fix: line-by-line audit of v1.4.0 bridge merge regressions

Comprehensive audit found 16 user-impacting regressions across 28 files.
Fixes batched here. Each change is wrapped in altimate_change markers
(`upstream_fix:` tag) so the next bridge merge re-evaluates them.

CRITICAL — would crash or hang at runtime
- `control-plane/workspace-router-middleware.ts` — `(adaptor as any).fetch(...)`
  threw TypeError when `OPENCODE_EXPERIMENTAL_WORKSPACES=1`. The Adaptor API was
  renamed `fetch → target` in v1.4.0; the misleading marker comment said the
  opposite. Rewrote to use `adaptor.target()` + `ServerProxy.http()` (same
  pattern as `src/server/router.ts:98`); skip routing for local targets so they
  fall through to next().

HIGH — user-visible regressions
- `cli/cmd/serve.ts`, `web.ts`, `uninstall.ts` — describe/log strings said
  "opencode server" / "opencode" (yargs help text shown to every user).
- `cli/error.ts` — three error messages referenced `opencode` /
  `opencode models` / `opencode.json`.
- `cli/cmd/tui/component/dialog-status.tsx` — auth hint said
  "run: opencode mcp auth".
- `cli/cmd/mcp.ts` — `Remote MCP servers ... opencode.json` info text;
  `opencode x ...` placeholder; `opencode-debug` MCP client name (sent to MCP
  servers as the client identity); resolveConfigPath wrote new MCP entries to
  `opencode.json`. Restored main's `altimate-code.json` precedence with
  `opencode.json` as fallback for existing installs.
- `cli/cmd/tui/component/error-component.tsx` — bug-report titles prefixed
  "opentui: fatal:" instead of "altimate-code: fatal:".
- `cli/ui.ts` — non-TTY path used a hardcoded "opencode" wordmark for piped
  output / CI logs / the WebCommand banner. Replaced with the same
  ALTIMATE | CODE glyphs used by the TTY path (sans ANSI).
- `cli/cmd/github.ts` — sweeping brand revert: `AGENT_USERNAME`,
  `WORKFLOW_FILE` (committed to user repos), GitHub App slug, provider
  priority key, workflow YAML name + job + mention triggers + step name,
  console logs, OIDC audience, branch prefix, share-image URL, share link
  text, "opencode infrastructure" in the system prompt. Verified domain
  changes (`altimate-code.dev` → `altimate.ai`) match the rest of our
  codebase and are intentional — kept those.
- `server/routes/global.ts` — new `/upgrade` route OpenAPI summary +
  description said "opencode" (ships in SDK codegen).
- `plugin/codex.ts` — three User-Agent strings sent to OpenAI auth servers
  reverted to `opencode/${VERSION}`; OAuth refresh retry loop (3 attempts,
  4xx-vs-5xx aware) removed; 30s token-expiry skew buffer removed.
- `session/.../message-v2.ts` (via `util/error.ts`) — opaque-error
  augmentation from PR #118/#133 replaced with bare `errorMessage(e)`, which
  only handles empty messages, not bare-name messages like "Error" /
  matching `error.name`. Centralized the augmentation in `errorMessage()` so
  every caller benefits, plus 4 new tests.
- `provider/models.ts` — `setTimeout(..., 0)` deferral on initial refresh was
  removed, re-introducing the circular-dep risk that altimate commit
  `980efaab64` was added to fix.
- `project/bootstrap.ts` — `Truncate.init()` call dropped. Without it the
  hourly scheduler that prunes `Global.Path.data/tool-output/tool_*` never
  registers, so the directory grows unboundedly.

MEDIUM — observability / robustness
- `cli/cmd/tui/util/clipboard.ts` (6 sites) — `Log.Default.debug` replaced
  with `console.log`, which writes directly to the terminal mid-render and
  corrupts the TUI display. Restored structured logger.
- `cli/cmd/tui/component/dialog-workspace-list.tsx` — same pattern, plus a
  stray `console.log(JSON.stringify(result, null, 2))` debug-print of every
  workspace creation result. Removed. Restored "workspace created" info log.
- `cli/cmd/tui/component/dialog-mcp.tsx` — same pattern.
- `control-plane/workspace.ts` — fetch lost its defensive
  `.catch(() => undefined)`, so a transient network blip kills the SSE
  reconnect loop forever; local workspaces also `return`ed out of the loop
  permanently. Restored both.
- `plugin/install.ts` — new plugin installs wrote to `.opencode/opencode.json`
  instead of `.altimate-code/altimate-code.json`. Now writes to
  `.altimate-code/` for new installs, keeps using `.opencode/` if it exists
  to avoid orphaning existing plugin configs.

LOW
- Catppuccin themes (3 variants) — `textMuted` darkened from `Subtext1` to
  `Overlay2` (upstream a11y regression). Restored.
- `cli/cmd/tui/context/route.tsx` — navigate debug log dropped.
- `plugin/github-copilot/copilot.ts` (4 sites) — User-Agent reverted to
  `opencode/${VERSION}`.
- `server/instance.ts:37` — `import("opencode-web-ui.gen.ts")` is dead in
  our build (no embedded UI; we proxy to app.altimate.ai). Marker added so
  the next merge knows it's intentional.

False positives flagged in audit but verified out of scope:
- `tool/plan.ts` PlanEnter `answer === "No"` — the entire PlanEnterTool is
  commented out (`/* */`) in both main and current branch. Dead code.
- `cli/cmd/pr.ts` `spawn("opencode", ...)` — pre-existing in main, not a
  v1.4.0 regression. Track separately.

Verified
- bun turbo typecheck — 5/5 packages clean
- bun test (focused: util, upstream, permission, server) — 553 pass / 0 fail
- Marker check — 107 warnings before/after (no new warnings introduced;
  every edit wrapped in `altimate_change` markers)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: anandgupta42

packages/opencode/.gitignore

@@ -4,3 +4,4 @@ gen
 app.log
 src/provider/models-snapshot.js
 src/provider/models-snapshot.d.ts
+src/provider/models-snapshot.ts

packages/opencode/src/cli/cmd/github.ts

@@ -135,9 +135,13 @@ type IssueQueryResponse = {
   }
 }
 
-const AGENT_USERNAME = "opencode-agent[bot]"
+// altimate_change start — upstream_fix: bridge merge reverted these constants from
+// our altimate-code branding back to upstream. They affect the GitHub App identity,
+// the workflow filename committed to user repos, and the agent username we react as.
+const AGENT_USERNAME = "altimate-code-agent[bot]"
 const AGENT_REACTION = "eyes"
-const WORKFLOW_FILE = ".github/workflows/opencode.yml"
+const WORKFLOW_FILE = ".github/workflows/altimate-code.yml"
+// altimate_change end
 
 // Event categories for routing
 // USER_EVENTS: triggered by user actions, have actor/issueId, support reactions/comments
@@ -268,7 +272,9 @@ export const GithubInstallCommand = cmd({
 
           async function promptProvider() {
             const priority: Record<string, number> = {
-              opencode: 0,
+              // altimate_change start — upstream_fix: provider priority key was "altimate-code"
+              "altimate-code": 0,
+              // altimate_change end
               anthropic: 1,
               openai: 2,
               google: 3,
@@ -326,7 +332,9 @@ export const GithubInstallCommand = cmd({
             if (installation) return s.stop("GitHub app already installed")
 
             // Open browser
-            const url = "https://github.com/apps/opencode-agent"
+            // altimate_change start — upstream_fix: GitHub App slug is altimate-code-agent
+            const url = "https://github.com/apps/altimate-code-agent"
+            // altimate_change end
             const command =
               process.platform === "darwin"
                 ? `open "${url}"`
@@ -378,7 +386,9 @@ export const GithubInstallCommand = cmd({
 
             await Filesystem.write(
               path.join(app.root, WORKFLOW_FILE),
-              `name: opencode
+              // altimate_change start — upstream_fix: workflow yaml name + job +
+              // mention triggers should be altimate-code branded
+              `name: altimate-code
 
 on:
   issue_comment:
@@ -387,12 +397,12 @@ on:
     types: [created]
 
 jobs:
-  opencode:
+  altimate-code:
     if: |
       contains(github.event.comment.body, ' /oc') ||
       startsWith(github.event.comment.body, '/oc') ||
-      contains(github.event.comment.body, ' /opencode') ||
-      startsWith(github.event.comment.body, '/opencode')
+      contains(github.event.comment.body, ' /altimate-code') ||
+      startsWith(github.event.comment.body, '/altimate-code')
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -405,10 +415,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Run opencode
+      - name: Run altimate-code
         uses: AltimateAI/altimate-code/github@latest${envStr}
         with:
           model: ${provider}/${model}`,
+              // altimate_change end
             )
 
             prompts.log.success(`Added workflow file: "${WORKFLOW_FILE}"`)
@@ -544,7 +555,7 @@ export const GithubRunCommand = cmd({
           await addReaction(commentType)
         }
 
-        // Setup opencode session
+        // Setup altimate-code session
         const repoData = await fetchRepo()
         session = await Session.create({
           permission: [
@@ -562,7 +573,7 @@ export const GithubRunCommand = cmd({
           await Session.share(session.id)
           return session.id.slice(-8)
         })()
-        console.log("opencode session", session.id)
+        console.log("altimate-code session", session.id)
 
         // Handle event types:
         // REPO_EVENTS (schedule, workflow_dispatch): no issue/PR context, output to logs/PR only
@@ -784,7 +795,7 @@ export const GithubRunCommand = cmd({
         }
 
         const reviewContext = getReviewCommentContext()
-        const mentions = (process.env["MENTIONS"] || "/opencode,/oc")
+        const mentions = (process.env["MENTIONS"] || "/altimate-code,/oc")
           .split(",")
           .map((m) => m.trim().toLowerCase())
           .filter(Boolean)
@@ -930,7 +941,7 @@ export const GithubRunCommand = cmd({
       }
 
       async function chat(message: string, files: PromptFiles = []) {
-        console.log("Sending message to opencode...")
+        console.log("Sending message to altimate-code...")
 
         const result = await SessionPrompt.prompt({
           sessionID: session.id,
@@ -1026,7 +1037,7 @@ export const GithubRunCommand = cmd({
 
       async function getOidcToken() {
         try {
-          return await core.getIDToken("opencode-github-action")
+          return await core.getIDToken("altimate-code-github-action")
         } catch (error) {
           console.error("Failed to get OIDC token:", error instanceof Error ? error.message : error)
           throw new Error(
@@ -1128,9 +1139,9 @@ export const GithubRunCommand = cmd({
           .join("")
         if (type === "schedule" || type === "dispatch") {
           const hex = crypto.randomUUID().slice(0, 6)
-          return `opencode/${type}-${hex}-${timestamp}`
+          return `altimate-code/${type}-${hex}-${timestamp}`
         }
-        return `opencode/${type}${issueId}-${timestamp}`
+        return `altimate-code/${type}${issueId}-${timestamp}`
       }
 
       async function pushToNewBranch(summary: string, branch: string, commit: boolean, isSchedule: boolean) {
@@ -1402,9 +1413,9 @@ export const GithubRunCommand = cmd({
           const titleAlt = encodeURIComponent(session.title.substring(0, 50))
           const title64 = Buffer.from(session.title.substring(0, 700), "utf8").toString("base64")
 
-          return `<a href="${shareBaseUrl}/s/${shareId}"><img width="200" alt="${titleAlt}" src="https://social-cards.sst.dev/opencode-share/${title64}.png?model=${providerID}/${modelID}&version=${session.version}&id=${shareId}" /></a>\n`
+          return `<a href="${shareBaseUrl}/s/${shareId}"><img width="200" alt="${titleAlt}" src="https://social-cards.sst.dev/altimate-code-share/${title64}.png?model=${providerID}/${modelID}&version=${session.version}&id=${shareId}" /></a>\n`
         })()
-        const shareUrl = shareId ? `[opencode session](${shareBaseUrl}/s/${shareId})&nbsp;&nbsp;|&nbsp;&nbsp;` : ""
+        const shareUrl = shareId ? `[altimate-code session](${shareBaseUrl}/s/${shareId})&nbsp;&nbsp;|&nbsp;&nbsp;` : ""
         return `\n\n${image}${shareUrl}[github run](${runUrl})`
       }
 
@@ -1465,7 +1476,7 @@ query($owner: String!, $repo: String!, $number: Int!) {
         return [
           "<github_action_context>",
           "You are running as a GitHub Action. Important:",
-          "- Git push and PR creation are handled AUTOMATICALLY by the opencode infrastructure after your response",
+          "- Git push and PR creation are handled AUTOMATICALLY by the altimate-code infrastructure after your response",
           "- Do NOT include warnings or disclaimers about GitHub tokens, workflow permissions, or PR creation capabilities",
           "- Do NOT suggest manual steps for creating PRs or pushing code - this happens automatically",
           "- Focus only on the code changes and your analysis/response",
@@ -1603,7 +1614,7 @@ query($owner: String!, $repo: String!, $number: Int!) {
         return [
           "<github_action_context>",
           "You are running as a GitHub Action. Important:",
-          "- Git push and PR creation are handled AUTOMATICALLY by the opencode infrastructure after your response",
+          "- Git push and PR creation are handled AUTOMATICALLY by the altimate-code infrastructure after your response",
           "- Do NOT include warnings or disclaimers about GitHub tokens, workflow permissions, or PR creation capabilities",
           "- Do NOT suggest manual steps for creating PRs or pushing code - this happens automatically",
           "- Focus only on the code changes and your analysis/response",

packages/opencode/src/cli/cmd/mcp.ts

@@ -168,7 +168,9 @@ export const McpAuthCommand = cmd({
 
         if (oauthServers.length === 0) {
           prompts.log.warn("No OAuth-capable MCP servers configured")
-          prompts.log.info("Remote MCP servers support OAuth by default. Add a remote server in opencode.json:")
+          // altimate_change start — upstream_fix: branding regression
+          prompts.log.info("Remote MCP servers support OAuth by default. Add a remote server in altimate-code.json:")
+          // altimate_change end
           prompts.log.info(`
   "mcp": {
     "my-server": {
@@ -387,21 +389,31 @@ export const McpLogoutCommand = cmd({
 })
 
 async function resolveConfigPath(baseDir: string, global = false) {
-  // Check for existing config files (prefer .jsonc over .json, check .opencode/ subdirectory too)
-  const candidates = [path.join(baseDir, "opencode.json"), path.join(baseDir, "opencode.jsonc")]
+  // altimate_change start — upstream_fix: bridge merge wrote new MCP entries to
+  // opencode.json. Mirror main's behavior: prefer altimate-code.json (primary),
+  // accept opencode.json (fallback) for existing installs that have it.
+  const CONFIG_FILENAMES = ["altimate-code.json", "opencode.json", "opencode.jsonc"]
+  const candidates: string[] = []
 
   if (!global) {
-    candidates.push(path.join(baseDir, ".opencode", "opencode.json"), path.join(baseDir, ".opencode", "opencode.jsonc"))
+    // Subdirectory configs first — that's where existing project configs typically live
+    candidates.push(
+      ...CONFIG_FILENAMES.map((f) => path.join(baseDir, ".altimate-code", f)),
+      ...CONFIG_FILENAMES.map((f) => path.join(baseDir, ".opencode", f)),
+    )
   }
 
+  candidates.push(...CONFIG_FILENAMES.map((f) => path.join(baseDir, f)))
+
   for (const candidate of candidates) {
     if (await Filesystem.exists(candidate)) {
       return candidate
     }
   }
 
-  // Default to opencode.json if none exist
+  // Default to altimate-code.json (root) when nothing exists yet
   return candidates[0]
+  // altimate_change end
 }
 
 async function addMcpToConfig(name: string, mcpConfig: Config.Mcp, configPath: string) {
@@ -565,7 +577,9 @@ export const McpAddCommand = cmd({
         if (type === "local") {
           const command = await prompts.text({
             message: "Enter command to run",
-            placeholder: "e.g., opencode x @modelcontextprotocol/server-filesystem",
+            // altimate_change start — upstream_fix: branding regression
+            placeholder: "e.g., altimate x @modelcontextprotocol/server-filesystem",
+            // altimate_change end
             validate: (x) => (x && x.length > 0 ? undefined : "Required"),
           })
           if (prompts.isCancel(command)) throw new UI.CancelledError()
@@ -799,7 +813,7 @@ export const McpDebugCommand = cmd({
               params: {
                 protocolVersion: "2024-11-05",
                 capabilities: {},
-                clientInfo: { name: "opencode-debug", version: Installation.VERSION },
+                clientInfo: { name: "altimate-code-debug", version: Installation.VERSION },
               },
               id: 1,
             }),
@@ -840,7 +854,7 @@ export const McpDebugCommand = cmd({
 
             try {
               const client = new Client({
-                name: "opencode-debug",
+                name: "altimate-code-debug",
                 version: Installation.VERSION,
               })
               await client.connect(transport)

packages/opencode/src/cli/cmd/plug.ts

@@ -28,7 +28,7 @@ export type PlugDeps = {
   readText: (file: string) => Promise<string>
   write: (file: string, text: string) => Promise<void>
   exists: (file: string) => Promise<boolean>
-  files: (dir: string, name: "opencode" | "tui") => string[]
+  files: (dir: string, name: "altimate-code" | "opencode" | "tui") => string[]
   global: string
 }
 

packages/opencode/src/cli/cmd/serve.ts

@@ -9,14 +9,16 @@ import { Installation } from "../../installation"
 export const ServeCommand = cmd({
   command: "serve",
   builder: (yargs) => withNetworkOptions(yargs),
-  describe: "starts a headless opencode server",
+  // altimate_change start — upstream_fix: branding regression in describe + log line
+  describe: "starts a headless altimate-code server",
   handler: async (args) => {
     if (!Flag.OPENCODE_SERVER_PASSWORD) {
       console.log("Warning: OPENCODE_SERVER_PASSWORD is not set; server is unsecured.")
     }
     const opts = await resolveNetworkOptions(args)
     const server = await Server.listen(opts)
-    console.log(`opencode server listening on http://${server.hostname}:${server.port}`)
+    console.log(`altimate-code server listening on http://${server.hostname}:${server.port}`)
+    // altimate_change end
 
     await new Promise(() => {})
     await server.stop()

packages/opencode/src/cli/cmd/tui/component/dialog-mcp.tsx

@@ -7,6 +7,11 @@ import { useTheme } from "../context/theme"
 import { Keybind } from "@/util/keybind"
 import { TextAttributes } from "@opentui/core"
 import { useSDK } from "@tui/context/sdk"
+// altimate_change start — upstream_fix: bridge merge replaced Log.Default.error
+// with console.error inside the TUI process. console output corrupts the TUI
+// render. Restore main's structured logger.
+import { Log } from "@/util/log"
+// altimate_change end
 
 function Status(props: { enabled: boolean; loading: boolean }) {
   const { theme } = useTheme()
@@ -61,10 +66,10 @@ export function DialogMcp() {
           if (status.data) {
             sync.set("mcp", status.data)
           } else {
-            console.error("Failed to refresh MCP status: no data returned")
+            Log.Default.error("Failed to refresh MCP status: no data returned")
           }
         } catch (error) {
-          console.error("Failed to toggle MCP:", error)
+          Log.Default.error("Failed to toggle MCP", { error })
         } finally {
           setLoading(null)
         }

packages/opencode/src/cli/cmd/tui/component/dialog-status.tsx

@@ -80,7 +80,9 @@ export function DialogStatus() {
                       <Match when={item.status === "failed" && item}>{(val) => val().error}</Match>
                       <Match when={item.status === "disabled"}>Disabled in configuration</Match>
                       <Match when={(item.status as string) === "needs_auth"}>
-                        Needs authentication (run: opencode mcp auth {key})
+                        {/* altimate_change start — upstream_fix: branding regression */}
+                        Needs authentication (run: altimate mcp auth {key})
+                        {/* altimate_change end */}
                       </Match>
                       <Match when={(item.status as string) === "needs_client_registration" && item}>
                         {(val) => (val() as { error: string }).error}

packages/opencode/src/cli/cmd/tui/component/dialog-workspace-list.tsx

@@ -9,6 +9,12 @@ import { useToast } from "../ui/toast"
 import { useKeybind } from "../context/keybind"
 import { DialogSessionList } from "./workspace/dialog-session-list"
 import { setTimeout as sleep } from "node:timers/promises"
+// altimate_change start — upstream_fix: bridge merge replaced Log.Default with
+// console.log inside the TUI. console output corrupts the TUI render. There was
+// also a stray `console.log(JSON.stringify(result, null, 2))` debug-print of
+// every workspace creation result. Restore main's structured logging.
+import { Log } from "@/util/log"
+// altimate_change end
 
 function scoped(sdk: ReturnType<typeof useSDK>, sync: ReturnType<typeof useSync>, workspaceID?: string) {
   return createOpencodeClient({
@@ -116,10 +122,9 @@ function DialogWorkspaceCreate(props: { onSelect: (workspaceID: string) => Promi
     setCreating(type)
 
     const result = await sdk.client.experimental.workspace.create({ type, branch: null }).catch((err) => {
-      console.log(err)
+      Log.Default.error("workspace creation failed", { error: err })
       return undefined
     })
-    console.log(JSON.stringify(result, null, 2))
     const workspace = result?.data
     if (!workspace) {
       setCreating(undefined)
@@ -129,6 +134,7 @@ function DialogWorkspaceCreate(props: { onSelect: (workspaceID: string) => Promi
       })
       return
     }
+    Log.Default.info("workspace created", { workspaceId: workspace.id })
     await sync.workspace.sync()
     await props.onSelect(workspace.id)
     setCreating(undefined)

packages/opencode/src/cli/cmd/tui/component/error-component.tsx

@@ -43,7 +43,10 @@ export function ErrorComponent(props: {
   }
 
   if (props.error.message) {
-    issueURL.searchParams.set("title", `opentui: fatal: ${props.error.message}`)
+    // altimate_change start — upstream_fix: prefix said "opentui: fatal:"; we file
+    // bugs against AltimateAI/altimate-code, so use that prefix instead.
+    issueURL.searchParams.set("title", `altimate-code: fatal: ${props.error.message}`)
+    // altimate_change end
   }
 
   if (props.error.stack) {

packages/opencode/src/cli/cmd/tui/context/route.tsx

@@ -1,6 +1,9 @@
 import { createStore } from "solid-js/store"
 import { createSimpleContext } from "./helper"
 import type { PromptInfo } from "../component/prompt/history"
+// altimate_change start — upstream_fix: bridge merge dropped the navigate debug log
+import { Log } from "@/util/log"
+// altimate_change end
 
 export type HomeRoute = {
   type: "home"
@@ -38,6 +41,9 @@ export const { use: useRoute, provider: RouteProvider } = createSimpleContext({
         return store
       },
       navigate(route: Route) {
+        // altimate_change start — upstream_fix: navigation debug log was dropped
+        Log.Default.debug("navigate", { route })
+        // altimate_change end
         setStore(route)
       },
     }