@keyou007/agent-bot 0.1.17 → 0.1.18-alpha.0

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@keyou007/agent-bot",
-  "version": "0.1.17",
+  "version": "0.1.18-alpha.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@keyou007/agent-bot",
-      "version": "0.1.17",
+      "version": "0.1.18-alpha.0",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@agentclientprotocol/sdk": "1.2.1",
@@ -16,6 +16,7 @@
         "better-sqlite3": "12.11.1",
         "dotenv": "17.4.2",
         "highlight.js": "11.12.0",
+        "markdown-it": "15.0.1",
         "pino": "10.3.1",
         "yaml": "2.9.0",
         "zod": "4.4.3"
@@ -1927,6 +1928,22 @@
         "url": "https://github.com/sponsors/epoberezkin"
       }
     },
+    "node_modules/argparse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-3.0.1.tgz",
+      "integrity": "sha512-nM4mHF/KM1v59ZNKX7zfusQz5wUAxR511YG8Vo6TyiV4aqhu++rbJW4v04xsWhpSsHFj66flT8P7znVpyO20xQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/nodeca"
+        }
+      ],
+      "license": "PSF-2.0"
+    },
     "node_modules/assertion-error": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
@@ -2245,6 +2262,18 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/entities": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz",
+      "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
     "node_modules/es-define-property": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
@@ -3251,6 +3280,25 @@
         "url": "https://opencollective.com/parcel"
       }
     },
+    "node_modules/linkify-it": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-6.1.0.tgz",
+      "integrity": "sha512-wJ/TwpSDTLepCrQoYWYIExIKg5Zchex2Nn5yk2mFnB+6PtdkHtyLx742md9csRjjOnGkKIS/RrbY7l8D6gT9Vw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^3.0.0"
+      }
+    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -3301,6 +3349,33 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/markdown-it": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-15.0.1.tgz",
+      "integrity": "sha512-9/7gE95FNPkfUWrjJIoHZza2iLmuJlPD0UNMxPi7bxUrbCR525YZY0r+zyfes0dZI5ZZ/uNIXUJca0pJvtw41g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/puzrin"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/markdown-it"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^3.0.0",
+        "entities": "^8.0.0",
+        "linkify-it": "^6.0.0",
+        "mdurl": "^2.1.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^3.0.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -3310,6 +3385,12 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/mdurl": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.1.0.tgz",
+      "integrity": "sha512-1+HBaOx0zi/dQWht8rNv9MYf9qqpqL/kxI0hXImU6Y547zM6Sni8BQibt7ifgMcYtQg41ao3Ivd6cnSM86inpg==",
+      "license": "MIT"
+    },
     "node_modules/mime-db": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
@@ -3752,6 +3833,15 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/qs": {
       "version": "6.15.3",
       "resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
@@ -4277,6 +4367,12 @@
         "@typescript/typescript-win32-x64": "7.0.2"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-3.0.0.tgz",
+      "integrity": "sha512-U3PppEkleoTnIfi8BozMx3yju3qc/L6SwqWo2Sw+54PX+PX0q9I+r1Um5HCmqD7n9VDX5/v3vQH/AjA6deDdtw==",
+      "license": "MIT"
+    },
     "node_modules/undici-types": {
       "version": "6.21.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@keyou007/agent-bot",
-  "version": "0.1.17",
+  "version": "0.1.18-alpha.0",
   "type": "module",
   "description": "Use Codex, TraeX, and compatible coding agents from Lark/Feishu.",
   "license": "GPL-3.0-only",
@@ -74,6 +74,7 @@
     "better-sqlite3": "12.11.1",
     "dotenv": "17.4.2",
     "highlight.js": "11.12.0",
+    "markdown-it": "15.0.1",
     "pino": "10.3.1",
     "yaml": "2.9.0",
     "zod": "4.4.3"

package/src/local-files/LocalFileViewerServer.ts

@@ -6,6 +6,7 @@ import hljs from "highlight.js/lib/common";
 import dos from "highlight.js/lib/languages/dos";
 import dockerfile from "highlight.js/lib/languages/dockerfile";
 import powershell from "highlight.js/lib/languages/powershell";
+import MarkdownIt from "markdown-it";
 import {
   selectPreferredNetworkAddress,
   type NetworkConnectionKind,
@@ -19,10 +20,27 @@ const MAX_TEXT_PREVIEW_BYTES = 2 * 1024 * 1024;
 const MAX_CONTENT_SAMPLE_BYTES = 64 * 1024;
 const MAX_SYNTAX_HIGHLIGHT_BYTES = 512 * 1024;
 const DIRECTORY_PAGE_SIZE = 100;
+const MARKDOWN_EXTENSIONS = new Set([".markdown", ".md", ".mdown", ".mkd", ".mkdn"]);
 hljs.registerLanguage("dos", dos);
 hljs.registerLanguage("dockerfile", dockerfile);
 hljs.registerLanguage("powershell", powershell);
 
+const MARKDOWN_RENDERER = new MarkdownIt({
+  breaks: false,
+  html: false,
+  linkify: true,
+  typographer: false,
+  highlight(value, language) {
+    const highlighted = language && hljs.getLanguage(language)
+      ? hljs.highlight(value, { language, ignoreIllegals: true }).value
+      : escapeHtml(value);
+    const languageAttribute = language && hljs.getLanguage(language)
+      ? ` class="language-${escapeAttribute(language)}"`
+      : "";
+    return `<pre class="markdown-code-block hljs"><code${languageAttribute}>${highlighted}</code></pre>`;
+  },
+});
+
 const HIGHLIGHT_LANGUAGE_BY_EXTENSION: Readonly<Record<string, string>> = {
   ".bash": "bash", ".bat": "dos", ".c": "c", ".cc": "cpp", ".cmd": "dos", ".cpp": "cpp",
   ".cs": "csharp", ".css": "css", ".cxx": "cpp", ".diff": "diff", ".go": "go", ".h": "cpp",
@@ -46,9 +64,31 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
   const metadata = document.getElementById("viewer-metadata");
   const header = document.getElementById("viewer-header");
   const title = document.getElementById("viewer-title");
+  const viewSwitch = document.getElementById("viewer-view-switch");
+  const viewButtons = Array.from(document.querySelectorAll("[data-view-mode-button]"));
   if (!content || !metadata || !header || !title) return;
   const filePath = title.dataset.filePath || title.textContent || "";
 
+  const syncViewMode = () => {
+    const mode = document.body.dataset.viewMode === "code" ? "code" : "rendered";
+    for (const button of viewButtons) {
+      const active = button.dataset.viewModeButton === mode;
+      button.classList.toggle("is-active", active);
+      button.setAttribute("aria-selected", String(active));
+    }
+    for (const panel of content.querySelectorAll("[data-view-panel]")) {
+      panel.setAttribute("aria-hidden", String(panel.dataset.viewPanel !== mode));
+    }
+  };
+  const setViewMode = (mode) => {
+    document.body.dataset.viewMode = mode === "code" ? "code" : "rendered";
+    syncViewMode();
+    if (mode === "code") requestAnimationFrame(positionHashTarget);
+  };
+  for (const button of viewButtons) {
+    button.addEventListener("click", () => setViewMode(button.dataset.viewModeButton));
+  }
+
   title.addEventListener("pointerdown", (event) => {
     if (event.button !== 0) return;
     event.preventDefault();
@@ -83,6 +123,8 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
   const positionHashTarget = () => {
     highlightHashTarget()?.scrollIntoView({ block: "start" });
   };
+  if (/^#L\\d+$/u.test(window.location.hash)) document.body.dataset.viewMode = "code";
+  syncViewMode();
   updateHeaderOffset();
   if (typeof ResizeObserver === "function") {
     new ResizeObserver(updateHeaderOffset).observe(header);
@@ -107,6 +149,7 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
     const codeScrollLeft = content.querySelector(".code")?.scrollLeft ?? 0;
     content.innerHTML = nextContent;
     metadata.innerHTML = nextMetadata;
+    syncViewMode();
     highlightHashTarget();
     restoreScroll(top, left, atBottom, codeScrollLeft);
   };
@@ -116,6 +159,7 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
     try {
       const update = JSON.parse(event.data);
       if (typeof update.content === "string" && typeof update.metadata === "string") {
+        if (viewSwitch) viewSwitch.hidden = update.viewMode !== "markdown";
         replaceContent(update.content, update.metadata);
       }
     } catch {
@@ -157,6 +201,7 @@ interface DirectoryViewerEntry {
 interface RenderedFileSnapshot {
   content: string;
   metadata: string[];
+  viewMode?: "markdown";
 }
 
 export interface LocalFileViewerServerOptions {
@@ -423,6 +468,7 @@ export class LocalFileViewerServer {
         { href: downloadUrl.toString(), label: "下载" },
       ],
       content: snapshot.content,
+      viewMode: snapshot.viewMode,
       liveUpdates: {
         eventsUrl: eventsUrl.toString(),
         scriptPath: `${this.basePath}/assets/viewer.js`.replace(/\/{2,}/gu, "/"),
@@ -442,7 +488,10 @@ export class LocalFileViewerServer {
     let content: string;
     if (classification.kind === "text") {
       const preview = readTextPreview(filePath, stat.size, classification.encoding);
-      content = `${preview.truncated ? '<div class="notice">文件较大，仅显示开头 2 MiB。可使用下方按钮查看或下载完整文件。</div>' : ""}${renderText(preview.text, filePath)}`;
+      const previewContent = isMarkdownFile(filePath)
+        ? renderMarkdownDocument(preview.text, filePath)
+        : renderText(preview.text, filePath);
+      content = `${preview.truncated ? '<div class="notice">文件较大，仅显示开头 2 MiB。可使用下方按钮查看或下载完整文件。</div>' : ""}${previewContent}`;
     } else if (contentType.startsWith("image/")) {
       content = `<div class="media"><img src="${escapeAttribute(rawUrl.toString())}" alt="${escapeAttribute(fileName)}"></div>`;
     } else if (contentType === "application/pdf") {
@@ -457,6 +506,9 @@ export class LocalFileViewerServer {
     return {
       content,
       metadata: [formatFileSize(stat.size), stat.mtime.toLocaleString()],
+      ...(classification.kind === "text" && isMarkdownFile(filePath)
+        ? { viewMode: "markdown" as const }
+        : {}),
     };
   }
 
@@ -485,6 +537,7 @@ export class LocalFileViewerServer {
         writeServerSentEvent(response, "update", JSON.stringify({
           content: snapshot.content,
           metadata: renderMetadata(snapshot.metadata),
+          viewMode: snapshot.viewMode ?? null,
         }));
       } catch {
         writeServerSentEvent(response, "unavailable", JSON.stringify({
@@ -637,12 +690,19 @@ function renderViewerPage(input: {
   metadata: string[];
   actions: Array<{ href: string; label: string }>;
   content: string;
+  viewMode?: "markdown";
   liveUpdates?: { eventsUrl: string; scriptPath: string };
 }): string {
   const metadata = renderMetadata(input.metadata);
   const actions = input.actions.length > 0
     ? `<nav class="actions">${input.actions.map((action) => `<a href="${escapeAttribute(action.href)}">${escapeHtml(action.label)}</a>`).join("")}</nav>`
     : "";
+  const viewSwitch = input.viewMode === "markdown"
+    ? '<div class="view-switch" id="viewer-view-switch" role="tablist" aria-label="预览模式"><button class="is-active" type="button" role="tab" aria-selected="true" data-view-mode-button="rendered">预览</button><button type="button" role="tab" aria-selected="false" data-view-mode-button="code">代码</button></div>'
+    : "";
+  const toolbar = viewSwitch || actions
+    ? `<div class="toolbar">${viewSwitch}${actions}</div>`
+    : "";
   const liveAttributes = input.liveUpdates
     ? ` data-events-url="${escapeAttribute(input.liveUpdates.eventsUrl)}"`
     : "";
@@ -661,10 +721,15 @@ function renderViewerPage(input: {
     body { margin: 0; background: #f5f7fa; color: #1f2329; }
     header { position: sticky; top: 0; z-index: 2; padding: 7px 12px; background: rgba(255,255,255,.96); border-bottom: 1px solid #dfe3e8; }
     h1 { margin: 0; cursor: text; font: 600 13px/1.4 ui-monospace, SFMono-Regular, Consolas, monospace; overflow-wrap: anywhere; }
-    .meta { display: flex; gap: 10px; align-items: center; min-height: 26px; margin-top: 3px; color: #646a73; font-size: 11px; }
+    .meta { display: flex; flex-wrap: wrap; gap: 6px 10px; align-items: center; min-height: 26px; margin-top: 3px; color: #646a73; font-size: 11px; }
     .metadata-values { display: contents; }
-    .actions { margin-left: auto; display: flex; gap: 8px; }
+    .toolbar { margin-left: auto; display: flex; gap: 8px; align-items: center; }
+    .actions { display: flex; gap: 8px; }
     .actions a { color: #1456f0; text-decoration: none; padding: 3px 7px; border: 1px solid #c9d0db; border-radius: 4px; background: #fff; }
+    .view-switch { display: inline-flex; padding: 2px; border: 1px solid #c9d0db; border-radius: 5px; background: #f2f3f5; }
+    .view-switch[hidden] { display: none; }
+    .view-switch button { min-width: 46px; padding: 2px 8px; border: 0; border-radius: 3px; background: transparent; color: #646a73; cursor: pointer; font: inherit; }
+    .view-switch button.is-active { background: #fff; color: #1456f0; box-shadow: 0 1px 3px rgba(31,35,41,.16); }
     main { padding: 0; }
     .notice, .unsupported { margin: 8px; padding: 10px 12px; border: 1px solid #f3cf8f; background: #fff7e6; border-radius: 5px; }
     .code { margin: 0; padding: 6px 0; overflow: auto; border: 0; border-radius: 0; background: #fff; color: #1f2329; font-size: 13px; line-height: 1.5; tab-size: 2; }
@@ -681,6 +746,28 @@ function renderViewerPage(input: {
     .hljs-addition { background: #e6ffed; }
     .hljs-emphasis { font-style: italic; }
     .hljs-strong { font-weight: 700; }
+    body[data-view-mode="rendered"] [data-view-panel="code"], body[data-view-mode="code"] [data-view-panel="rendered"] { display: none; }
+    .markdown-body { max-width: 980px; margin: 0 auto; padding: 20px 28px 48px; background: #fff; font-size: 15px; line-height: 1.72; overflow-wrap: anywhere; }
+    .markdown-body > :first-child { margin-top: 0; }
+    .markdown-body > :last-child { margin-bottom: 0; }
+    .markdown-body h1, .markdown-body h2, .markdown-body h3, .markdown-body h4, .markdown-body h5, .markdown-body h6 { margin: 1.45em 0 .6em; line-height: 1.28; }
+    .markdown-body h1 { padding-bottom: .35em; border-bottom: 1px solid #dfe3e8; font-size: 2em; }
+    .markdown-body h2 { padding-bottom: .3em; border-bottom: 1px solid #eceff3; font-size: 1.5em; }
+    .markdown-body h3 { font-size: 1.25em; }
+    .markdown-body p, .markdown-body ul, .markdown-body ol, .markdown-body blockquote, .markdown-body table, .markdown-body pre { margin: 0 0 1em; }
+    .markdown-body ul, .markdown-body ol { padding-left: 1.8em; }
+    .markdown-body li + li { margin-top: .28em; }
+    .markdown-body blockquote { margin-left: 0; padding: .15em 1em; border-left: 4px solid #c9d0db; color: #646a73; }
+    .markdown-body a { color: #1456f0; text-decoration: none; }
+    .markdown-body a:hover { text-decoration: underline; }
+    .markdown-body code { padding: .14em .35em; border-radius: 4px; background: #f2f3f5; font-family: var(--viewer-code-font); font-size: .9em; }
+    .markdown-body .markdown-code-block { margin: 0 0 1em; padding: 14px 16px; overflow: auto; border-radius: 6px; background: #f6f8fa; line-height: 1.55; }
+    .markdown-body .markdown-code-block code { padding: 0; background: transparent; font-size: 13px; }
+    .markdown-body table { display: block; max-width: 100%; overflow: auto; border-collapse: collapse; }
+    .markdown-body th, .markdown-body td { padding: 7px 12px; border: 1px solid #dfe3e8; text-align: left; }
+    .markdown-body th { background: #f5f7fa; }
+    .markdown-body img { max-width: 100%; height: auto; }
+    .markdown-body hr { height: 1px; margin: 1.5em 0; border: 0; background: #dfe3e8; }
     .media { display: grid; place-items: center; min-height: 220px; }
     .media img, .media video { max-width: 100%; max-height: calc(100vh - 70px); }
     .media audio { width: min(720px, 100%); }
@@ -704,7 +791,19 @@ function renderViewerPage(input: {
       .meta, .pagination { color: #a6a9ad; }
       .actions a, .pagination a { color: #8ab4ff; }
       .actions a { border-color: #55585c; background: #292a2d; }
+      .view-switch { border-color: #55585c; background: #292a2d; }
+      .view-switch button { color: #a6a9ad; }
+      .view-switch button.is-active { background: #3a3b3d; color: #8ab4ff; box-shadow: none; }
       .code, .directory-list { background: #202124; color: #e8eaed; border-color: #3a3b3d; }
+      .markdown-body { background: #202124; color: #e8eaed; }
+      .markdown-body h1, .markdown-body h2 { border-color: #3a3b3d; }
+      .markdown-body blockquote { color: #a6a9ad; border-color: #55585c; }
+      .markdown-body a { color: #8ab4ff; }
+      .markdown-body code { background: #303134; }
+      .markdown-body .markdown-code-block { background: #282a2d; }
+      .markdown-body th, .markdown-body td { border-color: #55585c; }
+      .markdown-body th { background: #292a2d; }
+      .markdown-body hr { background: #3a3b3d; }
       .directory-entry { border-color: #3a3b3d; }
       .directory-entry:hover { background: #292f3d; }
       .line-number { color: #8b9098; border-color: #3a3b3d; }
@@ -720,10 +819,10 @@ function renderViewerPage(input: {
     }
   </style>
 </head>
-<body${liveAttributes}>
+<body${input.viewMode === "markdown" ? ' data-view-mode="rendered"' : ""}${liveAttributes}>
   <header id="viewer-header">
     <h1 id="viewer-title" data-file-path="${escapeAttribute(input.filePath)}">${escapeHtml(input.filePath)}</h1>
-    <div class="meta"><span class="metadata-values" id="viewer-metadata">${metadata}</span>${actions}</div>
+    <div class="meta"><span class="metadata-values" id="viewer-metadata">${metadata}</span>${toolbar}</div>
   </header>
   <main id="viewer-content">${input.content}</main>
   ${liveScript}
@@ -976,6 +1075,14 @@ function renderText(value: string, filePath: string): string {
   }).join("")}</code></pre>`;
 }
 
+function renderMarkdownDocument(value: string, filePath: string): string {
+  return `<article class="markdown-body" data-view-panel="rendered">${MARKDOWN_RENDERER.render(value)}</article><section data-view-panel="code">${renderText(value, filePath)}</section>`;
+}
+
+function isMarkdownFile(filePath: string): boolean {
+  return MARKDOWN_EXTENSIONS.has(path.extname(filePath).toLowerCase());
+}
+
 function syntaxLanguageFor(filePath: string): string | undefined {
   const fileName = path.basename(filePath).toLowerCase();
   return HIGHLIGHT_LANGUAGE_BY_FILENAME[fileName]

package/src/proxy/ProxySessionController.ts

@@ -1757,7 +1757,7 @@ export class ProxySessionController {
     }
     switch (command.type) {
       case "shell":
-        await this.runShellCommand(contextKey, command.command, messageId);
+        await this.runShellCommand(contextKey, command.command, messageId, incomingMessage);
         return;
       case "dir":
         await this.openDirectoryBrowser(contextKey, command.directory);
@@ -4963,8 +4963,9 @@ export class ProxySessionController {
     contextKey: string,
     command: string,
     sourceMessageId?: string,
+    incomingMessage?: IncomingMessage,
   ): Promise<void> {
-    const cwd = this.currentSession(contextKey)?.cwd ?? this.config.defaults.cwd;
+    const cwd = this.shellCommandCwd(contextKey, incomingMessage);
     const created = await this.shellCommandJobs.createJob({ contextKey, sourceMessageId, command, cwd });
     let cardMessageId: string | undefined;
     const initialState: ShellCommandCardView = {
@@ -5010,6 +5011,28 @@ export class ProxySessionController {
     }
   }
 
+  private shellCommandCwd(contextKey: string, incomingMessage?: IncomingMessage): string {
+    const current = this.currentSession(contextKey);
+    if (current) return current.cwd;
+
+    if (incomingMessage?.threadContext) {
+      const anchor = threadForkAnchorMessageIds(incomingMessage)
+        .map((messageId) => this.store.findTurnAnchorByMessageId(messageId))
+        .find((candidate) => candidate !== undefined);
+      const source = anchor?.contextKey
+        ? this.store.getSessionForContext(anchor.localSessionId, anchor.contextKey)
+        : anchor
+          ? this.store.getSession(anchor.localSessionId)
+          : undefined;
+      const sourceContextKey = anchor?.contextKey ?? source?.contextKey;
+      if (source && sourceContextKey && baseChatContextKey(sourceContextKey) === baseChatContextKey(contextKey)) {
+        return source.cwd;
+      }
+    }
+
+    return this.config.defaults.cwd;
+  }
+
   private monitorShellCommandJob(
     job: ShellCommandJobSnapshot,
     seededState?: ShellCommandCardView,