@matteeh/osq 0.2.0 → 0.2.2

package/dist/harness/claude/claude-stream.js

@@ -0,0 +1,150 @@
+import { relativizeToolSummary } from '../../core/run/summary.js';
+import { EventStreamParser, asRecord, firstNonEmptyString, resolveEventTimestamp, } from '../stream.js';
+import { appendHarnessEvent, } from '../types.js';
+import { claudeToolSummary, toProjectRelative } from './claude-tools.js';
+export function createClaudeStreamState() {
+    return { toolUses: new Map() };
+}
+function contentBlocks(message) {
+    if (!Array.isArray(message?.content))
+        return [];
+    return message.content
+        .map((block) => asRecord(block))
+        .filter((block) => block !== undefined);
+}
+function numberField(value) {
+    return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
+async function handleAssistant(event, ctx, state, timestamp) {
+    const message = asRecord(event.message);
+    for (const block of contentBlocks(message)) {
+        const type = firstNonEmptyString(block.type);
+        if (type === 'tool_use') {
+            const name = firstNonEmptyString(block.name) ?? 'tool';
+            const id = firstNonEmptyString(block.id);
+            const input = asRecord(block.input);
+            const filePath = firstNonEmptyString(input?.file_path);
+            if (id) {
+                state.toolUses.set(id, { name, ...(filePath ? { path: filePath } : {}) });
+            }
+            const summary = relativizeToolSummary(claudeToolSummary(name, input), ctx.projectRoot);
+            await appendHarnessEvent(ctx.specFolderPath, ctx.taskNumber, {
+                type: 'tool',
+                timestamp,
+                data: { tool: name, summary },
+            });
+            ctx.logger?.verbose(`[tool] ${name}: ${summary}`);
+            continue;
+        }
+        if (type === 'text') {
+            const text = firstNonEmptyString(block.text);
+            if (text) {
+                await appendHarnessEvent(ctx.specFolderPath, ctx.taskNumber, {
+                    type: 'text',
+                    timestamp,
+                    data: { text },
+                });
+            }
+        }
+    }
+}
+async function handleUser(event, ctx, state, timestamp) {
+    const message = asRecord(event.message);
+    for (const block of contentBlocks(message)) {
+        if (firstNonEmptyString(block.type) !== 'tool_result')
+            continue;
+        if (block.is_error === true)
+            continue;
+        const id = firstNonEmptyString(block.tool_use_id);
+        const remembered = id ? state.toolUses.get(id) : undefined;
+        if (!remembered)
+            continue;
+        if (remembered.name !== 'Edit' && remembered.name !== 'Write')
+            continue;
+        if (!remembered.path)
+            continue;
+        await appendHarnessEvent(ctx.specFolderPath, ctx.taskNumber, {
+            type: 'file_changed',
+            timestamp,
+            data: {
+                path: toProjectRelative(remembered.path, ctx.projectRoot),
+            },
+        });
+    }
+}
+async function handleResult(event, ctx, state, timestamp) {
+    state.subtype = firstNonEmptyString(event.subtype);
+    state.isError = event.is_error === true;
+    state.result = firstNonEmptyString(event.result);
+    const modelUsage = asRecord(event.modelUsage);
+    if (!modelUsage)
+        return;
+    for (const [model, entry] of Object.entries(modelUsage)) {
+        const usage = asRecord(entry);
+        if (!usage)
+            continue;
+        const cacheRead = numberField(usage.cacheReadInputTokens);
+        const promptTokens = (numberField(usage.inputTokens) ?? 0) +
+            (cacheRead ?? 0) +
+            (numberField(usage.cacheCreationInputTokens) ?? 0);
+        const candidateTokens = numberField(usage.outputTokens) ?? 0;
+        const data = {
+            promptTokens,
+            candidateTokens,
+            totalTokens: promptTokens + candidateTokens,
+            model,
+        };
+        if (cacheRead !== undefined)
+            data.cachedTokens = cacheRead;
+        const reasoning = numberField(usage.thinkingTokens);
+        if (reasoning !== undefined)
+            data.reasoningTokens = reasoning;
+        const cost = numberField(usage.costUSD);
+        if (cost !== undefined)
+            data.cost = cost;
+        await appendHarnessEvent(ctx.specFolderPath, ctx.taskNumber, {
+            type: 'tokens',
+            timestamp,
+            data,
+        });
+    }
+}
+/** Translate one completed Claude Code JSONL line into osq harness events. */
+export async function processClaudeStdoutLine(line, ctx, state) {
+    const trimmed = line.trim();
+    if (!trimmed)
+        return;
+    let parsed;
+    try {
+        parsed = JSON.parse(trimmed);
+    }
+    catch {
+        ctx.logger?.verbose(`[claude] Unrecognised stream line: ${trimmed}`);
+        return;
+    }
+    const event = asRecord(parsed);
+    if (!event)
+        return;
+    const type = firstNonEmptyString(event.type);
+    const timestamp = resolveEventTimestamp(event);
+    if (type === 'assistant') {
+        await handleAssistant(event, ctx, state, timestamp);
+        return;
+    }
+    if (type === 'user') {
+        await handleUser(event, ctx, state, timestamp);
+        return;
+    }
+    if (type === 'result') {
+        await handleResult(event, ctx, state, timestamp);
+        return;
+    }
+    ctx.logger?.verbose(`[claude] Ignored event: ${type ?? 'unknown'}`);
+}
+/** Buffering helper mirroring the other harness parsers. */
+export class ClaudeEventStreamParser extends EventStreamParser {
+    constructor(ctx, state) {
+        super((line) => processClaudeStdoutLine(line, ctx, state));
+    }
+}
+//# sourceMappingURL=claude-stream.js.map

package/dist/harness/claude/claude-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-stream.js","sourceRoot":"","sources":["../../../src/harness/claude/claude-stream.ts"],"names":[],"mappings":"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"}

package/dist/harness/claude/claude-tools.d.ts

@@ -0,0 +1,5 @@
+/** Relativize an absolute path under the project root, leaving relative paths. */
+export declare function toProjectRelative(target: string, projectRoot: string): string;
+/** Short, human-readable tool summary following Claude Code's tool input shapes. */
+export declare function claudeToolSummary(toolName: string, input: Record<string, unknown> | undefined): string;
+//# sourceMappingURL=claude-tools.d.ts.map

package/dist/harness/claude/claude-tools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-tools.d.ts","sourceRoot":"","sources":["../../../src/harness/claude/claude-tools.ts"],"names":[],"mappings":"AAKA,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,CAE7E;AAED,oFAAoF;AACpF,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GACzC,MAAM,CAoBR"}

package/dist/harness/claude/claude-tools.js

@@ -0,0 +1,30 @@
+import path from 'node:path';
+import { firstNonEmptyString } from '../stream.js';
+const SUMMARY_MAX = 60;
+/** Relativize an absolute path under the project root, leaving relative paths. */
+export function toProjectRelative(target, projectRoot) {
+    return path.isAbsolute(target) ? path.relative(projectRoot, target) : target;
+}
+/** Short, human-readable tool summary following Claude Code's tool input shapes. */
+export function claudeToolSummary(toolName, input) {
+    const i = input ?? {};
+    let raw;
+    switch (toolName) {
+        case 'Bash':
+            raw = firstNonEmptyString(i.command);
+            break;
+        case 'Read':
+        case 'Edit':
+        case 'Write':
+            raw = firstNonEmptyString(i.file_path);
+            break;
+        case 'Glob':
+        case 'Grep':
+            raw = firstNonEmptyString(i.pattern);
+            break;
+        default:
+            raw = JSON.stringify(i);
+    }
+    return (raw ?? '').slice(0, SUMMARY_MAX);
+}
+//# sourceMappingURL=claude-tools.js.map

package/dist/harness/claude/claude-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-tools.js","sourceRoot":"","sources":["../../../src/harness/claude/claude-tools.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,MAAc,EAAE,WAAmB;IACnE,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAC/E,CAAC;AAED,oFAAoF;AACpF,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,KAA0C;IAE1C,MAAM,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;IACtB,IAAI,GAAuB,CAAC;IAC5B,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,MAAM;YACT,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM;QACR,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM,CAAC;QACZ,KAAK,OAAO;YACV,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;YACvC,MAAM;QACR,KAAK,MAAM,CAAC;QACZ,KAAK,MAAM;YACT,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACrC,MAAM;QACR;YACE,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;AAC3C,CAAC"}

package/dist/harness/index.d.ts

@@ -13,4 +13,5 @@ export * from './agy/agy.js';
 export * from './opencode/opencode.js';
 export * from './codex/codex.js';
 export * from './pi/pi.js';
+export * from './claude/claude-exec.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/harness/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,uCAAuC,CAAC;AAM/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,cAAc,CAAC,CAMvF,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAY9D;AAED,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,WAAW,EAGjB,MAAM,uCAAuC,CAAC;AAO/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,uBAAuB,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW,EAAE,MAAM,cAAc,CAAC,CAOvF,CAAC;AAEF,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAY9D;AAED,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}

package/dist/harness/index.js

@@ -1,5 +1,6 @@
 import { availableHarnessNames, lookupHarness, } from '../core/foundation/harness-catalog.js';
 import { AgyAdapter } from './agy/agy.js';
+import { ClaudeAdapter } from './claude/claude-exec.js';
 import { CodexAdapter } from './codex/codex.js';
 import { MockAdapter } from './mock.js';
 import { OpencodeAdapter } from './opencode/opencode.js';
@@ -11,6 +12,7 @@ import { PiAdapter } from './pi/pi.js';
  */
 export const harnessAdapterFactories = {
     agy: () => new AgyAdapter(),
+    claude: () => new ClaudeAdapter(),
     codex: () => new CodexAdapter(),
     mock: () => new MockAdapter(),
     opencode: () => new OpencodeAdapter(),
@@ -32,4 +34,5 @@ export * from './agy/agy.js';
 export * from './opencode/opencode.js';
 export * from './codex/codex.js';
 export * from './pi/pi.js';
+export * from './claude/claude-exec.js';
 //# sourceMappingURL=index.js.map

package/dist/harness/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAwD;IAC1F,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,EAAE;IAC3B,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,WAAW,EAAE;IAC7B,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE;IACrC,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,SAAS,EAAE;CAC1B,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,0BAA0B,qBAAqB,EAAE,CAAC,IAAI,CACrF,IAAI,CACL,EAAE,CACJ,CAAC;IACJ,CAAC;IACD,OAAO,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/harness/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,qBAAqB,EACrB,aAAa,GACd,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC;;;;GAIG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAwD;IAC1F,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,UAAU,EAAE;IAC3B,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,aAAa,EAAE;IACjC,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,YAAY,EAAE;IAC/B,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,WAAW,EAAE;IAC7B,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,eAAe,EAAE;IACrC,EAAE,EAAE,GAAG,EAAE,CAAC,IAAI,SAAS,EAAE;CAC1B,CAAC;AAEF,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,IAAI,OAAoB,CAAC;IACzB,IAAI,CAAC;QACH,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC;IACrC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CACb,6BAA6B,IAAI,0BAA0B,qBAAqB,EAAE,CAAC,IAAI,CACrF,IAAI,CACL,EAAE,CACJ,CAAC;IACJ,CAAC;IACD,OAAO,uBAAuB,CAAC,OAAO,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,cAAc,CAAC;AAC7B,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC;AACjC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}

package/dist/harness/opencode/opencode-session.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Whole-run token and cost totals for one opencode task. The adapter records
+ * what the JSON stream reported and, after the process exits, reads the
+ * session export to recover the final step the stream leaves out.
+ */
+export interface OpencodeUsageTotals {
+    promptTokens: number;
+    candidateTokens: number;
+    totalTokens: number;
+    cachedTokens: number;
+    reasoningTokens: number;
+    cost: number;
+}
+/** Mutable per-run state carried through the parser closure. */
+export interface OpencodeRunTracker {
+    sessionID?: string;
+    totals: OpencodeUsageTotals;
+}
+export declare function createOpencodeRunTracker(): OpencodeRunTracker;
+/** Record the top-level `sessionID` every opencode stream event carries. */
+export declare function trackOpencodeSessionID(tracker: OpencodeRunTracker, event: unknown): void;
+/** Accumulate one streamed `step_finish` usage record into the run totals. */
+export declare function addOpencodeUsage(tracker: OpencodeRunTracker, usage: OpencodeUsageTotals): void;
+/**
+ * Parse `opencode session export` JSON. Returns the session's whole-run totals,
+ * or `null` when the payload is not an object carrying an `info` record.
+ */
+export declare function parseOpencodeSessionExport(raw: string): OpencodeUsageTotals | null;
+/**
+ * Run `opencode session export --standalone <sessionID>` and parse it. Any
+ * spawn failure, non-zero exit, timeout, or unparseable payload yields `null`
+ * so the caller appends nothing.
+ */
+export declare function readOpencodeSessionUsage(bin: string, projectRoot: string, sessionID: string, timeoutSeconds: number): Promise<OpencodeUsageTotals | null>;
+/** Field-wise remainder, clamped at zero so the session total is never undershot. */
+export declare function computeOpencodeRemainder(streamed: OpencodeUsageTotals, session: OpencodeUsageTotals): OpencodeUsageTotals;
+/**
+ * Append one `tokens` event carrying only what the session export reported
+ * beyond the streamed totals. Appends nothing when the remainder is empty.
+ */
+export declare function appendOpencodeSessionRemainder(specFolderPath: string, taskNumber: string, streamed: OpencodeUsageTotals, session: OpencodeUsageTotals): Promise<void>;
+//# sourceMappingURL=opencode-session.d.ts.map

package/dist/harness/opencode/opencode-session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-session.d.ts","sourceRoot":"","sources":["../../../src/harness/opencode/opencode-session.ts"],"names":[],"mappings":"AAIA;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,gEAAgE;AAChE,MAAM,WAAW,kBAAkB;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,mBAAmB,CAAC;CAC7B;AAaD,wBAAgB,wBAAwB,IAAI,kBAAkB,CAE7D;AAED,4EAA4E;AAC5E,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAMxF;AAED,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAQ9F;AAOD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,GAAG,IAAI,CAuBlF;AAED;;;;GAIG;AACH,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAgBrC;AAED,qFAAqF;AACrF,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,EAAE,mBAAmB,GAC3B,mBAAmB,CAYrB;AAMD;;;GAGG;AACH,wBAAsB,8BAA8B,CAClD,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,mBAAmB,EAC7B,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAUf"}

package/dist/harness/opencode/opencode-session.js

@@ -0,0 +1,123 @@
+import { spawnWithTimeout } from '../process.js';
+import { asRecord } from '../stream.js';
+import { appendHarnessEvent } from '../types.js';
+function emptyTotals() {
+    return {
+        promptTokens: 0,
+        candidateTokens: 0,
+        totalTokens: 0,
+        cachedTokens: 0,
+        reasoningTokens: 0,
+        cost: 0,
+    };
+}
+export function createOpencodeRunTracker() {
+    return { totals: emptyTotals() };
+}
+/** Record the top-level `sessionID` every opencode stream event carries. */
+export function trackOpencodeSessionID(tracker, event) {
+    const eventObj = asRecord(event);
+    const sessionID = eventObj?.sessionID;
+    if (typeof sessionID === 'string' && sessionID.length > 0) {
+        tracker.sessionID = sessionID;
+    }
+}
+/** Accumulate one streamed `step_finish` usage record into the run totals. */
+export function addOpencodeUsage(tracker, usage) {
+    const totals = tracker.totals;
+    totals.promptTokens += usage.promptTokens;
+    totals.candidateTokens += usage.candidateTokens;
+    totals.totalTokens += usage.totalTokens;
+    totals.cachedTokens += usage.cachedTokens;
+    totals.reasoningTokens += usage.reasoningTokens;
+    totals.cost += usage.cost;
+}
+function count(value) {
+    const numeric = Number(value);
+    return Number.isFinite(numeric) ? numeric : 0;
+}
+/**
+ * Parse `opencode session export` JSON. Returns the session's whole-run totals,
+ * or `null` when the payload is not an object carrying an `info` record.
+ */
+export function parseOpencodeSessionExport(raw) {
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+    const info = asRecord(asRecord(parsed)?.info);
+    if (!info) {
+        return null;
+    }
+    const tokens = asRecord(info.tokens);
+    const cache = asRecord(tokens?.cache);
+    const promptTokens = count(tokens?.input);
+    const candidateTokens = count(tokens?.output);
+    return {
+        promptTokens,
+        candidateTokens,
+        totalTokens: promptTokens + candidateTokens,
+        cachedTokens: count(cache?.read) + count(cache?.write),
+        reasoningTokens: count(tokens?.reasoning),
+        cost: count(info.cost),
+    };
+}
+/**
+ * Run `opencode session export --standalone <sessionID>` and parse it. Any
+ * spawn failure, non-zero exit, timeout, or unparseable payload yields `null`
+ * so the caller appends nothing.
+ */
+export async function readOpencodeSessionUsage(bin, projectRoot, sessionID, timeoutSeconds) {
+    let result;
+    try {
+        result = await spawnWithTimeout({
+            command: bin,
+            args: ['session', 'export', '--standalone', sessionID],
+            cwd: projectRoot,
+            timeoutSeconds,
+        });
+    }
+    catch {
+        return null;
+    }
+    if (result.exitCode !== 0 || result.timedOut) {
+        return null;
+    }
+    return parseOpencodeSessionExport(result.stdout);
+}
+/** Field-wise remainder, clamped at zero so the session total is never undershot. */
+export function computeOpencodeRemainder(streamed, session) {
+    const remainder = (recorded, total) => Math.max(0, total - recorded);
+    const promptTokens = remainder(streamed.promptTokens, session.promptTokens);
+    const candidateTokens = remainder(streamed.candidateTokens, session.candidateTokens);
+    return {
+        promptTokens,
+        candidateTokens,
+        totalTokens: promptTokens + candidateTokens,
+        cachedTokens: remainder(streamed.cachedTokens, session.cachedTokens),
+        reasoningTokens: remainder(streamed.reasoningTokens, session.reasoningTokens),
+        cost: remainder(streamed.cost, session.cost),
+    };
+}
+function hasUsage(totals) {
+    return Object.values(totals).some((value) => value > 0);
+}
+/**
+ * Append one `tokens` event carrying only what the session export reported
+ * beyond the streamed totals. Appends nothing when the remainder is empty.
+ */
+export async function appendOpencodeSessionRemainder(specFolderPath, taskNumber, streamed, session) {
+    const remainder = computeOpencodeRemainder(streamed, session);
+    if (!hasUsage(remainder)) {
+        return;
+    }
+    await appendHarnessEvent(specFolderPath, taskNumber, {
+        type: 'tokens',
+        timestamp: new Date().toISOString(),
+        data: remainder,
+    });
+}
+//# sourceMappingURL=opencode-session.js.map

package/dist/harness/opencode/opencode-session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"opencode-session.js","sourceRoot":"","sources":["../../../src/harness/opencode/opencode-session.ts"],"names":[],"mappings":"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"}

package/dist/harness/opencode/opencode.d.ts

@@ -2,6 +2,7 @@ import { type OsqConfig } from '../../core/foundation/config.js';
 import type { Logger } from '../../core/foundation/logger.js';
 import { EventStreamParser } from '../stream.js';
 import { type HarnessAdapter, type InteractiveSessionOptions, type InteractiveUsage, type ReadInteractiveUsageOptions, type SpawnResult, type SpawnTaskOptions, type ToolEventData } from '../types.js';
+import { type OpencodeRunTracker } from './opencode-session.js';
 export declare const OPENCODE_PLANNER_AGENT_TEMPLATE = "---\ndescription: Interactive planning agent for osq\nmode: all\npermission:\n  read: allow\n  edit: allow\n  glob: allow\n  grep: allow\n  bash:\n    \"*\": deny\n    \"osq lint*\": allow\n    \"pnpm osq lint*\": allow\n    \"npx osq lint*\": allow\n    \"*;*\": deny\n    \"*&*\": deny\n    \"*|*\": deny\n    \"*>*\": deny\n    \"*<*\": deny\n    \"*`*\": deny\n    \"*$(*\": deny\n    \"*\\n*\": deny\n  webfetch: deny\n  websearch: deny\n---\n\nFollow PLANNER.md strictly for change planning rules and procedure.\nWrites are expected only under openspec/changes/<id>/.\nThe only shell command you may run is `osq lint <slug>`.\n";
 export declare const OPENCODE_AGENT_TEMPLATE: string;
 export declare function resolveOpencodeBinary(config?: OsqConfig): Promise<string>;
@@ -19,7 +20,7 @@ export interface OpencodeTokensData {
 export declare function extractOpencodeTokens(event: unknown): OpencodeTokensData | null;
 export declare function extractToolEventSummary(toolName: string, input: unknown): string;
 export declare function extractOpencodeToolEvent(event: unknown): ToolEventData | null;
-export declare function processOpencodeStdoutLine(line: string, specFolderPath: string, taskNumber: string, logger?: Logger, projectRoot?: string): Promise<void>;
+export declare function processOpencodeStdoutLine(line: string, specFolderPath: string, taskNumber: string, logger?: Logger, projectRoot?: string, tracker?: OpencodeRunTracker): Promise<void>;
 /**
  * Compatibility subclass retained for existing callers and tests; the buffering
  * and serialization logic lives entirely in the shared {@link EventStreamParser}.

package/dist/harness/opencode/opencode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../src/harness/opencode/opencode.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,iCAAiC,CAAC;AAM7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EACL,iBAAiB,EAIlB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EACrB,KAAK,2BAA2B,EAChC,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAEnB,MAAM,aAAa,CAAC;AAGrB,eAAO,MAAM,+BAA+B,8nBA4B3C,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAcnC,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ/E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAErE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAuHpF;AAED,eAAO,MAAM,SAAS,0BAAoB,CAAC;AAE3C,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,GAAG,IAAI,CAwD/E;AAKD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAuBhF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CA4B7E;AAyBD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC,CAsEf;AAED;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;gBAClD,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;CAK9F;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CA2B3C;AAED,qBAAa,eAAgB,YAAW,cAAc;IACpD,QAAQ,CAAC,IAAI,cAAc;IAErB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C5D,KAAK,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IAqCtD,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IA4BrE,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAK5F"}
+{"version":3,"file":"opencode.d.ts","sourceRoot":"","sources":["../../../src/harness/opencode/opencode.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,KAAK,SAAS,EAAc,MAAM,iCAAiC,CAAC;AAM7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EACL,iBAAiB,EAIlB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAC9B,KAAK,gBAAgB,EACrB,KAAK,2BAA2B,EAChC,KAAK,WAAW,EAChB,KAAK,gBAAgB,EAErB,KAAK,aAAa,EAEnB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,KAAK,kBAAkB,EAMxB,MAAM,uBAAuB,CAAC;AAG/B,eAAO,MAAM,+BAA+B,8nBA4B3C,CAAC;AAEF,eAAO,MAAM,uBAAuB,QAcnC,CAAC;AAEF,wBAAsB,qBAAqB,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAQ/E;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,gBAAgB,GAAG,MAAM,CAErE;AAED,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAoHpF;AAED,eAAO,MAAM,SAAS,0BAAoB,CAAC;AAE3C,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,kBAAkB,GAAG,IAAI,CAwD/E;AAKD,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,MAAM,CAuBhF;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,GAAG,IAAI,CA4B7E;AAyBD,wBAAsB,yBAAyB,CAC7C,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,kBAAkB,GAC3B,OAAO,CAAC,IAAI,CAAC,CA4Df;AA8BD;;;GAGG;AACH,qBAAa,yBAA0B,SAAQ,iBAAiB;gBAClD,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM;CAK9F;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC,CAqC3C;AAED,qBAAa,eAAgB,YAAW,cAAc;IACpD,QAAQ,CAAC,IAAI,cAAc;IAErB,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE,KAAK,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IA+C5D,KAAK,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,WAAW,CAAC;IA+DtD,gBAAgB,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAyBrE,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAK5F"}

package/dist/harness/opencode/opencode.js

@@ -2,6 +2,7 @@ import { spawn } from 'node:child_process';
 import fsSync from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { OPENCODE_TESTED_RANGE, assessOpencodeVersion, } from '../../core/foundation/config-opencode.js';
 import { loadConfig } from '../../core/foundation/config.js';
 import { MANAGED_AGENTS_BLOCK, OSQ_END_MARKER, OSQ_START_MARKER, } from '../../core/foundation/init.js';
 import { relativizeToolSummary } from '../../core/run/summary.js';
@@ -10,6 +11,7 @@ import { spawnWithTimeout } from '../process.js';
 import { buildExecutorPrompt } from '../prompt.js';
 import { EventStreamParser, asRecord, firstNonEmptyString, resolveEventTimestamp, } from '../stream.js';
 import { appendHarnessEvent, } from '../types.js';
+import { addOpencodeUsage, appendOpencodeSessionRemainder, createOpencodeRunTracker, readOpencodeSessionUsage, trackOpencodeSessionID, } from './opencode-session.js';
 import { readOpencodeInteractiveUsage } from './opencode-usage.js';
 export const OPENCODE_PLANNER_AGENT_TEMPLATE = `---
 description: Interactive planning agent for osq
@@ -71,23 +73,21 @@ export async function buildOpencodeArgs(options) {
     const { projectRoot, specFolderPath, taskNumber, config } = options;
     const agent = config?.opencode?.agent || 'osq-coder';
     const model = config?.opencode?.model || process.env.OSQ_MODEL || 'deepseek/deepseek-flash';
+    const variant = config?.opencode?.variant;
+    const modelArg = variant ? `${model}#${variant}` : model;
     const prompt = buildOpencodePrompt(options);
     const args = [
         'run',
         prompt,
+        '--standalone',
         '--agent',
         agent,
         '--auto',
         '--format',
         'json',
-        '--dir',
-        projectRoot,
         '--model',
-        model,
+        modelArg,
     ];
-    if (config?.opencode?.variant) {
-        args.push('--variant', config.opencode.variant);
-    }
     const changeDocName = fsSync.existsSync(path.resolve(specFolderPath, 'proposal.md'))
         ? 'proposal.md'
         : 'spec.md';
@@ -279,7 +279,7 @@ async function emitObservedToolEvent(specFolderPath, taskNumber, toolEvent, time
     });
     logger?.verbose(`[tool] ${toolEvent.tool}: ${summary}`);
 }
-export async function processOpencodeStdoutLine(line, specFolderPath, taskNumber, logger, projectRoot) {
+export async function processOpencodeStdoutLine(line, specFolderPath, taskNumber, logger, projectRoot, tracker) {
     const trimmed = line.trim();
     if (!trimmed) {
         return;
@@ -296,27 +296,16 @@ export async function processOpencodeStdoutLine(line, specFolderPath, taskNumber
         return;
     }
     const eventObj = event;
+    if (tracker) {
+        trackOpencodeSessionID(tracker, eventObj);
+    }
     const toolEvent = extractOpencodeToolEvent(eventObj);
     if (toolEvent) {
         await emitObservedToolEvent(specFolderPath, taskNumber, toolEvent, resolveEventTimestamp(eventObj), projectRoot, logger);
         return;
     }
     if (eventObj.type === 'step_finish') {
-        const tokensData = extractOpencodeTokens(eventObj);
-        if (tokensData) {
-            await appendHarnessEvent(specFolderPath, taskNumber, {
-                type: 'tokens',
-                timestamp: resolveEventTimestamp(eventObj),
-                data: {
-                    promptTokens: tokensData.promptTokens,
-                    candidateTokens: tokensData.candidateTokens,
-                    totalTokens: tokensData.totalTokens,
-                    cachedTokens: tokensData.cachedTokens,
-                    reasoningTokens: tokensData.reasoningTokens,
-                    cost: tokensData.cost,
-                },
-            });
-        }
+        await emitOpencodeTokensEvent(specFolderPath, taskNumber, eventObj, tracker);
         return;
     }
     // A completed text part is the adapter's final assistant message. Only whole
@@ -337,6 +326,28 @@ export async function processOpencodeStdoutLine(line, specFolderPath, taskNumber
     // stdout can never leak onto the terminal.
     logger?.verbose(`[opencode] Unknown event type: ${eventObj.type}`);
 }
+/** Append one `tokens` event for a streamed `step_finish`, tracking the run sum. */
+async function emitOpencodeTokensEvent(specFolderPath, taskNumber, eventObj, tracker) {
+    const tokensData = extractOpencodeTokens(eventObj);
+    if (!tokensData) {
+        return;
+    }
+    if (tracker) {
+        addOpencodeUsage(tracker, tokensData);
+    }
+    await appendHarnessEvent(specFolderPath, taskNumber, {
+        type: 'tokens',
+        timestamp: resolveEventTimestamp(eventObj),
+        data: {
+            promptTokens: tokensData.promptTokens,
+            candidateTokens: tokensData.candidateTokens,
+            totalTokens: tokensData.totalTokens,
+            cachedTokens: tokensData.cachedTokens,
+            reasoningTokens: tokensData.reasoningTokens,
+            cost: tokensData.cost,
+        },
+    });
+}
 /**
  * Compatibility subclass retained for existing callers and tests; the buffering
  * and serialization logic lives entirely in the shared {@link EventStreamParser}.
@@ -369,7 +380,15 @@ export async function preflightOpencode(projectRoot, config) {
         process.exit(1);
         return { version: '', bin };
     }
-    const version = (result.stdout || result.stderr).trim().split('\n')[0].trim();
+    const raw = (result.stdout || result.stderr).trim();
+    const version = raw.split('\n')[0]?.trim() ?? '';
+    const assessment = assessOpencodeVersion(raw);
+    if (!assessment.ok) {
+        console.error(`opencode ${assessment.version} is not supported; the opencode adapter needs opencode 2 (tested ${OPENCODE_TESTED_RANGE})`);
+        process.exitCode = 1;
+        process.exit(1);
+        return { version, bin };
+    }
     console.log(version);
     return { version, bin };
 }
@@ -424,7 +443,8 @@ export class OpencodeAdapter {
         const { projectRoot, specFolderPath, taskNumber, timeoutSeconds = 1800, config } = options;
         const args = await buildOpencodeArgs(options);
         const bin = await resolveOpencodeBinary(config);
-        const streamParser = new EventStreamParser((line) => processOpencodeStdoutLine(line, specFolderPath, taskNumber, options.logger, projectRoot));
+        const tracker = createOpencodeRunTracker();
+        const streamParser = new EventStreamParser((line) => processOpencodeStdoutLine(line, specFolderPath, taskNumber, options.logger, projectRoot, tracker));
         const result = await spawnWithTimeout({
             command: bin,
             args,
@@ -441,6 +461,13 @@ export class OpencodeAdapter {
             onSpawn: options.onSpawn,
         });
         await streamParser.flush();
+        if (tracker.sessionID) {
+            const timeoutSeconds = config?.timeouts?.harnessPreflightSeconds ?? 10;
+            const sessionTotals = await readOpencodeSessionUsage(bin, projectRoot, tracker.sessionID, timeoutSeconds);
+            if (sessionTotals) {
+                await appendOpencodeSessionRemainder(specFolderPath, taskNumber, tracker.totals, sessionTotals);
+            }
+        }
         return {
             exitCode: result.exitCode,
             timedOut: result.timedOut,
@@ -454,16 +481,13 @@ export class OpencodeAdapter {
         const { prompt, cwd, model, agent } = options;
         const config = await loadConfig(cwd).catch(() => undefined);
         const bin = await resolveOpencodeBinary(config);
-        const args = [prompt, '--dir', cwd];
+        const args = ['mini', '--prompt', prompt];
         if (model) {
             args.push('--model', model);
         }
         if (agent) {
             args.push('--agent', agent);
         }
-        if (config?.opencode?.variant) {
-            args.push('--variant', config.opencode.variant);
-        }
         const child = spawn(bin, args, {
             cwd,
             env: process.env,