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

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

@@ -12,6 +12,54 @@ import {
   saveCredential
 } from "./chunk-RZUJYAQV.js";
 
+// src/thinking.ts
+var OPEN = "<think>";
+var CLOSE = "</think>";
+function partialTag(text, tag) {
+  for (let n = Math.min(tag.length - 1, text.length); n > 0; n--) if (tag.startsWith(text.slice(-n))) return n;
+  return 0;
+}
+var ThinkSplitter = class {
+  inside = false;
+  held = "";
+  push(delta) {
+    let rest = this.held + delta;
+    this.held = "";
+    let text = "";
+    let thinking = "";
+    while (rest) {
+      const tag = this.inside ? CLOSE : OPEN;
+      const at = rest.indexOf(tag);
+      if (at >= 0) {
+        if (this.inside) thinking += rest.slice(0, at);
+        else text += rest.slice(0, at);
+        rest = rest.slice(at + tag.length);
+        this.inside = !this.inside;
+        continue;
+      }
+      const keep = partialTag(rest, tag);
+      const out = rest.slice(0, rest.length - keep);
+      if (this.inside) thinking += out;
+      else text += out;
+      this.held = rest.slice(rest.length - keep);
+      break;
+    }
+    return { text, thinking };
+  }
+  /** Whatever was held back as a possible tag start is plain text after all. */
+  flush() {
+    const held = this.held;
+    this.held = "";
+    return this.inside ? { text: "", thinking: held } : { text: held, thinking: "" };
+  }
+};
+function splitThinking(text) {
+  const s = new ThinkSplitter();
+  const a = s.push(text);
+  const b = s.flush();
+  return { text: a.text + b.text, thinking: a.thinking + b.thinking };
+}
+
 // src/provider.ts
 var ProviderError = class extends Error {
   constructor(message, status) {
@@ -58,8 +106,21 @@ function errorMessage(body) {
   }
 }
 var toUsage = (u) => u ? { inputTokens: u.prompt_tokens ?? 0, outputTokens: u.completion_tokens ?? 0 } : void 0;
-async function readStream(res, onText) {
+async function readStream(res, onText, onThinking) {
   let text = "";
+  let thinking = "";
+  const splitter = new ThinkSplitter();
+  const emit = (part) => {
+    if (part.thinking) {
+      thinking += part.thinking;
+      onThinking?.(part.thinking);
+    }
+    if (part.text) {
+      text += part.text;
+      onText?.(part.text);
+      if (loopAt < 0) loopAt = detectRepetition(text);
+    }
+  };
   let usage;
   let finishReason;
   const calls = [];
@@ -84,11 +145,9 @@ async function readStream(res, onText) {
     if (!choice) return;
     if (choice.finish_reason) finishReason = choice.finish_reason;
     const delta = choice.delta ?? {};
-    if (delta.content) {
-      text += delta.content;
-      onText?.(delta.content);
-      if (loopAt < 0) loopAt = detectRepetition(text);
-    }
+    const reasoning = delta.reasoning_content || delta.reasoning;
+    if (reasoning) emit({ text: "", thinking: reasoning });
+    if (delta.content) emit(splitter.push(delta.content));
     for (const tc of delta.tool_calls ?? []) {
       let target = tc.index !== void 0 ? byIndex.get(tc.index) : current;
       if (!target || tc.index === void 0 && tc.id && target.id && target.id !== tc.id) {
@@ -110,11 +169,12 @@ async function readStream(res, onText) {
       buffer = buffer.slice(newline + 1);
       newline = buffer.indexOf("\n");
     }
-    if (loopAt >= 0) return { text: text.slice(0, loopAt), toolCalls: [], usage, finishReason: "repetition" };
+    if (loopAt >= 0) return { text: text.slice(0, loopAt), toolCalls: [], thinking: thinking || void 0, usage, finishReason: "repetition" };
   }
   handle(buffer.trim());
+  emit(splitter.flush());
   const toolCalls = calls.map((call, index) => ({ ...call, id: call.id || `call_${index}` }));
-  return { text, toolCalls, usage, finishReason };
+  return { text, toolCalls, thinking: thinking || void 0, usage, finishReason };
 }
 async function readJson(res) {
   const body = await res.json();
@@ -124,7 +184,9 @@ async function readJson(res) {
     name: tc.function?.name ?? "",
     arguments: tc.function?.arguments ?? ""
   }));
-  return { text: choice?.message?.content ?? "", toolCalls, usage: toUsage(body.usage), finishReason: choice?.finish_reason };
+  const split = splitThinking(choice?.message?.content ?? "");
+  const thinking = (choice?.message?.reasoning_content || choice?.message?.reasoning || "") + split.thinking;
+  return { text: split.text, toolCalls, thinking: thinking || void 0, usage: toUsage(body.usage), finishReason: choice?.finish_reason };
 }
 function createProvider({ baseURL, apiKey, model, fetch: doFetch = fetch, retryDelayMs = 1e3 }) {
   const headers = { "content-type": "application/json" };
@@ -149,7 +211,7 @@ function createProvider({ baseURL, apiKey, model, fetch: doFetch = fetch, retryD
     throw lastError ?? new ProviderError("Permintaan gagal");
   }
   return {
-    async chat({ messages, tools, signal, onText }) {
+    async chat({ messages, tools, signal, onText, onThinking }) {
       const res = await post(
         "/chat/completions",
         { model, messages, stream: true, stream_options: { include_usage: true }, ...tools?.length ? { tools } : {} },
@@ -157,7 +219,7 @@ function createProvider({ baseURL, apiKey, model, fetch: doFetch = fetch, retryD
       );
       if ((res.headers.get("content-type") ?? "").includes("application/json")) return readJson(res);
       if (!res.body) throw new ProviderError("Respons provider kosong");
-      return readStream(res, onText);
+      return readStream(res, onText, onThinking);
     },
     async listModels() {
       const res = await doFetch(`${baseURL}/models`, { headers });

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

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

package/dist/cli.js

@@ -7,10 +7,10 @@ import {
   addProviderKey,
   createProvider,
   listAllModels
-} from "./chunk-2JBRLGKD.js";
+} from "./chunk-C5AFWX7H.js";
 import {
   runLogin
-} from "./chunk-L7L4RGKG.js";
+} from "./chunk-GW36UMHZ.js";
 import {
   BUILTIN_AGENTS,
   buildSystemPrompt,
@@ -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,20 @@ ${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 })
+          onText: (delta) => this.onEvent({ type: "text", delta }),
+          onThinking: (delta) => this.onEvent({ type: "thinking", 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 +1273,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.4" : "0.0.0-dev";
 
 // src/cli.ts
 async function main() {
@@ -1217,12 +1290,12 @@ async function main() {
   if (args.command === "login") return runLogin(args.loginProvider ?? "bc-cloud", cwd);
   if (args.command === "mcp") {
     const { runMcpCommand } = await import("./mcpCli-Q2H63ISP.js");
-    const { readSecret } = await import("./login-KHU7ONSR.js");
+    const { readSecret } = await import("./login-F4G5QXOU.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-G3X7KENO.js");
-    const { readSecret } = await import("./login-KHU7ONSR.js");
+    const { runProviderCommand } = await import("./providerCli-MXV6PD6F.js");
+    const { readSecret } = await import("./login-F4G5QXOU.js");
     return runProviderCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "models") {
@@ -1252,7 +1325,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-A32PTF4F.js");
+  const { startInteractive } = await import("./ui-7FXPXXGN.js");
   return startInteractive(rt, { initialPrompt: args.prompt, resume: args.resume, version: VERSION });
 }
 main().then(

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

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

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

@@ -2,7 +2,7 @@
 import {
   addProviderKey,
   runProviderCommand
-} from "./chunk-2JBRLGKD.js";
+} from "./chunk-C5AFWX7H.js";
 import "./chunk-U7DLMVPZ.js";
 import "./chunk-RZUJYAQV.js";
 export {

package/dist/{ui-A32PTF4F.js → ui-7FXPXXGN.js}

@@ -638,6 +638,11 @@ function applyEvent(t, event) {
       if (last?.kind === "assistant") return { ...t, live: [...t.live.slice(0, -1), { ...last, text: last.text + event.delta }] };
       return { ...t, live: [...t.live, entry({ kind: "assistant", text: event.delta })] };
     }
+    case "thinking": {
+      const last = t.live.at(-1);
+      if (last?.kind === "thinking") return { ...t, live: [...t.live.slice(0, -1), { ...last, text: last.text + event.delta }] };
+      return { ...t, live: [...t.live, entry({ kind: "thinking", text: event.delta })] };
+    }
     case "textReplace": {
       const last = t.live.at(-1);
       if (last?.kind !== "assistant") return t;
@@ -687,6 +692,7 @@ function helpText(runtime) {
     "",
     "shift+tab  ganti mode izin    esc  batalkan giliran",
     "ctrl+o     output alat terakhir lengkap    \\ + enter  baris baru",
+    "ctrl+t     buka/tutup thinking model",
     "@file + tab  lengkapi nama file    \u2191\u2193  riwayat input"
   ].join("\n");
 }
@@ -713,6 +719,8 @@ function App({ runtime, initialPrompt, version }) {
   const [mcpMenu, setMcpMenu] = useState8(null);
   const [listPicker, setListPicker] = useState8(null);
   const [planAsk, setPlanAsk] = useState8(null);
+  const [queued, setQueued] = useState8([]);
+  const [showThinking, setShowThinking] = useState8(false);
   useEffect2(() => runtime.todos.subscribe(setTodos), [runtime]);
   const extraCommands = [
     ...runtime.commands.filter((c) => !SLASH_COMMANDS.some((b) => b.name === c.name.toLowerCase())).map((c) => ({ name: c.name.toLowerCase(), description: c.description ?? "perintah custom" })),
@@ -1086,6 +1094,19 @@ ARGUMENTS: ${slash.args}`);
     },
     [runSlash, runTurn, runtime, notice]
   );
+  const onPrompt = useCallback(
+    (text) => {
+      if (busy) setQueued((q) => [...q, text]);
+      else submit(text);
+    },
+    [busy, submit]
+  );
+  useEffect2(() => {
+    if (busy || pending || planAsk || !queued.length) return;
+    const [next, ...rest] = queued;
+    setQueued(rest);
+    submit(next);
+  }, [busy, pending, planAsk, queued, submit]);
   const initialSent = useRef(false);
   useEffect2(() => {
     if (initialPrompt && !initialSent.current) {
@@ -1100,6 +1121,25 @@ ARGUMENTS: ${slash.args}`);
       setMode(next);
     } else if (key.escape && busy && !pending) {
       controller.current?.abort();
+      if (queued.length) {
+        setQueued([]);
+        notice(`${queued.length} pesan antrian dibatalkan.`, "warn");
+      }
+    } else if (key.ctrl && input === "t") {
+      const next = !showThinking;
+      setShowThinking(next);
+      setTranscript((t) => {
+        const last = [...t.done, ...t.live].findLast((e) => e.kind === "thinking");
+        const reprint = next && last?.kind === "thinking" && t.done.includes(last);
+        return {
+          ...t,
+          done: [
+            ...t.done,
+            ...reprint ? [entry({ kind: "thinking", text: last.text, open: true })] : [],
+            entry({ kind: "notice", text: next ? "Thinking ditampilkan (ctrl+t untuk menutup)." : "Thinking disembunyikan (ctrl+t untuk membuka).", tone: "info" })
+          ]
+        };
+      });
     } else if (key.ctrl && input === "o" && lastTool.current) {
       const t = lastTool.current;
       notice(`\u23BF ${t.tool} ${t.target}
@@ -1180,6 +1220,18 @@ ${t.output}`);
           /* @__PURE__ */ jsx15(Text15, { color: color(ACCENT), children: "\u25CF " }),
           /* @__PURE__ */ jsx15(Markdown, { text: e.text.replace(/^\s+/, "") })
         ] }, e.id);
+      case "thinking": {
+        const text = e.text.trim();
+        if (!text) return null;
+        if (!(e.open ?? showThinking)) {
+          const lines = text.split("\n").length;
+          return /* @__PURE__ */ jsx15(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: `\u273B Berpikir \xB7 ${lines} baris \xB7 ctrl+t buka` }) }, e.id);
+        }
+        return /* @__PURE__ */ jsxs10(Box13, { marginTop: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: "\u273B Berpikir (ctrl+t tutup)" }),
+          /* @__PURE__ */ jsx15(Box13, { paddingLeft: 2, children: /* @__PURE__ */ jsx15(Text15, { dimColor: true, italic: true, children: text }) })
+        ] }, e.id);
+      }
       case "tool":
         return /* @__PURE__ */ jsx15(ToolBlock, { tool: e.tool, target: e.target, output: e.output, display: e.display, isError: e.isError, done: e.done, sub: e.sub }, e.id);
       case "notice":
@@ -1232,7 +1284,8 @@ ${t.output}`);
       }
     ) : null,
     /* @__PURE__ */ jsx15(TodoList, { items: todos }),
-    /* @__PURE__ */ jsx15(PromptInput, { disabled: busy || !!pending || !!picker || !!providerMenu || !!prompt || !!planAsk || !!mcpMenu || !!listPicker, history, cwd: runtime.cwd, onSubmit: submit, extraCommands }),
+    queued.map((q, i) => /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: `  \u23F3 antri: ${q}` }, `${i}-${q}`)),
+    /* @__PURE__ */ jsx15(PromptInput, { disabled: !!pending || !!picker || !!providerMenu || !!prompt || !!planAsk || !!mcpMenu || !!listPicker, history, cwd: runtime.cwd, onSubmit: onPrompt, extraCommands }),
     /* @__PURE__ */ jsx15(StatusBar, { mode, tokens, busy, model: modelLabel })
   ] });
 }

package/package.json

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