@productbrain/cli 0.1.0-beta.104 → 0.1.0-beta.10403

package/dist/commands/handshake.js

@@ -2,179 +2,44 @@
  * pb handshake — generate context files for AI developer tools.
  * Context export wiring (read-only filesystem bridge; GLO-63, DEC-161) — not a product surface.
  */
-import { mkdirSync, writeFileSync, existsSync, readFileSync, readdirSync, copyFileSync, appendFileSync, unlinkSync, statSync } from 'fs';
-import { join, dirname, resolve, basename } from 'path';
+import { mkdirSync, writeFileSync, existsSync, readFileSync, readdirSync, copyFileSync, realpathSync } from 'fs';
+import { join, dirname, resolve, basename, relative, sep } from 'path';
 import { homedir } from 'os';
 import { fileURLToPath } from 'url';
-import { createHash } from 'crypto';
+import { execSync } from 'child_process';
 import { getConfigOrGuide } from '../lib/config.js';
-import { select as promptSelect } from '../lib/prompts.js';
-import { composeHooksFromIntents, getHookStatusForSurface } from '../lib/hook-intents.js';
-import { kernelCall, kernelCallWithSession } from '../lib/client.js';
+import { select as promptSelect, confirm as promptConfirm } from '../lib/prompts.js';
+import { HOOK_INTENT_CONFIGS, composeHooksFromIntents, getHookStatusForSurface } from '../lib/hook-intents.js';
+import { kernelCall } from '../lib/client.js';
 import { readSession } from '../lib/session.js';
 import { detectRepo, extractWorkspaceProfile } from '../lib/repo-detect.js';
 import { generateContextMd } from '../generators/context-md.js';
 import { generateBriefingMd } from '../generators/briefing-md.js';
-import { MARKER, generateAgentsMd, generateClaudeMd, generateCursorMdc, generateCopilotMd } from '../generators/adapters.js';
-import { readCanonicalSkills, readCanonicalRules, readPersonalLayer, readPersonalSkillsLayer, generateCursorSkill, generateCursorRule, generateCodexSkill, generateCodexSkillIndex, generateClaudeRule, generateClaudeSkillRouter, shouldEmitToTarget, filterByLevel, validateCodexSkills, evaluateConditions, STAGE_TO_MAX_LEVEL, LEVEL_ORDER, } from '../generators/portable-knowledge.js';
-import { generateChainRules } from '../generators/chain-rules.js';
-import { saveHandshakeState, loadPreviousState, diffHandshakeState, formatDiff, buildCurrentState, } from '../generators/handshake-diff.js';
+import { MARKER, generateAgentsMd, generateClaudeMd, generateCursorMdc, generateCopilotMd, generateCopilotInstructionFiles } from '../generators/adapters.js';
+import { readCanonicalSkills, readCanonicalRules, readPersonalLayer, readPersonalSkillsLayer, generateCursorSkill, generateCursorRule, generateCodexSkill, generateCodexSkillIndex, shouldEmitToTarget, filterByLevel, validateCodexSkills, evaluateConditions, } from '../generators/portable-knowledge.js';
+import { findNoProjectionAssets } from '../generators/noProjectionAssets.js'; // WP-660 S2 combine
 import { resolveSurfaceProfile } from '../generators/surface-profiles.js';
+import { generateEveryoneRulesMd } from '../generators/everyone-rules-md.js';
+import { removeStaleBriefingProjections, retireGeneratedProjections } from '../generators/retired-projections.js';
+import { formatWorkspaceBriefingLines } from '../lib/ruleListRender.js';
 import { formatHandshakeReport } from '../formatters/handshake.js';
-import { readManifest, filterByAdoptionState } from '../generators/manifest.js';
+import { classifyAdapterFile, detectEol, spliceAppend, spliceReplace } from '../generators/region.js';
+import { REGION_PROJECTIONS } from '../generators/region-projections.js';
+import { readManifest, readManifestStatus, filterByAdoptionState } from '../generators/manifest.js';
 import { generateBoundaryManifest, getBoundaryEnforcementMode } from '../generators/boundary-manifest.js';
 import { loadMethodRegistry } from '../lib/method-registry.js';
 import { CLIError, ErrorCode } from '../lib/errors.js';
-import { trackEvent } from '../lib/telemetry.js';
+import { isJsonMode } from '../lib/runner.js';
+import { stripConvexInternals } from '../lib/strip.js';
+import { replaceVocabTokens } from '../lib/canonicalRefs.js';
+// WP-436 S3: vocab projector — resolves {{vocab:...}} tokens before writing to disk.
+import { getOrFetchVocabCtx } from '../lib/workspaceVocabCache.js';
 import { normalizeMaterializedFilename } from '../lib/normalizeMaterializedFilename.js';
-const MAX_HANDSHAKE_WAIT_MS = 10_000; // 10 seconds
-const POLL_INTERVAL_MS = 500; // 500 ms per poll
-const MAX_POLLS = MAX_HANDSHAKE_WAIT_MS / POLL_INTERVAL_MS; // 20
-// ── WP-379 S4: Dormant marker ─────────────────────────────────────────────────
-/**
- * DORMANT_MARKER — appended to previously-projected asset files when the asset's
- * gate deactivates (e.g. workspace readiness exceeds the max threshold).
- *
- * Contract:
- *   - The file is NOT deleted. It persists on disk so that history is preserved
- *     and the agent surface remains inspectable.
- *   - The marker is appended at the end of the file, idempotent — if it already
- *     exists, no second append occurs.
- *   - The marker does NOT trigger a drift TEN. Dormant files are intentionally
- *     deactivated, not accidentally forked.
- *   - The marker is never included in active file writes — only dormant writes.
- *
- * Used by: writeDormantMarker() (write) and hasDormantMarker() (idempotency check).
- * Exported for use in tests.
- *
- * Chain: WP-379 S4.
- */
-export const DORMANT_MARKER = '<!-- pb-status: dormant -->';
-/**
- * hasDormantMarker — check whether a file on disk already has the dormant marker.
- * Used for idempotency: if the marker is already present, skip the append.
- */
-function hasDormantMarker(content) {
-    return content.includes(DORMANT_MARKER);
-}
-/**
- * writeDormantMarker — append the dormant marker to a previously-projected file.
- *
- * Idempotent: if DORMANT_MARKER is already present, no-op.
- * Only operates on files that have the auto-gen MARKER — we never touch
- * manually-authored files.
- *
- * @param filePath  Absolute path to the file.
- * @returns         'written' | 'already-dormant' | 'skipped' (no auto-gen marker)
- */
-export function writeDormantMarkerToFile(filePath) {
-    if (!existsSync(filePath))
-        return 'skipped';
-    const content = readFileSync(filePath, 'utf8');
-    // Only mark files that were originally projected by pb handshake.
-    // Files without the auto-gen MARKER are manually authored — leave them alone.
-    if (!content.includes(MARKER))
-        return 'skipped';
-    if (hasDormantMarker(content))
-        return 'already-dormant';
-    // Append the marker on its own line. No trailing newline assumption —
-    // appendFileSync adds to whatever is already there.
-    appendFileSync(filePath, `\n${DORMANT_MARKER}\n`);
-    return 'written';
-}
-/**
- * deriveDormantFilePaths — compute the set of on-disk file paths that would have
- * been projected for a given dormant asset (by name and assetKind).
- *
- * Assets are projected to one or more surfaces (cursor/claude/codex) depending
- * on shouldEmitToTarget. Since we don't re-run shouldEmitToTarget here, we
- * speculatively probe all known surface paths and let writeDormantMarkerToFile
- * decide whether each exists and has the auto-gen MARKER.
- *
- * @param asset  The dormant asset from the server.
- * @param cwd    Current working directory (project root).
- * @returns      Array of absolute file paths to probe.
- */
-function deriveDormantFilePaths(asset, cwd) {
-    // Defense-in-depth: even though `name` originates from platform-seeded DB
-    // entries (not user input), validate it against a strict charset before
-    // interpolating into a filesystem path. Reject anything that could traverse
-    // out of the expected directories. WP-379 S4 review finding.
-    if (!/^[A-Za-z0-9 ._-]+$/.test(asset.name)) {
-        return [];
-    }
-    const paths = [];
-    const { name, assetKind } = asset;
-    if (assetKind === 'skill') {
-        // Cursor skill
-        paths.push(join(cwd, '.cursor', 'skills', name, 'SKILL.md'));
-        // Codex skill
-        paths.push(join(cwd, '.codex', 'skills', `${name}.md`));
-    }
-    else if (assetKind === 'rule' || assetKind === 'hook') {
-        // Cursor rule
-        paths.push(join(cwd, '.cursor', 'rules', `${name}.mdc`));
-        // Claude rule
-        paths.push(join(cwd, '.claude', 'rules', `${name}.md`));
-    }
-    return paths;
-}
-/**
- * Single-shot health probe — calls `workspace.health` and inspects
- * `starterSetupSeeded`. Does NOT poll internally; polling is the caller's
- * responsibility (connect-screens.tsx).
- *
- * Returns:
- *  - `seeds-ready`   — health query succeeded AND starterSetupSeeded is true
- *  - `seeds-pending` — health query succeeded but starterSetupSeeded is false
- *  - `probe-failed`  — health query threw (network, auth, etc.)
- */
-export async function probeStarterSetupSeeded() {
-    try {
-        const health = await kernelCall('workspace.health', {});
-        if (health.starterSetupSeeded) {
-            return { status: 'seeds-ready' };
-        }
-        const starterGaps = (health.gaps ?? []).filter((g) => g.kind === 'starter-setup-missing' || g.kind === 'platform-domains-missing');
-        return {
-            status: 'seeds-pending',
-            gaps: starterGaps.length > 0 ? starterGaps : [
-                {
-                    kind: 'starter-setup-missing',
-                    severity: 'warn',
-                    message: 'Starter setup seeds are still running.',
-                },
-            ],
-        };
-    }
-    catch (err) {
-        return {
-            status: 'probe-failed',
-            error: err instanceof Error ? err.message : String(err),
-        };
-    }
-}
-/**
- * Poll `probeStarterSetupSeeded` up to MAX_POLLS times (10s at 500ms intervals).
- * Returns the final probe result — caller decides how to render the outcome.
- *
- * Exported so connect-screens.tsx can use it without re-implementing the loop.
- */
-export async function pollUntilSeedsReady() {
-    for (let poll = 0; poll < MAX_POLLS; poll++) {
-        const result = await probeStarterSetupSeeded();
-        if (result.status === 'seeds-ready')
-            return result;
-        if (result.status === 'probe-failed')
-            return result; // don't retry on auth/network errors
-        // seeds-pending — wait before next poll
-        if (poll < MAX_POLLS - 1) {
-            await new Promise((res) => setTimeout(res, POLL_INTERVAL_MS));
-        }
-    }
-    // Final probe after exhausting waits — return whatever state we have
-    return probeStarterSetupSeeded();
-}
+import { findLeftoverCursorSkills, LEFTOVER_FILES_MAX } from './handshakeCursorSkillCleanup.js';
+import { classifyDriftBucket } from './handshakeDriftClassification.js';
+import { sanitizeStartupResolutionSignals } from '../lib/startup-resolution-signals.js';
+import { assertSetupWritePath } from '../lib/writePerimeter.js';
+import { SURFACE_GOVERN_NO_SURFACES, SURFACE_REGISTRY, validateSurfacesForMode, } from '../surfaces/registry.js';
 const LEVELS = {
     guide: {
         label: 'Guide me',
@@ -203,8 +68,7 @@ const LEVELS = {
 };
 // Explicit ordering — determines menu numbering in promptLevel(). Do not reorder.
 const LEVEL_KEYS = ['guide', 'work', 'silent', 'full-trust'];
-// Hook failure contract (TEN-712): all hook commands MUST end with '2>/dev/null || true'
-// so Claude Code always starts even if pb is unavailable. Never remove this suffix.
+// Hook failure contract (TEN-712): every hook command MUST end with '|| true' so Claude Code always starts even if pb is unavailable.
 const INIT_PERMISSION = 'Bash(pb:*)';
 function readSettings(filePath) {
     if (!existsSync(filePath))
@@ -232,7 +96,16 @@ function writeTeamSettings(cwd, dryRun) {
     }
     settings.permissions = permissions;
     const hooks = (settings.hooks ?? {});
-    const hookAdditions = composeHooksFromIntents(['session-start', 'session-close', 'pre-compact'], hooks);
+    const hookAdditions = composeHooksFromIntents(['session-start', 'session-close'], hooks);
+    const close = HOOK_INTENT_CONFIGS['session-close'].command; // TASK-763 (DEC-2038): an older init closed on Stop, every turn
+    const stop = (hooks.Stop ?? []).map((g) => ({ ...g, hooks: g.hooks.filter((h) => h.command !== close) })).filter((g) => g.hooks.length > 0);
+    if (JSON.stringify(stop) !== JSON.stringify(hooks.Stop ?? [])) {
+        if (stop.length)
+            hooks.Stop = stop;
+        else
+            delete hooks.Stop;
+        added.push('Stop → pb session close removed (closed every turn)');
+    }
     for (const addition of hookAdditions) {
         hooks[addition.event] = [...(hooks[addition.event] ?? []), addition.entry];
         added.push(addition.label);
@@ -305,8 +178,7 @@ export async function runHandshakeInit(options = {}) {
         for (const item of teamAdded)
             console.log(`    + ${item}`);
     }
-    // Step 2: Personal config — wizard or --level flag
-    // Cast is safe: LEVEL_KEYS.includes() validated above; invalid level already threw CLIError.
+    // Step 2: Personal config — wizard or --level flag. Cast is safe: LEVEL_KEYS.includes() validated above.
     const levelKey = options.level ? options.level : await promptLevel();
     const level = LEVELS[levelKey];
     const personalAdded = writePersonalSettings(levelKey, dryRun);
@@ -328,11 +200,7 @@ export async function runHandshakeInit(options = {}) {
     if (!dryRun)
         console.log('Reload /hooks in Claude Code (or restart) to activate.');
     console.log('Run `pb handshake --init --level <guide|work|silent|full-trust>` to change level.');
-    // Step 2b: Report multi-surface hook opt-in status (WP-310 E3b)
-    // Reads manifest.hooks.{cursor,copilot} and prints an informational note for
-    // each opted-in surface. Silence = no manifest or no hooks flags set.
-    // DEC-536: Claude-native default is already wired above; this block only fires
-    // when the user has explicitly opted in via manifest.
+    // Step 2b: Report multi-surface hook opt-in status (WP-310 E3b) — manifest.hooks.{cursor,copilot}, silence = no manifest/flags (DEC-536).
     const pbDirForManifest = join(cwd, '.productbrain');
     const initManifest = readManifest(pbDirForManifest);
     const multiSurfaceOptIns = [];
@@ -401,24 +269,237 @@ export async function runHandshakeInit(options = {}) {
         }
     }
 }
-/**
- * Normalize volatile handshake-only timestamps before comparing generated files.
- * This keeps the visible timestamps in generated artifacts while avoiding
- * meaningless rewrites when semantic content is unchanged.
- */
+const LOCAL_REF_REGEX = /\b(?:WP|TEN|DEC|BET|FEAT|INS|STD|PRI|ARCH)[-\s#]*\d+\b|\bPR\s*#?\s*\d+\b/gi;
+const STARTUP_RESOLUTION_RESOLVER_VERSION = 'startup-resolution-v1';
+// Global cap on collected refs (spec "Contract: StartupResolutionSignals" — arrays are capped).
+const LOCAL_REF_GLOBAL_CAP = 25;
+// Per-source cap so a broad source (context.md) can't starve briefing.md's task-specific refs (Codex@677).
+const LOCAL_REF_PER_SOURCE_CAP = 18;
+// Time-boxed so an unauthed/slow `gh` can't stall session-start (F4).
+const PR_DIFF_TIMEOUT_MS = 4_000;
+// Bounds worst-case `gh` subprocess invocations per handshake.
+const PR_DIFF_MAX_REFS = 5;
+function runGitText(cwd, command) {
+    try {
+        const value = execSync(command, {
+            cwd,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+        return value.length > 0 ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** Dereference a "PR #N" ref to its changed paths via `gh pr diff <N> --name-only` (F4: server
+ *  resolver has no git/gh access). Guarded/time-boxed; `run` is injectable for tests. */
+export function dereferencePrRefToPaths(cwd, prNumber, run = runGitTextTimeboxed) {
+    if (!Number.isInteger(prNumber) || prNumber <= 0)
+        return [];
+    const raw = run(cwd, `gh pr diff ${prNumber} --name-only`, PR_DIFF_TIMEOUT_MS);
+    if (!raw)
+        return [];
+    return raw.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+}
+/** Time-boxed variant of runGitText for the PR-diff dereference (F4). */
+function runGitTextTimeboxed(cwd, command, timeoutMs) {
+    try {
+        const value = execSync(command, {
+            cwd,
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+            timeout: timeoutMs,
+        }).trim();
+        return value.length > 0 ? value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function readOptionalLocalText(cwd, path) {
+    const fullPath = join(cwd, path);
+    if (!existsSync(fullPath))
+        return undefined;
+    try {
+        return readFileSync(fullPath, 'utf8');
+    }
+    catch {
+        return undefined;
+    }
+}
+function normalizeLocalRef(ref) {
+    const trimmed = ref.trim().replace(/\s+/g, ' ');
+    const pr = trimmed.match(/^PR\s*#?\s*(\d+)$/i);
+    if (pr)
+        return `PR #${pr[1]}`;
+    const entry = trimmed.match(/^([A-Z]+)[-\s#]*(\d+)$/i);
+    if (entry)
+        return `${entry[1].toUpperCase()}-${entry[2]}`;
+    return trimmed;
+}
+/** Collect normalized local refs across several text sources, deduped. Codex@677: a per-source
+ *  cap alongside the global one, so a broad source (context.md) can't starve a later,
+ *  task-specific source (briefing.md); already-collected refs dedupe without spending later quota. */
+function collectLocalRefs(texts) {
+    const refs = [];
+    const seen = new Set();
+    for (const text of texts) {
+        if (!text)
+            continue;
+        let fromThisSource = 0;
+        for (const match of text.matchAll(LOCAL_REF_REGEX)) {
+            const ref = normalizeLocalRef(match[0]);
+            const key = ref.toLowerCase();
+            if (seen.has(key))
+                continue;
+            if (fromThisSource >= LOCAL_REF_PER_SOURCE_CAP)
+                break;
+            seen.add(key);
+            refs.push(ref);
+            fromThisSource++;
+            if (refs.length >= LOCAL_REF_GLOBAL_CAP)
+                return refs;
+        }
+    }
+    return refs;
+}
+function deriveHandshakeStartupTask(refs, changedPaths, callerTask) {
+    if (callerTask && callerTask.trim())
+        return callerTask.trim();
+    const parts = [];
+    if (refs.length > 0)
+        parts.push(refs.join(' '));
+    if (changedPaths.length > 0)
+        parts.push(`changed paths ${changedPaths.slice(0, 5).join(' ')}`);
+    return parts.length > 0 ? parts.join(' ') : undefined;
+}
+const DEFAULT_HANDSHAKE_SIGNAL_DEPS = {
+    runGit: runGitText,
+    prDiff: (cwd, prNumber) => dereferencePrRefToPaths(cwd, prNumber),
+};
+/** Extract the PR number from a normalized "PR #N" ref, else null. */
+function prNumberFromRef(ref) {
+    const m = ref.match(/^PR\s*#?\s*(\d+)$/i);
+    if (!m)
+        return null;
+    const n = Number(m[1]);
+    return Number.isInteger(n) && n > 0 ? n : null;
+}
+export function deriveHandshakeStartupSignals(cwd, callerSignals = {}, deps = DEFAULT_HANDSHAKE_SIGNAL_DEPS) {
+    const { runGit, prDiff } = deps;
+    const branchName = runGit(cwd, 'git branch --show-current');
+    const commitSha = runGit(cwd, 'git rev-parse --short HEAD');
+    // Changed paths, unioned + deduped: (1) dirty worktree; (2) committed branch delta vs origin/main's
+    // merge-base (Codex@665, invisible once the tree is clean); (3) PR-ref dereference (F4), appended later.
+    const dirtyChangedPaths = runGit(cwd, 'git diff --name-only HEAD')?.split(/\r?\n/).filter(Boolean) ?? [];
+    const mergeBase = runGit(cwd, 'git merge-base HEAD origin/main');
+    const branchChangedPaths = mergeBase
+        ? (runGit(cwd, `git diff --name-only ${mergeBase} HEAD`)?.split(/\r?\n/).filter(Boolean) ?? [])
+        : [];
+    const worktreeName = basename(cwd);
+    const contextText = readOptionalLocalText(cwd, '.productbrain/context.md');
+    const briefingText = readOptionalLocalText(cwd, '.productbrain/briefing.md');
+    const callerRefs = Array.isArray(callerSignals.reviewedArtifactRefs) ? callerSignals.reviewedArtifactRefs.join('\n') : undefined;
+    // Codex@677: briefing.md (task-specific) reads BEFORE context.md (broad) so its refs collect first — with the per-source cap, context.md can't starve briefing.
+    const refs = collectLocalRefs([
+        callerSignals.taskText ?? undefined,
+        callerSignals.explicitScope ?? undefined,
+        callerRefs,
+        branchName,
+        worktreeName,
+        briefingText,
+        contextText,
+    ]);
+    // F4: dereference "PR #N" refs to diff paths, folded into changedPaths — the only place this can happen (server records dereferenced:false, no git access). Time-boxed; absent/unauthed gh no-ops.
+    const prDiffPaths = [];
+    if (callerSignals.changedPaths === undefined) {
+        let derefed = 0;
+        for (const ref of refs) {
+            const prNumber = prNumberFromRef(ref);
+            if (prNumber === null)
+                continue;
+            if (derefed >= PR_DIFF_MAX_REFS)
+                break;
+            derefed++;
+            try {
+                for (const p of prDiff(cwd, prNumber))
+                    prDiffPaths.push(p);
+            }
+            catch {
+                // gh absent / unauthed / PR missing — skip gracefully, leave existing behavior.
+            }
+        }
+    }
+    // Caller-supplied changedPaths win (backward compat); otherwise union the
+    // three local sources, deduped, order-stable.
+    const unionedChangedPaths = callerSignals.changedPaths ??
+        Array.from(new Set([...dirtyChangedPaths, ...branchChangedPaths, ...prDiffPaths]));
+    const baseSignals = sanitizeStartupResolutionSignals({
+        ...callerSignals,
+        sourceSurface: callerSignals.sourceSurface ?? 'cli',
+        resolverVersion: callerSignals.resolverVersion ?? STARTUP_RESOLUTION_RESOLVER_VERSION,
+        branchName: callerSignals.branchName ?? branchName,
+        worktreeName: callerSignals.worktreeName ?? worktreeName,
+        changedPaths: unionedChangedPaths,
+        reviewedArtifactRefs: callerSignals.reviewedArtifactRefs ?? refs,
+        commitSha: callerSignals.commitSha ?? commitSha,
+    });
+    const taskText = deriveHandshakeStartupTask(baseSignals.reviewedArtifactRefs ?? [], baseSignals.changedPaths ?? [], baseSignals.taskText);
+    const sanitized = sanitizeStartupResolutionSignals({
+        ...baseSignals,
+        taskText,
+    });
+    const hasMeaningfulEvidence = Boolean(sanitized.taskText) ||
+        (sanitized.changedPaths?.length ?? 0) > 0 ||
+        (sanitized.reviewedArtifactRefs?.length ?? 0) > 0 ||
+        Boolean(sanitized.explicitScope);
+    if (hasMeaningfulEvidence)
+        return sanitized;
+    // Codex@704: even with no evidence, emit a minimal envelope carrying attribution — {} would
+    // drop the whole startup block, losing the loud domain-unresolved signal (spec "Loud Unresolved State", AC #4).
+    return sanitizeStartupResolutionSignals({
+        sourceSurface: sanitized.sourceSurface ?? 'cli',
+        resolverVersion: sanitized.resolverVersion ?? STARTUP_RESOLUTION_RESOLVER_VERSION,
+        branchName: sanitized.branchName,
+        worktreeName: sanitized.worktreeName,
+        commitSha: sanitized.commitSha,
+        changeId: sanitized.changeId,
+    });
+}
+/** Normalize volatile handshake-only timestamps before comparing generated files — keeps visible
+ *  timestamps in artifacts while avoiding meaningless rewrites when content is unchanged. */
 export function normalizeHandshakeContentForComparison(content) {
     return content
         .replace(/<!-- auto-generated by pb handshake — [0-9]{4}-[0-9]{2}-[0-9]{2}T[^>]+ -->/g, '<!-- auto-generated by pb handshake — <TIMESTAMP> -->')
         .replace(/^_Generated: [0-9]{4}-[0-9]{2}-[0-9]{2}T.*_$/gm, '_Generated: <TIMESTAMP>_');
 }
 function shouldWriteAdapter(filePath, force) {
-    if (force)
-        return true;
+    // An absent file at an adapter path is a projection target → materialize it.
     if (!existsSync(filePath))
         return true;
     const content = readFileSync(filePath, 'utf8');
+    // No MARKER → user-owned/committed-static (CLAUDE.md, AGENTS.md, Copilot instructions) — never overwritten, not even under --force.
+    void force;
     return content.includes(MARKER);
 }
+function normalizeSurfaceName(surface) {
+    const stripped = surface.startsWith('.') ? surface.slice(1) : surface;
+    const normalized = stripped === 'github' ? 'copilot' : stripped;
+    return normalized in SURFACE_REGISTRY ? normalized : null;
+}
+function surfacePerimeterRoots(surface) {
+    if (surface === 'codex')
+        return ['.codex', SURFACE_REGISTRY.codex.hookFilePath];
+    if (surface === 'copilot')
+        return ['.github', SURFACE_REGISTRY.copilot.hookFilePath];
+    if (surface === 'claude')
+        return ['.claude', 'CLAUDE.md'];
+    return [`.${surface}`];
+}
+// ── WP-421 S3: Three-bucket drift classification (doneWhen #17) — now its own module (STD-2/DEC-1504
+// shrink-only offset). Re-exported so existing imports `from '../commands/handshake.js'` keep working.
+export { classifyDriftBucket };
 function deduplicateEntries(entries) {
     const seen = new Set();
     const result = [];
@@ -432,46 +513,35 @@ function deduplicateEntries(entries) {
     return result;
 }
 /**
- * resolveProjectionCollision — WP-379 S5b
- *
- * Marker-scoped orphan unlink: enumerates target dirs (.cursor/rules/,
- * .claude/rules/, .claude/skills/, .codex/skills/); for each file that has
- * the auto-gen MARKER whose lowercase-normalized filename does NOT match any
- * current active-asset materializedFilename, the file is unlinked.
+ * findLeftoverProjections — WP-379 S5b
  *
- * User-forked files (no MARKER) are never touched, regardless of name.
+ * Lists marker-bearing files under .cursor/rules/, .claude/rules/, .claude/skills/, .codex/skills/
+ * (plus the nested .cursor/skills/<name>/SKILL.md layout) that look stale: orphan (no canonical
+ * asset), stale case/punctuation variant, or a leftover `.dormant` copy. User-owned (no MARKER)
+ * files and unselected `allowedTargets` are never reported.
  *
- * Linux case-collision disambiguation:
- *   1. Exact match (lowercase name == any canonical name): survives.
- *   2. Case-variant with MARKER (marker file, no exact canonical match): unlinked.
- *   3. Ambiguous (zero exact, multiple case-variants with MARKER):
- *      newest mtime wins; all others are unlinked; a collision TEN is
- *      appended to the session capture queue (not fired inline).
+ * Round 12: stops once `LEFTOVER_FILES_MAX + 1` matches are found across the flat + merged
+ * nested-Cursor scan combined — bounds read/enumerate I/O, not just the reported list.
+ * `truncated` says more exist beyond the capped, returned `files`.
  *
- * Returns a list of unlink results so the caller can log/report them.
- *
- * @param cwd         Project root (absolute path).
- * @param assetNames  The current set of canonical asset names from the server
- *                    (e.g. ["Setup-ProductBrain", "chain-rules"]).
- * @param log         Progress log function.
- * @param logErr      Error log function.
+ * @param cursorSkillNames Cursor-specific, SKILL-kind-only canon (falls back to `assetNames`).
+ * @param exactRelativePaths Round 11: exact write-plan paths (forward-slash), exempted from both
+ *   checks — covers asset-less generated files and a canonical raw name not already normalized.
  */
-export function resolveProjectionCollision(cwd, assetNames, log, logErr) {
-    // Target directories by extension suffix.
+export function findLeftoverProjections(cwd, assetNames, allowedTargets, cursorSkillNames, exactRelativePaths) {
     const TARGET_DIRS_BY_EXT = [
-        { dir: join(cwd, '.cursor', 'rules'), ext: '.mdc' },
-        { dir: join(cwd, '.claude', 'rules'), ext: '.md' },
-        { dir: join(cwd, '.claude', 'skills'), ext: '.md' },
-        { dir: join(cwd, '.codex', 'skills'), ext: '.md' },
+        { dir: join(cwd, '.cursor', 'rules'), ext: '.mdc', surface: 'cursor' },
+        { dir: join(cwd, '.claude', 'rules'), ext: '.md', surface: 'claude' },
+        { dir: join(cwd, '.claude', 'skills'), ext: '.md', surface: 'claude' },
+        { dir: join(cwd, '.codex', 'skills'), ext: '.md', surface: 'codex' },
     ];
-    // Build a set of normalized canonical names (without extension) for fast lookup.
-    // We normalize all asset names to detect case-variant collisions.
-    // For each asset name we derive the normalized basename (the part before the ext).
-    // canonicalNormalizedNames: Set<normalized-stem> (lowercase + slug).
     const canonicalNormalizedStems = new Set(assetNames.map((n) => normalizeMaterializedFilename(n)));
-    const results = [];
-    const collisionTens = [];
-    for (const { dir, ext } of TARGET_DIRS_BY_EXT) {
+    const exactPaths = exactRelativePaths ?? new Set();
+    const leftovers = [];
+    let truncated = false;
+    scanLoop: for (const { dir, ext, surface } of TARGET_DIRS_BY_EXT) {
+        if (!allowedTargets.has(surface))
+            continue;
         if (!existsSync(dir))
             continue;
         let files;
@@ -481,14 +551,10 @@ export function resolveProjectionCollision(cwd, assetNames, log, logErr) {
         catch {
             continue; // unreadable dir — skip
         }
-        // Group files by their normalized stem.
-        // normalizedStem → [ { filename, fullPath } ]
-        const groups = new Map();
         for (const filename of files) {
-            if (!filename.endsWith(ext))
+            if (!filename.endsWith(ext) && !filename.endsWith(`${ext}.dormant`))
                 continue;
             const fullPath = join(dir, filename);
-            // Only operate on files that have the auto-gen MARKER.
             let content;
             try {
                 content = readFileSync(fullPath, 'utf8');
@@ -497,115 +563,82 @@ export function resolveProjectionCollision(cwd, assetNames, log, logErr) {
                 continue; // unreadable file — skip
             }
             if (!content.includes(MARKER))
-                continue; // user-forked — never touch
-            const stem = basename(filename, ext);
+                continue; // user-owned — never reported
+            const isDormant = filename.endsWith('.dormant');
+            // A live file the write plan targets by this exact path is canonical by construction.
+            if (!isDormant) {
+                const relativePath = relative(cwd, fullPath).split(sep).join('/');
+                if (exactPaths.has(relativePath))
+                    continue;
+            }
+            const stem = basename(isDormant ? filename.slice(0, -'.dormant'.length) : filename, ext);
             const normalizedStem = normalizeMaterializedFilename(stem);
-            const group = groups.get(normalizedStem) ?? [];
-            group.push({ filename, fullPath });
-            groups.set(normalizedStem, group);
-        }
-        // Evaluate each normalized stem group.
-        for (const [normalizedStem, members] of groups) {
-            const isKnownCanonical = canonicalNormalizedStems.has(normalizedStem);
-            if (!isKnownCanonical) {
-                // All members of this group are orphans (no canonical asset with this stem).
-                // Unlink them all — they're stale projections of an asset no longer in the server.
-                for (const { filename, fullPath } of members) {
-                    try {
-                        unlinkSync(fullPath);
-                        log(`Orphan unlinked: ${fullPath}`);
-                        results.push({ action: 'unlinked', filePath: fullPath, reason: 'orphan-no-canonical-match' });
-                    }
-                    catch (err) {
-                        logErr(`Warning: could not unlink orphan ${fullPath} — ${err instanceof Error ? err.message : String(err)}`);
-                        results.push({ action: 'kept', filePath: fullPath, reason: 'unlink-failed' });
-                    }
-                }
-                continue;
+            let entry = null;
+            if (!canonicalNormalizedStems.has(normalizedStem)) {
+                entry = { path: fullPath, reason: 'orphan — no canonical asset matches this name' };
             }
-            // The stem IS known canonical. Check for case-collision.
-            if (members.length === 1) {
-                // Single file — no collision.
-                results.push({ action: 'kept', filePath: members[0].fullPath, reason: 'canonical-exact' });
-                continue;
+            else if (isDormant) {
+                entry = { path: fullPath, reason: 'leftover .dormant file from an older binary version' };
             }
-            // Multiple files with the same normalized stem → case-collision.
-            // Rule: exact match (filename stem === normalized stem, i.e. already lowercase) wins.
-            const exactMatches = members.filter(({ filename }) => {
-                const stem = basename(filename, ext);
-                return stem === normalizedStem; // lowercase-equal means already normalized
-            });
-            if (exactMatches.length === 1) {
-                // Rule 1: exactly one exact match → keep it, unlink all case-variants.
-                const keeper = exactMatches[0];
-                results.push({ action: 'kept', filePath: keeper.fullPath, reason: 'case-exact-match-wins' });
-                for (const member of members) {
-                    if (member.fullPath === keeper.fullPath)
-                        continue;
-                    try {
-                        unlinkSync(member.fullPath);
-                        log(`Case-variant unlinked: ${member.fullPath} (kept: ${keeper.filename})`);
-                        results.push({ action: 'unlinked', filePath: member.fullPath, reason: 'case-variant-unlinked' });
-                    }
-                    catch (err) {
-                        logErr(`Warning: could not unlink case-variant ${member.fullPath} — ${err instanceof Error ? err.message : String(err)}`);
-                        results.push({ action: 'kept', filePath: member.fullPath, reason: 'unlink-failed' });
-                    }
-                }
-                continue;
+            else if (stem !== normalizedStem) {
+                entry = { path: fullPath, reason: `stale case/punctuation variant — canonical form is "${normalizedStem}${ext}"` };
             }
-            // Rule 3: ambiguous — zero exact matches (or multiple exact matches, which
-            // can't happen on a case-sensitive FS). Newest mtime wins.
-            // Sort by mtime descending: highest mtime = newest = winner.
-            const withStats = members.map(({ filename, fullPath }) => {
-                try {
-                    const { mtimeMs } = statSync(fullPath);
-                    return { filename, fullPath, mtimeMs };
-                }
-                catch {
-                    return { filename, fullPath, mtimeMs: 0 };
-                }
-            });
-            withStats.sort((a, b) => b.mtimeMs - a.mtimeMs);
-            const winner = withStats[0];
-            log(`Case-collision ambiguous for ${normalizedStem}${ext}: newest mtime wins (${winner.filename})`);
-            results.push({ action: 'collision-ten', filePath: winner.fullPath, reason: 'ambiguous-newest-mtime-wins' });
-            const tenMsg = `Handshake case-collision: ambiguous filename for stem "${normalizedStem}${ext}" ` +
-                `(${members.map((m) => m.filename).join(', ')}). ` +
-                `Kept newest: ${winner.filename}. Consider renaming to ${normalizedStem}${ext}.`;
-            collisionTens.push(tenMsg);
-            for (const member of withStats.slice(1)) {
-                try {
-                    unlinkSync(member.fullPath);
-                    log(`Case-variant (ambiguous) unlinked: ${member.fullPath}`);
-                    results.push({ action: 'unlinked', filePath: member.fullPath, reason: 'ambiguous-case-variant-unlinked' });
-                }
-                catch (err) {
-                    logErr(`Warning: could not unlink ambiguous case-variant ${member.fullPath} — ${err instanceof Error ? err.message : String(err)}`);
-                    results.push({ action: 'kept', filePath: member.fullPath, reason: 'unlink-failed' });
-                }
+            if (!entry)
+                continue;
+            leftovers.push(entry);
+            if (leftovers.length > LEFTOVER_FILES_MAX) {
+                truncated = true;
+                leftovers.pop();
+                break scanLoop;
             }
         }
     }
-    return { results, collisionTens };
+    // Nested Cursor skills — extracted to its own module (STD-2/DEC-1504 shrink-only offset).
+    // Skipped once the flat scan already hit the cap; the remaining budget keeps the combined
+    // total across both scans stopping at LEFTOVER_FILES_MAX + 1.
+    if (!truncated && allowedTargets.has('cursor')) {
+        const nested = findLeftoverCursorSkills(cwd, cursorSkillNames ?? assetNames, LEFTOVER_FILES_MAX - leftovers.length);
+        leftovers.push(...nested.files);
+        truncated = nested.truncated;
+    }
+    return { files: leftovers, truncated };
+}
+/** Round 13 (Codex P1, security): strips a `user:token@` userinfo segment from an https remote
+ *  so a credential never reaches JSON output. SSH remotes (`git@host:...`) are untouched — that
+ *  `git@` is a fixed public username, not a secret. */
+function redactGitRemote(remote) {
+    return remote ? remote.replace(/^(https?:\/\/)[^@/]+@/i, '$1') : remote;
+}
+/** Round 13 (Codex P1, security): `pb --json handshake` serialized the report directly — leaking
+ *  an HTTPS git-remote credential and raw Convex `_id`/`_creationTime` on `matchedEntries` (never
+ *  went through the shared runner's `stripConvexInternals`). One public shape, both JSON paths. */
+function toPublicJsonReport(report) {
+    return stripConvexInternals({ ...report, repo: { ...report.repo, gitRemote: redactGitRemote(report.repo.gitRemote) } });
+}
+/** TASK-554 (RULE-659): getOrientView always serves the briefing's facts; a view without them is a broken contract. */
+function servedBriefing(view) {
+    if (view.briefing)
+        return view.briefing;
+    throw new CLIError('The orient view carried no briefing; getOrientView always serves one.', { code: ErrorCode.INTERNAL, category: 'internal' });
 }
 export async function runHandshake(options = {}) {
-    const config = await getConfigOrGuide(() => runHandshake(options));
+    const config = await getConfigOrGuide(async () => { await runHandshake(options); });
     if (!config)
-        return;
+        return undefined;
     const cwd = process.cwd();
     const force = options.force ?? false;
     const dryRun = options.dryRun ?? false;
-    // Preview mode: default when neither --apply nor --dry-run is passed.
-    // --dry-run is kept as a backward-compat alias for preview (same behavior).
+    // Preview mode: default when neither --apply nor --dry-run is passed (--dry-run is a backward-compat alias).
     const preview = !options.apply && !dryRun;
     const applyMode = options.apply === true && !dryRun;
     const level = options.level;
+    // `quiet` gates the final report write (`--json` alone still prints). `suppressProgress`
+    // also silences stdout log() prose in JSON mode. logErr() stays on `quiet` alone (stderr).
     const quiet = options.quiet ?? false;
-    const generate = options.generate ?? false;
+    const suppressProgress = quiet || isJsonMode();
     const timestamp = new Date().toISOString();
-    // Helper: emit progress line only when not quiet (used when handshake is a sub-step)
-    const log = (msg) => { if (!quiet)
+    // Helper: emit progress line only when not suppressed. logErr is gated on `quiet` alone.
+    const log = (msg) => { if (!suppressProgress)
         process.stdout.write(msg + '\n'); };
     const logErr = (msg) => { if (!quiet)
         process.stderr.write(msg + '\n'); };
@@ -624,6 +657,21 @@ export async function runHandshake(options = {}) {
     if (repo.detectedStack.length > 0) {
         log(`Stack: ${repo.detectedStack.join(', ')}`);
     }
+    const startupSignals = deriveHandshakeStartupSignals(cwd, options.startupSignals ?? {});
+    const orientArgs = { tier: 'standard' };
+    if (options.invocationPath)
+        orientArgs.invocationPath = options.invocationPath;
+    if (Object.keys(startupSignals).length > 0) {
+        orientArgs.startupSignals = startupSignals;
+        if (startupSignals.taskText)
+            orientArgs.task = startupSignals.taskText;
+    }
+    // Scopes the role rule lists this orient call returns to THIS session, not a sibling's.
+    const activeSession = readSession();
+    if (activeSession?.sessionId)
+        orientArgs.sessionId = activeSession.sessionId;
+    if (activeSession?.conversationId)
+        orientArgs.conversationId = activeSession.conversationId;
     // 2. Fetch orient view + workspace readiness in parallel (budget max +200ms added latency)
     log('Fetching workspace context...');
     let orientView = null;
@@ -631,7 +679,7 @@ export async function runHandshake(options = {}) {
     try {
         const workspaceReadinessPromise = kernelCall('chain.workspaceReadiness', {}).catch(() => null);
         const [orientResult, readinessRaw] = await Promise.all([
-            kernelCall('chain.getOrientView', {}).catch((err) => {
+            kernelCall('chain.getOrientView', orientArgs).catch((err) => {
                 logErr(`Warning: could not fetch workspace context — ${err instanceof Error ? err.message : err}`);
                 logErr('Continuing with limited context (Chain search + portable knowledge only).');
                 return null;
@@ -646,7 +694,7 @@ export async function runHandshake(options = {}) {
         logErr('Continuing with limited context (Chain search + portable knowledge only).');
     }
     if (workspaceProfile) {
-        log(`Workspace profile: stage=${workspaceProfile.stage}, entries=${workspaceProfile.totalEntries}, governance=${workspaceProfile.governanceMode}`);
+        log(`Workspace profile: entries=${workspaceProfile.totalEntries}`);
     }
     // 3. Build search queries from repo context
     const searchQueries = [];
@@ -668,211 +716,56 @@ export async function runHandshake(options = {}) {
         const searchResults = await Promise.all(uniqueQueries.map((q) => kernelCall('chain.searchEntries', { query: q }).catch(() => [])));
         matchedEntries = deduplicateEntries(searchResults.flat());
     }
-    // 5. Read canonical skills & rules — DB-first (WP-345 S0c, TEN-1459), FS fallback.
-    // Primary: query setup.listAssetsForUser from DB (workspace SSOT).
-    // Fallback: read from .productbrain/ filesystem (legacy — used when DB is empty or unavailable).
+    // 5. Read canonical skills & rules — DB-first (WP-345 S0c, TEN-1459): query setup.listAssetsForUser, FS fallback.
     const pbDir = join(cwd, '.productbrain');
-    let dbSkills = [];
-    let dbRules = [];
-    let usedDbSource = false;
-    let dbAssetRows = [];
-    // WP-379 S4: dormant assets (gate-failed) — their on-disk files get the dormant marker.
-    let dormantDbAssetRows = [];
-    // WP-379 S5b: whether any setup_receipt exists for this workspace (first-run UX gate).
-    // undefined when server is pre-S5b (treat as unknown → suppress drift TENs conservatively).
-    let hasAnyReceipt = undefined;
-    const dbProjectionHashes = new Map();
-    try {
-        // WP-379 S4: listAssetsForUser now returns { activeAssets, dormantAssets }.
-        // Wire format changed from DbAsset[] to { activeAssets: DbAsset[], dormantAssets: DbAsset[] }.
-        // Fall back to empty arrays if the server returns the old flat-array shape (graceful degradation).
-        const rawResponse = await kernelCall('setup.listAssetsForUser', {}).catch(() => null);
-        let dbAssets = [];
-        if (rawResponse !== null) {
-            if (Array.isArray(rawResponse)) {
-                // Pre-S4 server — treat entire response as active assets with no dormant list.
-                dbAssets = rawResponse;
-                dormantDbAssetRows = [];
-                hasAnyReceipt = undefined; // unknown on legacy servers
-            }
-            else {
-                dbAssets = rawResponse.activeAssets ?? [];
-                dormantDbAssetRows = rawResponse.dormantAssets ?? [];
-                // WP-379 S5b: extract hasAnyReceipt when provided by the server.
-                // undefined means pre-S5b server — we treat as unknown (no receipts assumed).
-                hasAnyReceipt = rawResponse.hasAnyReceipt;
-            }
-        }
-        if (dbAssets.length > 0) {
-            dbAssetRows = dbAssets;
-            // Map DB assets to CanonicalSkill/CanonicalRule shapes
-            for (const asset of dbAssets) {
-                if (asset.disabledByOwner)
-                    continue;
-                if (asset.assetKind === 'skill') {
-                    dbSkills.push({
-                        name: asset.name,
-                        description: asset.description,
-                        triggers: asset.triggers ?? [],
-                        body: asset.body,
-                        sourcePath: `db:${asset.entryId}`,
-                    });
-                }
-                else if (asset.assetKind === 'rule' || asset.assetKind === 'hook') {
-                    dbRules.push({
-                        name: asset.name,
-                        description: asset.description,
-                        autoApply: false,
-                        body: asset.body,
-                        sourcePath: `db:${asset.entryId}`,
-                    });
-                }
-            }
-            usedDbSource = true;
-            log(`Setup assets: ${dbSkills.length} skills, ${dbRules.length} rules/hooks from DB (WP-345 DB-first path)`);
-            if (dormantDbAssetRows.length > 0) {
-                log(`Setup assets: ${dormantDbAssetRows.length} dormant (gate-filtered) asset(s) will be marked on disk`);
-            }
-        }
-    }
-    catch {
-        // DB source unavailable — silently fall through to FS path
+    const manifestStatus = readManifestStatus(pbDir);
+    const manifest = manifestStatus.manifest;
+    const surfaceValidation = validateSurfacesForMode(manifestStatus.mode, manifestStatus.surfaces);
+    if (applyMode && surfaceValidation.error === SURFACE_GOVERN_NO_SURFACES) {
+        throw new CLIError('materialize: govern requires at least one registered manifest surface.', {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: 'Add surfaces such as `.cursor` or `.claude` to .productbrain/manifest.yaml.',
+        });
     }
-    const allSkills = usedDbSource ? dbSkills : readCanonicalSkills(pbDir);
-    const manualRules = usedDbSource ? dbRules : readCanonicalRules(pbDir);
-    if (!usedDbSource) {
-        log('Setup assets: reading from filesystem (DB source unavailable or empty)');
+    for (const surface of surfaceValidation.unregisteredSurfaces) {
+        logErr(`Warning: manifest surface "${surface}" is not registered; skipping it.`);
     }
-    // 5a-pre. E4: Resolve semantic refs in DB assets (WP-345, DEC-A, DEC-C, DEC-K)
-    // For each asset with semanticRefs[], resolve them via the Convex resolver and
-    // replace {{ref:key}} placeholders in the body. Runs in apply mode only (not preview).
-    // NG11: PostHog events fire from CLI side only (never inside Convex mutations).
-    if (usedDbSource && applyMode) {
-        const projectableDbAssets = dbAssetRows.filter((a) => !a.disabledByOwner && (a.assetKind === 'skill' || a.assetKind === 'rule' || a.assetKind === 'hook'));
-        const assetsWithRefs = projectableDbAssets.filter((a) => a.semanticRefs && a.semanticRefs.length > 0);
-        if (assetsWithRefs.length > 0) {
-            log(`Resolving semantic refs for ${assetsWithRefs.length} asset(s)...`);
-            // Collect unique ref keys across all assets
-            const allRefKeys = [...new Set(assetsWithRefs.flatMap((a) => a.semanticRefs))];
-            // Resolve all refs in a single batch call. Shape: SetupRefResolution[]
-            // (DEC-767 / WP-354 Build-Order #6 — kind + status discriminator).
-            let resolvedRefs = [];
-            try {
-                resolvedRefs = await kernelCall('setup.resolveSemanticRefs', { semanticRefs: allRefKeys });
-            }
-            catch (err) {
-                trackEvent('setup.refs.resolve_failed', { error: err instanceof Error ? err.message : String(err) });
-                logErr(`Warning: could not resolve semantic refs — ${err instanceof Error ? err.message : String(err)}`);
-            }
-            // Build resolved map: canonicalKey → display name. Only required refs
-            // count as unresolved warnings; seed/unknown refs are not gates.
-            const resolvedMap = new Map();
-            let unresolvedCount = 0;
-            for (const result of resolvedRefs) {
-                if (result.status === 'resolved' && result.localEntryId) {
-                    resolvedMap.set(result.ref, result.localEntryId);
-                    trackEvent('skill.ref.resolved', { ref: result.ref, kind: result.kind });
-                }
-                else if (result.status === 'unsupported-future') {
-                    // seed: refs are explicitly future scope per WP-354 Build-Order #6 — not a warning.
-                    trackEvent('skill.ref.future', { ref: result.ref, kind: result.kind });
-                }
-                else if (result.required) {
-                    unresolvedCount++;
-                    trackEvent('skill.ref.unresolved', { ref: result.ref, kind: result.kind, status: result.status });
-                }
-            }
-            if (unresolvedCount > 0) {
-                logErr(`Warning: ${unresolvedCount} required semantic ref(s) could not be resolved.`);
-            }
-            // Projection must preserve ref tokens as portable machine-readable refs.
-            // resolvedMap is only used for validation/telemetry here; generated setup
-            // artifacts keep {{ref:domain:...}} / {{ref:entry:...}} intact.
-        }
-        // Compute projection hash for each projected DB asset (DEC-K).
-        // The stored hash is sha256 of the normalized resolved asset body; DB persistence
-        // is deferred until the write loop confirms a matching file was emitted.
-        // Strip existing hash trailer and timestamp lines, normalize to LF, then hash.
-        const HASH_TRAILER_REGEX = /^<!--\s*pb-hash:.*-->\s*$/gm;
-        const TIMESTAMP_REGEX = /^<!--\s*pb-generated-at:.*-->\s*$/gm;
-        for (const rawAsset of projectableDbAssets) {
-            const resolvedAsset = [...dbSkills, ...dbRules].find((a) => a.sourcePath === `db:${rawAsset.entryId}`);
-            if (!resolvedAsset)
-                continue;
-            try {
-                // Build the projected body (what will be written to disk)
-                const projectedBody = resolvedAsset.body;
-                // Normalize: strip existing hash/timestamp trailers, convert to LF
-                const normalized = projectedBody
-                    .replace(HASH_TRAILER_REGEX, '')
-                    .replace(TIMESTAMP_REGEX, '')
-                    .replace(/\r\n/g, '\n')
-                    .replace(/\r/g, '\n')
-                    .trimEnd();
-                // Compute sha256 hash
-                const hash = createHash('sha256').update(normalized, 'utf8').digest('hex');
-                const hashTrailer = `<!-- pb-hash: sha256:${hash} -->`;
-                // Append hash trailer to the projected body
-                resolvedAsset.body = `${normalized}\n${hashTrailer}`;
-                dbProjectionHashes.set(rawAsset.entryId, {
-                    hash: `sha256:${hash}`,
-                    assetKind: rawAsset.assetKind,
-                });
-                // Drift detection: compare against last known hash
-                if (rawAsset.lastProjectedHash && rawAsset.lastProjectedHash !== `sha256:${hash}`) {
-                    trackEvent('skill.drift.detected', {
-                        entryId: rawAsset.entryId,
-                        assetKind: rawAsset.assetKind,
-                    });
-                    log(`Drift detected for asset ${rawAsset.entryId} — projecting updated version.`);
-                }
-                trackEvent('skill.projection.succeeded', {
-                    entryId: rawAsset.entryId,
-                    assetKind: rawAsset.assetKind,
-                });
-            }
-            catch (err) {
-                trackEvent('skill.projection.failed', {
-                    entryId: rawAsset.entryId,
-                    assetKind: rawAsset.assetKind,
-                });
-                logErr(`Warning: projection failed for ${rawAsset.entryId} — ${err instanceof Error ? err.message : String(err)}`);
-            }
-        }
-    }
-    // 5a. Optionally fetch and merge Chain-derived rules (--generate flag)
-    let chainRulesStats = null;
-    let chainGaps = [];
-    let allRules = manualRules;
-    if (generate) {
-        log('Generating Chain-derived rules...');
-        const chainResult = await generateChainRules(kernelCall, manualRules);
-        if (chainResult.sentinel) {
-            // MCP unavailable — inject sentinel rule and warn
-            allRules = [...manualRules, chainResult.sentinel];
-            logErr('Warning: Chain MCP unavailable — generated rules are disabled. Sentinel rule injected.');
+    const manifestTargets = new Set(surfaceValidation.registeredSurfaces);
+    const cliTargets = new Set();
+    const ignoredCliSurfaces = [];
+    for (const surface of options.surfaces ?? []) {
+        const normalized = normalizeSurfaceName(surface);
+        if (normalized && manifestTargets.has(normalized)) {
+            cliTargets.add(normalized);
         }
         else {
-            // Merge generated rules after manual rules (manual takes precedence on dedup)
-            allRules = [...manualRules, ...chainResult.rules];
-            chainRulesStats = chainResult.stats;
-            chainGaps = chainResult.gaps;
-            const { generatedRules, suppressedByManual, suppressedByZeroEntries } = chainResult.stats;
-            log(`Chain-derived rules: ${generatedRules} generated, ${suppressedByManual} suppressed by manual, ${suppressedByZeroEntries} gaps`);
-            if (chainGaps.length > 0) {
-                log(`Gaps (no matching governance entries): ${chainGaps.join(', ')}`);
-            }
-            // Diff: compare current state against previous run
-            const previousState = loadPreviousState(pbDir);
-            const currentState = buildCurrentState(chainResult.rules, chainResult.classified);
-            saveHandshakeState(pbDir, chainResult.rules, chainResult.classified);
-            const diff = diffHandshakeState(currentState, previousState);
-            const diffText = formatDiff(diff);
-            log(diffText);
+            ignoredCliSurfaces.push(surface);
         }
     }
-    // 5b. Read personal layer (WP-310 E2) — machine-local rules/skills from .productbrain/.local/
-    // Returns [] when the directory is absent. All returned entries have persist: 'local'.
+    if (ignoredCliSurfaces.length > 0) {
+        logErr(`Warning: --surfaces ignored outside manifest.surfaces: ${ignoredCliSurfaces.join(', ')}`);
+    }
+    const allowedTargets = options.surfaces && options.surfaces.length > 0
+        ? cliTargets
+        : manifestTargets;
+    const perimeterManifest = {
+        surfaces: [...manifestTargets].flatMap(surfacePerimeterRoots),
+    };
+    const authorityCanWrite = manifestStatus.mode === 'project' || manifestStatus.mode === 'govern';
+    const authorityPreviewOnly = applyMode && !authorityCanWrite;
+    const writeMode = applyMode && authorityCanWrite;
+    // TASK-554 (TEN-4036): materialize governs the coding-tool surfaces (DEC-951). PB's own files
+    // under .productbrain/ (context.md, briefing.md, generated/) refresh on every --apply wherever
+    // that folder exists; mode `off` means it does not (DEC-955), and then nothing is created.
+    const pbOwnedWriteMode = applyMode && manifestStatus.mode !== 'off';
+    // Skills and rules are read from the filesystem only (WP-776 S3f, DEC-1771).
+    const allSkills = readCanonicalSkills(pbDir);
+    const manualRules = readCanonicalRules(pbDir);
+    // The --generate flag and its chain-rules generator are gone: the everyone/team/role rule lists
+    // (DEC-1774) are the rule-delivery path (context.md, chain.mdc, everyone-rules.md).
+    let allRules = manualRules;
+    // 5b. Read personal layer (WP-310 E2) — machine-local rules/skills from .productbrain/.local/, [] if absent, all persist: 'local'.
     const personalRules = readPersonalLayer(pbDir);
     if (personalRules.length > 0) {
         // Name collision detection — warn when a personal rule overrides a team rule
@@ -895,14 +788,12 @@ export async function runHandshake(options = {}) {
         }
         allSkills.push(...personalSkills);
     }
-    // 5c. Apply manifest-based adoption filter (WP-310 E1)
-    // readManifest returns null when manifest.yaml is absent → filterByAdoptionState is a no-op.
-    const manifest = readManifest(pbDir);
-    // 5d. Load method registry (WP-310 E4) — only when manifest is present.
+    // 5d. Load method registry (WP-310 E4) — only when manifest is present. Unrelated to the
+    // setup-assets system (WP-329's own "methods" Chain collection, no setup.* coupling) — kept.
     let registrySource;
     let registryStale;
     if (manifest) {
-        const registryResult = await loadMethodRegistry(manifest.method_source, kernelCall).catch(() => null);
+        const registryResult = await loadMethodRegistry().catch(() => null);
         if (registryResult) {
             registrySource = registryResult.source;
             registryStale = registryResult.stale;
@@ -913,24 +804,10 @@ export async function runHandshake(options = {}) {
     // Compute adoption counts for report (only meaningful when manifest is present)
     const adoptedRulesCount = manifest ? adoptionFilteredRules.length : undefined;
     const rejectedRulesCount = manifest ? allRules.length - adoptionFilteredRules.length : undefined;
-    // Apply level filtering with stage-gating (after adoption filter, before target filtering in write loop)
-    // Stage caps the effective level: blank→beginner, seed→intermediate, grounded+→expert.
-    // If stage caps below the requested level, log it so the user knows why items were dropped.
-    const profileStage = workspaceProfile?.stage;
-    const levelFilteredSkills = filterByLevel(adoptionFilteredSkills, level, profileStage);
-    const levelFilteredRules = filterByLevel(adoptionFilteredRules, level, profileStage);
-    // Log when stage gating changes the effective level
-    if (profileStage) {
-        const stageCap = STAGE_TO_MAX_LEVEL[profileStage];
-        if (stageCap) {
-            const requestedIdx = level ? LEVEL_ORDER.indexOf(level) : LEVEL_ORDER.length - 1;
-            const capIdx = LEVEL_ORDER.indexOf(stageCap);
-            if (capIdx < requestedIdx) {
-                log(`Stage "${profileStage}" caps level from ${level || 'expert'} to ${stageCap}`);
-            }
-        }
-    }
-    // Apply when-condition filtering (stage-aware, workspace profile + repo context)
+    // Level filtering: requested level only (WP-762 C4e-2, DEC-1800 — no more stage cap).
+    const levelFilteredSkills = filterByLevel(adoptionFilteredSkills, level);
+    const levelFilteredRules = filterByLevel(adoptionFilteredRules, level);
+    // Apply when-condition filtering (workspace profile + repo context)
     const canonicalSkills = levelFilteredSkills.filter((skill) => {
         const result = evaluateConditions(skill.conditions ?? {}, workspaceProfile, repo);
         if (dryRun && !result.included) {
@@ -951,26 +828,23 @@ export async function runHandshake(options = {}) {
     if (dryRun && canonicalRules.length > 0) {
         log(`  INCLUDED rules: ${canonicalRules.map((r) => r.name).join(', ')}`);
     }
+    const noProjectionAssets = findNoProjectionAssets(canonicalSkills, canonicalRules);
     if (canonicalSkills.length > 0 || canonicalRules.length > 0) {
         const levelSuffix = level ? ` (level: ${level})` : '';
-        const stageSuffix = profileStage ? `, stage: ${profileStage}` : '';
         const stackSuffix = repo.detectedStack.length > 0 ? `, stack: [${repo.detectedStack.join(', ')}]` : '';
         const totalSkills = allSkills.length;
         const totalRules = allRules.length;
-        log(`Portable knowledge: ${canonicalSkills.length}/${totalSkills} skills, ${canonicalRules.length}/${totalRules} rules${levelSuffix}${stageSuffix}${stackSuffix}`);
+        log(`Portable knowledge: ${canonicalSkills.length}/${totalSkills} skills, ${canonicalRules.length}/${totalRules} rules${levelSuffix}${stackSuffix}`);
     }
     // 6. Generate file contents
-    // Build workspace context for AGENTS.md enrichment (stage, focus, governance, entry count)
+    // Build workspace context for AGENTS.md enrichment (focus, entry count) — TASK-435 (C4c) deleted `stage` from it.
     const agentsWorkspaceContext = workspaceProfile
         ? {
-            stage: workspaceProfile.stage,
-            focus: orientView?.strategicContext?.currentBet ?? undefined,
-            governanceMode: workspaceProfile.governanceMode,
+            focus: orientView?.strategicContext?.currentWorkPackage ?? undefined,
             totalEntries: workspaceProfile.totalEntries,
         }
         : undefined;
-    // Collect codex-targeted skills for AGENTS.md skill directory
-    // Exclude persist: 'local' rules — committed adapter files must never include local-only rules.
+    // Collect codex-targeted skills for AGENTS.md skill directory — persist: 'local' entries included (all projections are local-only now).
     const agentsCodexSkills = canonicalSkills
         .filter((s) => shouldEmitToTarget(s, 'codex'))
         .map((s) => ({
@@ -1000,15 +874,27 @@ export async function runHandshake(options = {}) {
         skills: copilotSkills.length > 0 ? copilotSkills : undefined,
         rules: copilotRules.length > 0 ? copilotRules : undefined,
     };
-    const contextContent = orientView ? generateContextMd(orientView, repo, timestamp, workspaceProfile?.stage) : null;
+    // TASK-554 (WP-777, DEC-1888): one workspace briefing (spine and the Everyone rule list, from
+    // the kernel builder) feeds context.md, everyone-rules.md and chain.mdc. `null` means the orient
+    // fetch failed: the two briefing files are not written (and a stale copy is removed in apply
+    // mode below), and chain.mdc says the briefing is unavailable.
+    const workspaceBriefingLines = orientView ? formatWorkspaceBriefingLines(servedBriefing(orientView), orientView.ruleLists) : null;
+    const contextContent = orientView && workspaceBriefingLines ? generateContextMd(orientView, workspaceBriefingLines, repo, timestamp) : null;
+    const everyoneRulesContent = workspaceBriefingLines ? generateEveryoneRulesMd(workspaceBriefingLines, timestamp) : null;
     const briefingContent = generateBriefingMd(matchedEntries, repo, uniqueQueries, timestamp);
     const agentsContent = generateAgentsMd(timestamp, {
         workspaceContext: agentsWorkspaceContext,
         skills: agentsCodexSkills.length > 0 ? agentsCodexSkills : undefined,
     });
     const claudeContent = generateClaudeMd(timestamp);
-    const cursorContent = generateCursorMdc(timestamp);
+    const cursorContent = generateCursorMdc(timestamp, workspaceBriefingLines);
     const copilotContent = generateCopilotMd(timestamp, copilotOptions);
+    // DEC-1343: one committed .github/instructions/<slug>.instructions.md per copilot rule with applyTo; repo-wide rules stay above.
+    const copilotInstructionFiles = generateCopilotInstructionFiles(canonicalRules
+        .filter((r) => shouldEmitToTarget(r, 'copilot'))
+        // `.github/instructions/` is COMMITTED — never project a machine-local (persist: 'local') rule into it.
+        .filter((r) => r.persist !== 'local')
+        .map((r) => ({ name: r.name, body: r.body, applyTo: r.applyTo, sourcePath: r.sourcePath })), timestamp);
     const boundaryEnforcementMode = getBoundaryEnforcementMode(manifest);
     const boundaryManifestContent = boundaryEnforcementMode === 'advisory'
         ? null
@@ -1017,17 +903,30 @@ export async function runHandshake(options = {}) {
     const filesWritten = [];
     const filesSkipped = [];
     const previewPlan = [];
-    // Surface filtering: skip adapter writes for targets not in the allowed set
-    const allowedTargets = options.surfaces && options.surfaces.length > 0
-        ? new Set(options.surfaces)
-        : null; // null = write all
     const writes = [
         ...(contextContent ? [{ path: join(cwd, '.productbrain', 'context.md'), relative: '.productbrain/context.md', content: contextContent, dirs: join(cwd, '.productbrain'), isAdapter: false }] : []),
+        ...(everyoneRulesContent
+            ? [{
+                    path: join(cwd, '.productbrain', 'generated', 'everyone-rules.md'),
+                    relative: '.productbrain/generated/everyone-rules.md',
+                    content: everyoneRulesContent,
+                    dirs: join(cwd, '.productbrain', 'generated'),
+                    isAdapter: false,
+                }]
+            : []),
         { path: join(cwd, '.productbrain', 'briefing.md'), relative: '.productbrain/briefing.md', content: briefingContent, isAdapter: false },
-        { path: join(cwd, 'AGENTS.md'), relative: 'AGENTS.md', content: agentsContent, isAdapter: true, target: 'codex' },
-        { path: join(cwd, 'CLAUDE.md'), relative: 'CLAUDE.md', content: claudeContent, isAdapter: true, target: 'claude' },
+        { path: join(cwd, 'AGENTS.md'), relative: 'AGENTS.md', content: agentsContent, isAdapter: true, target: 'codex', augmentTarget: true },
+        { path: join(cwd, 'CLAUDE.md'), relative: 'CLAUDE.md', content: claudeContent, isAdapter: true, target: 'claude', augmentTarget: true },
         { path: join(cwd, '.cursor', 'rules', 'chain.mdc'), relative: '.cursor/rules/chain.mdc', content: cursorContent, dirs: join(cwd, '.cursor', 'rules'), isAdapter: true, target: 'cursor' },
         { path: join(cwd, '.github', 'copilot-instructions.md'), relative: '.github/copilot-instructions.md', content: copilotContent, dirs: join(cwd, '.github'), isAdapter: true, target: 'copilot' },
+        ...copilotInstructionFiles.map((f) => ({
+            path: join(cwd, f.relativePath),
+            relative: f.relativePath,
+            content: f.content,
+            dirs: join(cwd, '.github', 'instructions'),
+            isAdapter: true,
+            target: 'copilot',
+        })),
         ...(boundaryManifestContent ? [{
                 path: join(cwd, '.productbrain', 'generated', 'boundaries.json'),
                 relative: '.productbrain/generated/boundaries.json',
@@ -1093,76 +992,163 @@ export async function runHandshake(options = {}) {
             dbAssetEntryId,
         });
     }
-    // Add Claude Code rule copies (filtered by target)
-    const claudeProfile = resolveSurfaceProfile('claude');
-    for (const rule of canonicalRules) {
-        if (!shouldEmitToTarget(rule, 'claude'))
-            continue;
-        const dbAssetEntryId = rule.sourcePath.startsWith('db:') ? rule.sourcePath.slice(3) : undefined;
-        writes.push({
-            path: join(cwd, '.claude', 'rules', `${rule.name}.md`),
-            relative: `.claude/rules/${rule.name}.md`,
-            content: generateClaudeRule(rule, claudeProfile),
-            dirs: join(cwd, '.claude', 'rules'),
-            isAdapter: true,
-            target: 'claude',
-            dbAssetEntryId,
-        });
+    // 7a. WP-379 S5b: find leftover projections (apply mode) — REPORT-ONLY (coordinator ruling, PR
+    // #912 round 10), see findLeftoverProjections's own header. WP-776 S3f: gated on writeMode
+    // alone now — the DB source (dbQuerySucceeded) is gone, so activeAssetNames comes from the
+    // filesystem-sourced allSkills/allRules (which already include the personal layer, merged in
+    // above) instead of dbAssetRows.
+    let leftoverFiles = [];
+    let leftoverFilesTruncated = false;
+    // TASK-554 (RULE-659): a failed orient fetch is named in the report, and apply removes stale briefing copies.
+    if (orientView === null) {
+        for (const path of ['.productbrain/context.md', '.productbrain/generated/everyone-rules.md'])
+            filesSkipped.push({ path, reason: 'briefing unavailable — the orient fetch failed' });
+        const stale = pbOwnedWriteMode ? removeStaleBriefingProjections(cwd) : [];
+        if (stale.length > 0)
+            logErr(`Warning: the workspace briefing could not be fetched; removed the stale ${stale.join(', ')}.`);
     }
-    // Add Claude Code skill router (filtered by target)
-    const claudeSkills = canonicalSkills.filter((s) => shouldEmitToTarget(s, 'claude'));
-    const skillRouterContent = generateClaudeSkillRouter(claudeSkills, claudeProfile);
-    if (skillRouterContent) {
-        writes.push({
-            path: join(cwd, '.claude', 'rules', 'skill-router.md'),
-            relative: '.claude/rules/skill-router.md',
-            content: skillRouterContent,
-            dirs: join(cwd, '.claude', 'rules'),
-            isAdapter: true,
-            target: 'claude',
-        });
+    if (writeMode) {
+        retireGeneratedProjections(cwd, log);
+        const activeAssetNames = [
+            ...allSkills.map((s) => s.name),
+            ...allRules.map((r) => r.name),
+        ];
+        // Nested .cursor/skills scan gets its OWN canon: canonicalSkills is SKILL-kind only and
+        // shouldEmitToTarget(_, 'cursor') respects per-skill target routing.
+        const cursorSkillNames = canonicalSkills.filter((s) => shouldEmitToTarget(s, 'cursor')).map((s) => s.name);
+        // Round 11: exempt exact write-plan paths from the leftover scan (see findLeftoverProjections's own doc).
+        const exactRelativePaths = new Set(writes.map((w) => w.relative));
+        const scanResult = findLeftoverProjections(cwd, activeAssetNames, allowedTargets, cursorSkillNames, exactRelativePaths);
+        leftoverFiles = scanResult.files;
+        leftoverFilesTruncated = scanResult.truncated;
     }
-    // 7a. WP-379 S5b: Resolve projection collisions before writing.
-    // In apply mode, enumerate target dirs and unlink any auto-generated files
-    // whose normalized name no longer matches any active asset from the server.
-    // This prevents case-variant orphans from accumulating across handshakes.
-    // Runs only when we have a DB asset list (usedDbSource) — without a DB source,
-    // we can't determine which files are canonical vs. orphan.
-    const collisionTensToFire = [];
-    if (applyMode && usedDbSource) {
-        const activeAssetNames = dbAssetRows
-            .filter((a) => !a.disabledByOwner)
-            .map((a) => a.name);
-        const { collisionTens } = resolveProjectionCollision(cwd, activeAssetNames, log, logErr);
-        collisionTensToFire.push(...collisionTens);
+    // ── WP-436 S3: Vocab projector — fetch workspace vocab context once per handshake. Source-side
+    // stays tokenized; resolves {{vocab:...}} before writing. Fail-open: a failed fetch writes the raw token.
+    const handshakeVocabCtx = await getOrFetchVocabCtx(config.apiKey, async () => {
+        try {
+            const vocab = await kernelCall('chain.getVocabulary', {});
+            if (vocab?.collectionLabels || vocab?.collectionDefaults) {
+                return {
+                    ...(vocab.collectionLabels ? { collectionLabels: vocab.collectionLabels } : {}),
+                    ...(vocab.collectionDefaults ? { collectionDefaults: vocab.collectionDefaults } : {}),
+                };
+            }
+            return null;
+        }
+        catch {
+            return null; // fail-open
+        }
+    });
+    const userOwnedSkipped = [];
+    const cleanBucketPaths = [];
+    const tamperedBucket = [];
+    // TEN-2155: region augmentation context + symlink dedupe — codexActive gates the AGENTS.md skills-index pointer.
+    const regionCtx = { codexActive: allowedTargets.has('codex') };
+    const malformedRegionPaths = [];
+    // Same inode for two augment targets (e.g. CLAUDE.md symlinked to AGENTS.md): augment only first-seen.
+    const seenAugmentRealpaths = new Set();
+    const augmentTargetSkip = new Set();
+    for (const w of writes) {
+        if (!w.augmentTarget || !w.target || !allowedTargets.has(w.target) || !existsSync(w.path))
+            continue;
+        let real;
+        try {
+            real = realpathSync(w.path);
+        }
+        catch {
+            real = w.path;
+        }
+        if (seenAugmentRealpaths.has(real))
+            augmentTargetSkip.add(w.path);
+        else
+            seenAugmentRealpaths.add(real);
     }
-    const forkedPaths = [];
-    const projectedHashUpdates = new Map();
-    const recordProjectedHash = (entryId) => {
-        if (!applyMode || !entryId)
-            return;
-        const projection = dbProjectionHashes.get(entryId);
-        if (projection)
-            projectedHashUpdates.set(entryId, projection.hash);
-    };
     for (const w of writes) {
         // Surface filtering: skip adapter writes for targets not in the allowed set
-        if (allowedTargets && w.target && !allowedTargets.has(w.target)) {
+        if (w.target && !allowedTargets.has(w.target)) {
             filesSkipped.push({ path: w.relative, reason: `filtered (surface: ${w.target})` });
             if (preview)
                 previewPlan.push({ path: w.relative, status: 'filtered' });
             continue;
         }
+        // ── TEN-2155: augment user-owned CLAUDE.md / AGENTS.md with a marked PB region — runs ahead
+        // of the legacy MARKER gates; absent/legacy-pb-managed fall through to the legacy path.
+        if (w.augmentTarget) {
+            const projection = REGION_PROJECTIONS[w.target];
+            if (projection && existsSync(w.path)) {
+                if (augmentTargetSkip.has(w.path)) {
+                    filesSkipped.push({ path: w.relative, reason: 'symlinked to another augment target — augmented once' });
+                    continue;
+                }
+                const disk = readFileSync(w.path, 'utf8');
+                const cls = classifyAdapterFile(disk);
+                if (cls === 'augmentable' || cls === 'region-present') {
+                    const eol = detectEol(disk);
+                    const region = replaceVocabTokens(projection.build(regionCtx, eol), handshakeVocabCtx);
+                    // Defense-in-depth: the composed region (post vocab-token resolution) must itself be a
+                    // single well-formed region. v1 content has no vocab tokens so this is a no-op, but it
+                    // guards the documented future override/vocab seam from injecting a stray sentinel/MARKER.
+                    if (classifyAdapterFile(region) !== 'region-present') {
+                        filesSkipped.push({ path: w.relative, reason: 'internal: composed PB region malformed — skipped to protect your file' });
+                        if (preview)
+                            previewPlan.push({ path: w.relative, status: 'needs-attention' });
+                        continue;
+                    }
+                    const candidate = cls === 'augmentable' ? spliceAppend(disk, region, eol) : spliceReplace(disk, region);
+                    if (candidate === disk) {
+                        filesSkipped.push({ path: w.relative, reason: 'unchanged' });
+                        if (preview)
+                            previewPlan.push({ path: w.relative, status: 'unchanged' });
+                        continue;
+                    }
+                    if (preview || dryRun) {
+                        filesWritten.push(w.relative + (dryRun ? ' (dry run)' : ''));
+                        if (preview)
+                            previewPlan.push({ path: w.relative, status: 'would-augment' });
+                        continue;
+                    }
+                    if (authorityPreviewOnly) {
+                        // apply + materialize observe/off: honor authority — do NOT write; mirror the legacy
+                        // preview-only skip so the report does not falsely list it as written.
+                        filesSkipped.push({ path: w.relative, reason: `preview-only (materialize: ${manifestStatus.mode})` });
+                        continue;
+                    }
+                    assertSetupWritePath(w.path, perimeterManifest);
+                    writeFileSync(w.path, candidate);
+                    filesWritten.push(w.relative);
+                    continue;
+                }
+                if (cls === 'malformed') {
+                    filesSkipped.push({ path: w.relative, reason: 'malformed PB region — left untouched; fix the pb:region sentinels' });
+                    if (preview)
+                        previewPlan.push({ path: w.relative, status: 'needs-attention' });
+                    malformedRegionPaths.push(w.relative);
+                    continue;
+                }
+                // cls 'pb-managed' falls through to legacy re-projection; 'opt-out' (pb:no-augment) falls through to the user-owned skip.
+            }
+            // absent file → fall through to legacy whole-file CREATE.
+        }
         if (w.isAdapter && !shouldWriteAdapter(w.path, force)) {
-            filesSkipped.push({ path: w.relative, reason: 'exists without auto-generated marker (use --force to overwrite)' });
+            // User-owned: a file at an adapter path without our auto-gen MARKER is the
+            // user's own file. Leave it untouched — never overwrite, never treat as drift
+            // or log a TEN (TEN-2150). Relayed to the connect screen via userOwnedSkipped.
+            filesSkipped.push({ path: w.relative, reason: 'user-owned — left untouched (pb won\'t overwrite your file)' });
             if (preview) {
-                previewPlan.push({ path: w.relative, status: 'forked' });
+                previewPlan.push({ path: w.relative, status: 'user-owned' });
             }
             else {
-                forkedPaths.push(w.relative);
+                userOwnedSkipped.push(w.relative);
             }
             continue;
         }
+        if (w.isAdapter ? authorityPreviewOnly : applyMode && !pbOwnedWriteMode) {
+            filesSkipped.push({
+                path: w.relative,
+                reason: `preview-only (materialize: ${manifestStatus.mode})`,
+            });
+            continue;
+        }
         if (preview || dryRun) {
             // In preview/dry-run mode: check content to distinguish new/update/unchanged
             if (existsSync(w.path)) {
@@ -1187,140 +1173,150 @@ export async function runHandshake(options = {}) {
             }
             continue;
         }
+        // ── WP-421 S3: defer tampered adapter writes (doneWhen #17) — classify pb-managed-clean vs
+        // pb-managed-tampered, deferred not overwritten; post-loop resolves. --force bypasses the defer.
+        if (w.isAdapter && !force) {
+            const drift = classifyDriftBucket(w.path);
+            if (drift && drift.bucket === 'pb-managed-tampered') {
+                tamperedBucket.push({
+                    path: w.path,
+                    relative: w.relative,
+                    content: w.content,
+                    expectedHash: drift.expectedHash,
+                    actualHash: drift.actualHash,
+                    dirs: w.dirs,
+                });
+                // Do NOT write — defer until prompt/refusal resolves the file.
+                continue;
+            }
+            if (drift && drift.bucket === 'pb-managed-clean') {
+                cleanBucketPaths.push(w.relative);
+            }
+        }
+        assertSetupWritePath(w.path, perimeterManifest);
         if (w.dirs)
             mkdirSync(w.dirs, { recursive: true });
+        // WP-436 S3: resolve {{vocab:...}} tokens before writing projected adapter files only
+        // (source-side stays tokenized). Fail-open: undefined vocabCtx falls back to canonicalKey literals.
+        const resolvedContent = w.isAdapter
+            ? replaceVocabTokens(w.content, handshakeVocabCtx)
+            : w.content;
         if (existsSync(w.path)) {
             const current = readFileSync(w.path, 'utf8');
-            const nextNormalized = normalizeHandshakeContentForComparison(w.content);
+            const nextNormalized = normalizeHandshakeContentForComparison(resolvedContent);
             const currentNormalized = normalizeHandshakeContentForComparison(current);
             if (nextNormalized === currentNormalized) {
                 filesSkipped.push({ path: w.relative, reason: 'unchanged' });
-                recordProjectedHash(w.dbAssetEntryId);
                 continue;
             }
         }
-        writeFileSync(w.path, w.content);
+        writeFileSync(w.path, resolvedContent);
         filesWritten.push(w.relative);
-        recordProjectedHash(w.dbAssetEntryId);
     }
-    if (projectedHashUpdates.size > 0) {
-        const updates = [...projectedHashUpdates];
-        const results = await Promise.allSettled(updates.map(([entryId, hash]) => kernelCall('setup.updateLastProjectedHash', { entryId, hash })));
-        results.forEach((result, index) => {
-            if (result.status === 'rejected') {
-                const [entryId] = updates[index];
-                trackEvent('skill.projection.failed', {
-                    entryId,
-                    reason: result.reason instanceof Error ? result.reason.message : String(result.reason),
-                });
-            }
+    // Runs AFTER the write loop (malformed files were never written, nothing to record). TEN-2155:
+    // non-interactive apply refuses on a malformed region — gated on applyMode per STD-263 vi.
+    if (applyMode && malformedRegionPaths.length > 0 && (options.noPrompt || !process.stdout.isTTY)) {
+        throw new CLIError(`Malformed PB region in: ${malformedRegionPaths.join(', ')}`, {
+            code: ErrorCode.VALIDATION_FAILED,
+            category: 'validation',
+            guidance: 'Fix the `<!-- pb:region:start -->` / `<!-- pb:region:end -->` sentinels (one balanced pair), then re-run `pb handshake`.',
         });
     }
-    // 8a. Dormant marker writes (WP-379 S4) — apply mode only.
-    // For each dormant asset (gate-filtered by the server), locate any previously-projected
-    // on-disk files and append the DORMANT_MARKER trailer. Files are NOT deleted.
-    //
-    // Drift TEN exclusion: dormant-marked files have the auto-gen MARKER, so
-    // shouldWriteAdapter() returns true for them. However, because the asset is dormant,
-    // it is NOT in the `writes` array — it was never queued for a fresh write. Therefore,
-    // dormant files will never appear in forkedPaths (forkedPaths only catches files that
-    // ARE in the writes array but fail shouldWriteAdapter). The dormant marker write is a
-    // separate, independent pass that runs BEFORE the drift TEN check — intentionally
-    // after the main write loop to avoid interfering with active asset writes.
-    //
-    // Fail-open: if a dormant marker write fails, log and continue. Never crash the handshake.
-    const dormantMarkedPaths = [];
-    if (applyMode && dormantDbAssetRows.length > 0) {
-        for (const dormantAsset of dormantDbAssetRows) {
-            const candidatePaths = deriveDormantFilePaths(dormantAsset, cwd);
-            for (const filePath of candidatePaths) {
-                try {
-                    const markerResult = writeDormantMarkerToFile(filePath);
-                    if (markerResult === 'written') {
-                        dormantMarkedPaths.push(filePath);
-                        log(`Dormant marker written: ${filePath}`);
-                    }
-                    // 'already-dormant' and 'skipped' are silent no-ops — idempotent.
-                }
-                catch (err) {
-                    // Fail-open: dormant marker write is advisory. Log, never throw.
-                    logErr(`Warning: could not write dormant marker to ${filePath} — ${err instanceof Error ? err.message : String(err)}`);
-                }
-            }
-        }
-    }
-    // 8. Drift logging — if apply mode encountered forked adapters and a session is active, log a draft TEN.
-    // Dormant-marked files are NOT forked — they were intentionally deactivated and have the auto-gen MARKER.
-    // They will never appear in forkedPaths because they are excluded from the `writes` array entirely.
-    //
-    // WP-379 S5b — First-run UX rule:
-    // When `hasAnyReceipt` is false OR undefined (unknown / pre-S5b server), drift TENs are suppressed.
-    // Rationale: on the first handshake, users may have pre-existing non-marked files from manual
-    // setup; we must not flood them with TENs before they've even had one successful materialization.
-    // A TEN fires only after setup_receipt.count >= 1 for this workspace.
-    //
-    // Conservative unknown-treatment: if the server does not provide hasAnyReceipt (old server),
-    // we treat it as "no receipt exists" and suppress the TEN. The day-1 experience is more important
-    // than catching every early drift case; the TEN will fire on the next run once the server is updated.
-    const isFirstRun = hasAnyReceipt !== true; // true when no receipts or unknown
-    if (forkedPaths.length > 0) {
-        if (isFirstRun) {
-            log(`Info: ${forkedPaths.length} adapter(s) skipped (user files without auto-gen marker). ` +
-                'Drift TEN suppressed — first run (no setup receipt yet). Files: ' +
-                forkedPaths.join(', '));
-        }
-        else {
-            const session = readSession();
-            if (session) {
-                const names = forkedPaths.join(', ');
-                kernelCallWithSession('chain.createEntry', {
-                    collectionSlug: 'tensions',
-                    name: `TEN: handshake drift — ${forkedPaths.length} adapter(s) forked, sync blocked`,
-                    status: 'draft',
-                    data: {
-                        description: `pb handshake --apply encountered forked adapters that blocked sync. Files: ${names}. Use --force to overwrite or resolve drift manually.`,
-                    },
-                    sessionId: session.sessionId,
-                    createdBy: `agent:${session.sessionId}`,
-                }).catch(() => { });
+    // ── WP-421 S3: tampered-bucket resolution (doneWhen #17), apply mode only — headless (--no-prompt
+    // / non-TTY) refuses, exit non-zero. WP-776 S3d/S3f: the setup-assets system this resolution used
+    // to offer as an "adopt" alternative (capture tampered edits as a personal-scoped draft via
+    // setup.ingestSetupAsset) is deleted, and with it the only OTHER option besides overwriting —
+    // per DEC-1771 (delete, never hide) there is no shim standing in for that capability. Revert
+    // (re-project canonical content) is the only resolution left; this is a real capability loss
+    // for anyone who was relying on "adopt" to preserve hand-edits, named here rather than silently
+    // dropped. The refusal receipt (`setup.recordTamperRefusal`) is deleted along with the rest of
+    // the setup-assets gateway routes — headless mode still refuses and reports, it just no longer
+    // writes an audit row for the refusal.
+    const revertedTamperedPaths = [];
+    if (writeMode && tamperedBucket.length > 0) {
+        const headless = options.noPrompt === true || !process.stdout.isTTY;
+        if (headless) {
+            // ── Headless refusal path (doneWhen #17) ────────────────────────────────
+            logErr('');
+            logErr(`pb handshake: ${tamperedBucket.length} PB-managed projection file(s) were edited downstream of the auto-gen marker.`);
+            logErr('Headless mode (--no-prompt or no TTY) cannot confirm an overwrite — refusing.');
+            logErr('');
+            const refusedTamperedFiles = tamperedBucket.map((t) => ({
+                path: t.relative,
+                expectedHash: t.expectedHash,
+                actualHash: t.actualHash,
+            }));
+            for (const refused of refusedTamperedFiles) {
+                // Per #17: stderr enumerates each tampered file as
+                // {path, expectedHash, actualHash, bucket}.
+                logErr(`  ${JSON.stringify({ ...refused, bucket: 'pb-managed-tampered' })}`);
             }
-        }
-    }
-    // 8. Case-collision TENs (WP-379 S5b) — fire after the first-run gate.
-    // These are distinct from drift TENs: they record ambiguous filename collisions
-    // where the "newest mtime wins" heuristic was applied. They fire regardless of
-    // first-run status (collision is a data quality issue, not a drift issue).
-    if (collisionTensToFire.length > 0) {
-        const session = readSession();
-        if (session) {
-            for (const tenDescription of collisionTensToFire) {
-                kernelCallWithSession('chain.createEntry', {
-                    collectionSlug: 'tensions',
-                    name: `TEN: handshake case-collision — ambiguous filename resolved by mtime`,
-                    status: 'draft',
-                    data: { description: tenDescription },
-                    sessionId: session.sessionId,
-                    createdBy: `agent:${session.sessionId}`,
-                }).catch(() => { });
+            logErr('');
+            logErr('Re-run interactively to resolve, or use --force to overwrite (data loss).');
+            // Surface the report counts before exit (visibility for CI logs).
+            if (!quiet) {
+                const refusalReport = {
+                    filesWritten,
+                    filesSkipped,
+                    matchedEntries,
+                    searchQueries: uniqueQueries,
+                    repo,
+                    codexWarnings: codexWarnings.length > 0 ? codexWarnings : undefined,
+                    adoptedCount: adoptedRulesCount,
+                    rejectedCount: rejectedRulesCount,
+                    personalRuleCount: personalRules.length > 0 ? personalRules.length : undefined,
+                    personalSkillCount: personalSkills.length > 0 ? personalSkills.length : undefined,
+                    registrySource,
+                    registryStale,
+                    userOwnedSkipped: userOwnedSkipped.length > 0 ? userOwnedSkipped : undefined,
+                    managedCleanCount: cleanBucketPaths.length || undefined,
+                    tamperedFiles: refusedTamperedFiles,
+                    leftoverFiles: leftoverFiles.length > 0 ? leftoverFiles : undefined,
+                    leftoverFilesTruncated: leftoverFilesTruncated || undefined, noProjectionAssets: noProjectionAssets.length > 0 ? noProjectionAssets : undefined, // same-line combine, shrink-only budget
+                };
+                process.stdout.write('\n');
+                process.stdout.write(isJsonMode() ? JSON.stringify(toPublicJsonReport(refusalReport)) + '\n' : formatHandshakeReport(refusalReport) + '\n');
             }
+            // Exit non-zero per #17.
+            process.exit(1);
         }
-    }
-    // 8b. Setup receipt — record which assets were materialized (apply mode only)
-    // Fail-open: receipt write is advisory, never blocks the handshake.
-    if (applyMode) {
-        const session = readSession();
-        const caller = session ? kernelCallWithSession : kernelCall;
-        try {
-            const receiptResult = await caller('setup.materializeSetup', {});
-            if (receiptResult?.assetCount > 0) {
-                log(`Setup receipt: ${receiptResult.assetCount} asset(s) recorded.`);
+        // ── Interactive path: confirm, then revert every tampered file ─────────────
+        log('');
+        log(`pb handshake: ${tamperedBucket.length} PB-managed projection file(s) were edited downstream of the auto-gen marker.`);
+        log('These will be REVERTED (overwritten with canonical content) — there is no adopt/draft path any more.');
+        const proceed = await promptConfirm({
+            message: `Overwrite ${tamperedBucket.length} tampered file(s) with canonical content?`,
+            initialValue: false,
+        });
+        if (proceed) {
+            for (const tamper of tamperedBucket) {
+                log('');
+                log(`Reverting: ${tamper.relative}`);
+                log(`  expected: ${tamper.expectedHash}`);
+                log(`  actual:   ${tamper.actualHash}`);
+                // Re-project canonical content over the tampered file.
+                // WP-436 S3: resolve vocab tokens before writing (all tampered files are adapters).
+                if (tamper.dirs)
+                    mkdirSync(tamper.dirs, { recursive: true });
+                assertSetupWritePath(tamper.path, perimeterManifest);
+                writeFileSync(tamper.path, replaceVocabTokens(tamper.content, handshakeVocabCtx));
+                revertedTamperedPaths.push(tamper.relative);
             }
         }
-        catch (err) {
-            trackEvent('setup.receipt.write_failed', { error: err instanceof Error ? err.message : String(err) });
-            logErr(`Warning: could not write setup receipt — ${err instanceof Error ? err.message : String(err)}`);
+        else {
+            logErr('Skipped — tampered files left as-is; re-run to resolve.');
+            process.exit(1); // doneWhen #17: never exit 0 with a tampered file unresolved (codex review round 3)
         }
     }
+    // DEC-1690: a dormant (gate-failed) asset is simply not projected — dbAssets already comes
+    // from the server's activeAssets list. The WP-379 S4 / WP-426 E4 on-disk marker/rename/restore
+    // machinery (and its .authoring-sync.json registries) is retired: nothing to reconcile.
+    // 8. User-owned files left untouched are NOT drift (TEN-2150) — a marker-less adapter-path
+    // file is the user's own; handshake never wrote it, so no "sync", no draft TEN, just a benign
+    // "Skipped:" surfaced via report.userOwnedSkipped.
+    // 8. Case-collision and dormant-drift TENs are gone (coordinator ruling, PR #912 round 10) —
+    // they existed only to audit automated deletions that no longer happen; `report.leftoverFiles`
+    // below is the single reporting surface now.
     // 9. Report
     const report = {
         filesWritten,
@@ -1329,8 +1325,6 @@ export async function runHandshake(options = {}) {
         searchQueries: uniqueQueries,
         repo,
         codexWarnings: codexWarnings.length > 0 ? codexWarnings : undefined,
-        chainRulesStats: chainRulesStats ?? undefined,
-        chainGaps: chainGaps.length > 0 ? chainGaps : undefined,
         adoptedCount: adoptedRulesCount,
         rejectedCount: rejectedRulesCount,
         personalRuleCount: personalRules.length > 0 ? personalRules.length : undefined,
@@ -1339,11 +1333,27 @@ export async function runHandshake(options = {}) {
         registryStale,
         preview: preview ? true : undefined,
         previewPlan: preview && previewPlan.length > 0 ? previewPlan : undefined,
-        driftConflicts: forkedPaths.length > 0 ? forkedPaths : undefined,
+        userOwnedSkipped: userOwnedSkipped.length > 0 ? userOwnedSkipped : undefined,
+        // WP-421 S3: three-bucket drift report (doneWhen #17). PB-managed-clean is
+        // the count of files whose marker + hash matched. Tampered files were
+        // resolved (reverted) above and are reported separately. WP-776 S3d/S3f:
+        // adoptedTamperedPaths is gone — "adopt" is no longer an option (see the
+        // tampered-bucket resolution comment above).
+        managedCleanCount: cleanBucketPaths.length > 0 ? cleanBucketPaths.length : undefined,
+        revertedTamperedPaths: revertedTamperedPaths.length > 0 ? revertedTamperedPaths : undefined,
+        // REPORT-ONLY leftover-file listing (coordinator ruling, PR #912 round 10) — the human removes these.
+        leftoverFiles: leftoverFiles.length > 0 ? leftoverFiles : undefined,
+        leftoverFilesTruncated: leftoverFilesTruncated || undefined, noProjectionAssets: noProjectionAssets.length > 0 ? noProjectionAssets : undefined, // WP-660 S2 combine
     };
     if (!quiet) {
         process.stdout.write('\n');
-        process.stdout.write(formatHandshakeReport(report) + '\n');
+        process.stdout.write(isJsonMode() ? JSON.stringify(toPublicJsonReport(report)) + '\n' : formatHandshakeReport(report) + '\n');
     }
+    // Return the report so non-UI callers (e.g. prepareConnectContext) can surface
+    // skipped/user-owned files without re-deriving the skip logic (TEN-2107).
+    return report;
 }
+// WP-426 E3/E4: exported test-only surface (not part of the public CLI API). setupAuthoringPath
+// and loadAuthoringSyncState are gone with the setup-authoring sync machinery (WP-776 S3d/S3f).
+export const __test = { MARKER };
 //# sourceMappingURL=handshake.js.map