@a1hvdy/cc-openclaw 0.8.0 → 0.9.1

package/dist/src/lib/route-flag.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-flag.d.ts","sourceRoot":"","sources":["../../../src/lib/route-flag.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,MAAM,MAAM,MAAM,GAAG,aAAa,GAAG,cAAc,CAAC;AAEpD,yCAAyC;AACzC,eAAO,MAAM,eAAe,gCAAgC,CAAC;AAE7D;;;GAGG;AACH,eAAO,MAAM,cAAc,6BAA6B,CAAC;AAEzD;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,OAAO,CAK7C;AAED,mEAAmE;AACnE,wBAAgB,YAAY,IAAI,MAAM,CAErC;AAED;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,mBAAmB,IAAI,YAAY,CAKlD"}

package/dist/src/lib/sysprompt-strip.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sysprompt-strip.d.ts","sourceRoot":"","sources":["../../../src/lib/sysprompt-strip.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAIH,MAAM,WAAW,YAAY;IAC3B,sFAAsF;IACtF,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,yDAAyD;IACzD,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,wCAAwC;IACxC,OAAO,EAAE,OAAO,CAAC;IACjB,kFAAkF;IAClF,kBAAkB,EAAE,OAAO,CAAC;CAC7B;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,IAAI,GAAE,YAAiB,GAAG,OAAO,CAK/D;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,GAAG,WAAW,CA+BpF"}

package/dist/src/lib/telemetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../src/lib/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAcH,eAAO,MAAM,SAAS,QAAgD,CAAC;AACvE,eAAO,MAAM,aAAa,QAAoD,CAAC;AAS/E,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,qBAAqB,GAAG,qBAAqB,CAAC;IACpD,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,MAAM,CAAC,EAAE,OAAO,GAAG,UAAU,GAAG,SAAS,CAAC;CAC3C;AAgCD,wBAAgB,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,IAAI,CAE7D;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,IAAI,CAErE;AAID,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,IAAI,GAAG,IAAI,CAE/E;AAED,wBAAgB,0BAA0B,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,GAAG,IAAI,CAEvF;AAED,wBAAgB,wBAAwB,IAAI,IAAI,CAG/C"}

package/dist/src/lib/test-mode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-mode.d.ts","sourceRoot":"","sources":["../../../src/lib/test-mode.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,eAAO,MAAM,aAAa,8BAA8B,CAAC;AAEzD,wBAAgB,UAAU,IAAI,OAAO,CAKpC;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,CAGtD"}

package/dist/src/lib/vendor-paths.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vendor-paths.d.ts","sourceRoot":"","sources":["../../../src/lib/vendor-paths.ts"],"names":[],"mappings":"AAmBA,0DAA0D;AAC1D,eAAO,MAAM,YAAY,QAAoC,CAAC;AAE9D,wCAAwC;AACxC,eAAO,MAAM,UAAU,QAA+B,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,YAAY;;;;CAIf,CAAC"}

package/dist/src/logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/logger.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,WAAW,MAAM;IACrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC7C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC9C;AAUD,qFAAqF;AACrF,wBAAgB,mBAAmB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAoB3D;AAED,yDAAyD;AACzD,eAAO,MAAM,UAAU,EAAE,MAKxB,CAAC"}

package/dist/src/mcp/bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bridge.d.ts","sourceRoot":"","sources":["../../../src/mcp/bridge.ts"],"names":[],"mappings":"AAqCA,MAAM,WAAW,SAAS;IACxB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,GAAG,IAAI,CAAC;IAClE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,qBAAa,SAAS;IACpB,OAAO,CAAC,KAAK,CAA+C;IAE5D,KAAK,IAAI,IAAI;IAOb,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrB,SAAS,IAAI,OAAO;CACrB;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,SAAS,GAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAAE,CAaxF;AAGD,wBAAgB,wBAAwB,IAAI,IAAI,CAAmE"}

package/dist/src/mcp/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/mcp/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5E,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC"}

package/dist/src/models.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"models.d.ts","sourceRoot":"","sources":["../../src/models.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAI7C,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAEnF,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,iDAAiD;IACjD,EAAE,EAAE,MAAM,CAAC;IACX,8BAA8B;IAC9B,MAAM,EAAE,UAAU,CAAC;IACnB,wCAAwC;IACxC,QAAQ,EAAE,YAAY,CAAC;IACvB,oBAAoB;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,sDAAsD;IACtD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAoKD,yGAAyG;AACzG,wBAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAEnE;AAED,iFAAiF;AACjF,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAGlD;AAED,6FAA6F;AAC7F,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAc1F;AAED,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,YAAY,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CA6B3F;AAED,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAItD;AAED,gFAAgF;AAChF,wBAAgB,eAAe,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,YAAY,SAAsB,GAAG,YAAY,CAUhG;AAKD,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,GAAG,IAAI,CAS3F;AAED,iDAAiD;AACjD,wBAAgB,sBAAsB,IAAI,IAAI,CAE7C;AAED,0DAA0D;AAC1D,wBAAgB,YAAY,IAAI;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,KAAK,CAAC;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CAAE,CAOhH;AAED,2DAA2D;AAC3D,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAQnD;AAED,iDAAiD;AACjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEpD;AAED,iDAAiD;AACjD,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAGpD;AAED,gDAAgD;AAChD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,gFAAgF;AAChF,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,QAAQ,CAI7D"}

package/dist/src/openai-compat/cli-stream-parser.d.ts.map

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

package/dist/src/openai-compat/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/openai-compat/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}

package/dist/src/openai-compat/message-extractor.d.ts

@@ -0,0 +1,79 @@
+/**
+ * Cluster B — Message extractor.
+ *
+ * Extracted verbatim from `openai-compat.ts:177-301` (Phase 4 Cluster B
+ * Module D). Single function that converts an OpenAI `messages[]` array
+ * into the inputs Claude CLI's bridge expects:
+ *
+ *   - systemPrompt          — joined `role:system` content, undefined if none
+ *   - userMessage           — last user message (with skill-inline applied)
+ *                             OR XML-wrapped tool-result block when the
+ *                             last non-system message is `role:tool`
+ *   - userMessageBlocks     — tool-stream mode only: native Anthropic
+ *                             content blocks (tool_result + text) for the
+ *                             stream-json input path
+ *   - isNewConversation     — drives session-create vs session-append
+ *
+ * Single call site in the orchestrator (handleChatCompletion line 482).
+ * The two types `UserMessageBlock` and `ExtractedMessage` are also re-
+ * exported from openai-compat.ts for callers across the orchestrator
+ * (formatCompletionResponse + helpers all consume them as parameters).
+ *
+ * Session-reset semantics:
+ *   - X-Session-Reset: 1|true  → always treated as new conversation
+ *   - OPENAI_COMPAT_NEW_CONVO_HEURISTIC=1 (env) → legacy
+ *     "system + single user ⇒ new conversation" rule, opt-in for
+ *     callers that re-send the full transcript every turn
+ *   - Default (env unset)       → only the explicit header creates a new
+ *     conversation; persistent CLI sessions survive across turns and
+ *     benefit from Anthropic prompt caching (PR #40)
+ */
+import type { OpenAIChatMessage } from './openai-compat.js';
+import { type AnthropicToolResultBlock } from './tool-results-serializer.js';
+/**
+ * Phase 2 R4 wire-up: optional structured content for tool-stream mode.
+ * When set, consumers should send this array to the subprocess instead of
+ * the legacy XML-wrapped `userMessage` string. Each element is either a
+ * native Anthropic `tool_result` block (for prior tool outputs) or a
+ * `text` block (for the user's follow-up message).
+ */
+export type UserMessageBlock = AnthropicToolResultBlock | {
+    type: 'text';
+    text: string;
+};
+export interface ExtractedMessage {
+    systemPrompt: string | undefined;
+    userMessage: string;
+    /**
+     * Populated only in tool-stream mode when the last non-system message
+     * is a tool-role result. Carries native Anthropic tool_result blocks
+     * + optional follow-up text. When undefined, consumers fall back to
+     * the string `userMessage` (legacy XML-wrapped path).
+     */
+    userMessageBlocks?: UserMessageBlock[];
+    isNewConversation: boolean;
+}
+/**
+ * Extract the relevant parts from an OpenAI messages array.
+ *
+ * Sessions are stateful — we only need the last user message. The tricky
+ * question is whether to start a fresh session or append to the existing one.
+ *
+ * Default mode (no env var): only honor an explicit `X-Session-Reset: 1`
+ * header. This is correct for clients that maintain their own conversation
+ * transcript and forward only the latest user turn (OpenClaw main agent
+ * loop, cron jobs, subagents). The previous heuristic
+ * (`nonSystemMessages.length <= 1`) fired on every such request, killing the
+ * persistent CLI every turn and preventing Anthropic prompt caching from
+ * ever warming. Originally diagnosed in PR #40 by @megayounus786.
+ *
+ * Legacy mode (`OPENAI_COMPAT_NEW_CONVO_HEURISTIC=1`): restore the old
+ * `system + single user ⇒ new conversation` rule, for clients that re-send
+ * the full transcript on every turn (ChatGPT-Next-Web, Open WebUI, data
+ * labeling tools, etc). They use the transcript shape itself as their only
+ * "start a new conversation" signal.
+ *
+ * The env var is read on every call so ops can flip it via launchctl setenv
+ * without restarting the server.
+ */
+export declare function extractUserMessage(messages: OpenAIChatMessage[], headers?: Record<string, string | string[] | undefined>): ExtractedMessage;

package/dist/src/openai-compat/message-extractor.js

@@ -0,0 +1,162 @@
+/**
+ * Cluster B — Message extractor.
+ *
+ * Extracted verbatim from `openai-compat.ts:177-301` (Phase 4 Cluster B
+ * Module D). Single function that converts an OpenAI `messages[]` array
+ * into the inputs Claude CLI's bridge expects:
+ *
+ *   - systemPrompt          — joined `role:system` content, undefined if none
+ *   - userMessage           — last user message (with skill-inline applied)
+ *                             OR XML-wrapped tool-result block when the
+ *                             last non-system message is `role:tool`
+ *   - userMessageBlocks     — tool-stream mode only: native Anthropic
+ *                             content blocks (tool_result + text) for the
+ *                             stream-json input path
+ *   - isNewConversation     — drives session-create vs session-append
+ *
+ * Single call site in the orchestrator (handleChatCompletion line 482).
+ * The two types `UserMessageBlock` and `ExtractedMessage` are also re-
+ * exported from openai-compat.ts for callers across the orchestrator
+ * (formatCompletionResponse + helpers all consume them as parameters).
+ *
+ * Session-reset semantics:
+ *   - X-Session-Reset: 1|true  → always treated as new conversation
+ *   - OPENAI_COMPAT_NEW_CONVO_HEURISTIC=1 (env) → legacy
+ *     "system + single user ⇒ new conversation" rule, opt-in for
+ *     callers that re-send the full transcript every turn
+ *   - Default (env unset)       → only the explicit header creates a new
+ *     conversation; persistent CLI sessions survive across turns and
+ *     benefit from Anthropic prompt caching (PR #40)
+ */
+import { serializeToolResults, serializeToolResultsAsBlocks, } from './tool-results-serializer.js';
+import { isToolStreamMode } from './mode-flags.js';
+import { maybeInlineSkill } from './skill-resolver.js';
+import { isOpenaiCompatNewConvoHeuristic } from '../lib/config.js';
+/**
+ * Extract the relevant parts from an OpenAI messages array.
+ *
+ * Sessions are stateful — we only need the last user message. The tricky
+ * question is whether to start a fresh session or append to the existing one.
+ *
+ * Default mode (no env var): only honor an explicit `X-Session-Reset: 1`
+ * header. This is correct for clients that maintain their own conversation
+ * transcript and forward only the latest user turn (OpenClaw main agent
+ * loop, cron jobs, subagents). The previous heuristic
+ * (`nonSystemMessages.length <= 1`) fired on every such request, killing the
+ * persistent CLI every turn and preventing Anthropic prompt caching from
+ * ever warming. Originally diagnosed in PR #40 by @megayounus786.
+ *
+ * Legacy mode (`OPENAI_COMPAT_NEW_CONVO_HEURISTIC=1`): restore the old
+ * `system + single user ⇒ new conversation` rule, for clients that re-send
+ * the full transcript on every turn (ChatGPT-Next-Web, Open WebUI, data
+ * labeling tools, etc). They use the transcript shape itself as their only
+ * "start a new conversation" signal.
+ *
+ * The env var is read on every call so ops can flip it via launchctl setenv
+ * without restarting the server.
+ */
+export function extractUserMessage(messages, headers) {
+    if (!messages || messages.length === 0) {
+        throw new Error('messages array is empty');
+    }
+    // Normalize content from any message: OpenAI API allows content as a string
+    // OR an array of content parts (e.g. multimodal messages with text + images).
+    // We need a string for the CLI, so arrays are joined.
+    const textOf = (m) => {
+        if (typeof m.content === 'string')
+            return m.content;
+        if (Array.isArray(m.content)) {
+            return m.content
+                .map((p) => p.text || '')
+                .filter(Boolean)
+                .join('');
+        }
+        return m.content != null ? String(m.content) : '';
+    };
+    // Extract system prompt if present
+    const systemMessages = messages.filter((m) => m.role === 'system');
+    const systemPrompt = systemMessages.length > 0 ? systemMessages.map(textOf).join('\n') : undefined;
+    // Pick the actual user message — skipping OpenClaw upstream's
+    // `<system>...</system>` transport wrappers. OpenClaw stuffs the full
+    // system context (Lossless Recall + USER.md + TOOLS.md + runtime info)
+    // into user-role messages because its plugin SDK doesn't use the
+    // role:system slot. Without this filter, `extractUserMessage` would
+    // pick the 33K-char system blob as the "current turn" instead of the
+    // user's actual text earlier in the array.
+    //
+    // Diagnosed 2026-05-11 from sysprompt + usermsg dumps: a /new turn
+    // arrived as 3 user messages — the user's text in msg 1+2 (duplicate)
+    // and the system wrapper in msg 3. Model interpreted the wrapper's
+    // stray "continue" from USER.md as the user's input.
+    const isOpenClawSystemWrap = (text) => text.startsWith('<system>') && text.includes('</system>');
+    /** From `userMessages`, pick the most recent message that is NOT an
+     * OpenClaw system-context wrapper. Falls back to the last message
+     * when all candidates are wrappers (preserves pre-fix behavior for
+     * callers that don't trigger the OpenClaw pattern). */
+    const pickActualUserText = (userMessages) => {
+        if (userMessages.length === 0)
+            return '';
+        for (let i = userMessages.length - 1; i >= 0; i--) {
+            const t = textOf(userMessages[i]);
+            if (!isOpenClawSystemWrap(t))
+                return t;
+        }
+        return textOf(userMessages[userMessages.length - 1]);
+    };
+    // Handle tool result messages — only when the LAST non-system message is
+    // a tool role (meaning we're in an active tool-use cycle). If the last
+    // message is a user role, it's a follow-up in an existing conversation
+    // and the old tool results are already in the CLI's history.
+    const lastNonSystem = [...messages].reverse().find((m) => m.role !== 'system');
+    if (lastNonSystem?.role === 'tool') {
+        const userMessages = messages.filter((m) => m.role === 'user');
+        const lastUserText = pickActualUserText(userMessages);
+        // Phase 2 R4 wire-up: in tool-stream mode, emit native Anthropic
+        // tool_result blocks instead of XML-wrapped text. Claude CLI's
+        // stream-json input accepts content arrays directly.
+        if (isToolStreamMode()) {
+            const toolBlocks = serializeToolResultsAsBlocks(messages);
+            const userMessageBlocks = [...toolBlocks];
+            if (lastUserText) {
+                userMessageBlocks.push({ type: 'text', text: lastUserText });
+            }
+            // Keep userMessage populated as the legacy XML form for callers
+            // that don't yet handle the structured path. Both fields agree in
+            // intent; consumers should prefer userMessageBlocks when present.
+            const fallback = serializeToolResults(messages);
+            const userMessage = lastUserText ? `${fallback}\n\n${lastUserText}` : fallback;
+            return { systemPrompt, userMessage, userMessageBlocks, isNewConversation: false };
+        }
+        const toolResultBlock = serializeToolResults(messages);
+        const userMessage = lastUserText ? `${toolResultBlock}\n\n${lastUserText}` : toolResultBlock;
+        return { systemPrompt, userMessage, isNewConversation: false };
+    }
+    // Find last user message — using the OpenClaw-aware picker to skip
+    // `<system>...</system>` transport wrappers.
+    const userMessages = messages.filter((m) => m.role === 'user');
+    if (userMessages.length === 0) {
+        throw new Error('No user message found in messages array');
+    }
+    const rawUserMessage = pickActualUserText(userMessages);
+    // Workspace skill auto-inline: if the last user message is /<skill> [args]
+    // and ~/.openclaw/workspace/skills/*/SKILL.md has a matching `name:` in
+    // frontmatter, replace the user message with the SKILL.md body so the
+    // model has full skill context without needing the Read tool (cc-openclaw
+    // disables built-in tools by design — see the `sessionConfig.tools = ''`
+    // line below).
+    const userMessage = maybeInlineSkill(rawUserMessage) ?? rawUserMessage;
+    // 1. Explicit reset header — honored in both modes. Normalize trim+lowercase
+    //    so callers using `TRUE`, ` 1 `, etc. don't silently fail.
+    const rawReset = headers?.['x-session-reset'];
+    const resetHeader = typeof rawReset === 'string' ? rawReset.trim().toLowerCase() : '';
+    if (resetHeader === 'true' || resetHeader === '1') {
+        return { systemPrompt, userMessage, isNewConversation: true };
+    }
+    // 2. Legacy heuristic — only when explicitly opted in via env var.
+    if (isOpenaiCompatNewConvoHeuristic()) {
+        const nonSystemMessages = messages.filter((m) => m.role !== 'system');
+        return { systemPrompt, userMessage, isNewConversation: nonSystemMessages.length <= 1 };
+    }
+    return { systemPrompt, userMessage, isNewConversation: false };
+}
+//# sourceMappingURL=message-extractor.js.map

package/dist/src/openai-compat/message-extractor.js.map

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

package/dist/src/openai-compat/mode-flags.d.ts

@@ -0,0 +1,34 @@
+/**
+ * Cluster B beachhead — tool-mode flag predicates.
+ *
+ * Extracted from `openai-compat.ts` so that `session-key-resolver.ts`
+ * (and future Cluster B modules) can read these flags without creating
+ * a circular import back into the orchestrator.
+ *
+ * Behavior preserved bit-for-bit from the original definitions in
+ * `openai-compat.ts:126-142`. openai-compat.ts re-exports both
+ * functions for any external caller that previously imported them
+ * from there (none exist today, but the re-export is cheap insurance).
+ *
+ * Cluster B follow-on will fold these into the `IToolBridge` strategy
+ * pattern (PRP §5 Cluster B `bridges/factory.ts`); for now they
+ * remain free-function predicates.
+ */
+/**
+ * Legacy mode: when set, tool definitions are prepended to every user
+ * message instead of being baked into the session system prompt. Defeats
+ * prompt caching but allows mutating the tool list mid-session.
+ *
+ * Truthy values: '1', 'true', 'yes' (case-insensitive, trimmed).
+ */
+export declare function isToolsPerMessageModeEnabled(): boolean;
+/**
+ * Phase 2 R5: tool-stream mode flag. When `CC_OPENCLAW_TOOL_STREAM=1`
+ * AND the caller provides `tools[]`, cc-openclaw skips the defensive
+ * "no tools" system prompt and does NOT clear `sessionConfig.tools`,
+ * allowing Claude CLI's native tool_use events to flow through the
+ * parser+translator pipeline.
+ *
+ * Strict opt-in: only true when env value is exactly `'1'`.
+ */
+export declare function isToolStreamMode(): boolean;

package/dist/src/openai-compat/mode-flags.js

@@ -0,0 +1,44 @@
+/**
+ * Cluster B beachhead — tool-mode flag predicates.
+ *
+ * Extracted from `openai-compat.ts` so that `session-key-resolver.ts`
+ * (and future Cluster B modules) can read these flags without creating
+ * a circular import back into the orchestrator.
+ *
+ * Behavior preserved bit-for-bit from the original definitions in
+ * `openai-compat.ts:126-142`. openai-compat.ts re-exports both
+ * functions for any external caller that previously imported them
+ * from there (none exist today, but the re-export is cheap insurance).
+ *
+ * Cluster B follow-on will fold these into the `IToolBridge` strategy
+ * pattern (PRP §5 Cluster B `bridges/factory.ts`); for now they
+ * remain free-function predicates.
+ */
+import { getOpenaiCompatToolsPerMessage } from '../lib/config.js';
+/**
+ * Legacy mode: when set, tool definitions are prepended to every user
+ * message instead of being baked into the session system prompt. Defeats
+ * prompt caching but allows mutating the tool list mid-session.
+ *
+ * Truthy values: '1', 'true', 'yes' (case-insensitive, trimmed).
+ */
+export function isToolsPerMessageModeEnabled() {
+    const v = getOpenaiCompatToolsPerMessage();
+    if (!v)
+        return false;
+    const t = v.trim().toLowerCase();
+    return t === '1' || t === 'true' || t === 'yes';
+}
+/**
+ * Phase 2 R5: tool-stream mode flag. When `CC_OPENCLAW_TOOL_STREAM=1`
+ * AND the caller provides `tools[]`, cc-openclaw skips the defensive
+ * "no tools" system prompt and does NOT clear `sessionConfig.tools`,
+ * allowing Claude CLI's native tool_use events to flow through the
+ * parser+translator pipeline.
+ *
+ * Strict opt-in: only true when env value is exactly `'1'`.
+ */
+export function isToolStreamMode() {
+    return process.env.CC_OPENCLAW_TOOL_STREAM === '1';
+}
+//# sourceMappingURL=mode-flags.js.map

package/dist/src/openai-compat/mode-flags.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mode-flags.js","sourceRoot":"","sources":["../../../src/openai-compat/mode-flags.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,8BAA8B,EAAE,MAAM,kBAAkB,CAAC;AAElE;;;;;;GAMG;AACH,MAAM,UAAU,4BAA4B;IAC1C,MAAM,CAAC,GAAG,8BAA8B,EAAE,CAAC;IAC3C,IAAI,CAAC,CAAC;QAAE,OAAO,KAAK,CAAC;IACrB,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACjC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,KAAK,CAAC;AAClD,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,gBAAgB;IAC9B,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,KAAK,GAAG,CAAC;AACrD,CAAC"}

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

@@ -0,0 +1,26 @@
+/**
+ * Cluster B Phase 2 — Non-streaming HTTP handler.
+ *
+ * Extracted verbatim from `openai-compat.ts:508-615` (Module G).
+ * Handles the response path when the caller did NOT request `stream:true` —
+ * a single buffered Claude CLI session call, then one JSON object back to
+ * the client.
+ *
+ * Lifecycle:
+ *   1. reportStatus('thinking') → SessionManager.sendMessage(...)
+ *   2. On each tool_use event → push a status update + emit trajectory
+ *   3. On each tool_result event → emit trajectory only (no status)
+ *   4. v0.7.1: accumulate thinking-block content when surfaceThinking is on
+ *   5. On completion → read token stats, format response, write back
+ *   6. On error → reportStatus('idle','Request failed') + 500 with
+ *      structured `formatError` telemetry
+ *
+ * Parameterized fully — no closure capture from openai-compat.ts. All
+ * dependencies are imported from their dedicated Cluster B modules
+ * (response-formatter, tool-calls-parser, status-reporter,
+ * message-extractor for types) or from lib/.
+ */
+import type * as http from 'node:http';
+import type { SessionManagerLike } from './openai-compat.js';
+import type { UserMessageBlock } from './message-extractor.js';
+export declare function handleNonStreaming(manager: SessionManagerLike, sessionName: string, model: string, userMessage: string | UserMessageBlock[], completionId: string, res: http.ServerResponse, hasTools: boolean): Promise<void>;

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

@@ -0,0 +1,108 @@
+/**
+ * Cluster B Phase 2 — Non-streaming HTTP handler.
+ *
+ * Extracted verbatim from `openai-compat.ts:508-615` (Module G).
+ * Handles the response path when the caller did NOT request `stream:true` —
+ * a single buffered Claude CLI session call, then one JSON object back to
+ * the client.
+ *
+ * Lifecycle:
+ *   1. reportStatus('thinking') → SessionManager.sendMessage(...)
+ *   2. On each tool_use event → push a status update + emit trajectory
+ *   3. On each tool_result event → emit trajectory only (no status)
+ *   4. v0.7.1: accumulate thinking-block content when surfaceThinking is on
+ *   5. On completion → read token stats, format response, write back
+ *   6. On error → reportStatus('idle','Request failed') + 500 with
+ *      structured `formatError` telemetry
+ *
+ * Parameterized fully — no closure capture from openai-compat.ts. All
+ * dependencies are imported from their dedicated Cluster B modules
+ * (response-formatter, tool-calls-parser, status-reporter,
+ * message-extractor for types) or from lib/.
+ */
+import { reportStatus, getToolDescription } from './status-reporter.js';
+import { parseToolCallsFromText } from './tool-calls-parser.js';
+import { formatCompletionResponse } from './response-formatter.js';
+import { getSurfaceThinkingEnabled } from '../lib/config.js';
+import { emit as emitTrajectory } from '../lib/trajectory.js';
+import { formatError, ERROR_CODES } from '../lib/error-formatter.js';
+export async function handleNonStreaming(manager, sessionName, model, 
+// Phase 2 R4 wire-up: accepts native content-block arrays in tool-stream mode.
+userMessage, completionId, res, hasTools) {
+    try {
+        reportStatus('thinking', 'Processing request...');
+        // v0.7.1: accumulate thinking-block content when surfaceThinking is on.
+        // Default OFF for privacy — empty string means no `reasoning` field
+        // gets attached to the response.
+        const surfaceThinking = getSurfaceThinkingEnabled();
+        let thinkingBuffer = '';
+        const result = await manager.sendMessage(sessionName, userMessage, {
+            onEvent: (event) => {
+                if (event.type === 'tool_use' && event.tool?.name) {
+                    const desc = getToolDescription(event.tool.name, event.tool.input);
+                    reportStatus('working', desc, event.tool.name);
+                    // Pillar B v0.4.3: trajectory tool_use event. Emit tool name and
+                    // input-arg keys (not values — keys leak no sensitive content
+                    // while still letting offline analysis cluster tool-call shapes).
+                    emitTrajectory('tool_use', {
+                        name: event.tool.name,
+                        inputKeys: event.tool.input ? Object.keys(event.tool.input) : [],
+                    }, sessionName);
+                }
+                else if (event.type === 'tool_result') {
+                    emitTrajectory('tool_result', {}, sessionName);
+                }
+            },
+            // v0.7.1: when surfaceThinking is on, accumulate extended-thinking text
+            // for the `reasoning` field on the OpenAI response. Subscribing to the
+            // callback always (cheap closure cost ~ none); only buffering when
+            // the env flag is set so the privacy-default-OFF promise holds.
+            onThinking: surfaceThinking
+                ? (text) => {
+                    thinkingBuffer += text;
+                }
+                : undefined,
+        });
+        reportStatus('idle', 'Ready');
+        let tokensIn = 0;
+        let tokensOut = 0;
+        try {
+            const status = manager.getStatus(sessionName);
+            tokensIn = status.stats.tokensIn;
+            tokensOut = status.stats.tokensOut;
+        }
+        catch {
+            /* stats unavailable */
+        }
+        // v0.7.1: emit thinking_block trajectory event with token-count metadata
+        // only (never raw text). Fires when buffer is non-empty regardless of
+        // whether the response surfaces it — so observability is independent
+        // of the user-visible flag.
+        if (thinkingBuffer.length > 0) {
+            emitTrajectory('thinking_block', {
+                excerpt_chars: thinkingBuffer.length,
+                tokens_approx: Math.ceil(thinkingBuffer.length / 4),
+            }, sessionName);
+        }
+        // Parse tool_calls from response text when caller provided tools
+        if (hasTools) {
+            const parsed = parseToolCallsFromText(result.output);
+            const response = formatCompletionResponse(completionId, model, parsed.textContent ?? '', tokensIn, tokensOut, parsed.toolCalls.length > 0 ? parsed.toolCalls : undefined, surfaceThinking ? thinkingBuffer : undefined);
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(response));
+        }
+        else {
+            const response = formatCompletionResponse(completionId, model, result.output, tokensIn, tokensOut, undefined, surfaceThinking ? thinkingBuffer : undefined);
+            res.writeHead(200, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify(response));
+        }
+    }
+    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: 'handleNonStreaming' } });
+        res.writeHead(500, { 'Content-Type': 'application/json' });
+        res.end(JSON.stringify({ error: { message: err.message, type: 'server_error' } }));
+    }
+}
+//# sourceMappingURL=non-streaming-handler.js.map

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

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