@mtreeai/msapling-cli 2.3.6-beta.47 → 2.3.6-beta.48

package/dist/index.js

@@ -1032,6 +1032,47 @@ var init_src = __esm({
           body: JSON.stringify({ query, max_results: maxResults })
         });
       }
+      /**
+       * CLI-LOOP-01: cached backend capability map (from GET /chat/health). `null`
+       * until first probed. Cached for the client's lifetime — capabilities are a
+       * deploy-time property of the backend, so a single probe per session suffices.
+       */
+      _capabilities = null;
+      _capabilitiesProbe = null;
+      /**
+       * CLI-LOOP-01: fetch (and cache) the backend capability map from
+       * GET /chat/health. Returns an empty object when the backend is older / the
+       * probe fails, so callers degrade to legacy behavior rather than throwing.
+       *
+       * Concurrent callers share a single in-flight probe.
+       */
+      async getCapabilities(force = false) {
+        if (this._capabilities && !force) return this._capabilities;
+        if (this._capabilitiesProbe && !force) return this._capabilitiesProbe;
+        this._capabilitiesProbe = (async () => {
+          try {
+            const data = await this.request("/api/chat/health");
+            const caps = data && typeof data === "object" && data.capabilities && typeof data.capabilities === "object" ? data.capabilities : {};
+            this._capabilities = caps;
+            return caps;
+          } catch {
+            this._capabilities = {};
+            return this._capabilities;
+          } finally {
+            this._capabilitiesProbe = null;
+          }
+        })();
+        return this._capabilitiesProbe;
+      }
+      /**
+       * CLI-LOOP-01: convenience — does the backend accept the additive structured
+       * `tool_results` array (native parallel multi-tool-use)? When false the Agent
+       * loop uses the legacy `[TOOL_RESULT]`-per-prompt path.
+       */
+      async supportsStructuredToolResults() {
+        const caps = await this.getCapabilities();
+        return caps.structured_tool_results === true;
+      }
       async getHistory(chatId) {
         const data = await this.request(`/api/projects/chat/${chatId}/history`);
         return data.messages.map((m) => ({
@@ -7407,8 +7448,15 @@ var init_Agent = __esm({
         }
         const config = await this.getProjectConfig();
         const MAX_WORKER_TURN_DEPTH = 25;
+        let structuredToolResults = false;
+        try {
+          structuredToolResults = await this.client.supportsStructuredToolResults();
+        } catch {
+          structuredToolResults = false;
+        }
         const queue = [prompt4];
         let rounds = 0;
+        let toolCallSeq = 0;
         let streamUsage = null;
         while (queue.length > 0 && rounds < MAX_WORKER_TURN_DEPTH) {
           if (this.contextBudget.needsCompaction() && queue.length > 0) {
@@ -7452,14 +7500,25 @@ var init_Agent = __esm({
             this.contextBudget.reset();
             if (compactionSummary) {
               const next = queue[0];
-              queue[0] = `[CONTEXT_SUMMARY]: ${compactionSummary}
+              if (typeof next === "string") {
+                queue[0] = `[CONTEXT_SUMMARY]: ${compactionSummary}
 
 ${next}`;
+              } else {
+                queue[0] = {
+                  ...next,
+                  prompt: `[CONTEXT_SUMMARY]: ${compactionSummary}
+
+${next.prompt}`
+                };
+              }
             }
             continue;
           }
-          const currentPrompt = queue.shift();
+          const currentItem = queue.shift();
           rounds++;
+          const currentPrompt = typeof currentItem === "string" ? currentItem : currentItem.prompt;
+          const currentToolResults = typeof currentItem === "string" ? void 0 : currentItem.toolResults;
           const stream = this.chatWithFallback(
             {
               chat_id: chatId,
@@ -7468,11 +7527,16 @@ ${next}`;
               tools: this.executor.getToolSchemas(),
               project_root: this.projectRoot,
               mode: this.executor.getMode(),
+              // CLI-LOOP-01: carry the concurrently-executed tool_results from the
+              // previous turn as a structured batch. Only set in the capability-
+              // enabled path; absent => backend sees the legacy single-prompt turn.
+              ...currentToolResults && currentToolResults.length > 0 ? { tool_results: currentToolResults } : {},
               ...config.combined ? { project_context: config.combined } : {}
             },
             chatId,
             currentPrompt
           );
+          const pendingToolCalls = [];
           for await (const chunk of stream) {
             if (chunk.content) {
               onContent(chunk.content);
@@ -7489,11 +7553,39 @@ ${next}`;
               });
             }
             if (chunk.tool_use) {
-              const result = await this.executor.execute(
-                chunk.tool_use.name,
-                chunk.tool_use.args,
-                this.projectRoot
-              );
+              const id = chunk.tool_use.id ?? `call_${rounds}_${toolCallSeq++}`;
+              pendingToolCalls.push({ id, name: chunk.tool_use.name, args: chunk.tool_use.args });
+            }
+          }
+          if (pendingToolCalls.length === 0) {
+            continue;
+          }
+          if (structuredToolResults) {
+            const toolResults = await Promise.all(
+              pendingToolCalls.map(async (call) => {
+                try {
+                  const result = await this.executor.execute(call.name, call.args, this.projectRoot);
+                  const redactedContent = SafetyGuard.redact(result.content);
+                  return {
+                    tool_use_id: call.id,
+                    name: call.name,
+                    content: redactedContent,
+                    is_error: !!result.isError
+                  };
+                } catch (e) {
+                  return {
+                    tool_use_id: call.id,
+                    name: call.name,
+                    content: SafetyGuard.redact(`Tool execution failed: ${e?.message ?? String(e)}`),
+                    is_error: true
+                  };
+                }
+              })
+            );
+            queue.push({ prompt: "", toolResults });
+          } else {
+            for (const call of pendingToolCalls) {
+              const result = await this.executor.execute(call.name, call.args, this.projectRoot);
               const redactedContent = SafetyGuard.redact(result.content);
               const redactedResult = { ...result, content: redactedContent };
               queue.push(`[TOOL_RESULT]: ${JSON.stringify(redactedResult)}`);
@@ -12114,7 +12206,7 @@ var init_version = __esm({
       description: "Show version information for CLI and core packages",
       category: "debug",
       handler: async (_args, context) => {
-        const cliVersion = true ? "2.3.6-beta.47" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.48" : "(dev)";
         const coreVersion = true ? "2.3.6-beta.43" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -12123,7 +12215,7 @@ var init_version = __esm({
         context.addMessage("system", row2("Core (@msapling/core)", coreVersion));
         context.addMessage("system", row2("Runtime (Node/Bun)", runtime));
         try {
-          const ts = "2026-06-20T08:11:43.445Z";
+          const ts = "2026-06-20T08:17:10.331Z";
           if (ts && ts !== "__BUILD_TIMESTAMP__") {
             context.addMessage("system", row2("Build Timestamp", ts));
           }
@@ -17917,7 +18009,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 var Header = () => /* @__PURE__ */ jsxs(Box, { borderStyle: "single", borderColor: "cyan", paddingX: 1, marginBottom: 1, children: [
   /* @__PURE__ */ jsxs(Text, { bold: true, color: "cyan", children: [
     "\u25CF MSapling CLI v",
-    "2.3.6-beta.47"
+    "2.3.6-beta.48"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtreeai/msapling-cli",
-  "version": "2.3.6-beta.47",
+  "version": "2.3.6-beta.48",
   "description": "MSapling CLI — React/Ink terminal client for the MSapling backend (chat, projects, MDrive, agent tools). Proprietary; redistribution prohibited.",
   "license": "UNLICENSED",
   "author": "MSapling Team",