Skip to content

Commit 59fca2c

Browse files
committed
chore: fix duplicate upstream code after altimate_change block re-application
Remove original upstream lines that were left behind when altimate_change blocks were re-applied. Fix workspace configuration in root package.json to use explicit package list instead of glob patterns. Note: Some typecheck errors remain in 23 files due to upstream API changes and complex multi-line block re-application issues that need manual review. https://claude.ai/code/session_01FVE7bSfST5rpzbEmUhNiBU
1 parent 206fa8a commit 59fca2c

21 files changed

Lines changed: 3047 additions & 307 deletions

File tree

.github/meta/merge-report-v1.2.27.json

Lines changed: 2907 additions & 0 deletions
Large diffs are not rendered by default.

.upstream-merge-state.json

Lines changed: 0 additions & 39 deletions
This file was deleted.

bun.lock

Lines changed: 12 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,13 @@
1818
},
1919
"workspaces": {
2020
"packages": [
21-
"packages/*",
22-
"packages/console/*",
21+
"packages/opencode",
22+
"packages/plugin",
23+
"packages/script",
24+
"packages/util",
2325
"packages/sdk/js",
24-
"packages/slack"
26+
"packages/dbt-tools",
27+
"packages/drivers"
2528
],
2629
"catalog": {
2730
"@types/bun": "1.3.9",
@@ -69,19 +72,15 @@
6972
}
7073
},
7174
"devDependencies": {
72-
"@actions/artifact": "5.0.1",
7375
"@tsconfig/bun": "catalog:",
74-
"@types/mime-types": "3.0.1",
76+
"@types/pg": "8.18.0",
7577
"@typescript/native-preview": "catalog:",
76-
"glob": "13.0.5",
7778
"husky": "9.1.7",
7879
"prettier": "3.6.2",
7980
"semver": "^7.6.0",
80-
"sst": "3.18.10",
8181
"turbo": "2.8.13"
8282
},
8383
"dependencies": {
84-
"@aws-sdk/client-s3": "3.933.0",
8584
"@opencode-ai/plugin": "workspace:*",
8685
"@opencode-ai/script": "workspace:*",
8786
"@opencode-ai/sdk": "workspace:*",
@@ -101,8 +100,7 @@
101100
"protobufjs",
102101
"tree-sitter",
103102
"tree-sitter-bash",
104-
"web-tree-sitter",
105-
"electron"
103+
"web-tree-sitter"
106104
],
107105
"overrides": {
108106
"@types/bun": "catalog:",

packages/opencode/src/acp/agent.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -551,22 +551,6 @@ export namespace ACP {
551551
}
552552
}
553553
// altimate_change end
554-
const authMethod: AuthMethod = {
555-
description: "Run `opencode auth login` in the terminal",
556-
name: "Login with opencode",
557-
id: "opencode-login",
558-
}
559-
560-
// If client supports terminal-auth capability, use that instead.
561-
if (params.clientCapabilities?._meta?.["terminal-auth"] === true) {
562-
authMethod._meta = {
563-
"terminal-auth": {
564-
command: "opencode",
565-
args: ["auth", "login"],
566-
label: "Altimate Code Login",
567-
},
568-
}
569-
}
570554

571555
return {
572556
protocolVersion: 1,

packages/opencode/src/agent/agent.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ export namespace Agent {
346346
// altimate_change start - default agent is "builder" not "build"
347347
sortBy([(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "builder"), "desc"]),
348348
// altimate_change end
349-
sortBy([(x) => (cfg.default_agent ? x.name === cfg.default_agent : x.name === "build"), "desc"]),
350349
)
351350
}
352351

packages/opencode/src/cli/cmd/tui/app.tsx

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -850,14 +850,6 @@ function App() {
850850
}
851851
})
852852
// altimate_change end
853-
sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
854-
toast.show({
855-
variant: "info",
856-
title: "Update Available",
857-
message: `Altimate Code v${evt.properties.version} is available. Run 'opencode upgrade' to update manually.`,
858-
duration: 10000,
859-
})
860-
})
861853

862854
return (
863855
<box

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,12 +323,6 @@ export function Session() {
323323
)
324324
}
325325
// altimate_change end
326-
function toBottom() {
327-
setTimeout(() => {
328-
if (!scroll || scroll.isDestroyed) return
329-
scroll.scrollTo(scroll.scrollHeight)
330-
}, 50)
331-
}
332326

333327
const local = useLocal()
334328

packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -328,13 +328,6 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
328328
<span>{Installation.VERSION}</span>
329329
</text>
330330
{/* altimate_change end */}
331-
<text fg={theme.textMuted}>
332-
<span style={{ fg: theme.success }}></span> <b>Open</b>
333-
<span style={{ fg: theme.text }}>
334-
<b>Code</b>
335-
</span>{" "}
336-
<span>{Installation.VERSION}</span>
337-
</text>
338331
</box>
339332
</box>
340333
</Show>

0 commit comments

Comments
 (0)