@gaunt-sloth/core 2.0.0-alpha.22 → 2.0.0-alpha.24

package/dist/core/toolCallRepair/payload.js

@@ -0,0 +1,341 @@
+// EXT-35 — plain-text tool-call repair payload parser.
+//
+// Ported (TypeScript, gaunt-sloth house style) from the openclaw
+// `@openclaw/tool-call-repair` reference (`packages/tool-call-repair/src/payload.ts`).
+// Carries the three text-emitted tool-call dialects small/local models produce:
+//   • bracket:   `[tool:name]{...json...}`  /  `[name]\n{...json...}[/name]`
+//   • XML-ish:   `<function=name><parameter=key>value</parameter></function>`
+//   • Harmony:   `<|channel|>commentary to=name code<|message|>{...json...}<|call|>`
+//     — plus the real gpt-oss variant (EXT-43) with a NAMESPACED name and a `<|constrain|>` marker:
+//       `<|channel|>commentary to=functions.get_weather<|constrain|>json<|message|>{...}<|call|>`
+//
+// {@link parseStandalonePlainTextToolCallBlocks} is STANDALONE-only by construction: it walks the
+// WHOLE input and returns null the moment it hits text that is not a tool-call block, so prose that
+// merely mentions a tool or contains brackets never parses as a call. Allow-list + payload-size
+// gating are threaded through {@link PlainTextToolCallParseOptions}. The reference's streaming
+// normalizer and user-visible strip helpers are intentionally omitted (not needed for promotion).
+import { consumeLineBreak, END_TOOL_REQUEST, finalDotSegment, findJsonObjectEnd, HARMONY_CALL_MARKER, HARMONY_CHANNEL_MARKER, HARMONY_CONSTRAIN_MARKER, HARMONY_MESSAGE_MARKER, isHarmonyToolNameChar, isPlainTextToolNameChar, skipHorizontalWhitespace, skipWhitespace, } from './grammar.js';
+/**
+ * The single source of truth for the plain-text tool-call payload cap (256 KB). A serialized call
+ * larger than this is never treated as a tool call. Re-exported from `./promote.js` (and the module
+ * index) as `MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES` — the public name — so there is ONE constant,
+ * not two duplicated literals. (EXT-43 unified the former `DEFAULT_MAX_PLAIN_TEXT_TOOL_PAYLOAD_BYTES`
+ * here with `promote.ts`'s copy.)
+ */
+export const MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES = 256_000;
+const utf8Encoder = new TextEncoder();
+function utf8ByteLengthWithinLimit(text, start, end, maxBytes) {
+    if (end - start > maxBytes) {
+        return null;
+    }
+    const byteLength = utf8Encoder.encode(text.slice(start, end)).byteLength;
+    return byteLength <= maxBytes ? byteLength : null;
+}
+function parseBracketOpening(text, start) {
+    if (text[start] !== '[') {
+        return null;
+    }
+    let cursor = start + 1;
+    if (text.startsWith('tool:', cursor)) {
+        cursor += 'tool:'.length;
+        const nameStart = cursor;
+        while (isPlainTextToolNameChar(text[cursor])) {
+            cursor += 1;
+        }
+        if (cursor === nameStart || text[cursor] !== ']') {
+            return null;
+        }
+        return {
+            allowsOptionalXmlishClose: true,
+            end: cursor + 1,
+            name: text.slice(nameStart, cursor),
+            requiresClosing: false,
+        };
+    }
+    const nameStart = cursor;
+    while (isPlainTextToolNameChar(text[cursor])) {
+        cursor += 1;
+    }
+    if (cursor === nameStart || text[cursor] !== ']') {
+        return null;
+    }
+    const name = text.slice(nameStart, cursor);
+    cursor += 1;
+    cursor = skipHorizontalWhitespace(text, cursor);
+    const afterLineBreak = consumeLineBreak(text, cursor);
+    if (afterLineBreak === null) {
+        return null;
+    }
+    return { end: afterLineBreak, name, requiresClosing: true };
+}
+function parseHarmonyOpening(text, start) {
+    let cursor = start;
+    if (text.startsWith(HARMONY_CHANNEL_MARKER, cursor)) {
+        cursor += HARMONY_CHANNEL_MARKER.length;
+    }
+    const channelStart = cursor;
+    while (/[A-Za-z_]/.test(text[cursor] ?? '')) {
+        cursor += 1;
+    }
+    const channel = text.slice(channelStart, cursor);
+    if (channel !== 'commentary' && channel !== 'analysis' && channel !== 'final') {
+        return null;
+    }
+    cursor = skipHorizontalWhitespace(text, cursor);
+    if (!text.startsWith('to=', cursor)) {
+        return null;
+    }
+    cursor += 3;
+    // Tool name. EXT-43: accept the real gpt-oss NAMESPACED form (`to=functions.get_weather`) by
+    // scanning dot-inclusive chars, then take the FINAL dot-segment as the allow-listed tool name.
+    // The reference dotless form (`to=get_weather`) is the single-segment degenerate case.
+    const nameStart = cursor;
+    while (isHarmonyToolNameChar(text[cursor])) {
+        cursor += 1;
+    }
+    if (cursor === nameStart) {
+        return null;
+    }
+    const name = finalDotSegment(text.slice(nameStart, cursor));
+    if (!name) {
+        // Trailing-dot / empty final segment (e.g. `to=functions.`) is not a valid tool name.
+        return null;
+    }
+    cursor = skipHorizontalWhitespace(text, cursor);
+    // Payload-format marker between the header and the JSON. The reference grammar requires the
+    // literal `code` token; real gpt-oss instead emits `<|constrain|>json` (EXT-43). Accept EITHER —
+    // but a marker is still REQUIRED, so the widening does not relax prose-safety (a bare
+    // `commentary to=x {…}` never promotes).
+    if (text.startsWith('code', cursor)) {
+        cursor += 4;
+    }
+    else if (text.startsWith(HARMONY_CONSTRAIN_MARKER, cursor)) {
+        cursor += HARMONY_CONSTRAIN_MARKER.length;
+        // Optional constraint-format token that follows the marker (e.g. `json`).
+        cursor = skipHorizontalWhitespace(text, cursor);
+        while (isPlainTextToolNameChar(text[cursor])) {
+            cursor += 1;
+        }
+    }
+    else {
+        return null;
+    }
+    cursor = skipWhitespace(text, cursor);
+    if (text.startsWith(HARMONY_MESSAGE_MARKER, cursor)) {
+        cursor = skipWhitespace(text, cursor + HARMONY_MESSAGE_MARKER.length);
+    }
+    return { end: cursor, name, requiresClosing: false };
+}
+function parseXmlishFunctionOpening(text, start) {
+    const match = /^<function=([A-Za-z0-9_.:-]{1,120})>\s*/i.exec(text.slice(start));
+    if (!match?.[1]) {
+        return null;
+    }
+    return { end: start + match[0].length, name: match[1], requiresClosing: false };
+}
+function parseOpening(text, start) {
+    return parseBracketOpening(text, start) ?? parseHarmonyOpening(text, start);
+}
+function consumeJsonObject(text, start, maxPayloadBytes) {
+    const cursor = skipWhitespace(text, start);
+    if (text[cursor] !== '{') {
+        return null;
+    }
+    const end = findJsonObjectEnd(text, cursor, maxPayloadBytes);
+    if (end === null || utf8ByteLengthWithinLimit(text, cursor, end, maxPayloadBytes) === null) {
+        return null;
+    }
+    const rawJson = text.slice(cursor, end);
+    try {
+        const parsed = JSON.parse(rawJson);
+        if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+            return null;
+        }
+        return { end, value: parsed };
+    }
+    catch {
+        return null;
+    }
+}
+function parseClosing(text, start, name) {
+    const cursor = skipWhitespace(text, start);
+    if (text.startsWith(END_TOOL_REQUEST, cursor)) {
+        return cursor + END_TOOL_REQUEST.length;
+    }
+    const namedClosing = `[/${name}]`;
+    if (text.startsWith(namedClosing, cursor)) {
+        return cursor + namedClosing.length;
+    }
+    return null;
+}
+function parseOptionalHarmonyClosing(text, start) {
+    const cursor = skipWhitespace(text, start);
+    if (text.startsWith(HARMONY_CALL_MARKER, cursor)) {
+        return cursor + HARMONY_CALL_MARKER.length;
+    }
+    return start;
+}
+function parsePlainTextToolCallBlockAt(text, start, options) {
+    const opening = parseOpening(text, start);
+    if (!opening) {
+        return null;
+    }
+    const allowedToolNames = options?.allowedToolNames
+        ? new Set(options.allowedToolNames)
+        : undefined;
+    if (allowedToolNames && !allowedToolNames.has(opening.name)) {
+        return null;
+    }
+    const payload = consumeJsonObject(text, opening.end, options?.maxPayloadBytes ?? MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES);
+    if (!payload) {
+        return null;
+    }
+    const closingEnd = opening.requiresClosing
+        ? parseClosing(text, payload.end, opening.name)
+        : parseOptionalHarmonyClosing(text, payload.end);
+    if (closingEnd === null) {
+        return null;
+    }
+    return {
+        arguments: payload.value,
+        end: closingEnd,
+        name: opening.name,
+        raw: text.slice(start, closingEnd),
+        start,
+    };
+}
+function findXmlishParameterBlock(text, start) {
+    const cursor = skipWhitespace(text, start);
+    const openMatch = /^<parameter=([A-Za-z0-9_.:-]{1,120})>/i.exec(text.slice(cursor));
+    if (!openMatch?.[1]) {
+        return null;
+    }
+    const payloadStart = cursor + openMatch[0].length;
+    const closeMatch = /<\/parameter>/i.exec(text.slice(payloadStart));
+    if (!closeMatch) {
+        return null;
+    }
+    const closeStart = payloadStart + closeMatch.index;
+    const closeEnd = closeStart + closeMatch[0].length;
+    return {
+        closeStart,
+        end: closeEnd,
+        name: openMatch[1],
+        payloadStart,
+        start: cursor,
+    };
+}
+function extractXmlishParameterValue(text, start, end) {
+    let payloadStart = start;
+    let payloadEnd = end;
+    const afterOpeningLineBreak = consumeLineBreak(text, payloadStart);
+    if (afterOpeningLineBreak !== null) {
+        payloadStart = afterOpeningLineBreak;
+        if (payloadEnd > payloadStart && text[payloadEnd - 1] === '\n') {
+            payloadEnd -= 1;
+            if (payloadEnd > payloadStart && text[payloadEnd - 1] === '\r') {
+                payloadEnd -= 1;
+            }
+        }
+        else if (payloadEnd > payloadStart && text[payloadEnd - 1] === '\r') {
+            payloadEnd -= 1;
+        }
+    }
+    return text.slice(payloadStart, payloadEnd);
+}
+function consumeXmlishParameterBlock(text, start, maxPayloadBytes) {
+    const bounds = findXmlishParameterBlock(text, start);
+    if (!bounds) {
+        return null;
+    }
+    const byteLength = utf8ByteLengthWithinLimit(text, start, bounds.end, maxPayloadBytes);
+    if (byteLength === null) {
+        return null;
+    }
+    return {
+        byteLength,
+        end: bounds.end,
+        name: bounds.name,
+        value: extractXmlishParameterValue(text, bounds.payloadStart, bounds.closeStart),
+    };
+}
+function consumeXmlishFunctionClose(text, start) {
+    const cursor = skipWhitespace(text, start);
+    return text.slice(cursor).toLowerCase().startsWith('</function>')
+        ? cursor + '</function>'.length
+        : null;
+}
+function consumeOptionalXmlishFunctionClose(text, start) {
+    return consumeXmlishFunctionClose(text, start) ?? start;
+}
+function parseXmlishOpening(text, start) {
+    return parseBracketOpening(text, start) ?? parseXmlishFunctionOpening(text, start);
+}
+function parseXmlishPlainTextToolCallBlockAt(text, start, options) {
+    const opening = parseXmlishOpening(text, start);
+    if (!opening) {
+        return null;
+    }
+    const allowedToolNames = options?.allowedToolNames
+        ? new Set(options.allowedToolNames)
+        : undefined;
+    if (allowedToolNames && !allowedToolNames.has(opening.name)) {
+        return null;
+    }
+    const maxPayloadBytes = options?.maxPayloadBytes ?? MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES;
+    const args = {};
+    let cursor = opening.end;
+    let parameterCount = 0;
+    let payloadBytes = 0;
+    while (true) {
+        const parameter = consumeXmlishParameterBlock(text, cursor, maxPayloadBytes);
+        if (!parameter) {
+            break;
+        }
+        payloadBytes += parameter.byteLength;
+        if (payloadBytes > maxPayloadBytes) {
+            return null;
+        }
+        args[parameter.name] = parameter.value;
+        parameterCount += 1;
+        cursor = parameter.end;
+    }
+    if (parameterCount === 0) {
+        return null;
+    }
+    const end = opening.allowsOptionalXmlishClose
+        ? consumeOptionalXmlishFunctionClose(text, cursor)
+        : consumeXmlishFunctionClose(text, cursor);
+    if (end === null) {
+        return null;
+    }
+    return {
+        arguments: args,
+        end,
+        name: opening.name,
+        raw: text.slice(start, end),
+        start,
+    };
+}
+/**
+ * Parse the WHOLE input into standalone plain-text tool-call blocks, or return null if any part of
+ * it is not such a block. This all-or-nothing walk is the standalone-only gate: prose that merely
+ * mentions a tool name, contains brackets, or embeds a call inside a sentence never parses (the
+ * first non-block character aborts the parse). Allow-list + payload-cap gating are applied per
+ * block via {@link PlainTextToolCallParseOptions}.
+ */
+export function parseStandalonePlainTextToolCallBlocks(text, options) {
+    const blocks = [];
+    let cursor = skipWhitespace(text, 0);
+    while (cursor < text.length) {
+        const block = parsePlainTextToolCallBlockAt(text, cursor, options) ??
+            parseXmlishPlainTextToolCallBlockAt(text, cursor, options);
+        if (!block) {
+            return null;
+        }
+        blocks.push(block);
+        cursor = skipWhitespace(text, block.end);
+    }
+    return blocks.length > 0 ? blocks : null;
+}
+//# sourceMappingURL=payload.js.map

package/dist/core/toolCallRepair/payload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payload.js","sourceRoot":"","sources":["../../../src/core/toolCallRepair/payload.ts"],"names":[],"mappings":"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"}

package/dist/core/toolCallRepair/promote.d.ts

@@ -0,0 +1,45 @@
+import { AIMessage } from '@langchain/core/messages';
+/**
+ * A sane default cap on a single repaired call's serialized payload. A text blob larger than this
+ * is never treated as a tool call. Overridable per call so a test can assert the cap with a small
+ * value; production leaves it at the default. The single source of truth lives in `./payload.js`
+ * and is re-exported here under its public name (EXT-43 unified the former duplicated literal).
+ */
+export { MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES } from './payload.js';
+/** LangChain native tool-call shape (structurally a `ToolCall` from `@langchain/core/messages`). */
+type NativeToolCall = {
+    id: string;
+    name: string;
+    args: Record<string, unknown>;
+    type: 'tool_call';
+};
+/** Gates for {@link textToNativeToolCalls} / {@link promoteTextEmittedToolCallMessage}. */
+export interface TextToolCallRepairOptions {
+    /**
+     * The names of the tools bound to this run (the allow-list). Only a text-emitted call whose name
+     * is one of these promotes; an unknown name is left as text. An EMPTY set promotes nothing — the
+     * prose-safe default (no toolset ⇒ nothing is a call).
+     */
+    allowedToolNames: Iterable<string>;
+    /** Payload-size cap; defaults to {@link MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES}. */
+    maxPayloadBytes?: number;
+}
+/**
+ * Parse assistant `text` as one-or-more STANDALONE text-emitted tool calls and return them as
+ * native LangChain tool_calls, or `undefined` when the text is not a standalone call, names a tool
+ * outside the allow-list, or exceeds the payload cap. Fresh `id`s are minted per call (the model
+ * emitted none). Empty allow-list ⇒ `undefined` (never promote).
+ */
+export declare function textToNativeToolCalls(text: string | undefined, options: TextToolCallRepairOptions): NativeToolCall[] | undefined;
+/**
+ * Repair one assistant {@link AIMessage}: if it has NO native tool_calls but its content is a
+ * standalone text-emitted call (allow-listed, within the payload cap), return a NEW AIMessage that
+ * carries the promoted native tool_calls; otherwise return `undefined` (the caller keeps the
+ * original, so the native happy path is untouched).
+ *
+ * The returned message PRESERVES the original `id`. That is load-bearing: LangGraph's message-state
+ * reducer merges by id, so a same-id message REPLACES the original in graph state (rather than
+ * appending a duplicate/dangling assistant message). Content is cleared to '' since the raw
+ * text-call is now represented natively as tool_calls.
+ */
+export declare function promoteTextEmittedToolCallMessage(message: AIMessage, options: TextToolCallRepairOptions): AIMessage | undefined;

package/dist/core/toolCallRepair/promote.js

@@ -0,0 +1,90 @@
+// EXT-35 — promote a text-emitted tool call to a native LangChain tool_call.
+//
+// The LangChain-message adaptation of the openclaw `@openclaw/tool-call-repair` reference
+// (`packages/tool-call-repair/src/promote.ts`'s `promoteStandalonePlainTextToolCallMessage`).
+// Small/local models (Gemma, lmstudio, gpt-oss) often serialise a tool call as assistant TEXT
+// rather than a native `tool_call`; the ReAct graph then sees no tool_calls and ends the turn
+// ("no tool calls = done"), stalling the loop. This module rescues a STANDALONE text-emitted call
+// by rewriting the assistant message into one carrying a native `tool_call`, so the graph routes to
+// the tools node and the loop continues.
+//
+// Three hard gates keep prose from ever being misread as a call:
+//   1. name allow-list — only a call whose tool name is in the bound toolset promotes (an empty
+//      allow-list promotes nothing, the prose-safe default);
+//   2. payload-size cap — an oversized JSON blob is not treated as a call;
+//   3. standalone-only — the message content must be ESSENTIALLY JUST the call (enforced by
+//      {@link parseStandalonePlainTextToolCallBlocks}'s whole-input walk).
+//
+// Unlike the reference we do NOT set a `stopReason`/`toolUse` flag: langchain's ReAct router keys
+// purely off the presence of `tool_calls` on the last AIMessage, so promoting the tool_calls array
+// is sufficient to continue the loop.
+import { AIMessage } from '@langchain/core/messages';
+import { randomUUID } from 'node:crypto';
+import { MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES, parseStandalonePlainTextToolCallBlocks, } from './payload.js';
+/**
+ * A sane default cap on a single repaired call's serialized payload. A text blob larger than this
+ * is never treated as a tool call. Overridable per call so a test can assert the cap with a small
+ * value; production leaves it at the default. The single source of truth lives in `./payload.js`
+ * and is re-exported here under its public name (EXT-43 unified the former duplicated literal).
+ */
+export { MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES } from './payload.js';
+/**
+ * Parse assistant `text` as one-or-more STANDALONE text-emitted tool calls and return them as
+ * native LangChain tool_calls, or `undefined` when the text is not a standalone call, names a tool
+ * outside the allow-list, or exceeds the payload cap. Fresh `id`s are minted per call (the model
+ * emitted none). Empty allow-list ⇒ `undefined` (never promote).
+ */
+export function textToNativeToolCalls(text, options) {
+    const allowedToolNames = new Set(options.allowedToolNames);
+    // Prose-safety default: with no bound tools nothing can be a call.
+    if (allowedToolNames.size === 0) {
+        return undefined;
+    }
+    const trimmed = (text ?? '').trim();
+    if (!trimmed) {
+        return undefined;
+    }
+    const parseOptions = {
+        allowedToolNames,
+        maxPayloadBytes: options.maxPayloadBytes ?? MAX_TEXT_EMITTED_TOOL_CALL_PAYLOAD_BYTES,
+    };
+    const blocks = parseStandalonePlainTextToolCallBlocks(trimmed, parseOptions);
+    if (!blocks) {
+        return undefined;
+    }
+    return blocks.map((block) => ({
+        id: randomUUID(),
+        name: block.name,
+        args: block.arguments,
+        type: 'tool_call',
+    }));
+}
+/**
+ * Repair one assistant {@link AIMessage}: if it has NO native tool_calls but its content is a
+ * standalone text-emitted call (allow-listed, within the payload cap), return a NEW AIMessage that
+ * carries the promoted native tool_calls; otherwise return `undefined` (the caller keeps the
+ * original, so the native happy path is untouched).
+ *
+ * The returned message PRESERVES the original `id`. That is load-bearing: LangGraph's message-state
+ * reducer merges by id, so a same-id message REPLACES the original in graph state (rather than
+ * appending a duplicate/dangling assistant message). Content is cleared to '' since the raw
+ * text-call is now represented natively as tool_calls.
+ */
+export function promoteTextEmittedToolCallMessage(message, options) {
+    // Happy path untouched: repair engages ONLY when there are no native tool_calls.
+    if (message.tool_calls && message.tool_calls.length > 0) {
+        return undefined;
+    }
+    const toolCalls = textToNativeToolCalls(message.text, options);
+    if (!toolCalls) {
+        return undefined;
+    }
+    return new AIMessage({
+        id: message.id,
+        content: '',
+        tool_calls: toolCalls,
+        additional_kwargs: message.additional_kwargs,
+        response_metadata: message.response_metadata,
+    });
+}
+//# sourceMappingURL=promote.js.map

package/dist/core/toolCallRepair/promote.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"promote.js","sourceRoot":"","sources":["../../../src/core/toolCallRepair/promote.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,EAAE;AACF,0FAA0F;AAC1F,8FAA8F;AAC9F,8FAA8F;AAC9F,8FAA8F;AAC9F,kGAAkG;AAClG,oGAAoG;AACpG,yCAAyC;AACzC,EAAE;AACF,iEAAiE;AACjE,gGAAgG;AAChG,6DAA6D;AAC7D,2EAA2E;AAC3E,4FAA4F;AAC5F,2EAA2E;AAC3E,EAAE;AACF,kGAAkG;AAClG,mGAAmG;AACnG,sCAAsC;AAEtC,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EACL,wCAAwC,EACxC,sCAAsC,GAEvC,MAAM,cAAc,CAAC;AAEtB;;;;;GAKG;AACH,OAAO,EAAE,wCAAwC,EAAE,MAAM,cAAc,CAAC;AAsBxE;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CACnC,IAAwB,EACxB,OAAkC;IAElC,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3D,mEAAmE;IACnE,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACpC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,YAAY,GAAkC;QAClD,gBAAgB;QAChB,eAAe,EAAE,OAAO,CAAC,eAAe,IAAI,wCAAwC;KACrF,CAAC;IACF,MAAM,MAAM,GAAG,sCAAsC,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC7E,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC5B,EAAE,EAAE,UAAU,EAAE;QAChB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,IAAI,EAAE,KAAK,CAAC,SAAS;QACrB,IAAI,EAAE,WAAoB;KAC3B,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,iCAAiC,CAC/C,OAAkB,EAClB,OAAkC;IAElC,iFAAiF;IACjF,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,SAAS,GAAG,qBAAqB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,IAAI,SAAS,CAAC;QACnB,EAAE,EAAE,OAAO,CAAC,EAAE;QACd,OAAO,EAAE,EAAE;QACX,UAAU,EAAE,SAAS;QACrB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;KAC7C,CAAC,CAAC;AACL,CAAC"}

package/dist/core/toolDisplay.d.ts

@@ -46,7 +46,13 @@ export interface ToolCallDisplayInput {
  * defensive posture: a half-streamed or malformed buffer never throws — it returns `null`.
  */
 export declare function parseToolArgsSafe(argsText: string | undefined): Record<string, unknown> | null;
-/** Test seam: drop the cached env-derived secret literals so specs can vary the env. */
+/**
+ * Register the live config for inline-secret collection (TUI-C32 residual a). Resets the secret
+ * cache so the next {@link getDefaultSecrets} recomputes with the config's inline literals folded
+ * in. Idempotent; a later call with a fresh config supersedes the previous one.
+ */
+export declare function setToolDisplayConfig(config: unknown): void;
+/** Test seam: drop the cached secret literals + registered config so specs can vary both. */
 export declare function resetToolDisplaySecretsCacheForTests(): void;
 /**
  * Parse the shared shell-result shape (`Executing '…'…\n\n<COMMAND_OUTPUT>…</COMMAND_OUTPUT>\n\n
@@ -57,6 +63,13 @@ export declare function parseCommandOutputResult(result: string | undefined): {
     body: string;
     tail: string;
 } | null;
+/**
+ * TUI-C32 residual c — is THIS tool call genuinely a shell-shaped result (name allows it AND the
+ * result actually carries the `<COMMAND_OUTPUT>` shape)? Used by the plain surface to decide
+ * `liveOutputAlreadyShown` (the child streamed live via the tool-output channel's default sink),
+ * so a non-shell tool whose result merely quotes the marker no longer has its body suppressed.
+ */
+export declare function isShellShapedResult(name: string, result: string | undefined): boolean;
 /** The registry glyph for a tool name (generic `⚙` when unknown). */
 export declare function getToolGlyph(name: string): string;
 /**

package/dist/core/toolDisplay.js

@@ -64,16 +64,35 @@ export function parseToolArgsSafe(argsText) {
     }
 }
 /**
- * Lazily-computed default secret literals for redaction (GS2-47 technique 1), harvested from
- * the process env the same way `/debug-dump` does. Cached because `collectSecretValues` walks
- * the whole env; the set cannot change mid-process in any way this render path must react to.
- * `redactText` additionally always applies the provider-key patterns (technique 2).
+ * The live gth config, registered once per run so {@link getDefaultSecrets} can harvest INLINE
+ * config secrets (a pasted `apiKey`/`token` value) via the GS2-47 config walk — not only the
+ * env-derived literals. `GthAgentRunner.init` sets this next to the crash-context hand-off, so
+ * both render surfaces (the plain observer and the Ink TUI) see it. `undefined` (no config yet)
+ * degrades to env-only collection + the provider patterns, exactly as before.
+ */
+let displayConfig = undefined;
+/**
+ * Register the live config for inline-secret collection (TUI-C32 residual a). Resets the secret
+ * cache so the next {@link getDefaultSecrets} recomputes with the config's inline literals folded
+ * in. Idempotent; a later call with a fresh config supersedes the previous one.
+ */
+export function setToolDisplayConfig(config) {
+    displayConfig = config;
+    cachedSecrets = null;
+}
+/**
+ * Lazily-computed default secret literals for redaction (GS2-47 technique 1), harvested from the
+ * process env AND the registered config (inline `apiKey`/`token` values) the same way
+ * `/debug-dump` does. Cached because `collectSecretValues` walks the whole env + config; the set
+ * cannot change mid-process in any way this render path must react to (a new config resets it via
+ * {@link setToolDisplayConfig}). `redactText` additionally always applies the provider-key
+ * patterns (technique 2).
  */
 let cachedSecrets = null;
 function getDefaultSecrets() {
     if (cachedSecrets === null) {
         try {
-            cachedSecrets = collectSecretValues(undefined, env ?? {});
+            cachedSecrets = collectSecretValues(displayConfig, env ?? {});
         }
         catch {
             cachedSecrets = []; // patterns still apply via redactText
@@ -81,9 +100,10 @@ function getDefaultSecrets() {
     }
     return cachedSecrets;
 }
-/** Test seam: drop the cached env-derived secret literals so specs can vary the env. */
+/** Test seam: drop the cached secret literals + registered config so specs can vary both. */
 export function resetToolDisplaySecretsCacheForTests() {
     cachedSecrets = null;
+    displayConfig = undefined;
 }
 /** Collapse whitespace runs (incl. newlines) so a value stays a one-line token. */
 function inline(value) {
@@ -154,6 +174,26 @@ export function parseCommandOutputResult(result) {
         return null;
     return { body: match[1] ?? '', tail: (match[2] ?? '').trim() };
 }
+/**
+ * TUI-C32 residual c — may this tool NAME be treated as shell-shaped at all? A registered entry
+ * must be explicitly {@link ToolDisplayEntry.shellShaped}; an unregistered/custom name falls back
+ * to shape-detection (custom toolkit tools own user-defined names yet share the result shape). A
+ * registered non-shell tool (`read_file`, `list_directory`, …) is therefore NEVER shell-parsed
+ * just because its result happens to contain the `<COMMAND_OUTPUT>` marker.
+ */
+function nameAllowsShellShape(name) {
+    const entry = TOOL_DISPLAY_REGISTRY[name];
+    return entry ? entry.shellShaped === true : true;
+}
+/**
+ * TUI-C32 residual c — is THIS tool call genuinely a shell-shaped result (name allows it AND the
+ * result actually carries the `<COMMAND_OUTPUT>` shape)? Used by the plain surface to decide
+ * `liveOutputAlreadyShown` (the child streamed live via the tool-output channel's default sink),
+ * so a non-shell tool whose result merely quotes the marker no longer has its body suppressed.
+ */
+export function isShellShapedResult(name, result) {
+    return nameAllowsShellShape(name) && parseCommandOutputResult(result) !== null;
+}
 /**
  * Body formatter for shell-shaped calls: the child's output (preferring the LIVE streamed
  * output — verbatim what the child printed — over the result's `<COMMAND_OUTPUT>` copy of it,
@@ -170,7 +210,15 @@ function formatShellBody(input) {
         return null;
     const lines = [];
     if (!input.liveOutputAlreadyShown) {
-        const body = input.output && input.output.length > 0 ? input.output : (parsed?.body ?? '');
+        // TUI-C32 residual d — the streamed live output is normally the verbatim, most-complete copy,
+        // so it is preferred (TUI-C17 dedupe). But if the live channel dropped straggler/tail chunks
+        // it can be a strict PREFIX of the result's `<COMMAND_OUTPUT>` copy (which the model always
+        // receives in full) — in that case fall back to the fuller copy so the expanded view can still
+        // recover what the stream missed. The common case (live === result, an independent/capped
+        // result, or an empty live output) is unchanged: only a genuine dropped-tail prefix overrides.
+        const live = input.output ?? '';
+        const resultBody = parsed?.body ?? '';
+        const body = resultBody.length > live.length && resultBody.startsWith(live) ? resultBody : live;
         if (body.trim().length > 0)
             lines.push(...styled(toLines(body), 'dim'));
     }
@@ -249,11 +297,17 @@ const TOOL_DISPLAY_REGISTRY = {
         glyph: SHELL_GLYPH,
         summariseArgs: ['command'],
         formatBody: formatShellBody,
+        shellShaped: true,
+    },
+    run_tests: { glyph: SHELL_GLYPH, formatBody: formatShellBody, shellShaped: true },
+    run_single_test: {
+        glyph: SHELL_GLYPH,
+        summariseArgs: ['testPath'],
+        formatBody: formatShellBody,
+        shellShaped: true,
     },
-    run_tests: { glyph: SHELL_GLYPH, formatBody: formatShellBody },
-    run_single_test: { glyph: SHELL_GLYPH, summariseArgs: ['testPath'], formatBody: formatShellBody },
-    run_lint: { glyph: SHELL_GLYPH, formatBody: formatShellBody },
-    run_build: { glyph: SHELL_GLYPH, formatBody: formatShellBody },
+    run_lint: { glyph: SHELL_GLYPH, formatBody: formatShellBody, shellShaped: true },
+    run_build: { glyph: SHELL_GLYPH, formatBody: formatShellBody, shellShaped: true },
     task: { glyph: '🤖', summariseArgs: ['subagent_type', 'description'] },
 };
 /** The registry glyph for a tool name (generic `⚙` when unknown). */
@@ -311,7 +365,10 @@ export function buildToolBodyLines(input, secrets = getDefaultSecrets()) {
     const args = parseToolArgsSafe(input.argsText);
     const entry = TOOL_DISPLAY_REGISTRY[input.name];
     let lines = entry?.formatBody?.(input, args) ?? null;
-    if (lines === null)
+    // TUI-C32 residual c — only fall back to the shape-based shell formatter for names that may be
+    // shell-shaped (flagged registry entries + unregistered custom tools), so a registered non-shell
+    // tool whose result merely contains `<COMMAND_OUTPUT>` is rendered generically, not shell-parsed.
+    if (lines === null && nameAllowsShellShape(input.name))
         lines = formatShellBody(input);
     if (lines === null) {
         lines = [];