akm-cli 0.9.31 → 0.10.261002-beta

package/dist/integrations/agent/profiles.js

@@ -8,116 +8,59 @@
  * coding-agent CLI. Named engines lower canonical harness metadata into this
  * intentionally small internal shape. The wrapper is in `./spawn.ts`.
  */
-import { COMMON_SPAWN_ENV_PASSTHROUGH, OPENCODE_ENV_PASSTHROUGH } from "../../core/spawn-env.js";
-// AKM_EVENT_SOURCE carries usage-event provenance (improve/task) so that akm
-// invocations a spawned agent makes are recorded as machine traffic, not user
-// demand (DRIFT-6). Without it in the passthrough whitelist, buildChildEnv drops
-// the stamp at the agent boundary — e.g. `akm wiki ingest` spawns an agent whose
-// `akm curate/show/search` tool-calls then log source='user', silently inflating
-// every lane's read-back (GRR). It is a provenance tag, never a secret.
-const COMMON_PASSTHROUGH = COMMON_SPAWN_ENV_PASSTHROUGH;
+import { COMMON_SPAWN_ENV_PASSTHROUGH } from "../../core/spawn-env.js";
+import { HARNESS_REGISTRY } from "../harnesses/index.js";
 /**
- * Built-in profiles for the agent CLIs akm knows out of the box: the five the
- * v1 spec calls out explicitly, plus the P2 harness adapters (copilot, pi,
- * amazonq, openhands — plan §"Capability matrix"). The fields here are
- * conservative defaults — every value is overridable from user config.
+ * Built-in profiles for the agent CLIs akm knows out of the box, DERIVED from
+ * the harness registry: each harness that declares `profile` defaults gets one,
+ * named by its id. The fields are conservative defaults, overridable from user
+ * config. Engine lowering selects captured stdio for unattended dispatch.
  *
- * Engine lowering selects captured stdio for unattended dispatch.
+ * Built lazily: the registry transitively imports this module, so it cannot be
+ * read at module load.
  */
-const BUILTINS = {
-    opencode: {
-        name: "opencode",
-        bin: "opencode",
-        args: ["run"],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, ...OPENCODE_ENV_PASSTHROUGH],
-        parseOutput: "text",
-    },
-    claude: {
-        name: "claude",
-        bin: "claude",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "ANTHROPIC_API_KEY", "CLAUDE_CONFIG"],
-        parseOutput: "text",
-    },
-    codex: {
-        name: "codex",
-        bin: "codex",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "OPENAI_API_KEY", "CODEX_CONFIG"],
-        parseOutput: "text",
-    },
-    gemini: {
-        name: "gemini",
-        bin: "gemini",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "GEMINI_API_KEY", "GOOGLE_API_KEY"],
-        parseOutput: "text",
-    },
-    aider: {
-        name: "aider",
-        bin: "aider",
-        args: ["--no-auto-commits"],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "OPENAI_API_KEY", "ANTHROPIC_API_KEY"],
-        parseOutput: "text",
-    },
-    // ── P2 harness-adapter profiles (plan §"Capability matrix") ────────────────
-    copilot: {
-        name: "copilot",
-        bin: "copilot",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "GH_TOKEN", "GITHUB_TOKEN"],
-        parseOutput: "text",
-    },
-    pi: {
-        name: "pi",
-        bin: "pi",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "PI_API_KEY", "ANTHROPIC_API_KEY", "OPENAI_API_KEY"],
-        parseOutput: "text",
-    },
-    amazonq: {
-        name: "amazonq",
-        bin: "q",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "AWS_PROFILE", "AWS_REGION"],
-        parseOutput: "text",
-    },
-    openhands: {
-        name: "openhands",
-        bin: "openhands",
-        args: [],
-        stdio: "interactive",
-        envPassthrough: [...COMMON_PASSTHROUGH, "LLM_MODEL", "LLM_API_KEY", "LLM_BASE_URL"],
-        parseOutput: "text",
-    },
-};
+let builtins;
+function builtinProfiles() {
+    if (builtins)
+        return builtins;
+    builtins = {};
+    for (const harness of HARNESS_REGISTRY) {
+        if (!harness.profile)
+            continue;
+        builtins[harness.id] = {
+            name: harness.id,
+            bin: harness.profile.bin,
+            args: harness.profile.args,
+            stdio: "interactive",
+            // AKM_EVENT_SOURCE (in the common set) carries usage-event provenance so akm
+            // invocations a spawned agent makes are recorded as machine traffic; it is a
+            // provenance tag, never a secret.
+            envPassthrough: [...COMMON_SPAWN_ENV_PASSTHROUGH, ...harness.profile.envPassthrough],
+            parseOutput: "text",
+        };
+    }
+    return builtins;
+}
 /**
  * Binary the `opencode-sdk` harness needs on PATH.
  *
- * The embedded SDK is not self-contained, and that is the SDK's own design
- * rather than a consequence of how akm drives it: `@opencode-ai/sdk` ships
- * with `"dependencies": {}` and its `createOpencodeServer` is itself a
- * `spawn("opencode", ["serve", ...])`. akm's runner spawns the same binary
- * directly and talks HTTP to it (see `harnesses/opencode-sdk/sdk-runner.ts`),
+ * The embedded client is not self-contained, and that is the SDK's own design
+ * rather than a consequence of how akm drives it: `@opencode-ai/sdk` (OpenCode 1)
+ * ships with `"dependencies": {}` and its `createOpencodeServer` is itself a
+ * `spawn("opencode", ["serve", ...])`; `@opencode/client` (OpenCode 2, the
+ * default) is an HTTP client only and starts nothing. akm's runner spawns a
+ * private `opencode serve` of the engine's detected major (
+ * never the v2 background service) and talks HTTP to it through that major's
+ * adapter (see `harnesses/opencode-sdk/sdk-runner.ts`, `v1-adapter.ts`, `v2-adapter.ts`),
  * so the `opencode` binary gates the SDK path exactly as it gates the CLI
  * path — a host with the npm package but no binary can dispatch neither.
- * `opencode-sdk` deliberately has no {@link BUILTINS} entry — it dispatches
+ * `opencode-sdk` deliberately declares no `profile` — it dispatches
  * without argv construction — so this is the one place that pairing lives.
  */
 export const OPENCODE_SDK_SERVER_BIN = "opencode";
-/** Names of the canonical built-in harness descriptors. Stable, sorted. */
-export const BUILTIN_AGENT_PROFILE_NAMES = Object.freeze(Object.keys(BUILTINS).sort());
 /** Returns the built-in descriptor for a canonical harness id. */
 export function getBuiltinAgentProfile(name) {
-    return BUILTINS[name];
+    return builtinProfiles()[name];
 }
 /**
  * Return a copy of every canonical built-in descriptor keyed by harness id.
@@ -125,7 +68,7 @@ export function getBuiltinAgentProfile(name) {
  */
 export function listBuiltinAgentProfiles() {
     const out = {};
-    for (const [name, profile] of Object.entries(BUILTINS)) {
+    for (const [name, profile] of Object.entries(builtinProfiles())) {
         out[name] = { ...profile };
     }
     return out;

package/dist/integrations/agent/request-lowering.js

@@ -4,7 +4,7 @@
 import { ConfigError } from "../../core/errors.js";
 import { withSchemaInstruction } from "../../core/structured.js";
 import { MODEL_WORK_POLICY_ID } from "../../execution/source.js";
-import { HARNESS_MODEL_WORK_IDS, HARNESS_NATIVE_AGENT_IDS } from "../harnesses/ids.js";
+import { getHarness } from "../harnesses/index.js";
 import { composeConversationFallbackPrompt } from "./conversation-fallback.js";
 import { composePersonaFallbackPrompt } from "./persona-fallback.js";
 /** A tool selection that actually names tools (not omitted, null, or empty). */
@@ -77,7 +77,7 @@ export function createAgentRequestLowerer(options) {
             }
         }
         else if (typeof request.agent === "string") {
-            if (!HARNESS_NATIVE_AGENT_IDS.has(options.adapter)) {
+            if (!getHarness(options.adapter)?.capabilities.nativeAgent) {
                 throw new ConfigError(`The ${options.adapter} transport cannot consume native agent selector ${JSON.stringify(request.agent)}.`, "INVALID_CONFIG_FILE");
             }
             dispatch.agent = request.agent;
@@ -99,7 +99,7 @@ export function createAgentRequestLowerer(options) {
             }
         }
         if (modelWork) {
-            if (!HARNESS_MODEL_WORK_IDS.has(options.adapter)) {
+            if (!getHarness(options.adapter)?.capabilities.modelWork) {
                 throw new ConfigError(`The ${options.adapter} transport cannot enforce the model-work tool policy.`, "INVALID_CONFIG_FILE");
             }
             // The builder selects its own confined agent or flags; another agent would replace them.

package/dist/integrations/harnesses/aider/index.js

@@ -27,6 +27,11 @@ export class AiderHarness extends BaseHarness {
     id = "aider";
     displayName = "Aider";
     agentBuilder = aiderBuilder;
+    profile = {
+        bin: "aider",
+        args: ["--no-auto-commits"],
+        envPassthrough: ["OPENAI_API_KEY", "ANTHROPIC_API_KEY"],
+    };
     resultExtractor = aiderResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // No flag-shaped resume: Aider persists context in chat-history files

package/dist/integrations/harnesses/amazonq/index.js

@@ -28,6 +28,7 @@ export class AmazonqHarness extends BaseHarness {
     id = "amazonq";
     displayName = "Amazon Q Developer CLI";
     agentBuilder = amazonqBuilder;
+    profile = { bin: "q", args: [], envPassthrough: ["AWS_PROFILE", "AWS_REGION"] };
     resultExtractor = amazonqResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // No `identityEnv`: the matrix lists Q's identity markers as uncertain, and

package/dist/integrations/harnesses/claude/config-import.js

@@ -7,9 +7,8 @@
  *
  * Detects a Claude Code installation (filesystem only, no network) and reads
  * its config to extract LLM connection details. API key VALUES are never
- * stored — only the env var name that holds them. The pluggable registry
- * (`HARNESS_CONFIG_IMPORTERS`) and the OpenCode importer stay in
- * `setup/harness-config-import.ts`, which imports this importer back.
+ * stored — only the env var name that holds them. `ClaudeHarness` declares it
+ * as its `configImporter`.
  *
  * Behaviour-preserving relocation.
  */

package/dist/integrations/harnesses/claude/index.js

@@ -4,6 +4,7 @@
 import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 import { claudeBuilder } from "./agent-builder.js";
+import { claudeCodeImporter } from "./config-import.js";
 import { claudeResultExtractor } from "./result-extractor.js";
 import { ClaudeCodeProvider } from "./session-log.js";
 export { claudeBuilder } from "./agent-builder.js";
@@ -22,7 +23,9 @@ export class ClaudeHarness extends BaseHarness {
     // session-log provider, so offering it as a stash source is functional.
     setupDetectionDir = ".claude";
     agentBuilder = claudeBuilder;
+    profile = { bin: "claude", args: [], envPassthrough: ["ANTHROPIC_API_KEY", "CLAUDE_CONFIG"] };
     resultExtractor = claudeResultExtractor;
+    configImporter = claudeCodeImporter;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // Session-id env marker: presence of a concrete session id (not the bare
     // "running under Claude Code" flag) attributes a run to this harness.
@@ -32,6 +35,8 @@ export class ClaudeHarness extends BaseHarness {
         sessionLogs: true,
         agentDispatch: true,
         detection: true,
+        modelWork: true,
+        nativeAgent: true,
         configImport: true,
     });
 }

package/dist/integrations/harnesses/codex/index.js

@@ -20,6 +20,7 @@ export class CodexHarness extends BaseHarness {
     // No `setupDetectionDir`: `~/.codex` holds credentials and session rollouts,
     // not assets, so `akm setup` must not offer it as a stash source.
     agentBuilder = codexBuilder;
+    profile = { bin: "codex", args: [], envPassthrough: ["OPENAI_API_KEY", "CODEX_CONFIG"] };
     resultExtractor = codexResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // No flag-shaped resume: codex resume is the `exec resume <id>` SUBCOMMAND

package/dist/integrations/harnesses/copilot/index.js

@@ -28,6 +28,7 @@ export class CopilotHarness extends BaseHarness {
     id = "copilot";
     displayName = "GitHub Copilot CLI";
     agentBuilder = copilotBuilder;
+    profile = { bin: "copilot", args: [], envPassthrough: ["GH_TOKEN", "GITHUB_TOKEN"] };
     resultExtractor = copilotResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // Session-id env marker only. The matrix's other candidates (GH_TOKEN,

package/dist/integrations/harnesses/gemini/index.js

@@ -27,6 +27,7 @@ export class GeminiHarness extends BaseHarness {
     id = "gemini";
     displayName = "Gemini CLI";
     agentBuilder = geminiBuilder;
+    profile = { bin: "gemini", args: [], envPassthrough: ["GEMINI_API_KEY", "GOOGLE_API_KEY"] };
     resultExtractor = geminiResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // The matrix's identity marker: Gemini CLI stamps GEMINI_CLI=1 only on

package/dist/integrations/harnesses/index.js

@@ -2,16 +2,17 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 /**
- * Single registration point for every akm agent harness (#562).
+ * Single registration point for every akm agent harness (#562, #1095).
  *
- * `HARNESS_REGISTRY` is the ONE source of truth that replaces the three
- * previously-disconnected registries (session-logs index, agent profiles,
- * config/setup platform strings). All derived exports below are computed from
- * it, so adding a harness is a single entry here instead of ~16 scattered edits.
+ * `HARNESS_REGISTRY` is the ONE source of truth. Each harness is a
+ * self-contained folder (`./<id>/index.ts`) exporting its descriptor; the
+ * config schema's platform enum, the built-in agent profiles, command
+ * builders, setup choices and the docs table all derive from the array below.
  *
- * This module is a dependency-graph LEAF: it imports nothing from
- * `core/config`. `core/config/config-types.ts` derives `VALID_HARNESS_IDS`
- * from here, which keeps the import direction acyclic (config ← harnesses).
+ * Adding a harness: create `./<id>/index.ts`, add its class here. Removing:
+ * delete both. This module must stay free of runtime `core/config` imports
+ * (config derives `VALID_HARNESS_IDS` from here), so a harness's heavy runner
+ * (e.g. `opencode-sdk/sdk-runner.ts`) is imported by its caller, not here.
  */
 import { AiderHarness } from "./aider/index.js";
 import { AmazonqHarness } from "./amazonq/index.js";
@@ -19,26 +20,14 @@ import { ClaudeHarness } from "./claude/index.js";
 import { CodexHarness } from "./codex/index.js";
 import { CopilotHarness } from "./copilot/index.js";
 import { GeminiHarness } from "./gemini/index.js";
-import { HARNESS_ID_TABLE } from "./ids.js";
 import { OpencodeHarness } from "./opencode/index.js";
-// Import the descriptor from its LEAF module, not the per-harness barrel: the
-// barrel re-exports `./sdk-runner` (which imports `core/config`, and
-// `core/config/config-types` derives `VALID_HARNESS_IDS` back from this file).
-// Importing the class through the barrel would form an initialization cycle
-// that throws a TDZ error when the barrel is the first module loaded in a fresh
-// graph (see ./opencode-sdk/harness.ts). This keeps the registry a config-leaf.
-import { OpencodeSdkHarness } from "./opencode-sdk/harness.js";
+import { OpencodeSdkHarness } from "./opencode-sdk/index.js";
 import { OpenhandsHarness } from "./openhands/index.js";
 import { PiHarness } from "./pi/index.js";
 import { isSessionLogHarness } from "./types.js";
 export { isSessionLogHarness } from "./types.js";
-// Each harness descriptor (ClaudeHarness, OpencodeHarness, OpencodeSdkHarness)
-// lives in its own per-harness directory alongside that harness's session-log
-// reader, agent builder, config importer, and/or SDK runner (#563/#564). They
-// are imported above and registered in HARNESS_REGISTRY below.
 /**
- * The single registration point. Add a harness here (and nothing else) to make
- * every derived registry pick it up.
+ * The single registration point.
  *
  * Typed `as const` (not `AkmHarness[]`) so each entry keeps its literal `id`,
  * which lets `VALID_HARNESS_IDS` stay a literal tuple — `HarnessId`,
@@ -62,23 +51,6 @@ export const HARNESS_REGISTRY = Object.freeze([
     new AmazonqHarness(),
     new OpenhandsHarness(),
 ]);
-// Construction-time drift guard (WI-9.8 KILL 3, D.3 edge B): ./ids.ts's
-// HARNESS_ID_TABLE is config's dependency-free mirror of (id, agentDispatch)
-// for every registered harness, kept out of core/config's import graph so
-// config doesn't have to import this (heavier) barrel. Assert they match so
-// the mirror can never silently drift — a new/reordered/recapability'd
-// harness that forgets to update ./ids.ts fails loudly here instead of
-// quietly breaking config's platform validation.
-if (HARNESS_REGISTRY.length !== HARNESS_ID_TABLE.length) {
-    throw new Error(`harnesses/ids.ts HARNESS_ID_TABLE has ${HARNESS_ID_TABLE.length} entries but HARNESS_REGISTRY has ${HARNESS_REGISTRY.length} — update ids.ts to match.`);
-}
-HARNESS_REGISTRY.forEach((h, i) => {
-    const expected = HARNESS_ID_TABLE[i];
-    if (!expected || expected.id !== h.id || expected.agentDispatch !== h.capabilities.agentDispatch) {
-        throw new Error(`harnesses/ids.ts HARNESS_ID_TABLE[${i}] (${expected?.id ?? "<missing>"}, agentDispatch=${expected?.agentDispatch}) ` +
-            `does not match HARNESS_REGISTRY[${i}] (${h.id}, agentDispatch=${h.capabilities.agentDispatch}) — update ids.ts to match.`);
-    }
-});
 /** Lookup by the one supported harness id. */
 export const HARNESS_BY_ID = new Map(HARNESS_REGISTRY.map((h) => [h.id, h]));
 /**
@@ -96,6 +68,13 @@ export const VALID_HARNESS_IDS = Object.freeze(HARNESS_REGISTRY.map((h) => h.id)
 export const SESSION_LOG_HARNESSES = HARNESS_REGISTRY.filter(isSessionLogHarness);
 /** Harnesses that can be dispatched as an agent CLI / SDK. */
 export const AGENT_DISPATCH_HARNESSES = HARNESS_REGISTRY.filter((h) => h.capabilities.agentDispatch);
+const idsWith = (flag) => new Set(HARNESS_REGISTRY.filter(flag).map((h) => h.id));
+/** Harness ids whose `capabilities.agentDispatch` is `true`. */
+export const HARNESS_AGENT_DISPATCH_IDS = idsWith((h) => h.capabilities.agentDispatch);
+/** Harness ids that confine the model-work tool policy, so unattended model work may run on them. */
+export const HARNESS_MODEL_WORK_IDS = idsWith((h) => h.capabilities.modelWork);
+/** Harness ids that can run a named native agent, so an engine may name a default `agent`. */
+export const HARNESS_NATIVE_AGENT_IDS = idsWith((h) => h.capabilities.nativeAgent);
 /**
  * Resolve an exact harness id to its descriptor, or `undefined` if unknown.
  */

package/dist/integrations/harnesses/opencode/agent-builder.js

@@ -10,30 +10,75 @@
  * `getCommandBuilder`, the default builder, flag/tool helpers) stays in
  * `agent/builders.ts`, which imports this builder back into `BUILTIN_BUILDERS`.
  *
- * Behaviour-preserving relocation: the produced argv is byte-identical to the
- * pre-migration `opencodeBuilder`. The builder's `platform` stays `'opencode'`
- * (the canonical harness id).
+ * The builder's `platform` stays `'opencode'` (the canonical harness id). The
+ * one thing that depends on the OpenCode major (`./version.ts`, one cached
+ * `--version` run per binary) is `--standalone`, added on OpenCode 2 only; the
+ * OpenCode 1 argv is byte-identical to the pre-OpenCode-2 builder's.
  */
-import { modelFromArgs, resolveDispatchModel } from "../../agent/builder-shared.js";
+import { modelFromArgs, resolveDispatchModel, } from "../../agent/builder-shared.js";
 import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 import { MODEL_WORK_AGENT_INFERENCE, opencodeInferenceConfig } from "./model-config.js";
 import { MODEL_WORK_OPENCODE_AGENT, modelWorkOpencodeConfig, modelWorkPluginEnv } from "./model-work-agent.js";
+import { detectOpencodeMajor } from "./version.js";
 /**
- * OpenCode builder.
- * Command shape: opencode run [--agent <name>] [--model <m>] -- "<prompt>"
+ * OpenCode 2's `run` attaches to a shared background service by default,
+ * starting it when absent and leaving it running after the run; `--standalone`
+ * runs a private server that exits with the run (and reads the
+ * `OPENCODE_CONFIG_CONTENT` model work travels in, which the service ignores).
+ * OpenCode 1 has no such flag. An engine whose own `args` name `--server`
+ * chose that server, so it gets no `--standalone`. `--auto` is never passed:
+ * a non-interactive run rejects a permission request, on both majors.
+ */
+const STANDALONE_FLAG = "--standalone";
+function standalone(major, flags) {
+    if (major !== 2)
+        return [];
+    const chosen = flags.some((arg) => arg === STANDALONE_FLAG || arg === "--server" || arg.startsWith("--server="));
+    return chosen ? [] : [STANDALONE_FLAG];
+}
+/**
+ * The flags before the `--` separator of an ordinary dispatch: the engine's
+ * `args` (without any `--model` when the request names one), then `--agent`
+ * and `--model`. Both majors spell these the same way.
+ */
+function ordinaryFlags(profile, req) {
+    const args = req.model ? [] : [...profile.args];
+    if (req.model) {
+        for (let index = 0; index < profile.args.length; index += 1) {
+            const arg = profile.args[index];
+            if (arg === undefined)
+                continue;
+            if (arg === "--model") {
+                index += 1;
+            }
+            else if (!arg.startsWith("--model=")) {
+                args.push(arg);
+            }
+        }
+    }
+    if (req.agent) {
+        args.push("--agent", req.agent);
+    }
+    if (req.model) {
+        args.push("--model", resolveDispatchModel(req, profile, "opencode"));
+    }
+    return args;
+}
+/**
+ * OpenCode builder: `opencode run [--standalone] [--agent <name>] [--model <m>] -- "<prompt>"`
+ * (`--standalone` on OpenCode 2 only).
  *
  * `opencode run` has no system-prompt option (1.18.25 prints its usage and
  * exits 1 on `--system-prompt`), so the shared lowerer composes a persona
  * into the prompt.
  *
- * Tool policy is omitted — opencode manages tool access through its own agent
+ * Tool policy is omitted: opencode manages tool access through its own agent
  * config files, not via CLI flags. The one exception is the model-work tool
  * policy: the builder injects its confined agent through
  * `OPENCODE_CONFIG_CONTENT` and selects it with `--agent`. That command is
- * akm's own (`opencode run --agent akm-model-work`): the engine's `args` are
- * left out, because one such as `--attach` or `--dir` would move the run out
- * of the injected config or the scratch working directory. Only the model they
- * name is kept.
+ * akm's own: the engine's `args` are left out, because one such as `--attach`
+ * or `--dir` would move the run out of the injected config or the scratch
+ * working directory. Only the model they name is kept.
  *
  * Model work's agent carries the request's inference options
  * (`./model-config.ts`). Any other dispatch injects nothing and carries none, so
@@ -49,6 +94,7 @@ export const opencodeBuilder = {
         inference: MODEL_WORK_AGENT_INFERENCE,
     }),
     build(profile, req) {
+        const major = detectOpencodeMajor(profile.bin).major;
         if (req.modelWork) {
             const model = req.model ?? modelFromArgs(profile.args);
             const { agentOptions } = opencodeInferenceConfig(req.inference, true);
@@ -56,6 +102,7 @@ export const opencodeBuilder = {
                 argv: [
                     profile.bin,
                     "run",
+                    ...standalone(major, []),
                     "--agent",
                     MODEL_WORK_OPENCODE_AGENT,
                     ...(model ? ["--model", model] : []),
@@ -68,29 +115,7 @@ export const opencodeBuilder = {
                 },
             };
         }
-        const args = req.model ? [] : [...profile.args];
-        if (req.model) {
-            for (let index = 0; index < profile.args.length; index += 1) {
-                const arg = profile.args[index];
-                if (arg === undefined)
-                    continue;
-                if (arg === "--model") {
-                    index += 1;
-                }
-                else if (!arg.startsWith("--model=")) {
-                    args.push(arg);
-                }
-            }
-        }
-        if (req.agent) {
-            args.push("--agent", req.agent);
-        }
-        if (req.model) {
-            const resolved = resolveDispatchModel(req, profile, "opencode");
-            args.push("--model", resolved);
-        }
-        args.push("--");
-        args.push(req.prompt);
-        return { argv: [profile.bin, ...args] };
+        const flags = ordinaryFlags(profile, req);
+        return { argv: [profile.bin, ...flags, ...standalone(major, flags), "--", req.prompt] };
     },
 };