@botconnector/bccli 0.4.0-beta.2 → 0.4.0-beta.3

package/dist/cli.js

@@ -521,6 +521,71 @@ function toolDefinitions(tools) {
   });
 }
 
+// src/textToolCalls.ts
+var PAIR = /(?:<arg_key>\s*|`)?([A-Za-z_]\w*)(?:\s*<\/arg_key>)?`?\s*(?:=\s*`|<arg_value>)([\s\S]*?)<\/arg_value>/g;
+var CALL_START = /<tool_call>|\n?[^\n]*\bTool call list\b[^\n]*|\n\s*\d+\.\s*Tool:/g;
+function coerce(value, type) {
+  const types = Array.isArray(type) ? type : [type];
+  const v = value.trim();
+  if ((types.includes("integer") || types.includes("number")) && v !== "" && !Number.isNaN(Number(v))) return Number(v);
+  if (types.includes("boolean") && /^(true|false)$/i.test(v)) return v.toLowerCase() === "true";
+  if ((types.includes("object") || types.includes("array")) && /^[[{]/.test(v)) {
+    try {
+      return JSON.parse(v);
+    } catch {
+    }
+  }
+  return value.replace(/^\n+|\n+$/g, "");
+}
+function pickTool(name, keys, tools) {
+  const named = name && tools.find((t) => t.function.name === name);
+  if (named) return named;
+  let best;
+  let bestScore = 0;
+  let tie = false;
+  for (const t of tools) {
+    const params = t.function.parameters;
+    const props = Object.keys(params.properties ?? {});
+    if (!(params.required ?? []).every((r) => keys.includes(r))) continue;
+    const score = keys.filter((k) => props.includes(k)).length;
+    if (score > bestScore) [best, bestScore, tie] = [t, score, false];
+    else if (score === bestScore && score > 0) tie = true;
+  }
+  return tie ? void 0 : best;
+}
+function recoverTextToolCalls(text, tools) {
+  if (!/<\/arg_value>|<tool_call>/.test(text)) return null;
+  const starts = [...text.matchAll(CALL_START)].map((m) => m.index ?? 0);
+  const firstPair = text.search(PAIR);
+  const cut = Math.min(...[...starts, firstPair].filter((i) => i >= 0));
+  const bounds = starts.filter((i) => i >= cut);
+  if (!bounds.length || bounds[0] > cut) bounds.unshift(cut);
+  const toolCalls = [];
+  bounds.forEach((start, n) => {
+    const segment = text.slice(start, bounds[n + 1] ?? text.length);
+    const name = /<tool_call>\s*([A-Za-z_][\w.-]*)/.exec(segment)?.[1] ?? /Tool:\s*`?([A-Za-z_][\w.-]*)`?/.exec(segment)?.[1];
+    let args = [];
+    const flush = () => {
+      if (!args.length) return;
+      const keys = args.map(([k]) => k);
+      const tool = pickTool(name, keys, tools);
+      if (tool) {
+        const props = tool.function.parameters.properties ?? {};
+        const input = Object.fromEntries(args.filter(([k]) => k in props).map(([k, v]) => [k, coerce(v, props[k].type)]));
+        toolCalls.push({ id: `text_call_${toolCalls.length}`, name: tool.function.name, arguments: JSON.stringify(input) });
+      }
+      args = [];
+    };
+    for (const m of segment.matchAll(PAIR)) {
+      if (args.some(([k]) => k === m[1])) flush();
+      args.push([m[1], m[2]]);
+    }
+    flush();
+  });
+  if (!toolCalls.length) return null;
+  return { text: text.slice(0, cut).trim(), toolCalls };
+}
+
 // src/agent.ts
 var estimateTokens = (text) => Math.ceil(text.length / 4);
 var COMPACT_PROMPT = "Summarize the conversation so far for yourself so you can continue the work with no other context. Include: the user goals, decisions made, files touched and their current state, commands run and results, the task in progress and the next step. Be concise but complete.";
@@ -615,12 +680,19 @@ ${completion.text}` });
           await this.compact(signal);
           this.push({ role: "user", content: `Lanjutkan tugas ini sesuai ringkasan di atas: ${text}` });
         }
-        const completion = await this.provider.chat({
+        let completion = await this.provider.chat({
           messages: [{ role: "system", content: this.systemPrompt }, ...this.messages],
           tools: this.turnDefinitions,
           signal,
           onText: (delta) => this.onEvent({ type: "text", delta })
         });
+        if (!completion.toolCalls.length && completion.finishReason !== "repetition") {
+          const recovered = recoverTextToolCalls(completion.text, this.turnDefinitions);
+          if (recovered) {
+            completion = { ...completion, ...recovered };
+            this.onEvent({ type: "textReplace", text: recovered.text });
+          }
+        }
         const usage = completion.usage ?? {
           inputTokens: estimateTokens(this.systemPrompt) + estimateTokens(JSON.stringify(this.messages)),
           outputTokens: estimateTokens(completion.text) + (completion.toolCalls.length ? estimateTokens(JSON.stringify(completion.toolCalls)) : 0)
@@ -1200,7 +1272,7 @@ function createRuntime(opts) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.4.0-beta.2" : "0.0.0-dev";
+var VERSION = true ? "0.4.0-beta.3" : "0.0.0-dev";
 
 // src/cli.ts
 async function main() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botconnector/bccli",
-  "version": "0.4.0-beta.2",
+  "version": "0.4.0-beta.3",
   "description": "BCCLI — BotConnector AI coding agent for the terminal",
   "type": "module",
   "bin": {