specrails-desktop 2.36.0 → 2.42.2

package/server/dist/rail-pr-store.js

@@ -29,6 +29,7 @@ exports.toPrDeliverySnapshot = toPrDeliverySnapshot;
 exports.toRailPrStateMessage = toRailPrStateMessage;
 exports.toPrDecisionCardEnvelope = toPrDecisionCardEnvelope;
 const ids_1 = require("./ids");
+const multi_repo_execution_store_1 = require("./multi-repo-execution-store");
 /** Defensive per-ticket cap; contract-layer specs run long but bounded. */
 const SPEC_SNAPSHOT_DESCRIPTION_CAP = 32_768;
 function boundSpecSnapshot(entries) {
@@ -85,11 +86,11 @@ function createPrDelivery(db, input) {
        loop_name, origin_surface, origin_conversation_id,
        implementation_outcome, delivery_outcome, status_code,
        is_continuation, supersedes_delivery_id, spec_snapshot,
-       revision_note, revision_of
+       revision_note, revision_of, parent_delivery_id, repository_id, repository_path
      ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 'running', 'pending',
-       'implementation_running', ?, ?, ?, ?, ?)`).run(id, input.railIndex, input.loopId ?? null, input.railKey, JSON.stringify(input.ticketIds), input.baseBranch, input.loopName, input.originSurface, input.originConversationId ?? null, input.isContinuation ? 1 : 0, input.supersedesDeliveryId ?? null, input.specSnapshot && input.specSnapshot.length > 0
+       'implementation_running', ?, ?, ?, ?, ?, ?, ?, ?)`).run(id, input.railIndex, input.loopId ?? null, input.railKey, JSON.stringify(input.ticketIds), input.baseBranch, input.loopName, input.originSurface, input.originConversationId ?? null, input.isContinuation ? 1 : 0, input.supersedesDeliveryId ?? null, input.specSnapshot && input.specSnapshot.length > 0
         ? JSON.stringify(boundSpecSnapshot(input.specSnapshot))
-        : null, input.revisionNote ? boundRevisionNote(input.revisionNote) : null, input.revisionOf ?? null);
+        : null, input.revisionNote ? boundRevisionNote(input.revisionNote) : null, input.revisionOf ?? null, input.parentDeliveryId ?? null, input.repositoryId ?? null, input.repositoryPath ?? null);
     return getPrDelivery(db, id);
 }
 class PrDeliveryGenerationConflict extends Error {
@@ -119,6 +120,12 @@ END`;
  * not merely a router convention. Pass null for a genuinely fresh launch. */
 function createPrDeliveryGeneration(db, input, expectedActive) {
     return db.transaction(() => {
+        if (input.parentDeliveryId) {
+            const parent = getPrDelivery(db, input.parentDeliveryId);
+            if (!parent || parent.decision !== 'building' || parent.parent_delivery_id)
+                throw new PrDeliveryGenerationConflict(parent?.id ?? null);
+            return { delivery: createPrDelivery(db, input), superseded: null };
+        }
         const current = getActivePrDeliveryByRail(db, input.railIndex);
         if (expectedActive === null) {
             if (current)
@@ -189,7 +196,7 @@ function getPrDelivery(db, id) {
 function getActivePrDeliveryByRail(db, railIndex) {
     return db
         .prepare(`SELECT * FROM rail_pr_deliveries
-       WHERE rail_index = ? AND decision NOT IN ('completed','merged','discarded','superseded')
+       WHERE parent_delivery_id IS NULL AND rail_index = ? AND decision NOT IN ('completed','merged','discarded','superseded')
        ORDER BY created_at DESC, rowid DESC LIMIT 1`)
         .get(railIndex);
 }
@@ -197,7 +204,7 @@ function getActivePrDeliveryByRail(db, railIndex) {
 function listActivePrDeliveries(db) {
     return db
         .prepare(`SELECT * FROM rail_pr_deliveries
-       WHERE decision NOT IN ('completed','merged','discarded','superseded')
+       WHERE parent_delivery_id IS NULL AND decision NOT IN ('completed','merged','discarded','superseded')
        ORDER BY rail_index, created_at DESC, rowid DESC`)
         .all();
 }
@@ -207,7 +214,7 @@ function listActivePrDeliveries(db) {
 function listTerminalPrDeliveries(db) {
     return db
         .prepare(`SELECT * FROM rail_pr_deliveries
-       WHERE decision IN ('completed','merged','discarded','superseded')
+       WHERE parent_delivery_id IS NULL AND decision IN ('completed','merged','discarded','superseded')
        ORDER BY created_at DESC, rowid DESC`)
         .all();
 }
@@ -253,10 +260,12 @@ function listOriginLinkedPrDeliveries(db) {
  */
 function reconcileFailedBuildingPrDeliveries(db, opts = {}) {
     const rows = db
-        .prepare(`SELECT * FROM rail_pr_deliveries WHERE decision = 'building' ORDER BY created_at ASC, rowid ASC`)
+        .prepare(`SELECT * FROM rail_pr_deliveries WHERE decision = 'building' AND (execution_manifest IS NULL OR parent_delivery_id IS NOT NULL) ORDER BY created_at ASC, rowid ASC`)
         .all();
     const reconciled = [];
     for (const row of rows) {
+        if (opts.repositoryPath && (row.repository_path ?? opts.legacyRepositoryPath) !== opts.repositoryPath)
+            continue;
         const runIds = parseJsonArray(row.run_ids ?? '[]');
         if (runIds.length === 0) {
             if (!opts.startup)
@@ -310,9 +319,9 @@ function reconcileFailedBuildingPrDeliveries(db, opts = {}) {
         const worktrees = db.prepare(`
       SELECT id, ticket_id, run_id, branch, merge_state
         FROM rail_worktrees
-       WHERE run_id IN (${placeholdersForWorktrees})
+       WHERE run_id IN (${placeholdersForWorktrees}) AND repository_id IS ?
        ORDER BY created_at ASC, rowid ASC
-    `).all(...uniqueRunIds);
+    `).all(...uniqueRunIds, row.repository_id ?? null);
         const reconstructed = worktrees.map((worktree) => {
             const implementationSucceeded = worktree.run_id != null && successfulRunIds.has(worktree.run_id);
             const deliveryReady = implementationSucceeded && ['built', 'released'].includes(worktree.merge_state);
@@ -360,6 +369,8 @@ function reconcileFailedBuildingPrDeliveries(db, opts = {}) {
 // them to prevent any future caller injecting SQL via an object key (values
 // are always parameterized). Mirrors loop-runs-store's COUNTER_COLUMNS.
 const PATCH_COLUMNS = {
+    executionManifest: 'execution_manifest',
+    repositoryDeliveries: 'repository_deliveries',
     branch: 'branch',
     prUrl: 'pr_url',
     prNumber: 'pr_number',
@@ -393,7 +404,7 @@ function patchValue(key, patch) {
         return raw == null ? null : boundPrDiagnostic(String(raw));
     if (key === 'isContinuation')
         return raw ? 1 : 0;
-    if (key === 'settleEvidence')
+    if (key === 'settleEvidence' || key === 'executionManifest' || key === 'repositoryDeliveries')
         return raw == null ? null : JSON.stringify(raw);
     return raw;
 }
@@ -549,6 +560,7 @@ function parseJsonArray(raw) {
 function toPrDeliverySnapshot(row) {
     const units = parseJsonArray(row.branches);
     return {
+        ...(row.execution_manifest ? { executionManifest: (0, multi_repo_execution_store_1.readExecutionManifest)(row.execution_manifest), repositoryDeliveries: parseJsonArray(row.repository_deliveries ?? '[]') } : {}),
         id: row.id,
         railIndex: row.rail_index,
         loopId: row.loop_id,
@@ -597,6 +609,7 @@ function toRailPrStateMessage(projectId, snap) {
         prDeliveryId: snap.id,
         railKey: snap.railKey,
         ticketIds: snap.ticketIds,
+        ...(snap.executionManifest ? { executionManifest: snap.executionManifest, repositoryDeliveries: snap.repositoryDeliveries } : {}),
         baseBranch: snap.baseBranch,
         branch: snap.branch,
         prUrl: snap.prUrl,
@@ -635,6 +648,7 @@ function toPrDecisionCardEnvelope(projectId, snap) {
         projectId,
         baseBranch: snap.baseBranch,
         ticketIds: snap.ticketIds,
+        ...(snap.executionManifest ? { executionManifest: snap.executionManifest, repositoryDeliveries: snap.repositoryDeliveries } : {}),
         decision: snap.decision,
         implementationOutcome: snap.implementationOutcome,
         deliveryOutcome: snap.deliveryOutcome,

package/server/dist/rail-worktree-release.js

@@ -37,6 +37,7 @@ exports.durableBranchHeads = durableBranchHeads;
 exports.durableOverlayCleanupEvidence = durableOverlayCleanupEvidence;
 exports.durableSettlementIgnoredPaths = durableSettlementIgnoredPaths;
 exports.releaseRailWorktrees = releaseRailWorktrees;
+const repo_lock_1 = require("./repo-lock");
 const rail_worktrees_store_1 = require("./rail-worktrees-store");
 const worktree_manager_1 = require("./worktree-manager");
 const path = __importStar(require("path"));
@@ -205,6 +206,23 @@ async function verifyReleaseEvidence(input, worktree) {
             if (uncovered.length > 0) {
                 return { failure: `the worktree contains ignored paths that appeared after settlement (${uncovered.slice(0, 3).join(', ')})`, overlayEntries: [] };
             }
+            // A snapshot records names, not bytes. Files under an existing ignored
+            // directory may have been edited or added since settlement. Git's
+            // non-force worktree removal still deletes ignored content, so preserve
+            // every authorized ignored root in the same lossless quarantine used
+            // for overlays before releasing the mount.
+            for (const ignoredPath of ignoredPaths) {
+                const relative = safeRelativeOverlayPath(ignoredPath.replace(/\/$/, ''));
+                if (!relative)
+                    return { failure: 'Git reported an unsafe ignored path', overlayEntries: [] };
+                const target = path.join(worktree.worktree_path, ...relative.split('/'));
+                if (!pathStillExists(target))
+                    continue;
+                const fingerprint = (0, worktree_overlay_1.fingerprintOverlayCleanupPath)(target);
+                if (!fingerprint)
+                    return { failure: `could not preserve ignored path ${relative}`, overlayEntries: [] };
+                overlayEntries.push({ path: relative, ...fingerprint });
+            }
         }
         const [head, branchRef] = await Promise.all([
             input.git.run(['rev-parse', '--verify', 'HEAD'], worktree.worktree_path),
@@ -352,6 +370,20 @@ async function releaseRailWorktrees(input) {
         const wt = (0, rail_worktrees_store_1.getRailWorktree)(input.db, wtId);
         if (!wt)
             continue;
+        if (wt.repository_path && (0, repo_lock_1.repositoryLockKey)(wt.repository_path) !== (0, repo_lock_1.repositoryLockKey)(input.repoDir)) {
+            warnings.push(`worktree ${wtId} belongs to a different repository; preserved`);
+            continue;
+        }
+        const recordRemoved = () => {
+            input.db.transaction(() => {
+                (0, rail_worktrees_store_1.updateRailWorktreeState)(input.db, wt.id, state);
+                // Revisions can borrow the same mount under a new ledger id. Once Git
+                // proves that mount removed, older records must not pin membership forever.
+                input.db.prepare(`UPDATE rail_worktrees SET merge_state = 'released', updated_at = datetime('now')
+          WHERE id <> ? AND worktree_path = ? AND repository_id IS ?
+            AND merge_state IN ('building','built','merging','needs-review')`).run(wt.id, wt.worktree_path, wt.repository_id ?? null);
+            })();
+        };
         // Successful removal already terminalized these rows. Re-running `git
         // worktree remove` against their now-missing paths turns ordinary Publish /
         // Poll / Discard follow-ups into false cleanup_incomplete warnings.
@@ -370,7 +402,7 @@ async function releaseRailWorktrees(input) {
                 await input.git.run(['worktree', 'prune'], input.repoDir);
             }
             catch { /* a leftover registration surfaces at checkout with git's own error */ }
-            (0, rail_worktrees_store_1.updateRailWorktreeState)(input.db, wt.id, state);
+            recordRemoved();
             continue;
         }
         if (evidence.failure) {
@@ -428,7 +460,7 @@ async function releaseRailWorktrees(input) {
             continue;
         }
         if (wt.merge_state === 'needs-review' || !(0, rail_worktrees_store_1.isTerminalMergeState)(wt.merge_state)) {
-            (0, rail_worktrees_store_1.updateRailWorktreeState)(input.db, wt.id, state);
+            recordRemoved();
         }
     }
     return warnings;

package/server/dist/rail-worktrees-store.js

@@ -17,8 +17,8 @@ function isTerminalMergeState(s) {
     return exports.TERMINAL_MERGE_STATES.has(s);
 }
 function createRailWorktree(db, input) {
-    db.prepare(`INSERT INTO rail_worktrees (id, rail_index, ticket_id, run_id, branch, worktree_path, overlay_path, merge_state)
-     VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(input.id, input.railIndex, input.ticketId, input.runId ?? null, input.branch, input.worktreePath, input.overlayPath ?? null, input.mergeState ?? 'building');
+    db.prepare(`INSERT INTO rail_worktrees (id, rail_index, ticket_id, run_id, branch, worktree_path, overlay_path, merge_state, repository_id, repository_path)
+     VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.id, input.railIndex, input.ticketId, input.runId ?? null, input.branch, input.worktreePath, input.overlayPath ?? null, input.mergeState ?? 'building', input.repositoryId ?? null, input.repositoryPath ?? null);
     return getRailWorktree(db, input.id);
 }
 function getRailWorktree(db, id) {
@@ -64,7 +64,7 @@ function listRailWorktreesForTicket(db, ticketId) {
 /** True when a prior rail allocation for this ticket used exactly this branch —
  *  i.e. an existing branch of that name is OURS to resume (partial work from a
  *  stopped run), not a foreign collision to suffix away from. */
-function railWorktreeBranchExistsForTicket(db, ticketId, branch) {
-    return (db.prepare('SELECT 1 FROM rail_worktrees WHERE ticket_id = ? AND branch = ? LIMIT 1').get(ticketId, branch) !==
+function railWorktreeBranchExistsForTicket(db, ticketId, branch, repositoryId) {
+    return (db.prepare('SELECT 1 FROM rail_worktrees WHERE ticket_id = ? AND branch = ? AND repository_id IS ? LIMIT 1').get(ticketId, branch, repositoryId ?? null) !==
         undefined);
 }