neural-loom 0.2.70 → 0.3.1

package/src/app/components/TerminalConsole.tsx

@@ -1,7 +1,7 @@
 "use client";
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { useEffect, useRef, useState } from "react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { Terminal } from "xterm";
 import { FitAddon } from "xterm-addon-fit";
 import { SearchAddon } from "@xterm/addon-search";
@@ -19,10 +19,33 @@ interface LogBufferItem {
   message?: string;
 }
 
-function copyTextToClipboard(text: string): boolean {
-  if (typeof window === "undefined") return false;
-  
-  let successful = false;
+interface CopyResult {
+  ok: boolean;
+  method?: "clipboard-api" | "execCommand";
+  error?: string;
+}
+
+async function copyTextToClipboard(text: string): Promise<CopyResult> {
+  if (typeof window === "undefined") return { ok: false, error: "no window" };
+  if (!text) return { ok: false, error: "empty selection" };
+
+  let apiError = "";
+
+  // Preferred path: async Clipboard API. Reliable in a secure context, which
+  // includes localhost (NeuralLoom's default bind).
+  if (window.isSecureContext && navigator.clipboard?.writeText) {
+    try {
+      await navigator.clipboard.writeText(text);
+      return { ok: true, method: "clipboard-api" };
+    } catch (err) {
+      // Fall through to the execCommand fallback (e.g. not focused / denied).
+      apiError = err instanceof Error ? `${err.name}: ${err.message}` : String(err);
+    }
+  } else if (!window.isSecureContext) {
+    apiError = "not a secure context (access via http://localhost for the Clipboard API)";
+  }
+
+  // Fallback: hidden textarea + execCommand("copy").
   try {
     const textArea = document.createElement("textarea");
     textArea.value = text;
@@ -33,24 +56,14 @@ function copyTextToClipboard(text: string): boolean {
     document.body.appendChild(textArea);
     textArea.focus();
     textArea.select();
-    successful = document.execCommand("copy");
+    const successful = document.execCommand("copy");
     document.body.removeChild(textArea);
+    if (successful) return { ok: true, method: "execCommand" };
+    return { ok: false, error: `execCommand returned false${apiError ? ` (clipboard API: ${apiError})` : ""}` };
   } catch (err) {
-    console.warn("Fallback execCommand copy failed:", err);
-  }
-  
-  if (successful) {
-    return true;
-  }
-  
-  if (navigator.clipboard && navigator.clipboard.writeText) {
-    navigator.clipboard.writeText(text).catch((err) => {
-      console.error("Failed to copy using clipboard API:", err);
-    });
-    return true;
+    const ex = err instanceof Error ? err.message : String(err);
+    return { ok: false, error: `${ex}${apiError ? ` | clipboard API: ${apiError}` : ""}` };
   }
-  
-  return false;
 }
 
 export default function TerminalConsole({ sessionId, height = "400px", wsPort = 9601 }: TerminalConsoleProps) {
@@ -71,6 +84,44 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
   const [caseSensitive, setCaseSensitive] = useState(false);
   const searchAddonRef = useRef<SearchAddon | null>(null);
 
+  // Copy feedback ("Copied!" indicator) and last error (surfaced for diagnosis)
+  const [copied, setCopied] = useState(false);
+  const [copyError, setCopyError] = useState<string | null>(null);
+  const copiedTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+
+  // Copy the given text (or the current terminal selection) to the clipboard.
+  // Stable identity so the terminal effect can use it without re-initializing.
+  // `explicit` = triggered by a button/shortcut (surface "nothing selected").
+  const copySelection = useCallback((text?: string, explicit = false): void => {
+    const term = xtermRef.current;
+    const selection = (text ?? term?.getSelection() ?? "").trim();
+    if (!selection) {
+      if (explicit) {
+        setCopyError("Nothing selected to copy");
+        setTimeout(() => setCopyError(null), 2500);
+      }
+      return;
+    }
+    copyTextToClipboard(selection).then((result) => {
+      if (result.ok) {
+        setCopyError(null);
+        setCopied(true);
+        if (copiedTimerRef.current) clearTimeout(copiedTimerRef.current);
+        copiedTimerRef.current = setTimeout(() => setCopied(false), 1200);
+      } else {
+        console.error("[TerminalConsole] copy failed:", result.error);
+        setCopyError(result.error || "copy failed");
+      }
+    });
+  }, []);
+
+  // Clear the copy-feedback timer on unmount
+  useEffect(() => {
+    return () => {
+      if (copiedTimerRef.current) clearTimeout(copiedTimerRef.current);
+    };
+  }, []);
+
   // Focus search input when opened
   useEffect(() => {
     if (searchOpen && searchInputRef.current) {
@@ -189,27 +240,18 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
     term.focus();
 
     const container = terminalRef.current;
+    // Keep right-click from clearing an active selection so the context-menu
+    // copy can read it.
     const handleMouseDown = (e: MouseEvent) => {
-      console.log("[TerminalConsole] mousedown - button:", e.button, "hasSelection:", term.hasSelection(), "selection:", term.getSelection());
-      if (e.button === 2 && term.hasSelection()) {
-        console.log("[TerminalConsole] mousedown right-click, stopping propagation");
-        e.stopPropagation();
-      }
+      if (e.button === 2 && term.hasSelection()) e.stopPropagation();
     };
     const handleMouseUp = (e: MouseEvent) => {
-      console.log("[TerminalConsole] mouseup - button:", e.button, "hasSelection:", term.hasSelection(), "selection:", term.getSelection());
-      if (e.button === 2 && term.hasSelection()) {
-        console.log("[TerminalConsole] mouseup right-click, stopping propagation");
-        e.stopPropagation();
-      }
+      if (e.button === 2 && term.hasSelection()) e.stopPropagation();
     };
     const handleContextMenu = (e: MouseEvent) => {
-      console.log("[TerminalConsole] contextmenu - hasSelection:", term.hasSelection(), "selection:", term.getSelection());
       if (term.hasSelection()) {
         e.preventDefault();
-        const selection = term.getSelection();
-        const success = copyTextToClipboard(selection);
-        console.log("[TerminalConsole] contextmenu copy success:", success);
+        copySelection(term.getSelection());
         term.clearSelection();
       }
     };
@@ -219,6 +261,17 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
       container.addEventListener("contextmenu", handleContextMenu);
     }
 
+    // Copy-on-select: capture the selection the moment it is made. Claude Code's
+    // TUI redraws constantly, which clears the xterm selection — so we copy
+    // immediately (debounced) rather than waiting for a later Ctrl+C/right-click.
+    let selTimer: ReturnType<typeof setTimeout> | null = null;
+    const selDisposable = term.onSelectionChange(() => {
+      const sel = term.getSelection();
+      if (!sel || !sel.trim()) return;
+      if (selTimer) clearTimeout(selTimer);
+      selTimer = setTimeout(() => copySelection(sel), 150);
+    });
+
     // Attach search key handler and clipboard copy handler
     term.attachCustomKeyEventHandler((e) => {
       // Search: Ctrl+F
@@ -227,11 +280,20 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
         setSearchOpen(true);
         return false;
       }
-      
-      // Copy: Ctrl+C or Cmd+C (when selection is active)
-      if ((e.ctrlKey || e.metaKey) && e.key === "c" && e.type === "keydown") {
+
+      // Explicit copy: Ctrl+Shift+C / Cmd+Shift+C (always, when a selection exists)
+      if ((e.ctrlKey || e.metaKey) && e.shiftKey && (e.key === "c" || e.key === "C") && e.type === "keydown") {
         if (term.hasSelection()) {
-          copyTextToClipboard(term.getSelection());
+          copySelection(term.getSelection());
+          return false;
+        }
+      }
+
+      // Copy: Ctrl+C / Cmd+C only when a selection is active (otherwise let it
+      // pass through to the PTY as an interrupt).
+      if ((e.ctrlKey || e.metaKey) && !e.shiftKey && e.key === "c" && e.type === "keydown") {
+        if (term.hasSelection()) {
+          copySelection(term.getSelection());
           return false; // Prevent sending interrupt to PTY
         }
       }
@@ -414,6 +476,8 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
     return () => {
       isDisposed = true;
       clearTimeout(fitTimeout);
+      if (selTimer) clearTimeout(selTimer);
+      selDisposable.dispose();
       resizeObserver.disconnect();
       ws.close();
       if (container) {
@@ -428,7 +492,7 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
         console.warn("Error disposing terminal:", e);
       }
     };
-  }, [sessionId, wsPort]);
+  }, [sessionId, wsPort, copySelection]);
   const handlePaste = async (e: React.ClipboardEvent<HTMLDivElement>) => {
     const items = e.clipboardData?.items;
     if (!items) return;
@@ -530,6 +594,47 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
           )}
         </div>
         <div style={{ display: "flex", gap: "0.35rem", alignItems: "center" }}>
+          {copied && (
+            <span style={{
+              color: "#50fa7b",
+              fontSize: "0.65rem",
+              fontWeight: 600,
+            }}>
+              ✓ Copied
+            </span>
+          )}
+          {copyError && (
+            <span
+              title={copyError}
+              style={{
+                color: "#ff6b6b",
+                fontSize: "0.65rem",
+                fontWeight: 600,
+                maxWidth: "260px",
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap",
+              }}
+            >
+              ⚠ Copy failed: {copyError}
+            </span>
+          )}
+          <button
+            onClick={() => copySelection(undefined, true)}
+            style={{
+              padding: "2px 6px",
+              borderRadius: "3px",
+              border: "1px solid var(--border)",
+              backgroundColor: "transparent",
+              color: "var(--muted)",
+              fontSize: "0.65rem",
+              fontWeight: 600,
+              cursor: "pointer",
+            }}
+            title="Copy selected terminal text (also auto-copies on selection)"
+          >
+            📋 Copy
+          </button>
           <button
             onClick={togglePause}
             style={{

package/src/lib/agents/AgentRunner.ts

@@ -1,5 +1,11 @@
 import fs from "fs";
 import path from "path";
+import { getConfigDir } from "../config";
+import { SessionPersister } from "./SessionPersister";
+import { estimateCost } from "./pricing";
+
+/** Maximum number of log chunks retained per session (older chunks are dropped). */
+export const MAX_LOG_LINES = 5000;
 
 export interface RunnerStatus {
   id: string;
@@ -40,6 +46,8 @@ export abstract class AgentRunner {
   lastSyncedWorkspaceFolders?: string[];
   tokenUsage: { input: number; output: number; cost: number } = { input: 0, output: 0, cost: 0 };
   agentState: 'idle' | 'thinking' | 'complete' | 'needs-input' = 'idle';
+  /** Model name, when known, used for fallback cost estimation. */
+  protected model?: string;
   protected hasAnalyzedInitialState = false;
   private stateTimer: NodeJS.Timeout | null = null;
   private idleTimer: NodeJS.Timeout | null = null;
@@ -64,10 +72,9 @@ export abstract class AgentRunner {
 
     if (diffInput > 0 || diffOutput > 0 || diffCost > 0) {
       try {
-        const configDir = path.join(process.cwd(), ".ai", "neural-loom");
-        if (!fs.existsSync(configDir)) {
-          fs.mkdirSync(configDir, { recursive: true });
-        }
+        // Use the canonical config dir (honours ORIGINAL_CWD and the read-only
+        // fallback) rather than process.cwd(), which is the package root under npx.
+        const configDir = getConfigDir();
         const historyFile = path.join(configDir, "token-history.json");
         let history: TokenTransaction[] = [];
         if (fs.existsSync(historyFile)) {
@@ -139,7 +146,7 @@ export abstract class AgentRunner {
 
     // Fallback cost estimation if input/output is updated but cost is 0/unmatched
     if (this.tokenUsage.cost === 0 && (this.tokenUsage.input > 0 || this.tokenUsage.output > 0)) {
-      this.tokenUsage.cost = (this.tokenUsage.input * 0.000003) + (this.tokenUsage.output * 0.000015);
+      this.tokenUsage.cost = estimateCost(this.tokenUsage.input, this.tokenUsage.output, this.model);
     }
     this.logTokenUsageUpdate();
   }
@@ -171,6 +178,11 @@ export abstract class AgentRunner {
     // No-op by default, overridden by PTY runners
   }
 
+  /** OS process id of the underlying PTY, when one exists. Overridden by PTY runners. */
+  getPid(): number | undefined {
+    return undefined;
+  }
+
   protected listeners: ((data: string) => void)[] = [];
 
   public onOutput(callback: (data: string) => void): void {
@@ -186,6 +198,30 @@ export abstract class AgentRunner {
     this.listeners.forEach(cb => cb(data));
   }
 
+  /** Whether appendLog parses token usage / persists the session. Subclasses
+   * (e.g. the ephemeral workspace shell) may disable these. */
+  protected parseTokensOnLog = true;
+  protected persistOnLog = true;
+
+  /**
+   * Append a chunk to the session log, enforce the retention cap, emit it to
+   * subscribers and (per the flags above) parse token usage / persist the
+   * session. Shared by all PTY-backed runners.
+   */
+  protected appendLog(line: string): void {
+    this.logs.push(line);
+    if (this.logs.length > MAX_LOG_LINES) {
+      this.logs.shift();
+    }
+    if (this.parseTokensOnLog) {
+      this.parseTokenUsage(line);
+    }
+    this.emitOutput(line);
+    if (this.persistOnLog) {
+      SessionPersister.saveSession(this);
+    }
+  }
+
   /* eslint-disable-next-line @typescript-eslint/no-explicit-any */
   protected async writeToPty(ptyProcess: any, text: string): Promise<void> {
     if (!ptyProcess) return;

package/src/lib/agents/AiderRunner.ts

@@ -1,32 +1,13 @@
 import fs from "fs";
 import path from "path";
-import { exec } from "child_process";
+import { exec, execFile } from "child_process";
+import { promisify } from "util";
 import { getConfigDir } from "../config";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
+import { isWindows, findGitBash, loadNodePty } from "./runtime";
 
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+const execFilePromise = promisify(execFile);
 
 function getFilesForAider(dir: string): string {
   const maxFiles = 150;
@@ -87,16 +68,6 @@ export class AiderRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -115,9 +86,7 @@ export class AiderRunner extends AgentRunner {
     const shellArgs = useCmd ? ["/c"] : ["-c"];
 
     try {
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       // Load Aider configuration
       let aiderConfig = {
@@ -137,6 +106,8 @@ export class AiderRunner extends AgentRunner {
           console.error("Failed to parse Aider configuration:", err);
         }
       }
+      // Record the model so fallback cost estimates use the right rate.
+      this.model = aiderConfig.model;
 
       // Setup process environment with injected keys
       const customEnv = {
@@ -282,6 +253,15 @@ export class AiderRunner extends AgentRunner {
       }
       this.ptyProcess = null;
     }
+    // For containerised Aider, ensure the container is torn down (the PTY hangup
+    // alone may not trigger the run's --rm cleanup).
+    if (this.type === "aider-docker") {
+      try {
+        await execFilePromise("docker", ["stop", `neural-loom-session-${this.id}`]);
+      } catch {
+        // Container already gone or docker unavailable.
+      }
+    }
     this.appendLog("\r\n\x1b[1;31m[System] Aider session terminated.\x1b[0m\r\n");
   }
 
@@ -304,5 +284,9 @@ export class AiderRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/ClaudeRunner.ts

@@ -1,33 +1,8 @@
 import fs from "fs";
-import path from "path";
-import os from "os";
 import { execSync } from "child_process";
-import { getConfigDir } from "../config";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
-
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+import { isWindows, findGitBash, loadNodePty, loadClaudeExtraFlags, windowsPathOverride } from "./runtime";
 
 export class ClaudeRunner extends AgentRunner {
   id: string;
@@ -47,16 +22,6 @@ export class ClaudeRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -71,10 +36,7 @@ export class ClaudeRunner extends AgentRunner {
     const shellArgs = useCmd ? ["/c"] : ["-c"];
 
     try {
-      // Dynamic import to prevent bundler SSR/Turbopack errors on server start
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
       this.status = 'running';
       this.appendLog("\x1b[1;35m==================================================\x1b[0m\r\n");
@@ -85,23 +47,7 @@ export class ClaudeRunner extends AgentRunner {
         ? this.workspaceRoot 
         : process.env.ORIGINAL_CWD || process.cwd();
 
-      // Load Claude configuration to check for extraFlags (like --resume)
-      let extraFlags = "";
-      if (resume) {
-        extraFlags = "--resume";
-      } else {
-        const claudeConfigPath = path.join(getConfigDir(), "claude.json");
-        if (fs.existsSync(claudeConfigPath)) {
-          try {
-            const config = JSON.parse(fs.readFileSync(claudeConfigPath, "utf8"));
-            if (config.extraFlags) {
-              extraFlags = config.extraFlags;
-            }
-          } catch (err) {
-            console.error("Failed to parse Claude configuration:", err);
-          }
-        }
-      }
+      const extraFlags = loadClaudeExtraFlags(resume);
 
       // Setup process environment with injected keys
       const customEnv = {
@@ -111,11 +57,7 @@ export class ClaudeRunner extends AgentRunner {
       } as NodeJS.ProcessEnv;
 
       if (isWindows()) {
-        const vsNode = "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Microsoft\\VisualStudio\\NodeJs";
-        const localNpm = path.join(os.homedir(), "AppData", "Local", "npm");
-        const existingPath = process.env.Path || process.env.PATH || "";
-        const winPath = [vsNode, localNpm, existingPath].filter(Boolean).join(";");
-
+        const winPath = windowsPathOverride();
         for (const key of Object.keys(customEnv)) {
           if (key.toLowerCase() === "path") {
             delete customEnv[key];
@@ -198,5 +140,9 @@ export class ClaudeRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/DockerRunner.ts

@@ -1,31 +1,12 @@
 import fs from "fs";
 import path from "path";
-import { getConfigDir } from "../config";
+import { promisify } from "util";
+import { execFile } from "child_process";
 import type { IPty } from "node-pty";
 import { AgentRunner } from "./AgentRunner";
-import { SessionPersister } from "./SessionPersister";
+import { findGitBash, loadNodePty, loadClaudeExtraFlags } from "./runtime";
 
-function isWindows(): boolean {
-  return typeof process !== "undefined" && process.platform === "win32";
-}
-
-function findGitBash(): string | null {
-  if (!isWindows()) {
-    return "bash";
-  }
-  const pf = process.env.PROGRAMFILES || "C:\\Program Files";
-  const pf86 = process.env["PROGRAMFILES(X86)"] || "C:\\Program Files (x86)";
-  const local = process.env.LOCALAPPDATA || "";
-
-  const candidates: string[] = [
-    process.env.WINGMAN_BASH_PATH,
-    path.join(pf, "Git", "bin", "bash.exe"),
-    path.join(pf86, "Git", "bin", "bash.exe"),
-    local ? path.join(local, "Programs", "Git", "bin", "bash.exe") : "",
-  ].filter((p): p is string => typeof p === "string" && p !== "");
-
-  return candidates.find(p => fs.existsSync(p)) || null;
-}
+const execFilePromise = promisify(execFile);
 
 export class DockerRunner extends AgentRunner {
   id: string;
@@ -45,16 +26,6 @@ export class DockerRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
-    this.logs.push(line);
-    if (this.logs.length > 5000) {
-      this.logs.shift();
-    }
-    this.parseTokenUsage(line);
-    this.emitOutput(line);
-    SessionPersister.saveSession(this);
-  }
-
   async start(resume?: boolean): Promise<void> {
     if (this.status === 'running') return;
 
@@ -72,11 +43,9 @@ export class DockerRunner extends AgentRunner {
     }
 
     try {
-      if (!this.ptyModule) {
-        this.ptyModule = eval("require")("node-pty");
-      }
+      this.ptyModule = loadNodePty();
 
-      const targetCwd = (this.workspaceRoot && fs.existsSync(this.workspaceRoot)) 
+      const targetCwd = (this.workspaceRoot && fs.existsSync(this.workspaceRoot))
         ? this.workspaceRoot 
         : process.env.ORIGINAL_CWD || process.cwd();
 
@@ -121,23 +90,7 @@ export class DockerRunner extends AgentRunner {
       }
       const mountsStr = mounts.join(" ");
 
-      // Load Claude configuration to check for extraFlags (like --resume)
-      let extraFlags = "";
-      if (resume) {
-        extraFlags = "--resume";
-      } else {
-        const claudeConfigPath = path.join(getConfigDir(), "claude.json");
-        if (fs.existsSync(claudeConfigPath)) {
-          try {
-            const config = JSON.parse(fs.readFileSync(claudeConfigPath, "utf8"));
-            if (config.extraFlags) {
-              extraFlags = config.extraFlags;
-            }
-          } catch (err) {
-            console.error("Failed to parse Claude configuration:", err);
-          }
-        }
-      }
+      const extraFlags = loadClaudeExtraFlags(resume);
 
       const dockerCmd = `docker run -it --name neural-loom-session-${this.id} --rm ${mountsStr} -w /workspace node:20-alpine npx -y @anthropic-ai/claude-code ${extraFlags}`.trim();
 
@@ -180,6 +133,13 @@ export class DockerRunner extends AgentRunner {
       }
       this.ptyProcess = null;
     }
+    // Killing the PTY doesn't guarantee the `docker run` child receives a clean
+    // hangup, so explicitly stop the container (this also triggers its --rm cleanup).
+    try {
+      await execFilePromise("docker", ["stop", `neural-loom-session-${this.id}`]);
+    } catch {
+      // Container already gone or docker unavailable — nothing to clean up.
+    }
     this.appendLog("\r\n\x1b[1;31m[System] Docker container stopped and unmounted.\x1b[0m\r\n");
   }
 
@@ -202,5 +162,9 @@ export class DockerRunner extends AgentRunner {
       }
     }
   }
+
+  override getPid(): number | undefined {
+    return this.ptyProcess?.pid;
+  }
 }
 

package/src/lib/agents/MockRunner.ts

@@ -28,7 +28,9 @@ export class MockRunner extends AgentRunner {
     this.createdAt = new Date().toISOString();
   }
 
-  private appendLog(line: string) {
+  // Mock output is line-oriented, so it appends its own CRLF and overrides the
+  // base PTY-stream appendLog.
+  protected override appendLog(line: string) {
     this.logs.push(line);
     this.parseTokenUsage(line);
     this.emitOutput(line + "\r\n");