@a1hvdy/cc-openclaw 0.7.1 → 0.9.0

package/dist/src/openai-compat/streaming-handler.d.ts

@@ -0,0 +1,41 @@
+/**
+ * Cluster B Phase 2 — Streaming SSE HTTP handler.
+ *
+ * Extracted verbatim from `openai-compat.ts:514-775` (Module H).
+ * Handles the response path when the caller requested `stream:true`.
+ * Emits Server-Sent Events with intermediate `delta` chunks and a final
+ * chunk carrying `finish_reason` + token usage.
+ *
+ * Three dispatch paths (decided at runtime by `useToolStream + hasTools`):
+ *
+ *   1. **Tool-stream mode** (`isToolStreamMode() && hasTools`)
+ *      Session-manager's pre-parsed `tool_use` events are bridged
+ *      directly to OpenAI `tool_calls` SSE deltas — two chunks per
+ *      tool use (start + arguments). Text deltas stream inline.
+ *
+ *   2. **Legacy tools mode** (`hasTools && !useToolStream`)
+ *      Buffer the full response text, post-stream-parse `<tool_calls>`
+ *      XML via `parseToolCallsFromText`, emit text + tool_call chunks
+ *      with `finish_reason='tool_calls'`.
+ *
+ *   3. **No-tools** (`!hasTools`)
+ *      Stream text deltas inline, emit final chunk with
+ *      `finish_reason='stop'`.
+ *
+ * v0.7.2 backstop: if no visible payload was streamed (no text, no
+ * tool_calls), emit a minimal "Done." text chunk before finalizing so
+ * the upstream "incomplete terminal response" classifier sees content.
+ *
+ * Heartbeat: 30s SSE keepalive comment (`: keepalive`) prevents proxies
+ * from closing the connection during long Claude CLI thinking phases.
+ * Cleaned up in the `finally` block.
+ *
+ * Client disconnect: `res.on('close')` flips `clientDisconnected` so
+ * writes after disconnect short-circuit instead of throwing.
+ *
+ * Parameterized fully — no closure capture from openai-compat.ts.
+ */
+import type * as http from 'node:http';
+import type { SessionManagerLike } from './openai-compat.js';
+import type { UserMessageBlock } from './message-extractor.js';
+export declare function handleStreaming(manager: SessionManagerLike, sessionName: string, model: string, userMessage: string | UserMessageBlock[], completionId: string, res: http.ServerResponse, hasTools: boolean): Promise<void>;

package/dist/src/openai-compat/streaming-handler.js

@@ -0,0 +1,294 @@
+/**
+ * Cluster B Phase 2 — Streaming SSE HTTP handler.
+ *
+ * Extracted verbatim from `openai-compat.ts:514-775` (Module H).
+ * Handles the response path when the caller requested `stream:true`.
+ * Emits Server-Sent Events with intermediate `delta` chunks and a final
+ * chunk carrying `finish_reason` + token usage.
+ *
+ * Three dispatch paths (decided at runtime by `useToolStream + hasTools`):
+ *
+ *   1. **Tool-stream mode** (`isToolStreamMode() && hasTools`)
+ *      Session-manager's pre-parsed `tool_use` events are bridged
+ *      directly to OpenAI `tool_calls` SSE deltas — two chunks per
+ *      tool use (start + arguments). Text deltas stream inline.
+ *
+ *   2. **Legacy tools mode** (`hasTools && !useToolStream`)
+ *      Buffer the full response text, post-stream-parse `<tool_calls>`
+ *      XML via `parseToolCallsFromText`, emit text + tool_call chunks
+ *      with `finish_reason='tool_calls'`.
+ *
+ *   3. **No-tools** (`!hasTools`)
+ *      Stream text deltas inline, emit final chunk with
+ *      `finish_reason='stop'`.
+ *
+ * v0.7.2 backstop: if no visible payload was streamed (no text, no
+ * tool_calls), emit a minimal "Done." text chunk before finalizing so
+ * the upstream "incomplete terminal response" classifier sees content.
+ *
+ * Heartbeat: 30s SSE keepalive comment (`: keepalive`) prevents proxies
+ * from closing the connection during long Claude CLI thinking phases.
+ * Cleaned up in the `finally` block.
+ *
+ * Client disconnect: `res.on('close')` flips `clientDisconnected` so
+ * writes after disconnect short-circuit instead of throwing.
+ *
+ * Parameterized fully — no closure capture from openai-compat.ts.
+ */
+import { reportStatus, getToolDescription } from './status-reporter.js';
+import { parseToolCallsFromText } from './tool-calls-parser.js';
+import { formatCompletionChunk } from './response-formatter.js';
+import { isToolStreamMode } from './mode-flags.js';
+import { emit as emitTrajectory } from '../lib/trajectory.js';
+import { formatError, ERROR_CODES } from '../lib/error-formatter.js';
+export async function handleStreaming(manager, sessionName, model, 
+// Phase 2 R4 wire-up: accepts native content-block arrays in tool-stream mode.
+userMessage, completionId, res, hasTools) {
+    res.writeHead(200, {
+        'Content-Type': 'text/event-stream',
+        'Cache-Control': 'no-cache',
+        Connection: 'keep-alive',
+        'X-Accel-Buffering': 'no',
+    });
+    let clientDisconnected = false;
+    res.on('close', () => {
+        clientDisconnected = true;
+    });
+    const writeSSE = (data) => {
+        if (!clientDisconnected) {
+            try {
+                res.write(`data: ${data}\n\n`);
+            }
+            catch {
+                clientDisconnected = true;
+            }
+        }
+    };
+    // Initial chunk with role
+    writeSSE(JSON.stringify(formatCompletionChunk(completionId, model, { role: 'assistant' }, null)));
+    // SSE keepalive heartbeat
+    const heartbeatTimer = setInterval(() => {
+        if (!clientDisconnected) {
+            try {
+                res.write(': keepalive\n\n');
+            }
+            catch {
+                clientDisconnected = true;
+            }
+        }
+    }, 30_000);
+    // Phase 2 R1+R2: in tool-stream mode, bridge session-manager's pre-parsed
+    // tool_use events directly to OpenAI tool_calls SSE deltas. Skips the
+    // legacy "buffer text + regex-parse <tool_calls> XML" path entirely.
+    // Per memory project_cc_openclaw_session_manager_preparses.md:
+    // session-manager has already stripped Claude CLI's NDJSON envelope, so
+    // we don't need cli-stream-parser here — onEvent is the parser output.
+    const useToolStream = isToolStreamMode() && hasTools;
+    // When tools are present (legacy mode), buffer the full response to parse
+    // for <tool_calls> XML. Without tools — or in tool-stream mode — stream
+    // text chunks directly for low latency.
+    let bufferedText = '';
+    let toolCallsEmitted = 0;
+    // v0.7.2 streaming-path backstop: track whether *any* visible content
+    // (text chunk OR tool_calls SSE chunk) was ever streamed. If the model
+    // uses only CLI built-in tools (Bash/Read/Write) without producing text,
+    // bufferedText stays empty AND no caller-visible tool_calls get streamed,
+    // resulting in zero content payloads — which OpenClaw upstream's
+    // result-fallback-classifier rejects as an "incomplete terminal response".
+    // This flag drives a final-chunk backstop in each finalization branch.
+    let streamedAnything = false;
+    try {
+        reportStatus('thinking', 'Processing request...');
+        await manager.sendMessage(sessionName, userMessage, {
+            onChunk: (chunk) => {
+                if (useToolStream || !hasTools) {
+                    // Stream text deltas immediately. Tool-stream mode interleaves
+                    // text and tool_calls chunks naturally — Claude CLI emits text
+                    // between tool_use blocks, OpenClaw client handles that fine.
+                    if (chunk.length > 0)
+                        streamedAnything = true;
+                    writeSSE(JSON.stringify(formatCompletionChunk(completionId, model, { content: chunk }, null)));
+                }
+                else {
+                    // Legacy hasTools mode: buffer for XML <tool_calls> parsing post-stream.
+                    bufferedText += chunk;
+                }
+            },
+            onEvent: (event) => {
+                if (event.type === 'tool_result') {
+                    // Pillar B v0.4.3: streaming tool_result trajectory event.
+                    emitTrajectory('tool_result', {}, sessionName);
+                    return;
+                }
+                if (event.type === 'tool_use' && event.tool?.name) {
+                    reportStatus('working', getToolDescription(event.tool.name, event.tool.input), event.tool.name);
+                    // Pillar B v0.4.3: streaming tool_use trajectory event. Same
+                    // privacy-preserving inputKeys-only payload as handleNonStreaming.
+                    emitTrajectory('tool_use', {
+                        name: event.tool.name,
+                        inputKeys: event.tool.input ? Object.keys(event.tool.input) : [],
+                    }, sessionName);
+                    if (useToolStream) {
+                        // R1+R2 bridge: session-manager event → OpenAI tool_calls SSE.
+                        // Emit two chunks per tool_use (per OpenAI streaming spec):
+                        //   1. id + name + empty arguments
+                        //   2. arguments (JSON-stringified input)
+                        const toolUseId = event.tool.id ||
+                            `toolu_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 8)}`;
+                        const idx = toolCallsEmitted;
+                        const argsJson = event.tool.input != null ? JSON.stringify(event.tool.input) : '{}';
+                        const startChunk = {
+                            id: completionId,
+                            object: 'chat.completion.chunk',
+                            created: Math.floor(Date.now() / 1000),
+                            model,
+                            choices: [
+                                {
+                                    index: 0,
+                                    delta: {
+                                        tool_calls: [
+                                            {
+                                                index: idx,
+                                                id: toolUseId,
+                                                type: 'function',
+                                                function: { name: event.tool.name, arguments: '' },
+                                            },
+                                        ],
+                                    },
+                                    finish_reason: null,
+                                },
+                            ],
+                        };
+                        const argsChunk = {
+                            id: completionId,
+                            object: 'chat.completion.chunk',
+                            created: Math.floor(Date.now() / 1000),
+                            model,
+                            choices: [
+                                {
+                                    index: 0,
+                                    delta: {
+                                        tool_calls: [
+                                            {
+                                                index: idx,
+                                                function: { arguments: argsJson },
+                                            },
+                                        ],
+                                    },
+                                    finish_reason: null,
+                                },
+                            ],
+                        };
+                        writeSSE(JSON.stringify(startChunk));
+                        writeSSE(JSON.stringify(argsChunk));
+                        toolCallsEmitted += 1;
+                        streamedAnything = true;
+                    }
+                }
+            },
+        });
+        reportStatus('idle', 'Ready');
+        // Get token usage for final chunk
+        let usage;
+        try {
+            const status = manager.getStatus(sessionName);
+            usage = {
+                prompt_tokens: status.stats.tokensIn,
+                completion_tokens: status.stats.tokensOut,
+                total_tokens: status.stats.tokensIn + status.stats.tokensOut,
+            };
+        }
+        catch {
+            /* best effort */
+        }
+        // v0.7.2 streaming-path backstop: if nothing visible was streamed AND
+        // bufferedText (legacy mode) is also empty, emit a minimal "Done." text
+        // chunk before the finish chunk so the upstream classifier sees a
+        // payload. Skip when tool_calls were emitted — those are openai-spec
+        // valid as the only payload (multi-turn tool-use sessions).
+        const noVisiblePayload = !streamedAnything && bufferedText.length === 0 && toolCallsEmitted === 0;
+        if (noVisiblePayload) {
+            writeSSE(JSON.stringify(formatCompletionChunk(completionId, model, { content: 'Done.' }, null)));
+            streamedAnything = true;
+        }
+        if (useToolStream) {
+            // R1+R2: tool-stream mode — text + tool_calls already streamed inline.
+            // Just emit the final chunk with the right finish_reason.
+            const finishReason = toolCallsEmitted > 0 ? 'tool_calls' : 'stop';
+            const finalChunk = formatCompletionChunk(completionId, model, {}, finishReason);
+            if (usage)
+                finalChunk.usage = usage;
+            writeSSE(JSON.stringify(finalChunk));
+        }
+        else if (hasTools && bufferedText) {
+            const parsed = parseToolCallsFromText(bufferedText);
+            if (parsed.toolCalls.length > 0) {
+                // Emit text content if any
+                if (parsed.textContent) {
+                    writeSSE(JSON.stringify(formatCompletionChunk(completionId, model, { content: parsed.textContent }, null)));
+                }
+                // Emit tool_call chunks
+                for (let i = 0; i < parsed.toolCalls.length; i++) {
+                    const tc = parsed.toolCalls[i];
+                    writeSSE(JSON.stringify({
+                        id: completionId,
+                        object: 'chat.completion.chunk',
+                        created: Math.floor(Date.now() / 1000),
+                        model,
+                        choices: [
+                            {
+                                index: 0,
+                                delta: {
+                                    tool_calls: [
+                                        {
+                                            index: i,
+                                            id: tc.id,
+                                            type: 'function',
+                                            function: { name: tc.function.name, arguments: tc.function.arguments },
+                                        },
+                                    ],
+                                },
+                                finish_reason: null,
+                            },
+                        ],
+                    }));
+                }
+                // Final chunk with tool_calls finish reason
+                const finalChunk = formatCompletionChunk(completionId, model, {}, 'tool_calls');
+                if (usage)
+                    finalChunk.usage = usage;
+                writeSSE(JSON.stringify(finalChunk));
+            }
+            else {
+                // No tool calls — emit buffered text as content
+                writeSSE(JSON.stringify(formatCompletionChunk(completionId, model, { content: bufferedText }, null)));
+                const finalChunk = formatCompletionChunk(completionId, model, {}, 'stop');
+                if (usage)
+                    finalChunk.usage = usage;
+                writeSSE(JSON.stringify(finalChunk));
+            }
+        }
+        else {
+            // No tools — standard finish
+            const finalChunk = formatCompletionChunk(completionId, model, {}, 'stop');
+            if (usage)
+                finalChunk.usage = usage;
+            writeSSE(JSON.stringify(finalChunk));
+        }
+        writeSSE('[DONE]');
+    }
+    catch (err) {
+        reportStatus('idle', 'Request failed');
+        // v0.4.3: route through formatError for errors_total + trajectory error.
+        formatError(err, { code: ERROR_CODES.SESSION_ERROR, sessionId: sessionName, details: { phase: 'handleStreaming' } });
+        writeSSE(JSON.stringify({ error: { message: err.message, type: 'server_error' } }));
+        writeSSE('[DONE]');
+    }
+    finally {
+        clearInterval(heartbeatTimer);
+    }
+    if (!clientDisconnected) {
+        res.end();
+    }
+}
+//# sourceMappingURL=streaming-handler.js.map

package/dist/src/openai-compat/streaming-handler.js.map

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

package/dist/src/openai-compat/tool-calls-parser.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Cluster B — Tool-calls parser.
+ *
+ * Extracted verbatim from `openai-compat.ts:147-221` (Phase 4 Cluster B
+ * Module B). Reads model output text and pulls out any `<tool_calls>`
+ * XML blocks, converting them to OpenAI-compatible `OpenAIToolCall[]`.
+ *
+ * This is the response-side counterpart to `prompts.ts:buildToolPromptBlock`
+ * — the prompt tells the model "wrap your tool calls in `<tool_calls>`",
+ * and this parser is what reads those tool calls back out of the model's
+ * text response on the legacy (non-stream) tool path.
+ *
+ * Behavior preserved bit-for-bit. Two call sites in the orchestrator
+ * (handleChatCompletion lines 950 + 1181) — one on the buffered final
+ * output path, one on the streaming-buffered-text path.
+ *
+ * Robustness contract:
+ *   - Multiple `<tool_calls>` blocks in one response → all merged
+ *   - JSON parse fail on a block → that block kept as text content
+ *   - `arguments` field as string or object → both normalized to string
+ *   - `<tool_result>` echoes from the model → stripped from textContent
+ */
+import type { OpenAIToolCall } from './openai-compat.js';
+export interface ParsedToolCalls {
+    textContent: string | null;
+    toolCalls: OpenAIToolCall[];
+}
+/**
+ * Parse tool_calls from CLI text output.
+ *
+ * Looks for <tool_calls>[...]</tool_calls> tags in the response text.
+ * Returns both the extracted text content (before/after tags) and any tool calls found.
+ */
+export declare function parseToolCallsFromText(text: string): ParsedToolCalls;

package/dist/src/openai-compat/tool-calls-parser.js

@@ -0,0 +1,93 @@
+/**
+ * Cluster B — Tool-calls parser.
+ *
+ * Extracted verbatim from `openai-compat.ts:147-221` (Phase 4 Cluster B
+ * Module B). Reads model output text and pulls out any `<tool_calls>`
+ * XML blocks, converting them to OpenAI-compatible `OpenAIToolCall[]`.
+ *
+ * This is the response-side counterpart to `prompts.ts:buildToolPromptBlock`
+ * — the prompt tells the model "wrap your tool calls in `<tool_calls>`",
+ * and this parser is what reads those tool calls back out of the model's
+ * text response on the legacy (non-stream) tool path.
+ *
+ * Behavior preserved bit-for-bit. Two call sites in the orchestrator
+ * (handleChatCompletion lines 950 + 1181) — one on the buffered final
+ * output path, one on the streaming-buffered-text path.
+ *
+ * Robustness contract:
+ *   - Multiple `<tool_calls>` blocks in one response → all merged
+ *   - JSON parse fail on a block → that block kept as text content
+ *   - `arguments` field as string or object → both normalized to string
+ *   - `<tool_result>` echoes from the model → stripped from textContent
+ */
+import { randomUUID } from 'node:crypto';
+/**
+ * Parse tool_calls from CLI text output.
+ *
+ * Looks for <tool_calls>[...]</tool_calls> tags in the response text.
+ * Returns both the extracted text content (before/after tags) and any tool calls found.
+ */
+export function parseToolCallsFromText(text) {
+    // Match ALL <tool_calls> blocks (model may output multiple)
+    const tagRegex = /<tool_calls>\s*([\s\S]*?)\s*<\/tool_calls>/g;
+    const allCalls = [];
+    let lastIndex = 0;
+    const textParts = [];
+    let m;
+    while ((m = tagRegex.exec(text)) !== null) {
+        // Collect text before this block
+        const before = text.slice(lastIndex, m.index).trim();
+        if (before)
+            textParts.push(before);
+        lastIndex = m.index + m[0].length;
+        try {
+            const parsed = JSON.parse(m[1].trim());
+            const arr = Array.isArray(parsed) ? parsed : [parsed];
+            for (const raw of arr) {
+                const call = raw;
+                if (!call || typeof call !== 'object' || typeof call.name !== 'string')
+                    continue;
+                let args;
+                if (typeof call.arguments === 'string') {
+                    try {
+                        JSON.parse(call.arguments);
+                        args = call.arguments;
+                    }
+                    catch {
+                        args = JSON.stringify({ input: call.arguments });
+                    }
+                }
+                else {
+                    args = JSON.stringify(call.arguments ?? {});
+                }
+                allCalls.push({
+                    id: `call_${randomUUID().replace(/-/g, '').slice(0, 24)}`,
+                    type: 'function',
+                    function: { name: call.name, arguments: args },
+                });
+            }
+        }
+        catch {
+            // One block failed — keep its text as content
+            textParts.push(m[0]);
+        }
+    }
+    // Collect text after last block
+    const after = text.slice(lastIndex).trim();
+    if (after)
+        textParts.push(after);
+    // Strip <tool_result> and <tool_results> tags that the model may echo back
+    // from the serialized tool results we injected earlier.
+    const stripToolResultTags = (s) => s
+        .replace(/<tool_results?>[\s\S]*?<\/tool_results?>/g, '')
+        .replace(/<tool_results?[^>]*>/g, '')
+        .trim();
+    if (allCalls.length > 0) {
+        const raw = textParts.join('\n').trim();
+        const cleaned = raw ? stripToolResultTags(raw) : null;
+        return { textContent: cleaned || null, toolCalls: allCalls };
+    }
+    const cleaned = text ? stripToolResultTags(text) : null;
+    return { textContent: cleaned || null, toolCalls: [] };
+}
+//# sourceMappingURL=tool-calls-parser.js.map

package/dist/src/openai-compat/tool-calls-parser.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-calls-parser.js","sourceRoot":"","sources":["../../../src/openai-compat/tool-calls-parser.ts"],"names":[],"mappings":"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"}

package/dist/src/openai-compat/tool-results-serializer.d.ts

@@ -0,0 +1,60 @@
+/**
+ * Cluster B — Tool-result serializers.
+ *
+ * Extracted verbatim from `openai-compat.ts:153-211` (Phase 4 Cluster B
+ * Module C). Two functions that serialize OpenAI `role:tool` messages
+ * into the format Claude CLI expects, picked between by the runtime
+ * `CC_OPENCLAW_TOOL_STREAM` flag:
+ *
+ *   - `serializeToolResults(messages)` — legacy XML path. Wraps each
+ *     tool message in `<tool_result tool_call_id="...">` and concatenates
+ *     into a single `<tool_results>` block. Used when the model receives
+ *     tool definitions via the system prompt's `<available_tools>` XML.
+ *
+ *   - `serializeToolResultsAsBlocks(messages)` — Phase 2 R4 native path.
+ *     Returns an array of Anthropic `tool_result` content blocks shaped
+ *     as `{ type, tool_use_id, content }`. Used when Claude CLI parses
+ *     tool results natively (CC_OPENCLAW_TOOL_STREAM=1).
+ *
+ *   - `AnthropicToolResultBlock` — interface for the native shape.
+ *
+ * Both serializers are pure. Currently only called by
+ * `message-extractor.ts:extractUserMessage` (Module D); the orchestrator
+ * itself does not call them directly anymore.
+ */
+import type { OpenAIChatMessage } from './openai-compat.js';
+/**
+ * Serialize tool result messages into a text block for the CLI model.
+ * Converts OpenAI `tool` role messages into <tool_result> tags.
+ *
+ * Legacy path (CC_OPENCLAW_TOOL_STREAM=0). Used when the model receives
+ * tool definitions via the system prompt's <available_tools> XML block
+ * and emits <tool_calls> XML in response. Tool-stream mode (R4) uses
+ * `serializeToolResultsAsBlocks()` instead, returning native Anthropic
+ * `tool_result` content blocks that Claude CLI parses directly.
+ */
+export declare function serializeToolResults(messages: OpenAIChatMessage[]): string;
+/**
+ * Phase 2 R4: native Anthropic `tool_result` content blocks.
+ *
+ * In tool-stream mode (CC_OPENCLAW_TOOL_STREAM=1), this replaces
+ * `serializeToolResults()` XML wrapping. Returns blocks shaped like:
+ *
+ *   { type: 'tool_result', tool_use_id: 'toolu_X', content: '...' }
+ *
+ * Claude CLI's stream-json input format accepts these as user-message
+ * content arrays. The model then continues generation with the tool
+ * result in context, emitting either more `tool_use` events or final
+ * text — no XML round-tripping required.
+ *
+ * Wiring into the live request path lands with Phase 4 Pillar 0.5
+ * tasks R1+R2 (parser+translator response-side integration), where
+ * `extractUserMessage` produces structured content arrays in
+ * tool-stream mode.
+ */
+export interface AnthropicToolResultBlock {
+    type: 'tool_result';
+    tool_use_id: string;
+    content: string;
+}
+export declare function serializeToolResultsAsBlocks(messages: OpenAIChatMessage[]): AnthropicToolResultBlock[];

package/dist/src/openai-compat/tool-results-serializer.js

@@ -0,0 +1,56 @@
+/**
+ * Cluster B — Tool-result serializers.
+ *
+ * Extracted verbatim from `openai-compat.ts:153-211` (Phase 4 Cluster B
+ * Module C). Two functions that serialize OpenAI `role:tool` messages
+ * into the format Claude CLI expects, picked between by the runtime
+ * `CC_OPENCLAW_TOOL_STREAM` flag:
+ *
+ *   - `serializeToolResults(messages)` — legacy XML path. Wraps each
+ *     tool message in `<tool_result tool_call_id="...">` and concatenates
+ *     into a single `<tool_results>` block. Used when the model receives
+ *     tool definitions via the system prompt's `<available_tools>` XML.
+ *
+ *   - `serializeToolResultsAsBlocks(messages)` — Phase 2 R4 native path.
+ *     Returns an array of Anthropic `tool_result` content blocks shaped
+ *     as `{ type, tool_use_id, content }`. Used when Claude CLI parses
+ *     tool results natively (CC_OPENCLAW_TOOL_STREAM=1).
+ *
+ *   - `AnthropicToolResultBlock` — interface for the native shape.
+ *
+ * Both serializers are pure. Currently only called by
+ * `message-extractor.ts:extractUserMessage` (Module D); the orchestrator
+ * itself does not call them directly anymore.
+ */
+/**
+ * Serialize tool result messages into a text block for the CLI model.
+ * Converts OpenAI `tool` role messages into <tool_result> tags.
+ *
+ * Legacy path (CC_OPENCLAW_TOOL_STREAM=0). Used when the model receives
+ * tool definitions via the system prompt's <available_tools> XML block
+ * and emits <tool_calls> XML in response. Tool-stream mode (R4) uses
+ * `serializeToolResultsAsBlocks()` instead, returning native Anthropic
+ * `tool_result` content blocks that Claude CLI parses directly.
+ */
+export function serializeToolResults(messages) {
+    const toolMessages = messages.filter((m) => m.role === 'tool');
+    if (!toolMessages.length)
+        return '';
+    const results = toolMessages
+        .map((m) => {
+        const content = typeof m.content === 'string' ? m.content : JSON.stringify(m.content);
+        return `<tool_result tool_call_id="${m.tool_call_id || 'unknown'}">\n${content}\n</tool_result>`;
+    })
+        .join('\n\n');
+    return `<tool_results>\n${results}\n</tool_results>\n\nAbove are the results of the tool calls you requested. Continue your response based on these results.`;
+}
+export function serializeToolResultsAsBlocks(messages) {
+    return messages
+        .filter((m) => m.role === 'tool')
+        .map((m) => ({
+        type: 'tool_result',
+        tool_use_id: m.tool_call_id || 'unknown',
+        content: typeof m.content === 'string' ? m.content : JSON.stringify(m.content),
+    }));
+}
+//# sourceMappingURL=tool-results-serializer.js.map

package/dist/src/openai-compat/tool-results-serializer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-results-serializer.js","sourceRoot":"","sources":["../../../src/openai-compat/tool-results-serializer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAIH;;;;;;;;;GASG;AACH,MAAM,UAAU,oBAAoB,CAAC,QAA6B;IAChE,MAAM,YAAY,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC/D,IAAI,CAAC,YAAY,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAEpC,MAAM,OAAO,GAAG,YAAY;SACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACT,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACtF,OAAO,8BAA8B,CAAC,CAAC,YAAY,IAAI,SAAS,OAAO,OAAO,kBAAkB,CAAC;IACnG,CAAC,CAAC;SACD,IAAI,CAAC,MAAM,CAAC,CAAC;IAEhB,OAAO,mBAAmB,OAAO,4HAA4H,CAAC;AAChK,CAAC;AA0BD,MAAM,UAAU,4BAA4B,CAC1C,QAA6B;IAE7B,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;SAChC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACX,IAAI,EAAE,aAAsB;QAC5B,WAAW,EAAE,CAAC,CAAC,YAAY,IAAI,SAAS;QACxC,OAAO,EAAE,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC;KAC/E,CAAC,CAAC,CAAC;AACR,CAAC"}

package/dist/src/session/session-manager.js

@@ -189,6 +189,18 @@ export class SessionManager {
             permissionMode: config.permissionMode || this.pluginConfig.defaultPermissionMode,
             effort: config.effort || this.pluginConfig.defaultEffort,
             model: config.model || persisted?.model || this.pluginConfig.defaultModel,
+            // v0.7.5 unification: default --include-partial-messages ON for every
+            // claude.exe spawn. Without this flag the engine emits text only as
+            // one aggregate `assistant` event; cc-handler's synchronous sendMessage
+            // return path doesn't surface that as content payloads, so the openclaw
+            // embedded agent rejects the turn as "incomplete terminal response
+            // (format)". Adopting the openai-compat path's working behavior as the
+            // canonical default unifies all 10 startSession callers (openai-compat,
+            // cc-handler fresh + rehydrate, prewarm, council, internal recovery,
+            // hot-reload) without per-site changes. Callers that genuinely need it
+            // OFF can pass `includePartialMessages: false` and override via the
+            // `...config` spread below.
+            includePartialMessages: true,
             ...config,
             ...(resumeId ? { resumeSessionId: resumeId } : {}),
         };