@botconnector/bccli 0.4.0-beta.22 → 0.4.0-beta.23

package/dist/{chunk-JM75AWC3.js → chunk-TUSJXGMP.js}

@@ -19,6 +19,7 @@ import {
 // src/provider.ts
 import OpenAI from "openai";
 import { ResponsesWS } from "openai/resources/responses/ws";
+import { toResponseInputItems } from "openai/lib/responses/ResponseInputItems";
 
 // src/thinking.ts
 var OPEN = "<think>";
@@ -207,24 +208,35 @@ function responseInputFromMessages(messages) {
       continue;
     }
     if (message.role === "assistant") {
+      if (message.responses_output_items?.length) {
+        input.push(...toResponseInputItems(message.responses_output_items));
+        continue;
+      }
       if (message.content) input.push({ role: "assistant", content: message.content });
       for (const call of message.tool_calls ?? []) {
         input.push({
           type: "function_call",
           call_id: call.id,
           name: call.function.name,
-          arguments: call.function.arguments || "{}"
+          arguments: call.function.arguments || "{}",
+          ...call.caller ? { caller: call.caller } : {}
         });
       }
       continue;
     }
-    input.push({ type: "function_call_output", call_id: message.tool_call_id, output: message.content });
+    input.push({
+      type: "function_call_output",
+      call_id: message.tool_call_id,
+      output: message.content,
+      ...message.responses_caller ? { caller: message.responses_caller } : {}
+    });
   }
   return input;
 }
 var LUNA_TOOL_SEARCH_MIN_MCP_TOOLS = 20;
 var LUNA_TOOL_SEARCH_MIN_MCP_SCHEMA_CHARS = 32e3;
-function lunaToolPlan(tools) {
+var LUNA_PTC_SAFE_FUNCTIONS = /* @__PURE__ */ new Set(["read", "grep", "glob"]);
+function lunaToolPlan(tools, enableProgrammaticToolCalling = false) {
   const native = (tools ?? []).map((tool) => ({
     type: "function",
     name: tool.function.name,
@@ -235,8 +247,22 @@ function lunaToolPlan(tools) {
   const mcpIndexes = native.map((tool, index) => String(tool.name).startsWith("mcp__") ? index : -1).filter((index) => index >= 0);
   const deferredSchemaChars = mcpIndexes.reduce((sum, index) => sum + JSON.stringify(native[index]).length, 0);
   const useToolSearch = mcpIndexes.length >= LUNA_TOOL_SEARCH_MIN_MCP_TOOLS || deferredSchemaChars >= LUNA_TOOL_SEARCH_MIN_MCP_SCHEMA_CHARS;
+  if (enableProgrammaticToolCalling) {
+    for (let index = 0; index < native.length; index++) {
+      if (LUNA_PTC_SAFE_FUNCTIONS.has(String(native[index].name))) {
+        native[index] = { ...native[index], allowed_callers: ["direct", "programmatic"] };
+      }
+    }
+    native.push({ type: "programmatic_tool_calling" });
+  }
   if (!useToolSearch) {
-    return { tools: native, useToolSearch: false, deferredToolCount: 0, deferredSchemaChars };
+    return {
+      tools: native,
+      useToolSearch: false,
+      useProgrammaticToolCalling: enableProgrammaticToolCalling,
+      deferredToolCount: 0,
+      deferredSchemaChars
+    };
   }
   for (const index of mcpIndexes) native[index] = { ...native[index], defer_loading: true };
   native.push({
@@ -246,12 +272,13 @@ function lunaToolPlan(tools) {
   return {
     tools: native,
     useToolSearch: true,
+    useProgrammaticToolCalling: enableProgrammaticToolCalling,
     deferredToolCount: mcpIndexes.length,
     deferredSchemaChars
   };
 }
-function responseTools(tools) {
-  return lunaToolPlan(tools).tools;
+function responseTools(tools, enableProgrammaticToolCalling = false) {
+  return lunaToolPlan(tools, enableProgrammaticToolCalling).tools;
 }
 function responseReasoning(level) {
   if (level === "auto") return {};
@@ -260,12 +287,36 @@ function responseReasoning(level) {
 function toResponsesUsage(usage) {
   return usage ? { inputTokens: usage.input_tokens ?? 0, outputTokens: usage.output_tokens ?? 0 } : void 0;
 }
+function programCaller(item) {
+  const caller = item?.caller;
+  return caller?.type === "program" && typeof caller.caller_id === "string" ? { type: "program", caller_id: caller.caller_id } : void 0;
+}
+function responsesFinishReason(items, toolCallCount, incompleteReason) {
+  if (incompleteReason) return incompleteReason;
+  if (toolCallCount) return "tool_calls";
+  const hasMessage = items?.some((item) => item.type === "message") ?? false;
+  const hasProgramState = items?.some((item) => item.type === "program" || item.type === "program_output") ?? false;
+  return !hasMessage && hasProgramState ? "continue" : "stop";
+}
+function hasPendingProgrammaticReplay(messages) {
+  let pending = false;
+  for (const message of messages) {
+    if (message.role !== "assistant") continue;
+    for (const item of message.responses_output_items ?? []) {
+      if (item.type === "program") pending = true;
+      else if (item.type === "message" && pending) pending = false;
+    }
+  }
+  return pending;
+}
 async function readResponsesStream(res, onText) {
   let text = "";
   let usage;
   let finishReason;
   let loopAt = -1;
   const calls = /* @__PURE__ */ new Map();
+  const outputItems = /* @__PURE__ */ new Map();
+  let responsesOutputItems;
   const decoder = new TextDecoder();
   let buffer = "";
   const emitText = (delta) => {
@@ -298,7 +349,8 @@ async function readResponsesStream(res, onText) {
       calls.set(Number(event.output_index ?? calls.size), {
         id: String(event.item.call_id || event.item.id || `call_${calls.size}`),
         name: String(event.item.name || ""),
-        arguments: String(event.item.arguments || "")
+        arguments: String(event.item.arguments || ""),
+        ...programCaller(event.item) ? { caller: programCaller(event.item) } : {}
       });
       return;
     }
@@ -308,24 +360,34 @@ async function readResponsesStream(res, onText) {
       if (call) call.arguments += String(event.delta || "");
       return;
     }
-    if (event.type === "response.output_item.done" && event.item?.type === "function_call") {
-      const index = Number(event.output_index ?? 0);
-      const current = calls.get(index);
-      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 ?? "")
-      });
+    if (event.type === "response.output_item.done" && event.item) {
+      const index = Number(event.output_index ?? outputItems.size);
+      outputItems.set(index, event.item);
+      if (event.item.type === "function_call") {
+        const current = calls.get(index);
+        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 ?? ""),
+          ...programCaller(event.item) ?? current?.caller ? { caller: programCaller(event.item) ?? current?.caller } : {}
+        });
+      }
       return;
     }
     if (event.type === "response.completed") {
       usage = toResponsesUsage(event.response?.usage);
-      finishReason = calls.size ? "tool_calls" : "stop";
+      responsesOutputItems = event.response?.output ?? [...outputItems.entries()].sort(([a], [b]) => a - b).map(([, item]) => item);
+      finishReason = responsesFinishReason(responsesOutputItems, calls.size);
       return;
     }
     if (event.type === "response.incomplete") {
       usage = toResponsesUsage(event.response?.usage);
-      finishReason = String(event.response?.incomplete_details?.reason || "incomplete");
+      responsesOutputItems = event.response?.output ?? [...outputItems.entries()].sort(([a], [b]) => a - b).map(([, item]) => item);
+      finishReason = responsesFinishReason(
+        responsesOutputItems,
+        calls.size,
+        String(event.response?.incomplete_details?.reason || "incomplete")
+      );
     }
   };
   for await (const chunk of res.body) {
@@ -345,7 +407,8 @@ async function readResponsesStream(res, onText) {
     text,
     toolCalls: [...calls.entries()].sort(([a], [b]) => a - b).map(([, call]) => call),
     usage,
-    finishReason
+    finishReason,
+    responsesOutputItems
   };
 }
 async function readResponsesJson(res) {
@@ -362,7 +425,8 @@ async function readResponsesJson(res) {
       toolCalls.push({
         id: String(item.call_id || item.id || `call_${toolCalls.length}`),
         name: String(item.name || ""),
-        arguments: String(item.arguments || "{}")
+        arguments: String(item.arguments || "{}"),
+        ...programCaller(item) ? { caller: programCaller(item) } : {}
       });
     }
   }
@@ -370,7 +434,12 @@ async function readResponsesJson(res) {
     text,
     toolCalls,
     usage: toResponsesUsage(body.usage),
-    finishReason: toolCalls.length ? "tool_calls" : body.status === "incomplete" ? String(body.incomplete_details?.reason || "incomplete") : "stop"
+    responsesOutputItems: body.output,
+    finishReason: responsesFinishReason(
+      body.output,
+      toolCalls.length,
+      body.status === "incomplete" ? String(body.incomplete_details?.reason || "incomplete") : void 0
+    )
   };
 }
 function cloneMessages(messages) {
@@ -387,9 +456,11 @@ function completionAssistantMessage(completion) {
       tool_calls: completion.toolCalls.map((call) => ({
         id: call.id,
         type: "function",
-        function: { name: call.name, arguments: call.arguments }
+        function: { name: call.name, arguments: call.arguments },
+        ...call.caller ? { caller: call.caller } : {}
       }))
-    } : {}
+    } : {},
+    ...completion.responsesOutputItems?.length ? { responses_output_items: completion.responsesOutputItems } : {}
   };
 }
 function responseContinuationInput(messages, continuation) {
@@ -407,7 +478,12 @@ function responseContinuationInput(messages, continuation) {
     return { input: responseInputFromMessages(messages), incremental: false };
   }
   const delta = messages.slice(continuation.requestMessages.length + 1);
-  if (!delta.length) return { input: responseInputFromMessages(messages), incremental: false };
+  if (!delta.length) {
+    if (continuation.completion.finishReason === "continue") {
+      return { input: [], previousResponseId: continuation.responseId, incremental: true };
+    }
+    return { input: responseInputFromMessages(messages), incremental: false };
+  }
   return {
     input: responseInputFromMessages(delta),
     previousResponseId: continuation.responseId,
@@ -421,6 +497,7 @@ async function readResponsesWebSocketTurn(events, ws, onText, signal) {
   let finishReason;
   let loopAt = -1;
   const calls = /* @__PURE__ */ new Map();
+  const outputItems = /* @__PURE__ */ new Map();
   const emitText = (delta) => {
     if (!delta) return;
     text += delta;
@@ -478,7 +555,8 @@ async function readResponsesWebSocketTurn(events, ws, onText, signal) {
         calls.set(index, {
           id: String(event.item.call_id || event.item.id || `call_${index}`),
           name: String(event.item.name || ""),
-          arguments: String(event.item.arguments || "")
+          arguments: String(event.item.arguments || ""),
+          ...programCaller(event.item) ? { caller: programCaller(event.item) } : {}
         });
         continue;
       }
@@ -488,14 +566,18 @@ async function readResponsesWebSocketTurn(events, ws, onText, signal) {
         if (call) call.arguments += String(event.delta || "");
         continue;
       }
-      if (event.type === "response.output_item.done" && event.item?.type === "function_call") {
-        const index = Number(event.output_index ?? 0);
-        const current = calls.get(index);
-        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 ?? "")
-        });
+      if (event.type === "response.output_item.done" && event.item) {
+        const index = Number(event.output_index ?? outputItems.size);
+        outputItems.set(index, event.item);
+        if (event.item.type === "function_call") {
+          const current = calls.get(index);
+          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 ?? ""),
+            ...programCaller(event.item) ?? current?.caller ? { caller: programCaller(event.item) ?? current?.caller } : {}
+          });
+        }
         continue;
       }
       if (event.type === "response.failed") {
@@ -506,14 +588,20 @@ async function readResponsesWebSocketTurn(events, ws, onText, signal) {
       if (event.type === "response.completed" || event.type === "response.incomplete") {
         responseId = String(event.response?.id || responseId);
         usage = toResponsesUsage(event.response?.usage);
-        finishReason = event.type === "response.incomplete" ? String(event.response?.incomplete_details?.reason || "incomplete") : calls.size ? "tool_calls" : "stop";
+        const responsesOutputItems = event.response?.output ?? [...outputItems.entries()].sort(([a], [b]) => a - b).map(([, item]) => item);
+        finishReason = responsesFinishReason(
+          responsesOutputItems,
+          calls.size,
+          event.type === "response.incomplete" ? String(event.response?.incomplete_details?.reason || "incomplete") : void 0
+        );
         return {
           responseId,
           completion: {
             text,
             toolCalls: [...calls.entries()].sort(([a], [b]) => a - b).map(([, call]) => call),
             usage,
-            finishReason
+            finishReason,
+            responsesOutputItems
           }
         };
       }
@@ -530,7 +618,8 @@ function createProvider(options) {
     providerId,
     fetch: fetchOverride,
     retryDelayMs = 1e3,
-    responsesWebSocketFactory
+    responsesWebSocketFactory,
+    enableProgrammaticToolCalling = false
   } = options;
   const doFetch = fetchOverride ?? fetch;
   const headers = { "content-type": "application/json" };
@@ -583,7 +672,7 @@ function createProvider(options) {
     lunaWsIdleTimer.unref?.();
   };
   async function chatLunaWebSocket(messages, tools, reasoning, signal, onText) {
-    const nativeTools = responseTools(tools);
+    const nativeTools = responseTools(tools, enableProgrammaticToolCalling);
     const initialPlan = responseContinuationInput(messages, lunaContinuation);
     for (let attempt = 0; attempt < 2; attempt++) {
       if (signal?.aborted) throw signal.reason ?? new Error("Request aborted");
@@ -675,7 +764,7 @@ function createProvider(options) {
         }
       }
       if (useNativeResponses) {
-        const nativeTools = responseTools(tools);
+        const nativeTools = responseTools(tools, enableProgrammaticToolCalling);
         const res2 = await post(
           "/responses",
           {
@@ -802,6 +891,8 @@ async function runProviderCommand(args, deps) {
 }
 
 export {
+  hasPendingProgrammaticReplay,
+  completionAssistantMessage,
   createProvider,
   listAllModels,
   addProviderKey,

package/dist/{chunk-OQG5NP6C.js → chunk-XUJKRRPO.js}

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

package/dist/cli.js

@@ -18,9 +18,11 @@ import {
 } from "./chunk-ELML4KVQ.js";
 import {
   addProviderKey,
+  completionAssistantMessage,
   createProvider,
+  hasPendingProgrammaticReplay,
   listAllModels
-} from "./chunk-JM75AWC3.js";
+} from "./chunk-TUSJXGMP.js";
 import {
   providerName,
   readGlobalConfigFile
@@ -28,7 +30,7 @@ import {
 import "./chunk-SN3ODJZN.js";
 import {
   runLogin
-} from "./chunk-OQG5NP6C.js";
+} from "./chunk-XUJKRRPO.js";
 import {
   Session,
   pruneSessions
@@ -953,10 +955,10 @@ ${completion.text}` });
     this.opts.onTurnStart?.();
     this.webBudget.startTurn();
     try {
-      if (this.lastInputTokens > this.contextWindow * 0.8) await this.compact(signal);
+      if (this.lastInputTokens > this.contextWindow * 0.8 && !hasPendingProgrammaticReplay(this.messages)) await this.compact(signal);
       this.push({ role: "user", content: text });
       for (let step = 0; step < this.maxSteps; step++) {
-        if (step > 0 && this.lastInputTokens > this.contextWindow * 0.8) {
+        if (step > 0 && this.lastInputTokens > this.contextWindow * 0.8 && !hasPendingProgrammaticReplay(this.messages)) {
           await this.compact(signal);
           this.push({ role: "user", content: `Continue this task using the summary above: ${text}` });
         }
@@ -984,17 +986,7 @@ ${completion.text}` });
         this.totalUsage.outputTokens += usage.outputTokens;
         this.lastInputTokens = usage.inputTokens;
         this.onEvent({ type: "usage", ...this.totalUsage });
-        this.push({
-          role: "assistant",
-          content: completion.text || null,
-          ...completion.toolCalls.length ? {
-            tool_calls: completion.toolCalls.map((c) => ({
-              id: c.id,
-              type: "function",
-              function: { name: c.name, arguments: c.arguments }
-            }))
-          } : {}
-        });
+        this.push(completionAssistantMessage(completion));
         if (completion.finishReason === "repetition") {
           this.onEvent({ type: "textReplace", text: completion.text });
           this.onEvent({
@@ -1004,6 +996,7 @@ ${completion.text}` });
           return;
         }
         if (!completion.toolCalls.length) {
+          if (completion.finishReason === "continue") continue;
           this.onEvent({ type: "done" });
           return;
         }
@@ -1011,7 +1004,13 @@ ${completion.text}` });
         let i = 0;
         while (i < calls.length) {
           if (signal.aborted) {
-            for (const pending of calls.slice(i)) this.push({ role: "tool", tool_call_id: pending.id, content: "Cancelled by the user." });
+            for (const pending of calls.slice(i))
+              this.push({
+                role: "tool",
+                tool_call_id: pending.id,
+                content: "Cancelled by the user.",
+                ...pending.caller ? { responses_caller: pending.caller } : {}
+              });
             this.onEvent({ type: "aborted" });
             return;
           }
@@ -1020,7 +1019,12 @@ ${completion.text}` });
           const batch = calls.slice(i, j);
           const results = await Promise.all(batch.map((c) => this.runTool(c, signal)));
           batch.forEach((c, k) => {
-            this.push({ role: "tool", tool_call_id: c.id, content: results[k] });
+            this.push({
+              role: "tool",
+              tool_call_id: c.id,
+              content: results[k],
+              ...c.caller ? { responses_caller: c.caller } : {}
+            });
           });
           i = j;
         }
@@ -1509,7 +1513,13 @@ function createRuntime(opts) {
   let reasoning = opts.args.reasoning ?? config.reasoning;
   const makeProvider = (ref) => {
     const resolved = resolveModel(config, ref, env);
-    return opts.provider ?? createProvider({ baseURL: resolved.baseURL, apiKey: resolved.apiKey, model: resolved.model, providerId: resolved.providerId });
+    return opts.provider ?? createProvider({
+      baseURL: resolved.baseURL,
+      apiKey: resolved.apiKey,
+      model: resolved.model,
+      providerId: resolved.providerId,
+      enableProgrammaticToolCalling: env.BCCLI_LUNA_PTC === "1"
+    });
   };
   const provider = makeProvider(modelRef);
   const mode = opts.args.allowAll ? "allowAll" : opts.args.permissionMode ?? config.permissionMode;
@@ -1645,7 +1655,7 @@ function createRuntime(opts) {
 }
 
 // src/version.ts
-var VERSION = true ? "0.4.0-beta.22" : "0.0.0-dev";
+var VERSION = true ? "0.4.0-beta.23" : "0.0.0-dev";
 
 // src/cli.ts
 function chooseLanguage(argv) {
@@ -1671,12 +1681,12 @@ async function main() {
   if (args.command === "login") return runLogin(args.loginProvider ?? "bc-cloud", cwd);
   if (args.command === "mcp") {
     const { runMcpCommand } = await import("./mcpCli-J43FHF2H.js");
-    const { readSecret } = await import("./login-5AQCNXSR.js");
+    const { readSecret } = await import("./login-KHHIC6QQ.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-FLYQK6DX.js");
-    const { readSecret } = await import("./login-5AQCNXSR.js");
+    const { runProviderCommand } = await import("./providerCli-Q3FWHOKL.js");
+    const { readSecret } = await import("./login-KHHIC6QQ.js");
     return runProviderCommand(args, { env: process.env, cwd, out: (s) => console.log(s), err: (s) => console.error(s), readSecret });
   }
   if (args.command === "connect" || args.command === "disconnect" || args.command === "integrations") {

package/dist/{login-5AQCNXSR.js → login-KHHIC6QQ.js}

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

package/dist/{providerCli-FLYQK6DX.js → providerCli-Q3FWHOKL.js}

@@ -2,7 +2,7 @@
 import {
   addProviderKey,
   runProviderCommand
-} from "./chunk-JM75AWC3.js";
+} from "./chunk-TUSJXGMP.js";
 import "./chunk-K5JNR3HL.js";
 import "./chunk-SN3ODJZN.js";
 import "./chunk-EO7IVVX4.js";

package/package.json

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