akm-cli 0.10.261012-beta → 0.10.261014-beta

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

@@ -2,42 +2,25 @@
 // 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/.
 /**
- * Which OpenCode major a binary is (#1049).
+ * Which OpenCode major an installed `opencode` binary is.
  *
- * akm drives two OpenCode majors through separate adapters. There is no config
- * field for the choice: the binary says which major it is. {@link resolveOpencodeBin}
- * picks the binary (the engine's own `bin`, else the newest OpenCode on PATH) and
+ * The opencode harness runs the installed binary through its CLI for both majors;
+ * the binary's major decides the flags (`./agent-builder.ts`). Plugin upgrades also
+ * ask it, to refresh a plugin cache with the major that owns it.
  * {@link detectOpencodeMajor} runs `<bin> --version` once per binary per process.
- *
- * - Major 1: OpenCode 1 adapters, plus a one-time warning recommending OpenCode 2.
- * - Major 2: OpenCode 2 adapters.
- * - Anything else, or a `--version` that fails or cannot be parsed: the newest
- *   adapters akm knows (OpenCode 2) and a one-time warning with the raw output.
- *   Detection never aborts; the dispatch reports whatever real error the binary
- *   produces.
- *
- * PATH lookups are memoized too: PATH does not change inside a process, and
- * every dispatch asks for the same one or two binaries.
  */
-import childProcess from "node:child_process";
 import { warnOnce } from "../../../core/warn.js";
-import { defaultWhich } from "../../agent/detect.js";
-import { OPENCODE_SDK_SERVER_BIN } from "../../agent/profiles.js";
+import { defaultWhich, probeVersion } from "../../agent/detect.js";
+/**
+ * The OpenCode CLI binary: the opencode harness runs it and asks it for its major,
+ * and plugin upgrades refresh OpenCode's plugin caches with it. akm's own runtime
+ * does not use it: it runs a binary of its own (`./runtime/binary.ts`).
+ */
+export const OPENCODE_BIN = "opencode";
 /** OpenCode 2's own alias for its binary; it can sit next to an OpenCode 1 `opencode` on PATH. */
-export const OPENCODE2_BIN = "opencode2";
+const OPENCODE2_BIN = "opencode2";
 const VERSION_TIMEOUT_MS = 30_000;
-const defaultProbe = (bin) => {
-    const result = childProcess.spawnSync(bin, ["--version"], {
-        encoding: "utf8",
-        env: process.env,
-        stdio: "pipe",
-        timeout: VERSION_TIMEOUT_MS,
-        killSignal: "SIGKILL",
-    });
-    if (result.error || result.status !== 0)
-        return undefined;
-    return (result.stdout ?? "").trim();
-};
+const defaultProbe = (bin) => probeVersion(bin, VERSION_TIMEOUT_MS);
 let probeOverride;
 const detected = new Map();
 const onPath = new Map();
@@ -47,48 +30,42 @@ export function _setOpencodeVersionProbeForTests(fake) {
     detected.clear();
     onPath.clear();
 }
-/** `which`, memoized for the process when it is the default lookup. */
-function lookup(bin, which) {
-    if (which)
-        return which(bin) ?? undefined;
+/** `which`, memoized for the process. */
+function lookup(bin) {
     if (!onPath.has(bin))
         onPath.set(bin, defaultWhich(bin));
     return onPath.get(bin);
 }
-/** The major in `opencode --version` output (`1.18.34`, `opencode v2.0.26`), or undefined when there is none. */
-export function parseOpencodeMajor(versionOutput) {
-    const match = versionOutput.match(/(\d+)\.\d+/);
+/**
+ * The major in `opencode --version` output (`1.18.34`, `opencode v2.0.26`), or
+ * undefined when the output is not an OpenCode version (another program's
+ * `--version`, such as `true (GNU coreutils) 9.7`).
+ */
+function parseOpencodeMajor(versionOutput) {
+    const match = versionOutput.trim().match(/^(?:opencode\s+)?v?(\d+)\.\d+(?:\.\d+)?(?:[-+.\w]*)$/im);
     return match ? Number(match[1]) : undefined;
 }
 /**
- * The binary an OpenCode engine runs: its own `bin` when it sets one, else the
- * most recent OpenCode on PATH (`opencode2` when present, else `opencode`).
+ * The binary plugin upgrade refreshes OpenCode 2's plugin cache with: the most
+ * recent OpenCode on PATH (`opencode2` when present, else `opencode`). The harness
+ * itself runs `opencode`, or the `bin` its config names.
  */
-export function resolveOpencodeBin(explicitBin, which) {
-    if (explicitBin)
-        return explicitBin;
-    return lookup(OPENCODE2_BIN, which) ? OPENCODE2_BIN : OPENCODE_SDK_SERVER_BIN;
+export function resolveOpencodeBin() {
+    return lookup(OPENCODE2_BIN) ? OPENCODE2_BIN : OPENCODE_BIN;
 }
 /** Detect the OpenCode major of `bin`: one `--version` run per binary per process. */
-export function detectOpencodeMajor(bin, options = {}) {
-    const path = lookup(bin, options.which) ?? bin;
+export function detectOpencodeMajor(bin) {
+    const path = lookup(bin) ?? bin;
     const cached = detected.get(path);
     if (cached)
         return cached;
-    const raw = (options.probe ?? probeOverride ?? defaultProbe)(path);
+    const raw = (probeOverride ?? defaultProbe)(path);
     const version = raw ?? "";
     const reportedMajor = raw === undefined ? undefined : parseOpencodeMajor(raw);
-    const major = reportedMajor === 1 ? 1 : 2;
     if (reportedMajor === 1) {
         warnOnce(`opencode-version:${path}`, `${path} is OpenCode ${version}. OpenCode 1 support continues, but upgrading to OpenCode 2 is recommended.`);
     }
-    else if (reportedMajor !== 2) {
-        warnOnce(`opencode-version:${path}`, raw === undefined
-            ? `Could not run \`${path} --version\`, so its OpenCode major is unknown; treating it as OpenCode 2.`
-            : `${path} reported an unrecognized OpenCode version (${JSON.stringify(raw)}); treating it as OpenCode 2.`);
-    }
     const info = {
-        major,
         ...(reportedMajor !== undefined ? { reportedMajor } : {}),
         version,
         runnable: raw !== undefined,
@@ -96,3 +73,7 @@ export function detectOpencodeMajor(bin, options = {}) {
     detected.set(path, info);
     return info;
 }
+/** Whether `bin` is OpenCode 2 or later: its CLI takes the flags the builder passes. A binary whose version cannot be read counts as OpenCode 1. */
+export function isOpencode2(bin) {
+    return (detectOpencodeMajor(bin).reportedMajor ?? 0) >= 2;
+}

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

@@ -1,43 +1,19 @@
 // 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/.
-/**
- * OpenHands CLI harness (P2 integration, plan §"The adapter contract").
- *
- * Per-harness barrel gathering the OpenHands integration surfaces:
- *   - agent command builder → ./agent-builder.ts    (openhandsBuilder)
- *   - result extractor      → ./result-extractor.ts (openhandsResultExtractor)
- *
- * It also defines {@link OpenhandsHarness}, the {@link AkmHarness} descriptor
- * 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 { openhandsBuilder } from "./agent-builder.js";
-import { openhandsResultExtractor } from "./result-extractor.js";
-export { OPENHANDS_MODEL_ENV, OPENHANDS_PLATFORM, openhandsBuilder } from "./agent-builder.js";
-export { openhandsResultExtractor } from "./result-extractor.js";
-/**
- * OpenHands CLI.
- *
- * Canonical id is `'openhands'`; no alias or distinct runtime identity.
- */
-export class OpenhandsHarness extends BaseHarness {
+/** The environment variable OpenHands reads its model from. */
+const MODEL_ENV = "LLM_MODEL";
+export class OpenhandsHarness {
     id = "openhands";
     displayName = "OpenHands";
-    agentBuilder = openhandsBuilder;
-    profile = { bin: "openhands", args: [], envPassthrough: ["LLM_MODEL", "LLM_API_KEY", "LLM_BASE_URL"] };
-    resultExtractor = openhandsResultExtractor;
-    // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
-    // No flag-shaped resume: per the matrix OpenHands resumes from workspace state, not a
-    // session-id flag. The extractor still captures a conversation id
-    // opportunistically; akm's `workflow_run_units` remains the durable source
-    // of truth.
-    // No `identityEnv`: the matrix lists OpenHands' identity markers as
-    // uncertain, and it stamps no session var onto child processes.
-    capabilities = caps({
-        agentDispatch: true,
-        detection: true,
-    });
+    profile = { bin: "openhands", args: [] };
+    systemPrompt = false;
+    nativeAgent = false;
+    confinable = false;
+    build({ bin, args }, req) {
+        const argv = [bin, ...args];
+        if (req.prompt !== undefined)
+            argv.push("--headless", `--task=${req.prompt}`);
+        return { argv, ...(req.model ? { env: { [MODEL_ENV]: req.model } } : {}) };
+    }
 }

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

@@ -2,39 +2,28 @@
 // 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/.
 /**
- * Pi coding-agent CLI harness (P2 integration, plan §"The adapter contract").
- *
- * Per-harness barrel gathering the Pi integration surfaces:
- *   - agent command builder → ./agent-builder.ts    (piBuilder)
- *   - result extractor      → ./result-extractor.ts (piResultExtractor)
- *
- * It also defines {@link PiHarness}, the {@link AkmHarness} descriptor that
- * `HARNESS_REGISTRY` registers. Dispatch-only: no native session-log reader or
- * config importer yet.
+ * Pi coding-agent CLI (`pi`). `-p` is its print mode, and it reads the message from
+ * piped stdin: as an argument a prompt that starts with `-`, `--` or `@` is taken as an
+ * option or a file include. The persona is appended to pi's own system prompt, which
+ * is the one that explains pi's tools.
  */
-import { caps } from "../shared.js";
-import { BaseHarness } from "../types.js";
-import { piBuilder } from "./agent-builder.js";
-import { piResultExtractor } from "./result-extractor.js";
-export { PI_PLATFORM, piBuilder } from "./agent-builder.js";
-export { piResultExtractor } from "./result-extractor.js";
-/**
- * Pi coding-agent CLI.
- *
- * Canonical id is `'pi'`; no alias or distinct runtime identity.
- */
-export class PiHarness extends BaseHarness {
+import { withoutModelFlag, } from "../harness.js";
+export class PiHarness {
     id = "pi";
     displayName = "Pi";
-    agentBuilder = piBuilder;
-    profile = { bin: "pi", args: [], envPassthrough: ["PI_API_KEY", "ANTHROPIC_API_KEY", "OPENAI_API_KEY"] };
-    resultExtractor = piResultExtractor;
-    // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
-    // Session-id env marker only — the matrix's bare PI_* presence vars must
-    // not stamp identity onto manual runs (see `AkmHarness.identityEnv`).
-    identityEnv = ["PI_SESSION_ID"];
-    capabilities = caps({
-        agentDispatch: true,
-        detection: true,
-    });
+    profile = { bin: "pi", args: [] };
+    systemPrompt = true;
+    nativeAgent = false;
+    confinable = false;
+    build({ bin, args }, req) {
+        const argv = [bin, ...(req.model ? withoutModelFlag(args) : args)];
+        if (req.systemPrompt)
+            argv.push("--append-system-prompt", req.systemPrompt);
+        if (req.model)
+            argv.push("--model", req.model);
+        if (req.prompt === undefined)
+            return { argv };
+        argv.push("-p");
+        return { argv, stdin: req.prompt };
+    }
 }

package/dist/integrations/lockfile.js

@@ -139,7 +139,7 @@ function readLockfileOrThrow() {
 }
 /**
  * The materialized content root recorded in the lock for a managed (git/npm)
- * bundle — spec §10.2 desired/resolved split, where the desired config carries
+ * bundle — the desired/resolved split: the desired config carries
  * only the source LOCATOR and the resolved `localRoot` lives here.
  *
  * This is the SINGLE lock-first resolution point shared by the indexer READ

package/dist/integrations/session-logs/index.js

@@ -3,40 +3,26 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 import { getHarness, SESSION_LOG_HARNESSES } from "../harnesses/index.js";
 export { extractInlineRefMentions } from "./inline-refs.js";
-// #562/P2 (plan §"Kill registry drift"): the provider array is DERIVED from
-// the unified HARNESS_REGISTRY — every harness with `capabilities.sessionLogs`
-// must supply a `sessionLogProvider` factory on its descriptor, and this is
-// the only place providers are instantiated. Adding a session-log harness is
-// therefore one registry entry, never an edit here.
+// The provider array is DERIVED from the unified HARNESS_REGISTRY: every harness
+// with a `sessionLogProvider` factory on its descriptor, and this is the only
+// place providers are instantiated. Adding a session-log harness is therefore
+// one registry entry, never an edit here.
 //
 // Ordered by canonical id so the pre-derivation provider order
 // ([claude, opencode] — visible in e.g. `extract --auto` result order)
 // is preserved deterministically, independent of HARNESS_REGISTRY declaration
 // order (which is pinned for JSON-schema enum stability).
-//
-// WI-9.7 (H1): `SESSION_LOG_HARNESSES` is `HARNESS_REGISTRY` narrowed by the
-// `isSessionLogHarness` type-predicate (see `../harnesses/types.ts`), so every
-// element's `capabilities.sessionLogs` is the literal `true` and
-// `sessionLogProvider` is a required (non-optional) field — a harness
-// declaring `sessionLogs: true` without a provider is now a compile error at
-// its `HARNESS_REGISTRY` entry, not a throw here. The load-time throw this
-// used to guard (`h.sessionLogProvider?.()` returning undefined) is gone;
-// `h.sessionLogProvider()` cannot be called with no provider to invoke.
 const HARNESSES = [...SESSION_LOG_HARNESSES]
     .sort((a, b) => a.id.localeCompare(b.id))
     .map((h) => h.sessionLogProvider());
-// Every derived provider's `name` must exactly identify a registry harness whose
-// `sessionLogs` capability is set. This is NOT expressible as a compile-time
-// type constraint: `SessionLogHarness.name` is a runtime string with no
-// static link to the `AkmHarness` that produced it, so a typo'd or
-// stale `name` (e.g. copy-pasted from another provider, or renamed on one
-// side only) would only ever surface as a wrong/silent lookup miss much later
-// (health scans, `extract --auto` attribution) rather than here at load time.
-// Kept as a runtime guard for that reason.
+// Every derived provider's `name` must exactly identify the registry harness that
+// produced it. `SessionLogHarness.name` is a runtime string with no static link to
+// the `AkmHarness`, so a typo'd or stale `name` would only surface as a silent
+// lookup miss much later (health scans, `extract --auto` attribution) rather than
+// here at load time.
 for (const provider of HARNESSES) {
-    const harness = getHarness(provider.name);
-    if (!harness?.capabilities.sessionLogs) {
-        throw new Error(`[akm] session-log provider "${provider.name}" is not registered as a sessionLogs harness in HARNESS_REGISTRY (src/integrations/harnesses). Add it there.`);
+    if (!getHarness(provider.name)?.sessionLogProvider) {
+        throw new Error(`[akm] session-log provider "${provider.name}" is not registered as a session-log harness in HARNESS_REGISTRY (src/integrations/harnesses). Add it there.`);
     }
 }
 /**
@@ -46,9 +32,3 @@ for (const provider of HARNESSES) {
 export function getAvailableHarnesses() {
     return HARNESSES.filter((harness) => harness.isAvailable());
 }
-export function normalizeSessionTopic(text) {
-    const normalized = text.replace(/\s+/g, " ").trim().toLowerCase();
-    if (normalized.length < 10)
-        return undefined;
-    return normalized.slice(0, 60);
-}