maclat 0.2.0 → 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/cli/commands.js +4 -0
- package/dist/cli/commands.js.map +1 -1
- package/dist/daemon/executor.d.ts +9 -2
- package/dist/daemon/executors/claude-code.js +26 -15
- package/dist/daemon/executors/claude-code.js.map +1 -1
- package/dist/daemon/executors/claude-sdk.d.ts +2 -2
- package/dist/daemon/executors/claude-sdk.js +61 -13
- package/dist/daemon/executors/claude-sdk.js.map +1 -1
- package/dist/daemon/format.d.ts +16 -0
- package/dist/daemon/format.js +45 -0
- package/dist/daemon/format.js.map +1 -0
- package/dist/daemon/index.js +12 -10
- package/dist/daemon/index.js.map +1 -1
- package/dist/daemon/poller.d.ts +4 -0
- package/dist/daemon/poller.js +93 -20
- package/dist/daemon/poller.js.map +1 -1
- package/package.json +1 -1
package/dist/cli/commands.js
CHANGED
|
@@ -85,6 +85,10 @@ export function useExecutor(args) {
|
|
|
85
85
|
if (model) {
|
|
86
86
|
config.model = model;
|
|
87
87
|
}
|
|
88
|
+
const maxTurns = getFlag(args, '--max-turns');
|
|
89
|
+
if (maxTurns) {
|
|
90
|
+
config.max_turns = parseInt(maxTurns, 10);
|
|
91
|
+
}
|
|
88
92
|
// Validate API key requirement
|
|
89
93
|
if ((executor === 'anthropic' || executor === 'openrouter') && !config.api_key) {
|
|
90
94
|
console.log(`\n Warning: ${executor} requires an API key.`);
|
package/dist/cli/commands.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,14 @@ export interface ExecutionResult {
|
|
|
7
7
|
}>;
|
|
8
8
|
summary: string;
|
|
9
9
|
}
|
|
10
|
-
export type OnUpdate = (type: 'text' | 'terminal', content: string) => void;
|
|
10
|
+
export type OnUpdate = (type: 'text' | 'terminal' | 'file_write', content: string) => void;
|
|
11
|
+
export interface Interactivity {
|
|
12
|
+
getInstructions: () => Promise<Array<{
|
|
13
|
+
id: string;
|
|
14
|
+
content: string;
|
|
15
|
+
}>>;
|
|
16
|
+
markDelivered: (id: string) => Promise<void>;
|
|
17
|
+
}
|
|
11
18
|
export interface JobExecutor {
|
|
12
|
-
execute(job: Job, workDir: string, onUpdate: OnUpdate): Promise<ExecutionResult>;
|
|
19
|
+
execute(job: Job, workDir: string, onUpdate: OnUpdate, interactivity?: Interactivity): Promise<ExecutionResult>;
|
|
13
20
|
}
|
|
@@ -4,6 +4,7 @@ import { join } from 'path';
|
|
|
4
4
|
import { homedir } from 'os';
|
|
5
5
|
import { buildPrompt } from './prompt.js';
|
|
6
6
|
import { collectFiles } from './file-collector.js';
|
|
7
|
+
import { bold, dim, gray, toolPill, fileWrite as fmtFileWrite, agentText, jobDone, jobError, costLine } from '../format.js';
|
|
7
8
|
function findClaudeBinary() {
|
|
8
9
|
try {
|
|
9
10
|
const path = execSync('which claude 2>/dev/null', { encoding: 'utf-8' }).trim();
|
|
@@ -22,9 +23,6 @@ function findClaudeBinary() {
|
|
|
22
23
|
}
|
|
23
24
|
return 'claude';
|
|
24
25
|
}
|
|
25
|
-
function ts() {
|
|
26
|
-
return new Date().toLocaleTimeString('en-US', { hour12: false });
|
|
27
|
-
}
|
|
28
26
|
const GATEWAY_UPDATE_INTERVAL_MS = 60_000;
|
|
29
27
|
export class ClaudeCodeExecutor {
|
|
30
28
|
maxTurns;
|
|
@@ -36,7 +34,7 @@ export class ClaudeCodeExecutor {
|
|
|
36
34
|
async execute(job, workDir, onUpdate) {
|
|
37
35
|
mkdirSync(workDir, { recursive: true });
|
|
38
36
|
const prompt = buildPrompt(job, workDir);
|
|
39
|
-
console.log(` Using
|
|
37
|
+
console.log(` ${dim('Using')} ${bold('Claude Code')} ${gray(`(${this.claudePath})`)}`);
|
|
40
38
|
return new Promise((resolve) => {
|
|
41
39
|
const claude = spawn(this.claudePath, [
|
|
42
40
|
'-p', prompt,
|
|
@@ -88,10 +86,12 @@ export class ClaudeCodeExecutor {
|
|
|
88
86
|
pendingActions.length = 0;
|
|
89
87
|
}
|
|
90
88
|
onUpdate('text', summary);
|
|
89
|
+
console.log('');
|
|
90
|
+
console.log(jobDone(`${files.length} files created`));
|
|
91
91
|
resolve({ success: code === 0, files, summary });
|
|
92
92
|
});
|
|
93
93
|
claude.on('error', (err) => {
|
|
94
|
-
console.log(`
|
|
94
|
+
console.log(jobError(`Failed to spawn claude: ${err.message}`));
|
|
95
95
|
onUpdate('text', `Error spawning claude: ${err.message}`);
|
|
96
96
|
resolve({ success: false, files: [], summary: `Failed to spawn claude: ${err.message}` });
|
|
97
97
|
});
|
|
@@ -100,7 +100,7 @@ export class ClaudeCodeExecutor {
|
|
|
100
100
|
handleStreamEvent(event, onUpdate, pendingActions, stripPath, maybeFlush) {
|
|
101
101
|
switch (event.type) {
|
|
102
102
|
case 'system': {
|
|
103
|
-
console.log(
|
|
103
|
+
console.log(agentText('Agent started'));
|
|
104
104
|
onUpdate('text', 'Agent started working');
|
|
105
105
|
break;
|
|
106
106
|
}
|
|
@@ -110,17 +110,29 @@ export class ClaudeCodeExecutor {
|
|
|
110
110
|
for (const block of msg.content) {
|
|
111
111
|
if (block.type === 'text' && typeof block.text === 'string') {
|
|
112
112
|
const text = stripPath(block.text).slice(0, 500);
|
|
113
|
-
console.log(
|
|
113
|
+
console.log(agentText(text.split('\n')[0].slice(0, 120)));
|
|
114
114
|
pendingActions.push(text.slice(0, 80));
|
|
115
115
|
}
|
|
116
116
|
else if (block.type === 'tool_use') {
|
|
117
|
-
const toolName = block.name || 'tool';
|
|
117
|
+
const toolName = String(block.name || 'tool');
|
|
118
118
|
const input = (block.input || {});
|
|
119
119
|
const rawTarget = String(input.file_path || input.path || input.command || input.pattern || '');
|
|
120
|
-
const target = stripPath(rawTarget);
|
|
120
|
+
const target = stripPath(rawTarget).slice(0, 60);
|
|
121
121
|
const label = target ? `${toolName}: ${target}` : String(toolName);
|
|
122
|
-
|
|
122
|
+
// Pretty terminal output
|
|
123
|
+
console.log(toolPill(toolName, target));
|
|
123
124
|
pendingActions.push(label.slice(0, 80));
|
|
125
|
+
onUpdate('terminal', label);
|
|
126
|
+
// Emit file_write for Write/Edit tool uses
|
|
127
|
+
if (toolName === 'Write' && typeof input.file_path === 'string' && typeof input.content === 'string') {
|
|
128
|
+
const relPath = stripPath(String(input.file_path));
|
|
129
|
+
console.log(fmtFileWrite(relPath));
|
|
130
|
+
onUpdate('file_write', JSON.stringify({ path: relPath, content: input.content }));
|
|
131
|
+
}
|
|
132
|
+
else if (toolName === 'Edit' && typeof input.file_path === 'string') {
|
|
133
|
+
const relPath = stripPath(String(input.file_path));
|
|
134
|
+
onUpdate('file_write', JSON.stringify({ path: relPath, edit: { old_string: input.old_string, new_string: input.new_string } }));
|
|
135
|
+
}
|
|
124
136
|
}
|
|
125
137
|
}
|
|
126
138
|
}
|
|
@@ -130,22 +142,21 @@ export class ClaudeCodeExecutor {
|
|
|
130
142
|
case 'tool_result': {
|
|
131
143
|
const output = stripPath(String(event.output || event.content || '')).slice(0, 200);
|
|
132
144
|
if (output)
|
|
133
|
-
console.log(`
|
|
145
|
+
console.log(` ${gray('→')} ${dim(output.split('\n')[0])}`);
|
|
134
146
|
break;
|
|
135
147
|
}
|
|
136
148
|
case 'result': {
|
|
137
149
|
const result = event.result;
|
|
138
150
|
if (typeof result === 'string') {
|
|
139
151
|
const clean = stripPath(result);
|
|
140
|
-
console.log(
|
|
152
|
+
console.log('');
|
|
153
|
+
console.log(jobDone(clean.slice(0, 200)));
|
|
141
154
|
onUpdate('text', clean.slice(0, 200));
|
|
142
155
|
}
|
|
143
156
|
const cost = event.total_cost_usd;
|
|
144
157
|
const turns = event.num_turns;
|
|
145
158
|
if (cost)
|
|
146
|
-
console.log(
|
|
147
|
-
if (turns)
|
|
148
|
-
console.log(` [${ts()}] Turns: ${turns}`);
|
|
159
|
+
console.log(costLine(cost, turns));
|
|
149
160
|
break;
|
|
150
161
|
}
|
|
151
162
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../../src/daemon/executors/claude-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAqB,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../../src/daemon/executors/claude-code.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type { Job } from '../../shared/types.js';
|
|
2
|
-
import type { JobExecutor, ExecutionResult, OnUpdate } from '../executor.js';
|
|
2
|
+
import type { JobExecutor, ExecutionResult, OnUpdate, Interactivity } from '../executor.js';
|
|
3
3
|
export declare class ClaudeSdkExecutor implements JobExecutor {
|
|
4
4
|
private apiKey;
|
|
5
5
|
private model;
|
|
6
6
|
private maxTurns;
|
|
7
7
|
private baseUrl?;
|
|
8
8
|
constructor(apiKey: string, model?: string, maxTurns?: number, baseUrl?: string);
|
|
9
|
-
execute(job: Job, workDir: string, onUpdate: OnUpdate): Promise<ExecutionResult>;
|
|
9
|
+
execute(job: Job, workDir: string, onUpdate: OnUpdate, interactivity?: Interactivity): Promise<ExecutionResult>;
|
|
10
10
|
}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { mkdirSync } from 'fs';
|
|
2
2
|
import { buildPrompt } from './prompt.js';
|
|
3
3
|
import { collectFiles } from './file-collector.js';
|
|
4
|
-
|
|
5
|
-
return new Date().toLocaleTimeString('en-US', { hour12: false });
|
|
6
|
-
}
|
|
4
|
+
import { bold, dim, gray, cyan, costLine, toolPill, fileWrite as fmtFileWrite, agentText, jobDone } from '../format.js';
|
|
7
5
|
export class ClaudeSdkExecutor {
|
|
8
6
|
apiKey;
|
|
9
7
|
model;
|
|
@@ -15,11 +13,11 @@ export class ClaudeSdkExecutor {
|
|
|
15
13
|
this.maxTurns = maxTurns || 50;
|
|
16
14
|
this.baseUrl = baseUrl;
|
|
17
15
|
}
|
|
18
|
-
async execute(job, workDir, onUpdate) {
|
|
16
|
+
async execute(job, workDir, onUpdate, interactivity) {
|
|
19
17
|
mkdirSync(workDir, { recursive: true });
|
|
20
18
|
const prompt = buildPrompt(job, workDir);
|
|
21
19
|
const provider = this.baseUrl ? 'OpenRouter' : 'Anthropic';
|
|
22
|
-
console.log(`
|
|
20
|
+
console.log(` ${dim('Using')} ${bold(provider + ' SDK')} ${gray(`(${this.model})`)}`);
|
|
23
21
|
onUpdate('text', `Agent started via ${provider} SDK`);
|
|
24
22
|
// Set env vars for the SDK
|
|
25
23
|
const prevKey = process.env.ANTHROPIC_API_KEY;
|
|
@@ -31,7 +29,7 @@ export class ClaudeSdkExecutor {
|
|
|
31
29
|
try {
|
|
32
30
|
const { query } = await import('@anthropic-ai/claude-agent-sdk');
|
|
33
31
|
let lastText = '';
|
|
34
|
-
|
|
32
|
+
const q = query({
|
|
35
33
|
prompt,
|
|
36
34
|
options: {
|
|
37
35
|
allowedTools: ['Read', 'Write', 'Edit', 'Bash', 'Grep', 'Glob', 'WebSearch', 'WebFetch'],
|
|
@@ -40,7 +38,39 @@ export class ClaudeSdkExecutor {
|
|
|
40
38
|
model: this.model,
|
|
41
39
|
maxTurns: this.maxTurns,
|
|
42
40
|
},
|
|
43
|
-
})
|
|
41
|
+
});
|
|
42
|
+
// Concurrent instruction polling (if interactivity provided)
|
|
43
|
+
let pollingActive = true;
|
|
44
|
+
const pollPromise = interactivity ? (async () => {
|
|
45
|
+
while (pollingActive) {
|
|
46
|
+
await new Promise(r => setTimeout(r, 3000));
|
|
47
|
+
if (!pollingActive)
|
|
48
|
+
break;
|
|
49
|
+
try {
|
|
50
|
+
const instructions = await interactivity.getInstructions();
|
|
51
|
+
for (const inst of instructions) {
|
|
52
|
+
console.log(` ${cyan('↳')} ${dim('Instruction:')} ${inst.content.slice(0, 80)}`);
|
|
53
|
+
onUpdate('text', `Received instruction: ${inst.content.slice(0, 100)}`);
|
|
54
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
55
|
+
async function* singleMessage() {
|
|
56
|
+
yield {
|
|
57
|
+
type: 'user',
|
|
58
|
+
message: { role: 'user', content: inst.content },
|
|
59
|
+
parent_tool_use_id: null,
|
|
60
|
+
session_id: '',
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
64
|
+
await q.streamInput(singleMessage());
|
|
65
|
+
await interactivity.markDelivered(inst.id);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
catch {
|
|
69
|
+
// Non-critical, continue polling
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
})() : Promise.resolve();
|
|
73
|
+
for await (const message of q) {
|
|
44
74
|
const msg = message;
|
|
45
75
|
if (msg.type === 'assistant') {
|
|
46
76
|
const apiMsg = msg.message;
|
|
@@ -48,14 +78,28 @@ export class ClaudeSdkExecutor {
|
|
|
48
78
|
for (const block of apiMsg.content) {
|
|
49
79
|
if (block.type === 'text' && typeof block.text === 'string') {
|
|
50
80
|
const text = block.text.slice(0, 200);
|
|
51
|
-
console.log(
|
|
81
|
+
console.log(agentText(text.split('\n')[0].slice(0, 120)));
|
|
52
82
|
lastText = text;
|
|
53
83
|
onUpdate('text', text);
|
|
54
84
|
}
|
|
55
85
|
else if (block.type === 'tool_use') {
|
|
56
|
-
const
|
|
57
|
-
|
|
86
|
+
const toolName = String(block.name);
|
|
87
|
+
const input = (block.input || {});
|
|
88
|
+
const target = String(input.file_path || input.command || input.pattern || '').slice(0, 60);
|
|
89
|
+
const label = `${toolName}: ${target}`;
|
|
90
|
+
// Pretty terminal output
|
|
91
|
+
console.log(toolPill(toolName, target));
|
|
58
92
|
onUpdate('terminal', label);
|
|
93
|
+
// Emit file_write for Write/Edit tool uses
|
|
94
|
+
if (toolName === 'Write' && typeof input.file_path === 'string' && typeof input.content === 'string') {
|
|
95
|
+
const relPath = String(input.file_path).replace(new RegExp('^' + workDir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '/?'), '');
|
|
96
|
+
console.log(fmtFileWrite(relPath));
|
|
97
|
+
onUpdate('file_write', JSON.stringify({ path: relPath, content: input.content }));
|
|
98
|
+
}
|
|
99
|
+
else if (toolName === 'Edit' && typeof input.file_path === 'string') {
|
|
100
|
+
const relPath = String(input.file_path).replace(new RegExp('^' + workDir.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') + '/?'), '');
|
|
101
|
+
onUpdate('file_write', JSON.stringify({ path: relPath, edit: { old_string: input.old_string, new_string: input.new_string } }));
|
|
102
|
+
}
|
|
59
103
|
}
|
|
60
104
|
}
|
|
61
105
|
}
|
|
@@ -63,14 +107,18 @@ export class ClaudeSdkExecutor {
|
|
|
63
107
|
else if (msg.type === 'result') {
|
|
64
108
|
const result = msg.result;
|
|
65
109
|
if (result) {
|
|
66
|
-
console.log(
|
|
110
|
+
console.log('');
|
|
111
|
+
console.log(jobDone(result.slice(0, 200)));
|
|
67
112
|
lastText = result.slice(0, 200);
|
|
68
113
|
}
|
|
69
114
|
const cost = msg.total_cost_usd;
|
|
115
|
+
const turns = msg.num_turns;
|
|
70
116
|
if (cost)
|
|
71
|
-
console.log(
|
|
117
|
+
console.log(costLine(cost, turns));
|
|
72
118
|
}
|
|
73
119
|
}
|
|
120
|
+
pollingActive = false;
|
|
121
|
+
await pollPromise;
|
|
74
122
|
const files = collectFiles(workDir);
|
|
75
123
|
const summary = lastText || `Job completed via ${provider}. ${files.length} file(s) created.`;
|
|
76
124
|
onUpdate('text', summary.slice(0, 200));
|
|
@@ -78,7 +126,7 @@ export class ClaudeSdkExecutor {
|
|
|
78
126
|
}
|
|
79
127
|
catch (err) {
|
|
80
128
|
const errMsg = err instanceof Error ? err.message : String(err);
|
|
81
|
-
console.log(`
|
|
129
|
+
console.log(` ${bold('\x1b[31m✗\x1b[39m')} ${errMsg}`);
|
|
82
130
|
onUpdate('text', `Error: ${errMsg}`);
|
|
83
131
|
const files = collectFiles(workDir);
|
|
84
132
|
return { success: false, files, summary: `Error: ${errMsg}` };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-sdk.js","sourceRoot":"","sources":["../../../src/daemon/executors/claude-sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAG/B,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-sdk.js","sourceRoot":"","sources":["../../../src/daemon/executors/claude-sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export declare const bold: (s: string) => string;
|
|
2
|
+
export declare const dim: (s: string) => string;
|
|
3
|
+
export declare const purple: (s: string) => string;
|
|
4
|
+
export declare const cyan: (s: string) => string;
|
|
5
|
+
export declare const green: (s: string) => string;
|
|
6
|
+
export declare const yellow: (s: string) => string;
|
|
7
|
+
export declare const red: (s: string) => string;
|
|
8
|
+
export declare const gray: (s: string) => string;
|
|
9
|
+
export declare function box(lines: string[]): string;
|
|
10
|
+
export declare function toolPill(name: string, target: string): string;
|
|
11
|
+
export declare function fileWrite(path: string): string;
|
|
12
|
+
export declare function agentText(text: string): string;
|
|
13
|
+
export declare function jobFound(title: string, budget: number): string;
|
|
14
|
+
export declare function jobDone(summary: string): string;
|
|
15
|
+
export declare function jobError(msg: string): string;
|
|
16
|
+
export declare function costLine(cost: number | string, turns?: number | string): string;
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
// ANSI escape code formatters — zero dependencies
|
|
2
|
+
export const bold = (s) => `\x1b[1m${s}\x1b[22m`;
|
|
3
|
+
export const dim = (s) => `\x1b[2m${s}\x1b[22m`;
|
|
4
|
+
export const purple = (s) => `\x1b[35m${s}\x1b[39m`;
|
|
5
|
+
export const cyan = (s) => `\x1b[36m${s}\x1b[39m`;
|
|
6
|
+
export const green = (s) => `\x1b[32m${s}\x1b[39m`;
|
|
7
|
+
export const yellow = (s) => `\x1b[33m${s}\x1b[39m`;
|
|
8
|
+
export const red = (s) => `\x1b[31m${s}\x1b[39m`;
|
|
9
|
+
export const gray = (s) => `\x1b[90m${s}\x1b[39m`;
|
|
10
|
+
export function box(lines) {
|
|
11
|
+
const maxLen = Math.max(...lines.map(l => stripAnsi(l).length));
|
|
12
|
+
const pad = (s) => s + ' '.repeat(maxLen - stripAnsi(s).length);
|
|
13
|
+
const top = ` ╭${'─'.repeat(maxLen + 4)}╮`;
|
|
14
|
+
const bot = ` ╰${'─'.repeat(maxLen + 4)}╯`;
|
|
15
|
+
const rows = lines.map(l => ` │ ${pad(l)} │`);
|
|
16
|
+
return [top, ...rows, bot].join('\n');
|
|
17
|
+
}
|
|
18
|
+
function stripAnsi(s) {
|
|
19
|
+
return s.replace(/\x1b\[[0-9;]*m/g, '');
|
|
20
|
+
}
|
|
21
|
+
export function toolPill(name, target) {
|
|
22
|
+
return ` ${cyan('●')} ${bold(name)}${target ? gray(`(${target})`) : ''}`;
|
|
23
|
+
}
|
|
24
|
+
export function fileWrite(path) {
|
|
25
|
+
return ` ${green('✓')} ${bold('Write')}${gray(`(${path})`)}`;
|
|
26
|
+
}
|
|
27
|
+
export function agentText(text) {
|
|
28
|
+
return ` ${gray('│')} ${dim(text)}`;
|
|
29
|
+
}
|
|
30
|
+
export function jobFound(title, budget) {
|
|
31
|
+
return ` ${yellow('◆')} ${bold('Job found:')} ${title} ${gray(`(${budget} USDC)`)}`;
|
|
32
|
+
}
|
|
33
|
+
export function jobDone(summary) {
|
|
34
|
+
return ` ${green('✓')} ${bold('Done:')} ${summary}`;
|
|
35
|
+
}
|
|
36
|
+
export function jobError(msg) {
|
|
37
|
+
return ` ${red('✗')} ${msg}`;
|
|
38
|
+
}
|
|
39
|
+
export function costLine(cost, turns) {
|
|
40
|
+
const parts = [`$${cost}`];
|
|
41
|
+
if (turns)
|
|
42
|
+
parts.push(`${turns} turns`);
|
|
43
|
+
return ` ${gray(parts.join(' · '))}`;
|
|
44
|
+
}
|
|
45
|
+
//# sourceMappingURL=format.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/daemon/format.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/index.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { loadConfig, GATEWAY_URL } from '../shared/config.js';
|
|
2
2
|
import { createExecutor } from './executors/index.js';
|
|
3
3
|
import { JobPoller } from './poller.js';
|
|
4
|
+
import { bold, purple, gray, box, red } from './format.js';
|
|
4
5
|
export async function startDaemon(args) {
|
|
5
6
|
const config = loadConfig();
|
|
6
7
|
const agentId = getFlag(args, '--id') || config.agent_id;
|
|
@@ -17,23 +18,24 @@ export async function startDaemon(args) {
|
|
|
17
18
|
throw new Error(`HTTP ${res.status}`);
|
|
18
19
|
}
|
|
19
20
|
catch {
|
|
20
|
-
console.log(
|
|
21
|
+
console.log(`\n ${red('✗')} Cannot reach gateway at ${gatewayUrl}\n`);
|
|
21
22
|
process.exit(1);
|
|
22
23
|
}
|
|
23
24
|
const executorType = config.executor || 'claude-code';
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
25
|
+
const bannerLines = [
|
|
26
|
+
`${bold(purple('Maclat Agent'))}`,
|
|
27
|
+
``,
|
|
28
|
+
`${gray('Agent ID:')} ${agentId.slice(0, 16)}...`,
|
|
29
|
+
`${gray('Executor:')} ${bold(executorType)}`,
|
|
30
|
+
...(config.model ? [`${gray('Model:')} ${config.model}`] : []),
|
|
31
|
+
`${gray('Gateway:')} ${gatewayUrl}`,
|
|
32
|
+
];
|
|
33
|
+
console.log('\n' + box(bannerLines) + '\n');
|
|
32
34
|
const executor = createExecutor(config);
|
|
33
35
|
const poller = new JobPoller(gatewayUrl, agentId, executor);
|
|
34
36
|
// Graceful shutdown
|
|
35
37
|
process.on('SIGINT', () => {
|
|
36
|
-
console.log(
|
|
38
|
+
console.log(`\n ${gray('Shutting down agent daemon...')}`);
|
|
37
39
|
poller.stop();
|
|
38
40
|
process.exit(0);
|
|
39
41
|
});
|
package/dist/daemon/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/daemon/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAc;IAC9C,MAAM,MAAM,GAAG,UAAU,EAAE,CAAC;IAC5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC;IAEzD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,CAAC,GAAG,CAAC,+DAA+D,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;QACrD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,IAAI,WAAW,CAAC;IAErD,8BAA8B;IAC9B,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,UAAU,SAAS,CAAC,CAAC;QAChD,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IACrD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,4BAA4B,UAAU,IAAI,CAAC,CAAC;QACvE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,IAAI,aAAa,CAAC;IAEtD,MAAM,WAAW,GAAG;QAClB,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE;QACjC,EAAE;QACF,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK;QAClD,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,YAAY,CAAC,EAAE;QAC7C,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,UAAU,EAAE;KACtC,CAAC;IAEF,OAAO,CAAC,GAAG,CAAC,IAAI,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAE5D,oBAAoB;IACpB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACxB,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,+BAA+B,CAAC,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,IAAI,EAAE,CAAC;QACd,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,OAAO,CAAC,IAAc,EAAE,IAAY;IAC3C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC3D,OAAO,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AACvB,CAAC"}
|
package/dist/daemon/poller.d.ts
CHANGED
|
@@ -5,9 +5,13 @@ export declare class JobPoller {
|
|
|
5
5
|
private executor;
|
|
6
6
|
private running;
|
|
7
7
|
private currentJobId;
|
|
8
|
+
private idleInterval;
|
|
8
9
|
constructor(gatewayUrl: string, agentId: string, executor: JobExecutor);
|
|
9
10
|
start(): Promise<void>;
|
|
10
11
|
stop(): void;
|
|
12
|
+
private startIdleAnimation;
|
|
13
|
+
private stopIdleAnimation;
|
|
14
|
+
private clearIdleLine;
|
|
11
15
|
private pollForJobs;
|
|
12
16
|
private executeJob;
|
|
13
17
|
}
|
package/dist/daemon/poller.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { POLL_INTERVAL_MS, JOBS_DIR } from '../shared/config.js';
|
|
2
2
|
import { join } from 'path';
|
|
3
|
+
import { bold, dim, gray, toolPill, fileWrite as fmtFileWrite, agentText, jobFound, jobDone, jobError, } from './format.js';
|
|
3
4
|
export class JobPoller {
|
|
4
5
|
gatewayUrl;
|
|
5
6
|
agentId;
|
|
6
7
|
executor;
|
|
7
8
|
running = false;
|
|
8
9
|
currentJobId = null;
|
|
10
|
+
idleInterval = null;
|
|
9
11
|
constructor(gatewayUrl, agentId, executor) {
|
|
10
12
|
this.gatewayUrl = gatewayUrl;
|
|
11
13
|
this.agentId = agentId;
|
|
@@ -13,7 +15,7 @@ export class JobPoller {
|
|
|
13
15
|
}
|
|
14
16
|
async start() {
|
|
15
17
|
this.running = true;
|
|
16
|
-
|
|
18
|
+
this.startIdleAnimation();
|
|
17
19
|
while (this.running) {
|
|
18
20
|
try {
|
|
19
21
|
if (!this.currentJobId) {
|
|
@@ -22,13 +24,33 @@ export class JobPoller {
|
|
|
22
24
|
}
|
|
23
25
|
catch (err) {
|
|
24
26
|
const msg = err instanceof Error ? err.message : String(err);
|
|
25
|
-
console.log(`
|
|
27
|
+
console.log(jobError(`Poll failed: ${msg}`));
|
|
26
28
|
}
|
|
27
29
|
await sleep(POLL_INTERVAL_MS);
|
|
28
30
|
}
|
|
29
31
|
}
|
|
30
32
|
stop() {
|
|
31
33
|
this.running = false;
|
|
34
|
+
this.stopIdleAnimation();
|
|
35
|
+
}
|
|
36
|
+
startIdleAnimation() {
|
|
37
|
+
const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
|
|
38
|
+
let i = 0;
|
|
39
|
+
this.idleInterval = setInterval(() => {
|
|
40
|
+
if (!this.currentJobId) {
|
|
41
|
+
process.stdout.write(`\r ${gray(frames[i % frames.length])} ${dim('Watching for jobs...')} `);
|
|
42
|
+
i++;
|
|
43
|
+
}
|
|
44
|
+
}, 100);
|
|
45
|
+
}
|
|
46
|
+
stopIdleAnimation() {
|
|
47
|
+
if (this.idleInterval) {
|
|
48
|
+
clearInterval(this.idleInterval);
|
|
49
|
+
this.idleInterval = null;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
clearIdleLine() {
|
|
53
|
+
process.stdout.write('\r' + ' '.repeat(50) + '\r');
|
|
32
54
|
}
|
|
33
55
|
async pollForJobs() {
|
|
34
56
|
const res = await fetch(`${this.gatewayUrl}/jobs/available`);
|
|
@@ -37,18 +59,16 @@ export class JobPoller {
|
|
|
37
59
|
const jobs = (await res.json());
|
|
38
60
|
if (jobs.length === 0)
|
|
39
61
|
return;
|
|
40
|
-
// Take the first available job
|
|
41
62
|
const job = jobs[0];
|
|
42
|
-
|
|
43
|
-
console.log(
|
|
63
|
+
this.clearIdleLine();
|
|
64
|
+
console.log(jobFound(job.title, job.budget_usdc));
|
|
44
65
|
await this.executeJob(job);
|
|
45
66
|
}
|
|
46
67
|
async executeJob(job) {
|
|
47
68
|
this.currentJobId = job.id;
|
|
48
|
-
const time = () => new Date().toLocaleTimeString('en-US', { hour12: false });
|
|
49
69
|
try {
|
|
50
70
|
// 1. Claim the job
|
|
51
|
-
console.log(`
|
|
71
|
+
console.log(` ${dim('Claiming job...')}`);
|
|
52
72
|
const claimRes = await fetch(`${this.gatewayUrl}/jobs/${job.id}/claim`, {
|
|
53
73
|
method: 'POST',
|
|
54
74
|
headers: { 'Content-Type': 'application/json' },
|
|
@@ -56,18 +76,47 @@ export class JobPoller {
|
|
|
56
76
|
});
|
|
57
77
|
if (!claimRes.ok) {
|
|
58
78
|
const err = (await claimRes.json());
|
|
59
|
-
console.log(`
|
|
79
|
+
console.log(jobError(`Failed to claim: ${err.error}`));
|
|
60
80
|
this.currentJobId = null;
|
|
61
81
|
return;
|
|
62
82
|
}
|
|
63
83
|
// 2. Signal work started
|
|
64
|
-
console.log(`
|
|
84
|
+
console.log(` ${bold('Starting work...')}`);
|
|
65
85
|
await fetch(`${this.gatewayUrl}/jobs/${job.id}/start`, {
|
|
66
86
|
method: 'POST',
|
|
67
87
|
headers: { 'Content-Type': 'application/json' },
|
|
68
88
|
});
|
|
69
|
-
|
|
89
|
+
console.log('');
|
|
90
|
+
// 3. Set up progress relay (POST to gateway + pretty terminal output)
|
|
70
91
|
const onUpdate = async (type, content) => {
|
|
92
|
+
// Terminal output
|
|
93
|
+
if (type === 'terminal') {
|
|
94
|
+
// Parse "ToolName: target" format
|
|
95
|
+
const colonIdx = content.indexOf(':');
|
|
96
|
+
if (colonIdx > 0) {
|
|
97
|
+
const name = content.slice(0, colonIdx).trim();
|
|
98
|
+
const target = content.slice(colonIdx + 1).trim().slice(0, 60);
|
|
99
|
+
console.log(toolPill(name, target));
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
console.log(toolPill(content, ''));
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
else if (type === 'file_write') {
|
|
106
|
+
try {
|
|
107
|
+
const data = JSON.parse(content);
|
|
108
|
+
console.log(fmtFileWrite(data.path));
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
console.log(fmtFileWrite(content));
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
else if (type === 'text') {
|
|
115
|
+
// Truncate long text, show first line only
|
|
116
|
+
const firstLine = content.split('\n')[0].slice(0, 120);
|
|
117
|
+
console.log(agentText(firstLine));
|
|
118
|
+
}
|
|
119
|
+
// Gateway relay
|
|
71
120
|
try {
|
|
72
121
|
await fetch(`${this.gatewayUrl}/jobs/${job.id}/updates`, {
|
|
73
122
|
method: 'POST',
|
|
@@ -76,15 +125,39 @@ export class JobPoller {
|
|
|
76
125
|
});
|
|
77
126
|
}
|
|
78
127
|
catch {
|
|
79
|
-
// Non-critical
|
|
128
|
+
// Non-critical
|
|
80
129
|
}
|
|
81
130
|
};
|
|
82
|
-
// 4.
|
|
83
|
-
|
|
131
|
+
// 4. Set up interactivity (instruction injection)
|
|
132
|
+
const interactivity = {
|
|
133
|
+
getInstructions: async () => {
|
|
134
|
+
try {
|
|
135
|
+
const res = await fetch(`${this.gatewayUrl}/jobs/${job.id}/instructions?status=pending`);
|
|
136
|
+
if (!res.ok)
|
|
137
|
+
return [];
|
|
138
|
+
return await res.json();
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
return [];
|
|
142
|
+
}
|
|
143
|
+
},
|
|
144
|
+
markDelivered: async (id) => {
|
|
145
|
+
try {
|
|
146
|
+
await fetch(`${this.gatewayUrl}/jobs/${job.id}/instructions/${id}`, {
|
|
147
|
+
method: 'PATCH',
|
|
148
|
+
headers: { 'Content-Type': 'application/json' },
|
|
149
|
+
body: JSON.stringify({ status: 'delivered' }),
|
|
150
|
+
});
|
|
151
|
+
}
|
|
152
|
+
catch { /* non-critical */ }
|
|
153
|
+
},
|
|
154
|
+
};
|
|
155
|
+
// 5. Execute the job
|
|
84
156
|
const workDir = join(JOBS_DIR, job.id);
|
|
85
|
-
const result = await this.executor.execute(job, workDir, onUpdate);
|
|
86
|
-
//
|
|
87
|
-
console.log(
|
|
157
|
+
const result = await this.executor.execute(job, workDir, onUpdate, interactivity);
|
|
158
|
+
// 6. Deliver results
|
|
159
|
+
console.log('');
|
|
160
|
+
console.log(` ${dim('Delivering')} ${bold(String(result.files.length))} ${dim('files...')}`);
|
|
88
161
|
const deliverRes = await fetch(`${this.gatewayUrl}/jobs/${job.id}/deliver`, {
|
|
89
162
|
method: 'POST',
|
|
90
163
|
headers: { 'Content-Type': 'application/json' },
|
|
@@ -95,19 +168,19 @@ export class JobPoller {
|
|
|
95
168
|
}),
|
|
96
169
|
});
|
|
97
170
|
if (deliverRes.ok) {
|
|
98
|
-
console.log(
|
|
171
|
+
console.log(jobDone(`${result.files.length} files delivered`));
|
|
99
172
|
}
|
|
100
173
|
else {
|
|
101
|
-
console.log(
|
|
174
|
+
console.log(jobError('Failed to send deliverables.'));
|
|
102
175
|
}
|
|
103
176
|
}
|
|
104
177
|
catch (err) {
|
|
105
178
|
const msg = err instanceof Error ? err.message : String(err);
|
|
106
|
-
console.log(`
|
|
179
|
+
console.log(jobError(`Job execution failed: ${msg}`));
|
|
107
180
|
}
|
|
108
181
|
finally {
|
|
109
182
|
this.currentJobId = null;
|
|
110
|
-
console.log(
|
|
183
|
+
console.log('');
|
|
111
184
|
}
|
|
112
185
|
}
|
|
113
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../src/daemon/poller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"poller.js","sourceRoot":"","sources":["../../src/daemon/poller.ts"],"names":[],"mappings":"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"}
|