commandmate 0.43.0 → 0.44.0

package/dist/server/src/lib/verification/env-clean-gate.js

@@ -17,9 +17,13 @@
  *      counted, and it is the single failure this gate must not reproduce.
  *   2. **Additions and removals are judged asymmetrically.** Everything that
  *      existed at task start must still exist, whoever it belonged to — that is
- *      the pkill (#1739) and `kill-server` (#1624) case — with one exception: a
- *      tmux session the baseline recorded as *another CommandMate server's*
- *      (#2627), which that server may close whenever it likes. New things are a
+ *      the pkill (#1739) and `kill-server` (#1624) case — with three exceptions,
+ *      each recorded in the baseline rather than guessed at verification: a
+ *      tmux session of *another CommandMate server* (#2627) or of *this* server's
+ *      worktree in *another repository* (#3043), which their owners close
+ *      whenever they like, and a `.commandmate-demo-vitest-<pid>` directory
+ *      whose pid was already dead (#3043), which the demo-video tests clean up
+ *      by design. New things are a
  *      violation *unless they are attributable to another worker*, because
  *      parallel delegations legitimately start their own sessions and servers
  *      inside each other's measurement windows — or unless they are the one
@@ -31,7 +35,7 @@
  * @module lib/verification/env-clean-gate
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ENV_CLEAN_GUIDANCE = exports.MAX_REPORTED_ENV_CHANGES = exports.readLivePidCwd = exports.REQUIRE_ENV_CLEAN_SOURCE_CONTRACT = exports.REQUIRE_ENV_CLEAN_SOURCE_CONFIG = void 0;
+exports.ENV_CLEAN_GUIDANCE = exports.MAX_REPORTED_ENV_CHANGES = exports.isLivePid = exports.readLivePidCwd = exports.REQUIRE_ENV_CLEAN_SOURCE_CONTRACT = exports.REQUIRE_ENV_CLEAN_SOURCE_CONFIG = void 0;
 exports.resolveRequireEnvClean = resolveRequireEnvClean;
 exports.attributeSessionName = attributeSessionName;
 exports.attributeAnchor = attributeAnchor;
@@ -44,6 +48,10 @@ exports.currentSessionServer = currentSessionServer;
 exports.isOtherServerSession = isOtherServerSession;
 exports.recordOtherServerSessions = recordOtherServerSessions;
 exports.readOtherServerSessions = readOtherServerSessions;
+exports.recordOtherRepositorySessions = recordOtherRepositorySessions;
+exports.readOtherRepositorySessions = readOtherRepositorySessions;
+exports.recordDeadDemoVitestEntries = recordDeadDemoVitestEntries;
+exports.readDeadDemoVitestEntries = readDeadDemoVitestEntries;
 exports.diffEnvSnapshots = diffEnvSnapshots;
 exports.formatEnvCleanReport = formatEnvCleanReport;
 exports.envCleanNoBaseline = envCleanNoBaseline;
@@ -51,6 +59,8 @@ exports.evaluateEnvClean = evaluateEnvClean;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
+const db_instance_1 = require("../../lib/db/db-instance");
+const worktree_db_1 = require("../../lib/db/worktree-db");
 const session_name_1 = require("../../lib/cli-tools/session-name");
 const types_1 = require("../../lib/cli-tools/types");
 const env_snapshot_1 = require("./env-snapshot");
@@ -189,6 +199,16 @@ exports.readLivePidCwd = readLivePidCwd;
  * entry whose owner can be established.
  */
 const DEMO_VITEST_HOME_ENTRY = /^\.commandmate-demo-vitest-([1-9]\d*)$/;
+const isLivePid = (pid) => {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return error.code === 'EPERM';
+    }
+};
+exports.isLivePid = isLivePid;
 /** The pid a `.commandmate-demo-vitest-<pid>` name carries; null for any other name. */
 function demoVitestPid(name) {
     const match = DEMO_VITEST_HOME_ENTRY.exec(name);
@@ -252,11 +272,13 @@ function resolveTaskSessionName(task) {
     }
 }
 /** A freshly captured baseline, stamped with its task's own agent session. */
-function recordTaskSession(snapshot, task, server = currentSessionServer()) {
+function recordTaskSession(snapshot, task, server = currentSessionServer(), isPidAlive = exports.isLivePid) {
     return {
         ...snapshot,
         taskSession: resolveTaskSessionName(task),
         otherServerSessions: recordOtherServerSessions(snapshot, server),
+        otherRepositorySessions: recordOtherRepositorySessions(snapshot, task.worktreeId, server),
+        deadDemoVitestEntries: recordDeadDemoVitestEntries(snapshot, isPidAlive),
     };
 }
 /**
@@ -292,6 +314,14 @@ function currentSessionServer() {
                 return undefined;
             }
         },
+        repositoryOf: (worktreeId) => {
+            try {
+                return (0, worktree_db_1.getWorktreeById)((0, db_instance_1.getDbInstance)(), worktreeId)?.repositoryPath || null;
+            }
+            catch {
+                return null;
+            }
+        },
     };
 }
 /**
@@ -370,6 +400,131 @@ function readOtherServerSessions(baseline) {
         return new Set();
     return new Set(recorded.filter((name) => typeof name === 'string'));
 }
+// =============================================================================
+// This server's sessions of another repository (Issue #3043)
+// =============================================================================
+/**
+ * The repository a session of this server belongs to, or null when that
+ * cannot be pinned to exactly one.
+ *
+ * The worktree id and the instance suffix are not separable by name alone
+ * (`parseSessionName`), so every hyphen-boundary prefix of the tail is looked
+ * up; a prefix that is not a registered worktree answers null and is skipped.
+ * More than one repository among the answers is ambiguous and answers null —
+ * the strict direction, because null excuses nothing.
+ */
+function sessionRepository(tail, server) {
+    const repositoryOf = server.repositoryOf;
+    if (!repositoryOf)
+        return null;
+    const repositories = new Set();
+    let end = tail.indexOf('-');
+    for (;;) {
+        const candidate = end === -1 ? tail : tail.slice(0, end);
+        const repository = repositoryOf(candidate);
+        if (repository)
+            repositories.add(repository);
+        if (end === -1)
+            break;
+        end = tail.indexOf('-', end + 1);
+    }
+    return repositories.size === 1 ? [...repositories][0] : null;
+}
+/**
+ * The baseline's `mcbd-*` sessions of *this* server whose worktree belongs to a
+ * repository other than the task's, at task creation.
+ *
+ * Why this is the second line removals are excused on — the design note for
+ * #3043, which extends the one for #2627 rather than contradicting it:
+ *
+ *   - #1624, the case the removal rule exists for, was a worker killing a
+ *     *sibling worktree of the same repository*. Those sessions stay guarded
+ *     exactly as before: a same-repository removal is never excused, however
+ *     plainly `other` its name is.
+ *   - A worktree of another repository is driven by another orchestrate on the
+ *     same server, which closes its workers' sessions when they finish (the
+ *     2026-09-29 and 2026-09-30 runs, `commandagent-issue-546/554` against
+ *     `commandmate-issue-3023`). A delegation has no business in another
+ *     repository, and the one it is judged for cannot tell that close from a
+ *     kill any better than it could for another server's.
+ *   - It uses the database the #2627 note rejected, but not for what that note
+ *     rejected it for: there the other server's worktrees lived in a different
+ *     database under colliding ids. Here the session carries *this* server's
+ *     namespace, so *this* server's worktree table is the authority on it.
+ *   - Recorded at task creation, like {@link recordOtherServerSessions}: the
+ *     other orchestrate may remove its worktree — and with it the row — before
+ *     this task is verified, and an unknown worktree excuses nothing.
+ *
+ * Still rejected: excusing every `other` removal (drops #1624), counting,
+ * timing and the worker's command log, for the reasons in the #2627 note; and
+ * a "needs review" verdict of its own, because the orchestrator's review of the
+ * same-repository case is exactly the one #1624 needs a hard failure for.
+ *
+ * @returns the names, or null when `server` has no namespace or cannot place
+ *          the task's own worktree
+ */
+function recordOtherRepositorySessions(snapshot, taskWorktreeId, server) {
+    if (server.namespace === null || !server.repositoryOf)
+        return null;
+    const ownRepository = server.repositoryOf(taskWorktreeId);
+    if (!ownRepository)
+        return null;
+    const sessions = snapshot.probes['tmux-sessions'];
+    if (!sessions || sessions.status !== 'ok')
+        return [];
+    return sessions.entries
+        .map((entry) => entry.key)
+        .filter((name) => {
+        if (attributeSessionName(name, taskWorktreeId) !== 'other')
+            return false;
+        if (isOtherServerSession(name, server))
+            return false;
+        const parsed = (0, session_name_1.parseSessionName)(name);
+        if (!parsed)
+            return false;
+        const repository = sessionRepository(parsed.rest, server);
+        return repository !== null && repository !== ownRepository;
+    });
+}
+/** The recorded other-repository sessions of a baseline; empty when none was recorded. */
+function readOtherRepositorySessions(baseline) {
+    const recorded = baseline.otherRepositorySessions;
+    if (!Array.isArray(recorded))
+        return new Set();
+    return new Set(recorded.filter((name) => typeof name === 'string'));
+}
+// =============================================================================
+// Stale demo-vitest directories (Issue #3043)
+// =============================================================================
+/**
+ * The baseline's `.commandmate-demo-vitest-<pid>` entries whose pid was already
+ * dead at task creation.
+ *
+ * Recorded then, because only then is it knowable: a removed directory's pid is
+ * always dead by verification, so the gate could not otherwise tell a leftover
+ * swept up by `env-scripts.test.ts` (#3025, run by any parallel worktree's unit
+ * gate) from a directory a live test run was still using. The latter — a pid
+ * alive at task start — stays a violation: a worker may have deleted a parallel
+ * test's working directory.
+ */
+function recordDeadDemoVitestEntries(snapshot, isPidAlive = exports.isLivePid) {
+    const home = snapshot.probes['home-entries'];
+    if (!home || home.status !== 'ok')
+        return [];
+    return home.entries
+        .map((entry) => entry.key)
+        .filter((name) => {
+        const pid = demoVitestPid(name);
+        return pid !== null && !isPidAlive(pid);
+    });
+}
+/** The recorded dead-pid demo-vitest entries of a baseline; empty when none was recorded. */
+function readDeadDemoVitestEntries(baseline) {
+    const recorded = baseline.deadDemoVitestEntries;
+    if (!Array.isArray(recorded))
+        return new Set();
+    return new Set(recorded.filter((name) => typeof name === 'string' && demoVitestPid(name) !== null));
+}
 function toChange(entry, owner) {
     return { key: entry.key, detail: entry.detail, owner };
 }
@@ -384,6 +539,8 @@ function toChange(entry, owner) {
 function diffEnvSnapshots(baseline, final, context, options = {}) {
     const taskSession = readTaskSession(baseline);
     const otherServerSessions = readOtherServerSessions(baseline);
+    const otherRepositorySessions = readOtherRepositorySessions(baseline);
+    const deadDemoVitestEntries = readDeadDemoVitestEntries(baseline);
     const ignoredHomeEntries = new Set(options.ignoreHomeEntries ?? []);
     const resolvePidCwd = options.resolvePidCwd ?? exports.readLivePidCwd;
     const probes = env_snapshot_1.ENV_PROBE_IDS.map((probeId) => {
@@ -399,6 +556,8 @@ function diffEnvSnapshots(baseline, final, context, options = {}) {
                 taskSessionAdded: [],
                 removed: [],
                 removedByOtherServer: [],
+                removedByOtherRepository: [],
+                removedStaleDemoVitest: [],
                 ignoredByConfig: [],
             };
         }
@@ -412,6 +571,8 @@ function diffEnvSnapshots(baseline, final, context, options = {}) {
                 taskSessionAdded: [],
                 removed: [],
                 removedByOtherServer: [],
+                removedByOtherRepository: [],
+                removedStaleDemoVitest: [],
                 ignoredByConfig: [],
             };
         }
@@ -448,6 +609,8 @@ function diffEnvSnapshots(baseline, final, context, options = {}) {
             after.entries.some((entry) => beforeKeys.has(entry.key) || (taskSession !== null && entry.key === taskSession));
         const removed = [];
         const removedByOtherServer = [];
+        const removedByOtherRepository = [];
+        const removedStaleDemoVitest = [];
         for (const entry of before.entries) {
             if (afterKeys.has(entry.key))
                 continue;
@@ -460,6 +623,14 @@ function diffEnvSnapshots(baseline, final, context, options = {}) {
                 otherServerSessions.has(entry.key)) {
                 removedByOtherServer.push(change);
             }
+            else if (tmuxServerSurvived &&
+                change.owner === 'other' &&
+                otherRepositorySessions.has(entry.key)) {
+                removedByOtherRepository.push(change);
+            }
+            else if (probeId === 'home-entries' && deadDemoVitestEntries.has(entry.key)) {
+                removedStaleDemoVitest.push(change);
+            }
             else {
                 removed.push(change);
             }
@@ -473,6 +644,8 @@ function diffEnvSnapshots(baseline, final, context, options = {}) {
             taskSessionAdded,
             removed,
             removedByOtherServer,
+            removedByOtherRepository,
+            removedStaleDemoVitest,
             ignoredByConfig,
         };
     });
@@ -534,6 +707,14 @@ function formatTaskSessionChanges(changes) {
 function formatRemovedByOtherServer(changes) {
     return changes.map((change) => `    · - ${change.key} (ignored: another CommandMate server's session, recorded at task start)`);
 }
+/** Removals excused as this server's sessions of another repository (#3043), one line each. */
+function formatRemovedByOtherRepository(changes) {
+    return changes.map((change) => `    · - ${change.key} (ignored: a worktree of another repository on this server, recorded at task start)`);
+}
+/** Removals excused as leftover demo-vitest directories (#3043), one line each. */
+function formatRemovedStaleDemoVitest(changes) {
+    return changes.map((change) => `    · - ${change.key} (ignored: its pid was already dead at task start — a leftover swept by the demo-video tests)`);
+}
 function formatIgnoredByConfig(changes) {
     if (changes.length === 0)
         return [];
@@ -567,6 +748,8 @@ function formatEnvCleanReport(diff) {
             lines.push(`  ${probe.probeId} clean (${label})${excused}`);
             lines.push(...formatTaskSessionChanges(probe.taskSessionAdded));
             lines.push(...formatRemovedByOtherServer(probe.removedByOtherServer));
+            lines.push(...formatRemovedByOtherRepository(probe.removedByOtherRepository));
+            lines.push(...formatRemovedStaleDemoVitest(probe.removedStaleDemoVitest));
             lines.push(...formatIgnoredByConfig(probe.ignoredByConfig));
             continue;
         }
@@ -575,6 +758,8 @@ function formatEnvCleanReport(diff) {
         lines.push(...formatChanges('-', probe.removed));
         lines.push(...formatTaskSessionChanges(probe.taskSessionAdded));
         lines.push(...formatRemovedByOtherServer(probe.removedByOtherServer));
+        lines.push(...formatRemovedByOtherRepository(probe.removedByOtherRepository));
+        lines.push(...formatRemovedStaleDemoVitest(probe.removedStaleDemoVitest));
         lines.push(...formatIgnoredByConfig(probe.ignoredByConfig));
         for (const excused of probe.ignoredAdded) {
             lines.push(`    · ${excused.key} (ignored: belongs to another worktree)`);
@@ -599,7 +784,11 @@ function envCleanNoBaseline(taskId, sources) {
     return (`${verify_config_1.ENV_CLEAN_GATE_ID}: UNKNOWN — no baseline snapshot exists for ${who}, so nothing can be ` +
         'compared. This is NOT "the environment is unchanged": no measurement was taken. ' +
         'A baseline is recorded when the task is created (`send --contract`) and only while the ' +
-        `gate is switched on (currently: ${how}). Switch it on, then re-send the task.`);
+        `gate is switched on (currently: ${how}). Switch it on, then re-send the task.` +
+        (taskId
+            ? ''
+            : ' To re-verify this worktree\'s contract task (this run is not attached to a task), run ' +
+                '`commandmate verify <worktree> --task <id>`.'));
 }
 /**
  * Judge the machine against the task's baseline.

package/dist/server/src/lib/verification/gate-runner.js

@@ -50,6 +50,8 @@ const worktree_index_1 = require("./worktree-index");
 // exit-code table the pane prints, so the producer and the reader are one string.
 const run_verdict_vocabulary_1 = require("./run-verdict-vocabulary");
 const scope_gate_1 = require("./scope-gate");
+const receipt_owned_paths_1 = require("../../lib/skills/receipt-owned-paths");
+const agent_state_paths_1 = require("../../lib/skills/agent-state-paths");
 const verify_config_1 = require("./verify-config");
 Object.defineProperty(exports, "ENV_CLEAN_GATE_ID", { enumerable: true, get: function () { return verify_config_1.ENV_CLEAN_GATE_ID; } });
 Object.defineProperty(exports, "SCOPE_GATE_ID", { enumerable: true, get: function () { return verify_config_1.SCOPE_GATE_ID; } });
@@ -816,10 +818,35 @@ async function evaluateWorkEvidence(worktreePath, baseRef, requireCommit, agentE
     if (porcelain.code !== 0) {
         return done('error', "work-evidence: 'git status --porcelain' failed.", null);
     }
-    const uncommittedCount = (0, scope_gate_1.parsePorcelainEntries)(porcelain.stdout).filter((paths) => paths.some((path) => !(0, scope_gate_1.isContractPath)(path))).length;
+    // Untracked files a recorded Skill install placed, untouched since, are
+    // CommandMate's and not the agent's (#3092): installing a Skill alone must
+    // still read as `not_started`. Anything the receipt does not vouch for —
+    // including a Skill file whose bytes changed — is counted as before.
+    const skillOwned = (0, receipt_owned_paths_1.collectSkillReceiptOwnedPaths)(worktreePath);
+    let skillInstalledCount = 0;
+    const agentStateExcluded = new Set();
+    const uncommittedCount = (0, scope_gate_1.parsePorcelainStatusEntries)(porcelain.stdout).filter((entry) => {
+        if (!entry.paths.some((path) => !(0, scope_gate_1.isContractPath)(path)))
+            return false;
+        if ((0, scope_gate_1.isSkillInstalledUntrackedEntry)(entry, skillOwned)) {
+            skillInstalledCount += 1;
+            return false;
+        }
+        if ((0, agent_state_paths_1.isAgentStateUntrackedEntry)(entry)) {
+            entry.paths.forEach((path) => agentStateExcluded.add(path));
+            return false;
+        }
+        return true;
+    }).length;
     const summary = `work-evidence: baseRef=${baseRef} commits=${commitCount} uncommitted=${uncommittedCount}` +
         (requireCommit.required ? ' requireCommit=true' : '') +
-        ' (contract files excluded)';
+        ' (contract files excluded)' +
+        (skillInstalledCount > 0
+            ? ` (${skillInstalledCount} CommandMate-installed Skill file(s) excluded)`
+            : '') +
+        (agentStateExcluded.size > 0
+            ? ` (agent-managed state file(s) excluded: ${[...agentStateExcluded].sort().join(', ')})`
+            : '');
     if (!Number.isFinite(commitCount) || (commitCount === 0 && uncommittedCount === 0)) {
         // Issue #2043, and the ONLY place this gate's verdict differs from what it
         // was: git found nothing, so ask the agent. `null` — every tool but

package/dist/server/src/lib/verification/scope-gate.js

@@ -33,10 +33,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SCOPE_SKIP_NOT_REQUIRED = exports.SCOPE_SKIP_NO_CONTRACT = exports.ScopeMatcher = exports.CONTRACT_DIR_PREFIX = exports.SCOPE_EXEMPT_CONTRACT_PATH = exports.SCOPE_EXEMPT_ALWAYS_ALLOWED = exports.SCOPE_PATTERN_ARROW = exports.ALWAYS_ALLOWED_PREFIX = exports.SCOPE_ALLOW_GUIDANCE = exports.MAX_REPORTED_VIOLATIONS = void 0;
 exports.isContractPath = isContractPath;
 exports.parsePorcelainEntries = parsePorcelainEntries;
+exports.parsePorcelainStatusEntries = parsePorcelainStatusEntries;
+exports.isSkillInstalledUntrackedEntry = isSkillInstalledUntrackedEntry;
 exports.collectChangedPaths = collectChangedPaths;
 exports.scopeSkipDetachedContract = scopeSkipDetachedContract;
 exports.evaluateScope = evaluateScope;
 const child_process_1 = require("child_process");
+const receipt_owned_paths_1 = require("../../lib/skills/receipt-owned-paths");
+const agent_state_paths_1 = require("../../lib/skills/agent-state-paths");
 /**
  * Violations listed in `log_tail` before the rest are summarised as a count.
  *
@@ -311,6 +315,10 @@ function splitNul(output) {
  * as one change (#1580).
  */
 function parsePorcelainEntries(output) {
+    return parsePorcelainStatusEntries(output).map((entry) => entry.paths);
+}
+/** {@link parsePorcelainEntries}, keeping each record's status code (#3092). */
+function parsePorcelainStatusEntries(output) {
     const fields = output.split('\0');
     const entries = [];
     let i = 0;
@@ -328,10 +336,22 @@ function parsePorcelainEntries(output) {
             if (original)
                 paths.push(original);
         }
-        entries.push(paths);
+        entries.push({ status: entry.slice(0, 2), paths });
     }
     return entries;
 }
+/**
+ * Whether a status record is an untracked file a recorded Skill install placed
+ * there, untouched since (#3092).
+ *
+ * Untracked only: a tracked Skill file that changed is a change to what the
+ * branch carries, and stays counted. `owned` comes from
+ * `collectSkillReceiptOwnedPaths`, which already rejects files whose bytes no
+ * longer match the receipt.
+ */
+function isSkillInstalledUntrackedEntry(entry, owned) {
+    return entry.status === '??' && entry.paths.every((path) => owned.has(path));
+}
 /**
  * Every path this worktree changed relative to `baseRef`.
  *
@@ -368,10 +388,30 @@ async function collectChangedPaths(worktreePath, baseRef) {
                 (status.stderr.trim() ? `\n${status.stderr.trim()}` : ''),
         };
     }
+    // Untracked files a recorded Skill install placed are CommandMate's, not the
+    // agent's (#3092). Dropped from the working-tree side only; a committed Skill
+    // file is still judged by the diff above.
+    const skillOwned = (0, receipt_owned_paths_1.collectSkillReceiptOwnedPaths)(worktreePath);
+    // Likewise the state files an agent CLI writes for itself (#3126), by an
+    // explicit declaration of paths; they are reported, not silently dropped.
+    const agentStateExcluded = new Set();
+    const workingTree = parsePorcelainStatusEntries(status.stdout).filter((entry) => {
+        if (isSkillInstalledUntrackedEntry(entry, skillOwned))
+            return false;
+        if ((0, agent_state_paths_1.isAgentStateUntrackedEntry)(entry)) {
+            entry.paths.forEach((path) => agentStateExcluded.add(path));
+            return false;
+        }
+        return true;
+    });
     // Both sides are filtered, not just the working tree: an orchestrator may
     // also have committed the contract as a setup commit (#1580).
-    const paths = new Set([...splitNul(diff.stdout), ...parsePorcelainEntries(status.stdout).flat()].filter((path) => !isContractPath(path)));
-    return { paths: [...paths].sort(), mergeBase: base };
+    const paths = new Set([...splitNul(diff.stdout), ...workingTree.flatMap((entry) => entry.paths)].filter((path) => !isContractPath(path)));
+    return {
+        paths: [...paths].sort(),
+        mergeBase: base,
+        agentStateExcluded: [...agentStateExcluded].sort(),
+    };
 }
 // =============================================================================
 // Gate evaluation
@@ -418,6 +458,18 @@ function formatAdmitted(admitted) {
         ...(remainder > 0 ? [`  ... (+${remainder} more)`] : []),
     ];
 }
+/** The `excluded:` section naming agent-managed state files left out (#3126). */
+function formatAgentStateExcluded(excluded) {
+    if (excluded.length === 0)
+        return [];
+    const listed = excluded.slice(0, exports.MAX_REPORTED_VIOLATIONS);
+    const remainder = excluded.length - listed.length;
+    return [
+        'excluded (agent-managed state files, not counted as change):',
+        ...listed.map((path) => `  ~ ${path}`),
+        ...(remainder > 0 ? [`  ... (+${remainder} more)`] : []),
+    ];
+}
 /**
  * Reasons the gate has nothing to judge, phrased for `log_tail`.
  *
@@ -440,7 +492,8 @@ exports.SCOPE_SKIP_NOT_REQUIRED = 'scope: the contract sets success.requireScope
 function scopeSkipDetachedContract(taskId, status) {
     return (`scope: task ${taskId} declares a scope for this worktree, but it is ${status} and ` +
         'this run was not attached to it, so its scope was NOT judged. ' +
-        'Name the task when starting the run (`wait --verify` does this automatically).');
+        '`wait --verify` attaches only to an in-flight task; to re-verify a finished task, run ' +
+        `\`commandmate verify <worktree> --task ${taskId}\`.`);
 }
 /**
  * Judge the worktree's changes against a contract's scope.
@@ -492,6 +545,7 @@ async function evaluateScope(worktreePath, scope, requireScopeClean, baseRef, co
         `allow: ${formatPatterns(scope.allow)}`,
         `deny: ${formatPatterns(scope.deny)}`,
         ...formatAdmitted(admitted),
+        ...formatAgentStateExcluded(changed.agentStateExcluded),
     ].join('\n');
     if (violations.length === 0) {
         // An empty change set passes: work-evidence is the gate that judges "nothing