reasonix 0.49.0 → 0.50.1

package/dist/index.js

@@ -2,14 +2,8 @@
 import { createParser } from "eventsource-parser";
 
 // src/config.ts
-import {
-  appendFileSync,
-  chmodSync,
-  mkdirSync,
-  readFileSync,
-  renameSync,
-  writeFileSync
-} from "fs";
+import { randomBytes } from "crypto";
+import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { dirname, isAbsolute, join, resolve } from "path";
 import { z } from "zod";
@@ -39,39 +33,6 @@ function card(fg, tone) {
 function defineTheme(base) {
   return { ...base, card: card(base.fg, base.tone) };
 }
-var githubDark = defineTheme({
-  fg: {
-    strong: "#e6edf3",
-    body: "#c9d1d9",
-    sub: "#8b949e",
-    meta: "#6e7681",
-    faint: "#484f58"
-  },
-  tone: {
-    brand: "#79c0ff",
-    accent: "#d2a8ff",
-    violet: "#b395f5",
-    ok: "#7ee787",
-    warn: "#f0b07d",
-    err: "#ff8b81",
-    info: "#79c0ff"
-  },
-  toneActive: {
-    brand: "#a5d6ff",
-    accent: "#e2c5ff",
-    violet: "#c8aaff",
-    ok: "#a8f5ad",
-    warn: "#ffc99e",
-    err: "#ffaba3",
-    info: "#a5d6ff"
-  },
-  surface: {
-    bg: "#0a0c10",
-    bgInput: "#0d1015",
-    bgCode: "#06080c",
-    bgElev: "#11141a"
-  }
-});
 var dark = defineTheme({
   fg: {
     strong: "#f4f7fb",
@@ -100,7 +61,7 @@ var dark = defineTheme({
   },
   surface: {
     bg: "#0b1020",
-    bgInput: "#111827",
+    bgInput: "#0f172a",
     bgCode: "#080c16",
     bgElev: "#151d2f"
   }
@@ -133,12 +94,12 @@ var light = defineTheme({
   },
   surface: {
     bg: "#ffffff",
-    bgInput: "#f8fafc",
+    bgInput: "#f1f5f9",
     bgCode: "#f3f4f6",
     bgElev: "#eef2f7"
   }
 });
-var tokyoNight = defineTheme({
+var midnight = defineTheme({
   fg: {
     strong: "#c0caf5",
     body: "#a9b1d6",
@@ -171,37 +132,37 @@ var tokyoNight = defineTheme({
     bgElev: "#24283b"
   }
 });
-var githubLight = defineTheme({
+var deepBlue = defineTheme({
   fg: {
-    strong: "#1f2328",
-    body: "#24292f",
-    sub: "#57606a",
-    meta: "#6e7781",
-    faint: "#8c959f"
+    strong: "#ffffff",
+    body: "#e0e0e0",
+    sub: "#b0b0b0",
+    meta: "#808080",
+    faint: "#606060"
   },
   tone: {
-    brand: "#0969da",
-    accent: "#8250df",
-    violet: "#6639ba",
-    ok: "#1a7f37",
-    warn: "#9a6700",
-    err: "#cf222e",
-    info: "#0969da"
+    brand: "#0153e5",
+    accent: "#4d94ff",
+    violet: "#7b68ee",
+    ok: "#4caf50",
+    warn: "#ff9800",
+    err: "#f44336",
+    info: "#2196f3"
   },
   toneActive: {
-    brand: "#0550ae",
-    accent: "#6639ba",
-    violet: "#512a97",
-    ok: "#116329",
-    warn: "#7d4e00",
-    err: "#a40e26",
-    info: "#0550ae"
+    brand: "#4d94ff",
+    accent: "#80b3ff",
+    violet: "#9b8bff",
+    ok: "#66bb6a",
+    warn: "#ffb74d",
+    err: "#ef5350",
+    info: "#42a5f5"
   },
   surface: {
-    bg: "#ffffff",
-    bgInput: "#f6f8fa",
-    bgCode: "#f6f8fa",
-    bgElev: "#eaeef2"
+    bg: "#0a0a0a",
+    bgInput: "#1e1e1e",
+    bgCode: "#141414",
+    bgElev: "#252525"
   }
 });
 var highContrast = defineTheme({
@@ -238,15 +199,13 @@ var highContrast = defineTheme({
   }
 });
 var THEMES = {
-  default: githubDark,
   dark,
   light,
-  "tokyo-night": tokyoNight,
-  "github-dark": githubDark,
-  "github-light": githubLight,
+  midnight,
+  "deep-blue": deepBlue,
   "high-contrast": highContrast
 };
-var DEFAULT_THEME_NAME = "default";
+var DEFAULT_THEME_NAME = "dark";
 var DEFAULT_THEME = THEMES[DEFAULT_THEME_NAME];
 var activeTheme = DEFAULT_THEME;
 function proxyTokens(select) {
@@ -660,7 +619,6 @@ function readConfig(path2 = defaultConfigPath()) {
   return {};
 }
 function writeConfig(cfg, path2 = defaultConfigPath()) {
-  debugLogConfigWrite(cfg, path2);
   mkdirSync(dirname(path2), { recursive: true });
   const tmp = `${path2}.${process.pid}.tmp`;
   writeFileSync(tmp, JSON.stringify(cfg, null, 2), "utf8");
@@ -670,33 +628,24 @@ function writeConfig(cfg, path2 = defaultConfigPath()) {
   }
   renameSync(tmp, path2);
 }
-function debugLogConfigWrite(cfg, configPath) {
-  const debugPath = process.env.REASONIX_DEBUG_PRESET;
-  if (!debugPath) return;
-  try {
-    const stack = new Error("trace").stack ?? "";
-    const keys = Object.keys(cfg).sort().join(",");
-    const presetField = cfg.preset === void 0 ? "(absent)" : JSON.stringify(cfg.preset);
-    const line = `${(/* @__PURE__ */ new Date()).toISOString()} writeConfig pid=${process.pid} \u2192 ${configPath}
-  keys=[${keys}]
-  preset=${presetField}
-${stack.split("\n").slice(1, 10).map((l) => `  ${l.trim()}`).join("\n")}
-
-`;
-    appendFileSync(debugPath, line);
-  } catch {
-  }
-}
 function loadLanguage(path2 = defaultConfigPath()) {
   return readConfig(path2).lang;
 }
+function loadEndpoint(path2 = defaultConfigPath()) {
+  if (process.env.DEEPSEEK_BASE_URL) {
+    return { baseUrl: process.env.DEEPSEEK_BASE_URL, apiKey: process.env.DEEPSEEK_API_KEY };
+  }
+  const cfg = readConfig(path2);
+  if (cfg.baseUrl) {
+    return { baseUrl: cfg.baseUrl, apiKey: cfg.apiKey };
+  }
+  return { baseUrl: void 0, apiKey: process.env.DEEPSEEK_API_KEY ?? cfg.apiKey };
+}
 function loadApiKey(path2 = defaultConfigPath()) {
-  if (process.env.DEEPSEEK_API_KEY) return process.env.DEEPSEEK_API_KEY;
-  return readConfig(path2).apiKey;
+  return loadEndpoint(path2).apiKey;
 }
 function loadBaseUrl(path2 = defaultConfigPath()) {
-  if (process.env.DEEPSEEK_BASE_URL) return process.env.DEEPSEEK_BASE_URL;
-  return readConfig(path2).baseUrl;
+  return loadEndpoint(path2).baseUrl;
 }
 function isNonNegativeNumber(value) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0;
@@ -891,8 +840,8 @@ function computeWait(attempt, initial, cap, retryAfter) {
 }
 function sleep(ms, signal) {
   if (ms <= 0) return Promise.resolve();
-  return new Promise((resolve14, reject) => {
-    const timer = setTimeout(resolve14, ms);
+  return new Promise((resolve15, reject) => {
+    const timer = setTimeout(resolve15, ms);
     if (signal) {
       const onAbort = () => {
         clearTimeout(timer);
@@ -980,8 +929,8 @@ var DeepSeekClient = class {
     const waitMs = Math.max(0, this.nextChatRequestAt - now);
     this.nextChatRequestAt = Math.max(now, this.nextChatRequestAt) + this.minChatIntervalMs;
     if (waitMs <= 0) return;
-    await new Promise((resolve14, reject) => {
-      const timer = setTimeout(resolve14, waitMs);
+    await new Promise((resolve15, reject) => {
+      const timer = setTimeout(resolve15, waitMs);
       signal?.addEventListener(
         "abort",
         () => {
@@ -1197,10 +1146,10 @@ var PauseGate = class {
         `${kind}: no confirmation listener registered \u2014 cannot prompt the user. This tool can only be used inside an interactive Reasonix session.`
       );
     }
-    return new Promise((resolve14) => {
+    return new Promise((resolve15) => {
       const id = this._nextId++;
       const request = { id, kind, payload };
-      this._pending.set(id, { resolve: resolve14, request });
+      this._pending.set(id, { resolve: resolve15, request });
       for (const fn of this._listeners) {
         try {
           fn(request);
@@ -1330,7 +1279,7 @@ var EN = {
   cli: {
     description: "DeepSeek-native agent framework \u2014 built for cache hits and cheap tokens.",
     continue: "Resume the most recently used chat session without showing the picker.",
-    setup: "Interactive wizard \u2014 API key, preset, MCP servers. Re-run any time to reconfigure.",
+    setup: "Interactive wizard \u2014 API key, MCP servers. Re-run any time to reconfigure.",
     code: "Code-editing chat \u2014 filesystem tools rooted at <dir> (default: cwd), coding system prompt, v4-flash baseline.",
     chat: "Interactive Ink TUI with live cache/cost panel.",
     run: "Run a single task non-interactively, streaming output.",
@@ -1502,13 +1451,13 @@ var EN = {
     budgetHint: "session USD cap \u2014 warns at 80%, refuses next turn at 100%",
     modelIdHint: "DeepSeek model id (e.g. deepseek-v4-flash)",
     systemPromptHint: "override the default system prompt",
-    presetHint: "model bundle \u2014 auto|flash|pro",
+    effortHint: "reasoning effort \u2014 low|medium|high|max",
     sessionNameHint: "session name (default: 'default')",
     ephemeralHint: "disable session persistence for this run",
     mcpSpecHint: "MCP server spec (repeatable)",
     mcpPrefixHint: "prefix MCP tool names with this string",
     noConfigHint: "ignore ~/.reasonix/config.json for this run",
-    presetHintShort: "model bundle \u2014 auto|flash|pro",
+    effortHintShort: "reasoning effort \u2014 low|medium|high|max",
     budgetHintShort: "session USD cap",
     transcriptHintShort: "JSONL transcript path",
     mcpSpecHintShort: "MCP server spec (repeatable)",
@@ -1560,15 +1509,15 @@ var EN = {
   slash: {
     help: { description: "show the full command reference" },
     status: { description: "current model, flags, context, session" },
-    preset: {
-      description: "model bundle \u2014 auto escalates flash \u2192 pro, flash/pro lock",
-      argsHint: "<auto|flash|pro>"
+    effort: {
+      description: "reasoning_effort cap (low|medium|high|max); high is the safe default for vLLM/Azure",
+      argsHint: "<low|medium|high|max>"
     },
     model: { description: "switch DeepSeek model id", argsHint: "<id>" },
     models: { description: "list available models fetched from DeepSeek /models" },
     theme: {
       description: "show or persist the terminal theme preference. Bare opens picker.",
-      argsHint: "[auto|default|dark|light|tokyo-night|github-dark|github-light|high-contrast]"
+      argsHint: "[auto|dark|light|midnight|deep-blue|high-contrast]"
     },
     language: {
       description: "switch the runtime language",
@@ -1576,10 +1525,6 @@ var EN = {
       success: "Language switched to English.",
       unsupported: "Unsupported language code: {code}. Supported: {supported}."
     },
-    pro: {
-      description: "arm v4-pro for the NEXT turn only (one-shot \xB7 auto-disarms after turn)",
-      argsHint: "[off]"
-    },
     budget: {
       description: "session USD cap \u2014 warns at 80%, refuses next turn at 100%. Off by default. /budget alone shows status",
       argsHint: "[usd|off]"
@@ -1732,16 +1677,13 @@ var EN = {
     themeSampleHeading: "Sample",
     themeFooter: "[\u2191\u2193] navigate \xB7 [Enter] confirm \xB7 [Esc] cancel",
     themeCaption: {
-      default: "GitHub dark (default)",
-      dark: "Cool dark tones",
+      dark: "Cool dark tones (default)",
       light: "Clean light mode",
-      "tokyo-night": "Tokyo Night palette",
-      "github-dark": "GitHub dark",
-      "github-light": "GitHub light",
+      midnight: "Tokyo Night palette",
+      "deep-blue": "Deep blue on black",
       "high-contrast": "Accessibility"
     },
     reviewLabelTheme: "Theme",
-    presetTitle: "Pick a preset",
     mcpTitle: "Which MCP servers should Reasonix wire up for you?",
     mcpUserArgsHint: "(you'll provide {arg})",
     mcpFooterMulti: "[\u2191\u2193] navigate  \xB7  [Space] toggle  \xB7  [Enter] confirm  \xB7  [Esc] cancel  \xB7  empty = skip",
@@ -1755,7 +1697,6 @@ var EN = {
     reviewTitle: "Ready to save",
     reviewLabelApiKey: "API key",
     reviewLabelLanguage: "Language",
-    reviewLabelPreset: "Preset",
     reviewLabelMcp: "MCP",
     reviewMcpNone: "(none)",
     reviewMcpServers: "{count} server(s)",
@@ -1923,7 +1864,17 @@ var EN = {
     mcpFailed: "MCP {name} failed",
     mcpWarn: "MCP {name} warn",
     unknownTheme: "unknown theme: {name}\navailable: {choices}",
-    themeSaved: "theme saved: {name}\nactive on next launch: {active}"
+    themeSaved: "theme saved: {name}\nactive on next launch: {active}",
+    noPendingEdits: "nothing pending \u2014 the model hasn\u2019t proposed edits since the last /apply or /discard.",
+    noMatchedApply: "\u25B8 no edits matched those indices \u2014 nothing applied. Use /apply with no args to commit them all.",
+    noPendingDiscard: "nothing pending to discard.",
+    noMatchedDiscard: "\u25B8 no edits matched those indices \u2014 nothing discarded.",
+    blocksStillPending: "\u25B8 {count} edit block(s) still pending \u2014 /apply or /discard to clear them.",
+    nothingWritten: ". Nothing was written to disk.",
+    discardedCount: "\u25B8 discarded {count} pending edit block(s)",
+    noEventsFor: 'no events for session "{name}"',
+    lookedAtFile: "looked at: {path}",
+    sidecarHint: "(sessions auto-create the sidecar on first turn \u2014 has this session run yet?)"
   },
   hooks: {
     head: "hook {tag} `{cmd}` {decision}{truncTag}",
@@ -1943,13 +1894,9 @@ var EN = {
     budgetExhausted: "session budget exhausted \u2014 spent ${spent} \u2265 cap ${cap}. Bump the cap with /budget <usd>, clear it with /budget off, or end the session.",
     budget80Pct: "\u25B2 budget 80% used \u2014 ${spent} of ${cap}. Next turn or two likely trips the cap.",
     proArmed: "\u21E7 /pro armed \u2014 this turn runs on deepseek-v4-pro (one-shot \xB7 disarms after turn)",
-    abortedAtIter: "aborted at iter {iter} \u2014 stopped without producing a summary (press \u2191 + Enter or /retry to resume)",
     toolUploadStatus: "tool result uploaded \xB7 model thinking before next response\u2026",
-    preflightTruncateStatus: "preflight: context near full, truncating oldest history\u2026",
-    preflightTruncated: "preflight: request ~{estimate}/{ctxMax} tokens ({pct}%) \xB7 body {bodyKB} KB \u2014 truncated {beforeMessages} messages \u2192 {afterMessages}. Sending.",
-    preflightTruncatedStillFull: "preflight: request still ~{estimate}/{ctxMax} tokens ({pct}%) \xB7 body {bodyKB} KB after truncating {beforeMessages} messages \u2192 {afterMessages}. DeepSeek will likely 400. Run /clear or /new to start fresh.",
-    preflightNoFold: "preflight: request ~{estimate}/{ctxMax} tokens ({pct}%) \xB7 body {bodyKB} KB and nothing left to truncate \u2014 DeepSeek will likely 400. Run /clear or /new to start fresh.",
-    flashEscalation: "\u21E7 flash requested escalation \u2014 retrying this turn on {model}{reasonSuffix}",
+    turnStartFoldStatus: "turn start: context approaching limit, compacting history\u2026",
+    turnStartFolded: "turn start: request ~{estimate}/{ctxMax} tokens ({pct}%) \u2014 compacted {beforeMessages} messages \u2192 {afterMessages}. Sending.",
     harvestStatus: "extracting plan state from reasoning\u2026",
     repeatToolCallWarning: "Caught a repeated tool call \u2014 let the model see the issue and retry with a different approach.",
     stormStuck: "Stopped a stuck retry loop \u2014 the model kept calling the same tool with identical args after a self-correction nudge. Try /retry, rephrase, or rule out the underlying blocker.",
@@ -1972,7 +1919,7 @@ var EN = {
     deepseek5xxReachable: " DeepSeek's main API answered our health check, but /chat/completions is failing \u2014 partial outage on their side.",
     deepseek5xxUnreachable: " DeepSeek API is unreachable from your network \u2014 could be a wider DS outage or a local network issue.",
     deepseek5xxActionNetwork: " Try: (1) check your network, (2) wait 30s and retry, (3) status page: https://status.deepseek.com.",
-    deepseek5xxActionRetry: " Try: (1) wait 30s and retry, (2) /preset to switch model, (3) status page: https://status.deepseek.com.",
+    deepseek5xxActionRetry: " Try: (1) wait 30s and retry, (2) /model to switch model, (3) status page: https://status.deepseek.com.",
     innerNoMessage: "(no message)",
     reasonAborted: "[aborted by user (Esc) \u2014 summarizing what I found so far]",
     reasonContextGuard: "[context budget running low \u2014 summarizing before the next call would overflow]",
@@ -2010,10 +1957,6 @@ var EN = {
       helpUrl: "  @https://example.com     fetch the URL, strip HTML, inline under [Referenced URLs].",
       helpUrlCache: "                             Same URL twice in one session fetches once (in-mem cache).",
       helpUrlPunct: "                             Trailing sentence punctuation (./,/)) is stripped automatically.",
-      helpPresetsTitle: "Presets (branch + harvest are NEVER auto-enabled \u2014 opt-in only):",
-      helpPresetAuto: "  auto   v4-flash \u2192 v4-pro on hard turns  \u2190 default \xB7 cheap when easy, smart when hard",
-      helpPresetFlash: "  flash  v4-flash always                  cheapest \xB7 predictable per-turn cost",
-      helpPresetPro: "  pro    v4-pro   always                  ~3\xD7 flash (5/31) \xB7 hard multi-turn work",
       helpSessionsTitle: "Sessions (auto-enabled by default, named 'default'):",
       helpSessionCustom: "  reasonix chat --session <name>   use a different named session",
       helpSessionNone: "  reasonix chat --no-session       disable persistence for this run",
@@ -2155,14 +2098,9 @@ var EN = {
       modelUsage: "usage: /model <id>   ({hint})",
       modelNotInCatalog: "model \u2192 {id}   (\u26A0 not in the fetched catalog: {list}. If this is wrong the next call will 400 \u2014 run /models to refresh.)",
       modelSet: "model \u2192 {id}",
-      presetAuto: "preset \u2192 auto  (v4-flash \u2192 v4-pro on hard turns \xB7 default)",
-      presetFlash: "preset \u2192 flash  (v4-flash always \xB7 cheapest \xB7 /pro still bumps one turn)",
-      presetPro: "preset \u2192 pro  (v4-pro always \xB7 ~3\xD7 flash \xB7 for hard multi-turn work)",
-      presetUsage: "usage: /preset <auto|flash|pro>",
-      proNothingArmed: "nothing armed \u2014 /pro with no args will arm pro for your next turn",
-      proDisarmed: "\u25B8 /pro disarmed \u2014 next turn falls back to the current preset",
-      proUsage: "usage: /pro       arm pro for the next turn (one-shot, auto-disarms after)\n       /pro off  cancel armed state before the next turn",
-      proArmed: "\u25B8 /pro armed \u2014 your NEXT message runs on {model} regardless of preset. Auto-disarms after one turn. Use /preset max for a persistent switch.",
+      effortStatus: "effort \u2192 {current}   (pick: {list})",
+      effortUsage: "usage: /effort <{list}>   (high is the safe default; max is a DeepSeek extension)",
+      effortSet: "effort \u2192 {effort}",
       budgetNoCap: "no session budget set \u2014 Reasonix will keep going until you stop it. Set one with: /budget <usd>   (e.g. /budget 5)",
       budgetStatus: "budget: ${spent} of ${cap} ({pct}%) \xB7 /budget off to clear, /budget <usd> to change",
       budgetOff: "budget \u2192 off (no cap)",
@@ -2208,7 +2146,10 @@ var EN = {
       ready: "\u25B8 dashboard ready:",
       readyHint: "127.0.0.1 only \xB7 token-gated. Type `/dashboard stop` to shut down.",
       failed: "\u25B8 dashboard failed to start: {reason}",
-      starting: "\u25B8 starting dashboard server\u2026"
+      starting: "\u25B8 starting dashboard server\u2026",
+      copied: "\u25B8 dashboard URL copied to clipboard: {url}",
+      tokenResetting: "\u25B8 rotating dashboard token \u2014 restarting server\u2026",
+      tokenReset: "\u25B8 dashboard token rotated. New URL:"
     },
     observability: {
       contextInfo: "context: ~{total} of {max} ({pct}%) \xB7 system {sys} \xB7 tools {tools} \xB7 log {log}",
@@ -2448,7 +2389,10 @@ var EN = {
     editorExited: "editor exited with code {code}",
     typeaheadStaged: "\u25B8 {count} line(s) staged \xB7 esc recall",
     steerPlaceholder: "type to steer the current task \u2014 commands are disabled while busy",
-    steerHint: "send \u2014 injected mid-turn"
+    steerHint: "send \u2014 injected mid-turn",
+    stashNothing: "Nothing to stash",
+    stashSaved: "Stashed",
+    stashRecall: "Recalled"
   },
   pathConfirm: {
     title: "Outside-sandbox path",
@@ -2562,8 +2506,14 @@ var EN = {
     loading: "  \xB7  loading catalog\u2026",
     catalogEmpty: "  \xB7  catalog empty \u2014 using known fallbacks",
     modelsAvailable: "  \xB7  {count} models available",
-    presetsHeader: "    PRESETS  \xB7  recommended \u2014 model + effort + auto-escalate",
-    modelsHeader: "    MODELS  \xB7  raw pick \u2014 auto-escalate stays as-is",
+    effortHeader: "    EFFORT  \xB7  reasoning_effort cap",
+    modelsHeader: "    MODELS  \xB7  DeepSeek-compatible ids",
+    effortDesc: {
+      low: "fastest \u2014 minimal reasoning",
+      medium: "balanced",
+      high: "default \u2014 safe for vLLM / Azure",
+      max: "DeepSeek extension; rejected by stock OpenAI / vLLM"
+    },
     pickerFooter: "  \u2191\u2193 pick  \xB7  \u23CE confirm  \xB7  [r] refresh  \xB7  esc cancel",
     currentLabel: "  \xB7 current"
   },
@@ -2720,8 +2670,10 @@ var EN = {
     hitsPlural: "{count} hits \xB7 {files} files",
     moreHitSingular: "\u22EE +{count} more hit",
     moreHitsPlural: "\u22EE +{count} more hits",
-    earlierLine: "\u22EE {count} earlier line (use /tool to read full)",
-    earlierLines: "\u22EE {count} earlier lines (use /tool to read full)",
+    earlierLine: "\u22EE {count} hidden line (Ctrl+R for full output)",
+    earlierLines: "\u22EE {count} hidden lines (Ctrl+R for full output)",
+    hiddenLine: "\u22EE {count} hidden line",
+    hiddenLines: "\u22EE {count} hidden lines",
     earlierStackLine: "\u22EE {count} earlier stack line hidden",
     earlierStackLines: "\u22EE {count} earlier stack lines hidden",
     agent: "agent \xB7 {name}",
@@ -2927,14 +2879,15 @@ var EN = {
     descNewSession: "New session",
     descListSessions: "List sessions",
     descSwitchModel: "Switch model",
-    descSwitchPreset: "Switch preset",
+    descSwitchEffort: "Switch reasoning effort",
     descSwitchTheme: "Switch theme",
     descCtrlC: "Quit",
     descEsc: "Stop / Cancel",
     descCtrlR: "Toggle verbose",
     descCtrlO: "Expand reply (streaming only)",
     descHelp: "Show all commands",
-    descShiftTab: "Switch edit mode"
+    descShiftTab: "Switch edit mode",
+    descAltS: "Stash / recall input"
   },
   mcpCli: {
     bundledCatalog: "Bundled MCP servers (offline catalog):",
@@ -2977,7 +2930,7 @@ var zhCN = {
   cli: {
     description: "DeepSeek \u539F\u751F\u667A\u80FD\u4F53\u6846\u67B6 \u2014 \u4E13\u4E3A\u7F13\u5B58\u547D\u4E2D\u548C\u4F4E\u6210\u672C\u4EE4\u724C\u6784\u5EFA\u3002",
     continue: "\u6062\u590D\u6700\u8FD1\u4F7F\u7528\u7684\u804A\u5929\u4F1A\u8BDD\uFF0C\u4E0D\u663E\u793A\u9009\u62E9\u5668\u3002",
-    setup: "\u4EA4\u4E92\u5F0F\u5411\u5BFC \u2014 API \u5BC6\u94A5\u3001\u9884\u8BBE\u3001MCP \u670D\u52A1\u5668\u3002\u968F\u65F6\u91CD\u65B0\u8FD0\u884C\u4EE5\u91CD\u65B0\u914D\u7F6E\u3002",
+    setup: "\u4EA4\u4E92\u5F0F\u5411\u5BFC \u2014 API \u5BC6\u94A5\u3001MCP \u670D\u52A1\u5668\u3002\u968F\u65F6\u91CD\u65B0\u8FD0\u884C\u4EE5\u91CD\u65B0\u914D\u7F6E\u3002",
     code: "\u4EE3\u7801\u7F16\u8F91\u804A\u5929 \u2014 \u4EE5 <dir>\uFF08\u9ED8\u8BA4\uFF1Acwd\uFF09\u4E3A\u6839\u7684\u6587\u4EF6\u7CFB\u7EDF\u5DE5\u5177\uFF0C\u7F16\u7801\u7CFB\u7EDF\u63D0\u793A\u8BCD\uFF0Cv4-flash \u57FA\u7EBF\u3002",
     chat: "\u5177\u6709\u5B9E\u65F6\u7F13\u5B58/\u6210\u672C\u9762\u677F\u7684\u4EA4\u4E92\u5F0F Ink TUI\u3002",
     run: "\u4EE5\u975E\u4EA4\u4E92\u65B9\u5F0F\u8FD0\u884C\u5355\u4E2A\u4EFB\u52A1\uFF0C\u6D41\u5F0F\u8F93\u51FA\u3002",
@@ -3143,13 +3096,13 @@ var zhCN = {
     budgetHint: "\u4F1A\u8BDD\u7F8E\u5143\u4E0A\u9650 \u2014 80% \u65F6\u8B66\u544A\uFF0C100% \u65F6\u62D2\u7EDD\u4E0B\u4E00\u8F6E",
     modelIdHint: "DeepSeek \u6A21\u578B ID\uFF08\u4F8B\u5982 deepseek-v4-flash\uFF09",
     systemPromptHint: "\u8986\u76D6\u9ED8\u8BA4\u7CFB\u7EDF\u63D0\u793A\u8BCD",
-    presetHint: "\u6A21\u578B\u7EC4\u5408 \u2014 auto|flash|pro",
+    effortHint: "\u63A8\u7406\u5F3A\u5EA6 \u2014 low|medium|high|max",
     sessionNameHint: "\u4F1A\u8BDD\u540D\u79F0\uFF08\u9ED8\u8BA4\uFF1A'default'\uFF09",
     ephemeralHint: "\u7981\u7528\u672C\u6B21\u8FD0\u884C\u7684\u4F1A\u8BDD\u6301\u4E45\u5316",
     mcpSpecHint: "MCP \u670D\u52A1\u5668\u89C4\u683C\uFF08\u53EF\u91CD\u590D\uFF09",
     mcpPrefixHint: "\u7528\u6B64\u5B57\u7B26\u4E32\u4E3A MCP \u5DE5\u5177\u540D\u6DFB\u52A0\u524D\u7F00",
     noConfigHint: "\u672C\u6B21\u8FD0\u884C\u5FFD\u7565 ~/.reasonix/config.json",
-    presetHintShort: "\u6A21\u578B\u7EC4\u5408 \u2014 auto|flash|pro",
+    effortHintShort: "\u63A8\u7406\u5F3A\u5EA6 \u2014 low|medium|high|max",
     budgetHintShort: "\u4F1A\u8BDD\u7F8E\u5143\u4E0A\u9650",
     transcriptHintShort: "JSONL \u8F6C\u5F55\u7A3F\u8DEF\u5F84",
     mcpSpecHintShort: "MCP \u670D\u52A1\u5668\u89C4\u683C\uFF08\u53EF\u91CD\u590D\uFF09",
@@ -3201,15 +3154,15 @@ var zhCN = {
   slash: {
     help: { description: "\u663E\u793A\u5B8C\u6574\u547D\u4EE4\u53C2\u8003" },
     status: { description: "\u5F53\u524D\u6A21\u578B\u3001\u6807\u5FD7\u3001\u4E0A\u4E0B\u6587\u3001\u4F1A\u8BDD" },
-    preset: {
-      description: "\u6A21\u578B\u7EC4\u5408 \u2014 \u81EA\u52A8\u5728 flash \u2192 pro \u4E4B\u95F4\u5207\u6362\uFF0C\u6216\u9501\u5B9A flash/pro",
-      argsHint: "<auto|flash|pro>"
+    effort: {
+      description: "\u63A8\u7406\u5F3A\u5EA6\u4E0A\u9650\uFF08low|medium|high|max\uFF09\uFF1Bhigh \u662F vLLM/Azure \u5B89\u5168\u9ED8\u8BA4",
+      argsHint: "<low|medium|high|max>"
     },
     model: { description: "\u5207\u6362 DeepSeek \u6A21\u578B ID", argsHint: "<id>" },
     models: { description: "\u5217\u51FA\u4ECE DeepSeek /models \u83B7\u53D6\u7684\u53EF\u7528\u6A21\u578B" },
     theme: {
       description: "\u663E\u793A\u6216\u6301\u4E45\u5316\u7EC8\u7AEF\u4E3B\u9898\u504F\u597D\u3002\u65E0\u53C2\u6570\u65F6\u6253\u5F00\u9009\u62E9\u5668\u3002",
-      argsHint: "[auto|default|dark|light|tokyo-night|github-dark|github-light|high-contrast]"
+      argsHint: "[auto|dark|light|midnight|deep-blue|high-contrast]"
     },
     language: {
       description: "\u5207\u6362\u8FD0\u884C\u65F6\u8BED\u8A00",
@@ -3217,10 +3170,6 @@ var zhCN = {
       success: "\u8BED\u8A00\u5DF2\u5207\u6362\u4E3A\u7B80\u4F53\u4E2D\u6587\u3002",
       unsupported: "\u4E0D\u652F\u6301\u7684\u8BED\u8A00\u4EE3\u7801\uFF1A{code}\u3002\u652F\u6301\u7684\u8BED\u8A00\uFF1A{supported}\u3002"
     },
-    pro: {
-      description: "\u4EC5\u4E3A\u4E0B\u4E00\u8F6E\u542F\u7528 v4-pro\uFF08\u4E00\u6B21\u6027 \xB7 \u81EA\u52A8\u89E3\u9664\uFF09",
-      argsHint: "[off]"
-    },
     budget: {
       description: "\u4F1A\u8BDD\u7F8E\u5143\u4E0A\u9650 \u2014 80% \u65F6\u8B66\u544A\uFF0C100% \u65F6\u62D2\u7EDD\u4E0B\u4E00\u8F6E\u3002\u9ED8\u8BA4\u5173\u95ED\u3002\u5355\u72EC /budget \u663E\u793A\u72B6\u6001",
       argsHint: "[usd|off]"
@@ -3377,16 +3326,13 @@ var zhCN = {
     themeSampleHeading: "\u793A\u4F8B",
     themeFooter: "[\u2191\u2193] \u79FB\u52A8 \xB7 [Enter] \u786E\u8BA4 \xB7 [Esc] \u53D6\u6D88",
     themeCaption: {
-      default: "GitHub \u6DF1\u8272\uFF08\u9ED8\u8BA4\uFF09",
-      dark: "\u6DF1\u8272\u8C03",
+      dark: "\u6DF1\u8272\u8C03\uFF08\u9ED8\u8BA4\uFF09",
       light: "\u6E05\u723D\u6D45\u8272",
-      "tokyo-night": "\u4E1C\u4EAC\u591C\u8272",
-      "github-dark": "GitHub \u6DF1\u8272",
-      "github-light": "GitHub \u6D45\u8272",
+      midnight: "\u4E1C\u4EAC\u591C\u8272",
+      "deep-blue": "\u6DF1\u84DD\u7EAF\u9ED1",
       "high-contrast": "\u9AD8\u5BF9\u6BD4\u5EA6\uFF08\u65E0\u969C\u788D\uFF09"
     },
     reviewLabelTheme: "\u4E3B\u9898",
-    presetTitle: "\u9009\u62E9\u9884\u8BBE",
     mcpTitle: "Reasonix \u8981\u4E3A\u4F60\u63A5\u5165\u54EA\u4E9B MCP \u670D\u52A1\u5668\uFF1F",
     mcpUserArgsHint: "\uFF08\u9700\u8981\u4F60\u63D0\u4F9B {arg}\uFF09",
     mcpFooterMulti: "[\u2191\u2193] \u79FB\u52A8  \xB7  [\u7A7A\u683C] \u9009\u62E9  \xB7  [Enter] \u786E\u8BA4  \xB7  [Esc] \u53D6\u6D88  \xB7  \u5168\u4E0D\u9009 = \u8DF3\u8FC7",
@@ -3400,7 +3346,6 @@ var zhCN = {
     reviewTitle: "\u786E\u8BA4\u4FDD\u5B58",
     reviewLabelApiKey: "API key",
     reviewLabelLanguage: "\u8BED\u8A00",
-    reviewLabelPreset: "\u9884\u8BBE",
     reviewLabelMcp: "MCP",
     reviewMcpNone: "\uFF08\u65E0\uFF09",
     reviewMcpServers: "{count} \u4E2A\u670D\u52A1\u5668",
@@ -3568,7 +3513,17 @@ var zhCN = {
     mcpFailed: "MCP {name} \u5931\u8D25",
     mcpWarn: "MCP {name} \u8B66\u544A",
     unknownTheme: "\u672A\u77E5\u4E3B\u9898\uFF1A{name}\n\u53EF\u7528\u4E3B\u9898\uFF1A{choices}",
-    themeSaved: "\u4E3B\u9898\u5DF2\u4FDD\u5B58\uFF1A{name}\n\u4E0B\u6B21\u542F\u52A8\u751F\u6548\uFF1A{active}"
+    themeSaved: "\u4E3B\u9898\u5DF2\u4FDD\u5B58\uFF1A{name}\n\u4E0B\u6B21\u542F\u52A8\u751F\u6548\uFF1A{active}",
+    noPendingEdits: "\u6CA1\u6709\u5F85\u5904\u7406\u7684\u7F16\u8F91 \u2014 \u81EA\u4E0A\u6B21 /apply \u6216 /discard \u4EE5\u6765\u6A21\u578B\u672A\u63D0\u51FA\u4FEE\u6539\u3002",
+    noMatchedApply: "\u25B8 \u6CA1\u6709\u5339\u914D\u8FD9\u4E9B\u7D22\u5F15\u7684\u7F16\u8F91 \u2014 \u4EC0\u4E48\u90FD\u6CA1\u5E94\u7528\u3002\u4E0D\u5E26\u53C2\u6570\u4F7F\u7528 /apply \u63D0\u4EA4\u5168\u90E8\u3002",
+    noPendingDiscard: "\u6CA1\u6709\u53EF\u4E22\u5F03\u7684\u5F85\u5904\u7406\u7F16\u8F91\u3002",
+    noMatchedDiscard: "\u25B8 \u6CA1\u6709\u5339\u914D\u8FD9\u4E9B\u7D22\u5F15\u7684\u7F16\u8F91 \u2014 \u4EC0\u4E48\u90FD\u6CA1\u4E22\u5F03\u3002",
+    blocksStillPending: "\u25B8 \u8FD8\u6709 {count} \u4E2A\u5F85\u5904\u7406\u7F16\u8F91 \u2014 \u4F7F\u7528 /apply \u6216 /discard \u5904\u7406\u3002",
+    nothingWritten: "\u3002\u6CA1\u6709\u5199\u5165\u78C1\u76D8\u3002",
+    discardedCount: "\u25B8 \u5DF2\u4E22\u5F03 {count} \u4E2A\u5F85\u5904\u7406\u7F16\u8F91",
+    noEventsFor: '\u6CA1\u6709\u4F1A\u8BDD "{name}" \u7684\u4E8B\u4EF6',
+    lookedAtFile: "\u4F4D\u7F6E\uFF1A{path}",
+    sidecarHint: "\uFF08\u4F1A\u8BDD\u4F1A\u5728\u7B2C\u4E00\u8F6E\u65F6\u81EA\u52A8\u521B\u5EFA sidecar \u2014 \u6B64\u4F1A\u8BDD\u662F\u5426\u8FD0\u884C\u8FC7\uFF1F\uFF09"
   },
   hooks: {
     head: "\u94A9\u5B50 {tag} `{cmd}` {decision}{truncTag}",
@@ -3588,13 +3543,9 @@ var zhCN = {
     budgetExhausted: "\u4F1A\u8BDD\u9884\u7B97\u5DF2\u7528\u5B8C \u2014 \u5DF2\u82B1\u8D39 ${spent} \u2265 \u4E0A\u9650 ${cap}\u3002\u7528 /budget <usd> \u63D0\u9AD8\u4E0A\u9650\uFF0C/budget off \u6E05\u9664\u4E0A\u9650\uFF0C\u6216\u7ED3\u675F\u4F1A\u8BDD\u3002",
     budget80Pct: "\u25B2 \u9884\u7B97\u5DF2\u7528 80% \u2014 ${spent} / ${cap}\u3002\u4E0B\u4E00\u4E24\u8F6E\u53EF\u80FD\u5C31\u89E6\u9876\u3002",
     proArmed: "\u21E7 /pro \u5DF2\u88C5\u5907 \u2014 \u672C\u8F6E\u4F7F\u7528 deepseek-v4-pro\uFF08\u4E00\u6B21\u6027 \xB7 \u672C\u8F6E\u540E\u81EA\u52A8\u89E3\u9664\uFF09",
-    abortedAtIter: "\u5728\u7B2C {iter} \u6B21\u5DE5\u5177\u8C03\u7528\u5904\u4E2D\u65AD \u2014 \u672A\u751F\u6210\u603B\u7ED3\u5373\u505C\u6B62\uFF08\u6309 \u2191 + Enter \u6216 /retry \u6062\u590D\uFF09",
     toolUploadStatus: "\u5DE5\u5177\u7ED3\u679C\u5DF2\u4E0A\u4F20 \xB7 \u6A21\u578B\u5728\u751F\u6210\u4E0B\u4E00\u6761\u54CD\u5E94\u524D\u601D\u8003\u4E2D\u2026",
-    preflightTruncateStatus: "\u9884\u68C0\uFF1A\u4E0A\u4E0B\u6587\u63A5\u8FD1\u4E0A\u9650\uFF0C\u6B63\u5728\u88C1\u526A\u6700\u65E9\u5386\u53F2\u2026",
-    preflightTruncated: "\u9884\u68C0\uFF1A\u8BF7\u6C42\u7EA6 {estimate}/{ctxMax} tokens\uFF08{pct}%\uFF09\xB7 body {bodyKB} KB \u2014 \u5DF2\u88C1\u526A {beforeMessages} \u6761\u6D88\u606F \u2192 {afterMessages}\u3002\u53D1\u9001\u4E2D\u3002",
-    preflightTruncatedStillFull: "\u9884\u68C0\uFF1A\u88C1\u526A {beforeMessages} \u6761\u6D88\u606F \u2192 {afterMessages} \u540E\uFF0C\u8BF7\u6C42\u4ECD\u7EA6 {estimate}/{ctxMax} tokens\uFF08{pct}%\uFF09\xB7 body {bodyKB} KB \u2014 DeepSeek \u5927\u6982\u7387\u4F1A\u8FD4\u56DE 400\u3002\u8BF7\u8FD0\u884C /clear \u6216 /new \u91CD\u65B0\u5F00\u59CB\u3002",
-    preflightNoFold: "\u9884\u68C0\uFF1A\u8BF7\u6C42\u7EA6 {estimate}/{ctxMax} tokens\uFF08{pct}%\uFF09\xB7 body {bodyKB} KB \u4E14\u6CA1\u6709\u53EF\u88C1\u526A\u7684\u5185\u5BB9 \u2014 DeepSeek \u5927\u6982\u7387\u4F1A\u8FD4\u56DE 400\u3002\u8BF7\u8FD0\u884C /clear \u6216 /new \u91CD\u65B0\u5F00\u59CB\u3002",
-    flashEscalation: "\u21E7 flash \u8BF7\u6C42\u5347\u7EA7 \u2014 \u672C\u8F6E\u6539\u7528 {model}{reasonSuffix}",
+    turnStartFoldStatus: "\u56DE\u5408\u5F00\u59CB\uFF1A\u4E0A\u4E0B\u6587\u63A5\u8FD1\u4E0A\u9650\uFF0C\u6B63\u5728\u538B\u7F29\u5386\u53F2\u2026",
+    turnStartFolded: "\u56DE\u5408\u5F00\u59CB\uFF1A\u8BF7\u6C42\u7EA6 {estimate}/{ctxMax} tokens\uFF08{pct}%\uFF09\u2014 \u5DF2\u538B\u7F29 {beforeMessages} \u6761\u6D88\u606F \u2192 {afterMessages}\u3002\u53D1\u9001\u4E2D\u3002",
     harvestStatus: "\u6B63\u5728\u4ECE\u63A8\u7406\u8FC7\u7A0B\u63D0\u53D6\u8BA1\u5212\u72B6\u6001\u2026",
     repeatToolCallWarning: "\u62E6\u622A\u5230\u91CD\u590D\u5DE5\u5177\u8C03\u7528 \u2014 \u8BA9\u6A21\u578B\u5BDF\u89C9\u95EE\u9898\u5E76\u6362\u79CD\u65B9\u5F0F\u91CD\u8BD5\u3002",
     stormStuck: "\u5DF2\u505C\u6B62\u5361\u6B7B\u7684\u91CD\u8BD5\u5FAA\u73AF \u2014 \u6A21\u578B\u5728\u81EA\u7EA0\u63D0\u793A\u540E\u4ECD\u4EE5\u76F8\u540C\u53C2\u6570\u91CD\u590D\u8C03\u7528\u540C\u4E00\u5DE5\u5177\u3002\u8BF7\u5C1D\u8BD5 /retry\u3001\u6362\u79CD\u8BF4\u6CD5\uFF0C\u6216\u6392\u67E5\u5E95\u5C42\u963B\u585E\u3002",
@@ -3617,7 +3568,7 @@ var zhCN = {
     deepseek5xxReachable: " DeepSeek \u4E3B API \u5065\u5EB7\u68C0\u67E5\u901A\u8FC7\uFF0C\u4F46 /chat/completions \u5728\u6302 \u2014 \u4ED6\u4EEC\u90A3\u8FB9\u90E8\u5206\u670D\u52A1\u5F02\u5E38\u3002",
     deepseek5xxUnreachable: " \u65E0\u6CD5\u4ECE\u4F60\u7684\u7F51\u7EDC\u8BBF\u95EE DeepSeek API \u2014 \u53EF\u80FD\u662F DS \u6574\u4F53\u6545\u969C\uFF0C\u4E5F\u53EF\u80FD\u662F\u672C\u5730\u7F51\u7EDC\u95EE\u9898\u3002",
     deepseek5xxActionNetwork: " \u5EFA\u8BAE\uFF1A(1) \u68C0\u67E5\u7F51\u7EDC\uFF0C(2) \u7B49 30 \u79D2\u540E\u91CD\u8BD5\uFF0C(3) \u67E5\u770B\u72B6\u6001\u9875 https://status.deepseek.com\u3002",
-    deepseek5xxActionRetry: " \u5EFA\u8BAE\uFF1A(1) \u7B49 30 \u79D2\u540E\u91CD\u8BD5\uFF0C(2) \u7528 /preset \u5207\u6362\u6A21\u578B\uFF0C(3) \u67E5\u770B\u72B6\u6001\u9875 https://status.deepseek.com\u3002",
+    deepseek5xxActionRetry: " \u5EFA\u8BAE\uFF1A(1) \u7B49 30 \u79D2\u540E\u91CD\u8BD5\uFF0C(2) \u7528 /model \u5207\u6362\u6A21\u578B\uFF0C(3) \u67E5\u770B\u72B6\u6001\u9875 https://status.deepseek.com\u3002",
     innerNoMessage: "\uFF08\u65E0\u9519\u8BEF\u4FE1\u606F\uFF09",
     reasonAborted: "[\u7528\u6237\u5DF2\u4E2D\u65AD\uFF08Esc\uFF09 \u2014 \u6B63\u5728\u603B\u7ED3\u5230\u76EE\u524D\u4E3A\u6B62\u7684\u53D1\u73B0]",
     reasonContextGuard: "[\u4E0A\u4E0B\u6587\u989D\u5EA6\u5373\u5C06\u8017\u5C3D \u2014 \u5728\u4E0B\u4E00\u6B21\u8C03\u7528\u6EA2\u51FA\u4E4B\u524D\u5148\u603B\u7ED3]",
@@ -3655,10 +3606,6 @@ var zhCN = {
       helpUrl: "  @https://example.com     \u83B7\u53D6 URL\uFF0C\u5265\u79BB HTML\uFF0C\u5185\u8054\u5230 [Referenced URLs] \u4E0B\u3002",
       helpUrlCache: "                             \u540C\u4E00\u4F1A\u8BDD\u4E2D\u76F8\u540C URL \u53EA\u83B7\u53D6\u4E00\u6B21\uFF08\u5185\u5B58\u7F13\u5B58\uFF09\u3002",
       helpUrlPunct: "                             \u81EA\u52A8\u5265\u79BB\u5C3E\u90E8\u6807\u70B9\u7B26\u53F7\uFF08./,/\uFF09\uFF09\u3002",
-      helpPresetsTitle: "\u9884\u8BBE\uFF08branch + harvest \u6C38\u8FDC\u4E0D\u4F1A\u81EA\u52A8\u542F\u7528 \u2014 \u4EC5\u624B\u52A8\u9009\u62E9\uFF09\uFF1A",
-      helpPresetAuto: "  auto   v4-flash \u2192 v4-pro \u5728\u56F0\u96BE\u8F6E\u6B21\u5207\u6362  \u2190 \u9ED8\u8BA4 \xB7 \u7B80\u5355\u65F6\u4FBF\u5B9C\uFF0C\u56F0\u96BE\u65F6\u667A\u80FD",
-      helpPresetFlash: "  flash  \u59CB\u7EC8\u4F7F\u7528 v4-flash                  \u6700\u4FBF\u5B9C \xB7 \u6BCF\u8F6E\u6210\u672C\u53EF\u9884\u6D4B",
-      helpPresetPro: "  pro    \u59CB\u7EC8\u4F7F\u7528 v4-pro                     \u7EA6 3 \u500D flash \xB7 \u7528\u4E8E\u56F0\u96BE\u7684\u591A\u8F6E\u5DE5\u4F5C",
       helpSessionsTitle: "\u4F1A\u8BDD\uFF08\u9ED8\u8BA4\u81EA\u52A8\u542F\u7528\uFF0C\u547D\u540D\u4E3A 'default'\uFF09\uFF1A",
       helpSessionCustom: "  reasonix chat --session <name>   \u4F7F\u7528\u4E0D\u540C\u7684\u547D\u540D\u4F1A\u8BDD",
       helpSessionNone: "  reasonix chat --no-session       \u7981\u7528\u672C\u6B21\u8FD0\u884C\u7684\u6301\u4E45\u5316",
@@ -3800,14 +3747,9 @@ var zhCN = {
       modelUsage: "\u7528\u6CD5\uFF1A/model <id>   \uFF08{hint}\uFF09",
       modelNotInCatalog: "model \u2192 {id}   \uFF08\u26A0 \u4E0D\u5728\u83B7\u53D6\u7684\u76EE\u5F55\u4E2D\uFF1A{list}\u3002\u5982\u679C\u8FD9\u662F\u9519\u8BEF\u7684\uFF0C\u4E0B\u6B21\u8C03\u7528\u5C06\u8FD4\u56DE 400 \u2014 \u8FD0\u884C /models \u5237\u65B0\u3002\uFF09",
       modelSet: "model \u2192 {id}",
-      presetAuto: "preset \u2192 auto  \uFF08v4-flash \u2192 v4-pro \u5728\u56F0\u96BE\u8F6E\u6B21\u5207\u6362 \xB7 \u9ED8\u8BA4\uFF09",
-      presetFlash: "preset \u2192 flash  \uFF08\u59CB\u7EC8\u4F7F\u7528 v4-flash \xB7 \u6700\u4FBF\u5B9C \xB7 /pro \u4ECD\u53EF\u4E34\u65F6\u63D0\u5347\u4E00\u8F6E\uFF09",
-      presetPro: "preset \u2192 pro  \uFF08\u59CB\u7EC8\u4F7F\u7528 v4-pro \xB7 \u7EA6 3 \u500D flash \xB7 \u7528\u4E8E\u56F0\u96BE\u7684\u591A\u8F6E\u5DE5\u4F5C\uFF09",
-      presetUsage: "\u7528\u6CD5\uFF1A/preset <auto|flash|pro>",
-      proNothingArmed: "\u672A\u542F\u7528 \u2014 /pro \u4E0D\u5E26\u53C2\u6570\u5C06\u4E3A\u4E0B\u4E00\u8F6E\u542F\u7528 pro",
-      proDisarmed: "\u25B8 /pro \u5DF2\u89E3\u9664 \u2014 \u4E0B\u4E00\u8F6E\u56DE\u9000\u5230\u5F53\u524D\u9884\u8BBE",
-      proUsage: "\u7528\u6CD5\uFF1A/pro       \u4E3A\u4E0B\u4E00\u8F6E\u542F\u7528 pro\uFF08\u4E00\u6B21\u6027\uFF0C\u81EA\u52A8\u89E3\u9664\uFF09\n       /pro off  \u5728\u4E0B\u4E00\u8F6E\u524D\u53D6\u6D88\u542F\u7528\u72B6\u6001",
-      proArmed: "\u25B8 /pro \u5DF2\u542F\u7528 \u2014 \u60A8\u7684\u4E0B\u4E00\u6761\u6D88\u606F\u5C06\u5728 {model} \u4E0A\u8FD0\u884C\uFF0C\u65E0\u8BBA\u9884\u8BBE\u5982\u4F55\u3002\u4E00\u8F6E\u540E\u81EA\u52A8\u89E3\u9664\u3002\u4F7F\u7528 /preset max \u8FDB\u884C\u6301\u4E45\u5207\u6362\u3002",
+      effortStatus: "effort \u2192 {current}   \uFF08\u53EF\u9009\uFF1A{list}\uFF09",
+      effortUsage: "\u7528\u6CD5\uFF1A/effort <{list}>   \uFF08high \u4E3A\u5B89\u5168\u9ED8\u8BA4\uFF1Bmax \u662F DeepSeek \u6269\u5C55\uFF09",
+      effortSet: "effort \u2192 {effort}",
       budgetNoCap: "\u672A\u8BBE\u7F6E\u4F1A\u8BDD\u9884\u7B97 \u2014 Reasonix \u5C06\u6301\u7EED\u8FD0\u884C\u76F4\u5230\u60A8\u505C\u6B62\u3002\u4F7F\u7528\u4EE5\u4E0B\u65B9\u5F0F\u8BBE\u7F6E\uFF1A/budget <usd>   \uFF08\u4F8B\u5982 /budget 5\uFF09",
       budgetStatus: "\u9884\u7B97\uFF1A${spent} / ${cap}\uFF08{pct}%\uFF09\xB7 /budget off \u6E05\u9664\uFF0C/budget <usd> \u66F4\u6539",
       budgetOff: "budget \u2192 \u5173\u95ED\uFF08\u65E0\u4E0A\u9650\uFF09",
@@ -3853,7 +3795,10 @@ var zhCN = {
       ready: "\u25B8 \u4EEA\u8868\u677F\u5C31\u7EEA\uFF1A",
       readyHint: "\u4EC5 127.0.0.1 \xB7 token \u4FDD\u62A4\u3002\u8F93\u5165 `/dashboard stop` \u5173\u95ED\u3002",
       failed: "\u25B8 \u4EEA\u8868\u677F\u542F\u52A8\u5931\u8D25\uFF1A{reason}",
-      starting: "\u25B8 \u6B63\u5728\u542F\u52A8\u4EEA\u8868\u677F\u670D\u52A1\u5668\u2026"
+      starting: "\u25B8 \u6B63\u5728\u542F\u52A8\u4EEA\u8868\u677F\u670D\u52A1\u5668\u2026",
+      copied: "\u25B8 \u4EEA\u8868\u677F URL \u5DF2\u590D\u5236\u5230\u526A\u8D34\u677F\uFF1A{url}",
+      tokenResetting: "\u25B8 \u6B63\u5728\u8F6E\u6362\u4EEA\u8868\u677F token \u5E76\u91CD\u542F\u670D\u52A1\u2026",
+      tokenReset: "\u25B8 \u4EEA\u8868\u677F token \u5DF2\u8F6E\u6362\u3002\u65B0 URL\uFF1A"
     },
     observability: {
       contextInfo: "\u4E0A\u4E0B\u6587\uFF1A~{total} / {max}\uFF08{pct}%\uFF09\xB7 \u7CFB\u7EDF {sys} \xB7 \u5DE5\u5177 {tools} \xB7 \u65E5\u5FD7 {log}",
@@ -4093,7 +4038,10 @@ var zhCN = {
     editorExited: "\u7F16\u8F91\u5668\u5F02\u5E38\u9000\u51FA\uFF0C\u8FD4\u56DE\u7801 {code}",
     typeaheadStaged: "\u25B8 {count} \u884C\u5DF2\u6682\u5B58 \xB7 esc \u53EC\u56DE",
     steerPlaceholder: "\u8F93\u5165\u6D88\u606F\u4EE5\u5F15\u5BFC\u5F53\u524D\u4EFB\u52A1 \u2014 \u5FD9\u788C\u65F6\u4E0D\u652F\u6301\u547D\u4EE4",
-    steerHint: "\u53D1\u9001 \u2014 \u56DE\u5408\u5185\u6CE8\u5165"
+    steerHint: "\u53D1\u9001 \u2014 \u56DE\u5408\u5185\u6CE8\u5165",
+    stashNothing: "\u6CA1\u6709\u53EF\u6682\u5B58\u7684\u5185\u5BB9",
+    stashSaved: "\u5DF2\u6682\u5B58",
+    stashRecall: "\u5DF2\u6062\u590D"
   },
   pathConfirm: {
     title: "\u6C99\u7BB1\u5916\u8DEF\u5F84",
@@ -4207,8 +4155,14 @@ var zhCN = {
     loading: "  \xB7  \u52A0\u8F7D\u76EE\u5F55\u2026",
     catalogEmpty: "  \xB7  \u76EE\u5F55\u4E3A\u7A7A \u2014 \u4F7F\u7528\u5DF2\u77E5\u5907\u9009",
     modelsAvailable: "  \xB7  {count} \u4E2A\u6A21\u578B\u53EF\u7528",
-    presetsHeader: "    \u9884\u8BBE  \xB7  \u63A8\u8350 \u2014 \u6A21\u578B + \u5F3A\u5EA6 + \u81EA\u52A8\u5347\u7EA7",
-    modelsHeader: "    \u6A21\u578B  \xB7  \u76F4\u63A5\u9009\u62E9 \u2014 \u81EA\u52A8\u5347\u7EA7\u4FDD\u6301\u4E0D\u53D8",
+    effortHeader: "    \u5F3A\u5EA6  \xB7  reasoning_effort \u4E0A\u9650",
+    modelsHeader: "    \u6A21\u578B  \xB7  DeepSeek \u517C\u5BB9 ID",
+    effortDesc: {
+      low: "\u6700\u5FEB \u2014 \u6781\u5C11\u63A8\u7406",
+      medium: "\u5E73\u8861",
+      high: "\u9ED8\u8BA4 \u2014 vLLM / Azure \u5B89\u5168",
+      max: "DeepSeek \u6269\u5C55\uFF1BOpenAI / vLLM \u4F1A\u62D2\u7EDD"
+    },
     pickerFooter: "  \u2191\u2193 \u9009\u62E9 \xB7 \u23CE \u786E\u8BA4 \xB7 [r] \u5237\u65B0 \xB7 Esc \u53D6\u6D88",
     currentLabel: "  \xB7 \u5F53\u524D"
   },
@@ -4365,8 +4319,10 @@ var zhCN = {
     hitsPlural: "{count} \u6761\u7ED3\u679C \xB7 {files} \u4E2A\u6587\u4EF6",
     moreHitSingular: "\u22EE +{count} \u6761\u7ED3\u679C",
     moreHitsPlural: "\u22EE +{count} \u6761\u7ED3\u679C",
-    earlierLine: "\u22EE \u524D {count} \u884C\uFF08\u4F7F\u7528 /tool \u9605\u8BFB\u5168\u6587\uFF09",
-    earlierLines: "\u22EE \u524D {count} \u884C\uFF08\u4F7F\u7528 /tool \u9605\u8BFB\u5168\u6587\uFF09",
+    earlierLine: "\u22EE {count} \u884C\u5DF2\u9690\u85CF\uFF08Ctrl+R \u67E5\u770B\u5B8C\u6574\u8F93\u51FA\uFF09",
+    earlierLines: "\u22EE {count} \u884C\u5DF2\u9690\u85CF\uFF08Ctrl+R \u67E5\u770B\u5B8C\u6574\u8F93\u51FA\uFF09",
+    hiddenLine: "\u22EE {count} \u884C\u5DF2\u9690\u85CF",
+    hiddenLines: "\u22EE {count} \u884C\u5DF2\u9690\u85CF",
     earlierStackLine: "\u22EE \u524D {count} \u884C\u5806\u6808\u5DF2\u9690\u85CF",
     earlierStackLines: "\u22EE \u524D {count} \u884C\u5806\u6808\u5DF2\u9690\u85CF",
     agent: "\u4EE3\u7406 \xB7 {name}",
@@ -4572,14 +4528,15 @@ var zhCN = {
     descNewSession: "\u65B0\u5EFA\u4F1A\u8BDD",
     descListSessions: "\u5217\u51FA\u4F1A\u8BDD",
     descSwitchModel: "\u5207\u6362\u6A21\u578B",
-    descSwitchPreset: "\u5207\u6362\u9884\u8BBE",
+    descSwitchEffort: "\u5207\u6362\u63A8\u7406\u5F3A\u5EA6",
     descSwitchTheme: "\u5207\u6362\u4E3B\u9898",
     descCtrlC: "\u9000\u51FA",
     descEsc: "\u505C\u6B62/\u53D6\u6D88",
     descCtrlR: "\u5207\u6362\u8BE6\u7EC6\u6A21\u5F0F",
     descCtrlO: "\u5C55\u5F00\u56DE\u590D\uFF08\u4EC5\u6D41\u5F0F\u8F93\u51FA\u671F\u95F4\uFF09",
     descHelp: "\u663E\u793A\u6240\u6709\u547D\u4EE4",
-    descShiftTab: "\u5207\u6362\u7F16\u8F91\u6A21\u5F0F"
+    descShiftTab: "\u5207\u6362\u7F16\u8F91\u6A21\u5F0F",
+    descAltS: "\u6682\u5B58/\u6062\u590D\u8F93\u5165"
   },
   mcpCli: {
     bundledCatalog: "\u5DF2\u6253\u5305\u7684 MCP \u670D\u52A1\u5668\uFF08\u79BB\u7EBF\u76EE\u5F55\uFF09\uFF1A",
@@ -4710,7 +4667,7 @@ function matchesTool(hook, toolName) {
 }
 var HOOK_OUTPUT_CAP_BYTES = 256 * 1024;
 function defaultSpawner(input) {
-  return new Promise((resolve14) => {
+  return new Promise((resolve15) => {
     const child = spawn(input.command, {
       cwd: input.cwd,
       shell: true,
@@ -4755,7 +4712,7 @@ function defaultSpawner(input) {
     child.stderr.on("data", (chunk) => onChunk("stderr", chunk));
     child.once("error", (err) => {
       clearTimeout(timer);
-      resolve14({
+      resolve15({
         exitCode: null,
         stdout: Buffer.concat(stdoutChunks).toString("utf8"),
         stderr: Buffer.concat(stderrChunks).toString("utf8"),
@@ -4766,7 +4723,7 @@ function defaultSpawner(input) {
     });
     child.once("close", (code) => {
       clearTimeout(timer);
-      resolve14({
+      resolve15({
         exitCode: code,
         stdout: Buffer.concat(stdoutChunks).toString("utf8").trim(),
         stderr: Buffer.concat(stderrChunks).toString("utf8").trim(),
@@ -5531,6 +5488,9 @@ function plainTextRejectedReason(name, result) {
   if ((name === "edit_file" || name === "write_file") && /rejected this edit/i.test(result)) {
     return "edit-gate";
   }
+  if ((name === "edit_file" || name === "write_file" || name === "multi_edit") && /queued \d+ edits? for review/i.test(result)) {
+    return "edit-gate";
+  }
   if ((name === "edit_file" || name === "multi_edit") && /read_file first/i.test(result)) {
     return "read-before-edit";
   }
@@ -5673,12 +5633,12 @@ async function waitForReady(ready, timeoutMs, serverName, signal) {
   let timer;
   let onAbort;
   try {
-    await new Promise((resolve14, reject) => {
+    await new Promise((resolve15, reject) => {
       ready.then(
         () => {
           if (settled) return;
           settled = true;
-          resolve14();
+          resolve15();
         },
         (err) => {
           if (settled) return;
@@ -5858,6 +5818,12 @@ function blockToString(block) {
   return `[unknown block: ${JSON.stringify(block)}]`;
 }
 
+// packages/core-utils/src/compaction.ts
+var COMPACTION_SUMMARY_MARKER = "[CONVERSATION HISTORY SUMMARY \u2014 earlier turns folded for context efficiency]\n\n";
+
+// packages/core-utils/src/tildeify.ts
+import { homedir as homedir3 } from "os";
+
 // src/loop/thinking.ts
 function isThinkingModeModel(model) {
   if (model.includes("reasoner")) return true;
@@ -5895,7 +5861,7 @@ function buildSyntheticAssistantMessage(content, fallbackModel) {
 // src/memory/session.ts
 import { execFileSync } from "child_process";
 import {
-  appendFileSync as appendFileSync2,
+  appendFileSync,
   chmodSync as chmodSync2,
   copyFileSync,
   existsSync as existsSync3,
@@ -5907,7 +5873,7 @@ import {
   unlinkSync,
   writeFileSync as writeFileSync2
 } from "fs";
-import { homedir as homedir3 } from "os";
+import { homedir as homedir4 } from "os";
 import { dirname as dirname3, join as join4, posix as posixPath, win32 as win32Path } from "path";
 var SESSION_SIDECAR_EXTS = [
   ".events.jsonl",
@@ -5917,7 +5883,7 @@ var SESSION_SIDECAR_EXTS = [
   ".jsonl.bak"
 ];
 function sessionsDir() {
-  return join4(homedir3(), ".reasonix", "sessions");
+  return join4(homedir4(), ".reasonix", "sessions");
 }
 function sessionPath(name) {
   return join4(sessionsDir(), `${sanitizeName(name)}.jsonl`);
@@ -5959,7 +5925,7 @@ function readSessionMessages(path2) {
 function appendSessionMessage(name, message) {
   const path2 = sessionPath(name);
   mkdirSync2(dirname3(path2), { recursive: true });
-  appendFileSync2(path2, `${JSON.stringify(message)}
+  appendFileSync(path2, `${JSON.stringify(message)}
 `, "utf8");
   try {
     chmodSync2(path2, 384);
@@ -6011,6 +5977,18 @@ function loadSessionMeta(name) {
     return {};
   }
 }
+function patchSessionMeta(name, patch) {
+  const cur = loadSessionMeta(name);
+  const next = { ...cur, ...patch };
+  const p = metaPath(name);
+  mkdirSync2(dirname3(p), { recursive: true });
+  writeFileSync2(p, JSON.stringify(next), "utf8");
+  try {
+    chmodSync2(p, 384);
+  } catch {
+  }
+  return next;
+}
 function renameSession(oldName, newName) {
   const safeOld = sanitizeName(oldName);
   const safeNew = sanitizeName(newName);
@@ -6134,6 +6112,7 @@ var DEEPSEEK_CONTEXT_TOKENS = {
   "deepseek-reasoner": 1e6
 };
 var DEFAULT_CONTEXT_TOKENS = 131072;
+var MAX_TURNS = 200;
 function costUsd(model, usage, path2) {
   const p = pricingFor(model, path2);
   if (!p) return 0;
@@ -6166,6 +6145,7 @@ var SessionStats = class {
   _carryoverTurns = 0;
   _carryoverCacheHit = 0;
   _carryoverCacheMiss = 0;
+  _carryoverCompletion = 0;
   /** Last turn's promptTokens before exit — surfaced via summary() until the next live turn lands. */
   _carryoverLastPromptTokens = 0;
   /** Seed totals from a resumed session's persisted meta — only call once at construction. */
@@ -6182,16 +6162,38 @@ var SessionStats = class {
     if (typeof opts.cacheMissTokens === "number" && opts.cacheMissTokens > 0) {
       this._carryoverCacheMiss = opts.cacheMissTokens;
     }
+    if (typeof opts.totalCompletionTokens === "number" && opts.totalCompletionTokens > 0) {
+      this._carryoverCompletion = opts.totalCompletionTokens;
+    }
     if (typeof opts.lastPromptTokens === "number" && opts.lastPromptTokens > 0) {
       this._carryoverLastPromptTokens = opts.lastPromptTokens;
     }
   }
+  /** Cumulative cache hit tokens across carryover + current turns. */
+  get cumulativeCacheHitTokens() {
+    let hit = this._carryoverCacheHit;
+    for (const t2 of this.turns) hit += t2.usage.promptCacheHitTokens;
+    return hit;
+  }
+  /** Cumulative cache miss tokens across carryover + current turns. */
+  get cumulativeCacheMissTokens() {
+    let miss = this._carryoverCacheMiss;
+    for (const t2 of this.turns) miss += t2.usage.promptCacheMissTokens;
+    return miss;
+  }
+  /** Cumulative completion (output) tokens across carryover + current turns. */
+  get cumulativeCompletionTokens() {
+    let comp = this._carryoverCompletion;
+    for (const t2 of this.turns) comp += t2.usage.completionTokens;
+    return comp;
+  }
   reset() {
     this.turns.length = 0;
     this._carryoverCost = 0;
     this._carryoverTurns = 0;
     this._carryoverCacheHit = 0;
     this._carryoverCacheMiss = 0;
+    this._carryoverCompletion = 0;
     this._carryoverLastPromptTokens = 0;
   }
   record(turn, model, usage) {
@@ -6204,8 +6206,23 @@ var SessionStats = class {
       cacheHitRatio: usage.cacheHitRatio
     };
     this.turns.push(stats);
+    this.trimOldTurns();
     return stats;
   }
+  /** Drop oldest turns beyond MAX_TURNS, folding their costs into carryover so
+   *  session totals remain accurate even after trimming. */
+  trimOldTurns() {
+    if (this.turns.length <= MAX_TURNS) return;
+    const excess = this.turns.length - MAX_TURNS;
+    const dropped = this.turns.splice(0, excess);
+    for (const t2 of dropped) {
+      this._carryoverCost += t2.cost;
+      this._carryoverCacheHit += t2.usage.promptCacheHitTokens;
+      this._carryoverCacheMiss += t2.usage.promptCacheMissTokens;
+      this._carryoverCompletion += t2.usage.completionTokens;
+    }
+    this._carryoverTurns += excess;
+  }
   get totalCost() {
     return this._carryoverCost + this.turns.reduce((sum, t2) => sum + t2.cost, 0);
   }
@@ -6263,12 +6280,9 @@ var HISTORY_FOLD_AGGRESSIVE_THRESHOLD = 0.78;
 var HISTORY_FOLD_AGGRESSIVE_TAIL_FRACTION = 0.1;
 var HISTORY_FOLD_MIN_SAVINGS_FRACTION = 0.3;
 var FORCE_SUMMARY_THRESHOLD = 0.8;
-var PREFLIGHT_EMERGENCY_THRESHOLD = 0.95;
-var PREFLIGHT_MECHANICAL_TARGET_FRACTION = 0.7;
-var MAX_BODY_BYTES = 7e5;
-var MAX_BODY_BYTES_TARGET = 5e5;
+var TURN_START_FOLD_THRESHOLD = 0.9;
 var HISTORY_FOLD_SUMMARY_TIMEOUT_MS = 15e3;
-var HISTORY_FOLD_MARKER = "[CONVERSATION HISTORY SUMMARY \u2014 earlier turns folded for context efficiency]\n\n";
+var HISTORY_FOLD_MARKER = COMPACTION_SUMMARY_MARKER;
 var SKILL_PIN_MEMO_HEADER = "[Active skill memos \u2014 preserved verbatim across the fold:]";
 var SKILL_PIN_REGEX = /<skill-pin name="([^"]+)">\n[\s\S]*?\n<\/skill-pin>/g;
 function buildFoldSummaryInstruction(pinnedSkillNames) {
@@ -6338,28 +6352,13 @@ var ContextManager = class {
     }
     return { kind: "none", ...base };
   }
-  /** Local-side preflight before sending a request — catches oversized payloads early.
-   * Two independent signals trip mechanical truncate: token estimate above the context-window
-   * fraction, OR JSON body bytes above the gateway limit (see `MAX_BODY_BYTES`). */
-  decidePreflight(messages, toolSpecs, model) {
+  /** Turn-start estimate vs ctxMax — caller folds if the ratio crosses
+   *  TURN_START_FOLD_THRESHOLD. Replaces the old preflight/mechanical pair. */
+  estimateTurnStart(messages, toolSpecs, model) {
     const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
     const estimate = estimateRequestTokens(messages, toolSpecs ?? null, true);
-    const estimateBytes = Buffer.byteLength(JSON.stringify(messages), "utf8");
-    const tokensOver = estimate / ctxMax > PREFLIGHT_EMERGENCY_THRESHOLD;
-    const bytesOver = estimateBytes > MAX_BODY_BYTES;
-    let trigger = "none";
-    if (tokensOver && bytesOver) trigger = "both";
-    else if (tokensOver) trigger = "tokens";
-    else if (bytesOver) trigger = "bytes";
-    return {
-      needsAction: tokensOver || bytesOver,
-      estimateTokens: estimate,
-      estimateBytes,
-      ctxMax,
-      trigger
-    };
+    return { estimateTokens: estimate, ctxMax, ratio: estimate / ctxMax };
   }
-  /** Replace older turns with one summary message; keep tail within keepRecentTokens budget. */
   async fold(model, opts) {
     const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
     const tailBudget = opts?.keepRecentTokens ?? Math.floor(ctxMax * HISTORY_FOLD_TAIL_FRACTION);
@@ -6371,7 +6370,13 @@ var ContextManager = class {
       summaryChars: 0
     };
     if (all.length === 0) return noop;
-    const tokenCounts = all.map((m) => countTokensBounded(m.content ?? ""));
+    const tokenCounts = all.map((m) => {
+      let n = countTokensBounded(typeof m.content === "string" ? m.content : "");
+      if (m.role === "assistant" && Array.isArray(m.tool_calls) && m.tool_calls.length > 0) {
+        n += countTokensBounded(JSON.stringify(m.tool_calls));
+      }
+      return n;
+    });
     const totalTokens = tokenCounts.reduce((a, b) => a + b, 0);
     let cumTokens = 0;
     let boundary = all.length;
@@ -6381,6 +6386,7 @@ var ContextManager = class {
       if (all[i].role === "user") boundary = i;
     }
     if (boundary <= 0) return noop;
+    if (opts?.requireTailBoundary && boundary >= all.length) return noop;
     const head = all.slice(0, boundary);
     const tail = all.slice(boundary);
     const headTokens = totalTokens - cumTokens;
@@ -6416,58 +6422,6 @@ ${constraints}` : "";
       summaryChars: summary.content.length
     };
   }
-  /** Pure local emergency compaction for preflight: drop oldest log entries and keep a valid tail.
-   * Bounded by tokens AND bytes — bytes matter because DeepSeek's gateway 400s on bodies past
-   * `MAX_BODY_BYTES` even when the token budget is far from exhausted. */
-  mechanicalTruncate(model, opts) {
-    const ctxMax = DEEPSEEK_CONTEXT_TOKENS[model] ?? DEFAULT_CONTEXT_TOKENS;
-    const targetTokens = opts?.targetTokens ?? Math.floor(ctxMax * PREFLIGHT_MECHANICAL_TARGET_FRACTION);
-    const targetBytes = opts?.targetBytes ?? MAX_BODY_BYTES_TARGET;
-    const all = this.deps.log.toMessages();
-    const noop = {
-      folded: false,
-      beforeMessages: all.length,
-      afterMessages: all.length,
-      summaryChars: 0
-    };
-    if (all.length === 0) return noop;
-    const tokenCounts = all.map((m) => estimateConversationTokens([m], true));
-    const byteCounts = all.map((m) => Buffer.byteLength(JSON.stringify(m), "utf8"));
-    let latestUserBoundary = -1;
-    for (let i = all.length - 1; i >= 0; i--) {
-      if (all[i].role === "user") {
-        latestUserBoundary = i;
-        break;
-      }
-    }
-    let cumTokens = 0;
-    let cumBytes = 0;
-    let boundary = all.length;
-    let foundSafeBoundary = false;
-    for (let i = all.length - 1; i >= 0; i--) {
-      const nextTokens = cumTokens + tokenCounts[i];
-      const nextBytes = cumBytes + byteCounts[i];
-      if (nextTokens > targetTokens || nextBytes > targetBytes) break;
-      cumTokens = nextTokens;
-      cumBytes = nextBytes;
-      if (all[i].role === "user") {
-        boundary = i;
-        foundSafeBoundary = true;
-      }
-    }
-    if (boundary <= 0) return noop;
-    const replacement = foundSafeBoundary ? all.slice(boundary) : opts?.allowEmpty ? [] : latestUserBoundary >= 0 ? all.slice(latestUserBoundary) : all;
-    if (replacement.length === all.length) return noop;
-    this.deps.log.compactInPlace(replacement);
-    this.persistRewrite(replacement);
-    this.deps.onLogRewrite?.();
-    return {
-      folded: true,
-      beforeMessages: all.length,
-      afterMessages: replacement.length,
-      summaryChars: 0
-    };
-  }
   /** Drop a trailing in-flight assistant-with-tool_calls before a forced summary. Tail-only mutation; prefix cache safe. */
   trimTrailingToolCalls() {
     const tail = this.deps.log.entries[this.deps.log.entries.length - 1];
@@ -6654,31 +6608,6 @@ function extractDeepSeekErrorMessage(body) {
   return trimmed;
 }
 
-// src/loop/escalation.ts
-var NEEDS_PRO_MARKER_PREFIX = "<<<NEEDS_PRO";
-var NEEDS_PRO_MARKER_RE = /^<<<NEEDS_PRO(?::\s*([^>]*))?>>>/;
-var NEEDS_PRO_BUFFER_CHARS = 256;
-function parseEscalationMarker(content) {
-  const m = NEEDS_PRO_MARKER_RE.exec(content.trimStart());
-  if (!m) return { matched: false };
-  const reason = m[1]?.trim();
-  return { matched: true, reason: reason || void 0 };
-}
-function isEscalationRequest(content) {
-  return parseEscalationMarker(content).matched;
-}
-function looksLikePartialEscalationMarker(buf) {
-  const t2 = buf.trimStart();
-  if (t2.length === 0) return true;
-  if (t2.length <= NEEDS_PRO_MARKER_PREFIX.length) {
-    return NEEDS_PRO_MARKER_PREFIX.startsWith(t2);
-  }
-  if (!t2.startsWith(NEEDS_PRO_MARKER_PREFIX)) return false;
-  const rest = t2.slice(NEEDS_PRO_MARKER_PREFIX.length);
-  if (rest[0] !== ">" && rest[0] !== ":") return false;
-  return true;
-}
-
 // src/loop/force-summary.ts
 async function* forceSummaryAfterIterLimit(ctx, opts) {
   try {
@@ -7321,7 +7250,6 @@ var ReadTracker = class _ReadTracker {
 };
 
 // src/loop.ts
-var ESCALATION_MODEL = "deepseek-v4-pro";
 var MID_TURN_STEER_WRAPPER = "[Mid-turn steer queued by the user. Do not treat this as a new task; use it only as additional guidance for the current task after completing the current step.]";
 function formatSteerUserMessage(content) {
   return [MID_TURN_STEER_WRAPPER, content].join("\n");
@@ -7341,7 +7269,6 @@ var CacheFirstLoop = class {
   model;
   stream;
   reasoningEffort;
-  autoEscalate = true;
   budgetUsd;
   /** One-shot 80% warning latch — cleared by setBudget so a bump re-arms at the new boundary. */
   _budgetWarned = false;
@@ -7357,6 +7284,7 @@ var CacheFirstLoop = class {
   _streamPreference;
   /** Threaded through HTTP + every tool dispatch so Esc cancels in-flight work, not after. */
   _turnAbort = new AbortController();
+  _discardAbortRequested = false;
   /** Authoritative running-id set — UI cards consult this instead of trusting end-event delivery. Insert at dispatch entry, delete in finally. */
   _inflight = new InflightSet();
   /** Typeahead steer messages set by the UI; step() consumes one at each iter boundary. */
@@ -7377,8 +7305,6 @@ var CacheFirstLoop = class {
   get steerConsumed() {
     return this._steerConsumed;
   }
-  _proArmedForNextTurn = false;
-  _escalateThisTurn = false;
   _turnSelfCorrected = false;
   _foldedThisTurn = false;
   context;
@@ -7394,8 +7320,7 @@ var CacheFirstLoop = class {
     this.prefix = opts.prefix;
     this.tools = opts.tools ?? new ToolRegistry();
     this.model = opts.model ?? "deepseek-v4-flash";
-    this.reasoningEffort = opts.reasoningEffort ?? "max";
-    if (opts.autoEscalate !== void 0) this.autoEscalate = opts.autoEscalate;
+    this.reasoningEffort = opts.reasoningEffort ?? "high";
     this.budgetUsd = typeof opts.budgetUsd === "number" && opts.budgetUsd > 0 ? opts.budgetUsd : null;
     this.hooks = opts.hooks ?? [];
     this.hookCwd = opts.hookCwd ?? process.cwd();
@@ -7435,6 +7360,7 @@ var CacheFirstLoop = class {
           turnCount: meta.turnCount,
           cacheHitTokens: meta.cacheHitTokens,
           cacheMissTokens: meta.cacheMissTokens,
+          totalCompletionTokens: meta.totalCompletionTokens,
           lastPromptTokens: meta.lastPromptTokens
         });
       }
@@ -7552,35 +7478,15 @@ var CacheFirstLoop = class {
       this.stream = opts.stream;
     }
     if (opts.reasoningEffort !== void 0) this.reasoningEffort = opts.reasoningEffort;
-    if (opts.autoEscalate !== void 0) this.autoEscalate = opts.autoEscalate;
   }
   /** `null` disables the cap; any change re-arms the 80% warning. */
   setBudget(usd) {
     this.budgetUsd = typeof usd === "number" && usd > 0 ? usd : null;
     this._budgetWarned = false;
   }
-  /** Single-turn upgrade consumed at next step() — distinct from `/preset max` (persistent). */
-  armProForNextTurn() {
-    this._proArmedForNextTurn = true;
-  }
-  /** Cancel `/pro` arming before the next turn starts. */
-  disarmPro() {
-    this._proArmedForNextTurn = false;
-  }
-  /** UI surface — true while `/pro` is queued but hasn't fired yet. */
-  get proArmed() {
-    return this._proArmedForNextTurn;
-  }
-  /** UI surface — true while the current turn is running on pro (armed or auto-escalated). */
-  get escalatedThisTurn() {
-    return this._escalateThisTurn;
-  }
-  /** UI surface — model id of the call about to run (or running) right now, including escalation. */
+  /** UI surface — model id of the call about to run (or running) right now. */
   get currentCallModel() {
-    return this.modelForCurrentCall();
-  }
-  modelForCurrentCall() {
-    return this._escalateThisTurn ? ESCALATION_MODEL : this.model;
+    return this.model;
   }
   /** A call counts as mutating when its definition reports `readOnly !== true` and any dynamic `readOnlyCheck` doesn't override that for these args. */
   isMutating(call) {
@@ -7678,9 +7584,24 @@ ${reason}`
     }
     return healed.messages;
   }
-  abort() {
+  abort(opts = {}) {
+    if (opts.discardCurrentTurn) this._discardAbortRequested = true;
     this._turnAbort.abort();
   }
+  resetAbortState() {
+    this._turnAbort = new AbortController();
+    this._discardAbortRequested = false;
+  }
+  discardLogFrom(index) {
+    const preserved = this.log.entries.slice(0, index).map((m) => ({ ...m }));
+    this.log.compactInPlace(preserved);
+    if (this.sessionName) {
+      try {
+        rewriteSession(this.sessionName, preserved);
+      } catch {
+      }
+    }
+  }
   /** Drop the last user message + everything after; caller re-sends. Persists to session file. */
   retryLastUser() {
     const entries = this.log.entries;
@@ -7763,38 +7684,54 @@ ${reason}`
     this.scratch.reset();
     this.repair.resetStorm();
     this._turnSelfCorrected = false;
-    this._escalateThisTurn = false;
     this._foldedThisTurn = false;
-    let armedConsumed = false;
-    if (this._proArmedForNextTurn) {
-      this._escalateThisTurn = true;
-      this._proArmedForNextTurn = false;
-      armedConsumed = true;
-    }
     const carryAbort = this._turnAbort.signal.aborted;
     this._turnAbort = new AbortController();
     if (carryAbort) this._turnAbort.abort();
     const signal = this._turnAbort.signal;
-    if (armedConsumed) {
-      yield {
-        turn: this._turn,
-        role: "warning",
-        content: t("loop.proArmed")
-      };
-    }
+    const turnStartLogIndex = this.log.length;
     this.appendAndPersist({ role: "user", content: userInput });
     const toolSpecs = this.prefix.tools();
     let rateLimitWarningShown = false;
-    for (let iter = 0; ; iter++) {
-      if (signal.aborted) {
-        try {
+    {
+      const turnStart = this.context.estimateTurnStart(
+        this.buildMessages(),
+        this.prefix.toolSpecs,
+        this.model
+      );
+      if (turnStart.ratio > TURN_START_FOLD_THRESHOLD) {
+        yield {
+          turn: this._turn,
+          role: "status",
+          content: t("loop.turnStartFoldStatus")
+        };
+        const result = await this.context.fold(this.model, { requireTailBoundary: true });
+        if (result.folded) {
+          this._foldedThisTurn = true;
           yield {
             turn: this._turn,
             role: "warning",
-            content: t("loop.abortedAtIter", { iter })
+            content: t("loop.turnStartFolded", {
+              estimate: turnStart.estimateTokens.toLocaleString(),
+              ctxMax: turnStart.ctxMax.toLocaleString(),
+              pct: Math.round(turnStart.ratio * 100),
+              beforeMessages: result.beforeMessages,
+              afterMessages: result.afterMessages
+            })
           };
-          const stoppedMsg = "[aborted by user (Esc) \u2014 no summary produced. Ask again or /retry when ready; prior tool output is still in the log.]";
-          this.appendAndPersist(buildSyntheticAssistantMessage(stoppedMsg, this.model));
+        }
+      }
+    }
+    for (let iter = 0; ; iter++) {
+      if (signal.aborted) {
+        try {
+          const discardTurn = this._discardAbortRequested;
+          const stoppedMsg = discardTurn ? "[aborted by user (Esc) \u2014 interrupted turn discarded. Ask again when ready.]" : "[aborted by user (Esc) \u2014 no summary produced. Ask again or /retry when ready; prior tool output is still in the log.]";
+          if (discardTurn) {
+            this.discardLogFrom(turnStartLogIndex);
+          } else {
+            this.appendAndPersist(buildSyntheticAssistantMessage(stoppedMsg, this.model));
+          }
           yield {
             turn: this._turn,
             role: "assistant_final",
@@ -7803,7 +7740,7 @@ ${reason}`
           };
           yield { turn: this._turn, role: "done", content: stoppedMsg };
         } finally {
-          this._turnAbort = new AbortController();
+          this.resetAbortState();
         }
         this._steerQueue.length = 0;
         return;
@@ -7830,51 +7767,6 @@ ${reason}`
           content: steer
         };
       }
-      {
-        const decision2 = this.context.decidePreflight(messages, this.prefix.toolSpecs, this.model);
-        if (decision2.needsAction) {
-          const { estimateTokens: estimate, estimateBytes, ctxMax } = decision2;
-          yield {
-            turn: this._turn,
-            role: "status",
-            content: t("loop.preflightTruncateStatus")
-          };
-          const result = this.context.mechanicalTruncate(this.model, {
-            allowEmpty: false
-          });
-          if (result.folded) {
-            messages = this.buildMessages();
-            const after = this.context.decidePreflight(messages, this.prefix.toolSpecs, this.model);
-            const stillFull = after.needsAction;
-            yield {
-              turn: this._turn,
-              role: "warning",
-              content: t(
-                stillFull ? "loop.preflightTruncatedStillFull" : "loop.preflightTruncated",
-                {
-                  estimate: after.estimateTokens.toLocaleString(),
-                  ctxMax: after.ctxMax.toLocaleString(),
-                  pct: Math.round(after.estimateTokens / after.ctxMax * 100),
-                  bodyKB: Math.round(after.estimateBytes / 1024).toLocaleString(),
-                  beforeMessages: result.beforeMessages,
-                  afterMessages: result.afterMessages
-                }
-              )
-            };
-          } else {
-            yield {
-              turn: this._turn,
-              role: "warning",
-              content: t("loop.preflightNoFold", {
-                estimate: estimate.toLocaleString(),
-                ctxMax: ctxMax.toLocaleString(),
-                pct: Math.round(estimate / ctxMax * 100),
-                bodyKB: Math.round(estimateBytes / 1024).toLocaleString()
-              })
-            };
-          }
-        }
-      }
       let assistantContent = "";
       let reasoningContent = "";
       let toolCalls = [];
@@ -7883,10 +7775,7 @@ ${reason}`
         if (this.stream) {
           const callBuf = /* @__PURE__ */ new Map();
           const readyIndices = /* @__PURE__ */ new Set();
-          const callModel = this.modelForCurrentCall();
-          const bufferForEscalation = this.autoEscalate && callModel !== ESCALATION_MODEL;
-          let escalationBuf = "";
-          let escalationBufFlushed = false;
+          const callModel = this.model;
           for await (const chunk of this.client.stream({
             model: callModel,
             messages,
@@ -7906,27 +7795,11 @@ ${reason}`
             }
             if (chunk.contentDelta) {
               assistantContent += chunk.contentDelta;
-              if (bufferForEscalation && !escalationBufFlushed) {
-                escalationBuf += chunk.contentDelta;
-                if (isEscalationRequest(escalationBuf)) {
-                  break;
-                }
-                if (escalationBuf.length >= NEEDS_PRO_BUFFER_CHARS || !looksLikePartialEscalationMarker(escalationBuf)) {
-                  escalationBufFlushed = true;
-                  yield {
-                    turn: this._turn,
-                    role: "assistant_delta",
-                    content: escalationBuf
-                  };
-                  escalationBuf = "";
-                }
-              } else {
-                yield {
-                  turn: this._turn,
-                  role: "assistant_delta",
-                  content: chunk.contentDelta
-                };
-              }
+              yield {
+                turn: this._turn,
+                role: "assistant_delta",
+                content: chunk.contentDelta
+              };
             }
             if (chunk.toolCallDelta) {
               const d = chunk.toolCallDelta;
@@ -7958,17 +7831,8 @@ ${reason}`
             if (chunk.usage) usage = chunk.usage;
           }
           toolCalls = [...callBuf.values()];
-          if (bufferForEscalation && !escalationBufFlushed && escalationBuf.length > 0) {
-            if (!isEscalationRequest(escalationBuf)) {
-              yield {
-                turn: this._turn,
-                role: "assistant_delta",
-                content: escalationBuf
-              };
-            }
-          }
         } else {
-          const callModel = this.modelForCurrentCall();
+          const callModel = this.model;
           const resp = await this.client.chat({
             model: callModel,
             messages,
@@ -7984,10 +7848,11 @@ ${reason}`
         }
       } catch (err) {
         if (signal.aborted) {
+          if (this._discardAbortRequested) this.discardLogFrom(turnStartLogIndex);
           try {
             yield { turn: this._turn, role: "done", content: "" };
           } finally {
-            this._turnAbort = new AbortController();
+            this.resetAbortState();
           }
           this._steerQueue.length = 0;
           return;
@@ -8002,27 +7867,20 @@ ${reason}`
         this._steerQueue.length = 0;
         return;
       }
-      if (this.autoEscalate && this.modelForCurrentCall() !== ESCALATION_MODEL && isEscalationRequest(assistantContent)) {
-        const { reason } = parseEscalationMarker(assistantContent);
-        this._escalateThisTurn = true;
-        const reasonSuffix = reason ? ` \u2014 ${reason}` : "";
-        yield {
-          turn: this._turn,
-          role: "warning",
-          content: t("loop.flashEscalation", { model: ESCALATION_MODEL, reasonSuffix })
-        };
-        assistantContent = "";
-        reasoningContent = "";
-        toolCalls = [];
-        usage = null;
-        iter--;
-        continue;
+      const turnStats = this.stats.record(this._turn, this.model, usage ?? new Usage());
+      if (this.sessionName) {
+        try {
+          const last = this.stats.turns.length > 0 ? this.stats.turns[this.stats.turns.length - 1] : null;
+          patchSessionMeta(this.sessionName, {
+            totalCostUsd: this.stats.totalCost,
+            cacheHitTokens: this.stats.cumulativeCacheHitTokens,
+            cacheMissTokens: this.stats.cumulativeCacheMissTokens,
+            totalCompletionTokens: this.stats.cumulativeCompletionTokens,
+            lastPromptTokens: last?.usage.promptTokens
+          });
+        } catch {
+        }
       }
-      const turnStats = this.stats.record(
-        this._turn,
-        this.modelForCurrentCall(),
-        usage ?? new Usage()
-      );
       this.scratch.reasoning = reasoningContent || null;
       const { calls: repairedCalls, report } = this.repair.process(
         toolCalls,
@@ -8030,12 +7888,7 @@ ${reason}`
         assistantContent || null
       );
       this.appendAndPersist(
-        buildAssistantMessage(
-          assistantContent,
-          repairedCalls,
-          this.modelForCurrentCall(),
-          reasoningContent
-        )
+        buildAssistantMessage(assistantContent, repairedCalls, this.model, reasoningContent)
       );
       yield {
         turn: this._turn,
@@ -8048,12 +7901,7 @@ ${reason}`
       if (allSuppressed && !this._turnSelfCorrected) {
         this._turnSelfCorrected = true;
         this.replaceTailAssistantMessage(
-          buildAssistantMessage(
-            assistantContent,
-            toolCalls,
-            this.modelForCurrentCall(),
-            reasoningContent
-          )
+          buildAssistantMessage(assistantContent, toolCalls, this.model, reasoningContent)
         );
         for (const call of toolCalls) {
           this.appendAndPersist({
@@ -8066,6 +7914,7 @@ ${reason}`
         yield {
           turn: this._turn,
           role: "warning",
+          severity: "low",
           content: t("loop.repeatToolCallWarning")
         };
         continue;
@@ -8076,6 +7925,7 @@ ${reason}`
         yield {
           turn: this._turn,
           role: "warning",
+          severity: allSuppressed ? "high" : "low",
           content: `${phrase}${noteTail}`
         };
       }
@@ -8788,7 +8638,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync4
 } from "fs";
-import { homedir as homedir5 } from "os";
+import { homedir as homedir6 } from "os";
 import { join as join8, resolve as resolve5 } from "path";
 
 // src/frontmatter.ts
@@ -8849,7 +8699,7 @@ import {
   writeFileSync as writeFileSync3
 } from "fs";
 import { accessSync } from "fs";
-import { homedir as homedir4 } from "os";
+import { homedir as homedir5 } from "os";
 import { dirname as dirname4, isAbsolute as isAbsolute3, join as join7, resolve as resolve4 } from "path";
 
 // src/prompt-fragments.ts
@@ -8895,19 +8745,24 @@ function parseAllowedTools(raw) {
   const names = raw.split(",").map((s) => s.trim()).filter(Boolean);
   return names.length > 0 ? Object.freeze(names) : void 0;
 }
+function subagentModelForPreset(preset) {
+  return preset === "pro" ? "deepseek-v4-pro" : "deepseek-v4-flash";
+}
 var SkillStore = class {
   homeDir;
   projectRoot;
   customSkillPaths;
   disableBuiltins;
+  subagentModels;
   constructor(opts = {}) {
-    this.homeDir = opts.homeDir ?? homedir4();
+    this.homeDir = opts.homeDir ?? homedir5();
     this.projectRoot = opts.projectRoot ? resolve4(opts.projectRoot) : void 0;
     const baseDir = this.projectRoot ?? process.cwd();
     this.customSkillPaths = dedupePaths(
       opts.customSkillPaths?.map((p) => resolveCustomSkillPath(p, baseDir, this.homeDir)) ?? []
     );
     this.disableBuiltins = opts.disableBuiltins === true;
+    this.subagentModels = opts.subagentModels ?? {};
   }
   /** True iff this store was configured with a project root. */
   hasProjectScope() {
@@ -8961,7 +8816,14 @@ var SkillStore = class {
         if (!byName.has(skill.name)) byName.set(skill.name, skill);
       }
     }
-    return [...byName.values()].sort((a, b) => a.name.localeCompare(b.name));
+    return [...byName.values()].map((s) => this.applyModelOverride(s)).sort((a, b) => a.name.localeCompare(b.name));
+  }
+  /** Apply `subagentModels` config override on top of frontmatter `model:`. Inline skills are unaffected. */
+  applyModelOverride(skill) {
+    if (skill.runAs !== "subagent") return skill;
+    const override = this.subagentModels[skill.name];
+    if (!override) return skill;
+    return { ...skill, model: subagentModelForPreset(override) };
   }
   /** Scaffold a new skill stub at the chosen scope. Refuses to overwrite. */
   create(name, scope) {
@@ -9390,7 +9252,7 @@ var MemoryStore = class {
   homeDir;
   projectRoot;
   constructor(opts = {}) {
-    this.homeDir = opts.homeDir ?? join8(homedir5(), ".reasonix");
+    this.homeDir = opts.homeDir ?? join8(homedir6(), ".reasonix");
     this.projectRoot = opts.projectRoot ? resolve5(opts.projectRoot) : void 0;
   }
   /** Directory this store writes `scope` files into, creating it if needed. */
@@ -9542,7 +9404,7 @@ var MemoryStore = class {
 `, "utf8");
   }
 };
-function readGlobalReasonixMemory(homeDir = join8(homedir5(), ".reasonix")) {
+function readGlobalReasonixMemory(homeDir = join8(homedir6(), ".reasonix")) {
   const path2 = join8(homeDir, "REASONIX.md");
   if (!existsSync7(path2)) return null;
   let raw;
@@ -9561,7 +9423,7 @@ function readGlobalReasonixMemory(homeDir = join8(homedir5(), ".reasonix")) {
 }
 function applyGlobalReasonixMemory(basePrompt, homeDir) {
   if (!memoryEnabled()) return basePrompt;
-  const dir = homeDir ?? join8(homedir5(), ".reasonix");
+  const dir = homeDir ?? join8(homedir6(), ".reasonix");
   const mem = readGlobalReasonixMemory(dir);
   if (!mem) return basePrompt;
   return [
@@ -10199,7 +10061,7 @@ var RegexRunner = class {
     this.defaultTimeoutMs = opts.defaultTimeoutMs ?? DEFAULT_TIMEOUT_MS;
   }
   testLines(text, source, flags, opts = {}) {
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve15, reject) => {
       if (opts.signal?.aborted) {
         reject(new Error("regex evaluation aborted"));
         return;
@@ -10212,7 +10074,7 @@ var RegexRunner = class {
         this.killWorker();
         reject(new Error(`regex evaluation exceeded ${timeoutMs}ms`));
       }, timeoutMs);
-      const entry = { resolve: resolve14, reject, timer };
+      const entry = { resolve: resolve15, reject, timer };
       if (opts.signal) {
         entry.signal = opts.signal;
         entry.onAbort = () => {
@@ -12443,9 +12305,11 @@ var READY_SIGNALS = [
   // Generic
   /\bstartup (?:complete|finished)\b/i
 ];
-var JobRegistry = class {
+var JobRegistry = class _JobRegistry {
   jobs = /* @__PURE__ */ new Map();
   nextId = 1;
+  /** Max completed jobs to retain for list_jobs / job_output lookups. */
+  static MAX_COMPLETED_JOBS = 20;
   /** Resolves on (a) ready signal, (b) early exit, or (c) waitSec deadline — child keeps running regardless. */
   async start(command, opts) {
     const trimmed = command.trim();
@@ -12581,6 +12445,7 @@ ${job.output.slice(start)}`;
       job.exitCode = code;
       job.signalReady();
       job.signalClosed();
+      this.maybeCleanup();
     };
     child.on("exit", settleClosed);
     child.on("close", settleClosed);
@@ -12647,16 +12512,16 @@ ${job.output.slice(start)}`;
     let wakeOutput = null;
     if (waitFor === "output-or-exit") {
       racers.push(
-        new Promise((resolve14) => {
-          wakeOutput = resolve14;
-          job.outputWaiters.add(resolve14);
+        new Promise((resolve15) => {
+          wakeOutput = resolve15;
+          job.outputWaiters.add(resolve15);
         })
       );
     }
     let timer = null;
     racers.push(
-      new Promise((resolve14) => {
-        timer = setTimeout(resolve14, timeoutMs);
+      new Promise((resolve15) => {
+        timer = setTimeout(resolve15, timeoutMs);
       })
     );
     await Promise.race(racers);
@@ -12743,6 +12608,19 @@ ${job.output.slice(start)}`;
     for (const job of this.jobs.values()) if (job.running) n++;
     return n;
   }
+  /** Evict oldest completed jobs when the map exceeds MAX_COMPLETED_JOBS. */
+  maybeCleanup() {
+    const completed = [];
+    for (const [id, job] of this.jobs) {
+      if (!job.running) completed.push({ id, startedAt: job.startedAt });
+    }
+    if (completed.length <= _JobRegistry.MAX_COMPLETED_JOBS) return;
+    completed.sort((a, b) => a.startedAt - b.startedAt);
+    const toRemove = completed.length - _JobRegistry.MAX_COMPLETED_JOBS;
+    for (let i = 0; i < toRemove; i++) {
+      this.jobs.delete(completed[i].id);
+    }
+  }
 };
 function snapshot(job) {
   return {
@@ -13195,9 +13073,9 @@ async function runPipeGroup(segments, opts) {
     }
     const exits = await Promise.all(
       children.map(
-        (c) => new Promise((resolve14) => {
-          c.once("error", () => resolve14(null));
-          c.once("close", (code) => resolve14(code));
+        (c) => new Promise((resolve15) => {
+          c.once("error", () => resolve15(null));
+          c.once("close", (code) => resolve15(code));
         })
       )
     );
@@ -13243,11 +13121,6 @@ var OutputBuffer = class {
 // src/tools/shell/parse.ts
 import { homedir as homedir7 } from "os";
 import * as pathMod9 from "path";
-
-// packages/core-utils/src/tildeify.ts
-import { homedir as homedir6 } from "os";
-
-// src/tools/shell/parse.ts
 var BUILTIN_ALLOWLIST = [
   // Repo inspection
   "git status",
@@ -13625,7 +13498,7 @@ async function runCommand(cmd, opts) {
   };
   const { bin, args, spawnOverrides } = prepareSpawn(argv, { env: normalizedEnv });
   const effectiveSpawnOpts = { ...spawnOpts, ...spawnOverrides };
-  return await new Promise((resolve14, reject) => {
+  return await new Promise((resolve15, reject) => {
     let child;
     try {
       child = spawn4(bin, args, effectiveSpawnOpts);
@@ -13679,7 +13552,7 @@ async function runCommand(cmd, opts) {
       const output = buf.length > maxChars ? `${buf.slice(0, maxChars)}
 
 [\u2026 truncated ${buf.length - maxChars} chars \u2026]` : buf;
-      resolve14({ exitCode: code, output, timedOut });
+      resolve15({ exitCode: code, output, timedOut });
     });
   });
 }
@@ -15255,6 +15128,10 @@ function truncate(s, n) {
   return s.length > n ? `${s.slice(0, n)}\u2026` : s;
 }
 
+// src/mcp/client.ts
+import { basename as basename3, resolve as resolve13 } from "path";
+import { pathToFileURL } from "url";
+
 // src/version.ts
 import { existsSync as existsSync10, mkdirSync as mkdirSync5, readFileSync as readFileSync14, writeFileSync as writeFileSync6 } from "fs";
 import { homedir as homedir8 } from "os";
@@ -15385,6 +15262,8 @@ function isJsonRpcError(msg) {
 var McpClient = class {
   transport;
   clientInfo;
+  workspaceDir;
+  workspaceRoot;
   requestTimeoutMs;
   pending = /* @__PURE__ */ new Map();
   nextId = 1;
@@ -15404,6 +15283,14 @@ var McpClient = class {
   constructor(opts) {
     this.transport = opts.transport;
     this.clientInfo = opts.clientInfo ?? { name: "reasonix", version: VERSION };
+    const workspaceDir = opts.workspaceDir?.trim();
+    if (workspaceDir) {
+      this.workspaceDir = resolve13(workspaceDir);
+      this.workspaceRoot = {
+        uri: pathToFileURL(this.workspaceDir).href,
+        name: basename3(this.workspaceDir) || this.workspaceDir
+      };
+    }
     this.requestTimeoutMs = opts.requestTimeoutMs ?? 6e4;
   }
   /** Server's advertised capabilities, available after initialize(). */
@@ -15422,24 +15309,29 @@ var McpClient = class {
   get serverInstructions() {
     return this._instructions;
   }
+  get workspaceRootDir() {
+    return this.workspaceDir;
+  }
   /** Compliant servers reject other methods until this completes. */
   async initialize(opts = {}) {
     if (this.initialized) throw new Error("MCP client already initialized");
     this.startReaderIfNeeded();
-    const result = await this.request(
-      "initialize",
-      {
-        protocolVersion: MCP_PROTOCOL_VERSION,
-        // Advertise every method the client can consume so servers know
-        // they can send listChanged notifications etc. Sub-feature flags
-        // (e.g. `resources.subscribe`) are omitted — we don't implement
-        // those yet and the empty object means "method-level support, no
-        // sub-features."
-        capabilities: { tools: {}, resources: {}, prompts: {} },
-        clientInfo: this.clientInfo
-      },
-      opts.signal
-    );
+    const capabilities = {
+      tools: {},
+      resources: {},
+      prompts: {},
+      ...this.workspaceRoot ? { roots: {} } : {}
+    };
+    const params = {
+      protocolVersion: MCP_PROTOCOL_VERSION,
+      capabilities,
+      clientInfo: this.clientInfo,
+      ...this.workspaceRoot ? {
+        rootUri: this.workspaceRoot.uri,
+        workspaceFolders: [this.workspaceRoot]
+      } : {}
+    };
+    const result = await this.request("initialize", params, opts.signal);
     this._serverCapabilities = result.capabilities ?? {};
     this._serverInfo = result.serverInfo ?? { name: "", version: "" };
     this._protocolVersion = result.protocolVersion ?? "";
@@ -15516,7 +15408,7 @@ var McpClient = class {
     const id = this.nextId++;
     const frame = { jsonrpc: "2.0", id, method, params };
     let abortHandler = null;
-    const promise = new Promise((resolve14, reject) => {
+    const promise = new Promise((resolve15, reject) => {
       const timeout = setTimeout(() => {
         this.pending.delete(id);
         if (abortHandler && signal) signal.removeEventListener("abort", abortHandler);
@@ -15525,7 +15417,7 @@ var McpClient = class {
         );
       }, this.requestTimeoutMs);
       this.pending.set(id, {
-        resolve: resolve14,
+        resolve: resolve15,
         reject,
         timeout
       });
@@ -15599,7 +15491,10 @@ var McpClient = class {
       }
       return;
     }
-    if (!("result" in msg) && !("error" in msg)) return;
+    if (!("result" in msg) && !("error" in msg)) {
+      this.handleServerRequest(msg);
+      return;
+    }
     const pending = this.pending.get(msg.id);
     if (!pending) return;
     this.pending.delete(msg.id);
@@ -15611,6 +15506,21 @@ var McpClient = class {
       pending.resolve(resp.result);
     }
   }
+  handleServerRequest(req) {
+    if (req.method === "roots/list" && this.workspaceRoot) {
+      void this.transport.send({
+        jsonrpc: "2.0",
+        id: req.id,
+        result: { roots: [this.workspaceRoot] }
+      }).catch(() => void 0);
+      return;
+    }
+    void this.transport.send({
+      jsonrpc: "2.0",
+      id: req.id,
+      error: { code: -32601, message: `method not found: ${req.method}` }
+    }).catch(() => void 0);
+  }
 };
 
 // src/mcp/stdio.ts
@@ -15657,12 +15567,12 @@ var StdioTransport = class {
   }
   async send(message) {
     if (this.closed) throw new Error("MCP transport is closed");
-    return new Promise((resolve14, reject) => {
+    return new Promise((resolve15, reject) => {
       const line = `${JSON.stringify(message)}
 `;
       this.child.stdin.write(line, "utf8", (err) => {
         if (err) reject(err);
-        else resolve14();
+        else resolve15();
       });
     });
   }
@@ -15673,8 +15583,8 @@ var StdioTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve14) => {
-        this.waiters.push(resolve14);
+      const next = await new Promise((resolve15) => {
+        this.waiters.push(resolve15);
       });
       if (next === null) return;
       yield next;
@@ -15754,8 +15664,8 @@ var SseTransport = class {
   constructor(opts) {
     this.url = opts.url;
     this.headers = opts.headers ?? {};
-    this.endpointReady = new Promise((resolve14, reject) => {
-      this.resolveEndpoint = resolve14;
+    this.endpointReady = new Promise((resolve15, reject) => {
+      this.resolveEndpoint = resolve15;
       this.rejectEndpoint = reject;
     });
     this.endpointReady.catch(() => void 0);
@@ -15782,8 +15692,8 @@ var SseTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve14) => {
-        this.waiters.push(resolve14);
+      const next = await new Promise((resolve15) => {
+        this.waiters.push(resolve15);
       });
       if (next === null) return;
       yield next;
@@ -15969,8 +15879,8 @@ var StreamableHttpTransport = class {
         continue;
       }
       if (this.closed) return;
-      const next = await new Promise((resolve14) => {
-        this.waiters.push(resolve14);
+      const next = await new Promise((resolve15) => {
+        this.waiters.push(resolve15);
       });
       if (next === null) return;
       yield next;
@@ -16074,7 +15984,7 @@ import {
   writeFileSync as writeFileSync7,
   writeSync
 } from "fs";
-import { dirname as dirname9, isAbsolute as isAbsolute9, relative as relative10, resolve as resolve13 } from "path";
+import { dirname as dirname9, isAbsolute as isAbsolute9, relative as relative10, resolve as resolve14 } from "path";
 var BLOCK_RE = /^(\S[^\n]*)\n<{7} SEARCH\n([\s\S]*?)\n?={7}\n([\s\S]*?)\n?>{7} REPLACE/gm;
 function parseEditBlocks(text) {
   const out = [];
@@ -16092,15 +16002,15 @@ function parseEditBlocks(text) {
   return out;
 }
 function resolveEditPath(rootDir, rawPath) {
-  const absRoot = resolve13(rootDir);
+  const absRoot = resolve14(rootDir);
   if (/^[A-Za-z]:[\\/]/.test(rawPath) || looksLikeAbsoluteSystemPath2(rawPath)) {
-    return resolve13(rawPath);
+    return resolve14(rawPath);
   }
   let rooted = rawPath;
   while (rooted.startsWith("/") || rooted.startsWith("\\")) {
     rooted = rooted.slice(1);
   }
-  return resolve13(absRoot, rooted || ".");
+  return resolve14(absRoot, rooted || ".");
 }
 function looksLikeAbsoluteSystemPath2(rawPath) {
   return /^\/(?:home|Users|etc|var|opt|tmp|usr|mnt|Library|Volumes|proc|sys|dev|run|srv|media|Applications|System|root|boot|private)(?:[/\\]|$)/.test(
@@ -16112,7 +16022,7 @@ function pathIsUnder4(child, parent) {
   return rel === "" || !rel.startsWith("..") && !isAbsolute9(rel);
 }
 function applyEditBlock(block, rootDir) {
-  const absRoot = resolve13(rootDir);
+  const absRoot = resolve14(rootDir);
   const absTarget = resolveEditPath(rootDir, block.path);
   if (!pathIsUnder4(absTarget, absRoot)) {
     return {
@@ -16208,7 +16118,7 @@ function applyEditBlocks(blocks, rootDir) {
   return blocks.map((b) => applyEditBlock(b, rootDir));
 }
 function snapshotBeforeEdits(blocks, rootDir) {
-  const absRoot = resolve13(rootDir);
+  const absRoot = resolve14(rootDir);
   const seen = /* @__PURE__ */ new Set();
   const snapshots = [];
   for (const b of blocks) {
@@ -16230,7 +16140,7 @@ function snapshotBeforeEdits(blocks, rootDir) {
   return snapshots;
 }
 function restoreSnapshots(snapshots, rootDir) {
-  const absRoot = resolve13(rootDir);
+  const absRoot = resolve14(rootDir);
   return snapshots.map((snap) => {
     const abs = resolveEditPath(rootDir, snap.path);
     if (!pathIsUnder4(abs, absRoot)) {
@@ -16432,7 +16342,7 @@ ${appendParts.join("\n\n")}`;
 
 // src/telemetry/usage.ts
 import {
-  appendFileSync as appendFileSync3,
+  appendFileSync as appendFileSync2,
   closeSync as closeSync3,
   existsSync as existsSync13,
   fstatSync as fstatSync2,
@@ -16514,7 +16424,7 @@ function appendUsage(input) {
   const path2 = input.path ?? defaultUsageLogPath();
   try {
     mkdirSync7(dirname10(path2), { recursive: true });
-    appendFileSync3(path2, `${JSON.stringify(record)}
+    appendFileSync2(path2, `${JSON.stringify(record)}
 `, "utf8");
     compactUsageLogIfLarge(path2, record.ts);
   } catch {