@oxgeneral/orch 0.2.3 → 0.3.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.
- package/dist/App-TW35IULR.js +18 -0
- package/dist/agent-FRQKL7YI.js +9 -0
- package/dist/{orchestrator-VGYKSOZJ.js → chunk-2UC4SVJB.js} +236 -71
- package/dist/chunk-2UC4SVJB.js.map +1 -0
- package/dist/chunk-5AJ4LYO5.js +8 -0
- package/dist/{chunk-45K2XID7.js → chunk-6DWHQPTE.js} +2 -1
- package/dist/chunk-6DWHQPTE.js.map +1 -0
- package/dist/{chunk-POUC4CPC.js → chunk-6MJ7V6VY.js} +2 -2
- package/dist/{chunk-HNKJ4IF7.js → chunk-B4JQM4NU.js} +34 -10
- package/dist/chunk-B4JQM4NU.js.map +1 -0
- package/dist/{chunk-6HENRUYZ.js → chunk-CDFA4IIQ.js} +2 -2
- package/dist/chunk-CHRW4CLD.js +2 -0
- package/dist/{chunk-ZU6AY2VU.js → chunk-GZ2Q56YZ.js} +2 -2
- package/dist/chunk-HMMPM7MF.js +3 -0
- package/dist/{chunk-AELEEEV3.js → chunk-HSBYJ5C5.js} +27 -7
- package/dist/chunk-HXOMNULD.js +2 -0
- package/dist/{chunk-O5AO5QIR.js → chunk-IQXRQBUK.js} +9 -2
- package/dist/chunk-IQXRQBUK.js.map +1 -0
- package/dist/chunk-L26TK7Y5.js +2 -0
- package/dist/chunk-L3FYR45M.js +2 -0
- package/dist/chunk-LXNRCJ22.js +2 -0
- package/dist/{chunk-TX7WOFCW.js → chunk-MGFMVPRD.js} +4 -7
- package/dist/chunk-MGFMVPRD.js.map +1 -0
- package/dist/chunk-MNXU3KCD.js +2 -0
- package/dist/{chunk-CHIP7O6V.js → chunk-O2MSGW3V.js} +3 -1
- package/dist/chunk-O2MSGW3V.js.map +1 -0
- package/dist/chunk-PJ5DKXGR.js +2 -0
- package/dist/{chunk-VTA74YWX.js → chunk-QEEM67OA.js} +11 -17
- package/dist/chunk-QEEM67OA.js.map +1 -0
- package/dist/chunk-UMZEA3JT.js +5 -0
- package/dist/{shell-OGTSH4RJ.js → chunk-UW6GUUE6.js} +3 -3
- package/dist/chunk-XDVMX2FO.js +8 -0
- package/dist/chunk-XDVMX2FO.js.map +1 -0
- package/dist/chunk-ZA5Z33GO.js +11 -0
- package/dist/claude-E36EGXUV.js +2 -0
- package/dist/{chunk-IRN2U2NE.js → claude-RIB3RQS5.js} +5 -2
- package/dist/claude-RIB3RQS5.js.map +1 -0
- package/dist/cli.js +1 -199
- package/dist/clipboard-service-PDTSZIR5.js +25 -0
- package/dist/codex-OTZKVESD.js +2 -0
- package/dist/{codex-U7LTJTX6.js → codex-VBUSA2GJ.js} +5 -3
- package/dist/codex-VBUSA2GJ.js.map +1 -0
- package/dist/config-CCSS2P7R.js +2 -0
- package/dist/container-OIXLFSX2.js +6 -0
- package/dist/context-GSMQHQES.js +7 -0
- package/dist/cursor-3DJA6LWS.js +2 -0
- package/dist/{cursor-3DI5GKRF.js → cursor-4QIOTDBW.js} +5 -3
- package/dist/cursor-4QIOTDBW.js.map +1 -0
- package/dist/doctor-KBK5JZBZ.js +2 -0
- package/dist/doctor-service-F2SXDWHS.js +91 -0
- package/dist/doctor-service-F2SXDWHS.js.map +1 -0
- package/dist/doctor-service-PB7YBH3F.js +2 -0
- package/dist/goal-RFKFPR7M.js +8 -0
- package/dist/index.d.ts +124 -46
- package/dist/index.js +1817 -5
- package/dist/index.js.map +1 -1
- package/dist/init-WRDFAFS2.js +53 -0
- package/dist/logs-5QHJWMEG.js +12 -0
- package/dist/msg-4SCLBO4K.js +9 -0
- package/dist/orchestrator-FGGXK3N3.js +5 -0
- package/dist/{orchestrator-TAFBYQQ5.js.map → orchestrator-FGGXK3N3.js.map} +1 -1
- package/dist/orchestrator-R7IWZUT6.js +13 -0
- package/dist/process-manager-33H27MQF.js +2 -0
- package/dist/process-manager-A36Y7LHP.js +3 -0
- package/dist/{process-manager-TLZOTO4Y.js.map → process-manager-A36Y7LHP.js.map} +1 -1
- package/dist/registry-BO2PPRNG.js +2 -0
- package/dist/registry-JXXRLJ5J.js +3 -0
- package/dist/{registry-UQAHK77P.js.map → registry-JXXRLJ5J.js.map} +1 -1
- package/dist/run-HSHRELOP.js +3 -0
- package/dist/shell-EOJBDWTH.js +2 -0
- package/dist/{chunk-CIIE6LNG.js → shell-IH2MMTVP.js} +3 -2
- package/dist/shell-IH2MMTVP.js.map +1 -0
- package/dist/status-DLBNWSWM.js +2 -0
- package/dist/task-J6ZN7ALI.js +20 -0
- package/dist/team-MSIBKOQC.js +4 -0
- package/dist/template-engine-MFL5B677.js +3 -0
- package/dist/{template-engine-322SCRR6.js.map → template-engine-MFL5B677.js.map} +1 -1
- package/dist/template-engine-ONIDVD4F.js +2 -0
- package/dist/tui-G4XUFAIP.js +2 -0
- package/dist/update-PC2ENCKU.js +2 -0
- package/dist/update-check-HGMBDYHL.js +2 -0
- package/dist/workspace-manager-KOOYTO7E.js +3 -0
- package/dist/{workspace-manager-47KI7B27.js → workspace-manager-T6AXG7XL.js} +40 -3
- package/dist/workspace-manager-T6AXG7XL.js.map +1 -0
- package/package.json +2 -1
- package/readme.md +5 -4
- package/scripts/benchmark.ts +304 -0
- package/dist/App-KDZSTAMR.js +0 -4864
- package/dist/agent-V5M2C3OC.js +0 -157
- package/dist/chunk-2B32FPEB.js +0 -11
- package/dist/chunk-2B32FPEB.js.map +0 -1
- package/dist/chunk-33QNTNR6.js +0 -46
- package/dist/chunk-6GFVB6EK.js +0 -101
- package/dist/chunk-6HENRUYZ.js.map +0 -1
- package/dist/chunk-AELEEEV3.js.map +0 -1
- package/dist/chunk-E3TCKHU6.js +0 -13
- package/dist/chunk-E3TCKHU6.js.map +0 -1
- package/dist/chunk-ED47GL3F.js +0 -29
- package/dist/chunk-HXYAZGLP.js +0 -15
- package/dist/chunk-I5WEMARW.js +0 -166
- package/dist/chunk-IZYSGYXG.js +0 -2
- package/dist/chunk-IZYSGYXG.js.map +0 -1
- package/dist/chunk-P6ATSXGL.js +0 -107
- package/dist/chunk-PBFE5V3G.js +0 -2
- package/dist/chunk-PBFE5V3G.js.map +0 -1
- package/dist/chunk-PNE6LQRF.js +0 -5
- package/dist/chunk-POUC4CPC.js.map +0 -1
- package/dist/chunk-XI4TU6VU.js +0 -50
- package/dist/chunk-ZU6AY2VU.js.map +0 -1
- package/dist/claude-GH6P2DC5.js +0 -4
- package/dist/claude-S47YTIHU.js +0 -2
- package/dist/claude-S47YTIHU.js.map +0 -1
- package/dist/codex-2CH57B7G.js +0 -2
- package/dist/codex-2CH57B7G.js.map +0 -1
- package/dist/config-LJFM55LN.js +0 -75
- package/dist/container-JV7TAUP5.js +0 -1532
- package/dist/context-EPSDCJTU.js +0 -83
- package/dist/cursor-QFUNKPCQ.js +0 -2
- package/dist/cursor-QFUNKPCQ.js.map +0 -1
- package/dist/doctor-IO4PV4D6.js +0 -67
- package/dist/doctor-service-A34DHPKI.js +0 -2
- package/dist/doctor-service-NTWBWOM2.js +0 -2
- package/dist/doctor-service-NTWBWOM2.js.map +0 -1
- package/dist/goal-I56QP7HS.js +0 -110
- package/dist/init-BE5VKWOM.js +0 -149
- package/dist/logs-IAUAS5TX.js +0 -207
- package/dist/msg-SQWQLJP6.js +0 -95
- package/dist/orchestrator-TAFBYQQ5.js +0 -2
- package/dist/process-manager-HUVNAPQV.js +0 -2
- package/dist/process-manager-TLZOTO4Y.js +0 -2
- package/dist/registry-PQWRVNF2.js +0 -2
- package/dist/registry-UQAHK77P.js +0 -2
- package/dist/run-PSZURVVL.js +0 -95
- package/dist/shell-5ZNXFGXV.js +0 -3
- package/dist/shell-OGTSH4RJ.js.map +0 -1
- package/dist/status-DTF7D3DV.js +0 -56
- package/dist/task-5OJTXW27.js +0 -209
- package/dist/team-AISPLEJB.js +0 -97
- package/dist/template-engine-322SCRR6.js +0 -2
- package/dist/template-engine-3CDRZNMJ.js +0 -3
- package/dist/tui-XDJE3IUA.js +0 -225
- package/dist/update-72GZMF65.js +0 -64
- package/dist/update-check-4RV7Z6WT.js +0 -2
- package/dist/workspace-manager-7M46ESUL.js +0 -2
- package/dist/workspace-manager-7M46ESUL.js.map +0 -1
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {c as c$1}from'./chunk-HSBYJ5C5.js';import {a}from'./chunk-PJ5DKXGR.js';import'./chunk-CHRW4CLD.js';import {k,j as j$1,q}from'./chunk-L26TK7Y5.js';import {l,j,i,c,a as a$1}from'./chunk-ZA5Z33GO.js';import'./chunk-GZ2Q56YZ.js';import A from'path';import k$1 from'fs/promises';var _=`Agent architect \u2014 designs and creates AI agents for the orchestrator via \`orch agent add\`.
|
|
3
|
+
|
|
4
|
+
## CREATION PROCESS
|
|
5
|
+
|
|
6
|
+
1) ANALYZE \u2014 determine: agent function, required skills, adapter, team interactions.
|
|
7
|
+
|
|
8
|
+
2) WRITE THE ROLE \u2014 this is the most important part. A good role includes:
|
|
9
|
+
- Identity and specialization (who you are)
|
|
10
|
+
- Concrete workflow (numbered steps)
|
|
11
|
+
- Which skills to invoke (\`/skill-name\`)
|
|
12
|
+
- Rules and constraints
|
|
13
|
+
Do NOT include CLI documentation or goal-mode instructions \u2014 these are already injected by the system prompt template.
|
|
14
|
+
|
|
15
|
+
3) CHOOSE CONFIGURATION:
|
|
16
|
+
- adapter: \`claude\` (AI tasks), \`shell\` (bash scripts), \`codex\` (OpenAI Codex), \`cursor\` (Cursor IDE)
|
|
17
|
+
- model: \`claude-opus-4-6\` (complex/architectural), \`claude-sonnet-4-6\` (fast/routine), \`claude-haiku-4-5-20251001\` (simple/templated)
|
|
18
|
+
- approval_policy: \`auto\` (no confirmation) / \`suggest\` (proposes actions) / \`manual\` (human approval)
|
|
19
|
+
- max_turns: 50 (default), up to 100 for complex tasks
|
|
20
|
+
|
|
21
|
+
4) CREATE:
|
|
22
|
+
\`orch agent add "<name>" --adapter claude --model <model> --skills "<skills>" --role "<role>" --approval-policy auto\`
|
|
23
|
+
|
|
24
|
+
## AVAILABLE SKILLS
|
|
25
|
+
|
|
26
|
+
Development: feature-dev:feature-dev, feature-dev:code-explorer, feature-dev:code-architect, feature-dev:code-reviewer, simplify, claude-api
|
|
27
|
+
Testing: testing-suite:generate-tests, testing-suite:test-coverage, testing-suite:e2e-setup, testing-suite:test-quality-analyzer
|
|
28
|
+
Frontend: frontend-design, document-skills:frontend-design
|
|
29
|
+
Documents: pdf, xlsx, docx, pptx
|
|
30
|
+
Marketing: marketing-psychology, product-manager-toolkit
|
|
31
|
+
|
|
32
|
+
## ANTI-PATTERNS
|
|
33
|
+
|
|
34
|
+
- Never create agents without skills \u2014 they cannot be auto-matched to tasks.
|
|
35
|
+
- Never write generic roles like "helper" \u2014 be specific about actions and tools.
|
|
36
|
+
- Never use opus for simple tasks \u2014 it is expensive; use sonnet or haiku.
|
|
37
|
+
- Never assign more than 3-4 skills per agent \u2014 create specialized agents instead.
|
|
38
|
+
- Never use the -e/--edit flag in automated mode \u2014 it opens an interactive editor.
|
|
39
|
+
- Always specify --role when calling \`orch agent add\`.
|
|
40
|
+
|
|
41
|
+
After creation \u2014 \`orch context set agent-<name> "<capabilities>"\`.`;function y(){return [{id:"agt_creator",name:"Agent Creator",adapter:"claude",role:_,config:{model:"claude-sonnet-4-6",approval_policy:"suggest",max_turns:50,timeout_ms:36e5,stall_timeout_ms:3e5,skills:["document-skills:skill-creator"]},status:"idle",stats:{tasks_completed:0,tasks_failed:0,total_runs:0,total_runtime_ms:0}}]}async function w(a$2={}){let o=process.cwd(),e=new l(o);if(await j(e.root)){k("Already initialized");return}await Promise.all([i(e.tasksDir),i(e.agentsDir),i(e.goalsDir),i(e.runsDir),i(e.templatesDir),i(e.logsDir)]);let i$1={...a};i$1.project.name=a$2.name??A.basename(o);let l$1=["# Runtime state","state.json","*.lock","","# Logs and runs","runs/","logs/","","# Agent workspaces","workspaces/"].join(`
|
|
42
|
+
`)+`
|
|
43
|
+
`,v=[".orchestry","node_modules",".env",".env.*","dist","build",".next","__pycache__","*.pyc",".venv"].join(`
|
|
44
|
+
`)+`
|
|
45
|
+
`,d=y();await Promise.all([c(e.configPath,i$1),a$1(e.gitignorePath,l$1),a$1(e.workspaceExcludePath,v),a$1(e.defaultTemplatePath(),c$1),...d.map(s=>c(e.agentPath(s.id),s))]),await x(o),console.log(),j$1("initialized"),console.log(),console.log(` Created ${q(".orchestry/")}`),console.log(` ${q("\u251C\u2500\u2500")} config.yml`),console.log(` ${q("\u251C\u2500\u2500")} tasks/`),console.log(` ${q("\u251C\u2500\u2500")} agents/`);for(let s of d)console.log(` ${q("\u2502 \u2514\u2500\u2500")} ${s.id}.yml ${q(`(${s.name})`)}`);console.log(` ${q("\u251C\u2500\u2500")} templates/default.md`),console.log(` ${q("\u2514\u2500\u2500")} .gitignore`),console.log();}async function x(a){let o=A.join(a,".gitignore");try{let e=await k$1.readFile(o,"utf-8");if(e.split(`
|
|
46
|
+
`).some(l=>l.trim()===".orchestry"))return;let i=e.endsWith(`
|
|
47
|
+
`)?"":`
|
|
48
|
+
`;await k$1.appendFile(o,`${i}
|
|
49
|
+
# Orchestry state
|
|
50
|
+
.orchestry
|
|
51
|
+
`);}catch{await a$1(o,`# Orchestry state
|
|
52
|
+
.orchestry
|
|
53
|
+
`);}}function $(a){a.command("init").description("Initialize .orchestry/ in the current directory").option("--name <name>","Project name").action(async o=>{await w(o),console.log(` Next: ${q('orch task add "Create backend agent" --assignee agt_creator')}`),console.log();});}export{$ as registerInitCommand,w as runInit};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {i,q,c}from'./chunk-L26TK7Y5.js';import {c as c$1}from'./chunk-GZ2Q56YZ.js';function k(o,e){o.command("logs [run-id]").description("View run logs").option("--agent <agent-id>","Filter by agent").option("--task <task-id>","Filter by task").option("--follow","Live stream").option("--since <duration>","Filter by time (e.g. 5m, 1h)").action(async(s,n)=>{await e.paths.requireInit();let i$1=n.since?I(n.since):void 0;n.follow?await v(e,{runId:s,taskId:n.task,agentId:n.agent}):s?await h(e,s,i$1):n.task?await w(e,n.task,i$1):n.agent?await p(e,n.agent,i$1):(i("Specify a run ID, --task, or --agent"),process.exit(2));});}function u(o){let e=new Date(o.timestamp).toLocaleTimeString("en-US",{hour12:false,hour:"2-digit",minute:"2-digit",second:"2-digit"}),s=o.type==="error"?c("failed"):c("agentAction"),n=typeof o.data=="string"?o.data:JSON.stringify(o.data);return ` ${q(e)} ${s} ${n.slice(0,80)}`}function f(o,e){if(!e)return o;let s=Date.now()-e;return o.filter(n=>new Date(n.timestamp).getTime()>=s)}async function h(o,e,s){let n=s?f(await o.runService.readEventsTail(e,500),s):await o.runService.readEventsTail(e,50);if(o.context.json){console.log(JSON.stringify(n,null,2));return}if(n.length===0){console.log(`
|
|
3
|
+
No events for run ${e}
|
|
4
|
+
`);return}console.log();for(let i of n)console.log(u(i));console.log();}async function w(o,e,s){let n=await o.runService.listForTask(e);if(o.context.json){console.log(JSON.stringify(n,null,2));return}if(n.length===0){console.log(`
|
|
5
|
+
No runs for task ${e}
|
|
6
|
+
`);return}let i=s?n.slice(-20):n,g=await Promise.all(i.map(t=>s?o.runService.readEventsTail(t.id,500).then(r=>f(r,s)):o.runService.readEventsTail(t.id,10)));for(let t=0;t<i.length;t++){let r=i[t],l=g[t];console.log(`
|
|
7
|
+
Run ${r.id} \xB7 attempt ${r.attempt} \xB7 ${r.status}`);for(let d of l.slice(-10))console.log(u(d));}console.log();}async function p(o,e,s){let n=await o.runService.listForAgent(e);if(o.context.json){console.log(JSON.stringify(n,null,2));return}if(n.length===0){console.log(`
|
|
8
|
+
No runs for agent ${e}
|
|
9
|
+
`);return}let i=n.slice(-5),g=await Promise.all(i.map(t=>s?o.runService.readEventsTail(t.id,500).then(r=>f(r,s)):o.runService.readEventsTail(t.id,5)));for(let t=0;t<i.length;t++){let r=i[t],l=g[t];console.log(`
|
|
10
|
+
Run ${r.id} \xB7 task ${r.task_id} \xB7 ${r.status}`);for(let d of l.slice(-5))console.log(u(d));}console.log();}async function v(o,e){let s=new Set,n=new Set;if(e.runId&&s.add(e.runId),e.taskId){let t=await o.runService.listForTask(e.taskId);for(let r of t)s.add(r.id);}e.agentId&&n.add(e.agentId);let i=s.size>0||n.size>0;console.log(`
|
|
11
|
+
${q("Following live events...")} ${q("(Ctrl+C to stop)")}
|
|
12
|
+
`);let g=o.eventBus.onAny(t=>{let r=new Date().toLocaleTimeString("en-US",{hour12:false,hour:"2-digit",minute:"2-digit",second:"2-digit"});if(i){if("runId"in t&&s.size>0&&!s.has(t.runId))return;if("agentId"in t&&n.size>0){let l=t;if(!n.has(l.agentId))return}}switch(t.type){case "agent:output":{let l=typeof t.data=="string"?t.data.slice(0,80):"";console.log(` ${q(r)} ${c("agentAction")} ${l}`);break}case "agent:file_changed":console.log(` ${q(r)} ${c("agentAction")} Modified ${t.path}`);break;case "agent:error":console.log(` ${q(r)} ${c("failed")} ${t.error}`);break;case "agent:started":console.log(` ${q(r)} ${c("orchestratorEvent")} Started ${t.runId} (agent: ${t.agentId})`);break;case "agent:completed":t.success?console.log(` ${q(r)} ${c("done")} DONE ${t.runId}`):console.log(` ${q(r)} ${c("failed")} FAIL ${t.runId}`);break;case "run:retry":console.log(` ${q(r)} ${c("retrying")} RETRY attempt ${t.attempt} \xB7 next in ${Math.round(t.delay_ms/1e3)}s`);break;case "orchestrator:stall_detected":console.log(` ${q(r)} ${c("warning")} STALL ${t.runId}`);break}});await new Promise(t=>{let r=()=>{g(),t();};process.once("SIGINT",r),process.once("SIGTERM",r);});}function I(o){let e=o.match(/^(\d+)(s|m|h|d)$/);if(!e)throw new c$1(`Invalid duration: "${o}". Use format: 5m, 1h, 30s, 1d`);let s=parseInt(e[1],10);switch(e[2]){case "s":return s*1e3;case "m":return s*6e4;case "h":return s*36e5;case "d":return s*864e5;default:return s*6e4}}export{k as registerLogsCommand};
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {j,q,g,l}from'./chunk-L26TK7Y5.js';function f(m,s){let a=m.command("msg").description("Inter-agent messaging");a.command("send <to-agent-id> <body>").description("Send a direct message to an agent").option("-s, --subject <subject>","Message subject").option("--from <agent-id>","Sender agent ID (default: cli)").option("--ttl <ms>","TTL in milliseconds").option("--reply-to <msg-id>","Reply to a message").action(async(n,e,t)=>{await s.paths.requireInit();let o=await s.messageService.send({channel:"direct",from_agent_id:t.from??"cli",to_agent_id:n,subject:t.subject??"",body:e,ttl_ms:t.ttl?parseInt(t.ttl,10):void 0,reply_to:t.replyTo});s.context.json?console.log(JSON.stringify(o,null,2)):s.context.quiet?console.log(o[0]?.id):j(`Message sent: ${o[0]?.id} \u2192 ${n}`);}),a.command("broadcast <body>").description("Broadcast a message to all agents (or team members)").option("-s, --subject <subject>","Message subject").option("--from <agent-id>","Sender agent ID (default: cli)").option("--team <team-id>","Limit broadcast to team members").option("--ttl <ms>","TTL in milliseconds").action(async(n,e)=>{await s.paths.requireInit();let t=await s.messageService.send({channel:"broadcast",from_agent_id:e.from??"cli",subject:e.subject??"",body:n,ttl_ms:e.ttl?parseInt(e.ttl,10):void 0,team_id:e.team});s.context.json?console.log(JSON.stringify(t,null,2)):s.context.quiet?console.log(t.map(o=>o.id).join(`
|
|
3
|
+
`)):j(`Broadcast sent to ${t.length} agent(s)`);}),a.command("inbox <agent-id>").description("Show pending messages for an agent").action(async n=>{await s.paths.requireInit();let e=await s.messageService.listPendingForAgent(n);if(s.context.json){console.log(JSON.stringify(e,null,2));return}if(e.length===0){console.log(q(`
|
|
4
|
+
No pending messages.
|
|
5
|
+
`));return}console.log();for(let t of e)console.log(` ${q(t.id)} from ${t.from_agent_id}${t.subject?` \u2014 ${t.subject}`:""}`),console.log(` ${t.body}`),console.log();}),a.command("list").description("List all messages").option("--agent <agent-id>","Filter by agent (sent or received)").action(async n=>{await s.paths.requireInit();let e;if(n.agent?e=await s.messageService.listForAgent(n.agent):e=await s.messageService.listAll(),s.context.json){console.log(JSON.stringify(e,null,2));return}if(e.length===0){console.log(q(`
|
|
6
|
+
No messages.
|
|
7
|
+
`));return}let t=["ID","FROM","TO","CHANNEL","STATUS","SENT"],o=e.map(i=>[i.id,i.from_agent_id,i.to_agent_id??"*",i.channel,i.status,g(i.created_at)]);console.log(),l(t,o),console.log(`
|
|
8
|
+
${e.length} message(s)
|
|
9
|
+
`);});}export{f as registerMsgCommand};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"names":[],"mappings":"","file":"orchestrator-
|
|
1
|
+
{"version":3,"sources":[],"names":[],"mappings":"","file":"orchestrator-FGGXK3N3.js"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {c as c$1,b as b$2}from'./chunk-HSBYJ5C5.js';import {e,c,b as b$1,d as d$1,f,g}from'./chunk-LXNRCJ22.js';import {a}from'./chunk-CHRW4CLD.js';import {d,l,h,e as e$1}from'./chunk-GZ2Q56YZ.js';import {dirname}from'path';import x from'fs/promises';import {execFile}from'child_process';function V(u,t){if(!u?.length||!t?.length)return false;for(let e of u)for(let s of t)if(nt(e,s))return true;return false}function O(u){let t=u.split("*")[0],e=!t.endsWith("/"),s=e?dirname(t):"";return {raw:u,base:t,isFile:e,dir:s}}var P=class{entries;constructor(t){this.entries=[];for(let e of t)if(e?.length)for(let s of e)this.entries.push(O(s));}overlapsAny(t){if(!t?.length||this.entries.length===0)return false;for(let e of t){let s=O(e);for(let i of this.entries)if(rt(s,i))return true}return false}add(t){if(t?.length)for(let e of t)this.entries.push(O(e));}get size(){return this.entries.length}};function rt(u,t){return u.raw===t.raw||u.base.startsWith(t.base)||t.base.startsWith(u.base)?true:u.isFile&&t.isFile?u.dir===t.dir&&u.dir!==".":false}function nt(u,t){if(u===t)return true;let e=u.split("*")[0],s=t.split("*")[0];if(e.startsWith(s)||s.startsWith(e))return true;if(!e.endsWith("/")&&!s.endsWith("/")){let i=dirname(e),o=dirname(s);return i===o&&i!=="."}return false}var Y=Promise.resolve();async function j(u){let t,e=new Promise(i=>{t=i;}),s=Y;Y=e,await s;try{return await ot(u)}finally{t();}}async function ot(u){let t=await Z(u);if(t!==null){if(ct(t))return {acquired:false,pid:t};await x.unlink(u).catch(()=>{});}try{let e=await x.open(u,"wx");return await e.writeFile(String(process.pid),"utf-8"),await e.close(),{acquired:!0,pid:process.pid}}catch(e){if(e.code==="EEXIST")return {acquired:false,pid:await Z(u)??void 0};throw e}}async function G(u){await x.unlink(u).catch(()=>{});}async function Z(u){try{let t=await x.readFile(u,"utf-8"),e=parseInt(t.trim(),10);return isNaN(e)?null:e}catch{return null}}function ct(u){try{return process.kill(u,0),!0}catch(t){return t.code==="EPERM"}}var E=class{constructor(t){this.inner=t;}cache=new Map;async list(t){let e=t?`${t.status??""}:${t.goalId??""}`:"__all__";if(this.cache.has(e))return this.cache.get(e);let s=await this.inner.list(t);return this.cache.set(e,s),s}async get(t){return this.inner.get(t)}async save(t){await this.inner.save(t),this.cache.clear();}async delete(t){await this.inner.delete(t),this.cache.clear();}invalidate(){this.cache.clear();}},b=class{constructor(t){this.inner=t;}listCache=null;nameCache=new Map;async list(){if(this.listCache)return this.listCache;let t=await this.inner.list();return this.listCache=t,t}async get(t){return this.inner.get(t)}async getByName(t){if(this.nameCache.has(t))return this.nameCache.get(t)??null;let e=await this.inner.getByName(t);return this.nameCache.set(t,e),e}async save(t){await this.inner.save(t),this.listCache=null,this.nameCache.clear();}async delete(t){await this.inner.delete(t),this.listCache=null,this.nameCache.clear();}invalidate(){this.listCache=null,this.nameCache.clear();}},D=class{constructor(t){this.inner=t;}cache=new Map;async list(t){let e=t?.status??"__all__";if(this.cache.has(e))return this.cache.get(e);let s=await this.inner.list(t);return this.cache.set(e,s),s}async get(t){return this.inner.get(t)}async save(t){await this.inner.save(t),this.cache.clear();}async delete(t){await this.inner.delete(t),this.cache.clear();}invalidate(){this.cache.clear();}};var ut={test_pass:{cmd:"npm",args:["test"]},typecheck:{cmd:"npx",args:["tsc","--noEmit"]},lint:{cmd:"npm",args:["run","lint"]}},k=class{cwd;timeoutMs;constructor(t){this.cwd=t.cwd,this.timeoutMs=t.timeout_ms??12e4;}async runAll(t){let e=[];for(let s of t){let i=await this.runCriterion(s);e.push(i);}return e}static allPassed(t){return t.length>0&&t.every(e=>e.passed)}static formatReport(t){return t.map(s=>{let i=s.passed?"\u2713":"\u2717",o=s.output.slice(0,500);return `${i} ${s.criterion}: ${s.passed?"PASSED":"FAILED"}
|
|
3
|
+
${o}`}).join(`
|
|
4
|
+
|
|
5
|
+
`)}runCriterion(t){let{cmd:e,args:s}=ut[t];return new Promise(i=>{execFile(e,s,{cwd:this.cwd,timeout:this.timeoutMs,maxBuffer:1024*1024},(o,p,c)=>{let l=(p+`
|
|
6
|
+
`+c).trim();i({criterion:t,passed:!o,output:l.slice(0,2e3)});});})}};var dt=8192,ht=4096,tt=class{constructor(t){this.deps=t;this.cachedTaskStore=new E(t.taskStore),this.cachedAgentStore=new b(t.agentStore),this.cachedGoalStore=t.goalStore?new D(t.goalStore):null;}intervalId=null;shuttingDown=false;state=null;abortControllers=new Map;cachedTaskStore;cachedAgentStore;cachedGoalStore;saveStateTimer=null;saveStateDirty=false;lockAcquired=false;consecutiveTickFailures=0;maxConsecutiveTickFailures=5;maxRetryQueueSize=100;signalHandlers=[];immediateDispatchTimer=null;taskCreatedUnsub=null;tickInProgress=false;stateMutex=Promise.resolve();get isOwner(){return this.lockAcquired}withStateLock(t){let e,s=new Promise(o=>{e=o;}),i=this.stateMutex;return this.stateMutex=s,i.then(async()=>{try{return await t()}finally{e();}})}async runTask(t){if(this.lockAcquired){await this.freshDispatch(()=>this.dispatchTask(t));return}await this.withTemporaryLock(()=>this.freshDispatch(()=>this.dispatchTask(t)));}async runAll(){if(this.lockAcquired){await this.freshDispatch(()=>this.dispatchAll());return}await this.withTemporaryLock(()=>this.freshDispatch(()=>this.dispatchAll()));}async freshDispatch(t){await this.withStateLock(async()=>{this.cachedTaskStore.invalidate(),this.cachedAgentStore.invalidate(),await this.loadState(),await t(),await this.saveState();});}async withTemporaryLock(t){let e=await j(this.deps.lockPath);if(!e.acquired)throw new d(e.pid);this.lockAcquired=true;try{await t();}finally{this.lockAcquired=false,await G(this.deps.lockPath);}}async startWatch(){let t=await j(this.deps.lockPath);if(!t.acquired)throw new d(t.pid);this.lockAcquired=true,await this.loadState(),this.state.pid=process.pid,this.state.started_at=new Date().toISOString(),await this.saveState(),this.registerSignalHandlers(),this.taskCreatedUnsub=this.deps.eventBus.on("task:created",()=>{this.scheduleImmediateDispatch();}),await this.tick(),this.intervalId=setInterval(()=>this.tick().then(()=>{this.consecutiveTickFailures=0;},e=>{this.consecutiveTickFailures++;let s=e instanceof Error?e.message:String(e);this.deps.eventBus.emit({type:"orchestrator:error",error:s,context:"tick",fatal:this.consecutiveTickFailures>=this.maxConsecutiveTickFailures}),this.consecutiveTickFailures>=this.maxConsecutiveTickFailures&&(this.deps.eventBus.emit({type:"orchestrator:shutdown",reason:`${this.consecutiveTickFailures} consecutive tick failures`}),this.stop().catch(i=>{this.deps.eventBus.emit({type:"orchestrator:error",error:i instanceof Error?i.message:String(i),context:"stop after consecutive tick failures",fatal:false});}));}),this.deps.config.scheduling.poll_interval_ms);}registerSignalHandlers(){let t=e=>{this.deps.eventBus.emit({type:"orchestrator:shutdown",reason:`Received ${e}`}),this.stop().catch(s=>{this.deps.eventBus.emit({type:"orchestrator:error",error:s instanceof Error?s.message:String(s),context:`stop after ${e} signal`,fatal:false});});};for(let e of ["SIGINT","SIGTERM"]){let s=()=>t(e);this.signalHandlers.push([e,s]),process.on(e,s);}}removeSignalHandlers(){for(let[t,e]of this.signalHandlers)process.removeListener(t,e);this.signalHandlers=[];}async stop(){this.shuttingDown||(this.shuttingDown=true,this.intervalId&&(clearInterval(this.intervalId),this.intervalId=null),this.taskCreatedUnsub&&(this.taskCreatedUnsub(),this.taskCreatedUnsub=null),this.immediateDispatchTimer&&(clearTimeout(this.immediateDispatchTimer),this.immediateDispatchTimer=null),await this.flushStateLazy(),await this.withStateLock(async()=>{if(this.state){for(let[t,e$1]of Object.entries(this.state.running)){this.abortControllers.get(t)?.abort(),this.abortControllers.delete(t),await this.deps.processManager.killWithGrace(e$1.pid),await this.deps.runService.finish(e$1.run_id,"cancelled");let s=await this.deps.taskStore.get(t);s&&await this.deps.taskService.updateStatus(t,e(s)),await this.deps.agentService.setStatus(e$1.agent_id,"idle");}this.state.running={},this.state.claimed=new Set,this.state.pid=void 0,this.state.started_at=void 0,await this.saveState();}}),this.lockAcquired&&(await G(this.deps.lockPath),this.lockAcquired=false),this.removeSignalHandlers());}async cancelTask(t){if(!this.lockAcquired)return this.withTemporaryLock(()=>this.cancelTask(t));await this.withStateLock(async()=>{await this.loadState();let e=this.state,s=e.running[t];s&&(this.abortControllers.get(t)?.abort(),this.abortControllers.delete(t),await this.deps.processManager.killWithGrace(s.pid,3e3).catch(i=>{this.deps.eventBus.emit({type:"orchestrator:error",error:i instanceof Error?i.message:String(i),context:`cancelTask kill process ${s.pid} for task ${t}`,fatal:false});}),await this.deps.runService.finish(s.run_id,"cancelled").catch(i=>{this.deps.eventBus.emit({type:"orchestrator:error",error:i instanceof Error?i.message:String(i),context:`cancelTask finish run ${s.run_id}`,fatal:false});}),await this.deps.agentService.setStatus(s.agent_id,"idle").catch(i=>{this.deps.eventBus.emit({type:"orchestrator:error",error:i instanceof Error?i.message:String(i),context:`cancelTask setStatus idle for agent ${s.agent_id}`,fatal:false});}),delete e.running[t],await this.saveState()),e.retry_queue=e.retry_queue.filter(i=>i.task_id!==t);try{await this.deps.taskService.cancel(t);}catch{try{await this.deps.taskService.updateStatus(t,"cancelled");}catch{}}await this.saveState();});}async forceStopAgent(t){if(!this.lockAcquired)return this.withTemporaryLock(()=>this.forceStopAgent(t));await this.withStateLock(async()=>{await this.loadState();let e=this.state;for(let[s,i]of Object.entries(e.running))if(i.agent_id===t){this.abortControllers.get(s)?.abort(),this.abortControllers.delete(s),await this.deps.processManager.killWithGrace(i.pid,3e3),await this.deps.runService.finish(i.run_id,"cancelled");try{await this.deps.taskService.updateStatus(s,"failed");}catch{}delete e.running[s];}await this.deps.agentService.setStatus(t,"idle"),await this.saveState();});}async tick(){if(!this.shuttingDown){this.tickInProgress=true;try{await this.withStateLock(async()=>{if(this.shuttingDown)return;this.cachedTaskStore.invalidate(),this.cachedAgentStore.invalidate(),this.cachedGoalStore?.invalidate(),await this.loadState(),await this.reconcile(),await this.seedAutonomousTasks(),await this.dispatchAll();let t=await this.cachedTaskStore.list(),e=Object.keys(this.state.running).length,s=t.filter(i=>c(i.status)).length;this.deps.eventBus.emit({type:"orchestrator:tick",running:e,queued:s});});}finally{this.tickInProgress=false;}}}scheduleImmediateDispatch(t=0){this.shuttingDown||this.immediateDispatchTimer||(this.immediateDispatchTimer=setTimeout(()=>{if(this.immediateDispatchTimer=null,!this.shuttingDown){if(this.tickInProgress){t<10&&this.scheduleImmediateDispatch(t+1);return}this.immediateDispatch().catch(e=>{this.deps.eventBus.emit({type:"orchestrator:error",error:e instanceof Error?e.message:String(e),context:"immediate dispatch on task:created",fatal:false});});}},500));}async immediateDispatch(){this.shuttingDown||await this.freshDispatch(()=>this.shuttingDown?Promise.resolve():this.dispatchAll());}async reconcile(){let t=this.state,e=Date.now(),s=Object.entries(t.running),i=await Promise.all(s.map(([r])=>this.deps.taskStore.get(r)));for(let r=0;r<s.length;r++){let[a,n]=s[r],f=i[r];if(!f||b$1(f.status)){this.abortControllers.delete(a),delete t.running[a],await this.deps.agentService.setStatus(n.agent_id,"idle").catch(h=>{this.deps.eventBus.emit({type:"orchestrator:error",error:h instanceof Error?h.message:String(h),context:`reconcile setStatus idle for stale agent ${n.agent_id} (task ${a})`,fatal:false});});continue}if(!this.deps.processManager.isAlive(n.pid)){try{await this._handleRunFailure(a,n,"Process crashed unexpectedly");}catch{delete t.running[a],await this.deps.agentService.setStatus(n.agent_id,"idle").catch(h=>{this.deps.eventBus.emit({type:"orchestrator:error",error:h instanceof Error?h.message:String(h),context:`reconcile crash fallback setStatus idle for agent ${n.agent_id} (task ${a})`,fatal:false});});}continue}let d=new Date(n.last_event_at).getTime(),m=this.deps.config.defaults.agent.stall_timeout_ms;if(e-d>m){this.deps.eventBus.emit({type:"orchestrator:stall_detected",runId:n.run_id}),this.abortControllers.get(a)?.abort(),await this.deps.processManager.killWithGrace(n.pid,5e3);try{await this._handleRunFailure(a,n,"Agent stalled (no events)");}catch{delete t.running[a],await this.deps.agentService.setStatus(n.agent_id,"idle").catch(h=>{this.deps.eventBus.emit({type:"orchestrator:error",error:h instanceof Error?h.message:String(h),context:`reconcile stall fallback setStatus idle for agent ${n.agent_id} (task ${a})`,fatal:false});});}}}let o=new Set(Object.values(t.running).map(r=>r.agent_id)),p=await this.cachedAgentStore.list();for(let r of p)r.status==="running"&&!o.has(r.id)&&await this.deps.agentService.setStatus(r.id,"idle");let c=await this.cachedTaskStore.list();for(let r of c)if(r.status==="in_progress"&&!t.running[r.id]){try{await this.deps.taskService.updateStatus(r.id,"failed");}catch{r.status="failed",r.updated_at=new Date().toISOString(),await this.deps.taskStore.save(r).catch(a=>{this.deps.eventBus.emit({type:"orchestrator:error",error:a instanceof Error?a.message:String(a),context:`force-write orphaned task ${r.id}`,fatal:false});});}this.deps.eventBus.emit({type:"task:orphaned",taskId:r.id});}let l=[];t.retry_queue=t.retry_queue.filter(r=>e>=new Date(r.due_at).getTime()?(l.push(r.task_id),false):true);for(let r of l)await this.dispatchTask(r);await this.saveState();}async seedAutonomousTasks(){let e=(await this.cachedAgentStore.list()).filter(c=>c.autonomous&&c.status==="idle");if(e.length===0)return;let s=await this.cachedTaskStore.list(),i=this.cachedGoalStore?await this.cachedGoalStore.list({status:"active"}):[],o=false,p=new Set;for(let c of e){if(s.some(d=>d.assignee===c.id&&!b$1(d.status)))continue;let r=i.find(d=>d.assignee===c.id&&!p.has(d.id))??i.find(d=>!d.assignee&&!p.has(d.id));r&&p.add(r.id);let a$1=c.role??"general assistant",n=r?`[auto] ${c.name}: ${r.title.slice(0,60)}`:`[auto] ${c.name}: ${a$1.slice(0,60)}`,f=r?`## GOAL (highest priority)
|
|
7
|
+
|
|
8
|
+
${r.description||r.title}
|
|
9
|
+
|
|
10
|
+
---
|
|
11
|
+
Agent role: ${a$1}`:`Autonomous work cycle. Agent role: ${a$1}`;try{await this.deps.taskService.create({title:n,description:f,assignee:c.id,labels:[a],priority:3,goalId:r?.id}),o=!0;}catch(d){this.deps.eventBus.emit({type:"orchestrator:error",error:d instanceof Error?d.message:String(d),context:`autonomous task for agent ${c.id}`,fatal:false});}}o&&this.cachedTaskStore.invalidate();}async dispatchAll(){let t=this.state,e=this.deps.config.scheduling.max_concurrent_agents,s=Object.keys(t.running).length,i=e-s;if(i<=0)return;let o=await this.cachedTaskStore.list(),p=new Map(o.map(n=>[n.id,n])),c$1=o.filter(n=>c(n.status)&&!d$1(n,p)&&!t.running[n.id]&&!t.claimed.has(n.id)).sort((n,f)=>{let d=f.updated_at??"",m=n.updated_at??"";return d<m?-1:d>m?1:0}).slice(0,i),l$1=new Set,r=o.filter(n=>n.status==="in_progress"&&n.scope?.length),a=new P(r.map(n=>n.scope));for(let n of c$1)if(n.scope?.length)if(a.overlapsAny(n.scope)){let f=r.find(d=>V(n.scope,d.scope));this.deps.eventBus.emit({type:"task:scope_overlap",taskId:n.id,overlappingTaskId:f?.id??n.id,patterns:n.scope}),l$1.add(n.id);}else a.add(n.scope);for(let n of c$1)if(!l$1.has(n.id))try{await this.dispatchTask(n.id);}catch(f){if(f instanceof l)try{let d=await this.deps.taskStore.get(n.id);d&&!b$1(d.status)&&(d.status="failed",d.updated_at=new Date().toISOString(),await this.deps.taskStore.save(d));}catch{}this.deps.eventBus.emit({type:"orchestrator:error",error:f instanceof Error?f.message:String(f),context:`dispatch task ${n.id}`,fatal:false});}}async dispatchTask(t){let e=this.state;if(e.running[t]){let i=e.running[t];throw new h(t,i.run_id,i.agent_id)}let s=await this.deps.taskService.get(t);e.claimed.add(t),await this.saveState();try{let i=await this.cachedAgentStore.list(),o=await this.deps.agentService.findBestAgent(s);if(!o){if(i.length===0)throw new e$1;this.unclaim(t),await this.saveState();return}let{path:p,branch:c}=await this.deps.workspaceManager.prepare(s,o,this.deps.config),l=this.deps.config.prompt?.template??c$1,r=s.attempts+1,a;if(r>1){let w=await this.deps.runService.getLastFailedRunContext(s.id);w&&(a={previous_error:w.error,previous_output:w.output});}let n=s.goalId,[f,d,m]=await Promise.all([this.deps.contextStore?.getAll(),this.deps.messageService?this.deps.messageService.drainMailbox(o.id,s.id):[],n&&this.cachedGoalStore?this.cachedGoalStore.get(n).catch(()=>null):null]),h;if(m){let it=(await this.cachedTaskStore.list()).filter(A=>A.goalId===n),at=await this.deps.contextStore?.get(`${n}-progress`),C=30,T=it.map(A=>`[${A.status}] ${A.title}`);h={id:m.id,title:m.title,description:m.description,status:m.status,task_names:T.length>C?[...T.slice(0,C),`... and ${T.length-C} more`]:T,progress:at?.value};}let v=b$2(s,o,r,p,this.deps.config,{allAgents:i,retryContext:a,sharedContext:f,feedback:s.feedback,messages:d.length?d:void 0,goal:h}),g=await this.deps.templateEngine.render(l,v),S=await this.deps.runService.create({taskId:s.id,agentId:o.id,attempt:r,prompt:g,workspacePath:p});(s.status==="failed"||s.status==="cancelled")&&(await this.deps.taskService.retry(t),s.status="todo",s.attempts=0),await this.deps.taskService.updateStatus(t,"in_progress"),await this.deps.taskService.assign(t,o.id),await this.deps.taskService.incrementAttempts(t),c&&(s.proof={...s.proof??{files_changed:[]},branch:c},s.workspace=p,await this.deps.taskStore.save(s)),await this.deps.agentService.setStatus(o.id,"running");let y=await this.deps.agentService.get(o.id);y.current_task=t,await this.deps.agentStore.save(y);let st=this.deps.adapterRegistry.require(o.adapter),q=new AbortController;this.abortControllers.set(t,q);let I=st.execute({prompt:g,workspace:p,env:{...o.config.env,ORCH_AGENT_ID:o.id,ORCH_AGENT_NAME:o.name,ORCH_TASK_ID:s.id},config:y.config,signal:q.signal}),F=I.pid,N=new Date().toISOString();await this.deps.runService.start(S.id,F),this.unclaim(t),e.running[t]={run_id:S.id,agent_id:o.id,task_id:t,pid:F,started_at:N,last_event_at:N},await this.saveState(),this.collectEvents(I.events,S.id,t,o.id).catch(w=>{this.deps.eventBus.emit({type:"orchestrator:error",error:w instanceof Error?w.message:String(w),context:`adapter execution for ${t}`,fatal:!1});});}catch(i){throw this.unclaim(t),await this.saveState(),i}}async collectEvents(t,e,s,i){let o,p,c,l=new Set;try{for await(let a of t){if(this.shuttingDown)break;if(a.type==="done"){a.tokens&&(o=a.tokens);let h=a.data;h&&typeof h.result=="string"&&(p=h.result);}if(a.type==="output"){let h=a.data;if(h){let v=typeof h.text=="string"?h.text:typeof h.message=="string"?h.message:void 0;v?.trim()&&(c=v);}}if(a.type==="file_change"){let h=a.data;if(h&&Array.isArray(h.paths))for(let v of h.paths)typeof v=="string"&&l.add(v);else {let v=h&&typeof h.path=="string"?h.path:typeof a.data=="string"?a.data:String(a.data);l.add(v);}}let n=pt(a.timestamp)?a.timestamp:new Date().toISOString(),f=et(a.data,dt);a.data=void 0;let d={timestamp:n,type:a.type==="output"?"agent_output":a.type==="file_change"?"file_changed":a.type==="command"?"command_run":a.type==="tool_call"?"tool_call":a.type==="error"?"error":"done",data:f};await this.deps.runService.appendEvent(e,d),this.state?.running[s]&&(this.state.running[s].last_event_at=n,this.saveStateLazy());let m=et(f,ht);a.type==="output"||a.type==="tool_call"?this.deps.eventBus.emit({type:"agent:output",runId:e,agentId:i,data:m}):a.type==="file_change"?this.deps.eventBus.emit({type:"agent:file_changed",runId:e,agentId:i,path:typeof a.data=="string"?a.data:String(a.data)}):a.type==="error"&&this.deps.eventBus.emit({type:"agent:error",runId:e,agentId:i,error:m});}let r=p??c;await this.handleRunSuccess(s,e,i,o,r,[...l]);}catch(r){let a=r instanceof Error?r.message:String(r),n=this.state?.running[s];n&&await this.handleRunFailure(s,n,a);}}async handleRunSuccess(t,e,s,i,o,p){return this.withStateLock(()=>this._handleRunSuccess(t,e,s,i,o,p))}async _handleRunSuccess(t,e,s,i,o,p){await this.flushStateLazy(),this.abortControllers.delete(t);let c=this.state;if(!c.running[t])return;let l=await this.deps.taskStore.get(t);if(!l)return;l.proof={...l.proof,agent_summary:o?.slice(0,2e3)??l.proof?.agent_summary,files_changed:p?.length?p:l.proof?.files_changed??[]},delete l.feedback,await this.deps.taskStore.save(l);let r=await this.deps.agentStore.get(s),n=l.labels?.includes(a)||r?.config.approval_policy==="auto",f$1=f(l,true,n);await this.deps.runService.finish(e,"succeeded",i);let d=c.running[t],m=d?Date.now()-new Date(d.started_at).getTime():0;d&&(c.stats.total_runtime_ms+=m),delete c.running[t];let h={tasks_completed:(r?.stats.tasks_completed??0)+1,total_runs:(r?.stats.total_runs??0)+1,total_runtime_ms:(r?.stats.total_runtime_ms??0)+m};if(i&&(h.tokens_used=(r?.stats.tokens_used??0)+i.total),await this.deps.agentService.updateStats(s,h).catch(g=>{this.deps.eventBus.emit({type:"orchestrator:error",error:g instanceof Error?g.message:String(g),context:`agent stats update for ${s}`,fatal:false});}),c.stats.total_tasks_completed++,c.stats.total_runs++,i&&(c.stats.total_tokens.input+=i.input,c.stats.total_tokens.output+=i.output,c.stats.total_tokens.total=c.stats.total_tokens.input+c.stats.total_tokens.output),l.proof?.branch)try{let g=await this.deps.workspaceManager.mergeBack(l.proof.branch);if(g.success)this.deps.eventBus.emit({type:"workspace:merge_succeeded",taskId:t,branch:l.proof.branch}),await this.deps.workspaceManager.cleanup(t).catch(S=>{this.deps.eventBus.emit({type:"orchestrator:error",error:S instanceof Error?S.message:String(S),context:`workspace cleanup for ${t}`,fatal:!1});});else {this.deps.eventBus.emit({type:"workspace:merge_conflict",taskId:t,branch:l.proof.branch,conflictInfo:g.conflictInfo}),await this.forceTaskToReview(l,s,`MERGE CONFLICT: ${g.conflictInfo}`);return}}catch(g){let S=g instanceof Error?g.message:String(g);await this.forceTaskToReview(l,s,`MERGE ERROR: ${S}`);return}try{await this.deps.taskService.updateStatus(t,f$1);}catch(g){let S=g instanceof Error?g.message:String(g);this.deps.eventBus.emit({type:"orchestrator:error",error:S,context:`state machine validation failed for task ${t} -> ${f$1}, force-writing`,fatal:false}),l.status=f$1,l.updated_at=new Date().toISOString(),await this.deps.taskStore.save(l).catch(y=>{this.deps.eventBus.emit({type:"orchestrator:error",error:y instanceof Error?y.message:String(y),context:`force-write task ${t} to store failed`,fatal:false});});}await this.deps.agentService.setStatus(s,"idle").catch(g=>{this.deps.eventBus.emit({type:"orchestrator:error",error:g instanceof Error?g.message:String(g),context:`_handleRunSuccess setStatus idle for agent ${s}`,fatal:false});});let v=await this.deps.agentStore.get(s);v&&(v.current_task=void 0,await this.deps.agentStore.save(v)),f$1==="review"&&l.review_criteria?.length?await this.runAutoReview(t,l.review_criteria,l.workspace??this.deps.projectRoot):f$1==="review"&&n&&await this.deps.taskService.updateStatus(t,"done"),await this.saveState(),this.scheduleImmediateDispatch();}async handleRunFailure(t,e,s){return this.withStateLock(()=>this._handleRunFailure(t,e,s))}async _handleRunFailure(t,e$1,s){await this.flushStateLazy(),this.abortControllers.delete(t);let i=this.state,o=await this.deps.taskStore.get(t);if(!o)return;await this.deps.runService.finish(e$1.run_id,"failed",void 0,s),await this.deps.agentService.setStatus(e$1.agent_id,"idle");let p=await this.deps.agentStore.get(e$1.agent_id);p&&(p.current_task=void 0,await this.deps.agentStore.save(p));let c=await this.deps.agentStore.get(e$1.agent_id),l=Date.now()-new Date(e$1.started_at).getTime();await this.deps.agentService.updateStats(e$1.agent_id,{tasks_failed:(c?.stats.tasks_failed??0)+1,total_runs:(c?.stats.total_runs??0)+1,total_runtime_ms:(c?.stats.total_runtime_ms??0)+l});let r=e(o);if(await this.deps.taskService.updateStatus(t,r),r==="retrying"){let a=g(o.attempts-1,this.deps.config.scheduling.retry_base_delay_ms,this.deps.config.scheduling.retry_max_delay_ms);i.retry_queue.some(f=>f.task_id===t)||(i.retry_queue.length>=this.maxRetryQueueSize&&i.retry_queue.shift(),i.retry_queue.push({task_id:t,attempt:o.attempts+1,due_at:new Date(Date.now()+a).toISOString(),error:s})),this.deps.eventBus.emit({type:"run:retry",runId:e$1.run_id,attempt:o.attempts+1,delay_ms:a});}else i.stats.total_tasks_failed++;i.stats.total_runtime_ms+=l,delete i.running[t],i.stats.total_runs++,await this.saveState(),this.scheduleImmediateDispatch();}async runAutoReview(t,e,s){let o=await new k({cwd:s}).runAll(e),p=k.allPassed(o),c=await this.deps.taskStore.get(t);if(c&&(c.review_results=o,c.proof={...c.proof,test_results:k.formatReport(o),files_changed:c.proof?.files_changed??[]},await this.deps.taskStore.save(c),this.deps.eventBus.emit({type:"task:auto_reviewed",taskId:t,passed:p,results:o}),p))try{await this.deps.taskService.updateStatus(t,"done");}catch(l){let r=l instanceof Error?l.message:String(l);this.deps.eventBus.emit({type:"orchestrator:error",error:r,context:`auto-review transition failed for task ${t} -> done, force-writing`,fatal:false}),c.status="done",c.updated_at=new Date().toISOString(),await this.deps.taskStore.save(c).catch(a=>{this.deps.eventBus.emit({type:"orchestrator:error",error:a instanceof Error?a.message:String(a),context:`force-write task ${t} to store failed (auto-review)`,fatal:false});});}}async forceTaskToReview(t,e,s){t.proof={...t.proof,agent_summary:`${s}
|
|
12
|
+
|
|
13
|
+
${t.proof?.agent_summary??""}`.slice(0,2e3),files_changed:t.proof?.files_changed??[]},t.status="review",t.updated_at=new Date().toISOString(),await this.deps.taskStore.save(t),await this.deps.agentService.setStatus(e,"idle").catch(o=>{this.deps.eventBus.emit({type:"orchestrator:error",error:o instanceof Error?o.message:String(o),context:`forceTaskToReview setStatus idle for agent ${e}`,fatal:false});});let i=await this.deps.agentStore.get(e);i&&(i.current_task=void 0,await this.deps.agentStore.save(i)),await this.saveState();}unclaim(t){this.state.claimed.delete(t);}requireOwnership(){if(!this.lockAcquired)throw new d(0)}async loadState(){this.state=await this.deps.stateStore.read();}async saveState(){this.state&&await this.deps.stateStore.write(this.state);}saveStateLazy(){this.saveStateDirty=true,!this.saveStateTimer&&(this.saveStateTimer=setTimeout(()=>{this.saveStateTimer=null,this.saveStateDirty&&(this.saveStateDirty=false,this.saveState().catch(t=>{this.deps.eventBus.emit({type:"orchestrator:error",error:t instanceof Error?t.message:String(t),context:"debounced state save",fatal:false});}));},500));}async flushStateLazy(){this.saveStateTimer&&(clearTimeout(this.saveStateTimer),this.saveStateTimer=null),this.saveStateDirty&&(this.saveStateDirty=false,await this.saveState());}};function pt(u){if(typeof u!="string")return false;let t=new Date(u);return !isNaN(t.getTime())&&t.toISOString()===u}function et(u,t){let e=typeof u=="string"?u:JSON.stringify(u);return e.length>t?e.slice(0,t)+"\u2026":e}export{tt as Orchestrator};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"names":[],"mappings":"","file":"process-manager-
|
|
1
|
+
{"version":3,"sources":[],"names":[],"mappings":"","file":"process-manager-A36Y7LHP.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"names":[],"mappings":"","file":"registry-
|
|
1
|
+
{"version":3,"sources":[],"names":[],"mappings":"","file":"registry-JXXRLJ5J.js"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {i,p as p$1,j,q,c}from'./chunk-L26TK7Y5.js';function p(t,o){t.command("run [task-id]").description("Run tasks").option("--all","Run all todo tasks").option("--watch","Watch mode: continuous orchestration").action(async(e,r)=>{await o.paths.requireInit(),r.watch?await m(o):r.all?await d(o):e?await u(o,e):(i("Specify a task ID, --all, or --watch"),process.exit(2));});}async function u(t,o){let e=await t.taskService.get(o);console.log(),console.log(` ${p$1("orch")} \xB7 running ${o} "${e.title}"`);let r=t.eventBus.onAny(s=>{let c$1=new Date().toLocaleTimeString("en-US",{hour12:false,hour:"2-digit",minute:"2-digit",second:"2-digit"});switch(s.type){case "agent:output":console.log(` ${q(c$1)} ${c("agentAction")} ${typeof s.data=="string"?s.data.slice(0,80):""}`);break;case "agent:file_changed":console.log(` ${q(c$1)} ${c("agentAction")} Modified ${s.path}`);break;case "agent:error":console.log(` ${q(c$1)} ${c("failed")} ${s.error}`);break;case "agent:completed":s.success?j("Done"):i("Failed");break}});try{await t.orchestrator.runTask(o);}finally{r();}console.log();}async function d(t){console.log(),console.log(` ${p$1("orch")} \xB7 running all todo tasks`),console.log(),await t.orchestrator.runAll();}async function m(t){console.log(`${p$1("orch")} \xB7 watching \xB7 poll interval ${t.config.scheduling.poll_interval_ms/1e3}s`),console.log("\u2501".repeat(43)),console.log(),t.eventBus.onAny(o=>{let e=new Date().toLocaleTimeString("en-US",{hour12:false,hour:"2-digit",minute:"2-digit"});switch(o.type){case "agent:output":{let r=typeof o.data=="string"?o.data.slice(0,60):"";console.log(`${q(e)} ${c("agentAction")} ${r}`);break}case "agent:completed":o.success?console.log(`${q(e)} ${c("done")} DONE ${o.runId}`):console.log(`${q(e)} ${c("failed")} FAIL ${o.runId}`);break;case "run:retry":console.log(`${q(e)} ${c("retrying")} RETRY attempt ${o.attempt} \xB7 next in ${Math.round(o.delay_ms/1e3)}s`);break;case "orchestrator:tick":process.stdout.write(`\r${p$1("orch")} \xB7 watching \xB7 ${o.running} running \xB7 ${o.queued} queued `);break;case "orchestrator:stall_detected":console.log(`${q(e)} ${c("warning")} STALL ${o.runId}`);break;case "orchestrator:shutdown":console.log(`
|
|
3
|
+
${q("Shutting down...")}`);break}}),await t.orchestrator.startWatch();}export{p as registerRunCommand};
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
|
|
2
|
-
import { readLines } from './chunk-CHIP7O6V.js';
|
|
1
|
+
import { readLines } from './chunk-O2MSGW3V.js';
|
|
3
2
|
import { execFile } from 'child_process';
|
|
4
3
|
import { promisify } from 'util';
|
|
5
4
|
|
|
@@ -215,3 +214,5 @@ var ShellAdapter = class {
|
|
|
215
214
|
};
|
|
216
215
|
|
|
217
216
|
export { ShellAdapter };
|
|
217
|
+
//# sourceMappingURL=shell-IH2MMTVP.js.map
|
|
218
|
+
//# sourceMappingURL=shell-IH2MMTVP.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/infrastructure/adapters/event-buffer.ts","../src/infrastructure/adapters/shell.ts"],"names":[],"mappings":";;;;;AAWA,IAAM,gBAAA,GAAmB,IAAA;AAOzB,SAAS,QAAA,GAA2B;AAClC,EAAA,IAAI,OAAA;AACJ,EAAA,MAAM,OAAA,GAAU,IAAI,OAAA,CAAW,CAAC,CAAA,KAAM;AAAE,IAAA,OAAA,GAAU,CAAA;AAAA,EAAG,CAAC,CAAA;AACtD,EAAA,OAAO,EAAE,SAAS,OAAA,EAAQ;AAC5B;AAEO,IAAM,cAAN,MAAkB;AAAA,EACf,GAAA;AAAA,EACA,IAAA,GAAO,CAAA;AAAA;AAAA,EACP,IAAA,GAAO,CAAA;AAAA;AAAA,EACP,KAAA,GAAQ,CAAA;AAAA,EACC,QAAA;AAAA;AAAA,EAGT,SAAA,GAAmC,IAAA;AAAA;AAAA,EAEnC,UAAA,GAAoC,IAAA;AAAA,EAEpC,MAAA,GAAS,KAAA;AAAA,EAEjB,WAAA,CAAY,WAAW,gBAAA,EAAkB;AACvC,IAAA,IAAA,CAAK,QAAA,GAAW,QAAA;AAChB,IAAA,IAAA,CAAK,GAAA,GAAM,IAAI,KAAA,CAAM,QAAQ,CAAA;AAAA,EAC/B;AAAA;AAAA,EAGA,IAAI,IAAA,GAAe;AACjB,IAAA,OAAO,IAAA,CAAK,KAAA;AAAA,EACd;AAAA,EAEA,IAAI,MAAA,GAAkB;AACpB,IAAA,OAAO,IAAA,CAAK,SAAS,IAAA,CAAK,QAAA;AAAA,EAC5B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,KAAK,KAAA,EAAkC;AAC3C,IAAA,OAAO,IAAA,CAAK,MAAA,IAAU,CAAC,IAAA,CAAK,MAAA,EAAQ;AAClC,MAAA,IAAI,CAAC,KAAK,UAAA,EAAY;AACpB,QAAA,IAAA,CAAK,aAAa,QAAA,EAAe;AAAA,MACnC;AACA,MAAA,MAAM,KAAK,UAAA,CAAW,OAAA;AAAA,IACxB;AACA,IAAA,IAAI,KAAK,MAAA,EAAQ;AAEjB,IAAA,IAAA,CAAK,GAAA,CAAI,IAAA,CAAK,IAAI,CAAA,GAAI,KAAA;AACtB,IAAA,IAAA,CAAK,IAAA,GAAA,CAAQ,IAAA,CAAK,IAAA,GAAO,CAAA,IAAK,IAAA,CAAK,QAAA;AACnC,IAAA,IAAA,CAAK,KAAA,EAAA;AAGL,IAAA,IAAI,KAAK,SAAA,EAAW;AAClB,MAAA,MAAM,KAAK,IAAA,CAAK,SAAA;AAChB,MAAA,IAAA,CAAK,SAAA,GAAY,IAAA;AACjB,MAAA,EAAA,CAAG,OAAA,EAAQ;AAAA,IACb;AAAA,EACF;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,MAAM,IAAA,GAAwC;AAC5C,IAAA,OAAO,IAAA,CAAK,UAAU,CAAA,EAAG;AACvB,MAAA,IAAI,IAAA,CAAK,QAAQ,OAAO,MAAA;AACxB,MAAA,IAAI,CAAC,KAAK,SAAA,EAAW;AACnB,QAAA,IAAA,CAAK,YAAY,QAAA,EAAe;AAAA,MAClC;AACA,MAAA,MAAM,KAAK,SAAA,CAAU,OAAA;AAAA,IACvB;AAEA,IAAA,MAAM,KAAA,GAAQ,IAAA,CAAK,GAAA,CAAI,IAAA,CAAK,IAAI,CAAA;AAChC,IAAA,IAAA,CAAK,GAAA,CAAI,IAAA,CAAK,IAAI,CAAA,GAAI,MAAA;AACtB,IAAA,IAAA,CAAK,IAAA,GAAA,CAAQ,IAAA,CAAK,IAAA,GAAO,CAAA,IAAK,IAAA,CAAK,QAAA;AACnC,IAAA,IAAA,CAAK,KAAA,EAAA;AAGL,IAAA,IAAI,KAAK,UAAA,EAAY;AACnB,MAAA,MAAM,KAAK,IAAA,CAAK,UAAA;AAChB,MAAA,IAAA,CAAK,UAAA,GAAa,IAAA;AAClB,MAAA,EAAA,CAAG,OAAA,EAAQ;AAAA,IACb;AAEA,IAAA,OAAO,KAAA;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,KAAA,GAAc;AACZ,IAAA,IAAA,CAAK,MAAA,GAAS,IAAA;AACd,IAAA,IAAI,KAAK,SAAA,EAAW;AAClB,MAAA,MAAM,KAAK,IAAA,CAAK,SAAA;AAChB,MAAA,IAAA,CAAK,SAAA,GAAY,IAAA;AACjB,MAAA,EAAA,CAAG,OAAA,EAAQ;AAAA,IACb;AACA,IAAA,IAAI,KAAK,UAAA,EAAY;AACnB,MAAA,MAAM,KAAK,IAAA,CAAK,UAAA;AAChB,MAAA,IAAA,CAAK,UAAA,GAAa,IAAA;AAClB,MAAA,EAAA,CAAG,OAAA,EAAQ;AAAA,IACb;AAAA,EACF;AAAA,EAEA,IAAI,QAAA,GAAoB;AACtB,IAAA,OAAO,IAAA,CAAK,MAAA;AAAA,EACd;AAAA;AAAA;AAAA;AAAA,EAKA,QAAQ,MAAA,CAAO,aAAa,CAAA,GAAgC;AAC1D,IAAA,OAAO,IAAA,EAAM;AACX,MAAA,MAAM,KAAA,GAAQ,MAAM,IAAA,CAAK,IAAA,EAAK;AAC9B,MAAA,IAAI,UAAU,MAAA,EAAW;AACzB,MAAA,MAAM,KAAA;AAAA,IACR;AAAA,EACF;AACF,CAAA;AC1HA,IAAM,aAAA,GAAgB,UAAU,QAAQ,CAAA;AAEjC,IAAM,eAAN,MAA4C;AAAA,EAGjD,YAA6B,cAAA,EAAiC;AAAjC,IAAA,IAAA,CAAA,cAAA,GAAA,cAAA;AAAA,EAAkC;AAAA,EAFtD,IAAA,GAAO,OAAA;AAAA,EAIhB,MAAM,IAAA,GAAmC;AACvC,IAAA,IAAI;AACF,MAAA,MAAM,EAAE,QAAO,GAAI,MAAM,cAAc,MAAA,EAAQ,CAAC,WAAW,CAAC,CAAA;AAC5D,MAAA,MAAM,OAAA,GAAU,OAAO,KAAA,CAAM,IAAI,EAAE,CAAC,CAAA,EAAG,MAAK,IAAK,SAAA;AACjD,MAAA,OAAO,EAAE,EAAA,EAAI,IAAA,EAAM,OAAA,EAAQ;AAAA,IAC7B,CAAA,CAAA,MAAQ;AACN,MAAA,OAAO,EAAE,EAAA,EAAI,KAAA,EAAO,KAAA,EAAO,gBAAA,EAAiB;AAAA,IAC9C;AAAA,EACF;AAAA,EAEA,QAAQ,MAAA,EAAsC;AAC5C,IAAA,MAAM,OAAA,GAAU,OAAO,MAAA,CAAO,OAAA;AAC9B,IAAA,IAAI,CAAC,OAAA,EAAS;AAEZ,MAAA,gBAAgB,QAAA,GAAuC;AACrD,QAAA,MAAM;AAAA,UACJ,IAAA,EAAM,OAAA;AAAA,UACN,SAAA,EAAA,iBAAW,IAAI,IAAA,EAAK,EAAE,WAAA,EAAY;AAAA,UAClC,IAAA,EAAM;AAAA,SACR;AAAA,MACF;AACA,MAAA,OAAO,EAAE,GAAA,EAAK,CAAA,EAAG,MAAA,EAAQ,UAAS,EAAE;AAAA,IACtC;AAEA,IAAA,MAAM,EAAE,OAAA,EAAS,IAAA,EAAM,GAAA,EAAI,GAAI,IAAA,CAAK,cAAA,CAAe,KAAA,CAAM,MAAA,EAAQ,CAAC,KAAA,EAAO,OAAO,CAAA,EAAG;AAAA,MACjF,KAAK,MAAA,CAAO,SAAA;AAAA,MACZ,GAAA,EAAK;AAAA,QACH,GAAG,OAAA,CAAQ,GAAA;AAAA,QACX,GAAG,MAAA,CAAO,GAAA;AAAA,QACV,uBAAuB,MAAA,CAAO;AAAA,OAChC;AAAA,MACA,QAAQ,MAAA,CAAO;AAAA,KAChB,CAAA;AAED,IAAA,MAAM,SAAS,MAAA,CAAO,MAAA;AACtB,IAAA,MAAM,iBAAiB,IAAA,CAAK,cAAA;AAE5B,IAAA,gBAAgB,cAAA,GAA6C;AAE3D,MAAA,MAAM,MAAA,GAAS,IAAI,WAAA,EAAY;AAG/B,MAAA,MAAM,UAAU,MAAM;AACpB,QAAA,cAAA,CAAe,aAAA,CAAc,GAAA,EAAK,GAAK,CAAA,CAAE,MAAM,MAAM;AAAA,QAAC,CAAC,CAAA;AAAA,MACzD,CAAA;AACA,MAAA,IAAI,MAAA,EAAQ;AACV,QAAA,IAAI,OAAO,OAAA,EAAS;AAClB,UAAA,OAAA,EAAQ;AAAA,QACV,CAAA,MAAO;AACL,UAAA,MAAA,CAAO,iBAAiB,OAAA,EAAS,OAAA,EAAS,EAAE,IAAA,EAAM,MAAM,CAAA;AAAA,QAC1D;AAAA,MACF;AAEA,MAAA,MAAM,iBAAiB,YAAY;AACjC,QAAA,IAAI,CAAC,KAAK,MAAA,EAAQ;AAClB,QAAA,WAAA,MAAiB,IAAA,IAAQ,SAAA,CAAU,IAAA,CAAK,MAAM,CAAA,EAAG;AAC/C,UAAA,IAAI,QAAQ,OAAA,EAAS;AACrB,UAAA,MAAM,OAAO,IAAA,CAAK;AAAA,YAChB,IAAA,EAAM,QAAA;AAAA,YACN,SAAA,EAAA,iBAAW,IAAI,IAAA,EAAK,EAAE,WAAA,EAAY;AAAA,YAClC,IAAA,EAAM;AAAA,WACP,CAAA;AAAA,QACH;AAAA,MACF,CAAA,GAAG;AAEH,MAAA,MAAM,iBAAiB,YAAY;AACjC,QAAA,IAAI,CAAC,KAAK,MAAA,EAAQ;AAClB,QAAA,WAAA,MAAiB,IAAA,IAAQ,SAAA,CAAU,IAAA,CAAK,MAAM,CAAA,EAAG;AAC/C,UAAA,IAAI,QAAQ,OAAA,EAAS;AACrB,UAAA,MAAM,OAAO,IAAA,CAAK;AAAA,YAChB,IAAA,EAAM,OAAA;AAAA,YACN,SAAA,EAAA,iBAAW,IAAI,IAAA,EAAK,EAAE,WAAA,EAAY;AAAA,YAClC,IAAA,EAAM;AAAA,WACP,CAAA;AAAA,QACH;AAAA,MACF,CAAA,GAAG;AAGH,MAAA,KAAK,QAAQ,GAAA,CAAI,CAAC,aAAA,EAAe,aAAa,CAAC,CAAA,CAAE,IAAA;AAAA,QAC/C,MAAM,OAAO,KAAA,EAAM;AAAA,QACnB,MAAM,OAAO,KAAA;AAAM,OACrB;AAGA,MAAA,OAAO,MAAA;AAGP,MAAA,IAAI,MAAA,IAAU,CAAC,MAAA,CAAO,OAAA,EAAS;AAC7B,QAAA,MAAA,CAAO,mBAAA,CAAoB,SAAS,OAAO,CAAA;AAAA,MAC7C;AAGA,MAAA,MAAM,IAAI,OAAA,CAAc,CAAC,OAAA,EAAS,MAAA,KAAW;AAE3C,QAAA,IAAI,IAAA,CAAK,QAAA,KAAa,IAAA,IAAQ,IAAA,CAAK,MAAA,EAAQ;AACzC,UAAA,OAAA,EAAQ;AACR,UAAA;AAAA,QACF;AACA,QAAA,IAAA,CAAK,EAAA,CAAG,OAAA,EAAS,CAAC,IAAA,KAAS;AACzB,UAAA,IAAI,IAAA,KAAS,CAAA,IAAK,MAAA,EAAQ,OAAA,EAAS;AACjC,YAAA,OAAA,EAAQ;AAAA,UACV,CAAA,MAAO;AACL,YAAA,MAAA,CAAO,IAAI,KAAA,CAAM,CAAA,+BAAA,EAAkC,IAAI,EAAE,CAAC,CAAA;AAAA,UAC5D;AAAA,QACF,CAAC,CAAA;AACD,QAAA,IAAA,CAAK,EAAA,CAAG,SAAS,MAAM,CAAA;AAAA,MACzB,CAAC,CAAA;AAAA,IACH;AAEA,IAAA,OAAO,EAAE,GAAA,EAAK,MAAA,EAAQ,cAAA,EAAe,EAAE;AAAA,EACzC;AAAA,EAEA,MAAM,KAAK,GAAA,EAA4B;AACrC,IAAA,MAAM,IAAA,CAAK,cAAA,CAAe,aAAA,CAAc,GAAG,CAAA;AAAA,EAC7C;AACF","file":"shell-IH2MMTVP.js","sourcesContent":["/**\n * Lock-free ring buffer for AgentEvent streaming.\n *\n * Replaces Array.shift() O(n) polling with O(1) dequeue\n * and event-driven notification instead of 50ms busy-wait.\n * Includes backpressure: when buffer is full, push() returns\n * a promise that resolves when space is available.\n */\n\nimport type { AgentEvent } from './interface.js';\n\nconst DEFAULT_CAPACITY = 1024;\n\ninterface Deferred<T> {\n promise: Promise<T>;\n resolve: (value: T) => void;\n}\n\nfunction deferred<T>(): Deferred<T> {\n let resolve!: (value: T) => void;\n const promise = new Promise<T>((r) => { resolve = r; });\n return { promise, resolve };\n}\n\nexport class EventBuffer {\n private buf: (AgentEvent | undefined)[];\n private head = 0; // read index\n private tail = 0; // write index\n private count = 0;\n private readonly capacity: number;\n\n // Consumer notification: resolved when new data is available\n private dataReady: Deferred<void> | null = null;\n // Producer notification: resolved when space is available\n private spaceReady: Deferred<void> | null = null;\n\n private closed = false;\n\n constructor(capacity = DEFAULT_CAPACITY) {\n this.capacity = capacity;\n this.buf = new Array(capacity);\n }\n\n /** Number of buffered events. */\n get size(): number {\n return this.count;\n }\n\n get isFull(): boolean {\n return this.count >= this.capacity;\n }\n\n /**\n * Push an event into the buffer.\n * If the buffer is full, waits until space is available (backpressure).\n */\n async push(event: AgentEvent): Promise<void> {\n while (this.isFull && !this.closed) {\n if (!this.spaceReady) {\n this.spaceReady = deferred<void>();\n }\n await this.spaceReady.promise;\n }\n if (this.closed) return;\n\n this.buf[this.tail] = event;\n this.tail = (this.tail + 1) % this.capacity;\n this.count++;\n\n // Wake up consumer if waiting\n if (this.dataReady) {\n const dr = this.dataReady;\n this.dataReady = null;\n dr.resolve();\n }\n }\n\n /**\n * Dequeue the next event. O(1).\n * Returns undefined only when buffer is empty AND closed.\n */\n async take(): Promise<AgentEvent | undefined> {\n while (this.count === 0) {\n if (this.closed) return undefined;\n if (!this.dataReady) {\n this.dataReady = deferred<void>();\n }\n await this.dataReady.promise;\n }\n\n const event = this.buf[this.head];\n this.buf[this.head] = undefined; // allow GC\n this.head = (this.head + 1) % this.capacity;\n this.count--;\n\n // Wake up producer if waiting for space\n if (this.spaceReady) {\n const sr = this.spaceReady;\n this.spaceReady = null;\n sr.resolve();\n }\n\n return event;\n }\n\n /**\n * Signal that no more events will be pushed.\n * Wakes up any waiting consumer/producer.\n */\n close(): void {\n this.closed = true;\n if (this.dataReady) {\n const dr = this.dataReady;\n this.dataReady = null;\n dr.resolve();\n }\n if (this.spaceReady) {\n const sr = this.spaceReady;\n this.spaceReady = null;\n sr.resolve();\n }\n }\n\n get isClosed(): boolean {\n return this.closed;\n }\n\n /**\n * Async iterator that drains the buffer until closed and empty.\n */\n async *[Symbol.asyncIterator](): AsyncGenerator<AgentEvent> {\n while (true) {\n const event = await this.take();\n if (event === undefined) return;\n yield event;\n }\n }\n}\n","/**\n * Shell adapter.\n *\n * Spawns an arbitrary command via `bash -lc`.\n * Task prompt is passed via ORCHESTRY_TASK_PROMPT env variable.\n * Consumes stdout and stderr concurrently to avoid deadlocks.\n */\n\nimport type { IAgentAdapter, AdapterTestResult, ExecuteParams, AgentEvent, ExecuteHandle } from './interface.js';\nimport type { IProcessManager } from '../process/process-manager.js';\nimport { readLines } from '../process/process-manager.js';\nimport { EventBuffer } from './event-buffer.js';\nimport { execFile } from 'node:child_process';\nimport { promisify } from 'node:util';\n\nconst execFileAsync = promisify(execFile);\n\nexport class ShellAdapter implements IAgentAdapter {\n readonly kind = 'shell';\n\n constructor(private readonly processManager: IProcessManager) {}\n\n async test(): Promise<AdapterTestResult> {\n try {\n const { stdout } = await execFileAsync('bash', ['--version']);\n const version = stdout.split('\\n')[0]?.trim() ?? 'unknown';\n return { ok: true, version };\n } catch {\n return { ok: false, error: 'bash not found' };\n }\n }\n\n execute(params: ExecuteParams): ExecuteHandle {\n const command = params.config.command;\n if (!command) {\n // Return a handle that immediately yields an error\n async function* errorGen(): AsyncGenerator<AgentEvent> {\n yield {\n type: 'error',\n timestamp: new Date().toISOString(),\n data: 'Shell adapter requires a command in agent config',\n };\n }\n return { pid: 0, events: errorGen() };\n }\n\n const { process: proc, pid } = this.processManager.spawn('bash', ['-lc', command], {\n cwd: params.workspace,\n env: {\n ...process.env,\n ...params.env,\n ORCHESTRY_TASK_PROMPT: params.prompt,\n },\n signal: params.signal,\n });\n\n const signal = params.signal;\n const processManager = this.processManager;\n\n async function* generateEvents(): AsyncGenerator<AgentEvent> {\n // Ring buffer with backpressure replaces Array.shift() polling\n const buffer = new EventBuffer();\n\n // Ensure process is reaped on abort — SIGTERM + grace period + SIGKILL\n const onAbort = () => {\n processManager.killWithGrace(pid, 5_000).catch(() => {});\n };\n if (signal) {\n if (signal.aborted) {\n onAbort();\n } else {\n signal.addEventListener('abort', onAbort, { once: true });\n }\n }\n\n const stdoutPromise = (async () => {\n if (!proc.stdout) return;\n for await (const line of readLines(proc.stdout)) {\n if (signal?.aborted) break;\n await buffer.push({\n type: 'output',\n timestamp: new Date().toISOString(),\n data: line,\n });\n }\n })();\n\n const stderrPromise = (async () => {\n if (!proc.stderr) return;\n for await (const line of readLines(proc.stderr)) {\n if (signal?.aborted) break;\n await buffer.push({\n type: 'error',\n timestamp: new Date().toISOString(),\n data: line,\n });\n }\n })();\n\n // Close the buffer once both streams are drained (or on error)\n void Promise.all([stdoutPromise, stderrPromise]).then(\n () => buffer.close(),\n () => buffer.close(),\n );\n\n // Yield events as they arrive — no polling, no busy-wait\n yield* buffer;\n\n // Clean up abort listener\n if (signal && !signal.aborted) {\n signal.removeEventListener('abort', onAbort);\n }\n\n // Wait for process to exit\n await new Promise<void>((resolve, reject) => {\n // If process already exited, resolve immediately\n if (proc.exitCode !== null || proc.killed) {\n resolve();\n return;\n }\n proc.on('close', (code) => {\n if (code === 0 || signal?.aborted) {\n resolve();\n } else {\n reject(new Error(`Shell command exited with code ${code}`));\n }\n });\n proc.on('error', reject);\n });\n }\n\n return { pid, events: generateEvents() };\n }\n\n async stop(pid: number): Promise<void> {\n await this.processManager.killWithGrace(pid);\n }\n}\n"]}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {g,p,q,d,o,e,h}from'./chunk-L26TK7Y5.js';function j(S,o$1){S.command("status").description("Show orchestrator status").action(async()=>{await o$1.paths.requireInit();let s=await o$1.taskService.list(),c=await o$1.agentService.list(),n=await o$1.stateStore.read();if(o$1.context.json){console.log(JSON.stringify({tasks:s,agents:c,state:n},null,2));return}let l=Object.keys(n.running).length,y=n.pid?"watching":"idle",g$1=n.started_at?g(n.started_at):"";console.log(),console.log(`${p("orch")} \xB7 ${o$1.config.project.name} \xB7 ${y}`),console.log();let e$1={};for(let t of s)e$1[t.status]=(e$1[t.status]??0)+1;l>0&&console.log(` ${"RUNNING".padEnd(12)}${l}${"".padEnd(20)}AGENTS ${c.length}`);for(let[t,a]of Object.entries(e$1))t!=="in_progress"&&console.log(` ${q(t.padEnd(12))}${a}`);let m=s.filter(t=>t.status==="in_progress");if(m.length>0){console.log();for(let t of m){let a=g(t.updated_at);console.log(` ${d("in_progress")} ${t.assignee?o(t.assignee):""} ${t.title.slice(0,35).padEnd(37)}${a} ${e(t.priority)}`);}}let d$1=n.stats.total_tokens.total,u=[g$1?`up ${g$1}`:null,d$1>0?`${h(d$1)} tokens`:null].filter(Boolean).join(" \xB7 ");u&&(console.log(),console.log(` ${q(u)}`)),console.log();});}export{j as registerStatusCommand};
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {a,b,c}from'./chunk-5AJ4LYO5.js';import {j,q,g,d,e,o,l,n,m}from'./chunk-L26TK7Y5.js';function A(_,e$1){let c$1=_.command("task").description("Manage tasks");c$1.command("add <title>").description("Create a new task").option("-d, --description <desc>","Task description").option("-p, --priority <n>","Priority (1-4)","3").option("-l, --labels <labels>","Comma-separated labels").option("--depends-on <ids>","Comma-separated dependency task IDs").option("--max-attempts <n>","Max retry attempts").option("--workspace-mode <mode>","Workspace mode: shared|worktree|isolated").option("--assignee <agent-id>","Assign to agent").option("--review-criteria <criteria>","Comma-separated auto-review criteria: test_pass,typecheck,lint").option("--scope <patterns>","Comma-separated glob patterns for file scope (e.g. src/auth/**,src/session/**)").option("--goal-id <goalId>","Associate task with a goal").option("--attach <paths>","Comma-separated file paths to attach (screenshots, docs)").option("-e, --edit","Open $EDITOR to write the description").action(async(s,t)=>{await e$1.paths.requireInit();let o=t.description;if(t.edit){let n=await a(b({title:s,priority:parseInt(t.priority,10),description:o}));o=c(n).description;}let i=await e$1.taskService.create({title:s,description:o,priority:parseInt(t.priority,10),labels:t.labels?.split(",").map(n=>n.trim()),depends_on:t.dependsOn?.split(",").map(n=>n.trim()),max_attempts:t.maxAttempts?parseInt(t.maxAttempts,10):void 0,workspace_mode:t.workspaceMode,assignee:t.assignee,review_criteria:t.reviewCriteria?.split(",").map(n=>n.trim()),scope:t.scope?.split(",").map(n=>n.trim()),goalId:t.goalId,attachments:t.attach?.split(",").map(n=>n.trim())});e$1.context.json?console.log(JSON.stringify(i,null,2)):e$1.context.quiet?console.log(i.id):j(`Created ${i.id} "${i.title}"`);}),c$1.command("list").description("List all tasks").option("--status <status>","Filter by status").action(async s=>{await e$1.paths.requireInit();let t=await e$1.taskService.list(s.status?{status:s.status}:void 0);if(e$1.context.json){console.log(JSON.stringify(t,null,2));return}if(e$1.context.quiet){t.forEach(a=>console.log(a.id));return}if(t.length===0){console.log(`
|
|
3
|
+
No tasks. Create one: ${q('orch task add "Title"')}
|
|
4
|
+
`);return}let o$1=["STATUS","PRI","TASK","AGENT","TIME"],i=t.map(a=>{let S=(a.status==="in_progress"||a.status==="done")&&a.updated_at?g(a.updated_at):q("\u2014");return [`${d(a.status)} ${a.status}`,e(a.priority),a.title.slice(0,35),a.assignee?o(a.assignee):q("\u2014"),S]});console.log(),l(o$1,i);let n=t.filter(a=>a.status==="in_progress").length,r=t.filter(a=>a.status==="review").length,l$1=t.filter(a=>a.status==="done").length;console.log(`
|
|
5
|
+
${t.length} tasks${n?` \xB7 ${n} running`:""}${r?` \xB7 ${r} review`:""}${l$1?` \xB7 ${l$1} done`:""}
|
|
6
|
+
`);}),c$1.command("show <id>").description("Show task details").action(async s=>{await e$1.paths.requireInit();let t=await e$1.taskService.get(s);if(e$1.context.json){console.log(JSON.stringify(t,null,2));return}console.log(`
|
|
7
|
+
${t.title}`),console.log(` ${"\u2550".repeat(42)}`),console.log();let o$1=[["Status",`${d(t.status)} ${t.status} \xB7 attempt ${t.attempts}/${t.max_attempts}`],["Priority",e(t.priority)]];if(t.assignee&&o$1.push(["Agent",o(t.assignee)]),t.labels.length&&o$1.push(["Labels",t.labels.join(", ")]),t.scope?.length&&o$1.push(["Scope",t.scope.join(", ")]),t.workspace_mode&&o$1.push(["Workspace",t.workspace_mode]),t.workspace&&o$1.push(["Path",n(t.workspace)]),t.review_criteria?.length&&o$1.push(["Review",t.review_criteria.join(", ")]),t.feedback&&o$1.push(["Feedback",t.feedback]),o$1.push(["Created",t.created_at]),m(o$1),t.attachments?.length){console.log(`
|
|
8
|
+
Attachments (${t.attachments.length})
|
|
9
|
+
${"\u2500".repeat(42)}`);for(let i of t.attachments)console.log(` ${n(i)}`);}if(t.description){console.log(`
|
|
10
|
+
Description
|
|
11
|
+
${"\u2500".repeat(42)}`);for(let i of t.description.split(`
|
|
12
|
+
`))console.log(` ${i}`);}if(t.proof){if(console.log(`
|
|
13
|
+
Result
|
|
14
|
+
${"\u2500".repeat(42)}`),t.proof.branch&&console.log(` Branch: ${t.proof.branch}`),t.proof.pr_url&&console.log(` PR: ${t.proof.pr_url}`),t.proof.files_changed.length){console.log(" Files changed:");for(let i of t.proof.files_changed)console.log(` \u2022 ${i}`);}if(t.proof.test_results){console.log(" Test results:");for(let i of t.proof.test_results.split(`
|
|
15
|
+
`))console.log(` ${i}`);}if(t.proof.agent_summary){console.log(" Agent summary:");for(let i of t.proof.agent_summary.split(`
|
|
16
|
+
`))console.log(` ${i}`);}}if(t.review_results?.length){console.log(`
|
|
17
|
+
Review Results
|
|
18
|
+
${"\u2500".repeat(42)}`);for(let i of t.review_results){let n=i.passed?"\u2713":"\u2717";if(console.log(` ${n} ${i.criterion}: ${i.passed?"passed":"failed"}`),i.output)for(let r of i.output.split(`
|
|
19
|
+
`))console.log(` ${r}`);}}console.log();}),c$1.command("edit <id>").description("Open task in $EDITOR to modify title, priority and description").action(async s=>{await e$1.paths.requireInit();let t=await e$1.taskService.get(s),o=t.attachments?.length?`
|
|
20
|
+
# Attachments: ${t.attachments.join(", ")}`:"",i=b({title:t.title,priority:t.priority,description:t.description})+o,n=await a(i),r=c(n),l={};if(r.title&&r.title!==t.title&&(l.title=r.title),r.priority&&r.priority!==t.priority&&(l.priority=r.priority),r.description!==void 0&&r.description!==t.description&&(l.description=r.description??""),Object.keys(l).length===0){console.log(" No changes.");return}let a$1=await e$1.taskService.update(s,l);j(`Updated ${a$1.id} "${a$1.title}"`);}),c$1.command("assign <task-id> <agent-id>").description("Assign task to agent").action(async(s,t)=>{await e$1.paths.requireInit();let o=await e$1.taskService.assign(s,t);j(`Assigned ${o.id} \u2192 ${t}`);}),c$1.command("cancel <id>").description("Cancel a task").action(async s=>{if(await e$1.paths.requireInit(),(await e$1.taskService.get(s)).status==="in_progress"){let{buildFullContainer:o}=await import('./container-OIXLFSX2.js');await(await o(e$1.context)).orchestrator.cancelTask(s);}else await e$1.taskService.cancel(s);j(`Cancelled ${s}`);}),c$1.command("approve <id>").description("Approve a task in review").action(async s=>{await e$1.paths.requireInit(),await e$1.taskService.updateStatus(s,"done"),j(`Approved ${s}`);}),c$1.command("reject <id>").description("Reject a task and send it back for rework").option("-r, --reason <reason>","Feedback for the agent explaining what to fix").action(async(s,t)=>{await e$1.paths.requireInit(),await e$1.taskService.reject(s,t.reason),j(`Rejected ${s} \u2192 todo${t.reason?` (reason: ${t.reason})`:""}`);}),c$1.command("retry <id>").description("Retry a failed task").action(async s=>{await e$1.paths.requireInit(),await e$1.taskService.retry(s),j(`Reset ${s} to todo`);});}export{A as registerTaskCommand};
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {j,q,l,m}from'./chunk-L26TK7Y5.js';function g(l$1,t){let n=l$1.command("team").description("Manage agent teams");n.command("create <name>").description("Create a new team").requiredOption("--lead <agent-id>","Lead agent ID").option("--members <ids>","Comma-separated member agent IDs").option("-d, --description <desc>","Team description").option("--no-auto-claim","Disable auto-claiming").action(async(a,e)=>{await t.paths.requireInit();let i=await t.teamService.create({name:a,description:e.description,lead_agent_id:e.lead,member_agent_ids:e.members?.split(",").map(o=>o.trim()),config:{auto_claim:e.autoClaim!==false}});t.context.json?console.log(JSON.stringify(i,null,2)):t.context.quiet?console.log(i.id):j(`Created team "${i.name}" \u2192 ${i.id}`);}),n.command("list").description("List all teams").action(async()=>{await t.paths.requireInit();let a=await t.teamService.list();if(t.context.json){console.log(JSON.stringify(a,null,2));return}if(a.length===0){console.log(q(`
|
|
3
|
+
No teams. Create one: orch team create <name> --lead <agent-id>
|
|
4
|
+
`));return}let e=["ID","NAME","STATUS","LEAD","MEMBERS","POOL"],i=a.map(o=>[o.id,o.name,o.status,o.lead_agent_id,String(o.members.length),String(o.task_pool.length)]);console.log(),l(e,i),console.log();}),n.command("show <id>").description("Show team details").action(async a=>{await t.paths.requireInit();let e=await t.teamService.get(a);if(t.context.json){console.log(JSON.stringify(e,null,2));return}console.log(),m([["ID",e.id],["Name",e.name],["Status",e.status],["Lead",e.lead_agent_id],["Members",e.members.map(i=>`${i.agent_id} (${i.role})`).join(", ")],["Pool",e.task_pool.length>0?e.task_pool.join(", "):q("empty")],["Auto-claim",String(e.config.auto_claim)],["Created",e.created_at]]),console.log();}),n.command("join <team-id> <agent-id>").description("Add an agent to a team").action(async(a,e)=>{await t.paths.requireInit(),await t.teamService.join(a,e),j(`Agent ${e} joined team ${a}`);}),n.command("leave <team-id> <agent-id>").description("Remove an agent from a team").action(async(a,e)=>{await t.paths.requireInit(),await t.teamService.leave(a,e),j(`Agent ${e} left team ${a}`);}),n.command("add-task <team-id> <task-id>").description("Add a task to the team pool").action(async(a,e)=>{await t.paths.requireInit(),await t.teamService.addTask(a,e),j(`Task ${e} added to team ${a} pool`);}),n.command("set-lead <team-id> <agent-id>").description("Transfer team lead to another member").action(async(a,e)=>{await t.paths.requireInit(),await t.teamService.setLead(a,e),j(`${e} is now lead of team ${a}`);}),n.command("disband <id>").description("Disband a team").action(async a=>{await t.paths.requireInit(),await t.teamService.disband(a),j(`Team ${a} disbanded`);});}export{g as registerTeamCommand};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":[],"names":[],"mappings":"","file":"template-engine-
|
|
1
|
+
{"version":3,"sources":[],"names":[],"mappings":"","file":"template-engine-MFL5B677.js"}
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
function it(c,e){c.command("tui").description("Launch interactive TUI dashboard").action(async()=>{await e.paths.requireInit();let y=await e.taskService.list(),v=await e.agentService.list(),S=await e.stateStore.read(),{render:w}=await import('ink'),{createElement:h}=await import('react'),{App:f}=await import('./App-TW35IULR.js'),T=async t=>{await e.orchestrator.runTask(t);},A=async(t,s)=>e.taskService.create({title:t,priority:s?.priority,description:s?.description,attachments:s?.attachments}),k=async t=>{await e.orchestrator.cancelTask(t);},R=async t=>{await e.taskService.retry(t);},_=async(t,s)=>{await e.taskService.assign(t,s);},b=async()=>{await e.orchestrator.runAll();},C=async t=>{await e.agentService.disable(t);},E=async t=>{await e.agentService.enable(t);},j=t=>e.eventBus.onAny(t),D=async()=>e.taskService.list(),P=async()=>e.agentService.list(),G=async()=>e.stateStore.read(),U=async(t,s,r)=>e.agentService.create({name:t,adapter:s??"claude",model:r?.model||void 0,role:r?.role||void 0,approval_policy:r?.approval_policy||void 0}),x=async t=>{await e.agentService.remove(t);},I=async t=>{await e.taskService.delete(t);},L=async t=>{await e.taskService.updateStatus(t,"done");},H=async(t,s)=>{await e.taskService.reject(t,s);},W=async(t,s)=>e.taskService.update(t,s),F=async(t,s)=>e.agentService.update(t,{...s,approval_policy:s.approval_policy}),M=async t=>{await e.orchestrator.forceStopAgent(t);},N=async(t,s)=>e.agentService.setAutonomous(t,s),O=async t=>{let s=await e.runService.listAll(),r=3,rt=10,p=s.slice(0,r),d=s.slice(r,rt),u=async a=>(await e.runService.readEventsTail(a.id,30)).map(n=>({timestamp:n.timestamp,agentId:a.agent_id,taskId:a.task_id,type:n.type,data:n.data}));if(p.length>0){let a=(await Promise.all(p.map(u))).flat();a.sort((i,n)=>new Date(i.timestamp).getTime()-new Date(n.timestamp).getTime()),t(a.slice(-200));}if(d.length>0){let a=(await Promise.all(d.map(u))).flat();a.sort((i,n)=>new Date(i.timestamp).getTime()-new Date(n.timestamp).getTime()),t(a.slice(-200));}},V=async t=>e.teamService.create(t),q=async()=>e.teamService.list(),B=async(t,s)=>e.teamService.join(t,s),J=async(t,s)=>e.teamService.leave(t,s),K=async t=>{await e.teamService.disband(t);},z=async(t,s)=>e.teamService.setLead(t,s),Q=async()=>e.goalService.list(),X=async t=>e.goalService.create(t),Y=async(t,s)=>e.goalService.update(t,s),Z=async(t,s)=>e.goalService.updateStatus(t,s),$=async t=>{await e.goalService.delete(t);},tt=async t=>e.goalService.getProgressReport(t),et=async()=>{await e.orchestrator.startWatch();},st=async()=>{await e.orchestrator.stop();},g=c.version()??"0.0.0",at=import('./update-check-HGMBDYHL.js').then(t=>t.checkForUpdateSWR(g)).catch(()=>null),o=false,l;try{await e.orchestrator.startWatch(),o=!0;}catch(t){l=t instanceof Error?t.message:String(t);}let m=await at,{waitUntilExit:nt}=w(h(f,{projectName:e.config.project.name,tasks:y,agents:v,state:S,onRunTask:T,onCreateTask:A,onCancelTask:k,onRetryTask:R,onAssignTask:_,onRunAll:b,onDisableAgent:C,onEnableAgent:E,onSubscribeEvents:j,onRefreshTasks:D,onRefreshAgents:P,onRefreshState:G,onLoadHistory:O,onAddAgent:U,onDeleteAgent:x,onApproveTask:L,onRejectTask:H,onDeleteTask:I,onUpdateTask:W,onUpdateAgent:F,onForceStopAgent:M,onToggleAutonomous:N,onRefreshGoals:Q,onCreateGoal:X,onUpdateGoal:Y,onUpdateGoalStatus:Z,onDeleteGoal:$,onGetGoalProgress:tt,onCreateTeam:V,onListTeams:q,onJoinTeam:B,onLeaveTeam:J,onDisbandTeam:K,onSetTeamLead:z,onStartWatch:et,onStopWatch:st,initialWatchActive:o,watchError:l,version:g,latestVersion:m?.updateAvailable?m.latest:void 0,initialActivityFilter:e.globalConfig.tui.activity_filter,onSaveActivityFilter:async t=>{await e.globalConfigStore.set("activity_filter",t);},initialMaxConcurrent:e.config.scheduling.max_concurrent_agents,onSaveMaxConcurrent:async t=>{await e.configStore.set("scheduling.max_concurrent_agents",t),e.config.scheduling.max_concurrent_agents=t;}}),{kittyKeyboard:{mode:"auto",flags:["disambiguateEscapeCodes"]}});await nt(),o&&await e.orchestrator.stop().catch(()=>{});});}export{it as registerTuiCommand};
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {a}from'./chunk-UMZEA3JT.js';import {p,q}from'./chunk-L26TK7Y5.js';import {execFile}from'child_process';import e from'chalk';var c="@oxgeneral/orch";function u(){return new Promise(n=>{let t=execFile("npm",["install","-g",`${c}@latest`],{timeout:6e4},(s,o,a)=>{let d=(o??"")+(a??"");n({code:s?1:0,output:d});});t.stdout?.pipe(process.stdout),t.stderr?.pipe(process.stderr);})}function h(n){n.command("update").description("Check for updates and install the latest version").option("--check","Only check, do not install").action(async t=>{console.log(),console.log(` ${p("orch update")} \xB7 checking for updates\u2026`),console.log();let s=n.version()??"0.0.0",o=await a(s);if(o||(console.log(` ${e.ansi256(167)("\u2715")} Could not reach npm registry`),console.log(" Check your network connection and try again."),console.log(),process.exit(1)),!o.updateAvailable){console.log(` ${e.ansi256(72)("\u2713")} Already up to date ${q(`(${o.current})`)}`),console.log();return}if(console.log(` ${e.ansi256(214)("\u25CF")} Update available: ${q(o.current)} \u2192 ${e.ansi256(72)(o.latest)}`),console.log(),t.check){console.log(` Run ${q("orch update")} to install.`),console.log();return}console.log(` Installing ${c}@${o.latest}\u2026`),console.log(),(await u()).code!==0&&(console.log(),console.log(` ${e.ansi256(167)("\u2715")} Update failed. Try manually:`),console.log(` npm install -g ${c}@latest`),console.log(),process.exit(1)),console.log(),console.log(` ${e.ansi256(72)("\u2713")} Updated to ${o.latest}`),console.log();});}export{h as registerUpdateCommand};
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
import {m,n as n$1,i}from'./chunk-ZA5Z33GO.js';import {l}from'./chunk-GZ2Q56YZ.js';import n from'path';import h from'fs/promises';var g=class{constructor(r,e){this.projectRoot=r;this.processManager=e;}async mergeBack(r){return new Promise(e=>{let{process:o}=this.processManager.spawn("git",["merge","--no-ff",r,"-m",`Merge ${r}`],{cwd:this.projectRoot}),t="",a=2e3,c=i=>{t.length<a&&(t+=i.toString());};o.stdout?.on("data",c),o.stderr?.on("data",c),o.on("close",i=>{if(i===0){e({success:true});return}let s=t.slice(0,1e3);if(!(s.includes("CONFLICT")||s.includes("Merge conflict"))){e({success:false,conflictInfo:s});return}try{let{process:f}=this.processManager.spawn("git",["merge","--abort"],{cwd:this.projectRoot});f.on("close",()=>{e({success:!1,conflictInfo:s});}),f.on("error",()=>{e({success:!1,conflictInfo:s});});}catch{e({success:false,conflictInfo:s});}}),o.on("error",i=>{e({success:false,conflictInfo:i.message});});})}};var y=class{constructor(r,e,o){this.projectRoot=r;this.orchestryDir=e;this.processManager=o;this.mergeStrategy=new g(r,o);}mergeStrategy;gitRepoChecked=false;isGitRepo=false;async prepare(r,e,o){let t=this.resolveMode(r,e,o);switch(t!=="shared"&&await this.requireGitRepo(t),t){case "shared":return {path:this.projectRoot};case "worktree":return this.prepareWorktree(r);case "isolated":return {path:await this.prepareIsolated(r)};default:return {path:this.projectRoot}}}async requireGitRepo(r){if(!this.gitRepoChecked){try{let{process:e}=this.processManager.spawn("git",["rev-parse","--is-inside-work-tree"],{cwd:this.projectRoot}),o=await new Promise(t=>{e.on("close",t),e.on("error",()=>t(1));});this.isGitRepo=o===0;}catch{this.isGitRepo=false;}this.isGitRepo&&(this.gitRepoChecked=true);}if(!this.isGitRepo)throw new l(`workspace_mode "${r}" requires a git repository`,`Run: git init && git add -A && git commit -m "Initial commit"
|
|
3
|
+
Or set workspace_mode: shared in .orchestry/config.yml`)}async mergeBack(r){return this.mergeStrategy.mergeBack(r)}async cleanup(r){let e=n.join(this.orchestryDir,"workspaces",m(r));try{let{process:o}=this.processManager.spawn("git",["worktree","remove","--force",e],{cwd:this.projectRoot});await new Promise(t=>{o.on("close",()=>t()),o.on("error",()=>t());});}catch{}try{await h.rm(e,{recursive:!0,force:!0});}catch{}}validate(r,e){n$1(r,e);}resolveMode(r,e,o){return r.workspace_mode??e.config.workspace_mode??o.defaults.agent.workspace_mode??"worktree"}async prepareWorktree(r){let e=n.join(this.orchestryDir,"workspaces",m(r.id));await i(n.dirname(e));let o=k(r.title)||m(r.id),t=`orchestry/${m(r.id)}/${o}`,{process:a}=this.processManager.spawn("git",["worktree","add",e,"-b",t],{cwd:this.projectRoot});await new Promise((i,s)=>{a.on("close",p=>{p===0?i():s(new Error(`git worktree add failed with code ${p}`));}),a.on("error",s);});let c=n.join(e,".orchestry");return await h.rm(c,{recursive:true,force:true}).catch(()=>{}),{path:e,branch:t}}async prepareIsolated(r){let e=n.join(this.orchestryDir,"workspaces",m(r.id));await i(n.dirname(e));try{let{process:t}=this.processManager.spawn("git",["clone","--local","--no-hardlinks",".",e],{cwd:this.projectRoot});await new Promise((a,c)=>{t.on("close",i=>{i===0?a():c(new Error("git clone failed"));}),t.on("error",c);});}catch{let a=["-a",`--exclude-from=${n.join(this.orchestryDir,"workspace-exclude")}`,"./",`${e}/`],{process:c}=this.processManager.spawn("rsync",a,{cwd:this.projectRoot});await new Promise((i,s)=>{c.on("close",p=>{p===0?i():s(new Error(`rsync failed with code ${p}`));}),c.on("error",s);});}let o=n.join(e,".orchestry");return await h.rm(o,{recursive:true,force:true}).catch(()=>{}),e}};function k(l){return l.toLowerCase().replace(/[^a-z0-9]+/g,"-").replace(/^-|-$/g,"").slice(0,40)}export{y as WorkspaceManager};
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
import {
|
|
3
|
-
import './chunk-O5AO5QIR.js';
|
|
1
|
+
import { sanitizeId, validateWorkspacePath, ensureDir } from './chunk-QEEM67OA.js';
|
|
2
|
+
import { WorkspaceError } from './chunk-IQXRQBUK.js';
|
|
4
3
|
import path from 'path';
|
|
5
4
|
import fs from 'fs/promises';
|
|
6
5
|
|
|
@@ -71,8 +70,13 @@ var WorkspaceManager = class {
|
|
|
71
70
|
this.mergeStrategy = new MergeStrategy(projectRoot, processManager);
|
|
72
71
|
}
|
|
73
72
|
mergeStrategy;
|
|
73
|
+
gitRepoChecked = false;
|
|
74
|
+
isGitRepo = false;
|
|
74
75
|
async prepare(task, agent, config) {
|
|
75
76
|
const mode = this.resolveMode(task, agent, config);
|
|
77
|
+
if (mode !== "shared") {
|
|
78
|
+
await this.requireGitRepo(mode);
|
|
79
|
+
}
|
|
76
80
|
switch (mode) {
|
|
77
81
|
case "shared":
|
|
78
82
|
return { path: this.projectRoot };
|
|
@@ -84,6 +88,31 @@ var WorkspaceManager = class {
|
|
|
84
88
|
return { path: this.projectRoot };
|
|
85
89
|
}
|
|
86
90
|
}
|
|
91
|
+
async requireGitRepo(mode) {
|
|
92
|
+
if (!this.gitRepoChecked) {
|
|
93
|
+
try {
|
|
94
|
+
const { process: proc } = this.processManager.spawn(
|
|
95
|
+
"git",
|
|
96
|
+
["rev-parse", "--is-inside-work-tree"],
|
|
97
|
+
{ cwd: this.projectRoot }
|
|
98
|
+
);
|
|
99
|
+
const code = await new Promise((resolve) => {
|
|
100
|
+
proc.on("close", resolve);
|
|
101
|
+
proc.on("error", () => resolve(1));
|
|
102
|
+
});
|
|
103
|
+
this.isGitRepo = code === 0;
|
|
104
|
+
} catch {
|
|
105
|
+
this.isGitRepo = false;
|
|
106
|
+
}
|
|
107
|
+
if (this.isGitRepo) this.gitRepoChecked = true;
|
|
108
|
+
}
|
|
109
|
+
if (!this.isGitRepo) {
|
|
110
|
+
throw new WorkspaceError(
|
|
111
|
+
`workspace_mode "${mode}" requires a git repository`,
|
|
112
|
+
'Run: git init && git add -A && git commit -m "Initial commit"\n Or set workspace_mode: shared in .orchestry/config.yml'
|
|
113
|
+
);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
87
116
|
async mergeBack(branch) {
|
|
88
117
|
return this.mergeStrategy.mergeBack(branch);
|
|
89
118
|
}
|
|
@@ -133,6 +162,9 @@ var WorkspaceManager = class {
|
|
|
133
162
|
});
|
|
134
163
|
proc.on("error", reject);
|
|
135
164
|
});
|
|
165
|
+
const worktreeOrchestry = path.join(workspacePath, ".orchestry");
|
|
166
|
+
await fs.rm(worktreeOrchestry, { recursive: true, force: true }).catch(() => {
|
|
167
|
+
});
|
|
136
168
|
return { path: workspacePath, branch: branchName };
|
|
137
169
|
}
|
|
138
170
|
async prepareIsolated(task) {
|
|
@@ -169,6 +201,9 @@ var WorkspaceManager = class {
|
|
|
169
201
|
proc.on("error", reject);
|
|
170
202
|
});
|
|
171
203
|
}
|
|
204
|
+
const clonedOrchestry = path.join(workspacePath, ".orchestry");
|
|
205
|
+
await fs.rm(clonedOrchestry, { recursive: true, force: true }).catch(() => {
|
|
206
|
+
});
|
|
172
207
|
return workspacePath;
|
|
173
208
|
}
|
|
174
209
|
};
|
|
@@ -177,3 +212,5 @@ function sanitizeTitle(title) {
|
|
|
177
212
|
}
|
|
178
213
|
|
|
179
214
|
export { WorkspaceManager };
|
|
215
|
+
//# sourceMappingURL=workspace-manager-T6AXG7XL.js.map
|
|
216
|
+
//# sourceMappingURL=workspace-manager-T6AXG7XL.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"sources":["../src/infrastructure/workspace/merge-strategy.ts","../src/infrastructure/workspace/workspace-manager.ts"],"names":[],"mappings":"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","file":"workspace-manager-T6AXG7XL.js","sourcesContent":["/**\n * Git merge strategy for worktree branches.\n *\n * Encapsulates `git merge --no-ff` execution and conflict handling.\n */\n\nimport type { IProcessManager } from '../process/process-manager.js';\n\nexport type MergeResult =\n | { success: true }\n | { success: false; conflictInfo: string };\n\nexport class MergeStrategy {\n constructor(\n private readonly projectRoot: string,\n private readonly processManager: IProcessManager,\n ) {}\n\n /**\n * Merge a branch into the current branch with --no-ff.\n * On conflict, aborts the merge and returns conflict info.\n */\n async mergeBack(branch: string): Promise<MergeResult> {\n return new Promise((resolve) => {\n const { process: proc } = this.processManager.spawn(\n 'git',\n ['merge', '--no-ff', branch, '-m', `Merge ${branch}`],\n { cwd: this.projectRoot },\n );\n\n let output = '';\n const maxOutputLen = 2000;\n const appendOutput = (chunk: Buffer) => {\n if (output.length < maxOutputLen) output += chunk.toString();\n };\n proc.stdout?.on('data', appendOutput);\n proc.stderr?.on('data', appendOutput);\n\n proc.on('close', (code) => {\n if (code === 0) {\n resolve({ success: true });\n return;\n }\n\n const trimmedOutput = output.slice(0, 1000);\n const isConflict = trimmedOutput.includes('CONFLICT') || trimmedOutput.includes('Merge conflict');\n\n if (!isConflict) {\n // Non-conflict failure (branch not found, hook failure, etc.) — no merge to abort\n resolve({ success: false, conflictInfo: trimmedOutput });\n return;\n }\n\n // Abort the failed merge to restore clean state\n try {\n const { process: abortProc } = this.processManager.spawn(\n 'git',\n ['merge', '--abort'],\n { cwd: this.projectRoot },\n );\n abortProc.on('close', () => {\n resolve({ success: false, conflictInfo: trimmedOutput });\n });\n abortProc.on('error', () => {\n resolve({ success: false, conflictInfo: trimmedOutput });\n });\n } catch {\n resolve({ success: false, conflictInfo: trimmedOutput });\n }\n });\n\n proc.on('error', (err) => {\n resolve({ success: false, conflictInfo: err.message });\n });\n });\n }\n}\n","/**\n * Workspace manager implementation.\n *\n * Resolves workspace path based on mode priority chain:\n * task.workspace_mode → agent.config.workspace_mode → defaults.agent.workspace_mode → 'worktree'\n */\n\nimport path from 'node:path';\nimport fs from 'node:fs/promises';\nimport type { Agent } from '../../domain/agent.js';\nimport type { OrchestratorConfig } from '../../domain/config.js';\nimport type { Task, WorkspaceMode } from '../../domain/task.js';\nimport type { IProcessManager } from '../process/process-manager.js';\nimport { validateWorkspacePath, sanitizeId } from '../storage/paths.js';\nimport { ensureDir } from '../storage/fs-utils.js';\nimport type { IWorkspaceManager, PrepareResult } from './interface.js';\nimport { MergeStrategy, type MergeResult } from './merge-strategy.js';\nimport { WorkspaceError } from '../../domain/errors.js';\n\nexport class WorkspaceManager implements IWorkspaceManager {\n private readonly mergeStrategy: MergeStrategy;\n private gitRepoChecked = false;\n private isGitRepo = false;\n\n constructor(\n private readonly projectRoot: string,\n private readonly orchestryDir: string,\n private readonly processManager: IProcessManager,\n ) {\n this.mergeStrategy = new MergeStrategy(projectRoot, processManager);\n }\n\n async prepare(task: Task, agent: Agent, config: OrchestratorConfig): Promise<PrepareResult> {\n const mode = this.resolveMode(task, agent, config);\n\n if (mode !== 'shared') {\n await this.requireGitRepo(mode);\n }\n\n switch (mode) {\n case 'shared':\n return { path: this.projectRoot };\n\n case 'worktree':\n return this.prepareWorktree(task);\n\n case 'isolated':\n return { path: await this.prepareIsolated(task) };\n\n default:\n return { path: this.projectRoot };\n }\n }\n\n private async requireGitRepo(mode: WorkspaceMode): Promise<void> {\n if (!this.gitRepoChecked) {\n try {\n const { process: proc } = this.processManager.spawn(\n 'git',\n ['rev-parse', '--is-inside-work-tree'],\n { cwd: this.projectRoot },\n );\n const code = await new Promise<number | null>((resolve) => {\n proc.on('close', resolve);\n proc.on('error', () => resolve(1));\n });\n this.isGitRepo = code === 0;\n } catch {\n this.isGitRepo = false;\n }\n // Only cache positive result — negative may change if user runs git init\n if (this.isGitRepo) this.gitRepoChecked = true;\n }\n\n if (!this.isGitRepo) {\n throw new WorkspaceError(\n `workspace_mode \"${mode}\" requires a git repository`,\n 'Run: git init && git add -A && git commit -m \"Initial commit\"\\n Or set workspace_mode: shared in .orchestry/config.yml',\n );\n }\n }\n\n async mergeBack(branch: string): Promise<MergeResult> {\n return this.mergeStrategy.mergeBack(branch);\n }\n\n async cleanup(taskId: string): Promise<void> {\n const workspacePath = path.join(this.orchestryDir, 'workspaces', sanitizeId(taskId));\n\n // Try git worktree remove first (cleans up .git/worktrees/ metadata)\n try {\n const { process: proc } = this.processManager.spawn(\n 'git',\n ['worktree', 'remove', '--force', workspacePath],\n { cwd: this.projectRoot },\n );\n await new Promise<void>((resolve) => {\n proc.on('close', () => resolve());\n proc.on('error', () => resolve());\n });\n } catch {\n // Not a worktree or git not available — fall through to rm\n }\n\n // Remove directory regardless (handles isolated mode and worktree cleanup failures)\n try {\n await fs.rm(workspacePath, { recursive: true, force: true });\n } catch {\n // Workspace may not exist\n }\n }\n\n validate(workspacePath: string, projectRoot: string): void {\n validateWorkspacePath(workspacePath, projectRoot);\n }\n\n private resolveMode(task: Task, agent: Agent, config: OrchestratorConfig): WorkspaceMode {\n return (\n task.workspace_mode ??\n agent.config.workspace_mode ??\n config.defaults.agent.workspace_mode ??\n 'worktree'\n );\n }\n\n private async prepareWorktree(task: Task): Promise<PrepareResult> {\n const workspacePath = path.join(\n this.orchestryDir,\n 'workspaces',\n sanitizeId(task.id),\n );\n await ensureDir(path.dirname(workspacePath));\n\n const titleSlug = sanitizeTitle(task.title) || sanitizeId(task.id);\n const branchName = `orchestry/${sanitizeId(task.id)}/${titleSlug}`;\n\n const { process: proc } = this.processManager.spawn(\n 'git',\n ['worktree', 'add', workspacePath, '-b', branchName],\n { cwd: this.projectRoot },\n );\n\n await new Promise<void>((resolve, reject) => {\n proc.on('close', (code) => {\n if (code === 0) resolve();\n else reject(new Error(`git worktree add failed with code ${code}`));\n });\n proc.on('error', reject);\n });\n\n // Remove .orchestry/ from worktree to prevent recursive state/workspaces\n const worktreeOrchestry = path.join(workspacePath, '.orchestry');\n await fs.rm(worktreeOrchestry, { recursive: true, force: true }).catch(() => {});\n\n return { path: workspacePath, branch: branchName };\n }\n\n private async prepareIsolated(task: Task): Promise<string> {\n const workspacePath = path.join(\n this.orchestryDir,\n 'workspaces',\n sanitizeId(task.id),\n );\n await ensureDir(path.dirname(workspacePath));\n\n // Try git clone first, fall back to rsync\n try {\n const { process: proc } = this.processManager.spawn(\n 'git',\n ['clone', '--local', '--no-hardlinks', '.', workspacePath],\n { cwd: this.projectRoot },\n );\n\n await new Promise<void>((resolve, reject) => {\n proc.on('close', (code) => {\n if (code === 0) resolve();\n else reject(new Error('git clone failed'));\n });\n proc.on('error', reject);\n });\n } catch {\n // Fallback: rsync\n const excludeFile = path.join(this.orchestryDir, 'workspace-exclude');\n const args = ['-a', `--exclude-from=${excludeFile}`, './', `${workspacePath}/`];\n\n const { process: proc } = this.processManager.spawn('rsync', args, {\n cwd: this.projectRoot,\n });\n\n await new Promise<void>((resolve, reject) => {\n proc.on('close', (code) => {\n if (code === 0) resolve();\n else reject(new Error(`rsync failed with code ${code}`));\n });\n proc.on('error', reject);\n });\n }\n\n // Remove .orchestry/ to prevent recursive workspaces (covers both clone and rsync)\n const clonedOrchestry = path.join(workspacePath, '.orchestry');\n await fs.rm(clonedOrchestry, { recursive: true, force: true }).catch(() => {});\n\n return workspacePath;\n }\n}\n\nfunction sanitizeTitle(title: string): string {\n return title\n .toLowerCase()\n .replace(/[^a-z0-9]+/g, '-')\n .replace(/^-|-$/g, '')\n .slice(0, 40);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oxgeneral/orch",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "Agents Organizations — CLI orchestrator for AI agents",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"engines": {
|
|
@@ -33,6 +33,7 @@
|
|
|
33
33
|
"typecheck": "tsc --noEmit",
|
|
34
34
|
"clean": "rm -rf dist",
|
|
35
35
|
"postinstall": "node scripts/postinstall.js || true",
|
|
36
|
+
"benchmark": "tsx scripts/benchmark.ts",
|
|
36
37
|
"prepublishOnly": "npm run build"
|
|
37
38
|
},
|
|
38
39
|
"keywords": [
|
package/readme.md
CHANGED
|
@@ -10,16 +10,17 @@
|
|
|
10
10
|
<a href="https://www.npmjs.com/package/@oxgeneral/orch"><img src="https://img.shields.io/npm/v/@oxgeneral/orch?color=cb0000" alt="npm" /></a>
|
|
11
11
|
<a href="#get-started-in-30-seconds"><img src="https://img.shields.io/badge/setup-one%20command-brightgreen" alt="One command setup" /></a>
|
|
12
12
|
<a href="LICENSE"><img src="https://img.shields.io/badge/license-MIT-blue" alt="MIT License" /></a>
|
|
13
|
-
<a href="#development"><img src="https://img.shields.io/badge/tests-
|
|
13
|
+
<a href="#development"><img src="https://img.shields.io/badge/tests-987%20passing-brightgreen" alt="Tests" /></a>
|
|
14
14
|
<a href="#architecture"><img src="https://img.shields.io/badge/TypeScript-strict-blue" alt="TypeScript strict" /></a>
|
|
15
15
|
</p>
|
|
16
16
|
</p>
|
|
17
17
|
|
|
18
18
|
---
|
|
19
19
|
|
|
20
|
+
<div align="center">
|
|
21
|
+
<video src="https://github.com/user-attachments/assets/c7c3ab77-e718-4e5a-a8cf-bfc446ace64e" width="100%" controls autoplay loop muted></video>
|
|
22
|
+
</div>
|
|
20
23
|
<p align="center">
|
|
21
|
-
<img src="assets/screenshot-tui.png" alt="ORCH TUI Dashboard — real-time task monitoring, agent activity feed, and keyboard-driven controls" width="100%" />
|
|
22
|
-
<br/>
|
|
23
24
|
<em>Real-time TUI dashboard: tasks running, agents working, activity streaming — all from one terminal.</em>
|
|
24
25
|
</p>
|
|
25
26
|
|
|
@@ -230,7 +231,7 @@ src/
|
|
|
230
231
|
```bash
|
|
231
232
|
npm run dev # Run via tsx
|
|
232
233
|
npm run build # Build ESM + DTS
|
|
233
|
-
npm test #
|
|
234
|
+
npm test # 977 tests via Vitest
|
|
234
235
|
npm run typecheck # Strict TypeScript
|
|
235
236
|
```
|
|
236
237
|
|