borgmcp 1.1.15 → 2.0.1

package/dist/setup.js

@@ -1,47 +1,170 @@
 #!/usr/bin/env node
-import w from"prompts";import e from"chalk";import x from"open";import p from"which";import{authenticateWithGoogle as H}from"./auth.js";import{checkSubscriptionStatus as i,createSubscription as M,probeSession as R}from"./remote-client.js";import{setupActionForSession as U}from"./setup-action.js";import{confirmConfigMutation as O,configMutationTargets as D,formatConfigMutationDisclosure as T,parseYesFlag as I,setupMutationPending as L}from"./setup-confirm.js";import{retrySubscriptionCheck as S}from"./subscription-retry.js";import{addUserPromptSubmitHook as q,addCodexSessionStartHook as Y,addCodexUserPromptSubmitHook as N,isMcpServerConfigured as W,isCodexMcpServerConfigured as j,isOpenCodeMcpServerConfigured as B,isSessionStartHookRegistered as E,isUserPromptSubmitHookRegistered as G,isCodexSessionStartHookRegistered as z,isCodexUserPromptSubmitHookRegistered as Q,removeSessionStartHook as V}from"./config-utils.js";import{ensureCliMcpConfigured as h}from"./ensure-mcp-config.js";import{handleVersionFlag as J}from"./version.js";import{initDebugFromArgv as K}from"./debug.js";async function X(){K(process.argv),J(),console.log(e.blue.bold(`
-\u25FC Borg MCP Setup Wizard \u25FC`));const a=process.argv.includes("--no-browser")||process.argv.includes("--device");let t=null,n=null,s=null;try{t=p.sync("claude")}catch{}try{n=p.sync("codex")}catch{}try{s=p.sync("opencode")}catch{}t&&console.log(e.gray(`Found Claude CLI: ${t}`)),n&&console.log(e.gray(`Found Codex CLI: ${n}`)),s&&console.log(e.gray(`Found OpenCode CLI: ${s}`)),(t||n||s)&&console.log(""),!t&&!n&&!s&&(console.error(e.red(`\u25FC No supported agent CLI found
-`)),console.error(e.yellow("Please install Claude Code, Codex, or OpenCode first:")),console.error(e.gray("  Claude Code: https://claude.ai/download")),console.error(e.gray("  Codex: https://developers.openai.com/codex")),console.error(e.gray(`  OpenCode: https://opencode.ai
-`)),process.exit(1)),console.log(e.blue("\u25FC Agent CLI Integration"));const v=I(process.argv),l=t!==null,g=n!==null,m=s!==null,P=W(),$=j(),A=B(),b=l&&E(),f=l&&!G(),y=g&&!z(),C=g&&!Q();if(L({claude:l,codex:g,opencode:m,claudeMcpConfigured:P,codexMcpConfigured:$,opencodeMcpConfigured:A,claudeHookPending:b||f,codexHookPending:y||C})&&(console.log(T(D({claude:l,codex:g,opencode:m}))),await O({isTTY:process.stdin.isTTY===!0,yes:v,confirm:async()=>{const{proceed:o}=await w({type:"confirm",name:"proceed",message:"Continue with these changes?",initial:!0});return o===!0}})==="abort"&&(console.log(e.yellow(`
-\u25FC Setup cancelled \u2014 no changes made.
-`)),process.exit(0))),console.log(""),t)try{h("claude"),b&&V(),f&&q(),console.log(e.green("\u25FC borg configured for Claude Code"))}catch(r){console.error(e.red(`
-\u25FC Failed to configure Claude Code: ${r.message}
-`)),process.exit(1)}if(n)try{h("codex"),y&&Y(),C&&N(),console.log(e.green("\u25FC borg configured for Codex"))}catch(r){console.error(e.red(`
-\u25FC Failed to configure Codex: ${r.message}
-`)),process.exit(1)}if(s)try{h("opencode"),console.log(e.green("\u25FC borg configured for OpenCode"))}catch(r){console.error(e.red(`
-\u25FC Failed to configure OpenCode: ${r.message}
-`)),process.exit(1)}console.log(""),console.log(e.blue("\u25FC Google Authentication"));const k=U(await R());if(k==="skip")console.log(e.green(`\u25FC Already signed in
-`));else if(k==="retry")console.error(e.yellow(`
-\u25FC Could not reach Google to verify your session (network issue).`)),console.error(e.yellow("Re-run `borg setup` when your connection is back.\n")),process.exit(1);else try{await H(a?{noBrowser:!0}:void 0)}catch(r){console.error(e.red(`
-\u25FC Authentication failed: ${r.message}
-`)),console.error(e.yellow("Re-run `borg setup` to try again.\n")),process.exit(1)}console.log(e.blue("\u25FC Subscription Check"));let c;try{c=await i()}catch(r){console.error(e.yellow(`
-\u25FC Subscription check failed: ${r.message}`)),console.error(e.gray(`\u25FC Retrying before falling back to the Free tier...
-`)),c={hasAccess:!1}}if(c=await S(c,{check:i,sleep:r=>new Promise(o=>setTimeout(o,r)),onRetry:(r,o)=>console.log(e.gray(`\u25FC Checking subscription... (attempt ${r}/${o})`))}),c.hasAccess)if(console.log(e.green("\u25FC Active subscription found")),c.expiresAt){const r=new Date(c.expiresAt);console.log(e.gray(`  Expires: ${r.toLocaleDateString()}
-`))}else console.log("");else{console.log(e.green("\u25FC You're on the Free tier \u2014 permanent, no card needed: 1 cube + 3 agent sessions + 100 req/hr.")),console.log(e.gray(`\u25FC Start using borgmcp right now. Upgrade any time: $1/month per cube, each cube adds 8 pooled agent sessions + 1000 req/hr.
-`));const{subscribeMethod:r}=await w({type:"select",name:"subscribeMethod",message:"You're ready on the Free tier. Want to do more?",choices:[{title:"\u25FC Continue on the Free tier (recommended)",value:"skip",description:"Start now \u2014 1 cube, 3 agent sessions, 100 req/hr. No payment required."},{title:"\u25FC Upgrade to Cube tier \u2014 $1/month per cube",value:"web",description:"Each cube adds 8 pooled agent sessions + 1000 req/hr. Opens the subscribe page in your browser."},{title:"\u25FC Quick Stripe checkout",value:"stripe",description:"Fast upgrade checkout in the browser"},{title:"\u25FC I already subscribed \u2014 re-check",value:"recheck",description:"Re-check now \u2014 a just-completed subscription can take a moment to activate"}]});switch(r===void 0&&console.log(e.yellow(`
-\u25FC No subscription option selected \u2014 continuing on the Free tier.
-`)),r){case"web":console.log(e.blue(`
-\u25FC Opening: https://borgmcp.ai/subscribe`));try{await x("https://borgmcp.ai/subscribe"),console.log(e.gray(`\u25FC Waiting for subscription (checking every 5s for 2 min)...
-`)),await F()}catch(o){console.error(e.yellow(`
-\u25FC ${o.message}`)),console.log(e.green(`\u25FC Continuing on the Free tier. Upgrade any time from https://borgmcp.ai/subscribe.
-`))}break;case"stripe":try{const o=await M();console.log(e.blue(`
-\u25FC Opening Stripe: ${o}`)),await x(o),console.log(e.gray(`\u25FC Waiting for subscription...
-`)),await F()}catch(o){console.error(e.red(`
-\u25FC Failed to create checkout: ${o.message}
-`)),console.log(e.green(`\u25FC Continuing on the Free tier. Upgrade any time from https://borgmcp.ai/subscribe.
-`))}break;case"recheck":try{let o;try{o=await i()}catch{o={hasAccess:!1}}o=await S(o,{check:i,sleep:d=>new Promise(u=>setTimeout(u,d)),onRetry:(d,u)=>console.log(e.gray(`\u25FC Re-checking subscription... (attempt ${d}/${u})`))}),o.hasAccess?console.log(e.green(`
-\u25FC Subscription found!
-`)):console.log(e.yellow(`
-\u25FC No subscription found \u2014 continuing on the Free tier.
-`))}catch(o){console.error(e.red(`
-\u25FC Failed to recheck: ${o.message}
-`)),console.log(e.green(`\u25FC Continuing on the Free tier.
-`))}break;case"skip":console.log(e.green(`
-\u25FC You're all set on the Free tier: 1 cube, 3 agent sessions, 100 req/hr.
-`));break}}console.log(e.green.bold(`Setup complete!
-`)),console.log(e.yellow(`\u{1F504} Restart Claude Code / Codex / OpenCode (or open a new session) for the changes to take effect.
-`)),console.log(e.gray("\u25FC Next steps:")),console.log(e.gray('1. cd into your project, then run "borg assimilate" to join a cube')),console.log(e.gray("   (this creates/joins the cube and launches your agent)")),console.log(e.gray(`2. Manage cubes and subscription at https://borgmcp.ai/dashboard
-`))}async function F(){for(let t=0;t<24;t++){await new Promise(n=>setTimeout(n,5e3));try{if((await i()).hasAccess){console.log(e.green(`\u25FC Subscription activated!
-`));return}}catch{}}throw new Error("Timeout - Run setup again after subscribing")}X().catch(a=>{console.error(e.red(`
-\u25FC Setup failed: ${a.message}
-`)),process.exit(1)});
+/**
+ * Borg MCP Setup Wizard
+ *
+ * Interactive setup flow:
+ * 1. Configure agent CLI MCP settings + orientation hooks
+ * 2. Print how to connect to a local self-hosted Borg server
+ *
+ * There is no cloud authority: setup offers/executes NO cloud auth, Google
+ * auth, subscription, or checkout.
+ */
+import prompts from 'prompts';
+import chalk from 'chalk';
+import which from 'which';
+import { confirmConfigMutation, configMutationTargets, formatConfigMutationDisclosure, parseYesFlag, setupMutationPending, } from './setup-confirm.js';
+import { addUserPromptSubmitHook, addCodexSessionStartHook, addCodexUserPromptSubmitHook, isMcpServerConfigured, isCodexMcpServerConfigured, isOpenCodeMcpServerConfigured, isSessionStartHookRegistered, isUserPromptSubmitHookRegistered, isCodexSessionStartHookRegistered, isCodexUserPromptSubmitHookRegistered, removeSessionStartHook, } from './config-utils.js';
+import { ensureCliMcpConfigured } from './ensure-mcp-config.js';
+import { handleVersionFlag } from './version.js';
+import { initDebugFromArgv } from './debug.js';
+import { defaultApprovalIo, setupApprovalWarnings } from './cli-tool-approval.js';
+/**
+ * Main setup wizard
+ */
+async function main() {
+    initDebugFromArgv(process.argv);
+    handleVersionFlag();
+    console.log(chalk.blue.bold('\n◼ Borg MCP Setup Wizard ◼'));
+    let claudeCliPath = null;
+    let codexCliPath = null;
+    let opencodeCliPath = null;
+    try {
+        claudeCliPath = which.sync('claude');
+    }
+    catch { /* optional */ }
+    try {
+        codexCliPath = which.sync('codex');
+    }
+    catch { /* optional */ }
+    try {
+        opencodeCliPath = which.sync('opencode');
+    }
+    catch { /* optional */ }
+    if (claudeCliPath)
+        console.log(chalk.gray(`Found Claude CLI: ${claudeCliPath}`));
+    if (codexCliPath)
+        console.log(chalk.gray(`Found Codex CLI: ${codexCliPath}`));
+    if (opencodeCliPath)
+        console.log(chalk.gray(`Found OpenCode CLI: ${opencodeCliPath}`));
+    if (claudeCliPath || codexCliPath || opencodeCliPath)
+        console.log('');
+    if (!claudeCliPath && !codexCliPath && !opencodeCliPath) {
+        console.error(chalk.red('◼ No supported agent CLI found\n'));
+        console.error(chalk.yellow('Please install Claude Code, Codex, or OpenCode first:'));
+        console.error(chalk.gray('  Claude Code: https://claude.ai/download'));
+        console.error(chalk.gray('  Codex: https://developers.openai.com/codex'));
+        console.error(chalk.gray('  OpenCode: https://opencode.ai\n'));
+        process.exit(1);
+    }
+    // Step 1: Configure every detected agent CLI
+    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 claudeMcpConfigured = isMcpServerConfigured();
+    const codexMcpConfigured = isCodexMcpServerConfigured();
+    const opencodeMcpConfigured = isOpenCodeMcpServerConfigured();
+    const claudeLegacyHookPending = claudeDetected && isSessionStartHookRegistered();
+    const claudeUpsHookPending = claudeDetected && !isUserPromptSubmitHookRegistered();
+    const codexSessionHookPending = codexDetected && !isCodexSessionStartHookRegistered();
+    const codexUpsHookPending = codexDetected && !isCodexUserPromptSubmitHookRegistered();
+    const claudeHookPending = claudeLegacyHookPending || claudeUpsHookPending;
+    const codexHookPending = codexSessionHookPending || codexUpsHookPending;
+    if (setupMutationPending({
+        claude: claudeDetected,
+        codex: codexDetected,
+        opencode: opencodeDetected,
+        claudeMcpConfigured,
+        codexMcpConfigured,
+        opencodeMcpConfigured,
+        claudeHookPending,
+        codexHookPending,
+    })) {
+        console.log(formatConfigMutationDisclosure(configMutationTargets({ claude: claudeDetected, codex: codexDetected, opencode: opencodeDetected })));
+        const mutationDecision = await confirmConfigMutation({
+            isTTY: process.stdin.isTTY === true,
+            yes,
+            confirm: async () => {
+                const { proceed } = await prompts({
+                    type: 'confirm',
+                    name: 'proceed',
+                    message: 'Continue with these changes?',
+                    initial: true,
+                });
+                return proceed === true;
+            },
+        });
+        if (mutationDecision === 'abort') {
+            console.log(chalk.yellow('\n◼ Setup cancelled — no changes made.\n'));
+            process.exit(0);
+        }
+    }
+    console.log('');
+    if (claudeCliPath) {
+        try {
+            ensureCliMcpConfigured('claude');
+            if (claudeLegacyHookPending)
+                removeSessionStartHook();
+            if (claudeUpsHookPending)
+                addUserPromptSubmitHook();
+            console.log(chalk.green('◼ borg configured for Claude Code'));
+        }
+        catch (error) {
+            console.error(chalk.red(`\n◼ Failed to configure Claude Code: ${error.message}\n`));
+            process.exit(1);
+        }
+    }
+    if (codexCliPath) {
+        try {
+            ensureCliMcpConfigured('codex');
+            if (codexSessionHookPending)
+                addCodexSessionStartHook();
+            if (codexUpsHookPending)
+                addCodexUserPromptSubmitHook();
+            console.log(chalk.green('◼ borg configured for Codex'));
+        }
+        catch (error) {
+            console.error(chalk.red(`\n◼ Failed to configure Codex: ${error.message}\n`));
+            process.exit(1);
+        }
+    }
+    if (opencodeCliPath) {
+        try {
+            ensureCliMcpConfigured('opencode');
+            console.log(chalk.green('◼ borg configured for OpenCode'));
+        }
+        catch (error) {
+            console.error(chalk.red(`\n◼ Failed to configure OpenCode: ${error.message}\n`));
+            process.exit(1);
+        }
+    }
+    const approvalIo = defaultApprovalIo(async () => '', () => false, {
+        cwd: process.cwd(),
+        env: process.env,
+        codexArgs: [],
+    });
+    for (const warning of await setupApprovalWarnings(approvalIo, {
+        codex: codexDetected,
+        opencode: opencodeDetected,
+    })) {
+        console.log(chalk.yellow(`warning: ${warning}`));
+    }
+    console.log('');
+    // Step 2: Server connection — local self-hosted only.
+    console.log(chalk.blue('◼ Server Connection'));
+    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.gray('◼ Next steps:'));
+    console.log(chalk.gray('1. cd into your project, then run "borg assimilate --host <host>" to join a cube'));
+    console.log(chalk.gray('   (this connects to your local server and launches your agent)'));
+    console.log(chalk.gray('2. Use `borg assimilate --host <host> --enroll` from the operator terminal to enroll a new client\n'));
+}
+// Run wizard
+main().catch((error) => {
+    console.error(chalk.red(`\n◼ Setup failed: ${error.message}\n`));
+    process.exit(1);
+});
+//# sourceMappingURL=setup.js.map

package/dist/setup.js.map

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

package/dist/shell-escape.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-escape.d.ts","sourceRoot":"","sources":["../src/shell-escape.ts"],"names":[],"mappings":"AAmBA,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE7C"}

package/dist/shell-escape.js

@@ -1 +1,22 @@
-function r(e){return`'${e.replace(/'/g,"'\\''")}'`}export{r as shellEscape};
+// POSIX-safe shell-escaping for paste-intended emission.
+//
+// Sprint 18 (gh-tracked via dispatch 10:41:47Z): when the CLI emits a
+// `cd <path>` line for the user to copy-paste into their shell, the path is
+// a filesystem-controlled string with no character constraints (unlike
+// DB-CHECK-constrained role/cube names). Paths can legally contain spaces,
+// `$VAR`, backticks, `$(cmd)`, embedded single-quotes, and other shell
+// metacharacters that would execute on paste under naive emission.
+//
+// drone-11 SR-LANE (cube entry 2026-05-19T10:44:35Z) escalation: double-
+// quoting handles spaces but `$VAR` / backtick / `$(cmd)` still expand
+// inside double-quotes. Single-quotes with internal-quote escape (`'\''`
+// = close-quote / escaped-quote / re-open-quote) defang every shell
+// metachar including embedded `'`. POSIX-defined, copy-paste-runnable
+// across bash / zsh / dash / sh.
+//
+// Behavior: returns the input wrapped in single-quotes with any internal
+// `'` rewritten as `'\''`. Empty string returns `''`.
+export function shellEscape(s) {
+    return `'${s.replace(/'/g, `'\\''`)}'`;
+}
+//# sourceMappingURL=shell-escape.js.map

package/dist/shell-escape.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shell-escape.js","sourceRoot":"","sources":["../src/shell-escape.ts"],"names":[],"mappings":"AAAA,yDAAyD;AACzD,EAAE;AACF,sEAAsE;AACtE,4EAA4E;AAC5E,uEAAuE;AACvE,2EAA2E;AAC3E,uEAAuE;AACvE,mEAAmE;AACnE,EAAE;AACF,yEAAyE;AACzE,uEAAuE;AACvE,yEAAyE;AACzE,oEAAoE;AACpE,sEAAsE;AACtE,iCAAiC;AACjC,EAAE;AACF,yEAAyE;AACzE,sDAAsD;AAEtD,MAAM,UAAU,WAAW,CAAC,CAAS;IACnC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC;AACzC,CAAC"}

package/dist/spawn.d.ts

@@ -3,8 +3,8 @@
  *
  * Replaced by `borg assimilate [role] --worktree <name>` (see
  * `assimilate-cmd.ts`). The new command folds worktree creation,
- * OAuth bootstrap, cube creation, template application, and drone
- * assimilation into one shell call. This file remains so existing
+ * cube creation, template application, and drone assimilation into one
+ * shell call. This file remains so existing
  * scripts and tab-completion entries fail loudly with an actionable
  * migration message rather than silently mis-routing.
  *

package/dist/spawn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../src/spawn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,wBAAsB,QAAQ,IAAI,OAAO,CAAC,MAAM,CAAC,CAahD"}

package/dist/spawn.js

@@ -1,10 +1,29 @@
-import{validateName as s}from"./name-validator.js";async function r(){return process.stderr.write(`borg spawn is removed. Use:
-  borg assimilate [role] --worktree <name>
-
-Example: if you previously ran \`borg spawn drone-2\`, the equivalent is
-  borg assimilate --worktree drone-2
-(role is optional; defaults per first-drone rules)
-
-If you want a specific role:
-  borg assimilate builder --worktree drone-2
-`),2}export{r as runSpawn,s as validateName};
+/**
+ * `borg spawn` — deprecation stub.
+ *
+ * Replaced by `borg assimilate [role] --worktree <name>` (see
+ * `assimilate-cmd.ts`). The new command folds worktree creation,
+ * cube creation, template application, and drone assimilation into one
+ * shell call. This file remains so existing
+ * scripts and tab-completion entries fail loudly with an actionable
+ * migration message rather than silently mis-routing.
+ *
+ * `validateName` continues to be re-exported from here for callers
+ * that still depend on the symbol (it lives in `name-validator.ts`
+ * now — single source of truth).
+ */
+export { validateName } from './name-validator.js';
+export async function runSpawn() {
+    const msg = 'borg spawn is removed. Use:\n' +
+        '  borg assimilate [role] --worktree <name>\n' +
+        '\n' +
+        'Example: if you previously ran `borg spawn drone-2`, the equivalent is\n' +
+        '  borg assimilate --worktree drone-2\n' +
+        '(role is optional; defaults per first-drone rules)\n' +
+        '\n' +
+        'If you want a specific role:\n' +
+        '  borg assimilate builder --worktree drone-2\n';
+    process.stderr.write(msg);
+    return 2;
+}
+//# sourceMappingURL=spawn.js.map

package/dist/spawn.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../src/spawn.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,MAAM,CAAC,KAAK,UAAU,QAAQ;IAC5B,MAAM,GAAG,GACP,+BAA+B;QAC/B,8CAA8C;QAC9C,IAAI;QACJ,0EAA0E;QAC1E,wCAAwC;QACxC,sDAAsD;QACtD,IAAI;QACJ,gCAAgC;QAChC,gDAAgD,CAAC;IACnD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC1B,OAAO,CAAC,CAAC;AACX,CAAC"}

package/dist/startup-services.d.ts

@@ -5,7 +5,6 @@ export interface McpStartupServices {
     auditHook: McpStartupTask;
     sseStream: McpStartupTask;
     openCode: McpStartupTask;
-    healthBeat: McpStartupTask;
 }
 /**
  * Run normal long-lived MCP child startup work. The assimilation readiness

package/dist/startup-services.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"startup-services.d.ts","sourceRoot":"","sources":["../src/startup-services.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAExD,2EAA2E;AAC3E,MAAM,WAAW,kBAAkB;IACjC,gBAAgB,EAAE,cAAc,CAAC;IACjC,SAAS,EAAE,cAAc,CAAC;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,cAAc,CAAC;CAC1B;AAED;;;;;GAKG;AACH,wBAAsB,qBAAqB,CACzC,cAAc,EAAE,OAAO,EACvB,QAAQ,EAAE,kBAAkB,GAC3B,OAAO,CAAC,IAAI,CAAC,CAgBf"}

package/dist/startup-services.js

@@ -1 +1,26 @@
-async function r(o,t){if(o)return;const a=[t.sessionStartHook,t.auditHook,t.sseStream,t.openCode,t.healthBeat];for(const n of a)try{await n()}catch{}}export{r as runMcpStartupServices};
+/**
+ * Run normal long-lived MCP child startup work. The assimilation readiness
+ * child must reach the initialize response without acquiring leases, fetching
+ * SSE, mutating hooks, or starting timers because it is intentionally killed
+ * immediately after that response.
+ */
+export async function runMcpStartupServices(readinessProbe, services) {
+    if (readinessProbe)
+        return;
+    const tasks = [
+        services.sessionStartHook,
+        services.auditHook,
+        services.sseStream,
+        services.openCode,
+    ];
+    for (const task of tasks) {
+        try {
+            await task();
+        }
+        catch {
+            // Every background service is best-effort and independent. A failure in
+            // one must neither break MCP initialize nor suppress later services.
+        }
+    }
+}
+//# sourceMappingURL=startup-services.js.map

package/dist/startup-services.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"startup-services.js","sourceRoot":"","sources":["../src/startup-services.ts"],"names":[],"mappings":"AAUA;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,cAAuB,EACvB,QAA4B;IAE5B,IAAI,cAAc;QAAE,OAAO;IAC3B,MAAM,KAAK,GAAG;QACZ,QAAQ,CAAC,gBAAgB;QACzB,QAAQ,CAAC,SAAS;QAClB,QAAQ,CAAC,SAAS;QAClB,QAAQ,CAAC,QAAQ;KAClB,CAAC;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC;YACH,MAAM,IAAI,EAAE,CAAC;QACf,CAAC;QAAC,MAAM,CAAC;YACP,wEAAwE;YACxE,qEAAqE;QACvE,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/stream-owner.d.ts

@@ -1,6 +1,7 @@
 export declare const STREAM_OWNER_STALE_MS = 70000;
 /** Grace window for mkdir→owner.json initialization before an empty lock is reclaimable. */
 export declare const STREAM_OWNER_INIT_STALE_MS = 5000;
+export declare const STREAM_OWNER_TAKEOVER_STALE_MS = 5000;
 export interface StreamOwnerRecord {
     schemaVersion: number;
     pid: number;
@@ -18,8 +19,9 @@ export interface StreamOwnershipSnapshot {
     heartbeatAt?: string;
     ageMs?: number;
     lockPath?: string;
-    /** Directory mtime used to compare-before-reap an orphaned initialization. */
-    lockMtimeMs?: number;
+    /** Opened-directory identity used to bind inspection to later takeover. */
+    lockDev?: number;
+    lockIno?: number;
 }
 export interface StreamLease {
     lockPath: string;
@@ -36,6 +38,8 @@ export interface StreamOwnerDeps {
     processStartedAt?: string;
     isPidAlive?: (pid: number) => boolean;
     beforeTakeoverVerify?: (takeoverPath: string) => Promise<void>;
+    beforeLeaseRefreshMutation?: (lockPath: string) => Promise<void>;
+    beforeLeaseReleaseMutation?: (lockPath: string) => Promise<void>;
     /** Initialization/refresh writer seam for failure-path regression tests. */
     writeRecord?: (lockPath: string, record: StreamOwnerRecord) => Promise<void>;
 }

package/dist/stream-owner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stream-owner.d.ts","sourceRoot":"","sources":["../src/stream-owner.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,qBAAqB,QAAS,CAAC;AAC5C,4FAA4F;AAC5F,eAAO,MAAM,0BAA0B,OAAQ,CAAC;AAChD,eAAO,MAAM,8BAA8B,OAAQ,CAAC;AAKpD,MAAM,WAAW,iBAAiB;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,OAAO,GAAG,wBAAwB,GAAG,cAAc,GAAG,yBAAyB,GAAG,SAAS,CAAC;IACnG,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,iBAAiB,CAAC;IAC1B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,oBAAoB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,0BAA0B,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,0BAA0B,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,4EAA4E;IAC5E,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9E;AAED,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,QAAQ,SAAmB,GAC1B,MAAM,CAIR;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,OAAO,SAAwB,EAC/B,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAoC7B;AAED,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,GAAE,eAAoB,GACzB,OAAO,CAAC,uBAAuB,CAAC,CA+DlC"}