borgmcp 2.15.0 → 2.16.0

package/dist/setup.js

@@ -20,6 +20,7 @@ import { initDebugFromArgv } from './debug.js';
 import { defaultApprovalIo, setupApprovalWarnings } from './cli-tool-approval.js';
 import { offerFirstRunServerInstall } from './first-run-server.js';
 import { setupNextStepsText } from './cli-help.js';
+import { emptySetupOutcome, resolveSetupAgentSelection, setupAgentChoices, setupRestartInstruction, } from './setup-selection.js';
 /**
  * Main setup wizard
  */
@@ -58,22 +59,18 @@ async function main() {
         console.error(chalk.gray('  OpenCode: https://opencode.ai\n'));
         process.exit(1);
     }
-    // Resolve the separately published local server before setup writes agent
-    // configuration. Decline/non-interactive/failure paths therefore leave no
-    // partial setup state behind.
-    console.log(chalk.blue('◼ Local Server'));
-    const serverInstall = await offerFirstRunServerInstall(undefined, undefined, { initializeServer: true });
-    if (serverInstall.kind !== 'present' && serverInstall.kind !== 'installed') {
-        process.exit(serverInstall.kind === 'declined' ? 0 : 1);
-    }
-    console.log('');
-    console.log('◼ Local server initialized');
-    // Step 1: Configure every detected agent CLI
+    // Step 1: Choose which detected agent CLIs to configure. The choice is
+    // first-run/invocation-local; it is never persisted as an opt-out.
     console.log(chalk.blue('◼ Agent CLI Integration'));
     const yes = parseYesFlag(process.argv);
     const claudeDetected = claudeCliPath !== null;
     const codexDetected = codexCliPath !== null;
     const opencodeDetected = opencodeCliPath !== null;
+    const detectedClis = [
+        ...(claudeDetected ? ['claude'] : []),
+        ...(codexDetected ? ['codex'] : []),
+        ...(opencodeDetected ? ['opencode'] : []),
+    ];
     const claudeMcpConfigured = isMcpServerConfigured();
     const codexMcpConfigured = isCodexMcpServerConfigured();
     const opencodeMcpConfigured = isOpenCodeMcpServerConfigured();
@@ -81,19 +78,70 @@ async function main() {
     const claudeUpsHookPending = claudeDetected && !isUserPromptSubmitHookRegistered();
     const codexSessionHookPending = codexDetected && !isCodexSessionStartHookRegistered();
     const codexUpsHookPending = codexDetected && !isCodexUserPromptSubmitHookRegistered();
-    const claudeHookPending = claudeLegacyHookPending || claudeUpsHookPending;
-    const codexHookPending = codexSessionHookPending || codexUpsHookPending;
-    if (setupMutationPending({
+    const alreadyConfigured = new Set([
+        ...(claudeDetected && claudeMcpConfigured && !claudeLegacyHookPending && !claudeUpsHookPending
+            ? ['claude']
+            : []),
+        ...(codexDetected && codexMcpConfigured && !codexSessionHookPending && !codexUpsHookPending
+            ? ['codex']
+            : []),
+        ...(opencodeDetected && opencodeMcpConfigured ? ['opencode'] : []),
+    ]);
+    const allDetectedMutationPending = setupMutationPending({
         claude: claudeDetected,
         codex: codexDetected,
         opencode: opencodeDetected,
         claudeMcpConfigured,
         codexMcpConfigured,
         opencodeMcpConfigured,
+        claudeHookPending: claudeLegacyHookPending || claudeUpsHookPending,
+        codexHookPending: codexSessionHookPending || codexUpsHookPending,
+    });
+    let selectedClis = detectedClis;
+    if (allDetectedMutationPending && !yes && process.stdin.isTTY === true) {
+        let cancelled = false;
+        const answer = await prompts({
+            type: 'multiselect',
+            name: 'selected',
+            message: 'Which detected agent CLIs should Borg configure?',
+            hint: 'Space toggles selection; Enter accepts the checked agents',
+            choices: setupAgentChoices(detectedClis, alreadyConfigured),
+            instructions: false,
+        }, {
+            onCancel: () => {
+                cancelled = true;
+            },
+        });
+        const selection = resolveSetupAgentSelection(detectedClis, answer.selected, cancelled);
+        if (selection.kind === 'cancelled') {
+            console.log(chalk.yellow('\n◼ Setup cancelled — no changes made.\n'));
+            return;
+        }
+        if (selection.kind === 'empty') {
+            const outcome = emptySetupOutcome();
+            console.log(chalk.yellow(`\n◼ No agent CLIs selected — agent configuration and local-server initialization were skipped. ` +
+                `Run \`${outcome.recovery.command}\` again to choose an agent and continue setup.\n`));
+            return;
+        }
+        selectedClis = selection.agents;
+    }
+    const selected = new Set(selectedClis);
+    const claudeSelected = selected.has('claude');
+    const codexSelected = selected.has('codex');
+    const opencodeSelected = selected.has('opencode');
+    const claudeHookPending = claudeSelected && (claudeLegacyHookPending || claudeUpsHookPending);
+    const codexHookPending = codexSelected && (codexSessionHookPending || codexUpsHookPending);
+    if (setupMutationPending({
+        claude: claudeSelected,
+        codex: codexSelected,
+        opencode: opencodeSelected,
+        claudeMcpConfigured,
+        codexMcpConfigured,
+        opencodeMcpConfigured,
         claudeHookPending,
         codexHookPending,
     })) {
-        console.log(formatConfigMutationDisclosure(configMutationTargets({ claude: claudeDetected, codex: codexDetected, opencode: opencodeDetected })));
+        console.log(formatConfigMutationDisclosure(configMutationTargets({ claude: claudeSelected, codex: codexSelected, opencode: opencodeSelected })));
         const mutationDecision = await confirmConfigMutation({
             isTTY: process.stdin.isTTY === true,
             yes,
@@ -113,7 +161,18 @@ async function main() {
         }
     }
     console.log('');
-    if (claudeCliPath) {
+    // Resolve the separately published local server only after the complete
+    // agent selection and the existing single config-mutation confirmation.
+    // Esc/zero-selection/decline therefore leave both agent and server setup
+    // untouched.
+    console.log(chalk.blue('◼ Local Server'));
+    const serverInstall = await offerFirstRunServerInstall(undefined, undefined, { initializeServer: true });
+    if (serverInstall.kind !== 'present' && serverInstall.kind !== 'installed') {
+        process.exit(serverInstall.kind === 'declined' ? 0 : 1);
+    }
+    console.log('');
+    console.log('◼ Local server initialized');
+    if (claudeSelected) {
         try {
             ensureCliMcpConfigured('claude');
             if (claudeLegacyHookPending)
@@ -127,7 +186,7 @@ async function main() {
             process.exit(1);
         }
     }
-    if (codexCliPath) {
+    if (codexSelected) {
         try {
             ensureCliMcpConfigured('codex');
             if (codexSessionHookPending)
@@ -141,7 +200,7 @@ async function main() {
             process.exit(1);
         }
     }
-    if (opencodeCliPath) {
+    if (opencodeSelected) {
         try {
             ensureCliMcpConfigured('opencode');
             console.log(chalk.green('◼ borg configured for OpenCode'));
@@ -157,8 +216,8 @@ async function main() {
         codexArgs: [],
     });
     for (const warning of await setupApprovalWarnings(approvalIo, {
-        codex: codexDetected,
-        opencode: opencodeDetected,
+        codex: codexSelected,
+        opencode: opencodeSelected,
     })) {
         console.log(chalk.yellow(`warning: ${warning}`));
     }
@@ -168,7 +227,7 @@ async function main() {
     console.log(chalk.gray('Local self-hosted server mode — no account or subscription needed.'));
     // Success message
     console.log(chalk.green.bold('\nSetup complete!\n'));
-    console.log(chalk.yellow('🔄 Restart Claude Code / Codex / OpenCode (or open a new session) for the changes to take effect.\n'));
+    console.log(chalk.yellow(`${setupRestartInstruction(selectedClis)}\n`));
     if (!serverInstall.suppressClientNextSteps) {
         console.log(chalk.gray(setupNextStepsText()));
     }

package/dist/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/setup.ts"],"names":[],"mappings":"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"}

package/docs/EXTRACTION_PROVENANCE.md

@@ -22,7 +22,7 @@ The extraction copied the monorepo's `client/src/` production boundary and top-l
   recovery, `2.0.2`, `2.0.3`, `2.0.4`, `2.0.5`, and `2.0.6` successors were
   published and registry-verified. The immutable `2.0.7` workflow failed before
   package creation or npm publication. The `2.0.8`, `2.0.9`, `2.0.10`, `2.0.11`,
-  `2.1.0`, and `2.1.1` successors were published, and `2.2.0` was subsequently published, and `2.3.0` was subsequently published, and `2.4.0` was subsequently published, and `2.4.1` was subsequently published, and `2.5.0` was subsequently published, and `2.6.0` was subsequently published, and `2.6.1` was subsequently published, and `2.7.0` was subsequently published, and `2.7.1` was subsequently published, and `2.7.2` was subsequently published, and `2.7.3` was subsequently published, and `2.8.0` was subsequently published, and `2.9.0` was subsequently published, and `2.10.0` was subsequently published, and the immutable `2.10.1` release attempt failed before artifact creation or publication. The `2.10.2`, `2.11.0`, `2.12.1`, and `2.13.0` successors were published; the immutable `2.12.0` attempt failed before artifact creation or publication and was superseded by `2.12.1`. The current release identity is `2.15.0`. Extraction and
+  `2.1.0`, and `2.1.1` successors were published, and `2.2.0` was subsequently published, and `2.3.0` was subsequently published, and `2.4.0` was subsequently published, and `2.4.1` was subsequently published, and `2.5.0` was subsequently published, and `2.6.0` was subsequently published, and `2.6.1` was subsequently published, and `2.7.0` was subsequently published, and `2.7.1` was subsequently published, and `2.7.2` was subsequently published, and `2.7.3` was subsequently published, and `2.8.0` was subsequently published, and `2.9.0` was subsequently published, and `2.10.0` was subsequently published, and the immutable `2.10.1` release attempt failed before artifact creation or publication. The `2.10.2`, `2.11.0`, `2.12.1`, and `2.13.0` successors were published; the immutable `2.12.0` attempt failed before artifact creation or publication and was superseded by `2.12.1`. The current release identity is `2.16.0`. Extraction and
   versioning do not authorize publication.
 
 ## Review Holds
@@ -47,6 +47,6 @@ client `borgmcp@2.10.0` line. Its annotated tag object
 `sha512-lOxIPg3WcjSBte46iTM7SAFVN6Y0b2oizOKAJ9Q1EijBdOlmsh/cQlpUIaa8F2UJPaTDFsXy3M64gpGs6XgKzA==`
 in the `borgmcp-server-0.9.0-release` registry decision. That server and its
 client line pin historical `borgmcp-shared` version `0.8.1` and remain
-immutable. Client `borgmcp@2.14.1` is published. The immutable `v2.0.7`
-attempt failed before publication and remains preserved. The current release identity and publication gate remain governed by the reviewed `v2.15.0` source, a fresh annotated tag, and
+immutable. Client `borgmcp@2.15.0` is published. The immutable `v2.0.7`
+attempt failed before publication and remains preserved. The current release identity and publication gate remain governed by the reviewed `v2.16.0` source, a fresh annotated tag, and
 the exact-artifact and protected-publication gates.

package/docs/RELEASING.md

@@ -4,220 +4,11 @@ The GitHub Actions workflow publishes one immutable, reviewed `borgmcp` version
 from a protected annotated tag. The protected publish job uses npm Trusted
 Publishing; no long-lived npm token is stored or exposed.
 
-## Immutable Release Evidence
-
-The existing lightweight `v2.0.0` tag points to
-`90a078264f4d61c0140ad0a30357a4df42c34ab0`. Immutable workflow run
-`29693915689` rejected it at annotated-tag verification and failed before package
-creation or npm publication; the publish job was skipped and
-`borgmcp@2.0.0` remains absent from npm. Never delete, move, replace, reuse, or
-rerun that tag or run.
-
-The annotated `v2.0.1` tag object
-`def12ee40af665fc6c3af4873a7d566b3f844fc1` peels to protected-main commit
-`b30fc54a4d73bda98db4630864cca796c8923dd9`. Workflow run `29748931957`
-successfully published that exact source as `borgmcp@2.0.1`; the registry records
-integrity
-`sha512-Ah8IY2izZ774gYLKthRL9lfrV+JBk2o9HSlrWUplyZgoGqwVjVboHNon0hWWF5i/fObiCGikFOMY6qZ+vaeyCw==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-must use a fresh unused identity and requires the complete release gate again.
-
-The annotated `v2.0.2` tag object
-`a1fc1f8f05c3f1b4d7ccbef86e244955642165b5` peels to protected-main commit
-`aced84956fdf41315904c8901e50a345f628152c`. Workflow run `29840120451`
-successfully published that exact source as `borgmcp@2.0.2`; the registry records
-integrity
-`sha512-w0O0t/2wzeJpXEqb4jQGuqZeavEkfFKdz6poRT8q1TxDKHTlOlwo3auctE+X1kWU2s5JkSDcUiUdQdyLwu84IA==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-must use a fresh unused identity and requires the complete release gate again.
-
-The annotated `v2.0.3` tag object
-`47701127cbdba6499595ef0529de264b00a61840` peels to protected-main commit
-`3e44e9c439c036850c6a9226d02876f4883501d9`. Workflow run `29851751102`
-successfully published that exact source as `borgmcp@2.0.3`; the registry records
-integrity
-`sha512-3Iy4BSB+yq8F75w/gWiEU7D+mKCYYa5mIsn/iC/byy5CK/QsAWg10KgsBI3GlDBZul1CD3Qq+zpmVeK2qpIE1A==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-must use a fresh unused identity and requires the complete release gate again.
-
-The annotated `v2.0.4` tag object
-`f86c5b81b77afa7ebd080b508831f1dc39c403e2` peels to protected-main commit
-`57a26139a11b47bc5f1d7234bc69e2a2a75954b3`. Workflow run `29925624599`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.4`; the registry records integrity
-`sha512-xuGxMQ9FZTQN4KP/wGlJqI4LgxP2aKpeykbakjfXHPeUzmNHvkN0YtcenzlSvHsObnpQgMfsy7TNy+YrPkk65g==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-uses the unused `v2.0.5` identity from a fresh reviewed protected-main commit
-and requires the complete release gate again.
-
-The annotated `v2.0.5` tag object
-`242ed67fec00701f4eb332302e60dff84c0368f7` peels to protected-main commit
-`a18a169ec96c5e3194b3bd3edc9e84002c4bc7a3`. Workflow run `29955861508`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.5`; the registry records integrity
-`sha512-pMqovKzUu0Mdru2YJULj3XkHSeiT/PuCAjwCQ2Sg/mmF299tZE80qvca6GCNCLjhYEWWIuXmssuxK7wePKqxdw==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-uses the unused `v2.0.6` identity from a fresh reviewed protected-main commit
-and requires the complete release gate again.
-
-The annotated `v2.0.6` tag object
-`b41d312efc9f8d1ed63021812d8165b00011e8d8` peels to protected-main commit
-`5fd9048e4c22e4478160e3a25654837b5a33d8bb`. Workflow run `29982288768`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.6`; the registry records integrity
-`sha512-WDX4tmk46I6Tvb/Gz1XlD/9PbIgOe72rRDCjV+/lw6KnAxWW0S25LT1DgifotI9LQv7LLAok8WkjucDDTTQ+pw==`.
-Never move, replace, reuse, or rerun that tag or workflow.
-
-The annotated `v2.0.7` tag object
-`bf41d5a70d7df11930a3124feda72835ae903522` peels to protected-main commit
-`85f7c45cffdd449a6de4a52608453b6680492221`. Workflow run `30009042758`,
-attempt 1, received registry metadata HTTP 504 for
-`@esbuild/openbsd-arm64@0.28.1` and failed before package creation or npm
-publication. The publish and registry-verification jobs were skipped, and
-`borgmcp@2.0.7` remains absent from npm. Never delete, move, replace, reuse, or
-rerun that tag, version, or workflow. The next candidate uses the unused
-`v2.0.8` identity from a fresh reviewed protected-main commit and requires the
-complete release gate again.
-
-The annotated `v2.0.8` tag object
-`7b5a4929534abfa97a65e278df230adfdb842d8f` peels to protected-main commit
-`8bc796d8fc4e307dca593138fb080984662c7d62`. Workflow run `30012098601`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.8`; the registry records integrity
-`sha512-az1IKG4VNwAF/8PKEVK88gdRoFFBqgtl6ObXX+CcJadavNqkwJ9UFeP8LOJ2js911mIiXEm8c4xDf6MnO0GOng==`.
-Never move, replace, reuse, or rerun that tag or workflow. Its successor used
-the fresh `v2.0.9` identity from a reviewed protected-main commit and passed the
-complete release gate.
-
-The annotated `v2.0.9` tag object
-`3a88bb4f46143789803a4e57f52b94d762f1ca9b` peels to protected-main commit
-`18084fc486a041f3438f584a97d218c01a5e0399`. Workflow run `30047299013`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.9`; the registry records integrity
-`sha512-lf0TZ8ZcpHv/Nt3LkY/IGxkUFkg3weavF+rLv6xLImDDhLIaZly1y8jUdo3UuheQVhrLnLcxoz37Myr4mPx9lg==`.
-Never move, replace, reuse, or rerun that tag or workflow.
-
-The annotated `v2.0.10` tag object
-`31ae3c19ac4e04fac33269459a460d5316cce730` peels to protected-main commit
-`3f7003b65eadc74cd949857e831e1181a1aad2ff`. Workflow run `30063538271`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.10`; the registry records integrity
-`sha512-BkFrq75mF7ih0/7Z7RsXsJYo43qNs4ng7tSnvcFCl3k6r+ex1FvTkah0+KQNinDSrv6a+HLWahUe8875so8zew==`.
-Never move, replace, reuse, or rerun that tag or workflow.
-
-The annotated `v2.0.11` tag object
-`fb95f4278137d1d7871d945c467eb33984abe1c4` peels to protected-main commit
-`0676d93d3e8a64ba583e95f164d122b39687b53a`. Workflow run `30073844074`, attempt 1,
-successfully published that exact source as `borgmcp@2.0.11`; the registry records integrity
-`sha512-429njJ7HVmWhpm8E71RoLzG57Qehy3RSxEzs6fQofVoOIiZXnK4QQDwbQe9MPfhKifbvVN5lGcDKtKAjuC76ww==`.
-Never move, replace, reuse, or rerun that tag or workflow.
-
-The annotated `v2.1.0` tag object
-`e0b189bb0dd1f1b12369ab81870113925e1afc41` peels to protected-main commit
-`10f18e4010c9c518c0ea2184d42ed5388642a53f`. Workflow run `30166498938`, attempt 1,
-successfully published that exact source as `borgmcp@2.1.0`; the same-run artifact report records integrity
-`sha512-Gm9n69y3C0feNDYRPEOnShLCscQJ/BoylcRMH+sDDQJmdcbjY8+U6dDTcFv3w+uH5P/IVwJydB8TGRHPXL0FQA==`.
-Never move, replace, reuse, or rerun that tag or workflow.
-
-The annotated `v2.1.1` tag object
-`aa8d772c4791b2da16d702d5d78e5b3c365796c4` peels to protected-main commit
-`db0a6a76744928e0067eb03b8a236076c56ae758`. Workflow run `30174878044`, attempt 1,
-successfully published that exact source as `borgmcp@2.1.1`; the same-run artifact report records integrity
-`sha512-nZJ3i6LBIj/4743mqVRJTUH3YGmC8HfC/NuQb7eOv+/K/dyBogDnwZ3opiZiZSe4LE5CXuG72Sip7cPRoCoZrA==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.2.0` tag object
-`edf12fcd4c56eb0ad59917269aaeee223b36bd53` peels to protected-main commit
-`db4f374e88c24dadee47d5400537890cad1e5f40`. Workflow run `30195666955`, attempt 1,
-successfully published that exact source as `borgmcp@2.2.0`; the same-run artifact report records integrity
-`sha512-Pi3rpQH6f+V67OPoRIwyKjOFrCJ5y/39knCayExBmnMC5Urb8m+m9UQVNV7cWMuhd3S3WMM6JOkgcIYOVhWnxg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.3.0` tag object
-`24b1f8622a0a0b542dbac26c70662f5b499d3426` peels to protected-main commit
-`9e708b7233486abdcd7fbc893a2d5bc818241d87`. Workflow run `30218208664`, attempt 1,
-successfully published that exact source as `borgmcp@2.3.0`; the same-run artifact report records integrity
-`sha512-xyiyC/HXvWnSiii621WdA4qBKehmBzZSaLGN6PZvf82FQUqVONrRyhl1SmOLzPlPXX9boNKSA1EuaVJrtUv6zA==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.4.0` tag object
-`55458a1c38a670d3e15f8b19909afea195a146ce` peels to protected-main commit
-`3882c22d7e8eca34a2213a4e2e4b1bf10dce8fe3`. Workflow run `30246632666`, attempt 1,
-successfully published that exact source as `borgmcp@2.4.0`; the same-run artifact report records integrity
-`sha512-dQ4jXxmubhtXhIxObTegYYMrgPVk2mZXNHFfV4MRwRWKr1TpQ4xXdmp3Qb89vOOOORvZlux6GNNS5kjy3wDvZw==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.4.1` tag object
-`1e42aac25fc5368f16334a1eb48ffd0524a3fe7f` peels to protected-main commit
-`6b3b5d3c2c008888e55dd88485dafcb623ef9e17`. Workflow run `30282532108`, attempt 1,
-successfully published that exact source as `borgmcp@2.4.1`; the same-run artifact report records integrity
-`sha512-/tMVjZYqXQrZNPoZHjhpaS02e4Qju752sV+BLf9ML7yFmIf6DhzfItj9hDj/3+ORm6GK3aS4Fz4JmiWDxworZg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.5.0` tag object
-`23132a4d71d42f59fd08bab66f0fe3da0114a15a` peels to protected-main commit
-`771dd6e78e26744180b2470374790d0e91aad7d7`. Workflow run `30349154152`, attempt 1,
-successfully published that exact source as `borgmcp@2.5.0`; the same-run artifact report records integrity
-`sha512-BQ5vxtmxqD9V+dmPuGQaog8Ip+K+hbnCxmjZt0zX2v354x7gUZtIt5zmP3HTNe4A5rmO9sp4qvv7XA4gcAGNrg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.6.0` tag object
-`c8598e1a1852a3690f53f7089a8342b53e2191da` peels to protected-main commit
-`ef90006de0005e2fe2b35d36907a4656352e4abf`. Workflow run `30421261350`, attempt 1,
-successfully published that exact source as `borgmcp@2.6.0`; the same-run artifact report records integrity
-`sha512-KvJ5kuyMXH6Vd9tImV0zvXWhSj2Y68r09mAO3TqhsGAQM2XERcBPeEmrdp6VI1Z3KYMPjdg0bRvRW7CGonFl9w==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.6.1` tag object
-`e65b9d43c4a5a7c12a4fafc6e3f1024f6d99c023` peels to protected-main commit
-`902847186f5c4fc00f3610ee027e8f929b977670`. Workflow run `30427148267`, attempt 1,
-successfully published that exact source as `borgmcp@2.6.1`; the same-run artifact report records integrity
-`sha512-N0NIsD2D39d98vvjMkcFwMSn/UXHuHMdMTcuk3awfo6t5FHyd7BYhBsQXhpDuvdJK/02S8g0OdvfHUb827siYQ==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.7.0` tag object
-`a9a7f75114548b6c383168164f0f59bb05c02b85` peels to protected-main commit
-`a8d3c572dee3b90cf2a898768c45a1f46270fe11`. Workflow run `30440435955`, attempt 1,
-successfully published that exact source as `borgmcp@2.7.0`; the same-run artifact report records integrity
-`sha512-qn7ljuq/UwYzQJ5pWliLqD7Q5mlwk287ObOXbSV5FOcs+JdoXjFlb9NVC6bFoQzjHaWixCX600EAEtRZ0UeNPw==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.7.1` tag object
-`fc308b52393edf0ed8299490980207840a69c157` peels to protected-main commit
-`41091978bfe02831863de26e75fdf3bb48d4b038`. Workflow run `30463299198`, attempt 1,
-successfully published that exact source as `borgmcp@2.7.1`; the same-run artifact report records integrity
-`sha512-hgxKTCAocbTsBV/YHIegn/jlG9a9YwdbOHD3s5mL+CsN61/5m180rvGJ8+RlNRd5Sdk408phc+QW2Li46tmTMg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.7.2` tag object
-`0b16c38da15090a49b285e687fae45381f0f6812` peels to protected-main commit
-`52b8a54565f548560dd674d689e0b841e2d8590d`. Workflow run `30491774435`, attempt 1,
-successfully published that exact source as `borgmcp@2.7.2`; the same-run artifact report records integrity
-`sha512-j/OKr5FzhnDbnLn4pNadbi6XQwR6hcmlfSQHuDsy696KYroL1UagIzelpLJXR+uR/T6FKbD2Zdphr/s81l1Rfw==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.7.3` tag object
-`b084eb3d2177fc93aa87ca58efde402542b90b8f` peels to protected-main commit
-`83fadd1b308f2b770ce0d8da6a3b61183ec94f8d`. Workflow run `30618377765`, attempt 1,
-successfully published that exact source as `borgmcp@2.7.3`; the same-run artifact report records integrity
-`sha512-Jb+Kg/+H3cPU34JX7eFV3gEO/PzdfJEruNU1mJwYlQZKG7TMfrLJzwghDzxmlMupHJHL3rzAVZ224wioM/pclg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.8.0` tag object
-`576e2401a83537662ef0d5f7b0d03d6101b15c54` peels to protected-main commit
-`ad40e93ee9b1ff2801119c1c763ad526974ae2a6`. Workflow run `30639790368`, attempt 1,
-successfully published that exact source as `borgmcp@2.8.0`; the same-run artifact report records integrity
-`sha512-hKNyWwVg/8WJ/qcqaNjZVylMw2UzgFEhE7sAJmWy/BjNU4lEa6ox8N7SdbEt8hhKsySMxt+YTFbNFitRtf9u3g==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.9.0` tag object
-`26df119da33e914f857f820e68df6e887afed949` peels to protected-main commit
-`895f12065c09ec5c0a35f770f26ec89f36f2feaa`. Workflow run `30695501563`, attempt 1,
-successfully published that exact source as `borgmcp@2.9.0`; the same-run artifact report records integrity
-`sha512-e10KK//zAP6xRDtUjCrLqzVyeX5zd/39JD4LksBhNVL0ZIGthu5ZLahPMrcCjGl6lZQHNTCo8Tez5c1jmThgGQ==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.10.0` tag object
-`83bd13fe9943c980760db6ecdbcef0d8c413cee0` peels to protected-main commit
-`c5d3d2cbe85644d402dfd82ce108dceca3a913a1`. Workflow run `30764262636`, attempt 1,
-successfully published that exact source as `borgmcp@2.10.0`; the same-run artifact report records integrity
-`sha512-YUVxWevAToQYwu/MDV2r9TrKnaZxpYiEitmLtr7OekfyE0+XZnkyHmL1gSk04JAiYquzv6ZyTRDYMnjQzS5GxA==`.
-Never move, replace, reuse, or rerun that tag or workflow. FAILED-SUPERSEDED release record: The annotated `v2.10.1` tag object
-`afee30802629d0f838b2446efd2241ff01964af2` peels to protected-main commit
-`fcecd75211107994ccd0df0bf4093240f83de9b2`. Workflow run `30766475027`, attempt 1, concluded `failure`
-during verification before artifact creation or publication. Verify job `91545993819` records the release
-artifact build, verification, exercise, and upload steps as skipped; publish job `91546125556` was skipped.
-Registry verification found no published `borgmcp@2.10.1` package, so no published npm artifact or SRI
-exists for that version as of this check.
-Never delete, move, replace, reuse, or rerun that tag, version, or workflow. The annotated `v2.10.2` tag object
-`3655b212c12617aa08cf76747a3b65a73b78e5cc` peels to protected-main commit
-`bb8ff57162efdc777bb92f5e1f9d31aaf293d3c6`. Workflow run `30768860612`, attempt 1,
-successfully published that exact source as `borgmcp@2.10.2`; the same-run artifact report records integrity
-`sha512-uNeDidPLxZDe0E/RnQ35zaAMZwHcBbdpHrk+McQuV4lyBxoMSdf+MlBDHv7usijCtOBAUf+exlR/l4F9wVtvZg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.13.0` tag object
-`67a2fd7bf76299dccc94a3260ddfd4b688eacaa1` peels to protected-main commit
-`fc5e4d9299210b70f979c7d39130a9c12ea265ea`. Workflow run `30894287863`, attempt 1,
-successfully published that exact source as `borgmcp@2.13.0`; the same-run artifact report records integrity
-`sha512-YuF3NwY5iBRVKhgdRiK+3GX+6O8O7S/V9g+XYN/1A0so9RLIYoQWpS91qJewqGQ59nyIARjRmk2wKhK8ODxU0Q==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.14.0` tag object
-`eb9d5cb14b08b1a2eb6d48b2492acbc6cecb7bef` peels to protected-main commit
-`4dd92bcbac26f460a4f137f766992e8f93843576`. Workflow run `30929322201`, attempt 1,
-successfully published that exact source as `borgmcp@2.14.0`; the same-run artifact report records integrity
-`sha512-haKgpQbcbaRya1XqYQaOy7yZiHMxeP8QO3fr7ahHaYDNYrDvlGmXNlW9VMtqnRJ9mtVDC5UTkeuQmCRJMzF/Tg==`.
-Never move, replace, reuse, or rerun that tag or workflow. The annotated `v2.14.1` tag object
-`c1c8b526dcc31259f6b821f0a6fdd0017a42435c` peels to protected-main commit
-`3de4cbf2e5adf6883334fe4e9b7aa1f43868daae`. Workflow run `30943397747`, attempt 1,
-successfully published that exact source as `borgmcp@2.14.1`; the same-run artifact report records integrity
-`sha512-VqkOp3jo/KnzgusCk98TFj/U8U7Q/gt8agvIbjiSWrV0lIHnsD+A+7w3C+GMQeyA08KXxRuZDF3No9sDomqMTQ==`.
-Never move, replace, reuse, or rerun that tag or workflow. The next candidate
-uses the unused `v2.15.0` identity from a fresh reviewed protected-main commit
-and requires the complete release gate again.
+## Release Integrity
+
+Release provenance is established by protected annotated tags, GitHub build
+provenance, and npm Trusted Publishing. Tags and publication workflows are
+immutable: never move, replace, reuse, or rerun them.
 
 ## Release Prerequisites
 
@@ -246,76 +37,11 @@ Before creating the release tag, independently verify all of these conditions:
 machine-checkable. A release tag created before they are resolved fails before
 dependency installation or publication.
 
-### Release identity preparation
-
-Prepare the next stable identity only from a clean protected-main checkout. The
-command requires evidence for the version being superseded because a workflow
-run and artifact integrity cannot be derived from the repository tree:
-
-```sh
-npm run release:prepare -- 2.3.0 \
-  --workflow-run-id 30195666955 \
-  --workflow-run-attempt 1 \
-  --artifact-integrity 'sha512-...'
-```
-
-The command independently verifies the annotated tag, its peeled commit, the
-exact successful tag-workflow attempt, and npm artifact integrity before writing
-anything. It then deterministically updates only the manifest version, the two
-root lockfile version fields, the extraction ledger, this document's immutable
-release record, and the release-lane current-version/evidence assertions.
-
-When the superseded tag's attempt failed before artifact creation or publication,
-prepare the fresh recovery identity with `--workflow-conclusion failure` and omit
-`--artifact-integrity` entirely. The preparer verifies the annotated tag and exact
-failed workflow attempt, writes a canonical failed-superseded record stating that
-the artifact build, verification, exercise, upload, and publish phases were all
-skipped, and separately re-verifies the last published release as the artifact
-provenance anchor. It also reads the authoritative registry version list before
-writing the time-bounded fact that no published npm artifact or SRI exists for
-the failed version. This recovery-time absence check is required before preparing
-the replacement identity; it is not the prohibited post-publication readback of
-the newly published release. A failed record carrying an SRI, a failed run whose
-artifact or publish phase ran, a failed version present in the registry, or a
-successful record without an SRI is invalid. Failed tags and workflow attempts
-stay immutable and must never be moved, reused, or rerun.
-
-```sh
-npm run release:prepare -- 2.10.2 \
-  --workflow-run-id 30766475027 \
-  --workflow-run-attempt 1 \
-  --workflow-conclusion failure
-```
+### Release branches
 
 Release branches use the `release/` prefix and enter protected `main` through a
-pull request. A direct push only updates the staging branch; it does
-not produce a release-identity verdict and grants no review skip, merge
-authority, or release authority.
-
-For a pull request from a same-repository `release/` branch, the dedicated
-release-identity workflow is loaded from the exact protected base commit. It
-checks out that base, fetches the exact candidate commit into the Git object
-database without checking it out, and invokes the base commit's verifier with
-explicit base and candidate SHAs. It does not install or execute candidate
-dependencies, package scripts, workflow code, actions, or verifier code. The
-candidate is treated only as Git tree and blob data.
-
-To reproduce the classification locally, resolve and pass exact commit SHAs:
-
-```sh
-base_sha=$(git rev-parse origin/main)
-candidate_sha=$(git rev-parse HEAD)
-npm run verify:release-identity -- --base "$base_sha" --candidate "$candidate_sha"
-```
-
-The verifier rechecks the recorded provenance against GitHub, npm, and Git. It
-reconstructs the expected tree in a temporary Git index and requires exact tree
-equality, exact changed paths, and exact per-file shapes. The release-identity
-allowlist must remain byte-identical. The generated no-cloud occurrence allowlist
-must also remain byte-identical; any source-line renumbering makes the commit a
-code change rather than a release-identity change. A commit the classifier
-rejects follows the full code review chain and must never be manually declared
-identity-only.
+pull request. Direct pushes only update staging branches; publication still
+requires the complete protected release gate.
 
 ## Repository Controls
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "borgmcp",
-  "version": "2.15.0",
+  "version": "2.16.0",
   "description": "Coordinate AI coding agents in shared cubes. Works with Claude Code, Codex, and OpenCode.",
   "type": "module",
   "main": "./dist/index.js",
@@ -24,23 +24,22 @@
   },
   "scripts": {
     "clean": "node scripts/clean.mjs",
-    "build": "npm run clean && tsc -p tsconfig.json && node scripts/set-bin-mode.mjs",
-    "check": "tsc -p tsconfig.json --noEmit",
-    "dev": "tsc -p tsconfig.json --watch",
+    "preflight:node": "node scripts/node-preflight.mjs",
+    "build": "npm run preflight:node && npm run clean && tsc -p tsconfig.json && node scripts/set-bin-mode.mjs",
+    "check": "npm run preflight:node && tsc -p tsconfig.json --noEmit",
+    "dev": "npm run preflight:node && tsc -p tsconfig.json --watch",
     "start": "node dist/index.js",
     "test": "npm run test:unit && npm run test:release",
-    "test:unit": "vitest run --config vitest.config.ts",
-    "test:release": "node --test test/release-lane.test.mjs test/release-identity.test.mjs",
+    "test:unit": "npm run preflight:node && vitest run --config vitest.config.ts",
+    "test:release": "npm run preflight:node && node --test test/release-lane.test.mjs",
     "onboarding:smoke": "node scripts/onboarding-smoke.mjs",
-    "release:prepare": "node scripts/release-identity.mjs prepare",
     "release:exercise": "npm run build && node scripts/release-exercise.mjs",
     "release:check": "npm run verify:public-source && npm run verify:release && npm run verify:lock && npm run check && npm test && npm run build && npm run onboarding:smoke && npm run verify:package",
     "verify:artifact": "node scripts/verify-packed-artifact.mjs",
     "verify:public-source": "node scripts/verify-public-source.mjs",
     "verify:package": "node scripts/verify-local-package.mjs",
     "verify:release": "node scripts/verify-release-readiness.mjs",
-    "verify:lock": "node scripts/verify-lock-registry.mjs",
-    "verify:release-identity": "node scripts/release-identity.mjs verify"
+    "verify:lock": "node scripts/verify-lock-registry.mjs"
   },
   "files": [
     "dist",

package/src/assimilate-cmd.ts

@@ -388,6 +388,8 @@ export interface AssimilateDeps {
   // on healthy hosts; degraded-path surfaces a stderr warning and
   // still launches claude (never blocks).
   probeMcpReady: () => Promise<boolean>;
+  /** Save the resolved CLI for a newly-created sibling worktree. */
+  setCliPreferenceForWorktree: (cli: BorgCli, worktree: string) => Promise<void>;
   resolveCli: (explicit?: BorgCli) => Promise<BorgCli>;
   prepareCodexRemoteLaunch: () => Promise<CodexRemoteLaunch>;
   setCodexWakeTarget: (cubeId: string, droneId: string, target: { threadId: string; socketPath: string }) => Promise<void>;
@@ -708,13 +710,10 @@ export async function runAssimilate(
 ): Promise<number> {
   const mode = args.mode ?? 'assimilate';
   // ----- Input validation (before any subprocess work) -----
-  if (args.role !== undefined) {
-    const v = validateName(args.role);
-    if (!v.ok) {
-      deps.stderr(v.error + '\n');
-      return 1;
-    }
-  }
+  // A role is a lookup key, not a path component. matchRoleByName() below
+  // applies the shared roleSlug() normalization, so displayed names such as
+  // "Builder" and "Code Reviewer" must reach that resolver. Keep the strict
+  // identifier validator for worktree names, which do become path components.
   if (args.flags.worktree !== undefined) {
     const v = validateName(args.flags.worktree);
     if (!v.ok) {
@@ -1867,6 +1866,24 @@ export async function runAssimilate(
     }
   };
 
+  // CLI resolution happens before the server attach because agent_kind is part
+  // of that request. The resolver therefore saved the preference against the
+  // invoking checkout. Once a sibling exists, save the same choice under its
+  // own project key so a later --here launch in that worktree can read it.
+  if (spawnedWorktreePath) {
+    try {
+      await deps.setCliPreferenceForWorktree(cli, spawnedWorktreePath);
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      deps.stderr(
+        `Borg could not save the ${cli} preference for sibling worktree ${spawnedWorktreePath}: ${message}. ` +
+          'The worktree was removed; correct the local configuration and retry.\n',
+      );
+      rollbackWorktree();
+      return 1;
+    }
+  }
+
   try {
     deps.mkdirp(scratchRoot);
     deps.provisionLaunchAccess?.(cli, seatWorktree, launchAccessPaths);