@timurproko/a1 0.2.6-dev.717 → 0.2.6-dev.734

package/dist/integrations/pi/engine/runtime-integration.d.ts

@@ -1,6 +1,7 @@
 import { createAgentSessionServices, SettingsManager, type AgentSession, type AgentSessionRuntime, type AgentSessionServices, type ScopedModel } from "../startup-public.js";
 import { resolvePiProjectTrustPreflight, type PiProjectTrustPreflightPrompt } from "./project-trust-preflight.js";
 import { type PiSessionForkPrompt, type PiSessionSelection } from "./session-selection.js";
+import { type StartupPhase } from "../../../foundation/startup/startup-runtime.js";
 export interface PiRuntimeIntegrationOptions {
     readonly cwd: string;
     readonly agentDir: string;
@@ -10,7 +11,12 @@ export interface PiRuntimeIntegrationOptions {
     readonly sessionForkPrompt?: PiSessionForkPrompt;
     readonly projectTrustPrompt?: PiProjectTrustPreflightPrompt;
     readonly preflightDependencies?: PiRuntimePreflightDependencies;
+    /** Host signal; model-scope resolution stops with it. Absent means only the resolver's own timeout applies. */
+    readonly signal?: AbortSignal;
+    /** Startup trace sink; the host supplies one that records each phase once per process. */
+    readonly markStartupPhase?: PiStartupPhaseMarker;
 }
+export type PiStartupPhaseMarker = (phase: StartupPhase) => Promise<void>;
 export interface PiRuntimePreflightDependencies {
     readonly resolveTrust?: typeof resolvePiProjectTrustPreflight;
     readonly createSettingsManager?: (cwd: string, agentDir: string, projectTrusted: boolean) => SettingsManager;
@@ -37,8 +43,8 @@ interface ConfiguredModelScope {
  * pattern ..."), and pick the same initial model pinned Pi would pick — the
  * saved default when it is in scope, otherwise the first scoped model.
  */
-export declare function resolveConfiguredModelScope(services: Pick<AgentSessionServices, "settingsManager" | "modelRuntime">): Promise<ConfiguredModelScope>;
-export declare function createPiRuntimeServicesAfterTrust(options: Pick<PiRuntimeIntegrationOptions, "agentDir" | "projectTrustPrompt" | "preflightDependencies"> & {
+export declare function resolveConfiguredModelScope(services: Pick<AgentSessionServices, "settingsManager" | "modelRuntime">, signal?: AbortSignal): Promise<ConfiguredModelScope>;
+export declare function createPiRuntimeServicesAfterTrust(options: Pick<PiRuntimeIntegrationOptions, "agentDir" | "projectTrustPrompt" | "preflightDependencies" | "markStartupPhase"> & {
     readonly cwd: string;
 }): Promise<{
     readonly services: AgentSessionServices;

package/dist/integrations/pi/engine/runtime-integration.js

@@ -9,12 +9,12 @@ import { createWindowsNulCleanupExtension } from "./windows-filesystem-hygiene.j
  * pattern ..."), and pick the same initial model pinned Pi would pick — the
  * saved default when it is in scope, otherwise the first scoped model.
  */
-export async function resolveConfiguredModelScope(services) {
+export async function resolveConfiguredModelScope(services, signal) {
     const patterns = services.settingsManager.getEnabledModels();
     if (!patterns || patterns.length === 0) {
         return { scopedModels: [], model: undefined, thinkingLevel: undefined, diagnostics: [] };
     }
-    const { scopedModels, diagnostics } = await resolveModelScopeWithDiagnostics([...patterns], services.modelRuntime, { signal: AbortSignal.timeout(15_000) });
+    const { scopedModels, diagnostics } = await resolveModelScopeWithDiagnostics([...patterns], services.modelRuntime, { signal: signal === undefined ? AbortSignal.timeout(15_000) : AbortSignal.any([signal, AbortSignal.timeout(15_000)]) });
     let selected;
     if (scopedModels.length > 0) {
         const savedProvider = services.settingsManager.getDefaultProvider();
@@ -38,13 +38,14 @@ export async function createPiRuntimeServicesAfterTrust(options) {
     const createSettingsManager = options.preflightDependencies?.createSettingsManager
         ?? ((targetCwd, agentDir, projectTrusted) => SettingsManager.create(targetCwd, agentDir, { projectTrusted }));
     const createServices = options.preflightDependencies?.createServices ?? createAgentSessionServices;
+    const markPhase = options.markStartupPhase ?? defaultStartupPhaseMarker;
     const trust = await resolveTrust({
         cwd: options.cwd,
         agentDir: options.agentDir,
         ...(options.projectTrustPrompt === undefined ? {} : { prompt: options.projectTrustPrompt }),
     });
     const settingsManager = createSettingsManager(options.cwd, options.agentDir, trust.trusted);
-    await markStartupPhase(process.env, "settings-loaded");
+    await markPhase("settings-loaded");
     const cleanupExtension = createWindowsNulCleanupExtension();
     const services = await createServices({
         cwd: options.cwd,
@@ -54,8 +55,8 @@ export async function createPiRuntimeServicesAfterTrust(options) {
             resourceLoaderOptions: { extensionFactories: [cleanupExtension] },
         }),
     });
-    await markStartupPhase(process.env, "pi-services");
-    await markStartupPhase(process.env, "resource-discovery");
+    await markPhase("pi-services");
+    await markPhase("resource-discovery");
     return { services, trust };
 }
 export async function createPiRuntimeIntegration(options) {
@@ -75,8 +76,9 @@ export async function createPiRuntimeIntegration(options) {
             agentDir: options.agentDir,
             ...(options.projectTrustPrompt === undefined ? {} : { projectTrustPrompt: options.projectTrustPrompt }),
             ...(options.preflightDependencies === undefined ? {} : { preflightDependencies: options.preflightDependencies }),
+            ...(options.markStartupPhase === undefined ? {} : { markStartupPhase: options.markStartupPhase }),
         });
-        const modelScope = await resolveConfiguredModelScope(services);
+        const modelScope = await resolveConfiguredModelScope(services, options.signal);
         const hasExistingSession = targetSessionManager.buildSessionContext().messages.length > 0;
         const created = await createAgentSessionFromServices({
             services,
@@ -86,7 +88,7 @@ export async function createPiRuntimeIntegration(options) {
             ...(modelScope.thinkingLevel && !hasExistingSession ? { thinkingLevel: modelScope.thinkingLevel } : {}),
             ...(modelScope.scopedModels.length > 0 ? { scopedModels: [...modelScope.scopedModels] } : {}),
         });
-        await markStartupPhase(process.env, "session-created");
+        await (options.markStartupPhase ?? defaultStartupPhaseMarker)("session-created");
         return {
             ...created,
             services,
@@ -102,6 +104,9 @@ export async function createPiRuntimeIntegration(options) {
         sessionManager,
     });
 }
+function defaultStartupPhaseMarker(phase) {
+    return markStartupPhase(process.env, phase);
+}
 export function bindPiRuntimeSession(runtime, rebind) {
     runtime.setRebindSession(rebind);
     return () => runtime.setRebindSession(undefined);

package/dist/integrations/pi/engine/session-events.js

@@ -177,10 +177,15 @@ export class PiSessionEvents {
                 if (event.type === "agent_settled") {
                     const assistants = finalMessages.filter(message => isRecord(message) && message.role === "assistant");
                     const lastAssistant = assistants.at(-1);
+                    const content = lastAssistant !== undefined && Array.isArray(lastAssistant.content) ? lastAssistant.content : [];
+                    const stopReason = lastAssistant === undefined ? null : stringValue(lastAssistant.stopReason) ?? null;
+                    const toolContinuation = stopReason === "toolUse"
+                        || content.some(item => isRecord(item) && item.type === "toolCall");
                     const successful = lastAssistant !== undefined
                         && stringValue(lastAssistant.errorMessage) === undefined
-                        && stringValue(lastAssistant.stopReason) !== "error"
-                        && stringValue(lastAssistant.stopReason) !== "aborted";
+                        && stopReason !== "error"
+                        && stopReason !== "aborted"
+                        && textFromContent(content).trim().length > 0;
                     this.#ports.emit({
                         type: "agent-run-settled",
                         sessionGeneration: this.#ports.sessionGeneration(),
@@ -189,6 +194,9 @@ export class PiSessionEvents {
                         model: this.#ports.activeModel(),
                         assistantMessageCount: assistants.length,
                         successful,
+                        stopReason,
+                        toolContinuation,
+                        aborted: event.aborted === true,
                     });
                 }
                 return;

package/dist/integrations/pi/engine/session-integration.d.ts

@@ -1,5 +1,4 @@
-import type { AgentSession, AgentSessionEvent, PromptOptions } from "../startup-public.js";
-import { type AgentCommandOutcome, type AgentEvent } from "../../../contracts/agent-engine/index.js";
+import type { AgentSession, PromptOptions } from "../startup-public.js";
 type PiPromptImages = NonNullable<PromptOptions["images"]>;
 export interface PiDocumentedSessionCommands {
     readonly isStreaming: AgentSession["isStreaming"];
@@ -36,8 +35,9 @@ export type PiSessionCommand = {
     readonly excludeFromContext: boolean;
     readonly onChunk?: (chunk: string) => void;
 };
+export type PiSessionCommandOutcome = "completed" | "rejected" | "failed" | "cancelled";
 export interface PiSessionCommandResult {
-    readonly outcome: AgentCommandOutcome;
+    readonly outcome: PiSessionCommandOutcome;
     readonly value?: unknown;
 }
 /** Routes neutral session commands to Pi while preserving Pi streaming and retry semantics. */
@@ -59,9 +59,4 @@ export declare class PiSessionCommandIntegration {
     /** Forgets the attachments kept for queued messages; the queue itself was cleared by the caller. */
     forgetQueuedImages(): void;
 }
-export interface PiOrderedEventIntegration {
-    dispose(): void;
-}
-export declare function subscribeToPiSessionEvents(session: Pick<AgentSession, "subscribe">, sessionId: string, emit: (event: AgentEvent) => void, malformed: (diagnostic: string) => void): PiOrderedEventIntegration;
-export declare function convertPiSessionEvent(event: AgentSessionEvent, sessionId: string, sequence: number): AgentEvent | null;
 export {};

package/dist/integrations/pi/engine/session-integration.js

@@ -1,4 +1,3 @@
-import { AGENT_ENGINE_CONTRACT_VERSION, } from "../../../contracts/agent-engine/index.js";
 /** Routes neutral session commands to Pi while preserving Pi streaming and retry semantics. */
 export class PiSessionCommandIntegration {
     #lastPrompt = null;
@@ -145,51 +144,3 @@ export class PiSessionCommandIntegration {
         return this.session.extensionRunner?.getCommand(name) !== undefined;
     }
 }
-export function subscribeToPiSessionEvents(session, sessionId, emit, malformed) {
-    let sequence = 0;
-    let disposed = false;
-    const unsubscribe = session.subscribe(event => {
-        if (disposed)
-            return;
-        sequence += 1;
-        try {
-            const converted = convertPiSessionEvent(event, sessionId, sequence);
-            if (converted)
-                emit(converted);
-        }
-        catch (error) {
-            malformed(`Pi session event ${sequence} is malformed: ${error instanceof Error ? error.message : String(error)}`);
-        }
-    });
-    return { dispose() { if (disposed)
-            return; disposed = true; unsubscribe(); } };
-}
-export function convertPiSessionEvent(event, sessionId, sequence) {
-    const base = { contractVersion: AGENT_ENGINE_CONTRACT_VERSION, sessionId, sequence };
-    switch (event.type) {
-        case "agent_start": return { ...base, type: "lifecycle", lifecycle: "busy", reason: null };
-        case "agent_settled": return { ...base, type: "lifecycle", lifecycle: "ready", reason: null };
-        case "agent_end": return event.willRetry ? null : { ...base, type: "lifecycle", lifecycle: "ready", reason: null };
-        case "message_start":
-        case "message_update":
-        case "message_end":
-            return { ...base, type: "content", content: toAgentMessage(event.message, event.type === "message_end" ? "final" : "streaming", sequence) };
-        default: return null;
-    }
-}
-function toAgentMessage(value, status, sequence) {
-    if (!value || typeof value !== "object")
-        throw new TypeError("message payload is not an object");
-    const message = value;
-    const role = message.role === "user" || message.role === "assistant" || message.role === "tool" || message.role === "system" ? message.role : "assistant";
-    const source = Array.isArray(message.content) ? message.content : [];
-    const text = source.flatMap(part => part && typeof part === "object" && typeof part.text === "string" ? [part.text] : []).join("");
-    return {
-        id: typeof message.id === "string" ? message.id : `message-${sequence}`,
-        role,
-        status,
-        content: text.length > 0
-            ? [{ kind: "text", text }]
-            : [{ kind: "unknown", sourceType: "pi-message", payload: { role: String(message.role ?? "unknown") } }],
-    };
-}

package/dist/integrations/pi/engine/session-runtime.d.ts

@@ -1,3 +1,4 @@
+import { type PiStartupPhaseMarker } from "./runtime-integration.js";
 import { PiSessionCommandIntegration } from "./session-integration.js";
 import { type AgentSession, type AgentSessionRuntime, type AgentSessionServices } from "../startup-public.js";
 import type { PiProjectTrustPreflightPrompt } from "./project-trust-preflight.js";
@@ -13,6 +14,9 @@ export interface PiEngineRuntimeFactoryInput {
     readonly sessionSelection?: PiSessionSelection;
     readonly sessionForkPrompt?: PiSessionForkPrompt;
     readonly projectTrustPrompt?: PiProjectTrustPreflightPrompt;
+    /** The host's signal; runtime creation steps that wait on the network stop with it. */
+    readonly signal: AbortSignal;
+    readonly markStartupPhase: PiStartupPhaseMarker;
 }
 export type PiEngineRuntimeFactory = (input: PiEngineRuntimeFactoryInput) => Promise<AgentSessionRuntime>;
 export type PiEnginePackageUpdateProbe = (settingsManager: AgentSessionServices["settingsManager"]) => Promise<readonly string[]>;
@@ -32,7 +36,9 @@ export interface PiEngineRuntimeOptions {
     readonly projectTrustPrompt: PiProjectTrustPreflightPrompt | undefined;
     readonly createRuntime: PiEngineRuntimeFactory | undefined;
     readonly checkPackageUpdates: PiEnginePackageUpdateProbe | undefined;
-    readonly announceStartupChangelog?: boolean;
+    /** Aborted by the host on disposal; a probe that resolves afterwards announces nothing. */
+    readonly signal: AbortSignal;
+    readonly markStartupPhase: PiStartupPhaseMarker;
     readonly pullRequestProbe?: PiPullRequestProbe;
     readonly pullRequestRefreshMs?: number;
     readonly repositoryContextPollMs?: number;
@@ -79,9 +85,12 @@ export declare class PiEngineRuntime {
     get pullRequest(): PiPullRequestIdentity | null;
     get sessionCommands(): PiSessionCommandIntegration | undefined;
     get started(): boolean;
-    /** Create the runtime, bind its first session, and announce the changelog; startup failures propagate. */
+    /** Create the runtime and bind its first session; startup failures propagate. */
     start(): Promise<AgentSessionRuntime>;
-    /** Probe extension packages for updates after startup and report them as an informational diagnostic. */
+    /**
+     * Probe extension packages for updates and report them as an informational diagnostic. The host
+     * calls this once per process, on the first session it creates.
+     */
     announcePackageUpdates(): Promise<void>;
     currentSessionFile(): string | null;
     currentSessionResumeMetadata(): PiSessionResumeMetadata | null;
@@ -96,4 +105,10 @@ export declare class PiEngineRuntime {
     deliverQueuedAfterCompaction(): void;
     /** Unsubscribe, stop observing compaction, and dispose the runtime; the session reference is kept for final reads. */
     dispose(): Promise<void>;
+    /**
+     * Announce pinned Pi's changelog since the last version this profile saw and record the current
+     * one. The host calls this once per process, on the first session it creates; the session must be
+     * empty, as in Pi's own startup.
+     */
+    announceChangelog(): Promise<void>;
 }

package/dist/integrations/pi/engine/session-runtime.js

@@ -94,12 +94,14 @@ export class PiEngineRuntime {
     get started() {
         return this.#runtime !== undefined;
     }
-    /** Create the runtime, bind its first session, and announce the changelog; startup failures propagate. */
+    /** Create the runtime and bind its first session; startup failures propagate. */
     async start() {
         const runtime = await this.#runtimeFactory({
             cwd: this.#cwd,
             agentDir: this.#options.agentDir,
             sessionId: this.#options.sessionId,
+            signal: this.#options.signal,
+            markStartupPhase: this.#options.markStartupPhase,
             ...(this.#options.sessionPath === undefined ? {} : { sessionPath: this.#options.sessionPath }),
             ...(this.#options.sessionSelection === undefined ? {} : { sessionSelection: this.#options.sessionSelection }),
             ...(this.#options.sessionForkPrompt === undefined ? {} : { sessionForkPrompt: this.#options.sessionForkPrompt }),
@@ -122,16 +124,17 @@ export class PiEngineRuntime {
             this.#ports.diagnostic(diagnostic.type === "error" ? "error" : diagnostic.type === "warning" ? "warning" : "info", code, diagnostic.message, diagnostic.type !== "error");
         }
         this.bindSession(runtime.session);
-        if (this.#options.announceStartupChangelog !== false)
-            await this.#announceChangelog(runtime.services.settingsManager);
         this.#repositoryRefreshEnabled = true;
         this.#startRepositoryRefresh();
         return runtime;
     }
-    /** Probe extension packages for updates after startup and report them as an informational diagnostic. */
+    /**
+     * Probe extension packages for updates and report them as an informational diagnostic. The host
+     * calls this once per process, on the first session it creates.
+     */
     async announcePackageUpdates() {
         const runtime = this.#runtime;
-        if (process.env.PI_OFFLINE || runtime === undefined)
+        if (process.env.PI_OFFLINE || runtime === undefined || this.#options.signal.aborted)
             return;
         let updates;
         try {
@@ -140,7 +143,7 @@ export class PiEngineRuntime {
         catch {
             return;
         }
-        if (this.#ports.disposed() || updates.length === 0)
+        if (this.#ports.disposed() || this.#options.signal.aborted || updates.length === 0)
             return;
         const packages = updates.map(name => `- ${name}`).join("\n");
         this.#ports.diagnostic("info", "package-updates", `Package updates are available. Run ${PRODUCT_IDENTITY.commandName} pi update --extensions\nPackages:\n${packages}`, true);
@@ -365,7 +368,13 @@ export class PiEngineRuntime {
                 this.#ports.event(event);
         });
     }
-    async #announceChangelog(settingsManager) {
+    /**
+     * Announce pinned Pi's changelog since the last version this profile saw and record the current
+     * one. The host calls this once per process, on the first session it creates; the session must be
+     * empty, as in Pi's own startup.
+     */
+    async announceChangelog() {
+        const settingsManager = this.#runtime?.services.settingsManager;
         if (!settingsManager || typeof settingsManager.getLastChangelogVersion !== "function"
             || typeof settingsManager.setLastChangelogVersion !== "function")
             return;
@@ -391,6 +400,8 @@ async function createDefaultPiRuntime(input) {
     return createPiRuntimeIntegration({
         cwd: input.cwd,
         agentDir: input.agentDir,
+        signal: input.signal,
+        markStartupPhase: input.markStartupPhase,
         ...(input.sessionPath === undefined ? {} : { sessionPath: input.sessionPath }),
         ...(input.sessionSelection === undefined ? {} : { sessionSelection: input.sessionSelection }),
         ...(input.sessionForkPrompt === undefined ? {} : { sessionForkPrompt: input.sessionForkPrompt }),

package/dist/integrations/pi/engine/settings-bridge.d.ts

@@ -1,6 +1,7 @@
 import type { SettingsManager } from "../startup-public.js";
 import type { AgentJsonValue, AgentSettingApplicationBoundary, AgentSettingChangeOutcome, AgentSettingDescriptor, AgentSettingOwner, AgentSettingsPort } from "../../../contracts/agent-engine/index.js";
-export type PiSettingKey = "autoCompact" | "showImages" | "imageWidthCells" | "autoResizeImages" | "blockImages" | "enableSkillCommands" | "steeringMode" | "followUpMode" | "transport" | "httpIdleTimeoutMs" | "cacheWarmingMode" | "modelThinkingLevels" | "theme" | "hideThinkingBlock" | "mermaidRenderingMode" | "showCacheMissNotices" | "collapseChangelog" | "enableInstallTelemetry" | "quietStartup" | "defaultProjectTrust" | "doubleEscapeAction" | "treeFilterMode" | "showHardwareCursor" | "editorPaddingX" | "outputPad" | "autocompleteMaxVisible" | "clearOnShrink" | "showTerminalProgress" | "tuiMode" | "fullscreenExitOutput" | "fullscreenScrollbar" | "fullscreenCopyOnSelect" | "fullscreenWheelScrollLines" | "warnings";
+import type { OwnedUiSessionSettingKey } from "../../../contracts/owned-ui/index.js";
+export type PiSettingKey = OwnedUiSessionSettingKey;
 export type PiSettingVisualClass = "none" | "transcript" | "transcript-geometry" | "editor-menu" | "queue-transcript" | "status-error" | "retry-error" | "footer-transcript" | "markdown" | "transcript-notice" | "startup-transcript" | "startup-selector" | "selector" | "terminal-cursor" | "editor-geometry" | "menu-geometry" | "terminal-frame" | "terminal-status" | "hidden";
 export interface PiSettingVisualEvidence {
     /** Reviewed visual family; `none` still names the behavior that can emit styled diagnostics. */
@@ -105,7 +106,6 @@ export declare class PiSettingsBridge implements AgentSettingsPort {
         write: boolean;
         flush: boolean;
     };
-    private readonly settings;
     constructor(settings: SettingsManager, providers?: PiSettingsProviders);
     bindOwner(owner: AgentSettingOwner, handlers: PiSettingOwnerHandlers): () => void;
     unbindOwner(owner: AgentSettingOwner): void;

package/dist/integrations/pi/engine/settings-bridge.js

@@ -294,9 +294,7 @@ export class PiSettingsBridge {
     #operations;
     #providers;
     #coordinator;
-    settings;
     constructor(settings, providers = {}) {
-        this.settings = settings;
         this.#providers = providers;
         const mapped = operations(settings, providers);
         this.#operations = new Map(mapped.map(operation => [operation.key, operation]));

package/dist/integrations/pi/engine/settings-port.d.ts

@@ -15,6 +15,8 @@ export interface PiEngineSettingsPorts {
     requireSession(): AgentSession;
     /** The session's thinking level was written through the settings port; the adapter mirrors and publishes it. */
     thinkingLevelChanged(level: OwnedUiThinkingLevel): void;
+    /** The HTTP idle timeout was written through the settings port; the host re-installs the process dispatcher. */
+    httpPolicyChanged(timeoutMs: number): void;
     emitView(): void;
 }
 /**

package/dist/integrations/pi/engine/settings-port.js

@@ -1,4 +1,3 @@
-import { configureOwnedHttpDispatcher } from "./http-dispatcher.js";
 import { isRecord, readThinkingLevel, stringProperty } from "./message-values.js";
 import { collectionResult } from "./resource-catalog.js";
 import { MODEL_THINKING_DEFAULT, PiSettingsBridge } from "./settings-bridge.js";
@@ -49,7 +48,6 @@ export class PiEngineSettings {
             return null;
         if (this.#settingsIntegration === undefined || this.#settingsIntegrationManager !== settings) {
             this.#settingsIntegrationManager = settings;
-            configureOwnedHttpDispatcher(settings.getHttpIdleTimeoutMs());
             this.#settingsIntegration = new PiSettingsBridge(settings, {
                 ...(this.#availableThemes === null ? {} : { themes: this.#availableThemes }),
                 models: () => this.#modelChoices(),
@@ -117,9 +115,9 @@ export class PiEngineSettings {
                 httpIdleTimeoutMs: { apply: value => {
                         if (typeof value !== "number" || !Number.isSafeInteger(value) || value < 0)
                             throw new TypeError("HTTP idle timeout is invalid");
-                        // Invariant: provider streaming reads the manager per request; global fetch uses
-                        // the matching owned dispatcher and zero maps to disabled semantics.
-                        configureOwnedHttpDispatcher(value);
+                        // Invariant: provider streaming reads the manager per request; the host gives global
+                        // fetch the matching process-wide dispatcher, and zero maps to disabled semantics.
+                        this.#ports.httpPolicyChanged(value);
                         settings.setHttpIdleTimeoutMs(value);
                     } },
                 cacheWarmingMode: { apply: value => {

package/dist/integrations/pi/engine/transcript-projection.js

@@ -363,7 +363,8 @@ export class PiTranscriptProjection {
             return;
         const source = ended ? event.result : event.partialResult;
         const payload = { toolCallId, toolName: stringValue(event.toolName) ?? "unknown",
-            partialResult: event.type === "tool_execution_update", argsComplete: true, isError: event.isError === true };
+            partialResult: event.type === "tool_execution_update", argsComplete: true, isError: event.isError === true,
+            ...(typeof event.durationMs === "number" ? { durationMs: event.durationMs } : {}) };
         const rendering = toolRenderingInput({ args: event.args, previousArgs: existing?.toolRendering, result: source,
             payload, image: part => this.imageReferences([part], "tool-result")[0] });
         this.upsert({