siclaw 0.1.2 → 0.1.4

package/dist/core/stream-wrappers.js

@@ -0,0 +1,369 @@
+/**
+ * Stream response wrappers for pi-agent streamFn.
+ *
+ * These wrap the RETURN VALUE of streamFn (the stream object) to intercept
+ * and repair stream events in-flight. Unlike input wrappers that modify
+ * context.messages before the API call, these modify the response.
+ *
+ * Ported from OpenClaw's src/agents/pi-embedded-runner/run/attempt.ts.
+ */
+// ── Tool call block type detection ───────────────────────────────────────
+function isToolCallBlockType(type) {
+    return type === "toolCall" || type === "toolUse" || type === "functionCall";
+}
+// ── Tool call name trimming ──────────────────────────────────────────────
+/**
+ * Normalize tool call IDs in a message: trim whitespace, assign fallback IDs
+ * for duplicates or missing IDs.
+ */
+function normalizeToolCallIdsInMessage(message) {
+    if (!message || typeof message !== "object")
+        return;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return;
+    const usedIds = new Set();
+    for (const block of content) {
+        if (!block || typeof block !== "object")
+            continue;
+        const typedBlock = block;
+        if (!isToolCallBlockType(typedBlock.type) || typeof typedBlock.id !== "string")
+            continue;
+        const trimmedId = typedBlock.id.trim();
+        if (!trimmedId)
+            continue;
+        usedIds.add(trimmedId);
+    }
+    let fallbackIndex = 1;
+    const assignedIds = new Set();
+    for (const block of content) {
+        if (!block || typeof block !== "object")
+            continue;
+        const typedBlock = block;
+        if (!isToolCallBlockType(typedBlock.type))
+            continue;
+        if (typeof typedBlock.id === "string") {
+            const trimmedId = typedBlock.id.trim();
+            if (trimmedId) {
+                if (!assignedIds.has(trimmedId)) {
+                    if (typedBlock.id !== trimmedId) {
+                        typedBlock.id = trimmedId;
+                    }
+                    assignedIds.add(trimmedId);
+                    continue;
+                }
+            }
+        }
+        let fallbackId = "";
+        while (!fallbackId || usedIds.has(fallbackId) || assignedIds.has(fallbackId)) {
+            fallbackId = `call_auto_${fallbackIndex++}`;
+        }
+        typedBlock.id = fallbackId;
+        usedIds.add(fallbackId);
+        assignedIds.add(fallbackId);
+    }
+}
+/**
+ * Trim whitespace from tool call names in a message and normalize IDs.
+ * Simplified from OpenClaw: only trims whitespace (no structured name resolution).
+ */
+function trimWhitespaceFromToolCallNamesInMessage(message) {
+    if (!message || typeof message !== "object")
+        return;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return;
+    for (const block of content) {
+        if (!block || typeof block !== "object")
+            continue;
+        const typedBlock = block;
+        if (!isToolCallBlockType(typedBlock.type))
+            continue;
+        if (typeof typedBlock.name === "string") {
+            const trimmed = typedBlock.name.trim();
+            if (trimmed !== typedBlock.name) {
+                typedBlock.name = trimmed;
+            }
+        }
+    }
+    normalizeToolCallIdsInMessage(message);
+}
+function wrapStreamTrimToolCallNames(stream) {
+    const originalResult = stream.result.bind(stream);
+    stream.result = async () => {
+        const message = await originalResult();
+        trimWhitespaceFromToolCallNamesInMessage(message);
+        return message;
+    };
+    const originalAsyncIterator = stream[Symbol.asyncIterator].bind(stream);
+    stream[Symbol.asyncIterator] = function () {
+        const iterator = originalAsyncIterator();
+        return {
+            async next() {
+                const result = await iterator.next();
+                if (!result.done && result.value && typeof result.value === "object") {
+                    const event = result.value;
+                    trimWhitespaceFromToolCallNamesInMessage(event.partial);
+                    trimWhitespaceFromToolCallNamesInMessage(event.message);
+                }
+                return result;
+            },
+            async return(value) {
+                return iterator.return?.(value) ?? { done: true, value: undefined };
+            },
+            async throw(error) {
+                return iterator.throw?.(error) ?? { done: true, value: undefined };
+            },
+        };
+    };
+    return stream;
+}
+/**
+ * Wrap streamFn to trim whitespace from tool call names in stream events.
+ * Also assigns fallback IDs to tool calls with missing/duplicate IDs.
+ */
+export function wrapStreamFnTrimToolCallNames(baseFn) {
+    return (model, context, options) => {
+        const maybeStream = baseFn(model, context, options);
+        if (maybeStream && typeof maybeStream === "object" && "then" in maybeStream) {
+            return Promise.resolve(maybeStream).then((stream) => wrapStreamTrimToolCallNames(stream));
+        }
+        return wrapStreamTrimToolCallNames(maybeStream);
+    };
+}
+// ── Malformed tool call argument repair ──────────────────────────────────
+const MAX_TOOLCALL_REPAIR_BUFFER_CHARS = 64_000;
+const MAX_TOOLCALL_REPAIR_TRAILING_CHARS = 3;
+const TOOLCALL_REPAIR_ALLOWED_TRAILING_RE = /^[^\s{}[\]":,\\]{1,3}$/;
+/**
+ * Extract the first balanced JSON object/array from a raw string.
+ * Returns null if no balanced structure is found.
+ */
+export function extractBalancedJsonPrefix(raw) {
+    let start = 0;
+    while (start < raw.length && /\s/.test(raw[start] ?? "")) {
+        start += 1;
+    }
+    const startChar = raw[start];
+    if (startChar !== "{" && startChar !== "[") {
+        return null;
+    }
+    let depth = 0;
+    let inString = false;
+    let escaped = false;
+    for (let i = start; i < raw.length; i += 1) {
+        const char = raw[i];
+        if (char === undefined)
+            break;
+        if (inString) {
+            if (escaped) {
+                escaped = false;
+            }
+            else if (char === "\\") {
+                escaped = true;
+            }
+            else if (char === '"') {
+                inString = false;
+            }
+            continue;
+        }
+        if (char === '"') {
+            inString = true;
+            continue;
+        }
+        if (char === "{" || char === "[") {
+            depth += 1;
+            continue;
+        }
+        if (char === "}" || char === "]") {
+            depth -= 1;
+            if (depth === 0) {
+                return raw.slice(start, i + 1);
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Check if we should attempt to repair malformed tool call arguments.
+ * Triggers on closing braces/brackets or short trailing content.
+ */
+export function shouldAttemptMalformedToolCallRepair(partialJson, delta) {
+    if (/[}\]]/.test(delta)) {
+        return true;
+    }
+    const trimmedDelta = delta.trim();
+    return (trimmedDelta.length > 0 &&
+        trimmedDelta.length <= MAX_TOOLCALL_REPAIR_TRAILING_CHARS &&
+        /[}\]]/.test(partialJson));
+}
+/**
+ * Try to parse and repair malformed tool call arguments.
+ * Returns undefined if the JSON is already valid or cannot be repaired.
+ */
+export function tryParseMalformedToolCallArguments(raw) {
+    if (!raw.trim())
+        return undefined;
+    try {
+        JSON.parse(raw);
+        return undefined;
+    }
+    catch {
+        const jsonPrefix = extractBalancedJsonPrefix(raw);
+        if (!jsonPrefix)
+            return undefined;
+        const suffix = raw.slice(raw.indexOf(jsonPrefix) + jsonPrefix.length).trim();
+        if (suffix.length === 0 ||
+            suffix.length > MAX_TOOLCALL_REPAIR_TRAILING_CHARS ||
+            !TOOLCALL_REPAIR_ALLOWED_TRAILING_RE.test(suffix)) {
+            return undefined;
+        }
+        try {
+            const parsed = JSON.parse(jsonPrefix);
+            return parsed && typeof parsed === "object" && !Array.isArray(parsed)
+                ? { args: parsed, trailingSuffix: suffix }
+                : undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
+}
+function repairToolCallArgumentsInMessage(message, contentIndex, repairedArgs) {
+    if (!message || typeof message !== "object")
+        return;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return;
+    const block = content[contentIndex];
+    if (!block || typeof block !== "object")
+        return;
+    const typedBlock = block;
+    if (!isToolCallBlockType(typedBlock.type))
+        return;
+    typedBlock.arguments = repairedArgs;
+}
+function clearToolCallArgumentsInMessage(message, contentIndex) {
+    if (!message || typeof message !== "object")
+        return;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return;
+    const block = content[contentIndex];
+    if (!block || typeof block !== "object")
+        return;
+    const typedBlock = block;
+    if (!isToolCallBlockType(typedBlock.type))
+        return;
+    typedBlock.arguments = {};
+}
+function repairMalformedToolCallArgumentsInMessage(message, repairedArgsByIndex) {
+    if (!message || typeof message !== "object")
+        return;
+    const content = message.content;
+    if (!Array.isArray(content))
+        return;
+    for (const [index, repairedArgs] of repairedArgsByIndex.entries()) {
+        repairToolCallArgumentsInMessage(message, index, repairedArgs);
+    }
+}
+function wrapStreamRepairMalformedToolCallArguments(stream) {
+    const partialJsonByIndex = new Map();
+    const repairedArgsByIndex = new Map();
+    const disabledIndices = new Set();
+    const loggedRepairIndices = new Set();
+    const originalResult = stream.result.bind(stream);
+    stream.result = async () => {
+        const message = await originalResult();
+        repairMalformedToolCallArgumentsInMessage(message, repairedArgsByIndex);
+        partialJsonByIndex.clear();
+        repairedArgsByIndex.clear();
+        disabledIndices.clear();
+        loggedRepairIndices.clear();
+        return message;
+    };
+    const originalAsyncIterator = stream[Symbol.asyncIterator].bind(stream);
+    stream[Symbol.asyncIterator] = function () {
+        const iterator = originalAsyncIterator();
+        return {
+            async next() {
+                const result = await iterator.next();
+                if (!result.done && result.value && typeof result.value === "object") {
+                    const event = result.value;
+                    if (typeof event.contentIndex === "number" &&
+                        Number.isInteger(event.contentIndex) &&
+                        event.type === "toolcall_delta" &&
+                        typeof event.delta === "string") {
+                        if (disabledIndices.has(event.contentIndex)) {
+                            return result;
+                        }
+                        const nextPartialJson = (partialJsonByIndex.get(event.contentIndex) ?? "") + event.delta;
+                        if (nextPartialJson.length > MAX_TOOLCALL_REPAIR_BUFFER_CHARS) {
+                            partialJsonByIndex.delete(event.contentIndex);
+                            repairedArgsByIndex.delete(event.contentIndex);
+                            disabledIndices.add(event.contentIndex);
+                            return result;
+                        }
+                        partialJsonByIndex.set(event.contentIndex, nextPartialJson);
+                        if (shouldAttemptMalformedToolCallRepair(nextPartialJson, event.delta)) {
+                            const repair = tryParseMalformedToolCallArguments(nextPartialJson);
+                            if (repair) {
+                                repairedArgsByIndex.set(event.contentIndex, repair.args);
+                                repairToolCallArgumentsInMessage(event.partial, event.contentIndex, repair.args);
+                                repairToolCallArgumentsInMessage(event.message, event.contentIndex, repair.args);
+                                if (!loggedRepairIndices.has(event.contentIndex)) {
+                                    loggedRepairIndices.add(event.contentIndex);
+                                    console.warn(`[stream-wrappers] repairing malformed tool call arguments after ${repair.trailingSuffix.length} trailing chars`);
+                                }
+                            }
+                            else {
+                                repairedArgsByIndex.delete(event.contentIndex);
+                                clearToolCallArgumentsInMessage(event.partial, event.contentIndex);
+                                clearToolCallArgumentsInMessage(event.message, event.contentIndex);
+                            }
+                        }
+                    }
+                    if (typeof event.contentIndex === "number" &&
+                        Number.isInteger(event.contentIndex) &&
+                        event.type === "toolcall_end") {
+                        const repairedArgs = repairedArgsByIndex.get(event.contentIndex);
+                        if (repairedArgs) {
+                            if (event.toolCall && typeof event.toolCall === "object") {
+                                event.toolCall.arguments = repairedArgs;
+                            }
+                            repairToolCallArgumentsInMessage(event.partial, event.contentIndex, repairedArgs);
+                            repairToolCallArgumentsInMessage(event.message, event.contentIndex, repairedArgs);
+                        }
+                        partialJsonByIndex.delete(event.contentIndex);
+                        disabledIndices.delete(event.contentIndex);
+                        loggedRepairIndices.delete(event.contentIndex);
+                    }
+                }
+                return result;
+            },
+            async return(value) {
+                return iterator.return?.(value) ?? { done: true, value: undefined };
+            },
+            async throw(error) {
+                return iterator.throw?.(error) ?? { done: true, value: undefined };
+            },
+        };
+    };
+    return stream;
+}
+/**
+ * Wrap streamFn to repair malformed JSON in tool call arguments.
+ *
+ * Intercepts `toolcall_delta` events, accumulates partial JSON, and attempts
+ * to extract a balanced JSON prefix when trailing non-JSON characters appear.
+ */
+export function wrapStreamFnRepairMalformedToolCallArguments(baseFn) {
+    return (model, context, options) => {
+        const maybeStream = baseFn(model, context, options);
+        if (maybeStream && typeof maybeStream === "object" && "then" in maybeStream) {
+            return Promise.resolve(maybeStream).then((stream) => wrapStreamRepairMalformedToolCallArguments(stream));
+        }
+        return wrapStreamRepairMalformedToolCallArguments(maybeStream);
+    };
+}
+//# sourceMappingURL=stream-wrappers.js.map

package/dist/core/stream-wrappers.js.map

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

package/dist/core/thinking-blocks.d.ts

@@ -0,0 +1,20 @@
+/**
+ * Strip thinking blocks from assistant messages before sending to API.
+ *
+ * Some providers choke on `type: "thinking"` blocks in the conversation
+ * history. This utility removes them while preserving turn structure.
+ *
+ * Ported from OpenClaw's src/agents/pi-embedded-runner/thinking.ts.
+ */
+import type { AgentMessage } from "@mariozechner/pi-agent-core";
+/**
+ * Strip all `type: "thinking"` content blocks from assistant messages.
+ *
+ * If an assistant message becomes empty after stripping, it is replaced with
+ * a synthetic `{ type: "text", text: "" }` block to preserve turn structure
+ * (some providers require strict user/assistant alternation).
+ *
+ * Returns the original array reference when nothing was changed (callers can
+ * use reference equality to skip downstream work).
+ */
+export declare function dropThinkingBlocks(messages: AgentMessage[]): AgentMessage[];

package/dist/core/thinking-blocks.js

@@ -0,0 +1,45 @@
+function isAssistantMessageWithContent(message) {
+    return (!!message &&
+        typeof message === "object" &&
+        message.role === "assistant" &&
+        Array.isArray(message.content));
+}
+/**
+ * Strip all `type: "thinking"` content blocks from assistant messages.
+ *
+ * If an assistant message becomes empty after stripping, it is replaced with
+ * a synthetic `{ type: "text", text: "" }` block to preserve turn structure
+ * (some providers require strict user/assistant alternation).
+ *
+ * Returns the original array reference when nothing was changed (callers can
+ * use reference equality to skip downstream work).
+ */
+export function dropThinkingBlocks(messages) {
+    let touched = false;
+    const out = [];
+    for (const msg of messages) {
+        if (!isAssistantMessageWithContent(msg)) {
+            out.push(msg);
+            continue;
+        }
+        const nextContent = [];
+        let changed = false;
+        for (const block of msg.content) {
+            if (block && typeof block === "object" && block.type === "thinking") {
+                touched = true;
+                changed = true;
+                continue;
+            }
+            nextContent.push(block);
+        }
+        if (!changed) {
+            out.push(msg);
+            continue;
+        }
+        // Preserve the assistant turn even if all blocks were thinking-only.
+        const content = nextContent.length > 0 ? nextContent : [{ type: "text", text: "" }];
+        out.push({ ...msg, content });
+    }
+    return touched ? out : messages;
+}
+//# sourceMappingURL=thinking-blocks.js.map

package/dist/core/thinking-blocks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thinking-blocks.js","sourceRoot":"","sources":["../../src/core/thinking-blocks.ts"],"names":[],"mappings":"AAaA,SAAS,6BAA6B,CAAC,OAAqB;IAC1D,OAAO,CACL,CAAC,CAAC,OAAO;QACT,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,CAAC,IAAI,KAAK,WAAW;QAC5B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAC/B,CAAC;AACJ,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,kBAAkB,CAAC,QAAwB;IACzD,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,GAAG,GAAmB,EAAE,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;QAC3B,IAAI,CAAC,6BAA6B,CAAC,GAAG,CAAC,EAAE,CAAC;YACxC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,SAAS;QACX,CAAC;QACD,MAAM,WAAW,GAA4B,EAAE,CAAC;QAChD,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChC,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAK,KAA4B,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC5F,OAAO,GAAG,IAAI,CAAC;gBACf,OAAO,GAAG,IAAI,CAAC;gBACf,SAAS;YACX,CAAC;YACD,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACd,SAAS;QACX,CAAC;QACD,qEAAqE;QACrE,MAAM,OAAO,GACX,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAA2B,CAAC,CAAC;QAC/F,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC;AAClC,CAAC"}

package/dist/core/tool-call-id.d.ts

@@ -0,0 +1,22 @@
+import type { AgentMessage } from "@mariozechner/pi-agent-core";
+export type ToolCallIdMode = "strict" | "strict9";
+/**
+ * Sanitize a tool call ID to be compatible with various providers.
+ *
+ * - "strict" mode: only [a-zA-Z0-9]
+ * - "strict9" mode: only [a-zA-Z0-9], length 9 (Mistral tool call requirement)
+ */
+export declare function sanitizeToolCallId(id: string, mode?: ToolCallIdMode): string;
+export declare function isValidCloudCodeAssistToolId(id: string, mode?: ToolCallIdMode): boolean;
+/**
+ * Sanitize tool call IDs for provider compatibility.
+ *
+ * Sanitization can introduce collisions, and some providers also reject raw
+ * duplicate tool-call IDs. Track assistant occurrences in-order so repeated
+ * raw IDs receive distinct rewritten IDs, while matching tool results consume
+ * the same rewritten IDs in encounter order.
+ *
+ * @param messages - The messages to sanitize
+ * @param mode - "strict" (alphanumeric only) or "strict9" (alphanumeric length 9)
+ */
+export declare function sanitizeToolCallIdsForCloudCodeAssist(messages: AgentMessage[], mode?: ToolCallIdMode): AgentMessage[];