@love-moon/conductor-cli 0.2.28 → 0.2.30

package/bin/conductor-diagnose.js

@@ -366,6 +366,7 @@ function normalizeRole(role) {
 function normalizeTaskStatus(status) {
   const normalized = cleanText(status).toLowerCase();
   if (normalized === "completed") return "completed";
+  if (normalized === "init") return "init";
   if (normalized === "running") return "running";
   if (normalized === "killed" || normalized === "failed" || normalized === "cancelled") return "killed";
   return normalized || "unknown";

package/bin/conductor-fire.js

@@ -427,13 +427,12 @@ async function main() {
 
   let resumeContext = null;
   if (cliArgs.resumeSessionId) {
-    resumeContext = await resolveResumeContext(cliArgs.backend, cliArgs.resumeSessionId);
-    log(
-      `Validated --resume ${resumeContext.sessionId} (${resumeContext.provider}) at ${resumeContext.sessionPath}`,
-    );
-    log(`Resume will run backend from ${resumeContext.cwd}`);
-    runtimeProjectPath = await applyWorkingDirectory(resumeContext.cwd);
-    log(`Switched working directory to ${runtimeProjectPath} before Conductor connect`);
+    const bootstrap = await bootstrapResumeContextForFire({
+      backend: cliArgs.backend,
+      resumeSessionId: cliArgs.resumeSessionId,
+    });
+    resumeContext = bootstrap.resumeContext;
+    runtimeProjectPath = bootstrap.runtimeProjectPath;
   }
 
   const env = buildEnv();
@@ -1224,6 +1223,40 @@ export async function resolveResumeContext(backend, sessionId, options = {}) {
   return resolveCliResumeContext(backend, sessionId, options);
 }
 
+export async function bootstrapResumeContextForFire({
+  backend,
+  resumeSessionId,
+  env = process.env,
+  resolveResumeContextFn = resolveResumeContext,
+  applyWorkingDirectoryFn = applyWorkingDirectory,
+  logger = log,
+}) {
+  let runtimeProjectPath = process.cwd();
+  let resumeContext = null;
+
+  if (!resumeSessionId) {
+    return { resumeContext, runtimeProjectPath };
+  }
+
+  const overrideResumeCwd =
+    typeof env?.CONDUCTOR_RESUME_CWD === "string" ? env.CONDUCTOR_RESUME_CWD.trim() : "";
+  if (overrideResumeCwd) {
+    logger(`Using CONDUCTOR_RESUME_CWD override for --resume ${resumeSessionId}: ${overrideResumeCwd}`);
+    runtimeProjectPath = await applyWorkingDirectoryFn(overrideResumeCwd);
+    logger(`Switched working directory to ${runtimeProjectPath} before Conductor connect`);
+    return { resumeContext, runtimeProjectPath };
+  }
+
+  resumeContext = await resolveResumeContextFn(backend, resumeSessionId);
+  logger(
+    `Validated --resume ${resumeContext.sessionId} (${resumeContext.provider}) at ${resumeContext.sessionPath}`,
+  );
+  logger(`Resume will run backend from ${resumeContext.cwd}`);
+  runtimeProjectPath = await applyWorkingDirectoryFn(resumeContext.cwd);
+  logger(`Switched working directory to ${runtimeProjectPath} before Conductor connect`);
+  return { resumeContext, runtimeProjectPath };
+}
+
 export async function applyWorkingDirectory(targetPath) {
   const normalizedPath = typeof targetPath === "string" ? targetPath.trim() : "";
   if (!normalizedPath) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@love-moon/conductor-cli",
-  "version": "0.2.28",
-  "gitCommitId": "c690738",
+  "version": "0.2.30",
+  "gitCommitId": "e6a71ad",
   "type": "module",
   "bin": {
     "conductor": "bin/conductor.js"
@@ -17,16 +17,17 @@
     "test": "node --test test/*.test.js"
   },
   "dependencies": {
-    "@love-moon/ai-sdk": "0.2.28",
-    "@love-moon/conductor-sdk": "0.2.28",
+    "@love-moon/ai-bridge": "0.1.4",
+    "@love-moon/ai-sdk": "0.2.30",
+    "@love-moon/conductor-sdk": "0.2.30",
+    "chrome-launcher": "^1.2.1",
+    "chrome-remote-interface": "^0.33.0",
     "dotenv": "^16.4.5",
     "enquirer": "^2.4.1",
     "js-yaml": "^4.1.1",
     "node-pty": "^1.0.0",
     "ws": "^8.18.0",
-    "yargs": "^17.7.2",
-    "chrome-launcher": "^1.2.1",
-    "chrome-remote-interface": "^0.33.0"
+    "yargs": "^17.7.2"
   },
   "optionalDependencies": {
     "@roamhq/wrtc": "^0.10.0"

package/src/daemon.js

@@ -3,13 +3,14 @@ import path from "node:path";
 import os from "node:os";
 import { createRequire } from "node:module";
 import { spawn } from "node:child_process";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 
 import dotenv from "dotenv";
 import yaml from "js-yaml";
 
 import { ConductorWebSocketClient, ConductorConfig, loadConfig, ConfigFileNotFound } from "@love-moon/conductor-sdk";
 import { DaemonLogCollector } from "./log-collector.js";
+import { resolveResumeContext } from "./fire/resume.js";
 import { filterRuntimeSupportedAllowCliList, normalizeRuntimeBackendName } from "./runtime-backends.js";
 import {
   PACKAGE_NAME,
@@ -30,6 +31,7 @@ dotenv.config();
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const PACKAGE_ROOT = path.join(__dirname, "..");
+const DEFAULT_AI_BRIDGE_API_SPECIFIER = "@love-moon/ai-bridge/dist/api.js";
 const moduleRequire = createRequire(import.meta.url);
 const CLI_PATH = path.resolve(PACKAGE_ROOT, "bin", "conductor-fire.js");
 const DAEMON_LOG_DIR = path.join(os.homedir(), ".conductor", "logs");
@@ -283,6 +285,24 @@ function normalizeOptionalString(value) {
   return normalized || null;
 }
 
+function resolveImportTarget(specifierOrPath) {
+  const normalized = normalizeOptionalString(specifierOrPath);
+  if (!normalized) {
+    return null;
+  }
+  if (
+    normalized.startsWith("file:") ||
+    normalized.startsWith("node:") ||
+    normalized.startsWith("data:")
+  ) {
+    return normalized;
+  }
+  if (path.isAbsolute(normalized) || normalized.startsWith("./") || normalized.startsWith("../")) {
+    return pathToFileURL(path.resolve(normalized)).href;
+  }
+  return normalized;
+}
+
 function normalizeTerminalResumeStrategy(value) {
   const normalized = normalizeOptionalString(value);
   if (!normalized) {
@@ -1154,13 +1174,18 @@ export function startDaemon(config = {}, deps = {}) {
     });
   }
 
-  function runCommand(command, args, timeoutMs = 120_000) {
+  function runCommand(command, args, options = 120_000) {
     return new Promise((resolve) => {
       let stdout = "";
       let stderr = "";
+      const normalizedOptions =
+        typeof options === "number"
+          ? { timeoutMs: options }
+          : (options || {});
       const child = spawnFn(command, args, {
         stdio: ["ignore", "pipe", "pipe"],
-        env: { ...process.env },
+        env: normalizedOptions.env || { ...process.env },
+        cwd: normalizedOptions.cwd || process.cwd(),
       });
       const timer = setTimeout(() => {
         try {
@@ -1168,7 +1193,7 @@ export function startDaemon(config = {}, deps = {}) {
         } catch {
           /* ignore */
         }
-      }, timeoutMs);
+      }, normalizedOptions.timeoutMs ?? 120_000);
       child.stdout?.on("data", (chunk) => {
         if (stdout.length < 4000) stdout += chunk.toString().slice(0, 2000);
       });
@@ -1187,11 +1212,7 @@ export function startDaemon(config = {}, deps = {}) {
   }
 
   function runBufferedCommand(command, args, options = {}) {
-    return runCommand(
-      command,
-      args,
-      typeof options === "number" ? options : options?.timeoutMs ?? 120_000,
-    );
+    return runCommand(command, args, options);
   }
 
   async function readInstalledCliVersion() {
@@ -2518,6 +2539,16 @@ export function startDaemon(config = {}, deps = {}) {
         rejectCreateTaskDuringShutdown(event.payload);
         return;
       }
+      if (event.type === "restart_task") {
+        reportRestartFailure({
+          taskId: event?.payload?.target_task_id ? String(event.payload.target_task_id) : "",
+          projectId: event?.payload?.project_id ? String(event.payload.project_id) : "",
+          requestId: event?.payload?.request_id ? String(event.payload.request_id) : "",
+          mode: event?.payload?.mode ? String(event.payload.mode) : "",
+          error: new Error("daemon shutting down"),
+        });
+        return;
+      }
       if (event.type === "create_pty_task") {
         rejectCreatePtyTaskDuringShutdown(event.payload);
         return;
@@ -2528,6 +2559,10 @@ export function startDaemon(config = {}, deps = {}) {
       handleCreateTask(event.payload);
       return;
     }
+    if (event.type === "restart_task") {
+      void handleRestartTask(event.payload);
+      return;
+    }
     if (event.type === "create_pty_task") {
       void handleCreatePtyTask(event.payload);
       return;
@@ -2792,6 +2827,111 @@ export function startDaemon(config = {}, deps = {}) {
     }
   }
 
+  let bridgeSessionHelperPromise = null;
+  async function getBridgeSessionHelper() {
+    if (typeof deps.bridgeSessionBetweenBackends === "function") {
+      return deps.bridgeSessionBetweenBackends;
+    }
+    if (!bridgeSessionHelperPromise) {
+      bridgeSessionHelperPromise = (async () => {
+        try {
+          const bridgeImportTarget =
+            resolveImportTarget(process.env.CONDUCTOR_AI_BRIDGE_API_PATH) ||
+            DEFAULT_AI_BRIDGE_API_SPECIFIER;
+          const bridgeModule = await importOptionalModule(bridgeImportTarget);
+          if (typeof bridgeModule.bridgeSessionBetweenBackends !== "function") {
+            throw new Error("bridgeSessionBetweenBackends is not available");
+          }
+          return bridgeModule.bridgeSessionBetweenBackends;
+        } catch (error) {
+          bridgeSessionHelperPromise = null;
+          throw error;
+        }
+      })();
+    }
+    return bridgeSessionHelperPromise;
+  }
+
+  function reportRestartFailure({ taskId, projectId, requestId, mode, error, sendAck = true }) {
+    const prefix =
+      mode === "bridge_to_new_task" || mode === "fork_to_new_task"
+        ? "new task failed"
+        : "restart failed";
+    const summary = `${prefix}: ${error?.message || error}`;
+    if (sendAck) {
+      sendAgentCommandAck({
+        requestId,
+        taskId,
+        eventType: "restart_task",
+        accepted: false,
+      }).catch(() => {});
+    }
+    client
+      .sendJson({
+        type: "task_status_update",
+        payload: {
+          task_id: taskId,
+          project_id: projectId,
+          status: "KILLED",
+          summary,
+        },
+      })
+      .catch((err) => {
+        logError(`Failed to report restart_task failure for ${taskId}: ${err?.message || err}`);
+      });
+  }
+
+  async function resolveRestartCwd({
+    projectId,
+    preferredCwd = "",
+    backendType,
+    sessionId,
+    sourceSessionFilePath = "",
+  }) {
+    const normalizedPreferredCwd = typeof preferredCwd === "string" ? preferredCwd.trim() : "";
+    if (normalizedPreferredCwd) {
+      return normalizedPreferredCwd;
+    }
+
+    const boundPath = await getProjectLocalPath(projectId);
+    if (boundPath) {
+      return boundPath;
+    }
+
+    const normalizedBackend = normalizeRuntimeBackendName(backendType);
+    const normalizedSessionId = typeof sessionId === "string" ? sessionId.trim() : "";
+    if (normalizedSessionId && normalizedBackend && normalizedBackend !== "opencode") {
+      try {
+        const resumeContext = await (deps.resolveResumeContext || resolveResumeContext)(
+          normalizedBackend,
+          normalizedSessionId,
+          { cwd: process.cwd() },
+        );
+        if (typeof resumeContext?.cwd === "string" && resumeContext.cwd.trim()) {
+          return resumeContext.cwd.trim();
+        }
+      } catch {
+        // ignore provider-specific fallback failure here; we'll try the remaining fallbacks
+      }
+    }
+
+    const normalizedSessionPath =
+      typeof sourceSessionFilePath === "string" ? sourceSessionFilePath.trim() : "";
+    if (normalizedSessionPath) {
+      try {
+        const stats = fs.statSync(normalizedSessionPath);
+        if (stats.isDirectory()) {
+          return normalizedSessionPath;
+        }
+        return path.dirname(normalizedSessionPath);
+      } catch {
+        // ignore missing local path
+      }
+    }
+
+    return "";
+  }
+
   async function handleCreateTask(payload) {
     const {
       task_id: taskId,
@@ -2888,11 +3028,11 @@ export function startDaemon(config = {}, deps = {}) {
         payload: {
           task_id: taskId,
           project_id: projectId,
-          status: "UNKNOWN",
+          status: "INIT",
         },
       })
       .catch((err) => {
-        logError(`Failed to report task status (UNKNOWN) for ${taskId}: ${err?.message || err}`);
+        logError(`Failed to report task status (INIT) for ${taskId}: ${err?.message || err}`);
       });
 
     // Check if project has a bound local path for this daemon
@@ -3085,6 +3225,375 @@ export function startDaemon(config = {}, deps = {}) {
     });
   }
 
+  async function handleRestartTask(payload) {
+    const {
+      mode,
+      source_task_id: sourceTaskId,
+      target_task_id: targetTaskId,
+      project_id: projectId,
+      title,
+      source_backend_type: sourceBackendType,
+      source_session_id: sourceSessionId,
+      source_session_file_path: sourceSessionFilePath,
+      target_backend_type: targetBackendType,
+      request_id: requestIdRaw,
+    } = payload || {};
+
+    const requestId = requestIdRaw ? String(requestIdRaw) : "";
+    const normalizedMode = typeof mode === "string" ? mode.trim() : "";
+    const normalizedSourceTaskId = sourceTaskId ? String(sourceTaskId) : "";
+    const normalizedTargetTaskId = targetTaskId ? String(targetTaskId) : "";
+    const normalizedProjectId = projectId ? String(projectId) : "";
+    const normalizedSourceSessionId = sourceSessionId ? String(sourceSessionId).trim() : "";
+
+    if (
+      !normalizedMode ||
+      !normalizedSourceTaskId ||
+      !normalizedTargetTaskId ||
+      !normalizedProjectId ||
+      !normalizedSourceSessionId
+    ) {
+      logError(`Invalid restart_task payload: ${JSON.stringify(payload)}`);
+      sendAgentCommandAck({
+        requestId,
+        taskId: normalizedTargetTaskId || normalizedSourceTaskId,
+        eventType: "restart_task",
+        accepted: false,
+      }).catch(() => {});
+      return;
+    }
+
+    if (requestId && !markRequestSeen(requestId)) {
+      log(
+        `Duplicate restart_task ignored for ${normalizedTargetTaskId} (request_id=${requestId})`,
+      );
+      sendAgentCommandAck({
+        requestId,
+        taskId: normalizedTargetTaskId,
+        eventType: "restart_task",
+        accepted: true,
+      }).catch(() => {});
+      return;
+    }
+
+    if (daemonShuttingDown) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error("daemon shutting down"),
+      });
+      return;
+    }
+
+    const activeTarget = activeTaskProcesses.get(normalizedTargetTaskId);
+    if (activeTarget?.child) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error(`task already active (pid=${activeTarget.child.pid ?? "unknown"})`),
+      });
+      return;
+    }
+
+    const effectiveBackend = normalizeRuntimeBackendName(targetBackendType || sourceBackendType || SUPPORTED_BACKENDS[0]);
+    if (!SUPPORTED_BACKENDS.includes(effectiveBackend)) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error(`Unsupported backend: ${effectiveBackend}`),
+      });
+      return;
+    }
+
+    if (normalizedMode === "resume_inplace") {
+      if (normalizedTargetTaskId !== normalizedSourceTaskId) {
+        reportRestartFailure({
+          taskId: normalizedTargetTaskId,
+          projectId: normalizedProjectId,
+          requestId,
+          mode: normalizedMode,
+          error: new Error("In-place restart must reuse the same task"),
+        });
+        return;
+      }
+      if (effectiveBackend !== sourceBackendType) {
+        reportRestartFailure({
+          taskId: normalizedTargetTaskId,
+          projectId: normalizedProjectId,
+          requestId,
+          mode: normalizedMode,
+          error: new Error("In-place restart must reuse the same backend"),
+        });
+        return;
+      }
+    }
+
+    sendAgentCommandAck({
+      requestId,
+      taskId: normalizedTargetTaskId,
+      eventType: "restart_task",
+      accepted: true,
+    }).catch((err) => {
+      logError(`Failed to report agent_command_ack(restart_task) for ${normalizedTargetTaskId}: ${err?.message || err}`);
+    });
+
+    let resolvedResumeSessionId = normalizedSourceSessionId;
+    let resolvedResumeCwd = "";
+    try {
+      if (normalizedMode === "bridge_to_new_task" || normalizedMode === "fork_to_new_task") {
+        const sourceResumeCwd = await resolveRestartCwd({
+          projectId: normalizedProjectId,
+          backendType: sourceBackendType,
+          sessionId: normalizedSourceSessionId,
+          sourceSessionFilePath: sourceSessionFilePath ? String(sourceSessionFilePath) : "",
+        });
+        const bridgeSession = await getBridgeSessionHelper();
+        const bridgeResult = await bridgeSession({
+          sourceTool: sourceBackendType,
+          sourceSessionId: normalizedSourceSessionId,
+          sourceSessionPath: sourceSessionFilePath ? String(sourceSessionFilePath) : undefined,
+          sourceSessionInfo: {
+            tool: sourceBackendType,
+            sessionId: normalizedSourceSessionId,
+            path: sourceSessionFilePath ? String(sourceSessionFilePath) : undefined,
+            cwd: sourceResumeCwd || undefined,
+          },
+          targetTool: effectiveBackend,
+          targetCwdFallback: sourceResumeCwd || undefined,
+        });
+        resolvedResumeSessionId = bridgeResult.sessionId;
+        resolvedResumeCwd = await resolveRestartCwd({
+          projectId: normalizedProjectId,
+          preferredCwd: bridgeResult.cwd,
+          backendType: effectiveBackend,
+          sessionId: bridgeResult.sessionId,
+          sourceSessionFilePath: sourceSessionFilePath ? String(sourceSessionFilePath) : "",
+        });
+      } else if (normalizedMode === "resume_inplace") {
+        resolvedResumeCwd = await resolveRestartCwd({
+          projectId: normalizedProjectId,
+          backendType: effectiveBackend,
+          sessionId: normalizedSourceSessionId,
+          sourceSessionFilePath: sourceSessionFilePath ? String(sourceSessionFilePath) : "",
+        });
+      } else {
+        throw new Error(`Unsupported restart mode: ${normalizedMode}`);
+      }
+    } catch (error) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error,
+        sendAck: false,
+      });
+      return;
+    }
+
+    if (!resolvedResumeCwd) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error("Could not resolve resume cwd"),
+        sendAck: false,
+      });
+      return;
+    }
+
+    const cliCommand = ALLOW_CLI_LIST[effectiveBackend];
+
+    log("");
+    log(
+      `Restarting task ${normalizedTargetTaskId} from ${normalizedSourceTaskId} (${normalizedMode} -> ${effectiveBackend})`,
+    );
+    log(`CLI command: ${cliCommand}`);
+
+    if (normalizedMode !== "resume_inplace") {
+      client
+        .sendJson({
+          type: "task_status_update",
+          payload: {
+            task_id: normalizedTargetTaskId,
+            project_id: normalizedProjectId,
+            status: "INIT",
+          },
+        })
+        .catch((err) => {
+          logError(`Failed to report task status (INIT) for ${normalizedTargetTaskId}: ${err?.message || err}`);
+        });
+    }
+
+    if (daemonShuttingDown) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error("daemon shutting down"),
+        sendAck: false,
+      });
+      return;
+    }
+
+    let taskDir = resolvedResumeCwd;
+    let logPath = path.join(taskDir, "conductor.log");
+
+    try {
+      mkdirSyncFn(taskDir, { recursive: true });
+    } catch (err) {
+      reportRestartFailure({
+        taskId: normalizedTargetTaskId,
+        projectId: normalizedProjectId,
+        requestId,
+        mode: normalizedMode,
+        error: new Error(`Failed to ensure task workspace ${taskDir}: ${err?.message || err}`),
+        sendAck: false,
+      });
+      return;
+    }
+
+    const args = [];
+    if (effectiveBackend) {
+      args.push("--backend", effectiveBackend);
+    }
+    args.push("--resume", resolvedResumeSessionId);
+    args.push("--");
+
+    const env = {
+      ...process.env,
+      CONDUCTOR_PROJECT_ID: normalizedProjectId,
+      CONDUCTOR_TASK_ID: normalizedTargetTaskId,
+      CONDUCTOR_CLI_COMMAND: cliCommand,
+      CONDUCTOR_RESUME_CWD: resolvedResumeCwd,
+    };
+    if (config.CONFIG_FILE) {
+      env.CONDUCTOR_CONFIG = config.CONFIG_FILE;
+    }
+    if (AGENT_TOKEN) {
+      env.CONDUCTOR_AGENT_TOKEN = AGENT_TOKEN;
+    }
+    if (BACKEND_HTTP) {
+      env.CONDUCTOR_BACKEND_URL = BACKEND_HTTP;
+    }
+
+    const child = spawnFn(process.execPath, [CLI_PATH_VAL, ...args], {
+      cwd: taskDir,
+      env,
+      stdio: ["inherit", "pipe", "pipe"],
+    });
+
+    let logStream;
+    try {
+      logStream = createWriteStreamFn(logPath, { flags: "a" });
+      if (logStream && typeof logStream.on === "function") {
+        const logPathSnapshot = logPath;
+        logStream.on("error", (err) => {
+          logError(`Log stream error (${logPathSnapshot}): ${err?.message || err}`);
+        });
+      }
+    } catch (err) {
+      logError(`Failed to open log file ${logPath}: ${err?.message || err}`);
+    }
+
+    log(`Task title: ${title || normalizedTargetTaskId}`);
+    log(`Resume session: ${resolvedResumeSessionId}`);
+    log(`Resume cwd: ${resolvedResumeCwd}`);
+    log(`Logs: ${logPath}`);
+
+    activeTaskProcesses.set(normalizedTargetTaskId, {
+      child,
+      projectId: normalizedProjectId,
+      logPath,
+      stopForceKillTimer: null,
+    });
+
+    client
+      .sendJson({
+        type: "task_status_update",
+        payload: {
+          task_id: normalizedTargetTaskId,
+          project_id: normalizedProjectId,
+          status: "RUNNING",
+        },
+      })
+      .catch((err) => {
+        logError(`Failed to report task status (RUNNING) for ${normalizedTargetTaskId}: ${err?.message || err}`);
+      });
+
+    if (child.stdout && typeof child.stdout.pipe === "function" && logStream) {
+      child.stdout.pipe(logStream, { end: false });
+    } else if (child.stdout && typeof child.stdout.on === "function" && logStream) {
+      child.stdout.on("data", (chunk) => logStream.write(chunk));
+    }
+    if (child.stderr && typeof child.stderr.pipe === "function" && logStream) {
+      child.stderr.pipe(logStream, { end: false });
+    } else if (child.stderr && typeof child.stderr.on === "function" && logStream) {
+      child.stderr.on("data", (chunk) => logStream.write(chunk));
+    }
+
+    child.on("error", (err) => {
+      logError(`Failed to spawn restart CLI for ${normalizedTargetTaskId}: ${err.message}`);
+      if (logStream) {
+        const ts = new Date().toLocaleString("sv-SE", { timeZone: "Asia/Shanghai" }).replace(" ", "T");
+        logStream.write(`[daemon ${ts}] spawn error: ${err.message}\n`);
+      }
+    });
+
+    child.on("exit", (code, signal) => {
+      const active = activeTaskProcesses.get(normalizedTargetTaskId);
+      if (active?.stopForceKillTimer) {
+        clearTimeout(active.stopForceKillTimer);
+      }
+      activeTaskProcesses.delete(normalizedTargetTaskId);
+      const suppressExitStatusReport = suppressedExitStatusReports.has(normalizedTargetTaskId);
+      suppressedExitStatusReports.delete(normalizedTargetTaskId);
+      if (logStream) {
+        const ts = new Date().toLocaleString("sv-SE", { timeZone: "Asia/Shanghai" }).replace(" ", "T");
+        if (signal) {
+          logStream.write(`[daemon ${ts}] process killed by signal ${signal}\n`);
+        } else {
+          logStream.write(`[daemon ${ts}] process exited with code ${code}\n`);
+        }
+        logStream.end();
+      }
+
+      const isKilledBySignal = Boolean(signal);
+      const isKilledByExitCode = code === 130 || code === 143;
+      const isKilled = isKilledBySignal || isKilledByExitCode;
+      const status = isKilled ? "KILLED" : code === 0 ? "COMPLETED" : "KILLED";
+      const summary = isKilled
+        ? (signal ? `killed by signal ${signal}` : `terminated (exit code ${code})`)
+        : code === 0
+          ? "completed"
+          : `exited with code ${code}`;
+
+      if (!suppressExitStatusReport) {
+        client
+          .sendJson({
+            type: "task_status_update",
+            payload: {
+              task_id: normalizedTargetTaskId,
+              project_id: normalizedProjectId,
+              status,
+              summary,
+            },
+          })
+          .catch((err) => {
+            logError(`Failed to report task status (${status}) for ${normalizedTargetTaskId}: ${err?.message || err}`);
+          });
+      }
+    });
+  }
+
   let closePromise = null;
   async function shutdownDaemon(reason = "manual close") {
     if (closePromise) {

package/src/native-deps.js

@@ -315,8 +315,16 @@ export async function repairAndVerifyGlobalNodePty({
     await ensurePnpmOnlyBuiltDependencies({ runCommand, dependencies, global: true });
   }
 
+  const packageDirectory = await resolveGlobalPackageDirectory({
+    packageManager,
+    packageName,
+    runCommand,
+  });
+
   if (packageManager === "pnpm") {
-    const rebuildResult = await runCommand("pnpm", ["rebuild", "-g", ...dependencies]);
+    const rebuildResult = await runCommand("pnpm", ["rebuild", ...dependencies], {
+      cwd: packageDirectory,
+    });
     if (!rebuildResult.success) {
       throw new Error(
         `pnpm rebuild failed: ${String(rebuildResult.stderr || rebuildResult.stdout || "unknown error").trim()}`,
@@ -336,12 +344,6 @@ export async function repairAndVerifyGlobalNodePty({
       );
     }
   }
-
-  const packageDirectory = await resolveGlobalPackageDirectory({
-    packageManager,
-    packageName,
-    runCommand,
-  });
   await verifyNodePtyForPackageDirectory({
     packageDirectory,
     runCommand,