@qduc/term2 0.21.0 → 0.22.1

package/dist/utils/shell/execute-shell.js

@@ -232,6 +232,20 @@ async function executeShellCommandUnleased(command, options = {}) {
     // happens to exit 0 is still a timeout, so this is never cleared.
     let timedOutLatched = false;
     let outputCompleteResult;
+    // Typed reason the executor itself ended the command (deadline, caller
+    // cancellation, retained-output overflow), plus paused-time accounting for
+    // the network-approval pause. The reason is recorded when termination
+    // begins; overflow is classified from the retained-buffer error in the catch
+    // below because that kill happens inside the exec implementation.
+    let terminationKind;
+    let pausedTotalMs = 0;
+    let pausedSinceMs;
+    const endPauseAccounting = () => {
+        if (pausedSinceMs === undefined)
+            return;
+        pausedTotalMs += Date.now() - pausedSinceMs;
+        pausedSinceMs = undefined;
+    };
     try {
         const result = await new Promise((resolve, reject) => {
             let unregisterPauseController;
@@ -270,11 +284,15 @@ async function executeShellCommandUnleased(command, options = {}) {
              * only real guarantee is that this settles on a deadline regardless of
              * whether anything actually died.
              */
-            const beginTermination = () => {
+            const beginTermination = (kind) => {
                 if (settled || hardFinishTimer)
                     return;
+                // The first cause wins: once the deadline has fired, a later caller
+                // cancellation must not relabel the termination.
+                terminationKind ??= kind;
                 if (paused) {
                     paused = false;
+                    endPauseAccounting();
                     signalChildProcess(child, 'SIGCONT');
                 }
                 stopChildProcess(child);
@@ -296,7 +314,7 @@ async function executeShellCommandUnleased(command, options = {}) {
                     }
                 }, terminationGraceMs + drainGraceMs);
             };
-            const stopChild = () => beginTermination();
+            const stopChild = () => beginTermination('cancelled');
             const cleanupListeners = () => {
                 // The termination grace is owed to the direct child. Once it has exited,
                 // anything still in its group ignored SIGTERM or never saw it, and there
@@ -324,7 +342,7 @@ async function executeShellCommandUnleased(command, options = {}) {
                     timeoutId = undefined;
                     remainingTimeoutMs = 0;
                     timedOutLatched = true;
-                    beginTermination();
+                    beginTermination('deadline');
                 }, remainingTimeoutMs);
             };
             const pauseCommandTimeout = () => {
@@ -369,12 +387,14 @@ async function executeShellCommandUnleased(command, options = {}) {
                                 return;
                             pauseCommandTimeout();
                             paused = true;
+                            pausedSinceMs = Date.now();
                             signalChildProcess(child, 'SIGSTOP');
                         },
                         resume: () => {
                             if (settled || !paused)
                                 return;
                             paused = false;
+                            endPauseAccounting();
                             startCommandTimeout();
                             signalChildProcess(child, 'SIGCONT');
                         },
@@ -396,14 +416,34 @@ async function executeShellCommandUnleased(command, options = {}) {
             timedOut: timedOutLatched,
             signal: null,
             outputComplete: outputCompleteResult ?? true,
+            ...(terminationKind === undefined ? {} : { terminationKind }),
+            ...(pausedTotalMs > 0 ? { pausedMs: pausedTotalMs } : {}),
         };
     }
     catch (error) {
         const exitCode = typeof error?.code === 'number' ? error.code : null;
         const signal = error?.signal ?? null;
-        // The latch is authoritative; the signal check stays as a fallback for
-        // impls that terminate the child without going through the deadline.
-        const timedOut = timedOutLatched || Boolean(error?.killed || error?.signal === 'SIGTERM');
+        // The deadline latch is authoritative. A child can receive SIGTERM from
+        // outside this executor (for example, a process-control command matching
+        // its own supervision shell), and that must not be mistaken for expiry.
+        // Preserve the legacy cancellation bit for callers that still consume it;
+        // the typed reason is what distinguishes cancellation from a deadline.
+        const timedOut = timedOutLatched || terminationKind === 'cancelled';
+        // The retained-buffer overflow kill happens inside defaultExecImpl, so the
+        // executor never began termination for it; classify it from the error the
+        // implementation reports instead of leaving it as an unexplained signal.
+        let classifiedKind = terminationKind;
+        if (classifiedKind === undefined) {
+            if (typeof error?.message === 'string' && error.message.includes('maxBuffer length exceeded')) {
+                classifiedKind = 'output-overflow';
+            }
+            else if (error?.killed || signal !== null) {
+                // This is a process termination observed by the executor, not an
+                // executor-owned deadline. Keep it explicit so callers do not need to
+                // infer timeout attribution from SIGTERM/SIGKILL.
+                classifiedKind = 'process-terminated';
+            }
+        }
         return {
             stdout: error?.stdout?.toString() ?? '',
             stderr: error?.stderr?.toString() ?? '',
@@ -411,6 +451,8 @@ async function executeShellCommandUnleased(command, options = {}) {
             timedOut,
             signal,
             outputComplete: outputCompleteResult ?? true,
+            ...(classifiedKind === undefined ? {} : { terminationKind: classifiedKind }),
+            ...(pausedTotalMs > 0 ? { pausedMs: pausedTotalMs } : {}),
         };
     }
 }

package/dist/utils/shell/execute-shell.js.map

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

package/dist/utils/shell/shell-output.d.ts

@@ -7,6 +7,12 @@ export interface FormatShellExecutionOutputParams {
     timedOut: boolean;
     maxOutputLength?: number;
     durationMs?: number;
+    /** Effective deadline budget, for the bounded timeout explanation. */
+    timeoutMs?: number;
+    /** Where the effective budget came from (invocation vs a settings default). */
+    timeoutSource?: 'invocation' | 'foreground_setting' | 'background_setting';
+    /** Present when the executor stopped the command for a caller cancellation. */
+    cancelled?: boolean;
 }
 export interface FormatShellExecutionOutputResult {
     text: string;
@@ -24,5 +30,5 @@ export declare function saveOutputArtifact(contents: string, options?: {
 }): Promise<string>;
 /** Build the standard truncation note the agent relies on for follow-up reads. */
 export declare function formatFullOutputSavedNote(artifactPath: string): string;
-export declare function formatShellExecutionOutput({ command, cwd, stdout, stderr, exitCode, timedOut, maxOutputLength, durationMs, }: FormatShellExecutionOutputParams): Promise<FormatShellExecutionOutputResult>;
+export declare function formatShellExecutionOutput({ command, cwd, stdout, stderr, exitCode, timedOut, maxOutputLength, durationMs, timeoutMs, timeoutSource, cancelled, }: FormatShellExecutionOutputParams): Promise<FormatShellExecutionOutputResult>;
 //# sourceMappingURL=shell-output.d.ts.map

package/dist/utils/shell/shell-output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shell-output.d.ts","sourceRoot":"","sources":["../../../source/utils/shell/shell-output.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qFAAqF;AACrF,eAAO,MAAM,6BAA6B,yBAAyB,CAAC;AAgCpE;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAWjH;AAED,kFAAkF;AAClF,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEtE;AAED,wBAAsB,0BAA0B,CAAC,EAC/C,OAAO,EACP,GAAG,EACH,MAAM,EACN,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,UAAU,GACX,EAAE,gCAAgC,GAAG,OAAO,CAAC,gCAAgC,CAAC,CA0B9E"}
+{"version":3,"file":"shell-output.d.ts","sourceRoot":"","sources":["../../../source/utils/shell/shell-output.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,gCAAgC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+EAA+E;IAC/E,aAAa,CAAC,EAAE,YAAY,GAAG,oBAAoB,GAAG,oBAAoB,CAAC;IAC3E,+EAA+E;IAC/E,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,gCAAgC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,qFAAqF;AACrF,eAAO,MAAM,6BAA6B,yBAAyB,CAAC;AAkCpE;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,cAAc,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAWjH;AAED,kFAAkF;AAClF,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAEtE;AAkCD,wBAAsB,0BAA0B,CAAC,EAC/C,OAAO,EACP,GAAG,EACH,MAAM,EACN,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,eAAe,EACf,UAAU,EACV,SAAS,EACT,aAAa,EACb,SAAS,GACV,EAAE,gCAAgC,GAAG,OAAO,CAAC,gCAAgC,CAAC,CA6B9E"}

package/dist/utils/shell/shell-output.js

@@ -8,13 +8,14 @@ export const FULL_OUTPUT_SAVED_NOTE_PREFIX = 'Full output saved to';
 const TOOL_OUTPUT_DIR = path.join(SANDBOX_TEMP_DIR, 'tool-output');
 let toolOutputDirPromise;
 function buildArtifactContents(params) {
-    const statusLine = params.timedOut ? 'timeout' : `exit ${params.exitCode ?? 'null'}`;
+    const statusLine = params.cancelled ? 'cancelled' : params.timedOut ? 'timeout' : `exit ${params.exitCode ?? 'null'}`;
+    const timedOutColumn = params.timedOut && !params.cancelled ? 'yes' : 'no';
     return [
         `Command: ${params.command}`,
         `Working directory: ${params.cwd}`,
         `Status: ${statusLine}`,
         typeof params.durationMs === 'number' ? `Runtime: ${params.durationMs}ms` : undefined,
-        `Timed out: ${params.timedOut ? 'yes' : 'no'}`,
+        `Timed out: ${timedOutColumn}`,
         '',
         'STDOUT:',
         params.stdout || '(empty)',
@@ -44,7 +45,33 @@ export async function saveOutputArtifact(contents, options) {
 export function formatFullOutputSavedNote(artifactPath) {
     return `${FULL_OUTPUT_SAVED_NOTE_PREFIX} \`${artifactPath}\``;
 }
-export async function formatShellExecutionOutput({ command, cwd, stdout, stderr, exitCode, timedOut, maxOutputLength, durationMs, }) {
+/**
+ * Bounded, model-facing explanation of why the command stopped. Load-bearing
+ * wording (partial effects, no automatic replay) is part of the tool contract:
+ * a deadline is evidence the agent must diagnose, not a license to retry a
+ * command whose earlier effects may already have landed.
+ */
+function buildTerminationNote(params) {
+    if (params.cancelled) {
+        return 'Interrupted: the command was cancelled before completing.\nOutput may be partial and effects may already have occurred.';
+    }
+    if (!params.timedOut)
+        return '';
+    const budgetLabel = params.timeoutSource === 'invocation'
+        ? `its explicit ${params.timeoutMs}ms timeout`
+        : params.timeoutSource === 'background_setting'
+            ? `the ${params.timeoutMs}ms background-setting timeout`
+            : params.timeoutSource === 'foreground_setting'
+                ? `the ${params.timeoutMs}ms foreground-setting timeout`
+                : params.timeoutMs !== undefined
+                    ? `its ${params.timeoutMs}ms timeout budget`
+                    : 'its timeout budget';
+    return [
+        `Terminated: the command reached the end of ${budgetLabel} and was stopped.`,
+        'Output may be partial and effects may already have occurred; increasing the timeout does not authorize replaying the command.',
+    ].join('\n');
+}
+export async function formatShellExecutionOutput({ command, cwd, stdout, stderr, exitCode, timedOut, maxOutputLength, durationMs, timeoutMs, timeoutSource, cancelled, }) {
     const stdoutTrimmedOutput = trimOutput(stdout, undefined, maxOutputLength);
     const stderrTrimmedOutput = trimOutput(stderr, undefined, maxOutputLength);
     const stdoutTrimmed = stdoutTrimmedOutput.trimEnd();
@@ -52,16 +79,19 @@ export async function formatShellExecutionOutput({ command, cwd, stdout, stderr,
     const stdoutTruncated = stdoutTrimmedOutput !== stdout;
     const stderrTruncated = stderrTrimmedOutput !== stderr;
     const combinedOutput = [stdoutTrimmed, stderrTrimmed].filter(Boolean).join('\n').trimEnd();
-    const statusLine = timedOut ? 'timeout' : `exit ${exitCode ?? 'null'}`;
+    const statusLine = cancelled ? 'cancelled' : timedOut ? 'timeout' : `exit ${exitCode ?? 'null'}`;
     const runtimeLine = typeof durationMs === 'number' ? `Runtime: ${durationMs}ms` : '';
-    const emptyOutputNote = combinedOutput === '' && !timedOut && exitCode === 0 ? '(No output)' : '';
+    const terminationNote = buildTerminationNote({ timedOut, cancelled, timeoutMs, timeoutSource });
+    const emptyOutputNote = combinedOutput === '' && !timedOut && !cancelled && exitCode === 0 ? '(No output)' : '';
     let artifactPath;
     if (stdoutTruncated || stderrTruncated) {
-        artifactPath = await saveOutputArtifact(buildArtifactContents({ command, cwd, stdout, stderr, exitCode, timedOut, durationMs }));
+        artifactPath = await saveOutputArtifact(buildArtifactContents({ command, cwd, stdout, stderr, exitCode, timedOut, durationMs, cancelled }));
     }
     const truncationNote = artifactPath ? formatFullOutputSavedNote(artifactPath) : '';
     return {
-        text: [statusLine, runtimeLine, combinedOutput, emptyOutputNote, truncationNote].filter(Boolean).join('\n'),
+        text: [statusLine, runtimeLine, terminationNote, combinedOutput, emptyOutputNote, truncationNote]
+            .filter(Boolean)
+            .join('\n'),
         truncated: Boolean(artifactPath),
         artifactPath,
     };

package/dist/utils/shell/shell-output.js.map

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

package/dist/utils/streaming/streaming-session-factory.d.ts

@@ -33,6 +33,15 @@ export interface StreamingSessionFactoryDeps {
      */
     setRunBudgetNotice?: (event: RunBudgetEvent) => void;
     reasoningThrottleMs: number;
+    /**
+     * Shared message-id sequence. The session must mint ids from the same
+     * monotonic sequence as the caller's other messages: separate
+     * createMessageIdFactory instances derive the same `<timestamp>-0` id when
+     * they both fire within one millisecond, and a colliding id makes in-place
+     * finalization find the wrong message (sender mismatch) and silently skip,
+     * stranding the bot message in status 'streaming'.
+     */
+    createMessageId?: () => string;
     now?: () => number;
     createStreamingState?: () => StreamingState;
     createStreamingUpdateCoordinator?: typeof createStreamingUpdateCoordinator;

package/dist/utils/streaming/streaming-session-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EAClC,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAiC7F,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;IAC/D,WAAW,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACzD,YAAY,EAAE,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAC3D,sBAAsB,EAAE,4BAA4B,CAAC,wBAAwB,CAAC,CAAC;IAC/E,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC5D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7E,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yBAAyB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAqJzG"}
+{"version":3,"file":"streaming-session-factory.d.ts","sourceRoot":"","sources":["../../../source/utils/streaming/streaming-session-factory.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAC5F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,8BAA8B,EAC9B,KAAK,4BAA4B,EAClC,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAClG,OAAO,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AAC1E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AAiC7F,MAAM,WAAW,2BAA2B;IAC1C,cAAc,EAAE,4BAA4B,CAAC,gBAAgB,CAAC,CAAC;IAC/D,WAAW,EAAE,4BAA4B,CAAC,aAAa,CAAC,CAAC;IACzD,YAAY,EAAE,4BAA4B,CAAC,cAAc,CAAC,CAAC;IAC3D,sBAAsB,EAAE,4BAA4B,CAAC,wBAAwB,CAAC,CAAC;IAC/E,cAAc,EAAE,eAAe,CAAC;IAChC,YAAY,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;IAC/C,iBAAiB,CAAC,EAAE,CAAC,SAAS,EAAE,kBAAkB,KAAK,IAAI,CAAC;IAC5D,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,KAAK,IAAI,CAAC;IAC7E,qGAAqG;IACrG,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yBAAyB,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5D;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,IAAI,CAAC;IACrD,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;;;;;;OAOG;IACH,eAAe,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,oBAAoB,CAAC,EAAE,MAAM,cAAc,CAAC;IAC5C,gCAAgC,CAAC,EAAE,OAAO,gCAAgC,CAAC;IAC3E,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;CACxE;AAED,MAAM,WAAW,gBAAgB;IAC/B,kBAAkB,EAAE,4BAA4B,CAAC,oBAAoB,CAAC,CAAC;IACvE,gBAAgB,EAAE,4BAA4B,CAAC,kBAAkB,CAAC,CAAC;IACnE,cAAc,EAAE,cAAc,CAAC;IAC/B,sBAAsB,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,GAAG,gBAAgB,CAqJzG"}

package/dist/utils/streaming/streaming-session-factory.js

@@ -43,7 +43,7 @@ export function createStreamingSession(deps, label) {
     const createState = deps.createStreamingState ?? createStreamingState;
     const createCoordinator = deps.createStreamingUpdateCoordinator ?? createStreamingUpdateCoordinator;
     const createEventHandler = deps.createConversationEventHandler ?? createConversationEventHandler;
-    const createMessageId = createMessageIdFactory(now);
+    const createMessageId = deps.createMessageId ?? createMessageIdFactory(now);
     const streamingState = createState();
     const botResponseUpdater = createCoordinator((newBotText) => {
         deps.setMessages((prev) => {

package/dist/utils/streaming/streaming-session-factory.js.map

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

package/dist/utils/tool-args-display.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Coercions for rendering model-supplied tool arguments.
+ *
+ * `toolArgs` reaches the UI as unvalidated JSON straight from the model. A
+ * field the schema declares as an array or a string can arrive as anything —
+ * a JSON string, an object, a number — including from a partial stream. Ink
+ * renders inside `useMemo`, so an unguarded `.map`/`.split` on such a value
+ * throws during render and the error boundary takes down the whole surface,
+ * wedging a running session rather than degrading one message.
+ *
+ * Display code must never assume the declared shape. Coerce here instead.
+ */
+/** The value if it is genuinely an array, otherwise an empty array. */
+export declare function asDisplayArray<T = unknown>(value: unknown): T[];
+/**
+ * The value if it is a string, otherwise a rendered stand-in. Nullish becomes
+ * empty; other non-strings are shown rather than silently dropped, so a
+ * malformed payload is visible instead of looking like an empty file.
+ */
+export declare function asDisplayString(value: unknown): string;
+//# sourceMappingURL=tool-args-display.d.ts.map

package/dist/utils/tool-args-display.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-args-display.d.ts","sourceRoot":"","sources":["../../source/utils/tool-args-display.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,uEAAuE;AACvE,wBAAgB,cAAc,CAAC,CAAC,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,CAAC,EAAE,CAE/D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAQtD"}

package/dist/utils/tool-args-display.js

@@ -0,0 +1,34 @@
+/**
+ * Coercions for rendering model-supplied tool arguments.
+ *
+ * `toolArgs` reaches the UI as unvalidated JSON straight from the model. A
+ * field the schema declares as an array or a string can arrive as anything —
+ * a JSON string, an object, a number — including from a partial stream. Ink
+ * renders inside `useMemo`, so an unguarded `.map`/`.split` on such a value
+ * throws during render and the error boundary takes down the whole surface,
+ * wedging a running session rather than degrading one message.
+ *
+ * Display code must never assume the declared shape. Coerce here instead.
+ */
+/** The value if it is genuinely an array, otherwise an empty array. */
+export function asDisplayArray(value) {
+    return Array.isArray(value) ? value : [];
+}
+/**
+ * The value if it is a string, otherwise a rendered stand-in. Nullish becomes
+ * empty; other non-strings are shown rather than silently dropped, so a
+ * malformed payload is visible instead of looking like an empty file.
+ */
+export function asDisplayString(value) {
+    if (typeof value === 'string')
+        return value;
+    if (value === null || value === undefined)
+        return '';
+    try {
+        return JSON.stringify(value) ?? String(value);
+    }
+    catch {
+        return String(value);
+    }
+}
+//# sourceMappingURL=tool-args-display.js.map

package/dist/utils/tool-args-display.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-args-display.js","sourceRoot":"","sources":["../../source/utils/tool-args-display.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,uEAAuE;AACvE,MAAM,UAAU,cAAc,CAAc,KAAc;IACxD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,KAAa,CAAC,CAAC,CAAC,EAAE,CAAC;AACpD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,KAAc;IAC5C,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IAC5C,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IACrD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}

package/dist/utils/value-suggestions.d.ts

@@ -1,17 +1,11 @@
+import { isSecretSetting, isStringSetting, isNumberSetting } from '../services/settings/settings-ui-metadata.js';
+export { isSecretSetting, isStringSetting, isNumberSetting };
 export type SettingValueSuggestion = {
     value: string;
     description?: string;
 };
-/**
- * Secret settings hold credentials. Their current value must never be echoed
- * into the input buffer or the suggestion list: doing so lets a following paste
- * append to the existing secret instead of replacing it, producing a silently
- * malformed credential (two concatenated API keys) that only surfaces later as
- * an opaque provider 401.
- */
-export declare function isSecretSetting(key: string): boolean;
-export declare function isStringSetting(key: string): boolean;
-export declare function isNumberSetting(key: string): boolean;
+export declare function isProviderSettingKey(key: string): boolean;
+export declare function buildProviderSuggestions(): SettingValueSuggestion[];
 /**
  * Build value suggestions for a setting key.
  *

package/dist/utils/value-suggestions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"value-suggestions.d.ts","sourceRoot":"","sources":["../../source/utils/value-suggestions.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAyQF;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAGD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEpD;AAaD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,EAAE,CAQlF;AAED,wBAAgB,oCAAoC,CAClD,WAAW,EAAE,sBAAsB,EAAE,EACrC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAoB,EAChC,GAAG,CAAC,EAAE,MAAM,GACX,sBAAsB,EAAE,CAiD1B"}
+{"version":3,"file":"value-suggestions.d.ts","sourceRoot":"","sources":["../../source/utils/value-suggestions.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EACf,eAAe,EACf,eAAe,EAChB,MAAM,8CAA8C,CAAC;AAKtD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,CAAC;AAE7D,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAgBF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED,wBAAgB,wBAAwB,IAAI,sBAAsB,EAAE,CA0CnE;AAoKD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,EAAE,CAWlF;AAED,wBAAgB,oCAAoC,CAClD,WAAW,EAAE,sBAAsB,EAAE,EACrC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAoB,EAChC,GAAG,CAAC,EAAE,MAAM,GACX,sBAAsB,EAAE,CAiD1B"}