borgmcp 3.11.1 → 3.13.0

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.
Files changed (58) hide show
  1. package/README.md +15 -0
  2. package/THIRD_PARTY_NOTICES.md +5 -0
  3. package/dist/assimilate-deps.d.ts.map +1 -1
  4. package/dist/assimilate-deps.js +11 -0
  5. package/dist/assimilate-deps.js.map +1 -1
  6. package/dist/cli-help.d.ts.map +1 -1
  7. package/dist/cli-help.js +19 -7
  8. package/dist/cli-help.js.map +1 -1
  9. package/dist/clone-cmd.d.ts +4 -1
  10. package/dist/clone-cmd.d.ts.map +1 -1
  11. package/dist/clone-cmd.js +28 -6
  12. package/dist/clone-cmd.js.map +1 -1
  13. package/dist/codex-app-wake.d.ts +3 -2
  14. package/dist/codex-app-wake.d.ts.map +1 -1
  15. package/dist/codex-app-wake.js +42 -9
  16. package/dist/codex-app-wake.js.map +1 -1
  17. package/dist/cube-activity-wake-copy.d.ts +1 -1
  18. package/dist/cube-activity-wake-copy.d.ts.map +1 -1
  19. package/dist/cube-activity-wake-copy.js +1 -1
  20. package/dist/cube-activity-wake-copy.js.map +1 -1
  21. package/dist/log-stream.d.ts +3 -3
  22. package/dist/log-stream.d.ts.map +1 -1
  23. package/dist/log-stream.js +8 -13
  24. package/dist/log-stream.js.map +1 -1
  25. package/dist/opencode-drone.d.ts +1 -1
  26. package/dist/opencode-drone.d.ts.map +1 -1
  27. package/dist/opencode-drone.js +16 -2
  28. package/dist/opencode-drone.js.map +1 -1
  29. package/dist/parse-clone-args.d.ts +3 -2
  30. package/dist/parse-clone-args.d.ts.map +1 -1
  31. package/dist/parse-clone-args.js +32 -9
  32. package/dist/parse-clone-args.js.map +1 -1
  33. package/dist/quickstart-cmd.d.ts +5 -1
  34. package/dist/quickstart-cmd.d.ts.map +1 -1
  35. package/dist/quickstart-cmd.js +17 -6
  36. package/dist/quickstart-cmd.js.map +1 -1
  37. package/dist/remote-client.d.ts +2 -21
  38. package/dist/remote-client.d.ts.map +1 -1
  39. package/dist/remote-client.js +8 -6
  40. package/dist/remote-client.js.map +1 -1
  41. package/dist/server-handshake.d.ts +6 -1
  42. package/dist/server-handshake.d.ts.map +1 -1
  43. package/dist/server-handshake.js +1 -0
  44. package/dist/server-handshake.js.map +1 -1
  45. package/docs/LOCAL_SERVER.md +4 -8
  46. package/docs/RELEASING.md +32 -308
  47. package/package.json +3 -2
  48. package/src/assimilate-deps.ts +11 -0
  49. package/src/cli-help.ts +19 -7
  50. package/src/clone-cmd.ts +36 -7
  51. package/src/codex-app-wake.ts +42 -8
  52. package/src/cube-activity-wake-copy.ts +1 -1
  53. package/src/log-stream.ts +24 -15
  54. package/src/opencode-drone.ts +14 -1
  55. package/src/parse-clone-args.ts +31 -10
  56. package/src/quickstart-cmd.ts +34 -6
  57. package/src/remote-client.ts +11 -25
  58. package/src/server-handshake.ts +4 -1
package/README.md CHANGED
@@ -18,6 +18,21 @@ Continue with the [Get Started guide](https://borgmcp.ai/get-started/) to check
18
18
  the requirements, configure Borg, start the local server, and add your first
19
19
  drone. Borg has no hosted account or subscription.
20
20
 
21
+ ## Choose A Command
22
+
23
+ - `borg clone <repository-url>` checks out a new repository and delegates its
24
+ complete cube, roster, and launch setup to `borg quickstart`. Use
25
+ `--checkout-only` to stop after checkout; `--no-launch` remains an explicit
26
+ compatibility alias. In a non-interactive terminal, full setup requires both
27
+ `--yes` and `--template <name>`.
28
+ - `borg quickstart` creates, staffs, and launches the full roster for the Git
29
+ repository you are already in. Repeat `--role <slug>[:<count>]` to replace the
30
+ template roster with an explicit selection. Rerunning it keeps existing drones
31
+ and continues after cancellation or partial failure.
32
+ - `borg assimilate [role]` adds or resumes one drone under one role. Use it when
33
+ you need one more drone or want to reattach a saved worktree, not when you want
34
+ the repository's complete initial roster.
35
+
21
36
  ## Documentation
22
37
 
23
38
  - [Core concepts](https://borgmcp.ai/docs/concepts/) defines cubes, drones,
@@ -0,0 +1,5 @@
1
+ # Third-Party Notices
2
+
3
+ | Package | Version | License |
4
+ | --- | --- | --- |
5
+ | borgmcp-shared | 0.12.2 | Apache-2.0 |
@@ -1 +1 @@
1
- {"version":3,"file":"assimilate-deps.d.ts","sourceRoot":"","sources":["../src/assimilate-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AA+D1D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAWlE,wBAAgB,mBAAmB,CACjC,QAAQ,GAAE,cAAsC,GAC/C,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAWtC;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,GAAE,cAAsC,GAC/C,cAAc,CA8chB"}
1
+ {"version":3,"file":"assimilate-deps.d.ts","sourceRoot":"","sources":["../src/assimilate-deps.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAiBH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAgE1D;;;GAGG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAWlE,wBAAgB,mBAAmB,CACjC,QAAQ,GAAE,cAAsC,GAC/C,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAWtC;AAED,wBAAgB,0BAA0B,CACxC,QAAQ,GAAE,cAAsC,GAC/C,cAAc,CAwdhB"}
@@ -20,6 +20,7 @@ import { inspectLiveInboxMonitor } from './seat-reattach-guard.js';
20
20
  import { buildDefaultFirstRunServerInstallDeps, offerFirstRunServerInstall, } from './first-run-server.js';
21
21
  import { listCubes as remoteListCubes, getCube as remoteGetCube, } from './remote-client.js';
22
22
  import { DEFAULT_LOCAL_SERVER_ORIGIN, associateLocalBorgServerRepositoryCube, connectLocalBorgServer, createLocalBorgServerCube, enrollLocalBorgServer, enrollLocalBorgServerArtifact, probeLocalBorgServer, resolveLocalBorgServerRepositoryCube, resumeLocalBorgServerEnrollment, sendBorgServerAttach, } from './server-handshake.js';
23
+ import { advanceLocalServerCursor } from './local-server-cursor.js';
23
24
  import { findIncompleteSiblingAttempt, observeSeat, prepareSeat, seatRef, } from './seats.js';
24
25
  import { readPersistedLocalSeat, } from './cubes.js';
25
26
  import { loadBorgServerTrust } from './server-trust.js';
@@ -381,6 +382,16 @@ export function buildDefaultAssimilateDeps(question = defaultPromptQuestion) {
381
382
  throw new BorgServerError('ATTACH_CONFLICT', 'Borg server did not reattach the saved connection');
382
383
  }
383
384
  }
385
+ if (prepared.initialLogCursor) {
386
+ const binding = {
387
+ origin: apiUrl,
388
+ trustIdentity: serverTrustIdentity,
389
+ cubeId: prepared.cube.id,
390
+ droneId: prepared.drone.id,
391
+ };
392
+ await advanceLocalServerCursor(binding, prepared.initialLogCursor);
393
+ await advanceLocalServerCursor({ ...binding, purpose: 'stream' }, prepared.initialLogCursor);
394
+ }
384
395
  return {
385
396
  cube_id: prepared.cube.id,
386
397
  drone_id: prepared.drone.id,
@@ -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 +1 @@
1
- {"version":3,"file":"cli-help.d.ts","sourceRoot":"","sources":["../src/cli-help.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE3D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAuBzD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAa1D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYrD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAW1D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOtD;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAgBf;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA6BxD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CASjE;AAED,4DAA4D;AAC5D,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoBtD;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,IAAI,MAAM,CAiBvC;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgBxD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAiC1D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAkB9D;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD"}
1
+ {"version":3,"file":"cli-help.d.ts","sourceRoot":"","sources":["../src/cli-help.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,wDAAwD;AACxD,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAE3D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQvD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAuBzD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgB1D;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmBrD;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAW1D;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAOtD;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,GAAG,SAAS,EAC3B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CAgBf;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAM3C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CA6BxD;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CASjE;AAED,4DAA4D;AAC5D,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAoBtD;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,IAAI,MAAM,CAiBvC;AAED,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgBxD;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAmC1D;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAkB9D;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQrD"}
package/dist/cli-help.js CHANGED
@@ -46,20 +46,30 @@ export function quickstartHelpText(version) {
46
46
  `Usage:\n` +
47
47
  ` borg quickstart [options]\n\n` +
48
48
  `Options:\n` +
49
- ` --template ${NEW_CUBE_TEMPLATE_OPTIONS} Choose the new-cube template without prompting\n` +
49
+ ` --template <name> Choose without prompting:\n` +
50
+ ` ${NEW_CUBE_TEMPLATE_OPTIONS}\n` +
50
51
  ` --role <slug>[:<count>] Fully specify the roster (repeatable)\n` +
51
52
  ` --yes, -y Accept the displayed plan\n` +
52
53
  ` --help, -h Show this help\n\n` +
53
- `Quickstart requires a running Borg server and never starts one. Rerun the same\n` +
54
- `command after a partial failure; existing drones are kept and skipped.\n`);
54
+ `For the current repository, quickstart creates and launches a full roster.\n` +
55
+ `Use --role to replace that roster with an explicit selection. Quickstart\n` +
56
+ `requires a running Borg server and never starts one. Rerun the same command\n` +
57
+ `after a partial failure; existing drones are kept and skipped.\n`);
55
58
  }
56
59
  export function cloneHelpText(version) {
57
60
  return (`borg clone (borgmcp ${version}) — clone a repository and run quickstart\n\n` +
58
61
  `Usage:\n` +
59
- ` borg clone <repository-url> [directory] [--no-launch]\n\n` +
62
+ ` borg clone <repository-url> [directory] [options]\n\n` +
60
63
  `Options:\n` +
61
- ` --no-launch Stop after the checkout is ready; do not create or launch a cube\n` +
62
- ` --help, -h Show this help\n\n` +
64
+ ` --template <name> Choose without prompting:\n` +
65
+ ` ${NEW_CUBE_TEMPLATE_OPTIONS}\n` +
66
+ ` --role <slug>[:<count>] Fully specify the roster (repeatable)\n` +
67
+ ` --yes, -y Accept the displayed plan\n` +
68
+ ` --checkout-only Stop after the checkout is ready\n` +
69
+ ` --no-launch Same as --checkout-only\n` +
70
+ ` --help, -h Show this help\n\n` +
71
+ `Clone checks out a new repository, then delegates the complete setup directly to\n` +
72
+ `quickstart. Non-interactive full setup requires both --yes and --template.\n` +
63
73
  `A repeated command reuses a checkout only when its origin matches. Default\n` +
64
74
  `destination names avoid non-repository collisions. Credential-bearing URLs are\n` +
65
75
  `refused; use a Git credential helper or SSH configuration instead.\n`);
@@ -129,7 +139,7 @@ export function topLevelHelpText(version) {
129
139
  ` borg doctor Check agent hook commands, versions, configs, and the OpenCode plugin\n` +
130
140
  ` borg clone <url> [dir] Clone a repository, then create and launch its cube\n` +
131
141
  ` borg quickstart Create a cube and a drone for every role, then launch them\n` +
132
- ` borg assimilate [role] Join or create a cube\n` +
142
+ ` borg assimilate [role] Join or create a cube with one drone under one role\n` +
133
143
  ` borg assimilate --host <host> Join or create on an explicit server\n` +
134
144
  ` borg assimilate --worktree <name> Spawn a worktree drone (in ~/.borg/worktrees/<repo>/<name>)\n` +
135
145
  ` borg server cube init Initialize this repository's cube without creating a drone\n` +
@@ -232,6 +242,8 @@ export function assimilateHelpText(version) {
232
242
  ` --cli claude|codex|opencode Agent CLI to launch\n` +
233
243
  ` --model claude:<model> Legacy Claude model override (configure models in the agent CLI)\n` +
234
244
  ` --yes, -y Accept new-cube defaults; never adopt by name\n\n` +
245
+ `Assimilate adds or resumes one drone under one role; use quickstart when you want\n` +
246
+ `the repository's full roster.\n` +
235
247
  `Creation shows repository context, name, template, and one confirmation. An existing\n` +
236
248
  `repository association skips all prompts. One accessible exact-name legacy cube requires\n` +
237
249
  `explicit interactive adoption; ambiguous matches fail closed. An enrolled owner client may\n` +
@@ -1 +1 @@
1
- {"version":3,"file":"cli-help.js","sourceRoot":"","sources":["../src/cli-help.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli-help.js","sourceRoot":"","sources":["../src/cli-help.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,+BAA+B,EAAE,MAAM,0BAA0B,CAAC;AAE3E,MAAM,yBAAyB,GAAG,+BAA+B,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACpG,MAAM,yBAAyB,GAAG,+BAA+B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAE1E,wDAAwD;AACxD,MAAM,UAAU,UAAU,CAAC,GAAuB;IAChD,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,OAAO,CACL,yBAAyB,OAAO,gDAAgD;QAChF,UAAU;QACV,yEAAyE;QACzE,sEAAsE;QACtE,0CAA0C,CAC3C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,OAAO,CACL,4BAA4B,OAAO,+CAA+C;QAClF,UAAU;QACV,wCAAwC;QACxC,YAAY;QACZ,qEAAqE;QACrE,0EAA0E;QAC1E,kEAAkE;QAClE,6EAA6E;QAC7E,6EAA6E;QAC7E,uEAAuE;QACvE,iEAAiE;QACjE,4DAA4D;QAC5D,UAAU;QACV,kFAAkF;QAClF,+EAA+E;QAC/E,8EAA8E;QAC9E,kFAAkF;QAClF,kCAAkC;QAClC,8EAA8E;QAC9E,wEAAwE,CACzE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,CACL,4BAA4B,OAAO,0DAA0D;QAC7F,UAAU;QACV,iCAAiC;QACjC,YAAY;QACZ,kEAAkE;QAClE,wCAAwC,yBAAyB,IAAI;QACrE,8EAA8E;QAC9E,kEAAkE;QAClE,yDAAyD;QACzD,8EAA8E;QAC9E,4EAA4E;QAC5E,+EAA+E;QAC/E,kEAAkE,CACnE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,CACL,uBAAuB,OAAO,+CAA+C;QAC7E,UAAU;QACV,yDAAyD;QACzD,YAAY;QACZ,kEAAkE;QAClE,wCAAwC,yBAAyB,IAAI;QACrE,8EAA8E;QAC9E,kEAAkE;QAClE,yEAAyE;QACzE,gEAAgE;QAChE,yDAAyD;QACzD,oFAAoF;QACpF,8EAA8E;QAC9E,8EAA8E;QAC9E,kFAAkF;QAClF,sEAAsE,CACvE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,CACL,wBAAwB,OAAO,+CAA+C;QAC9E,UAAU;QACV,gFAAgF;QAChF,0CAA0C;QAC1C,oDAAoD,CACrD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,CACL,wBAAwB,OAAO,uDAAuD;QACtF,UAAU;QACV,4CAA4C;QAC5C,0DAA0D;QAC1D,0BAA0B;QAC1B,YAAY;QACZ,iFAAiF;QACjF,iDAAiD,CAClD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,CACL,wBAAwB,OAAO,+DAA+D;QAC9F,UAAU;QACV,8GAA8G;QAC9G,yCAAyC,CAC1C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,OAA2B,EAC3B,IAAuB,EACvB,OAAe;IAEf,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,OAAO,CAAC,CAAC,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,OAAO,CAAC,CAAC,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;QAC5C,KAAK,YAAY,CAAC,CAAC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,YAAY,CAAC,CAAC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACtD,KAAK,wBAAwB,CAAC,CAAC,OAAO,sBAAsB,CAAC,OAAO,CAAC,CAAC;QACtE,KAAK,oBAAoB,CAAC,CAAC,OAAO,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACrE,KAAK,SAAS,CAAC,CAAC,OAAO,eAAe,CAAC,OAAO,CAAC,CAAC;QAChD,KAAK,QAAQ,CAAC,CAAC,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC;QAC7C,KAAK,QAAQ,CAAC,CAAC,OAAO,kBAAkB,CAAC,OAAO,CAAC,CAAC;QAClD,KAAK,YAAY,CAAC,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACrD,KAAK,QAAQ,CAAC,CAAC,OAAO,cAAc,CAAC,OAAO,CAAC,CAAC;QAC9C,OAAO,CAAC,CAAC,OAAO,IAAI,CAAC;IACvB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,CACL,iBAAiB;QACjB,8DAA8D;QAC9D,+FAA+F,CAChG,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,CACL,WAAW,OAAO,6DAA6D;QAC/E,uGAAuG;QACvG,gFAAgF;QAChF,sFAAsF;QACtF,2FAA2F;QAC3F,UAAU;QACV,8GAA8G;QAC9G,6EAA6E;QAC7E,oFAAoF;QACpF,oGAAoG;QACpG,kFAAkF;QAClF,yFAAyF;QACzF,kFAAkF;QAClF,0EAA0E;QAC1E,qGAAqG;QACrG,yFAAyF;QACzF,uHAAuH;QACvH,6FAA6F;QAC7F,uFAAuF;QACvF,kFAAkF;QAClF,2FAA2F;QAC3F,0FAA0F;QAC1F,uCAAuC;QACvC,sEAAsE;QACtE,uDAAuD;QACvD,qEAAqE,CACtE,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,OAAO,CACL,oCAAoC,OAAO,uDAAuD;QAClG,UAAU;QACV,qDAAqD;QACrD,sCAAsC;QACtC,4FAA4F;QAC5F,kGAAkG,CACnG,CAAC;AACJ,CAAC;AAED,4DAA4D;AAC5D,MAAM,UAAU,cAAc,CAAC,OAAe;IAC5C,OAAO,CACL,cAAc,OAAO,CAAC,CAAC,CAAC,aAAa,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,uDAAuD;QAC3G,UAAU;QACV,gEAAgE;QAChE,+EAA+E;QAC/E,8CAA8C;QAC9C,yFAAyF;QACzF,oGAAoG;QACpG,+FAA+F;QAC/F,8FAA8F;QAC9F,yDAAyD;QACzD,4FAA4F;QAC5F,+FAA+F;QAC/F,kGAAkG;QAClG,0FAA0F;QAC1F,8FAA8F;QAC9F,mCAAmC;QACnC,2CAA2C,CAC5C,CAAC;AACJ,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,cAAc;IAC5B,OAAO,CACL,8CAA8C;QAC9C,aAAa;QACb,iFAAiF;QACjF,2DAA2D;QAC3D,6CAA6C;QAC7C,gDAAgD;QAChD,2DAA2D;QAC3D,yEAAyE;QACzE,mGAAmG;QACnG,+IAA+I;QAC/I,uJAAuJ;QACvJ,0DAA0D;QAC1D,mFAAmF;QACnF,gEAAgE,CACjE,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC9C,OAAO,CACL,kCAAkC,OAAO,wEAAwE;QACjH,UAAU;QACV,uCAAuC;QACvC,YAAY;QACZ,4FAA4F;QAC5F,gFAAgF;QAChF,8FAA8F;QAC9F,gBAAgB,yBAAyB,iCAAiC,yBAAyB,KAAK;QACxG,oFAAoF;QACpF,uDAAuD;QACvD,0FAA0F;QAC1F,2FAA2F;QAC3F,+FAA+F,CAChG,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAe;IAChD,OAAO,CACL,4BAA4B,OAAO,4CAA4C;QAC/E,UAAU;QACV,qFAAqF;QACrF,sFAAsF;QACtF,4EAA4E;QAC5E,6EAA6E;QAC7E,sFAAsF;QACtF,8EAA8E;QAC9E,uGAAuG;QACvG,2DAA2D;QAC3D,UAAU;QACV,oFAAoF;QACpF,mEAAmE;QACnE,6FAA6F;QAC7F,wFAAwF;QACxF,sFAAsF;QACtF,mGAAmG;QACnG,gBAAgB,yBAAyB,kCAAkC,yBAAyB,KAAK;QACzG,yEAAyE;QACzE,6DAA6D;QAC7D,+FAA+F;QAC/F,gFAAgF;QAChF,qFAAqF;QACrF,iCAAiC;QACjC,wFAAwF;QACxF,4FAA4F;QAC5F,8FAA8F;QAC9F,0FAA0F;QAC1F,2DAA2D;QAC3D,wEAAwE;QACxE,qFAAqF;QACrF,qFAAqF,CACtF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,OAAe;IACpD,OAAO,CACL,wCAAwC,OAAO,iEAAiE;QAChH,8FAA8F;QAC9F,+FAA+F;QAC/F,6FAA6F;QAC7F,qBAAqB;QACrB,8FAA8F;QAC9F,0FAA0F;QAC1F,UAAU;QACV,6GAA6G;QAC7G,+FAA+F;QAC/F,wGAAwG;QACxG,kEAAkE;QAClE,UAAU;QACV,0FAA0F;QAC1F,4FAA4F,CAC7F,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,OAAe;IAC3C,OAAO,CACL,uBAAuB,OAAO,wDAAwD;QACtF,qEAAqE;QACrE,UAAU;QACV,+DAA+D;QAC/D,6CAA6C,CAC9C,CAAC;AACJ,CAAC"}
@@ -1,4 +1,6 @@
1
1
  import type { CloneArgs } from './parse-clone-args.js';
2
+ import type { QuickstartArgs } from './parse-quickstart-args.js';
3
+ import { type QuickstartRunOptions } from './quickstart-cmd.js';
2
4
  export interface GitRunResult {
3
5
  status: number | null;
4
6
  stdout: string;
@@ -13,7 +15,8 @@ export interface CloneDeps {
13
15
  readDirectory: (path: string) => string[];
14
16
  createDirectory: (path: string) => boolean;
15
17
  removeTree: (path: string) => void;
16
- quickstart: (cwd: string) => Promise<number>;
18
+ isTTY: () => boolean;
19
+ quickstart: (cwd: string, args: QuickstartArgs, options: QuickstartRunOptions) => Promise<number>;
17
20
  stdout: (text: string) => void;
18
21
  stderr: (text: string) => void;
19
22
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clone-cmd.d.ts","sourceRoot":"","sources":["../src/clone-cmd.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC;IACrE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC1C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC3C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC;AAeD,wBAAgB,qBAAqB,IAAI,SAAS,CA4BjD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAwBrG;AAwED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CA0EnF"}
1
+ {"version":3,"file":"clone-cmd.d.ts","sourceRoot":"","sources":["../src/clone-cmd.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAGL,KAAK,oBAAoB,EAC1B,MAAM,qBAAqB,CAAC;AAG7B,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,MAAM,CAAC;IAClB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,KAAK,YAAY,CAAC;IACrE,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACtC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IACvC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IAC1C,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;IAC3C,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,KAAK,EAAE,MAAM,OAAO,CAAC;IACrB,UAAU,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAClG,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CAChC;AAeD,wBAAgB,qBAAqB,IAAI,SAAS,CA6BjD;AAED,wBAAgB,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAwBrG;AAwED,wBAAsB,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,CAgGnF"}
package/dist/clone-cmd.js CHANGED
@@ -3,7 +3,7 @@ import { existsSync, mkdirSync, readdirSync, rmSync, statSync } from 'node:fs';
3
3
  import { basename, dirname, resolve } from 'node:path';
4
4
  import { fileURLToPath } from 'node:url';
5
5
  import { hasCloneCredentials, redactCloneSecrets } from './clone-security.js';
6
- import { buildDefaultQuickstartDeps, runQuickstart } from './quickstart-cmd.js';
6
+ import { buildDefaultQuickstartDeps, runQuickstart, } from './quickstart-cmd.js';
7
7
  import { shellEscape } from './shell-escape.js';
8
8
  const CONTROL_RE = /[\u0000-\u001f\u007f]/;
9
9
  const ALLOWED_SCHEMES = new Set(['file:', 'git:', 'git+ssh:', 'http:', 'https:', 'ssh:']);
@@ -44,9 +44,10 @@ export function buildDefaultCloneDeps() {
44
44
  }
45
45
  },
46
46
  removeTree: (path) => rmSync(path, { recursive: true, force: true }),
47
- quickstart: async (cwd) => {
47
+ isTTY: () => process.stdin.isTTY === true,
48
+ quickstart: async (cwd, args, options) => {
48
49
  process.chdir(cwd);
49
- return runQuickstart({ roles: [], yes: false }, buildDefaultQuickstartDeps());
50
+ return runQuickstart(args, buildDefaultQuickstartDeps(), options);
50
51
  },
51
52
  stdout: (text) => process.stdout.write(text),
52
53
  stderr: (text) => process.stderr.write(text),
@@ -166,6 +167,11 @@ export async function runClone(args, rawDeps) {
166
167
  deps.stderr(`borg clone: ${valid.error}.\n`);
167
168
  return 1;
168
169
  }
170
+ if (!args.checkoutOnly && !deps.isTTY() && (!args.yes || !args.template)) {
171
+ deps.stderr('borg clone: non-interactive full setup requires both --yes and --template; ' +
172
+ 'use --checkout-only to clone without setup.\n');
173
+ return 1;
174
+ }
169
175
  const selected = chooseDestination(deps, args);
170
176
  if ('error' in selected) {
171
177
  deps.stderr(`borg clone: ${selected.error}.\n`);
@@ -211,14 +217,30 @@ export async function runClone(args, rawDeps) {
211
217
  cloned = true;
212
218
  deps.stdout(`Cloned ${sourceName(args.repositoryUrl)} into ${destination}.\n`);
213
219
  }
214
- if (args.noLaunch) {
220
+ if (args.checkoutOnly) {
215
221
  deps.stdout(`Checkout ready at ${destination}. No cube or drone was created.\n` +
216
222
  `Next: cd ${shellEscape(destination)} && borg quickstart\n`);
217
223
  return 0;
218
224
  }
219
225
  deps.chdir(destination);
220
- const code = await deps.quickstart(destination);
221
- if (code !== 0) {
226
+ const quickstartArgs = {
227
+ ...(args.template === undefined ? {} : { template: args.template }),
228
+ roles: args.roles,
229
+ yes: args.yes,
230
+ };
231
+ let cancelled = false;
232
+ const code = await deps.quickstart(destination, quickstartArgs, {
233
+ onCancelled: (kind) => {
234
+ cancelled = true;
235
+ const message = `${kind === 'interrupted' ? '\n' : ''}borg clone: cancelled. Checkout remains at ${destination}.\n` +
236
+ `Resume: cd ${shellEscape(destination)} && borg quickstart\n`;
237
+ if (kind === 'interrupted')
238
+ deps.stderr(message);
239
+ else
240
+ deps.stdout(message);
241
+ },
242
+ });
243
+ if (code !== 0 && !cancelled) {
222
244
  deps.stderr(`The checkout${cloned ? '' : ' you already had'} is ready at ${destination}, but quickstart did not finish. ` +
223
245
  `It was left untouched; cd there and run \`borg quickstart\` again.\n`);
224
246
  }
@@ -1 +1 @@
1
- {"version":3,"file":"clone-cmd.js","sourceRoot":"","sources":["../src/clone-cmd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,OAAO,EAAE,0BAA0B,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAsBhD,MAAM,UAAU,GAAG,uBAAuB,CAAC;AAC3C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAC1F,MAAM,aAAa,GAAG,4BAA4B,CAAC;AAEnD,SAAS,cAAc,CAAC,GAAW,EAAE,IAAc,EAAE,GAAY;IAC/D,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/D,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;KACrF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,qBAAqB;IACnC,OAAO;QACL,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QACxB,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACpC,OAAO,EAAE,cAAc;QACvB,UAAU,EAAE,UAAU;QACtB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACpB,IAAI,CAAC;gBAAC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC;gBAAC,OAAO,KAAK,CAAC;YAAC,CAAC;QACtE,CAAC;QACD,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC;QAC1C,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;YACxB,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9C,IAAI,CAAC;gBACH,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,OAAO,IAAI,CAAC;YACd,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ;oBAAE,OAAO,KAAK,CAAC;gBACvF,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;QACD,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QACpE,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;YACxB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACnB,OAAO,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,0BAA0B,EAAE,CAAC,CAAC;QAChF,CAAC;QACD,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAC5C,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,KAAa;IACtD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACnF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,0DAA0D,EAAE,CAAC;IAC1F,CAAC;IACD,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,6CAA6C,EAAE,CAAC;IACtG,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,2GAA2G,EAAE,CAAC;IAC3I,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG,wBAAwB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACzD,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,cAAc;IAChD,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;QACrG,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oDAAoD,EAAE,CAAC;IACpF,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;QAC/H,IAAI,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,kEAAkE,EAAE,CAAC;QAClI,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,oCAAoC,EAAE,CAAC;QACvH,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,KAAK,GAAG;YAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,+CAA+C,EAAE,CAAC;QAC9H,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,6BAA6B,EAAE,CAAC;IAC7D,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC/B,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,GAAG,MAAM,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC/E,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACnE,OAAO,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC7D,OAAO,IAAI,IAAI,YAAY,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,IAAY;IAC5C,IAAI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;QACpC,MAAM,EAAE,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QAChC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QAC/C,OAAO,SAAS,IAAI,IAAI,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC;IACtG,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,MAAM,CAAC,QAAQ,KAAK,OAAO;YAAE,OAAO,QAAQ,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACjF,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClD,OAAO,GAAG,MAAM,CAAC,QAAQ,KAAK,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CAAC;IAC3I,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,QAAQ,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;IACxC,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAe,EAAE,SAAiB;IACpD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACnF,CAAC;AAED,SAAS,YAAY,CAAC,IAAe,EAAE,SAAiB;IACtD,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,uBAAuB,CAAC,EAAE,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AAC7F,CAAC;AAED,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC;QACtH,OAAO,2CAA2C,CAAC;IACrD,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAe,EAAE,IAAe;IACzD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACxB,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;IACvE,CAAC;IACD,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACnC,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,CAAC,CAAC;QACjE,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAC5D,IAAI,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC;YACjE,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAC3C,IAAI,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC;gBACnH,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YAC7B,CAAC;YACD,IAAI,CAAC,KAAK,CAAC;gBAAE,OAAO,EAAE,KAAK,EAAE,wBAAwB,SAAS,2DAA2D,EAAE,CAAC;QAC9H,CAAC;IACH,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,mDAAmD,IAAI,EAAE,EAAE,CAAC;AAC9E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,IAAe,EAAE,OAAkB;IAChE,MAAM,IAAI,GAAc;QACtB,GAAG,OAAO;QACV,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAC1D,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;KAC3D,CAAC;IACF,MAAM,KAAK,GAAG,0BAA0B,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,CAAC,eAAe,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC;QAC7C,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC/C,IAAI,OAAO,IAAI,QAAQ,EAAE,CAAC;QACxB,IAAI,CAAC,MAAM,CAAC,eAAe,QAAQ,CAAC,KAAK,KAAK,CAAC,CAAC;QAChD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC;IAClC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,MAAM,kBAAkB,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,kBAAkB,IAAI,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IAC7H,IAAI,kBAAkB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;YACvE,IAAI,CAAC,MAAM,CAAC,2BAA2B,WAAW,6DAA6D,CAAC,CAAC;YACjH,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,IAAI,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3C,IAAI,CAAC,MAAM,CAAC,iGAAiG,CAAC,CAAC;YAC/G,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,MAAM,CAAC,kCAAkC,WAAW,cAAc,MAAM,eAAe,IAAI,CAAC,aAAa,sCAAsC,CAAC,CAAC;YACtJ,OAAO,CAAC,CAAC;QACX,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,gCAAgC,WAAW,gCAAgC,CAAC,CAAC;IAC3F,CAAC;SAAM,CAAC;QACN,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,CAAC,kBAAkB,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC/C,IAAI,CAAC,MAAM,CAAC,2BAA2B,WAAW,6FAA6F,CAAC,CAAC;YACjJ,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QACjG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,kBAAkB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;gBACvD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;YAC/B,CAAC;YACD,IAAI,CAAC,MAAM,CACT,2BAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK;gBACvF,aAAa,kBAAkB;oBAC7B,CAAC,CAAC,sCAAsC,WAAW,kDAAkD;oBACrG,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,+BAA+B,WAAW,EAAE,CAAC,CAAC,CAAC,iCAAiC,WAAW,cAAc,KAAK,CAClJ,CAAC;YACF,OAAO,CAAC,CAAC;QACX,CAAC;QACD,MAAM,GAAG,IAAI,CAAC;QACd,IAAI,CAAC,MAAM,CAAC,UAAU,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,WAAW,KAAK,CAAC,CAAC;IACjF,CAAC;IAED,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;QAClB,IAAI,CAAC,MAAM,CACT,qBAAqB,WAAW,mCAAmC;YACnE,YAAY,WAAW,CAAC,WAAW,CAAC,uBAAuB,CAC5D,CAAC;QACF,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACxB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAChD,IAAI,IAAI,KAAK,CAAC,EAAE,CAAC;QACf,IAAI,CAAC,MAAM,CACT,eAAe,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,kBAAkB,gBAAgB,WAAW,mCAAmC;YAC7G,sEAAsE,CACvE,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
1
+ {"version":3,"file":"clone-cmd.js","sourceRoot":"","sources":["../src/clone-cmd.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { getActiveCube, getCodexWakeTarget, setCodexWakeTarget, type ActiveCube } from './cubes.js';
2
2
  import { CodexAppServerClient } from './codex-app-server.js';
3
3
  import { checkCodexBridgeHealthy } from './codex-remote.js';
4
- export declare const CODEX_WAKE_PROMPT = "Borg cube activity arrived while you were busy. Reading cube messages does not end your current task. Drain `borg_read-log unread_only=true` until caught up, handle actionable entries, then RESUME the interrupted work.";
4
+ export declare const CODEX_WAKE_PROMPT = "Borg cube activity arrived while you were busy. Reading cube messages does not end your current task. Drain `borg_read-log unread_only=true` until caught up, handle actionable entries, then RESUME the interrupted work. If the unread drain is empty, resume silently without a liveness post or full regen.";
5
5
  export declare function formatCodexWakePrompt(inboxLine: string): string;
6
6
  export declare const CODEX_CATCHUP_PROMPT: string;
7
7
  export declare function isCodexRemoteWakeEnabled(env?: NodeJS.ProcessEnv): boolean;
@@ -46,10 +46,11 @@ export interface CodexWakeDeps {
46
46
  jitter?: () => number;
47
47
  maxAttempts?: number;
48
48
  hasPendingWork?: (active: ActiveCube) => Promise<boolean>;
49
+ hasPendingEntry?: (active: ActiveCube, entryId: string) => Promise<boolean>;
49
50
  isStreamOwner?: () => boolean;
50
51
  onAppServerSocketDead?: () => void;
51
52
  }
52
- export declare function wakeCodexViaAppServer(reason?: string, env?: NodeJS.ProcessEnv, deps?: CodexWakeDeps, deliveryIdentity?: string): void;
53
+ export declare function wakeCodexViaAppServer(reason?: string, env?: NodeJS.ProcessEnv, deps?: CodexWakeDeps, deliveryIdentity?: string, sourceEntryId?: string): void;
53
54
  /**
54
55
  * gh#857 WI-2: codex /loop-equivalent heartbeat cadence. Codex retains this
55
56
  * independent 20-minute drain because it has no Claude-style per-entry inbox
@@ -1 +1 @@
1
- {"version":3,"file":"codex-app-wake.d.ts","sourceRoot":"","sources":["../src/codex-app-wake.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codex-app-wake.d.ts","sourceRoot":"","sources":["../src/codex-app-wake.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { getActiveCube, getCodexWakeTarget, setCodexWakeTarget, } from './cubes.js';
2
2
  import { CodexAppServerClient } from './codex-app-server.js';
3
3
  import { checkCodexBridgeHealthy } from './codex-remote.js';
4
- import { hasPendingWakeActivity } from './remote-client.js';
4
+ import { hasPendingWakeActivity, hasPendingWakeEntry } from './remote-client.js';
5
5
  import { BORG_CODEX_REMOTE_WAKE_ENV, resolveSessionAgentKind, } from './agent-runtime.js';
6
6
  import { codexAppServerSocketFromEnv, pickFreshThread, wakeTargetChanged, wakeRetryBackoffMs, wakeRetryExpired, WAKE_RETRY_MAX_ATTEMPTS, shouldFireHeartbeat, } from './codex-wake-resolve.js';
7
7
  import { CUBE_ACTIVITY_RESUME_WAKE_MESSAGE, formatCubeActivityWakeMessage, } from './cube-activity-wake-copy.js';
@@ -65,6 +65,8 @@ const DELIVERED_WAKE_KEY_CAP = 100;
65
65
  // (mid-turn thread) or missed (transient error) into ONE retried-until-delivered
66
66
  // drain. The coalesce gate means a burst collapses to one poller, not N.
67
67
  let retryDrainInFlight = false;
68
+ const retryDrainSourceEntryIds = new Set();
69
+ let retryDrainHasUnscopedWork = false;
68
70
  // gh#857 WI-2: timestamp of the last SUCCESSFUL wake delivery (per-entry OR
69
71
  // retry-drain OR heartbeat). The heartbeat reads this (shouldFireHeartbeat) to
70
72
  // skip when a delivery already landed inside the cadence window. Module-scoped
@@ -176,11 +178,11 @@ async function maybePersistWakeTarget(active, fresh, deps) {
176
178
  // best-effort cache write; never break the wake path
177
179
  }
178
180
  }
179
- export function wakeCodexViaAppServer(reason = CODEX_WAKE_PROMPT, env = process.env, deps = {}, deliveryIdentity) {
181
+ export function wakeCodexViaAppServer(reason = CODEX_WAKE_PROMPT, env = process.env, deps = {}, deliveryIdentity, sourceEntryId) {
180
182
  const target = resolveCodexWakeTarget(env);
181
183
  if (!target.enabled)
182
184
  return;
183
- pendingWakeRequests.push({ reason, deliveryIdentity, deps });
185
+ pendingWakeRequests.push({ reason, deliveryIdentity, sourceEntryId, deps });
184
186
  if (wakeInFlight)
185
187
  return;
186
188
  wakeInFlight = true;
@@ -191,21 +193,24 @@ export function wakeCodexViaAppServer(reason = CODEX_WAKE_PROMPT, env = process.
191
193
  async function drainCodexWakeQueue() {
192
194
  while (pendingWakeRequests.length > 0) {
193
195
  const request = pendingWakeRequests.shift();
194
- await wakeCodexTargeted(request.reason, request.deliveryIdentity, request.deps);
196
+ await wakeCodexTargeted(request.reason, request.deliveryIdentity, request.sourceEntryId, request.deps);
195
197
  }
196
198
  }
197
- async function wakeCodexTargeted(reason, deliveryIdentity, deps) {
199
+ async function wakeCodexTargeted(reason, deliveryIdentity, sourceEntryId, deps) {
198
200
  // gh#861 finding 1: another path (heartbeat/retry-drain) is mid-inject into the
199
201
  // same thread — defer to the retry-drain so this entry isn't double-injected nor
200
202
  // lost (the drain re-syncs the whole burst via the server read-cursor).
201
203
  if (!tryAcquireInjectLock()) {
202
- scheduleRetryDrain(deps);
204
+ scheduleRetryDrain(deps, sourceEntryId);
203
205
  return;
204
206
  }
205
207
  try {
206
208
  const active = await (deps.getActiveCube ?? getActiveCube)();
207
209
  if (!active)
208
210
  return;
211
+ const pendingEntry = deps.hasPendingEntry ?? hasPendingWakeEntry;
212
+ if (sourceEntryId && !(await pendingEntry(active, sourceEntryId)))
213
+ return;
209
214
  // gh#855: resolve FRESH (live env socket + re-resolved thread), falling back
210
215
  // to the launch-recorded file only when the env socket is absent.
211
216
  const resolved = await resolveFreshCodexWakeTarget(active, deps);
@@ -224,9 +229,11 @@ async function wakeCodexTargeted(reason, deliveryIdentity, deps) {
224
229
  // now. Schedule the retry-drain (coalesced, retried-until-delivered) so
225
230
  // the burst's entries are drained once the thread goes idle; codex has no
226
231
  // on-disk tail fallback like Claude's borg-inbox-monitor.
227
- scheduleRetryDrain(deps);
232
+ scheduleRetryDrain(deps, sourceEntryId);
228
233
  return;
229
234
  }
235
+ if (sourceEntryId && !(await pendingEntry(active, sourceEntryId)))
236
+ return;
230
237
  await client.startTurn(threadId, reason);
231
238
  rememberDeliveredWake(wakeKey);
232
239
  markDelivered(deps);
@@ -240,7 +247,7 @@ async function wakeCodexTargeted(reason, deliveryIdentity, deps) {
240
247
  // swallowed (the old best-effort drop let a single blip lose an entry).
241
248
  // Schedule the retry-drain so the wake is retried-until-delivered; the SSE
242
249
  // stream is never broken (this is fire-and-forget).
243
- scheduleRetryDrain(deps);
250
+ scheduleRetryDrain(deps, sourceEntryId);
244
251
  }
245
252
  finally {
246
253
  releaseInjectLock();
@@ -257,7 +264,11 @@ async function wakeCodexTargeted(reason, deliveryIdentity, deps) {
257
264
  * (wakeRetryExpired); the gh#857 WI-2 heartbeat is the backstop beyond that.
258
265
  * Never throws into the SSE path (fire-and-forget).
259
266
  */
260
- function scheduleRetryDrain(deps) {
267
+ function scheduleRetryDrain(deps, sourceEntryId) {
268
+ if (sourceEntryId)
269
+ retryDrainSourceEntryIds.add(sourceEntryId);
270
+ else
271
+ retryDrainHasUnscopedWork = true;
261
272
  if (retryDrainInFlight)
262
273
  return; // coalesce: one loop covers all deferred/missed wakes
263
274
  retryDrainInFlight = true;
@@ -285,6 +296,18 @@ async function runRetryDrainLoop(deps) {
285
296
  const active = await (deps.getActiveCube ?? getActiveCube)();
286
297
  if (!active)
287
298
  continue; // no active cube yet → keep retrying (until age cap)
299
+ const pendingEntry = deps.hasPendingEntry ?? hasPendingWakeEntry;
300
+ for (const entryId of retryDrainSourceEntryIds) {
301
+ try {
302
+ if (!(await pendingEntry(active, entryId)))
303
+ retryDrainSourceEntryIds.delete(entryId);
304
+ }
305
+ catch {
306
+ // Retain the obligation until unread state can be checked.
307
+ }
308
+ }
309
+ if (!retryDrainHasUnscopedWork && retryDrainSourceEntryIds.size === 0)
310
+ return;
288
311
  // gh#855: same FRESH resolution as the per-entry wake, so a stale launch
289
312
  // probe can't defeat the retry-drain either.
290
313
  const resolved = await resolveFreshCodexWakeTarget(active, deps);
@@ -298,7 +321,15 @@ async function runRetryDrainLoop(deps) {
298
321
  if (thread?.status?.type === 'active') {
299
322
  continue; // re-defer: still mid-turn (backoff before next poll)
300
323
  }
324
+ for (const entryId of retryDrainSourceEntryIds) {
325
+ if (!(await pendingEntry(active, entryId)))
326
+ retryDrainSourceEntryIds.delete(entryId);
327
+ }
328
+ if (!retryDrainHasUnscopedWork && retryDrainSourceEntryIds.size === 0)
329
+ return;
301
330
  await client.startTurn(threadId, CODEX_CATCHUP_PROMPT);
331
+ retryDrainSourceEntryIds.clear();
332
+ retryDrainHasUnscopedWork = false;
302
333
  markDelivered(deps);
303
334
  return; // drain delivered → server read-cursor drains all unread → done
304
335
  }
@@ -420,6 +451,8 @@ export function resetCodexWakeForTests() {
420
451
  deliveredWakeKeys.clear();
421
452
  deliveredWakeKeyOrder.length = 0;
422
453
  retryDrainInFlight = false;
454
+ retryDrainSourceEntryIds.clear();
455
+ retryDrainHasUnscopedWork = false;
423
456
  lastDeliveredAt = null;
424
457
  heartbeatInFlight = false;
425
458
  injectInFlight = false;