@mtreeai/msapling-cli 2.3.6-beta.60 → 2.3.6-beta.61

package/dist/index.js

@@ -14450,6 +14450,14 @@ var init_Settings = __esm({
 });
 
 // ../core/src/agent/localModelPolicy.ts
+function buildDeterministicReadPlan(prompt4, availableTools) {
+  if (MUTATING_INTENT.test(prompt4) || !LIST_DIRECTORY_INTENT.test(prompt4)) return null;
+  if (!new Set(availableTools).has("list_directory")) return null;
+  const absolute = (prompt4.match(QUOTED_WINDOWS_PATH)?.[1] ?? prompt4.match(WINDOWS_DRIVE_ROOT)?.[1] ?? prompt4.match(WINDOWS_ABSOLUTE_TOKEN)?.[1])?.trim();
+  const drive = prompt4.match(WINDOWS_DRIVE_WORDS)?.[1] ?? prompt4.match(WINDOWS_DIRECTORY_THEN_DRIVE)?.[1];
+  const path3 = absolute || (drive ? `${drive.toUpperCase()}:\\` : ".");
+  return { tool: "list_directory", args: { path: path3 } };
+}
 function buildReadToolRecovery(prompt4, response, availableTools) {
   if (MUTATING_INTENT.test(prompt4)) return null;
   const hasReadIntent = SAFE_READ_INTENT.test(prompt4) || SAFE_READ_VERB.test(prompt4);
@@ -14478,7 +14486,7 @@ function inferCapability(model) {
   if (sizes.some((size) => size <= 7)) return "small";
   return "unknown";
 }
-var LOCAL_ACCESS_DENIAL, SAFE_READ_INTENT, SAFE_READ_VERB, PATH_LIKE_INTENT, MUTATING_INTENT, READ_RECOVERY_TOOLS, SAFE_TOOLS;
+var LOCAL_ACCESS_DENIAL, SAFE_READ_INTENT, SAFE_READ_VERB, PATH_LIKE_INTENT, MUTATING_INTENT, READ_RECOVERY_TOOLS, LIST_DIRECTORY_INTENT, QUOTED_WINDOWS_PATH, WINDOWS_DRIVE_ROOT, WINDOWS_ABSOLUTE_TOKEN, WINDOWS_DRIVE_WORDS, WINDOWS_DIRECTORY_THEN_DRIVE, SAFE_TOOLS;
 var init_localModelPolicy = __esm({
   "../core/src/agent/localModelPolicy.ts"() {
     "use strict";
@@ -14489,6 +14497,12 @@ var init_localModelPolicy = __esm({
     PATH_LIKE_INTENT = /(?:[A-Za-z]:[\\/]|\/{1,2}[A-Za-z0-9_.-]+\/|\.\.?[\\/])[A-Za-z0-9_.\\/ -]*/;
     MUTATING_INTENT = /\b(?:create|overwrite|write|edit|modify|change|delete|remove|move|rename|execute|run|install|uninstall|commit|push|upload)\b/i;
     READ_RECOVERY_TOOLS = ["read_file", "list_directory", "glob_files", "grep_search"];
+    LIST_DIRECTORY_INTENT = /\b(?:list|show|display|enumerate|review|inspect|what(?:'s| is)? (?:in|inside))\b[^\n]{0,120}\b(?:files?|folders?|director(?:y|ies)|drive|workspace|project)\b/i;
+    QUOTED_WINDOWS_PATH = /["']([A-Za-z]:[\\/][^"']*)["']/;
+    WINDOWS_DRIVE_ROOT = /\b([A-Za-z]:[\\/])(?=\s|$|[.,;:)])/;
+    WINDOWS_ABSOLUTE_TOKEN = /\b([A-Za-z]:[\\/][^\s,;]*)/;
+    WINDOWS_DRIVE_WORDS = /\b([A-Za-z])\s+(?:drive|directory)\b/i;
+    WINDOWS_DIRECTORY_THEN_DRIVE = /\b(?:drive|directory)\s+([A-Za-z])\b/i;
     SAFE_TOOLS = /* @__PURE__ */ new Set([
       "read_file",
       "list_directory",
@@ -15028,6 +15042,33 @@ var init_Agent = __esm({
         }
         return this.executor.execute(toolName, args2, this.projectRoot);
       }
+      async executeDeterministicReadAdapter(chatId, turnId, plan) {
+        const toolCallId = `client-read-${randomUUID6()}`;
+        const request = {
+          toolName: plan.tool,
+          toolCallId,
+          turnId,
+          input: plan.args
+        };
+        await this.modeContract?.recordToolRequest(request);
+        try {
+          const result = await this.executeTurnTool(plan.tool, plan.args, false);
+          await this.modeContract?.recordToolResult(request, result.content, !!result.isError);
+          this.recordRemoteToolTelemetry(
+            chatId,
+            turnId,
+            toolCallId,
+            plan.tool,
+            result.isError ? "failed" : "completed"
+          );
+          return result;
+        } catch (error) {
+          const content = SafetyGuard.redact(error instanceof Error ? error.message : String(error));
+          await this.modeContract?.recordToolResult(request, content, true);
+          this.recordRemoteToolTelemetry(chatId, turnId, toolCallId, plan.tool, "failed");
+          throw error;
+        }
+      }
       recordRemoteToolTelemetry(chatId, turnId, toolCallId, toolName, outcome) {
         if (this.executionMode !== "remote") return;
         if (this.toolTelemetryQueue.length >= TOOL_TELEMETRY_QUEUE_MAX) {
@@ -15277,7 +15318,37 @@ var init_Agent = __esm({
             structuredToolResults = false;
           }
         }
-        const queue = [{ prompt: prompt4, allowReadRecovery: true }];
+        let initialQueueItem = { prompt: prompt4, allowReadRecovery: true };
+        if (!localTurn) {
+          const initialToolNames = this.getTurnToolSchemas(false).map((tool) => String(tool.name));
+          const deterministicPlan = buildDeterministicReadPlan(prompt4, initialToolNames);
+          if (deterministicPlan) {
+            const diagnostic = `[MSapling: running safe local ${deterministicPlan.tool} before the connected model.]
+`;
+            await this.modeContract?.recordOutput(chatId, contractTurnId, diagnostic);
+            onContent(diagnostic);
+            const result = await this.executeDeterministicReadAdapter(
+              chatId,
+              contractTurnId,
+              deterministicPlan
+            );
+            const evidence = boundToolResultForModel(result.content);
+            initialQueueItem = {
+              prompt: `A trusted MSapling client read-only adapter executed ${deterministicPlan.tool} with ${JSON.stringify(deterministicPlan.args)} for the original request below.
+
+<client_tool_result error="${result.isError === true}">
+${evidence}
+</client_tool_result>
+
+Original request: ${prompt4}
+
+Answer directly from the tool result. Do not claim local access is unavailable, do not emit a patch or diff, and do not invent entries.`,
+              allowedToolNames: [],
+              allowReadRecovery: false
+            };
+          }
+        }
+        const queue = [initialQueueItem];
         let rounds = 0;
         let toolCallSeq = 0;
         let streamUsage = null;
@@ -15450,16 +15521,44 @@ ${next.prompt}`
             const recovery = !localTurn && allowReadRecovery && !remoteReadRecoveryUsed && !assistantResponse.includes("[MSapling: local model denied available file tools;") ? buildReadToolRecovery(prompt4, assistantResponse, turnTools.map((tool) => String(tool.name))) : null;
             if (recovery) {
               remoteReadRecoveryUsed = true;
-              const diagnostic = `
+              const deterministicPlan = buildDeterministicReadPlan(prompt4, recovery.tools);
+              if (deterministicPlan) {
+                const diagnostic = `
+
+[MSapling: connected model did not use the required read tool; running safe local ${deterministicPlan.tool}.]
+`;
+                await this.modeContract?.recordOutput(chatId, contractTurnId, diagnostic);
+                onContent(diagnostic);
+                const result = await this.executeDeterministicReadAdapter(
+                  chatId,
+                  contractTurnId,
+                  deterministicPlan
+                );
+                const evidence = boundToolResultForModel(result.content);
+                queue.push({
+                  prompt: `A trusted MSapling client read-only adapter executed ${deterministicPlan.tool} with ${JSON.stringify(deterministicPlan.args)} for the original request below.
+
+<client_tool_result error="${result.isError === true}">
+${evidence}
+</client_tool_result>
+
+Original request: ${prompt4}
+
+Answer from the tool result. Do not claim local access is unavailable.`,
+                  allowedToolNames: []
+                });
+              } else {
+                const diagnostic = `
 
 [MSapling: connected model did not use required client file tools; retrying once with ${recovery.tools.join(", ")}.]
 `;
-              await this.modeContract?.recordOutput(chatId, contractTurnId, diagnostic);
-              onContent(diagnostic);
-              queue.push({
-                prompt: recovery.instruction,
-                allowedToolNames: recovery.tools
-              });
+                await this.modeContract?.recordOutput(chatId, contractTurnId, diagnostic);
+                onContent(diagnostic);
+                queue.push({
+                  prompt: recovery.instruction,
+                  allowedToolNames: recovery.tools
+                });
+              }
             }
             continue;
           }
@@ -23566,7 +23665,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.60" : "(dev)";
+        const cliVersion = true ? "2.3.6-beta.61" : "(dev)";
         const coreVersion = true ? "2.3.6-beta.43" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -29593,7 +29692,7 @@ import { render } from "ink";
 
 // src/App.tsx
 init_esm_shims();
-import { useState as useState5, useEffect as useEffect4, useCallback as useCallback2, useRef as useRef2 } from "react";
+import { useState as useState5, useEffect as useEffect3, useCallback as useCallback2, useRef } from "react";
 import { randomUUID as randomUUID10 } from "crypto";
 import { Box as Box7, Text as Text7, useApp, useInput as useInput4, useStdout } from "ink";
 
@@ -29603,11 +29702,11 @@ import { Box, Text } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
 var Header = ({ compact: compact2 = false }) => compact2 ? /* @__PURE__ */ jsxs(Text, { bold: true, color: "cyan", children: [
   "\u25CF MSapling v",
-  "2.3.6-beta.60"
+  "2.3.6-beta.61"
 ] }) : /* @__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.60"
+    "2.3.6-beta.61"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -29711,42 +29810,6 @@ function promptLabel(user) {
 init_esm_shims();
 import { useState, useMemo } from "react";
 import { Box as Box3, Text as Text3, useInput } from "ink";
-
-// src/hooks/useTerminalMouseScroll.ts
-init_esm_shims();
-import { useEffect, useRef } from "react";
-var ESC = String.fromCharCode(27);
-function isMouseReport(input) {
-  return input.includes(`${ESC}[<`) && /\d+;\d+;\d+[mM]/.test(input);
-}
-function parseMouseScroll(input) {
-  const directions = [];
-  const pattern = new RegExp(`${ESC}\\[<(64|65);\\d+;\\d+[mM]`, "g");
-  for (const match of input.matchAll(pattern)) {
-    directions.push(match[1] === "64" ? "up" : "down");
-  }
-  return directions;
-}
-function useTerminalMouseScroll(onScroll) {
-  const callback = useRef(onScroll);
-  callback.current = onScroll;
-  useEffect(() => {
-    if (!process.stdin.isTTY || !process.stdout.isTTY) return;
-    const handleData = (chunk) => {
-      for (const direction of parseMouseScroll(String(chunk))) {
-        callback.current(direction);
-      }
-    };
-    process.stdout.write("\x1B[?1000h\x1B[?1006h");
-    process.stdin.on("data", handleData);
-    return () => {
-      process.stdin.off("data", handleData);
-      process.stdout.write("\x1B[?1006l\x1B[?1000l");
-    };
-  }, []);
-}
-
-// src/components/ApprovalDialog.tsx
 import { Fragment, jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 function parseDiffLines(diffText) {
   if (!diffText) return [];
@@ -29813,7 +29876,6 @@ var ApprovalDialog = ({
   const { hasDiff, diffText, title } = useMemo(() => extractDiffFromCommand(command, diff), [command, diff]);
   const diffLines = useMemo(() => parseDiffLines(diffText), [diffText]);
   useInput((input, key) => {
-    if (isMouseReport(input)) return;
     if (key.escape) {
       onResolve("no");
       return;
@@ -29900,7 +29962,6 @@ var AskUserQuestion = ({ question, options, multiSelect, onResolve }) => {
   const [selectedIndex, setSelectedIndex] = useState2(0);
   const [selectedIndices, setSelectedIndices] = useState2(/* @__PURE__ */ new Set());
   useInput2((input, key) => {
-    if (isMouseReport(input)) return;
     if (key.upArrow) {
       setSelectedIndex((prev) => prev > 0 ? prev - 1 : options.length - 1);
     } else if (key.downArrow) {
@@ -30010,7 +30071,7 @@ var VirtualizedMessageList = ({
   );
   const separatorWidth = termColumns > 0 ? Math.min(termColumns, 60) : 60;
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", flexGrow: 1, children: [
-    (hiddenCount > 0 || hiddenAfter > 0) && /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: `[\u2191 ${hiddenCount} older \xB7 \u2193 ${hiddenAfter} newer \xB7 wheel/\u2191/\u2193 or PageUp/PageDown \xB7 Ctrl+E latest]` }),
+    (hiddenCount > 0 || hiddenAfter > 0) && /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: `[\u2191 ${hiddenCount} older \xB7 \u2193 ${hiddenAfter} newer \xB7 \u2191/\u2193 or PageUp/PageDown \xB7 Ctrl+E latest]` }),
     displayMessages.map((msg, i) => /* @__PURE__ */ jsxs5(
       Box5,
       {
@@ -30042,7 +30103,7 @@ init_src3();
 
 // src/ui/TextInput.tsx
 init_esm_shims();
-import { useState as useState3, useEffect as useEffect2 } from "react";
+import { useState as useState3, useEffect } from "react";
 import { Box as Box6, Text as Text6, useInput as useInput3 } from "ink";
 
 // src/state/commandHandler.ts
@@ -30642,11 +30703,10 @@ var TextInput = ({
 }) => {
   const [history, setHistory] = useState3([]);
   const [historyIndex, setHistoryIndex] = useState3(-1);
-  useEffect2(() => {
+  useEffect(() => {
     storage.loadHistory().then((entries) => setHistory(filterSafeHistory(entries)));
   }, [storage]);
   useInput3((input, key) => {
-    if (isMouseReport(input)) return;
     if (key.ctrl && input === "c" || key.escape) {
       onCancel?.();
       return;
@@ -30869,7 +30929,7 @@ init_errorPresentation();
 
 // src/hooks/useTerminalResize.ts
 init_esm_shims();
-import { useState as useState4, useEffect as useEffect3, useCallback } from "react";
+import { useState as useState4, useEffect as useEffect2, useCallback } from "react";
 function getCurrentDimensions() {
   return {
     columns: process.stdout.columns ?? 80,
@@ -30883,7 +30943,7 @@ function useTerminalResize() {
   const handleResize = useCallback(() => {
     setDimensions(getCurrentDimensions());
   }, []);
-  useEffect3(() => {
+  useEffect2(() => {
     process.stdout.on("resize", handleResize);
     const onSigwinch = () => handleResize();
     process.on("SIGWINCH", onSigwinch);
@@ -30986,20 +31046,20 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
   const [billingProfile, setBillingProfile] = useState5(executionMode2 === "local" ? "ollama" : "account-metered");
   const [continuityProfile, setContinuityProfile] = useState5(executionMode2 === "local" ? "standalone-private" : "connected-mirrored");
   const [bootstrapState, setBootstrapState] = useState5("loading");
-  const submissionLockRef = useRef2(false);
+  const submissionLockRef = useRef(false);
   const { exit } = useApp();
   const { stdout: termStdout } = useStdout();
   const { columns: termResizeCols, rows: termResizeRows } = useTerminalResize();
-  const storage = useRef2(new StorageManager()).current;
-  const client = useRef2(new MSaplingClient()).current;
+  const storage = useRef(new StorageManager()).current;
+  const client = useRef(new MSaplingClient()).current;
   const remoteEnvironment = describeRemoteEnvironment(client.getApiUrl());
-  const modeContract = useRef2(new CliModeRuntime({
+  const modeContract = useRef(new CliModeRuntime({
     mode: executionMode2,
     provider: process.env.MSAPLING_LOCAL_LLM_PROVIDER ?? "ollama"
   })).current;
-  const sessionRecovery = useRef2(new CliSessionRecovery()).current;
-  const checkpointTurns = useRef2(/* @__PURE__ */ new Map()).current;
-  const agentRef = useRef2(null);
+  const sessionRecovery = useRef(new CliSessionRecovery()).current;
+  const checkpointTurns = useRef(/* @__PURE__ */ new Map()).current;
+  const agentRef = useRef(null);
   const requestApproval = useCallback2((request) => {
     agentRef.current?.fireLifecycleHook(
       "notification",
@@ -31010,7 +31070,7 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
       setPendingApproval({ request, resolve: resolve31 });
     });
   }, []);
-  const agent = useRef2(new Agent(client, process.cwd(), requestApproval, { executionMode: executionMode2, modeContract })).current;
+  const agent = useRef(new Agent(client, process.cwd(), requestApproval, { executionMode: executionMode2, modeContract })).current;
   agentRef.current = agent;
   const applyStandaloneSyncState = (state) => {
     const localChatId = "local-cli-chat";
@@ -31031,18 +31091,18 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
     setContinuityProfile(profile);
     if (profile === "standalone-private") agent.configureStandaloneSync(null);
   };
-  const trustStore = useRef2(new TrustStore()).current;
-  const lastActivityRef = useRef2(Date.now());
-  const pollingIntervalRef = useRef2(null);
-  useEffect4(() => {
+  const trustStore = useRef(new TrustStore()).current;
+  const lastActivityRef = useRef(Date.now());
+  const pollingIntervalRef = useRef(null);
+  useEffect3(() => {
     agent.setApprovalCallback(requestApproval);
   }, [agent, requestApproval]);
-  useEffect4(() => {
+  useEffect3(() => {
     if (bypassExpiry === null) return;
     const timer = setInterval(() => setPermissionNow(Date.now()), 1e3);
     return () => clearInterval(timer);
   }, [bypassExpiry]);
-  useEffect4(() => {
+  useEffect3(() => {
     agent.setOnModeChange((m) => {
       setModeState(m);
       addMessage("system", `Mode changed to: ${m} (via plan-mode tool)`);
@@ -31071,7 +31131,7 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
     setModeState(m);
     agent.setMode(m, source);
   }, [agent]);
-  useEffect4(() => {
+  useEffect3(() => {
     if (mode !== "bypassPermissions" || !isBypassExpired(bypassExpiry, permissionNow)) return;
     setMode("default");
     setBypassExpiry(null);
@@ -31087,7 +31147,7 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
     setContextBudgetSnap(snapshotBudget(agent.getContextBudget()));
   }, [agent]);
   const getModel = useCallback2(() => activeModel, [activeModel]);
-  const cliProjectRef = useRef2(null);
+  const cliProjectRef = useRef(null);
   const setProjectId = useCallback2((id) => {
     if (cliProjectRef.current && id !== cliProjectRef.current) return;
     setActiveProjectId(id);
@@ -31173,7 +31233,7 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
     client.setToken("");
     setStatus("Session expired - run /login");
   }, [client, storage]);
-  useEffect4(() => {
+  useEffect3(() => {
     agent.setAuthFailureHandler(handle401);
     return () => agent.setAuthFailureHandler(null);
   }, [agent, handle401]);
@@ -31194,7 +31254,7 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       setStatus(classifyCliError(error, { executionMode: executionMode2 }).summary);
     }
   }, [client, activeChatId, setProjectId, handle401]);
-  useEffect4(() => {
+  useEffect3(() => {
     (async () => {
       try {
         if (executionMode2 === "local") {
@@ -31306,14 +31366,14 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       }
     })();
   }, []);
-  useEffect4(() => {
+  useEffect3(() => {
     return () => {
       void agent.flushPendingToolTelemetry();
       void agent.flushPendingUsageTelemetry();
       agent.fireLifecycleHook("session-end", { cwd: process.cwd() });
     };
   }, []);
-  useEffect4(() => {
+  useEffect3(() => {
     if (!user) return;
     createIdleAwarePoll(pollingIntervalRef, lastActivityRef, client, setUser, setUsageError);
     return () => {
@@ -31412,9 +31472,9 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       return { journalEvents, checkpoints };
     }
   });
-  const relayCommandRef = useRef2(handleCommand);
+  const relayCommandRef = useRef(handleCommand);
   relayCommandRef.current = handleCommand;
-  useEffect4(() => {
+  useEffect3(() => {
     if (executionMode2 !== "remote" || process.env.MSAPLING_RELAY_ENABLED !== "1" || !activeProjectId) return;
     let listener = null;
     let cancelled = false;
@@ -31463,9 +31523,6 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       setHistoryOffset((current) => Math.max(0, current - amount));
     }
   }, [displayedHistory.length, historyPageStep]);
-  useTerminalMouseScroll((direction) => {
-    if (!pendingApproval && !pendingAskUser) scrollTranscript(direction);
-  });
   useInput4((input2, key) => {
     if (pendingApproval || pendingAskUser) return;
     if (key.pageUp) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtreeai/msapling-cli",
-  "version": "2.3.6-beta.60",
+  "version": "2.3.6-beta.61",
   "description": "MSapling CLI by MTreeAI — React/Ink terminal client for the MSapling backend: chat, projects, MDrive, agent tools, MCP server.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "MSapling Team",