kimiflare 0.7.0 → 0.7.1

package/dist/index.js

@@ -142,7 +142,33 @@ var init_errors = __esm({
   }
 });
 
+// src/agent/messages.ts
+function sanitizeString(str) {
+  return str.replace(/[\uD800-\uDFFF]/g, "\uFFFD");
+}
+function jsonReplacer(_key, value) {
+  if (typeof value === "string") {
+    return sanitizeString(value);
+  }
+  return value;
+}
+var init_messages = __esm({
+  "src/agent/messages.ts"() {
+    "use strict";
+  }
+});
+
 // src/agent/client.ts
+function cleanErrorMessage(msg) {
+  return msg.replace(/^(AiError:\s*)+/, "").trim();
+}
+function isRetryable(err, attempt) {
+  if (attempt >= MAX_ATTEMPTS - 1) return false;
+  if (err.code !== void 0 && RETRYABLE_CODES.has(err.code)) return true;
+  if (err.httpStatus !== void 0 && err.httpStatus >= 500 && err.httpStatus < 600) return true;
+  if (err.message.includes("Internal server error")) return true;
+  return false;
+}
 async function* runKimi(opts2) {
   const url = `https://api.cloudflare.com/client/v4/accounts/${opts2.accountId}/ai/run/${opts2.model}`;
   const body = {
@@ -156,15 +182,26 @@ async function* runKimi(opts2) {
     body.reasoning_effort = opts2.reasoningEffort;
   }
   for (let attempt = 0; attempt < MAX_ATTEMPTS; attempt++) {
-    const res = await fetch(url, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${opts2.apiToken}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(body),
-      signal: opts2.signal
-    });
+    let res;
+    try {
+      res = await fetch(url, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${opts2.apiToken}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(body, jsonReplacer),
+        signal: opts2.signal
+      });
+    } catch (fetchErr) {
+      const msg = fetchErr instanceof Error ? fetchErr.message : String(fetchErr);
+      if (attempt < MAX_ATTEMPTS - 1) {
+        const delay = 500 * 2 ** attempt + Math.random() * 250;
+        await sleep(delay, opts2.signal);
+        continue;
+      }
+      throw new KimiApiError(`kimiflare: network error: ${msg}`, void 0, void 0);
+    }
     const contentType = res.headers.get("content-type") ?? "";
     if (!contentType.includes("text/event-stream")) {
       const text = await res.text();
@@ -174,13 +211,15 @@ async function* runKimi(opts2) {
       } catch {
       }
       const err = extractCloudflareError(parsed);
-      if (err?.code === RETRYABLE_CODE && attempt < MAX_ATTEMPTS - 1) {
+      const rawMsg = err?.message ?? `HTTP ${res.status}: ${text.slice(0, 300)}`;
+      const msg = cleanErrorMessage(rawMsg);
+      const apiErr = new KimiApiError(`kimiflare: ${msg}`, err?.code, res.status);
+      if (isRetryable(apiErr, attempt)) {
         const delay = 500 * 2 ** attempt + Math.random() * 250;
         await sleep(delay, opts2.signal);
         continue;
       }
-      const msg = err?.message ?? `HTTP ${res.status}: ${text.slice(0, 300)}`;
-      throw new KimiApiError(`kimiflare: ${msg}`, err?.code, res.status);
+      throw apiErr;
     }
     if (!res.body) throw new KimiApiError("kimiflare: empty response body", void 0, res.status);
     yield* parseStream(res.body, opts2.signal);
@@ -257,9 +296,14 @@ async function* parseStream(body, signal) {
 }
 function extractCloudflareError(parsed) {
   if (!parsed || typeof parsed !== "object") return null;
-  const p = parsed;
-  if (p.success === false && Array.isArray(p.errors) && p.errors.length > 0) {
-    return { code: p.errors[0]?.code, message: p.errors[0]?.message };
+  const cf = parsed;
+  if (cf.success === false && Array.isArray(cf.errors) && cf.errors.length > 0) {
+    return { code: cf.errors[0]?.code, message: cf.errors[0]?.message };
+  }
+  const oai = parsed;
+  if (oai.object === "error" && typeof oai.message === "string") {
+    const codeNum = typeof oai.code === "number" ? oai.code : void 0;
+    return { code: codeNum, message: oai.message };
   }
   return null;
 }
@@ -277,13 +321,14 @@ function sleep(ms, signal) {
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
-var RETRYABLE_CODE, MAX_ATTEMPTS;
+var RETRYABLE_CODES, MAX_ATTEMPTS;
 var init_client = __esm({
   "src/agent/client.ts"() {
     "use strict";
     init_sse();
     init_errors();
-    RETRYABLE_CODE = 3040;
+    init_messages();
+    RETRYABLE_CODES = /* @__PURE__ */ new Set([3040]);
     MAX_ATTEMPTS = 5;
   }
 });
@@ -360,9 +405,17 @@ async function runAgentTurn(opts2) {
     }
     const assistantMsg = {
       role: "assistant",
-      content: content || null,
-      ...reasoning ? { reasoning_content: reasoning } : {},
-      ...toolCalls.length ? { tool_calls: toolCalls } : {}
+      content: content ? sanitizeString(content) : null,
+      ...reasoning ? { reasoning_content: sanitizeString(reasoning) } : {},
+      ...toolCalls.length ? {
+        tool_calls: toolCalls.map((tc) => ({
+          ...tc,
+          function: {
+            name: tc.function.name,
+            arguments: sanitizeString(tc.function.arguments)
+          }
+        }))
+      } : {}
     };
     opts2.messages.push(assistantMsg);
     opts2.callbacks.onAssistantFinal?.(assistantMsg);
@@ -377,7 +430,7 @@ async function runAgentTurn(opts2) {
       opts2.messages.push({
         role: "tool",
         tool_call_id: result.tool_call_id,
-        content: result.content,
+        content: sanitizeString(result.content),
         name: result.name
       });
       opts2.callbacks.onToolResult?.(result);
@@ -390,6 +443,7 @@ var init_loop = __esm({
     "use strict";
     init_client();
     init_registry();
+    init_messages();
   }
 });
 
@@ -3189,7 +3243,7 @@ function App({ initialCfg }) {
       "Do not call `tasks_set` for this. Just read what you need, then write the file."
     ].join("\n");
     setEvents((e) => [...e, { kind: "user", key: mkKey(), text: "/init" }]);
-    messagesRef.current.push({ role: "user", content: prompt });
+    messagesRef.current.push({ role: "user", content: sanitizeString(prompt) });
     setBusy(true);
     setTurnStartedAt(Date.now());
     const controller = new AbortController();
@@ -3543,7 +3597,7 @@ use: /thinking low | medium | high`
       if (trimmed.startsWith("/") && handleSlash(trimmed)) return;
       const display = displayText?.trim() || trimmed;
       setEvents((e) => [...e, { kind: "user", key: mkKey(), text: display }]);
-      messagesRef.current.push({ role: "user", content: trimmed });
+      messagesRef.current.push({ role: "user", content: sanitizeString(trimmed) });
       setBusy(true);
       setTurnStartedAt(Date.now());
       const controller = new AbortController();
@@ -3827,6 +3881,7 @@ var init_app = __esm({
     init_system_prompt();
     init_compact();
     init_executor();
+    init_messages();
     init_chat();
     init_status();
     init_permission();