@zhijiewang/openharness 0.5.1 → 0.6.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/commands/cybergotchi.d.ts.map +1 -1
- package/dist/commands/cybergotchi.js +22 -19
- package/dist/commands/cybergotchi.js.map +1 -1
- package/dist/components/App.d.ts +1 -1
- package/dist/components/App.d.ts.map +1 -1
- package/dist/components/App.js +58 -2
- package/dist/components/App.js.map +1 -1
- package/dist/components/CompanionFooter.d.ts +9 -0
- package/dist/components/CompanionFooter.d.ts.map +1 -0
- package/dist/components/CompanionFooter.js +13 -0
- package/dist/components/CompanionFooter.js.map +1 -0
- package/dist/components/CybergotchiBubble.d.ts +2 -1
- package/dist/components/CybergotchiBubble.d.ts.map +1 -1
- package/dist/components/CybergotchiBubble.js +4 -5
- package/dist/components/CybergotchiBubble.js.map +1 -1
- package/dist/components/CybergotchiPanel.d.ts +5 -4
- package/dist/components/CybergotchiPanel.d.ts.map +1 -1
- package/dist/components/CybergotchiPanel.js +4 -2
- package/dist/components/CybergotchiPanel.js.map +1 -1
- package/dist/components/CybergotchiPanelConnected.js +4 -4
- package/dist/components/CybergotchiPanelConnected.js.map +1 -1
- package/dist/components/CybergotchiSetup.d.ts.map +1 -1
- package/dist/components/CybergotchiSetup.js +25 -61
- package/dist/components/CybergotchiSetup.js.map +1 -1
- package/dist/components/CybergotchiSprite.d.ts +5 -4
- package/dist/components/CybergotchiSprite.d.ts.map +1 -1
- package/dist/components/CybergotchiSprite.js +16 -9
- package/dist/components/CybergotchiSprite.js.map +1 -1
- package/dist/components/DiffView.d.ts +27 -0
- package/dist/components/DiffView.d.ts.map +1 -0
- package/dist/components/DiffView.js +74 -0
- package/dist/components/DiffView.js.map +1 -0
- package/dist/components/Messages.js +1 -1
- package/dist/components/Messages.js.map +1 -1
- package/dist/components/PermissionPrompt.d.ts.map +1 -1
- package/dist/components/PermissionPrompt.js +61 -8
- package/dist/components/PermissionPrompt.js.map +1 -1
- package/dist/components/REPL.d.ts.map +1 -1
- package/dist/components/REPL.js +75 -21
- package/dist/components/REPL.js.map +1 -1
- package/dist/components/TextInput.d.ts +2 -1
- package/dist/components/TextInput.d.ts.map +1 -1
- package/dist/components/TextInput.js +110 -6
- package/dist/components/TextInput.js.map +1 -1
- package/dist/cybergotchi/bones.d.ts +12 -0
- package/dist/cybergotchi/bones.d.ts.map +1 -0
- package/dist/cybergotchi/bones.js +89 -0
- package/dist/cybergotchi/bones.js.map +1 -0
- package/dist/cybergotchi/config.d.ts +14 -4
- package/dist/cybergotchi/config.d.ts.map +1 -1
- package/dist/cybergotchi/config.js +62 -9
- package/dist/cybergotchi/config.js.map +1 -1
- package/dist/cybergotchi/needs.d.ts +4 -4
- package/dist/cybergotchi/needs.d.ts.map +1 -1
- package/dist/cybergotchi/needs.js.map +1 -1
- package/dist/cybergotchi/personality.d.ts +11 -0
- package/dist/cybergotchi/personality.d.ts.map +1 -0
- package/dist/cybergotchi/personality.js +26 -0
- package/dist/cybergotchi/personality.js.map +1 -0
- package/dist/cybergotchi/species.d.ts +0 -1
- package/dist/cybergotchi/species.d.ts.map +1 -1
- package/dist/cybergotchi/species.js +253 -229
- package/dist/cybergotchi/species.js.map +1 -1
- package/dist/cybergotchi/types.d.ts +45 -7
- package/dist/cybergotchi/types.d.ts.map +1 -1
- package/dist/cybergotchi/types.js +36 -5
- package/dist/cybergotchi/types.js.map +1 -1
- package/dist/cybergotchi/useCybergotchi.d.ts +7 -5
- package/dist/cybergotchi/useCybergotchi.d.ts.map +1 -1
- package/dist/cybergotchi/useCybergotchi.js +27 -16
- package/dist/cybergotchi/useCybergotchi.js.map +1 -1
- package/dist/git/index.d.ts +9 -0
- package/dist/git/index.d.ts.map +1 -1
- package/dist/git/index.js +31 -0
- package/dist/git/index.js.map +1 -1
- package/dist/harness/config.d.ts +5 -0
- package/dist/harness/config.d.ts.map +1 -1
- package/dist/harness/config.js.map +1 -1
- package/dist/harness/credentials.d.ts +24 -0
- package/dist/harness/credentials.d.ts.map +1 -0
- package/dist/harness/credentials.js +104 -0
- package/dist/harness/credentials.js.map +1 -0
- package/dist/harness/hooks.d.ts +8 -0
- package/dist/harness/hooks.d.ts.map +1 -1
- package/dist/harness/hooks.js +98 -22
- package/dist/harness/hooks.js.map +1 -1
- package/dist/harness/keybindings.d.ts +37 -0
- package/dist/harness/keybindings.d.ts.map +1 -0
- package/dist/harness/keybindings.js +134 -0
- package/dist/harness/keybindings.js.map +1 -0
- package/dist/harness/memory.d.ts +35 -0
- package/dist/harness/memory.d.ts.map +1 -0
- package/dist/harness/memory.js +115 -0
- package/dist/harness/memory.js.map +1 -0
- package/dist/harness/plugins.d.ts +57 -0
- package/dist/harness/plugins.d.ts.map +1 -0
- package/dist/harness/plugins.js +142 -0
- package/dist/harness/plugins.js.map +1 -0
- package/dist/harness/session.d.ts +5 -0
- package/dist/harness/session.d.ts.map +1 -1
- package/dist/harness/session.js +39 -1
- package/dist/harness/session.js.map +1 -1
- package/dist/lsp/client.d.ts +58 -0
- package/dist/lsp/client.d.ts.map +1 -0
- package/dist/lsp/client.js +174 -0
- package/dist/lsp/client.js.map +1 -0
- package/dist/main.js +160 -0
- package/dist/main.js.map +1 -1
- package/dist/mcp/DeferredMcpTool.d.ts +30 -0
- package/dist/mcp/DeferredMcpTool.d.ts.map +1 -0
- package/dist/mcp/DeferredMcpTool.js +75 -0
- package/dist/mcp/DeferredMcpTool.js.map +1 -0
- package/dist/mcp/client.d.ts +7 -0
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +56 -8
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/loader.d.ts +9 -0
- package/dist/mcp/loader.d.ts.map +1 -1
- package/dist/mcp/loader.js +43 -2
- package/dist/mcp/loader.js.map +1 -1
- package/dist/mcp/schema.d.ts +7 -0
- package/dist/mcp/schema.d.ts.map +1 -0
- package/dist/mcp/schema.js +41 -0
- package/dist/mcp/schema.js.map +1 -0
- package/dist/mcp/server.d.ts +16 -0
- package/dist/mcp/server.d.ts.map +1 -0
- package/dist/mcp/server.js +94 -0
- package/dist/mcp/server.js.map +1 -0
- package/dist/providers/anthropic.d.ts +1 -1
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/base.d.ts +15 -0
- package/dist/providers/base.d.ts.map +1 -1
- package/dist/providers/base.js +13 -1
- package/dist/providers/base.js.map +1 -1
- package/dist/providers/openai.d.ts +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js.map +1 -1
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +91 -14
- package/dist/query.js.map +1 -1
- package/dist/remote/server.d.ts +31 -0
- package/dist/remote/server.d.ts.map +1 -0
- package/dist/remote/server.js +163 -0
- package/dist/remote/server.js.map +1 -0
- package/dist/services/AgentDispatcher.d.ts +42 -0
- package/dist/services/AgentDispatcher.d.ts.map +1 -0
- package/dist/services/AgentDispatcher.js +181 -0
- package/dist/services/AgentDispatcher.js.map +1 -0
- package/dist/services/StreamingToolExecutor.d.ts +2 -1
- package/dist/services/StreamingToolExecutor.d.ts.map +1 -1
- package/dist/services/StreamingToolExecutor.js +11 -2
- package/dist/services/StreamingToolExecutor.js.map +1 -1
- package/dist/tools/AgentTool/index.d.ts +3 -0
- package/dist/tools/AgentTool/index.d.ts.map +1 -1
- package/dist/tools/AgentTool/index.js +54 -16
- package/dist/tools/AgentTool/index.js.map +1 -1
- package/dist/tools/DiagnosticsTool/index.d.ts +21 -0
- package/dist/tools/DiagnosticsTool/index.d.ts.map +1 -0
- package/dist/tools/DiagnosticsTool/index.js +108 -0
- package/dist/tools/DiagnosticsTool/index.js.map +1 -0
- package/dist/tools/GrepTool/index.d.ts +2 -2
- package/dist/tools/ParallelAgentTool/index.d.ts +37 -0
- package/dist/tools/ParallelAgentTool/index.d.ts.map +1 -0
- package/dist/tools/ParallelAgentTool/index.js +53 -0
- package/dist/tools/ParallelAgentTool/index.js.map +1 -0
- package/dist/tools/SkillTool/index.d.ts.map +1 -1
- package/dist/tools/SkillTool/index.js +22 -27
- package/dist/tools/SkillTool/index.js.map +1 -1
- package/dist/tools/ToolSearchTool/index.d.ts +15 -0
- package/dist/tools/ToolSearchTool/index.d.ts.map +1 -0
- package/dist/tools/ToolSearchTool/index.js +50 -0
- package/dist/tools/ToolSearchTool/index.js.map +1 -0
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +9 -0
- package/dist/tools.js.map +1 -1
- package/dist/types/message.d.ts +2 -0
- package/dist/types/message.d.ts.map +1 -1
- package/dist/types/message.js +3 -0
- package/dist/types/message.js.map +1 -1
- package/dist/types/permissions.d.ts +2 -0
- package/dist/types/permissions.d.ts.map +1 -1
- package/dist/types/permissions.js +30 -0
- package/dist/types/permissions.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Remote server — HTTP + WebSocket server for remote agent dispatch,
|
|
3
|
+
* bidirectional channels, and structured event streaming.
|
|
4
|
+
*
|
|
5
|
+
* Endpoints:
|
|
6
|
+
* - POST /dispatch — send a prompt, get a streaming response
|
|
7
|
+
* - GET /status — check server status
|
|
8
|
+
* - WS /channel — bidirectional WebSocket channel
|
|
9
|
+
*/
|
|
10
|
+
import type { Provider } from '../providers/base.js';
|
|
11
|
+
import type { Tools } from '../Tool.js';
|
|
12
|
+
import type { PermissionMode } from '../types/permissions.js';
|
|
13
|
+
export type RemoteServerConfig = {
|
|
14
|
+
port: number;
|
|
15
|
+
provider: Provider;
|
|
16
|
+
tools: Tools;
|
|
17
|
+
systemPrompt: string;
|
|
18
|
+
permissionMode: PermissionMode;
|
|
19
|
+
model?: string;
|
|
20
|
+
};
|
|
21
|
+
export declare class RemoteServer {
|
|
22
|
+
private config;
|
|
23
|
+
private channels;
|
|
24
|
+
private server;
|
|
25
|
+
constructor(config: RemoteServerConfig);
|
|
26
|
+
start(): Promise<void>;
|
|
27
|
+
stop(): void;
|
|
28
|
+
private handleHttp;
|
|
29
|
+
private handleChannel;
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=server.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/remote/server.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAQF,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,QAAQ,CAA8B;IAC9C,OAAO,CAAC,MAAM,CAAgD;gBAElD,MAAM,EAAE,kBAAkB;IAItC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtB,IAAI,IAAI,IAAI;YASE,UAAU;IAqExB,OAAO,CAAC,aAAa;CAgDtB"}
|
|
@@ -0,0 +1,163 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Remote server — HTTP + WebSocket server for remote agent dispatch,
|
|
3
|
+
* bidirectional channels, and structured event streaming.
|
|
4
|
+
*
|
|
5
|
+
* Endpoints:
|
|
6
|
+
* - POST /dispatch — send a prompt, get a streaming response
|
|
7
|
+
* - GET /status — check server status
|
|
8
|
+
* - WS /channel — bidirectional WebSocket channel
|
|
9
|
+
*/
|
|
10
|
+
import { createServer } from 'node:http';
|
|
11
|
+
import { WebSocketServer, WebSocket } from 'ws';
|
|
12
|
+
export class RemoteServer {
|
|
13
|
+
config;
|
|
14
|
+
channels = new Map();
|
|
15
|
+
server = null;
|
|
16
|
+
constructor(config) {
|
|
17
|
+
this.config = config;
|
|
18
|
+
}
|
|
19
|
+
start() {
|
|
20
|
+
return new Promise((resolve) => {
|
|
21
|
+
this.server = createServer((req, res) => this.handleHttp(req, res));
|
|
22
|
+
// WebSocket upgrade
|
|
23
|
+
const wss = new WebSocketServer({ noServer: true });
|
|
24
|
+
this.server.on('upgrade', (request, socket, head) => {
|
|
25
|
+
if (request.url === '/channel') {
|
|
26
|
+
wss.handleUpgrade(request, socket, head, (ws) => {
|
|
27
|
+
this.handleChannel(ws);
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
socket.destroy();
|
|
32
|
+
}
|
|
33
|
+
});
|
|
34
|
+
this.server.listen(this.config.port, () => {
|
|
35
|
+
process.stderr.write(`[remote] Server listening on http://localhost:${this.config.port}\n`);
|
|
36
|
+
process.stderr.write(`[remote] Endpoints: POST /dispatch, GET /status, WS /channel\n`);
|
|
37
|
+
resolve();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
stop() {
|
|
42
|
+
for (const ch of this.channels.values()) {
|
|
43
|
+
ch.abortController.abort();
|
|
44
|
+
ch.ws.close();
|
|
45
|
+
}
|
|
46
|
+
this.channels.clear();
|
|
47
|
+
this.server?.close();
|
|
48
|
+
}
|
|
49
|
+
async handleHttp(req, res) {
|
|
50
|
+
// CORS headers
|
|
51
|
+
res.setHeader('Access-Control-Allow-Origin', '*');
|
|
52
|
+
res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
|
|
53
|
+
res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
|
|
54
|
+
if (req.method === 'OPTIONS') {
|
|
55
|
+
res.writeHead(204);
|
|
56
|
+
res.end();
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
if (req.url === '/status' && req.method === 'GET') {
|
|
60
|
+
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
61
|
+
res.end(JSON.stringify({
|
|
62
|
+
status: 'ok',
|
|
63
|
+
provider: this.config.provider.name,
|
|
64
|
+
model: this.config.model,
|
|
65
|
+
channels: this.channels.size,
|
|
66
|
+
}));
|
|
67
|
+
return;
|
|
68
|
+
}
|
|
69
|
+
if (req.url === '/dispatch' && req.method === 'POST') {
|
|
70
|
+
const body = await readBody(req);
|
|
71
|
+
try {
|
|
72
|
+
const { prompt, maxTurns } = JSON.parse(body);
|
|
73
|
+
if (!prompt) {
|
|
74
|
+
res.writeHead(400, { 'Content-Type': 'application/json' });
|
|
75
|
+
res.end(JSON.stringify({ error: 'Missing "prompt" field' }));
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
// Stream response as Server-Sent Events
|
|
79
|
+
res.writeHead(200, {
|
|
80
|
+
'Content-Type': 'text/event-stream',
|
|
81
|
+
'Cache-Control': 'no-cache',
|
|
82
|
+
'Connection': 'keep-alive',
|
|
83
|
+
});
|
|
84
|
+
const { query } = await import('../query.js');
|
|
85
|
+
const config = {
|
|
86
|
+
provider: this.config.provider,
|
|
87
|
+
tools: this.config.tools,
|
|
88
|
+
systemPrompt: this.config.systemPrompt,
|
|
89
|
+
permissionMode: this.config.permissionMode,
|
|
90
|
+
model: this.config.model,
|
|
91
|
+
maxTurns: maxTurns ?? 20,
|
|
92
|
+
};
|
|
93
|
+
for await (const event of query(prompt, config)) {
|
|
94
|
+
const data = JSON.stringify(event);
|
|
95
|
+
res.write(`data: ${data}\n\n`);
|
|
96
|
+
}
|
|
97
|
+
res.write('data: [DONE]\n\n');
|
|
98
|
+
res.end();
|
|
99
|
+
}
|
|
100
|
+
catch (err) {
|
|
101
|
+
if (!res.headersSent) {
|
|
102
|
+
res.writeHead(500, { 'Content-Type': 'application/json' });
|
|
103
|
+
}
|
|
104
|
+
res.end(JSON.stringify({ error: err instanceof Error ? err.message : String(err) }));
|
|
105
|
+
}
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
res.writeHead(404, { 'Content-Type': 'application/json' });
|
|
109
|
+
res.end(JSON.stringify({ error: 'Not found' }));
|
|
110
|
+
}
|
|
111
|
+
handleChannel(ws) {
|
|
112
|
+
const id = Date.now().toString(36) + Math.random().toString(36).slice(2, 6);
|
|
113
|
+
const abortController = new AbortController();
|
|
114
|
+
const channel = { id, ws, abortController };
|
|
115
|
+
this.channels.set(id, channel);
|
|
116
|
+
process.stderr.write(`[remote] Channel ${id} connected\n`);
|
|
117
|
+
ws.send(JSON.stringify({ type: 'connected', channelId: id }));
|
|
118
|
+
ws.on('message', async (data) => {
|
|
119
|
+
try {
|
|
120
|
+
const msg = JSON.parse(data.toString());
|
|
121
|
+
if (msg.type === 'dispatch') {
|
|
122
|
+
const { query } = await import('../query.js');
|
|
123
|
+
const config = {
|
|
124
|
+
provider: this.config.provider,
|
|
125
|
+
tools: this.config.tools,
|
|
126
|
+
systemPrompt: this.config.systemPrompt,
|
|
127
|
+
permissionMode: this.config.permissionMode,
|
|
128
|
+
model: this.config.model,
|
|
129
|
+
maxTurns: msg.maxTurns ?? 20,
|
|
130
|
+
abortSignal: abortController.signal,
|
|
131
|
+
};
|
|
132
|
+
for await (const event of query(msg.prompt, config)) {
|
|
133
|
+
if (ws.readyState !== WebSocket.OPEN)
|
|
134
|
+
break;
|
|
135
|
+
ws.send(JSON.stringify(event));
|
|
136
|
+
}
|
|
137
|
+
ws.send(JSON.stringify({ type: 'dispatch_complete' }));
|
|
138
|
+
}
|
|
139
|
+
if (msg.type === 'abort') {
|
|
140
|
+
abortController.abort();
|
|
141
|
+
ws.send(JSON.stringify({ type: 'aborted' }));
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
catch (err) {
|
|
145
|
+
ws.send(JSON.stringify({ type: 'error', message: err instanceof Error ? err.message : String(err) }));
|
|
146
|
+
}
|
|
147
|
+
});
|
|
148
|
+
ws.on('close', () => {
|
|
149
|
+
abortController.abort();
|
|
150
|
+
this.channels.delete(id);
|
|
151
|
+
process.stderr.write(`[remote] Channel ${id} disconnected\n`);
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
function readBody(req) {
|
|
156
|
+
return new Promise((resolve, reject) => {
|
|
157
|
+
const chunks = [];
|
|
158
|
+
req.on('data', (chunk) => chunks.push(chunk));
|
|
159
|
+
req.on('end', () => resolve(Buffer.concat(chunks).toString('utf-8')));
|
|
160
|
+
req.on('error', reject);
|
|
161
|
+
});
|
|
162
|
+
}
|
|
163
|
+
//# sourceMappingURL=server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/remote/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AgentDispatcher — parallel sub-agent execution with task dependency DAG.
|
|
3
|
+
*
|
|
4
|
+
* Accepts a list of tasks with optional dependencies (blockedBy),
|
|
5
|
+
* dispatches independent tasks to parallel worktrees, collects results,
|
|
6
|
+
* and triggers dependent tasks when their blockers complete.
|
|
7
|
+
*/
|
|
8
|
+
import type { Provider } from '../providers/base.js';
|
|
9
|
+
import type { Tools } from '../Tool.js';
|
|
10
|
+
import type { PermissionMode } from '../types/permissions.js';
|
|
11
|
+
export type AgentTask = {
|
|
12
|
+
id: string;
|
|
13
|
+
prompt: string;
|
|
14
|
+
description?: string;
|
|
15
|
+
blockedBy?: string[];
|
|
16
|
+
};
|
|
17
|
+
export type AgentTaskResult = {
|
|
18
|
+
id: string;
|
|
19
|
+
output: string;
|
|
20
|
+
isError: boolean;
|
|
21
|
+
durationMs: number;
|
|
22
|
+
};
|
|
23
|
+
export declare class AgentDispatcher {
|
|
24
|
+
private provider;
|
|
25
|
+
private tools;
|
|
26
|
+
private systemPrompt;
|
|
27
|
+
private permissionMode;
|
|
28
|
+
private model?;
|
|
29
|
+
private workingDir?;
|
|
30
|
+
private abortSignal?;
|
|
31
|
+
private tasks;
|
|
32
|
+
private results;
|
|
33
|
+
private maxConcurrency;
|
|
34
|
+
constructor(provider: Provider, tools: Tools, systemPrompt: string, permissionMode: PermissionMode, model?: string | undefined, workingDir?: string | undefined, abortSignal?: AbortSignal | undefined, maxConcurrency?: number);
|
|
35
|
+
addTask(task: AgentTask): void;
|
|
36
|
+
addTasks(tasks: AgentTask[]): void;
|
|
37
|
+
/** Execute all tasks respecting dependencies. Returns results in completion order. */
|
|
38
|
+
execute(): Promise<AgentTaskResult[]>;
|
|
39
|
+
private isReady;
|
|
40
|
+
private runTask;
|
|
41
|
+
}
|
|
42
|
+
//# sourceMappingURL=AgentDispatcher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AgentDispatcher.d.ts","sourceRoot":"","sources":["../../src/services/AgentDispatcher.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,KAAK,EAAE,KAAK,EAAe,MAAM,YAAY,CAAC;AACrD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAG9D,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAOF,qBAAa,eAAe;IAMxB,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,KAAK,CAAC;IACd,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,WAAW,CAAC;IAXtB,OAAO,CAAC,KAAK,CAA4B;IACzC,OAAO,CAAC,OAAO,CAA2C;IAC1D,OAAO,CAAC,cAAc,CAAS;gBAGrB,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,cAAc,EAC9B,KAAK,CAAC,EAAE,MAAM,YAAA,EACd,UAAU,CAAC,EAAE,MAAM,YAAA,EACnB,WAAW,CAAC,EAAE,WAAW,YAAA,EACjC,cAAc,SAAI;IAMpB,OAAO,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IAI9B,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI;IAIlC,sFAAsF;IAChF,OAAO,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAkE3C,OAAO,CAAC,OAAO;YAQD,OAAO;CAuEtB"}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AgentDispatcher — parallel sub-agent execution with task dependency DAG.
|
|
3
|
+
*
|
|
4
|
+
* Accepts a list of tasks with optional dependencies (blockedBy),
|
|
5
|
+
* dispatches independent tasks to parallel worktrees, collects results,
|
|
6
|
+
* and triggers dependent tasks when their blockers complete.
|
|
7
|
+
*/
|
|
8
|
+
import { createWorktree, removeWorktree, isGitRepo } from '../git/index.js';
|
|
9
|
+
export class AgentDispatcher {
|
|
10
|
+
provider;
|
|
11
|
+
tools;
|
|
12
|
+
systemPrompt;
|
|
13
|
+
permissionMode;
|
|
14
|
+
model;
|
|
15
|
+
workingDir;
|
|
16
|
+
abortSignal;
|
|
17
|
+
tasks;
|
|
18
|
+
results = new Map();
|
|
19
|
+
maxConcurrency;
|
|
20
|
+
constructor(provider, tools, systemPrompt, permissionMode, model, workingDir, abortSignal, maxConcurrency = 4) {
|
|
21
|
+
this.provider = provider;
|
|
22
|
+
this.tools = tools;
|
|
23
|
+
this.systemPrompt = systemPrompt;
|
|
24
|
+
this.permissionMode = permissionMode;
|
|
25
|
+
this.model = model;
|
|
26
|
+
this.workingDir = workingDir;
|
|
27
|
+
this.abortSignal = abortSignal;
|
|
28
|
+
this.tasks = new Map();
|
|
29
|
+
this.maxConcurrency = maxConcurrency;
|
|
30
|
+
}
|
|
31
|
+
addTask(task) {
|
|
32
|
+
this.tasks.set(task.id, { ...task, status: 'pending' });
|
|
33
|
+
}
|
|
34
|
+
addTasks(tasks) {
|
|
35
|
+
for (const t of tasks)
|
|
36
|
+
this.addTask(t);
|
|
37
|
+
}
|
|
38
|
+
/** Execute all tasks respecting dependencies. Returns results in completion order. */
|
|
39
|
+
async execute() {
|
|
40
|
+
const results = [];
|
|
41
|
+
while (true) {
|
|
42
|
+
if (this.abortSignal?.aborted)
|
|
43
|
+
break;
|
|
44
|
+
// Find tasks ready to run (all blockers completed)
|
|
45
|
+
const ready = [...this.tasks.values()].filter(t => t.status === 'pending' && this.isReady(t));
|
|
46
|
+
const running = [...this.tasks.values()].filter(t => t.status === 'running');
|
|
47
|
+
// All done?
|
|
48
|
+
if (ready.length === 0 && running.length === 0)
|
|
49
|
+
break;
|
|
50
|
+
// Dispatch up to maxConcurrency
|
|
51
|
+
const toStart = ready.slice(0, this.maxConcurrency - running.length);
|
|
52
|
+
if (toStart.length === 0 && running.length === 0) {
|
|
53
|
+
// Deadlock — blocked tasks with no way to unblock
|
|
54
|
+
for (const t of this.tasks.values()) {
|
|
55
|
+
if (t.status === 'pending') {
|
|
56
|
+
t.status = 'failed';
|
|
57
|
+
const result = {
|
|
58
|
+
id: t.id,
|
|
59
|
+
output: 'Deadlock: blocked dependencies never completed.',
|
|
60
|
+
isError: true,
|
|
61
|
+
durationMs: 0,
|
|
62
|
+
};
|
|
63
|
+
this.results.set(t.id, result);
|
|
64
|
+
results.push(result);
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
break;
|
|
68
|
+
}
|
|
69
|
+
// Run tasks in parallel
|
|
70
|
+
const promises = toStart.map(t => {
|
|
71
|
+
t.status = 'running';
|
|
72
|
+
return this.runTask(t).then(result => {
|
|
73
|
+
t.status = 'completed';
|
|
74
|
+
t.result = result;
|
|
75
|
+
this.results.set(t.id, result);
|
|
76
|
+
results.push(result);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
// Wait for at least one to complete before scheduling more
|
|
80
|
+
if (promises.length > 0) {
|
|
81
|
+
await Promise.race(promises);
|
|
82
|
+
// Wait for remaining in this batch
|
|
83
|
+
await Promise.allSettled(promises);
|
|
84
|
+
}
|
|
85
|
+
else {
|
|
86
|
+
// Running tasks exist but we can't start more — wait for all running
|
|
87
|
+
const runningPromises = [...this.tasks.values()]
|
|
88
|
+
.filter(t => t.status === 'running' && t.result)
|
|
89
|
+
.map(t => Promise.resolve());
|
|
90
|
+
if (runningPromises.length === 0) {
|
|
91
|
+
// Need to poll — running tasks haven't resolved yet
|
|
92
|
+
await new Promise(r => setTimeout(r, 100));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return results;
|
|
97
|
+
}
|
|
98
|
+
isReady(task) {
|
|
99
|
+
if (!task.blockedBy || task.blockedBy.length === 0)
|
|
100
|
+
return true;
|
|
101
|
+
return task.blockedBy.every(id => {
|
|
102
|
+
const blocker = this.tasks.get(id);
|
|
103
|
+
return blocker && (blocker.status === 'completed' || blocker.status === 'failed');
|
|
104
|
+
});
|
|
105
|
+
}
|
|
106
|
+
async runTask(task) {
|
|
107
|
+
const start = Date.now();
|
|
108
|
+
const cwd = this.workingDir ?? process.cwd();
|
|
109
|
+
const useWorktree = isGitRepo(cwd);
|
|
110
|
+
let worktreePath = null;
|
|
111
|
+
if (useWorktree) {
|
|
112
|
+
worktreePath = createWorktree(cwd);
|
|
113
|
+
}
|
|
114
|
+
try {
|
|
115
|
+
const { query } = await import('../query.js');
|
|
116
|
+
const config = {
|
|
117
|
+
provider: this.provider,
|
|
118
|
+
tools: this.tools,
|
|
119
|
+
systemPrompt: this.systemPrompt,
|
|
120
|
+
permissionMode: this.permissionMode,
|
|
121
|
+
model: this.model,
|
|
122
|
+
maxTurns: 20,
|
|
123
|
+
abortSignal: this.abortSignal,
|
|
124
|
+
};
|
|
125
|
+
// Inject blocker results as context
|
|
126
|
+
let promptWithContext = task.prompt;
|
|
127
|
+
if (task.blockedBy && task.blockedBy.length > 0) {
|
|
128
|
+
const blockerContext = task.blockedBy
|
|
129
|
+
.map(id => {
|
|
130
|
+
const r = this.results.get(id);
|
|
131
|
+
return r ? `## Result from task "${id}":\n${r.output.slice(0, 1000)}` : '';
|
|
132
|
+
})
|
|
133
|
+
.filter(Boolean)
|
|
134
|
+
.join('\n\n');
|
|
135
|
+
if (blockerContext) {
|
|
136
|
+
promptWithContext = `${blockerContext}\n\n---\n\n${task.prompt}`;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
const originalCwd = process.cwd();
|
|
140
|
+
if (worktreePath) {
|
|
141
|
+
try {
|
|
142
|
+
process.chdir(worktreePath);
|
|
143
|
+
}
|
|
144
|
+
catch { /* ignore */ }
|
|
145
|
+
}
|
|
146
|
+
let output = '';
|
|
147
|
+
try {
|
|
148
|
+
for await (const event of query(promptWithContext, config)) {
|
|
149
|
+
if (event.type === 'text_delta')
|
|
150
|
+
output += event.content;
|
|
151
|
+
if (event.type === 'error') {
|
|
152
|
+
return { id: task.id, output: `Error: ${event.message}`, isError: true, durationMs: Date.now() - start };
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
finally {
|
|
157
|
+
if (worktreePath) {
|
|
158
|
+
try {
|
|
159
|
+
process.chdir(originalCwd);
|
|
160
|
+
}
|
|
161
|
+
catch { /* ignore */ }
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
return { id: task.id, output: output || '(no output)', isError: false, durationMs: Date.now() - start };
|
|
165
|
+
}
|
|
166
|
+
catch (err) {
|
|
167
|
+
return {
|
|
168
|
+
id: task.id,
|
|
169
|
+
output: `Failed: ${err instanceof Error ? err.message : String(err)}`,
|
|
170
|
+
isError: true,
|
|
171
|
+
durationMs: Date.now() - start,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
174
|
+
finally {
|
|
175
|
+
if (worktreePath) {
|
|
176
|
+
removeWorktree(worktreePath, cwd);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
//# sourceMappingURL=AgentDispatcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AgentDispatcher.js","sourceRoot":"","sources":["../../src/services/AgentDispatcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,12 +10,13 @@ export declare class StreamingToolExecutor {
|
|
|
10
10
|
private context;
|
|
11
11
|
private permissionMode;
|
|
12
12
|
private askUser?;
|
|
13
|
+
private abortSignal?;
|
|
13
14
|
private tracked;
|
|
14
15
|
readonly outputChunks: Array<{
|
|
15
16
|
callId: string;
|
|
16
17
|
chunk: string;
|
|
17
18
|
}>;
|
|
18
|
-
constructor(tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn | undefined);
|
|
19
|
+
constructor(tools: Tools, context: ToolContext, permissionMode: PermissionMode, askUser?: AskUserFn | undefined, abortSignal?: AbortSignal | undefined);
|
|
19
20
|
addTool(toolCall: ToolCall): void;
|
|
20
21
|
private processQueue;
|
|
21
22
|
private executeTool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamingToolExecutor.d.ts","sourceRoot":"","sources":["../../src/services/StreamingToolExecutor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAQ,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAgBzE,qBAAa,qBAAqB;IAK9B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"StreamingToolExecutor.d.ts","sourceRoot":"","sources":["../../src/services/StreamingToolExecutor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAQ,UAAU,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAgBzE,qBAAa,qBAAqB;IAK9B,OAAO,CAAC,KAAK;IACb,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,cAAc;IACtB,OAAO,CAAC,OAAO,CAAC;IAChB,OAAO,CAAC,WAAW,CAAC;IARtB,OAAO,CAAC,OAAO,CAAqB;IACpC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAM;gBAG3D,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,YAAA,EACnB,WAAW,CAAC,EAAE,WAAW,YAAA;IAGnC,OAAO,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI;IAYjC,OAAO,CAAC,YAAY;YAeN,WAAW;IAmExB,mBAAmB,IAAI,SAAS,CAAC;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,UAAU,CAAA;KAAE,CAAC;IAWvE,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,IAAI,YAAY,IAAI,MAAM,CAEzB;CACF"}
|
|
@@ -10,13 +10,15 @@ export class StreamingToolExecutor {
|
|
|
10
10
|
context;
|
|
11
11
|
permissionMode;
|
|
12
12
|
askUser;
|
|
13
|
+
abortSignal;
|
|
13
14
|
tracked = [];
|
|
14
15
|
outputChunks = [];
|
|
15
|
-
constructor(tools, context, permissionMode, askUser) {
|
|
16
|
+
constructor(tools, context, permissionMode, askUser, abortSignal) {
|
|
16
17
|
this.tools = tools;
|
|
17
18
|
this.context = context;
|
|
18
19
|
this.permissionMode = permissionMode;
|
|
19
20
|
this.askUser = askUser;
|
|
21
|
+
this.abortSignal = abortSignal;
|
|
20
22
|
}
|
|
21
23
|
addTool(toolCall) {
|
|
22
24
|
const tool = findToolByName(this.tools, toolCall.toolName);
|
|
@@ -74,11 +76,18 @@ export class StreamingToolExecutor {
|
|
|
74
76
|
tracked.status = "completed";
|
|
75
77
|
return;
|
|
76
78
|
}
|
|
77
|
-
//
|
|
79
|
+
// Check abort before executing
|
|
80
|
+
if (this.abortSignal?.aborted) {
|
|
81
|
+
tracked.result = { output: "Aborted.", isError: true };
|
|
82
|
+
tracked.status = "completed";
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
85
|
+
// Execute with per-call context (streaming output chunks + abort signal)
|
|
78
86
|
const callId = tracked.toolCall.id;
|
|
79
87
|
const callContext = {
|
|
80
88
|
...this.context,
|
|
81
89
|
callId,
|
|
90
|
+
abortSignal: this.abortSignal,
|
|
82
91
|
onOutputChunk: (id, chunk) => { this.outputChunks.push({ callId: id, chunk }); },
|
|
83
92
|
};
|
|
84
93
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StreamingToolExecutor.js","sourceRoot":"","sources":["../../src/services/StreamingToolExecutor.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAa1D,MAAM,eAAe,GAAG,EAAE,CAAC;AAE3B,MAAM,OAAO,qBAAqB;IAKtB;IACA;IACA;IACA;
|
|
1
|
+
{"version":3,"file":"StreamingToolExecutor.js","sourceRoot":"","sources":["../../src/services/StreamingToolExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,15 @@ import type { Tool } from "../../Tool.js";
|
|
|
3
3
|
declare const inputSchema: z.ZodObject<{
|
|
4
4
|
prompt: z.ZodString;
|
|
5
5
|
description: z.ZodOptional<z.ZodString>;
|
|
6
|
+
isolated: z.ZodOptional<z.ZodBoolean>;
|
|
6
7
|
}, "strip", z.ZodTypeAny, {
|
|
7
8
|
prompt: string;
|
|
8
9
|
description?: string | undefined;
|
|
10
|
+
isolated?: boolean | undefined;
|
|
9
11
|
}, {
|
|
10
12
|
prompt: string;
|
|
11
13
|
description?: string | undefined;
|
|
14
|
+
isolated?: boolean | undefined;
|
|
12
15
|
}>;
|
|
13
16
|
export declare const AgentTool: Tool<typeof inputSchema>;
|
|
14
17
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/AgentTool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/tools/AgentTool/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,IAAI,EAA2B,MAAM,eAAe,CAAC;AAGnE,QAAA,MAAM,WAAW;;;;;;;;;;;;EAIf,CAAC;AAEH,eAAO,MAAM,SAAS,EAAE,IAAI,CAAC,OAAO,WAAW,CAqG9C,CAAC"}
|