borgmcp 1.0.59 → 1.1.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/dist/assimilate-cmd.d.ts +1 -1
- package/dist/assimilate-cmd.js +30 -30
- package/dist/bare-launch-menu.js +4 -4
- package/dist/claude.js +13 -13
- package/dist/cli-platform.d.ts +1 -0
- package/dist/cli-platform.js +4 -4
- package/dist/codex-app-wake.d.ts +3 -3
- package/dist/codex-app-wake.js +2 -2
- package/dist/codex-launch.js +2 -2
- package/dist/config-utils.d.ts +23 -0
- package/dist/config-utils.js +4 -3
- package/dist/cubes.d.ts +1 -1
- package/dist/health-beat.d.ts +5 -4
- package/dist/health-beat.js +1 -1
- package/dist/index.js +18 -18
- package/dist/launch-all-deps.d.ts +1 -1
- package/dist/log-stream.d.ts +8 -0
- package/dist/log-stream.js +8 -8
- package/dist/opencode-drone.d.ts +18 -0
- package/dist/opencode-drone.js +1 -0
- package/dist/opencode-plugin.d.ts +3 -0
- package/dist/opencode-plugin.js +37 -0
- package/dist/parse-launch-all-args.d.ts +1 -1
- package/dist/regen-format.d.ts +2 -2
- package/dist/regen-format.js +1 -1
- package/dist/regen.js +1 -1
- package/dist/remote-client.d.ts +1 -1
- package/dist/roster-render.d.ts +1 -1
- package/dist/setup-confirm.d.ts +4 -0
- package/dist/setup-confirm.js +2 -2
- package/dist/setup.js +24 -22
- package/dist/templates.d.ts +1 -1
- package/dist/templates.js +7 -5
- package/package.json +2 -1
package/dist/assimilate-cmd.d.ts
CHANGED
|
@@ -88,7 +88,7 @@ export interface AssimilateDeps {
|
|
|
88
88
|
hostname?: string | null;
|
|
89
89
|
prior_drone_id?: string;
|
|
90
90
|
model?: string | null;
|
|
91
|
-
agent_kind?: 'claude' | 'codex' | null;
|
|
91
|
+
agent_kind?: 'claude' | 'codex' | 'opencode' | null;
|
|
92
92
|
}) => Promise<AssimilateResult>;
|
|
93
93
|
listTemplates: (apiUrl: string, token: string) => Promise<Array<{
|
|
94
94
|
name: string;
|
package/dist/assimilate-cmd.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import{dirname as K,basename as
|
|
1
|
+
import{dirname as K,basename as R}from"node:path";import{randomUUID as oe}from"node:crypto";import{roleSlug as ie,matchRoleByName as ae,pickDefaultRole as se}from"./role-resolver.js";import{deriveCubeName as le,parseGitRemote as ce,sanitizeRemoteUrl as ue}from"./cube-name.js";import{validateName as q}from"./name-validator.js";import{renderAssimilationWelcome as me}from"./assimilate-welcome.js";import{shellEscape as de}from"./shell-escape.js";import{withCodexCwdArg as fe}from"./codex-remote.js";import{buildAgentKickoffPrompt as he,buildKickoffWakePathClause as ge,recordCodexWakeTarget as we,socketPathFromRemoteArgs as be}from"./codex-launch.js";import{perWorktreeBranchName as W,adoptWorktree as ke,computeWorktreePath as z,localBranchExists as J,isMerged as ye}from"./worktree-lifecycle.js";import{DroneEvictedError as ve}from"./drone-lifecycle.js";import{codexBorgSessionConfigArgs as pe}from"./launch-gate.js";import{inboxPathForDrone as $e}from"./cubes.js";import{resolveLaunchEnv as xe,resolveOllamaBaseUrl as Se,parseModel as Ce}from"./model-presets.js";import{unlinkSync as Re}from"node:fs";import{gcOrphanInboxesForCube as Ee,defaultListInboxLogs as _e,defaultInboxLivenessDeps as Ie,isInboxLive as Ae,ORPHAN_INBOX_STALE_MS as Ne}from"./gc-orphan-inboxes.js";import{installBorgPlugin as Pe}from"./opencode-plugin.js";import{ensureOpenCodeServerEnvConfig as Le}from"./config-utils.js";import{computeOpenCodePort as Te}from"./opencode-drone.js";async function lt(r,e){if(r.role!==void 0){const t=q(r.role);if(!t.ok)return e.stderr(t.error+`
|
|
2
2
|
`),1}if(r.flags.worktree!==void 0){const t=q(r.flags.worktree);if(!t.ok)return e.stderr(t.error+`
|
|
3
|
-
`),1}let a=await e.getCachedAuth();if(!a){if(!e.isTTY()&&!r.flags.yes)return e.stderr("borg setup required and stdin is non-interactive. Run `borg setup` first in an interactive terminal, then `borg assimilate`.\n"),1;a=await e.runSetup()}const o=e.findProjectRoot(e.cwd());let i;if(r.flags.cubeName)i=r.flags.cubeName;else{const t=e.runSync("git",["remote","get-url","origin"],o),n=t.status===0?t.stdout:null;if(i=
|
|
4
|
-
`)}}let
|
|
3
|
+
`),1}let a=await e.getCachedAuth();if(!a){if(!e.isTTY()&&!r.flags.yes)return e.stderr("borg setup required and stdin is non-interactive. Run `borg setup` first in an interactive terminal, then `borg assimilate`.\n"),1;a=await e.runSetup()}const o=e.findProjectRoot(e.cwd());let i;if(r.flags.cubeName)i=r.flags.cubeName;else{const t=e.runSync("git",["remote","get-url","origin"],o),n=t.status===0?t.stdout:null;if(i=le(o,n),n){const c=ue(n),m=c?ce(c):null;c&&!m&&i&&e.stderr(`couldn't parse git remote '${c}' \u2014 using directory name '${i}' as cube name
|
|
4
|
+
`)}}let s=null;if(i&&i.includes("@")&&i.includes(":")){const t=i.lastIndexOf(":");s={ownerEmail:i.substring(0,t),cubeName:i.substring(t+1)},i=s.cubeName}const E=e.cwd();e.stderr(`Checking your cubes\u2026
|
|
5
5
|
`);let I;try{I=await e.listCubes(a.apiUrl,a.token)}catch(t){const n=t instanceof Error?t.message:String(t);if(n.includes("Authentication required")||n.includes("Authentication expired"))e.stderr(`Re-authenticating...
|
|
6
|
-
`),a=await e.runSetup(),I=await e.listCubes(a.apiUrl,a.token);else throw t}const A=I.find(t=>t.name===i);if(!A&&
|
|
6
|
+
`),a=await e.runSetup(),I=await e.listCubes(a.apiUrl,a.token);else throw t}const A=I.find(t=>t.name===i);if(!A&&s)return e.stderr(`No cube named '${s.cubeName}' accessible to you owned by '${s.ownerEmail}'. Did you accept their invite? See borgmcp.ai/dashboard.
|
|
7
7
|
`),1;let u,N;if(A)u=await e.getCube(a.apiUrl,a.token,A.id),N=!1;else{let t;if(r.flags.template)t=r.flags.template;else if(r.flags.noTemplate)t=void 0;else if(e.isTTY())if(r.flags.yes)t="starter";else{const n=await e.listTemplates(a.apiUrl,a.token),c=["First drone joining a new cube. Apply a template?"];n.forEach((p,$)=>{const _=$===0?" (default)":"";c.push(` ${$+1}) ${p.name}${_} \u2014 ${p.description}`)}),c.push(` ${n.length+1}) skip \u2014 no template`);const m=(await e.prompt(c.join(`
|
|
8
8
|
`)+`
|
|
9
9
|
[1]: `)).trim(),y=m===""?1:parseInt(m,10);if(Number.isNaN(y)||y<1||y>n.length+1)return e.stderr(`invalid choice "${m}"
|
|
@@ -11,38 +11,38 @@ import{dirname as K,basename as C}from"node:path";import{randomUUID as oe}from"n
|
|
|
11
11
|
Pass --template <name>, --no-template, or --yes (defaults to starter).
|
|
12
12
|
`),1;t="starter"}e.stderr(i?`Creating cube '${i}'\u2026
|
|
13
13
|
`:`Creating your cube\u2026
|
|
14
|
-
`),u=await e.createCube(a.apiUrl,a.token,t?{name:i??void 0,template:t}:{name:i??void 0}),N=!0}let
|
|
14
|
+
`),u=await e.createCube(a.apiUrl,a.token,t?{name:i??void 0,template:t}:{name:i??void 0}),N=!0}let g;if(r.role!==void 0){if(g=ae(u.roles,r.role),!g){const t=u.roles.map(m=>m.name).join(", "),n=je(r.role,u.roles.map(m=>m.name)),c=n?` Did you mean "${n}"?`:"";return e.stderr(`no role matching "${r.role}" in cube "${u.name}". Available: ${t}.${c}
|
|
15
15
|
(Use --template <name> on first-drone setup or run \`borg_create-role\` from inside Claude.)
|
|
16
|
-
`),1}}else{const t=new Set((u.drones??[]).map(n=>n.role_id));if(
|
|
16
|
+
`),1}}else{const t=new Set((u.drones??[]).map(n=>n.role_id));if(g=se(u.roles,{isFirstDrone:N,occupiedRoleIds:t}),!g)return e.stderr(`cube "${u.name}" has no default or human-seat role; cannot infer a role. Either pass a role argument explicitly (e.g. \`borg assimilate builder\`) or run \`borg_create-role\` from inside Claude to set up roles.
|
|
17
17
|
`),1}const x=await e.getActiveCube();let S;if(x&&r.flags.here)if(x.cubeId===u.id)S=x.droneId;else return e.stderr(`this directory already hosts an active drone; remove --here or run from a fresh worktree
|
|
18
|
-
`),1;const M=r.flags.worktree!==void 0||x!==null&&!r.flags.here,X=S??x?.droneId??null,P=M?null:await e.getLaunchModel(u.id,o,X),b=r.flags.model??P?.model??
|
|
19
|
-
`),1}const
|
|
20
|
-
`);let
|
|
18
|
+
`),1;const M=r.flags.worktree!==void 0||x!==null&&!r.flags.here,X=S??x?.droneId??null,P=M?null:await e.getLaunchModel(u.id,o,X),b=r.flags.model??P?.model??g.default_model??null,L=Se(process.env,b!=null&&b===P?.model?P?.ollamaBaseUrl:void 0);if(b){const t=await e.checkModelReachable(b,e.fetch,L);if(!t.ok)return e.stderr(`${t.message}
|
|
19
|
+
`),1}const d=await e.resolveCli(r.flags.cli);e.stderr(`Joining cube '${u.name}' as ${g.name}\u2026
|
|
20
|
+
`);let l;try{l=await e.assimilate(a.apiUrl,a.token,{cube_id:u.id,role_id:g.id,hostname:e.getHostname(),agent_kind:d,model:b,...S?{prior_drone_id:S}:{}})}catch(t){if(t instanceof ve&&S!=null)return e.stderr(`seat evicted \u2014 this worktree's saved seat was evicted from the cube. Re-assimilate fresh from a terminal, or remove this worktree.
|
|
21
21
|
`),1;const n=t instanceof Error?t.message:String(t);return e.stderr(`assimilate failed: ${n}
|
|
22
|
-
`),1}const k=u.roles.find(t=>t.id===
|
|
23
|
-
`):k.id!==
|
|
24
|
-
`);const Q=M;let
|
|
22
|
+
`),1}const k=u.roles.find(t=>t.id===l.role_id)??g;l.reattached?e.stderr(`re-attached to existing seat ${l.drone_label} (session token rotated, no new drone minted)
|
|
23
|
+
`):k.id!==g.id&&e.stderr(`Note: your invite didn't grant the "${g.name}" role \u2014 assimilated as "${k.name}" instead.
|
|
24
|
+
`);const Q=M;let w=null;if(Q){const t=e.runSync("git",["rev-parse","--verify","HEAD"],o);if(t.status!==0)return e.stderr(`sibling worktree spawn requires HEAD pointing at a commit.
|
|
25
25
|
Fix: create at least one commit (\`git commit --allow-empty -m "initial"\`)
|
|
26
26
|
OR: pass --here to skip the sibling spawn and use the current directory
|
|
27
27
|
`),1;e.runSync("git",["fetch","origin"],o);let n="origin/main";e.runSync("git",["rev-parse","--verify","origin/main"],o).status!==0&&e.runSync("git",["rev-parse","--verify","origin/master"],o).status===0&&(n="origin/master");const m=t.stdout.trim(),y=e.runSync("git",["rev-parse",n],o).stdout.trim();m!==y&&e.stderr(`note: local HEAD (${m.slice(0,7)}) differs from ${n} (${y.slice(0,7)}); new worktree will start on ${n}
|
|
28
|
-
`);const p=
|
|
29
|
-
`),1;const _=e.homedir();let
|
|
30
|
-
`),1;e.stderr(`spawned sibling worktree at ${
|
|
31
|
-
`),e.chdir(
|
|
32
|
-
`),
|
|
33
|
-
`):e.stderr(`manual cleanup needed: \`git worktree remove --force ${
|
|
34
|
-
`)}return 1}try{const t=Ie(),n=K($e(
|
|
35
|
-
`)}if(!
|
|
36
|
-
`),e.stderr(
|
|
37
|
-
`)}await e.probeMcpReady()||e.stderr(`warning: borg-mcp readiness probe did not complete within the timeout; launching ${
|
|
38
|
-
`);const ee=e.getInboxPath(
|
|
39
|
-
`),D="\u26A0 Codex wake-path capability check failed: remote-control is unavailable for this session. Run borg_regen manually whenever you return, and expect only fallback wakeups until relaunch."):D="Codex wake-path capability check passed: remote-control socket established for this session.",
|
|
40
|
-
Agent exited. You were working in ${
|
|
28
|
+
`);const p=R(o),$=r.flags.worktree??ie(k.name);if($.length===0)return e.stderr(`cannot derive a worktree name from role "${k.name}"; pass an explicit --worktree <name>
|
|
29
|
+
`),1;const _=e.homedir();let h=z(_,p,$),v=W(R(h),p),Y=2;for(;e.pathExists(h)||Ue(e,o,h)||J(e.runSync,o,v)&&!ye(e.runSync,o,v,n);)h=z(_,p,$,Y),v=W(R(h),p),Y++;e.mkdirp(K(h));const G=J(e.runSync,o,v)?e.runSync("git",["worktree","add",h,v],o):e.runSync("git",["worktree","add","-b",v,h,n],o);if(G.status!==0)return e.stderr(`git worktree add failed: ${V(G.stderr)}
|
|
30
|
+
`),1;e.stderr(`spawned sibling worktree at ${h} on branch ${v} (${n}); original dir is registered as active (edit ~/.config/borgmcp/cubes.json if stale).
|
|
31
|
+
`),e.chdir(h),e.stderr(De(h,v,o)),w=e.cwd()}try{await e.setActiveCube({cubeId:l.cube_id,droneId:l.drone_id,name:u.name,sessionToken:l.session_token,droneLabel:l.drone_label,apiUrl:a.apiUrl,roleName:k.name,isHumanSeat:k.is_human_seat,...k.role_class?{roleClass:k.role_class}:{}})}catch(t){const n=t instanceof Error?t.message:String(t);if(e.stderr(`setActiveCube failed: ${n}
|
|
32
|
+
`),w){const c=e.runSync("git",["worktree","remove","--force",w],o);c.status===0?e.stderr(`rolled back spawned worktree at ${w}
|
|
33
|
+
`):e.stderr(`manual cleanup needed: \`git worktree remove --force ${w}\` (rollback attempt failed: ${V(c.stderr).trim()||"unknown"})
|
|
34
|
+
`)}return 1}try{const t=Ie(),n=K($e(l.cube_id,l.drone_id));Ee({cubeInboxDir:n,selfDroneId:l.drone_id,deps:{listInboxLogs:_e,isLive:c=>Ae(c,t),droneState:()=>"absent",unlink:c=>Re(c),now:t.now,staleMs:Ne}})}catch{}e.setTerminalTitle(l.drone_label,u.name);const Z=e.isTTY()&&!process.env.NO_COLOR&&!process.env.CI;e.stdout(me(k.name,u.name,Z));const f=e.cwd();try{e.installProjectSessionHook(f)}catch{e.stderr(`warning: could not install the project-local SessionStart hook in ${f}; it will be re-attempted on the next borg launch
|
|
35
|
+
`)}if(!w){e.runSync("git",["fetch","origin","--prune"],f);const t=W(R(f),R(o)),n=ke(e.runSync,f,t,"origin/main");n.action==="adopted"?(e.stderr(`worktree: adopted branch ${t} at origin/main
|
|
36
|
+
`),e.stderr(Oe(f,t))):n.message&&e.stderr(`worktree sync: ${n.message}
|
|
37
|
+
`)}await e.probeMcpReady()||e.stderr(`warning: borg-mcp readiness probe did not complete within the timeout; launching ${d} anyway \u2014 the kickoff prompt's ToolSearch fallback will recover if the MCP server takes longer to start.
|
|
38
|
+
`);const ee=e.getInboxPath(l.cube_id,l.drone_id),T=d==="codex"?`borg-wake-${oe()}`:null,te=ge(d,d==="claude"?ee:null);let D,B=[],C,O=null,U=null;const H=e.findProjectRoot(f);b?await e.setLaunchModel(l.cube_id,H,{model:b,ollamaBaseUrl:Ce(b).kind==="ollama"?L:null}):await e.clearLaunchModel(l.cube_id,H);const F=xe(b,L),j={...process.env,...F.set,BORG_SESSION:"1"};for(const t of F.unset)delete j[t];if(d==="codex"){const t=await e.prepareCodexRemoteLaunch();t.warning?(e.stderr(`warning: ${t.warning}
|
|
39
|
+
`),D="\u26A0 Codex wake-path capability check failed: remote-control is unavailable for this session. Run borg_regen manually whenever you return, and expect only fallback wakeups until relaunch."):D="Codex wake-path capability check passed: remote-control socket established for this session.",B=t.args,Object.keys(t.env).length>0&&Object.assign(j,t.env),O=be(t.args),U=t.server?.cleanup??null}if(C=[he({cli:d,codexWakeNonce:T,monitorClause:te,codexWakePathClause:D})],d==="codex")C=[...pe(),...B,...fe(C,f)];else if(d==="opencode"){const t=Te(l.drone_id);Pe(),Le(t),C=[f,"--port",String(t),"--auto"]}const re=e.exec(d,C,f,j);d==="codex"&&O&&T&&we({deps:e,cubeId:l.cube_id,droneId:l.drone_id,socketPath:O,cwd:f,previewNeedle:T,launchedAtSeconds:Math.floor(Date.now()/1e3)});const ne=await re;if(U)try{U()}catch{}return w&&E!==w&&e.stderr(`
|
|
40
|
+
Agent exited. You were working in ${w}; your shell is back in ${E}.
|
|
41
41
|
To return:
|
|
42
|
-
cd ${de(
|
|
43
|
-
`),ne}function
|
|
42
|
+
cd ${de(w)}
|
|
43
|
+
`),ne}function De(r,e,a){return`
|
|
44
44
|
WORKTREE STEERING: You are in worktree ${r} on branch ${e}. Do ALL work HERE \u2014 cut your feature branch (fix/.../feat/...) off ${e} in THIS worktree, use relative paths / your cwd. NEVER \`git -C ${a}\` or operate on the primary checkout ${a}: the same branch can't be checked out in two worktrees, so work created in the primary won't reach your wt-branch without manual surgery (cherry-pick/merge).
|
|
45
|
-
`}function
|
|
45
|
+
`}function Oe(r,e){return`
|
|
46
46
|
WORKTREE STEERING: This checkout is now on branch ${e}. Do ALL work HERE in ${r} \u2014 cut your feature branch (fix/.../feat/...) off ${e}, use relative paths / your cwd.
|
|
47
|
-
`}function V(r){return r.replace(/[\x00-\x1F\x7F]/g,"")}function
|
|
48
|
-
`).some(i=>i===`worktree ${a}`)}function
|
|
47
|
+
`}function V(r){return r.replace(/[\x00-\x1F\x7F]/g,"")}function Ue(r,e,a){const o=r.runSync("git",["worktree","list","--porcelain"],e);return o.status!==0?!1:o.stdout.split(`
|
|
48
|
+
`).some(i=>i===`worktree ${a}`)}function je(r,e){if(e.length===0)return null;const a=r.toLowerCase();let o=null;for(const i of e){const s=We(a,i.toLowerCase());s<=2&&(o===null||s<o.distance)&&(o={name:i,distance:s})}return o?o.name:null}function We(r,e){if(r===e)return 0;if(r.length===0)return e.length;if(e.length===0)return r.length;const a=new Array(e.length+1),o=new Array(e.length+1);for(let i=0;i<=e.length;i++)a[i]=i;for(let i=1;i<=r.length;i++){o[0]=i;for(let s=1;s<=e.length;s++){const E=r[i-1]===e[s-1]?0:1;o[s]=Math.min(o[s-1]+1,a[s]+1,a[s-1]+E)}for(let s=0;s<=e.length;s++)a[s]=o[s]}return a[e.length]}export{lt as runAssimilate,V as safeStderr,je as suggestRoleName};
|
package/dist/bare-launch-menu.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
const c={claude:"Claude",codex:"Codex"};function f(n){return n.extraArgs.length===0&&n.stdinIsTTY&&n.stdoutIsTTY}function x(n){return!n.explicitCli||!n.stdinIsTTY||!n.stdoutIsTTY||!n.hasActiveCube||!n.hasLaunchAllTargets?null:`borg --cli ${n.explicitCli} launches ${c[n.explicitCli]} directly; use bare borg for the launch menu or borg launch-all --cli ${n.explicitCli} for all drone worktrees.
|
|
2
|
-
`}function
|
|
1
|
+
const c={claude:"Claude",codex:"Codex",opencode:"OpenCode"};function f(n){return n.extraArgs.length===0&&n.stdinIsTTY&&n.stdoutIsTTY}function x(n){return!n.explicitCli||!n.stdinIsTTY||!n.stdoutIsTTY||!n.hasActiveCube||!n.hasLaunchAllTargets?null:`borg --cli ${n.explicitCli} launches ${c[n.explicitCli]} directly; use bare borg for the launch menu or borg launch-all --cli ${n.explicitCli} for all drone worktrees.
|
|
2
|
+
`}function p(n){return!!(n.explicitCli&&n.stdinIsTTY&&n.stdoutIsTTY&&n.hasActiveCube)}function h(n){const t=[{key:"1",label:`Launch (default \xB7 ${c[n.defaultCli]})`,action:{kind:"launch",cli:n.defaultCli}}];return n.otherInstalledCli&&t.push({key:String(t.length+1),label:`Launch with ${c[n.otherInstalledCli]} instead (one-shot)`,action:{kind:"launch",cli:n.otherInstalledCli}}),n.hasLaunchAllTargets&&t.push({key:String(t.length+1),label:"Launch all (this cube's drone worktrees)",action:{kind:"launch-all"}}),t}function s(n,t){const e=t.trim();if(e==="")return{ok:!0,action:n[0].action};const i=n.find(l=>l.key===e);return i?{ok:!0,action:i.action}:{ok:!1}}function d(n){return`borg \u2014 how do you want to launch?
|
|
3
3
|
${n.map(e=>` ${e.key}) ${e.label}`).join(`
|
|
4
4
|
`)}
|
|
5
|
-
[1]: `}async function
|
|
6
|
-
${u}`),r=s(i,a);if(r.ok)return r.action;e.warn?.(`invalid launch-menu selection: ${JSON.stringify(a.trim())}`)}return i[0].action}export{h as buildLaunchMenuOptions,x as explicitCliLaunchHint,d as renderLaunchMenu,s as resolveLaunchMenuChoice,
|
|
5
|
+
[1]: `}async function C(n,t,e={}){const i=h(n);if(i.length===1)return i[0].action;const l=e.maxAttempts??3,u=d(i);for(let o=0;o<l;o++){const a=await t(o===0?u:`Invalid choice.
|
|
6
|
+
${u}`),r=s(i,a);if(r.ok)return r.action;e.warn?.(`invalid launch-menu selection: ${JSON.stringify(a.trim())}`)}return i[0].action}export{h as buildLaunchMenuOptions,x as explicitCliLaunchHint,d as renderLaunchMenu,s as resolveLaunchMenuChoice,C as runBareLaunchMenu,p as shouldResolveExplicitCliLaunchHintTargets,f as shouldShowLaunchMenu};
|
package/dist/claude.js
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
|
-
import{spawn as
|
|
3
|
-
`)})();if((process.argv[2]==="--help"||process.argv[2]==="-h")&&(process.stdout.write(
|
|
4
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=
|
|
5
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=await
|
|
6
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=await
|
|
7
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=
|
|
8
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1)),
|
|
9
|
-
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const $=async e=>{const r=
|
|
10
|
-
\u25FC Failed to launch ${
|
|
11
|
-
`)}`)
|
|
12
|
-
\u25FC Failed to launch ${
|
|
13
|
-
`)}`)
|
|
14
|
-
\u25FC Error: ${
|
|
2
|
+
import{spawn as B}from"child_process";import{randomUUID as F}from"node:crypto";import{basename as _}from"node:path";import{createInterface as W}from"node:readline/promises";import i from"chalk";import{findProjectRoot as I,getActiveCube as G,getLaunchModel as Y,inboxPathForDrone as U,setCodexWakeTarget as V,pruneDeadCodexWakeTargets as K}from"./cubes.js";import{applyOllamaLaunchEnv as j,checkModelReachable as q}from"./model-presets.js";import{handleVersionFlag as X,getPackageVersion as h}from"./version.js";import{isHelpFlag as L,setupHelpText as z,topLevelHelpText as J,assimilateHelpText as Q}from"./cli-help.js";import{runSpawn as Z}from"./spawn.js";import{buildClaudeLaunchArgs as ee}from"./claude-launch-args.js";import{parseSyncArgs as re,runSync as oe}from"./sync.js";import{parseCleanupArgs as se,runCleanup as te}from"./cleanup-cmd.js";import{parseAssimilateArgs as ie}from"./parse-assimilate-args.js";import{runAssimilate as ae}from"./assimilate-cmd.js";import{buildDefaultAssimilateDeps as ne}from"./assimilate-deps.js";import{parseLaunchAllArgs as R}from"./parse-launch-all-args.js";import{unknownSubcommand as ce}from"./unknown-subcommand.js";import{runLaunchAll as O}from"./launch-all-cmd.js";import{buildDefaultLaunchAllDeps as k}from"./launch-all-deps.js";import{discoverDroneCandidates as le}from"./launch-all-discovery.js";import{explicitCliLaunchHint as de,runBareLaunchMenu as pe,shouldResolveExplicitCliLaunchHintTargets as ue,shouldShowLaunchMenu as me}from"./bare-launch-menu.js";import{setTerminalTitle as fe}from"./terminal-title.js";import{initConsolePrefix as ge,consolePrefix as t}from"./console-prefix.js";import{initDebugFromArgv as he}from"./debug.js";import{fetchLatestBorgmcpVersion as we,compareVersionsForStaleness as Ce}from"./stale-version-check.js";import{defaultCliChoiceDeps as xe,detectCliAvailability as b,installedCliNames as D,parseCliFlag as ve,resolveCliChoice as ke}from"./cli-platform.js";import{getRefreshToken as be,getIdToken as $e}from"./config.js";import{composeGetStarted as Se,shouldShowGetStarted as ye}from"./get-started.js";import{prepareCodexRemoteLaunch as Ae,withCodexCwdArg as Te,defaultCodexRemoteDeps as Pe,checkCodexBridgeHealthy as Ie}from"./codex-remote.js";import{findLoadedCodexThread as Le}from"./codex-app-server.js";import{buildAgentKickoffPrompt as Re,buildKickoffWakePathClause as Oe,recordCodexWakeTarget as De,socketPathFromRemoteArgs as E}from"./codex-launch.js";import{codexBorgSessionConfigArgs as Ee}from"./launch-gate.js";import{addCodexMcpServer as Me,addCodexSessionStartHook as He,addCodexUserPromptSubmitHook as Ne,addMcpServer as Be,addOpenCodeMcpServer as Fe,addProjectSessionStartHook as _e,addUserPromptSubmitHook as We,ensureOpenCodeServerEnvConfig as Ge,isCodexMcpServerConfigured as Ye,isMcpServerConfigured as Ue,isOpenCodeMcpServerConfigured as Ve,removeSessionStartHook as Ke}from"./config-utils.js";import{installBorgPlugin as je}from"./opencode-plugin.js";import{computeOpenCodePort as qe}from"./opencode-drone.js";async function Xe(){he(process.argv),X(),await ge();const c=(async()=>{if(!process.stderr.isTTY)return;const e=h(),r=await we();if(!r)return;const a=Ce(e,r);a.stale&&a.message&&process.stderr.write(`${t()}${a.message}
|
|
3
|
+
`)})();if((process.argv[2]==="--help"||process.argv[2]==="-h")&&(process.stdout.write(J(h())),process.exit(0)),process.argv[2]==="setup"){L(process.argv[3])&&(process.stdout.write(z(h())),process.exit(0)),await import("./setup.js");return}if(process.argv[2]==="assimilate"){process.argv.slice(3).some(L)&&(process.stdout.write(Q(h())),process.exit(0));const e=ie(process.argv.slice(3));e.ok||(process.stderr.write(i.red(`${t()}\u25FC borg assimilate: ${e.error}
|
|
4
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=ne(),a=await ae({role:e.role,flags:e.flags},r);process.exit(a)}if(process.argv[2]==="spawn"){const e=await Z();process.exit(e)}if(process.argv[2]==="sync"){const e=re(process.argv.slice(3));e.ok||(process.stderr.write(i.red(`${t()}\u25FC borg sync: ${e.error}
|
|
5
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=await oe({},e.options);process.exit(r)}if(process.argv[2]==="cleanup"){const e=se(process.argv.slice(3));e.ok||(process.stderr.write(i.red(`${t()}\u25FC borg cleanup: ${e.error}
|
|
6
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=await te({},e.options);process.exit(r)}if(process.argv[2]==="launch-all"){const e=R(process.argv.slice(3));e.ok||(process.stderr.write(i.red(`${t()}\u25FC borg launch-all: ${e.error}
|
|
7
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const r=k(),a=await O(e.args,r);process.exit(a)}const n=ce(process.argv[2]);if(n!==null&&(process.stderr.write(i.red(`${t()}\u25FC unknown command: ${n}
|
|
8
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1)),ye(await be()!==null,await $e()!==null)){const e=D(b()).length>0;process.stdout.write(Se(e)),process.exit(0)}const d=ve(process.argv.slice(2));d.error&&(process.stderr.write(i.red(`${t()}\u25FC ${d.error}
|
|
9
|
+
`)),process.stderr.write("Run `borg --help` for usage.\n"),process.exit(1));const $=async e=>{const r=W({input:process.stdin,output:process.stdout});try{return await r.question(e)}finally{r.close()}};let o=await ke(d.cli,xe($,()=>process.stdin.isTTY===!0));ze();const s=await G();let w;const S=async()=>s?(w===void 0&&(w=(await le({targetCubeId:s.cubeId},k())).length>0),w):!1,C=process.stdin.isTTY===!0,x=process.stdout.isTTY===!0,y=de({explicitCli:d.cli,stdinIsTTY:C,stdoutIsTTY:x,hasActiveCube:s!==null,hasLaunchAllTargets:ue({explicitCli:d.cli,stdinIsTTY:C,stdoutIsTTY:x,hasActiveCube:s!==null})?await S():!1});if(y&&process.stderr.write(y),me({extraArgs:process.argv.slice(2),stdinIsTTY:C,stdoutIsTTY:x})){const e=D(b()).find(a=>a!==o)??null,r=await pe({defaultCli:o,otherInstalledCli:e,hasLaunchAllTargets:await S()},$);if(r.kind==="launch-all"){const a=R([]),N=a.ok?await O(a.args,k()):1;process.exit(N)}o=r.cli}const l=d.rest;fe(s?{label:s.droneLabel,cubeName:s.name}:null,_(process.cwd()));const M=Oe(o,s&&o==="claude"?U(s.cubeId,s.droneId):null);await Promise.race([c,new Promise(e=>setTimeout(e,2e3))]);const A=o==="codex"?`borg-wake-${F()}`:null;let f,T=[],p={...process.env,BORG_SESSION:"1"},u=null,m=null;if(o==="codex"&&!l.includes("--remote")){console.error(`${t()}${i.gray("\u25FC Starting Codex remote-wake app-server\u2026")}`);const e=await Ae(Pe());e.warning?(console.error(`${t()}${i.yellow(`warning: ${e.warning}`)}`),f="\u26A0 Codex wake-path capability check failed: remote-control is unavailable for this session. Run borg_regen manually whenever you return, and expect only fallback wakeups until relaunch."):f="Codex wake-path capability check passed: remote-control socket established for this session.",T=e.args,p={...process.env,...e.env,BORG_SESSION:"1"},u=E(e.args),m=e.server?.cleanup??null}else o==="codex"&&l.includes("--remote")&&(f="Codex wake-path capability check: using caller-provided --remote socket; if no wake arrives, run borg_regen manually when returning to the session.",u=E(l),u&&(p={...process.env,BORG_CODEX_REMOTE_WAKE:"1",BORG_SESSION:"1"}));if(s){const e=await Y(s.cubeId,I(),s.droneId),r=j(p,e,process.env);if(p=r.env,r.probe){const a=await q(r.probe.descriptor,fetch,r.probe.baseUrl);a.ok||console.error(`${t()}${i.yellow(`warning: ${a.message}`)}`)}}const v=Re({cli:o,codexWakeNonce:A,monitorClause:M,codexWakePathClause:f});let g;if(o==="codex")g=[...Ee(),...T,...Te([...l,v],process.cwd())];else if(o==="opencode"){const e=s?qe(s.droneId):14096;je(),Ge(e),g=[process.cwd(),"--port",String(e),"--auto",...l]}else g=ee(l,v);const H=o==="claude"?"Claude Code":o==="codex"?"Codex":"OpenCode";console.error(`${t()}${i.blue(`\u25FC Launching ${H}\u2026`)}`);const P=B(o,g,{stdio:"inherit",shell:!1,env:p});o==="codex"&&s&&u&&(De({deps:{setCodexWakeTarget:V,findLoadedCodexThread:Le},cubeId:s.cubeId,droneId:s.droneId,socketPath:u,passthroughArgs:l,previewNeedle:A??v.slice(0,120),cwd:process.cwd(),launchedAtSeconds:Math.floor(Date.now()/1e3)}),K(e=>Ie(e))),P.on("error",e=>{if(m)try{m()}catch{}if(e.code==="ENOENT"){console.error(`${t()}${i.red(`
|
|
10
|
+
\u25FC Failed to launch ${o}`)}`);const r=o==="opencode"?"opencode":o;console.error(`${t()}${i.gray(`Make sure ${r} is installed.
|
|
11
|
+
`)}`)}else console.error(`${t()}${i.red(`
|
|
12
|
+
\u25FC Failed to launch ${o}: ${e.message}
|
|
13
|
+
`)}`);process.exit(1)}),P.on("exit",e=>{if(m)try{m()}catch{}process.exit(e??0)})}function ze(){const c=b();if(c.claude)try{Ue()||Be(),_e(I(process.cwd())),Ke(),We()}catch(n){console.error(`${t()}${i.yellow(`warning: Claude Code integration check failed: ${n?.message??n}`)}`)}if(c.codex)try{Ye()||Me(),He(),Ne()}catch(n){console.error(`${t()}${i.yellow(`warning: Codex integration check failed: ${n?.message??n}`)}`)}if(c.opencode)try{Ve()||Fe()}catch(n){console.error(`${t()}${i.yellow(`warning: OpenCode integration check failed: ${n?.message??n}`)}`)}}Xe().catch(c=>{console.error(`${t()}${i.red(`
|
|
14
|
+
\u25FC Error: ${c.message}
|
|
15
15
|
`)}`),process.exit(1)});
|
package/dist/cli-platform.d.ts
CHANGED
package/dist/cli-platform.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
[1]: `)).trim()
|
|
1
|
+
import C from"which";import{getProjectCliPreference as p,setProjectCliPreference as w}from"./cubes.js";function m(){return{claude:f("claude"),codex:f("codex"),opencode:f("opencode")}}function f(r){try{return C.sync(r)}catch{return null}}function g(r){const e=[];return r.claude&&e.push("claude"),r.codex&&e.push("codex"),r.opencode&&e.push("opencode"),e}async function a(r,e){return await e.setPreference(r),r}async function I(r,e){const c=e.detectCli(),n=g(c);if(n.length===0)throw new Error("No supported agent CLI found (claude, codex, opencode). Install one of them, then run borg again.");if(r){if(!n.includes(r))throw new Error(`${r} CLI is not installed.`);return await e.setPreference(r),r}const t=await e.getPreference();if(t&&n.includes(t))return t;if(n.length===1)return await e.setPreference(n[0]),n[0];if(!e.isTTY())throw new Error("Multiple agent CLIs detected. Pass --cli claude, --cli codex, or --cli opencode to choose.");const o=n.map((s,h)=>` ${h+1}) ${s}`),i=(await e.prompt(`Use which CLI for this project?
|
|
2
|
+
${o.join(`
|
|
3
|
+
`)}
|
|
4
|
+
[1]: `)).trim();if(i===""||i==="1")return a(n[0],e);const l=parseInt(i,10);if(!Number.isNaN(l)&&l>=1&&l<=n.length)return a(n[l-1],e);const d=i.toLowerCase();for(const s of n)if(d===s)return a(s,e);throw new Error(`invalid CLI choice "${i}"`)}function L(r,e){return{detectCli:m,getPreference:p,setPreference:w,prompt:r,isTTY:e}}const u=["claude","codex","opencode"];function $(r){const e=[];let c;for(let n=0;n<r.length;n++){const t=r[n];if(t==="--cli"){const o=r[n+1];if(!o||!u.includes(o))return{rest:e,error:`--cli requires one of: ${u.join(", ")}`};c=o,n+=1}else if(t.startsWith("--cli=")){const o=t.slice(6);if(!u.includes(o))return{rest:e,error:`--cli requires one of: ${u.join(", ")}`};c=o}else e.push(t)}return{cli:c,rest:e}}export{L as defaultCliChoiceDeps,m as detectCliAvailability,g as installedCliNames,$ as parseCliFlag,I as resolveCliChoice};
|
package/dist/codex-app-wake.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ export declare const CODEX_WAKE_PROMPT = "New Borg cube-log activity arrived.";
|
|
|
5
5
|
export declare function formatCodexWakePrompt(inboxLine: string): string;
|
|
6
6
|
export declare const CODEX_CATCHUP_PROMPT = "Borg cube activity arrived while you were busy. Wake triage: run `borg_read-log unread_only=true` and DRAIN \u2014 repeat until the returned page is under the limit and behind_by is 0 \u2014 so no entries are skipped. Then handle actionable entries; if none, resume the prior interrupted work.";
|
|
7
7
|
export declare function isCodexRemoteWakeEnabled(env?: NodeJS.ProcessEnv): boolean;
|
|
8
|
-
export declare function resolveSessionAgentKind(env?: NodeJS.ProcessEnv): 'claude' | 'codex';
|
|
8
|
+
export declare function resolveSessionAgentKind(env?: NodeJS.ProcessEnv): 'claude' | 'codex' | 'opencode';
|
|
9
9
|
export interface CodexWakeTarget {
|
|
10
10
|
enabled: boolean;
|
|
11
11
|
}
|
|
@@ -51,7 +51,7 @@ export interface CodexWakeDeps {
|
|
|
51
51
|
export declare function wakeCodexViaAppServer(reason?: string, env?: NodeJS.ProcessEnv, deps?: CodexWakeDeps): void;
|
|
52
52
|
/**
|
|
53
53
|
* gh#857 WI-2: codex /loop-equivalent heartbeat cadence. Tighter than claude's
|
|
54
|
-
* ~
|
|
54
|
+
* ~60-min /loop ScheduleWakeup because codex has no per-entry inbox-Monitor
|
|
55
55
|
* backstop — this periodic drain IS the independent second safety net.
|
|
56
56
|
*/
|
|
57
57
|
export declare const CODEX_HEARTBEAT_CADENCE_MS: number;
|
|
@@ -80,7 +80,7 @@ export declare function fireCodexHeartbeatTick(deps?: CodexWakeDeps, cadenceMs?:
|
|
|
80
80
|
* not a codex session. Injectable agentKind/intervalMs/tick for tests.
|
|
81
81
|
*/
|
|
82
82
|
export declare function startCodexHeartbeat(opts?: {
|
|
83
|
-
agentKind?: 'claude' | 'codex';
|
|
83
|
+
agentKind?: 'claude' | 'codex' | 'opencode';
|
|
84
84
|
intervalMs?: number;
|
|
85
85
|
tick?: () => void;
|
|
86
86
|
}): ReturnType<typeof setInterval> | null;
|
package/dist/codex-app-wake.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{getActiveCube as C,getCodexWakeTarget as
|
|
2
|
-
${e}`}const D="Borg cube activity arrived while you were busy. Wake triage: run `borg_read-log unread_only=true` and DRAIN \u2014 repeat until the returned page is under the limit and behind_by is 0 \u2014 so no entries are skipped. Then handle actionable entries; if none, resume the prior interrupted work.";function P(e=process.env){return e.BORG_CODEX_REMOTE_WAKE==="1"}function X(e=process.env){return P(e)?"codex":"claude"}function q(e=process.env){return P(e)?{enabled:!0}:{enabled:!1}}async function ce(e,t={}){try{const r=await(t.getCodexWakeTarget??
|
|
1
|
+
import{getActiveCube as C,getCodexWakeTarget as p,setCodexWakeTarget as R}from"./cubes.js";import{CodexAppServerClient as O}from"./codex-app-server.js";import{checkCodexBridgeHealthy as S}from"./codex-remote.js";import{recordEventReceipt as W}from"./health-beat.js";import{codexAppServerSocketFromEnv as K,pickFreshThread as B,wakeTargetChanged as M,wakeRetryBackoffMs as F,wakeRetryExpired as N,WAKE_RETRY_MAX_ATTEMPTS as H,shouldFireHeartbeat as j}from"./codex-wake-resolve.js";const L="New Borg cube-log activity arrived.";function ie(e){return`New Borg cube-log activity arrived:
|
|
2
|
+
${e}`}const D="Borg cube activity arrived while you were busy. Wake triage: run `borg_read-log unread_only=true` and DRAIN \u2014 repeat until the returned page is under the limit and behind_by is 0 \u2014 so no entries are skipped. Then handle actionable entries; if none, resume the prior interrupted work.";function P(e=process.env){return e.BORG_CODEX_REMOTE_WAKE==="1"}function X(e=process.env){return P(e)?"codex":e.BORG_OPENCODE==="1"?"opencode":"claude"}function q(e=process.env){return P(e)?{enabled:!0}:{enabled:!1}}async function ce(e,t={}){try{const r=await(t.getCodexWakeTarget??p)(e.cubeId,e.droneId);return r?(t.checkBridge??S)(r.socketPath):!1}catch{return null}}let f=!1;const h=[],d=new Set,w=[],$=100;let g=!1,k=null;function se(){return k}function m(e){k=(e.now??Date.now)()}let y=!1,v=!1;function T(){return v?!1:(v=!0,!0)}function A(){v=!1}function G(e){return e?.code==="ENOENT"}function V(e){return new Promise(t=>setTimeout(t,e))}function x(e,t){return t.createClient?t.createClient(e):new O(e)}async function E(e,t){const n=K(t.env??process.env);if(n){const a=x(n,t);await a.connect();try{const o=await a.loadedThreadIds(),i=[];for(const u of o){const s=await a.readThread(u);s&&i.push({id:s.id,cwd:s.cwd,updatedAt:s.updatedAt})}const c=B(i,{cwd:(t.cwd??(()=>process.cwd()))()});return c?(await Y(e,{socketPath:n,threadId:c},t),{socketPath:n,threadId:c}):null}finally{a.close()}}const r=await(t.getCodexWakeTarget??p)(e.cubeId,e.droneId);return r?{socketPath:r.socketPath,threadId:r.threadId}:null}async function Y(e,t,n){try{const r=n.getCodexWakeTarget??p,a=n.setCodexWakeTarget??R,o=await r(e.cubeId,e.droneId),i=o?{socketPath:o.socketPath,threadId:o.threadId}:null;M(i,t)&&await a(e.cubeId,e.droneId,t)}catch{}}function ue(e=L,t=process.env,n={}){q(t).enabled&&(h.push({reason:e,deps:n}),!f&&(f=!0,Q().finally(()=>{f=!1})))}async function Q(){for(;h.length>0;){const e=h.shift();await U(e.reason,e.deps)}}async function U(e,t){if(!T()){b(t);return}try{const n=await(t.getActiveCube??C)();if(!n)return;const r=await E(n,t);if(!r)return;const{socketPath:a,threadId:o}=r,i=`${o}\0${e}`;if(d.has(i))return;const c=x(a,t);await c.connect();try{if((await c.readThread(o))?.status?.type==="active"){b(t);return}await c.startTurn(o,e),W(),Z(i),m(t)}finally{c.close()}}catch{b(t)}finally{A()}}function b(e){g||(g=!0,z(e).finally(()=>{g=!1}))}async function z(e){const t=e.sleep??V,n=e.now??Date.now,r=e.jitter??(()=>Math.random()*500),a=e.maxAttempts??H,o=n();let i=0;for(;!N(o,n())&&i<a;)if(await t(F(i,r())),i++,!!T())try{const c=await(e.getActiveCube??C)();if(!c)continue;const u=await E(c,e);if(!u)continue;const{socketPath:s,threadId:I}=u,l=x(s,e);await l.connect();try{if((await l.readThread(I))?.status?.type==="active")continue;await l.startTurn(I,D),W(),m(e);return}finally{l.close()}}catch{}finally{A()}}const _=20*6e4;async function J(e={},t=_){if(y)return;const n=(e.now??Date.now)();if(j(k,n,t)&&!(e.isStreamOwner&&!e.isStreamOwner())&&T()){y=!0;try{const r=await(e.getActiveCube??C)();if(!r)return;const a=await E(r,e);if(!a)return;const o=x(a.socketPath,e);await o.connect();try{if((await o.readThread(a.threadId))?.status?.type==="active")return;await o.startTurn(a.threadId,D),m(e)}finally{o.close()}}catch(r){G(r)&&e.onAppServerSocketDead?.()}finally{y=!1,A()}}}function de(e={}){if((e.agentKind??X())!=="codex")return null;const n=e.intervalMs??_,r=e.tick??(()=>{J()}),a=setInterval(r,n);return a.unref?.(),a}function le(){f=!1,h.length=0,d.clear(),w.length=0,g=!1,k=null,y=!1,v=!1}function Z(e){if(!d.has(e))for(d.add(e),w.push(e);w.length>$;){const t=w.shift();t&&d.delete(t)}}export{D as CODEX_CATCHUP_PROMPT,_ as CODEX_HEARTBEAT_CADENCE_MS,L as CODEX_WAKE_PROMPT,J as fireCodexHeartbeatTick,ie as formatCodexWakePrompt,se as getLastDeliveredAt,P as isCodexRemoteWakeEnabled,ce as probeCodexBridgeArmed,le as resetCodexWakeForTests,q as resolveCodexWakeTarget,X as resolveSessionAgentKind,de as startCodexHeartbeat,ue as wakeCodexViaAppServer};
|
package/dist/codex-launch.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import{wakePathArming as
|
|
2
|
-
Keep this Monitor armed for the whole session \u2014 NEVER TaskStop it (the generic /loop "TaskStop any Monitor you armed" step does NOT apply to the cube inbox Monitor; it targets throwaway loop-scratch watches only). The sole exception is a confirmed terminal eviction (410 DRONE_EVICTED).
|
|
1
|
+
import{wakePathArming as c}from"./regen-format.js";function i(e,t){return e==="claude"&&t?c("claude",t)+`
|
|
2
|
+
Keep this Monitor armed for the whole session \u2014 NEVER TaskStop it (the generic /loop "TaskStop any Monitor you armed" step does NOT apply to the cube inbox Monitor; it targets throwaway loop-scratch watches only). The sole exception is a confirmed terminal eviction (410 DRONE_EVICTED). `:""}function d(e){const t=e.codexWakeNonce?`Wake target nonce: ${e.codexWakeNonce}. `:"",r=e.codexWakePathClause??"Codex Borg wakeups use remote-control when available; if no wake arrives, run borg_regen manually when returning to the session.",a="OpenCode wakes: the inbox Monitor is not available yet for OpenCode; check activity by calling borg_read-log periodically.",o=e.cli==="claude"?"/loop ":"",n=e.cli==="claude"?e.monitorClause:e.cli==="codex"?r:a;return`${o}Call borg_regen and follow the playbook in its response. `+t+'Note: at session start the borg MCP server is still spinning up in parallel \u2014 if a system reminder claims "MCP server disconnected" or the borg tools are not yet registered, do NOT bail. Recover via `ToolSearch({query: "select:mcp__borg__borg_regen,mcp__borg__borg_log,Monitor", max_results: 3})` to load the bootstrap tools in one call, then call borg_regen. The server typically becomes available within a few seconds. '+n}function u(e){const t=e.indexOf("--remote");if(t<0)return null;const r=e[t+1];return r?.startsWith("unix://")?r.slice(7):null}function l(e){if(e[0]==="resume"&&e[1]&&!e[1].startsWith("-"))return e[1];const t=e.indexOf("--resume");return t>=0&&e[t+1]?e[t+1]:null}async function h(e){try{const t=e.passthroughArgs?l(e.passthroughArgs):null;if(t){await e.deps.setCodexWakeTarget(e.cubeId,e.droneId,{threadId:t,socketPath:e.socketPath});return}const r=Date.now()+15e3;for(;Date.now()<r;){const a=await e.deps.findLoadedCodexThread({socketPath:e.socketPath,cwd:e.cwd,previewIncludes:e.previewNeedle,updatedAfter:e.launchedAtSeconds-5});if(a){await e.deps.setCodexWakeTarget(e.cubeId,e.droneId,{threadId:a,socketPath:e.socketPath});return}await new Promise(o=>setTimeout(o,500))}}catch{}}export{d as buildAgentKickoffPrompt,i as buildKickoffWakePathClause,h as recordCodexWakeTarget,u as socketPathFromRemoteArgs,l as threadIdFromPassthroughArgs};
|
package/dist/config-utils.d.ts
CHANGED
|
@@ -109,4 +109,27 @@ export declare function isCodexSessionStartHookRegistered(hooksPath?: string): b
|
|
|
109
109
|
* registered. Non-mutating mirror of addCodexUserPromptSubmitHook.
|
|
110
110
|
*/
|
|
111
111
|
export declare function isCodexUserPromptSubmitHookRegistered(hooksPath?: string): boolean;
|
|
112
|
+
/**
|
|
113
|
+
* Detect whether the borg MCP server is already registered in the opencode
|
|
114
|
+
* config (`~/.config/opencode/opencode.json` `mcp.borg`).
|
|
115
|
+
*
|
|
116
|
+
* Reads the config as JSON and checks for a `mcp.borg` entry with
|
|
117
|
+
* `type: "local"`. Safe-default: any read error returns `false`.
|
|
118
|
+
*/
|
|
119
|
+
export declare function isOpenCodeMcpServerConfigured(configPath?: string): boolean;
|
|
120
|
+
/**
|
|
121
|
+
* Add borg MCP server to OpenCode using `opencode mcp add` CLI.
|
|
122
|
+
* Pins BORG_SESSION=1, BORG_OPENCODE=1, and BORG_API_URL in the server
|
|
123
|
+
* environment so the MCP child inherits the activation gate + agent-kind
|
|
124
|
+
* signal (same approach as codex's pinned env — opencode MCP children
|
|
125
|
+
* only see pinned env, not parent process env).
|
|
126
|
+
*/
|
|
127
|
+
export declare function addOpenCodeMcpServer(): void;
|
|
128
|
+
/**
|
|
129
|
+
* Ensure the opencode MCP server config includes OPENCODE_SERVER_URL env var
|
|
130
|
+
* pointing at the local opencode HTTP server. Idempotent: updates in-place.
|
|
131
|
+
* Best-effort (failure is non-fatal — the MCP child discovers the server via
|
|
132
|
+
* port scan as a fallback).
|
|
133
|
+
*/
|
|
134
|
+
export declare function ensureOpenCodeServerEnvConfig(port: number): void;
|
|
112
135
|
//# sourceMappingURL=config-utils.d.ts.map
|
package/dist/config-utils.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
-
import{execSync as
|
|
2
|
-
`,"utf-8")}function
|
|
3
|
-
`,"utf-8")}function
|
|
1
|
+
import{execSync as d}from"child_process";import n from"fs";import f from"os";import i from"path";import{fileURLToPath as v}from"url";import{dirname as R}from"path";const E=v(import.meta.url),U=R(E),a="borg-regen",u="borg-log-audit",j=i.join(f.homedir(),".claude.json"),H=i.join(f.homedir(),".codex","config.toml"),m=i.join(f.homedir(),".codex","hooks.json"),h=i.join(f.homedir(),".config","opencode","opencode.json"),M="borg";function S(){return i.join(f.homedir(),".claude","settings.json")}function p(){const e=S();if(!n.existsSync(e))return{};const o=n.readFileSync(e,"utf-8");return o.trim()?JSON.parse(o):{}}function g(e){const o=S();n.mkdirSync(i.dirname(o),{recursive:!0}),n.writeFileSync(o,JSON.stringify(e,null,2)+`
|
|
2
|
+
`,"utf-8")}function k(e){if(!n.existsSync(e))return{};const o=n.readFileSync(e,"utf-8");return o.trim()?JSON.parse(o):{}}function O(e,o){n.mkdirSync(i.dirname(e),{recursive:!0}),n.writeFileSync(e,JSON.stringify(o,null,2)+`
|
|
3
|
+
`,"utf-8")}function $(){return P(S())}function D(e){return P(x(e))}function J(e){return w(x(e))}function x(e){return i.join(e,".claude","settings.local.json")}function P(e){let o;try{o=k(e)}catch(t){return console.error(`\u26A0 Could not parse ${e}: ${t.message}. Skipping hook registration; you can add it manually.`),!1}return o.hooks??={},o.hooks.SessionStart??=[],o.hooks.SessionStart.some(t=>Array.isArray(t?.hooks)&&t.hooks.some(s=>s?.type==="command"&&s?.command===a))?!1:(o.hooks.SessionStart.push({matcher:"*",hooks:[{type:"command",command:a}]}),O(e,o),!0)}function w(e){let o;try{o=k(e)}catch{return!1}const r=o?.hooks?.SessionStart;return Array.isArray(r)?r.some(t=>Array.isArray(t?.hooks)&&t.hooks.some(s=>s?.type==="command"&&s?.command===a)):!1}function T(){let e;try{e=p()}catch{return!1}const o=e?.hooks?.SessionStart;return Array.isArray(o)?o.some(r=>Array.isArray(r?.hooks)&&r.hooks.some(t=>t?.type==="command"&&t?.command===a)):!1}function K(){let e;try{e=p()}catch{return!1}const o=e?.hooks?.UserPromptSubmit;return Array.isArray(o)?o.some(r=>Array.isArray(r?.hooks)&&r.hooks.some(t=>t?.type==="command"&&t?.command===u)):!1}function X(){let e;try{e=p()}catch{return!1}if(!e?.hooks?.SessionStart)return!1;let o=!1;return e.hooks.SessionStart=e.hooks.SessionStart.map(r=>{if(!Array.isArray(r?.hooks))return r;const t=r.hooks.filter(s=>!(s?.type==="command"&&s?.command===a));return t.length!==r.hooks.length?(o=!0,{...r,hooks:t}):r}).filter(r=>Array.isArray(r?.hooks)&&r.hooks.length>0),e.hooks.SessionStart.length===0&&delete e.hooks.SessionStart,Object.keys(e.hooks).length===0&&delete e.hooks,o&&g(e),o}function W(){let e;try{e=p()}catch(r){return console.error(`\u26A0 Could not parse ${S()}: ${r.message}. Skipping audit hook registration.`),!1}return e.hooks??={},e.hooks.UserPromptSubmit??=[],e.hooks.UserPromptSubmit.some(r=>Array.isArray(r?.hooks)&&r.hooks.some(t=>t?.type==="command"&&t?.command===u))?!1:(e.hooks.UserPromptSubmit.push({matcher:"*",hooks:[{type:"command",command:u}]}),g(e),!0)}function V(){let e;try{e=p()}catch{return!1}if(!e?.hooks?.UserPromptSubmit)return!1;let o=!1;return e.hooks.UserPromptSubmit=e.hooks.UserPromptSubmit.map(r=>{if(!Array.isArray(r?.hooks))return r;const t=r.hooks.filter(s=>!(s?.type==="command"&&s?.command===u));return t.length!==r.hooks.length?(o=!0,{...r,hooks:t}):r}).filter(r=>Array.isArray(r?.hooks)&&r.hooks.length>0),e.hooks.UserPromptSubmit.length===0&&delete e.hooks.UserPromptSubmit,Object.keys(e.hooks).length===0&&delete e.hooks,o&&g(e),o}function Q(e=j){try{if(!n.existsSync(e))return!1;const o=n.readFileSync(e,"utf-8");if(!o.trim())return!1;const r=JSON.parse(o);if(!r||typeof r!="object")return!1;const t=r.mcpServers;return!t||typeof t!="object"||Array.isArray(t)?!1:M in t}catch{return!1}}function q(e=H){try{if(!n.existsSync(e))return!1;const o=n.readFileSync(e,"utf-8");return/^\s*\[mcp_servers\.borg\]\s*$/m.test(o)&&/^\s*BORG_CODEX_REMOTE_WAKE\s*=\s*"1"\s*$/m.test(o)}catch{return!1}}function z(){return i.join(U,"index.js")}function Y(){try{try{d("claude mcp remove --scope user borg",{stdio:"ignore"})}catch{}d("claude mcp add --scope user borg borg-mcp",{stdio:"inherit",env:{...process.env,BORG_API_URL:process.env.BORG_API_URL||"https://api.borgmcp.ai"}})}catch(e){throw e.message?.includes("command not found")?new Error("Claude CLI not found. Please install Claude Code first."):new Error(`Failed to add MCP server: ${e.message}`)}}function Z(){try{try{d("codex mcp remove borg",{stdio:"ignore"})}catch{}d("codex mcp add borg --env BORG_API_URL="+_(process.env.BORG_API_URL||"https://api.borgmcp.ai")+" --env BORG_CODEX_REMOTE_WAKE=1 -- borg-mcp",{stdio:"inherit",env:{...process.env,BORG_API_URL:process.env.BORG_API_URL||"https://api.borgmcp.ai",BORG_CODEX_REMOTE_WAKE:"1"}})}catch(e){throw e.message?.includes("command not found")?new Error("Codex CLI not found. Please install Codex first."):new Error(`Failed to add MCP server to Codex: ${e.message}`)}}function _(e){return`'${e.replace(/'/g,"'\\''")}'`}function C(e,o,r={}){let t;try{t=k(m)}catch(l){return console.error(`\u26A0 Could not parse ${m}: ${l.message}. Skipping Codex hook registration.`),!1}t.hooks??={},t.hooks[e]??=[];const s=t.hooks[e];if(!Array.isArray(s)||s.some(l=>Array.isArray(l?.hooks)&&l.hooks.some(A=>A?.type==="command"&&A?.command===o)))return!1;const c={hooks:[{type:"command",command:o}]};return r.matcher&&(c.matcher=r.matcher),typeof r.timeout=="number"&&(c.hooks[0].timeout=r.timeout),s.push(c),O(m,t),!0}function ee(){return C("SessionStart",a,{matcher:"startup|resume",timeout:30})}function re(){return C("UserPromptSubmit",u,{timeout:10})}function b(e,o,r=m){try{const s=k(r)?.hooks?.[e];return Array.isArray(s)?s.some(y=>Array.isArray(y?.hooks)&&y.hooks.some(c=>c?.type==="command"&&c?.command===o)):!1}catch{return!1}}function oe(e=m){return b("SessionStart",a,e)}function te(e=m){return b("UserPromptSubmit",u,e)}function se(e=h){try{if(!n.existsSync(e))return!1;const o=n.readFileSync(e,"utf-8");if(!o.trim())return!1;const r=JSON.parse(o);if(!r||typeof r!="object")return!1;const t=r.mcp?.borg;return!t||typeof t!="object"?!1:t.type==="local"}catch{return!1}}function ne(){try{const e=process.env.BORG_API_URL||"https://api.borgmcp.ai";d(`opencode mcp add borg --env BORG_SESSION=1 --env BORG_OPENCODE=1 --env BORG_API_URL=${_(e)} -- borg-mcp`,{stdio:"inherit"})}catch(e){throw e.message?.includes("command not found")?new Error("opencode CLI not found. Please install opencode first."):new Error(`Failed to add MCP server to opencode: ${e.message}`)}}function ie(e){try{if(!n.existsSync(h))return;const o=n.readFileSync(h,"utf-8");if(!o.trim())return;const r=JSON.parse(o);if(!r||typeof r!="object")return;const t=r.mcp?.borg;if(!t||typeof t!="object")return;t.env=t.env||{},t.env.OPENCODE_SERVER_URL=`http://127.0.0.1:${e}`,n.writeFileSync(h,JSON.stringify(r,null,2)+`
|
|
4
|
+
`,"utf-8")}catch{}}export{Z as addCodexMcpServer,ee as addCodexSessionStartHook,re as addCodexUserPromptSubmitHook,Y as addMcpServer,ne as addOpenCodeMcpServer,D as addProjectSessionStartHook,$ as addSessionStartHook,W as addUserPromptSubmitHook,ie as ensureOpenCodeServerEnvConfig,z as getBinaryPath,b as isCodexHookRegistered,q as isCodexMcpServerConfigured,oe as isCodexSessionStartHookRegistered,te as isCodexUserPromptSubmitHookRegistered,Q as isMcpServerConfigured,se as isOpenCodeMcpServerConfigured,J as isProjectSessionStartHookRegistered,T as isSessionStartHookRegistered,K as isUserPromptSubmitHookRegistered,X as removeSessionStartHook,V as removeUserPromptSubmitHook};
|
package/dist/cubes.d.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* to know which worker to talk to.
|
|
17
17
|
*/
|
|
18
18
|
import { writeFile, unlink, rename } from 'node:fs/promises';
|
|
19
|
-
export type BorgCli = 'claude' | 'codex';
|
|
19
|
+
export type BorgCli = 'claude' | 'codex' | 'opencode';
|
|
20
20
|
export interface ActiveCube {
|
|
21
21
|
cubeId: string;
|
|
22
22
|
droneId: string;
|
package/dist/health-beat.d.ts
CHANGED
|
@@ -48,7 +48,7 @@ export interface HealthPayload {
|
|
|
48
48
|
* frozen at first-join. Beating it self-heals the column via recordDroneHealth
|
|
49
49
|
* COALESCE — same always-running-child self-heal pattern as wake_armed.
|
|
50
50
|
*/
|
|
51
|
-
agent_kind: 'claude' | 'codex';
|
|
51
|
+
agent_kind: 'claude' | 'codex' | 'opencode';
|
|
52
52
|
/**
|
|
53
53
|
* gh#408: live runtime hostname. Assimilate captures hostname only at first
|
|
54
54
|
* join; the beat carries the relaunched process's current machine name so
|
|
@@ -86,7 +86,7 @@ export declare function __resetHealthBeatStateForTest(): void;
|
|
|
86
86
|
* the design's false-deaf-avoidance posture — an undeterminable probe must not
|
|
87
87
|
* masquerade as a dead Monitor.
|
|
88
88
|
*/
|
|
89
|
-
export declare function buildHealthPayload(sseConnected: boolean, inboxMonitorHealthy: boolean | null, wakeArmed: boolean | null, agentKind: 'claude' | 'codex', hostname: string | null, version: string): HealthPayload;
|
|
89
|
+
export declare function buildHealthPayload(sseConnected: boolean, inboxMonitorHealthy: boolean | null, wakeArmed: boolean | null, agentKind: 'claude' | 'codex' | 'opencode', hostname: string | null, version: string): HealthPayload;
|
|
90
90
|
export interface BeatTransport {
|
|
91
91
|
fetchImpl: typeof fetch;
|
|
92
92
|
getToken: () => Promise<string>;
|
|
@@ -102,7 +102,7 @@ export declare function emitHealthBeat(active: HealthBeatActive, opts: {
|
|
|
102
102
|
sseConnected: boolean;
|
|
103
103
|
inboxMonitorHealthy: boolean | null;
|
|
104
104
|
wakeArmed: boolean | null;
|
|
105
|
-
agentKind: 'claude' | 'codex';
|
|
105
|
+
agentKind: 'claude' | 'codex' | 'opencode';
|
|
106
106
|
hostname: string | null;
|
|
107
107
|
version: string;
|
|
108
108
|
} & BeatTransport): Promise<void>;
|
|
@@ -113,7 +113,8 @@ export interface HealthBeatTickDeps extends BeatTransport {
|
|
|
113
113
|
checkMonitor: (inboxPath: string | null) => boolean | null;
|
|
114
114
|
isCodexRemoteWake: () => boolean;
|
|
115
115
|
probeBridgeArmed: (active: HealthBeatActive) => Promise<boolean | null>;
|
|
116
|
-
|
|
116
|
+
probeOpenCodeDrone?: (active: HealthBeatActive) => Promise<boolean | null>;
|
|
117
|
+
resolveAgentKind: () => 'claude' | 'codex' | 'opencode';
|
|
117
118
|
resolveHostname: () => string | null;
|
|
118
119
|
resolveVersion: () => string;
|
|
119
120
|
}
|
package/dist/health-beat.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
let a=null,i=null,l=null;function x(e=new Date){a=e}function y(){return a}function k(){return i}function v(){return l}function A(){a=null,i=null,l=null}function u(e,t,n,o,r,c){return{sse_connected:e,inbox_monitor_armed:t!==!1,wake_armed:n!==!1,agent_kind:o,hostname:r,version:c,last_event_at:a?a.toISOString():null}}async function d(e,t,n){try{const o=await n.getToken();await n.fetchImpl(`${e.apiUrl}/api/drone/health`,{method:"POST",headers:{Authorization:`Bearer ${o}`,"X-Drone-Session":e.sessionToken,"Content-Type":"application/json"},body:JSON.stringify(t)})}catch{}}async function f(e,t){const n=u(t.sseConnected,t.inboxMonitorHealthy,t.wakeArmed,t.agentKind,t.hostname,t.version);await d(e,n,t)}async function m(e){try{const t=await e.getActiveCube();if(!t)return;const n=e.getStreamConnected(),o=e.checkMonitor(e.getInboxPath(t));i=o;const r=e.isCodexRemoteWake()?await e.probeBridgeArmed(t):o;l=
|
|
1
|
+
let a=null,i=null,l=null;function x(e=new Date){a=e}function y(){return a}function k(){return i}function v(){return l}function A(){a=null,i=null,l=null}function u(e,t,n,o,r,c){return{sse_connected:e,inbox_monitor_armed:t!==!1,wake_armed:n!==!1,agent_kind:o,hostname:r,version:c,last_event_at:a?a.toISOString():null}}async function d(e,t,n){try{const o=await n.getToken();await n.fetchImpl(`${e.apiUrl}/api/drone/health`,{method:"POST",headers:{Authorization:`Bearer ${o}`,"X-Drone-Session":e.sessionToken,"Content-Type":"application/json"},body:JSON.stringify(t)})}catch{}}async function f(e,t){const n=u(t.sseConnected,t.inboxMonitorHealthy,t.wakeArmed,t.agentKind,t.hostname,t.version);await d(e,n,t)}async function m(e){try{const t=await e.getActiveCube();if(!t)return;const n=e.getStreamConnected(),o=e.checkMonitor(e.getInboxPath(t));i=o;const r=e.resolveAgentKind(),c=r==="opencode"?await e.probeOpenCodeDrone?.(t)??null:e.isCodexRemoteWake()?await e.probeBridgeArmed(t):o;l=c;const h=e.resolveHostname(),s=e.resolveVersion();await f(t,{sseConnected:n,inboxMonitorHealthy:o,wakeArmed:c,agentKind:r,hostname:h,version:s,fetchImpl:e.fetchImpl,getToken:e.getToken})}catch{}}const g=6e4;function H(e,t=g){const n=setInterval(()=>{m(e)},t);return n.unref?.(),n}export{g as HEALTH_BEAT_INTERVAL_MS,A as __resetHealthBeatStateForTest,u as buildHealthPayload,f as emitHealthBeat,k as getCachedMonitorHealthy,v as getCachedWakeArmed,y as getLastEventReceivedAt,d as postHealthBeat,x as recordEventReceipt,m as runHealthBeatOnce,H as startHealthBeatTick};
|