crewly 1.20.195 → 1.20.196

package/dist/backend/backend/src/services/monitoring/agent-turn-state.js

@@ -0,0 +1,391 @@
+/**
+ * Agent Turn State
+ *
+ * Whether an agent is mid-turn according to its runtime, not according to
+ * its screen. Long tool calls, a model writing a long tool input and
+ * background subagents are all silent on the PTY. Reading silence as "idle"
+ * let a restart kill Eve mid-work (2026-10-02, TKT-194). See
+ * specs/2026-10-02-restart-busy-and-resume.md.
+ *
+ * Sources:
+ * - Claude Code hooks (POST /api/agent-hooks): SessionStart, UserPromptSubmit,
+ *   PreToolUse, PostToolUse, SubagentStart, SubagentStop, Stop. Only
+ *   identifiers are kept (event names, tool-use ids, subagent ids), never
+ *   payload content.
+ * - The Claude Code transcript (see claude-transcript-turn.ts).
+ *
+ * How they combine:
+ * - The hooks lead. A transcript turn end (end_turn, interrupt, API or
+ *   usage-limit error) newer than the last hook event ends a hook `turn`:
+ *   Esc and API errors fire no Stop hook.
+ * - `Stop` clears open tool calls and holds the turn's subagents. Held
+ *   subagents count as `background` only while the transcript (Claude Code's
+ *   own pending-background count) agrees; a transcript turn end with nothing
+ *   pending drops them.
+ * - A transcript-only `background` (no hook saw a subagent) is reported as
+ *   `idle`: on its own it never blocks the drain or settling.
+ * - A transcript `turn` newer than the last hook event (a lost hook) is a turn.
+ *
+ * Verdicts:
+ * - `turn`: a turn is in progress;
+ * - `background`: the turn ended, but a subagent is still running and will
+ *   start a new turn when it finishes;
+ * - `idle`: the runtime said the turn ended and nothing is pending;
+ * - `unknown`: no trustworthy signal; callers fall back to the screen.
+ *
+ * @module services/monitoring/agent-turn-state
+ */
+import { TURN_STATE_CONSTANTS } from '../../constants.js';
+import { claudeTranscriptTurnState } from './claude-transcript-turn.js';
+/** Hook events this service reads. */
+const TURN_EVENTS = new Set(['SessionStart', 'UserPromptSubmit', 'PreToolUse', 'PostToolUse', 'SubagentStart', 'SubagentStop', 'Stop']);
+/** SessionStart sources that mean a new runtime process. */
+const RUNTIME_START_SOURCES = new Set(['startup', 'resume']);
+/** Prefix of synthetic ids for subagents that reported none. */
+const ANON = '\u0000anon-';
+const UNKNOWN = { state: 'unknown', longRunning: false, since: null, source: 'none' };
+/**
+ * Oldest value, or null.
+ *
+ * @param values - Timestamps
+ * @returns Smallest, or null when empty
+ */
+function oldest(values) {
+    let min = null;
+    for (const v of values)
+        if (min === null || v < min)
+            min = v;
+    return min;
+}
+/**
+ * Process-wide runtime turn state. Singleton; in memory only (a backend
+ * restart kills the agents too, so nothing needs to survive one).
+ */
+export class AgentTurnStateService {
+    static instance = null;
+    records = new Map();
+    transcriptLocator = null;
+    /** Located transcript per session, re-resolved after LOCATOR_CACHE_MS */
+    located = new Map();
+    /**
+     * @returns The singleton
+     */
+    static getInstance() {
+        if (!AgentTurnStateService.instance)
+            AgentTurnStateService.instance = new AgentTurnStateService();
+        return AgentTurnStateService.instance;
+    }
+    /** Reset the singleton (tests only). */
+    static resetInstance() {
+        AgentTurnStateService.instance = null;
+    }
+    /**
+     * Install the transcript locator.
+     *
+     * @param locator - Locator, or null to disable the transcript
+     */
+    setTranscriptLocator(locator) {
+        this.transcriptLocator = locator;
+        this.located.clear();
+    }
+    /**
+     * A runtime process was (re)started for the session: forget its old turn
+     * state, and ignore transcript background launches from before now.
+     *
+     * @param sessionName - Session
+     * @param now - Start time
+     */
+    noteRuntimeStart(sessionName, now = Date.now()) {
+        this.records.delete(sessionName);
+        this.located.delete(sessionName);
+        const r = this.recordFor(sessionName, now);
+        r.runtimeStartedAt = now;
+    }
+    /**
+     * Record a Claude Code hook event.
+     *
+     * @param sessionName - Reporting session
+     * @param event - Hook event name (validated by the caller)
+     * @param ids - Tool-use / subagent ids and SessionStart source, already validated
+     * @param now - Clock
+     * @returns True when the event changed the turn state model
+     */
+    recordHook(sessionName, event, ids = {}, now = Date.now()) {
+        if (!TURN_EVENTS.has(event))
+            return false;
+        if (event === 'SessionStart') {
+            if (ids.source && RUNTIME_START_SOURCES.has(ids.source)) {
+                this.noteRuntimeStart(sessionName, now);
+            }
+            else {
+                // /clear or compaction: same process, maybe another transcript file.
+                this.located.delete(sessionName);
+            }
+            return true;
+        }
+        const r = this.recordFor(sessionName, now);
+        r.lastEventAt = now;
+        const markActive = () => {
+            if (!r.active) {
+                r.active = true;
+                r.activeSince = now;
+            }
+        };
+        const max = TURN_STATE_CONSTANTS.MAX_OPEN_PER_SESSION;
+        switch (event) {
+            case 'UserPromptSubmit':
+                markActive();
+                break;
+            case 'PreToolUse':
+                markActive();
+                if (ids.toolUseId && r.openTools.size < max)
+                    r.openTools.set(ids.toolUseId, now);
+                break;
+            case 'PostToolUse':
+                markActive();
+                if (ids.toolUseId)
+                    r.openTools.delete(ids.toolUseId);
+                break;
+            case 'SubagentStart':
+                if (r.subagents.size < max)
+                    r.subagents.set(ids.agentId ?? `${ANON}${r.anonSeq++}`, now);
+                break;
+            case 'SubagentStop': {
+                const removeFrom = (m) => {
+                    if (ids.agentId && m.delete(ids.agentId))
+                        return true;
+                    if (!ids.agentId) {
+                        const anon = [...m.keys()].find((k) => k.startsWith(ANON)) ?? m.keys().next().value;
+                        if (anon !== undefined)
+                            return m.delete(anon);
+                    }
+                    return false;
+                };
+                if (!removeFrom(r.subagents))
+                    removeFrom(r.heldSubagents);
+                // The parent is notified and resumes: its turn is active again
+                // until the next Stop (2026-10-02, Eve's 04:41:11 turn).
+                markActive();
+                break;
+            }
+            case 'Stop':
+                this.endTurn(r, now);
+                break;
+        }
+        return true;
+    }
+    /**
+     * Forget a session (its runtime exited).
+     *
+     * @param sessionName - Session
+     */
+    forget(sessionName) {
+        this.records.delete(sessionName);
+        this.located.delete(sessionName);
+    }
+    /**
+     * Sessions that reported a hook event (still remembered).
+     *
+     * @returns Session names
+     */
+    knownSessions() {
+        return [...this.records.keys()];
+    }
+    /**
+     * Epoch ms of the session's last hook event, or null when it never sent one.
+     *
+     * @param sessionName - Session
+     * @returns Time or null
+     */
+    lastHookEventAt(sessionName) {
+        const r = this.records.get(sessionName);
+        return r && r.lastEventAt > 0 ? r.lastEventAt : null;
+    }
+    /**
+     * What the hooks alone say (held subagents count as background here).
+     *
+     * @param sessionName - Session
+     * @param now - Clock
+     * @returns Verdict (`unknown` without hooks or after a long silence)
+     */
+    hookVerdict(sessionName, now = Date.now()) {
+        const r = this.records.get(sessionName);
+        if (!r || r.lastEventAt === 0)
+            return UNKNOWN;
+        this.expire(r, now);
+        const subs = r.subagents.size + r.heldSubagents.size;
+        if (r.active) {
+            const open = r.openTools.size > 0 || subs > 0;
+            if (open || now - r.lastEventAt <= TURN_STATE_CONSTANTS.HOOK_SILENCE_MS) {
+                return { state: 'turn', longRunning: open, since: r.activeSince, source: 'hooks' };
+            }
+            // A lost Stop must not pin the agent as busy forever.
+            return UNKNOWN;
+        }
+        if (subs > 0) {
+            return { state: 'background', longRunning: true, since: oldest([...r.subagents.values(), ...r.heldSubagents.values()]), source: 'hooks' };
+        }
+        return { state: 'idle', longRunning: false, since: null, source: 'hooks' };
+    }
+    /**
+     * Combined verdict (see the module doc for the rules).
+     *
+     * @param sessionName - Session
+     * @param now - Clock
+     * @returns Verdict
+     *
+     * @example
+     * ```typescript
+     * const v = AgentTurnStateService.getInstance().getVerdict('eve-1');
+     * if (v.state === 'turn' || v.state === 'background') // do not call it idle
+     * ```
+     */
+    getVerdict(sessionName, now = Date.now()) {
+        const r = this.records.get(sessionName);
+        const t = this.readTranscript(sessionName, now, r?.runtimeStartedAt ?? undefined);
+        const transcriptTurn = t !== null && t.verdict === 'turn' && now - t.mtimeMs <= TURN_STATE_CONSTANTS.TRANSCRIPT_FRESH_MS;
+        const asTranscriptTurn = () => ({
+            state: 'turn',
+            longRunning: false,
+            since: t && Number.isFinite(t.lastEntryAt) ? t.lastEntryAt : null,
+            source: 'transcript',
+        });
+        if (!r || r.lastEventAt === 0) {
+            if (transcriptTurn)
+                return asTranscriptTurn();
+            // A transcript-only "background" never blocks on its own.
+            if (t && (t.verdict === 'idle' || t.verdict === 'background'))
+                return { state: 'idle', longRunning: false, since: null, source: 'transcript' };
+            return UNKNOWN;
+        }
+        // Esc, API errors and usage limits end the turn with no Stop hook: a
+        // transcript turn end newer than the last hook event ends it here too.
+        if (r.active && t && Number.isFinite(t.turnEndedAt) && t.turnEndedAt > r.lastEventAt) {
+            this.endTurn(r, t.turnEndedAt);
+        }
+        const hooks = this.hookVerdict(sessionName, now);
+        if (hooks.state === 'turn')
+            return hooks;
+        if (hooks.state === 'background') {
+            // Held subagents need Claude Code's own word that they still run.
+            // (A transcript still mid-flush — its last entry the turn's tool
+            // result — agrees too when it lists the launch as pending.)
+            const agrees = t !== null && t.pendingBackground > 0 && (t.verdict === 'background' || transcriptTurn);
+            const liveSince = oldest(r.subagents.values());
+            if (r.subagents.size > 0 || agrees) {
+                return { ...hooks, ...(agrees ? {} : { since: liveSince }) };
+            }
+            if (t !== null && t.verdict === 'idle' && r.stoppedAt !== null && Number.isFinite(t.turnEndedAt) && t.turnEndedAt >= r.stoppedAt - TURN_STATE_CONSTANTS.TRANSCRIPT_LAG_MS) {
+                r.heldSubagents.clear(); // the transcript says nothing is pending: they were stale
+            }
+            if (!t)
+                r.heldSubagents.clear(); // no second opinion: Stop clears them
+            return { state: 'idle', longRunning: false, since: null, source: 'hooks' };
+        }
+        // A turn the hooks missed (a failed POST) but the transcript shows.
+        if (transcriptTurn && t && t.lastEntryAt > r.lastEventAt)
+            return asTranscriptTurn();
+        return hooks;
+    }
+    /**
+     * Whether the agent still has background work after its turn ended: the
+     * work it is answering for is not finished yet.
+     *
+     * @param sessionName - Session
+     * @param now - Clock
+     * @returns True for a `background` verdict
+     */
+    hasBackgroundWork(sessionName, now = Date.now()) {
+        return this.getVerdict(sessionName, now).state === 'background';
+    }
+    /**
+     * End a record's turn: open tools are cleared, the turn's subagents are held.
+     *
+     * @param r - Record
+     * @param at - When the turn ended
+     */
+    endTurn(r, at) {
+        r.active = false;
+        r.stoppedAt = at;
+        r.openTools.clear();
+        for (const [id, startedAt] of r.subagents)
+            r.heldSubagents.set(id, startedAt);
+        r.subagents.clear();
+    }
+    /**
+     * Drop open tool calls and subagents older than OPEN_WORK_MAX_MS.
+     *
+     * @param r - Record
+     * @param now - Clock
+     */
+    expire(r, now) {
+        const maxAge = TURN_STATE_CONSTANTS.OPEN_WORK_MAX_MS;
+        for (const m of [r.openTools, r.subagents, r.heldSubagents]) {
+            for (const [id, at] of m)
+                if (now - at > maxAge)
+                    m.delete(id);
+        }
+    }
+    /**
+     * Read the session's transcript, if a locator finds one.
+     *
+     * @param sessionName - Session
+     * @param now - Clock
+     * @param launchedAfter - Runtime start (older launches ignored)
+     * @returns The transcript state, or null
+     */
+    readTranscript(sessionName, now, launchedAfter) {
+        if (!this.transcriptLocator)
+            return null;
+        const cached = this.located.get(sessionName);
+        let file;
+        if (cached && now - cached.at < TURN_STATE_CONSTANTS.LOCATOR_CACHE_MS) {
+            file = cached.file;
+        }
+        else {
+            try {
+                file = this.transcriptLocator(sessionName);
+            }
+            catch {
+                file = null;
+            }
+            if (this.located.size >= TURN_STATE_CONSTANTS.MAX_TRACKED_SESSIONS)
+                this.located.clear();
+            this.located.set(sessionName, { file, at: now });
+        }
+        if (!file)
+            return null;
+        return claudeTranscriptTurnState(file, launchedAfter !== undefined ? { launchedAfter } : {});
+    }
+    /**
+     * Get or create a session's record (bounded).
+     *
+     * @param sessionName - Session
+     * @param now - Clock
+     * @returns The record
+     */
+    recordFor(sessionName, now) {
+        let r = this.records.get(sessionName);
+        if (r)
+            return r;
+        if (this.records.size >= TURN_STATE_CONSTANTS.MAX_TRACKED_SESSIONS) {
+            const first = this.records.keys().next().value;
+            if (first !== undefined)
+                this.records.delete(first);
+        }
+        r = {
+            active: false,
+            activeSince: now,
+            lastEventAt: 0,
+            stoppedAt: null,
+            runtimeStartedAt: null,
+            openTools: new Map(),
+            subagents: new Map(),
+            heldSubagents: new Map(),
+            anonSeq: 0,
+        };
+        this.records.set(sessionName, r);
+        return r;
+    }
+}
+//# sourceMappingURL=agent-turn-state.js.map

package/dist/backend/backend/src/services/monitoring/agent-turn-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"agent-turn-state.js","sourceRoot":"","sources":["../../../../../../backend/src/services/monitoring/agent-turn-state.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/services/monitoring/claude-transcript-sync.service.d.ts

@@ -39,6 +39,7 @@
  *
  * @module services/monitoring/claude-transcript-sync
  */
+import { type CostRepairPlan } from './transcript-cost-repair.js';
 /**
  * How far a single session's transcript has been consumed.
  *
@@ -87,8 +88,12 @@ export interface TranscriptCursor {
      * pointed at one foreign transcript and each accumulated its whole cost —
      * Atlas and Max each showed ~$300. Cursors without this mark are recounted
      * once on load.
+     *
+     * `3` once `cost` has been checked against the token ledger and, if it was
+     * double-counted by the recount bug (#972, v1.20.89–v1.20.192), lowered to
+     * the ledger cost (#990). New cursors start at `3`.
      */
-    costBasis?: 2;
+    costBasis?: 2 | 3;
 }
 /** One agent's context size, as measured from its latest transcript turn. */
 export interface ContextReading {
@@ -263,6 +268,35 @@ export declare class ClaudeTranscriptSyncService {
     private emitContext;
     /** Reads persisted cursors; a missing or corrupt file starts fresh. */
     private loadCursors;
+    /**
+     * #990: one-time repair of cursors whose `cost` was double-counted by the
+     * recount bug (#972). Each cursor not yet at `costBasis: 3` is checked
+     * against its session's token-ledger cost: one clearly above the ledger is
+     * lowered to it, one that is not is left alone. Either way it is marked
+     * `costBasis: 3` so it is never checked again. A cursor whose ledger cannot
+     * be trusted yet (no events, or the newest transcript turn is missing from
+     * the ledger) is left unmarked and checked again on the next start.
+     *
+     * Every change is logged with the before and after figures. With `dryRun`
+     * nothing is changed or marked; the plan is only logged and returned.
+     *
+     * Expects the token ledger to be loaded already (the server loads it before
+     * starting this service).
+     *
+     * @param options.dryRun - Log what would change, change nothing
+     * @returns The plan that was applied (or would be, in a dry run)
+     */
+    repairDoubleCountedCosts(options?: {
+        dryRun?: boolean;
+    }): Promise<CostRepairPlan>;
+    /**
+     * The newest assistant turn this cursor has counted in its current
+     * transcript, as a ledger match key.
+     *
+     * @param cursor - The cursor
+     * @returns The key; null when nothing has been counted there yet; undefined when the transcript cannot be read
+     */
+    private newestCountedTurn;
     /**
      * Recount, once, the cost of every cursor written before the shared-cwd
      * guard, from its own transcript alone.

package/dist/backend/backend/src/services/monitoring/claude-transcript-sync.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-transcript-sync.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/monitoring/claude-transcript-sync.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAcH;;;;;GAKG;AACH,MAAM,WAAW,gBAAgB;IAChC,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,mCAAmC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;;OAOG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC;;;;;;;OAOG;IACH,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,4DAA4D;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;OAQG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;;OAOG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,WAAW,cAAc;IAC9B,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,aAAa,EAAE,MAAM,CAAC;IACtB,sCAAsC;IACtC,KAAK,EAAE,MAAM,CAAC;CACd;AAED,6EAA6E;AAC7E,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI,CAAC;AAEhE,8DAA8D;AAC9D,MAAM,WAAW,UAAU;IAC1B,8CAA8C;IAC9C,eAAe,EAAE,MAAM,CAAC;IACxB,sDAAsD;IACtD,YAAY,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,8DAA8D;IAC9D,yBAAyB,EAAE,MAAM,CAAC;CAClC;AAqBD;;;;;;;;;GASG;AACH,qBAAa,2BAA2B;IACvC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAA4C;IAEnE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAkB;IACzC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,+EAA+E;IAC/E,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAA8B;IAC/D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,KAAK,CAA+C;IAC5D,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,MAAM,CAAS;IACvB,4DAA4D;IAC5D,OAAO,CAAC,OAAO,CAAS;IAExB;;;;OAIG;gBACS,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,MAAM;IAQjG;;;;OAIG;IACH,MAAM,CAAC,WAAW,IAAI,2BAA2B;IAOjD,uDAAuD;IACvD,MAAM,CAAC,aAAa,IAAI,IAAI;IAK5B;;;;OAIG;IACH,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;IAIjD;;;;OAIG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAe5B,6DAA6D;IAC7D,IAAI,IAAI,IAAI;IAOZ;;;;;;;;OAQG;IACG,IAAI,IAAI,OAAO,CAAC,UAAU,CAAC;IA0FjC;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB;IAU3B;;;;;;;;;;;;;;OAcG;YACW,iBAAiB;IAgC/B;;;;;;;;;;;;;;;;;OAiBG;YACW,OAAO;IAoDrB;;;;;;;;;OASG;YACW,OAAO;IA8DrB;;;;;;;;;;;OAWG;YACW,QAAQ;IAYtB;;;;;;OAMG;IACH,OAAO,CAAC,UAAU;IAiDlB;;;;OAIG;IACH,OAAO,CAAC,WAAW;IAanB,uEAAuE;YACzD,WAAW;IAazB;;;;;;;;OAQG;YACW,kBAAkB;IA0ChC,0EAA0E;YAC5D,WAAW;IAezB;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;CAG5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,IAAI,2BAA2B,CAErE"}
+{"version":3,"file":"claude-transcript-sync.service.d.ts","sourceRoot":"","sources":["../../../../../../backend/src/services/monitoring/claude-transcript-sync.service.ts"],"names":[],"mappings":"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"}

package/dist/backend/backend/src/services/monitoring/claude-transcript-sync.service.js

@@ -50,6 +50,7 @@ import { CLAUDE_TRANSCRIPT_SYNC_CONSTANTS } from '../../constants.js';
 import { findLatestSessionFile, findSessionJsonlPath } from './claude-session-tokens.service.js';
 import { effectiveClaudeAccount } from '../runtime-fallback/effective-runtime.js';
 import { claudeAccountConfigDir } from '../harness/claude-accounts.js';
+import { planCostRepair, ledgerEventCost } from './transcript-cost-repair.js';
 /**
  * Reads Claude Code transcripts on an interval and records exact token usage.
  *
@@ -315,7 +316,7 @@ export class ClaudeTranscriptSyncService {
     async syncOne(sessionName, filePath, ownedByOther = () => false) {
         let cursor = this.cursors.get(sessionName);
         if (!cursor) {
-            cursor = { filePath, offset: 0, seenMessageIds: [], cost: 0, costBasis: 2 };
+            cursor = { filePath, offset: 0, seenMessageIds: [], cost: 0, costBasis: 3 };
             this.cursors.set(sessionName, cursor);
         }
         let turns = 0;
@@ -521,7 +522,131 @@ export class ClaudeTranscriptSyncService {
         }
         catch {
             this.cursors = new Map();
+            return;
+        }
+        try {
+            await this.repairDoubleCountedCosts({
+                dryRun: process.env[CLAUDE_TRANSCRIPT_SYNC_CONSTANTS.COST_REPAIR_DRY_RUN_ENV] === '1',
+            });
+        }
+        catch (err) {
+            this.logger.warn('Transcript cost repair failed; cursors left as they were', {
+                error: err instanceof Error ? err.message : String(err),
+            });
+        }
+    }
+    /**
+     * #990: one-time repair of cursors whose `cost` was double-counted by the
+     * recount bug (#972). Each cursor not yet at `costBasis: 3` is checked
+     * against its session's token-ledger cost: one clearly above the ledger is
+     * lowered to it, one that is not is left alone. Either way it is marked
+     * `costBasis: 3` so it is never checked again. A cursor whose ledger cannot
+     * be trusted yet (no events, or the newest transcript turn is missing from
+     * the ledger) is left unmarked and checked again on the next start.
+     *
+     * Every change is logged with the before and after figures. With `dryRun`
+     * nothing is changed or marked; the plan is only logged and returned.
+     *
+     * Expects the token ledger to be loaded already (the server loads it before
+     * starting this service).
+     *
+     * @param options.dryRun - Log what would change, change nothing
+     * @returns The plan that was applied (or would be, in a dry run)
+     */
+    async repairDoubleCountedCosts(options = {}) {
+        const pending = [...this.cursors].filter(([, cursor]) => cursor.costBasis !== 3);
+        if (pending.length === 0)
+            return { changes: [], verified: [], skipped: [] };
+        const pendingNames = new Set(pending.map(([name]) => name));
+        const ledgerCost = new Map();
+        const ledgerTurns = new Map();
+        TokenUsageService.getInstance().forEachEvent((sessionName, event) => {
+            if (!pendingNames.has(sessionName))
+                return;
+            ledgerCost.set(sessionName, (ledgerCost.get(sessionName) ?? 0) + ledgerEventCost(event));
+            const turns = ledgerTurns.get(sessionName) ?? new Set();
+            turns.add(turnKey(event.timestamp, event.input, event.output));
+            ledgerTurns.set(sessionName, turns);
+        });
+        // Is the ledger current for a session? Its newest counted transcript turn must be in it.
+        const current = new Map();
+        for (const [sessionName, cursor] of pending) {
+            if (!ledgerCost.has(sessionName))
+                continue;
+            const newest = await this.newestCountedTurn(cursor);
+            current.set(sessionName, newest === undefined ? undefined : newest === null ? true : ledgerTurns.get(sessionName)?.has(newest) === true);
+        }
+        const plan = planCostRepair(Object.fromEntries(pending), (sessionName) => {
+            const cost = ledgerCost.get(sessionName);
+            return cost === undefined ? undefined : { cost, current: current.get(sessionName) };
+        });
+        const round = (usd) => Math.round(usd * 100) / 100;
+        for (const change of plan.changes) {
+            this.logger.info(options.dryRun
+                ? 'Cost repair (dry run): would lower a double-counted session cost to its ledger cost'
+                : 'Cost repair: lowered a double-counted session cost to its ledger cost', {
+                sessionName: change.sessionName,
+                was: round(change.was),
+                now: round(change.now),
+                removed: round(change.excess),
+            });
+        }
+        this.logger.info(options.dryRun ? 'Cost repair dry run finished; nothing changed' : 'Cost repair finished', {
+            lowered: plan.changes.length,
+            removedUsd: round(plan.changes.reduce((n, c) => n + c.excess, 0)),
+            alreadyCorrect: plan.verified.length,
+            skipped: plan.skipped,
+        });
+        if (options.dryRun)
+            return plan;
+        for (const change of plan.changes) {
+            const cursor = this.cursors.get(change.sessionName);
+            if (!cursor)
+                continue;
+            cursor.cost = change.now;
+            cursor.costBasis = 3;
+            TokenUsageService.getInstance().overrideSessionCost(change.sessionName, cursor.cost);
+        }
+        for (const sessionName of plan.verified) {
+            const cursor = this.cursors.get(sessionName);
+            if (cursor)
+                cursor.costBasis = 3;
         }
+        if (plan.changes.length > 0 || plan.verified.length > 0)
+            await this.saveCursors();
+        return plan;
+    }
+    /**
+     * The newest assistant turn this cursor has counted in its current
+     * transcript, as a ledger match key.
+     *
+     * @param cursor - The cursor
+     * @returns The key; null when nothing has been counted there yet; undefined when the transcript cannot be read
+     */
+    async newestCountedTurn(cursor) {
+        let text;
+        try {
+            const handle = await fs.open(cursor.filePath, 'r');
+            try {
+                const size = (await handle.stat()).size;
+                const length = Math.min(cursor.offset, size);
+                const buf = Buffer.alloc(length);
+                await handle.read(buf, 0, length, 0);
+                text = buf.toString('utf-8');
+            }
+            finally {
+                await handle.close();
+            }
+        }
+        catch {
+            return undefined;
+        }
+        const lastNewline = text.lastIndexOf('\n');
+        if (lastNewline < 0)
+            return null;
+        const turns = this.parseTurns(text.slice(0, lastNewline), new Set());
+        const newest = turns[turns.length - 1];
+        return newest ? turnKey(newest.timestamp, newest.input, newest.output) : null;
     }
     /**
      * Recount, once, the cost of every cursor written before the shared-cwd
@@ -535,7 +660,7 @@ export class ClaudeTranscriptSyncService {
     async recountLegacyCosts() {
         let changed = false;
         for (const [sessionName, cursor] of this.cursors) {
-            if (cursor.costBasis === 2)
+            if (cursor.costBasis === 2 || cursor.costBasis === 3)
                 continue;
             let text;
             try {
@@ -600,6 +725,17 @@ export class ClaudeTranscriptSyncService {
         return this.cursors.get(sessionName);
     }
 }
+/**
+ * Key that matches a transcript turn to its token-ledger event.
+ *
+ * @param timestamp - Turn timestamp (the ledger keeps the turn's own)
+ * @param input - Fresh input tokens
+ * @param output - Output tokens
+ * @returns Match key
+ */
+function turnKey(timestamp, input, output) {
+    return `${timestamp}|${input}|${output}`;
+}
 /**
  * Convenience accessor for the shared sync service.
  *