harnery 0.35.0 → 0.36.0

package/dist/core/presence/codec-digest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codec-digest.d.ts","sourceRoot":"","sources":["../../../src/core/presence/codec-digest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAC7B,UAAU,GACV,YAAY,GACZ,OAAO,GACP,MAAM,GACN,MAAM,GACN,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,qBAAqB,CAAC;IAChC,OAAO,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,CAAC,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,qBAAqB,CAAC;QAChC,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,OAAO,GAAG,UAAU,GAAG,WAAW,CAAC;QAC/C,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC;AAYD,+EAA+E;AAC/E,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAI7F;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,SAAS,OAAO,EAAE,GACzB,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAoHlC"}
+{"version":3,"file":"codec-digest.d.ts","sourceRoot":"","sources":["../../../src/core/presence/codec-digest.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAGxD,MAAM,MAAM,qBAAqB,GAC7B,UAAU,GACV,YAAY,GACZ,OAAO,GACP,MAAM,GACN,MAAM,GACN,YAAY,GACZ,OAAO,CAAC;AAEZ,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,qBAAqB,CAAC;IAChC,OAAO,EAAE,IAAI,GAAG,OAAO,GAAG,SAAS,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAClC,cAAc,EAAE,CAAC,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE;QACV,QAAQ,EAAE,qBAAqB,CAAC;QAChC,KAAK,EAAE,MAAM,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,OAAO,CAAC,EAAE;QACR,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,OAAO,GAAG,UAAU,GAAG,WAAW,CAAC;QAC/C,QAAQ,EAAE,MAAM,CAAC;QACjB,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,cAAc,EAAE,mBAAmB,EAAE,CAAC;CACvC;AAYD,+EAA+E;AAC/E,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAI7F;AAED,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,SAAS,OAAO,EAAE,GACzB,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CA0HlC"}

package/dist/core/presence/codec-digest.js

@@ -85,10 +85,21 @@ export function projectPresenceCodecDigests(events) {
                 break;
             case "context.observed": {
                 const measurement = event.payload.measurement;
-                if (measurement.state === "observed" && measurement.value.limit_tokens > 0) {
+                if (measurement.state === "observed") {
+                    const usedPercent = "used_percent" in measurement.value
+                        ? measurement.value.used_percent
+                        : measurement.value.limit_tokens > 0
+                            ? (measurement.value.used_tokens / measurement.value.limit_tokens) * 100
+                            : undefined;
+                    if (usedPercent === undefined)
+                        break;
                     slot.context = {
-                        used_percent: Math.min(100, Math.max(0, Math.round((measurement.value.used_tokens / measurement.value.limit_tokens) * 100))),
-                        confidence: measurement.confidence === "exact" ? "exact" : "reported",
+                        used_percent: Math.min(100, Math.max(0, Math.round(usedPercent))),
+                        confidence: measurement.attestation === "inferred"
+                            ? "estimated"
+                            : measurement.confidence === "exact"
+                                ? "exact"
+                                : "reported",
                         event_id: event.event_id,
                         observed_at: event.time.observed_at,
                     };

package/dist/core/presence/relay-client.d.ts

@@ -29,6 +29,7 @@
 export declare function ensureRelayDaemon(coordRoot: string): void;
 /** Foreground daemon loop (spawned detached by ensureRelayDaemon). */
 export declare function runRelayDaemon(coordRoot: string): Promise<number>;
+export declare function appendPresenceRelayDiagnostic(coordRoot: string, event: string, fields?: Record<string, unknown>): "shared" | "legacy";
 /** Daemon status for `presence peers`/doctor surfaces. */
 export declare function relayDaemonStatus(coordRoot: string): {
     running: boolean;

package/dist/core/presence/relay-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"relay-client.d.ts","sourceRoot":"","sources":["../../../src/core/presence/relay-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAyFH;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAwBzD;AAED,sEAAsE;AACtE,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAoKvE;AAED,0DAA0D;AAC1D,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAMA"}
+{"version":3,"file":"relay-client.d.ts","sourceRoot":"","sources":["../../../src/core/presence/relay-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AA6FH;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CA0BzD;AAED,sEAAsE;AACtE,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAuLvE;AAED,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,EACb,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACnC,QAAQ,GAAG,QAAQ,CAiBrB;AAED,0DAA0D;AAC1D,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAMA"}

package/dist/core/presence/relay-client.js

@@ -22,11 +22,14 @@
  * daemon refuses to start and presence stays on git-refs.
  */
 import { spawn } from "node:child_process";
-import { existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, watch, writeFileSync, } from "node:fs";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, renameSync, rmSync, watch, writeFileSync, } from "node:fs";
 import { join } from "node:path";
+import { coordEnv } from "../../lib/env.js";
 import { resolveMachineLabel } from "../../lib/machine.js";
 import { presenceRelayUrl } from "../config.js";
 import { eventV3ActiveWatchPath } from "../events/v3/reader.js";
+import { closeProcessLoggers, legacyLogFields, processLogger } from "../storage/logger.js";
+import { RotatingTextSink } from "../storage/process-log.js";
 import { buildPresenceBlob } from "./blob.js";
 import { originUrl, rootCommitSha, sanitizeRefComponent } from "./git.js";
 import { computeSenderId, decryptPayload, deriveRoomCredentials, encryptPayload, parseRelayFrame, } from "./relay-protocol.js";
@@ -99,13 +102,16 @@ export function ensureRelayDaemon(coordRoot) {
         if (!existsSync(harnBin))
             return;
         mkdirSync(presenceDir(coordRoot), { recursive: true });
-        const log = openSync(logFilePath(coordRoot), "a");
+        const sharedLogs = coordEnv("SHARED_LOGS") !== "0";
+        const log = sharedLogs ? undefined : openSync(logFilePath(coordRoot), "a");
         const child = spawn(harnBin, ["presence", "relay-daemon"], {
             cwd: coordRoot,
             detached: true,
-            stdio: ["ignore", log, log],
+            stdio: log === undefined ? ["ignore", "ignore", "ignore"] : ["ignore", log, log],
             env: { ...process.env, HARNERY_OUTPUT_SESSION_TEE: "0" },
         });
+        if (log !== undefined)
+            closeSync(log);
         child.unref();
     }
     catch {
@@ -116,17 +122,32 @@ export function ensureRelayDaemon(coordRoot) {
 export async function runRelayDaemon(coordRoot) {
     const url = presenceRelayUrl(coordRoot);
     if (!url) {
-        console.error("relay-daemon: no relay configured (presence.relay)");
+        const message = "relay-daemon: no relay configured (presence.relay)";
+        console.error(message);
+        if (coordEnv("SHARED_LOGS") !== "0") {
+            appendPresenceRelayDiagnostic(coordRoot, "relay.configuration_error", { message });
+        }
+        await closeProcessLoggers();
         return 2;
     }
     if (typeof WebSocket === "undefined") {
-        console.error("relay-daemon: no global WebSocket in this runtime (need Bun or Node >= 21)");
+        const message = "relay-daemon: no global WebSocket in this runtime (need Bun or Node >= 21)";
+        console.error(message);
+        if (coordEnv("SHARED_LOGS") !== "0") {
+            appendPresenceRelayDiagnostic(coordRoot, "relay.runtime_error", { message });
+        }
+        await closeProcessLoggers();
         return 2;
     }
     const sha = rootCommitSha(coordRoot);
     const origin = originUrl(coordRoot);
     if (!sha || !origin) {
-        console.error("relay-daemon: repo has no commits or no origin remote");
+        const message = "relay-daemon: repo has no commits or no origin remote";
+        console.error(message);
+        if (coordEnv("SHARED_LOGS") !== "0") {
+            appendPresenceRelayDiagnostic(coordRoot, "relay.repository_error", { message });
+        }
+        await closeProcessLoggers();
         return 2;
     }
     // Take (or take over) the pid file. A superseded daemon notices and exits.
@@ -152,6 +173,9 @@ export async function runRelayDaemon(coordRoot) {
     let shuttingDown = false;
     const log = (msg) => {
         console.log(`[${new Date().toISOString()}] ${msg}`);
+        if (coordEnv("SHARED_LOGS") !== "0") {
+            appendPresenceRelayDiagnostic(coordRoot, "relay.lifecycle", { message: msg });
+        }
     };
     const publishNow = async (force = false) => {
         if (!ws || ws.readyState !== WebSocket.OPEN)
@@ -265,7 +289,8 @@ export async function runRelayDaemon(coordRoot) {
             catch {
                 /* ignore */
             }
-            process.exit(0);
+            void closeProcessLoggers().finally(() => process.exit(0));
+            return;
         }
         // Idle machine (no live sessions for a while) → exit; hooks restart us.
         if (idleSince && Date.now() - idleSince > IDLE_EXIT_MS) {
@@ -279,12 +304,31 @@ export async function runRelayDaemon(coordRoot) {
             catch {
                 /* ignore */
             }
-            process.exit(0);
+            void closeProcessLoggers().finally(() => process.exit(0));
         }
     }, KEEPALIVE_MS);
     // Never resolves in normal operation; exits happen above.
     return await new Promise(() => { });
 }
+export function appendPresenceRelayDiagnostic(coordRoot, event, fields = {}) {
+    if (coordEnv("SHARED_LOGS") !== "0") {
+        try {
+            const logger = processLogger(coordRoot, "presence-relay");
+            if (event.includes("error"))
+                logger.error(event, legacyLogFields(fields));
+            else
+                logger.info(event, legacyLogFields(fields));
+            return "shared";
+        }
+        catch {
+            // Bootstrap failures retain a bounded text file for process diagnostics.
+        }
+    }
+    const sink = new RotatingTextSink({ path: logFilePath(coordRoot), max_bytes: 512 * 1_024 });
+    sink.append(`${JSON.stringify({ schema_version: 1, ts: new Date().toISOString(), event, ...fields })}\n`);
+    sink.close();
+    return "legacy";
+}
 /** Daemon status for `presence peers`/doctor surfaces. */
 export function relayDaemonStatus(coordRoot) {
     const rec = readPidRecord(coordRoot);

package/dist/core/semantic/adapters.d.ts

@@ -1,12 +1,7 @@
 import type { TSchema } from "@sinclair/typebox";
-import { type SemanticConfiguredModel, type SemanticHarness } from "./contract.js";
+import { type SemanticHarness, type SemanticUsageReceiptV1 } from "./contract.js";
+import { type SemanticReaderRoute } from "./routes.js";
 import type { SemanticReaderResolution } from "./storage.js";
-export interface SemanticReaderRoute {
-    harness: SemanticHarness;
-    binary: string;
-    configured_model: SemanticConfiguredModel;
-    invocation_model_id: string;
-}
 export interface SemanticAdapterSuccess {
     ok: true;
     text: string;
@@ -14,6 +9,7 @@ export interface SemanticAdapterSuccess {
     model_attestation: "verified" | "requested-only";
     duration_ms: number;
     output_bytes: number;
+    usage: SemanticUsageReceiptV1;
 }
 export interface SemanticAdapterFailure {
     ok: false;
@@ -21,6 +17,7 @@ export interface SemanticAdapterFailure {
     resolved_model_id?: string;
     model_attestation?: "verified" | "requested-only";
     duration_ms: number;
+    usage: SemanticUsageReceiptV1;
 }
 export type SemanticAdapterResult = SemanticAdapterSuccess | SemanticAdapterFailure;
 export interface SemanticAdapter {
@@ -28,7 +25,13 @@ export interface SemanticAdapter {
     discover(now?: () => Date): SemanticReaderResolution;
     invoke(prompt: string, timeoutMs?: number, responseSchema?: TSchema): Promise<SemanticAdapterResult>;
 }
-export declare const SEMANTIC_READER_ROUTES: Record<SemanticHarness, SemanticReaderRoute>;
+export { SEMANTIC_READER_ROUTES, type SemanticReaderRoute } from "./routes.js";
 export declare function createSemanticAdapters(): Record<SemanticHarness, SemanticAdapter>;
 export declare function discoverSemanticReaders(adapters?: Record<SemanticHarness, SemanticAdapter>): Record<SemanticHarness, SemanticReaderResolution>;
+export interface ParsedSemanticHarnessOutput {
+    text: string;
+    executedModelId?: string;
+    usage?: SemanticUsageReceiptV1;
+}
+export declare function parseSemanticHarnessOutput(harness: SemanticHarness, stdout: string, outputFileText?: string): ParsedSemanticHarnessOutput;
 //# sourceMappingURL=adapters.d.ts.map

package/dist/core/semantic/adapters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../src/core/semantic/adapters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EACL,KAAK,uBAAuB,EAC5B,KAAK,eAAe,EAErB,MAAM,eAAe,CAAC;AACvB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAM7D,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,eAAe,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB,EAAE,uBAAuB,CAAC;IAC1C,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,UAAU,GAAG,gBAAgB,CAAC;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,KAAK,CAAC;IACV,WAAW,EACP,qBAAqB,GACrB,4BAA4B,GAC5B,mBAAmB,GACnB,gBAAgB,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,UAAU,GAAG,gBAAgB,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAEpF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,GAAG,wBAAwB,CAAC;IACrD,MAAM,CACJ,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACnC;AAED,eAAO,MAAM,sBAAsB,EAAE,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAmB/E,CAAC;AAEF,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAMjF;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,GAAE,MAAM,CAAC,eAAe,EAAE,eAAe,CAA4B,GAC5E,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAMnD"}
+{"version":3,"file":"adapters.d.ts","sourceRoot":"","sources":["../../../src/core/semantic/adapters.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EACL,KAAK,eAAe,EAEpB,KAAK,sBAAsB,EAC5B,MAAM,eAAe,CAAC;AACvB,OAAO,EAA0B,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAC/E,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAW7D,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,IAAI,CAAC;IACT,IAAI,EAAE,MAAM,CAAC;IACb,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,UAAU,GAAG,gBAAgB,CAAC;IACjD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,sBAAsB,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,KAAK,CAAC;IACV,WAAW,EACP,qBAAqB,GACrB,4BAA4B,GAC5B,mBAAmB,GACnB,gBAAgB,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,UAAU,GAAG,gBAAgB,CAAC;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,sBAAsB,CAAC;CAC/B;AAED,MAAM,MAAM,qBAAqB,GAAG,sBAAsB,GAAG,sBAAsB,CAAC;AAEpF,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,GAAG,wBAAwB,CAAC;IACrD,MAAM,CACJ,MAAM,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,qBAAqB,CAAC,CAAC;CACnC;AAED,OAAO,EAAE,sBAAsB,EAAE,KAAK,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/E,wBAAgB,sBAAsB,IAAI,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,CAMjF;AAED,wBAAgB,uBAAuB,CACrC,QAAQ,GAAE,MAAM,CAAC,eAAe,EAAE,eAAe,CAA4B,GAC5E,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC,CAMnD;AAwKD,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,sBAAsB,CAAC;CAChC;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,MAAM,EACd,cAAc,CAAC,EAAE,MAAM,GACtB,2BAA2B,CAsC7B"}

package/dist/core/semantic/adapters.js

@@ -5,29 +5,12 @@ import { join } from "node:path";
 import { promisify } from "node:util";
 import { whichBin } from "../../lib/headless/index.js";
 import { SemanticModelReplyV2Schema, } from "./contract.js";
+import { SEMANTIC_READER_ROUTES } from "./routes.js";
+import { estimateVisibleSemanticUsage, nativeSemanticUsage, unreportedSemanticUsage, } from "./usage.js";
 const execFileAsync = promisify(execFile);
 const MAX_OUTPUT_BYTES = 512 * 1024;
 const DEFAULT_TIMEOUT_MS = 90_000;
-export const SEMANTIC_READER_ROUTES = {
-    "claude-code": {
-        harness: "claude-code",
-        binary: "claude",
-        configured_model: "haiku-4.5",
-        invocation_model_id: "claude-haiku-4-5-20251001",
-    },
-    codex: {
-        harness: "codex",
-        binary: "codex",
-        configured_model: "gpt-5.6-luna",
-        invocation_model_id: "gpt-5.6-luna",
-    },
-    cursor: {
-        harness: "cursor",
-        binary: "cursor-agent",
-        configured_model: "composer-2.5",
-        invocation_model_id: "composer-2.5",
-    },
-};
+export { SEMANTIC_READER_ROUTES } from "./routes.js";
 export function createSemanticAdapters() {
     return {
         "claude-code": createAdapter(SEMANTIC_READER_ROUTES["claude-code"]),
@@ -62,7 +45,12 @@ function createAdapter(route) {
         },
         async invoke(prompt, timeoutMs = DEFAULT_TIMEOUT_MS, responseSchema = SemanticModelReplyV2Schema) {
             if (!whichBin(route.binary)) {
-                return { ok: false, reason_code: "harness_unavailable", duration_ms: 0 };
+                return {
+                    ok: false,
+                    reason_code: "harness_unavailable",
+                    duration_ms: 0,
+                    usage: unreportedSemanticUsage(),
+                };
             }
             return await invokeRoute(route, prompt, timeoutMs, responseSchema);
         },
@@ -81,17 +69,21 @@ async function invokeRoute(route, prompt, timeoutMs, responseSchema) {
         });
         pending.child.stdin?.end();
         const { stdout } = await pending;
-        const raw = invocation.outputFile ? readFileSync(invocation.outputFile, "utf8") : stdout;
-        const parsed = parseHarnessOutput(route.harness, raw);
+        const outputFileText = invocation.outputFile
+            ? readFileSync(invocation.outputFile, "utf8")
+            : undefined;
+        const parsed = parseSemanticHarnessOutput(route.harness, stdout, outputFileText);
         if (!parsed.text.trim())
             throw new Error("empty semantic response");
-        if (parsed.executedModelId && parsed.executedModelId !== route.invocation_model_id) {
+        if (parsed.executedModelId &&
+            !modelIdsMatch(parsed.executedModelId, route.invocation_model_id)) {
             return {
                 ok: false,
                 reason_code: "model_mismatch",
                 resolved_model_id: parsed.executedModelId,
                 model_attestation: "verified",
                 duration_ms: Date.now() - started,
+                usage: parsed.usage ?? unreportedSemanticUsage(),
             };
         }
         return {
@@ -101,6 +93,7 @@ async function invokeRoute(route, prompt, timeoutMs, responseSchema) {
             model_attestation: parsed.executedModelId ? "verified" : "requested-only",
             duration_ms: Date.now() - started,
             output_bytes: Buffer.byteLength(parsed.text),
+            usage: parsed.usage ?? estimateVisibleSemanticUsage(prompt, parsed.text),
         };
     }
     catch (error) {
@@ -110,6 +103,7 @@ async function invokeRoute(route, prompt, timeoutMs, responseSchema) {
             resolved_model_id: route.invocation_model_id,
             model_attestation: "requested-only",
             duration_ms: Date.now() - started,
+            usage: unreportedSemanticUsage(),
         };
     }
     finally {
@@ -156,6 +150,7 @@ function buildInvocation(route, prompt, dir, responseSchema) {
                 "--ephemeral",
                 "--ignore-user-config",
                 "--ignore-rules",
+                "--json",
                 "--output-last-message",
                 outputFile,
                 "--cd",
@@ -169,7 +164,7 @@ function buildInvocation(route, prompt, dir, responseSchema) {
             "-p",
             prompt,
             "--output-format",
-            "json",
+            "stream-json",
             "--mode",
             "ask",
             "--sandbox",
@@ -180,24 +175,167 @@ function buildInvocation(route, prompt, dir, responseSchema) {
         ],
     };
 }
-function parseHarnessOutput(harness, raw) {
+export function parseSemanticHarnessOutput(harness, stdout, outputFileText) {
     if (harness === "codex")
-        return { text: raw };
+        return parseCodexOutput(stdout, outputFileText);
+    if (harness === "cursor")
+        return parseCursorOutput(stdout);
     try {
-        const envelope = JSON.parse(raw);
+        const envelope = JSON.parse(stdout);
         if (envelope.is_error)
             throw new Error("harness returned an error envelope");
+        const structured = envelope.structured_output;
+        const modelUsage = objectValue(envelope.modelUsage) ?? objectValue(envelope.model_usage);
+        const modelUsageEntries = modelUsage ? Object.entries(modelUsage) : [];
+        const executedModelId = typeof envelope.model === "string"
+            ? envelope.model
+            : modelUsageEntries.length === 1
+                ? modelUsageEntries[0][0]
+                : undefined;
+        const usage = parseClaudeUsage(envelope.usage) ?? aggregateClaudeModelUsage(modelUsageEntries);
         return {
-            text: typeof envelope.result === "string" ? envelope.result : "",
-            ...(typeof envelope.model === "string" ? { executedModelId: envelope.model } : {}),
+            text: structured !== undefined
+                ? JSON.stringify(structured)
+                : typeof envelope.result === "string"
+                    ? envelope.result
+                    : "",
+            ...(executedModelId ? { executedModelId } : {}),
+            ...(usage ? { usage } : {}),
         };
     }
     catch (error) {
         if (error instanceof SyntaxError)
-            return { text: raw };
+            return { text: stdout };
         throw error;
     }
 }
+function parseCodexOutput(stdout, outputFileText) {
+    const events = parseJsonLines(stdout);
+    const completed = [...events]
+        .reverse()
+        .find((event) => event.type === "turn.completed" && objectValue(event.usage));
+    const usage = completed ? parseCodexUsage(completed.usage) : undefined;
+    const streamedText = [...events]
+        .reverse()
+        .map((event) => objectValue(event.item))
+        .find((item) => item?.type === "agent_message" && typeof item.text === "string")?.text;
+    return {
+        text: outputFileText ?? (typeof streamedText === "string" ? streamedText : ""),
+        ...(usage ? { usage } : {}),
+    };
+}
+function parseCursorOutput(stdout) {
+    const events = parseJsonLines(stdout);
+    const init = events.find((event) => event.type === "system" && event.subtype === "init" && typeof event.model === "string");
+    const terminal = [...events]
+        .reverse()
+        .find((event) => event.type === "result" && typeof event.result === "string");
+    if (!terminal) {
+        try {
+            const envelope = JSON.parse(stdout);
+            if (envelope.is_error)
+                throw new Error("harness returned an error envelope");
+            return {
+                text: typeof envelope.result === "string" ? envelope.result : "",
+                ...(typeof envelope.model === "string" ? { executedModelId: envelope.model } : {}),
+                ...(parseCursorUsage(envelope.usage) ? { usage: parseCursorUsage(envelope.usage) } : {}),
+            };
+        }
+        catch (error) {
+            if (error instanceof SyntaxError)
+                return { text: stdout };
+            throw error;
+        }
+    }
+    if (terminal.is_error)
+        throw new Error("harness returned an error envelope");
+    const usage = parseCursorUsage(terminal.usage);
+    return {
+        text: terminal.result,
+        ...(typeof init?.model === "string" ? { executedModelId: init.model } : {}),
+        ...(usage ? { usage } : {}),
+    };
+}
+function parseClaudeUsage(value) {
+    const usage = objectValue(value);
+    if (!usage)
+        return undefined;
+    return nativeSemanticUsage({
+        input_tokens: usage.input_tokens,
+        cached_input_tokens: usage.cache_read_input_tokens,
+        cache_creation_input_tokens: usage.cache_creation_input_tokens,
+        output_tokens: usage.output_tokens,
+        reasoning_tokens: usage.reasoning_tokens ?? usage.reasoning_output_tokens,
+        total_tokens: usage.total_tokens,
+    });
+}
+function aggregateClaudeModelUsage(entries) {
+    const values = {};
+    for (const [, raw] of entries) {
+        const usage = objectValue(raw);
+        if (!usage)
+            continue;
+        addNumber(values, "input_tokens", usage.inputTokens);
+        addNumber(values, "cached_input_tokens", usage.cacheReadInputTokens);
+        addNumber(values, "cache_creation_input_tokens", usage.cacheCreationInputTokens);
+        addNumber(values, "output_tokens", usage.outputTokens);
+    }
+    return nativeSemanticUsage(values);
+}
+function parseCodexUsage(value) {
+    const usage = objectValue(value);
+    if (!usage)
+        return undefined;
+    return nativeSemanticUsage({
+        input_tokens: usage.input_tokens,
+        cached_input_tokens: usage.cached_input_tokens,
+        cache_creation_input_tokens: usage.cache_write_input_tokens,
+        output_tokens: usage.output_tokens,
+        reasoning_tokens: usage.reasoning_output_tokens,
+        total_tokens: usage.total_tokens,
+    });
+}
+function parseCursorUsage(value) {
+    const usage = objectValue(value);
+    if (!usage)
+        return undefined;
+    return nativeSemanticUsage({
+        input_tokens: usage.inputTokens ?? usage.input_tokens,
+        cached_input_tokens: usage.cacheReadTokens ?? usage.cachedInputTokens ?? usage.cached_input_tokens,
+        cache_creation_input_tokens: usage.cacheWriteTokens ?? usage.cacheCreationInputTokens ?? usage.cache_write_input_tokens,
+        output_tokens: usage.outputTokens ?? usage.output_tokens,
+        reasoning_tokens: usage.reasoningTokens ?? usage.reasoning_output_tokens,
+        total_tokens: usage.totalTokens ?? usage.total_tokens,
+    });
+}
+function parseJsonLines(raw) {
+    return raw
+        .split(/\r?\n/)
+        .filter((line) => line.trim().length > 0)
+        .flatMap((line) => {
+        try {
+            const value = JSON.parse(line);
+            return objectValue(value) ? [value] : [];
+        }
+        catch {
+            return [];
+        }
+    });
+}
+function objectValue(value) {
+    return value !== null && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+}
+function addNumber(target, field, value) {
+    if (typeof value === "number" && Number.isSafeInteger(value) && value >= 0) {
+        target[field] = (target[field] ?? 0) + value;
+    }
+}
+function modelIdsMatch(attested, requested) {
+    const normalize = (value) => value.toLowerCase().replace(/[^a-z0-9]+/g, "-");
+    return normalize(attested) === normalize(requested);
+}
 function semanticChildEnv() {
     const env = { ...process.env };
     for (const key of Object.keys(env)) {