borgmcp 3.4.0 → 3.5.0

package/README.md

@@ -84,8 +84,26 @@ continue:
 The lookup is the same for Claude Code, Codex, and OpenCode; only their launch
 adapters differ. It is also the same for an in-place drone and a sibling drone
 worktree: run `borg` inside the worktree where the drone was assimilated.
-Running it in the repository's main worktree does not resume sibling drones. To
-resume all saved drone worktrees for a cube, run:
+In a TTY, running `borg` in the repository's main worktree offers the repository's drones so you can pick one to resume.
+
+You do not have to remember worktree paths. To list the drones registered on
+this machine, run:
+
+```bash
+borg seats
+```
+
+To resume one drone from any directory, run:
+
+```bash
+borg launch <label-or-id-prefix>
+```
+
+`borg launch` finds the drone's worktree in the local seat registry and starts
+it exactly as if you ran `borg` in that worktree. If a label exists in more
+than one cube, add `--cube <name>` or use the drone id prefix.
+
+To resume all saved drone worktrees for a cube, run:
 
 ```bash
 borg launch-all [cube]

package/dist/backends/{launch-all-windows.d.ts → launch-all-terminals.d.ts}

@@ -1,13 +1,15 @@
 import type { DroneCandidate } from '../launch-all-discovery.js';
 import type { LaunchAllDeps } from '../launch-all-deps.js';
-export interface WindowsOpts {
+export interface TerminalsOpts {
     borgPath: string;
     platform: NodeJS.Platform;
+    cubeName: string;
     launchedAtISO: string;
     /** Stagger between drone launches (ms) to avoid the rate limiter; 0 disables. */
     launchDelayMs: number;
     /** Injectable sleep (real setTimeout in prod; no-op spy in tests). */
     sleep: (ms: number) => Promise<void>;
 }
-export declare function runWindowsBackend(candidates: DroneCandidate[], opts: WindowsOpts, deps: LaunchAllDeps): Promise<void>;
-//# sourceMappingURL=launch-all-windows.d.ts.map
+export declare function hasMacOSTerminalApp(deps: Pick<LaunchAllDeps, 'pathExists'>): boolean;
+export declare function runTerminalsBackend(candidates: DroneCandidate[], opts: TerminalsOpts, deps: LaunchAllDeps): Promise<void>;
+//# sourceMappingURL=launch-all-terminals.d.ts.map

package/dist/backends/launch-all-terminals.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"launch-all-terminals.d.ts","sourceRoot":"","sources":["../../src/backends/launch-all-terminals.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAa3D,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,iFAAiF;IACjF,aAAa,EAAE,MAAM,CAAC;IACtB,sEAAsE;IACtE,KAAK,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtC;AASD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,GAAG,OAAO,CAEpF;AAoED,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,cAAc,EAAE,EAC5B,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,IAAI,CAAC,CAgBf"}

package/dist/backends/{launch-all-windows.js → launch-all-terminals.js}

@@ -1,21 +1,32 @@
-// gh#556 Part 2 — windows backend (explicit `--mode windows` only, spec §4.2).
+// client#400 — terminals backend (`--mode terminals`; macOS auto default).
 // Opens each worktree as a new terminal window/tab. macOS: iTerm/Terminal via
 // osascript. Linux: $BORG_TERMINAL / $TERMINAL / probed emulator. No shared
 // session, so no post-launch attach. Hard-fails if no compatible terminal found.
 import { buildLaunchCommand } from '../launch-all-command.js';
 import { writeLockMarker } from '../launch-all-locks.js';
+import { composeTerminalTitle } from '../terminal-title.js';
+import { shellEscape } from '../shell-escape.js';
+const ITERM_APP = '/Applications/iTerm.app';
+const TERMINAL_APPS = [
+    '/System/Applications/Utilities/Terminal.app',
+    '/Applications/Utilities/Terminal.app',
+    '/Applications/Terminal.app',
+];
 /** AppleScript string-literal escaping (backslash + double-quote). */
 function appleScriptEscape(s) {
     return s.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
 class NoTerminalError extends Error {
 }
+export function hasMacOSTerminalApp(deps) {
+    return deps.pathExists(ITERM_APP) || TERMINAL_APPS.some((path) => deps.pathExists(path));
+}
 /** macOS: open each candidate in iTerm or Terminal via osascript. */
 async function launchMacOS(candidates, opts, deps) {
-    const hasITerm = deps.pathExists('/Applications/iTerm.app');
-    const hasTerminal = deps.pathExists('/Applications/Terminal.app');
+    const hasITerm = deps.pathExists(ITERM_APP);
+    const hasTerminal = TERMINAL_APPS.some((path) => deps.pathExists(path));
     if (!hasITerm && !hasTerminal) {
-        throw new NoTerminalError('borg launch-all: --mode windows requires a compatible terminal app.\n' +
+        throw new NoTerminalError('borg launch-all: --mode terminals requires a compatible terminal app.\n' +
             'Not found: iTerm.app, Terminal.app\n' +
             'Install iTerm2 (https://iterm2.com) or use --mode tmux (brew install tmux).\n');
     }
@@ -24,9 +35,10 @@ async function launchMacOS(candidates, opts, deps) {
         if (i > 0 && opts.launchDelayMs > 0)
             await opts.sleep(opts.launchDelayMs); // rate-limit stagger
         const cmd = buildLaunchCommand(c.worktreeDir, opts.borgPath);
+        const title = composeTerminalTitle({ label: c.droneLabel, cubeName: opts.cubeName }, '');
         const script = hasITerm
-            ? `tell application "iTerm"\n  tell current window to create tab with default profile command "${appleScriptEscape(cmd)}"\nend tell`
-            : `tell application "Terminal"\n  do script "${appleScriptEscape(cmd)}"\n  activate\nend tell`;
+            ? `tell application "iTerm"\n  if (count of windows) = 0 then\n    set launchedWindow to (create window with default profile command "${appleScriptEscape(cmd)}")\n    tell current session of launchedWindow to set name to "${appleScriptEscape(title)}"\n  else\n    tell current window\n      set launchedTab to (create tab with default profile command "${appleScriptEscape(cmd)}")\n      tell current session of launchedTab to set name to "${appleScriptEscape(title)}"\n    end tell\n  end if\nend tell`
+            : `tell application "Terminal"\n  set launchedTab to do script "${appleScriptEscape(cmd)}"\n  set custom title of launchedTab to "${appleScriptEscape(title)}"\n  set title displays custom title of launchedTab to true\n  activate\nend tell`;
         deps.runSync('osascript', ['-e', script]);
         writeLockMarker(deps, c.cubeId, c.droneLabel, c.worktreeDir, opts.launchedAtISO);
     }
@@ -45,14 +57,16 @@ async function launchLinux(candidates, opts, deps) {
         }
     }
     if (!term) {
-        throw new NoTerminalError('borg launch-all: --mode windows requires a terminal emulator.\n' +
+        throw new NoTerminalError('borg launch-all: --mode terminals requires a terminal emulator.\n' +
             'Not found. Set $BORG_TERMINAL=<path> or use --mode tmux.\n');
     }
     for (let i = 0; i < candidates.length; i++) {
         const c = candidates[i];
         if (i > 0 && opts.launchDelayMs > 0)
             await opts.sleep(opts.launchDelayMs); // rate-limit stagger
-        const cmd = buildLaunchCommand(c.worktreeDir, opts.borgPath, { keepOpenOnFail: true });
+        const title = composeTerminalTitle({ label: c.droneLabel, cubeName: opts.cubeName }, '');
+        const cmd = `printf '\\033]0;%s\\007' ${shellEscape(title)}; ` +
+            buildLaunchCommand(c.worktreeDir, opts.borgPath, { keepOpenOnFail: true });
         // `<term> -e sh -c '<cmd>'` opens a new window running the command.
         deps.runSync(term, ['-e', 'sh', '-c', cmd]);
         writeLockMarker(deps, c.cubeId, c.droneLabel, c.worktreeDir, opts.launchedAtISO);
@@ -64,14 +78,14 @@ async function launchLinux(candidates, opts, deps) {
  * string literal (parse error). Reject such paths up front (the user's own path;
  * pathological) — fail-loud + skip, never silently mangle. Applies to both
  * platforms defensively (the tmux primary handles control chars fine via
- * shellEscape + array-args, so this guard is windows-backend-specific).
+ * shellEscape + array-args, so this guard is terminals-backend-specific).
  */
 const CONTROL_CHAR_RE = /[\x00-\x1f\x7f]/;
-export async function runWindowsBackend(candidates, opts, deps) {
+export async function runTerminalsBackend(candidates, opts, deps) {
     const safe = candidates.filter((c) => {
         if (CONTROL_CHAR_RE.test(c.worktreeDir)) {
             deps.stderr(`skipping ${c.droneLabel} (${JSON.stringify(c.worktreeDir)}): worktree path contains a control ` +
-                `character — unsafe for --mode windows; use --mode tmux instead.\n`);
+                `character — unsafe for --mode terminals; use --mode tmux instead.\n`);
             return false;
         }
         return true;
@@ -83,4 +97,4 @@ export async function runWindowsBackend(candidates, opts, deps) {
         await launchLinux(safe, opts, deps);
     }
 }
-//# sourceMappingURL=launch-all-windows.js.map
+//# sourceMappingURL=launch-all-terminals.js.map

package/dist/backends/launch-all-terminals.js.map

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

package/dist/bare-launch-menu.d.ts

@@ -1,29 +1,38 @@
 /**
  * gh#853 — bare `borg` (no-args) interactive launch menu.
  *
- * When `borg` is run with NO arguments in a TTY, offer a small launch selector
- * instead of launching immediately:
- *   1. Launch (default)             — the configured agent (Enter selects).
- *   2. Launch with <other> instead  — the OTHER configured agent, ONE-SHOT
- *                                      (does NOT persist the preference).
- *   3. Launch all                   — runLaunchAll for the active cube.
+ * When `borg` is run with NO arguments in a TTY outside an active seat, offer
+ * a small launch selector. In a repository with live sibling drones, those
+ * drones come first; otherwise the existing agent choices remain unchanged.
  *
  * The option-set, the selection→action mapping, and the show/collapse decision
  * are pure functions so they're unit-testable without a real TTY. claude.ts
- * main() is thin glue: it computes the inputs (default cli, other-configured cli,
- * launch-all targets), gates on shouldShowLaunchMenu, runs the orchestrator with
- * the real readline prompt, then dispatches the returned action.
+ * main() is thin glue: it computes the available candidates and agent choices,
+ * gates on shouldShowLaunchMenu, runs the orchestrator with the real readline
+ * prompt, then dispatches the returned action.
  *
- * Load-bearing safety: TTY-only + bare-args-only (shouldShowLaunchMenu) so every
- * scripted/programmatic `borg` and every explicit subcommand/flag is untouched.
+ * Load-bearing safety: TTY-only + bare-args-only + no-active-seat
+ * (shouldShowLaunchMenu), so scripted/programmatic invocations and direct
+ * worktree resumes are untouched.
  */
-import type { BorgCli } from './cubes.js';
+import type { ActiveCube, BorgCli } from './cubes.js';
+import type { DroneCandidate } from './launch-all-discovery.js';
+import type { SeatStatus } from './seat-probe.js';
 export type LaunchMenuAction = {
     kind: 'launch';
     cli: BorgCli;
+} | {
+    kind: 'launch-seat';
+    target: string;
 } | {
     kind: 'launch-all';
+    cubeId?: string;
 };
+export interface LaunchMenuDroneCandidate {
+    droneLabel: string;
+    target: string;
+    worktree: string;
+}
 export interface LaunchMenuOption {
     /** The keystroke that selects this option (sequential: '1', '2', …). */
     key: string;
@@ -35,9 +44,35 @@ export interface LaunchMenuInputs {
     defaultCli: BorgCli;
     /** All configured agents that are NOT the default, in display order. */
     otherConfiguredClis: BorgCli[];
-    /** True iff there's an active cube with >=1 discoverable drone (option 3). */
+    /** True iff the current menu context has launch-all targets. */
     hasLaunchAllTargets: boolean;
+    /** Live sibling drones offered before the unattached launch choices. */
+    droneCandidates?: LaunchMenuDroneCandidate[];
+    /** Cube selected by the sibling-drone context for its launch-all action. */
+    launchAllCubeId?: string;
+}
+interface LaunchMenuCandidateDeps {
+    readAllProjectIdentities: () => Promise<Array<{
+        projectPath: string;
+        cube: ActiveCube;
+    }>>;
+    discoverDroneCandidates: (cubeId: string) => Promise<DroneCandidate[]>;
+    getActiveSeatForWorktree: (worktree: string) => Promise<{
+        cubeId: string;
+        droneId?: string;
+    } | null>;
+    pathExists: (worktree: string) => boolean;
+    probeSeat: (candidate: DroneCandidate) => Promise<SeatStatus>;
 }
+/**
+ * Find linked sibling worktrees that still own their preferred active seat.
+ * Authoritative terminal probe results are omitted; transient/unknown probe
+ * results stay visible, matching launch-all's constructive fail-open behavior.
+ */
+export declare function discoverLiveLaunchMenuCandidates(deps: LaunchMenuCandidateDeps): Promise<{
+    candidates: LaunchMenuDroneCandidate[];
+    launchAllCubeId?: string;
+}>;
 /**
  * Resolve and configure the CLI that will actually launch.
  *
@@ -47,14 +82,15 @@ export interface LaunchMenuInputs {
  */
 export declare function configureSelectedLaunchCli(defaultCli: BorgCli, action: LaunchMenuAction | undefined, configure: (cli: BorgCli) => void): BorgCli;
 /**
- * Gate: the menu fires ONLY for bare `borg` (no args) in a TTY. Any explicit
- * subcommand/flag, or a non-TTY (piped/scripted/CI) invocation, falls straight
- * through to the existing default launch — no menu, no behavior change.
+ * Gate: the menu fires ONLY for bare `borg` (no args) in a TTY without an
+ * active seat. Explicit invocations, non-TTY launches, and direct worktree
+ * resumes fall straight through to the existing launch path.
  */
 export declare function shouldShowLaunchMenu(args: {
     extraArgs: string[];
     stdinIsTTY: boolean;
     stdoutIsTTY: boolean;
+    hasActiveSeat?: boolean;
 }): boolean;
 export declare function explicitCliLaunchHint(args: {
     explicitCli: BorgCli | undefined;
@@ -94,4 +130,5 @@ export declare function runBareLaunchMenu(inputs: LaunchMenuInputs, prompt: (mes
     maxAttempts?: number;
     warn?: (message: string) => void;
 }): Promise<LaunchMenuAction>;
+export {};
 //# sourceMappingURL=bare-launch-menu.d.ts.map

package/dist/bare-launch-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bare-launch-menu.d.ts","sourceRoot":"","sources":["../src/bare-launch-menu.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAE1C,MAAM,MAAM,gBAAgB,GACxB;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,GAAG,EAAE,OAAO,CAAA;CAAE,GAChC;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3B,MAAM,WAAW,gBAAgB;IAC/B,wEAAwE;IACxE,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED,MAAM,WAAW,gBAAgB;IAC/B,wDAAwD;IACxD,UAAU,EAAE,OAAO,CAAC;IACpB,wEAAwE;IACxE,mBAAmB,EAAE,OAAO,EAAE,CAAC;IAC/B,8EAA8E;IAC9E,mBAAmB,EAAE,OAAO,CAAC;CAC9B;AAED;;;;;;GAMG;AACH,wBAAgB,0BAA0B,CACxC,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,gBAAgB,GAAG,SAAS,EACpC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,IAAI,GAChC,OAAO,CAIT;AAID;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;CACtB,GAAG,OAAO,CAEV;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,mBAAmB,EAAE,OAAO,CAAC;CAC9B,GAAG,MAAM,GAAG,IAAI,CAIhB;AAED,wBAAgB,yCAAyC,CAAC,IAAI,EAAE;IAC9D,WAAW,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;CACxB,GAAG,OAAO,CAEV;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,GAAG,gBAAgB,EAAE,CAuBnF;AAED,8EAA8E;AAC9E,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,gBAAgB,EAAE,EAC3B,QAAQ,EAAE,MAAM,GACf;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,gBAAgB,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAA;CAAE,CAKxD;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,MAAM,CAGpE;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC5C,IAAI,GAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAA;CAAO,GACpE,OAAO,CAAC,gBAAgB,CAAC,CAa3B"}
+{"version":3,"file":"bare-launch-menu.d.ts","sourceRoot":"","sources":["../src/bare-launch-menu.ts"],"names":[],"mappings":"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"}

package/dist/bare-launch-menu.js

@@ -1,3 +1,59 @@
+const TERMINAL_SEAT_STATUSES = new Set([
+    'evicted',
+    'revoked',
+    'rejected',
+    'credential-rejected',
+    'trust-mismatch',
+]);
+/**
+ * Find linked sibling worktrees that still own their preferred active seat.
+ * Authoritative terminal probe results are omitted; transient/unknown probe
+ * results stay visible, matching launch-all's constructive fail-open behavior.
+ */
+export async function discoverLiveLaunchMenuCandidates(deps) {
+    const identities = await deps.readAllProjectIdentities();
+    const cubeIds = [...new Set(identities.map(({ cube }) => cube.cubeId))];
+    const discovered = (await Promise.all(cubeIds.map((cubeId) => deps.discoverDroneCandidates(cubeId)))).flat();
+    const candidates = [];
+    const seen = new Set();
+    for (const candidate of discovered) {
+        if (!deps.pathExists(candidate.worktreeDir))
+            continue;
+        const preferred = await deps.getActiveSeatForWorktree(candidate.worktreeDir);
+        if (!preferred ||
+            preferred.cubeId !== candidate.cubeId ||
+            preferred.droneId !== candidate.droneId)
+            continue;
+        let status;
+        try {
+            status = await deps.probeSeat(candidate);
+        }
+        catch {
+            status = 'indeterminate';
+        }
+        if (TERMINAL_SEAT_STATUSES.has(status))
+            continue;
+        const key = `${candidate.cubeId}\0${candidate.droneId}\0${candidate.worktreeDir}`;
+        if (seen.has(key))
+            continue;
+        seen.add(key);
+        candidates.push({
+            cubeId: candidate.cubeId,
+            droneLabel: candidate.droneLabel,
+            target: candidate.droneId,
+            worktree: candidate.worktreeDir,
+        });
+    }
+    candidates.sort((a, b) => a.droneLabel.localeCompare(b.droneLabel) || a.worktree.localeCompare(b.worktree));
+    const candidateCubeIds = new Set(candidates.map((candidate) => candidate.cubeId));
+    const launchAllCubeId = candidateCubeIds.size === 1
+        ? candidates[0].cubeId
+        : undefined;
+    return {
+        candidates: candidates.map(({ cubeId: _cubeId, ...candidate }) => candidate),
+        ...(launchAllCubeId ? { launchAllCubeId } : {}),
+    };
+}
 /**
  * Resolve and configure the CLI that will actually launch.
  *
@@ -12,12 +68,15 @@ export function configureSelectedLaunchCli(defaultCli, action, configure) {
 }
 const PRETTY = { claude: 'Claude', codex: 'Codex', opencode: 'OpenCode' };
 /**
- * Gate: the menu fires ONLY for bare `borg` (no args) in a TTY. Any explicit
- * subcommand/flag, or a non-TTY (piped/scripted/CI) invocation, falls straight
- * through to the existing default launch — no menu, no behavior change.
+ * Gate: the menu fires ONLY for bare `borg` (no args) in a TTY without an
+ * active seat. Explicit invocations, non-TTY launches, and direct worktree
+ * resumes fall straight through to the existing launch path.
  */
 export function shouldShowLaunchMenu(args) {
-    return args.extraArgs.length === 0 && args.stdinIsTTY && args.stdoutIsTTY;
+    return args.extraArgs.length === 0
+        && args.stdinIsTTY
+        && args.stdoutIsTTY
+        && !args.hasActiveSeat;
 }
 export function explicitCliLaunchHint(args) {
     if (!args.explicitCli || !args.stdinIsTTY || !args.stdoutIsTTY)
@@ -35,6 +94,38 @@ export function shouldResolveExplicitCliLaunchHintTargets(args) {
  * middle option never produces a "1) … 3) …" gap menu.
  */
 export function buildLaunchMenuOptions(inputs) {
+    if (inputs.droneCandidates && inputs.droneCandidates.length > 0) {
+        const options = [...inputs.droneCandidates]
+            .sort((a, b) => a.droneLabel.localeCompare(b.droneLabel) || a.worktree.localeCompare(b.worktree))
+            .map((candidate, index) => ({
+            key: String(index + 1),
+            label: `Resume ${candidate.droneLabel} (${candidate.worktree})`,
+            action: { kind: 'launch-seat', target: candidate.target },
+        }));
+        if (inputs.hasLaunchAllTargets) {
+            options.push({
+                key: String(options.length + 1),
+                label: "Launch all (this cube's drone worktrees)",
+                action: {
+                    kind: 'launch-all',
+                    ...(inputs.launchAllCubeId ? { cubeId: inputs.launchAllCubeId } : {}),
+                },
+            });
+        }
+        options.push({
+            key: String(options.length + 1),
+            label: `Launch ${PRETTY[inputs.defaultCli]} here without a drone`,
+            action: { kind: 'launch', cli: inputs.defaultCli },
+        });
+        for (const cli of inputs.otherConfiguredClis) {
+            options.push({
+                key: String(options.length + 1),
+                label: `Launch with ${PRETTY[cli]} here without a drone (one-shot)`,
+                action: { kind: 'launch', cli },
+            });
+        }
+        return options;
+    }
     const options = [
         {
             key: '1',

package/dist/bare-launch-menu.js.map

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

package/dist/claude.d.ts

@@ -15,9 +15,14 @@
  *   borg server <cmd>   → Forward a lifecycle command to borg-mcp-server
  */
 import { spawn } from 'child_process';
+import { type ActiveCube, type BorgCli } from './cubes.js';
 import { buildDefaultAssimilateDeps } from './assimilate-deps.js';
 import { connectOpenCodeDrone, createOpenCodeLaunchKickoff } from './opencode-drone.js';
 export type AssimilateDepsBuilder = typeof buildDefaultAssimilateDeps;
+export declare class OpenCodeTargetedLaunchConfigError extends Error {
+    readonly code = "OPENCODE_TARGETED_LAUNCH_CONFIG";
+    constructor(droneLabel: string, worktree: string);
+}
 export declare function createOpenCodeLaunchPlan(cwd: string, port: number, prompt: string, passthroughArgs?: string[]): {
     launchArgs: string[];
     envPort: string;
@@ -40,4 +45,5 @@ export declare function launchOpenCodeProcess(options: {
     process: ReturnType<typeof spawn>;
 };
 export declare function runAssimilateEntry(args: readonly string[], buildDeps?: AssimilateDepsBuilder): Promise<number>;
+export declare function ensureResolvedCliConfigured(cli: BorgCli, active?: ActiveCube | null): void;
 //# sourceMappingURL=claude.d.ts.map

package/dist/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAiBtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAkDlE,OAAO,EAAwB,oBAAoB,EAAE,2BAA2B,EAA+C,MAAM,qBAAqB,CAAC;AAM3J,MAAM,MAAM,qBAAqB,GAAG,OAAO,0BAA0B,CAAC;AAEtE,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,eAAe,GAAE,MAAM,EAAO,GAC7B;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAO9D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,oBAAoB,CAAC;CACvC,GAAG;IACF,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;CACnC,CAmBA;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,SAAS,GAAE,qBAAkD,GAC5D,OAAO,CAAC,MAAM,CAAC,CAUjB"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../src/claude.ts"],"names":[],"mappings":";AACA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAOtC,OAAO,EASL,KAAK,UAAU,EACf,KAAK,OAAO,EACb,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AA0DlE,OAAO,EAAwB,oBAAoB,EAAE,2BAA2B,EAA+C,MAAM,qBAAqB,CAAC;AAM3J,MAAM,MAAM,qBAAqB,GAAG,OAAO,0BAA0B,CAAC;AAEtE,qBAAa,iCAAkC,SAAQ,KAAK;IAC1D,QAAQ,CAAC,IAAI,qCAAqC;gBAEtC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAQjD;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,eAAe,GAAE,MAAM,EAAO,GAC7B;IAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAO9D;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,UAAU,CAAC,OAAO,2BAA2B,CAAC,CAAC;IACxD,YAAY,CAAC,EAAE,OAAO,KAAK,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,oBAAoB,CAAC;CACvC,GAAG;IACF,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC,UAAU,CAAC;IAC7B,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC;CACnC,CAmBA;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,SAAS,GAAE,qBAAkD,GAC5D,OAAO,CAAC,MAAM,CAAC,CAUjB;AA+gBD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,UAAU,GAAG,IAAW,GAAG,IAAI,CA6ChG"}

package/dist/claude.js

@@ -21,7 +21,7 @@ import { basename } from 'node:path';
 import { createInterface } from 'node:readline/promises';
 import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
-import { findProjectRoot, getActiveCube, inboxPathForDrone, setCodexWakeTarget, pruneDeadCodexWakeTargets } from './cubes.js';
+import { BORG_LAUNCH_EXPECTED_SEAT_ENV, codexLaunchSeatExpectationConfigArgs, findProjectRoot, getActiveCube, inboxPathForDrone, LaunchSeatIdentityChangedError, setCodexWakeTarget, pruneDeadCodexWakeTargets, } from './cubes.js';
 import { monitorStateRootForWorktree } from './inbox-monitor.js';
 import { formatSeatReattachRefusal, inspectLiveInboxMonitor } from './seat-reattach-guard.js';
 import { handleVersionFlag, getPackageVersion } from './version.js';
@@ -38,8 +38,9 @@ import { unknownSubcommand } from './unknown-subcommand.js';
 import { parseRecoverEnrollmentArgs, runRecoverEnrollment } from './recover-enrollment-cmd.js';
 import { runLaunchAll } from './launch-all-cmd.js';
 import { buildDefaultLaunchAllDeps } from './launch-all-deps.js';
+import { buildDefaultSeatCommandDeps, parseLaunchSeatArgs, parseSeatsArgs, runLaunchSeat, runSeats, } from './seat-commands.js';
 import { discoverDroneCandidates } from './launch-all-discovery.js';
-import { configureSelectedLaunchCli, explicitCliLaunchHint, runBareLaunchMenu, shouldResolveExplicitCliLaunchHintTargets, shouldShowLaunchMenu, } from './bare-launch-menu.js';
+import { configureSelectedLaunchCli, discoverLiveLaunchMenuCandidates, explicitCliLaunchHint, runBareLaunchMenu, shouldResolveExplicitCliLaunchHintTargets, shouldShowLaunchMenu, } from './bare-launch-menu.js';
 import { setTerminalTitle } from './terminal-title.js';
 import { initConsolePrefix, consolePrefix } from './console-prefix.js';
 import { initDebugFromArgv } from './debug.js';
@@ -58,6 +59,15 @@ import { buildOpenCodeLaunchArgs, defaultApprovalIo, resolveLaunchBorgApprovals
 import { isClientOwnedCubeInitArgv, runEarlyServerFacade } from './server-facade.js';
 import { runEarlyUpdate } from './update-cmd.js';
 import { runDoctor, warnIfAgentIntegrationUnhealthy } from './agent-integration-health.js';
+export class OpenCodeTargetedLaunchConfigError extends Error {
+    code = 'OPENCODE_TARGETED_LAUNCH_CONFIG';
+    constructor(droneLabel, worktree) {
+        super(`borg launch: did not launch '${droneLabel}' — borg could not update or verify the OpenCode configuration ` +
+            'that a targeted launch needs to open the correct drone. Check that the OpenCode configuration file is ' +
+            `writable, then try again. As a fallback, run \`borg\` in ${worktree} to resume that worktree's drone directly.`);
+        this.name = 'OpenCodeTargetedLaunchConfigError';
+    }
+}
 export function createOpenCodeLaunchPlan(cwd, port, prompt, passthroughArgs = []) {
     const binding = openCodeLaunchBinding(port);
     return {
@@ -197,6 +207,24 @@ async function main() {
         const code = await runCleanup({}, parsed.options);
         process.exit(code);
     }
+    if (process.argv[2] === 'seats') {
+        const parsed = parseSeatsArgs(process.argv.slice(3));
+        if (!parsed.ok) {
+            process.stderr.write(chalk.red(`${consolePrefix()}◼ borg seats: ${parsed.error}\n`));
+            process.stderr.write(`Run \`borg seats --help\` for usage.\n`);
+            process.exit(1);
+        }
+        process.exit(await runSeats(buildDefaultSeatCommandDeps()));
+    }
+    if (process.argv[2] === 'launch') {
+        const parsed = parseLaunchSeatArgs(process.argv.slice(3));
+        if (!parsed.ok) {
+            process.stderr.write(chalk.red(`${consolePrefix()}◼ borg launch: ${parsed.error}\n`));
+            process.stderr.write(`Run \`borg launch --help\` for usage.\n`);
+            process.exit(1);
+        }
+        process.exit(await runLaunchSeat({ target: parsed.target, ...(parsed.cube ? { cube: parsed.cube } : {}) }, buildDefaultSeatCommandDeps()));
+    }
     if (process.argv[2] === 'launch-all') {
         const parsed = parseLaunchAllArgs(process.argv.slice(3));
         if (!parsed.ok) {
@@ -274,12 +302,39 @@ async function main() {
         extraArgs: process.argv.slice(2),
         stdinIsTTY,
         stdoutIsTTY,
+        hasActiveSeat: active !== null,
     })) {
+        const launchAllDeps = buildDefaultLaunchAllDeps();
+        const seatCommandDeps = buildDefaultSeatCommandDeps();
+        const siblingContext = await discoverLiveLaunchMenuCandidates({
+            readAllProjectIdentities: launchAllDeps.readAllProjectIdentities,
+            discoverDroneCandidates: (cubeId) => discoverDroneCandidates({ targetCubeId: cubeId }, { ...launchAllDeps, stderr: () => { } }),
+            getActiveSeatForWorktree: seatCommandDeps.getActiveSeatForWorktree,
+            pathExists: launchAllDeps.pathExists,
+            probeSeat: (candidate) => launchAllDeps.probeSeat(candidate.sessionToken, candidate.apiUrl, candidate.serverTrustIdentity),
+        });
         const otherConfiguredClis = configuredCliNames(detectCliAvailability(), detectCliConfiguration()).filter((c) => c !== cli);
-        const action = await runBareLaunchMenu({ defaultCli: cli, otherConfiguredClis, hasLaunchAllTargets: await hasLaunchAllTargets() }, prompt);
+        const action = await runBareLaunchMenu({
+            defaultCli: cli,
+            otherConfiguredClis,
+            hasLaunchAllTargets: siblingContext.launchAllCubeId !== undefined,
+            droneCandidates: siblingContext.candidates,
+            ...(siblingContext.launchAllCubeId
+                ? { launchAllCubeId: siblingContext.launchAllCubeId }
+                : {}),
+        }, prompt);
+        if (action.kind === 'launch-seat') {
+            process.exit(await runLaunchSeat({ target: action.target }, buildDefaultSeatCommandDeps()));
+        }
         if (action.kind === 'launch-all') {
-            const parsed = parseLaunchAllArgs([]); // empty args → active cube, auto backend
-            const code = parsed.ok ? await runLaunchAll(parsed.args, buildDefaultLaunchAllDeps()) : 1;
+            const deps = buildDefaultLaunchAllDeps();
+            const selectedIdentity = action.cubeId
+                ? (await deps.readAllProjectIdentities()).find(({ cube }) => cube.cubeId === action.cubeId)
+                : undefined;
+            const parsed = parseLaunchAllArgs([]);
+            const code = parsed.ok
+                ? await runLaunchAll(parsed.args, selectedIdentity ? { ...deps, getActiveCube: async () => selectedIdentity.cube } : deps)
+                : 1;
             process.exit(code);
         }
         // option 1 → configured default; option 2 → the other agent, ONE-SHOT
@@ -289,7 +344,7 @@ async function main() {
     }
     // Configure only the CLI that will actually launch. This must follow the
     // one-shot menu: the resolved default can differ from the menu selection.
-    cli = configureSelectedLaunchCli(cli, launchAction, ensureResolvedCliConfigured);
+    cli = configureSelectedLaunchCli(cli, launchAction, (selectedCli) => ensureResolvedCliConfigured(selectedCli, active));
     if (active && !parsedCli.force) {
         const inboxPath = inboxPathForDrone(active.cubeId, active.droneId);
         const stateRoot = monitorStateRootForWorktree(findProjectRoot(process.cwd()));
@@ -421,6 +476,7 @@ async function main() {
             ...codexAgentKindConfigArgs(),
             ...codexRemoteWakeConfigArgs(codexSocketPath !== null),
             ...codexStateRootConfigArgs(),
+            ...codexLaunchSeatExpectationConfigArgs(),
             ...remoteArgs,
             ...withCodexCwdArg([...passthroughArgs, kickoff], process.cwd()),
         ];
@@ -503,11 +559,23 @@ async function main() {
         process.exit(code ?? 0);
     });
 }
-function ensureResolvedCliConfigured(cli) {
+export function ensureResolvedCliConfigured(cli, active = null) {
     const label = cli === 'claude' ? 'Claude Code' : cli === 'codex' ? 'Codex' : 'OpenCode';
+    const targetedOpenCodeLaunch = cli === 'opencode' &&
+        Boolean(process.env[BORG_LAUNCH_EXPECTED_SEAT_ENV]);
     try {
         configureResolvedCli(cli, {
-            ensureMcp: ensureCliMcpConfigured,
+            ensureMcp: (selectedCli) => {
+                try {
+                    ensureCliMcpConfigured(selectedCli);
+                }
+                catch (error) {
+                    if (targetedOpenCodeLaunch && selectedCli === 'opencode') {
+                        throw new OpenCodeTargetedLaunchConfigError(active?.droneLabel ?? '<unknown>', active?.worktree ?? process.cwd());
+                    }
+                    throw error;
+                }
+            },
             addClaudeProjectSessionStartHook: () => {
                 // gh#673 P2 (WI-1): the orientation hook lives PROJECT-LOCAL in
                 // <root>/.claude/settings.local.json — ensured on every bare
@@ -523,6 +591,8 @@ function ensureResolvedCliConfigured(cli) {
         });
     }
     catch (err) {
+        if (err instanceof OpenCodeTargetedLaunchConfigError)
+            throw err;
         console.error(`${consolePrefix()}${chalk.yellow(`warning: ${label} integration check failed: ${err?.message ?? err}`)}`);
     }
     try {
@@ -544,6 +614,11 @@ function isEntryInvocation() {
 }
 if (isEntryInvocation()) {
     main().catch((error) => {
+        if (error instanceof LaunchSeatIdentityChangedError ||
+            error instanceof OpenCodeTargetedLaunchConfigError) {
+            process.stderr.write(`${error.message}\n`);
+            process.exit(1);
+        }
         console.error(`${consolePrefix()}${chalk.red(`\n◼ Error: ${error.message}\n`)}`);
         process.exit(1);
     });