akm-cli 0.9.1 → 0.9.2-alpha.2

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

@@ -5,6 +5,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import { openDatabase } from "../../../storage/database.js";
+import { openSqliteReadSnapshot } from "../../../storage/sqlite-read-snapshot.js";
 import { extractInlineRefMentions } from "../../session-logs/inline-refs.js";
 import { AbstractSessionLogProvider } from "../../session-logs/provider-base.js";
 function getOpenCodeBaseDir() {
@@ -14,21 +15,12 @@ function getOpenCodeBaseDir() {
     return path.join(os.homedir(), ".local", "share", "opencode");
 }
 /**
- * Opencode storage layouts:
+ * Opencode session storage:
  *
  *   SQLite (current, observed 2026-06): `<base>/opencode.db` — a Drizzle-managed
  *   database with `session` / `message` / `part` tables. Message text lives in
  *   `part` rows (`data` JSON, `type: "text"`); `message.data` holds role/timing.
- *   This is the layout current opencode builds write; it is preferred whenever
- *   `opencode.db` exists.
- *
- *   JSON files (legacy, observed 2026-05): `<base>/storage/session/<projectId>/
- *   <sessionId>.json` (metadata) + `<base>/storage/message/<sessionId>/
- *   <messageId>.json` (one per message). Read only when `opencode.db` is absent.
- *
- * Older builds wrote logs directly into `<base>/log/` and `<base>/*.log`;
- * those are still scanned by {@link OpenCodeProvider.readEvents} for
- * backward compatibility with the existing failure-pattern aggregator.
+ *   This is the sole supported layout.
  */
 /** Filename of opencode's SQLite session store, relative to its base dir. */
 const OPENCODE_DB_FILENAME = "opencode.db";
@@ -36,153 +28,22 @@ export class OpenCodeProvider extends AbstractSessionLogProvider {
     name = "opencode";
     #baseDir = getOpenCodeBaseDir();
     availabilityRoot() {
-        return this.#baseDir;
+        return this.#dbPath(this.#baseDir);
     }
     /** Absolute path to opencode's SQLite store under `base`. */
     #dbPath(base) {
         return path.join(base, OPENCODE_DB_FILENAME);
     }
-    *readEvents(input) {
-        // Legacy behavior: stream raw log lines from the top-level dir and `log/`
-        // subdirectory. Kept to keep `getExecutionLogCandidates` working without
-        // a coordinated change to its caller. New code should use
-        // {@link listSessions} + {@link readSession} instead.
-        const candidates = [this.#baseDir, path.join(this.#baseDir, "log")];
-        for (const dir of candidates) {
-            if (!fs.existsSync(dir))
-                continue;
-            try {
-                for (const file of fs.readdirSync(dir)) {
-                    const full = path.join(dir, file);
-                    const stat = this.statSafe(full);
-                    if (!stat?.isFile())
-                        continue;
-                    if (stat.mtimeMs < input.sinceMs)
-                        continue;
-                    if (!file.endsWith(".json") && !file.endsWith(".jsonl") && !file.endsWith(".log"))
-                        continue;
-                    const content = fs.readFileSync(full, "utf8");
-                    const lines = content.includes("\n") ? content.split("\n") : [content];
-                    yield* this.logLineEvents({
-                        lines,
-                        filePath: full,
-                        fallbackTsMs: stat.mtimeMs,
-                        selectText: (entry) => entry?.content ?? entry?.message ?? entry?.text ?? "",
-                        selectSessionId: (entry) => entry?.sessionId,
-                    });
-                }
-            }
-            catch {
-                // unreadable dir — skip
-            }
-        }
-    }
     listSessions(input = {}) {
         const base = input.location ?? this.#baseDir;
         const sinceMs = input.sinceMs ?? 0;
         const dbPath = this.#dbPath(base);
-        if (fs.existsSync(dbPath))
-            return this.#listSessionsFromDb(dbPath, sinceMs);
-        const sessionRoot = path.join(base, "storage", "session");
-        if (!fs.existsSync(sessionRoot))
+        if (!fs.existsSync(dbPath))
             return [];
-        return this.listSessionsFromFiles({
-            sinceMs,
-            enumerate: () => this.#legacySessionFiles(sessionRoot),
-            summarize: (filePath, stat) => this.#legacySessionSummary(filePath, stat),
-        });
-    }
-    /** Legacy JSON layout: `<sessionRoot>/<projectId>/<sessionId>.json`. */
-    *#legacySessionFiles(sessionRoot) {
-        for (const projectId of fs.readdirSync(sessionRoot)) {
-            const projectDir = path.join(sessionRoot, projectId);
-            if (!this.statSafe(projectDir)?.isDirectory())
-                continue;
-            for (const file of fs.readdirSync(projectDir)) {
-                if (!file.endsWith(".json"))
-                    continue;
-                yield path.join(projectDir, file);
-            }
-        }
-    }
-    /** Summarize one legacy session metadata file; `undefined` when unreadable. */
-    #legacySessionSummary(filePath, stat) {
-        let meta;
-        try {
-            meta = JSON.parse(fs.readFileSync(filePath, "utf8"));
-        }
-        catch {
-            return undefined;
-        }
-        const time = meta?.time ?? undefined;
-        return this.sessionRef({
-            sessionId: typeof meta?.id === "string" ? meta.id : path.basename(filePath, ".json"),
-            filePath,
-            startedAt: typeof time?.created === "number" ? time.created : stat.ctimeMs,
-            endedAt: typeof time?.updated === "number" ? time.updated : stat.mtimeMs,
-            // Fallback is the project directory name (the legacy layout's projectId).
-            projectHint: typeof meta?.directory === "string" ? meta.directory : path.basename(path.dirname(filePath)),
-            title: typeof meta?.title === "string" ? meta.title : undefined,
-        });
+        return this.#listSessionsFromDb(dbPath, sinceMs, input.isolatedSnapshot ?? false);
     }
     readSession(ref) {
-        if (path.basename(ref.filePath) === OPENCODE_DB_FILENAME)
-            return this.#readSessionFromDb(ref);
-        let meta = {};
-        try {
-            meta = JSON.parse(fs.readFileSync(ref.filePath, "utf8"));
-        }
-        catch {
-            // metadata missing — proceed with empty defaults
-        }
-        const time = meta.time ?? undefined;
-        const startedAt = typeof time?.created === "number" ? time.created : undefined;
-        const endedAt = typeof time?.updated === "number" ? time.updated : undefined;
-        const title = typeof meta.title === "string" ? meta.title : undefined;
-        const projectHint = typeof meta.directory === "string" ? meta.directory : undefined;
-        const events = [];
-        const inlineRefs = [];
-        // Resolve message directory: <baseDir>/storage/message/<sessionId>/
-        const inferredBase = this.#inferBaseFromSessionPath(ref.filePath) ?? this.#baseDir;
-        const msgDir = path.join(inferredBase, "storage", "message", ref.sessionId);
-        if (fs.existsSync(msgDir)) {
-            try {
-                const files = fs.readdirSync(msgDir).filter((f) => f.endsWith(".json"));
-                for (const file of files) {
-                    const full = path.join(msgDir, file);
-                    let msg;
-                    try {
-                        msg = JSON.parse(fs.readFileSync(full, "utf8"));
-                    }
-                    catch {
-                        continue;
-                    }
-                    if (!msg)
-                        continue;
-                    const evt = this.#messageToEvent(msg, ref.sessionId, full);
-                    if (evt) {
-                        events.push(evt);
-                        inlineRefs.push(...extractInlineRefMentions(evt.text, evt.ts));
-                    }
-                }
-            }
-            catch {
-                // unreadable msg dir — skip
-            }
-        }
-        events.sort((a, b) => (a.ts ?? 0) - (b.ts ?? 0));
-        return {
-            ref: this.sessionRef({
-                sessionId: ref.sessionId,
-                filePath: ref.filePath,
-                startedAt,
-                endedAt,
-                projectHint,
-                title,
-            }),
-            events,
-            inlineRefs,
-        };
+        return this.#readSessionFromDb(ref);
     }
     /**
      * List sessions from the SQLite store. `filePath` on each summary is the
@@ -190,10 +51,15 @@ export class OpenCodeProvider extends AbstractSessionLogProvider {
      * Returns `[]` (never throws) when the DB is unreadable or lacks the expected
      * schema — callers treat a missing harness as "no sessions".
      */
-    #listSessionsFromDb(dbPath, sinceMs) {
+    #listSessionsFromDb(dbPath, sinceMs, isolatedSnapshot) {
         let db;
         try {
-            db = openDatabase(dbPath, { readonly: true, create: false });
+            const opened = isolatedSnapshot
+                ? openSqliteReadSnapshot(dbPath)
+                : openDatabase(dbPath, { readonly: true, create: false });
+            if (!opened)
+                return [];
+            db = opened;
         }
         catch {
             return [];
@@ -311,60 +177,4 @@ export class OpenCodeProvider extends AbstractSessionLogProvider {
             db.close();
         }
     }
-    /**
-     * Derive opencode base dir from a session metadata file path so a caller
-     * passing a custom `--location` can still find the message dir.
-     * Layout: `<base>/storage/session/<projectId>/<id>.json` → base.
-     */
-    #inferBaseFromSessionPath(filePath) {
-        // Walk up: <id>.json → <projectId> → session → storage → <base>
-        const dir = path.dirname(filePath);
-        const parts = dir.split(path.sep);
-        if (parts.length < 3)
-            return undefined;
-        const last = parts[parts.length - 1];
-        const sndLast = parts[parts.length - 2];
-        const thirdLast = parts[parts.length - 3];
-        if (sndLast !== "session" || thirdLast !== "storage" || !last)
-            return undefined;
-        return parts.slice(0, parts.length - 3).join(path.sep);
-    }
-    #messageToEvent(msg, sessionId, filePath) {
-        const time = msg.time ?? undefined;
-        const ts = typeof time?.created === "number" ? time.created : typeof msg.timestamp === "number" ? msg.timestamp : 0;
-        const role = typeof msg.role === "string" ? msg.role : "unknown";
-        // Opencode message bodies live in summary.title / summary.diffs[].before/after /
-        // parts (referenced from storage/part/<msg-id>/). For listing+extraction
-        // purposes the summary block is sufficient — it's what the platform itself
-        // surfaces as the message preview.
-        const summary = msg.summary;
-        const parts = [];
-        if (typeof summary?.title === "string")
-            parts.push(summary.title);
-        if (Array.isArray(summary?.parts)) {
-            for (const p of summary.parts) {
-                if (typeof p === "string")
-                    parts.push(p);
-                else if (p && typeof p === "object") {
-                    const text = p.text;
-                    if (typeof text === "string")
-                        parts.push(text);
-                }
-            }
-        }
-        // content field for some opencode versions
-        if (typeof msg.content === "string")
-            parts.push(msg.content);
-        const text = parts.join("\n").trim();
-        if (text.length < 1)
-            return undefined;
-        return {
-            harness: this.name,
-            text,
-            ts: ts || undefined,
-            sessionId,
-            role,
-            filePath,
-        };
-    }
 }

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

@@ -21,6 +21,7 @@
  * Importing the descriptor from this leaf keeps the registry a config-leaf and
  * breaks the cycle.
  */
+import { createAgentRequestLowerer } from "../../agent/request-lowering.js";
 import { caps } from "../shared.js";
 import { BaseHarness } from "../types.js";
 /**
@@ -31,7 +32,6 @@ import { BaseHarness } from "../types.js";
 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).
@@ -39,6 +39,17 @@ export class OpencodeSdkHarness extends BaseHarness {
     // `session.prompt` returns structured SDK events/messages; akm extracts the
     // final message then validates against the node schema ⇒ native-json tier.
     structuredOutput = "native-json";
+    executionLowerer = {
+        platform: "opencode-sdk",
+        personaChannel: "native",
+        lower: createAgentRequestLowerer({
+            adapter: "opencode-sdk",
+            personaChannel: "native",
+            nativeAgentSelector: true,
+            tools: "sdk",
+            outputSchema: false,
+        }),
+    };
     // No flag-shaped resume: 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.

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

@@ -93,7 +93,6 @@
 import { spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import { DEFAULT_AGENT_TIMEOUT_MS } from "../../agent/config.js";
-import { resolveModel } from "../../agent/model-aliases.js";
 // Server registry — one server per complete server-material signature. Caller
 // deadlines race the shared promise independently; they never become startup
 // configuration inherited by later callers.
@@ -234,22 +233,13 @@ function toolsToSdkAllowlist(tools) {
 }
 /**
  * Assemble the OpenCode SDK server config from the profile + LLM fallback.
- * Pure and exported for tests. `profile.model` is resolved through the model
- * alias tables (platform key `"opencode-sdk"`) so config aliases like
- * `"model": "fast"` work on the SDK path the same way they do for CLI
- * builders. Note there is no built-in alias column for `opencode-sdk` —
- * built-in opus/sonnet/haiku strings are CLI-provider-qualified and would
- * collide with the `akm-custom/` provider prefixing below, so only profile
- * and config-root alias tables apply here.
+ * Pure and exported for tests. `profile.model` is already exact because model
+ * aliases resolve once before harness lowering.
  */
 export function buildSdkConfig(profile, llmConfig) {
     const endpoint = llmConfig?.endpoint;
     const apiKey = llmConfig?.apiKey;
-    const profileModel = profile.model
-        ? profile.modelIsExact
-            ? profile.model
-            : resolveModel(profile.model, "opencode-sdk", profile.modelAliases, profile.globalModelAliases)
-        : undefined;
+    const profileModel = profile.model;
     const model = profileModel ?? llmConfig?.model;
     const sdkConfig = {};
     if (model)
@@ -279,25 +269,28 @@ function serverRegistryKey(profile, env) {
         .update(JSON.stringify(canonicalize(material)))
         .digest("hex");
 }
+const OPENCODE_SDK_SERVER_ENV_NAMES = [
+    "HOME",
+    "PATH",
+    "USER",
+    "LANG",
+    "LC_ALL",
+    "TERM",
+    "TMPDIR",
+    "SYSTEMROOT",
+    "COMSPEC",
+    "PATHEXT",
+    "WINDIR",
+    "TEMP",
+    "TMP",
+];
+/** @internal Exact environment allowlist used to start the OpenCode SDK server. */
+export function opencodeSdkServerEnvironmentNames(profile) {
+    return [...new Set([...OPENCODE_SDK_SERVER_ENV_NAMES, ...(profile.envPassthrough ?? [])])];
+}
 function buildServerEnv(profile, config, bindings, envSource) {
     const env = {};
-    const inheritedNames = new Set([
-        "HOME",
-        "PATH",
-        "USER",
-        "LANG",
-        "LC_ALL",
-        "TERM",
-        "TMPDIR",
-        "SYSTEMROOT",
-        "COMSPEC",
-        "PATHEXT",
-        "WINDIR",
-        "TEMP",
-        "TMP",
-        ...(profile.envPassthrough ?? []),
-    ]);
-    for (const key of inheritedNames) {
+    for (const key of opencodeSdkServerEnvironmentNames(profile)) {
         const value = envSource[key];
         if (value !== undefined)
             env[key] = value;
@@ -688,6 +681,17 @@ async function deleteSessionBestEffort(client, sessionId, query, setTimeoutFn, c
         return `OpenCode session cleanup failed: ${errorText(err)}`;
     }
 }
+function abortedBeforeSdkStart(profile) {
+    return {
+        ok: false,
+        stdout: "",
+        stderr: "",
+        durationMs: 0,
+        exitCode: null,
+        reason: "aborted",
+        error: `opencode-sdk agent "${profile.name}" not started: caller signal already aborted`,
+    };
+}
 export async function runOpencodeSdk(profile, prompt, opts = {}, llmConfig) {
     const start = Date.now();
     const timeoutMs = opts.timeoutMs !== undefined ? opts.timeoutMs : DEFAULT_AGENT_TIMEOUT_MS;
@@ -695,17 +699,8 @@ export async function runOpencodeSdk(profile, prompt, opts = {}, llmConfig) {
     const remainingTimeoutMs = () => (deadline === null ? null : Math.max(0, deadline - Date.now()));
     const setTimeoutImpl = opts.setTimeoutFn ?? setTimeout;
     const clearTimeoutImpl = opts.clearTimeoutFn ?? clearTimeout;
-    if (opts.signal?.aborted) {
-        return {
-            ok: false,
-            stdout: "",
-            stderr: "",
-            durationMs: 0,
-            exitCode: null,
-            reason: "aborted",
-            error: `opencode-sdk agent "${profile.name}" not started: caller signal already aborted`,
-        };
-    }
+    if (opts.signal?.aborted)
+        return abortedBeforeSdkStart(profile);
     let client;
     if (_testServer) {
         client = _testServer.client;
@@ -831,14 +826,17 @@ export async function runOpencodeSdk(profile, prompt, opts = {}, llmConfig) {
             error: "Failed to create OpenCode session",
         };
     }
-    // #564 bug fixes (1) + (2): forward systemPrompt and tools from the abstract
+    // Forward the exact native agent selector, systemPrompt, and tools from the abstract
     // dispatch request. Both were previously accepted on AgentDispatchRequest but
     // silently dropped on the SDK path, so SDK-mode dispatch ignored agent-asset
     // system prompts and tool policies entirely (the CLI path honours both).
     const dispatch = opts.dispatch;
+    const agent = dispatch?.agent;
     const system = dispatch?.systemPrompt;
     const tools = toolsToSdkAllowlist(dispatch?.tools);
     const body = { parts: [{ type: "text", text: prompt }] };
+    if (agent)
+        body.agent = agent;
     if (system)
         body.system = system;
     if (tools)

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

@@ -72,6 +72,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 OPENHANDS_PLATFORM = "openhands";
 /**
@@ -106,6 +107,13 @@ function buildTaskPayload(req) {
  */
 export const openhandsBuilder = {
     platform: OPENHANDS_PLATFORM,
+    personaChannel: "prompt",
+    lower: createAgentRequestLowerer({
+        adapter: OPENHANDS_PLATFORM,
+        personaChannel: "prompt",
+        tools: "none",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

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

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

@@ -51,6 +51,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 PI_PLATFORM = "pi";
 /**
@@ -72,6 +73,13 @@ function buildPromptPayload(req) {
  */
 export const piBuilder = {
     platform: PI_PLATFORM,
+    personaChannel: "native",
+    lower: createAgentRequestLowerer({
+        adapter: PI_PLATFORM,
+        personaChannel: "native",
+        tools: "none",
+        outputSchema: true,
+    }),
     build(profile, req) {
         assertNotFlag(req.systemPrompt, "systemPrompt");
         assertNotFlag(req.model, "model");

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

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

package/dist/integrations/harnesses/shared.js

@@ -7,7 +7,6 @@ export function caps(c) {
         agentDispatch: false,
         detection: false,
         configImport: false,
-        runtimeIdentity: false,
         ...c,
     };
 }

package/dist/integrations/harnesses/types.js

@@ -44,11 +44,9 @@ export function isSessionLogHarness(h) {
  * (Claude, OpenCode) declare their own required `sessionLogProvider`.
  */
 export class BaseHarness {
-    runtimeId;
     setupDetectionDir;
     agentBuilder;
-    pattern;
-    structuredOutput;
+    executionLowerer;
     identityEnv;
     presenceEnv;
     resultExtractor;