akm-cli 0.9.0-rc.1 → 0.9.0-rc.13

package/dist/integrations/harnesses/claude/session-log.js

@@ -5,6 +5,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { extractInlineRefMentions } from "../../session-logs/inline-refs.js";
+import { AbstractSessionLogProvider } from "../../session-logs/provider-base.js";
 /**
  * Root directory holding Claude Code's per-project JSONL session logs.
  *
@@ -100,22 +101,12 @@ function parseClaudeEvent(entry, sessionId, filePath, fallbackTsMs) {
  * (`getHarness`), and the `--type` flag accepts both, so the canonical id and
  * the persisted runtime string coexist without drift.
  */
-export class ClaudeCodeProvider {
+export class ClaudeCodeProvider extends AbstractSessionLogProvider {
     // Runtime identity (NOT the canonical id) — see class doc. Equals
     // HARNESS_BY_ID.get("claude").runtimeId.
     name = "claude-code";
-    isAvailable() {
-        return fs.existsSync(claudeProjectsDir());
-    }
-    /**
-     * Directory holding Claude Code's per-project session JSONL files
-     * (`~/.claude/projects`, honoring `AKM_CLAUDE_PROJECTS_DIR`). Returns `[]`
-     * when the directory does not exist on this machine. See {@link
-     * SessionLogHarness.watchRoots}.
-     */
-    watchRoots() {
-        const dir = claudeProjectsDir();
-        return fs.existsSync(dir) ? [dir] : [];
+    availabilityRoot() {
+        return claudeProjectsDir();
     }
     *readEvents(input) {
         try {
@@ -124,25 +115,13 @@ export class ClaudeCodeProvider {
                 if (stat.mtimeMs < input.sinceMs)
                     continue;
                 const lines = fs.readFileSync(jsonlPath, "utf8").split("\n").filter(Boolean);
-                for (const line of lines) {
-                    try {
-                        const entry = JSON.parse(line);
-                        const text = entry?.message?.content ?? entry?.content ?? "";
-                        if (typeof text !== "string" || text.length < 10)
-                            continue;
-                        yield {
-                            harness: this.name,
-                            text,
-                            ts: typeof entry?.timestamp === "number" ? entry.timestamp : stat.mtimeMs,
-                            sessionId: typeof entry?.session_id === "string" ? entry.session_id : undefined,
-                            role: typeof entry?.role === "string" ? entry.role : "unknown",
-                            filePath: jsonlPath,
-                        };
-                    }
-                    catch {
-                        // skip malformed lines
-                    }
-                }
+                yield* this.logLineEvents({
+                    lines,
+                    filePath: jsonlPath,
+                    fallbackTsMs: stat.mtimeMs,
+                    selectText: (entry) => entry?.message?.content ?? entry?.content ?? "",
+                    selectSessionId: (entry) => entry?.session_id,
+                });
             }
         }
         catch {
@@ -151,39 +130,23 @@ export class ClaudeCodeProvider {
     }
     listSessions(input = {}) {
         const root = input.location ?? claudeProjectsDir();
-        const sinceMs = input.sinceMs ?? 0;
-        const summaries = [];
-        try {
-            for (const jsonlPath of this.#walkJsonl(root)) {
-                let stat;
-                try {
-                    stat = fs.statSync(jsonlPath);
-                }
-                catch {
-                    continue;
-                }
-                if (stat.mtimeMs < sinceMs)
-                    continue;
-                const sessionId = path.basename(jsonlPath, ".jsonl");
-                const projectHint = path.basename(path.dirname(jsonlPath));
+        return this.listSessionsFromFiles({
+            sinceMs: input.sinceMs ?? 0,
+            enumerate: () => this.#walkJsonl(root),
+            summarize: (jsonlPath, stat) => {
                 // Peek first + last non-empty line to derive start/end timestamps and
                 // title. Reading the whole file would be wasteful for listing.
                 const peek = this.#peekJsonl(jsonlPath);
-                summaries.push({
-                    harness: this.name,
-                    sessionId,
+                return this.sessionRef({
+                    sessionId: path.basename(jsonlPath, ".jsonl"),
                     filePath: jsonlPath,
                     startedAt: peek.firstTsMs ?? stat.ctimeMs,
                     endedAt: peek.lastTsMs ?? stat.mtimeMs,
-                    projectHint,
-                    ...(peek.title ? { title: peek.title } : {}),
+                    projectHint: path.basename(path.dirname(jsonlPath)),
+                    title: peek.title,
                 });
-            }
-        }
-        catch {
-            // Root missing or unreadable — return what we have.
-        }
-        return summaries.sort((a, b) => (b.endedAt ?? 0) - (a.endedAt ?? 0));
+            },
+        });
     }
     readSession(ref) {
         const stat = fs.statSync(ref.filePath);
@@ -220,15 +183,14 @@ export class ClaudeCodeProvider {
             inlineRefs.push(...extractInlineRefMentions(parsed.text, parsed.ts));
         }
         return {
-            ref: {
-                harness: this.name,
+            ref: this.sessionRef({
                 sessionId: ref.sessionId,
                 filePath: ref.filePath,
                 startedAt: firstTsMs ?? stat.ctimeMs,
                 endedAt: lastTsMs ?? stat.mtimeMs,
                 projectHint,
-                ...(title ? { title } : {}),
-            },
+                title,
+            }),
             events,
             inlineRefs,
         };
@@ -302,18 +264,8 @@ export class ClaudeCodeProvider {
         }
         return result;
     }
-    *#walkJsonl(dir) {
-        try {
-            for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-                const full = path.join(dir, entry.name);
-                if (entry.isDirectory())
-                    yield* this.#walkJsonl(full);
-                else if (entry.name.endsWith(".jsonl") && entry.name !== "journal.jsonl")
-                    yield full;
-            }
-        }
-        catch {
-            // permission errors etc.
-        }
+    /** Session JSONL files under `dir`, excluding the shared journal file. */
+    #walkJsonl(dir) {
+        return this.walkFiles(dir, (name) => name.endsWith(".jsonl") && name !== "journal.jsonl");
     }
 }

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

@@ -46,14 +46,16 @@
  *     `-c model_reasoning_effort=<v>` — left to the integration task so the
  *     shared request contract's "no builder consumes it yet" note stays true).
  *
- * NOT registered anywhere yet: `HARNESS_REGISTRY` / `BUILTIN_BUILDERS` wiring
- * is a follow-up integration task. Exported cleanly for that task to import.
+ * Registered: `codexBuilder` is `CodexHarness.agentBuilder` (`./index.ts`),
+ * one of the ten harnesses `HARNESS_REGISTRY` constructs
+ * (`harnesses/index.ts`); `agent/builders.ts` derives `BUILTIN_BUILDERS` from
+ * that registry, so this builder is reachable under the `"codex"` platform
+ * name without any further wiring.
  */
 import { mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { assertNotFlag } from "../../agent/builder-shared.js";
-import { resolveModel } from "../../agent/model-aliases.js";
+import { assertNotFlag, resolveDispatchModel } from "../../agent/builder-shared.js";
 /**
  * Write a node's JSON Schema to a fresh temp file for `--output-schema`.
  *
@@ -69,8 +71,7 @@ export function writeCodexOutputSchemaFile(schema) {
 }
 /**
  * Argv prefix that resumes a previous codex session: `exec resume <id>`.
- * Codex resume is a subcommand chain, not a flag — kept here so the flag-shaped
- * `HarnessResumeSupport` seam is not force-fitted. The harness-native session
+ * Codex resume is a subcommand chain, not a flag. The harness-native session
  * id comes from the unit row (stored opportunistically by the result
  * extractor); akm never depends on it (plan §"Session, MCP, and identity").
  */
@@ -119,7 +120,7 @@ export const codexBuilder = {
         const sandboxArgs = ensureSandboxFlags(extra);
         const args = ["exec", ...sandboxArgs];
         if (req.model) {
-            const resolved = resolveModel(req.model, "codex", profile.modelAliases, profile.globalModelAliases);
+            const resolved = resolveDispatchModel(req, profile, "codex");
             args.push("--model", resolved);
         }
         // JSONL event stream on stdout — the codex result extractor's input.

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

@@ -12,22 +12,12 @@
  * `HARNESS_REGISTRY` registers. Dispatch-only: no native session-log reader or
  * config importer yet.
  */
+import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 import { codexBuilder } from "./agent-builder.js";
 import { codexResultExtractor } from "./result-extractor.js";
 export { codexBuilder, codexResumeArgs, writeCodexOutputSchemaFile } from "./agent-builder.js";
 export { codexResultExtractor } from "./result-extractor.js";
-function caps(c) {
-    return {
-        sessionLogs: false,
-        agentDispatch: false,
-        detection: false,
-        configImport: false,
-        runtimeIdentity: false,
-        v1Migration: false,
-        ...c,
-    };
-}
 /**
  * OpenAI Codex CLI.
  *
@@ -45,8 +35,7 @@ export class CodexHarness extends BaseHarness {
     // `--output-schema <file>` enforces a caller-supplied JSON schema natively.
     structuredOutput = "native-schema";
     // No flag-shaped resume: codex resume is the `exec resume <id>` SUBCOMMAND
-    // chain (see `codexResumeArgs` in ./agent-builder.ts), which the flag-shaped
-    // `HarnessResumeSupport` seam deliberately does not force-fit.
+    // chain (see `codexResumeArgs` in ./agent-builder.ts).
     // Presence flag: CODEX_SANDBOX is stamped only on processes codex itself
     // spawns inside its sandbox, so it genuinely means "running under codex" —
     // but its VALUE (e.g. "seatbelt") is a sandbox mode, not a session id, so it

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

@@ -12,9 +12,8 @@
  *   copilot -p "<prompt>" --allow-all-tools
  *
  * with `--output-format json` for structured output, `--model <m>` for model
- * selection, and `--resume <id>` for resume (resume is registry-side —
- * `AkmHarness.resume` — not built here because `AgentDispatchRequest` carries
- * no session id).
+ * selection, and `--resume <id>` for resume (not built here because
+ * `AgentDispatchRequest` carries no session id).
  *
  * Platform-specific mapping decisions (all localized here, per the adapter
  * contract):
@@ -40,12 +39,13 @@
  *   programmatic mode Copilot then denies unapproved tool calls, which is the
  *   conservative failure mode.
  *
- * NOT registered anywhere: `builders.ts` / `harnesses/index.ts` wiring is a
- * follow-up integration task. Exported standalone so that task only adds a
- * registry entry.
+ * Registered: `copilotBuilder` is `CopilotHarness.agentBuilder`
+ * (`./index.ts`), one of the ten harnesses `HARNESS_REGISTRY` constructs
+ * (`harnesses/index.ts`); `agent/builders.ts` derives `BUILTIN_BUILDERS` from
+ * that registry, so this builder is reachable under the `"copilot"` platform
+ * name without any further wiring.
  */
-import { assertNotFlag } from "../../agent/builder-shared.js";
-import { resolveModel } from "../../agent/model-aliases.js";
+import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const COPILOT_PLATFORM = "copilot";
 /**
@@ -94,7 +94,7 @@ export const copilotBuilder = {
         assertNotFlag(req.model, "model");
         const args = [...profile.args];
         if (req.model) {
-            const resolved = resolveModel(req.model, COPILOT_PLATFORM, profile.modelAliases, profile.globalModelAliases);
+            const resolved = resolveDispatchModel(req, profile, COPILOT_PLATFORM);
             args.push("--model", resolved);
         }
         if (req.tools) {

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

@@ -13,22 +13,12 @@
  * (`copilot -p …`); the cloud "Copilot coding agent" is the plan's
  * cloud-delegate pattern and is a separate, future descriptor.
  */
+import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 import { copilotBuilder } from "./agent-builder.js";
 import { copilotResultExtractor } from "./result-extractor.js";
 export { COPILOT_PLATFORM, copilotBuilder } from "./agent-builder.js";
 export { copilotResultExtractor } from "./result-extractor.js";
-function caps(c) {
-    return {
-        sessionLogs: false,
-        agentDispatch: false,
-        detection: false,
-        configImport: false,
-        runtimeIdentity: false,
-        v1Migration: false,
-        ...c,
-    };
-}
 /**
  * GitHub Copilot CLI (local headless CLI, not the cloud coding agent).
  *
@@ -46,8 +36,6 @@ export class CopilotHarness extends BaseHarness {
     // `--output-format json` emits a documented JSON envelope akm parses, then
     // validates against the node schema ⇒ native-json tier.
     structuredOutput = "native-json";
-    // `copilot --resume <sessionId>` replays a previous session.
-    resume = { flag: "--resume", takesSessionId: true };
     // Session-id env marker only. The matrix's other candidates (GH_TOKEN,
     // bare COPILOT_* presence vars) are credential/presence flags that would
     // stamp identity onto manual runs, so they are deliberately NOT registered

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

@@ -12,9 +12,7 @@
  *   gemini -p "<prompt>"
  *
  * with `--output-format json` for structured output, `--model <m>` for model
- * selection, and `--resume <id>` for resume. Resume is registry-side
- * (`AkmHarness.resume` — Gemini's resume IS flag-shaped, so the shared
- * `HarnessResumeSupport` seam covers it); it is not built here because
+ * selection, and `--resume <id>` for resume; resume is not built here because
  * `AgentDispatchRequest` carries no session id. The `GEMINI_CLI=1` identity
  * env marker is likewise registry-side (`AkmHarness.identityEnv` /
  * `agent-identity.ts`), not a builder concern.
@@ -45,12 +43,13 @@
  *   `gemini -p "<p>"`; autonomy flags (`--yolo`, `--approval-mode`) belong in
  *   `profile.args` where the operator opts in explicitly.
  *
- * NOT registered anywhere: `builders.ts` / `harnesses/index.ts` wiring is a
- * follow-up integration task. Exported standalone so that task only adds a
- * registry entry.
+ * Registered: `geminiBuilder` is `GeminiHarness.agentBuilder` (`./index.ts`),
+ * one of the ten harnesses `HARNESS_REGISTRY` constructs
+ * (`harnesses/index.ts`); `agent/builders.ts` derives `BUILTIN_BUILDERS` from
+ * that registry, so this builder is reachable under the `"gemini"` platform
+ * name without any further wiring.
  */
-import { assertNotFlag } from "../../agent/builder-shared.js";
-import { resolveModel } from "../../agent/model-aliases.js";
+import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const GEMINI_PLATFORM = "gemini";
 /**
@@ -99,7 +98,7 @@ export const geminiBuilder = {
         assertNotFlag(req.model, "model");
         const args = [...profile.args];
         if (req.model) {
-            const resolved = resolveModel(req.model, GEMINI_PLATFORM, profile.modelAliases, profile.globalModelAliases);
+            const resolved = resolveDispatchModel(req, profile, GEMINI_PLATFORM);
             args.push("--model", resolved);
         }
         if (req.tools) {

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

@@ -12,22 +12,12 @@
  * that `HARNESS_REGISTRY` registers. Dispatch-only: no native session-log
  * reader or config importer yet.
  */
+import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 import { geminiBuilder } from "./agent-builder.js";
 import { geminiResultExtractor } from "./result-extractor.js";
 export { GEMINI_PLATFORM, geminiBuilder } from "./agent-builder.js";
 export { geminiResultExtractor } from "./result-extractor.js";
-function caps(c) {
-    return {
-        sessionLogs: false,
-        agentDispatch: false,
-        detection: false,
-        configImport: false,
-        runtimeIdentity: false,
-        v1Migration: false,
-        ...c,
-    };
-}
 /**
  * Gemini CLI.
  *
@@ -45,8 +35,6 @@ export class GeminiHarness extends BaseHarness {
     // `--output-format json` emits a documented JSON envelope akm parses, then
     // validates against the node schema ⇒ native-json tier.
     structuredOutput = "native-json";
-    // `gemini --resume <id>` replays a previous session.
-    resume = { flag: "--resume", takesSessionId: true };
     // The matrix's identity marker: Gemini CLI stamps GEMINI_CLI=1 only on
     // processes it spawns, so it genuinely means "running under gemini" (it is
     // not a user-profile config var) — but its VALUE ("1") is a bare flag, not

package/dist/integrations/harnesses/ids.js

@@ -0,0 +1,24 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
+export const HARNESS_ID_TABLE = [
+    { id: "opencode", agentDispatch: true },
+    { id: "claude", agentDispatch: true },
+    { id: "opencode-sdk", agentDispatch: true },
+    { id: "codex", agentDispatch: true },
+    { id: "copilot", agentDispatch: true },
+    { id: "pi", agentDispatch: true },
+    { id: "gemini", agentDispatch: true },
+    { id: "aider", agentDispatch: true },
+    { id: "amazonq", agentDispatch: true },
+    { id: "openhands", agentDispatch: true },
+];
+/**
+ * Canonical, ordered list of valid harness / platform ids — the
+ * dependency-free counterpart of `./index.ts`'s `VALID_HARNESS_IDS` (which
+ * remains the barrel's own derivation for its own consumers). Both are
+ * asserted equal at `HARNESS_REGISTRY` construction time.
+ */
+export const VALID_HARNESS_IDS = Object.freeze(HARNESS_ID_TABLE.map((h) => h.id));
+/** Harness ids whose `capabilities.agentDispatch` is `true`. */
+export const HARNESS_AGENT_DISPATCH_IDS = new Set(HARNESS_ID_TABLE.filter((h) => h.agentDispatch).map((h) => h.id));

package/dist/integrations/harnesses/index.js

@@ -12,10 +12,6 @@
  * 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).
- *
- * Implementations (session-log readers, agent profiles) are migrated under each
- * harness in #563/#564; this step only owns ids + capability membership and
- * wires the existing call sites to consult it (behaviour-preserving).
  */
 import { AiderHarness } from "./aider/index.js";
 import { AmazonqHarness } from "./amazonq/index.js";
@@ -23,6 +19,7 @@ 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
@@ -33,6 +30,8 @@ import { OpencodeHarness } from "./opencode/index.js";
 import { OpencodeSdkHarness } from "./opencode-sdk/harness.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
@@ -48,9 +47,9 @@ import { PiHarness } from "./pi/index.js";
 // Order is significant: VALID_HARNESS_IDS derives from this array and feeds the
 // committed JSON-schema enum order. The original [opencode, claude,
 // opencode-sdk] prefix is preserved so the pre-unification portion of the
-// generated schema enum does not reorder (#562); the seven P2 harness adapters
-// (plan §"Capability matrix") are appended after it, which extends the enum
-// additively (schemas/akm-config.json is regenerated in lockstep).
+// generated schema enum does not reorder; the seven P2 harness adapters are
+// appended after it, which extends the enum additively (schemas/akm-config.json
+// is regenerated in lockstep).
 export const HARNESS_REGISTRY = Object.freeze([
     new OpencodeHarness(),
     new ClaudeHarness(),
@@ -63,6 +62,23 @@ 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 canonical id. */
 export const HARNESS_BY_ID = new Map(HARNESS_REGISTRY.map((h) => [h.id, h]));
 /**
@@ -82,12 +98,17 @@ const HARNESS_BY_ANY_ID = (() => {
 })();
 /**
  * Canonical, ordered list of valid harness / platform ids. The Zod
- * `AgentPlatformSchema` enum, the `AgentProfileConfig` platform union, and
+ * `AgentPlatformSchema` enum, the agent-engine platform union, and
  * setup's `DetectedHarness` union all derive from this so they cannot drift.
  */
 export const VALID_HARNESS_IDS = Object.freeze(HARNESS_REGISTRY.map((h) => h.id));
-/** Harnesses that expose readable native session logs. */
-export const SESSION_LOG_HARNESSES = HARNESS_REGISTRY.filter((h) => h.capabilities.sessionLogs);
+/**
+ * Harnesses that expose readable native session logs. Narrowed via the
+ * {@link isSessionLogHarness} type-predicate (rather than a plain boolean
+ * callback) so `sessionLogProvider` is known-present on every element — see
+ * that function's doc comment for why a plain predicate doesn't narrow here.
+ */
+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);
 /** Harnesses that can import an existing harness config into akm. */
@@ -112,29 +133,6 @@ export function getHarness(id) {
 export function normalizeHarnessId(id) {
     return HARNESS_BY_ANY_ID.get(id)?.id ?? id;
 }
-/**
- * Resolve a legacy v1 agent-profile name to its v2 platform id (#566).
- *
- * v1 agent profiles never carried an explicit `platform`; it had to be inferred
- * from the profile name. This is the SINGLE registry-backed resolver that
- * replaces both the old standalone `guessAgentPlatform()` in config-migration
- * and the `name.includes("claude") ? "claude" : "opencode"` heuristic in setup.
- * Each harness owns its own `matchesV1ProfileName()`; an unknown name matches no
- * harness and returns `undefined`, so the caller drops it instead of silently
- * defaulting to `'opencode'`.
- *
- * Harnesses are consulted most-specific-id-first (longest id wins) so a
- * decorated name like `"opencode-sdk-fast"` resolves to `'opencode-sdk'` rather
- * than being over-matched by OpenCode's `"opencode"` prefix.
- */
-const V1_RESOLUTION_ORDER = [...HARNESS_REGISTRY].sort((a, b) => b.id.length - a.id.length);
-export function v1ProfilePlatform(name) {
-    for (const h of V1_RESOLUTION_ORDER) {
-        if (h.matchesV1ProfileName(name))
-            return h.id;
-    }
-    return undefined;
-}
 /**
  * Default agent-profile name for a detected harness id (#566).
  *

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

@@ -14,8 +14,7 @@
  * pre-migration `opencodeBuilder`. The builder's `platform` stays `'opencode'`
  * (the canonical harness id).
  */
-import { assertNotFlag } from "../../agent/builder-shared.js";
-import { resolveModel } from "../../agent/model-aliases.js";
+import { assertNotFlag, resolveDispatchModel } from "../../agent/builder-shared.js";
 /**
  * OpenCode builder.
  * Command shape: opencode run [--system-prompt "..."] [--model <m>] "<prompt>"
@@ -28,13 +27,32 @@ export const opencodeBuilder = {
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");
-        const args = [...profile.args]; // starts with ["run"]
+        let configuredModel;
+        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") {
+                    configuredModel = profile.args[index + 1];
+                    index += 1;
+                }
+                else if (arg.startsWith("--model=")) {
+                    configuredModel = arg.slice("--model=".length);
+                }
+                else {
+                    args.push(arg);
+                }
+            }
+        }
         if (req.systemPrompt) {
             args.push("--system-prompt", req.systemPrompt);
         }
         if (req.model) {
-            const resolved = resolveModel(req.model, "opencode", profile.modelAliases, profile.globalModelAliases);
-            args.push("--model", resolved);
+            const resolved = resolveDispatchModel(req, profile, "opencode");
+            const provider = configuredModel?.split("/", 1)[0];
+            args.push("--model", provider && !resolved.includes("/") ? `${provider}/${resolved}` : resolved);
         }
         args.push("--");
         args.push(req.prompt);

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

@@ -15,9 +15,7 @@
  */
 import fs from "node:fs";
 import path from "node:path";
-function homeDir() {
-    return process.env.HOME ?? process.env.USERPROFILE ?? "";
-}
+import { homeDir } from "../shared.js";
 /**
  * Imports LLM config from an OpenCode installation.
  *

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

@@ -1,23 +1,13 @@
 // This Source Code Form is subject to the terms of the Mozilla Public
 // 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/.
+import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 import { opencodeBuilder } from "./agent-builder.js";
 import { OpenCodeProvider } from "./session-log.js";
 export { opencodeBuilder } from "./agent-builder.js";
 export { openCodeImporter } from "./config-import.js";
 export { OpenCodeProvider } from "./session-log.js";
-function caps(c) {
-    return {
-        sessionLogs: false,
-        agentDispatch: false,
-        detection: false,
-        configImport: false,
-        runtimeIdentity: false,
-        v1Migration: false,
-        ...c,
-    };
-}
 /**
  * OpenCode.
  *
@@ -30,10 +20,6 @@ export class OpencodeHarness extends BaseHarness {
     // Home-relative config dir scanned by `akm setup` (#567). OpenCode has a
     // session-log provider, so offering it as a stash source is functional.
     setupDetectionDir = ".config/opencode";
-    // Decorated v1 profile names like "opencode-fast" still belong to OpenCode.
-    // `v1ProfilePlatform()` resolves most-specific-id-first, so "opencode-sdk-*"
-    // is claimed by OpencodeSdkHarness before this prefix can over-match it.
-    v1ProfilePrefixes = ["opencode"];
     agentBuilder = opencodeBuilder;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // This entry is the CLI spawn path (`opencode run …`): akm launches the
@@ -44,8 +30,6 @@ export class OpencodeHarness extends BaseHarness {
     // engine uses the prompt-injected schema + embedded-JSON extraction tier
     // (the matrix's "via prompt+validate"). The SDK entry is native-json.
     structuredOutput = "none";
-    // `opencode run --session <id>` continues a previous session.
-    resume = { flag: "--session", takesSessionId: true };
     // Session-id env marker for run attribution.
     identityEnv = ["OPENCODE_SESSION_ID"];
     sessionLogProvider = () => new OpenCodeProvider();
@@ -55,6 +39,5 @@ export class OpencodeHarness extends BaseHarness {
         detection: true,
         configImport: true,
         runtimeIdentity: true,
-        v1Migration: true,
     });
 }