@tyvm/knowhow 0.0.108 → 0.0.109-dev.2b94ba2

package/README.md

@@ -362,3 +362,48 @@ For command usage and behavior details, see:
 - Website: https://knowhow.tyvm.ai
 - Twitter/X: https://x.com/micahriggan
 - npm: https://www.npmjs.com/package/@tyvm/knowhow
+
+---
+
+## 🚧 Dev & Nightly Releases
+
+Knowhow publishes unstable/preview builds under separate npm dist-tags so that regular users on `latest` are never affected.
+
+### Installing a pre-release build
+
+```bash
+# Latest nightly (date-stamped)
+npm install -g @tyvm/knowhow@nightly
+
+# Latest dev snapshot (git-hash-stamped)
+npm install -g @tyvm/knowhow@dev
+
+# Pin a specific pre-release version
+npm install -g @tyvm/knowhow@0.0.108-nightly.20250428
+```
+
+### How dist-tags work
+
+| Tag | Installed by default? | Audience |
+|-----|-----------------------|---------|
+| `latest` | ✅ Yes (`npm install @tyvm/knowhow`) | All stable users |
+| `nightly` | ❌ No (must opt-in) | Testers / early adopters |
+| `dev` | ❌ No (must opt-in) | Developers / contributors |
+
+Publishing a `nightly` or `dev` release **never moves the `latest` tag**, so existing users won't receive unstable code through normal updates.
+
+### Publishing scripts (for maintainers)
+
+```bash
+# Publish a date-stamped nightly (e.g. 0.0.108-nightly.20250428)
+npm run publish:nightly
+
+# Publish a git-hash-stamped dev snapshot (e.g. 0.0.108-dev.abc1234)
+npm run publish:dev
+
+# Publish a stable release to `latest`
+npm version patch   # or minor / major
+npm run publish:stable
+```
+
+> **Note:** `publish:nightly` and `publish:dev` automatically version-bump the `package.json` with a pre-release suffix before publishing and do **not** create a git tag, keeping your git history clean.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tyvm/knowhow",
-  "version": "0.0.108",
+  "version": "0.0.109-dev.2b94ba2",
   "description": "ai cli with plugins and agents",
   "main": "ts_build/src/index.js",
   "bin": {
@@ -21,7 +21,13 @@
     "lint": "tslint ./src/**/*.ts",
     "lint:deps": "depcheck --config=.depcheckrc",
     "lint:all": "npm run lint && npm run lint:deps",
-    "check:model-pricing": "ts-node scripts/check-model-pricing.ts"
+    "check:model-pricing": "ts-node scripts/check-model-pricing.ts",
+    "version:nightly": "bash scripts/publish.sh version:nightly",
+    "version:dev": "bash scripts/publish.sh version:dev",
+    "publish:nightly": "bash scripts/publish.sh nightly",
+    "publish:dev": "bash scripts/publish.sh dev",
+    "publish:latest": "bash scripts/publish.sh stable",
+    "publish:stable": "bash scripts/publish.sh stable"
   },
   "keywords": [],
   "author": "Micah Riggan",
@@ -49,13 +55,12 @@
     "@inquirer/editor": "^4.2.18",
     "@modelcontextprotocol/sdk": "^1.13.3",
     "@simplewebauthn/server": "^13.3.0",
-    "@tyvm/knowhow-tunnel": "0.0.4",
+    "@tyvm/knowhow-tunnel": "0.0.5",
     "commander": "^14.0.0",
     "diff": "^5.2.0",
     "express": "^4.19.2",
     "gitignore-to-glob": "^0.3.0",
     "glob": "11.1.0",
-    "isolated-vm": "^5.0.4",
     "jiti": "^2.6.1",
     "marked": "^10.0.0",
     "marked-terminal": "^6.2.0",

package/scripts/build-for-node.sh

@@ -7,11 +7,10 @@
 # This script:
 #   1. Compiles TypeScript with Node 20 (required for workspace deps)
 #   2. Creates /tmp/knowhow-node-<major> with the compiled output
-#   3. Installs the correct isolated-vm version for the target node in that dir
-#   4. Symlinks the package globally for ALL installed nvm versions matching the target
+#   3. Symlinks the package globally for ALL installed nvm versions matching the target
 #
-# This approach avoids polluting the workspace node_modules with a different
-# isolated-vm ABI, so Node 20 and Node 24 builds can coexist.
+# Note: isolated-vm is now in @tyvm/knowhow-module-script — install that separately
+# for the correct node version if you need script execution support.
 
 set -e
 
@@ -81,23 +80,11 @@ fi
 
 # Use the last (latest patch) for building
 TARGET_NODE_BIN="${TARGET_NODE_BINS[${#TARGET_NODE_BINS[@]}-1]}"
-TARGET_NODE_NPM="$(dirname "$TARGET_NODE_BIN")/npm"
-TARGET_NODE_DIR="$(dirname "$TARGET_NODE_BIN")"
 TARGET_NODE_ACTUAL_VERSION="$("$TARGET_NODE_BIN" --version)"
 
 echo "🎯 Found Node $TARGET_VERSION installs: ${TARGET_NODE_BINS[*]}"
 echo "🔨 Building with: $TARGET_NODE_BIN ($TARGET_NODE_ACTUAL_VERSION)"
 
-# --- Pick the right isolated-vm version for the target node ---
-# isolated-vm@5.x supports Node <22, isolated-vm@6.x requires Node >=22
-if [ "$TARGET_MAJOR" -ge 22 ]; then
-  IVM_VERSION="^6.0.0"
-  echo "📌 Using isolated-vm@6.x (Node >= 22)"
-else
-  IVM_VERSION="^5.0.4"
-  echo "📌 Using isolated-vm@5.x (Node < 22)"
-fi
-
 # --- Create staging directory ---
 STAGING_DIR="/tmp/knowhow-node-${TARGET_MAJOR}"
 rm -rf "$STAGING_DIR"
@@ -114,13 +101,11 @@ for item in README.md LICENSE .npmignore; do
   [ -e "$PACKAGE_DIR/$item" ] && cp "$PACKAGE_DIR/$item" "$STAGING_DIR/" || true
 done
 
-# --- Patch package.json for target isolated-vm version ---
-echo "📝 Patching package.json for isolated-vm $IVM_VERSION..."
+# --- Patch package.json to remove workspace protocol deps ---
+echo "📝 Patching package.json..."
 "$NODE20_BIN" -e "
   const fs = require('fs');
   const pkg = JSON.parse(fs.readFileSync('$STAGING_DIR/package.json', 'utf8'));
-  pkg.dependencies['isolated-vm'] = '$IVM_VERSION';
-  // Remove workspace protocol deps that won't resolve outside the monorepo
   if (pkg.dependencies) {
     for (const [k, v] of Object.entries(pkg.dependencies)) {
       if (String(v).startsWith('workspace:')) delete pkg.dependencies[k];
@@ -130,13 +115,14 @@ echo "📝 Patching package.json for isolated-vm $IVM_VERSION..."
   console.log('✅ package.json patched');
 "
 
-# --- Install deps in staging dir using target node ---
+# --- Install dependencies in staging dir with target Node ---
+TARGET_NODE_NPM="$(dirname "$TARGET_NODE_BIN")/npm"
 echo ""
 echo "📦 Installing dependencies in staging dir with Node $TARGET_MAJOR..."
 cd "$STAGING_DIR"
-# Prepend target node bin to PATH so npm/node-gyp uses the correct node version
-PATH="$TARGET_NODE_DIR:$PATH" "$TARGET_NODE_NPM" install --no-save 2>&1
-echo "✅ Dependencies installed (isolated-vm compiled for Node $TARGET_MAJOR)"
+"$TARGET_NODE_NPM" install --omit=dev
+echo "✅ Dependencies installed"
+cd "$PACKAGE_DIR"
 
 # --- Symlink globally for ALL matching Node version installs ---
 PKG_NAME="$("$NODE20_BIN" -e "console.log(require('$STAGING_DIR/package.json').name)")"

package/scripts/publish.sh

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+COMMAND="${1:-}"
+
+get_current_version() {
+  node -e "process.stdout.write(require('./package.json').version)"
+}
+
+version_nightly() {
+  local version
+  version=$(get_current_version)
+  # Strip any existing pre-release suffix (e.g. -dev.xxx or -nightly.xxx)
+  version=$(echo "$version" | sed 's/-.*$//')
+  local stamp
+  stamp=$(date -u +%Y%m%d)
+  local pre="${version}-nightly.${stamp}"
+  local current
+  current=$(get_current_version)
+  if [ "$current" = "$pre" ]; then
+    echo "Version already set to: $pre (no change needed)"
+  else
+    echo "Bumping version to: $pre"
+    npm version "$pre" --no-git-tag-version
+  fi
+}
+
+version_dev() {
+  local version
+  version=$(get_current_version)
+  # Strip any existing pre-release suffix (e.g. -dev.xxx or -nightly.xxx)
+  version=$(echo "$version" | sed 's/-.*$//')
+  local hash
+  hash=$(git rev-parse --short HEAD)
+  local pre="${version}-dev.${hash}"
+  local current
+  current=$(get_current_version)
+  if [ "$current" = "$pre" ]; then
+    echo "Version already set to: $pre (no change needed)"
+  else
+    echo "Bumping version to: $pre"
+    npm version "$pre" --no-git-tag-version
+  fi
+}
+
+case "$COMMAND" in
+  nightly)
+    echo "🌙 Publishing nightly release..."
+    npm run compile
+    bash scripts/check-isolated-deps.sh
+    version_nightly
+    npm publish --tag nightly
+    echo "✅ Nightly published!"
+    ;;
+  dev)
+    echo "🔧 Publishing dev release..."
+    npm run compile
+    bash scripts/check-isolated-deps.sh
+    version_dev
+    npm publish --tag dev
+    echo "✅ Dev release published!"
+    ;;
+  stable|latest)
+    echo "🚀 Publishing stable release..."
+    npm run compile
+    bash scripts/check-isolated-deps.sh
+    npm publish --tag latest
+    echo "✅ Stable release published!"
+    ;;
+  version:nightly)
+    version_nightly
+    ;;
+  version:dev)
+    version_dev
+    ;;
+  *)
+    echo "Usage: $0 <nightly|dev|stable|version:nightly|version:dev>"
+    echo ""
+    echo "  nightly        - Compile, check deps, bump version with nightly stamp, publish to 'nightly' tag"
+    echo "  dev            - Compile, check deps, bump version with git hash, publish to 'dev' tag"
+    echo "  stable         - Compile, check deps, publish to 'latest' tag"
+    echo "  version:nightly - Only bump version with nightly stamp (no publish)"
+    echo "  version:dev     - Only bump version with git hash (no publish)"
+    exit 1
+    ;;
+esac

package/src/agents/base/base.ts

@@ -317,6 +317,15 @@ export abstract class BaseAgent implements IAgent {
       if (trimmed.startsWith("✅") || /^[\d\.\-\*]/.test(trimmed)) return true;
     }
 
+    // Detect JSON-wrapped finalAnswer output, e.g. {"answer":"..."} or {"finalAnswer":"..."}
+    try {
+      const parsed = JSON.parse(trimmed);
+      if (parsed && typeof parsed === "object") {
+        if (typeof parsed.answer === "string") return true;
+        if (typeof parsed.finalAnswer === "string") return true;
+      }
+    } catch (_) {}
+
     return false;
   }
 
@@ -713,6 +722,7 @@ export abstract class BaseAgent implements IAgent {
         messages,
         tools: this.getEnabledTools(),
         tool_choice: "auto",
+        long_ttl_cache: this.runTime() > 300_000,
       });
 
       // If the agent was paused while the completion was in-flight, wait here

package/src/agents/tools/execCommand.ts

@@ -3,6 +3,7 @@ import { promisify } from "util";
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
+import { services, ToolsService } from "../../services";
 
 export const execAsync = promisify(exec);
 
@@ -256,16 +257,32 @@ const execWithTimeout = async (
 };
 
 // Public tool
-export const execCommand = async (
+export async function execCommand(
   command: string,
   timeout?: number,
   continueInBackground?: boolean,
   logFileName?: string
-): Promise<string> => {
-  if(!command || typeof command !== "string") {
+): Promise<string> {
+  if (!command || typeof command !== "string") {
     throw new Error("Invalid command. We received a non-string value. Please ensure you are sending strings of 4k tokens or less.");
   }
 
+  // Get context from bound ToolsService (same pattern as writeFile)
+  const toolService = (
+    this instanceof ToolsService ? this : services().Tools
+  ) as ToolsService;
+  const context = toolService.getContext();
+
+  // Emit pre-run blocking event — handlers can throw to block the command
+  if (context.Events) {
+    await context.Events.emitBlocking("exec:pre-run", {
+      command,
+      timeout,
+      continueInBackground,
+      logFileName,
+    });
+  }
+
   const { stdout, stderr, timedOut, killed, pid, logPath } =
     await execWithTimeout(command, {
       timeout,
@@ -298,6 +315,32 @@ export const execCommand = async (
    *    : "";
    */
 
-  // return `$ ${command}${statusMsg}\n${trimmed}${trimmedMsg}`;
-  return `$ ${command}${statusMsg}\n${output}`;
-};
+  const result = `$ ${command}${statusMsg}\n${output}`;
+
+  // Emit post-run blocking event — handlers can append extra context
+  let eventResults: any[] = [];
+  if (context.Events) {
+    eventResults = await context.Events.emitBlocking("exec:post-run", {
+      command,
+      timeout,
+      continueInBackground,
+      logFileName,
+      stdout,
+      stderr,
+      timedOut,
+      killed,
+      pid,
+      logPath,
+      output,
+    });
+  }
+
+  // Append any additional context returned by post-run handlers
+  let eventResultsText = "";
+  if (eventResults && eventResults.length > 0) {
+    eventResultsText =
+      "\n\nAdditional Information:\n" + JSON.stringify(eventResults, null, 2);
+  }
+
+  return result + eventResultsText;
+};

package/src/agents/tools/index.ts

@@ -20,7 +20,6 @@ export * from "./askHuman";
 export * from "./aiClient";
 export * from "./googleSearch";
 export * from "./stringReplace";
-export * from "./executeScript";
 export * from "./startAgentTask";
 export * from "./ycmd";
 export * from "./mcp";

package/src/agents/tools/list.ts

@@ -6,7 +6,6 @@ import * as ycmd from "./ycmd/definitions";
 import * as language from "./language/definitions";
 import * as mcp from "./mcp/definitions";
 import { googleSearchDefinition } from "./googleSearch";
-import { executeScriptDefinition } from "./executeScript/definition";
 import { startAgentTaskDefinition } from "./startAgentTask";
 
 function getPluginNames(): string {
@@ -157,8 +156,8 @@ export const includedTools = [
           },
           model: {
             type: "string",
-            description: "The model to use (default: 'gpt-4o')",
-            default: "gpt-4o",
+            description: "The model to use (default: 'gpt-5.4-nano')",
+            default: "gpt-5.4-nano",
           },
         },
         required: ["imageUrl", "question"],
@@ -666,7 +665,6 @@ export const includedTools = [
       },
     },
   },
-  executeScriptDefinition,
   googleSearchDefinition,
   startAgentTaskDefinition,
   ...ycmd.definitions,

package/src/chat/CliChatService.ts

@@ -19,6 +19,7 @@ import editor from "@inquirer/editor";
 import fs from "fs";
 import path from "path";
 import { services } from "../services";
+import { logger } from "../logger";
 
 export class CliChatService implements ChatService {
   private context: ChatContext;
@@ -37,7 +38,7 @@ export class CliChatService implements ChatService {
       searchMode: false,
       voiceMode: false,
       multilineMode: false,
-      currentModel: "gpt-4o",
+      currentModel: "gpt-5.4-nano",
       currentProvider: "openai",
       chatHistory: this.chatHistory,
       plugins,
@@ -265,7 +266,15 @@ export class CliChatService implements ChatService {
     if (this.context.voiceMode) {
       value = await voiceToText();
     } else if (this.context.multilineMode) {
-      value = await editor({ message: prompt });
+      const renderer = this.context.renderer;
+      if (renderer) renderer.pause();
+      logger.silence();
+      try {
+        value = await editor({ message: prompt });
+      } finally {
+        if (renderer) renderer.resume();
+        logger.unsilence();
+      }
       this.context.multilineMode = false; // Disable after use like original
     } else {
       // Use saved input history for scrollback (InputQueueManager handles reverse access)

package/src/chat/modules/AgentModule.ts

@@ -30,11 +30,7 @@ import {
   Base64ImageProcessor,
 } from "../../processors/index";
 import { TaskInfo } from "../types";
-import {
-  createAgent,
-  agentConstructors,
-  AgentName,
-} from "../../agents";
+import { createAgent, agentConstructors, AgentName } from "../../agents";
 import { ToolCallEvent } from "../../agents/base/base";
 import { KnowhowSimpleClient } from "../../services/KnowhowClient";
 
@@ -80,7 +76,6 @@ export class AgentModule extends BaseChatModule {
     this.remoteSyncModule = module;
   }
 
-
   getCommands(): ChatCommand[] {
     return [
       {
@@ -260,7 +255,10 @@ export class AgentModule extends BaseChatModule {
         if (context) {
           // Create a temporary agent instance to read its default model/provider
           const agentContext = services().Agents.getAgentContext();
-          const tempAgent = createAgent(agentName as AgentName, agentContext) as BaseAgent;
+          const tempAgent = createAgent(
+            agentName as AgentName,
+            agentContext
+          ) as BaseAgent;
           context.selectedAgent = tempAgent;
           context.agentMode = true;
           context.currentAgent = agentName;
@@ -455,7 +453,6 @@ export class AgentModule extends BaseChatModule {
       const agentNames = Object.keys(agentConstructors);
 
       if (agentNames.length > 0) {
-
         console.log("\nAvailable agents:");
         agentNames.forEach((name) => {
           console.log(`  - ${name}`);
@@ -503,39 +500,57 @@ export class AgentModule extends BaseChatModule {
         console.error(`Session ${sessionId} not found.`);
         return;
       }
-      const lastThread = session.threads[session.threads.length - 1];
       console.log(`\n🔄 Resuming session: ${sessionId}`);
       console.log(`Agent: ${session.agentName}`);
       console.log(`Original task: ${session.initialInput}`);
       console.log(`Status: ${session.status}`);
 
-      const reason = resumeReason
-        ? `Reason for resuming:  ${resumeReason}`
-        : "";
-
-      // Create resume prompt
-      const resumePrompt = `You are resuming a previously started task. Here's the context:
-ORIGINAL REQUEST:
-      ${session.initialInput}
-
-LAST Progress State:
-      ${JSON.stringify(lastThread)}
-
-Please continue from where you left off and complete the original request.
-        ${reason}
-
-`;
+      // Build resume prompt (same pattern as resumeFromMessages)
+      const resumePrompt = [
+        "You are resuming a previously started task.",
+        session.initialInput ? `ORIGINAL REQUEST: ${session.initialInput}` : "",
+        "Please continue from where you left off and complete the original request.",
+        resumeReason ? `Reason for resuming: ${resumeReason}` : "",
+      ]
+        .filter(Boolean)
+        .join("\n");
+
+      // Restore the full message history from the last thread
+      const threads = session.threads || [];
+      // Guard against sessions saved with a flat Message[] instead of Message[][]
+      // (a bug where threadUpdate emitted a single thread instead of all threads)
+      const normalizedThreads: Message[][] = threads.length > 0 && !Array.isArray(threads[0])
+        ? [threads as unknown as Message[]]
+        : threads as Message[][];
+      const lastThread = normalizedThreads.length > 0 ? normalizedThreads[normalizedThreads.length - 1] : [];
+      const resumeMessages = [...lastThread];
+
+      // Append the resume prompt to the last user message (or add a new one)
+      const reversedIndex = [...lastThread]
+        .reverse()
+        .findIndex((e) => e.role === "user" && typeof e.content === "string");
+
+      if (reversedIndex === -1) {
+        resumeMessages.push({ role: "user", content: resumePrompt });
+      } else {
+        const actualIndex = lastThread.length - 1 - reversedIndex;
+        resumeMessages[actualIndex] = {
+          ...resumeMessages[actualIndex],
+          content: resumeMessages[actualIndex].content + `\n\n<Workflow>[RESUME CONTEXT]: ${resumePrompt}</Workflow>`,
+        };
+      }
 
       console.log("🚀 Session resuming...");
       const context = this.chatService?.getContext();
       const agentName = session.agentName || context.currentAgent;
+      const previousAgentMode = context?.agentMode;
 
       if (!agentName || !agentConstructors[agentName as AgentName]) {
         console.error(`Agent ${agentName} not found.`);
         return;
       }
 
-      // Start agent with Knowhow task context if available
+      // Start agent with Knowhow task context and restored message history
       const { agent, taskId } = await this.setupAgent({
         agentName,
         input: resumePrompt,
@@ -544,7 +559,20 @@ Please continue from where you left off and complete the original request.
         chatHistory: [],
         run: false, // Don't run yet, we need to set up event listeners first
       });
-      await this.attachedAgentChatLoop(taskId, agent, resumePrompt);
+
+      // After resume finishes, revert to normal chat (non-agent mode) so the
+      // user can start a fresh conversation instead of staying locked in agent mode.
+      agent.agentEvents.once(agent.eventTypes.done, () => {
+        const ctx = this.chatService?.getContext();
+        if (ctx && !previousAgentMode) {
+          ctx.agentMode = false;
+          ctx.selectedAgent = undefined;
+          ctx.currentAgent = undefined;
+          this.chatService?.disableMode("agent");
+        }
+      });
+
+      await this.attachedAgentChatLoop(taskId, agent, resumePrompt, resumeMessages);
     } catch (error) {
       console.error(
         `Failed to resume session ${sessionId}:`,
@@ -678,7 +706,7 @@ Please continue from where you left off and complete the original request.
 
       // Set up session update listener
       const threadUpdateHandler = async (threadState: any) => {
-        this.updateSession(taskId, threadState);
+        this.updateSession(taskId, agent.getThreads());
         taskInfo.totalCost = agent.getTotalCostUsd();
       };
       agent.agentEvents.on(agent.eventTypes.threadUpdate, threadUpdateHandler);
@@ -1033,7 +1061,8 @@ Please continue from where you left off and complete the original request.
   async attachedAgentChatLoop(
     taskId: string,
     agent: AttachableAgent,
-    initialInput?: string
+    initialInput?: string,
+    initialMessages?: any[]
   ): Promise<void> {
     try {
       let agentFinalOutput: string | undefined;
@@ -1075,7 +1104,7 @@ Please continue from where you left off and complete the original request.
 
           if (context.chatHistory) {
             const found = context.chatHistory.find((h) => h.taskId === taskId);
-            found.output = agentFinalOutput;
+            if (found) found.output = agentFinalOutput;
           }
 
           resolve("done");
@@ -1088,7 +1117,8 @@ Please continue from where you left off and complete the original request.
       if (initialInput) {
         const taskInfo = this.taskRegistry.get(taskId);
         (agent as BaseAgent).call(
-          taskInfo?.formattedPrompt || taskInfo?.initialInput || initialInput
+          taskInfo?.formattedPrompt || taskInfo?.initialInput || initialInput,
+          initialMessages
         );
       }
     } catch (error) {

package/src/chat/modules/SessionsModule.ts

@@ -304,15 +304,20 @@ export class SessionsModule extends BaseChatModule {
   async handleResumeCommand(args: string[]): Promise<void> {
     const sessionManager = this.agentModule.getSessionManager();
 
-    if (args.length === 0) {
+    if (args.length === 0 || args[0] === "--all") {
       // Interactive: show saved sessions for selection
-      const savedSessions = sessionManager.listAvailableSessions();
+      const showAll = args[0] === "--all";
+      const allSessions = sessionManager.listAvailableSessions();
+      const savedSessions = showAll ? allSessions : allSessions.slice(0, 10);
       if (savedSessions.length === 0) {
         console.log("No saved sessions found to resume.");
         return;
       }
 
       this.printSavedSessionsTable(savedSessions);
+      if (!showAll && allSessions.length > 10) {
+        console.log(`   ... and ${allSessions.length - 10} more. Use /resume --all to see all sessions.`);
+      }
 
       const allIds = savedSessions.map((s) => s.sessionId);
       const selectedId = await this.selectByNumber(
@@ -357,8 +362,47 @@ export class SessionsModule extends BaseChatModule {
     // Check filesystem agent (may have metadata with threads)
     const fsAgentPath = path.join(".knowhow", "processes", "agents", id);
     if (fs.existsSync(fsAgentPath)) {
+      // Try to load threads from metadata.json and resume
+      const metadataPath = path.join(fsAgentPath, "metadata.json");
+      if (fs.existsSync(metadataPath)) {
+        try {
+          const raw = fs.readFileSync(metadataPath, "utf-8");
+          const metadata = JSON.parse(raw);
+          const threads: any[] = metadata.threads || [];
+          const agentName = metadata.agentName || "Developer";
+
+          // Try to get initialInput from the saved session file (more complete)
+          // since metadata.json doesn't always store it
+          const savedSession = sessionManager.loadSession(id);
+          const initialInput = savedSession?.initialInput || metadata.initialInput || metadata.prompt || "";
+
+          console.log(`\n📋 Found task in filesystem: ${id}`);
+          console.log(`   Agent  : ${agentName}`);
+          console.log(`   Task   : ${initialInput}`);
+          console.log(`   Status : ${metadata.status || "unknown"}`);
+
+          const additionalContext = await this.chatService?.getInput(
+            "Add any additional context for resuming this session (or press Enter to skip): "
+          );
+
+          // Normalize threads: if flat Message[] (old buggy format), wrap in array
+          const normalizedThreads = threads.length > 0 && !Array.isArray(threads[0])
+            ? [threads]
+            : threads;
+
+          await this.agentModule.resumeFromMessages({
+            agentName,
+            taskId: id,
+            threads: normalizedThreads,
+            input: additionalContext?.trim() || initialInput || "",
+          });
+          return;
+        } catch (e: any) {
+          console.error(`⚠️  Failed to load metadata for task ${id}: ${e.message}`);
+        }
+      }
       console.log(
-        `⚠️  Task ${id} exists in the filesystem but has no saved session.\n` +
+        `⚠️  Task ${id} exists in the filesystem but has no saved session or metadata.\n` +
           `   Use /attach ${id} if it is still running.`
       );
       return;