msapling 2.3.6-beta.59 → 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.59" : "(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");
@@ -29601,10 +29700,13 @@ import { Box as Box7, Text as Text7, useApp, useInput as useInput4, useStdout }
 init_esm_shims();
 import { Box, Text } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
-var Header = () => /* @__PURE__ */ jsxs(Box, { borderStyle: "single", borderColor: "cyan", paddingX: 1, marginBottom: 1, children: [
+var Header = ({ compact: compact2 = false }) => compact2 ? /* @__PURE__ */ jsxs(Text, { bold: true, color: "cyan", children: [
+  "\u25CF MSapling v",
+  "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.59"
+    "2.3.6-beta.61"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -29969,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 PageUp/PageDown to scroll \xB7 Ctrl+E for 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,
       {
@@ -30596,7 +30698,8 @@ var TextInput = ({
   onCancel,
   disabled,
   storage,
-  promptColor = "green"
+  promptColor = "green",
+  transcriptNavigationActive = false
 }) => {
   const [history, setHistory] = useState3([]);
   const [historyIndex, setHistoryIndex] = useState3(-1);
@@ -30619,13 +30722,13 @@ var TextInput = ({
       }
     } else if (key.backspace || key.delete) {
       onChange(value.slice(0, -1));
-    } else if (key.upArrow) {
+    } else if (key.ctrl && input === "p" || key.upArrow && !transcriptNavigationActive) {
       const nextIndex = historyIndex + 1;
       if (nextIndex < history.length) {
         setHistoryIndex(nextIndex);
         onChange(history[history.length - 1 - nextIndex]);
       }
-    } else if (key.downArrow) {
+    } else if (key.ctrl && input === "n" || key.downArrow && !transcriptNavigationActive) {
       const nextIndex = historyIndex - 1;
       if (nextIndex >= 0) {
         setHistoryIndex(nextIndex);
@@ -30634,6 +30737,8 @@ var TextInput = ({
         setHistoryIndex(-1);
         onChange("");
       }
+    } else if ((key.upArrow || key.downArrow) && transcriptNavigationActive) {
+      return;
     } else if (input && !key.ctrl && !key.meta) {
       onChange(value + input);
     }
@@ -30875,6 +30980,42 @@ function releaseSubmission(lock2) {
   lock2.current = false;
 }
 
+// src/state/terminalLayout.ts
+init_esm_shims();
+function resolveTerminalLayout(rows, columns, forceCompact = false) {
+  const safeRows = Number.isFinite(rows) && rows > 0 ? rows : 24;
+  const safeColumns = Number.isFinite(columns) && columns > 0 ? columns : 80;
+  const density = forceCompact || safeRows <= 34 ? "minimal" : safeRows <= 48 || safeColumns < 100 ? "condensed" : "full";
+  if (density === "minimal") {
+    return {
+      density,
+      outerPadding: 0,
+      showFramedHeader: false,
+      showFooter: false,
+      statusRows: 1,
+      fixedRows: 3
+    };
+  }
+  if (density === "condensed") {
+    return {
+      density,
+      outerPadding: 0,
+      showFramedHeader: false,
+      showFooter: false,
+      statusRows: 2,
+      fixedRows: 5
+    };
+  }
+  return {
+    density,
+    outerPadding: 1,
+    showFramedHeader: true,
+    showFooter: true,
+    statusRows: 6,
+    fixedRows: 16
+  };
+}
+
 // src/App.tsx
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var App = ({ compact: compact2 = false, continueSession: continueSession2 = false, executionMode: executionMode2 = "remote" }) => {
@@ -31362,44 +31503,63 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
   }, [executionMode2, storage, activeProjectId, activeChatId]);
   const termHeight = termResizeRows ?? termStdout?.rows ?? 24;
   const termColumns = termResizeCols ?? termStdout?.columns ?? 80;
+  const terminalLayout = resolveTerminalLayout(termHeight, termColumns, compact2);
+  const compactPresentation = terminalLayout.density !== "full";
   const normalizedFooterOptions = normalizeFooterOptions(footerOptions);
-  const footerRows = compact2 ? 0 : 4 + (normalizedFooterOptions.expanded && normalizedFooterOptions.chat ? 1 : 0) + Number(normalizedFooterOptions.location) + Number(normalizedFooterOptions.permissions) + Number(normalizedFooterOptions.tokens) + Number(normalizedFooterOptions.context) + Number(normalizedFooterOptions.costs) + Number(normalizedFooterOptions.budget);
-  const modeRows = mode === "plan" || mode === "bypassPermissions" ? 4 : 0;
+  const footerRows = terminalLayout.showFooter ? 4 + (normalizedFooterOptions.expanded && normalizedFooterOptions.chat ? 1 : 0) + Number(normalizedFooterOptions.location) + Number(normalizedFooterOptions.permissions) + Number(normalizedFooterOptions.tokens) + Number(normalizedFooterOptions.context) + Number(normalizedFooterOptions.costs) + Number(normalizedFooterOptions.budget) : 0;
+  const modeRows = mode === "plan" || mode === "bypassPermissions" ? terminalLayout.density === "full" ? 4 : 1 : 0;
   const activityRows = pendingApproval ? 6 : pendingAskUser ? 10 : isRunning ? 2 : 0;
-  const visibleLines = Math.max(termHeight - (16 + footerRows + modeRows + activityRows), 1);
+  const visibleLines = Math.max(termHeight - (terminalLayout.fixedRows + footerRows + modeRows + activityRows), 1);
   const displayedHistory = historyView ?? history;
   const historyPageStep = Math.max(1, Math.floor(visibleLines / 3));
+  const viewport = computeViewport(displayedHistory, visibleLines, termColumns, historyOffset);
+  const canScrollOlder = viewport.hiddenCount > 0;
+  const canScrollNewer = historyOffset > 0;
+  const scrollTranscript = useCallback2((direction, page = false) => {
+    const amount = page ? historyPageStep : 1;
+    if (direction === "up") {
+      setHistoryOffset((current) => Math.min(Math.max(0, displayedHistory.length - 1), current + amount));
+    } else {
+      setHistoryOffset((current) => Math.max(0, current - amount));
+    }
+  }, [displayedHistory.length, historyPageStep]);
   useInput4((input2, key) => {
     if (pendingApproval || pendingAskUser) return;
     if (key.pageUp) {
-      setHistoryOffset((current) => Math.min(Math.max(0, displayedHistory.length - 1), current + historyPageStep));
+      scrollTranscript("up", true);
     } else if (key.pageDown) {
-      setHistoryOffset((current) => Math.max(0, current - historyPageStep));
+      scrollTranscript("down", true);
+    } else if (key.upArrow && input2.length === 0 && canScrollOlder) {
+      scrollTranscript("up");
+    } else if (key.downArrow && input2.length === 0 && canScrollNewer) {
+      scrollTranscript("down");
     } else if (key.ctrl && input2 === "e") {
       setHistoryOffset(0);
       setHistoryView(null);
     }
   });
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", padding: 1, children: [
-    /* @__PURE__ */ jsx7(Header, {}),
-    /* @__PURE__ */ jsx7(Box7, { marginBottom: compact2 ? 0 : 1, children: /* @__PURE__ */ jsx7(
+  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", padding: terminalLayout.outerPadding, children: [
+    /* @__PURE__ */ jsx7(Header, { compact: !terminalLayout.showFramedHeader }),
+    /* @__PURE__ */ jsx7(Box7, { marginBottom: compactPresentation ? 0 : 1, children: /* @__PURE__ */ jsx7(
       VirtualizedMessageList,
       {
         messages: displayedHistory,
         visibleLines,
         termColumns,
-        compact: compact2,
+        compact: compactPresentation,
         offsetFromEnd: historyOffset
       }
     ) }),
-    mode === "plan" && /* @__PURE__ */ jsxs7(Box7, { borderStyle: "single", borderColor: "blueBright", paddingX: 1, marginBottom: 1, children: [
+    mode === "plan" && terminalLayout.density === "full" && /* @__PURE__ */ jsxs7(Box7, { borderStyle: "single", borderColor: "blueBright", paddingX: 1, marginBottom: 1, children: [
       /* @__PURE__ */ jsx7(Text7, { color: "blueBright", bold: true, children: "PLAN MODE " }),
       /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(read-only \u2014 edits, run_command, sub_shell are blocked. /mode default to execute.)" })
     ] }),
-    mode === "bypassPermissions" && /* @__PURE__ */ jsxs7(Box7, { borderStyle: "single", borderColor: "redBright", paddingX: 1, marginBottom: 1, children: [
+    mode === "plan" && terminalLayout.density !== "full" && /* @__PURE__ */ jsx7(Text7, { color: "blueBright", bold: true, children: "PLAN MODE \xB7 read-only" }),
+    mode === "bypassPermissions" && terminalLayout.density === "full" && /* @__PURE__ */ jsxs7(Box7, { borderStyle: "single", borderColor: "redBright", paddingX: 1, marginBottom: 1, children: [
       /* @__PURE__ */ jsx7(Text7, { color: "redBright", bold: true, children: "BYPASS " }),
       /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "(approvals disabled \u2014 every tool call runs without prompting. /mode default to re-enable.)" })
     ] }),
+    mode === "bypassPermissions" && terminalLayout.density !== "full" && /* @__PURE__ */ jsx7(Text7, { color: "redBright", bold: true, children: "BYPASS \xB7 approvals disabled" }),
     isRunning && !pendingApproval && !pendingAskUser && /* @__PURE__ */ jsx7(Box7, { marginBottom: 1, children: /* @__PURE__ */ jsx7(Text7, { color: "yellow", children: "Thinking..." }) }),
     pendingApproval && /* @__PURE__ */ jsx7(
       ApprovalDialog,
@@ -31447,10 +31607,11 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         },
         disabled: bootstrapState === "loading" || isRunning || pendingApproval !== null || pendingAskUser !== null,
         storage,
-        promptColor: PROMPT_COLOR_BY_MODE[mode] ?? "green"
+        promptColor: PROMPT_COLOR_BY_MODE[mode] ?? "green",
+        transcriptNavigationActive: input.length === 0 && (canScrollOlder || canScrollNewer)
       }
     ),
-    /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexDirection: "row", justifyContent: "space-between", children: [
+    terminalLayout.density === "full" && /* @__PURE__ */ jsxs7(Box7, { marginTop: 1, flexDirection: "row", justifyContent: "space-between", children: [
       /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
         /* @__PURE__ */ jsxs7(Text7, { color: executionMode2 === "local" ? "yellow" : "cyan", children: [
           "Execution: ",
@@ -31490,7 +31651,32 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         contextBudgetSnap !== null && /* @__PURE__ */ jsx7(Text7, { color: contextBudgetColor(contextBudgetSnap.usedPct), children: formatContextBudgetLabel(contextBudgetSnap) })
       ] })
     ] }),
-    !compact2 && /* @__PURE__ */ jsx7(
+    terminalLayout.density === "condensed" && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", color: executionMode2 === "local" ? "yellow" : "cyan", children: [
+        executionMode2 === "local" ? "LOCAL" : remoteEnvironment.label.replace("CONNECTED ", ""),
+        " \xB7 ",
+        mode,
+        " \xB7 ",
+        billingProfile,
+        " \xB7 ",
+        continuityProfile
+      ] }),
+      /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", dimColor: true, children: [
+        activeModel,
+        contextBudgetSnap ? ` \xB7 ${formatContextBudgetLabel(contextBudgetSnap)}` : "",
+        lastCost > 0 ? ` \xB7 last $${lastCost.toFixed(4)}` : ""
+      ] })
+    ] }),
+    terminalLayout.density === "minimal" && /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", dimColor: true, children: [
+      executionMode2 === "local" ? "LOCAL" : remoteEnvironment.label.replace("CONNECTED ", ""),
+      " \xB7 ",
+      mode,
+      " \xB7 ",
+      activeModel,
+      lastCost > 0 ? ` \xB7 $${lastCost.toFixed(4)}` : "",
+      contextBudgetSnap ? ` \xB7 ctx ${contextBudgetSnap.usedPct}%` : ""
+    ] }),
+    terminalLayout.showFooter && /* @__PURE__ */ jsx7(
       Footer,
       {
         user,
@@ -31509,7 +31695,8 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         projectContained: true,
         attachmentPaths,
         usageError,
-        attachmentCount
+        attachmentCount,
+        terminalWidth: termColumns
       }
     )
   ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msapling",
-  "version": "2.3.6-beta.59",
+  "version": "2.3.6-beta.61",
   "description": "Short-name distribution of the MSapling CLI.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "MSapling Team",