@worca/ui 0.12.0 → 0.13.0

package/app/protocol.js

@@ -2,7 +2,7 @@
  * Protocol definitions for worca-ui WebSocket communication.
  */
 
-/** @typedef {'subscribe-run'|'unsubscribe-run'|'subscribe-log'|'unsubscribe-log'|'list-runs'|'get-agent-prompt'|'get-preferences'|'set-preferences'|'stop-run'|'resume-run'|'list-beads-issues'|'start-beads-issue'|'list-beads-counts'|'list-beads-refs'|'list-beads-unlinked'|'run-snapshot'|'run-update'|'runs-list'|'log-line'|'log-bulk'|'preferences'|'run-started'|'run-stopped'|'stage-restarted'|'beads-update'} MessageType */
+/** @typedef {'subscribe-run'|'unsubscribe-run'|'subscribe-log'|'unsubscribe-log'|'list-runs'|'get-agent-prompt'|'get-preferences'|'set-preferences'|'stop-run'|'resume-run'|'list-beads-issues'|'start-beads-issue'|'list-beads-counts'|'list-beads-refs'|'list-beads-unlinked'|'run-snapshot'|'run-update'|'runs-list'|'log-line'|'log-bulk'|'preferences'|'run-started'|'run-stopped'|'stage-restarted'|'beads-update'|'hello'|'hello-ack'} MessageType */
 
 /** @type {MessageType[]} */
 export const MESSAGE_TYPES = [
@@ -29,12 +29,6 @@ export const MESSAGE_TYPES = [
   // Protocol handshake
   'hello',
   'hello-ack',
-  // Parallel pipelines
-  'list-pipelines',
-  'subscribe-pipeline',
-  'unsubscribe-pipeline',
-  'pipeline-status-changed',
-  'pipelines-list',
   // Server → Client events
   'run-snapshot',
   'run-update',

package/app/styles.css

@@ -4525,3 +4525,61 @@ sl-tooltip.bead-tooltip::part(body) {
   padding: 2rem;
 }
 
+
+/* --- Worktrees view --- */
+.worktrees-view {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+.worktrees-summary {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px 6px;
+  align-items: baseline;
+  padding: 6px 0 2px;
+  font-size: 12px;
+  color: var(--muted);
+  font-variant-numeric: tabular-nums;
+}
+.worktrees-summary .meta-sep {
+  color: var(--border-subtle);
+  margin: 0 2px;
+}
+.worktrees-disk-alert {
+  margin-bottom: 4px;
+}
+.worktrees-toolbar {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex-wrap: wrap;
+}
+.worktrees-toolbar .worktrees-filter {
+  flex: 1;
+  min-width: 240px;
+}
+.worktree-card-path {
+  align-items: baseline;
+}
+.worktree-path-mono {
+  font-family: var(--font-mono, ui-monospace, SFMono-Regular, Menlo, monospace);
+  font-size: 11px;
+  color: var(--muted);
+  word-break: break-all;
+}
+.worktrees-bulk-groups {
+  margin: 8px 0 0;
+  padding-left: 18px;
+  font-size: 13px;
+  color: var(--muted);
+}
+.worktrees-bulk-groups li {
+  margin-bottom: 2px;
+}
+.dialog-actions {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+  width: 100%;
+}

package/package.json

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

package/server/process-manager.js

@@ -84,6 +84,43 @@ export class ProcessManager {
     this.settingsPath = settingsPath ?? null;
   }
 
+  /**
+   * Resolve the worcaDir and runDir for a given run ID.
+   * Checks root runs/ first, then pipelines.d/ registry for worktree_path.
+   * @param {string} runId
+   * @returns {{ worcaDir: string, runDir: string } | null}
+   */
+  resolveRunContext(runId) {
+    const rootPath = join(this.worcaDir, 'runs', runId, 'status.json');
+    if (existsSync(rootPath)) {
+      return {
+        worcaDir: this.worcaDir,
+        runDir: join(this.worcaDir, 'runs', runId),
+      };
+    }
+    const regPath = join(
+      this.worcaDir,
+      'multi',
+      'pipelines.d',
+      `${runId}.json`,
+    );
+    if (existsSync(regPath)) {
+      try {
+        const reg = JSON.parse(readFileSync(regPath, 'utf8'));
+        if (reg.worktree_path) {
+          const wtWorcaDir = join(reg.worktree_path, '.worca');
+          return {
+            worcaDir: wtWorcaDir,
+            runDir: join(wtWorcaDir, 'runs', runId),
+          };
+        }
+      } catch {
+        /* ignore */
+      }
+    }
+    return null;
+  }
+
   /**
    * Check if a pipeline is currently running.
    * @param {string} [runId] - If provided, check per-run PID first
@@ -125,7 +162,7 @@ export class ProcessManager {
 
   /**
    * Reconcile stale "running" status when the pipeline process is dead.
-   * Scans all runs with per-run PID files + the active_run pointer.
+   * Scans all runs with per-run PID files.
    * If pipeline_status is "running" but no process is alive, transitions
    * to "failed" with stop_reason="stale".
    * Preserves any existing stop_reason (e.g. "signal" set by Layer 1).
@@ -136,7 +173,7 @@ export class ProcessManager {
     let fixed = false;
     const dispatches = [];
 
-    // Collect run IDs to check: scan runs/*/pipeline.pid + active_run fallback
+    // Collect run IDs to check: scan runs/*/pipeline.pid
     const runIds = new Set();
     const runsDir = join(this.worcaDir, 'runs');
     if (existsSync(runsDir)) {
@@ -154,17 +191,6 @@ export class ProcessManager {
       }
     }
 
-    // Backward compat: also check active_run pointer
-    const activeRunPath = join(this.worcaDir, 'active_run');
-    if (existsSync(activeRunPath)) {
-      try {
-        const activeId = readFileSync(activeRunPath, 'utf8').trim();
-        if (activeId) runIds.add(activeId);
-      } catch {
-        /* ignore */
-      }
-    }
-
     for (const runId of runIds) {
       // Check if this run's process is alive
       const alive = this.getRunningPid(runId);
@@ -272,20 +298,47 @@ export class ProcessManager {
    */
   async startPipeline(opts = {}) {
     const cwd = opts.projectRoot || this.projectRoot;
-    const scriptPath = join(cwd, '.claude/worca/scripts/run_pipeline.py');
-    if (!existsSync(scriptPath)) {
-      const err = new Error(`Pipeline script not found at ${scriptPath}`);
-      err.code = 'script_not_found';
-      throw err;
+    const pipelineScriptRel = '.claude/worca/scripts/run_pipeline.py';
+    const worktreeScriptRel = '.claude/worca/scripts/run_worktree.py';
+
+    let scriptRel;
+    if (opts.resume) {
+      const pipelinePath = join(cwd, pipelineScriptRel);
+      if (!existsSync(pipelinePath)) {
+        const err = new Error(`Pipeline script not found at ${pipelinePath}`);
+        err.code = 'script_not_found';
+        throw err;
+      }
+      scriptRel = pipelineScriptRel;
+    } else {
+      const worktreePath = join(cwd, worktreeScriptRel);
+      if (existsSync(worktreePath)) {
+        scriptRel = worktreeScriptRel;
+      } else {
+        const pipelinePath = join(cwd, pipelineScriptRel);
+        if (!existsSync(pipelinePath)) {
+          const err = new Error(`Pipeline script not found at ${pipelinePath}`);
+          err.code = 'script_not_found';
+          throw err;
+        }
+        console.warn(
+          '[worca] run_worktree.py not found, falling back to run_pipeline.py',
+        );
+        scriptRel = pipelineScriptRel;
+      }
     }
 
-    const args = ['.claude/worca/scripts/run_pipeline.py'];
+    const args = [scriptRel];
     let promptFilePath = null; // track for cleanup on spawn failure
 
     if (opts.resume) {
       args.push('--resume');
       if (opts.runId) {
-        args.push('--status-dir', join(this.worcaDir, 'runs', opts.runId));
+        const ctx = this.resolveRunContext(opts.runId);
+        const statusDir = ctx
+          ? ctx.runDir
+          : join(this.worcaDir, 'runs', opts.runId);
+        args.push('--status-dir', statusDir);
       }
     } else if (opts.sourceType !== undefined) {
       // New format: separate source and prompt args
@@ -400,10 +453,13 @@ export class ProcessManager {
     let pid = null;
     let foundPidPath = null;
 
+    const ctx = runId ? this.resolveRunContext(runId) : null;
+    const effectiveWorcaDir = ctx ? ctx.worcaDir : this.worcaDir;
+
     // Check per-run PID file first, then project-level fallback
     const candidates = [];
     if (runId) {
-      candidates.push(join(this.worcaDir, 'runs', runId, 'pipeline.pid'));
+      candidates.push(join(effectiveWorcaDir, 'runs', runId, 'pipeline.pid'));
     }
     candidates.push(join(this.worcaDir, 'pipeline.pid'));
 
@@ -431,10 +487,10 @@ export class ProcessManager {
     }
 
     // Belt-and-suspenders: write control.json so the orchestrator gets a clean signal
-    const effectiveRunId = runId || this._readActiveRunId();
+    const effectiveRunId = runId;
     if (effectiveRunId) {
       try {
-        const controlDir = join(this.worcaDir, 'runs', effectiveRunId);
+        const controlDir = join(effectiveWorcaDir, 'runs', effectiveRunId);
         mkdirSync(controlDir, { recursive: true });
         writeFileSync(
           join(controlDir, 'control.json'),
@@ -514,7 +570,9 @@ export class ProcessManager {
     }
     const { pid } = running;
 
-    const controlDir = join(this.worcaDir, 'runs', runId);
+    const ctx = this.resolveRunContext(runId);
+    const effectiveWorcaDir = ctx ? ctx.worcaDir : this.worcaDir;
+    const controlDir = join(effectiveWorcaDir, 'runs', runId);
     mkdirSync(controlDir, { recursive: true });
     writeFileSync(
       join(controlDir, 'control.json'),
@@ -569,21 +627,6 @@ export class ProcessManager {
     }
   }
 
-  /**
-   * Read the active_run file to get the current run ID.
-   * @returns {string|null}
-   */
-  _readActiveRunId() {
-    const activeRunPath = join(this.worcaDir, 'active_run');
-    if (!existsSync(activeRunPath)) return null;
-    try {
-      const id = readFileSync(activeRunPath, 'utf8').trim();
-      return id || null;
-    } catch {
-      return null;
-    }
-  }
-
   /**
    * Delete a run directory and clean up references.
    * Refuses if the pipeline is currently running.
@@ -600,8 +643,10 @@ export class ProcessManager {
       throw err;
     }
 
-    const runsParent = resolve(this.worcaDir, 'runs');
-    const runDir = resolve(runsParent, runId);
+    const ctx = this.resolveRunContext(runId);
+    const effectiveWorcaDir = ctx ? ctx.worcaDir : this.worcaDir;
+    const runsParent = resolve(effectiveWorcaDir, 'runs');
+    const runDir = ctx ? resolve(ctx.runDir) : resolve(runsParent, runId);
     if (!runDir.startsWith(runsParent)) {
       const err = new Error('Invalid runId');
       err.code = 'invalid_id';
@@ -615,17 +660,6 @@ export class ProcessManager {
 
     rmSync(runDir, { recursive: true, force: true });
 
-    // Clear active_run pointer if it references this run
-    const activeRunPath = join(this.worcaDir, 'active_run');
-    if (existsSync(activeRunPath)) {
-      try {
-        const activeId = readFileSync(activeRunPath, 'utf8').trim();
-        if (activeId === runId) unlinkSync(activeRunPath);
-      } catch {
-        /* ignore */
-      }
-    }
-
     return { deleted: true };
   }
 
@@ -635,7 +669,8 @@ export class ProcessManager {
    * @returns {{ runId: string, paused: boolean }}
    */
   pausePipeline(runId) {
-    const controlDir = join(this.worcaDir, 'runs', runId);
+    const ctx = this.resolveRunContext(runId);
+    const controlDir = ctx ? ctx.runDir : join(this.worcaDir, 'runs', runId);
     mkdirSync(controlDir, { recursive: true });
     writeFileSync(
       join(controlDir, 'control.json'),
@@ -655,19 +690,34 @@ export class ProcessManager {
 
   /**
    * Restart a failed stage by resetting it and spawning with --resume.
+   *
+   * Internal API — only called from worca-ui (project-routes.js). The signature
+   * changed in W-048 from (stageKey, opts) to (runId, stageKey, opts) because
+   * runs are now per-worktree and the manager can no longer infer "the active
+   * run". Callers must pass an explicit runId.
+   *
+   * @param {string} runId - Run identifier to restart
    * @param {string} stageKey - The stage key to restart
    * @param {{ projectRoot?: string }} opts
    * @returns {Promise<{ pid: number, stage: string }>}
    */
-  async restartStage(stageKey, opts = {}) {
-    const running = this.getRunningPid();
+  async restartStage(runId, stageKey, opts = {}) {
+    const running = this.getRunningPid(runId);
     if (running) {
       const err = new Error(`Pipeline already running (PID ${running.pid})`);
       err.code = 'already_running';
       throw err;
     }
 
-    const cwd = opts.projectRoot || this.projectRoot;
+    const ctx = this.resolveRunContext(runId);
+    const runDir = ctx ? ctx.runDir : join(this.worcaDir, 'runs', runId);
+    // For worktree runs derive projectRoot from worcaDir parent (.worca/..)
+    const cwd =
+      opts.projectRoot ||
+      (ctx && ctx.worcaDir !== this.worcaDir
+        ? join(ctx.worcaDir, '..')
+        : this.projectRoot);
+
     const scriptPath = join(cwd, '.claude/worca/scripts/run_pipeline.py');
     if (!existsSync(scriptPath)) {
       const err = new Error(`Pipeline script not found at ${scriptPath}`);
@@ -675,24 +725,8 @@ export class ProcessManager {
       throw err;
     }
 
-    // Find status.json — check active_run first, then legacy
-    let statusPath = null;
-    const activeRunPath = join(this.worcaDir, 'active_run');
-    if (existsSync(activeRunPath)) {
-      try {
-        const runId = readFileSync(activeRunPath, 'utf8').trim();
-        const candidate = join(this.worcaDir, 'runs', runId, 'status.json');
-        if (existsSync(candidate)) statusPath = candidate;
-      } catch {
-        /* ignore */
-      }
-    }
-    if (!statusPath) {
-      const legacy = join(this.worcaDir, 'status.json');
-      if (existsSync(legacy)) statusPath = legacy;
-    }
-
-    if (!statusPath) {
+    const statusPath = join(runDir, 'status.json');
+    if (!existsSync(statusPath)) {
       const err = new Error('No status.json found');
       err.code = 'no_status';
       throw err;
@@ -720,14 +754,19 @@ export class ProcessManager {
     delete status.stages[stageKey].completed_at;
     writeFileSync(statusPath, `${JSON.stringify(status, null, 2)}\n`, 'utf8');
 
-    // Spawn with --resume
+    // Spawn with --resume --status-dir so the pipeline finds the right run
     const env = { ...process.env };
     delete env.CLAUDECODE;
 
     return new Promise((resolve, reject) => {
       const child = spawn(
         'python3',
-        ['.claude/worca/scripts/run_pipeline.py', '--resume'],
+        [
+          '.claude/worca/scripts/run_pipeline.py',
+          '--resume',
+          '--status-dir',
+          runDir,
+        ],
         {
           detached: true,
           stdio: 'ignore',
@@ -807,10 +846,10 @@ export function pausePipeline(worcaDir, runId) {
   return new ProcessManager({ worcaDir }).pausePipeline(runId);
 }
 
-/** @param {string} worcaDir @param {string} stageKey @param {object} opts */
-export async function restartStage(worcaDir, stageKey, opts = {}) {
+/** @param {string} worcaDir @param {string} runId @param {string} stageKey @param {object} opts */
+export async function restartStage(worcaDir, runId, stageKey, opts = {}) {
   return new ProcessManager({
     worcaDir,
     projectRoot: opts.projectRoot,
-  }).restartStage(stageKey, opts);
+  }).restartStage(runId, stageKey, opts);
 }

package/server/project-routes.js

@@ -48,6 +48,7 @@ import {
   readProjectWorcaVersion,
   runWorcaSetup,
 } from './worca-setup.js';
+import { createWorktreesRouter } from './worktrees-routes.js';
 
 /** Validate a runId — must not contain path traversal characters */
 const RUN_ID_RE = /^[a-zA-Z0-9_-]+$/;
@@ -1135,7 +1136,7 @@ export function createProjectScopedRoutes({
     async (req, res) => {
       const { stage } = req.params;
       try {
-        const result = await req.project.pm.restartStage(stage);
+        const result = await req.project.pm.restartStage(req.params.id, stage);
         const { broadcast } = req.app.locals;
         if (broadcast) broadcast('stage-restarted', { stage, pid: result.pid });
         res.json({ ok: true, restarted: true, stage, pid: result.pid });
@@ -1249,94 +1250,7 @@ export function createProjectScopedRoutes({
     res.json({ ok: true, runId, pid: child.pid });
   });
 
-  // POST /api/projects/:projectId/multi-pipeline — launch parallel pipelines
-  router.post('/multi-pipeline', requireWorcaDir, (req, res) => {
-    const { projectRoot } = req.project;
-    const body = req.body || {};
-    const { requests, baseBranch, maxParallel, cleanupPolicy, msize, mloops } =
-      body;
-
-    if (!Array.isArray(requests) || requests.length < 1) {
-      return res.status(400).json({
-        ok: false,
-        error: 'requests array required (at least 1 item)',
-      });
-    }
-    if (requests.length > 20) {
-      return res
-        .status(400)
-        .json({ ok: false, error: 'Too many requests (max 20)' });
-    }
-    for (const r of requests) {
-      if (typeof r !== 'string' || r.trim().length === 0) {
-        return res.status(400).json({
-          ok: false,
-          error: 'Each request must be a non-empty string',
-        });
-      }
-      if (r.length > 50000) {
-        return res.status(400).json({
-          ok: false,
-          error: 'Each request must be 50,000 characters or less',
-        });
-      }
-    }
-    if (baseBranch !== undefined) {
-      if (
-        typeof baseBranch !== 'string' ||
-        baseBranch.length > 200 ||
-        !/^[\w.\-/]+$/.test(baseBranch)
-      ) {
-        return res
-          .status(400)
-          .json({ ok: false, error: 'Invalid baseBranch value' });
-      }
-    }
-
-    const maxP = Math.max(1, Math.min(5, Math.round(Number(maxParallel) || 3)));
-    const msizeVal = Math.max(1, Math.min(10, Math.round(Number(msize) || 1)));
-    const mloopsVal = Math.max(
-      1,
-      Math.min(10, Math.round(Number(mloops) || 1)),
-    );
-    const cleanup = ['on-success', 'always', 'never'].includes(cleanupPolicy)
-      ? cleanupPolicy
-      : 'on-success';
-
-    const args = ['.claude/worca/scripts/run_multi.py'];
-    args.push('--max-parallel', String(maxP));
-    args.push('--cleanup', cleanup);
-    args.push('--msize', String(msizeVal));
-    args.push('--mloops', String(mloopsVal));
-    if (baseBranch) args.push('--base-branch', baseBranch);
-    args.push('--requests', ...requests.map((r) => r.trim()));
-
-    const env = { ...process.env };
-    delete env.CLAUDECODE;
-
-    try {
-      const child = spawn('python3', args, {
-        detached: true,
-        stdio: 'ignore',
-        cwd: projectRoot,
-        env,
-      });
-      child.unref();
-
-      const { broadcast } = req.app.locals;
-      if (broadcast)
-        broadcast('multi-pipeline-started', {
-          pid: child.pid,
-          count: requests.length,
-        });
-
-      res.json({ ok: true, pid: child.pid, count: requests.length });
-    } catch (err) {
-      res.status(500).json({ ok: false, error: err.message });
-    }
-  });
-
-  // POST /api/projects/:projectId/pipelines/:runId/stop — stop a parallel pipeline
+  // POST /api/projects/:projectId/pipelines/:runId/stop — stop a worktree pipeline
   router.post('/pipelines/:runId/stop', requireWorcaDir, (req, res) => {
     const runId = req.params.runId;
     if (!validateRunId(runId)) {
@@ -1385,7 +1299,7 @@ export function createProjectScopedRoutes({
     }
   });
 
-  // POST /api/projects/:projectId/pipelines/:runId/pause — pause a parallel pipeline
+  // POST /api/projects/:projectId/pipelines/:runId/pause — pause a worktree pipeline
   router.post('/pipelines/:runId/pause', requireWorcaDir, (req, res) => {
     const runId = req.params.runId;
     if (!validateRunId(runId)) {
@@ -1642,5 +1556,7 @@ export function createProjectScopedRoutes({
     }
   });
 
+  router.use('/worktrees', requireWorcaDir, createWorktreesRouter());
+
   return router;
 }

package/server/watcher-set.js

@@ -10,7 +10,6 @@
 
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { MultiWatcher } from './multi-watcher.js';
 import { createBeadsWatcher } from './ws-beads-watcher.js';
 import { createEventWatcher } from './ws-event-watcher.js';
 import { createLogWatcher } from './ws-log-watcher.js';
@@ -32,14 +31,12 @@ export class WatcherSet {
     this._deps = deps;
     this._closed = false;
     this._tier = TIER_POLLING;
-    this._skipMultiWatcher = !!factoryOverrides._skipMultiWatcher;
-    const { _skipMultiWatcher, ...factories } = factoryOverrides;
     this._factories = {
       createStatusWatcher,
       createLogWatcher,
       createBeadsWatcher,
       createEventWatcher,
-      ...factories,
+      ...factoryOverrides,
     };
 
     /** @type {ReturnType<typeof createStatusWatcher> | null} */
@@ -50,8 +47,6 @@ export class WatcherSet {
     this.beadsWatcher = null;
     /** @type {ReturnType<typeof createEventWatcher> | null} */
     this.eventWatcher = null;
-    /** @type {MultiWatcher | null} */
-    this.multiWatcher = null;
   }
 
   get worcaDir() {
@@ -93,28 +88,6 @@ export class WatcherSet {
     if (this._tier === TIER_FULL) {
       this._createSecondaryWatchers();
     }
-    // Start multi-pipeline watcher (skip for pipeline-level WatcherSets to avoid recursion)
-    if (!this._skipMultiWatcher) {
-      this._createMultiWatcher();
-    }
-  }
-
-  /** Create multi-pipeline watcher for this project's .worca/multi/pipelines.d/. */
-  _createMultiWatcher() {
-    try {
-      this.multiWatcher = new MultiWatcher(
-        this.projectId,
-        this._worcaDir,
-        this._deps,
-      );
-      this.multiWatcher.start();
-    } catch (err) {
-      console.error(
-        `[WatcherSet:${this.projectId}] multiWatcher failed:`,
-        err.message,
-      );
-      this.multiWatcher = null;
-    }
   }
 
   /** Create status watcher (always needed). */
@@ -153,8 +126,8 @@ export class WatcherSet {
       try {
         this.logWatcher = this._factories.createLogWatcher({
           broadcaster,
-          resolveActiveRunDir: this.statusWatcher
-            ? this.statusWatcher.resolveActiveRunDir
+          resolveLatestRunDir: this.statusWatcher
+            ? this.statusWatcher.resolveLatestRunDir
             : () => worcaDir,
           worcaDir,
           currentActiveRunId: this.statusWatcher
@@ -236,15 +209,6 @@ export class WatcherSet {
     if (this._closed) return;
     this._closed = true;
 
-    if (this.multiWatcher) {
-      try {
-        this.multiWatcher.destroy();
-      } catch {
-        // ignore cleanup errors
-      }
-      this.multiWatcher = null;
-    }
-
     for (const w of [
       this.statusWatcher,
       this.logWatcher,
@@ -274,11 +238,6 @@ export class WatcherSet {
     return count;
   }
 
-  /** Get multi-pipeline watcher (may be null for pipeline-level WatcherSets). */
-  getMultiWatcher() {
-    return this.multiWatcher;
-  }
-
   /** Delegate to status watcher's scheduleRefresh. */
   scheduleRefresh() {
     this.statusWatcher?.scheduleRefresh();