@qduc/term2 0.11.0 → 0.12.0

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

@@ -0,0 +1,44 @@
+import type { Term2HookEvent, Term2HookEventName } from './hook-contracts.js';
+import { type HookDiscoveryOptions, type HookDiscoveryResult } from './hook-discovery.js';
+import { HookRegistry, type HookDiagnostic, type HookDiagnosticLogger, type HookRegistryOptions } from './hook-registry.js';
+import { type HookModuleLoader } from './hook-module-loader.js';
+export interface HookServiceOptions {
+    readonly discovery?: HookDiscoveryPort;
+    readonly discoveryOptions?: HookDiscoveryOptions;
+    readonly moduleLoader?: HookModuleLoader;
+    readonly registry?: HookRegistry;
+    readonly registryOptions?: HookRegistryOptions;
+    readonly logger?: HookDiagnosticLogger;
+}
+export interface HookDiscoveryPort {
+    discover(): Promise<HookDiscoveryResult>;
+}
+export interface HookStartupResult {
+    readonly loadedFiles: readonly string[];
+    readonly skippedFiles: readonly string[];
+    readonly diagnostics: readonly HookDiagnostic[];
+}
+export interface HookLifecyclePort {
+    emit<Name extends Term2HookEventName>(event: Term2HookEvent<Name>): Promise<void>;
+    shutdown(): Promise<void>;
+}
+/**
+ * Composition boundary for public hooks. Discovery and module evaluation live
+ * here; lifecycle owners only need the HookLifecyclePort and never need to
+ * know where callbacks came from.
+ */
+export declare class HookService implements HookLifecyclePort {
+    #private;
+    constructor(options?: HookServiceOptions);
+    get registry(): HookRegistry;
+    get started(): boolean;
+    get startupResult(): HookStartupResult | undefined;
+    /** Load and register all hooks once, preserving discovery order. */
+    start(): Promise<HookStartupResult>;
+    /** Alias for callers that describe startup as initialization. */
+    initialize(): Promise<HookStartupResult>;
+    emit<Name extends Term2HookEventName>(event: Term2HookEvent<Name>): Promise<void>;
+    shutdown(): Promise<void>;
+    dispose(): Promise<void>;
+}
+//# sourceMappingURL=hook-service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"hook-service.d.ts","sourceRoot":"","sources":["../../../source/services/hooks/hook-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAEL,KAAK,oBAAoB,EAEzB,KAAK,mBAAmB,EACzB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,YAAY,EACZ,KAAK,cAAc,EACnB,KAAK,oBAAoB,EACzB,KAAK,mBAAmB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAwB,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGtF,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,SAAS,CAAC,EAAE,iBAAiB,CAAC;IACvC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,oBAAoB,CAAC;IACjD,QAAQ,CAAC,YAAY,CAAC,EAAE,gBAAgB,CAAC;IACzC,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,eAAe,CAAC,EAAE,mBAAmB,CAAC;IAC/C,QAAQ,CAAC,MAAM,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,IAAI,OAAO,CAAC,mBAAmB,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,YAAY,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,SAAS,cAAc,EAAE,CAAC;CACjD;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,CAAC,IAAI,SAAS,kBAAkB,EAAE,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClF,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED;;;;GAIG;AACH,qBAAa,WAAY,YAAW,iBAAiB;;IASnD,YAAY,OAAO,GAAE,kBAAuB,EAa3C;IAED,IAAI,QAAQ,IAAI,YAAY,CAE3B;IAED,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,aAAa,IAAI,iBAAiB,GAAG,SAAS,CAEjD;IAED,oEAAoE;IAC9D,KAAK,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAkExC;IAED,iEAAiE;IACjE,UAAU,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAEvC;IAEK,IAAI,CAAC,IAAI,SAAS,kBAAkB,EAAE,KAAK,EAAE,cAAc,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAGtF;IAEK,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAI9B;IAED,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAEvB;CAUF"}

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

@@ -0,0 +1,138 @@
+import { HookDiscovery, } from './hook-discovery.js';
+import { HookRegistry, } from './hook-registry.js';
+import { JitiHookModuleLoader } from './hook-module-loader.js';
+import { ensureHookEditorShim } from './hook-editor-shim.js';
+/**
+ * Composition boundary for public hooks. Discovery and module evaluation live
+ * here; lifecycle owners only need the HookLifecyclePort and never need to
+ * know where callbacks came from.
+ */
+export class HookService {
+    #discovery;
+    #moduleLoader;
+    #registry;
+    #logger;
+    #started = false;
+    #shutdown = false;
+    #startupResult;
+    constructor(options = {}) {
+        this.#logger = options.logger;
+        this.#discovery = options.discovery ?? new HookDiscovery(options.discoveryOptions);
+        this.#moduleLoader =
+            options.moduleLoader ??
+                new JitiHookModuleLoader((path) => {
+                    // jiti is a production dependency so packaged/global Term2 installs can
+                    // load TypeScript hooks without relying on the development tsx runner.
+                    // Keep the import lazy so embedders that inject a loader need not pay the
+                    // module initialization cost.
+                    return import('jiti').then(({ createJiti }) => createJiti(import.meta.url, { interopDefault: true })(path));
+                });
+        this.#registry = options.registry ?? new HookRegistry({ ...options.registryOptions, logger: options.logger });
+    }
+    get registry() {
+        return this.#registry;
+    }
+    get started() {
+        return this.#started;
+    }
+    get startupResult() {
+        return this.#startupResult;
+    }
+    /** Load and register all hooks once, preserving discovery order. */
+    async start() {
+        if (this.#shutdown)
+            throw new Error('HookService has already been shut down');
+        if (this.#startupResult)
+            return this.#startupResult;
+        const diagnostics = [];
+        const loadedFiles = [];
+        const skippedFiles = [];
+        let discovered = [];
+        try {
+            const result = await this.#discovery.discover();
+            discovered = result.files;
+            diagnostics.push(...result.diagnostics);
+            for (const diagnostic of result.diagnostics)
+                this.#log(diagnostic);
+            if (result.userRoot) {
+                await ensureHookEditorShim(result.userRoot);
+            }
+            if (result.projectRoot && result.files.some((f) => f.scope === 'project')) {
+                await ensureHookEditorShim(result.projectRoot);
+            }
+        }
+        catch (error) {
+            const diagnostic = {
+                code: 'discovery_failed',
+                message: 'Hook discovery failed; continuing without discovered hooks',
+                error,
+            };
+            diagnostics.push(diagnostic);
+            this.#log(diagnostic);
+        }
+        for (const file of discovered) {
+            let registration;
+            try {
+                registration = await this.#moduleLoader.load(file.path);
+            }
+            catch (error) {
+                const diagnostic = {
+                    code: 'module_load_failed',
+                    message: 'Hook module failed to load and was skipped',
+                    source: { path: file.path, scope: file.scope },
+                    error,
+                };
+                diagnostics.push(diagnostic);
+                skippedFiles.push(file.path);
+                this.#log(diagnostic);
+                continue;
+            }
+            try {
+                await this.#registry.register({ path: file.path, scope: file.scope }, registration);
+                loadedFiles.push(file.path);
+            }
+            catch (error) {
+                const diagnostic = {
+                    code: 'registration_rejected',
+                    message: 'Hook registration failed and was rolled back; module was skipped',
+                    source: { path: file.path, scope: file.scope },
+                    error,
+                };
+                diagnostics.push(diagnostic);
+                skippedFiles.push(file.path);
+            }
+        }
+        this.#started = true;
+        this.#startupResult = { loadedFiles, skippedFiles, diagnostics };
+        return this.#startupResult;
+    }
+    /** Alias for callers that describe startup as initialization. */
+    initialize() {
+        return this.start();
+    }
+    async emit(event) {
+        if (this.#shutdown)
+            return;
+        await this.#registry.dispatch(event);
+    }
+    async shutdown() {
+        if (this.#shutdown)
+            return;
+        this.#shutdown = true;
+        this.#registry.clear();
+    }
+    dispose() {
+        return this.shutdown();
+    }
+    #log(diagnostic) {
+        if (!this.#logger)
+            return;
+        try {
+            this.#logger(diagnostic);
+        }
+        catch (error) {
+            void error;
+        }
+    }
+}
+//# sourceMappingURL=hook-service.js.map

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

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

package/dist/services/hooks/hook-tool-lifecycle.d.ts

@@ -0,0 +1,6 @@
+import type { ToolExecutionLifecyclePort } from '../../tools/types.js';
+import type { HookLifecyclePort } from './hook-service.js';
+import type { HookEventFactory } from './hook-event-factory.js';
+/** Adapts the application run-loop seam to the public observational contract. */
+export declare function createToolExecutionLifecyclePort(lifecycle: HookLifecyclePort, events: HookEventFactory): ToolExecutionLifecyclePort;
+//# sourceMappingURL=hook-tool-lifecycle.d.ts.map

package/dist/services/hooks/hook-tool-lifecycle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-tool-lifecycle.d.ts","sourceRoot":"","sources":["../../../source/services/hooks/hook-tool-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAGhE,iFAAiF;AACjF,wBAAgB,gCAAgC,CAC9C,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,gBAAgB,GACvB,0BAA0B,CAkD5B"}

package/dist/services/hooks/hook-tool-lifecycle.js

@@ -0,0 +1,33 @@
+import { summarizeHookValue } from './hook-event-factory.js';
+/** Adapts the application run-loop seam to the public observational contract. */
+export function createToolExecutionLifecyclePort(lifecycle, events) {
+    return {
+        async before(context) {
+            await lifecycle.emit(events.create('tool.before', {
+                toolName: context.toolName,
+                normalizedArguments: events.includeToolArguments
+                    ? context.normalizedArguments
+                    : summarizeHookValue(context.normalizedArguments),
+                attempt: context.attempt,
+                ownership: context.scope,
+            }, { turnId: context.turnId, toolCallId: context.toolCallId }, context.scope));
+        },
+        async after(context, result, duration) {
+            await lifecycle.emit(events.create('tool.after', {
+                toolName: context.toolName,
+                duration,
+                normalizedResultSummary: events.includeToolResults ? result : summarizeHookValue(result),
+            }, { turnId: context.turnId, toolCallId: context.toolCallId }, context.scope));
+        },
+        async error(context, error, duration, convertedToModelResult) {
+            await lifecycle.emit(events.create('tool.error', {
+                toolName: context.toolName,
+                duration,
+                errorCategory: 'tool',
+                safeMessage: (error instanceof Error ? error.message : String(error)).slice(0, 500),
+                convertedToModelResult,
+            }, { turnId: context.turnId, toolCallId: context.toolCallId }, context.scope));
+        },
+    };
+}
+//# sourceMappingURL=hook-tool-lifecycle.js.map

package/dist/services/hooks/hook-tool-lifecycle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hook-tool-lifecycle.js","sourceRoot":"","sources":["../../../source/services/hooks/hook-tool-lifecycle.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,iFAAiF;AACjF,MAAM,UAAU,gCAAgC,CAC9C,SAA4B,EAC5B,MAAwB;IAExB,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,OAAO;YAClB,MAAM,SAAS,CAAC,IAAI,CAClB,MAAM,CAAC,MAAM,CACX,aAAa,EACb;gBACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,mBAAmB,EAAE,MAAM,CAAC,oBAAoB;oBAC9C,CAAC,CAAC,OAAO,CAAC,mBAAmB;oBAC7B,CAAC,CAAC,kBAAkB,CAAC,OAAO,CAAC,mBAAmB,CAAC;gBACnD,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,SAAS,EAAE,OAAO,CAAC,KAAK;aACzB,EACD,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,EAC1D,OAAO,CAAC,KAAK,CACd,CACF,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ;YACnC,MAAM,SAAS,CAAC,IAAI,CAClB,MAAM,CAAC,MAAM,CACX,YAAY,EACZ;gBACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ;gBACR,uBAAuB,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,CAAC;aACzF,EACD,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,EAC1D,OAAO,CAAC,KAAK,CACd,CACF,CAAC;QACJ,CAAC;QACD,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,sBAAsB;YAC1D,MAAM,SAAS,CAAC,IAAI,CAClB,MAAM,CAAC,MAAM,CACX,YAAY,EACZ;gBACE,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,QAAQ;gBACR,aAAa,EAAE,MAAM;gBACrB,WAAW,EAAE,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;gBACnF,sBAAsB;aACvB,EACD,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,EAC1D,OAAO,CAAC,KAAK,CACd,CACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC"}

package/dist/services/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export type { ApprovalRequestedHookEvent, ApprovalResolvedHookEvent, HookEventBase, SessionEndHookEvent, SessionStartHookEvent, StatusChangeHookEvent, Term2ApprovalKind, Term2ApprovalResolution, Term2ApprovalResolutionSource, Term2ErrorCategory, Term2HookCallback, Term2HookEvent, Term2HookEventMap, Term2HookEventName, Term2HookRegistration, Term2Hooks, Term2HookScope, Term2HookSchemaVersion, Term2SessionMode, Term2Status, Term2StatusChangeReason, Term2SubagentScope, Term2ToolOwnership, Term2TurnOrigin, Term2TurnTerminalKind, ToolAfterHookEvent, ToolBeforeHookEvent, ToolErrorHookEvent, TurnEndHookEvent, TurnErrorHookEvent, TurnStartHookEvent, } from './hook-contracts.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/services/hooks/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../source/services/hooks/index.ts"],"names":[],"mappings":"AAAA,YAAY,EACV,0BAA0B,EAC1B,yBAAyB,EACzB,aAAa,EACb,mBAAmB,EACnB,qBAAqB,EACrB,qBAAqB,EACrB,iBAAiB,EACjB,uBAAuB,EACvB,6BAA6B,EAC7B,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,gBAAgB,EAChB,WAAW,EACX,uBAAuB,EACvB,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,mBAAmB,EACnB,kBAAkB,EAClB,gBAAgB,EAChB,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,qBAAqB,CAAC"}

package/dist/services/hooks/index.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.js.map

package/dist/services/hooks/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../source/services/hooks/index.ts"],"names":[],"mappings":""}

package/dist/services/input-surge-guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"input-surge-guard.d.ts","sourceRoot":"","sources":["../../source/services/input-surge-guard.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,2BAA2B,EAAE,MAAM,CAAC;IACpC,kCAAkC,EAAE,MAAM,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAqB;IACpC,kCAAkC,EAAE,MAAM,CAAC;IAC3C,sCAAsC,EAAE,MAAM,CAAC;CAChD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,eAAe,CAAC;IACvB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,cAAc,CAAC;AAE3D,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB;IACvE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,gCAAgC,EAAE,qBAG9C,CAAC;AA8CF,eAAO,MAAM,sBAAsB,UAAW,OAAO,KAAG,eAoBvD,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CA+BtG,CAAC;AAEF,qBAAa,eAAe;;IAG1B,YAAY,MAAM,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAEtD;IAED,KAAK,IAAI,IAAI,CAAG;IAEhB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAE,wBAA6B,GAAG,kBAAkB,CAwBnF;IAED,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAE,uBAA4B,GAAG,IAAI,CAAG;CACxF"}
+{"version":3,"file":"input-surge-guard.d.ts","sourceRoot":"","sources":["../../source/services/input-surge-guard.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,2BAA2B,EAAE,MAAM,CAAC;IACpC,kCAAkC,EAAE,MAAM,CAAC;CAC5C;AAED,MAAM,WAAW,qBAAqB;IACpC,kCAAkC,EAAE,MAAM,CAAC;IAC3C,sCAAsC,EAAE,MAAM,CAAC;CAChD;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,eAAe,CAAC;IACvB,aAAa,CAAC,EAAE,eAAe,CAAC;CACjC;AAED,MAAM,MAAM,mBAAmB,GAAG,OAAO,GAAG,cAAc,CAAC;AAE3D,MAAM,WAAW,wBAAwB;IACvC,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAwB,SAAQ,wBAAwB;IACvE,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,gCAAgC,EAAE,qBAG9C,CAAC;AAsBF,eAAO,MAAM,sBAAsB,UAAW,OAAO,KAAG,eAoBvD,CAAC;AAEF,eAAO,MAAM,mCAAmC,UAAW,OAAO,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CA6BtG,CAAC;AAEF,qBAAa,eAAe;;IAG1B,YAAY,MAAM,GAAE,OAAO,CAAC,qBAAqB,CAAM,EAEtD;IAED,KAAK,IAAI,IAAI,CAAG;IAEhB,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,GAAE,wBAA6B,GAAG,kBAAkB,CAwBnF;IAED,qBAAqB,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,GAAE,uBAA4B,GAAG,IAAI,CAAG;CACxF"}

package/dist/services/input-surge-guard.js

@@ -1,33 +1,12 @@
+import { normalizeRunItem } from './conversation/run-item-normalizer.js';
 export const DEFAULT_INPUT_SURGE_GUARD_CONFIG = {
     maxDuplicateToolCallSignatureCount: 4,
     minDuplicateToolCallSignaturesForBlock: 20,
 };
-const asRecord = (value) => value && typeof value === 'object' && !Array.isArray(value) ? value : null;
+const normalizedToolItems = (item) => normalizeRunItem(item).filter((candidate) => candidate.type === 'tool_call' || candidate.type === 'tool_result');
 const toolCallSignature = (item) => {
-    const record = asRecord(item);
-    if (!record) {
-        return null;
-    }
-    const raw = asRecord(record.rawItem) ?? record;
-    const callId = raw.callId ?? raw.call_id ?? raw.tool_call_id;
-    const type = raw.type;
-    if (typeof callId !== 'string' || !callId || typeof type !== 'string' || !type) {
-        return null;
-    }
-    return `${type}:${callId}`;
-};
-const toolCallRecord = (item) => {
-    const record = asRecord(item);
-    if (!record) {
-        return null;
-    }
-    const raw = asRecord(record.rawItem) ?? record;
-    const callId = raw.callId ?? raw.call_id ?? raw.tool_call_id;
-    const type = raw.type;
-    if (typeof callId !== 'string' || !callId || typeof type !== 'string' || !type) {
-        return null;
-    }
-    return { callId, type };
+    const normalized = normalizedToolItems(item).find((candidate) => candidate.callId !== 'unknown-call');
+    return normalized ? `${normalized.type}:${normalized.callId}` : null;
 };
 const serializedBytes = (input) => {
     try {
@@ -61,15 +40,15 @@ export const collectDuplicateToolCallResultPairs = (input) => {
     const calls = new Map();
     const results = new Map();
     for (const item of items) {
-        const record = toolCallRecord(item);
-        if (!record) {
-            continue;
-        }
-        if (record.type === 'function_call') {
-            calls.set(record.callId, (calls.get(record.callId) ?? 0) + 1);
-        }
-        if (record.type === 'function_call_result') {
-            results.set(record.callId, (results.get(record.callId) ?? 0) + 1);
+        for (const normalized of normalizedToolItems(item)) {
+            if (normalized.callId === 'unknown-call')
+                continue;
+            if (normalized.type === 'tool_call') {
+                calls.set(normalized.callId, (calls.get(normalized.callId) ?? 0) + 1);
+            }
+            if (normalized.type === 'tool_result') {
+                results.set(normalized.callId, (results.get(normalized.callId) ?? 0) + 1);
+            }
         }
     }
     let pairs = 0;

package/dist/services/input-surge-guard.js.map

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

package/dist/services/logging/assistant-turn-journal.d.ts

@@ -66,7 +66,7 @@ export declare class AssistantTurnJournal {
     /**
      * Record a provider-backed run item (function call, tool result,
      * assistant message, or reasoning). Duplicates within the same turn are
-     * suppressed by the dedup key on the raw item's callId / type / id.
+     * suppressed by the normalized item's call or provider identity.
      *
      * Returns the normalized persisted item so callers can layer additional
      * recovery logic on top.

package/dist/services/logging/assistant-turn-journal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assistant-turn-journal.d.ts","sourceRoot":"","sources":["../../../source/services/logging/assistant-turn-journal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,QAAQ,EACT,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAGpG,MAAM,WAAW,2BAA2B;IAC1C,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,gFAAgF;IAChF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAoB;;IAO/B,YAAY,IAAI,EAAE,2BAA2B,EAG5C;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAUtD;IAED;;;OAGG;IACH,eAAe,IAAI,IAAI,CAGtB;IAED;;OAEG;IACH,SAAS,IAAI,4BAA4B,EAAE,CAE1C;IAED;;OAEG;IACH,QAAQ,IAAI,0BAA0B,EAAE,CAEvC;IAED;;OAEG;IACH,oBAAoB,IAAI,4BAA4B,EAAE,CAGrD;IAED;;OAEG;IACH,mBAAmB,IAAI,0BAA0B,EAAE,CAElD;IAED;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAKnC;IAED;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAKxC;IAED;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,0BAA0B,EAAE,CA6BzD;IAED;;;OAGG;IACH,WAAW,IAAI,MAAM,CAEpB;CAgBF"}
+{"version":3,"file":"assistant-turn-journal.d.ts","sourceRoot":"","sources":["../../../source/services/logging/assistant-turn-journal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,4BAA4B,EAC5B,QAAQ,EACT,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mDAAmD,CAAC;AAGpG,MAAM,WAAW,2BAA2B;IAC1C,sEAAsE;IACtE,gBAAgB,EAAE,MAAM,MAAM,CAAC;IAC/B,gFAAgF;IAChF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,qBAAa,oBAAoB;;IAO/B,YAAY,IAAI,EAAE,2BAA2B,EAG5C;IAED;;;;OAIG;IACH,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE,QAAQ,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAUtD;IAED;;;OAGG;IACH,eAAe,IAAI,IAAI,CAGtB;IAED;;OAEG;IACH,SAAS,IAAI,4BAA4B,EAAE,CAE1C;IAED;;OAEG;IACH,QAAQ,IAAI,0BAA0B,EAAE,CAEvC;IAED;;OAEG;IACH,oBAAoB,IAAI,4BAA4B,EAAE,CAGrD;IAED;;OAEG;IACH,mBAAmB,IAAI,0BAA0B,EAAE,CAElD;IAED;;;;OAIG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAKnC;IAED;;OAEG;IACH,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAKxC;IAED;;;;;;;OAOG;IACH,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,0BAA0B,EAAE,CA4BzD;IAED;;;OAGG;IACH,WAAW,IAAI,MAAM,CAEpB;CAgBF"}

package/dist/services/logging/assistant-turn-journal.js

@@ -20,7 +20,7 @@ export class AssistantTurnJournal {
     #getCurrentTurnId;
     #sink;
     #seq = 0;
-    #emittedRawItemKeys = new Set();
+    #emittedItemKeys = new Set();
     #itemEvents = [];
     constructor(opts) {
         this.#getCurrentTurnId = opts.getCurrentTurnId;
@@ -48,7 +48,7 @@ export class AssistantTurnJournal {
      */
     resetForNewTurn() {
         this.#seq = 0;
-        this.#emittedRawItemKeys.clear();
+        this.#emittedItemKeys.clear();
     }
     /**
      * Returns all durable item events emitted so far, across all turns.
@@ -98,7 +98,7 @@ export class AssistantTurnJournal {
     /**
      * Record a provider-backed run item (function call, tool result,
      * assistant message, or reasoning). Duplicates within the same turn are
-     * suppressed by the dedup key on the raw item's callId / type / id.
+     * suppressed by the normalized item's call or provider identity.
      *
      * Returns the normalized persisted item so callers can layer additional
      * recovery logic on top.
@@ -107,16 +107,16 @@ export class AssistantTurnJournal {
         if (item == null) {
             return [];
         }
-        const dedupKey = makeRunItemDedupKey(item);
-        if (dedupKey && this.#emittedRawItemKeys.has(dedupKey)) {
-            return [];
-        }
         const items = buildPersistedAssistantItemsFromRaw(item);
         if (items.length === 0) {
             return [];
         }
+        const dedupKey = makeItemDedupKey(items);
+        if (dedupKey && this.#emittedItemKeys.has(dedupKey)) {
+            return [];
+        }
         if (dedupKey) {
-            this.#emittedRawItemKeys.add(dedupKey);
+            this.#emittedItemKeys.add(dedupKey);
         }
         for (const persisted of items) {
             const event = {
@@ -152,36 +152,21 @@ export class AssistantTurnJournal {
     }
 }
 /**
- * Compute a stable dedup key for a raw run item. Returns `null` if the
- * item doesn't carry enough information to dedup, in which case the journal
- * keeps the entry.
+ * Compute one stable identity for a normalized run item group. Tool identity
+ * wins so a provider wrapper and its equivalent canonical tool item share a
+ * key. The group is suppressed as a whole to avoid partially replaying items
+ * produced by one provider record.
  */
-function makeRunItemDedupKey(item) {
-    if (!item || typeof item !== 'object') {
-        return null;
-    }
-    const record = item;
-    const raw = (record.rawItem && typeof record.rawItem === 'object' ? record.rawItem : record);
-    const type = typeof raw.type === 'string' ? raw.type : '';
-    if (!type) {
-        return null;
-    }
-    const callId = typeof raw.callId === 'string'
-        ? raw.callId
-        : typeof raw.call_id === 'string'
-            ? raw.call_id
-            : typeof raw.tool_call_id === 'string'
-                ? raw.tool_call_id
-                : typeof raw.id === 'string'
-                    ? raw.id
-                    : null;
-    if (callId) {
-        return `${type}:${callId}`;
+function makeItemDedupKey(items) {
+    for (const item of items) {
+        if (item.type === 'tool_call' || item.type === 'tool_result') {
+            return `${item.type}:${item.callId}`;
+        }
     }
-    // For reasoning / assistant-message items, use (type, id) when available.
-    const id = typeof raw.id === 'string' ? raw.id : null;
-    if (id) {
-        return `${type}:${id}`;
+    for (const item of items) {
+        if ((item.type === 'reasoning' || item.type === 'assistant_text') && item.providerItemId) {
+            return `${item.type}:${item.providerItemId}`;
+        }
     }
     return null;
 }

package/dist/services/logging/assistant-turn-journal.js.map

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

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

@@ -1,12 +1,14 @@
-import type { AgentInputItem } from '@openai/agents';
+import type { ProviderInputItem } from '../../contracts/provider-input.js';
 import type { NormalizedUsage } from '../../utils/ai/token-usage.js';
 import type { CommandMessage } from '../../tools/types.js';
 import type { SubagentResult } from '../subagents/types.js';
 import type { SavedToolExecution } from '../tool-execution-ledger.js';
-import type { SavedAppMode, SavedMessage, PersistedAssistantTurn, PersistedAssistantTurnItem } from '../conversation/conversation-persistence-types.js';
+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;
 export interface StateSnapshot {
-    history: AgentInputItem[];
+    history: ProviderInputItem[];
     previousResponseId: string | null;
     toolLedger: SavedToolExecution[];
     model?: string;
@@ -36,7 +38,7 @@ export interface SettingsChangedEvent {
 }
 export interface UserMessageEvent {
     type: 'user_message';
-    message: SavedMessage;
+    message: UserMessage;
 }
 export interface ToolStartedLogEvent {
     type: 'tool_started';
@@ -74,6 +76,24 @@ export interface ApprovalResolvedLogEvent {
     answer: 'y' | 'n';
     rejectionReason?: string;
 }
+/** Observation-only evidence for a later OpenAI selector review. */
+export interface OpenAIRootSelectorParityLogEvent {
+    type: 'openai_root_selector_parity';
+    version: 2;
+    turnId?: string;
+    eligible: boolean;
+    matches: boolean;
+    /** Fixed diagnostic enum, only emitted when eligibility is false. */
+    failure?: 'model_unavailable' | 'identity_unavailable' | 'no_accepted_checkpoint' | 'missing_successor_proof' | 'lineage_mismatch' | 'invalid_planned_snapshot' | 'identity_mismatch' | 'origin_mismatch' | 'revision_not_advanced' | 'history_not_extended' | 'history_prefix_mismatch';
+}
+/** Sanitized, observation-only evidence for the OpenAI root checkpoint lifecycle. */
+export interface OpenAIRootCheckpointLifecycleLogEvent {
+    type: 'openai_root_checkpoint_lifecycle';
+    version: 1;
+    turnId?: string;
+    stage: 'candidate' | 'publication';
+    outcome: 'observed' | 'missing_prefix_binding' | 'not_prepared' | 'already_consumed' | 'input_mismatch' | 'missing_response_id' | 'invalid_lineage' | 'lineage_rejected' | 'promoted' | 'history_not_committed' | 'candidate_not_promoted';
+}
 /**
  * Streaming fragment of assistant output (text or reasoning) that has not yet
  * been materialized as a durable persisted item. These entries are intentionally
@@ -108,6 +128,8 @@ export interface SubagentStartedLogEvent {
     agentId: string;
     role: string;
     task: string;
+    /** Original public delegation tool, retained only for transcript compatibility. */
+    parentTool?: string;
     async?: boolean;
 }
 export interface SubagentToolStartedLogEvent {
@@ -121,6 +143,32 @@ export interface SubagentToolStartedLogEvent {
 export interface SubagentCompletedLogEvent {
     type: 'subagent_completed';
     result: SubagentResult;
+    /** Cumulative model-request cost records for the subagent run. */
+    costRecords?: ModelRequestCost[];
+}
+export interface SubagentQuestionLogEvent {
+    type: 'subagent_question';
+    messageId: string;
+    runId: string;
+    name?: string;
+    role: string;
+    question: string;
+}
+/** Durable observation that a session-owned shell job was launched. */
+export interface BackgroundShellStartedLogEvent {
+    type: 'background_shell_started';
+    jobId: string;
+    command: string;
+}
+/** Durable terminal observation for a background shell job. */
+export interface BackgroundShellCompletedLogEvent {
+    type: 'background_shell_completed';
+    jobId: string;
+    command: string;
+    status: 'completed' | 'failed' | 'timed_out' | 'cancelled';
+    /** Normalized, bounded shell output. */
+    output: string;
+    error?: string;
 }
 export interface ErrorLogEvent {
     type: 'error';
@@ -136,6 +184,8 @@ export interface AssistantTurnEvent {
     usage?: NormalizedUsage;
     /** Footer-compatible usage from the last streamed model turn, when available. */
     displayUsage?: NormalizedUsage;
+    /** Cumulative model-request cost records for the completed turn. */
+    costRecords?: ModelRequestCost[];
     state?: AssistantTurnState;
     /** Present in v2 logs. New v3 logs use `state` to avoid cumulative snapshots. */
     snapshot?: StateSnapshot;
@@ -148,12 +198,25 @@ export interface UndoEvent {
 export interface SessionClearedEvent {
     type: 'session_cleared';
 }
-export type LogEvent = SessionInitEvent | SettingsChangedEvent | UserMessageEvent | ToolStartedLogEvent | ToolResultLogEvent | CommandMessageLogEvent | ApprovalRequiredLogEvent | ApprovalResolvedLogEvent | SubagentStartedLogEvent | SubagentToolStartedLogEvent | SubagentCompletedLogEvent | ErrorLogEvent | AssistantTurnEvent | AssistantJournalDeltaLogEvent | AssistantJournalItemLogEvent | UndoEvent | SessionClearedEvent;
-export interface LogEnvelope {
+export type LogEvent = SessionInitEvent | SettingsChangedEvent | UserMessageEvent | ToolStartedLogEvent | ToolResultLogEvent | CommandMessageLogEvent | ApprovalRequiredLogEvent | ApprovalResolvedLogEvent | OpenAIRootSelectorParityLogEvent | OpenAIRootCheckpointLifecycleLogEvent | SubagentStartedLogEvent | SubagentToolStartedLogEvent | SubagentCompletedLogEvent | SubagentQuestionLogEvent | BackgroundShellStartedLogEvent | BackgroundShellCompletedLogEvent | ErrorLogEvent | AssistantTurnEvent | AssistantJournalDeltaLogEvent | AssistantJournalItemLogEvent | UndoEvent | SessionClearedEvent;
+export interface TruncatedLogEvent {
+    type: string;
+    truncated: true;
+    originalSize: number;
+}
+export type PersistedLogEvent = LogEvent | TruncatedLogEvent;
+/**
+ * Narrowing predicate for the storage-only truncation marker. Uses an `in`
+ * check (plus an explicit `=== true`) rather than the `type` discriminant
+ * because `TruncatedLogEvent.type` is a plain `string` that overlaps with
+ * every log-event type.
+ */
+export declare function isTruncatedLogEvent(event: PersistedLogEvent): event is TruncatedLogEvent;
+export interface LogEnvelope<TEvent = LogEvent> {
     v: number;
     seq: number;
     ts: string;
-    event: LogEvent;
+    event: TEvent;
 }
 export declare const AGENT_AFFECTING_SETTINGS: Set<string>;
 //# sourceMappingURL=conversation-log-events.d.ts.map