opencastle 0.33.5 → 0.33.7

package/src/cli/convoy/pipeline.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises'
 import { mkdirSync } from 'node:fs'
-import { resolve, dirname, relative, isAbsolute, sep } from 'node:path'
+import { resolve, join, dirname, relative, isAbsolute, sep } from 'node:path'
 import { execFile as execFileCb } from 'node:child_process'
 import { promisify } from 'node:util'
 import type { TaskSpec, AgentAdapter } from '../types.js'
@@ -8,7 +8,6 @@ import { parseTaskSpecText } from '../run/schema.js'
 import { createConvoyStore } from './store.js'
 import {
   createConvoyEngine,
-  ensureBranch,
   type ConvoyEngine,
   type ConvoyResult,
   type ConvoyEngineOptions,
@@ -51,6 +50,9 @@ export interface PipelineOrchestratorOptions {
   _createConvoyEngine?: (opts: ConvoyEngineOptions) => ConvoyEngine
   /** Injectable branch handler (used in tests). */
   _ensureBranch?: (branchName: string, basePath: string) => Promise<void>
+  /** Pass `null` to skip pipeline-level worktree creation (test mode).
+   *  Also skipped when `_ensureBranch` is provided (backward-compat for tests). */
+  _convoyWorktreeDir?: string | null
 }
 
 // ── Internal helpers ──────────────────────────────────────────────────────────
@@ -87,7 +89,6 @@ export function createPipelineOrchestrator(
   const basePath = resolve(options.basePath ?? process.cwd())
   const dbPath = options.dbPath ?? resolve(basePath, '.opencastle', 'convoy.db')
   const engineFactory = options._createConvoyEngine ?? createConvoyEngine
-  const branchFn = options._ensureBranch ?? ensureBranch
 
   async function getCurrentBranch(): Promise<string> {
     try {
@@ -118,7 +119,7 @@ export function createPipelineOrchestrator(
     specPath: string,
     pipelineId: string,
     branch: string,
-    skipDirtyCheck = false,
+    effectiveBase: string = basePath,
   ): Promise<ConvoyResult> {
     const absPath = resolveSpecPath(specPath)
     const convoyYaml = await readFile(absPath, 'utf8')
@@ -129,16 +130,13 @@ export function createPipelineOrchestrator(
       spec: overriddenSpec,
       specYaml: convoyYaml,
       adapter,
-      basePath,
+      basePath: effectiveBase,
       dbPath,
       logsDir: options.logsDir,
       verbose,
       pipelineId,
+      _convoyWorktreeDir: null,
     }
-    if (skipDirtyCheck) {
-      engineOpts._ensureBranch = (b, base) => ensureBranch(b, base, true)
-    }
-
     const engine = engineFactory(engineOpts)
     return engine.run()
   }
@@ -149,10 +147,33 @@ export function createPipelineOrchestrator(
     const branch = spec.branch ?? (await getCurrentBranch())
     const convoySpecs = spec.depends_on_convoy ?? []
 
-    // Switch branch BEFORE any DB writes — otherwise the convoy.db modification
-    // from insertPipeline() causes ensureBranch's dirty check to fail.
+    // Create pipeline-level worktree for branch isolation.
+    // Skipped when _convoyWorktreeDir is null or _ensureBranch is injected (test mode).
+    let effectiveBasePath = basePath
+    let convoyWorktreeDir: string | undefined
     if (spec.branch !== undefined) {
-      await branchFn(spec.branch, basePath)
+      const skipWorktree = options._convoyWorktreeDir === null || options._ensureBranch !== undefined
+      if (!skipWorktree) {
+        if (typeof options._convoyWorktreeDir === 'string') {
+          effectiveBasePath = options._convoyWorktreeDir
+          convoyWorktreeDir = options._convoyWorktreeDir
+        } else {
+          const worktreeId = `convoy-root-${Date.now()}`
+          convoyWorktreeDir = join(basePath, '.opencastle', 'worktrees', worktreeId)
+          mkdirSync(dirname(convoyWorktreeDir), { recursive: true })
+          let branchExists = false
+          try {
+            await execFile('git', ['rev-parse', '--verify', spec.branch], { cwd: basePath })
+            branchExists = true
+          } catch { /* branch doesn't exist */ }
+          if (branchExists) {
+            await execFile('git', ['worktree', 'add', convoyWorktreeDir, spec.branch], { cwd: basePath })
+          } else {
+            await execFile('git', ['worktree', 'add', '-b', spec.branch, convoyWorktreeDir], { cwd: basePath })
+          }
+          effectiveBasePath = convoyWorktreeDir
+        }
+      }
     }
 
     mkdirSync(dirname(dbPath), { recursive: true })
@@ -187,10 +208,7 @@ export function createPipelineOrchestrator(
 
         let convoyResult: ConvoyResult
         try {
-          // Always skip dirty check inside pipeline — run.ts pre-flight already
-          // handled the stash prompt, and insertPipeline() writes to convoy.db
-          // before the first convoy runs (which would cause a false dirty-check failure).
-          convoyResult = await runConvoySpecFile(specPath, pipelineId, branch, true)
+          convoyResult = await runConvoySpecFile(specPath, pipelineId, branch, effectiveBasePath)
         } catch (err) {
           process.stderr.write(
             `  ✗ Convoy spec "${specPath}" failed to load: ${(err as Error).message}\n`,
@@ -218,11 +236,12 @@ export function createPipelineOrchestrator(
           spec: { ...spec, branch },
           specYaml,
           adapter,
-          basePath,
+          basePath: effectiveBasePath,
           dbPath,
           logsDir: options.logsDir,
           verbose,
           pipelineId,
+          _convoyWorktreeDir: null,
         })
         const hybridResult = await hybridEngine.run()
         convoyResults.push(hybridResult)
@@ -238,6 +257,12 @@ export function createPipelineOrchestrator(
         failStore.close()
       }
       throw err
+    } finally {
+      if (convoyWorktreeDir) {
+        try {
+          await execFile('git', ['worktree', 'remove', convoyWorktreeDir, '--force'], { cwd: basePath })
+        } catch { /* ignore cleanup errors */ }
+      }
     }
 
     const totalTokens = aggregateTokens(convoyResults)
@@ -283,6 +308,36 @@ export function createPipelineOrchestrator(
     const convoySpecs: string[] = JSON.parse(pipeline.convoy_specs) as string[]
     const branch = pipeline.branch ?? spec.branch ?? (await getCurrentBranch())
 
+    // Create pipeline-level worktree for branch isolation.
+    // Skipped when _convoyWorktreeDir is null or _ensureBranch is injected (test mode).
+    let effectiveBasePath = basePath
+    let convoyWorktreeDir: string | undefined
+    const pipelineBranch = pipeline.branch ?? spec.branch
+    if (pipelineBranch !== undefined) {
+      const skipWorktree = options._convoyWorktreeDir === null || options._ensureBranch !== undefined
+      if (!skipWorktree) {
+        if (typeof options._convoyWorktreeDir === 'string') {
+          effectiveBasePath = options._convoyWorktreeDir
+          convoyWorktreeDir = options._convoyWorktreeDir
+        } else {
+          const worktreeId = `convoy-root-${Date.now()}`
+          convoyWorktreeDir = join(basePath, '.opencastle', 'worktrees', worktreeId)
+          mkdirSync(dirname(convoyWorktreeDir), { recursive: true })
+          let branchExists = false
+          try {
+            await execFile('git', ['rev-parse', '--verify', pipelineBranch], { cwd: basePath })
+            branchExists = true
+          } catch { /* branch doesn't exist */ }
+          if (branchExists) {
+            await execFile('git', ['worktree', 'add', convoyWorktreeDir, pipelineBranch], { cwd: basePath })
+          } else {
+            await execFile('git', ['worktree', 'add', '-b', pipelineBranch, convoyWorktreeDir], { cwd: basePath })
+          }
+          effectiveBasePath = convoyWorktreeDir
+        }
+      }
+    }
+
     // Load all convoys linked to this pipeline, sorted by creation time
     const convoyStore = createConvoyStore(dbPath)
     let existingConvoys
@@ -350,11 +405,12 @@ export function createPipelineOrchestrator(
             spec: overriddenSpec,
             specYaml: convoyYaml,
             adapter,
-            basePath,
+            basePath: effectiveBasePath,
             dbPath,
             logsDir: options.logsDir,
             verbose,
             pipelineId,
+            _convoyWorktreeDir: null,
           })
 
           if (existing.status === 'failed') {
@@ -366,7 +422,7 @@ export function createPipelineOrchestrator(
         } else {
           // Run fresh
           try {
-            convoyResult = await runConvoySpecFile(specPath, pipelineId, branch, true)
+            convoyResult = await runConvoySpecFile(specPath, pipelineId, branch, effectiveBasePath)
           } catch (err) {
             process.stderr.write(
               `  ✗ Convoy spec "${specPath}" failed to load: ${(err as Error).message}\n`,
@@ -399,6 +455,12 @@ export function createPipelineOrchestrator(
         failStore.close()
       }
       throw err
+    } finally {
+      if (convoyWorktreeDir) {
+        try {
+          await execFile('git', ['worktree', 'remove', convoyWorktreeDir, '--force'], { cwd: basePath })
+        } catch { /* ignore cleanup errors */ }
+      }
     }
 
     const totalTokens = aggregateTokens(convoyResults)

package/src/cli/convoy/store.test.ts

@@ -99,11 +99,11 @@ describe('DB creation', () => {
     expect(row.journal_mode).toBe('wal')
   })
 
-  it('sets schema version to 11', () => {
+  it('sets schema version to 12', () => {
     const db = new DatabaseSync(dbPath)
     const row = db.prepare('PRAGMA user_version').get() as { user_version: number }
     db.close()
-    expect(row.user_version).toBe(11)
+    expect(row.user_version).toBe(12)
   })
 
   it('creates all required tables', () => {
@@ -131,7 +131,7 @@ describe('DB creation', () => {
     store2.close()
     // Reassign so afterEach does not double-close
     store = createConvoyStore(dbPath)
-    expect(row.user_version).toBe(11)
+    expect(row.user_version).toBe(12)
   })
 })
 
@@ -208,8 +208,8 @@ describe('schema migration', () => {
     verifyDb.close()
 
     expect(cols.map(c => c.name)).toContain('adapter')
-    // v1 chains through v2→v3→v4→...→v7→v8→v9→v10→v11 in one init, so final version is 11
-    expect(version.user_version).toBe(11)
+    // v1 chains through v2→v3→v4→...→v7→v8→v9→v10→v11→v12 in one init, so final version is 12
+    expect(version.user_version).toBe(12)
   })
 
   it('schema migration v2 to v3 adds cost columns', () => {
@@ -295,7 +295,7 @@ describe('schema migration', () => {
     expect(convoyColNames).toContain('total_tokens')
     expect(convoyColNames).toContain('total_cost_usd')
 
-    expect(version.user_version).toBe(11)
+    expect(version.user_version).toBe(12)
   })
 
   it('schema migration v1 to v3 chains correctly in a single init', () => {
@@ -381,7 +381,7 @@ describe('schema migration', () => {
     expect(convoyColNames).toContain('total_tokens')
     expect(convoyColNames).toContain('total_cost_usd')
 
-    expect(version.user_version).toBe(11)
+    expect(version.user_version).toBe(12)
   })
 
   it('schema migration v3 to v4 creates pipeline table and adds pipeline_id to convoy', () => {
@@ -464,7 +464,7 @@ describe('schema migration', () => {
 
     expect(convoyCols.map(c => c.name)).toContain('pipeline_id')
     expect(tables.map(t => t.name)).toContain('pipeline')
-    expect(version.user_version).toBe(11)
+    expect(version.user_version).toBe(12)
   })
 })
 
@@ -580,6 +580,20 @@ describe('task CRUD', () => {
     expect(tasks[1].phase).toBe(1)
   })
 
+  it('allows same task ID in different convoys', () => {
+    store.insertConvoy(makeConvoy({ id: 'convoy-a' }))
+    store.insertConvoy(makeConvoy({ id: 'convoy-b' }))
+    store.insertTask(makeTask({ id: 'shared-task', convoy_id: 'convoy-a' }))
+    store.insertTask(makeTask({ id: 'shared-task', convoy_id: 'convoy-b' }))
+
+    const taskA = store.getTask('shared-task', 'convoy-a')
+    const taskB = store.getTask('shared-task', 'convoy-b')
+    expect(taskA).toBeDefined()
+    expect(taskB).toBeDefined()
+    expect(taskA!.convoy_id).toBe('convoy-a')
+    expect(taskB!.convoy_id).toBe('convoy-b')
+  })
+
   it('updates task status', () => {
     store.insertTask(makeTask())
     store.updateTaskStatus('task-1', 'convoy-1', 'running')
@@ -1444,7 +1458,7 @@ describe('schema migration v5 → v6', () => {
     v5Verify.close()
     migratedStore.close()
 
-    expect(row.user_version).toBe(11)
+    expect(row.user_version).toBe(12)
     expect(taskStepTable?.name).toBe('task_step')
     expect(convoy?.id).toBe('convoy-auto')
     expect(task?.id).toBe('task-auto')
@@ -1614,7 +1628,7 @@ describe('schema migration v6→v7 (drift detection columns)', () => {
 
     expect(cols.map(c => c.name)).toContain('drift_score')
     expect(cols.map(c => c.name)).toContain('drift_retried')
-    expect(version.user_version).toBe(11)
+    expect(version.user_version).toBe(12)
   })
 
   it('new databases include drift_score and drift_retried in CREATE TABLE', () => {
@@ -1846,10 +1860,9 @@ describe('migration full chain v4→v10', () => {
     migratedStore.close()
 
     const verifyDb = new DatabaseSync(chainDbPath)
-
-    // Verify user_version = 11
+    verifyDb.exec('PRAGMA foreign_keys = 0')
     const version = (verifyDb.prepare('PRAGMA user_version').get() as { user_version: number }).user_version
-    expect(version).toBe(11)
+    expect(version).toBe(12)
 
     // Verify all new tables exist
     const tables = (verifyDb.prepare("SELECT name FROM sqlite_master WHERE type='table'").all() as Array<{ name: string }>).map(t => t.name)
@@ -1884,7 +1897,7 @@ describe('migration full chain v4→v10', () => {
     const eventCount = (verifyDb.prepare('SELECT COUNT(*) AS cnt FROM event WHERE convoy_id = :id').get({ id: 'convoy-chain' }) as { cnt: number }).cnt
     expect(eventCount).toBe(1)
 
-    // Verify FK constraints work: insert a task_step referencing the seeded task_id
+    // Verify task_step table accepts inserts
     expect(() => {
       verifyDb.prepare(
         `INSERT INTO task_step (task_id, step_index, prompt, gates, status)
@@ -2528,7 +2541,7 @@ describe('v9→v10 migration', () => {
     // Verify version = 11
     const verifyDb = new DatabaseSync(migDb)
     const version = (verifyDb.prepare('PRAGMA user_version').get() as { user_version: number }).user_version
-    expect(version).toBe(11)
+    expect(version).toBe(12)
 
     // Verify new REAL columns exist
     const convoyCols = (verifyDb.prepare('PRAGMA table_info(convoy)').all() as Array<{ name: string }>).map(c => c.name)

package/src/cli/convoy/store.ts

@@ -17,7 +17,7 @@ import type {
   TaskStepRecord,
 } from './types.js'
 
-const SCHEMA_VERSION = 11
+const SCHEMA_VERSION = 12
 
 // ── Size limits (bytes) ────────────────────────────────────────────────────────
 const LIMIT_SPEC_YAML = 256 * 1024      // 256 KB
@@ -178,6 +178,7 @@ class ConvoyStoreImpl implements ConvoyStore {
   constructor(dbPath: string) {
     this.dbPath = dbPath
     this.db = new DatabaseSync(dbPath)
+    this.db.exec('PRAGMA foreign_keys = 0')
     this.db.exec('PRAGMA journal_mode = WAL')
     this.db.exec('PRAGMA synchronous = NORMAL')
     this.initSchema()
@@ -222,7 +223,7 @@ class ConvoyStoreImpl implements ConvoyStore {
         );
 
         CREATE TABLE IF NOT EXISTS task (
-          id          TEXT PRIMARY KEY,
+          id          TEXT NOT NULL,
           convoy_id   TEXT NOT NULL REFERENCES convoy(id),
           phase       INTEGER NOT NULL,
           prompt      TEXT NOT NULL,
@@ -265,7 +266,8 @@ class ConvoyStoreImpl implements ConvoyStore {
           outputs           TEXT,
           inputs            TEXT,
           discovered_issues TEXT,
-          contract_result   TEXT
+          contract_result   TEXT,
+          PRIMARY KEY (id, convoy_id)
         );
 
         CREATE UNIQUE INDEX IF NOT EXISTS idx_task_idempotency ON task(convoy_id, idempotency_key)
@@ -424,6 +426,10 @@ class ConvoyStoreImpl implements ConvoyStore {
       migrateSchema(this.db, this.dbPath, 10, 11)
       version = 11
     }
+    if (version === 11) {
+      migrateSchema(this.db, this.dbPath, 11, 12)
+      version = 12
+    }
   }
 
   insertConvoy(
@@ -1356,6 +1362,71 @@ export function migrateSchema(db: DatabaseSync, dbPath: string, fromVersion: num
           ALTER TABLE task ADD COLUMN compaction_count INTEGER NOT NULL DEFAULT 0;
         `)
       }
+      if (v === 11) {
+        db.exec(`
+          CREATE TABLE task_new (
+            id                TEXT NOT NULL,
+            convoy_id         TEXT NOT NULL REFERENCES convoy(id),
+            phase             INTEGER NOT NULL,
+            prompt            TEXT NOT NULL,
+            agent             TEXT NOT NULL DEFAULT 'developer',
+            adapter           TEXT,
+            model             TEXT,
+            timeout_ms        INTEGER NOT NULL DEFAULT 1800000,
+            status            TEXT NOT NULL DEFAULT 'pending',
+            worker_id         TEXT,
+            worktree          TEXT,
+            output            TEXT,
+            exit_code         INTEGER,
+            started_at        TEXT,
+            finished_at       TEXT,
+            retries           INTEGER NOT NULL DEFAULT 0,
+            max_retries       INTEGER NOT NULL DEFAULT 1,
+            files             TEXT,
+            depends_on        TEXT,
+            prompt_tokens     INTEGER,
+            completion_tokens INTEGER,
+            total_tokens      INTEGER,
+            cost_usd          TEXT,
+            cost_usd_num      REAL,
+            gates             TEXT,
+            on_exhausted      TEXT NOT NULL DEFAULT 'dlq',
+            injected          INTEGER NOT NULL DEFAULT 0,
+            provenance        TEXT,
+            idempotency_key   TEXT,
+            current_step      INTEGER,
+            total_steps       INTEGER,
+            review_level      TEXT,
+            review_verdict    TEXT,
+            review_tokens     INTEGER,
+            review_model      TEXT,
+            panel_attempts    INTEGER NOT NULL DEFAULT 0,
+            dispute_id        TEXT,
+            drift_score       REAL,
+            drift_retried     INTEGER NOT NULL DEFAULT 0,
+            compaction_count  INTEGER NOT NULL DEFAULT 0,
+            outputs           TEXT,
+            inputs            TEXT,
+            discovered_issues TEXT,
+            contract_result   TEXT,
+            PRIMARY KEY (id, convoy_id)
+          );
+          INSERT INTO task_new SELECT
+            id, convoy_id, phase, prompt, agent, adapter, model, timeout_ms,
+            status, worker_id, worktree, output, exit_code, started_at, finished_at,
+            retries, max_retries, files, depends_on, prompt_tokens, completion_tokens,
+            total_tokens, cost_usd, cost_usd_num, gates, on_exhausted, injected,
+            provenance, idempotency_key, current_step, total_steps, review_level,
+            review_verdict, review_tokens, review_model, panel_attempts, dispute_id,
+            drift_score, drift_retried, compaction_count, outputs, inputs,
+            discovered_issues, contract_result
+          FROM task;
+          DROP TABLE task;
+          ALTER TABLE task_new RENAME TO task;
+          CREATE UNIQUE INDEX IF NOT EXISTS idx_task_idempotency ON task(convoy_id, idempotency_key)
+            WHERE idempotency_key IS NOT NULL;
+        `)
+      }
       db.exec('COMMIT')
     } catch (err) {
       try { db.exec('ROLLBACK') } catch { /* ignore */ }

package/src/cli/run.ts

@@ -871,54 +871,6 @@ export default async function run({ args, pkgRoot }: CliContext): Promise<void>
     if (spec.branch) console.log(`  Branch: ${spec.branch}`)
     if (spec.gates?.length) console.log(`  Gates: ${spec.gates.length} validation commands`)
 
-    // ── Pre-flight: handle uncommitted changes before branch switch ──
-    let pipelineDidStash = false
-    if (spec.branch) {
-      const { execFile: execFileCb } = await import('node:child_process')
-      const { promisify } = await import('node:util')
-      const execFile = promisify(execFileCb)
-      let statusOut: string
-      try {
-        const result = await execFile('git', ['status', '--porcelain'], {
-          cwd: process.cwd(),
-        })
-        statusOut = result.stdout
-      } catch {
-        console.error(`  ✗ Git repository not found. A git repo is required when using the \`branch\` option.`)
-        console.error(`    Run \`git init\` to initialize a repository.`)
-        console.log(`\n  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-        process.exit(1)
-      }
-      // Untracked files (??) don't block branch checkout — ignore them
-      const trackedChanges = statusOut
-        .split('\n')
-        .filter(line => line.trim() && !line.startsWith('??'))
-        .join('\n')
-      if (trackedChanges) {
-        console.log(`\n  ${c.yellow('⚠')} Uncommitted changes detected.`)
-        const shouldStash = await confirm('Stash changes and continue?', true)
-        if (!shouldStash) {
-          console.log('  Aborted. Commit or stash your changes manually, then retry.')
-          console.log(`\n  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-          closePrompts()
-          process.exit(1)
-        }
-        try {
-          await execFile('git', ['stash', 'push', '-m', 'opencastle: auto-stash before pipeline'], {
-            cwd: process.cwd(),
-          })
-          pipelineDidStash = true
-          console.log(`  ${c.green('✓')} Changes stashed.`)
-        } catch {
-          console.log(`  ${c.yellow('⚠')} Could not stash changes automatically.`)
-          console.log(`  Commit or stash your changes manually, then resume:\n`)
-          console.log(`  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-          closePrompts()
-          process.exit(1)
-        }
-      }
-    }
-
     const { startDashboardServer } = await import('./dashboard.js')
     let pipelineDashboardResult: { server: import('node:http').Server; port: number; url: string } | null = null
     try {
@@ -953,17 +905,6 @@ export default async function run({ args, pkgRoot }: CliContext): Promise<void>
       throw err
     }
     printPipelineResult(pipelineResult)
-    if (pipelineDidStash) {
-      const { execFile: execFileCb } = await import('node:child_process')
-      const { promisify } = await import('node:util')
-      const execFile = promisify(execFileCb)
-      try {
-        await execFile('git', ['stash', 'pop'], { cwd: process.cwd() })
-        console.log(`  ${c.green('✓')} Stashed changes restored.`)
-      } catch {
-        console.log(`  ${c.yellow('⚠')} Could not restore stash automatically. Run \`git stash pop\` manually.`)
-      }
-    }
     if (pipelineDashboardResult) {
       console.log(`\n  ${c.dim('Results saved to .opencastle/convoy.db')}`)
       console.log(`  ${c.dim('Dashboard:')} ${pipelineDashboardResult.url}`)
@@ -996,54 +937,6 @@ export default async function run({ args, pkgRoot }: CliContext): Promise<void>
     if (spec.branch) console.log(`  Branch: ${spec.branch}`)
     if (spec.gates?.length) console.log(`  Gates: ${spec.gates.length} validation commands`)
 
-    // ── Pre-flight: handle uncommitted changes before branch switch ──
-    let didStash = false
-    if (spec.branch) {
-      const { execFile: execFileCb } = await import('node:child_process')
-      const { promisify } = await import('node:util')
-      const execFile = promisify(execFileCb)
-      let statusOut: string
-      try {
-        const result = await execFile('git', ['status', '--porcelain'], {
-          cwd: process.cwd(),
-        })
-        statusOut = result.stdout
-      } catch {
-        console.error(`  ✗ Git repository not found. A git repo is required when using the \`branch\` option.`)
-        console.error(`    Run \`git init\` to initialize a repository.`)
-        console.log(`\n  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-        process.exit(1)
-      }
-      // Untracked files (??) don't block branch checkout — ignore them
-      const trackedChanges = statusOut
-        .split('\n')
-        .filter(line => line.trim() && !line.startsWith('??'))
-        .join('\n')
-      if (trackedChanges) {
-        console.log(`\n  ${c.yellow('⚠')} Uncommitted changes detected.`)
-        const shouldStash = await confirm('Stash changes and continue?', true)
-        if (!shouldStash) {
-          console.log('  Aborted. Commit or stash your changes manually, then retry.')
-          console.log(`\n  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-          closePrompts()
-          process.exit(1)
-        }
-        try {
-          await execFile('git', ['stash', 'push', '-m', 'opencastle: auto-stash before convoy'], {
-            cwd: process.cwd(),
-          })
-          didStash = true
-          console.log(`  ${c.green('✓')} Changes stashed.`)
-        } catch {
-          console.log(`  ${c.yellow('⚠')} Could not stash changes automatically.`)
-          console.log(`  Commit or stash your changes manually, then resume:\n`)
-          console.log(`  ${c.dim('Resume:')} npx opencastle run -f ${opts.file}`)
-          closePrompts()
-          process.exit(1)
-        }
-      }
-    }
-
     const { startDashboardServer } = await import('./dashboard.js')
     let dashboardResult: { server: import('node:http').Server; port: number; url: string } | null = null
     try {
@@ -1095,17 +988,6 @@ export default async function run({ args, pkgRoot }: CliContext): Promise<void>
       throw err
     }
     printConvoyResult(result)
-    if (didStash) {
-      const { execFile: execFileCb } = await import('node:child_process')
-      const { promisify } = await import('node:util')
-      const execFile = promisify(execFileCb)
-      try {
-        await execFile('git', ['stash', 'pop'], { cwd: process.cwd() })
-        console.log(`  ${c.green('✓')} Stashed changes restored.`)
-      } catch {
-        console.log(`  ${c.yellow('⚠')} Could not restore stash automatically. Run \`git stash pop\` manually.`)
-      }
-    }
     if (dashboardResult) {
       console.log(`\n  ${c.dim('Results saved to .opencastle/convoy.db')}`)
       console.log(`  ${c.dim('Dashboard:')} ${dashboardResult.url}`)

package/src/dashboard/dist/data/convoys/demo-api-v2.json

@@ -51,21 +51,21 @@
       "name": "docs/api-v2-contract.json",
       "type": "json",
       "task_id": "api-t1",
-      "created_at": "2026-04-06T09:01:29.678Z"
+      "created_at": "2026-04-07T12:58:13.324Z"
     },
     {
       "id": "artifact-demo-api-v2-reports-security-gate-failure-md",
       "name": "reports/security-gate-failure.md",
       "type": "summary",
       "task_id": "api-t3",
-      "created_at": "2026-04-06T09:01:29.678Z"
+      "created_at": "2026-04-07T12:58:13.324Z"
     },
     {
       "id": "artifact-demo-api-v2-src-api-rate-limiter-ts",
       "name": "src/api/rate-limiter.ts",
       "type": "file",
       "task_id": "api-t2",
-      "created_at": "2026-04-06T09:01:29.678Z"
+      "created_at": "2026-04-07T12:58:13.324Z"
     }
   ],
   "has_more_events": false,

package/src/dashboard/dist/data/convoys/demo-auth-revamp.json

@@ -42,28 +42,28 @@
       "name": "libs/auth/src/jwt-middleware.ts",
       "type": "file",
       "task_id": "auth-t2",
-      "created_at": "2026-04-06T09:01:29.677Z"
+      "created_at": "2026-04-07T12:58:13.323Z"
     },
     {
       "id": "artifact-demo-auth-revamp-libs-auth-src-rls-policies-sql",
       "name": "libs/auth/src/rls-policies.sql",
       "type": "file",
       "task_id": "auth-t3",
-      "created_at": "2026-04-06T09:01:29.677Z"
-    },
-    {
-      "id": "artifact-demo-auth-revamp-reports-auth-review-summary-md",
-      "name": "reports/auth-review-summary.md",
-      "type": "summary",
-      "task_id": "auth-t5",
-      "created_at": "2026-04-06T09:01:29.677Z"
+      "created_at": "2026-04-07T12:58:13.323Z"
     },
     {
       "id": "artifact-demo-auth-revamp-tests-auth-integration-test-ts",
       "name": "tests/auth/integration.test.ts",
       "type": "file",
       "task_id": "auth-t4",
-      "created_at": "2026-04-06T09:01:29.677Z"
+      "created_at": "2026-04-07T12:58:13.323Z"
+    },
+    {
+      "id": "artifact-demo-auth-revamp-reports-auth-review-summary-md",
+      "name": "reports/auth-review-summary.md",
+      "type": "summary",
+      "task_id": "auth-t5",
+      "created_at": "2026-04-07T12:58:13.324Z"
     }
   ],
   "has_more_events": false,