@qduc/term2 0.13.0 → 0.15.0

package/dist/services/grok/grok-credit-usage-service.js

@@ -0,0 +1,137 @@
+import { fetchGrokCreditUsage, GrokCreditUsageRateLimitedError, GrokCreditUsageUnauthorizedError, } from '../../providers/grok-credit-usage.js';
+/** Minimum gap between two fetches. */
+export const GROK_CREDIT_USAGE_COOLDOWN_MS = 5 * 60 * 1000;
+/** First backoff step after a failure, doubling up to the ceiling. */
+const INITIAL_BACKOFF_MS = 60 * 1000;
+const MAX_BACKOFF_MS = 30 * 60 * 1000;
+export class GrokCreditUsageService {
+    #snapshot = { usage: null, fetchedAtMs: null };
+    #listeners = new Set();
+    #inFlight = null;
+    /** Earliest time a fetch may run. Raised by the cooldown and by backoff. */
+    #nextAllowedAtMs = 0;
+    #backoffMs = INITIAL_BACKOFF_MS;
+    /**
+     * Set when the provider rejects our credentials. Nothing is gained by asking
+     * an endpoint that has just told us the token is dead, and a stopped poller
+     * is easier to reason about than one retrying in the background forever.
+     */
+    #stopped = false;
+    #accountId = null;
+    #options;
+    constructor(options) {
+        this.#options = options;
+    }
+    getSnapshot() {
+        return this.#snapshot;
+    }
+    subscribe(listener) {
+        this.#listeners.add(listener);
+        return () => this.#listeners.delete(listener);
+    }
+    /**
+     * Fetches if the cooldown has elapsed, and does nothing otherwise.
+     *
+     * Never rejects: this is decoration, and a failure to read it must not reach
+     * the turn that triggered it. Callers fire and forget.
+     */
+    async refreshIfStale({ force = false } = {}) {
+        if (this.#stopped)
+            return;
+        if (this.#inFlight)
+            return this.#inFlight;
+        if (!force && this.#now() < this.#nextAllowedAtMs)
+            return;
+        this.#inFlight = this.#run().finally(() => {
+            this.#inFlight = null;
+        });
+        return this.#inFlight;
+    }
+    /** Clears the cached value, e.g. when signing out. */
+    reset() {
+        this.#snapshot = { usage: null, fetchedAtMs: null };
+        this.#nextAllowedAtMs = 0;
+        this.#backoffMs = INITIAL_BACKOFF_MS;
+        this.#stopped = false;
+        this.#accountId = null;
+        this.#emit();
+    }
+    async #run() {
+        try {
+            const accessToken = await this.#options.resolveAccessToken();
+            if (!accessToken) {
+                // Not logged in yet. Not an error, and not a reason to stop: a login
+                // can happen later in the same session.
+                this.#scheduleCooldown();
+                return;
+            }
+            this.#dropCacheIfAccountChanged();
+            const fetchUsage = this.#options.fetchUsage ?? fetchGrokCreditUsage;
+            const usage = await fetchUsage({ accessToken });
+            this.#backoffMs = INITIAL_BACKOFF_MS;
+            this.#scheduleCooldown();
+            // A well-formed response with no meter leaves the previous value alone
+            // rather than blanking the display.
+            if (usage) {
+                this.#snapshot = { usage, fetchedAtMs: this.#now() };
+                this.#emit();
+            }
+        }
+        catch (error) {
+            this.#handleFailure(error);
+        }
+    }
+    #handleFailure(error) {
+        this.#options.onError?.(error);
+        if (error instanceof GrokCreditUsageUnauthorizedError) {
+            this.#stopped = true;
+            return;
+        }
+        if (error instanceof GrokCreditUsageRateLimitedError && error.retryAfterMs !== undefined) {
+            this.#nextAllowedAtMs = this.#now() + Math.max(error.retryAfterMs, this.#cooldownMs());
+            return;
+        }
+        this.#nextAllowedAtMs = this.#now() + this.#backoffMs;
+        this.#backoffMs = Math.min(this.#backoffMs * 2, MAX_BACKOFF_MS);
+    }
+    /**
+     * The meter is per-account, and a session pins the account it first resolved.
+     * Should the resolved account change anyway, the previous account's number is
+     * wrong rather than stale, so it is dropped instead of shown.
+     */
+    #dropCacheIfAccountChanged() {
+        const accountId = this.#options.resolveAccountId?.() ?? null;
+        if (this.#accountId !== null && accountId !== this.#accountId) {
+            this.#snapshot = { usage: null, fetchedAtMs: null };
+            this.#emit();
+        }
+        this.#accountId = accountId;
+    }
+    #scheduleCooldown() {
+        this.#nextAllowedAtMs = this.#now() + this.#cooldownMs();
+    }
+    #cooldownMs() {
+        return this.#options.cooldownMs ?? GROK_CREDIT_USAGE_COOLDOWN_MS;
+    }
+    #now() {
+        return (this.#options.now ?? Date.now)();
+    }
+    #emit() {
+        for (const listener of this.#listeners)
+            listener();
+    }
+}
+let sharedService = null;
+/**
+ * The process-wide instance. Sharing it is what makes the cooldown hold across
+ * concurrent sessions and subagents.
+ */
+export const getGrokCreditUsageService = (options) => {
+    sharedService ??= new GrokCreditUsageService(options);
+    return sharedService;
+};
+/** Test seam: drops the process-wide instance. */
+export const resetGrokCreditUsageServiceForTests = () => {
+    sharedService = null;
+};
+//# sourceMappingURL=grok-credit-usage-service.js.map

package/dist/services/grok/grok-credit-usage-service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"grok-credit-usage-service.js","sourceRoot":"","sources":["../../../source/services/grok/grok-credit-usage-service.ts"],"names":[],"mappings":"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"}

package/dist/services/history-service.d.ts

@@ -10,6 +10,9 @@ export declare class HistoryService {
     private historyFile;
     private maxHistorySize;
     private loggingService;
+    /** Set when the on-disk history failed to parse, so the first save
+     *  quarantines the corrupt bytes before publishing a valid replacement. */
+    private corruptFileDetected;
     constructor(deps: {
         loggingService: LoggingService;
         settingsService: SettingsService;
@@ -19,6 +22,12 @@ export declare class HistoryService {
      * Load history from disk
      */
     private load;
+    /**
+     * Move the corrupt history file aside so its bytes survive a valid
+     * replacement write. Returns false (and leaves the file in place) if the
+     * quarantine itself fails.
+     */
+    private quarantineCorruptHistory;
     /**
      * Save history to disk
      */

package/dist/services/history-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history-service.d.ts","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwC7F;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAiB;IAEvC,YAAY,IAAI,EAAE;QAAE,cAAc,EAAE,cAAc,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAK3G;IAED;;OAEG;IACH,OAAO,CAAC,IAAI;IA2BZ;;OAEG;IACH,OAAO,CAAC,IAAI;IAsBZ;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAqB3C;IAED;;OAEG;IACH,WAAW,IAAI,MAAM,EAAE,CAEtB;IAED;;OAEG;IACH,QAAQ,IAAI,QAAQ,EAAE,CAErB;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAGZ;CACF"}
+{"version":3,"file":"history-service.d.ts","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAyC,KAAK,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAwC7F;;;GAGG;AACH,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAkB;IAClC,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,cAAc,CAAiB;IACvC;+EAC2E;IAC3E,OAAO,CAAC,mBAAmB,CAAS;IAEpC,YAAY,IAAI,EAAE;QAAE,cAAc,EAAE,cAAc,CAAC;QAAC,eAAe,EAAE,eAAe,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,EAK3G;IAED;;OAEG;IACH,OAAO,CAAC,IAAI;IA6BZ;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;IAUhC;;OAEG;IACH,OAAO,CAAC,IAAI;IA+CZ;;OAEG;IACH,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAqB3C;IAED;;OAEG;IACH,WAAW,IAAI,MAAM,EAAE,CAEtB;IAED;;OAEG;IACH,QAAQ,IAAI,QAAQ,EAAE,CAErB;IAED;;OAEG;IACH,KAAK,IAAI,IAAI,CAGZ;CACF"}

package/dist/services/history-service.js

@@ -1,5 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
+import crypto from 'node:crypto';
 import envPaths from 'env-paths';
 import { hasUserTurnContent, normalizeUserTurn } from '../types/user-turn.js';
 const paths = envPaths('term2');
@@ -37,6 +38,9 @@ export class HistoryService {
     historyFile;
     maxHistorySize;
     loggingService;
+    /** Set when the on-disk history failed to parse, so the first save
+     *  quarantines the corrupt bytes before publishing a valid replacement. */
+    corruptFileDetected = false;
     constructor(deps) {
         this.loggingService = deps.loggingService;
         this.historyFile = deps.historyFile || path.join(paths.log, 'history.json');
@@ -62,12 +66,29 @@ export class HistoryService {
             }
         }
         catch (error) {
-            // If we can't load history, start with empty array
+            // If we can't load history, start with empty array but preserve the
+            // corrupt bytes: the next save quarantines them instead of overwriting.
             this.loggingService.error('Failed to load history', {
                 error: error instanceof Error ? error.message : String(error),
                 filePath: this.historyFile,
             });
             this.messages = [];
+            this.corruptFileDetected = true;
+        }
+    }
+    /**
+     * Move the corrupt history file aside so its bytes survive a valid
+     * replacement write. Returns false (and leaves the file in place) if the
+     * quarantine itself fails.
+     */
+    quarantineCorruptHistory() {
+        try {
+            const quarantinePath = `${this.historyFile}.corrupt.${Date.now()}`;
+            fs.renameSync(this.historyFile, quarantinePath);
+            return true;
+        }
+        catch {
+            return false;
         }
     }
     /**
@@ -80,10 +101,36 @@ export class HistoryService {
             if (!fs.existsSync(dir)) {
                 fs.mkdirSync(dir, { recursive: true });
             }
+            if (this.corruptFileDetected) {
+                this.corruptFileDetected = false;
+                if (!this.quarantineCorruptHistory()) {
+                    // Refuse to replace corrupt bytes we could not preserve.
+                    this.loggingService.error('Failed to save history', {
+                        error: 'Could not quarantine corrupt history file',
+                        filePath: this.historyFile,
+                        messageCount: this.messages.length,
+                    });
+                    return;
+                }
+            }
             const data = {
                 messages: this.messages,
             };
-            fs.writeFileSync(this.historyFile, JSON.stringify(data, null, 2), 'utf-8');
+            // Stage to a same-directory temporary file and atomically rename, so an
+            // interrupted or failing write never truncates the prior durable file.
+            const tempPath = path.join(dir, `.${path.basename(this.historyFile)}.${crypto.randomUUID()}.tmp`);
+            try {
+                fs.writeFileSync(tempPath, JSON.stringify(data, null, 2), 'utf-8');
+                fs.renameSync(tempPath, this.historyFile);
+            }
+            finally {
+                try {
+                    fs.unlinkSync(tempPath);
+                }
+                catch {
+                    // Rename succeeded or there is no temp file to clean up.
+                }
+            }
         }
         catch (error) {
             this.loggingService.error('Failed to save history', {

package/dist/services/history-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-service.js","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"history-service.js","sourceRoot":"","sources":["../../source/services/history-service.ts"],"names":[],"mappings":"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"}

package/dist/services/hooks/hook-composition.d.ts

@@ -0,0 +1,17 @@
+import type { ExecutionContext } from '../execution-context.js';
+import type { HookDiscoveryOptions } from './hook-discovery.js';
+import { HookService, type HookServiceOptions } from './hook-service.js';
+export interface RootHookRuntimeOptions extends Omit<HookDiscoveryOptions, 'cwd'>, Pick<HookServiceOptions, 'logger' | 'registryOptions'> {
+    readonly executionContext: Pick<ExecutionContext, 'getCwd' | 'isRemote'>;
+}
+export interface RootHookRuntime {
+    /** The directory represented in root-session hook discovery and events. */
+    readonly cwd: string;
+    readonly hookService: HookService;
+}
+/**
+ * Builds root-session hooks at the CLI composition boundary. Tool execution
+ * may use a remote directory, while hook extensions remain local to Term2.
+ */
+export declare function createRootHookRuntime(options: RootHookRuntimeOptions): RootHookRuntime;
+//# sourceMappingURL=hook-composition.d.ts.map

package/dist/services/hooks/hook-composition.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-composition.d.ts","sourceRoot":"","sources":["../../../source/services/hooks/hook-composition.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEzE,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,EACvC,IAAI,CAAC,kBAAkB,EAAE,QAAQ,GAAG,iBAAiB,CAAC;IACxD,QAAQ,CAAC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,UAAU,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,eAAe;IAC9B,2EAA2E;IAC3E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;CACnC;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,sBAAsB,GAAG,eAAe,CAWtF"}

package/dist/services/hooks/hook-composition.js

@@ -0,0 +1,19 @@
+import process from 'node:process';
+import { HookService } from './hook-service.js';
+/**
+ * Builds root-session hooks at the CLI composition boundary. Tool execution
+ * may use a remote directory, while hook extensions remain local to Term2.
+ */
+export function createRootHookRuntime(options) {
+    const { executionContext, logger, registryOptions, ...discoveryOptions } = options;
+    const cwd = executionContext.isRemote() ? process.cwd() : executionContext.getCwd();
+    return {
+        cwd,
+        hookService: new HookService({
+            discoveryOptions: { cwd, ...discoveryOptions },
+            registryOptions,
+            logger,
+        }),
+    };
+}
+//# sourceMappingURL=hook-composition.js.map

package/dist/services/hooks/hook-composition.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-composition.js","sourceRoot":"","sources":["../../../source/services/hooks/hook-composition.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AAGnC,OAAO,EAAE,WAAW,EAA2B,MAAM,mBAAmB,CAAC;AAczE;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAA+B;IACnE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,gBAAgB,EAAE,GAAG,OAAO,CAAC;IACnF,MAAM,GAAG,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC;IACpF,OAAO;QACL,GAAG;QACH,WAAW,EAAE,IAAI,WAAW,CAAC;YAC3B,gBAAgB,EAAE,EAAE,GAAG,EAAE,GAAG,gBAAgB,EAAE;YAC9C,eAAe;YACf,MAAM;SACP,CAAC;KACH,CAAC;AACJ,CAAC"}

package/dist/services/logging/conversation-log-events.d.ts

@@ -7,6 +7,21 @@ import type { UserMessage } from '../../types/message.js';
 import type { SavedAppMode, PersistedAssistantTurn, PersistedAssistantTurnItem } from '../conversation/conversation-persistence-types.js';
 import type { ModelRequestCost } from '../cost/model-cost.js';
 export declare const LOG_ENVELOPE_VERSION = 3;
+/**
+ * Streaming `assistant_journal_delta` events are written to a per-session
+ * sidecar instead of the canonical log. They are only ever read to reconstruct
+ * a turn that never produced a final `assistant_turn`, so the sidecar is
+ * dropped when a session closes with no unsettled turn.
+ *
+ * The suffix deliberately does **not** end in `.jsonl`: `listConversations`
+ * enumerates the conversations directory with a `*.jsonl` glob and would
+ * otherwise surface the sidecar as a phantom conversation.
+ */
+export declare const DELTA_SIDECAR_SUFFIX = ".deltas";
+/** Map a canonical `<sessionId>.jsonl` path to its delta sidecar path. */
+export declare function deltaSidecarPathFor(logFilePath: string): string;
+/** Event types routed to the delta sidecar rather than the canonical log. */
+export declare const SIDECAR_EVENT_TYPES: Set<string>;
 export interface StateSnapshot {
     history: ProviderInputItem[];
     previousResponseId: string | null;
@@ -52,7 +67,7 @@ export interface ToolResultLogEvent {
     turnId?: string;
     callId: string;
     toolName: string;
-    status: 'completed' | 'failed' | 'aborted';
+    status: 'completed' | 'failed' | 'aborted' | 'unknown';
     output?: unknown;
     historyItems?: unknown[];
 }
@@ -146,6 +161,18 @@ export interface SubagentCompletedLogEvent {
     /** Cumulative model-request cost records for the subagent run. */
     costRecords?: ModelRequestCost[];
 }
+export interface SubagentInterruptedLogEvent {
+    type: 'subagent_interrupted';
+    agentId: string;
+    role: string;
+    finalText: string;
+}
+export interface SubagentTransferredLogEvent {
+    type: 'subagent_transferred';
+    agentId: string;
+    runId: string;
+    role: string;
+}
 export interface SubagentQuestionLogEvent {
     type: 'subagent_question';
     messageId: string;
@@ -180,6 +207,13 @@ export interface BackgroundShellOutputLogEvent {
     seq: number;
     /** Bounded, complete-line match text carried by the firing. */
     matchedLines: string;
+    /** Distinct complete lines coalesced into this firing (incl. byte-cap evictions). */
+    coalescedCount?: number;
+    /** Inclusive per-watch seq range this firing represents. */
+    seqRange?: {
+        first: number;
+        last: number;
+    };
     /** Present when the job's retained buffer evicted bytes before this firing. */
     droppedBytes?: number;
 }
@@ -211,7 +245,7 @@ export interface UndoEvent {
 export interface SessionClearedEvent {
     type: 'session_cleared';
 }
-export type LogEvent = SessionInitEvent | SettingsChangedEvent | UserMessageEvent | ToolStartedLogEvent | ToolResultLogEvent | CommandMessageLogEvent | ApprovalRequiredLogEvent | ApprovalResolvedLogEvent | OpenAIRootSelectorParityLogEvent | OpenAIRootCheckpointLifecycleLogEvent | SubagentStartedLogEvent | SubagentToolStartedLogEvent | SubagentCompletedLogEvent | SubagentQuestionLogEvent | BackgroundShellStartedLogEvent | BackgroundShellCompletedLogEvent | BackgroundShellOutputLogEvent | ErrorLogEvent | AssistantTurnEvent | AssistantJournalDeltaLogEvent | AssistantJournalItemLogEvent | UndoEvent | SessionClearedEvent;
+export type LogEvent = SessionInitEvent | SettingsChangedEvent | UserMessageEvent | ToolStartedLogEvent | ToolResultLogEvent | CommandMessageLogEvent | ApprovalRequiredLogEvent | ApprovalResolvedLogEvent | OpenAIRootSelectorParityLogEvent | OpenAIRootCheckpointLifecycleLogEvent | SubagentStartedLogEvent | SubagentToolStartedLogEvent | SubagentCompletedLogEvent | SubagentInterruptedLogEvent | SubagentTransferredLogEvent | SubagentQuestionLogEvent | BackgroundShellStartedLogEvent | BackgroundShellCompletedLogEvent | BackgroundShellOutputLogEvent | ErrorLogEvent | AssistantTurnEvent | AssistantJournalDeltaLogEvent | AssistantJournalItemLogEvent | UndoEvent | SessionClearedEvent;
 export interface TruncatedLogEvent {
     type: string;
     truncated: true;

package/dist/services/logging/conversation-log-events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-log-events.d.ts","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-events.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"conversation-log-events.d.ts","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-events.ts"],"names":[],"mappings":"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"}

package/dist/services/logging/conversation-log-events.js

@@ -1,4 +1,21 @@
 export const LOG_ENVELOPE_VERSION = 3;
+/**
+ * Streaming `assistant_journal_delta` events are written to a per-session
+ * sidecar instead of the canonical log. They are only ever read to reconstruct
+ * a turn that never produced a final `assistant_turn`, so the sidecar is
+ * dropped when a session closes with no unsettled turn.
+ *
+ * The suffix deliberately does **not** end in `.jsonl`: `listConversations`
+ * enumerates the conversations directory with a `*.jsonl` glob and would
+ * otherwise surface the sidecar as a phantom conversation.
+ */
+export const DELTA_SIDECAR_SUFFIX = '.deltas';
+/** Map a canonical `<sessionId>.jsonl` path to its delta sidecar path. */
+export function deltaSidecarPathFor(logFilePath) {
+    return logFilePath.replace(/\.jsonl$/, '') + DELTA_SIDECAR_SUFFIX;
+}
+/** Event types routed to the delta sidecar rather than the canonical log. */
+export const SIDECAR_EVENT_TYPES = new Set(['assistant_journal_delta']);
 /**
  * Narrowing predicate for the storage-only truncation marker. Uses an `in`
  * check (plus an explicit `=== true`) rather than the `type` discriminant

package/dist/services/logging/conversation-log-events.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-log-events.js","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-events.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AA8RtC;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAwB;IAC1D,OAAO,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC;AAC1D,CAAC;AASD,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAS;IACtD,aAAa;IACb,gBAAgB;IAChB,uBAAuB;IACvB,mBAAmB;IACnB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,sBAAsB;CACvB,CAAC,CAAC"}
+{"version":3,"file":"conversation-log-events.js","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-events.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;AAE9C,0EAA0E;AAC1E,MAAM,UAAU,mBAAmB,CAAC,WAAmB;IACrD,OAAO,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,GAAG,oBAAoB,CAAC;AACpE,CAAC;AAED,6EAA6E;AAC7E,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAS,CAAC,yBAAyB,CAAC,CAAC,CAAC;AAkThF;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAwB;IAC1D,OAAO,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC;AAC1D,CAAC;AASD,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAAS;IACtD,aAAa;IACb,gBAAgB;IAChB,uBAAuB;IACvB,mBAAmB;IACnB,gBAAgB;IAChB,cAAc;IACd,cAAc;IACd,sBAAsB;CACvB,CAAC,CAAC"}

package/dist/services/logging/conversation-log-writer.d.ts

@@ -2,6 +2,7 @@ import fs from 'fs';
 import type { ILoggingService } from '../service-interfaces.js';
 import { type LogEvent, type TruncatedLogEvent, type SessionInitEvent } from './conversation-log-events.js';
 import { saveLastConversation } from '../conversation/conversation-persistence.js';
+export declare const CONVERSATION_FSYNC_EVENTS: Set<"approval_required" | "approval_resolved" | "assistant_journal_delta" | "assistant_journal_item" | "assistant_turn" | "background_shell_completed" | "background_shell_output" | "background_shell_started" | "command_message" | "error" | "openai_root_checkpoint_lifecycle" | "openai_root_selector_parity" | "session_cleared" | "session_init" | "settings_changed" | "subagent_completed" | "subagent_interrupted" | "subagent_question" | "subagent_started" | "subagent_tool_started" | "subagent_transferred" | "tool_result" | "tool_started" | "undo" | "user_message">;
 export interface ConversationLogWriter {
     readonly sessionId: string;
     init(meta: Omit<SessionInitEvent, 'type'>): void;
@@ -31,10 +32,16 @@ interface WriterOptions {
     logger: ILoggingService;
     fileSystem?: WriterFileSystem;
     saveLast?: typeof saveLastConversation;
+    /**
+     * Deterministic PID-liveness probe for the stale-lock liveness path.
+     * Defaults to the production `process.kill(pid, 0)` probe; tests inject a
+     * controlled predicate so proofs never probe real processes.
+     */
+    isPidAlive?: (pid: number) => boolean;
 }
 export declare function sanitizeSubagentResult(value: unknown): unknown;
 declare function truncateForLog(event: LogEvent): LogEvent | TruncatedLogEvent;
-declare function acquireLock(dir: string, sessionId: string, fileSystem?: WriterFileSystem): void;
+declare function acquireLock(dir: string, sessionId: string, fileSystem?: WriterFileSystem, isPidAliveFn?: (pid: number) => boolean): void;
 declare function releaseLock(dir: string, sessionId: string, fileSystem?: WriterFileSystem): void;
 export declare function createConversationLogWriter(opts: WriterOptions): ConversationLogWriter;
 export declare const __testing: {

package/dist/services/logging/conversation-log-writer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-log-writer.d.ts","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAGL,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAiBnF,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACzE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3E,YAAY,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,EAUjH;CACF;AAED,KAAK,gBAAgB,GAAG,IAAI,CAC1B,OAAO,EAAE,EACP,YAAY,GACZ,WAAW,GACX,UAAU,GACV,cAAc,GACd,UAAU,GACV,WAAW,GACX,WAAW,GACX,WAAW,GACX,WAAW,GACX,YAAY,CACf,CAAC;AAEF,UAAU,aAAa;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,oBAAoB,CAAC;CACxC;AAiFD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAmC9D;AAED,iBAAS,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,iBAAiB,CA+BrE;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,gBAAqB,GAAG,IAAI,CAyB5F;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,gBAAqB,GAAG,IAAI,CAS5F;AAyLD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,aAAa,GAAG,qBAAqB,CAEtF;AAED,eAAO,MAAM,SAAS;;;;CAIrB,CAAC"}
+{"version":3,"file":"conversation-log-writer.d.ts","sourceRoot":"","sources":["../../../source/services/logging/conversation-log-writer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAGpB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAKL,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAc,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAE/F,eAAO,MAAM,yBAAyB,wjBAYpC,CAAC;AAGH,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC9B,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,IAAI,CAAC;IACzE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAC3E,YAAY,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,EAUjH;CACF;AAED,KAAK,gBAAgB,GAAG,IAAI,CAC1B,OAAO,EAAE,EACP,YAAY,GACZ,WAAW,GACX,UAAU,GACV,cAAc,GACd,UAAU,GACV,WAAW,GACX,WAAW,GACX,WAAW,GACX,WAAW,GACX,YAAY,CACf,CAAC;AAEF,UAAU,aAAa;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,QAAQ,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACvC;;;;OAIG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACvC;AAgGD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAmC9D;AAED,iBAAS,cAAc,CAAC,KAAK,EAAE,QAAQ,GAAG,QAAQ,GAAG,iBAAiB,CA+BrE;AAED,iBAAS,WAAW,CAClB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,UAAU,GAAE,gBAAqB,EACjC,YAAY,GAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAoB,GAClD,IAAI,CA8CN;AAED,iBAAS,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAE,gBAAqB,GAAG,IAAI,CAS5F;AAyRD,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,aAAa,GAAG,qBAAqB,CAEtF;AAED,eAAO,MAAM,SAAS;;;;CAIrB,CAAC"}