@botconnector/bccli 0.4.0 → 0.4.2

package/dist/{chunk-PUN4HMAG.js → chunk-5YJ3ZQVR.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   reasoningPayload
-} from "./chunk-BLOYFIAD.js";
+} from "./chunk-KPTML72Q.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/provider.ts
 import OpenAI from "openai";
@@ -171,7 +171,7 @@ async function readStream(res, onText, onThinking) {
       }
       current = target;
       if (tc.id) target.id = tc.id;
-      if (tc.function?.name && !target.name) target.name = tc.function.name;
+      if (tc.function?.name && target.name !== tc.function.name) target.name += tc.function.name;
       if (tc.function?.arguments) target.arguments += tc.function.arguments;
     }
   };
@@ -378,7 +378,16 @@ function responsesFinishReason(items, toolCallCount, incompleteReason) {
 function hasPendingProgrammaticReplay(messages) {
   let pending = false;
   for (const message of messages) {
+    if (message.role === "user" && typeof message.content === "string") {
+      pending = false;
+      continue;
+    }
+    if (message.role === "tool" && message.content === "Cancelled by the user.") {
+      pending = false;
+      continue;
+    }
     if (message.role !== "assistant") continue;
+    if (message.content) pending = false;
     for (const item of message.responses_output_items ?? []) {
       if (item.type === "program") pending = true;
       else if (item.type === "message" && pending) pending = false;
@@ -452,7 +461,7 @@ async function readResponsesStream(res, onText, onThinking) {
         calls.set(index, {
           id: String(event.item.call_id || current?.id || event.item.id || `call_${index}`),
           name: String(event.item.name || current?.name || ""),
-          arguments: String(event.item.arguments ?? current?.arguments ?? ""),
+          arguments: String(event.item.arguments || current?.arguments || ""),
           ...programCaller(event.item) ?? current?.caller ? { caller: programCaller(event.item) ?? current?.caller } : {}
         });
       }
@@ -688,7 +697,7 @@ async function readResponsesWebSocketTurn(events, ws, onText, onThinking, signal
           calls.set(index, {
             id: String(event.item.call_id || current?.id || event.item.id || `call_${index}`),
             name: String(event.item.name || current?.name || ""),
-            arguments: String(event.item.arguments ?? current?.arguments ?? ""),
+            arguments: String(event.item.arguments || current?.arguments || ""),
             ...programCaller(event.item) ?? current?.caller ? { caller: programCaller(event.item) ?? current?.caller } : {}
           });
         }
@@ -749,7 +758,7 @@ function createProvider(options) {
   const isBotConnectorCloud = /^https:\/\/api\.botconnector\.id\/v1\/?$/.test(baseURL) && apiKey?.startsWith("bc_live_");
   if (isBotConnectorCloud) {
     headers["x-botconnector-client"] = "bccli";
-    headers["x-botconnector-client-version"] = "0.4.0";
+    headers["x-botconnector-client-version"] = "0.4.2";
   }
   const useNativeResponses = isBotConnectorCloud && providerId === "bc-cloud" && model === "gpt-6-luna";
   const useResponsesWebSocket = useNativeResponses && Boolean(apiKey) && (fetchOverride === void 0 || responsesWebSocketFactory !== void 0);
@@ -780,7 +789,7 @@ function createProvider(options) {
         baseURL: baseURL.replace(/\/+$/, ""),
         defaultHeaders: {
           "x-botconnector-client": "bccli",
-          "x-botconnector-client-version": "0.4.0"
+          "x-botconnector-client-version": "0.4.2"
         }
       });
       lunaWs = responsesWebSocketFactory ? responsesWebSocketFactory(client) : new ResponsesWS(client, { reconnect: null });
@@ -843,8 +852,13 @@ function createProvider(options) {
       } catch (error) {
         const err = error instanceof ProviderError ? error : new ProviderError(error.message);
         const lostPrevious = err.code === "previous_response_not_found";
+        const handshakeStatus = /unexpected server response:\s*(\d{3})\b/i.exec(err.message);
+        const handshakeRejected = Boolean(handshakeStatus && Number(handshakeStatus[1]) >= 400);
         const connectionLost = /websocket|connection closed|socket|network/i.test(err.message) || err.code === "websocket_connection_limit_reached";
         resetLunaWebSocket();
+        if (!emittedText && !signal?.aborted && handshakeRejected) {
+          throw new ProviderError(err.message, Number(handshakeStatus?.[1]), "bc_ws_http_fallback");
+        }
         if (attempt === 0 && !emittedText && !signal?.aborted && (plan.incremental || lostPrevious || connectionLost)) {
           continue;
         }
@@ -858,8 +872,13 @@ function createProvider(options) {
   }
   async function post(path, body, signal) {
     let lastError;
+    let retryAfterWaitMs;
     for (let attempt = 0; attempt < 4; attempt++) {
-      if (attempt > 0) await sleep(retryDelayMs * 2 ** (attempt - 1), signal);
+      if (attempt > 0) {
+        const delay = retryAfterWaitMs ?? retryDelayMs * 2 ** (attempt - 1);
+        retryAfterWaitMs = void 0;
+        await sleep(delay, signal);
+      }
       let res;
       try {
         res = await doFetch(`${baseURL}${path}`, { method: "POST", headers, body: JSON.stringify(body), signal });
@@ -869,9 +888,15 @@ function createProvider(options) {
         continue;
       }
       if (res.ok) return res;
+      const retryHeader = res.headers.get("retry-after");
+      if (retryHeader) {
+        const secs = Number(retryHeader);
+        if (Number.isFinite(secs) && secs > 0 && secs <= 30) retryAfterWaitMs = Math.ceil(secs * 1e3);
+      }
       const text = await res.text().catch(() => "");
       lastError = new ProviderError(t("{status} from {url}: {message}", { status: res.status, url: baseURL, message: errorMessage(text) }), res.status);
-      if (!retryable(res.status)) throw lastError;
+      const deterministicQuota429 = res.status === 429 && /"code"\s*:\s*"(?:luna_monthly_quota_exhausted|plan_allowance_exhausted)"/i.test(text);
+      if (!retryable(res.status) || deterministicQuota429) throw lastError;
     }
     throw lastError ?? new ProviderError(t("Request failed"));
   }
@@ -930,11 +955,49 @@ function createProvider(options) {
     }
   };
 }
+function withFallbackProvider(primary, fallbacks) {
+  return {
+    async chat(req) {
+      let emitted = false;
+      const wrappedReq = {
+        ...req,
+        onText: req.onText ? (delta) => {
+          emitted = true;
+          req.onText?.(delta);
+        } : () => {
+          emitted = true;
+        }
+      };
+      try {
+        return await primary.chat(wrappedReq);
+      } catch (primaryError) {
+        if (emitted || req.signal?.aborted) throw primaryError;
+        const status = primaryError instanceof ProviderError ? primaryError.status : void 0;
+        const canFallback = status === void 0 || status === 429 || status === 408 || status >= 500;
+        if (!canFallback) throw primaryError;
+        const chain = fallbacks();
+        if (!chain.length) throw primaryError;
+        let lastError = primaryError;
+        for (const fb of chain) {
+          if (req.signal?.aborted) throw lastError;
+          try {
+            return await fb.chat(req);
+          } catch (fbError) {
+            lastError = fbError;
+          }
+        }
+        throw lastError;
+      }
+    },
+    listModels: () => primary.listModels()
+  };
+}
 
 export {
   contentText,
   imageUserMessage,
   hasPendingProgrammaticReplay,
   completionAssistantMessage,
-  createProvider
+  createProvider,
+  withFallbackProvider
 };

package/dist/{chunk-L7QI6JN2.js → chunk-6M55UPES.js}

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 import {
-  ConfigError
-} from "./chunk-LACUWBWS.js";
+  ConfigError,
+  writeFileAtomic
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/mcp/config.ts
 import { createHash } from "crypto";
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { existsSync, mkdirSync, readFileSync } from "fs";
 import { dirname, join, resolve } from "path";
 var ENV_REF = /\$\{([A-Za-z_][A-Za-z0-9_]*)(?::-([^}]*))?\}/g;
 function expandEnvVars(config, env) {
@@ -41,9 +42,8 @@ function readJson(path, fallback) {
 }
 function writePrivate(path, data) {
   mkdirSync(dirname(path), { recursive: true });
-  writeFileSync(path, `${JSON.stringify(data, null, 2)}
-`, { mode: 384 });
-  chmodSync(path, 384);
+  writeFileAtomic(path, `${JSON.stringify(data, null, 2)}
+`, 384);
 }
 function readMcpFile(path) {
   return readJson(path, {}).mcpServers ?? {};

package/dist/{chunk-KEMYIGCP.js → chunk-6UO5GX55.js}

@@ -1,18 +1,18 @@
 #!/usr/bin/env node
 import {
   MODE_ORDER
-} from "./chunk-O7M3TGIW.js";
+} from "./chunk-WFZKJY3R.js";
 import {
   REASONING_LEVELS,
   isReasoningLevel
-} from "./chunk-BLOYFIAD.js";
+} from "./chunk-KPTML72Q.js";
 import {
   ConfigError
-} from "./chunk-LACUWBWS.js";
+} from "./chunk-RX4UQX43.js";
 import {
   parseLang,
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/args.ts
 import { parseArgs } from "util";
@@ -41,9 +41,18 @@ var LOOPBACK_BIND = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "::1"]);
 function trustFence(headers, port) {
   const host = headers.host;
   if (!host) return "missing Host header";
-  const sep = host.lastIndexOf(":");
-  const hostname = sep > -1 ? host.slice(0, sep) : host;
-  const hostPort = sep > -1 ? Number(host.slice(sep + 1)) : 80;
+  let hostname;
+  let hostPort;
+  if (host.startsWith("[")) {
+    const close = host.indexOf("]");
+    if (close === -1) return `non-loopback Host: ${host}`;
+    hostname = host.slice(0, close + 1);
+    hostPort = host[close + 1] === ":" ? Number(host.slice(close + 2)) : 80;
+  } else {
+    const sep = host.lastIndexOf(":");
+    hostname = sep > -1 ? host.slice(0, sep) : host;
+    hostPort = sep > -1 ? Number(host.slice(sep + 1)) : 80;
+  }
   if (!LOOPBACK_HOSTS.has(hostname)) return `non-loopback Host: ${hostname}`;
   if (hostPort !== port) return `Host port ${hostPort} does not match listener ${port}`;
   if (headers.origin) {
@@ -111,9 +120,12 @@ Options:
   -h, --help                    this help`;
 var helpText = () => t(HELP);
 function parseCliArgs(argv) {
-  const expanded = argv.map(
-    (a, i) => a === "--models" && (i + 1 >= argv.length || argv[i + 1].startsWith("-")) ? "--models=all" : a
-  );
+  const expanded = argv.map((a, i) => {
+    const nextIsFlagOrEnd = i + 1 >= argv.length || argv[i + 1].startsWith("-");
+    if (a === "--models" && nextIsFlagOrEnd) return "--models=all";
+    if (a === "--project" && nextIsFlagOrEnd) return "--project=";
+    return a;
+  });
   const { values, positionals } = parseArgs({
     args: expanded,
     allowPositionals: true,
@@ -145,7 +157,8 @@ function parseCliArgs(argv) {
       tools: { type: "string" },
       models: { type: "string" },
       project: { type: "string" },
-      repo: { type: "string" }
+      repo: { type: "string" },
+      "fallback-model": { type: "string" }
     }
   });
   const reasoning = values.reasoning;
@@ -219,7 +232,8 @@ function parseCliArgs(argv) {
     tools,
     models,
     project: values.project,
-    repo: values.repo
+    repo: values.repo,
+    fallbackModel: values["fallback-model"]
   };
 }
 

package/dist/{chunk-TLPFQIS2.js → chunk-C64KM37J.js}

@@ -2,13 +2,13 @@
 import {
   runCommand,
   runHooks
-} from "./chunk-M7CALSP3.js";
+} from "./chunk-ZEPTUKNW.js";
 import {
   ConfigError
-} from "./chunk-LACUWBWS.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/verify.ts
 var MAX_VERIFY_ROUNDS = 2;
@@ -40,10 +40,19 @@ function toolLabel(tool) {
   if (tool === "web_search") return "Search";
   return tool.charAt(0).toUpperCase() + tool.slice(1);
 }
+function resolvePrintPrompt(prompt, stdinText) {
+  const cleanStdin = stdinText?.trim();
+  const cleanPrompt = prompt?.trim();
+  if (cleanStdin && cleanPrompt) return `${cleanStdin}
+
+${cleanPrompt}`;
+  return cleanPrompt || cleanStdin || void 0;
+}
 async function runPrint(rt, prompt, io = { out: process.stdout, err: process.stderr }, opts = {}) {
   const format = opts.outputFormat ?? "text";
   const emit = (line) => io.out.write(`${JSON.stringify(line)}
 `);
+  const startedMs = Date.now();
   let result = "";
   const toolNames = /* @__PURE__ */ new Map();
   rt.interaction.approvePlan = async () => {
@@ -65,6 +74,9 @@ async function runPrint(rt, prompt, io = { out: process.stdout, err: process.std
           result += event.delta;
         }
         break;
+      case "textReplace":
+        result = event.text;
+        break;
       case "toolStart":
         toolNames.set(event.id, event.tool);
         io.err.write(`\u23BF ${toolLabel(event.tool)}  ${event.target}
@@ -142,12 +154,29 @@ async function runPrint(rt, prompt, io = { out: process.stdout, err: process.std
   for (const warning of stop.warnings) io.err.write(`${warning}
 `);
   await rt.emitPlugins("Stop");
+  const durationMs = Math.max(0, Date.now() - startedMs);
   if (format === "json") {
-    io.out.write(`${JSON.stringify({ status: failed ? "failed" : "ok", model: rt.modelRef, result })}
-`);
+    io.out.write(
+      `${JSON.stringify({
+        status: failed ? "failed" : "ok",
+        model: rt.modelRef,
+        session_id: rt.session.id,
+        usage: rt.agent.totalUsage,
+        duration_ms: durationMs,
+        result
+      })}
+`
+    );
   } else if (format === "stream-json") {
     if (result) emit({ type: "message", text: result });
-    emit({ type: "result", status: failed ? "failed" : "ok", model: rt.modelRef });
+    emit({
+      type: "result",
+      status: failed ? "failed" : "ok",
+      model: rt.modelRef,
+      session_id: rt.session.id,
+      usage: rt.agent.totalUsage,
+      duration_ms: durationMs
+    });
   } else if (wroteText) {
     io.out.write("\n");
   }
@@ -225,6 +254,7 @@ export {
   runVerify,
   verifyFollowup,
   toolLabel,
+  resolvePrintPrompt,
   runPrint,
   resolveWorktree,
   worktreeListText

package/dist/{chunk-JL5ZCSP2.js → chunk-H7XJDKJY.js}

@@ -1,21 +1,21 @@
 #!/usr/bin/env node
 import {
   listAllModels
-} from "./chunk-XBO5GACQ.js";
+} from "./chunk-IYR5PYA3.js";
 import {
   hasKey,
   providerName,
   removeGlobalProvider,
   writeGlobalConfig
-} from "./chunk-SPRNLS7K.js";
+} from "./chunk-HQW4BROS.js";
 import {
   PRESETS,
   loadConfig,
   saveCredential
-} from "./chunk-LACUWBWS.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/providerCli.ts
 async function addProviderKey(providerId, key, deps) {

package/dist/{chunk-SPRNLS7K.js → chunk-HQW4BROS.js}

@@ -4,11 +4,11 @@ import {
   bccliHome,
   readCredentials,
   readJsonConfig,
-  removeCredential
-} from "./chunk-LACUWBWS.js";
+  removeCredential,
+  writeFileAtomic
+} from "./chunk-RX4UQX43.js";
 
 // src/providers.ts
-import { mkdirSync, writeFileSync } from "fs";
 import { join } from "path";
 function providerName(config, id) {
   return PRESETS.find((p) => p.id === id)?.name ?? config.providers[id]?.name ?? id;
@@ -24,8 +24,7 @@ function readGlobalConfigFile(env = process.env) {
   return readJsonConfig(globalPath(env));
 }
 function save(data, env) {
-  mkdirSync(bccliHome(env), { recursive: true });
-  writeFileSync(globalPath(env), `${JSON.stringify(data, null, 2)}
+  writeFileAtomic(globalPath(env), `${JSON.stringify(data, null, 2)}
 `);
 }
 function writeGlobalConfig(patch, env = process.env) {

package/dist/{chunk-XBO5GACQ.js → chunk-IYR5PYA3.js}

@@ -2,17 +2,17 @@
 import {
   hasKey,
   providerName
-} from "./chunk-SPRNLS7K.js";
+} from "./chunk-HQW4BROS.js";
 import {
   createProvider
-} from "./chunk-PUN4HMAG.js";
+} from "./chunk-5YJ3ZQVR.js";
 import {
   PRESETS,
   readCredentials
-} from "./chunk-LACUWBWS.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/models.ts
 function order(ids) {

package/dist/{chunk-45SDLMTV.js → chunk-JXM6REER.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-PSO7R5AD.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/tools/websearch.ts
 import { z } from "zod";

package/dist/{chunk-BLOYFIAD.js → chunk-KPTML72Q.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/reasoning.ts
 var REASONING_LEVELS = ["auto", "off", "low", "medium", "high", "max"];

package/dist/{chunk-BQ2IGPBR.js → chunk-NQOGVP3I.js}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import {
   ConfigError
-} from "./chunk-LACUWBWS.js";
+} from "./chunk-RX4UQX43.js";
 import {
   t
-} from "./chunk-UZWJQF67.js";
+} from "./chunk-3WHI4LN3.js";
 
 // src/mcp/catalog.ts
 var CATALOG = [

package/dist/{chunk-QZKLZELZ.js → chunk-OK2USAXX.js}

@@ -1,12 +1,36 @@
 #!/usr/bin/env node
 
 // src/tokenBudget.ts
+var IMAGE_TOKEN_COST = 1e3;
 var estimateTokens = (text) => Math.ceil(text.length / 4);
-var estimateMessages = (messages) => estimateTokens(JSON.stringify(messages));
+function isImageAttachmentMessage(m) {
+  if (m.role !== "user" || !Array.isArray(m.content)) return false;
+  const hasImage = m.content.some((p) => p.type === "image_url");
+  const firstText = m.content.find((p) => p.type === "text");
+  return hasImage && !!firstText && firstText.type === "text" && firstText.text.startsWith("Image read from ");
+}
+function isUserTurnBoundary(m) {
+  return m.role === "user" && !isImageAttachmentMessage(m);
+}
+function estimateMessages(messages) {
+  let total = 0;
+  for (const m of messages) {
+    if (m.role === "user" && Array.isArray(m.content)) {
+      for (const part of m.content) {
+        if (part.type === "image_url") total += IMAGE_TOKEN_COST;
+        else total += estimateTokens(part.text);
+      }
+      total += 8;
+    } else {
+      total += estimateTokens(JSON.stringify(m));
+    }
+  }
+  return total;
+}
 function trimToFit(messages, maxTokens) {
   let out = messages;
   while (estimateMessages(out) > maxTokens) {
-    const boundary = out.findIndex((m, i) => i > 0 && m.role === "user");
+    const boundary = out.findIndex((m, i) => i > 0 && isUserTurnBoundary(m));
     if (boundary === -1) return out;
     out = out.slice(boundary);
   }
@@ -16,13 +40,13 @@ function splitKeepRecent(messages, keepTokens) {
   if (messages.length === 0) return [[], []];
   let start = messages.length;
   for (let i = messages.length - 1; i >= 0; i--) {
-    if (i > 0 && messages[i].role !== "user") continue;
+    if (i > 0 && !isUserTurnBoundary(messages[i])) continue;
     if (estimateMessages(messages.slice(i)) <= keepTokens) start = i;
     else break;
   }
   if (start === messages.length) {
     for (let i = messages.length - 1; i >= 0; i--) {
-      if (messages[i].role === "user") {
+      if (isUserTurnBoundary(messages[i])) {
         start = i;
         break;
       }