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

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

@@ -6,6 +6,7 @@ import os from "node:os";
 import path from "node:path";
 import { openDatabase } from "../../../storage/database.js";
 import { extractInlineRefMentions } from "../../session-logs/inline-refs.js";
+import { AbstractSessionLogProvider } from "../../session-logs/provider-base.js";
 function getOpenCodeBaseDir() {
     if (process.platform === "darwin") {
         return path.join(os.homedir(), "Library", "Application Support", "opencode");
@@ -31,31 +32,16 @@ function getOpenCodeBaseDir() {
  */
 /** Filename of opencode's SQLite session store, relative to its base dir. */
 const OPENCODE_DB_FILENAME = "opencode.db";
-export class OpenCodeProvider {
+export class OpenCodeProvider extends AbstractSessionLogProvider {
     name = "opencode";
     #baseDir = getOpenCodeBaseDir();
-    isAvailable() {
-        return fs.existsSync(this.#baseDir);
+    availabilityRoot() {
+        return this.#baseDir;
     }
     /** Absolute path to opencode's SQLite store under `base`. */
     #dbPath(base) {
         return path.join(base, OPENCODE_DB_FILENAME);
     }
-    /**
-     * Directories/files opencode writes session data under. Returns the base dir
-     * when the SQLite store (`opencode.db`) exists, the legacy JSON session root
-     * (`<base>/storage/session`) when present, or both during a migration overlap.
-     * Empty when neither exists. See {@link SessionLogHarness.watchRoots}.
-     */
-    watchRoots() {
-        const roots = [];
-        if (fs.existsSync(this.#dbPath(this.#baseDir)))
-            roots.push(this.#baseDir);
-        const sessionRoot = path.join(this.#baseDir, "storage", "session");
-        if (fs.existsSync(sessionRoot))
-            roots.push(sessionRoot);
-        return roots;
-    }
     *readEvents(input) {
         // Legacy behavior: stream raw log lines from the top-level dir and `log/`
         // subdirectory. Kept to keep `getExecutionLogCandidates` working without
@@ -68,14 +54,8 @@ export class OpenCodeProvider {
             try {
                 for (const file of fs.readdirSync(dir)) {
                     const full = path.join(dir, file);
-                    let stat;
-                    try {
-                        stat = fs.statSync(full);
-                    }
-                    catch {
-                        continue;
-                    }
-                    if (!stat.isFile())
+                    const stat = this.statSafe(full);
+                    if (!stat?.isFile())
                         continue;
                     if (stat.mtimeMs < input.sinceMs)
                         continue;
@@ -83,25 +63,13 @@ export class OpenCodeProvider {
                         continue;
                     const content = fs.readFileSync(full, "utf8");
                     const lines = content.includes("\n") ? content.split("\n") : [content];
-                    for (const line of lines) {
-                        try {
-                            const entry = JSON.parse(line);
-                            const text = entry?.content ?? entry?.message ?? entry?.text ?? "";
-                            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?.sessionId === "string" ? entry.sessionId : undefined,
-                                role: typeof entry?.role === "string" ? entry.role : "unknown",
-                                filePath: full,
-                            };
-                        }
-                        catch {
-                            // skip malformed
-                        }
-                    }
+                    yield* this.logLineEvents({
+                        lines,
+                        filePath: full,
+                        fallbackTsMs: stat.mtimeMs,
+                        selectText: (entry) => entry?.content ?? entry?.message ?? entry?.text ?? "",
+                        selectSessionId: (entry) => entry?.sessionId,
+                    });
                 }
             }
             catch {
@@ -118,61 +86,44 @@ export class OpenCodeProvider {
         const sessionRoot = path.join(base, "storage", "session");
         if (!fs.existsSync(sessionRoot))
             return [];
-        const summaries = [];
-        try {
-            for (const projectId of fs.readdirSync(sessionRoot)) {
-                const projectDir = path.join(sessionRoot, projectId);
-                let pstat;
-                try {
-                    pstat = fs.statSync(projectDir);
-                }
-                catch {
-                    continue;
-                }
-                if (!pstat.isDirectory())
+        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;
-                for (const file of fs.readdirSync(projectDir)) {
-                    if (!file.endsWith(".json"))
-                        continue;
-                    const filePath = path.join(projectDir, file);
-                    let stat;
-                    try {
-                        stat = fs.statSync(filePath);
-                    }
-                    catch {
-                        continue;
-                    }
-                    if (stat.mtimeMs < sinceMs)
-                        continue;
-                    let meta;
-                    try {
-                        meta = JSON.parse(fs.readFileSync(filePath, "utf8"));
-                    }
-                    catch {
-                        continue;
-                    }
-                    const sessionId = typeof meta?.id === "string" ? meta.id : path.basename(file, ".json");
-                    const time = meta?.time ?? undefined;
-                    const startedAt = typeof time?.created === "number" ? time.created : stat.ctimeMs;
-                    const endedAt = typeof time?.updated === "number" ? time.updated : stat.mtimeMs;
-                    const title = typeof meta?.title === "string" ? meta.title : undefined;
-                    const projectHint = typeof meta?.directory === "string" ? meta.directory : projectId;
-                    summaries.push({
-                        harness: this.name,
-                        sessionId,
-                        filePath,
-                        startedAt,
-                        endedAt,
-                        projectHint,
-                        ...(title ? { title } : {}),
-                    });
-                }
+                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 {
-            // unreadable session root — return what we have
+            return undefined;
         }
-        return summaries.sort((a, b) => (b.endedAt ?? 0) - (a.endedAt ?? 0));
+        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,
+        });
     }
     readSession(ref) {
         if (path.basename(ref.filePath) === OPENCODE_DB_FILENAME)
@@ -221,15 +172,14 @@ export class OpenCodeProvider {
         }
         events.sort((a, b) => (a.ts ?? 0) - (b.ts ?? 0));
         return {
-            ref: {
-                harness: this.name,
+            ref: this.sessionRef({
                 sessionId: ref.sessionId,
                 filePath: ref.filePath,
-                ...(startedAt !== undefined ? { startedAt } : {}),
-                ...(endedAt !== undefined ? { endedAt } : {}),
-                ...(projectHint ? { projectHint } : {}),
-                ...(title ? { title } : {}),
-            },
+                startedAt,
+                endedAt,
+                projectHint,
+                title,
+            }),
             events,
             inlineRefs,
         };
@@ -252,21 +202,14 @@ export class OpenCodeProvider {
             const rows = db
                 .prepare("SELECT id, title, directory, time_created, time_updated FROM session WHERE time_updated >= ? ORDER BY time_updated DESC")
                 .all(sinceMs);
-            return rows.map((r) => {
-                const startedAt = typeof r.time_created === "number" ? r.time_created : undefined;
-                const endedAt = typeof r.time_updated === "number" ? r.time_updated : undefined;
-                const title = typeof r.title === "string" && r.title.length > 0 ? r.title : undefined;
-                const projectHint = typeof r.directory === "string" && r.directory.length > 0 ? r.directory : undefined;
-                return {
-                    harness: this.name,
-                    sessionId: r.id,
-                    filePath: dbPath,
-                    ...(startedAt !== undefined ? { startedAt } : {}),
-                    ...(endedAt !== undefined ? { endedAt } : {}),
-                    ...(projectHint ? { projectHint } : {}),
-                    ...(title ? { title } : {}),
-                };
-            });
+            return rows.map((r) => this.sessionRef({
+                sessionId: r.id,
+                filePath: dbPath,
+                startedAt: typeof r.time_created === "number" ? r.time_created : undefined,
+                endedAt: typeof r.time_updated === "number" ? r.time_updated : undefined,
+                projectHint: typeof r.directory === "string" && r.directory.length > 0 ? r.directory : undefined,
+                title: typeof r.title === "string" && r.title.length > 0 ? r.title : undefined,
+            }));
         }
         catch {
             // Missing `session` table / unexpected schema — treat as no sessions.
@@ -283,7 +226,7 @@ export class OpenCodeProvider {
      * (never throws) when the DB is unreadable.
      */
     #readSessionFromDb(ref) {
-        const emptyRef = { harness: this.name, sessionId: ref.sessionId, filePath: ref.filePath };
+        const emptyRef = this.sessionRef({ sessionId: ref.sessionId, filePath: ref.filePath });
         let db;
         try {
             db = openDatabase(ref.filePath, { readonly: true, create: false });
@@ -349,15 +292,14 @@ export class OpenCodeProvider {
             }
             events.sort((a, b) => (a.ts ?? 0) - (b.ts ?? 0));
             return {
-                ref: {
-                    harness: this.name,
+                ref: this.sessionRef({
                     sessionId: ref.sessionId,
                     filePath: ref.filePath,
-                    ...(startedAt !== undefined ? { startedAt } : {}),
-                    ...(endedAt !== undefined ? { endedAt } : {}),
-                    ...(projectHint ? { projectHint } : {}),
-                    ...(title ? { title } : {}),
-                },
+                    startedAt,
+                    endedAt,
+                    projectHint,
+                    title,
+                }),
                 events,
                 inlineRefs,
             };

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

@@ -21,30 +21,17 @@
  * Importing the descriptor from this leaf keeps the registry a config-leaf and
  * breaks the cycle.
  */
+import { caps } from "../shared.js";
 import { BaseHarness } from "../types.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.
+ * Dispatch-only: no native session logs, but detected at setup.
  */
 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"];
     // ── Workflow-engine descriptor (plan §"Capability matrix", P2) ────────────
     // Embedded-SDK dispatch on this machine ⇒ local-runner (the matrix's
     // "local (sdk/cli)" row, SDK half).
@@ -52,7 +39,7 @@ 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";
-    // No `resume` flag: session reuse is programmatic — the SDK session id is
+    // 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.
     // No `identityEnv`: the SDK runs in-process; it does not mark a child
@@ -60,6 +47,5 @@ export class OpencodeSdkHarness extends BaseHarness {
     capabilities = caps({
         agentDispatch: true,
         detection: true,
-        v1Migration: true,
     });
 }