reasonix 0.46.1 → 0.47.0

package/dist/index.js

@@ -472,6 +472,12 @@ function loadMetasoApiKey(path2 = defaultConfigPath()) {
   if (cfg && typeof cfg === "string" && cfg.trim()) return cfg.trim();
   return DEFAULT_METASO_API_KEY;
 }
+function loadTavilyApiKey(path2 = defaultConfigPath()) {
+  if (process.env.TAVILY_API_KEY) return process.env.TAVILY_API_KEY.trim();
+  const cfg = readConfig(path2).tavilyApiKey;
+  if (cfg && typeof cfg === "string" && cfg.trim()) return cfg.trim();
+  return void 0;
+}
 function defaultConfigPath() {
   return join(homedir(), ".reasonix", "config.json");
 }
@@ -1191,8 +1197,9 @@ var EN = {
             { key: "wheel", text: "scrolls chat history (works on web/cloud/SSH terminals too)" },
             {
               key: "\u2191 / \u2193",
-              text: "scroll chat \xB7 use Ctrl+P / Ctrl+N for prompt history + multi-line cursor"
-            }
+              text: "prompt history (or per-line cursor in a multi-line draft) \u2014 Ctrl+P / Ctrl+N alias"
+            },
+            { key: "PgUp / PgDn", text: "scroll chat history (mouse wheel routes here too)" }
           ]
         }
       ],
@@ -1206,11 +1213,11 @@ var EN = {
           rows: [
             { key: "Enter", text: "submit the prompt" },
             { key: "Shift+Enter", text: "insert a newline in the prompt" },
-            { key: "\u2191 / \u2193", text: "scroll chat history (mouse wheel routes here too)" },
             {
-              key: "Ctrl+P / Ctrl+N",
+              key: "\u2191 / \u2193",
               text: "previous / next prompt history \xB7 cursor up / down in a multi-line draft"
             },
+            { key: "Ctrl+P / Ctrl+N", text: "readline alias for \u2191 / \u2193" },
             { key: "Ctrl+A / Ctrl+E", text: "jump to start / end of the current line" },
             { key: "Ctrl+W", text: "delete the word before the cursor" },
             { key: "Ctrl+U", text: "clear the entire prompt buffer" },
@@ -1219,7 +1226,11 @@ var EN = {
             { key: "Esc", text: "dismiss picker \xB7 abort the running model turn" },
             { key: "Ctrl+C", text: "abort the running model turn (NOT copy \u2014 see clipboard)" },
             { key: "PgUp / PgDn", text: "scroll chat history a page at a time" },
-            { key: "End", text: "jump chat to the most recent line" }
+            { key: "End", text: "jump chat to the most recent line" },
+            {
+              key: "Ctrl+R",
+              text: "toggle verbose mode \u2014 full reasoning + tool output, no head/tail elision"
+            }
           ]
         },
         {
@@ -1258,7 +1269,7 @@ var EN = {
           ]
         }
       ],
-      footer: "Wheel\u2192\u2191/\u2193 via DECSET 1007 (alternate-scroll) \u2014 wheel scrolls chat on most terminals (web/cloud/SSH included) without disturbing native selection. Drag to select stays modifier-free. Pass --no-mouse to opt out."
+      footer: "Wheel scrolls chat on most terminals (web/cloud/SSH included) \u2014 SGR mouse tracking is on by default and stays out of the way of native drag-select and right-click. Pass --no-mouse to opt out."
     },
     tipShownOnce: "shown once",
     modelOverride: "override the default model",
@@ -1413,7 +1424,7 @@ var EN = {
     sessions: { description: "list saved sessions (current marked with \u25B8)" },
     title: { description: "ask the model to rename this session from the conversation" },
     qq: {
-      description: "connect, inspect, or disconnect the QQ channel for this session",
+      description: "connect, inspect, or disconnect the QQ channel for this session (first connect guides App ID / App Secret setup)",
       argsHint: "[connect [appId appSecret [sandbox]]|status|disconnect]"
     },
     setup: { description: "reminds you to exit and run `reasonix setup`" },
@@ -1637,6 +1648,8 @@ var EN = {
     notedVerbCreated: "created",
     notedVerbAppended: "appended to",
     memoryWriteFailed: "# memory write failed",
+    verboseOn: "\u25B8 verbose mode on \u2014 full reasoning + tool output",
+    verboseOff: "\u25B8 verbose mode off \u2014 head/tail elision restored",
     commandFailed: "! command failed",
     btwUsage: "\u25B8 /btw <question> \u2014 ask a side question without polluting the conversation context.",
     btwHeader: "\u226B btw",
@@ -1771,6 +1784,48 @@ var EN = {
       titleStarted: "\u25B8 naming session\u2026",
       titleFailed: "\u25B8 session title failed: {reason}"
     },
+    qq: {
+      unavailable: "/qq is not available in this session.",
+      connecting: "QQ: connecting\u2026",
+      connectFailed: "QQ connect failed: {reason}",
+      disconnecting: "QQ: disconnecting\u2026",
+      disconnectFailed: "QQ disconnect failed: {reason}",
+      usage: "Usage: /qq connect [appId appSecret [sandbox]] | /qq status | /qq disconnect",
+      promptAppId: "QQ setup: enter your QQ Open Platform App ID, then press Enter. Type /cancel to abort.",
+      promptAppSecret: "QQ setup: enter your QQ Open Platform App Secret, then press Enter. Type /cancel to abort.",
+      setupWaitingAppId: "waiting for App ID",
+      setupWaitingAppSecret: "waiting for App Secret",
+      setupCancelled: "QQ setup cancelled.",
+      credentialsRequired: "QQ App ID and App Secret are required.",
+      connected: "QQ connected in {mode} mode. It will auto-start on future launches.",
+      alreadyConnected: "QQ is already connected in {mode} mode. Auto-start is enabled.",
+      disconnected: "QQ disconnected. Auto-start is disabled.",
+      status: "QQ: {connected}, auto-start {enabled}, credentials {configured}, appId {appId}, {sandbox}, access {access}, current mode {mode}.",
+      statusSetup: "QQ: setup in progress \u2014 {step}",
+      stateConnected: "connected",
+      stateDisconnected: "disconnected",
+      stateEnabled: "enabled",
+      stateDisabled: "disabled",
+      stateConfigured: "configured",
+      stateNotConfigured: "not configured",
+      sandbox: "sandbox",
+      production: "production",
+      none: "none",
+      modeChat: "chat",
+      modeCode: "code",
+      accessOwner: "owner {owner}",
+      accessOwnerWithAllowlist: "owner {owner}, allowlist {count}",
+      accessAllowlist: "allowlist {count}",
+      accessRuntime: "first-sender (runtime only, {owner})",
+      accessOpen: "open (unbound)",
+      lockAlreadyRunning: "QQ channel is already running in process {pid}. Stop that process before starting another QQ channel.",
+      unauthorizedMessage: "QQ ignored message from unauthorized openid {openid}. Current access: {access}.",
+      runtimeBound: "QQ temporarily bound this run to first sender {openid}. Set `qq.ownerOpenId` in config to persist access.",
+      missingAppId: "QQ App ID is required. Run `/qq connect` to configure.",
+      missingAppSecret: "QQ App Secret is required. Run `/qq connect` to configure.",
+      authFailed: "QQ bot authentication failed \u2014 check your App ID and App Secret.",
+      readyTimeout: "QQ bot did not receive READY within 15s \u2014 check your App ID and App Secret."
+    },
     admin: {
       doctorNeedsTui: "/doctor needs a TUI context (postDoctor wired).",
       doctorRunning: "\u2695 Doctor \u2014 running health checks\u2026",
@@ -2037,12 +2092,14 @@ var EN = {
       usageSearxng: "  /search-engine searxng            use SearXNG at default endpoint",
       usageSearxngUrl: "  /search-engine searxng <url>      use SearXNG at custom endpoint",
       usageMetaso: "  /search-engine metaso              use Metaso API (100/d free, configure your own API key for more)",
+      usageTavily: "  /search-engine tavily              use Tavily API (LLM-friendly, free 1000/mo \u2014 set TAVILY_API_KEY or tavilyApiKey in config; get one at https://tavily.com)",
       alias: "Alias: /se",
       searxngInfo: "SearXNG is a self-hosted metasearch engine (https://github.com/searxng/searxng).",
       searxngInstall: "Install it with:  docker run -d -p 8080:8080 searxng/searxng",
       switched: 'Switched web search engine to "{engine}".{note}',
       switchedSearxngNote: " Make sure SearXNG is running at {endpoint}.",
       switchedMetasoNote: " There is a daily quota of 100 (configure your own API key for higher limits).",
+      switchedTavilyNote: " Set TAVILY_API_KEY or `tavilyApiKey` in config; free 1000/mo at https://tavily.com.",
       confirmed: '\u2713 Web search engine set to "{engine}"{detail}. Next assistant turn will pick up the change.',
       confirmedDetail: " ({endpoint})"
     },
@@ -2178,6 +2235,13 @@ var EN = {
     linesBelow: "  \u2193 {count} line below  (\u2193/j or Space/PgDn)",
     linesBelowPlural: "  \u2193 {count} lines below  (\u2193/j or Space/PgDn)"
   },
+  editPicker: {
+    title: "edit a previous message",
+    hint: "\u2191\u2193 pick \xB7 Enter to load into composer \xB7 Esc to cancel",
+    empty: "no user turns yet \u2014 nothing to edit",
+    dismiss: "Esc to dismiss",
+    forked: "\u25B8 forked at turn #{turn} \u2014 buffer holds the original text"
+  },
   sessionPicker: {
     header: " \u25C8 REASONIX \xB7 pick a session ",
     title: "pick a session \u2014 {workspace}",
@@ -2311,6 +2375,11 @@ var EN = {
     metasoServerError: "web_search: Metaso server error ({status}) \u2014 try again later, or switch engine with /search-engine mojeek",
     metasoParseError: "web_search: Metaso returned unparseable response (HTTP {status}) \u2014 try again later",
     metasoApiError: "web_search: Metaso API error (code {code}: {message}) \u2014 try again later",
+    tavilyMissingKey: "web_search: Tavily backend requires an API key \u2014 set TAVILY_API_KEY env var or `tavilyApiKey` in ~/.reasonix/config.json; free 1000/mo signup at https://tavily.com",
+    tavilyUnauthorized: "web_search: Tavily API key rejected \u2014 check TAVILY_API_KEY or get one at https://tavily.com",
+    tavilyRateLimit: "web_search: Tavily rate-limited or monthly quota exceeded \u2014 wait, switch engine with /search-engine mojeek, or upgrade your Tavily plan",
+    tavilyServerError: "web_search: Tavily server error ({status}) \u2014 try again later, or switch engine with /search-engine mojeek",
+    tavilyParseError: "web_search: Tavily returned unparseable response (HTTP {status}) \u2014 try again later",
     fetchStatus: "web_fetch {status} for {url} \u2014 try: confirm the URL resolves in a browser; status suggests the host returned an error page",
     fetchRateLimit429: "web_fetch 429 for {url} \u2014 try: wait 10s before retrying; the host is rate-limiting this client",
     fetchForbidden403: "web_fetch 403 for {url} \u2014 try: the host is blocking this client; the page may require login or block bots \u2014 use web_search snippets instead",
@@ -2429,7 +2498,8 @@ var EN = {
     scrollAbove: " \u2191 {scroll} / {max} row above",
     scrollAbovePlural: " \u2191 {scroll} / {max} rows above",
     scrollMore: " \u2014 {remaining} more",
-    scrollPgUp: " \xB7 PgUp / wheel / \u2191"
+    scrollPgUp: " \xB7 PgUp / wheel",
+    scrollCopy: " \xB7 /copy enters copy mode"
   },
   slashArgPicker: {
     noMatch: 'no match for "{partial}"',
@@ -2487,7 +2557,8 @@ var EN = {
     reconnectDetail: "tearing down \xB7 re-handshake \xB7 listing tools",
     disabledDetail: "via /mcp disable {name}",
     failedSetupHint: "\u2192 run `reasonix setup` to remove this entry, or fix the underlying issue (missing npm package, network, etc.).",
-    failedSetupConfigHint: "\u2192 run `reasonix setup` to remove broken entries from your saved config."
+    failedSetupConfigHint: "\u2192 run `reasonix setup` to remove broken entries from your saved config.",
+    abortedHint: "MCP startup aborted \u2014 {count} server(s) skipped. Run /mcp to retry once you've fixed the underlying issue."
   },
   checkpointPicker: {
     title: "restore a checkpoint \u2014 {workspace}",
@@ -2632,8 +2703,9 @@ var zhCN = {
             { key: "\u6EDA\u8F6E", text: "\u6EDA\u52A8\u804A\u5929\u8BB0\u5F55\uFF08Web / \u4E91\u7AEF / SSH \u7EC8\u7AEF\u4E5F\u80FD\u7528\uFF09" },
             {
               key: "\u2191 / \u2193",
-              text: "\u6EDA\u52A8\u804A\u5929 \xB7 \u8F93\u5165\u6846\u5386\u53F2 + \u591A\u884C\u5149\u6807\u7528 Ctrl+P / Ctrl+N"
-            }
+              text: "\u8F93\u5165\u5386\u53F2\uFF08\u591A\u884C\u8349\u7A3F\u65F6\u6309\u884C\u79FB\u52A8\u5149\u6807\uFF09\u2014 Ctrl+P / Ctrl+N \u540C\u4E49"
+            },
+            { key: "PgUp / PgDn", text: "\u6EDA\u52A8\u804A\u5929\u8BB0\u5F55\uFF08\u9F20\u6807\u6EDA\u8F6E\u4E5F\u8D70\u8FD9\u6761\u8DEF\u5F84\uFF09" }
           ]
         }
       ],
@@ -2647,11 +2719,11 @@ var zhCN = {
           rows: [
             { key: "Enter", text: "\u63D0\u4EA4\u8F93\u5165" },
             { key: "Shift+Enter", text: "\u5728\u8F93\u5165\u6846\u4E2D\u63D2\u5165\u6362\u884C" },
-            { key: "\u2191 / \u2193", text: "\u6EDA\u52A8\u804A\u5929\u8BB0\u5F55\uFF08\u9F20\u6807\u6EDA\u8F6E\u4E5F\u8D70\u8FD9\u6761\u8DEF\u5F84\uFF09" },
             {
-              key: "Ctrl+P / Ctrl+N",
+              key: "\u2191 / \u2193",
               text: "\u4E0A\u4E00\u6761 / \u4E0B\u4E00\u6761\u8F93\u5165\u5386\u53F2 \xB7 \u591A\u884C\u8349\u7A3F\u4E2D\u6309\u884C\u79FB\u52A8\u5149\u6807"
             },
+            { key: "Ctrl+P / Ctrl+N", text: "\u2191 / \u2193 \u7684 readline \u540C\u4E49\u952E" },
             { key: "Ctrl+A / Ctrl+E", text: "\u8DF3\u5230\u5F53\u524D\u884C\u7684\u5F00\u5934 / \u7ED3\u5C3E" },
             { key: "Ctrl+W", text: "\u5220\u9664\u5149\u6807\u524D\u7684\u4E00\u4E2A\u8BCD" },
             { key: "Ctrl+U", text: "\u6E05\u7A7A\u6574\u4E2A\u8F93\u5165\u7F13\u51B2\u533A" },
@@ -2660,7 +2732,8 @@ var zhCN = {
             { key: "Esc", text: "\u5173\u95ED\u5F39\u51FA\u9009\u62E9\u5668 \xB7 \u4E2D\u6B62\u5F53\u524D\u6A21\u578B\u56DE\u5408" },
             { key: "Ctrl+C", text: "\u4E2D\u6B62\u5F53\u524D\u6A21\u578B\u56DE\u5408\uFF08\u4E0D\u662F\u590D\u5236 \u2014 \u89C1\u526A\u8D34\u677F\u6BB5\uFF09" },
             { key: "PgUp / PgDn", text: "\u6574\u9875\u6EDA\u52A8\u804A\u5929\u8BB0\u5F55" },
-            { key: "End", text: "\u8DF3\u5230\u804A\u5929\u7684\u6700\u65B0\u4E00\u884C" }
+            { key: "End", text: "\u8DF3\u5230\u804A\u5929\u7684\u6700\u65B0\u4E00\u884C" },
+            { key: "Ctrl+R", text: "\u5207\u6362\u8BE6\u7EC6\u6A21\u5F0F \u2014 \u663E\u793A\u5B8C\u6574\u63A8\u7406 + \u5DE5\u5177\u8F93\u51FA\uFF0C\u4E0D\u7701\u7565" }
           ]
         },
         {
@@ -2699,7 +2772,7 @@ var zhCN = {
           ]
         }
       ],
-      footer: "\u901A\u8FC7 DECSET 1007\uFF08alternate-scroll\uFF09\uFF0C\u7EC8\u7AEF\u628A\u6EDA\u8F6E\u7FFB\u8BD1\u6210 \u2191/\u2193 \u53D1\u7ED9\u5E94\u7528 \u2014 \u5927\u591A\u6570\u7EC8\u7AEF\uFF08\u542B Web / \u4E91\u7AEF / SSH\uFF09\u90FD\u80FD\u6EDA\uFF0C\u4E14\u4E0D\u5F71\u54CD\u7EC8\u7AEF\u539F\u751F\u9009\u533A\u3002\u76F4\u63A5\u62D6\u52A8\u9009\u4E2D\u6587\u672C\u65E0\u9700 Shift\u3002\u4F20\u5165 --no-mouse \u53EF\u5173\u95ED\u3002"
+      footer: "\u6EDA\u8F6E\u5728\u5927\u591A\u6570\u7EC8\u7AEF\uFF08\u542B Web / \u4E91\u7AEF / SSH\uFF09\u90FD\u80FD\u6EDA\u804A\u5929 \u2014 \u9ED8\u8BA4\u5F00\u542F SGR \u9F20\u6807\u8DDF\u8E2A\uFF0C\u4F46\u4E0D\u4F1A\u5F71\u54CD\u7EC8\u7AEF\u539F\u751F\u62D6\u9009\u548C\u53F3\u952E\u83DC\u5355\u3002\u76F4\u63A5\u62D6\u52A8\u9009\u4E2D\u6587\u672C\u65E0\u9700 Shift\u3002\u4F20\u5165 --no-mouse \u53EF\u5173\u95ED\u3002"
     },
     tipShownOnce: "\u4EC5\u663E\u793A\u4E00\u6B21",
     modelOverride: "\u8986\u76D6\u9ED8\u8BA4\u6A21\u578B",
@@ -2856,7 +2929,7 @@ var zhCN = {
     sessions: { description: "\u5217\u51FA\u5DF2\u4FDD\u5B58\u7684\u4F1A\u8BDD\uFF08\u5F53\u524D\u6807\u8BB0\u4E3A \u25B8\uFF09" },
     title: { description: "\u8BA9\u6A21\u578B\u6839\u636E\u5F53\u524D\u5BF9\u8BDD\u91CD\u547D\u540D\u6B64\u4F1A\u8BDD" },
     qq: {
-      description: "\u8FDE\u63A5\u3001\u67E5\u770B\u6216\u65AD\u5F00\u5F53\u524D\u4F1A\u8BDD\u7684 QQ \u901A\u9053",
+      description: "\u8FDE\u63A5\u3001\u67E5\u770B\u6216\u65AD\u5F00\u5F53\u524D\u4F1A\u8BDD\u7684 QQ \u901A\u9053\uFF08\u9996\u6B21\u8FDE\u63A5\u4F1A\u5F15\u5BFC\u5F55\u5165 App ID / App Secret\uFF09",
       argsHint: "[connect [appId appSecret [sandbox]]|status|disconnect]"
     },
     setup: { description: "\u63D0\u9192\u60A8\u9000\u51FA\u5E76\u8FD0\u884C `reasonix setup`" },
@@ -3082,6 +3155,8 @@ var zhCN = {
     notedVerbCreated: "\u521B\u5EFA",
     notedVerbAppended: "\u8FFD\u52A0\u5230",
     memoryWriteFailed: "# \u8BB0\u5FC6\u5199\u5165\u5931\u8D25",
+    verboseOn: "\u25B8 \u8BE6\u7EC6\u6A21\u5F0F\u5DF2\u5F00 \u2014 \u663E\u793A\u5B8C\u6574\u63A8\u7406 + \u5DE5\u5177\u8F93\u51FA",
+    verboseOff: "\u25B8 \u8BE6\u7EC6\u6A21\u5F0F\u5DF2\u5173 \u2014 \u6062\u590D\u5934\u5C3E\u7701\u7565",
     commandFailed: "! \u547D\u4EE4\u5931\u8D25",
     btwUsage: "\u25B8 /btw <\u95EE\u9898> \u2014 \u987A\u4FBF\u95EE\u4E2A\u9898\u5916\u8BDD\uFF0C\u4E0D\u4F1A\u5199\u5165\u5F53\u524D\u4F1A\u8BDD\u4E0A\u4E0B\u6587\u3002",
     btwHeader: "\u226B btw",
@@ -3216,6 +3291,48 @@ var zhCN = {
       titleStarted: "\u25B8 \u6B63\u5728\u547D\u540D\u4F1A\u8BDD\u2026",
       titleFailed: "\u25B8 \u4F1A\u8BDD\u547D\u540D\u5931\u8D25\uFF1A{reason}"
     },
+    qq: {
+      unavailable: "/qq \u5728\u5F53\u524D\u4F1A\u8BDD\u4E2D\u4E0D\u53EF\u7528\u3002",
+      connecting: "QQ\uFF1A\u6B63\u5728\u8FDE\u63A5\u2026",
+      connectFailed: "QQ \u8FDE\u63A5\u5931\u8D25\uFF1A{reason}",
+      disconnecting: "QQ\uFF1A\u6B63\u5728\u65AD\u5F00\u2026",
+      disconnectFailed: "QQ \u65AD\u5F00\u5931\u8D25\uFF1A{reason}",
+      usage: "\u7528\u6CD5\uFF1A/qq connect [appId appSecret [sandbox]] | /qq status | /qq disconnect",
+      promptAppId: "QQ \u9996\u6B21\u914D\u7F6E\uFF1A\u8BF7\u8F93\u5165 QQ \u5F00\u653E\u5E73\u53F0 App ID \u540E\u56DE\u8F66\u3002\u8F93\u5165 /cancel \u53EF\u53D6\u6D88\u3002",
+      promptAppSecret: "QQ \u9996\u6B21\u914D\u7F6E\uFF1A\u8BF7\u8F93\u5165 QQ \u5F00\u653E\u5E73\u53F0 App Secret \u540E\u56DE\u8F66\u3002\u8F93\u5165 /cancel \u53EF\u53D6\u6D88\u3002",
+      setupWaitingAppId: "\u7B49\u5F85\u8F93\u5165 App ID",
+      setupWaitingAppSecret: "\u7B49\u5F85\u8F93\u5165 App Secret",
+      setupCancelled: "QQ \u9996\u6B21\u914D\u7F6E\u5DF2\u53D6\u6D88\u3002",
+      credentialsRequired: "QQ App ID \u548C App Secret \u4E0D\u80FD\u4E3A\u7A7A\u3002",
+      connected: "QQ \u5DF2\u5728{mode}\u6A21\u5F0F\u4E0B\u8FDE\u63A5\u6210\u529F\uFF0C\u540E\u7EED\u542F\u52A8\u4F1A\u81EA\u52A8\u542F\u7528\u3002",
+      alreadyConnected: "QQ \u5DF2\u5728{mode}\u6A21\u5F0F\u4E0B\u8FDE\u63A5\uFF0C\u81EA\u52A8\u542F\u52A8\u5DF2\u542F\u7528\u3002",
+      disconnected: "QQ \u5DF2\u65AD\u5F00\u8FDE\u63A5\uFF0C\u81EA\u52A8\u542F\u52A8\u5DF2\u5173\u95ED\u3002",
+      status: "QQ\uFF1A{connected}\uFF0C\u81EA\u52A8\u542F\u52A8{enabled}\uFF0C\u51ED\u636E{configured}\uFF0CappId {appId}\uFF0C{sandbox}\uFF0C\u8BBF\u95EE\u63A7\u5236 {access}\uFF0C\u5F53\u524D\u6A21\u5F0F {mode}\u3002",
+      statusSetup: "QQ\uFF1A\u9996\u6B21\u914D\u7F6E\u8FDB\u884C\u4E2D \u2014\u2014 {step}",
+      stateConnected: "\u5DF2\u8FDE\u63A5",
+      stateDisconnected: "\u672A\u8FDE\u63A5",
+      stateEnabled: "\u5DF2\u542F\u7528",
+      stateDisabled: "\u672A\u542F\u7528",
+      stateConfigured: "\u5DF2\u914D\u7F6E",
+      stateNotConfigured: "\u672A\u914D\u7F6E",
+      sandbox: "\u6C99\u7BB1\u73AF\u5883",
+      production: "\u6B63\u5F0F\u73AF\u5883",
+      none: "\u65E0",
+      modeChat: "\u804A\u5929",
+      modeCode: "\u4EE3\u7801",
+      accessOwner: "\u6240\u6709\u8005 {owner}",
+      accessOwnerWithAllowlist: "\u6240\u6709\u8005 {owner}\uFF0C\u767D\u540D\u5355 {count}",
+      accessAllowlist: "\u767D\u540D\u5355 {count}",
+      accessRuntime: "\u9996\u4E2A\u79C1\u804A\u7528\u6237\uFF08\u4EC5\u672C\u6B21\u8FD0\u884C\uFF0C{owner}\uFF09",
+      accessOpen: "\u5F00\u653E\uFF08\u672A\u7ED1\u5B9A\uFF09",
+      lockAlreadyRunning: "QQ \u901A\u9053\u5DF2\u5728\u8FDB\u7A0B {pid} \u4E2D\u8FD0\u884C\u3002\u8BF7\u5148\u505C\u6B62\u8BE5\u8FDB\u7A0B\uFF0C\u518D\u542F\u52A8\u65B0\u7684 QQ \u901A\u9053\u3002",
+      unauthorizedMessage: "QQ \u5FFD\u7565\u4E86\u672A\u6388\u6743 openid {openid} \u7684\u6D88\u606F\u3002\u5F53\u524D\u8BBF\u95EE\u63A7\u5236\uFF1A{access}\u3002",
+      runtimeBound: "QQ \u5DF2\u5728\u672C\u6B21\u8FD0\u884C\u4E2D\u4E34\u65F6\u7ED1\u5B9A\u5230\u9996\u4E2A\u53D1\u9001\u8005 {openid}\u3002\u5982\u9700\u6301\u4E45\u5316\uFF0C\u8BF7\u5728\u914D\u7F6E\u4E2D\u8BBE\u7F6E `qq.ownerOpenId`\u3002",
+      missingAppId: "\u7F3A\u5C11 QQ App ID\u3002\u8BF7\u5148\u8FD0\u884C `/qq connect` \u5B8C\u6210\u914D\u7F6E\u3002",
+      missingAppSecret: "\u7F3A\u5C11 QQ App Secret\u3002\u8BF7\u5148\u8FD0\u884C `/qq connect` \u5B8C\u6210\u914D\u7F6E\u3002",
+      authFailed: "QQ \u673A\u5668\u4EBA\u9274\u6743\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5 App ID \u548C App Secret\u3002",
+      readyTimeout: "QQ \u673A\u5668\u4EBA 15 \u79D2\u5185\u672A\u6536\u5230 READY\uFF0C\u8BF7\u68C0\u67E5 App ID \u548C App Secret\u3002"
+    },
     admin: {
       doctorNeedsTui: "/doctor \u9700\u8981 TUI \u4E0A\u4E0B\u6587\uFF08postDoctor \u5DF2\u8FDE\u63A5\uFF09\u3002",
       doctorRunning: "\u2695 \u5065\u5EB7\u68C0\u67E5 \u2014 \u6B63\u5728\u8FD0\u884C\u2026",
@@ -3482,12 +3599,14 @@ var zhCN = {
       usageSearxng: "  /search-engine searxng            \u4F7F\u7528 SearXNG \u9ED8\u8BA4\u7AEF\u70B9",
       usageSearxngUrl: "  /search-engine searxng <url>      \u4F7F\u7528 SearXNG \u81EA\u5B9A\u4E49\u7AEF\u70B9",
       usageMetaso: "  /search-engine metaso              \u4F7F\u7528 Metaso API\uFF08\u6BCF\u5929 100 \u6B21\u514D\u8D39\uFF0C\u914D\u7F6E\u4F60\u81EA\u5DF1\u7684 API \u5BC6\u94A5\u53EF\u63D0\u5347\u9650\u989D\uFF09",
+      usageTavily: "  /search-engine tavily              \u4F7F\u7528 Tavily API\uFF08LLM \u53CB\u597D\uFF0C\u6BCF\u6708 1000 \u6B21\u514D\u8D39 \u2014 \u8BBE\u7F6E TAVILY_API_KEY \u6216 config \u7684 tavilyApiKey\uFF1B\u6CE8\u518C https://tavily.com\uFF09",
       alias: "\u522B\u540D\uFF1A/se",
       searxngInfo: "SearXNG \u662F\u4E00\u4E2A\u81EA\u6258\u7BA1\u7684\u5143\u641C\u7D22\u5F15\u64CE\uFF08https://github.com/searxng/searxng\uFF09\u3002",
       searxngInstall: "\u5B89\u88C5\u547D\u4EE4\uFF1A  docker run -d -p 8080:8080 searxng/searxng",
       switched: '\u5DF2\u5207\u6362\u7F51\u9875\u641C\u7D22\u5F15\u64CE\u4E3A "{engine}"\u3002{note}',
       switchedSearxngNote: " \u8BF7\u786E\u4FDD SearXNG \u5728 {endpoint} \u8FD0\u884C\u3002",
       switchedMetasoNote: " \u6BCF\u65E5\u9650\u989D 100 \u6B21\uFF08\u914D\u7F6E\u4F60\u81EA\u5DF1\u7684 API \u5BC6\u94A5\u53EF\u63D0\u5347\u9650\u989D\uFF09\u3002",
+      switchedTavilyNote: " \u8BF7\u8BBE\u7F6E\u73AF\u5883\u53D8\u91CF TAVILY_API_KEY \u6216 config \u4E2D\u7684 `tavilyApiKey`\uFF1Bhttps://tavily.com \u6BCF\u6708 1000 \u6B21\u514D\u8D39\u3002",
       confirmed: '\u2713 \u7F51\u9875\u641C\u7D22\u5F15\u64CE\u5DF2\u8BBE\u4E3A "{engine}"{detail}\u3002\u4E0B\u4E00\u8F6E\u6A21\u578B\u8C03\u7528\u5C06\u751F\u6548\u3002',
       confirmedDetail: "\uFF08{endpoint}\uFF09"
     },
@@ -3623,6 +3742,13 @@ var zhCN = {
     linesBelow: "  \u2193 \u4E0B\u65B9 {count} \u884C\uFF08\u2193/j \u6216 Space/PgDn\uFF09",
     linesBelowPlural: "  \u2193 \u4E0B\u65B9 {count} \u884C\uFF08\u2193/j \u6216 Space/PgDn\uFF09"
   },
+  editPicker: {
+    title: "\u7F16\u8F91\u4E4B\u524D\u7684\u6D88\u606F",
+    hint: "\u2191\u2193 \u9009\u62E9 \xB7 Enter \u52A0\u8F7D\u5230\u8F93\u5165\u6846 \xB7 Esc \u53D6\u6D88",
+    empty: "\u8FD8\u6CA1\u6709\u7528\u6237\u53D1\u8A00 \u2014 \u6CA1\u4EC0\u4E48\u53EF\u4EE5\u7F16\u8F91\u7684",
+    dismiss: "Esc \u5173\u95ED",
+    forked: "\u25B8 \u4ECE\u7B2C #{turn} \u8F6E\u5206\u53C9 \u2014 \u539F\u6587\u5DF2\u586B\u56DE\u8F93\u5165\u6846"
+  },
   sessionPicker: {
     header: " \u25C8 REASONIX \xB7 \u9009\u62E9\u4F1A\u8BDD ",
     title: "\u9009\u62E9\u4F1A\u8BDD \u2014 {workspace}",
@@ -3756,6 +3882,11 @@ var zhCN = {
     metasoServerError: "web_search: Metaso \u670D\u52A1\u5668\u9519\u8BEF\uFF08{status}\uFF09\u2014 \u7A0D\u540E\u91CD\u8BD5\uFF0C\u6216\u4F7F\u7528 /search-engine mojeek \u5207\u6362\u5F15\u64CE",
     metasoParseError: "web_search: Metaso \u8FD4\u56DE\u65E0\u6CD5\u89E3\u6790\u7684\u54CD\u5E94\uFF08HTTP {status}\uFF09\u2014 \u7A0D\u540E\u91CD\u8BD5",
     metasoApiError: "web_search: Metaso API \u9519\u8BEF\uFF08code {code}: {message}\uFF09\u2014 \u7A0D\u540E\u91CD\u8BD5",
+    tavilyMissingKey: "web_search: Tavily \u540E\u7AEF\u9700\u8981 API \u5BC6\u94A5 \u2014 \u8BBE\u7F6E TAVILY_API_KEY \u73AF\u5883\u53D8\u91CF\uFF0C\u6216\u5728 ~/.reasonix/config.json \u4E2D\u914D\u7F6E `tavilyApiKey`\uFF1Bhttps://tavily.com \u6BCF\u6708 1000 \u6B21\u514D\u8D39",
+    tavilyUnauthorized: "web_search: Tavily API \u5BC6\u94A5\u88AB\u62D2\u7EDD \u2014 \u68C0\u67E5 TAVILY_API_KEY\uFF0C\u6216\u5728 https://tavily.com \u83B7\u53D6\u5BC6\u94A5",
+    tavilyRateLimit: "web_search: Tavily \u8BF7\u6C42\u9891\u7387\u9650\u5236\u6216\u6708\u5EA6\u914D\u989D\u7528\u5C3D \u2014 \u7B49\u5F85\u3001\u7528 /search-engine mojeek \u5207\u6362\u5F15\u64CE\uFF0C\u6216\u5347\u7EA7 Tavily \u8BA1\u5212",
+    tavilyServerError: "web_search: Tavily \u670D\u52A1\u5668\u9519\u8BEF\uFF08{status}\uFF09\u2014 \u7A0D\u540E\u91CD\u8BD5\uFF0C\u6216\u4F7F\u7528 /search-engine mojeek \u5207\u6362\u5F15\u64CE",
+    tavilyParseError: "web_search: Tavily \u8FD4\u56DE\u65E0\u6CD5\u89E3\u6790\u7684\u54CD\u5E94\uFF08HTTP {status}\uFF09\u2014 \u7A0D\u540E\u91CD\u8BD5",
     fetchStatus: "web_fetch {status} for {url} \u2014 try: \u5728\u6D4F\u89C8\u5668\u4E2D\u786E\u8BA4\u8BE5 URL \u80FD\u5426\u8BBF\u95EE\uFF1B\u8BE5\u72B6\u6001\u7801\u8868\u660E\u76EE\u6807\u4E3B\u673A\u8FD4\u56DE\u4E86\u9519\u8BEF\u9875\u9762",
     fetchRateLimit429: "web_fetch 429 for {url} \u2014 try: \u7B49\u5F85 10 \u79D2\u540E\u91CD\u8BD5\uFF1B\u76EE\u6807\u4E3B\u673A\u6B63\u5728\u5BF9\u8BE5\u5BA2\u6237\u7AEF\u8FDB\u884C\u9650\u6D41",
     fetchForbidden403: "web_fetch 403 for {url} \u2014 try: \u76EE\u6807\u4E3B\u673A\u62D2\u7EDD\u8BE5\u5BA2\u6237\u7AEF\u8BBF\u95EE\uFF1B\u8BE5\u9875\u9762\u53EF\u80FD\u9700\u8981\u767B\u5F55\u6216\u5C4F\u853D\u722C\u866B \u2014 \u6539\u7528 web_search \u6458\u8981",
@@ -3874,7 +4005,8 @@ var zhCN = {
     scrollAbove: " \u2191 {scroll}/{max} \u884C",
     scrollAbovePlural: " \u2191 {scroll}/{max} \u884C",
     scrollMore: " \u2014 \u8FD8\u6709 {remaining} \u884C",
-    scrollPgUp: " \xB7 PgUp/\u6EDA\u8F6E/\u2191"
+    scrollPgUp: " \xB7 PgUp/\u6EDA\u8F6E",
+    scrollCopy: " \xB7 /copy \u8FDB\u5165\u590D\u5236\u6A21\u5F0F"
   },
   slashArgPicker: {
     noMatch: '\u6CA1\u6709\u5339\u914D "{partial}"',
@@ -3932,7 +4064,8 @@ var zhCN = {
     reconnectDetail: "\u65AD\u5F00\u65E7\u8FDE\u63A5 \xB7 \u91CD\u65B0\u63E1\u624B \xB7 \u5217\u51FA\u5DE5\u5177",
     disabledDetail: "\u901A\u8FC7 /mcp disable {name}",
     failedSetupHint: "\u2192 \u8FD0\u884C `reasonix setup` \u79FB\u9664\u6B64\u6761\u76EE\uFF0C\u6216\u4FEE\u590D\u5E95\u5C42\u95EE\u9898\uFF08\u7F3A\u5C11 npm \u5305\u3001\u7F51\u7EDC\u7B49\uFF09\u3002",
-    failedSetupConfigHint: "\u2192 \u8FD0\u884C `reasonix setup` \u4ECE\u5DF2\u4FDD\u5B58\u914D\u7F6E\u4E2D\u79FB\u9664\u635F\u574F\u7684\u6761\u76EE\u3002"
+    failedSetupConfigHint: "\u2192 \u8FD0\u884C `reasonix setup` \u4ECE\u5DF2\u4FDD\u5B58\u914D\u7F6E\u4E2D\u79FB\u9664\u635F\u574F\u7684\u6761\u76EE\u3002",
+    abortedHint: "\u5DF2\u4E2D\u65AD MCP \u542F\u52A8 \u2014 \u8DF3\u8FC7 {count} \u4E2A\u670D\u52A1\u5668\u3002\u95EE\u9898\u4FEE\u590D\u540E\u7528 /mcp \u91CD\u65B0\u8FDE\u63A5\u3002"
   },
   checkpointPicker: {
     title: "\u6062\u590D\u68C0\u67E5\u70B9 \u2014 {workspace}",
@@ -4779,6 +4912,12 @@ var ToolRegistry = class {
         });
       }
     }
+    if (opts.signal?.aborted) {
+      return JSON.stringify({
+        error: `${name}: aborted before dispatch (user interrupt)`,
+        rejectedReason: "aborted"
+      });
+    }
     let finalResult;
     try {
       try {
@@ -5011,11 +5150,42 @@ async function bridgeMcpTools(client, opts = {}) {
   return { ...result, env };
 }
 function flattenMcpResult(result, opts = {}) {
+  validateResultShape(result);
   const parts = result.content.map(blockToString);
   const joined = parts.join("\n").trim();
   const prefixed = result.isError ? `ERROR: ${joined || "(no error message from server)"}` : joined;
   return opts.maxChars ? truncateForModel(prefixed, opts.maxChars) : prefixed;
 }
+function validateResultShape(result) {
+  if (typeof result !== "object" || !result)
+    throw new Error(`MCP server returned non-object result: ${typeof result}`);
+  const { content, isError: _isError } = result;
+  if (!Array.isArray(content))
+    throw new Error(`MCP server returned result with non-array content: ${typeof content}`);
+  for (let i = 0; i < content.length; i++) {
+    const block = content[i];
+    if (typeof block !== "object" || !block)
+      throw new Error(`MCP server returned result.content[${i}] is not an object`);
+    if (block.type !== "text" && block.type !== "image")
+      throw new Error(
+        `MCP server returned result.content[${i}] with unknown type ${JSON.stringify(block.type)}`
+      );
+    if (block.type === "text" && typeof block.text !== "string")
+      throw new Error(
+        `MCP server returned result.content[${i}] with non-string text (${typeof block.text})`
+      );
+    if (block.type === "image") {
+      if (typeof block.data !== "string")
+        throw new Error(
+          `MCP server returned result.content[${i}] with non-string data (${typeof block.data})`
+        );
+      if (typeof block.mimeType !== "string")
+        throw new Error(
+          `MCP server returned result.content[${i}] with non-string mimeType (${typeof block.mimeType})`
+        );
+    }
+  }
+}
 function truncateForModel(s, maxChars) {
   if (s.length <= maxChars) return s;
   const tailBudget = Math.min(1024, Math.floor(maxChars * 0.1));
@@ -5198,31 +5368,38 @@ function appendSessionMessage(name, message) {
   } catch {
   }
 }
-function listSessions() {
+function listSessions(opts) {
   const dir = sessionsDir();
   if (!existsSync3(dir)) return [];
+  const want = opts?.workspaceFilter ? normalizeWorkspace(opts.workspaceFilter) : null;
   try {
     const files = readdirSync(dir).filter(
       (f) => f.endsWith(".jsonl") && !f.endsWith(".events.jsonl")
     );
-    return files.map((file) => {
+    return files.flatMap((file) => {
       const path2 = join4(dir, file);
-      const stat2 = statSync(path2);
       const name = file.replace(/\.jsonl$/, "");
+      const meta = loadSessionMeta(name);
+      if (want !== null) {
+        if (typeof meta.workspace !== "string") return [];
+        if (normalizeWorkspace(meta.workspace) !== want) return [];
+      }
+      const stat2 = statSync(path2);
       const messageCount = countLines(path2);
-      return {
-        name,
-        path: path2,
-        size: stat2.size,
-        messageCount,
-        mtime: stat2.mtime,
-        meta: loadSessionMeta(name)
-      };
+      return [{ name, path: path2, size: stat2.size, messageCount, mtime: stat2.mtime, meta }];
     }).sort((a, b) => b.mtime.getTime() - a.mtime.getTime());
   } catch {
     return [];
   }
 }
+function normalizeWorkspace(p, platform = process.platform) {
+  if (typeof p !== "string" || p.length === 0) return "";
+  if (platform === "win32") {
+    const resolved = win32Path.resolve(p);
+    return resolved.replace(/\\/g, "/").replace(/^([A-Z]):/i, (_, d) => `${d.toLowerCase()}:`);
+  }
+  return posixPath.resolve(p);
+}
 function metaPath(name) {
   return join4(sessionsDir(), `${sanitizeName(name)}.meta.json`);
 }
@@ -5312,8 +5489,13 @@ function archiveSession(name) {
 }
 function countLines(path2) {
   try {
-    const raw = readFileSync4(path2, "utf8");
-    return raw.split(/\r?\n/).filter((l) => l.trim()).length;
+    const buf = readFileSync4(path2);
+    let count = 0;
+    for (let i = 0; i < buf.length; i++) {
+      if (buf[i] === 10) count++;
+    }
+    if (buf.length > 0 && buf[buf.length - 1] !== 10) count++;
+    return count;
   } catch {
     return 0;
   }
@@ -6834,6 +7016,32 @@ ${reason}`
     }
     return userText;
   }
+  /** Rewind to the N-th user turn (0-indexed). Drops that turn + everything after. */
+  rewindToUserTurn(userTurnIndex) {
+    const entries = this.log.entries;
+    let count = 0;
+    let targetIdx = -1;
+    for (let i = 0; i < entries.length; i++) {
+      if (entries[i].role !== "user") continue;
+      if (count === userTurnIndex) {
+        targetIdx = i;
+        break;
+      }
+      count++;
+    }
+    if (targetIdx < 0) return null;
+    const raw = entries[targetIdx].content;
+    const userText = typeof raw === "string" ? raw : "";
+    const preserved = entries.slice(0, targetIdx).map((m) => ({ ...m }));
+    this.log.compactInPlace(preserved);
+    if (this.sessionName) {
+      try {
+        rewriteSession(this.sessionName, preserved);
+      } catch {
+      }
+    }
+    return userText;
+  }
   async *step(userInput) {
     this._steerConsumed = false;
     if (this.budgetUsd !== null) {
@@ -8001,10 +8209,15 @@ var SkillStore = class {
         dir: join7(this.projectRoot, ".agents", SKILLS_DIRNAME),
         scope: "project"
       });
+      out.push({
+        dir: join7(this.projectRoot, ".claude", SKILLS_DIRNAME),
+        scope: "project"
+      });
     }
     for (const dir of this.customSkillPaths) out.push({ dir, scope: "custom" });
     out.push({ dir: join7(this.homeDir, ".reasonix", SKILLS_DIRNAME), scope: "global" });
     out.push({ dir: join7(this.homeDir, ".agents", SKILLS_DIRNAME), scope: "global" });
+    out.push({ dir: join7(this.homeDir, ".claude", SKILLS_DIRNAME), scope: "global" });
     return out.map((root, priority) => ({ ...root, priority, status: skillPathStatus(root.dir) }));
   }
   customRoots() {
@@ -8107,14 +8320,20 @@ var SkillStore = class {
     }
     const { data, body } = parseFrontmatter(raw);
     const name = data.name && isValidSkillName(data.name) ? data.name : stem;
+    const description = (data.description ?? "").trim();
+    if (!description) {
+      console.warn(
+        `[skills] "${name}" at ${path2} has no description: \u2014 it will be loaded but won't appear in the skills index.`
+      );
+    }
     return {
       name,
-      description: (data.description ?? "").trim(),
+      description,
       body: body.trim(),
       scope,
       path: path2,
       allowedTools: parseAllowedTools(data["allowed-tools"]),
-      runAs: parseRunAs(data.runAs),
+      runAs: parseRunAs(data.runAs, data.context, data.agent),
       model: data.model?.startsWith("deepseek-") ? data.model : void 0
     };
   }
@@ -8147,8 +8366,11 @@ function skillPathStatus(dir) {
     return "unreadable";
   }
 }
-function parseRunAs(raw) {
-  return raw?.trim() === "subagent" ? "subagent" : "inline";
+function parseRunAs(raw, context, agent) {
+  if (raw?.trim() === "subagent") return "subagent";
+  if (context?.trim().toLowerCase() === "fork") return "subagent";
+  if (agent?.trim()) return "subagent";
+  return "inline";
 }
 function skillStubBody(name) {
   return `---
@@ -8710,13 +8932,13 @@ import picomatch3 from "picomatch";
 // src/memory/subdir.ts
 import { existsSync as existsSync8, readFileSync as readFileSync10 } from "fs";
 import { dirname as dirname5, join as join9, relative as relative2, resolve as resolve5 } from "path";
-function findSubdirMemoryAncestors(absPath, rootDir) {
+function findDirMemory(absDir, rootDir) {
   const root = resolve5(rootDir);
-  const target = resolve5(absPath);
+  const target = resolve5(absDir);
   const rel = relative2(root, target);
-  if (!rel || rel.startsWith("..")) return [];
+  if (rel.startsWith("..")) return [];
   const found = [];
-  let cur = dirname5(target);
+  let cur = target;
   while (cur !== root) {
     const r = relative2(root, cur);
     if (!r || r.startsWith("..")) break;
@@ -8733,6 +8955,9 @@ function findSubdirMemoryAncestors(absPath, rootDir) {
   }
   return found;
 }
+function findSubdirMemoryAncestors(absPath, rootDir) {
+  return findDirMemory(dirname5(resolve5(absPath)), rootDir);
+}
 function readSubdirMemoryContent(path2) {
   let raw;
   try {
@@ -9157,6 +9382,129 @@ function formatOutline(entries) {
 // src/tools/fs/search.ts
 import { promises as fs3 } from "fs";
 import * as pathMod4 from "path";
+
+// src/tools/fs/regex-runner.ts
+import { Worker } from "worker_threads";
+var WORKER_SOURCE = `
+const { parentPort } = require("node:worker_threads");
+parentPort.on("message", (msg) => {
+  const { id, text, source, flags } = msg;
+  let re;
+  try {
+    re = new RegExp(source, flags);
+  } catch (err) {
+    parentPort.postMessage({ id, error: (err && err.message) ? err.message : String(err) });
+    return;
+  }
+  const lines = text.split(/\\r?\\n/);
+  const hits = [];
+  for (let i = 0; i < lines.length; i++) {
+    if (re.test(lines[i])) hits.push(i);
+  }
+  parentPort.postMessage({ id, hits });
+});
+`;
+var DEFAULT_TIMEOUT_MS = 6e4;
+var RegexRunner = class {
+  worker = null;
+  pending = /* @__PURE__ */ new Map();
+  nextId = 1;
+  defaultTimeoutMs;
+  constructor(opts = {}) {
+    this.defaultTimeoutMs = opts.defaultTimeoutMs ?? DEFAULT_TIMEOUT_MS;
+  }
+  testLines(text, source, flags, opts = {}) {
+    return new Promise((resolve13, reject) => {
+      if (opts.signal?.aborted) {
+        reject(new Error("regex evaluation aborted"));
+        return;
+      }
+      if (!this.worker) this.worker = this.spawn();
+      const id = this.nextId++;
+      const timeoutMs = opts.timeoutMs ?? this.defaultTimeoutMs;
+      const timer = setTimeout(() => {
+        this.pending.delete(id);
+        this.killWorker();
+        reject(new Error(`regex evaluation exceeded ${timeoutMs}ms`));
+      }, timeoutMs);
+      const entry = { resolve: resolve13, reject, timer };
+      if (opts.signal) {
+        entry.signal = opts.signal;
+        entry.onAbort = () => {
+          this.pending.delete(id);
+          clearTimeout(timer);
+          this.killWorker();
+          reject(new Error("regex evaluation aborted"));
+        };
+        opts.signal.addEventListener("abort", entry.onAbort, { once: true });
+      }
+      this.pending.set(id, entry);
+      this.worker.postMessage({ id, text, source, flags });
+    });
+  }
+  async shutdown() {
+    if (this.worker) {
+      const w = this.worker;
+      this.worker = null;
+      await w.terminate();
+    }
+    for (const entry of this.pending.values()) {
+      clearTimeout(entry.timer);
+      if (entry.onAbort && entry.signal) {
+        entry.signal.removeEventListener("abort", entry.onAbort);
+      }
+      entry.reject(new Error("regex runner shut down"));
+    }
+    this.pending.clear();
+  }
+  spawn() {
+    const w = new Worker(WORKER_SOURCE, { eval: true });
+    w.on("message", (msg) => {
+      const entry = this.pending.get(msg.id);
+      if (!entry) return;
+      clearTimeout(entry.timer);
+      if (entry.onAbort && entry.signal) {
+        entry.signal.removeEventListener("abort", entry.onAbort);
+      }
+      this.pending.delete(msg.id);
+      if (msg.error !== void 0) entry.reject(new Error(msg.error));
+      else entry.resolve(msg.hits ?? []);
+    });
+    w.on("error", (err) => {
+      if (this.worker !== w) return;
+      this.failPending(err);
+    });
+    w.on("exit", () => {
+      if (this.worker !== w) return;
+      this.worker = null;
+      if (this.pending.size > 0) this.failPending(new Error("regex worker exited"));
+    });
+    return w;
+  }
+  killWorker() {
+    if (!this.worker) return;
+    const w = this.worker;
+    this.worker = null;
+    void w.terminate();
+  }
+  failPending(err) {
+    for (const entry of this.pending.values()) {
+      clearTimeout(entry.timer);
+      if (entry.onAbort && entry.signal) {
+        entry.signal.removeEventListener("abort", entry.onAbort);
+      }
+      entry.reject(err);
+    }
+    this.pending.clear();
+  }
+};
+var _runner = null;
+function getRegexRunner() {
+  if (!_runner) _runner = new RegexRunner();
+  return _runner;
+}
+
+// src/tools/fs/search.ts
 function throwIfAborted(signal) {
   if (!signal?.aborted) return;
   throw new DOMException("search aborted by user", "AbortError");
@@ -9209,17 +9557,20 @@ async function searchFiles(ctx, startAbs, args) {
 }
 var MAX_HITS_PER_FILE = 30;
 var SUMMARY_MODE_TRIGGER_RATIO = 0.8;
+var WALK_DEADLINE_MS = 12e4;
 async function searchContent(ctx, startAbs, args) {
   throwIfAborted(args.signal);
   const caseSensitive = args.case_sensitive === true;
   const includeDeps = args.include_deps === true;
   const ctxLines = Math.max(0, Math.min(20, Math.floor(args.context ?? 0)));
   const summaryOnly = args.summary_only === true;
-  let re = null;
+  const reFlags = caseSensitive ? "" : "i";
+  let reSource = null;
   try {
-    re = new RegExp(args.pattern, caseSensitive ? "" : "i");
+    new RegExp(args.pattern, reFlags);
+    reSource = args.pattern;
   } catch {
-    re = null;
+    reSource = null;
   }
   const needle = caseSensitive ? args.pattern : args.pattern.toLowerCase();
   const matches = [];
@@ -9229,6 +9580,15 @@ async function searchContent(ctx, startAbs, args) {
   let summaryMode = summaryOnly;
   let summaryNoticeEmitted = false;
   const fileHitCounts = /* @__PURE__ */ new Map();
+  const regexSkippedFiles = [];
+  const t0 = Date.now();
+  const throwIfTimedOut = () => {
+    if (Date.now() - t0 > WALK_DEADLINE_MS) {
+      throw new Error(
+        `search_content exceeded ${WALK_DEADLINE_MS}ms \u2014 narrow the scope (path/glob) or simplify the pattern`
+      );
+    }
+  };
   const pushLine = (out) => {
     if (totalBytes + out.length + 1 > ctx.maxListBytes) {
       matches.push(`[\u2026 truncated at ${ctx.maxListBytes} bytes \u2014 refine pattern or path \u2026]`);
@@ -9263,6 +9623,7 @@ async function searchContent(ctx, startAbs, args) {
     for (const e of entries) {
       if (truncated) return;
       throwIfAborted(args.signal);
+      throwIfTimedOut();
       if (e.isDirectory()) {
         if (!includeDeps && ctx.skipDirNames.has(e.name)) continue;
         await walk2(pathMod4.join(dir, e.name));
@@ -9299,13 +9660,25 @@ async function searchContent(ctx, startAbs, args) {
       const text = raw.toString("utf8");
       const rel = displayRel3(ctx.rootDir, full);
       const lines = text.split(/\r?\n/);
-      const hits = [];
-      for (let li = 0; li < lines.length; li++) {
-        throwIfAborted(args.signal);
-        const line = lines[li];
-        const lineForCheck = caseSensitive ? line : line.toLowerCase();
-        const hit = re ? re.test(line) : lineForCheck.includes(needle);
-        if (hit) hits.push(li);
+      let hits;
+      if (reSource !== null) {
+        try {
+          hits = await getRegexRunner().testLines(text, reSource, reFlags, {
+            signal: args.signal
+          });
+        } catch (err) {
+          const reason = err.message;
+          if (reason.includes("aborted")) throw err;
+          regexSkippedFiles.push({ rel, reason });
+          continue;
+        }
+      } else {
+        hits = [];
+        for (let li = 0; li < lines.length; li++) {
+          throwIfAborted(args.signal);
+          const lineForCheck = caseSensitive ? lines[li] : lines[li].toLowerCase();
+          if (lineForCheck.includes(needle)) hits.push(li);
+        }
       }
       scanned++;
       if (hits.length === 0) continue;
@@ -9354,6 +9727,11 @@ async function searchContent(ctx, startAbs, args) {
     }
   };
   await walk2(startAbs);
+  if (regexSkippedFiles.length > 0) {
+    pushLine(
+      `[regex timed out on ${regexSkippedFiles.length} file${regexSkippedFiles.length === 1 ? "" : "s"} \u2014 pattern may have catastrophic backtracking; first: ${regexSkippedFiles[0].rel}]`
+    );
+  }
   if (matches.length === 0) {
     return scanned === 0 ? "(no files scanned \u2014 path empty or all files filtered out)" : `(no matches across ${scanned} file${scanned === 1 ? "" : "s"})`;
   }
@@ -9418,11 +9796,15 @@ function registerFilesystemTools(registry, opts) {
   const sessionApproved = /* @__PURE__ */ new Set();
   const shownSubdirMemory = /* @__PURE__ */ new Set();
   function withSubdirMemory(absPath, body) {
-    if (!memoryEnabled()) return body;
-    const ancestors = findSubdirMemoryAncestors(absPath, rootDir);
-    if (ancestors.length === 0) return body;
+    return prependMemorySections(findSubdirMemoryAncestors(absPath, rootDir), body);
+  }
+  function withDirMemory(absDir, body) {
+    return prependMemorySections(findDirMemory(absDir, rootDir), body);
+  }
+  function prependMemorySections(memPaths, body) {
+    if (!memoryEnabled() || memPaths.length === 0) return body;
     const sections = [];
-    for (const memPath of [...ancestors].reverse()) {
+    for (const memPath of [...memPaths].reverse()) {
       if (shownSubdirMemory.has(memPath)) continue;
       const content = readSubdirMemoryContent(memPath);
       if (!content) continue;
@@ -9615,7 +9997,7 @@ ${slice.join("\n")}`);
       for (const e of entries.sort((a, b) => a.name.localeCompare(b.name))) {
         lines.push(e.isDirectory() ? `${e.name}/` : e.name);
       }
-      return lines.join("\n") || "(empty directory)";
+      return withDirMemory(abs, lines.join("\n") || "(empty directory)");
     }
   });
   registry.register({
@@ -12743,6 +13125,7 @@ var FETCH_MAX_BYTES = 10 * 1024 * 1024;
 var USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
 var MOJEEK_ENDPOINT = "https://www.mojeek.com/search";
 var METASO_ENDPOINT = "https://metaso.cn/api/v1";
+var TAVILY_ENDPOINT = "https://api.tavily.com/search";
 function searchStatusError(status) {
   if (status === 429) return t("webErrors.rateLimit429");
   if (status === 403) return t("webErrors.forbidden403");
@@ -12762,6 +13145,9 @@ async function webSearch(query, opts = {}) {
   if (opts.engine === "searxng") {
     return searchSearxng(query, opts);
   }
+  if (opts.engine === "tavily") {
+    return searchTavily(query, opts);
+  }
   return searchMojeek(query, opts);
 }
 async function searchMojeek(query, opts = {}) {
@@ -12896,6 +13282,55 @@ async function searchMetaso(query, opts = {}) {
     snippet: wp.snippet ?? wp.summary ?? ""
   }));
 }
+async function searchTavily(query, opts = {}) {
+  const topK = Math.max(1, Math.min(20, opts.topK ?? DEFAULT_TOPK));
+  const apiKey = loadTavilyApiKey();
+  if (!apiKey) throw new Error(t("webErrors.tavilyMissingKey"));
+  let resp;
+  try {
+    resp = await fetch(TAVILY_ENDPOINT, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Accept: "application/json"
+      },
+      body: JSON.stringify({
+        api_key: apiKey,
+        query,
+        search_depth: "basic",
+        max_results: topK,
+        include_answer: false,
+        include_raw_content: false,
+        include_images: false
+      }),
+      signal: opts.signal
+    });
+  } catch (err) {
+    if (err instanceof TypeError && err.message.includes("fetch")) {
+      throw new Error(t("webErrors.cannotReach", { endpoint: TAVILY_ENDPOINT }));
+    }
+    throw err;
+  }
+  if (!resp.ok) {
+    if (resp.status === 401 || resp.status === 403) {
+      throw new Error(t("webErrors.tavilyUnauthorized"));
+    }
+    if (resp.status === 429) throw new Error(t("webErrors.tavilyRateLimit"));
+    throw new Error(t("webErrors.tavilyServerError", { status: resp.status }));
+  }
+  let data;
+  try {
+    data = await resp.json();
+  } catch {
+    throw new Error(t("webErrors.tavilyParseError", { status: resp.status }));
+  }
+  const results = data.results ?? [];
+  return results.slice(0, topK).map((r) => ({
+    title: r.title,
+    url: r.url,
+    snippet: r.content ?? ""
+  }));
+}
 function parseSearxngHtmlResults(html) {
   const root = parseHtml(html);
   const results = [];
@@ -13114,7 +13549,7 @@ function registerWebTools(registry, opts = {}) {
   const maxFetchChars = opts.maxFetchChars ?? DEFAULT_FETCH_MAX_CHARS;
   registry.register({
     name: "web_search",
-    description: "Search the public web. Returns ranked results with title, url, and snippet. Call this when the answer's correctness depends on current state \u2014 anything that changes over time (events, prices, releases, status of a thing in the real world). Composing such answers from training memory invents stale numbers; search first, then ground the answer in the results. For evergreen / definitional questions you don't need this. To change the backend, use /search-engine mojeek|searxng|metaso.",
+    description: "Search the public web. Returns ranked results with title, url, and snippet. Call this when the answer's correctness depends on current state \u2014 anything that changes over time (events, prices, releases, status of a thing in the real world). Composing such answers from training memory invents stale numbers; search first, then ground the answer in the results. For evergreen / definitional questions you don't need this. To change the backend, use /search-engine mojeek|searxng|metaso|tavily.",
     readOnly: true,
     parallelSafe: true,
     parameters: {
@@ -13800,19 +14235,23 @@ var McpClient = class {
     return this._instructions;
   }
   /** Compliant servers reject other methods until this completes. */
-  async initialize() {
+  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
-    });
+    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
+    );
     this._serverCapabilities = result.capabilities ?? {};
     this._serverInfo = result.serverInfo ?? { name: "", version: "" };
     this._protocolVersion = result.protocolVersion ?? "";