msapling 2.3.6-beta.60 → 2.3.6-beta.62

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;
           }
@@ -19163,6 +19262,105 @@ var init_src3 = __esm({
   }
 });
 
+// src/runtime/terminalScreen.ts
+function sanitizeTerminalText(value, preserveNewlines = true) {
+  const text = String(value ?? "");
+  const escape = String.fromCharCode(27);
+  const bell = String.fromCharCode(7);
+  const withoutEscapes = text.replace(new RegExp(`${escape}\\](?:[^${bell}${escape}]|${escape}(?!\\\\))*?(?:${bell}|${escape}\\\\)`, "g"), "").replace(new RegExp(`${escape}P(?:[^${escape}]|${escape}(?!\\\\))*?(?:${escape}\\\\)`, "g"), "").replace(new RegExp(`${escape}\\[[0-?]*[ -/]*[@-~]`, "g"), "").replace(new RegExp(`${escape}[()][0-2A-Z]`, "g"), "").replace(new RegExp(`${escape}.`, "g"), "");
+  let safe = "";
+  for (const character of withoutEscapes) {
+    const code = character.codePointAt(0) ?? 0;
+    const isNewline = code === 10;
+    const isControl = code < 32 || code === 127;
+    if (isControl && (!preserveNewlines || !isNewline)) continue;
+    safe += character;
+  }
+  return safe;
+}
+function enterAlternateScreen(output = process.stdout, env = process.env) {
+  if (alternateScreenActive || !output.isTTY || env.MSAPLING_NO_ALT_SCREEN === "1" || env.TERM === "dumb") return false;
+  output.write(ENTER_ALTERNATE_SCREEN + (env.MSAPLING_NO_MOUSE_SCROLL === "1" ? "" : ENABLE_MOUSE_SCROLL));
+  alternateScreenActive = true;
+  return true;
+}
+function isSgrMouseReport(input) {
+  const escape = String.fromCharCode(27);
+  return new RegExp(`${escape}\\[<[0-9]+;[0-9]+;[0-9]+[mM]`).test(input);
+}
+function parseMouseWheel(input) {
+  const escape = String.fromCharCode(27);
+  const match = new RegExp(`${escape}\\[<([0-9]+);[0-9]+;[0-9]+[mM]`).exec(input);
+  if (!match) return null;
+  const button = Number(match[1]);
+  if (button === 64) return "up";
+  if (button === 65) return "down";
+  return null;
+}
+function leaveAlternateScreen(output = process.stdout) {
+  if (!alternateScreenActive) return false;
+  output.write(LEAVE_ALTERNATE_SCREEN);
+  alternateScreenActive = false;
+  return true;
+}
+var ENTER_ALTERNATE_SCREEN, ENABLE_MOUSE_SCROLL, LEAVE_ALTERNATE_SCREEN, alternateScreenActive, MAX_PROTOCOL_BUFFER, TerminalInputDecoder;
+var init_terminalScreen = __esm({
+  "src/runtime/terminalScreen.ts"() {
+    "use strict";
+    init_esm_shims();
+    ENTER_ALTERNATE_SCREEN = "\x1B[?1049h\x1B[H";
+    ENABLE_MOUSE_SCROLL = "\x1B[?1000h\x1B[?1006h";
+    LEAVE_ALTERNATE_SCREEN = "\x1B[?1006l\x1B[?1000l\x1B[?1049l\x1B[?25h";
+    alternateScreenActive = false;
+    MAX_PROTOCOL_BUFFER = 64 * 1024;
+    TerminalInputDecoder = class {
+      pending = "";
+      inBracketedPaste = false;
+      feed(input) {
+        const escape = String.fromCharCode(27);
+        if (this.inBracketedPaste) {
+          const candidate2 = this.pending + input;
+          const endMarker = `${escape}[201~`;
+          const end = candidate2.indexOf(endMarker);
+          if (end < 0) {
+            if (candidate2.length > MAX_PROTOCOL_BUFFER) this.reset();
+            else this.pending = candidate2;
+            return { protocol: true, text: "", mouseWheel: null };
+          }
+          const text = candidate2.slice(0, end);
+          const remainder = candidate2.slice(end + endMarker.length);
+          this.reset();
+          return { protocol: true, text: text + remainder, mouseWheel: null };
+        }
+        const candidate = this.pending + input;
+        this.pending = "";
+        const pasteStart = `${escape}[200~`;
+        if (candidate.startsWith(pasteStart)) {
+          this.inBracketedPaste = true;
+          const remainder = candidate.slice(pasteStart.length);
+          return this.feed(remainder);
+        }
+        if (!candidate.startsWith(escape)) return { protocol: false, text: input, mouseWheel: null };
+        const wheel = parseMouseWheel(candidate);
+        if (wheel || isSgrMouseReport(candidate)) {
+          return { protocol: true, text: "", mouseWheel: wheel };
+        }
+        const sgrPrefix = `${escape}[<`;
+        const isPartialSgr = sgrPrefix.startsWith(candidate) || candidate.startsWith(sgrPrefix);
+        if (isPartialSgr && candidate.length <= MAX_PROTOCOL_BUFFER) {
+          this.pending = candidate;
+          return { protocol: true, text: "", mouseWheel: null };
+        }
+        return { protocol: true, text: "", mouseWheel: null };
+      }
+      reset() {
+        this.pending = "";
+        this.inBracketedPaste = false;
+      }
+    };
+  }
+});
+
 // src/runtime/errorPresentation.ts
 function errorRecord(error) {
   return error && typeof error === "object" ? error : {};
@@ -19286,19 +19484,20 @@ function renderCliError(error) {
     tool: "Local tool guardrail",
     cli: "Local CLI"
   }[error.surface];
-  return [
+  return sanitizeTerminalText([
     `[${error.code}] ${error.summary}`,
     `Surface: ${surface}`,
     `Why: ${error.explanation}`,
     `Next: ${error.action}`,
     ...error.detail ? [`Detail: ${error.detail}`] : []
-  ].join("\n");
+  ].join("\n"));
 }
 var init_errorPresentation = __esm({
   "src/runtime/errorPresentation.ts"() {
     "use strict";
     init_esm_shims();
     init_src3();
+    init_terminalScreen();
   }
 });
 
@@ -19752,7 +19951,6 @@ var init_toggles = __esm({
     sessionToggles = /* @__PURE__ */ new Map([
       ["effort", "medium"],
       // 'low' | 'medium' | 'high'
-      ["vimMode", false],
       ["fastMode", false],
       ["simpleMode", false],
       ["filterRegex", null]
@@ -19807,12 +20005,18 @@ var init_toggles = __esm({
         context.addMessage("system", `effort set to: ${arg}`);
       }
     };
-    vimCommand = makeToggle(
-      "vim",
-      "vimMode",
-      "vim mode",
-      "Toggle vim mode for REPL input (vim [on|off] to set explicitly)"
-    );
+    vimCommand = {
+      name: "vim",
+      args: "[on|off]",
+      description: "Show Vim editor-mode availability (not yet implemented)",
+      category: "config",
+      handler: (_args, context) => {
+        context.addMessage(
+          "system",
+          "Vim input mode is not available yet. /vim does not change editor behavior; use the standard cursor and history keys shown by /shortcuts."
+        );
+      }
+    };
     fastCommand = makeToggle(
       "fast",
       "fastMode",
@@ -23566,7 +23770,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.62" : "(dev)";
         const coreVersion = true ? "2.3.6-beta.43" : "(dev)";
         const runtime = process.version;
         context.addMessage("system", "MSapling Version Info");
@@ -23840,7 +24044,7 @@ var init_shortcuts = __esm({
     shortcutsCommand = {
       name: "shortcuts",
       aliases: ["sc"],
-      description: "List all registered slash commands with descriptions and aliases",
+      description: "List keyboard controls and registered slash commands",
       category: "debug",
       handler: (args2, context) => {
         const { commands: commands2 } = (init_commands(), __toCommonJS(commands_exports));
@@ -23876,7 +24080,19 @@ ${matching.length} command(s) found.`);
           ...CATEGORY_ORDER2.filter((c) => grouped[c]),
           ...Object.keys(grouped).filter((c) => !CATEGORY_ORDER2.includes(c)).sort()
         ];
-        context.addMessage("system", "Registered Slash Commands");
+        context.addMessage("system", [
+          "Keyboard Controls",
+          "  \u2191/\u2193 (empty prompt)   Scroll transcript one row",
+          "  PageUp/PageDown      Scroll transcript one page",
+          "  Ctrl+E               Return to newest transcript row",
+          "  \u2190/\u2192                  Move the prompt cursor",
+          "  Ctrl+A               Move to start of prompt",
+          "  Ctrl+P/Ctrl+N        Previous/next prompt history",
+          "  Shift+Enter          Insert a newline",
+          "  Escape/Ctrl+C        Cancel current operation",
+          "",
+          "Registered Slash Commands"
+        ].join("\n"));
         context.addMessage("system", tableSep());
         for (const cat of cats) {
           const cmds = grouped[cat].sort((a, b) => a.name.localeCompare(b.name));
@@ -29593,7 +29809,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 as useRef2 } from "react";
 import { randomUUID as randomUUID10 } from "crypto";
 import { Box as Box7, Text as Text7, useApp, useInput as useInput4, useStdout } from "ink";
 
@@ -29603,11 +29819,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"
-] }) : /* @__PURE__ */ jsxs(Box, { borderStyle: "single", borderColor: "cyan", paddingX: 1, marginBottom: 1, children: [
+  "2.3.6-beta.62"
+] }) : /* @__PURE__ */ jsxs(Box, { width: "100%", 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.62"
   ] }),
   /* @__PURE__ */ jsx(Box, { marginLeft: 2, children: /* @__PURE__ */ jsx(Text, { color: "gray", children: "Platinum Tier Architecture" }) })
 ] });
@@ -29615,6 +29831,7 @@ var Header = ({ compact: compact2 = false }) => compact2 ? /* @__PURE__ */ jsxs(
 // src/components/Footer.tsx
 init_esm_shims();
 init_src3();
+init_terminalScreen();
 import { Box as Box2, Text as Text2 } from "ink";
 import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var PRO_TIERS2 = /* @__PURE__ */ new Set(["pro", "monthly", "lifetime", "enterprise", "admin", "superadmin"]);
@@ -29660,18 +29877,21 @@ var Footer = ({ user, options, model, project, chatId, cwd, mode, lastCost, sess
   const showCapMeter = user ? shouldShowCapMeter(user) : false;
   const dailyPct = user && showCapMeter ? Math.min(100, Math.round(user.daily_tokens_used / user.daily_tokens_limit * 100)) : 0;
   const standaloneSearchCost = getSessionStats().snapshot().standaloneSearch.estimatedCostUsd;
-  return /* @__PURE__ */ jsxs2(Box2, { borderStyle: "round", borderColor: "gray", paddingX: 1, marginTop: 1, flexDirection: "column", children: [
+  const safeModel = sanitizeTerminalText(model, false);
+  const safeProject = sanitizeTerminalText(project, false);
+  const safeChatId = chatId ? sanitizeTerminalText(chatId, false) : null;
+  return /* @__PURE__ */ jsxs2(Box2, { width: "100%", borderStyle: "round", borderColor: "gray", paddingX: 1, marginTop: 1, flexDirection: "column", children: [
     /* @__PURE__ */ jsxs2(Box2, { justifyContent: "space-between", children: [
       /* @__PURE__ */ jsx2(Text2, { bold: true, children: "CLI telemetry" }),
       /* @__PURE__ */ jsx2(Text2, { color: "yellow", children: formatAccountSummary(user, { billingProfile, isStale, usageError }) })
     ] }),
     expanded && options.chat && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
       "project: ",
-      project,
+      safeProject,
       "  chat: ",
-      chatId ?? "none",
+      safeChatId ?? "none",
       "  model: ",
-      model
+      safeModel
     ] }),
     options.location && /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
       "cwd: ",
@@ -29709,44 +29929,9 @@ function promptLabel(user) {
 
 // src/components/ApprovalDialog.tsx
 init_esm_shims();
+init_terminalScreen();
 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 [];
@@ -29810,10 +29995,13 @@ var ApprovalDialog = ({
   onResolve
 }) => {
   const [showFullDiff, setShowFullDiff] = useState(false);
-  const { hasDiff, diffText, title } = useMemo(() => extractDiffFromCommand(command, diff), [command, diff]);
+  const safeCommand = sanitizeTerminalText(command, false);
+  const safeReason = sanitizeTerminalText(reason);
+  const safePath = targetPath ? sanitizeTerminalText(targetPath, false) : void 0;
+  const safeDiff = diff ? sanitizeTerminalText(diff) : void 0;
+  const { hasDiff, diffText, title } = useMemo(() => extractDiffFromCommand(safeCommand, safeDiff), [safeCommand, safeDiff]);
   const diffLines = useMemo(() => parseDiffLines(diffText), [diffText]);
   useInput((input, key) => {
-    if (isMouseReport(input)) return;
     if (key.escape) {
       onResolve("no");
       return;
@@ -29833,16 +30021,16 @@ var ApprovalDialog = ({
   const isTruncated = !showFullDiff && diffLines.length > MAX_DIFF_COLLAPSED_LINES;
   return /* @__PURE__ */ jsxs3(Box3, { borderStyle: "double", borderColor: "yellow", paddingX: 1, marginY: 1, flexDirection: "column", children: [
     /* @__PURE__ */ jsx3(Text3, { bold: true, color: "yellow", children: "SECURITY APPROVAL REQUIRED" }),
-    /* @__PURE__ */ jsx3(Text3, { italic: true, dimColor: true, children: reason }),
+    /* @__PURE__ */ jsx3(Text3, { italic: true, dimColor: true, children: safeReason }),
     /* @__PURE__ */ jsx3(Box3, { marginTop: 1, paddingX: 1, borderStyle: "round", borderColor: "gray", children: /* @__PURE__ */ jsxs3(Text3, { color: "white", children: [
       "$ ",
-      command
+      safeCommand
     ] }) }),
     hasDiff && /* @__PURE__ */ jsxs3(Box3, { marginTop: 1, flexDirection: "column", borderStyle: "single", borderColor: "cyan", paddingX: 1, children: [
       /* @__PURE__ */ jsxs3(Box3, { justifyContent: "space-between", children: [
         /* @__PURE__ */ jsxs3(Text3, { bold: true, color: "cyan", children: [
           "DIFF REVIEW ",
-          targetPath || title ? `(${targetPath || title})` : "",
+          safePath || title ? `(${safePath || sanitizeTerminalText(title, false)})` : "",
           ":"
         ] }),
         /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
@@ -29893,6 +30081,7 @@ var ApprovalDialog = ({
 
 // src/components/AskUserQuestion.tsx
 init_esm_shims();
+init_terminalScreen();
 import { useState as useState2 } from "react";
 import { Box as Box4, Text as Text4, useInput as useInput2 } from "ink";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
@@ -29900,7 +30089,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) {
@@ -29928,7 +30116,7 @@ var AskUserQuestion = ({ question, options, multiSelect, onResolve }) => {
   });
   return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", padding: 1, children: [
     /* @__PURE__ */ jsx4(Text4, { bold: true, color: "cyan", children: "QUESTION FROM AGENT" }),
-    /* @__PURE__ */ jsx4(Text4, { children: question }),
+    /* @__PURE__ */ jsx4(Text4, { children: sanitizeTerminalText(question) }),
     /* @__PURE__ */ jsx4(Box4, { marginTop: 1, flexDirection: "column", children: options.map((opt, i) => {
       const isHighlighted = i === selectedIndex;
       const isSelected = selectedIndices.has(i);
@@ -29939,9 +30127,9 @@ var AskUserQuestion = ({ question, options, multiSelect, onResolve }) => {
       return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
         /* @__PURE__ */ jsxs4(Text4, { color: isHighlighted ? "blue" : "white", bold: isHighlighted, children: [
           marker,
-          opt.text
+          sanitizeTerminalText(opt.text, false)
         ] }),
-        isHighlighted && opt.preview && /* @__PURE__ */ jsx4(Box4, { marginLeft: 4, borderStyle: "single", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: opt.preview }) })
+        isHighlighted && opt.preview && /* @__PURE__ */ jsx4(Box4, { marginLeft: 4, borderStyle: "single", borderColor: "gray", paddingX: 1, children: /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: sanitizeTerminalText(opt.preview) }) })
       ] }, i);
     }) }),
     /* @__PURE__ */ jsx4(Box4, { marginTop: 1, children: /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
@@ -29954,37 +30142,12 @@ var AskUserQuestion = ({ question, options, multiSelect, onResolve }) => {
 
 // src/components/VirtualizedMessageList.tsx
 init_esm_shims();
+init_terminalScreen();
 import React3 from "react";
 import { Box as Box5, Text as Text5 } from "ink";
+import stringWidth from "string-width";
+import stripAnsi2 from "strip-ansi";
 import { jsx as jsx5, jsxs as jsxs5 } from "react/jsx-runtime";
-function estimateLineCount(text, cols) {
-  const effectiveCols = cols > 0 ? cols : 80;
-  const physicalLines = text.split("\n");
-  let total = 0;
-  for (const line of physicalLines) {
-    total += line.length === 0 ? 1 : Math.ceil(line.length / effectiveCols);
-  }
-  return total;
-}
-function computeViewport(messages, visibleLines, termColumns, offsetFromEnd = 0) {
-  const cols = termColumns > 0 ? termColumns : 80;
-  const budget = Math.max(visibleLines, 1);
-  let linesUsed = 0;
-  const endIdx = Math.max(0, messages.length - Math.max(0, Math.floor(offsetFromEnd)));
-  let startIdx = endIdx;
-  for (let i = endIdx - 1; i >= 0; i--) {
-    const contentLines = estimateLineCount(messages[i].content, cols);
-    const msgCost = contentLines + 2;
-    if (linesUsed + msgCost > budget) break;
-    linesUsed += msgCost;
-    startIdx = i;
-  }
-  return {
-    displayMessages: messages.slice(startIdx, endIdx),
-    hiddenCount: startIdx,
-    hiddenAfter: messages.length - endIdx
-  };
-}
 var ROLE_COLOR = {
   user: "green",
   assistant: "cyan",
@@ -29997,6 +30160,96 @@ var ROLE_LABEL = {
   error: "Error: ",
   system: ""
 };
+function cleanTerminalText(value) {
+  return sanitizeTerminalText(stripAnsi2(value)).replace(/\r\n?/g, "\n").replace(/\t/g, "    ");
+}
+function graphemes(value) {
+  if (typeof Intl.Segmenter === "function") {
+    const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+    return Array.from(segmenter.segment(value), (segment) => segment.segment);
+  }
+  return Array.from(value);
+}
+function wrapTerminalLine(value, columns) {
+  const width = Math.max(1, Math.floor(columns));
+  if (value.length === 0) return [""];
+  const rows = [];
+  let row3 = "";
+  let rowWidth = 0;
+  for (const grapheme of graphemes(value)) {
+    const cellWidth = Math.max(0, stringWidth(grapheme));
+    if (row3.length > 0 && rowWidth + cellWidth > width) {
+      rows.push(row3);
+      row3 = "";
+      rowWidth = 0;
+    }
+    row3 += grapheme;
+    rowWidth += cellWidth;
+  }
+  rows.push(row3);
+  return rows;
+}
+function buildTranscriptRows(messages, termColumns, compact2 = false) {
+  const columns = termColumns > 0 ? Math.floor(termColumns) : 80;
+  const separator = "\u2500".repeat(Math.max(1, Math.min(columns, 60)));
+  const rows = [];
+  messages.forEach((message2, messageIndex) => {
+    if (compact2 && messageIndex > 0) {
+      rows.push({ messageIndex, role: message2.role, prefix: "", content: separator, separator: true });
+    }
+    const label = ROLE_LABEL[message2.role];
+    const labelWidth = stringWidth(label);
+    const contentWidth = Math.max(1, columns - labelWidth);
+    const continuationPrefix = " ".repeat(labelWidth);
+    let firstVisualRow = true;
+    for (const physicalLine of cleanTerminalText(message2.content).split("\n")) {
+      const wrapped = wrapTerminalLine(physicalLine, contentWidth);
+      for (const content of wrapped) {
+        rows.push({
+          messageIndex,
+          role: message2.role,
+          prefix: firstVisualRow ? label : continuationPrefix,
+          content
+        });
+        firstVisualRow = false;
+      }
+    }
+    if (!compact2 && message2.role === "assistant") {
+      rows.push({ messageIndex, role: message2.role, prefix: "", content: "", margin: true });
+    }
+  });
+  return rows;
+}
+function uniqueMessageCount(rows) {
+  return new Set(rows.map((row3) => row3.messageIndex)).size;
+}
+function computeViewport(messages, visibleLines, termColumns, offsetFromEnd = 0, compact2 = false) {
+  const allRows = buildTranscriptRows(messages, termColumns, compact2);
+  const totalRows = allRows.length;
+  const budget = Math.max(1, Math.floor(visibleLines));
+  const hiddenRowsAfter = Math.min(totalRows, Math.max(0, Math.floor(offsetFromEnd)));
+  const end = totalRows - hiddenRowsAfter;
+  let contentBudget = budget;
+  let start = Math.max(0, end - contentBudget);
+  if (start > 0 || hiddenRowsAfter > 0) {
+    contentBudget = Math.max(0, budget - 1);
+    start = Math.max(0, end - contentBudget);
+  }
+  const displayRows = allRows.slice(start, end);
+  const visibleIndices = [...new Set(displayRows.map((row3) => row3.messageIndex))];
+  const displayMessages = visibleIndices.map((index) => messages[index]);
+  const beforeRows = allRows.slice(0, start);
+  const afterRows = allRows.slice(end);
+  return {
+    displayMessages,
+    displayRows,
+    hiddenCount: uniqueMessageCount(beforeRows),
+    hiddenAfter: uniqueMessageCount(afterRows),
+    hiddenRowsBefore: start,
+    hiddenRowsAfter,
+    totalRows
+  };
+}
 var VirtualizedMessageList = ({
   messages,
   visibleLines,
@@ -30004,45 +30257,27 @@ var VirtualizedMessageList = ({
   compact: compact2 = false,
   offsetFromEnd = 0
 }) => {
-  const { displayMessages, hiddenCount, hiddenAfter } = React3.useMemo(
-    () => computeViewport(messages, visibleLines, termColumns, offsetFromEnd),
-    [messages, visibleLines, termColumns, offsetFromEnd]
+  const { displayRows, hiddenRowsBefore, hiddenRowsAfter } = React3.useMemo(
+    () => computeViewport(messages, visibleLines, termColumns, offsetFromEnd, compact2),
+    [messages, visibleLines, termColumns, offsetFromEnd, compact2]
   );
-  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]` }),
-    displayMessages.map((msg, i) => /* @__PURE__ */ jsxs5(
-      Box5,
-      {
-        flexDirection: "column",
-        marginBottom: compact2 ? 0 : msg.role === "assistant" ? 1 : 0,
-        children: [
-          compact2 && i > 0 && /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: "\u2500".repeat(separatorWidth) }),
-          /* @__PURE__ */ jsxs5(Box5, { children: [
-            /* @__PURE__ */ jsx5(
-              Text5,
-              {
-                color: ROLE_COLOR[msg.role],
-                bold: msg.role !== "assistant",
-                children: ROLE_LABEL[msg.role]
-              }
-            ),
-            /* @__PURE__ */ jsx5(Text5, { wrap: "wrap", children: msg.content })
-          ] })
-        ]
-      },
-      i
-    ))
+  return /* @__PURE__ */ jsxs5(Box5, { width: "100%", flexDirection: "column", flexGrow: 1, children: [
+    (hiddenRowsBefore > 0 || hiddenRowsAfter > 0) && /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: `[\u2191 ${hiddenRowsBefore} rows \xB7 \u2193 ${hiddenRowsAfter} \xB7 PgUp/PgDn \xB7 Ctrl+E latest]` }),
+    displayRows.map((row3, index) => row3.separator ? /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: row3.content }, `${row3.messageIndex}-${index}`) : row3.margin ? /* @__PURE__ */ jsx5(Text5, { children: " " }, `${row3.messageIndex}-${index}`) : /* @__PURE__ */ jsxs5(Text5, { wrap: "truncate-end", children: [
+      /* @__PURE__ */ jsx5(Text5, { color: ROLE_COLOR[row3.role], bold: row3.role !== "assistant", children: row3.prefix }),
+      row3.content
+    ] }, `${row3.messageIndex}-${index}`))
   ] });
 };
 
 // src/App.tsx
+init_terminalScreen();
 init_src();
 init_src3();
 
 // src/ui/TextInput.tsx
 init_esm_shims();
-import { useState as useState3, useEffect as useEffect2 } from "react";
+import React4, { useState as useState3, useEffect } from "react";
 import { Box as Box6, Text as Text6, useInput as useInput3 } from "ink";
 
 // src/state/commandHandler.ts
@@ -30629,7 +30864,42 @@ ${finalCmd}`;
 }
 
 // src/ui/TextInput.tsx
+init_terminalScreen();
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+function sanitizePromptInput(value) {
+  return sanitizeTerminalText(value);
+}
+function cursorBoundaries(value) {
+  if (typeof Intl.Segmenter !== "function") {
+    return Array.from({ length: value.length + 1 }, (_, index) => index);
+  }
+  const segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+  return [0, ...Array.from(segmenter.segment(value), (segment) => segment.index + segment.segment.length)];
+}
+function moveCursorLeft(value, cursor) {
+  const boundaries = cursorBoundaries(value);
+  return boundaries[Math.max(0, boundaries.findIndex((boundary) => boundary >= cursor) - 1)] ?? 0;
+}
+function moveCursorRight(value, cursor) {
+  const boundaries = cursorBoundaries(value);
+  return boundaries.find((boundary) => boundary > cursor) ?? value.length;
+}
+function moveCursorWordLeft(value, cursor) {
+  const boundaries = cursorBoundaries(value);
+  let index = boundaries.findIndex((boundary) => boundary >= cursor);
+  if (index < 0) index = boundaries.length - 1;
+  while (index > 0 && /\s/.test(value.slice(boundaries[index - 1], boundaries[index]))) index--;
+  while (index > 0 && !/\s/.test(value.slice(boundaries[index - 1], boundaries[index]))) index--;
+  return boundaries[index] ?? 0;
+}
+function moveCursorWordRight(value, cursor) {
+  const boundaries = cursorBoundaries(value);
+  let index = boundaries.findIndex((boundary) => boundary > cursor);
+  if (index < 0) return value.length;
+  while (index < boundaries.length - 1 && !/\s/.test(value.slice(boundaries[index], boundaries[index + 1]))) index++;
+  while (index < boundaries.length - 1 && /\s/.test(value.slice(boundaries[index], boundaries[index + 1]))) index++;
+  return boundaries[index] ?? value.length;
+}
 var TextInput = ({
   value,
   onChange,
@@ -30641,12 +30911,24 @@ var TextInput = ({
   transcriptNavigationActive = false
 }) => {
   const [history, setHistory] = useState3([]);
+  const terminalInputDecoder = React4.useRef(new TerminalInputDecoder());
   const [historyIndex, setHistoryIndex] = useState3(-1);
-  useEffect2(() => {
+  const [cursor, setCursor] = useState3(value.length);
+  useEffect(() => {
     storage.loadHistory().then((entries) => setHistory(filterSafeHistory(entries)));
   }, [storage]);
+  useEffect(() => {
+    setCursor((current) => Math.min(current, value.length));
+  }, [value]);
   useInput3((input, key) => {
-    if (isMouseReport(input)) return;
+    const decoded = terminalInputDecoder.current.feed(input);
+    if (decoded.protocol && key.escape) {
+      terminalInputDecoder.current.reset();
+    } else if (decoded.protocol) {
+      if (!decoded.text) return;
+      input = decoded.text;
+    }
+    const extendedKey = key;
     if (key.ctrl && input === "c" || key.escape) {
       onCancel?.();
       return;
@@ -30654,39 +30936,70 @@ var TextInput = ({
     if (disabled) return;
     if (key.return) {
       if (key.shift) {
-        onChange(value + "\n");
+        onChange(value.slice(0, cursor) + "\n" + value.slice(cursor));
+        setCursor(cursor + 1);
       } else {
         onSubmit(value);
         onChange("");
+        setCursor(0);
         setHistoryIndex(-1);
       }
-    } else if (key.backspace || key.delete) {
-      onChange(value.slice(0, -1));
+    } else if (key.backspace) {
+      if (cursor > 0) {
+        onChange(value.slice(0, cursor - 1) + value.slice(cursor));
+        setCursor(cursor - 1);
+      }
+    } else if (key.delete) {
+      if (cursor < value.length) onChange(value.slice(0, cursor) + value.slice(cursor + 1));
+    } else if (extendedKey.home || key.ctrl && input === "a") {
+      setCursor(0);
+    } else if (extendedKey.end) {
+      setCursor(value.length);
+    } else if (key.leftArrow && key.ctrl) {
+      setCursor((current) => moveCursorWordLeft(value, current));
+    } else if (key.rightArrow && key.ctrl) {
+      setCursor((current) => moveCursorWordRight(value, current));
+    } else if (key.leftArrow) {
+      setCursor((current) => moveCursorLeft(value, current));
+    } else if (key.rightArrow) {
+      setCursor((current) => moveCursorRight(value, current));
     } 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]);
+        const entry = history[history.length - 1 - nextIndex];
+        const safeEntry = sanitizePromptInput(entry);
+        onChange(safeEntry);
+        setCursor(safeEntry.length);
       }
     } else if (key.ctrl && input === "n" || key.downArrow && !transcriptNavigationActive) {
       const nextIndex = historyIndex - 1;
       if (nextIndex >= 0) {
         setHistoryIndex(nextIndex);
-        onChange(history[history.length - 1 - nextIndex]);
+        const entry = history[history.length - 1 - nextIndex];
+        const safeEntry = sanitizePromptInput(entry);
+        onChange(safeEntry);
+        setCursor(safeEntry.length);
       } else {
         setHistoryIndex(-1);
         onChange("");
+        setCursor(0);
       }
     } else if ((key.upArrow || key.downArrow) && transcriptNavigationActive) {
       return;
     } else if (input && !key.ctrl && !key.meta) {
-      onChange(value + input);
+      const safeInput = sanitizePromptInput(input);
+      if (safeInput.length > 0) {
+        onChange(value.slice(0, cursor) + safeInput + value.slice(cursor));
+        setCursor(cursor + safeInput.length);
+      }
     }
   });
-  return /* @__PURE__ */ jsxs6(Box6, { children: [
+  return /* @__PURE__ */ jsxs6(Box6, { width: "100%", children: [
     /* @__PURE__ */ jsx6(Text6, { bold: true, color: promptColor, children: "\u276F " }),
-    /* @__PURE__ */ jsx6(Text6, { children: value }),
-    !disabled && /* @__PURE__ */ jsx6(Text6, { backgroundColor: "white", color: "black", children: " " })
+    /* @__PURE__ */ jsx6(Text6, { children: value.slice(0, cursor) }),
+    !disabled && /* @__PURE__ */ jsx6(Text6, { backgroundColor: "white", color: "black", children: value[cursor] ?? " " }),
+    /* @__PURE__ */ jsx6(Text6, { children: disabled ? value.slice(cursor) : value.slice(cursor + 1) })
   ] });
 };
 var PROMPT_COLOR_BY_MODE = {
@@ -30869,26 +31182,38 @@ init_errorPresentation();
 
 // src/hooks/useTerminalResize.ts
 init_esm_shims();
-import { useState as useState4, useEffect as useEffect3, useCallback } from "react";
-function getCurrentDimensions() {
+import { useState as useState4, useEffect as useEffect2, useCallback, useRef } from "react";
+function normalizeTerminalDimensions(columns, rows) {
   return {
-    columns: process.stdout.columns ?? 80,
-    rows: process.stdout.rows ?? 24
+    columns: Number.isFinite(columns) && columns > 0 ? Math.floor(columns) : 80,
+    rows: Number.isFinite(rows) && rows > 0 ? Math.floor(rows) : 24
   };
 }
+function getCurrentDimensions() {
+  return normalizeTerminalDimensions(process.stdout.columns ?? 80, process.stdout.rows ?? 24);
+}
 function useTerminalResize() {
   const [dimensions, setDimensions] = useState4(
     getCurrentDimensions
   );
+  const resizeTimer = useRef(null);
+  const resizeEpoch = useRef(0);
   const handleResize = useCallback(() => {
-    setDimensions(getCurrentDimensions());
+    const epoch = ++resizeEpoch.current;
+    if (resizeTimer.current !== null) clearTimeout(resizeTimer.current);
+    resizeTimer.current = setTimeout(() => {
+      resizeTimer.current = null;
+      if (epoch === resizeEpoch.current) setDimensions(getCurrentDimensions());
+    }, 16);
   }, []);
-  useEffect3(() => {
+  useEffect2(() => {
     process.stdout.on("resize", handleResize);
     const onSigwinch = () => handleResize();
     process.on("SIGWINCH", onSigwinch);
     handleResize();
     return () => {
+      if (resizeTimer.current !== null) clearTimeout(resizeTimer.current);
+      resizeTimer.current = null;
       process.stdout.off("resize", handleResize);
       process.off("SIGWINCH", onSigwinch);
     };
@@ -30961,6 +31286,7 @@ import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var App = ({ compact: compact2 = false, continueSession: continueSession2 = false, executionMode: executionMode2 = "remote" }) => {
   const [user, setUser] = useState5(null);
   const [input, setInput] = useState5("");
+  const terminalInputDecoder = useRef2(new TerminalInputDecoder());
   const [history, setHistory] = useState5([]);
   const [historyView, setHistoryView] = useState5(null);
   const [historyOffset, setHistoryOffset] = useState5(0);
@@ -31034,15 +31360,15 @@ var App = ({ compact: compact2 = false, continueSession: continueSession2 = fals
   const trustStore = useRef2(new TrustStore()).current;
   const lastActivityRef = useRef2(Date.now());
   const pollingIntervalRef = useRef2(null);
-  useEffect4(() => {
+  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 +31397,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);
@@ -31173,7 +31499,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 +31520,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 +31632,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 () => {
@@ -31414,7 +31740,7 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
   });
   const relayCommandRef = useRef2(handleCommand);
   relayCommandRef.current = handleCommand;
-  useEffect4(() => {
+  useEffect3(() => {
     if (executionMode2 !== "remote" || process.env.MSAPLING_RELAY_ENABLED !== "1" || !activeProjectId) return;
     let listener = null;
     let cancelled = false;
@@ -31451,24 +31777,45 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
   const activityRows = pendingApproval ? 6 : pendingAskUser ? 10 : isRunning ? 2 : 0;
   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 historyPageStep = Math.max(1, visibleLines - 1);
+  const viewport = computeViewport(displayedHistory, visibleLines, termColumns, historyOffset, compactPresentation);
+  const safeStatus = sanitizeTerminalText(status2, false);
+  const safeProjectId = sanitizeTerminalText(activeProjectId || "none", false);
+  const safeModel = sanitizeTerminalText(activeModel, false);
+  const safeEnvironment = sanitizeTerminalText(remoteEnvironment.label, false);
+  const canScrollOlder = viewport.hiddenRowsBefore > 0;
   const canScrollNewer = historyOffset > 0;
+  const previousTranscriptRowsRef = useRef2(viewport.totalRows);
+  useEffect3(() => {
+    const previousRows = previousTranscriptRowsRef.current;
+    previousTranscriptRowsRef.current = viewport.totalRows;
+    const rowDelta = viewport.totalRows - previousRows;
+    if (historyOffset > 0 && rowDelta !== 0) {
+      setHistoryOffset((current) => Math.min(
+        Math.max(0, viewport.totalRows - 1),
+        Math.max(0, current + rowDelta)
+      ));
+    }
+  }, [historyOffset, viewport.totalRows]);
   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));
+      setHistoryOffset((current) => Math.min(Math.max(0, viewport.totalRows - 1), current + amount));
     } else {
       setHistoryOffset((current) => Math.max(0, current - amount));
     }
-  }, [displayedHistory.length, historyPageStep]);
-  useTerminalMouseScroll((direction) => {
-    if (!pendingApproval && !pendingAskUser) scrollTranscript(direction);
-  });
+  }, [historyPageStep, viewport.totalRows]);
   useInput4((input2, key) => {
     if (pendingApproval || pendingAskUser) return;
-    if (key.pageUp) {
+    const decoded = terminalInputDecoder.current.feed(input2);
+    if (decoded.protocol && !decoded.mouseWheel) return;
+    if (isSgrMouseReport(input2) && !parseMouseWheel(input2)) return;
+    const mouseWheel = decoded.mouseWheel ?? parseMouseWheel(input2);
+    if (mouseWheel === "up") {
+      scrollTranscript("up");
+    } else if (mouseWheel === "down") {
+      scrollTranscript("down");
+    } else if (key.pageUp) {
       scrollTranscript("up", true);
     } else if (key.pageDown) {
       scrollTranscript("down", true);
@@ -31481,9 +31828,9 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       setHistoryView(null);
     }
   });
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", padding: terminalLayout.outerPadding, children: [
+  return /* @__PURE__ */ jsxs7(Box7, { width: termColumns, height: termHeight, flexDirection: "column", padding: terminalLayout.outerPadding, overflow: "hidden", children: [
     /* @__PURE__ */ jsx7(Header, { compact: !terminalLayout.showFramedHeader }),
-    /* @__PURE__ */ jsx7(Box7, { marginBottom: compactPresentation ? 0 : 1, children: /* @__PURE__ */ jsx7(
+    /* @__PURE__ */ jsx7(Box7, { width: "100%", flexGrow: 1, overflow: "hidden", children: /* @__PURE__ */ jsx7(
       VirtualizedMessageList,
       {
         messages: displayedHistory,
@@ -31558,7 +31905,7 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
       /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
         /* @__PURE__ */ jsxs7(Text7, { color: executionMode2 === "local" ? "yellow" : "cyan", children: [
           "Execution: ",
-          executionMode2 === "local" ? "STANDALONE LOCAL" : remoteEnvironment.label
+          executionMode2 === "local" ? "STANDALONE LOCAL" : safeEnvironment
         ] }),
         /* @__PURE__ */ jsxs7(Text7, { color: billingProfile === "account-metered" ? "cyan" : "yellow", children: [
           "Billing: ",
@@ -31571,15 +31918,15 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         ] }),
         /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
           "Status: ",
-          status2
+          safeStatus
         ] }),
         /* @__PURE__ */ jsxs7(Text7, { color: "gray", children: [
           "Project: ",
-          activeProjectId || "none"
+          safeProjectId
         ] }),
         /* @__PURE__ */ jsxs7(Text7, { color: "gray", children: [
           "Model: ",
-          activeModel
+          safeModel
         ] })
       ] }),
       /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", alignItems: "flex-end", children: [
@@ -31594,9 +31941,9 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         contextBudgetSnap !== null && /* @__PURE__ */ jsx7(Text7, { color: contextBudgetColor(contextBudgetSnap.usedPct), children: formatContextBudgetLabel(contextBudgetSnap) })
       ] })
     ] }),
-    terminalLayout.density === "condensed" && /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
+    terminalLayout.density === "condensed" && /* @__PURE__ */ jsxs7(Box7, { width: "100%", flexDirection: "column", children: [
       /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", color: executionMode2 === "local" ? "yellow" : "cyan", children: [
-        executionMode2 === "local" ? "LOCAL" : remoteEnvironment.label.replace("CONNECTED ", ""),
+        executionMode2 === "local" ? "LOCAL" : safeEnvironment.replace("CONNECTED ", ""),
         " \xB7 ",
         mode,
         " \xB7 ",
@@ -31605,17 +31952,17 @@ ${renderCliError(classifyCliError(error, { executionMode: executionMode2 }))}`);
         continuityProfile
       ] }),
       /* @__PURE__ */ jsxs7(Text7, { wrap: "truncate-end", dimColor: true, children: [
-        activeModel,
+        safeModel,
         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 ", ""),
+      executionMode2 === "local" ? "LOCAL" : safeEnvironment.replace("CONNECTED ", ""),
       " \xB7 ",
       mode,
       " \xB7 ",
-      activeModel,
+      safeModel,
       lastCost > 0 ? ` \xB7 $${lastCost.toFixed(4)}` : "",
       contextBudgetSnap ? ` \xB7 ctx ${contextBudgetSnap.usedPct}%` : ""
     ] }),
@@ -31834,26 +32181,7 @@ function handleCliArgs(args2) {
 // src/index.tsx
 init_src3();
 init_errorPresentation();
-
-// src/runtime/terminalScreen.ts
-init_esm_shims();
-var ENTER_ALTERNATE_SCREEN = "\x1B[?1049h\x1B[H";
-var LEAVE_ALTERNATE_SCREEN = "\x1B[?1049l\x1B[?25h";
-var alternateScreenActive = false;
-function enterAlternateScreen(output = process.stdout, env = process.env) {
-  if (alternateScreenActive || !output.isTTY || env.MSAPLING_NO_ALT_SCREEN === "1" || env.TERM === "dumb") return false;
-  output.write(ENTER_ALTERNATE_SCREEN);
-  alternateScreenActive = true;
-  return true;
-}
-function leaveAlternateScreen(output = process.stdout) {
-  if (!alternateScreenActive) return false;
-  output.write(LEAVE_ALTERNATE_SCREEN);
-  alternateScreenActive = false;
-  return true;
-}
-
-// src/index.tsx
+init_terminalScreen();
 import { jsx as jsx8 } from "react/jsx-runtime";
 var index_default = App;
 function restoreTerminalMode() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "msapling",
-  "version": "2.3.6-beta.60",
+  "version": "2.3.6-beta.62",
   "description": "Short-name distribution of the MSapling CLI.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "MSapling Team",
@@ -48,6 +48,8 @@
     "proper-lockfile": "^4.1.2",
     "react": "^18.3.1",
     "shell-quote": "^1.8.1",
+    "string-width": "^5.1.2",
+    "strip-ansi": "^7.1.0",
     "yaml": "^2.8.3"
   },
   "optionalDependencies": {