@worca/ui 0.15.1 → 0.15.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@worca/ui",
-  "version": "0.15.1",
+  "version": "0.15.3",
   "description": "Pipeline monitoring UI for worca-cc",
   "license": "MIT",
   "author": "Sinisha Djukic",

package/server/process-manager.js

@@ -371,7 +371,21 @@ export class ProcessManager {
    * @returns {Promise<{ pid: number }>}
    */
   async startPipeline(opts = {}) {
-    const cwd = opts.projectRoot || this.projectRoot;
+    // Resume must spawn inside the run's own working tree. Worktree-hosted
+    // runs live under <worktree>/.worca/runs/<id>; if we spawn from the parent
+    // project root, git operations and relative settings paths target the
+    // wrong tree and the resumed pipeline corrupts state on the parent
+    // branch. Worktree wins over opts.projectRoot for resume — callers
+    // routinely pass proj.projectRoot without knowing whether the run is
+    // worktree-hosted. Mirrors the cwd derivation in restartStage.
+    let resumeCtx = null;
+    if (opts.resume && opts.runId) {
+      resumeCtx = this.resolveRunContext(opts.runId);
+    }
+    const cwd =
+      resumeCtx && resumeCtx.worcaDir !== this.worcaDir
+        ? join(resumeCtx.worcaDir, '..')
+        : opts.projectRoot || this.projectRoot;
     const pipelineScriptRel = '.claude/worca/scripts/run_pipeline.py';
     const worktreeScriptRel = '.claude/worca/scripts/run_worktree.py';
 
@@ -408,11 +422,39 @@ export class ProcessManager {
     if (opts.resume) {
       args.push('--resume');
       if (opts.runId) {
-        const ctx = this.resolveRunContext(opts.runId);
-        const statusDir = ctx
-          ? ctx.runDir
-          : join(this.worcaDir, 'runs', opts.runId);
+        // The runner derives worca_dir from os.path.dirname(status_path) and
+        // builds the per-run dir as <worca_dir>/runs/<run_id>/. We must pass
+        // the worca root, not the per-run dir — passing <worca>/runs/<id>
+        // would make the runner compute a nested <worca>/runs/<id>/runs/<id>/
+        // and write status updates there while the UI keeps reading the
+        // original. _find_active_runs(worca_root) then locates the run.
+        const statusDir = resumeCtx ? resumeCtx.worcaDir : this.worcaDir;
         args.push('--status-dir', statusDir);
+
+        // _find_active_runs filters out runs whose pipeline_status is in
+        // {completed, interrupted}. To resume an interrupted/failed run, flip
+        // the top-level status to "resuming" so the runner can pick it up;
+        // it'll transition to "running" once it's processing.
+        const statusPath = resumeCtx
+          ? join(resumeCtx.runDir, 'status.json')
+          : join(this.worcaDir, 'runs', opts.runId, 'status.json');
+        try {
+          const s = JSON.parse(readFileSync(statusPath, 'utf8'));
+          if (
+            s.pipeline_status === 'interrupted' ||
+            s.pipeline_status === 'failed'
+          ) {
+            s.pipeline_status = 'resuming';
+            delete s.stop_reason;
+            writeFileSync(
+              statusPath,
+              `${JSON.stringify(s, null, 2)}\n`,
+              'utf8',
+            );
+          }
+        } catch {
+          /* non-fatal — runner will surface a clearer error if the file is missing */
+        }
       }
     } else if (opts.sourceType !== undefined) {
       // New format: separate source and prompt args

package/server/project-routes.js

@@ -71,7 +71,7 @@ function validateRunId(runId) {
 // Re-exported from run-dir-resolver so callers (including older tests) can
 // continue importing from project-routes. The implementation now overlays
 // worktree runs registered in <worcaDir>/multi/pipelines.d/.
-import { findRunStatusPath } from './run-dir-resolver.js';
+import { findRunStatusPath, readPipelineOverlay } from './run-dir-resolver.js';
 export { findRunStatusPath };
 
 /** Validate a branch name — alphanumeric, dots, hyphens, underscores, slashes */
@@ -686,8 +686,14 @@ export function createProjectScopedRoutes({
     }
     try {
       let status = JSON.parse(readFileSync(statusPath, 'utf8'));
-      // Reconcile stale "running" status when no process is alive
-      if (status.pipeline_status === 'running' && pm && !pm.getRunningPid()) {
+      // Reconcile stale "running" status when no process is alive.
+      // Pass runId so worktree-hosted pipelines (PID lives under
+      // <worktree>/.worca/runs/<id>/pipeline.pid) are detected correctly.
+      if (
+        status.pipeline_status === 'running' &&
+        pm &&
+        !pm.getRunningPid(runId)
+      ) {
         try {
           pm.reconcileStatus();
           status = JSON.parse(readFileSync(statusPath, 'utf8'));
@@ -929,7 +935,14 @@ export function createProjectScopedRoutes({
     }
     const { worcaDir, settingsPath } = req.project;
     try {
-      const controlDir = join(worcaDir, 'runs', runId);
+      // Worktree runs read control.json from <worktree>/.worca/runs/<id>/.
+      // Writing it to the parent project's worcaDir leaves the runner
+      // unaware of the stop request — SIGTERM still works, but we lose
+      // graceful-shutdown semantics.
+      const overlay = readPipelineOverlay(worcaDir, runId);
+      const controlDir = overlay?.worktree_path
+        ? join(overlay.worktree_path, '.worca', 'runs', runId)
+        : join(worcaDir, 'runs', runId);
       mkdirSync(controlDir, { recursive: true });
       writeFileSync(
         join(controlDir, 'control.json'),
@@ -1135,7 +1148,12 @@ export function createProjectScopedRoutes({
           pipeline_status: st.pipeline_status,
         });
       }
-      const controlDir = join(worcaDir, 'runs', runId);
+      // Worktree runs read control.json from <worktree>/.worca/runs/<id>/;
+      // writing to the parent's worcaDir is invisible to the runner.
+      const overlay = readPipelineOverlay(worcaDir, runId);
+      const controlDir = overlay?.worktree_path
+        ? join(overlay.worktree_path, '.worca', 'runs', runId)
+        : join(worcaDir, 'runs', runId);
       mkdirSync(controlDir, { recursive: true });
       writeFileSync(
         join(controlDir, 'control.json'),
@@ -1337,7 +1355,7 @@ export function createProjectScopedRoutes({
         .json({ ok: false, error: `Run "${runId}" not found` });
     }
 
-    const running = req.project.pm.getRunningPid();
+    const running = req.project.pm.getRunningPid(runId);
     if (running) {
       return res.status(409).json({
         ok: false,
@@ -1366,7 +1384,11 @@ export function createProjectScopedRoutes({
       }
     }
 
-    const cwd = projectRoot || process.cwd();
+    // Worktree-hosted runs live outside the parent project. Spawn the learner
+    // inside the worktree so its default --status-dir=.worca and any git
+    // operations land on the right tree, mirroring run_pipeline.py resume.
+    const overlay = readPipelineOverlay(worcaDir, runId);
+    const cwd = overlay?.worktree_path || projectRoot || process.cwd();
     const env = { ...process.env };
     delete env.CLAUDECODE;