@guilz-dev/belay 0.6.0 → 0.7.0

package/dist/core/capability/boundary-driver-container.js

@@ -1,9 +1,33 @@
 import { spawn } from 'node:child_process';
+import { randomUUID } from 'node:crypto';
 import { canonicalPath } from '../path-utils.js';
+import { runProcessWithBoundedOutput } from '../process-runner.js';
 import { dockerEnvArgs, dockerNetworkArgs, ensureBelayContainerNetwork } from './boundary-egress.js';
 import { materializeContainerBoundaryGrant } from './boundary-grant-materialize.js';
+import { BoundaryCleanupError, } from './boundary-run.js';
+import { buildWorkspaceMountSpec, resolveGuestWorkdir, workspaceMountEnvArgs, } from './boundary-workspace-mount.js';
 const ATTESTATION_TTL_MS = 15 * 60_000;
 const DEFAULT_IMAGE = 'alpine:3.20';
+const CONTAINER_CLEANUP_TIMEOUT_MS = 10_000;
+const CONTAINER_INSPECT_TIMEOUT_MS = 2_000;
+const CONTAINER_ABSENCE_ATTEMPTS = 10;
+const CONTAINER_ABSENCE_RETRY_MS = 100;
+function containerDoesNotExist(result) {
+    return /no such container/i.test(`${result.stderr ?? ''}\n${result.stdout ?? ''}`);
+}
+async function confirmContainerAbsent(containerName) {
+    for (let attempt = 0; attempt < CONTAINER_ABSENCE_ATTEMPTS; attempt += 1) {
+        const inspection = await runProcessWithBoundedOutput('docker', ['inspect', '--type', 'container', containerName], {}, CONTAINER_INSPECT_TIMEOUT_MS);
+        if (!inspection.timedOut && inspection.exitCode !== 0 && containerDoesNotExist(inspection)) {
+            return true;
+        }
+        if (inspection.timedOut || (inspection.exitCode !== 0 && !containerDoesNotExist(inspection))) {
+            return false;
+        }
+        await new Promise((resolve) => setTimeout(resolve, CONTAINER_ABSENCE_RETRY_MS));
+    }
+    return false;
+}
 export async function isDockerAvailable() {
     return new Promise((resolve) => {
         const child = spawn('docker', ['info'], { stdio: 'ignore' });
@@ -13,7 +37,12 @@ export async function isDockerAvailable() {
 }
 function containerAttestation(proxyEnv) {
     const probedAt = new Date().toISOString();
-    const signals = ['docker', 'container-driver', 'repo-mount-ro-default'];
+    const signals = [
+        'docker',
+        'container-driver',
+        'repo-mount-ro-default',
+        'workspace-mount-isolation',
+    ];
     if (Object.keys(proxyEnv).length > 0) {
         signals.push('egress-proxy-chokepoint');
     }
@@ -25,9 +54,12 @@ function containerAttestation(proxyEnv) {
         driver: 'container',
         probedAt,
         expiresAt: new Date(Date.now() + ATTESTATION_TTL_MS).toISOString(),
-        deniesUngrantedEffects: true,
-        materializesGrants: true,
-        probeSignals: signals,
+        // Mount and network classes are isolated, but exact grants are not yet
+        // passed to and enforced by the process runner.
+        deniesUngrantedEffects: false,
+        materializesGrants: false,
+        isolatesWorkspaceMounts: true,
+        probeSignals: [...signals, 'exact-grant-enforcement-unavailable'],
     };
 }
 function runDockerProbe(image) {
@@ -39,45 +71,80 @@ function runDockerProbe(image) {
         child.on('close', (code) => resolve(code === 0));
     });
 }
-function runInContainer(image, command, cwd, timeoutMs, proxyEnv, mountReadOnly, repoRoot) {
-    const mount = canonicalPath(cwd);
-    const mountSpec = mountReadOnly ? `${mount}:${mount}:ro` : `${mount}:${mount}`;
-    const proxyActive = Object.keys(proxyEnv).length > 0;
-    const networkArgs = dockerNetworkArgs(proxyActive, repoRoot);
-    const args = [
+export function buildContainerRunArgs(params) {
+    const proxyActive = Object.keys(params.proxyEnv).length > 0;
+    const networkArgs = dockerNetworkArgs(proxyActive, params.repoRoot);
+    const containerNameArgs = params.containerName ? ['--name', params.containerName] : [];
+    const workspaceMount = params.runOptions?.workspaceMount;
+    if (workspaceMount) {
+        if (!params.repoRoot) {
+            throw new Error('boundary_workspace_mount_missing_resource_root');
+        }
+        if (canonicalPath(workspaceMount.guestTargetRoot) !== canonicalPath(params.repoRoot)) {
+            throw new Error('boundary_workspace_mount_target_mismatch');
+        }
+        const workdir = resolveGuestWorkdir(workspaceMount);
+        if (canonicalPath(params.cwd) !== workdir) {
+            throw new Error('boundary_workspace_mount_cwd_mismatch');
+        }
+        return [
+            'run',
+            '--rm',
+            ...containerNameArgs,
+            ...networkArgs,
+            '--mount',
+            buildWorkspaceMountSpec(workspaceMount),
+            '-w',
+            workdir,
+            ...workspaceMountEnvArgs(workspaceMount),
+            ...dockerEnvArgs(params.proxyEnv),
+            params.image,
+            'sh',
+            '-c',
+            params.command,
+        ];
+    }
+    const mount = canonicalPath(params.cwd);
+    const mountSpec = params.mountReadOnly ? `${mount}:${mount}:ro` : `${mount}:${mount}`;
+    return [
         'run',
         '--rm',
+        ...containerNameArgs,
         ...networkArgs,
         '-v',
         mountSpec,
         '-w',
         mount,
-        ...dockerEnvArgs(proxyEnv),
-        image,
+        ...dockerEnvArgs(params.proxyEnv),
+        params.image,
         'sh',
         '-c',
-        command,
+        params.command,
     ];
-    return new Promise((resolve) => {
-        const child = spawn('docker', args, { stdio: 'ignore' });
-        let timedOut = false;
-        const timer = setTimeout(() => {
-            timedOut = true;
-            child.kill('SIGTERM');
-        }, timeoutMs);
-        child.on('error', () => {
-            clearTimeout(timer);
-            resolve({ exitCode: 1, signal: null, timedOut });
-        });
-        child.on('close', (exitCode, signal) => {
-            clearTimeout(timer);
-            resolve({
-                exitCode,
-                signal: signal ? String(signal) : null,
-                timedOut,
-            });
-        });
+}
+async function runInContainer(image, command, cwd, timeoutMs, proxyEnv, mountReadOnly, repoRoot, runOptions) {
+    const containerName = `belay-run-${randomUUID()}`;
+    const args = buildContainerRunArgs({
+        image,
+        command,
+        cwd,
+        proxyEnv,
+        mountReadOnly,
+        repoRoot,
+        runOptions,
+        containerName,
     });
+    const result = await runProcessWithBoundedOutput('docker', args, {}, timeoutMs);
+    if (result.timedOut) {
+        const cleanup = await runProcessWithBoundedOutput('docker', ['rm', '-f', containerName], {}, CONTAINER_CLEANUP_TIMEOUT_MS);
+        const cleanupFailed = cleanup.timedOut || cleanup.exitCode !== 0;
+        const absent = containerDoesNotExist(cleanup) ||
+            (cleanupFailed && (await confirmContainerAbsent(containerName)));
+        if (cleanupFailed && !absent) {
+            throw new BoundaryCleanupError('container', containerName);
+        }
+    }
+    return result;
 }
 export function createContainerBoundaryDriver(options = {}) {
     const image = options.image ?? DEFAULT_IMAGE;
@@ -102,12 +169,12 @@ export function createContainerBoundaryDriver(options = {}) {
             }
         },
         async run(command, cwd, timeoutMs, options) {
-            const mountReadOnly = options?.mountReadOnly !== false;
+            const mountReadOnly = options?.mountReadOnly !== false && !options?.workspaceMount;
             const proxyActive = Object.keys(proxyEnv).length > 0;
             if (proxyActive && repoRoot && !preparedNetwork) {
                 await ensureBelayContainerNetwork(repoRoot);
             }
-            return runInContainer(image, command, cwd, timeoutMs, proxyEnv, mountReadOnly, repoRoot);
+            return runInContainer(image, command, cwd, timeoutMs, proxyEnv, mountReadOnly, repoRoot, options);
         },
         materializeGrant(request, context) {
             return materializeContainerBoundaryGrant(request, {

package/dist/core/capability/boundary-driver.js

@@ -11,6 +11,7 @@ function hostIntegrationAttestation(driver) {
         expiresAt: new Date(Date.now() + ATTESTATION_TTL_MS).toISOString(),
         deniesUngrantedEffects: false,
         materializesGrants: false,
+        isolatesWorkspaceMounts: false,
         probeSignals: ['host-integration', 'l3-policy-only'],
     };
 }

package/dist/core/capability/boundary-grant-materialize.d.ts

@@ -11,3 +11,4 @@ export interface MaterializeBoundaryGrantParams {
     sensitivePaths?: string[];
 }
 export declare function materializeContainerBoundaryGrant(request: CapabilityRequestV1, params: MaterializeBoundaryGrantParams): CapabilityGrantV1 | null;
+export declare function materializeContainerBoundaryGrants(requests: readonly CapabilityRequestV1[], params: MaterializeBoundaryGrantParams): CapabilityGrantV1[];

package/dist/core/capability/boundary-grant-materialize.js

@@ -76,3 +76,18 @@ export function materializeContainerBoundaryGrant(request, params) {
     }
     return null;
 }
+export function materializeContainerBoundaryGrants(requests, params) {
+    const grants = [];
+    let existing = [...(params.existingGrants ?? [])];
+    for (const request of requests) {
+        const materialized = materializeContainerBoundaryGrant(request, {
+            ...params,
+            existingGrants: existing,
+        });
+        if (materialized) {
+            grants.push(materialized);
+            existing = [...existing, materialized];
+        }
+    }
+    return grants;
+}

package/dist/core/capability/boundary-run.d.ts

@@ -1,8 +1,33 @@
 import type { ShellRunResult } from '../transactional/git-worktree.js';
 import type { ClassifyResult } from '../types.js';
+export interface BoundaryCleanupFailure {
+    code: 'BOUNDARY_CLEANUP_UNCONFIRMED';
+    resourceKind: 'container';
+    resourceId: string;
+    executionStarted: true;
+    cleanupConfirmed: false;
+}
+export declare class BoundaryCleanupError extends Error implements BoundaryCleanupFailure {
+    readonly resourceKind: 'container';
+    readonly resourceId: string;
+    readonly code: "BOUNDARY_CLEANUP_UNCONFIRMED";
+    readonly executionStarted: true;
+    readonly cleanupConfirmed: false;
+    constructor(resourceKind: 'container', resourceId: string);
+}
+export declare function isBoundaryCleanupError(value: unknown): value is BoundaryCleanupFailure;
+export declare function safeBoundaryCleanupResourceId(value: unknown): string | undefined;
+export interface BoundaryWorkspaceMount {
+    hostSourceRoot: string;
+    guestTargetRoot: string;
+    cwdRelative: string;
+    writable: boolean;
+    hideHostSourcePath: boolean;
+}
 export interface BoundaryRunOptions {
     /** When true, container driver mounts the working directory read-only. */
     mountReadOnly?: boolean;
+    workspaceMount?: BoundaryWorkspaceMount;
 }
 export interface BoundaryPrepareContext {
     repoRoot?: string;

package/dist/core/capability/boundary-run.js

@@ -1,17 +1,45 @@
+const SAFE_CONTAINER_RESOURCE_ID = /^belay-run-[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/;
+export class BoundaryCleanupError extends Error {
+    resourceKind;
+    resourceId;
+    code = 'BOUNDARY_CLEANUP_UNCONFIRMED';
+    executionStarted = true;
+    cleanupConfirmed = false;
+    constructor(resourceKind, resourceId) {
+        super('Boundary cleanup could not be confirmed');
+        this.resourceKind = resourceKind;
+        this.resourceId = resourceId;
+        this.name = 'BoundaryCleanupError';
+    }
+}
+export function isBoundaryCleanupError(value) {
+    if (!value || typeof value !== 'object') {
+        return false;
+    }
+    const candidate = value;
+    return (candidate.code === 'BOUNDARY_CLEANUP_UNCONFIRMED' &&
+        candidate.resourceKind === 'container' &&
+        typeof candidate.resourceId === 'string' &&
+        candidate.executionStarted === true &&
+        candidate.cleanupConfirmed === false);
+}
+export function safeBoundaryCleanupResourceId(value) {
+    if (!isBoundaryCleanupError(value) || !SAFE_CONTAINER_RESOURCE_ID.test(value.resourceId)) {
+        return undefined;
+    }
+    return value.resourceId;
+}
 export function boundaryMountReadOnlyFromPrediction(predicted) {
     const effect = predicted.axes?.effect;
     if (effect === 'local_mutation' || effect === 'remote_mutation') {
         return false;
     }
-    const action = predicted.capabilityRequests?.[0]?.action;
-    if (action === 'fs.write' || action === 'git.ref.write' || action === 'control_plane.write') {
-        return false;
-    }
-    if (action === 'fs.read') {
-        return true;
-    }
-    if (action === 'network.connect' || action === 'process.exec' || action === 'indeterminate') {
-        return true;
+    for (const request of predicted.capabilityRequests ?? []) {
+        if (request.action === 'fs.write' ||
+            request.action === 'git.ref.write' ||
+            request.action === 'control_plane.write') {
+            return false;
+        }
     }
     return true;
 }

package/dist/core/capability/boundary-session.d.ts

@@ -12,6 +12,9 @@ export interface ResolvedBoundaryDriverContext {
     proxyActive: boolean;
     proxyEnv: Record<string, string>;
     prepareContext: BoundaryPrepareContext;
+    attestationPath: string;
+    attestation: BoundaryAttestation | null;
+    attestationFresh: boolean;
 }
 export declare function boundaryAttestationPath(repoRoot: string, config: BelayConfigV4): string;
 export declare function loadBoundaryAttestation(filePath: string, expectedRepoRoot?: string, controlPlaneDir?: string): Promise<BoundaryAttestation | null>;
@@ -53,5 +56,6 @@ export declare function runBoundaryAgentCommand(params: {
     command: string;
     cwd?: string;
     timeoutMs?: number;
+    runOptions?: BoundaryRunOptions;
 }): Promise<Awaited<ReturnType<BoundaryDriver['run']>>>;
 export { dockerNetworkArgs };

package/dist/core/capability/boundary-session.js

@@ -51,6 +51,9 @@ export function hostIntegrationBoundaryContext(repoRoot) {
             egressProxyActive: false,
             proxyEnv: {},
         },
+        attestationPath: '',
+        attestation: null,
+        attestationFresh: false,
     };
 }
 export async function resolveBoundaryDriverContext(params) {
@@ -74,6 +77,8 @@ export async function resolveBoundaryDriverContext(params) {
         egressProxyEnv: proxyEnv,
         repoRoot: params.repoRoot,
     });
+    const attestationPath = boundaryAttestationPath(params.repoRoot, params.config);
+    const attestation = await loadBoundaryAttestation(attestationPath, params.repoRoot, configuredControlPlaneDir(params.config));
     return {
         driver,
         driverId,
@@ -84,6 +89,9 @@ export async function resolveBoundaryDriverContext(params) {
             egressProxyActive: proxyActive,
             proxyEnv,
         },
+        attestationPath,
+        attestation,
+        attestationFresh: attestation ? isAttestationFresh(attestation) : false,
     };
 }
 export async function runWithBoundaryDriver(params) {
@@ -124,6 +132,7 @@ export async function runBoundaryAgentCommand(params) {
         command: params.command,
         cwd: params.cwd ?? params.repoRoot,
         timeoutMs: params.timeoutMs ?? 30 * 60_000,
+        runOptions: params.runOptions,
     });
 }
 export { dockerNetworkArgs };

package/dist/core/capability/boundary-workspace-mount.d.ts

@@ -0,0 +1,5 @@
+import type { BoundaryWorkspaceMount } from './boundary-run.js';
+export declare function validateWorkspaceMount(mount: BoundaryWorkspaceMount): void;
+export declare function resolveGuestWorkdir(mount: BoundaryWorkspaceMount): string;
+export declare function buildWorkspaceMountSpec(mount: BoundaryWorkspaceMount): string;
+export declare function workspaceMountEnvArgs(mount: BoundaryWorkspaceMount): string[];

package/dist/core/capability/boundary-workspace-mount.js

@@ -0,0 +1,68 @@
+import path from 'node:path';
+import { canonicalPath, pathWithinRoot } from '../path-utils.js';
+const HOST_PATH_ENV_VARS = [
+    'BELAY_EGRESS_REPO_ROOT',
+    'BELAY_JUDGE_BROKER_REPO_ROOT',
+    'BELAY_JUDGE_BROKER_STATE_DIR',
+    'BELAY_REPO_ROOT',
+];
+export function validateWorkspaceMount(mount) {
+    const hostSourceRoot = canonicalPath(mount.hostSourceRoot);
+    const guestTargetRoot = canonicalPath(mount.guestTargetRoot);
+    if (!hostSourceRoot || !guestTargetRoot) {
+        throw new Error('boundary_workspace_mount_invalid_root');
+    }
+    if (hostSourceRoot.includes(',') || guestTargetRoot.includes(',')) {
+        throw new Error('boundary_workspace_mount_invalid_root');
+    }
+    if (hostSourceRoot === guestTargetRoot) {
+        throw new Error('boundary_workspace_mount_source_equals_target');
+    }
+    if (pathWithinRoot(hostSourceRoot, guestTargetRoot)) {
+        throw new Error('boundary_workspace_mount_source_contains_target');
+    }
+    if (mount.cwdRelative.includes('\0')) {
+        throw new Error('boundary_workspace_mount_invalid_cwd');
+    }
+    const normalizedRelative = path.posix.normalize(mount.cwdRelative.replace(/\\/g, '/'));
+    if (normalizedRelative === '..' || normalizedRelative.startsWith('../')) {
+        throw new Error('boundary_workspace_mount_invalid_cwd');
+    }
+    if (path.posix.isAbsolute(normalizedRelative)) {
+        throw new Error('boundary_workspace_mount_invalid_cwd');
+    }
+}
+export function resolveGuestWorkdir(mount) {
+    validateWorkspaceMount(mount);
+    const guestTargetRoot = canonicalPath(mount.guestTargetRoot);
+    const normalizedRelative = path.posix.normalize(mount.cwdRelative.replace(/\\/g, '/'));
+    if (normalizedRelative === '.' || normalizedRelative === '') {
+        return guestTargetRoot;
+    }
+    const segments = normalizedRelative.split('/').filter(Boolean);
+    return path.posix.join(guestTargetRoot, ...segments);
+}
+export function buildWorkspaceMountSpec(mount) {
+    validateWorkspaceMount(mount);
+    const hostSourceRoot = canonicalPath(mount.hostSourceRoot);
+    const guestTargetRoot = canonicalPath(mount.guestTargetRoot);
+    const readonly = mount.writable ? '' : ',readonly';
+    return `type=bind,src=${hostSourceRoot},dst=${guestTargetRoot}${readonly}`;
+}
+export function workspaceMountEnvArgs(mount) {
+    const workdir = resolveGuestWorkdir(mount);
+    if (!mount.hideHostSourcePath) {
+        return ['-e', `PWD=${workdir}`];
+    }
+    const guestTargetRoot = canonicalPath(mount.guestTargetRoot);
+    const hostSourceRoot = canonicalPath(mount.hostSourceRoot);
+    const args = [];
+    for (const key of HOST_PATH_ENV_VARS) {
+        args.push('-e', `${key}=`);
+    }
+    args.push('-e', `PWD=${workdir}`, '-e', `OLDPWD=${workdir}`, '-e', `BELAY_REPO_ROOT=${guestTargetRoot}`);
+    if (hostSourceRoot !== guestTargetRoot) {
+        args.push('-e', `BELAY_EGRESS_REPO_ROOT=${guestTargetRoot}`);
+    }
+    return args;
+}

package/dist/core/capability/gate-policy-shadow.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import { belayStateDir } from '../config.js';
+import { effectPlanAuditFields } from '../effect-ir/audit.js';
 import { buildTier1Prompt } from '../verdict/judge.js';
 import { normalizeJudgeRuntimeConfig } from '../verdict/judge-runtime-config.js';
 import { judgeShadowAuditFields, recordShadowComparison, shouldRunShadowComparison, triggerJudgeSessionKillSwitch, } from '../verdict/judge-shadow.js';
@@ -7,7 +8,16 @@ import { evaluateWithJudgeTransport } from '../verdict/judge-transport.js';
 import { recordPolicyJudgeComparison } from './gate-shadow-ratchet.js';
 export { recordGateApprovalAsk } from './gate-shadow-ratchet.js';
 export function capabilityDecisionAuditFields(result) {
-    const fields = {};
+    const fields = {
+        ...effectPlanAuditFields(result.effectPlan, {
+            capabilityRequests: result.capabilityRequests,
+            decisions: result.effectPlanPolicyDecisions,
+            authorizationDecision: result.authorizationDecision,
+        }),
+        executionRoute: 'downstream_host',
+        enforcementStatus: 'prediction_only',
+        boundaryEnforcement: 'prediction_only',
+    };
     if (result.capabilityRequests?.length) {
         fields.capabilityRequestCount = result.capabilityRequests.length;
         fields.capabilityActions = result.capabilityRequests.map((request) => request.action);
@@ -19,6 +29,18 @@ export function capabilityDecisionAuditFields(result) {
             fields.policyMatchedRule = result.authorizationDecision.matchedRule;
         }
     }
+    const decisions = result.effectPlanPolicyDecisions ?? [];
+    if (decisions.length > 0 &&
+        decisions.every((decision) => decision.matchedRule === 'boundary.verified')) {
+        fields.authorizationMode = 'boundary_policy';
+    }
+    else if (decisions.length > 0 &&
+        decisions.every((decision) => decision.matchedRule === 'grant.exact')) {
+        fields.authorizationMode = 'exact_grant';
+    }
+    else {
+        fields.authorizationMode = result.authorizationDecision ? 'policy_decision' : 'none';
+    }
     if (result.boundaryProfile) {
         fields.boundaryProfile = result.boundaryProfile;
     }

package/dist/core/capability/grant-consumption.d.ts

@@ -0,0 +1,4 @@
+import type { ClassifyResult } from '../types.js';
+export declare function capabilityGrantLeaseRequired(result: Pick<ClassifyResult, 'reason' | 'authorizationDecision'>): boolean;
+/** Fail closed when a grant lease is required but capability requests are missing. */
+export declare function canConsumeCapabilityGrantLease(result: ClassifyResult): boolean;

package/dist/core/capability/grant-consumption.js

@@ -0,0 +1,11 @@
+export function capabilityGrantLeaseRequired(result) {
+    return (result.reason === 'capability_grant' ||
+        result.authorizationDecision?.matchedRule === 'grant.exact');
+}
+/** Fail closed when a grant lease is required but capability requests are missing. */
+export function canConsumeCapabilityGrantLease(result) {
+    if (!capabilityGrantLeaseRequired(result)) {
+        return true;
+    }
+    return (result.capabilityRequests?.length ?? 0) > 0;
+}

package/dist/core/capability/grant-lease.d.ts

@@ -1,9 +1,44 @@
-import type { ApprovalStateFile } from '../types.js';
+import type { ApprovalRecord, ApprovalStateFile } from '../types.js';
 import type { CapabilityGrantV1 } from './grant.js';
 import type { CapabilityRequestV1 } from './request.js';
+export type GrantBundleValidationFailureReason = 'legacy_record' | 'empty_requests' | 'cardinality_mismatch' | 'grant_scope_too_broad' | 'grant_inactive' | 'grant_mismatch';
+export type GrantBundleValidationResult = {
+    ok: true;
+    approval: ApprovalRecord;
+} | {
+    ok: false;
+    reason: GrantBundleValidationFailureReason;
+};
+export declare function grantsFromApproval(approval: {
+    grant?: CapabilityGrantV1;
+    grants?: CapabilityGrantV1[];
+}): CapabilityGrantV1[];
+export declare function approvalGrantBundleExhausted(approval: {
+    grant?: CapabilityGrantV1;
+    grants?: CapabilityGrantV1[];
+}): boolean;
+export declare function consumeApprovalGrantBundle(approval: ApprovalRecord, requests: readonly CapabilityRequestV1[]): {
+    approval: ApprovalRecord;
+    consumed: boolean;
+};
+/** Validate and consume a marked exact bundle without mutating on any failure. */
+export declare function validateAndConsumeGrantBundle(approval: ApprovalRecord, requests: readonly CapabilityRequestV1[], now?: number): GrantBundleValidationResult;
+/** Revalidate a marked bundle during an active replay lease without consuming it twice. */
+export declare function validateGrantBundleForLeaseReuse(approval: ApprovalRecord, requests: readonly CapabilityRequestV1[], now?: number): GrantBundleValidationResult;
+/** Consume every grant in an approved record after fingerprint/hash replay validation. */
+export declare function consumeApprovedRecordGrantBundle(approval: ApprovalRecord): {
+    approval: ApprovalRecord;
+    consumed: boolean;
+};
+export declare function decrementApprovalLegacyGrant(approval: ApprovalRecord): ApprovalRecord;
 export declare function grantsFromApprovedState(state: ApprovalStateFile, repoRoot: string): CapabilityGrantV1[];
 export declare function consumeGrantLease(state: ApprovalStateFile, grantId: string): {
     state: ApprovalStateFile;
     consumed: boolean;
 };
+/** Consume one lease for each request; all must succeed (atomic bundle consumption). */
+export declare function consumeGrantLeasesForRequests(state: ApprovalStateFile, requests: CapabilityRequestV1[]): {
+    state: ApprovalStateFile;
+    consumed: boolean;
+};
 export declare function findMatchingGrant(grants: CapabilityGrantV1[] | undefined, request: CapabilityRequestV1): CapabilityGrantV1 | undefined;