@straiffi/archon 1.11.8 → 1.11.10

package/dist/server/lib/agentProvider.js

@@ -1,5 +1,9 @@
 import { markRetryableOpenCodeDatabaseLock, retryOpenCodeDatabaseLocks } from './opencodeExecutionReliability.js';
+import { getAbortReason, observeChildProcessClose, OneShotCancellationTerminationError, terminateOneShotProcess, } from './oneShotCancellation.js';
 const runOneShotAgentOnce = (agentProvider, executionProvider, request, executionContext) => {
+    if (request.signal?.aborted) {
+        return Promise.reject(getAbortReason(request.signal));
+    }
     const invocation = agentProvider.buildInvocation(request);
     return new Promise((resolve, reject) => {
         let handle;
@@ -25,20 +29,54 @@ const runOneShotAgentOnce = (agentProvider, executionProvider, request, executio
         const stdoutChunks = [];
         const stderrChunks = [];
         let settled = false;
-        handle.child.stdout?.on('data', chunk => stdoutChunks.push(Buffer.from(chunk)));
-        handle.child.stderr?.on('data', chunk => stderrChunks.push(Buffer.from(chunk)));
-        void handle.placementFailure.then(failure => {
-            if (!failure || settled) {
+        let cancellationRequested = false;
+        const childClose = request.signal ? observeChildProcessClose(handle.child) : null;
+        const onStdoutData = (chunk) => stdoutChunks.push(Buffer.from(chunk));
+        const onStderrData = (chunk) => stderrChunks.push(Buffer.from(chunk));
+        const cleanup = () => {
+            request.signal?.removeEventListener('abort', onAbort);
+            handle.child.stdout?.removeListener?.('data', onStdoutData);
+            handle.child.stderr?.removeListener?.('data', onStderrData);
+            handle.child.removeListener?.('close', onClose);
+            handle.child.removeListener?.('error', onError);
+            childClose?.dispose();
+        };
+        const rejectOnce = (error) => {
+            if (settled || cancellationRequested) {
                 return;
             }
             settled = true;
-            reject(agentProvider.classifyExecutionFailure(failure));
-        });
-        handle.child.on('close', code => {
-            if (settled) {
+            cleanup();
+            reject(error);
+        };
+        const onAbort = () => {
+            if (settled || cancellationRequested) {
+                return;
+            }
+            cancellationRequested = true;
+            const reason = getAbortReason(request.signal);
+            void terminateOneShotProcess(handle.interrupt, childClose.promise).then(() => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                cleanup();
+                reject(reason);
+            }, error => {
+                if (settled) {
+                    return;
+                }
+                settled = true;
+                cleanup();
+                reject(new OneShotCancellationTerminationError(reason, { cause: error }));
+            });
+        };
+        const onClose = (code) => {
+            if (settled || cancellationRequested) {
                 return;
             }
             settled = true;
+            cleanup();
             const stderr = Buffer.concat(stderrChunks).toString().trim();
             const result = agentProvider.interpretOneShotOutput(Buffer.concat(stdoutChunks).toString(), stderr);
             if (result.error) {
@@ -56,18 +94,27 @@ const runOneShotAgentOnce = (agentProvider, executionProvider, request, executio
             reject(request.retryOpenCodeDatabaseLocks && stdoutChunks.length === 0
                 ? markRetryableOpenCodeDatabaseLock(error)
                 : error);
-        });
-        handle.child.on('error', error => {
-            if (settled) {
-                return;
+        };
+        const onError = (error) => rejectOnce(agentProvider.classifyExecutionFailure(error));
+        handle.child.stdout?.on('data', onStdoutData);
+        handle.child.stderr?.on('data', onStderrData);
+        handle.child.on('close', onClose);
+        handle.child.on('error', onError);
+        request.signal?.addEventListener('abort', onAbort, { once: true });
+        if (request.signal?.aborted) {
+            onAbort();
+        }
+        void handle.placementFailure.then(failure => {
+            if (failure) {
+                rejectOnce(agentProvider.classifyExecutionFailure(failure));
             }
-            settled = true;
-            reject(agentProvider.classifyExecutionFailure(error));
         });
     });
 };
 export const runOneShotAgent = (agentProvider, executionProvider, request, executionContext) => {
     const run = () => runOneShotAgentOnce(agentProvider, executionProvider, request, executionContext);
-    return request.retryOpenCodeDatabaseLocks ? retryOpenCodeDatabaseLocks(run) : run();
+    return request.retryOpenCodeDatabaseLocks
+        ? retryOpenCodeDatabaseLocks(run, { signal: request.signal })
+        : run();
 };
 //# sourceMappingURL=agentProvider.js.map

package/dist/server/lib/agentProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentProvider.js","sourceRoot":"","sources":["../../../server/lib/agentProvider.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agentProvider.js","sourceRoot":"","sources":["../../../server/lib/agentProvider.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/bundleCleanupManagement.js

@@ -0,0 +1,181 @@
+import { randomUUID } from 'crypto';
+import db from '../db.js';
+import { recoverStaleBundleDeletionClaims } from './bundleDeletion.js';
+import { getBundleDeletionJob } from './bundleDeletionStore.js';
+import { createDefaultDockerSandboxAdapter, inspectionMatches, resolveExpectedDockerSandbox } from './executionEnvironmentTargetCleanup.js';
+import { translateServerMessage } from './i18n/index.js';
+export class BundleCleanupConflict extends Error {
+}
+const requireJob = (projectId, bundleId) => {
+    const job = getBundleDeletionJob(projectId, bundleId);
+    if (!job) {
+        throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.notFound'));
+    }
+    return job;
+};
+const environmentRows = (job) => db.prepare('SELECT * FROM execution_environments WHERE project_id = ? AND target_key = ?')
+    .all(job.project_id, job.target_key);
+const assertIdle = (job) => {
+    if (job.claim_id) {
+        throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.active'));
+    }
+    const busy = db.prepare(`SELECT 1 FROM execution_environments environment
+    WHERE project_id = ? AND target_key = ? AND (operation_claim_id IS NOT NULL OR cleanup_claim_id IS NOT NULL
+      OR EXISTS (SELECT 1 FROM execution_environment_run_bindings binding
+        WHERE binding.environment_id = environment.id AND binding.project_id = environment.project_id AND binding.released_at IS NULL)) LIMIT 1`)
+        .get(job.project_id, job.target_key);
+    if (busy) {
+        throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.resourcesBusy'));
+    }
+};
+const remainingResources = (job, rows = environmentRows(job)) => {
+    if (job.status === 'abandoned') {
+        return JSON.parse(job.resources_json);
+    }
+    if (job.status === 'completed') {
+        return [];
+    }
+    const resources = rows.filter(row => row.lifecycle_state !== 'retired').map(row => ({
+        kind: 'sandbox', name: row.external_id ?? row.id, state: row.lifecycle_state,
+    }));
+    if (job.phase === 'sandboxes' || job.phase === 'worktree') {
+        resources.push({ kind: 'worktree', name: job.workspace_path });
+    }
+    resources.push({ kind: 'branch', name: job.branch });
+    return resources;
+};
+export const serializeBundleCleanup = (job) => ({
+    bundle_id: job.bundle_id, project_id: job.project_id, project_name: job.project_name,
+    branch: job.branch, workspace_path: job.workspace_path, phase: job.phase, status: job.status,
+    attempts: job.attempts, retry_at: job.retry_at, last_error: job.last_error, failure_code: job.failure_code,
+    quarantined: Boolean(job.quarantined), active: Boolean(job.claim_id),
+    is_archived: !db.prepare('SELECT 1 FROM projects WHERE id = ?').get(job.project_id),
+    remaining_resources: remainingResources(job),
+});
+export const listBundleCleanups = (projectId) => db.prepare(`SELECT * FROM bundle_deletion_jobs job
+  WHERE project_id = ? OR (status = 'abandoned' AND NOT EXISTS (SELECT 1 FROM projects WHERE id = job.project_id))
+  ORDER BY created_at DESC`).all(projectId).map(serializeBundleCleanup);
+export const retryBundleCleanup = (projectId, bundleId) => {
+    recoverStaleBundleDeletionClaims();
+    return db.transaction(() => {
+        const job = requireJob(projectId, bundleId);
+        assertIdle(job);
+        if (!['pending', 'blocked'].includes(job.status) || !db.prepare('SELECT 1 FROM projects WHERE id = ? AND deletion_started_at IS NULL').get(projectId)) {
+            throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.retryNotAllowed'));
+        }
+        db.prepare(`UPDATE bundle_deletion_jobs SET status = 'pending', retry_attempts = 0, retry_at = NULL,
+      failure_code = NULL, last_error = NULL WHERE bundle_id = ? AND project_id = ?`).run(bundleId, projectId);
+        return requireJob(projectId, bundleId);
+    }).immediate();
+};
+const withManagementClaim = async (projectId, bundleId, status, action) => {
+    recoverStaleBundleDeletionClaims();
+    const claimId = randomUUID();
+    const job = db.transaction(() => {
+        const current = requireJob(projectId, bundleId);
+        assertIdle(current);
+        if (status === 'abandoned' ? current.status !== 'abandoned' : !['pending', 'blocked'].includes(current.status)) {
+            throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.statusChanged'));
+        }
+        db.prepare('UPDATE bundle_deletion_jobs SET claim_id = ?, claimed_at = ? WHERE bundle_id = ? AND project_id = ?')
+            .run(claimId, new Date().toISOString(), bundleId, projectId);
+        return current;
+    }).immediate();
+    const heartbeat = setInterval(() => {
+        db.prepare('UPDATE bundle_deletion_jobs SET claimed_at = ? WHERE bundle_id = ? AND claim_id = ?')
+            .run(new Date().toISOString(), bundleId, claimId);
+    }, 30_000);
+    heartbeat.unref();
+    try {
+        await action(job, claimId);
+    }
+    finally {
+        clearInterval(heartbeat);
+        db.prepare('UPDATE bundle_deletion_jobs SET claim_id = NULL, claimed_at = NULL WHERE bundle_id = ? AND claim_id = ?')
+            .run(bundleId, claimId);
+    }
+    return requireJob(projectId, bundleId);
+};
+const verifyStoppedOrAbsent = async (rows, adapter) => {
+    const resources = [];
+    let safe = true;
+    for (const row of rows.filter(row => row.lifecycle_state !== 'retired')) {
+        let state = 'unverified';
+        try {
+            const expected = resolveExpectedDockerSandbox(row);
+            const observed = await adapter.inspect(expected.name, { timeoutMs: 10_000 });
+            if (!observed) {
+                state = 'absent';
+            }
+            else if (inspectionMatches(expected, observed)) {
+                state = observed.state;
+            }
+        }
+        catch {
+            // Failed observation is not termination proof and must preserve quarantine.
+        }
+        if (state !== 'absent' && state !== 'stopped') {
+            safe = false;
+        }
+        resources.push({ kind: 'sandbox', name: row.external_id ?? row.id, state });
+    }
+    return { safe, resources };
+};
+export const abandonBundleCleanup = (projectId, bundleId, adapter = createDefaultDockerSandboxAdapter()) => withManagementClaim(projectId, bundleId, 'pending', async (job, claimId) => {
+    const rows = environmentRows(job);
+    const proof = await verifyStoppedOrAbsent(rows, adapter);
+    return db.transaction(() => {
+        const current = requireJob(projectId, bundleId);
+        if (current.claim_id !== claimId || current.status !== job.status) {
+            throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.claimLost'));
+        }
+        const snapshot = rows.map(row => ({ environment: row,
+            events: db.prepare('SELECT * FROM execution_environment_events WHERE project_id = ? AND environment_id = ?').all(projectId, row.id),
+            bindings: db.prepare('SELECT * FROM execution_environment_run_bindings WHERE project_id = ? AND environment_id = ?').all(projectId, row.id),
+        }));
+        const resources = [...proof.resources, ...remainingResources(job, []).filter(resource => resource.kind !== 'sandbox')];
+        db.prepare(`UPDATE bundle_deletion_jobs SET status = 'abandoned', retry_at = NULL, abandoned_at = ?,
+        quarantined = ?, resources_json = ?, environment_snapshot_json = ? WHERE bundle_id = ? AND claim_id = ?`)
+            .run(new Date().toISOString(), proof.safe ? 0 : 1, JSON.stringify(resources), JSON.stringify(snapshot), bundleId, claimId);
+        if (!proof.safe) {
+            for (const path of new Set([job.workspace_path, ...rows.filter(row => row.lifecycle_state !== 'retired').map(row => row.target_workspace_path)])) {
+                db.prepare('INSERT OR IGNORE INTO bundle_cleanup_quarantines (bundle_id, workspace_path, repo_path, branch) VALUES (?, ?, ?, ?)')
+                    .run(bundleId, path, job.repo_path, job.branch);
+            }
+        }
+        return requireJob(projectId, bundleId);
+    }).immediate();
+});
+export const releaseBundleCleanupQuarantine = (projectId, bundleId, adapter = createDefaultDockerSandboxAdapter()) => withManagementClaim(projectId, bundleId, 'abandoned', async (job, claimId) => {
+    let snapshots;
+    try {
+        const parsed = JSON.parse(job.environment_snapshot_json);
+        const states = ['queued', 'preparing', 'ready', 'running', 'stopped', 'retiring', 'cleanup_pending', 'retired', 'failed', 'unavailable'];
+        if (!Array.isArray(parsed) || (job.quarantined && parsed.length === 0)
+            || !parsed.every(item => item && typeof item === 'object' && item.environment
+                && item.environment.project_id === job.project_id && item.environment.target_key === job.target_key
+                && typeof item.environment.id === 'string' && typeof item.environment.target_workspace_path === 'string'
+                && states.includes(item.environment.lifecycle_state))) {
+            throw new Error('Invalid archived ownership evidence');
+        }
+        snapshots = parsed;
+    }
+    catch {
+        throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.archiveUnverified'));
+    }
+    const proof = await verifyStoppedOrAbsent(snapshots.map(snapshot => snapshot.environment), adapter);
+    if (!proof.safe) {
+        throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.terminationUnverified'));
+    }
+    return db.transaction(() => {
+        if (requireJob(projectId, bundleId).claim_id !== claimId) {
+            throw new BundleCleanupConflict(translateServerMessage('bundleCleanup.claimLost'));
+        }
+        db.prepare('DELETE FROM bundle_cleanup_quarantines WHERE bundle_id = ?').run(bundleId);
+        const resources = [...proof.resources, ...remainingResources(job).filter(resource => resource.kind !== 'sandbox')];
+        db.prepare('UPDATE bundle_deletion_jobs SET quarantined = 0, resources_json = ? WHERE bundle_id = ? AND claim_id = ?')
+            .run(JSON.stringify(resources), bundleId, claimId);
+        return requireJob(projectId, bundleId);
+    }).immediate();
+});
+//# sourceMappingURL=bundleCleanupManagement.js.map

package/dist/server/lib/bundleCleanupManagement.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundleCleanupManagement.js","sourceRoot":"","sources":["../../../server/lib/bundleCleanupManagement.ts"],"names":[],"mappings":"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"}

package/dist/server/lib/bundleCleanupRoutes.js

@@ -0,0 +1,36 @@
+import { abandonBundleCleanup, BundleCleanupConflict, listBundleCleanups, releaseBundleCleanupQuarantine, retryBundleCleanup, serializeBundleCleanup } from './bundleCleanupManagement.js';
+import { attemptBundleDeletion } from './bundleDeletion.js';
+export const registerBundleCleanupRoutes = (app) => {
+    const projectId = (req) => typeof req.query.project_id === 'string' ? req.query.project_id : '';
+    app.get('/bundle-cleanups', (req, res) => {
+        if (!projectId(req)) {
+            return res.status(400).json({ error: 'project_id is required' });
+        }
+        return res.json({ jobs: listBundleCleanups(projectId(req)) });
+    });
+    const actions = {
+        retry: async (projectId, bundleId) => {
+            retryBundleCleanup(projectId, bundleId);
+            return (await attemptBundleDeletion(projectId, bundleId));
+        },
+        abandon: abandonBundleCleanup,
+        'release-quarantine': releaseBundleCleanupQuarantine,
+    };
+    for (const [action, perform] of Object.entries(actions)) {
+        app.post(`/bundle-cleanups/:id/${action}`, async (req, res) => {
+            if (!projectId(req)) {
+                return res.status(400).json({ error: 'project_id is required' });
+            }
+            try {
+                return res.json({ job: serializeBundleCleanup(await perform(projectId(req), req.params.id)) });
+            }
+            catch (error) {
+                if (error instanceof BundleCleanupConflict) {
+                    return res.status(409).json({ error: error.message });
+                }
+                throw error;
+            }
+        });
+    }
+};
+//# sourceMappingURL=bundleCleanupRoutes.js.map

package/dist/server/lib/bundleCleanupRoutes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bundleCleanupRoutes.js","sourceRoot":"","sources":["../../../server/lib/bundleCleanupRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAA;AAC1L,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,GAAY,EAAE,EAAE;IAC1D,MAAM,SAAS,GAAG,CAAC,GAAY,EAAE,EAAE,CAAC,OAAO,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAA;IACxG,GAAG,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACvC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;YACpB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAA;QAClE,CAAC;QACD,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,kBAAkB,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAA;IAC/D,CAAC,CAAC,CAAA;IACF,MAAM,OAAO,GAAG;QACd,KAAK,EAAE,KAAK,EAAE,SAAiB,EAAE,QAAgB,EAAE,EAAE;YACnD,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;YACvC,OAAO,CAAC,MAAM,qBAAqB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAE,CAAA;QAC5D,CAAC;QACD,OAAO,EAAE,oBAAoB;QAC7B,oBAAoB,EAAE,8BAA8B;KACrD,CAAA;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACxD,GAAG,CAAC,IAAI,CAAC,wBAAwB,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAC5D,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;gBACpB,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAA;YAClE,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,sBAAsB,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;YAChG,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,qBAAqB,EAAE,CAAC;oBAC3C,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;gBACvD,CAAC;gBACD,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}

package/dist/server/lib/bundleDeletion.js

@@ -0,0 +1,257 @@
+import { randomUUID } from 'crypto';
+import { resolve } from 'path';
+import db from '../db.js';
+import { getBundleDeletionJob } from './bundleDeletionStore.js';
+import { deleteBundleBranch, deleteOwnedBundleWorktree } from './bundleWorktreeCleanup.js';
+import { DockerSandboxCollisionFailure, SbxContractFailure } from './dockerSandboxExecutionEnvironment.js';
+import { cleanupExecutionEnvironmentsForTarget } from './executionEnvironmentReconciliation.js';
+import { requestExecutionEnvironmentRetirement } from './executionEnvironments.js';
+import { createExecutionTargetKey } from './executionTargets.js';
+import { resolveWorktreePath } from './git.js';
+import { countBundleTickets, deleteBundle, getBundle, isProjectRootBundle } from './tickets.js';
+export class BundleDeletionConflict extends Error {
+}
+export const beginBundleDeletion = (input) => {
+    // Resolve before the transaction; every mutable condition is rechecked inside it.
+    const bundle = getBundle(input.bundleId, input.project.id);
+    const existing = getBundleDeletionJob(input.project.id, input.bundleId);
+    if (existing) {
+        return existing;
+    }
+    if (!bundle) {
+        throw new BundleDeletionConflict('Bundle not found');
+    }
+    const workspacePath = resolveWorktreePath(bundle.branch, input.project);
+    return db.transaction(() => {
+        const current = getBundle(input.bundleId, input.project.id);
+        const project = db.prepare('SELECT * FROM projects WHERE id = ?').get(input.project.id);
+        if (!current || !project || project.deletion_started_at || current.branch !== bundle.branch || project.repo_path !== input.project.repo_path) {
+            throw new BundleDeletionConflict('Bundle target changed before deletion could be accepted');
+        }
+        input.assertEligible();
+        if (isProjectRootBundle(current) || countBundleTickets(current.id, project.id) > 0
+            || (project.active_target_kind === 'bundle' && project.active_target_bundle_id === current.id)) {
+            throw new BundleDeletionConflict('Bundle is still in use');
+        }
+        const targetKey = createExecutionTargetKey(project.id, { kind: 'bundle-worktree', bundleId: current.id, branch: current.branch });
+        const busy = db.prepare(`SELECT 1 FROM execution_environments environment
+      WHERE environment.project_id = ? AND environment.target_key = ? AND (
+        environment.operation_claim_id IS NOT NULL OR environment.cleanup_claim_id IS NOT NULL
+        OR EXISTS (SELECT 1 FROM execution_environment_run_bindings binding
+          WHERE binding.environment_id = environment.id AND binding.project_id = environment.project_id AND binding.released_at IS NULL))
+      LIMIT 1`).get(project.id, targetKey);
+        if (busy) {
+            throw new BundleDeletionConflict('Bundle execution environment is still in use');
+        }
+        db.prepare(`INSERT INTO bundle_deletion_jobs
+      (bundle_id, project_id, project_name, target_key, repo_path, branch, workspace_path, created_at)
+      VALUES (?, ?, ?, ?, ?, ?, ?, ?)`).run(current.id, project.id, project.name, targetKey, project.repo_path, current.branch, workspacePath, new Date().toISOString());
+        const environments = db.prepare(`SELECT id FROM execution_environments
+      WHERE project_id = ? AND target_key = ? AND lifecycle_state <> 'retired'`).all(project.id, targetKey);
+        for (const environment of environments) {
+            requestExecutionEnvironmentRetirement({ projectId: project.id, environmentId: environment.id });
+        }
+        deleteBundle(current.id, project.id);
+        return getBundleDeletionJob(project.id, current.id);
+    }).immediate();
+};
+const defaults = {
+    cleanup: cleanupExecutionEnvironmentsForTarget,
+    removeWorktree: deleteOwnedBundleWorktree,
+    removeBranch: deleteBundleBranch,
+};
+const inFlight = new Map();
+const CLAIM_TTL_MS = 5 * 60_000;
+const MAX_AUTOMATIC_ATTEMPTS = 8;
+const permanentFailureCode = (error, visited = new Set()) => {
+    if (!(error instanceof Error) || visited.has(error)) {
+        return null;
+    }
+    visited.add(error);
+    if (error instanceof DockerSandboxCollisionFailure) {
+        return 'ownership_mismatch';
+    }
+    if (error instanceof SbxContractFailure && !/^sbx \S+ exited with code \d+/.test(error.message)) {
+        return 'sandbox_contract';
+    }
+    if (/identity changed|incomplete.*ownership|ownership.*incomplete|Refusing to remove a repository root workspace|no longer a registered worktree|Bundle cleanup requires a branch, repository/i.test(error.message)) {
+        return 'ownership_mismatch';
+    }
+    const causes = error instanceof AggregateError ? [...error.errors, error.cause] : [error.cause];
+    for (const cause of causes) {
+        const code = permanentFailureCode(cause, visited);
+        if (code) {
+            return code;
+        }
+    }
+    return null;
+};
+export const recoverStaleBundleDeletionClaims = () => {
+    const cutoff = new Date(Date.now() - CLAIM_TTL_MS).toISOString();
+    const jobs = db.prepare(`SELECT * FROM bundle_deletion_jobs
+    WHERE status IN ('pending', 'blocked', 'abandoned') AND claim_id IS NOT NULL AND claimed_at < ?`)
+        .all(cutoff);
+    let recovered = 0;
+    for (const job of jobs) {
+        if (inFlight.has(`${job.project_id}:${job.bundle_id}`)) {
+            continue;
+        }
+        recovered += db.transaction(() => {
+            const freshEnvironment = db.prepare(`SELECT 1 FROM execution_environments
+        WHERE cleanup_claim_id = ? AND (cleanup_claimed_at IS NULL OR cleanup_claimed_at >= ?) LIMIT 1`)
+                .get(job.claim_id, cutoff);
+            if (freshEnvironment) {
+                return 0;
+            }
+            const result = db.prepare(`UPDATE bundle_deletion_jobs SET claim_id = NULL, claimed_at = NULL
+        WHERE bundle_id = ? AND project_id = ? AND claim_id = ? AND claimed_at < ?
+          AND status IN ('pending', 'blocked', 'abandoned')`)
+                .run(job.bundle_id, job.project_id, job.claim_id, cutoff);
+            if (result.changes === 1) {
+                db.prepare(`UPDATE execution_environments SET cleanup_claim_id = NULL, cleanup_claimed_at = NULL
+          WHERE project_id = ? AND target_key = ? AND cleanup_claim_id = ? AND cleanup_claimed_at < ?`)
+                    .run(job.project_id, job.target_key, job.claim_id, cutoff);
+            }
+            return result.changes;
+        }).immediate();
+    }
+    // Legacy environment operations may predate target reservation. Recover only
+    // expired, unbound ownership, never abandoned archives or fresh job claims.
+    db.prepare(`UPDATE execution_environments SET operation_claim_id = NULL, operation_kind = NULL, operation_claimed_at = NULL
+    WHERE operation_claimed_at < ? AND NOT EXISTS (
+      SELECT 1 FROM execution_environment_run_bindings binding WHERE binding.environment_id = execution_environments.id
+        AND binding.project_id = execution_environments.project_id AND binding.released_at IS NULL)
+      AND EXISTS (SELECT 1 FROM bundle_deletion_jobs job WHERE job.project_id = execution_environments.project_id
+        AND job.target_key = execution_environments.target_key AND job.status IN ('pending', 'blocked')
+        AND (job.claim_id IS NULL OR job.claimed_at < ?))`).run(cutoff, cutoff);
+    return recovered;
+};
+const runClaimedJob = async (job, dependencies) => {
+    db.prepare(`UPDATE bundle_deletion_jobs SET status = 'blocked', retry_at = NULL, failure_code = 'retry_exhausted'
+    WHERE bundle_id = ? AND status = 'pending' AND phase <> 'completed' AND claim_id IS NULL AND retry_attempts >= ?`)
+        .run(job.bundle_id, MAX_AUTOMATIC_ATTEMPTS);
+    const claimId = randomUUID();
+    const claimed = db.prepare(`UPDATE bundle_deletion_jobs SET claim_id = ?, claimed_at = ?, attempts = attempts + 1,
+      retry_attempts = retry_attempts + 1
+    WHERE bundle_id = ? AND status = 'pending' AND phase <> 'completed' AND retry_attempts < ? AND claim_id IS NULL
+      AND (retry_at IS NULL OR retry_at <= ?)`).run(claimId, new Date().toISOString(), job.bundle_id, MAX_AUTOMATIC_ATTEMPTS, new Date().toISOString());
+    if (claimed.changes !== 1) {
+        return getBundleDeletionJob(job.project_id, job.bundle_id);
+    }
+    const heartbeat = setInterval(() => {
+        const now = new Date().toISOString();
+        db.transaction(() => {
+            const result = db.prepare("UPDATE bundle_deletion_jobs SET claimed_at = ? WHERE bundle_id = ? AND claim_id = ? AND status = 'pending'")
+                .run(now, job.bundle_id, claimId);
+            if (result.changes === 1) {
+                db.prepare('UPDATE execution_environments SET cleanup_claimed_at = ? WHERE project_id = ? AND target_key = ? AND cleanup_claim_id = ?')
+                    .run(now, job.project_id, job.target_key, claimId);
+            }
+        }).immediate();
+    }, 30_000);
+    heartbeat.unref();
+    const advance = (phase) => {
+        const result = db.prepare(`UPDATE bundle_deletion_jobs SET phase = ?, status = ?, retry_at = NULL,
+      last_error = NULL, failure_code = NULL WHERE bundle_id = ? AND claim_id = ? AND status = 'pending'`)
+            .run(phase, phase === 'completed' ? 'completed' : 'pending', job.bundle_id, claimId);
+        if (result.changes !== 1) {
+            throw new Error('Bundle deletion claim was lost');
+        }
+        job.phase = phase;
+    };
+    try {
+        const requireOwnedProject = () => {
+            const project = db.prepare('SELECT * FROM projects WHERE id = ?').get(job.project_id);
+            if (!project || project.repo_path !== job.repo_path) {
+                throw new Error('Bundle deletion repository identity changed');
+            }
+            if (project.deletion_started_at) {
+                throw new Error('Project deletion is already cleaning this workspace');
+            }
+            const current = getBundleDeletionJob(job.project_id, job.bundle_id);
+            if (current?.claim_id !== claimId || current.status !== 'pending') {
+                throw new Error('Bundle deletion claim was lost');
+            }
+            return project;
+        };
+        requireOwnedProject();
+        if (job.phase === 'sandboxes') {
+            requireOwnedProject();
+            await dependencies.cleanup({ projectId: job.project_id, targetKind: 'bundle-worktree', targetKey: job.target_key,
+                claimId, commandOptions: { timeoutMs: 10_000 } });
+            advance('worktree');
+        }
+        if (job.phase === 'worktree') {
+            if (resolve(job.workspace_path) === resolve(job.repo_path)) {
+                throw new Error('Bundle deletion workspace identity changed');
+            }
+            await dependencies.removeWorktree(job.branch, requireOwnedProject(), job.workspace_path);
+            advance('branch');
+        }
+        if (job.phase === 'branch') {
+            const result = await dependencies.removeBranch(job.branch, requireOwnedProject());
+            if (result === 'failed') {
+                throw new Error('Bundle branch cleanup failed');
+            }
+            const warning = result === 'unmerged' ? `Git branch "${job.branch}" was kept because it contains commits that are not merged into its base branch.`
+                : result === 'checked-out' ? `Git branch "${job.branch}" was kept because it is still checked out in another worktree.` : null;
+            requireOwnedProject();
+            db.prepare("UPDATE bundle_deletion_jobs SET branch_warning = ?, completed_at = ? WHERE bundle_id = ? AND claim_id = ? AND status = 'pending'")
+                .run(warning, new Date().toISOString(), job.bundle_id, claimId);
+            advance('completed');
+        }
+    }
+    catch (error) {
+        const attempts = getBundleDeletionJob(job.project_id, job.bundle_id)?.retry_attempts ?? 1;
+        const delay = Math.min(15 * 60_000, 5_000 * 2 ** Math.min(8, attempts - 1));
+        const permanentCode = permanentFailureCode(error);
+        const blocked = permanentCode !== null || attempts >= MAX_AUTOMATIC_ATTEMPTS;
+        db.prepare(`UPDATE bundle_deletion_jobs SET status = ?, retry_at = ?, last_error = ?, failure_code = ?
+      WHERE bundle_id = ? AND claim_id = ? AND status = 'pending'`)
+            .run(blocked ? 'blocked' : 'pending', blocked ? null : new Date(Date.now() + delay).toISOString(), (error instanceof Error ? error.message : String(error)).slice(0, 4000), permanentCode ?? (blocked ? 'retry_exhausted' : 'transient'), job.bundle_id, claimId);
+    }
+    finally {
+        clearInterval(heartbeat);
+        db.prepare('UPDATE bundle_deletion_jobs SET claim_id = NULL, claimed_at = NULL WHERE bundle_id = ? AND claim_id = ?').run(job.bundle_id, claimId);
+    }
+    return getBundleDeletionJob(job.project_id, job.bundle_id);
+};
+export const runBundleDeletionJob = (projectId, bundleId, dependencies = defaults) => {
+    const key = `${projectId}:${bundleId}`;
+    const running = inFlight.get(key);
+    if (running) {
+        return running;
+    }
+    const job = getBundleDeletionJob(projectId, bundleId);
+    if (!job || job.status !== 'pending' || job.phase === 'completed') {
+        return Promise.resolve(job);
+    }
+    recoverStaleBundleDeletionClaims();
+    const promise = runClaimedJob(job, dependencies).finally(() => inFlight.delete(key));
+    inFlight.set(key, promise);
+    return promise;
+};
+export const attemptBundleDeletion = async (projectId, bundleId) => {
+    let timer;
+    try {
+        return await Promise.race([
+            runBundleDeletionJob(projectId, bundleId),
+            new Promise(resolve => {
+                timer = setTimeout(() => resolve(getBundleDeletionJob(projectId, bundleId)), 1_000);
+            }),
+        ]);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+};
+export const resumeBundleDeletions = async () => {
+    recoverStaleBundleDeletionClaims();
+    const jobs = db.prepare(`SELECT bundle_id, project_id FROM bundle_deletion_jobs
+    WHERE status = 'pending' AND phase <> 'completed' AND (retry_at IS NULL OR retry_at <= ?)
+    ORDER BY created_at LIMIT 20`).all(new Date().toISOString());
+    for (const job of jobs) {
+        await runBundleDeletionJob(job.project_id, job.bundle_id);
+    }
+};
+//# sourceMappingURL=bundleDeletion.js.map