@codapult/guard 0.10.0 → 0.11.0

package/dist/core/verification/verify.js

@@ -1,13 +1,275 @@
+import { createHash } from 'node:crypto';
 import { execFileSync } from 'node:child_process';
+import { lstatSync, readFileSync, realpathSync } from 'node:fs';
 import { createRequire } from 'node:module';
+import { extname, relative, resolve, sep } from 'node:path';
 import {} from '../../adapters/command.js';
 import { runProjectAdapters, runProjectChecks, runWorkspaceProjectChecks, inspectProjectRuntime, } from '../../adapters/project-checks.js';
-import { loadGuardPolicyAtRevision, loadGuardWorkingTreePolicy, scanGuard, classifyGuardOutcome, validateGuardPolicy, } from '../guard.js';
+import { GUARD_DIR, GUARD_HISTORY_DIR, loadGuardPolicyAtRevision, loadGuardWorkingTreePolicy, scanGuard, classifyGuardOutcome, validateGuardPolicy, } from '../guard.js';
 import { analyzeProjectImpact } from '../analysis/impact.js';
 import { discoverProject } from '../discovery/discovery.js';
 import { finishGuardRun, recordGuardRunStage, startGuardRun, } from '../history/runs.js';
+import { auditGitHubActions } from './github-actions.js';
+import { readGuardGitHubContext } from './github-context.js';
 const require = createRequire(import.meta.url);
 const packageJson = require('../../../package.json');
+const DEFAULT_PROTECTED_PATHS = [
+    '.codapult/guard/**',
+    '.github/workflows/**',
+    'CODEOWNERS',
+    '.github/CODEOWNERS',
+    'package.json',
+    '**/package.json',
+    'pnpm-lock.yaml',
+    '**/pnpm-lock.yaml',
+    'yarn.lock',
+    '**/yarn.lock',
+    'package-lock.json',
+    '**/package-lock.json',
+    'npm-shrinkwrap.json',
+    '**/npm-shrinkwrap.json',
+    'bun.lock',
+    '**/bun.lock',
+    'bun.lockb',
+    '**/bun.lockb',
+    'pnpm-workspace.yaml',
+    '**/pnpm-workspace.yaml',
+    '.npmrc',
+    '**/.npmrc',
+    '.pnpmfile.cjs',
+    '**/.pnpmfile.cjs',
+    'pnpmfile.cjs',
+    '**/pnpmfile.cjs',
+    '.yarnrc',
+    '**/.yarnrc',
+    '.yarnrc.yml',
+    '**/.yarnrc.yml',
+    '.pnp.cjs',
+    '**/.pnp.cjs',
+    '.pnp.loader.mjs',
+    '**/.pnp.loader.mjs',
+    '.gitignore',
+    '.ignore',
+    '.dockerignore',
+    '.npmignore',
+    '.prettierignore',
+    '.eslintignore',
+    'eslint.config.*',
+    '.eslintrc*',
+    'biome.json',
+    'biome.jsonc',
+    '.biomeignore',
+    'prettier.config.*',
+    '.prettierrc*',
+    'tsconfig.json',
+    'vitest.config.*',
+    'jest.config.*',
+    'playwright.config.*',
+    'next.config.*',
+    'babel.config.*',
+    '.babelrc*',
+    'webpack.config.*',
+    'stylelint.config.*',
+    '.stylelintrc*',
+    'nyc.config.*',
+    'tsconfig*.json',
+];
+function matchesPathPattern(path, pattern) {
+    let expression = '^';
+    for (let index = 0; index < pattern.length; index += 1) {
+        const character = pattern[index];
+        if (character === '*' && pattern[index + 1] === '*') {
+            if (pattern[index + 2] === '/') {
+                expression += '(?:.*/)?';
+                index += 2;
+            }
+            else {
+                expression += '.*';
+                index += 1;
+            }
+        }
+        else if (character === '*')
+            expression += '[^/]*';
+        else if (character === '?')
+            expression += '[^/]';
+        else
+            expression += '.+^${}()|[]\\'.includes(character) ? `\\${character}` : character;
+    }
+    return new RegExp(`${expression}$`).test(path);
+}
+const SOURCE_EXTENSIONS = new Set([
+    '.js',
+    '.jsx',
+    '.ts',
+    '.tsx',
+    '.mts',
+    '.cts',
+    '.mjs',
+    '.cjs',
+    '.html',
+    '.md',
+    '.mdx',
+    '.py',
+    '.pyi',
+    '.sh',
+    '.vue',
+    '.svelte',
+]);
+const SUPPRESSION_COMMENT = /(?:\/\/|\/\*|\*|<!--|#)\s*(eslint-disable|@ts-ignore|@ts-nocheck|@ts-expect-error|biome-ignore|prettier-ignore|tslint:disable|stylelint-disable|standard:disable|svelte-ignore|noqa|nosec|type:\s*ignore|pragma:\s*no\s+cover|istanbul\s+ignore|c8\s+ignore)\b/i;
+function addedSuppressionMarkers(root, baseRef) {
+    if (!baseRef)
+        return undefined;
+    try {
+        const diffs = [
+            execFileSync('git', ['diff', '--no-ext-diff', '--unified=0', `${baseRef}...HEAD`], {
+                cwd: root,
+                stdio: 'pipe',
+                timeout: 5_000,
+                maxBuffer: 8_000_000,
+            }).toString(),
+            execFileSync('git', ['diff', '--no-ext-diff', '--unified=0', 'HEAD'], {
+                cwd: root,
+                stdio: 'pipe',
+                timeout: 5_000,
+                maxBuffer: 8_000_000,
+            }).toString(),
+        ];
+        const found = new Set();
+        for (const diff of diffs) {
+            let file = '';
+            for (const line of diff.split('\n')) {
+                if (line.startsWith('+++ "'))
+                    return undefined;
+                if (line.startsWith('+++ b/'))
+                    file = line.slice(6);
+                else if (line.startsWith('+') && !line.startsWith('+++')) {
+                    const extension = extname(file).toLowerCase();
+                    const match = SUPPRESSION_COMMENT.exec(line);
+                    if (file && SOURCE_EXTENSIONS.has(extension) && match?.[1]) {
+                        found.add(`${file}:${match[1].toLowerCase()}`);
+                    }
+                }
+            }
+        }
+        const untracked = execFileSync('git', ['ls-files', '--others', '--exclude-standard', '-z'], {
+            cwd: root,
+            stdio: 'pipe',
+            timeout: 5_000,
+            maxBuffer: 8_000_000,
+        })
+            .toString()
+            .split('\0')
+            .filter(Boolean);
+        const realRoot = realpathSync(root);
+        for (const file of untracked) {
+            if (!SOURCE_EXTENSIONS.has(extname(file).toLowerCase()))
+                continue;
+            const absolutePath = resolve(root, file);
+            const realFilePath = realpathSync(absolutePath);
+            const fileRelative = relative(realRoot, realFilePath);
+            if (fileRelative === '..' || fileRelative.startsWith(`..${sep}`))
+                return undefined;
+            const stats = lstatSync(absolutePath);
+            if (stats.isSymbolicLink() || !stats.isFile() || stats.size > 2_000_000)
+                return undefined;
+            const source = readFileSync(absolutePath, 'utf8');
+            if (source.includes('\0'))
+                continue;
+            for (const line of source.split('\n')) {
+                const match = SUPPRESSION_COMMENT.exec(line);
+                if (match?.[1])
+                    found.add(`${file}:${match[1].toLowerCase()}`);
+            }
+        }
+        return [...found].sort();
+    }
+    catch {
+        return undefined;
+    }
+}
+function isGeneratedGuardArtifact(path) {
+    const normalized = path.replaceAll('\\', '/');
+    return (normalized === `${GUARD_DIR}/cache.json` ||
+        normalized === GUARD_HISTORY_DIR ||
+        normalized.startsWith(`${GUARD_HISTORY_DIR}/`));
+}
+function gitPaths(root, commands) {
+    try {
+        const pathLists = commands.map((args) => execFileSync('git', args, {
+            cwd: root,
+            stdio: 'pipe',
+            timeout: 5_000,
+        }).toString());
+        return [...new Set(pathLists.flatMap((paths) => paths.split('\0')))]
+            .map((file) => file.replace(/\\/g, '/'))
+            .filter((file) => Boolean(file) && !isGeneratedGuardArtifact(file))
+            .sort();
+    }
+    catch {
+        return undefined;
+    }
+}
+function committedFilesSince(root, baseRef) {
+    if (!baseRef)
+        return undefined;
+    return gitPaths(root, [['diff', '--name-only', '-z', `${baseRef}...HEAD`]]);
+}
+function workingTreeChangedFiles(root) {
+    return gitPaths(root, [
+        ['diff', '--name-only', '-z', 'HEAD'],
+        ['ls-files', '--others', '--exclude-standard', '-z'],
+    ]);
+}
+function changedFilesSince(root, baseRef) {
+    if (!baseRef)
+        return undefined;
+    const committed = committedFilesSince(root, baseRef);
+    const workingTree = workingTreeChangedFiles(root);
+    if (!committed || !workingTree)
+        return undefined;
+    return [...new Set([...committed, ...workingTree])].sort();
+}
+function getPolicySurface(root, baseRef, configPaths = [], policySurfaceConfig) {
+    const baseChangedPaths = changedFilesSince(root, baseRef);
+    const changedPaths = baseChangedPaths ?? [];
+    const suppressionMarkers = addedSuppressionMarkers(root, baseRef);
+    const defaultEntries = DEFAULT_PROTECTED_PATHS.map((pattern) => ({
+        pattern,
+        kind: pattern.startsWith('.github/workflows/')
+            ? 'ci-workflow'
+            : pattern.startsWith('.codapult/guard/')
+                ? 'guard-policy'
+                : pattern.toLowerCase().includes('codeowners')
+                    ? 'ownership'
+                    : ['package.json', 'lock.yaml', 'lock.json', '.npmrc'].some((part) => pattern.includes(part))
+                        ? 'dependency-input'
+                        : pattern.includes('ignore')
+                            ? 'ignore-config'
+                            : 'tool-config',
+        severity: 'error',
+    }));
+    const entries = [
+        ...defaultEntries,
+        ...configPaths.map((pattern) => ({ pattern, kind: 'custom', severity: 'error' })),
+        ...(policySurfaceConfig?.paths ?? []).map((entry) => ({
+            ...entry,
+            severity: entry.severity ?? 'error',
+        })),
+    ];
+    const protectedPaths = [...new Set(entries.map((entry) => entry.pattern))].sort();
+    const changes = changedPaths.flatMap((path) => entries
+        .filter((entry) => matchesPathPattern(path, entry.pattern))
+        .map((entry) => ({ path, ...entry })));
+    const matched = [...new Set(changes.map((change) => change.path))].sort();
+    return {
+        protectedPaths,
+        changedPaths: matched,
+        changes,
+        suppressionMarkers: suppressionMarkers ?? [],
+        workflowChanged: matched.some((path) => path.startsWith('.github/workflows/')),
+        complete: baseChangedPaths !== undefined && suppressionMarkers !== undefined,
+    };
+}
 function buildRunPolicy(snapshot, base, changedFromBase, decisionIds = []) {
     return {
         ...(snapshot.revision !== undefined ? { revision: snapshot.revision } : {}),
@@ -18,13 +280,61 @@ function buildRunPolicy(snapshot, base, changedFromBase, decisionIds = []) {
         ...(decisionIds.length > 0 ? { decisionIds } : {}),
     };
 }
+function stripControlCharacters(value) {
+    let output = '';
+    for (const character of value) {
+        const code = character.charCodeAt(0);
+        output += code <= 0x1f || code === 0x7f ? ' ' : character;
+    }
+    return output;
+}
+function sanitizeCommand(command) {
+    return stripControlCharacters(command.slice(0, 2_000))
+        .replace(/-----BEGIN [A-Z ]+-----[\s\S]*?-----END [A-Z ]+-----/g, '[REDACTED PRIVATE KEY]')
+        .replace(/\b(?:sk_(?:live|test)_|pk_(?:live|test)_|AKIA|gh[pousr]_|github_pat_)[A-Za-z0-9_-]+/g, '[REDACTED TOKEN]')
+        .replace(new RegExp('((?:api[_-]?key|secret|token|password|authorization|database[_-]?url)\\s*[:=]\\s*)[^\\s,}]+', 'gi'), '$1[REDACTED]')
+        .replace(/(--(?:token|secret|password|api-key|authorization)(?:=|\s+))[^\s]+/gi, '$1[REDACTED]');
+}
+function sanitizeProjectChecks(results) {
+    return Object.fromEntries(Object.entries(results).map(([name, result]) => [
+        name,
+        { ...result, command: sanitizeCommand(result.command) },
+    ]));
+}
 function receiptCheck(result) {
+    const command = sanitizeCommand(result.command);
+    const args = command.trim().split(/\s+/).filter(Boolean).slice(1);
     return {
         status: result.status,
         exitCode: result.exitCode,
         durationMs: result.durationMs,
+        command,
+        args,
+        execution: result.status === 'not-configured'
+            ? 'not-configured'
+            : result.stderr.includes('Unsafe or empty project command rejected.')
+                ? 'rejected'
+                : 'attempted',
     };
 }
+function effectiveVerifierInvocation(options) {
+    const args = ['--tools=' + options.tools];
+    if (!options.projectChecks)
+        args.push('--no-project-checks');
+    if (options.checks.length > 0)
+        args.push(`--checks=${options.checks.join(',')}`);
+    if (options.strict)
+        args.push('--strict');
+    if (options.changedOnly)
+        args.push('--changed');
+    if (options.policyBase)
+        args.push(`--policy-base=${options.policyBase}`);
+    if (options.failOnPolicyChange)
+        args.push('--fail-on-policy-change');
+    if (options.failOnProtectedChanges)
+        args.push('--fail-on-protected-changes');
+    return { command: 'codapult-guard verify', args };
+}
 function resolveGitCommit(root, ref) {
     if (!ref)
         return undefined;
@@ -42,29 +352,88 @@ function resolveGitCommit(root, ref) {
         return undefined;
     }
 }
-function changedFilesSince(root, baseRef) {
-    if (!baseRef)
-        return undefined;
+function hasWorkingTreeChanges(root) {
     try {
-        return execFileSync('git', ['diff', '--name-only', `${baseRef}...HEAD`], {
+        return (execFileSync('git', ['status', '--porcelain', '-z'], {
             cwd: root,
             stdio: 'pipe',
             timeout: 5_000,
-        })
-            .toString()
-            .split('\n')
-            .map((file) => file.trim().replace(/\\/g, '/'))
-            .filter(Boolean)
-            .sort();
+        }).length > 0);
     }
     catch {
+        return true;
+    }
+}
+function sha256(bytes) {
+    return createHash('sha256').update(bytes).digest('hex');
+}
+function baseFileDigest(root, revisions, path) {
+    if (!path || path.startsWith('/') || path.split('/').includes('..'))
         return undefined;
+    for (const revision of revisions) {
+        try {
+            const content = execFileSync('git', ['show', `${revision}:${path}`], {
+                cwd: root,
+                stdio: 'pipe',
+                timeout: 5_000,
+                maxBuffer: 32_000_000,
+            });
+            return sha256(content);
+        }
+        catch {
+            // A deleted working-tree file may exist at HEAD even when absent from the base ref.
+        }
     }
+    return undefined;
+}
+function verificationScope(root, inventory, changedPaths, policy) {
+    const revisions = [resolveGitCommit(root, 'HEAD'), resolveGitCommit(root, policy.ref)].filter((revision) => revision !== undefined);
+    const paths = [
+        ...new Set([...inventory.map((file) => file.path), ...changedPaths]
+            .map((path) => path.replaceAll('\\', '/'))
+            .filter((path) => !isGeneratedGuardArtifact(path))),
+    ].sort();
+    let complete = true;
+    const files = paths.map((path) => {
+        try {
+            if (!path ||
+                path.startsWith('/') ||
+                /^[a-z]:\//i.test(path) ||
+                path.split('/').includes('..')) {
+                complete = false;
+                return { path, status: 'unavailable' };
+            }
+            const fullPath = resolve(root, path);
+            const stats = lstatSync(fullPath);
+            if (!stats.isFile() || stats.isSymbolicLink()) {
+                complete = false;
+                return { path, status: 'unavailable' };
+            }
+            return { path, status: 'present', sha256: sha256(readFileSync(fullPath)) };
+        }
+        catch {
+            const digest = baseFileDigest(root, revisions, path);
+            if (digest)
+                return { path, status: 'deleted', sha256: digest };
+            complete = false;
+            return { path, status: 'unavailable' };
+        }
+    });
+    const fingerprint = createHash('sha256')
+        .update(JSON.stringify({
+        algorithm: 'sha256',
+        policyFingerprint: policy.fingerprint,
+        tool: { name: '@codapult/guard', version: packageJson.version },
+        files,
+    }))
+        .digest('hex');
+    return { algorithm: 'sha256', fingerprint, complete, stable: true, files };
 }
-function buildVerificationReceipt(root, policy, impact, checks, workspaceChecks, adapters, architecture, contractIssues, stages) {
+function buildVerificationReceipt(root, policy, impact, checks, workspaceChecks, adapters, architecture, contractIssues, stages, policySurface, ciIntegrity, scope, requiredStages, incompleteStages, effectiveInvocation) {
+    const githubContext = readGuardGitHubContext(process.env.GITHUB_EVENT_NAME, process.env.GITHUB_EVENT_PATH, resolveGitCommit(root, 'HEAD'), process.env.GITHUB_SHA);
     const baseCommit = resolveGitCommit(root, policy.ref);
-    const baseChangedFiles = changedFilesSince(root, policy.ref);
-    const workingTreeFiles = impact.requestedFiles;
+    const baseChangedFiles = committedFilesSince(root, policy.ref);
+    const workingTreeFiles = workingTreeChangedFiles(root) ?? impact.requestedFiles;
     const receiptChecks = {};
     for (const [name, result] of Object.entries(checks)) {
         receiptChecks[name] = receiptCheck(result);
@@ -81,6 +450,10 @@ function buildVerificationReceipt(root, policy, impact, checks, workspaceChecks,
         version: 1,
         kind: 'verification-receipt',
         subject: {
+            ...(githubContext?.event ? { githubEvent: githubContext.event } : {}),
+            ...(githubContext?.headSha ? { headSha: githubContext.headSha } : {}),
+            ...(githubContext?.baseSha ? { baseSha: githubContext.baseSha } : {}),
+            ...(githubContext?.mergeSha ? { mergeSha: githubContext.mergeSha } : {}),
             ...(policy.ref ? { baseRef: policy.ref } : {}),
             ...(baseCommit ? { baseCommit } : {}),
             ...(baseChangedFiles ? { baseChangedFiles } : {}),
@@ -89,12 +462,19 @@ function buildVerificationReceipt(root, policy, impact, checks, workspaceChecks,
             workingTreeDirty: workingTreeFiles.length > 0,
         },
         policy,
+        verificationScope: scope,
+        policySurface,
+        ...(ciIntegrity ? { ciIntegrity } : {}),
+        requiredStages,
+        incompleteStages,
+        effectiveInvocation,
         stages,
         checks: receiptChecks,
         findings: {
             total: architecture.findings.length,
             errors: architecture.findings.filter((finding) => finding.severity === 'error').length,
-            warnings: architecture.findings.filter((finding) => finding.severity === 'warning').length,
+            warnings: architecture.findings.filter((finding) => finding.severity === 'warning').length +
+                (policySurface.changes ?? []).filter((change) => change.severity === 'warning').length,
             waived: architecture.waived,
             waiverWarnings: architecture.waiverWarnings.length,
             expiredWaivers: architecture.expiredWaivers.length,
@@ -106,6 +486,48 @@ function buildVerificationReceipt(root, policy, impact, checks, workspaceChecks,
         tool: { name: '@codapult/guard', version: packageJson.version },
     };
 }
+function buildPolicyGateReceipt(root, policy, policySurface, ciIntegrity, stages) {
+    const githubContext = readGuardGitHubContext(process.env.GITHUB_EVENT_NAME, process.env.GITHUB_EVENT_PATH, resolveGitCommit(root, 'HEAD'), process.env.GITHUB_SHA);
+    const baseChangedFiles = committedFilesSince(root, policy.ref);
+    const workingTreeFiles = workingTreeChangedFiles(root) ?? [];
+    const baseCommit = resolveGitCommit(root, policy.ref);
+    return {
+        version: 1,
+        kind: 'verification-receipt',
+        subject: {
+            ...(githubContext?.event ? { githubEvent: githubContext.event } : {}),
+            ...(githubContext?.headSha ? { headSha: githubContext.headSha } : {}),
+            ...(githubContext?.baseSha ? { baseSha: githubContext.baseSha } : {}),
+            ...(githubContext?.mergeSha ? { mergeSha: githubContext.mergeSha } : {}),
+            ...(policy.ref ? { baseRef: policy.ref } : {}),
+            ...(baseCommit ? { baseCommit } : {}),
+            ...(baseChangedFiles ? { baseChangedFiles } : {}),
+            ...(workingTreeFiles.length > 0 ? { workingTreeFiles } : {}),
+            changedFiles: [...new Set([...(baseChangedFiles ?? []), ...workingTreeFiles])].sort(),
+            workingTreeDirty: hasWorkingTreeChanges(root),
+        },
+        policy,
+        policySurface,
+        ...(ciIntegrity ? { ciIntegrity } : {}),
+        requiredStages: [],
+        incompleteStages: [],
+        stages,
+        checks: {},
+        findings: {
+            total: 0,
+            errors: 0,
+            warnings: 0,
+            waived: 0,
+            waiverWarnings: 0,
+            expiredWaivers: 0,
+            fingerprints: [],
+            ruleIds: [],
+        },
+        contractIssues: [],
+        decisionIds: policy.decisionIds ?? [],
+        tool: { name: '@codapult/guard', version: packageJson.version },
+    };
+}
 export function runGuardVerification(root, options = {}) {
     const runContext = startGuardRun();
     const requirement = {
@@ -118,7 +540,7 @@ export function runGuardVerification(root, options = {}) {
     const runtimeStartedAt = Date.now();
     const runtime = inspectProjectRuntime(root);
     recordGuardRunStage(runContext, 'runtime', 'ok', runtimeStartedAt);
-    if (options.failOnPolicyChange && !options.policyBase) {
+    if ((options.failOnPolicyChange || options.failOnProtectedChanges) && !options.policyBase) {
         const run = finishGuardRun(root, runContext, 'fail', 'policy-base');
         return {
             status: 'fail',
@@ -129,7 +551,7 @@ export function runGuardVerification(root, options = {}) {
             workspaceChecks: {},
             adapters: {},
             runtime,
-            configError: '`failOnPolicyChange` requires `policyBase`.',
+            configError: 'Strict policy checks require `policyBase`.',
             contractIssues: [],
             requirement,
             run,
@@ -176,6 +598,9 @@ export function runGuardVerification(root, options = {}) {
     let policySnapshot;
     let workingTreeSnapshot;
     let policyChanged;
+    let policySurface;
+    let ciIntegrity;
+    let uncheckedProtectedPaths;
     let policyDecisionIds = [];
     try {
         workingTreeSnapshot = workingTreeState.snapshot;
@@ -202,6 +627,25 @@ export function runGuardVerification(root, options = {}) {
         policySnapshot = baseSnapshot ?? workingTreeSnapshot;
         policyChanged =
             baseSnapshot !== undefined && baseSnapshot.fingerprint !== workingTreeSnapshot.fingerprint;
+        const policySurfaceStartedAt = Date.now();
+        policySurface = getPolicySurface(root, options.policyBase, baseSnapshot?.config.protectedPaths ?? [], baseSnapshot?.config.policySurface);
+        recordGuardRunStage(runContext, 'policy-surface', policySurface.complete ? 'ok' : 'skipped', policySurfaceStartedAt, policySurface.complete ? undefined : 'A policy base was not available for comparison.');
+        const ciAuditStartedAt = Date.now();
+        ciIntegrity = auditGitHubActions(root, policySnapshot.config.githubActions, options.policyBase);
+        const contractedWorkflowPaths = new Set(policySnapshot.config.githubActions?.workflows.map((workflow) => workflow.path) ?? []);
+        uncheckedProtectedPaths = [
+            ...new Set(policySurface.changes
+                .filter((change) => change.severity === 'error')
+                .map((change) => change.path)
+                .filter((path) => !(path.startsWith('.github/workflows/') && contractedWorkflowPaths.has(path)))),
+        ];
+        recordGuardRunStage(runContext, 'ci-integrity', ciIntegrity === undefined
+            ? 'skipped'
+            : ciIntegrity.status === 'ok'
+                ? 'ok'
+                : ciIntegrity.status === 'policy-weakened'
+                    ? 'fail'
+                    : 'skipped', ciAuditStartedAt, ciIntegrity === undefined ? 'No GitHub Actions integrity contract is configured.' : undefined);
         if (policySnapshot.source === 'working-tree') {
             policyDecisionIds = (workingTreeState.proposals?.decisions ?? [])
                 .filter((decision) => decision.policyFingerprint === policySnapshot.fingerprint)
@@ -211,7 +655,7 @@ export function runGuardVerification(root, options = {}) {
         }
         if (options.failOnPolicyChange && policyChanged) {
             const policy = buildRunPolicy(policySnapshot, options.policyBase, policyChanged, policyDecisionIds);
-            const run = finishGuardRun(root, runContext, 'fail', 'policy-change', 'verify', policy);
+            const run = finishGuardRun(root, runContext, 'fail', 'policy-change', 'verify', policy, buildPolicyGateReceipt(root, policy, policySurface, ciIntegrity, Object.fromEntries(Object.entries(runContext.stages).map(([name, stage]) => [name, stage.status]))));
             return {
                 status: 'fail',
                 outcome: 'fail',
@@ -227,6 +671,40 @@ export function runGuardVerification(root, options = {}) {
                 run,
                 policy,
                 policyChanged,
+                policySurface,
+                ...(ciIntegrity ? { ciIntegrity } : {}),
+            };
+        }
+        if (options.failOnProtectedChanges &&
+            (!policySurface.complete ||
+                uncheckedProtectedPaths.length > 0 ||
+                policySurface.suppressionMarkers.length > 0)) {
+            const policy = buildRunPolicy(policySnapshot, options.policyBase, policyChanged, policyDecisionIds);
+            const run = finishGuardRun(root, runContext, 'fail', 'protected-path-change', 'verify', policy, buildPolicyGateReceipt(root, policy, policySurface, ciIntegrity, Object.fromEntries(Object.entries(runContext.stages).map(([name, stage]) => [name, stage.status]))));
+            return {
+                status: 'fail',
+                outcome: 'fail',
+                errorCode: policySurface.complete
+                    ? 'GUARD_PROTECTED_PATH_CHANGED'
+                    : 'GUARD_POLICY_SURFACE_INCOMPLETE',
+                recoverable: true,
+                checks: {},
+                workspaceChecks: {},
+                adapters: {},
+                runtime,
+                configError: policySurface.complete
+                    ? `Verification-sensitive paths or inline suppression markers changed: ${[
+                        ...uncheckedProtectedPaths,
+                        ...policySurface.suppressionMarkers,
+                    ].join(', ')}`
+                    : 'Could not inspect the complete policy surface against the base ref; strict verification failed closed.',
+                contractIssues: [],
+                requirement,
+                run,
+                policy,
+                policyChanged,
+                policySurface,
+                ...(ciIntegrity ? { ciIntegrity } : {}),
             };
         }
     }
@@ -251,11 +729,13 @@ export function runGuardVerification(root, options = {}) {
     const agentConfig = policySnapshot.agentConfig;
     const projectChecks = options.projectChecks ?? agentConfig.completionGate.projectChecks;
     const checks = projectChecks ? (options.checks ?? agentConfig.completionGate.checks) : [];
+    const discoveryStartedAt = Date.now();
+    const workspaceModel = discoverProject(root);
+    const scopeChangedPaths = changedFilesSince(root, policy.ref) ?? workspaceModel.git.changedFiles;
+    const initialScope = verificationScope(root, workspaceModel.files, scopeChangedPaths, policy);
     const checksStartedAt = Date.now();
     const results = runProjectChecks(root, checks, { timeout: options.timeout });
     recordGuardRunStage(runContext, 'project-checks', projectChecks ? 'ok' : 'skipped', checksStartedAt);
-    const discoveryStartedAt = Date.now();
-    const workspaceModel = discoverProject(root);
     const impact = analyzeProjectImpact(workspaceModel, options.changedOnly === false
         ? workspaceModel.modules.map((module) => module.path)
         : workspaceModel.git.changedFiles, policySnapshot.config.contracts ?? []);
@@ -283,6 +763,19 @@ export function runGuardVerification(root, options = {}) {
     });
     const contractIssues = validateGuardPolicy(root, policySnapshot.config);
     recordGuardRunStage(runContext, 'architecture-policy', 'ok', architectureStartedAt);
+    const finalWorkspaceModel = discoverProject(root);
+    const finalScope = verificationScope(root, finalWorkspaceModel.files, changedFilesSince(root, policy.ref) ?? finalWorkspaceModel.git.changedFiles, policy);
+    const scopeStable = initialScope.complete &&
+        finalScope.complete &&
+        initialScope.fingerprint === finalScope.fingerprint;
+    const scope = {
+        ...initialScope,
+        complete: initialScope.complete && finalScope.complete,
+        stable: scopeStable,
+    };
+    recordGuardRunStage(runContext, 'verification-scope', scope.complete && scope.stable ? 'ok' : 'skipped', discoveryStartedAt, scope.complete && scope.stable
+        ? undefined
+        : 'The complete verification input scope could not be hashed consistently for the entire run.');
     const commandFailed = Object.values(results).some((result) => result.status === 'failed');
     const workspaceCommandFailed = Object.values(workspaceChecks).some((packageResults) => Object.values(packageResults).some((result) => result.status === 'failed'));
     const adapterFailed = Object.values(adapters).some((result) => result.status === 'failed');
@@ -296,7 +789,8 @@ export function runGuardVerification(root, options = {}) {
     const expiredWaivers = architecture.expiredWaivers.length > 0;
     const architectureWarnings = architecture.findings.some((finding) => finding.severity === 'warning') ||
         (architecture.waiverWarnings ?? []).length > 0;
-    const failed = runtimeFailed ||
+    const policySurfaceWarnings = policySurface.changes.some((change) => change.severity === 'warning');
+    const otherFailures = runtimeFailed ||
         commandFailed ||
         workspaceCommandFailed ||
         adapterFailed ||
@@ -305,6 +799,9 @@ export function runGuardVerification(root, options = {}) {
         contractIssues.length > 0 ||
         missingProjectChecks ||
         missingAdapterTools;
+    const ciWeakened = ciIntegrity?.status === 'policy-weakened';
+    const ciIncomplete = ciIntegrity?.status === 'incomplete';
+    const failed = otherFailures || ciWeakened;
     const projectChecksFailed = commandFailed || workspaceCommandFailed || missingProjectChecks || runtimeFailed;
     const adaptersFailed = adapterFailed || missingAdapterTools;
     runContext.stages['project-checks'] = {
@@ -313,44 +810,97 @@ export function runGuardVerification(root, options = {}) {
     };
     runContext.stages.adapters = {
         ...runContext.stages.adapters,
-        status: toolMode === 'off' ? 'skipped' : adaptersFailed ? 'fail' : 'ok',
+        status: toolMode === 'off' ||
+            !Object.values(adapters).some((result) => result.status !== 'not-configured')
+            ? 'skipped'
+            : adaptersFailed
+                ? 'fail'
+                : 'ok',
     };
     runContext.stages.runtime = {
         ...runContext.stages.runtime,
-        status: runtimeFailed ? 'fail' : 'ok',
+        status: projectChecks ? (runtimeFailed ? 'fail' : 'ok') : 'skipped',
     };
     runContext.stages['architecture-policy'] = {
         ...runContext.stages['architecture-policy'],
         status: architectureFailed || expiredWaivers || contractIssues.length > 0 ? 'fail' : 'ok',
     };
-    const outcome = classifyGuardOutcome({
-        errors: failed ? 1 : 0,
-        warnings: architectureWarnings ? 1 : 0,
-    });
-    const gate = architectureFailed || expiredWaivers
-        ? 'architecture'
-        : contractIssues.length > 0
-            ? 'contracts'
-            : commandFailed || workspaceCommandFailed
-                ? 'project-checks'
-                : adapterFailed
-                    ? 'adapters'
-                    : missingProjectChecks
-                        ? 'project-checks'
-                        : missingAdapterTools
-                            ? 'required-tools'
-                            : runtimeFailed
-                                ? 'runtime'
-                                : 'none';
-    const receipt = buildVerificationReceipt(root, policy, impact, results, workspaceChecks, adapters, architecture, contractIssues, Object.fromEntries(Object.entries(runContext.stages).map(([name, stage]) => [name, stage.status])));
+    const requiredStages = agentConfig.completionGate.requiredStages ?? ['architecture-policy'];
+    const effectiveRequiredStages = [
+        ...new Set([
+            ...requiredStages,
+            ...(policySnapshot.source === 'git-ref' ? ['policy-surface'] : []),
+            ...(ciIntegrity !== undefined ? ['ci-integrity'] : []),
+            'verification-scope',
+        ]),
+    ];
+    const effectiveIncompleteStages = effectiveRequiredStages.filter((stage) => runContext.stages[stage].status !== 'ok');
+    const incomplete = ciIncomplete || effectiveIncompleteStages.length > 0;
+    const outcome = ciWeakened && !otherFailures
+        ? 'policy-weakened'
+        : classifyGuardOutcome({
+            errors: failed ? 1 : 0,
+            warnings: architectureWarnings || policySurfaceWarnings ? 1 : 0,
+            incomplete: !failed && incomplete,
+        });
+    const gate = ciWeakened
+        ? 'ci-integrity'
+        : architectureFailed || expiredWaivers
+            ? 'architecture'
+            : contractIssues.length > 0
+                ? 'contracts'
+                : commandFailed || workspaceCommandFailed
+                    ? 'project-checks'
+                    : adapterFailed
+                        ? 'adapters'
+                        : missingProjectChecks
+                            ? 'project-checks'
+                            : missingAdapterTools
+                                ? 'required-tools'
+                                : runtimeFailed
+                                    ? 'runtime'
+                                    : incomplete
+                                        ? 'required-stages'
+                                        : 'none';
+    const receipt = buildVerificationReceipt(root, policy, impact, results, workspaceChecks, adapters, architecture, contractIssues, Object.fromEntries(Object.entries(runContext.stages).map(([name, stage]) => [name, stage.status])), policySurface, ciIntegrity, scope, effectiveRequiredStages, effectiveIncompleteStages, effectiveVerifierInvocation({
+        checks,
+        tools: toolMode,
+        projectChecks,
+        strict: options.strict,
+        changedOnly: options.changedOnly,
+        policyBase: options.policyBase,
+        failOnPolicyChange: options.failOnPolicyChange,
+        failOnProtectedChanges: options.failOnProtectedChanges,
+    }));
     const run = finishGuardRun(root, runContext, outcome, gate, 'verify', policy, receipt);
     return {
-        status: failed ? 'fail' : 'ok',
+        status: outcome === 'policy-weakened'
+            ? 'policy-weakened'
+            : failed
+                ? 'fail'
+                : incomplete
+                    ? 'incomplete'
+                    : 'ok',
+        ...(ciWeakened || ciIncomplete || incomplete
+            ? {
+                errorCode: ciWeakened
+                    ? 'GUARD_CI_POLICY_WEAKENED'
+                    : ciIncomplete
+                        ? 'GUARD_CI_POLICY_INCOMPLETE'
+                        : 'GUARD_REQUIRED_STAGE_INCOMPLETE',
+            }
+            : {}),
         outcome,
         tools: toolMode,
-        checks: results,
-        workspaceChecks,
-        adapters,
+        checks: sanitizeProjectChecks(results),
+        workspaceChecks: Object.fromEntries(Object.entries(workspaceChecks).map(([name, packageChecks]) => [
+            name,
+            sanitizeProjectChecks(packageChecks),
+        ])),
+        adapters: Object.fromEntries(Object.entries(adapters).map(([name, result]) => [
+            name,
+            { ...result, command: sanitizeCommand(result.command) },
+        ])),
         runtime,
         architecture,
         impact,
@@ -359,5 +909,9 @@ export function runGuardVerification(root, options = {}) {
         run,
         policy,
         ...(policy.changedFromBase !== undefined ? { policyChanged: policy.changedFromBase } : {}),
+        policySurface,
+        ...(ciIntegrity ? { ciIntegrity } : {}),
+        requiredStages: effectiveRequiredStages,
+        incompleteStages: effectiveIncompleteStages,
     };
 }