@event4u/agent-config 14.21.0 → 14.23.0

package/src/scripts/condense.ts

@@ -48,7 +48,8 @@ import {
 // bundled-CLI-entry-guard landmine. Verified before wiring, not assumed.
 import { build_thin } from './project_thin_rules.js';
 import { build_claude_hook_matrix } from './_lib/claude_settings_hooks.js';
-import { normalizeLeanProjectionMode, writesThinFiles, type LeanProjectionMode } from './_lib/lean_projection_mode.js';
+import { describeDroppedHosts, normalizeLeanProjectionMode, resolveLeanProjectionHosts, thinsHost,
+    writesThinFiles, type LeanProjectionHosts, type LeanProjectionMode } from './_lib/lean_projection_mode.js';
 import { is_claude_builtin_name } from './_lib/claude_builtin_names.js';
 import { project_settings_path, load_agent_settings } from './_lib/agent_settings.js';
 import { rule_is_compile_enabled } from './_lib/compile_time_toggles.js';
@@ -265,9 +266,9 @@ export {
 } from '../install/claudePathsPlan.js';
 import { rule_in_scope } from '../install/ruleInScope.js';
 import { pruneEmptyDirs } from './_lib/prune_empty_dirs.js';
-import { commandsWithheld, partitionActive, personaPartition, setPartitionAnnounce } from '../install/partitionEligibility.js'; // ADR-236
+import { claudeLayerHolds, commandWithheld, keepInProjectLayer, personaPartition } from '../install/partitionEligibility.js'; // ADR-236
 import { dedupableRules, partitionRulesForDir } from '../install/ruleLayerPartition.js'; // ADR-236, per-host evidence
-import { _claude_paths_plan, derive_trigger_globs } from '../install/claudePathsPlan.js';
+import { _claude_paths_plan, applies_when, derive_trigger_globs } from '../install/claudePathsPlan.js';
 
 const _HERE = path.dirname(fileURLToPath(import.meta.url)); // <repo>/src/scripts
 const _DEFAULT_PROJECT_ROOT = path.resolve(_HERE, '..', '..');
@@ -320,7 +321,6 @@ function _deriveState(root: string): ModuleState {
 }
 
 export const MODULE_STATE: ModuleState = _deriveState(_DEFAULT_PROJECT_ROOT);
-setPartitionAnnounce(success); // ADR-236: the mode line must be visible at the default level
 
 /**
  * Test seam — reassign one or more module-state fields, mirroring the pytest
@@ -459,14 +459,17 @@ function _read_projection_scope_dedup(): boolean {
 }
 
 
-function _lean_projection_mode(): LeanProjectionMode {
+function _lean_projection_settings(): { mode: LeanProjectionMode; hosts: LeanProjectionHosts } {
     const data = load_agent_settings({ project_path: MODULE_STATE.SETTINGS_FILE });
     const lean = data['lean_projection'];
-    const raw =
+    const obj =
         typeof lean === 'object' && lean !== null && !Array.isArray(lean)
-            ? (lean as Record<string, unknown>)['mode']
-            : '';
-    return normalizeLeanProjectionMode(raw);
+            ? (lean as Record<string, unknown>)
+            : {};
+    return {
+        mode: normalizeLeanProjectionMode(obj['mode'] ?? ''),
+        hosts: resolveLeanProjectionHosts(obj['hosts']),
+    };
 }
 
 // --- hashing -----------------------------------------------------------------
@@ -1120,21 +1123,17 @@ export function generate_rule_symlinks(): number {
     const rules = _scoped_rule_basenames();
     const tool_dirs = _filter_tool_dirs(TOOL_DIRS);
 
+    const lean = _lean_projection_settings();
+    for (const warning of describeDroppedHosts(lean.hosts)) _print(`  ⚠️  ${warning}`);
     let thin_files: Record<string, string> | null = null;
-    if (writesThinFiles(_lean_projection_mode())) {
-        // DEAD-SWITCH REPAIR (road-to-renewal-foundation Phase 2). This branch
-        // used to THROW: the port was skipped as "out of scope, not exercised by
-        // golden parity", which left a documented, settings-selectable mode that
-        // could only ever crash. `build_thin` was ported and has been present the
-        // whole time — the wiring was the only thing missing.
-        //
-        // Scope note: this repairs the SWITCH only. The default stays
-        // `eager-all`. Flipping it is parked behind the thin-projection honest
-        // null (thin win-rate 36.2% < the 48% pre-registered threshold), and
-        // nothing here disturbs that verdict — but a mode that throws cannot
-        // even be re-measured, which is why the repair earns its place alone.
+    if (writesThinFiles(lean.mode)) {
+        // `thin` stays parked behind the thin-projection honest null (win-rate
+        // 36.2% against a 48% pre-registered threshold, ADR-202). `delivery` is
+        // NOT gated by that null and citing it as one is K7: delivery re-delivers
+        // identical bytes, is licensed by `docs/CLAIMS.md:365` on delivery
+        // equivalence and cost, and needs a recall floor rather than a judge.
         thin_files = Object.fromEntries(
-            build_thin(MODULE_STATE.RULES_SOURCE, _read_rule_workspaces()),
+            build_thin(MODULE_STATE.RULES_SOURCE, _read_rule_workspaces(), (m) => _print(`  ⚠️  ${m}`)),
         );
     }
 
@@ -1184,7 +1183,7 @@ export function generate_rule_symlinks(): number {
             if (_existsOrSymlink(link)) {
                 fs.unlinkSync(link);
             }
-            if (thin_files !== null) {
+            if (thin_files !== null && thinsHost(lean.mode, lean.hosts.hosts, _DIR_TOOL_ID[tool_dir] ?? '')) {
                 _writeText(link, thin_files[rule] as string);
             } else if (tool_dir === '.claude/rules') {
                 // Host-native activation (P3.1): emit the rule with the host's
@@ -1299,7 +1298,7 @@ export function _emit_cursor_mdc(source: string, target: string): void {
     const globs = always_apply ? [] : derive_trigger_globs(meta);
     const lines = [
         '---',
-        `description: ${_yaml_scalar(description)}`,
+        `description: ${_yaml_scalar(always_apply ? description : applies_when(description, meta))}`,
         `globs: ${globs.join(',')}`,
         `alwaysApply: ${always_apply ? 'true' : 'false'}`,
         '---',
@@ -1321,7 +1320,7 @@ export function _emit_windsurf_rule(source: string, target: string): void {
     const lines = [
         '---',
         `trigger: ${trigger}`,
-        `description: ${_yaml_scalar(description)}`,
+        `description: ${_yaml_scalar(always_apply ? description : applies_when(description, meta))}`,
         `globs: ${globs.join(',')}`,
         '---',
         '',
@@ -1628,23 +1627,22 @@ function _render_native_model_md(src_md: string, tier: string): string {
 }
 
 export function generate_claude_skills(active_skill_names: ReadonlySet<string> | null = null): number {
-    if (partitionActive(MODULE_STATE.PROJECT_ROOT)) active_skill_names = new Set<string>();
     if (!_exists(MODULE_STATE.SKILLS_SOURCE)) {
         process.stderr.write('  ⚠️  dist/agent-src/skills/ not found — skipping skills\n');
         return 0;
     }
 
-    let skills = _iterdirSorted(MODULE_STATE.SKILLS_SOURCE)
+    const all_skills = _iterdirSorted(MODULE_STATE.SKILLS_SOURCE)
         .filter((p) => _isDir(p))
         .map((p) => path.basename(p))
         .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
+    // ADR-236: withhold every skill `~/.claude/skills` holds — see `keepInProjectLayer`.
+    let skills = keepInProjectLayer('skills', all_skills);
     if (active_skill_names !== null) {
         skills = skills.filter((s) => active_skill_names.has(s));
     }
     const skill_set = new Set(skills);
-    const command_slugs = partitionActive(MODULE_STATE.PROJECT_ROOT)
-        ? new Set<string>()
-        : new Set([...iterCommands()].map(([, slug]) => slug));
+    const command_slugs = _emitted_wrapper_slugs(new Set(all_skills));
 
     _mkdirp(MODULE_STATE.CLAUDE_SKILLS_DIR);
     const auto = _read_model_auto_switch() === 'auto';
@@ -1737,6 +1735,22 @@ function _nested_command_subpath(source_file: string): string | null {
     return sub.includes('/') ? sub : null;
 }
 
+/** The emitter's four skips, in one place — see `emittedWrapperSlugs`. */
+const _wrapper_is_emitted = (f: string, s: string, skills: ReadonlySet<string>): boolean =>
+    !skills.has(s) &&
+    _nested_command_subpath(f) === null &&
+    !is_claude_builtin_name(s) &&
+    !claudeLayerHolds('skills', s);
+
+/** Wrapper slugs the command emitter really writes — see `emittedWrapperSlugs`. */
+function _emitted_wrapper_slugs(skill_names: ReadonlySet<string>): Set<string> {
+    return new Set(
+        [...iterCommands()]
+            .filter(([f, s]) => _wrapper_is_emitted(f, s, skill_names))
+            .map(([, slug]) => slug),
+    );
+}
+
 /**
  * Project-scope `.claude/commands/<cluster>/<sub>.md` — the colon form.
  *
@@ -1749,7 +1763,7 @@ function _nested_command_subpath(source_file: string): string | null {
  *
  * Emitting the nested form here lets `generate_claude_commands` stop wrapping
  * the clustered commands: one listing, same reachability, and reachability no
- * longer depends on a global deploy. Dedup AND precedence: `commandsWithheld`.
+ * longer depends on a global deploy. Dedup AND precedence: `commandWithheld`.
  *
  * ADR-003 (colon canonical for clusters) and ADR-044 (flat commands stay
  * hyphenated) both hold: flat commands are untouched and keep their wrapper.
@@ -1757,8 +1771,6 @@ function _nested_command_subpath(source_file: string): string | null {
 export function generate_claude_project_commands(
     active_command_slugs: ReadonlySet<string> | null = null,
 ): number {
-    if (commandsWithheld(MODULE_STATE.PROJECT_ROOT)) active_command_slugs = new Set<string>();
-    // Returns before the stale sweep — invariant, see `commandsWithheld`.
     if (!_isDir(path.join(MODULE_STATE.PROJECT_ROOT, 'src', 'domains'))) {
         return 0;
     }
@@ -1768,7 +1780,7 @@ export function generate_claude_project_commands(
             continue;
         }
         const sub = _nested_command_subpath(source_file);
-        if (sub !== null) {
+        if (sub !== null && !commandWithheld(`${sub}.md`)) {
             nested.push([source_file, sub]);
         }
     }
@@ -1805,7 +1817,6 @@ export function generate_claude_project_commands(
 }
 
 export function generate_claude_commands(active_command_slugs: ReadonlySet<string> | null = null): number {
-    if (partitionActive(MODULE_STATE.PROJECT_ROOT)) active_command_slugs = new Set<string>();
     if (!_isDir(path.join(MODULE_STATE.PROJECT_ROOT, 'src', 'domains'))) {
         process.stderr.write('  ⚠️  src/domains/ not found — skipping commands\n');
         return 0;
@@ -1826,6 +1837,7 @@ export function generate_claude_commands(active_command_slugs: ReadonlySet<strin
     let count = 0;
     let skipped = 0;
     let reserved = 0;
+    let withheld = 0;
     let rendered = 0;
     const auto = _read_model_auto_switch() === 'auto';
     for (const [source_file, slug] of iterCommands()) {
@@ -1854,6 +1866,9 @@ export function generate_claude_commands(active_command_slugs: ReadonlySet<strin
             reserved += 1;
             continue;
         }
+        // ADR-236 per-name: the INSTALLER re-projects visible flat commands as
+        // `~/.claude/skills/<slug>/SKILL.md` (install.ts:_apply_claude_flat_command_wrappers).
+        if (claudeLayerHolds('skills', slug)) { withheld += 1; continue; }
         current_slugs.add(slug);
 
         const skill_dir = path.join(MODULE_STATE.CLAUDE_SKILLS_DIR, slug);
@@ -1906,6 +1921,9 @@ export function generate_claude_commands(active_command_slugs: ReadonlySet<strin
     if (reserved) {
         msg += ` (${reserved} withheld — Claude Code built-in name)`;
     }
+    if (withheld > 0) {
+        msg += ` (${withheld} withheld — ~/.claude/skills carries the wrapper)`;
+    }
     if (removed_dirs) {
         msg += ` (${removed_dirs} stale dirs removed)`;
     }
@@ -2244,19 +2262,13 @@ export function generate_persona_symlinks(): number {
         _print('  ⚠️  dist/agent-src/personas/ not found — skipping personas');
         return 0;
     }
-    const personas = _rglobSorted(MODULE_STATE.PERSONAS_SOURCE, '*.md')
-        .filter((p) => _isFile(p) && path.basename(p, '.md') !== 'README')
-        .map((p) => path.basename(p))
-        // glob('*.md') is non-recursive in Python; mirror that — only top level.
-        .filter((name) => _isFile(path.join(MODULE_STATE.PERSONAS_SOURCE, name)));
     // Python uses PERSONAS_SOURCE.glob("*.md") (non-recursive). Re-derive
     // from a direct listing to match exactly.
     const direct = _iterdirSorted(MODULE_STATE.PERSONAS_SOURCE)
         .filter((p) => p.endsWith('.md') && _isFile(p) && path.basename(p, '.md') !== 'README')
         .map((p) => path.basename(p))
         .sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
-    void personas;
-    const partition = personaPartition(MODULE_STATE.PROJECT_ROOT, direct);
+    const partition = personaPartition(direct);
     const tool_dirs = _filter_tool_dirs(PERSONA_TOOL_DIRS);
     let total = 0;
     for (const [tool_dir, rel_prefix] of Object.entries(tool_dirs)) {

package/src/scripts/corpus_manifest.ts

@@ -23,7 +23,7 @@ import * as path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
-import { partitionActive } from '../install/partitionEligibility.js';
+import { resolveHostLayerVerdict } from '../install/partitionEligibility.js';
 import {
     type CorpusManifest,
     captureManifest,
@@ -126,9 +126,9 @@ export function parseArgs(argv: readonly string[]): Parsed | string {
 /**
  * One real capture over the real tree.
  *
- * This is the one caller for which the process globals `partitionActive` reads
- * — the host layer under the running user's home, and the install lockfile —
- * ARE this run's own host, so it is the one caller that passes the predicate.
+ * This is the one caller for which the process globals `resolveHostLayerVerdict`
+ * reads — the host layer under the running user's home, and the install lockfile
+ * — ARE this run's own host, so it is the one caller that passes the predicate.
  * Everywhere else the field stays `null` rather than recording some other
  * machine's state under this tree's name.
  */
@@ -138,7 +138,7 @@ function capture(limit: number): CorpusManifest {
         userHome: process.env['HOME'] ?? os.homedir(),
         limit,
         enumerationRule: ENUMERATION_RULE_ID,
-        partitionActive,
+        hostLayerVerified: (root) => resolveHostLayerVerdict(root).verified,
     });
 }
 

package/src/scripts/council_cli.ts

@@ -93,6 +93,7 @@ import {
     _quorum_min_present_from,
     _quorum_setting_from,
 } from './ai_council/quorum_wiring.js';
+import { measureDeliberation, runCallsFrom } from './ai_council/deliberation_metrics.js';
 import { formatQualificationLine, type MemberQualification } from './ai_council/qualification.js';
 import {
     absenceReasonFor,
@@ -2730,18 +2731,15 @@ function cmd_run(
     }
     const estimated_total = estimates.reduce((acc, e) => acc + _total_usd(e), 0.0);
     let actual_total = 0.0;
-    const all_responses: CouncilResponse[] = [...responses];
-    if (peer_review !== null) {
-        all_responses.push(...peer_review.responses);
-    }
-    if (consensus !== null) {
-        all_responses.push(...consensus.extraction_responses);
-        all_responses.push(...consensus.scoring_responses);
-    }
-    if (chairman !== null && chairman.response !== null) {
-        all_responses.push(chairman.response);
-    }
-    all_responses.push(...stance_repairs);
+    const run_calls = runCallsFrom({
+        deliberation: responses,
+        peerReview: peer_review?.responses ?? null,
+        consensusExtraction: consensus?.extraction_responses ?? null,
+        consensusScoring: consensus?.scoring_responses ?? null,
+        chairman: chairman?.response ?? null,
+        stanceRepairs: stance_repairs,
+    });
+    const all_responses: CouncilResponse[] = run_calls.responses;
     // Billable-aware: a subscription-CLI seat spent nothing, so pricing it at
     // API rates and calling the figure "actual" is a false statement about
     // money. See pricing.ts § billable-aware aggregation.
@@ -2791,6 +2789,7 @@ function cmd_run(
     // one for a machine consumer), even when every field is `null`: the
     // work-order envelope for whatever executes on this verdict next.
     payload['handoff'] = handoff;
+    payload['deliberation'] = measureDeliberation(run_calls.calls);
     const out_path = _validate_council_output_path(args.output as string, {
         kind: 'responses',
         subcommand: 'run',