akm-cli 0.9.0-rc.0 → 0.9.0-rc.2

package/dist/integrations/harnesses/index.js

@@ -17,9 +17,22 @@
  * 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";
 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 { OpencodeHarness } from "./opencode/index.js";
-import { OpencodeSdkHarness } from "./opencode-sdk/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 { OpenhandsHarness } from "./openhands/index.js";
+import { PiHarness } from "./pi/index.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
@@ -33,13 +46,22 @@ import { OpencodeSdkHarness } from "./opencode-sdk/index.js";
  * `z.enum(...)`, and the `platform` union all need the literal types.
  */
 // Order is significant: VALID_HARNESS_IDS derives from this array and feeds the
-// committed JSON-schema enum order. Kept as [opencode, claude, opencode-sdk] to
-// match the pre-unification VALID_HARNESS_IDS so the generated schema does not
-// drift (behaviour-preserving, #562).
+// 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).
 export const HARNESS_REGISTRY = Object.freeze([
     new OpencodeHarness(),
     new ClaudeHarness(),
     new OpencodeSdkHarness(),
+    new CodexHarness(),
+    new CopilotHarness(),
+    new PiHarness(),
+    new GeminiHarness(),
+    new AiderHarness(),
+    new AmazonqHarness(),
+    new OpenhandsHarness(),
 ]);
 /** Lookup by canonical id. */
 export const HARNESS_BY_ID = new Map(HARNESS_REGISTRY.map((h) => [h.id, h]));
@@ -60,7 +82,7 @@ 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));
@@ -90,29 +112,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>"
@@ -33,7 +32,7 @@ export const opencodeBuilder = {
             args.push("--system-prompt", req.systemPrompt);
         }
         if (req.model) {
-            const resolved = resolveModel(req.model, "opencode", profile.modelAliases, profile.globalModelAliases);
+            const resolved = resolveDispatchModel(req, profile, "opencode");
             args.push("--model", resolved);
         }
         args.push("--");

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

@@ -1,24 +1,9 @@
 // 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/.
-/**
- * OpenCode harness (#564).
- *
- * Per-harness barrel that gathers the OpenCode integration surfaces previously
- * scattered across the codebase:
- *   - session-log reader     → ./session-log.ts   (OpenCodeProvider)
- *   - agent command builder  → ./agent-builder.ts (opencodeBuilder)
- *   - config importer        → ./config-import.ts (openCodeImporter)
- *
- * It also defines {@link OpencodeHarness}, the {@link AkmHarness} descriptor
- * that `HARNESS_REGISTRY` registers.
- *
- * id normalization: OpenCode's canonical id (`'opencode'`) is also its runtime
- * identity and session-log provider name — there is no historical split (unlike
- * Claude Code's 'claude' vs 'claude-code'), so no alias bridge is needed.
- */
 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";
@@ -29,7 +14,6 @@ function caps(c) {
         detection: false,
         configImport: false,
         runtimeIdentity: false,
-        v1Migration: false,
         ...c,
     };
 }
@@ -45,17 +29,26 @@ 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
+    // harness locally per unit ⇒ local-runner. (The SDK path is the separate
+    // `opencode-sdk` harness.)
+    pattern = "local-runner";
+    // The CLI path emits plain text — no JSON stream akm consumes — so the
+    // 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();
     capabilities = caps({
         sessionLogs: true,
         agentDispatch: true,
         detection: true,
         configImport: true,
         runtimeIdentity: true,
-        v1Migration: true,
     });
 }

package/dist/integrations/harnesses/opencode-sdk/harness.js

@@ -0,0 +1,60 @@
+// 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/.
+/**
+ * OpenCode SDK harness DESCRIPTOR (#564).
+ *
+ * This module is a dependency-graph LEAF: it imports only the harness base
+ * types (`../types`) and nothing from `core/config` or the SDK runner. Keeping
+ * the descriptor separate from the runtime runner (`./sdk-runner`, which pulls
+ * `core/config`) is load-bearing: `HARNESS_REGISTRY` in `../index.ts` imports
+ * this class from HERE, not from the per-harness barrel (`./index.ts`). The
+ * barrel additionally re-exports `runOpencodeSdk`/`closeServer` from
+ * `./sdk-runner`; that re-export makes the barrel transitively depend on
+ * `core/config`, and `core/config/config-types` derives `VALID_HARNESS_IDS`
+ * back from `../index.ts`. If the registry imported the class through the
+ * barrel, that cycle would evaluate `../index.ts` (and `new
+ * OpencodeSdkHarness()`) while the barrel — and hence this class binding — was
+ * still initializing, throwing a temporal-dead-zone "Cannot access
+ * 'OpencodeSdkHarness' before initialization" whenever the barrel is the first
+ * module loaded in a fresh graph (e.g. the workflow-exec subprocess entry).
+ * Importing the descriptor from this leaf keeps the registry a config-leaf and
+ * breaks the cycle.
+ */
+import { BaseHarness } from "../types.js";
+function caps(c) {
+    return {
+        sessionLogs: false,
+        agentDispatch: false,
+        detection: false,
+        configImport: false,
+        runtimeIdentity: false,
+        ...c,
+    };
+}
+/**
+ * OpenCode SDK (embedded-SDK dispatch path).
+ *
+ * Dispatch-only: no native session logs, but detected at setup.
+ */
+export class OpencodeSdkHarness extends BaseHarness {
+    id = "opencode-sdk";
+    displayName = "OpenCode SDK";
+    aliases = [];
+    // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
+    // Embedded-SDK dispatch on this machine ⇒ local-runner (the matrix's
+    // "local (sdk/cli)" row, SDK half).
+    pattern = "local-runner";
+    // `session.prompt` returns structured SDK events/messages; akm extracts the
+    // final message then validates against the node schema ⇒ native-json tier.
+    structuredOutput = "native-json";
+    // No `resume` flag: session reuse is programmatic — the SDK session id is
+    // stored opportunistically on the unit row and passed back to
+    // `session.prompt`, not replayed via a CLI flag.
+    // No `identityEnv`: the SDK runs in-process; it does not mark a child
+    // process environment with a session id of its own.
+    capabilities = caps({
+        agentDispatch: true,
+        detection: true,
+    });
+}

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

@@ -5,10 +5,15 @@
  * OpenCode SDK harness (#564).
  *
  * Per-harness barrel for the SDK-mode dispatch path:
+ *   - descriptor → ./harness.ts ({@link OpencodeSdkHarness}, the
+ *     {@link AkmHarness} that `HARNESS_REGISTRY` registers)
  *   - agent runner → ./sdk-runner.ts (runOpencodeSdk)
  *
- * It also defines {@link OpencodeSdkHarness}, the {@link AkmHarness} descriptor
- * that `HARNESS_REGISTRY` registers.
+ * The descriptor lives in its own leaf module (`./harness.ts`) rather than
+ * here so that the registry can import the class WITHOUT pulling in
+ * `./sdk-runner` (and its `core/config` dependency) — see the header of
+ * `./harness.ts` for the temporal-dead-zone cycle this avoids. This barrel is
+ * the runtime entry point that re-exports both.
  *
  * Unlike the CLI harnesses, the SDK path has no native session logs of its own
  * (`capabilities.sessionLogs = false`): it dispatches via the embedded
@@ -16,34 +21,5 @@
  * session files. It is still detected at setup and migrated from v1 profile
  * names. Canonical id is `'opencode-sdk'` with no alias.
  */
-import { BaseHarness } from "../types.js";
+export { OpencodeSdkHarness } from "./harness.js";
 export { closeServer, runOpencodeSdk } from "./sdk-runner.js";
-function caps(c) {
-    return {
-        sessionLogs: false,
-        agentDispatch: false,
-        detection: false,
-        configImport: false,
-        runtimeIdentity: false,
-        v1Migration: false,
-        ...c,
-    };
-}
-/**
- * OpenCode SDK (embedded-SDK dispatch path).
- *
- * Dispatch-only: no native session logs, but detected at setup and migrated
- * from v1 profile names.
- */
-export class OpencodeSdkHarness extends BaseHarness {
-    id = "opencode-sdk";
-    displayName = "OpenCode SDK";
-    aliases = [];
-    // Decorated v1 profile names like "opencode-sdk-fast" belong to the SDK path.
-    v1ProfilePrefixes = ["opencode-sdk"];
-    capabilities = caps({
-        agentDispatch: true,
-        detection: true,
-        v1Migration: true,
-    });
-}