borgmcp 3.5.1 → 3.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +18 -13
- package/dist/assimilate-cmd.d.ts +1 -1
- package/dist/assimilate-cmd.d.ts.map +1 -1
- package/dist/assimilate-cmd.js +28 -53
- package/dist/assimilate-cmd.js.map +1 -1
- package/dist/assimilate-deps.d.ts.map +1 -1
- package/dist/assimilate-deps.js +1 -1
- package/dist/assimilate-deps.js.map +1 -1
- package/dist/backends/launch-all-pastelist.js +2 -2
- package/dist/backends/launch-all-pastelist.js.map +1 -1
- package/dist/backends/launch-all-terminals.js +2 -2
- package/dist/backends/launch-all-terminals.js.map +1 -1
- package/dist/backends/launch-all-tmux.js +3 -3
- package/dist/backends/launch-all-tmux.js.map +1 -1
- package/dist/bare-launch-menu.d.ts +23 -38
- package/dist/bare-launch-menu.d.ts.map +1 -1
- package/dist/bare-launch-menu.js +84 -31
- package/dist/bare-launch-menu.js.map +1 -1
- package/dist/claude.d.ts.map +1 -1
- package/dist/claude.js +27 -28
- package/dist/claude.js.map +1 -1
- package/dist/cleanup-cmd.d.ts +1 -1
- package/dist/cleanup-cmd.d.ts.map +1 -1
- package/dist/cleanup-cmd.js +10 -1
- package/dist/cleanup-cmd.js.map +1 -1
- package/dist/cli-help.d.ts.map +1 -1
- package/dist/cli-help.js +6 -9
- package/dist/cli-help.js.map +1 -1
- package/dist/console-prefix.d.ts.map +1 -1
- package/dist/console-prefix.js +7 -2
- package/dist/console-prefix.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/launch-all-cmd.d.ts.map +1 -1
- package/dist/launch-all-cmd.js +43 -25
- package/dist/launch-all-cmd.js.map +1 -1
- package/dist/launch-all-command.d.ts +8 -2
- package/dist/launch-all-command.d.ts.map +1 -1
- package/dist/launch-all-command.js +8 -4
- package/dist/launch-all-command.js.map +1 -1
- package/dist/launch-all-deps.d.ts +2 -2
- package/dist/launch-all-deps.d.ts.map +1 -1
- package/dist/launch-all-deps.js +2 -2
- package/dist/launch-all-deps.js.map +1 -1
- package/dist/launch-all-discovery.d.ts +2 -3
- package/dist/launch-all-discovery.d.ts.map +1 -1
- package/dist/launch-all-discovery.js +1 -5
- package/dist/launch-all-discovery.js.map +1 -1
- package/dist/parse-launch-all-args.d.ts +0 -1
- package/dist/parse-launch-all-args.d.ts.map +1 -1
- package/dist/parse-launch-all-args.js +1 -9
- package/dist/parse-launch-all-args.js.map +1 -1
- package/dist/remote-client.d.ts +2 -2
- package/dist/remote-client.d.ts.map +1 -1
- package/dist/remote-client.js +12 -4
- package/dist/remote-client.js.map +1 -1
- package/dist/seat-probe.d.ts +2 -1
- package/dist/seat-probe.d.ts.map +1 -1
- package/dist/seat-probe.js +2 -2
- package/dist/seat-probe.js.map +1 -1
- package/dist/seat-store.d.ts.map +1 -1
- package/dist/seat-store.js +18 -0
- package/dist/seat-store.js.map +1 -1
- package/dist/worktree-lifecycle.d.ts +0 -18
- package/dist/worktree-lifecycle.d.ts.map +1 -1
- package/dist/worktree-lifecycle.js +0 -39
- package/dist/worktree-lifecycle.js.map +1 -1
- package/docs/LOCAL_SERVER.md +8 -6
- package/docs/SEAT_LIFECYCLE.md +8 -7
- package/package.json +1 -1
- package/src/assimilate-cmd.ts +36 -68
- package/src/assimilate-deps.ts +1 -2
- package/src/backends/launch-all-pastelist.ts +2 -2
- package/src/backends/launch-all-terminals.ts +2 -2
- package/src/backends/launch-all-tmux.ts +3 -3
- package/src/bare-launch-menu.ts +89 -48
- package/src/claude.ts +31 -34
- package/src/cleanup-cmd.ts +10 -10
- package/src/cli-help.ts +6 -9
- package/src/console-prefix.ts +6 -2
- package/src/index.ts +2 -11
- package/src/launch-all-cmd.ts +55 -37
- package/src/launch-all-command.ts +9 -4
- package/src/launch-all-deps.ts +4 -10
- package/src/launch-all-discovery.ts +3 -8
- package/src/parse-launch-all-args.ts +1 -10
- package/src/remote-client.ts +13 -8
- package/src/seat-probe.ts +3 -4
- package/src/seat-store.ts +18 -0
- package/src/worktree-lifecycle.ts +0 -45
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assimilate-deps.js","sourceRoot":"","sources":["../src/assimilate-deps.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assimilate-deps.js","sourceRoot":"","sources":["../src/assimilate-deps.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// gh#556 Part 2 — pastelist backend (never-fail floor, spec §4.3).
|
|
2
|
-
// Prints copy-pasteable `cd <dir> && borg
|
|
2
|
+
// Prints copy-pasteable `cd <dir> && borg launch <droneId>` lines.
|
|
3
3
|
import { buildLaunchCommand } from '../launch-all-command.js';
|
|
4
4
|
export function runPastelistBackend(candidates, borgPath, deps) {
|
|
5
5
|
deps.stdout('# borg launch-all: open each worktree in a terminal window and run:\n\n');
|
|
6
6
|
for (const c of candidates) {
|
|
7
7
|
// No keep-open-on-fail: the operator owns their own shell in pastelist mode.
|
|
8
|
-
deps.stdout(buildLaunchCommand(c
|
|
8
|
+
deps.stdout(buildLaunchCommand(c, borgPath) + '\n');
|
|
9
9
|
}
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=launch-all-pastelist.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-all-pastelist.js","sourceRoot":"","sources":["../../src/backends/launch-all-pastelist.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"launch-all-pastelist.js","sourceRoot":"","sources":["../../src/backends/launch-all-pastelist.ts"],"names":[],"mappings":"AAAA,mEAAmE;AACnE,mEAAmE;AAInE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,UAAU,mBAAmB,CACjC,UAA4B,EAC5B,QAAgB,EAChB,IAAmB;IAEnB,IAAI,CAAC,MAAM,CAAC,yEAAyE,CAAC,CAAC;IACvF,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,6EAA6E;QAC7E,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC;IACtD,CAAC;AACH,CAAC"}
|
|
@@ -34,7 +34,7 @@ async function launchMacOS(candidates, opts, deps) {
|
|
|
34
34
|
const c = candidates[i];
|
|
35
35
|
if (i > 0 && opts.launchDelayMs > 0)
|
|
36
36
|
await opts.sleep(opts.launchDelayMs); // rate-limit stagger
|
|
37
|
-
const cmd = buildLaunchCommand(c
|
|
37
|
+
const cmd = buildLaunchCommand(c, opts.borgPath);
|
|
38
38
|
const title = composeTerminalTitle({ label: c.droneLabel, cubeName: opts.cubeName }, '');
|
|
39
39
|
const script = hasITerm
|
|
40
40
|
? `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`
|
|
@@ -66,7 +66,7 @@ async function launchLinux(candidates, opts, deps) {
|
|
|
66
66
|
await opts.sleep(opts.launchDelayMs); // rate-limit stagger
|
|
67
67
|
const title = composeTerminalTitle({ label: c.droneLabel, cubeName: opts.cubeName }, '');
|
|
68
68
|
const cmd = `printf '\\033]0;%s\\007' ${shellEscape(title)}; ` +
|
|
69
|
-
buildLaunchCommand(c
|
|
69
|
+
buildLaunchCommand(c, opts.borgPath, { keepOpenOnFail: true });
|
|
70
70
|
// `<term> -e sh -c '<cmd>'` opens a new window running the command.
|
|
71
71
|
deps.runSync(term, ['-e', 'sh', '-c', cmd]);
|
|
72
72
|
writeLockMarker(deps, c.cubeId, c.droneLabel, c.worktreeDir, opts.launchedAtISO);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-all-terminals.js","sourceRoot":"","sources":["../../src/backends/launch-all-terminals.ts"],"names":[],"mappings":"AAAA,2EAA2E;AAC3E,8EAA8E;AAC9E,4EAA4E;AAC5E,iFAAiF;AAIjF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,SAAS,GAAG,yBAAyB,CAAC;AAC5C,MAAM,aAAa,GAAG;IACpB,6CAA6C;IAC7C,sCAAsC;IACtC,4BAA4B;CACpB,CAAC;AAaX,sEAAsE;AACtE,SAAS,iBAAiB,CAAC,CAAS;IAClC,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,eAAgB,SAAQ,KAAK;CAAG;AAEtC,MAAM,UAAU,mBAAmB,CAAC,IAAuC;IACzE,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,qEAAqE;AACrE,KAAK,UAAU,WAAW,CAAC,UAA4B,EAAE,IAAmB,EAAE,IAAmB;IAC/F,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IACxE,IAAI,CAAC,QAAQ,IAAI,CAAC,WAAW,EAAE,CAAC;QAC9B,MAAM,IAAI,eAAe,CACvB,yEAAyE;YACvE,sCAAsC;YACtC,+EAA+E,CAClF,CAAC;IACJ,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,aAAa,GAAG,CAAC;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,qBAAqB;QAChG,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"launch-all-terminals.js","sourceRoot":"","sources":["../../src/backends/launch-all-terminals.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
// gh#556 Part 2 — tmux backend (primary, spec §4.1).
|
|
2
2
|
// One detached `borg-<cube>` session, one window per drone, each running
|
|
3
|
-
// `borg
|
|
3
|
+
// `borg launch <droneId>`. Idempotent: reuses an existing session (adds windows).
|
|
4
4
|
import { buildLaunchCommand } from '../launch-all-command.js';
|
|
5
5
|
import { writeLockMarker } from '../launch-all-locks.js';
|
|
6
6
|
export async function runTmuxBackend(candidates, opts, deps) {
|
|
@@ -9,7 +9,7 @@ export async function runTmuxBackend(candidates, opts, deps) {
|
|
|
9
9
|
for (let i = 0; i < candidates.length; i++) {
|
|
10
10
|
const c = candidates[i];
|
|
11
11
|
// Rate-limit stagger: wait BEFORE each launch after the first, so a fleet's
|
|
12
|
-
// agents don't all bootstrap (
|
|
12
|
+
// agents don't all bootstrap (launch + regen + roster) simultaneously and
|
|
13
13
|
// trip the per-user/IP limiter. Window creation is ~instant otherwise, so
|
|
14
14
|
// without this N agents start within ~100ms. 0 → no delay (first never waits).
|
|
15
15
|
if (i > 0 && launchDelayMs > 0) {
|
|
@@ -33,7 +33,7 @@ export async function runTmuxBackend(candidates, opts, deps) {
|
|
|
33
33
|
}
|
|
34
34
|
// tmux-level window name (status bar). The agent's own OSC-0 may update it later.
|
|
35
35
|
deps.runSync('tmux', ['rename-window', '-t', windowId, c.droneLabel]);
|
|
36
|
-
const cmd = buildLaunchCommand(c
|
|
36
|
+
const cmd = buildLaunchCommand(c, borgPath, { keepOpenOnFail: true });
|
|
37
37
|
deps.runSync('tmux', ['send-keys', '-t', windowId, cmd, 'Enter']);
|
|
38
38
|
// Lock marker written immediately after dispatch (best-effort liveness signal).
|
|
39
39
|
writeLockMarker(deps, c.cubeId, c.droneLabel, c.worktreeDir, launchedAtISO);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch-all-tmux.js","sourceRoot":"","sources":["../../src/backends/launch-all-tmux.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,yEAAyE;AACzE,
|
|
1
|
+
{"version":3,"file":"launch-all-tmux.js","sourceRoot":"","sources":["../../src/backends/launch-all-tmux.ts"],"names":[],"mappings":"AAAA,qDAAqD;AACrD,yEAAyE;AACzE,kFAAkF;AAIlF,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAezD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAA4B,EAC5B,IAAc,EACd,IAAmB;IAEnB,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAExF,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;IAE7F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAExB,4EAA4E;QAC5E,0EAA0E;QAC1E,0EAA0E;QAC1E,+EAA+E;QAC/E,IAAI,CAAC,GAAG,CAAC,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC;QAC7B,CAAC;QAED,kFAAkF;QAClF,kFAAkF;QAClF,oFAAoF;QACpF,qFAAqF;QACrF,uFAAuF;QACvF,IAAI,QAAgB,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YAC9B,QAAQ,GAAG,IAAI;iBACZ,OAAO,CAAC,MAAM,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;iBAC1G,IAAI,EAAE,CAAC;QACZ,CAAC;aAAM,CAAC;YACN,QAAQ,GAAG,IAAI;iBACZ,OAAO,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC;iBACnG,IAAI,EAAE,CAAC;QACZ,CAAC;QAED,kFAAkF;QAClF,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAEtE,MAAM,GAAG,GAAG,kBAAkB,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QACtE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC;QAElE,gFAAgF;QAChF,eAAe,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;IAC9E,CAAC;IAED,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,eAAe,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACvE,CAAC;SAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;IACxE,CAAC;IACD,kDAAkD;AACpD,CAAC"}
|
|
@@ -1,20 +1,3 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* gh#853 — bare `borg` (no-args) interactive launch menu.
|
|
3
|
-
*
|
|
4
|
-
* When `borg` is run with NO arguments in a TTY outside an active seat, offer
|
|
5
|
-
* a small launch selector. In a repository with live sibling drones, those
|
|
6
|
-
* drones come first; otherwise the existing agent choices remain unchanged.
|
|
7
|
-
*
|
|
8
|
-
* The option-set, the selection→action mapping, and the show/collapse decision
|
|
9
|
-
* are pure functions so they're unit-testable without a real TTY. claude.ts
|
|
10
|
-
* main() is thin glue: it computes the available candidates and agent choices,
|
|
11
|
-
* gates on shouldShowLaunchMenu, runs the orchestrator with the real readline
|
|
12
|
-
* prompt, then dispatches the returned action.
|
|
13
|
-
*
|
|
14
|
-
* Load-bearing safety: TTY-only + bare-args-only + no-active-seat
|
|
15
|
-
* (shouldShowLaunchMenu), so scripted/programmatic invocations and direct
|
|
16
|
-
* worktree resumes are untouched.
|
|
17
|
-
*/
|
|
18
1
|
import type { ActiveCube, BorgCli } from './cubes.js';
|
|
19
2
|
import type { DroneCandidate } from './launch-all-discovery.js';
|
|
20
3
|
import type { SeatStatus } from './seat-probe.js';
|
|
@@ -46,6 +29,12 @@ export interface LaunchMenuInputs {
|
|
|
46
29
|
otherConfiguredClis: BorgCli[];
|
|
47
30
|
/** True iff the current menu context has launch-all targets. */
|
|
48
31
|
hasLaunchAllTargets: boolean;
|
|
32
|
+
/** Legacy drone saved in the repository's main worktree, resumed in this process. */
|
|
33
|
+
currentDrone?: {
|
|
34
|
+
droneLabel: string;
|
|
35
|
+
worktree: string;
|
|
36
|
+
status: SeatStatus;
|
|
37
|
+
};
|
|
49
38
|
/** Live sibling drones offered before the unattached launch choices. */
|
|
50
39
|
droneCandidates?: LaunchMenuDroneCandidate[];
|
|
51
40
|
/** Cube selected by the sibling-drone context for its launch-all action. */
|
|
@@ -64,6 +53,9 @@ interface LaunchMenuCandidateDeps {
|
|
|
64
53
|
pathExists: (worktree: string) => boolean;
|
|
65
54
|
probeSeat: (candidate: DroneCandidate) => Promise<SeatStatus>;
|
|
66
55
|
}
|
|
56
|
+
export type TerminalLaunchMenuSeatStatus = Extract<SeatStatus, 'evicted' | 'revoked' | 'rejected' | 'credential-rejected' | 'trust-mismatch'>;
|
|
57
|
+
export declare function isTerminalLaunchMenuSeatStatus(status: SeatStatus): status is TerminalLaunchMenuSeatStatus;
|
|
58
|
+
export declare function terminalLaunchMenuSeatRefusal(status: TerminalLaunchMenuSeatStatus): string;
|
|
67
59
|
/**
|
|
68
60
|
* Find linked sibling worktrees that still own their preferred active seat.
|
|
69
61
|
* Authoritative terminal probe results are omitted; transient/unknown probe
|
|
@@ -82,28 +74,21 @@ export declare function discoverLiveLaunchMenuCandidates(deps: LaunchMenuCandida
|
|
|
82
74
|
*/
|
|
83
75
|
export declare function configureSelectedLaunchCli(defaultCli: BorgCli, action: LaunchMenuAction | undefined, configure: (cli: BorgCli) => void): BorgCli;
|
|
84
76
|
/**
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
77
|
+
* Git reports the main worktree with identical absolute git-dir/common-dir
|
|
78
|
+
* paths. Linked worktrees instead use <common>/worktrees/<name> as git-dir.
|
|
79
|
+
* Fail closed when either probe is absent or malformed.
|
|
80
|
+
*/
|
|
81
|
+
export declare function isMainGitWorktree(readGitPath: (args: string[]) => string): boolean;
|
|
82
|
+
/**
|
|
83
|
+
* Gate: the menu fires ONLY for bare `borg` (no args) in a TTY from the main
|
|
84
|
+
* repository worktree. Explicit invocations, non-TTY launches, and linked
|
|
85
|
+
* worktree resumes fall straight through to the existing launch path.
|
|
88
86
|
*/
|
|
89
87
|
export declare function shouldShowLaunchMenu(args: {
|
|
90
88
|
extraArgs: string[];
|
|
91
89
|
stdinIsTTY: boolean;
|
|
92
90
|
stdoutIsTTY: boolean;
|
|
93
|
-
|
|
94
|
-
}): boolean;
|
|
95
|
-
export declare function explicitCliLaunchHint(args: {
|
|
96
|
-
explicitCli: BorgCli | undefined;
|
|
97
|
-
stdinIsTTY: boolean;
|
|
98
|
-
stdoutIsTTY: boolean;
|
|
99
|
-
hasActiveCube: boolean;
|
|
100
|
-
hasLaunchAllTargets: boolean;
|
|
101
|
-
}): string | null;
|
|
102
|
-
export declare function shouldResolveExplicitCliLaunchHintTargets(args: {
|
|
103
|
-
explicitCli: BorgCli | undefined;
|
|
104
|
-
stdinIsTTY: boolean;
|
|
105
|
-
stdoutIsTTY: boolean;
|
|
106
|
-
hasActiveCube: boolean;
|
|
91
|
+
isMainWorktree: boolean;
|
|
107
92
|
}): boolean;
|
|
108
93
|
/**
|
|
109
94
|
* The context-filtered option set. Option 1 is always present; options 2/3 are
|
|
@@ -121,10 +106,10 @@ export declare function resolveLaunchMenuChoice(options: LaunchMenuOption[], raw
|
|
|
121
106
|
/** The rendered menu text (prompt suffix `[1]:` defaults to option 1 on Enter). */
|
|
122
107
|
export declare function renderLaunchMenu(options: LaunchMenuOption[]): string;
|
|
123
108
|
/**
|
|
124
|
-
* Orchestrate the menu with an injected readline-style prompt.
|
|
125
|
-
*
|
|
126
|
-
* Re-prompts on invalid input up to
|
|
127
|
-
*
|
|
109
|
+
* Orchestrate the menu with an injected readline-style prompt. The caller has
|
|
110
|
+
* already established that this is a bare interactive main-worktree launch,
|
|
111
|
+
* so even a one-item selector is rendered. Re-prompts on invalid input up to
|
|
112
|
+
* `maxAttempts`, then falls back to the safe default (option 1).
|
|
128
113
|
*/
|
|
129
114
|
export declare function runBareLaunchMenu(inputs: LaunchMenuInputs, prompt: (message: string) => Promise<string>, opts?: {
|
|
130
115
|
maxAttempts?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bare-launch-menu.d.ts","sourceRoot":"","sources":["../src/bare-launch-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* gh#853 — bare `borg` (no-args) interactive launch menu.
|
|
3
|
+
*
|
|
4
|
+
* When `borg` is run with NO arguments in a TTY from a repository's main
|
|
5
|
+
* worktree, offer a small launch selector. A linked worktree still resumes its
|
|
6
|
+
* own drone directly, so selecting a sibling from the menu cannot recurse.
|
|
7
|
+
*
|
|
8
|
+
* The option-set, the selection→action mapping, and the show/collapse decision
|
|
9
|
+
* are pure functions so they're unit-testable without a real TTY. claude.ts
|
|
10
|
+
* main() is thin glue: it computes the available candidates and agent choices,
|
|
11
|
+
* gates on shouldShowLaunchMenu, runs the orchestrator with the real readline
|
|
12
|
+
* prompt, then dispatches the returned action.
|
|
13
|
+
*
|
|
14
|
+
* Load-bearing safety: TTY-only + bare-args-only + main-worktree-only
|
|
15
|
+
* (shouldShowLaunchMenu), so scripted/programmatic invocations and direct
|
|
16
|
+
* linked-worktree resumes are untouched.
|
|
17
|
+
*/
|
|
18
|
+
import { isAbsolute } from 'node:path';
|
|
1
19
|
const TERMINAL_SEAT_STATUSES = new Set([
|
|
2
20
|
'evicted',
|
|
3
21
|
'revoked',
|
|
@@ -5,6 +23,23 @@ const TERMINAL_SEAT_STATUSES = new Set([
|
|
|
5
23
|
'credential-rejected',
|
|
6
24
|
'trust-mismatch',
|
|
7
25
|
]);
|
|
26
|
+
export function isTerminalLaunchMenuSeatStatus(status) {
|
|
27
|
+
return TERMINAL_SEAT_STATUSES.has(status);
|
|
28
|
+
}
|
|
29
|
+
export function terminalLaunchMenuSeatRefusal(status) {
|
|
30
|
+
const reason = {
|
|
31
|
+
evicted: 'the server reports that it was evicted',
|
|
32
|
+
revoked: 'its local session was revoked',
|
|
33
|
+
rejected: 'its local session was superseded by a newer enrollment',
|
|
34
|
+
'credential-rejected': 'its saved credential was rejected',
|
|
35
|
+
'trust-mismatch': 'the saved server identity no longer matches',
|
|
36
|
+
};
|
|
37
|
+
const recovery = status === 'trust-mismatch'
|
|
38
|
+
? 'Verify that this is the expected server; if it was re-initialized, restore the expected identity before relaunching.\n'
|
|
39
|
+
: 'Run `borg reset-local-connection`, then `borg assimilate` to start a replacement managed-worktree drone.\n';
|
|
40
|
+
return (`This worktree's saved drone cannot be resumed because ${reason[status]}. ` +
|
|
41
|
+
`No agent was launched and nothing was changed. ${recovery}`);
|
|
42
|
+
}
|
|
8
43
|
/**
|
|
9
44
|
* Find linked sibling worktrees that still own their preferred active seat.
|
|
10
45
|
* Authoritative terminal probe results are omitted; transient/unknown probe
|
|
@@ -31,7 +66,7 @@ export async function discoverLiveLaunchMenuCandidates(deps) {
|
|
|
31
66
|
catch {
|
|
32
67
|
status = 'indeterminate';
|
|
33
68
|
}
|
|
34
|
-
if (
|
|
69
|
+
if (isTerminalLaunchMenuSeatStatus(status))
|
|
35
70
|
continue;
|
|
36
71
|
const key = `${candidate.cubeId}\0${candidate.droneId}\0${candidate.worktreeDir}`;
|
|
37
72
|
if (seen.has(key))
|
|
@@ -68,25 +103,30 @@ export function configureSelectedLaunchCli(defaultCli, action, configure) {
|
|
|
68
103
|
}
|
|
69
104
|
const PRETTY = { claude: 'Claude', codex: 'Codex', opencode: 'OpenCode' };
|
|
70
105
|
/**
|
|
71
|
-
*
|
|
72
|
-
*
|
|
73
|
-
*
|
|
106
|
+
* Git reports the main worktree with identical absolute git-dir/common-dir
|
|
107
|
+
* paths. Linked worktrees instead use <common>/worktrees/<name> as git-dir.
|
|
108
|
+
* Fail closed when either probe is absent or malformed.
|
|
109
|
+
*/
|
|
110
|
+
export function isMainGitWorktree(readGitPath) {
|
|
111
|
+
try {
|
|
112
|
+
const gitDir = readGitPath(['rev-parse', '--path-format=absolute', '--git-dir']).trim();
|
|
113
|
+
const commonDir = readGitPath(['rev-parse', '--path-format=absolute', '--git-common-dir']).trim();
|
|
114
|
+
return isAbsolute(gitDir) && isAbsolute(commonDir) && gitDir === commonDir;
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
/**
|
|
121
|
+
* Gate: the menu fires ONLY for bare `borg` (no args) in a TTY from the main
|
|
122
|
+
* repository worktree. Explicit invocations, non-TTY launches, and linked
|
|
123
|
+
* worktree resumes fall straight through to the existing launch path.
|
|
74
124
|
*/
|
|
75
125
|
export function shouldShowLaunchMenu(args) {
|
|
76
126
|
return args.extraArgs.length === 0
|
|
77
127
|
&& args.stdinIsTTY
|
|
78
128
|
&& args.stdoutIsTTY
|
|
79
|
-
&&
|
|
80
|
-
}
|
|
81
|
-
export function explicitCliLaunchHint(args) {
|
|
82
|
-
if (!args.explicitCli || !args.stdinIsTTY || !args.stdoutIsTTY)
|
|
83
|
-
return null;
|
|
84
|
-
if (!args.hasActiveCube || !args.hasLaunchAllTargets)
|
|
85
|
-
return null;
|
|
86
|
-
return `borg --cli ${args.explicitCli} launches ${PRETTY[args.explicitCli]} directly; use bare borg for the launch menu or borg launch-all --cli ${args.explicitCli} for all drone worktrees.\n`;
|
|
87
|
-
}
|
|
88
|
-
export function shouldResolveExplicitCliLaunchHintTargets(args) {
|
|
89
|
-
return Boolean(args.explicitCli && args.stdinIsTTY && args.stdoutIsTTY && args.hasActiveCube);
|
|
129
|
+
&& args.isMainWorktree;
|
|
90
130
|
}
|
|
91
131
|
/**
|
|
92
132
|
* The context-filtered option set. Option 1 is always present; options 2/3 are
|
|
@@ -94,14 +134,25 @@ export function shouldResolveExplicitCliLaunchHintTargets(args) {
|
|
|
94
134
|
* middle option never produces a "1) … 3) …" gap menu.
|
|
95
135
|
*/
|
|
96
136
|
export function buildLaunchMenuOptions(inputs) {
|
|
97
|
-
|
|
98
|
-
|
|
137
|
+
const currentDrone = inputs.currentDrone && !isTerminalLaunchMenuSeatStatus(inputs.currentDrone.status)
|
|
138
|
+
? inputs.currentDrone
|
|
139
|
+
: undefined;
|
|
140
|
+
if (currentDrone || (inputs.droneCandidates && inputs.droneCandidates.length > 0)) {
|
|
141
|
+
const options = [];
|
|
142
|
+
if (currentDrone) {
|
|
143
|
+
options.push({
|
|
144
|
+
key: '1',
|
|
145
|
+
label: `Resume ${currentDrone.droneLabel} (${currentDrone.worktree})`,
|
|
146
|
+
action: { kind: 'launch', cli: inputs.defaultCli },
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
options.push(...[...(inputs.droneCandidates ?? [])]
|
|
99
150
|
.sort((a, b) => a.droneLabel.localeCompare(b.droneLabel) || a.worktree.localeCompare(b.worktree))
|
|
100
151
|
.map((candidate, index) => ({
|
|
101
|
-
key: String(index + 1),
|
|
152
|
+
key: String(options.length + index + 1),
|
|
102
153
|
label: `Resume ${candidate.droneLabel} (${candidate.worktree})`,
|
|
103
154
|
action: { kind: 'launch-seat', target: candidate.target },
|
|
104
|
-
}));
|
|
155
|
+
})));
|
|
105
156
|
if (inputs.hasLaunchAllTargets) {
|
|
106
157
|
options.push({
|
|
107
158
|
key: String(options.length + 1),
|
|
@@ -112,15 +163,19 @@ export function buildLaunchMenuOptions(inputs) {
|
|
|
112
163
|
},
|
|
113
164
|
});
|
|
114
165
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
166
|
+
if (!currentDrone) {
|
|
167
|
+
options.push({
|
|
168
|
+
key: String(options.length + 1),
|
|
169
|
+
label: `Launch ${PRETTY[inputs.defaultCli]} here without a drone`,
|
|
170
|
+
action: { kind: 'launch', cli: inputs.defaultCli },
|
|
171
|
+
});
|
|
172
|
+
}
|
|
120
173
|
for (const cli of inputs.otherConfiguredClis) {
|
|
121
174
|
options.push({
|
|
122
175
|
key: String(options.length + 1),
|
|
123
|
-
label:
|
|
176
|
+
label: currentDrone
|
|
177
|
+
? `Resume ${currentDrone.droneLabel} with ${PRETTY[cli]} (one-shot)`
|
|
178
|
+
: `Launch with ${PRETTY[cli]} here without a drone (one-shot)`,
|
|
124
179
|
action: { kind: 'launch', cli },
|
|
125
180
|
});
|
|
126
181
|
}
|
|
@@ -163,15 +218,13 @@ export function renderLaunchMenu(options) {
|
|
|
163
218
|
return `borg — how do you want to launch?\n${lines.join('\n')}\n[1]: `;
|
|
164
219
|
}
|
|
165
220
|
/**
|
|
166
|
-
* Orchestrate the menu with an injected readline-style prompt.
|
|
167
|
-
*
|
|
168
|
-
* Re-prompts on invalid input up to
|
|
169
|
-
*
|
|
221
|
+
* Orchestrate the menu with an injected readline-style prompt. The caller has
|
|
222
|
+
* already established that this is a bare interactive main-worktree launch,
|
|
223
|
+
* so even a one-item selector is rendered. Re-prompts on invalid input up to
|
|
224
|
+
* `maxAttempts`, then falls back to the safe default (option 1).
|
|
170
225
|
*/
|
|
171
226
|
export async function runBareLaunchMenu(inputs, prompt, opts = {}) {
|
|
172
227
|
const options = buildLaunchMenuOptions(inputs);
|
|
173
|
-
if (options.length === 1)
|
|
174
|
-
return options[0].action; // collapse — never a 1-item menu
|
|
175
228
|
const maxAttempts = opts.maxAttempts ?? 3;
|
|
176
229
|
const menu = renderLaunchMenu(options);
|
|
177
230
|
for (let attempt = 0; attempt < maxAttempts; attempt++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bare-launch-menu.js","sourceRoot":"","sources":["../src/bare-launch-menu.ts"],"names":[],"mappings":"
|
|
1
|
+
{"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.map
CHANGED
|
@@ -1 +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;AAOtC,OAAO,EASL,KAAK,UAAU,EACf,KAAK,OAAO,EACb,MAAM,YAAY,CAAC;AAUpB,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"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;AA4DlE,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;AA0gBD,wBAAgB,2BAA2B,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,UAAU,GAAG,IAAW,GAAG,IAAI,CA6ChG"}
|
package/dist/claude.js
CHANGED
|
@@ -40,7 +40,7 @@ import { runLaunchAll } from './launch-all-cmd.js';
|
|
|
40
40
|
import { buildDefaultLaunchAllDeps } from './launch-all-deps.js';
|
|
41
41
|
import { buildDefaultSeatCommandDeps, parseLaunchSeatArgs, parseSeatsArgs, runLaunchSeat, runSeats, } from './seat-commands.js';
|
|
42
42
|
import { discoverDroneCandidates } from './launch-all-discovery.js';
|
|
43
|
-
import { configureSelectedLaunchCli, discoverLiveLaunchMenuCandidates,
|
|
43
|
+
import { configureSelectedLaunchCli, discoverLiveLaunchMenuCandidates, isMainGitWorktree, isTerminalLaunchMenuSeatStatus, runBareLaunchMenu, shouldShowLaunchMenu, terminalLaunchMenuSeatRefusal, } from './bare-launch-menu.js';
|
|
44
44
|
import { setTerminalTitle } from './terminal-title.js';
|
|
45
45
|
import { initConsolePrefix, consolePrefix } from './console-prefix.js';
|
|
46
46
|
import { initDebugFromArgv } from './debug.js';
|
|
@@ -266,32 +266,10 @@ async function main() {
|
|
|
266
266
|
// Active cube for this directory — needed for the launch menu's option-3
|
|
267
267
|
// availability, the terminal title, and the inbox-Monitor clause below.
|
|
268
268
|
const active = await getActiveCube();
|
|
269
|
-
|
|
270
|
-
const
|
|
271
|
-
if (!active)
|
|
272
|
-
return false;
|
|
273
|
-
if (launchAllTargetsAvailable === undefined) {
|
|
274
|
-
const candidates = await discoverDroneCandidates({ targetCubeId: active.cubeId }, buildDefaultLaunchAllDeps());
|
|
275
|
-
launchAllTargetsAvailable = candidates.length > 0;
|
|
276
|
-
}
|
|
277
|
-
return launchAllTargetsAvailable;
|
|
278
|
-
};
|
|
269
|
+
const launchAllDeps = buildDefaultLaunchAllDeps();
|
|
270
|
+
const isMainWorktree = isMainGitWorktree((args) => launchAllDeps.runSync('git', args, { cwd: process.cwd() }));
|
|
279
271
|
const stdinIsTTY = process.stdin.isTTY === true;
|
|
280
272
|
const stdoutIsTTY = process.stdout.isTTY === true;
|
|
281
|
-
const explicitCliHint = explicitCliLaunchHint({
|
|
282
|
-
explicitCli: parsedCli.cli,
|
|
283
|
-
stdinIsTTY,
|
|
284
|
-
stdoutIsTTY,
|
|
285
|
-
hasActiveCube: active !== null,
|
|
286
|
-
hasLaunchAllTargets: shouldResolveExplicitCliLaunchHintTargets({
|
|
287
|
-
explicitCli: parsedCli.cli,
|
|
288
|
-
stdinIsTTY,
|
|
289
|
-
stdoutIsTTY,
|
|
290
|
-
hasActiveCube: active !== null,
|
|
291
|
-
}) ? await hasLaunchAllTargets() : false,
|
|
292
|
-
});
|
|
293
|
-
if (explicitCliHint)
|
|
294
|
-
process.stderr.write(explicitCliHint);
|
|
295
273
|
// gh#853: bare `borg` (no args) interactive launch menu. TTY-only + bare-args-
|
|
296
274
|
// only (shouldShowLaunchMenu) so every scripted/programmatic `borg` and every
|
|
297
275
|
// explicit subcommand/flag is untouched; the get-started breadcrumb already
|
|
@@ -302,22 +280,43 @@ async function main() {
|
|
|
302
280
|
extraArgs: process.argv.slice(2),
|
|
303
281
|
stdinIsTTY,
|
|
304
282
|
stdoutIsTTY,
|
|
305
|
-
|
|
283
|
+
isMainWorktree,
|
|
306
284
|
})) {
|
|
307
|
-
const launchAllDeps = buildDefaultLaunchAllDeps();
|
|
308
285
|
const seatCommandDeps = buildDefaultSeatCommandDeps();
|
|
286
|
+
let currentDroneStatus = null;
|
|
287
|
+
if (active) {
|
|
288
|
+
try {
|
|
289
|
+
currentDroneStatus = await launchAllDeps.probeSeat(active);
|
|
290
|
+
}
|
|
291
|
+
catch {
|
|
292
|
+
currentDroneStatus = 'indeterminate';
|
|
293
|
+
}
|
|
294
|
+
if (isTerminalLaunchMenuSeatStatus(currentDroneStatus)) {
|
|
295
|
+
process.stderr.write(terminalLaunchMenuSeatRefusal(currentDroneStatus));
|
|
296
|
+
process.exit(1);
|
|
297
|
+
}
|
|
298
|
+
}
|
|
309
299
|
const siblingContext = await discoverLiveLaunchMenuCandidates({
|
|
310
300
|
readAllProjectIdentities: launchAllDeps.readAllProjectIdentities,
|
|
311
301
|
discoverDroneCandidates: (cubeId) => discoverDroneCandidates({ targetCubeId: cubeId }, { ...launchAllDeps, stderr: () => { } }),
|
|
312
302
|
getActiveSeatForWorktree: seatCommandDeps.getActiveSeatForWorktree,
|
|
313
303
|
pathExists: launchAllDeps.pathExists,
|
|
314
|
-
probeSeat: (candidate) => launchAllDeps.probeSeat(candidate.
|
|
304
|
+
probeSeat: (candidate) => launchAllDeps.probeSeat(candidate.seat),
|
|
315
305
|
});
|
|
316
306
|
const otherConfiguredClis = configuredCliNames(detectCliAvailability(), detectCliConfiguration()).filter((c) => c !== cli);
|
|
317
307
|
const action = await runBareLaunchMenu({
|
|
318
308
|
defaultCli: cli,
|
|
319
309
|
otherConfiguredClis,
|
|
320
310
|
hasLaunchAllTargets: siblingContext.launchAllCubeId !== undefined,
|
|
311
|
+
...(active && currentDroneStatus
|
|
312
|
+
? {
|
|
313
|
+
currentDrone: {
|
|
314
|
+
droneLabel: active.droneLabel,
|
|
315
|
+
worktree: active.worktree ?? findProjectRoot(process.cwd()),
|
|
316
|
+
status: currentDroneStatus,
|
|
317
|
+
},
|
|
318
|
+
}
|
|
319
|
+
: {}),
|
|
321
320
|
droneCandidates: siblingContext.candidates,
|
|
322
321
|
...(siblingContext.launchAllCubeId
|
|
323
322
|
? { launchAllCubeId: siblingContext.launchAllCubeId }
|