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

package/dist/{args-EAKPBBGX.js → args-FCLPQ7TO.js}

@@ -2,9 +2,9 @@
 import {
   HELP_TEXT,
   parseCliArgs
-} from "./chunk-M7INIL2C.js";
+} from "./chunk-UN7QXPCB.js";
 import "./chunk-ELML4KVQ.js";
-import "./chunk-Z5JM76EL.js";
+import "./chunk-RZUJYAQV.js";
 export {
   HELP_TEXT,
   parseCliArgs

package/dist/{chunk-5ISYVAXI.js → chunk-2JBRLGKD.js}

@@ -4,13 +4,13 @@ import {
   providerName,
   removeGlobalProvider,
   writeGlobalConfig
-} from "./chunk-5C6NQFSI.js";
+} from "./chunk-U7DLMVPZ.js";
 import {
   PRESETS,
   loadConfig,
   readCredentials,
   saveCredential
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/provider.ts
 var ProviderError = class extends Error {

package/dist/{chunk-QH7XXNHU.js → chunk-L7L4RGKG.js}

@@ -35,8 +35,8 @@ function readSecret(prompt) {
   });
 }
 async function runLogin(providerId, cwd) {
-  const { runProviderCommand } = await import("./providerCli-SJRCBSRE.js");
-  const { parseCliArgs } = await import("./args-EAKPBBGX.js");
+  const { runProviderCommand } = await import("./providerCli-G3X7KENO.js");
+  const { parseCliArgs } = await import("./args-FCLPQ7TO.js");
   return runProviderCommand(parseCliArgs(["provider", "add", providerId]), {
     env: process.env,
     cwd,

package/dist/{chunk-XQLXE666.js → chunk-NGLKANMD.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ConfigError
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/mcp/config.ts
 import { createHash } from "crypto";

package/dist/{chunk-Z5JM76EL.js → chunk-RZUJYAQV.js}

@@ -91,11 +91,12 @@ function resolveModel(config, modelRef, env = process.env) {
 }
 function removeCredential(providerId, env = process.env) {
   const creds = readCredentials(env);
-  if (!(providerId in creds)) return;
+  if (!(providerId in creds)) return false;
   delete creds[providerId];
   const path = join(bccliHome(env), "credentials");
   writeFileSync(path, JSON.stringify(creds, null, 2), { mode: 384 });
   chmodSync(path, 384);
+  return true;
 }
 
 export {

package/dist/{chunk-5C6NQFSI.js → chunk-U7DLMVPZ.js}

@@ -5,7 +5,7 @@ import {
   readCredentials,
   readJsonConfig,
   removeCredential
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/providers.ts
 import { mkdirSync, writeFileSync } from "fs";

package/dist/{chunk-TV6LEHOH.js → chunk-UESQNU4A.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   ConfigError
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/mcp/catalog.ts
 var CATALOG = [

package/dist/{chunk-M7INIL2C.js → chunk-UN7QXPCB.js}

@@ -4,7 +4,7 @@ import {
 } from "./chunk-ELML4KVQ.js";
 import {
   ConfigError
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/args.ts
 import { parseArgs } from "util";

package/dist/cli.js

@@ -2,15 +2,15 @@
 import {
   HELP_TEXT,
   parseCliArgs
-} from "./chunk-M7INIL2C.js";
+} from "./chunk-UN7QXPCB.js";
 import {
   addProviderKey,
   createProvider,
   listAllModels
-} from "./chunk-5ISYVAXI.js";
+} from "./chunk-2JBRLGKD.js";
 import {
   runLogin
-} from "./chunk-QH7XXNHU.js";
+} from "./chunk-L7L4RGKG.js";
 import {
   BUILTIN_AGENTS,
   buildSystemPrompt,
@@ -26,7 +26,7 @@ import {
 } from "./chunk-ELML4KVQ.js";
 import {
   providerName
-} from "./chunk-5C6NQFSI.js";
+} from "./chunk-U7DLMVPZ.js";
 import {
   Session,
   pruneSessions
@@ -36,7 +36,7 @@ import {
   bccliHome,
   loadConfig,
   resolveModel
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/tools/index.ts
 import { z as z8 } from "zod";
@@ -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)
@@ -1173,6 +1245,8 @@ function createRuntime(opts) {
     resume(previous) {
       session = previous;
       agent.load(previous.load());
+      agent.totalUsage = { inputTokens: 0, outputTokens: 0 };
+      todos.set([]);
       checkpoints.clear();
     },
     newSession() {
@@ -1198,7 +1272,7 @@ function createRuntime(opts) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.4.0-beta.1" : "0.0.0-dev";
+var VERSION = true ? "0.4.0-beta.3" : "0.0.0-dev";
 
 // src/cli.ts
 async function main() {
@@ -1214,13 +1288,13 @@ async function main() {
   const cwd = process.cwd();
   if (args.command === "login") return runLogin(args.loginProvider ?? "bc-cloud", cwd);
   if (args.command === "mcp") {
-    const { runMcpCommand } = await import("./mcpCli-BV3IGR47.js");
-    const { readSecret } = await import("./login-FTMR64IA.js");
+    const { runMcpCommand } = await import("./mcpCli-Q2H63ISP.js");
+    const { readSecret } = await import("./login-KHU7ONSR.js");
     return runMcpCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "provider") {
-    const { runProviderCommand } = await import("./providerCli-SJRCBSRE.js");
-    const { readSecret } = await import("./login-FTMR64IA.js");
+    const { runProviderCommand } = await import("./providerCli-G3X7KENO.js");
+    const { readSecret } = await import("./login-KHU7ONSR.js");
     return runProviderCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "models") {
@@ -1237,7 +1311,7 @@ async function main() {
   }
   if (args.print) {
     if (!args.prompt) throw new ConfigError('Mode -p butuh tugas, contoh: bccli -p "jelaskan repo ini"');
-    const { serversToStart } = await import("./config-XPWPGNZJ.js");
+    const { serversToStart } = await import("./config-NPSYFAFD.js");
     const plan = serversToStart(rt.home, cwd);
     for (const s of plan.needTrust) {
       console.error(`Server MCP project "${s.name}" dilewati (belum diizinkan; jalankan bccli interaktif sekali untuk menyetujuinya).`);
@@ -1250,7 +1324,7 @@ async function main() {
     }
   }
   if (!process.stdin.isTTY) throw new ConfigError('Mode interaktif butuh terminal. Untuk skrip/CI pakai: bccli -p "tugas"');
-  const { startInteractive } = await import("./ui-LWZ75D7H.js");
+  const { startInteractive } = await import("./ui-A32PTF4F.js");
   return startInteractive(rt, { initialPrompt: args.prompt, resume: args.resume, version: VERSION });
 }
 main().then(

package/dist/{config-XPWPGNZJ.js → config-NPSYFAFD.js}

@@ -8,8 +8,8 @@ import {
   removeGlobalServer,
   serversToStart,
   setProjectTrust
-} from "./chunk-XQLXE666.js";
-import "./chunk-Z5JM76EL.js";
+} from "./chunk-NGLKANMD.js";
+import "./chunk-RZUJYAQV.js";
 export {
   addGlobalServer,
   globalMcpPath,

package/dist/{login-FTMR64IA.js → login-KHU7ONSR.js}

@@ -2,7 +2,7 @@
 import {
   readSecret,
   runLogin
-} from "./chunk-QH7XXNHU.js";
+} from "./chunk-L7L4RGKG.js";
 export {
   readSecret,
   runLogin

package/dist/{mcpCli-BV3IGR47.js → mcpCli-Q2H63ISP.js}

@@ -2,16 +2,16 @@
 import {
   CATALOG,
   fillTemplate
-} from "./chunk-TV6LEHOH.js";
+} from "./chunk-UESQNU4A.js";
 import {
   addGlobalServer,
   globalMcpPath,
   readMcpFile,
   removeGlobalServer
-} from "./chunk-XQLXE666.js";
+} from "./chunk-NGLKANMD.js";
 import {
   bccliHome
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/mcpCli.ts
 async function runMcpCommand(args, deps) {

package/dist/{providerCli-SJRCBSRE.js → providerCli-G3X7KENO.js}

@@ -2,9 +2,9 @@
 import {
   addProviderKey,
   runProviderCommand
-} from "./chunk-5ISYVAXI.js";
-import "./chunk-5C6NQFSI.js";
-import "./chunk-Z5JM76EL.js";
+} from "./chunk-2JBRLGKD.js";
+import "./chunk-U7DLMVPZ.js";
+import "./chunk-RZUJYAQV.js";
 export {
   addProviderKey,
   runProviderCommand

package/dist/{ui-LWZ75D7H.js → ui-A32PTF4F.js}

@@ -13,31 +13,31 @@ import {
   hasKey,
   providerName,
   writeGlobalConfig
-} from "./chunk-5C6NQFSI.js";
+} from "./chunk-U7DLMVPZ.js";
 import {
   Session
 } from "./chunk-SJH3YLW4.js";
 import {
   CATALOG,
   fillTemplate
-} from "./chunk-TV6LEHOH.js";
+} from "./chunk-UESQNU4A.js";
 import {
   addGlobalServer,
   globalMcpPath,
   readMcpFile,
   removeGlobalServer
-} from "./chunk-XQLXE666.js";
+} from "./chunk-NGLKANMD.js";
 import {
   PRESETS,
   removeCredential
-} from "./chunk-Z5JM76EL.js";
+} from "./chunk-RZUJYAQV.js";
 
 // src/ui/index.tsx
 import { render } from "ink";
 
 // src/ui/App.tsx
-import { spawnSync } from "child_process";
-import { mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
+import { execFile as execFile2 } from "child_process";
+import { existsSync as existsSync2, mkdirSync, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { homedir } from "os";
 import { dirname, join, relative, resolve } from "path";
 import { Box as Box13, Static, Text as Text15, useApp, useInput as useInput9 } from "ink";
@@ -90,13 +90,19 @@ function osc52(text, inTmux) {
 
 // src/slash/diff.ts
 import { execFile } from "child_process";
-function git(cwd, args) {
+function git(cwd, args, bin = "git") {
   return new Promise((resolve2) => {
-    execFile("git", args, { cwd, maxBuffer: 20 * 1024 * 1024 }, (error, stdout, stderr) => resolve2({ ok: !error, out: error ? stderr : stdout }));
+    execFile(
+      bin,
+      args,
+      { cwd, maxBuffer: 20 * 1024 * 1024 },
+      (error, stdout, stderr) => resolve2({ ok: !error, out: error ? stderr : stdout, missing: error?.code === "ENOENT" })
+    );
   });
 }
-async function gitDiff(cwd, maxLines = 400) {
-  const inside = await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
+async function gitDiff(cwd, maxLines = 400, bin = "git") {
+  const inside = await git(cwd, ["rev-parse", "--is-inside-work-tree"], bin);
+  if (inside.missing) return "git tidak terpasang atau tidak ada di PATH, jadi /diff tidak bisa dipakai.";
   if (!inside.ok || inside.out.trim() !== "true") return "Folder ini bukan repository git, jadi tidak ada diff.";
   const base = (await git(cwd, ["rev-parse", "--verify", "-q", "HEAD"])).ok ? "HEAD" : "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
   const [stat, diff, untracked] = await Promise.all([
@@ -117,13 +123,17 @@ async function doctorText(input, deps) {
   const major = Number(deps.nodeVersion.replace(/^v/, "").split(".")[0]);
   const lines = [major >= 22 ? `\u2713 Node ${deps.nodeVersion}` : `\u2717 Node ${deps.nodeVersion} (butuh \u2265 22)`];
   for (const p of input.providers) lines.push(p.ready ? `\u2713 ${p.name}` : `\u25CB ${p.name} (belum ada key)`);
-  try {
-    lines.push(`\u2713 Koneksi ${input.activeProvider} (${(await deps.listModels()).length} model)`);
-  } catch (error) {
-    lines.push(`\u2717 Koneksi ${input.activeProvider}: ${error.message}`);
-  }
+  const cmds = ["rg", "git", "npx", "uvx"];
+  const [connection, found] = await Promise.all([
+    deps.listModels().then(
+      (models) => `\u2713 Koneksi ${input.activeProvider} (${models.length} model)`,
+      (error) => `\u2717 Koneksi ${input.activeProvider}: ${error.message}`
+    ),
+    Promise.all(cmds.map(async (cmd) => deps.which(cmd)))
+  ]);
+  lines.push(connection);
   for (const m of input.mcp) lines.push(m.status === "error" ? `\u2717 MCP ${m.name}: ${m.error ?? ""}` : `\u2713 MCP ${m.name} (${m.status})`);
-  for (const cmd of ["rg", "git", "npx", "uvx"]) lines.push(`${deps.which(cmd) ? "\u2713" : "\u2717"} ${cmd}`);
+  for (const [i, cmd] of cmds.entries()) lines.push(`${found[i] ? "\u2713" : "\u2717"} ${cmd}`);
   return lines.join("\n");
 }
 
@@ -186,6 +196,10 @@ function appendMemory(file, text) {
   appendFileSync(file, `${prefix}- ${text.trim()}
 `);
 }
+function parseMemoryArgs(args) {
+  const match = /^global(?:\s+|$)/i.exec(args.trim());
+  return match ? { global: true, text: args.trim().slice(match[0].length).trim() } : { global: false, text: args.trim() };
+}
 
 // src/ui/Markdown.tsx
 import { Box, Text } from "ink";
@@ -833,6 +847,7 @@ function App({ runtime, initialPrompt, version }) {
               const chosen = others.find((s) => s.session.file === id);
               if (!chosen) return;
               runtime.resume(chosen.session);
+              setTokens(0);
               const tail = runtime.agent.messages.filter((m) => (m.role === "user" || m.role === "assistant") && m.content).slice(-3);
               notice(
                 [`Melanjutkan sesi (${runtime.agent.messages.length} pesan):`, ...tail.map((m) => `${m.role === "user" ? ">" : "\u25CF"} ${String(m.content).slice(0, 200)}`)].join(
@@ -874,7 +889,7 @@ function App({ runtime, initialPrompt, version }) {
                 activeProvider: runtime.providerLabel()
               },
               {
-                which: (cmd) => spawnSync(process.platform === "win32" ? "where" : "which", [cmd]).status === 0,
+                which: (cmd) => new Promise((done) => execFile2(process.platform === "win32" ? "where" : "which", [cmd], (error) => done(!error))),
                 nodeVersion: process.version,
                 listModels: () => runtime.agent.provider.listModels()
               }
@@ -910,8 +925,11 @@ function App({ runtime, initialPrompt, version }) {
             notice(files.length ? files.map((f) => `${f.path} (${f.lines} baris)`).join("\n") : "Belum ada AGENTS.md / BCCLI.md. Tambah dengan /memory <teks>.");
             return;
           }
-          const global = /^global\s/i.test(args);
-          const text = global ? args.replace(/^global\s+/i, "") : args;
+          const { global, text } = parseMemoryArgs(args);
+          if (!text) {
+            notice("Tulis teksnya: /memory global <teks>.", "warn");
+            return;
+          }
           const file = global ? join(runtime.home, "BCCLI.md") : join(runtime.cwd, "AGENTS.md");
           try {
             mkdirSync(dirname(file), { recursive: true });
@@ -937,15 +955,27 @@ function App({ runtime, initialPrompt, version }) {
             return;
           }
           runtime.setModel(runtime.modelRef);
+          const envName = runtime.config.providers[id]?.apiKeyEnv;
+          if (envName && runtime.env[envName]) {
+            notice(`Key ${runtime.providerLabel()} tersimpan, tapi ${envName} di environment lebih diutamakan dan tetap dipakai.`, "warn");
+            return;
+          }
           notice(`Key ${runtime.providerLabel()} tersimpan \xB7 ${result.models} model.`);
           return;
         }
         case "logout": {
           const id = runtime.modelRef.slice(0, runtime.modelRef.indexOf("/"));
-          removeCredential(id, runtime.env);
+          const removed = removeCredential(id, runtime.env);
           const envName = runtime.config.providers[id]?.apiKeyEnv;
           if (envName && runtime.env[envName]) {
-            notice(`Key tersimpan dihapus, tapi ${envName} masih ada di environment dan tetap dipakai.`, "warn");
+            notice(
+              `${removed ? "Key tersimpan dihapus, tapi" : "Tidak ada key tersimpan;"} ${envName} masih ada di environment dan tetap dipakai.`,
+              "warn"
+            );
+            return;
+          }
+          if (!removed) {
+            notice(`Tidak ada key tersimpan untuk ${runtime.providerLabel()}.`);
             return;
           }
           try {
@@ -996,6 +1026,13 @@ function App({ runtime, initialPrompt, version }) {
         case "export": {
           const name2 = args || `bccli-${(/* @__PURE__ */ new Date()).toISOString().slice(0, 16).replace(/[:T]/g, "-")}.md`;
           const file = resolve(runtime.cwd, name2);
+          if (existsSync2(file)) {
+            const answer2 = await ask(`${file} sudah ada. Timpa? (y/N)`);
+            if (!answer2 || !/^y(a|es)?$/i.test(answer2.trim())) {
+              notice("Ekspor dibatalkan.");
+              return;
+            }
+          }
           try {
             writeFileSync(file, exportMarkdown(runtime.agent.messages, `Sesi BCCLI ${runtime.startedAt.toLocaleString("id-ID")}`));
           } catch (error) {
@@ -1219,7 +1256,7 @@ async function startInteractive(rt, opts) {
       if (chosen) rt.resume(chosen.session);
     }
   }
-  const { serversToStart, setProjectTrust } = await import("./config-XPWPGNZJ.js");
+  const { serversToStart, setProjectTrust } = await import("./config-NPSYFAFD.js");
   const plan = serversToStart(rt.home, rt.cwd);
   if (plan.needTrust.length) {
     const { createInterface } = await import("readline/promises");

package/package.json

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