akm-cli 0.9.1 → 0.9.2-alpha.1

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

@@ -68,6 +68,7 @@
  * `structuredOutput: "none"` alongside it (`./index.ts`).
  */
 import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const AIDER_PLATFORM = "aider";
 /**
@@ -94,6 +95,13 @@ function buildMessagePayload(req) {
  */
 export const aiderBuilder = {
     platform: AIDER_PLATFORM,
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: AIDER_PLATFORM,
+        personaChannel: "prompt",
+        tools: "none",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

@@ -26,7 +26,6 @@ export { aiderResultExtractor } from "./result-extractor.js";
 export class AiderHarness extends BaseHarness {
     id = "aider";
     displayName = "Aider";
-    aliases = [];
     agentBuilder = aiderBuilder;
     resultExtractor = aiderResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────

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

@@ -63,6 +63,7 @@
  * (`./index.ts`).
  */
 import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const AMAZONQ_PLATFORM = "amazonq";
 /**
@@ -107,6 +108,13 @@ function buildPromptPayload(req) {
  */
 export const amazonqBuilder = {
     platform: AMAZONQ_PLATFORM,
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: AMAZONQ_PLATFORM,
+        personaChannel: "prompt",
+        tools: "flat",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

@@ -27,7 +27,6 @@ export { amazonqResultExtractor, stripTerminalFraming } from "./result-extractor
 export class AmazonqHarness extends BaseHarness {
     id = "amazonq";
     displayName = "Amazon Q Developer CLI";
-    aliases = [];
     agentBuilder = amazonqBuilder;
     resultExtractor = amazonqResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────

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

@@ -35,6 +35,7 @@
  * The builder's `platform` stays `'claude'` (the canonical harness id).
  */
 import { assertNotFlag, normalizeTools, resolveDispatchModel, } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /**
  * Assemble the positional prompt: the task prompt and — when a schema is
  * requested — the same schema directive the workflow engine's prompt assembly
@@ -51,17 +52,29 @@ function buildPromptPayload(req) {
 /**
  * Claude Code builder.
  * Command shape:
- *   claude [--system-prompt "..."] [--model <m>] [--allowedTools <t>]
+ *   claude [--agent <name>] [--system-prompt "..."] [--model <m>] [--allowedTools <t>]
  *          [--output-format json] --print -- "<prompt (+ schema directive)>"
  *
  * --print switches Claude Code to non-interactive captured output mode.
  */
 export const claudeBuilder = {
     platform: "claude",
+    personaChannel: "native",
+    lower: createAgentRequestLowerer({
+        adapter: "claude",
+        personaChannel: "native",
+        nativeAgentSelector: true,
+        tools: "all",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");
+        assertNotFlag(req.agent, "agent");
         const args = [...profile.args];
+        if (req.agent) {
+            args.push("--agent", req.agent);
+        }
         if (req.systemPrompt) {
             args.push("--system-prompt", req.systemPrompt);
         }

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

@@ -13,14 +13,11 @@ export { ClaudeCodeProvider } from "./session-log.js";
 /**
  * Claude Code.
  *
- * Canonical id is `'claude'`; `'claude-code'` is the runtime/session-log
- * identity and is registered as an alias so both directions round-trip.
+ * `claude` is the sole runtime and persisted id.
  */
 export class ClaudeHarness extends BaseHarness {
     id = "claude";
     displayName = "Claude Code";
-    aliases = ["claude-code"];
-    runtimeId = "claude-code";
     // Home-relative config dir scanned by `akm setup` (#567). Claude Code has a
     // session-log provider, so offering it as a stash source is functional.
     setupDetectionDir = ".claude";
@@ -50,6 +47,5 @@ export class ClaudeHarness extends BaseHarness {
         agentDispatch: true,
         detection: true,
         configImport: true,
-        runtimeIdentity: true,
     });
 }

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

@@ -80,7 +80,7 @@ function parseClaudeEvent(entry, sessionId, filePath, fallbackTsMs) {
     if (!text || text.length < 1)
         return undefined;
     return {
-        harness: "claude-code",
+        harness: "claude",
         text,
         ts,
         sessionId,
@@ -91,43 +91,13 @@ function parseClaudeEvent(entry, sessionId, filePath, fallbackTsMs) {
 /**
  * Claude Code native session-log reader.
  *
- * id-normalization note (#563): the canonical harness id is `'claude'`, but
- * the provider's `name` — which is STAMPED onto every {@link SessionEvent} /
- * {@link SessionRef} (`harness: this.name`), used as the extracted-session
- * dedup key, and embedded in `session:<harness>:<id>` proposal refs — stays
- * `'claude-code'` (the harness runtimeId). Changing it would silently break
- * round-tripping of already-persisted session-tracking rows and refs. Registry
- * lookups normalize `'claude-code'` → `'claude'` via the #562 bridge
- * (`getHarness`), and the `--type` flag accepts both, so the canonical id and
- * the persisted runtime string coexist without drift.
+ * Events, refs, extraction keys, and the harness registry all use `claude`.
  */
 export class ClaudeCodeProvider extends AbstractSessionLogProvider {
-    // Runtime identity (NOT the canonical id) — see class doc. Equals
-    // HARNESS_BY_ID.get("claude").runtimeId.
-    name = "claude-code";
+    name = "claude";
     availabilityRoot() {
         return claudeProjectsDir();
     }
-    *readEvents(input) {
-        try {
-            for (const jsonlPath of this.#walkJsonl(claudeProjectsDir())) {
-                const stat = fs.statSync(jsonlPath);
-                if (stat.mtimeMs < input.sinceMs)
-                    continue;
-                const lines = fs.readFileSync(jsonlPath, "utf8").split("\n").filter(Boolean);
-                yield* this.logLineEvents({
-                    lines,
-                    filePath: jsonlPath,
-                    fallbackTsMs: stat.mtimeMs,
-                    selectText: (entry) => entry?.message?.content ?? entry?.content ?? "",
-                    selectSessionId: (entry) => entry?.session_id,
-                });
-            }
-        }
-        catch {
-            return;
-        }
-    }
     listSessions(input = {}) {
         const root = input.location ?? claudeProjectsDir();
         return this.listSessionsFromFiles({

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

@@ -56,6 +56,7 @@ import { mkdtempSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { assertNotFlag, resolveDispatchModel } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /**
  * Write a node's JSON Schema to a fresh temp file for `--output-schema`.
  *
@@ -105,6 +106,13 @@ function ensureSandboxFlags(base) {
  */
 export const codexBuilder = {
     platform: "codex",
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: "codex",
+        personaChannel: "prompt",
+        tools: "none",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

@@ -26,7 +26,6 @@ export { codexResultExtractor } from "./result-extractor.js";
 export class CodexHarness extends BaseHarness {
     id = "codex";
     displayName = "OpenAI Codex CLI";
-    aliases = [];
     agentBuilder = codexBuilder;
     resultExtractor = codexResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────

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

@@ -46,6 +46,7 @@
  * name without any further wiring.
  */
 import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const COPILOT_PLATFORM = "copilot";
 /**
@@ -89,6 +90,13 @@ function buildPromptPayload(req) {
  */
 export const copilotBuilder = {
     platform: COPILOT_PLATFORM,
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: COPILOT_PLATFORM,
+        personaChannel: "prompt",
+        tools: "flat",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

@@ -27,7 +27,6 @@ export { copilotResultExtractor } from "./result-extractor.js";
 export class CopilotHarness extends BaseHarness {
     id = "copilot";
     displayName = "GitHub Copilot CLI";
-    aliases = [];
     agentBuilder = copilotBuilder;
     resultExtractor = copilotResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────

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

@@ -50,6 +50,7 @@
  * name without any further wiring.
  */
 import { assertNotFlag, resolveDispatchModel, } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /** Canonical harness/platform id used for model-alias resolution. */
 export const GEMINI_PLATFORM = "gemini";
 /**
@@ -93,6 +94,13 @@ function buildPromptPayload(req) {
  */
 export const geminiBuilder = {
     platform: GEMINI_PLATFORM,
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: GEMINI_PLATFORM,
+        personaChannel: "prompt",
+        tools: "flat",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

@@ -26,7 +26,6 @@ export { geminiResultExtractor } from "./result-extractor.js";
 export class GeminiHarness extends BaseHarness {
     id = "gemini";
     displayName = "Gemini CLI";
-    aliases = [];
     agentBuilder = geminiBuilder;
     resultExtractor = geminiResultExtractor;
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────

package/dist/integrations/harnesses/index.js

@@ -79,23 +79,8 @@ HARNESS_REGISTRY.forEach((h, i) => {
             `does not match HARNESS_REGISTRY[${i}] (${h.id}, agentDispatch=${h.capabilities.agentDispatch}) — update ids.ts to match.`);
     }
 });
-/** Lookup by canonical id. */
+/** Lookup by the one supported harness id. */
 export const HARNESS_BY_ID = new Map(HARNESS_REGISTRY.map((h) => [h.id, h]));
-/**
- * Lookup by canonical id OR any alias OR runtime id — the normalization bridge
- * resolver. Both 'claude' and 'claude-code' map to the Claude harness.
- */
-const HARNESS_BY_ANY_ID = (() => {
-    const m = new Map();
-    for (const h of HARNESS_REGISTRY) {
-        m.set(h.id, h);
-        if (h.runtimeId)
-            m.set(h.runtimeId, h);
-        for (const a of h.aliases)
-            m.set(a, h);
-    }
-    return m;
-})();
 /**
  * Canonical, ordered list of valid harness / platform ids. The Zod
  * `AgentPlatformSchema` enum, the agent-engine platform union, and
@@ -116,22 +101,10 @@ export const CONFIG_IMPORTER_HARNESSES = HARNESS_REGISTRY.filter((h) => h.capabi
 /** Harnesses that participate in `akm setup` detection. */
 export const DETECTION_HARNESSES = HARNESS_REGISTRY.filter((h) => h.capabilities.detection);
 /**
- * Resolve any id form (canonical id, alias, or runtime id) to the harness
- * descriptor, or `undefined` if unknown.
+ * Resolve an exact harness id to its descriptor, or `undefined` if unknown.
  */
 export function getHarness(id) {
-    return HARNESS_BY_ANY_ID.get(id);
-}
-/**
- * id normalization bridge — alias → canonical.
- *
- * Maps any known alias/runtime id to its canonical persisted id (e.g.
- * 'claude-code' → 'claude'). Unknown ids pass through unchanged so callers can
- * still validate them. This is what keeps existing persisted configs that say
- * 'claude-code' working against the canonical 'claude' registry.
- */
-export function normalizeHarnessId(id) {
-    return HARNESS_BY_ANY_ID.get(id)?.id ?? id;
+    return HARNESS_BY_ID.get(id);
 }
 /**
  * Default agent-profile name for a detected harness id (#566).
@@ -143,21 +116,8 @@ export function normalizeHarnessId(id) {
  * capable.
  */
 export function defaultProfileName(detected) {
-    const h = HARNESS_BY_ANY_ID.get(detected);
+    const h = HARNESS_BY_ID.get(detected);
     if (!h?.capabilities.agentDispatch)
         return undefined;
     return h.id;
 }
-/**
- * id normalization bridge — canonical → runtime identity.
- *
- * Maps a canonical id to the string a harness reports at runtime / in its
- * session logs (e.g. 'claude' → 'claude-code'). Used by workflow run
- * attribution and the session-logs provider name so the persisted runtime
- * identity stays stable. Falls back to the canonical id when the harness has no
- * distinct runtime identity.
- */
-export function denormalizeRuntimeIdentity(id) {
-    const h = HARNESS_BY_ANY_ID.get(id);
-    return h?.runtimeId ?? h?.id ?? id;
-}

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

@@ -15,19 +15,28 @@
  * (the canonical harness id).
  */
 import { assertNotFlag, resolveDispatchModel } from "../../agent/builder-shared.js";
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 /**
  * OpenCode builder.
- * Command shape: opencode run [--system-prompt "..."] [--model <m>] "<prompt>"
+ * Command shape: opencode run [--system-prompt "..."] [--agent <name>] [--model <m>] "<prompt>"
  *
  * Tool policy is omitted — opencode manages tool access through its own agent
  * config files, not via CLI flags.
  */
 export const opencodeBuilder = {
     platform: "opencode",
+    personaChannel: "native",
+    lower: createAgentRequestLowerer({
+        adapter: "opencode",
+        personaChannel: "native",
+        nativeAgentSelector: true,
+        tools: "none",
+        outputSchema: false,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");
-        let configuredModel;
+        assertNotFlag(req.agent, "agent");
         const args = req.model ? [] : [...profile.args];
         if (req.model) {
             for (let index = 0; index < profile.args.length; index += 1) {
@@ -35,13 +44,9 @@ export const opencodeBuilder = {
                 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 {
+                else if (!arg.startsWith("--model=")) {
                     args.push(arg);
                 }
             }
@@ -49,10 +54,12 @@ export const opencodeBuilder = {
         if (req.systemPrompt) {
             args.push("--system-prompt", req.systemPrompt);
         }
+        if (req.agent) {
+            args.push("--agent", req.agent);
+        }
         if (req.model) {
             const resolved = resolveDispatchModel(req, profile, "opencode");
-            const provider = configuredModel?.split("/", 1)[0];
-            args.push("--model", provider && !resolved.includes("/") ? `${provider}/${resolved}` : resolved);
+            args.push("--model", resolved);
         }
         args.push("--");
         args.push(req.prompt);

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

@@ -16,7 +16,6 @@ export { OpenCodeProvider } from "./session-log.js";
 export class OpencodeHarness extends BaseHarness {
     id = "opencode";
     displayName = "OpenCode";
-    aliases = [];
     // 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";
@@ -38,6 +37,5 @@ export class OpencodeHarness extends BaseHarness {
         agentDispatch: true,
         detection: true,
         configImport: true,
-        runtimeIdentity: true,
     });
 }