cosmios 0.4.4 → 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/adapters/claude-code.d.ts +1 -0
- package/dist/adapters/claude-code.d.ts.map +1 -1
- package/dist/adapters/claude-code.js +115 -7
- package/dist/adapters/claude-code.js.map +1 -1
- package/dist/adapters/codex.d.ts +1 -0
- package/dist/adapters/codex.d.ts.map +1 -1
- package/dist/adapters/codex.js +131 -23
- package/dist/adapters/codex.js.map +1 -1
- package/dist/adapters/interface.d.ts +21 -0
- package/dist/adapters/interface.d.ts.map +1 -1
- package/dist/api-client.d.ts +12 -1
- package/dist/api-client.d.ts.map +1 -1
- package/dist/api-client.js +53 -0
- package/dist/api-client.js.map +1 -1
- package/dist/run-handler.d.ts.map +1 -1
- package/dist/run-handler.js +26 -2
- package/dist/run-handler.js.map +1 -1
- package/package.json +1 -1
|
@@ -2,6 +2,7 @@ import type { Adapter, AdapterConfig } from './interface.js';
|
|
|
2
2
|
export declare class ClaudeCodeAdapter implements Adapter {
|
|
3
3
|
private process;
|
|
4
4
|
run(config: AdapterConfig): Promise<number>;
|
|
5
|
+
private handleJsonLine;
|
|
5
6
|
cancel(): void;
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=claude-code.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"claude-code.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAgD7E,qBAAa,iBAAkB,YAAW,OAAO;IAC/C,OAAO,CAAC,OAAO,CAA6B;IAEtC,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAgFjD,OAAO,CAAC,cAAc;IAiGtB,MAAM,IAAI,IAAI;CAcf"}
|
|
@@ -33,16 +33,35 @@ function resolveClaudeBin() {
|
|
|
33
33
|
}
|
|
34
34
|
return 'claude'; // last resort — will fail with a clear error
|
|
35
35
|
}
|
|
36
|
+
// Extract readable text from assistant message content blocks
|
|
37
|
+
function extractText(content) {
|
|
38
|
+
const lines = [];
|
|
39
|
+
for (const block of content) {
|
|
40
|
+
if (block.type === 'text' && block.text) {
|
|
41
|
+
lines.push(block.text);
|
|
42
|
+
}
|
|
43
|
+
else if (block.type === 'tool_use' && block.name) {
|
|
44
|
+
const inputStr = block.input ? JSON.stringify(block.input).slice(0, 200) : '';
|
|
45
|
+
lines.push(`[tool] ${block.name}${inputStr ? ': ' + inputStr : ''}`);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return lines;
|
|
49
|
+
}
|
|
36
50
|
export class ClaudeCodeAdapter {
|
|
37
51
|
process = null;
|
|
38
52
|
async run(config) {
|
|
39
|
-
const { workspace, command, onLog, agentOptions } = config;
|
|
53
|
+
const { workspace, command, onLog, onMeta, agentOptions } = config;
|
|
40
54
|
if (!existsSync(workspace)) {
|
|
41
55
|
throw new Error(`workspace_not_found:${workspace}`);
|
|
42
56
|
}
|
|
43
57
|
const claudeBin = resolveClaudeBin();
|
|
44
58
|
log.info(`using claude: ${claudeBin}`);
|
|
45
|
-
const args = [
|
|
59
|
+
const args = [
|
|
60
|
+
'--print',
|
|
61
|
+
'--output-format', 'stream-json',
|
|
62
|
+
'--verbose',
|
|
63
|
+
'--dangerously-skip-permissions',
|
|
64
|
+
];
|
|
46
65
|
if (agentOptions?.model) {
|
|
47
66
|
args.push('--model', agentOptions.model);
|
|
48
67
|
}
|
|
@@ -64,7 +83,6 @@ export class ClaudeCodeAdapter {
|
|
|
64
83
|
env: { ...process.env }
|
|
65
84
|
});
|
|
66
85
|
const proc = this.process;
|
|
67
|
-
// Buffer incomplete lines
|
|
68
86
|
let stdoutBuf = '';
|
|
69
87
|
let stderrBuf = '';
|
|
70
88
|
proc.stdout?.setEncoding('utf8');
|
|
@@ -73,8 +91,9 @@ export class ClaudeCodeAdapter {
|
|
|
73
91
|
const lines = stdoutBuf.split('\n');
|
|
74
92
|
stdoutBuf = lines.pop() ?? '';
|
|
75
93
|
for (const line of lines) {
|
|
76
|
-
if (line)
|
|
77
|
-
|
|
94
|
+
if (!line)
|
|
95
|
+
continue;
|
|
96
|
+
this.handleJsonLine(line, onLog, onMeta);
|
|
78
97
|
}
|
|
79
98
|
});
|
|
80
99
|
proc.stderr?.setEncoding('utf8');
|
|
@@ -96,9 +115,8 @@ export class ClaudeCodeAdapter {
|
|
|
96
115
|
}
|
|
97
116
|
});
|
|
98
117
|
proc.on('close', (code) => {
|
|
99
|
-
// Flush remaining buffers
|
|
100
118
|
if (stdoutBuf)
|
|
101
|
-
|
|
119
|
+
this.handleJsonLine(stdoutBuf, onLog, onMeta);
|
|
102
120
|
if (stderrBuf)
|
|
103
121
|
onLog(stderrBuf, 'stderr');
|
|
104
122
|
this.process = null;
|
|
@@ -106,6 +124,96 @@ export class ClaudeCodeAdapter {
|
|
|
106
124
|
});
|
|
107
125
|
});
|
|
108
126
|
}
|
|
127
|
+
handleJsonLine(line, onLog, onMeta) {
|
|
128
|
+
if (!line.startsWith('{')) {
|
|
129
|
+
// Not JSON — emit as plain text (fallback)
|
|
130
|
+
onLog(line, 'stdout');
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
let obj;
|
|
134
|
+
try {
|
|
135
|
+
obj = JSON.parse(line);
|
|
136
|
+
}
|
|
137
|
+
catch {
|
|
138
|
+
onLog(line, 'stdout');
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
const type = obj.type;
|
|
142
|
+
switch (type) {
|
|
143
|
+
case 'system': {
|
|
144
|
+
// Init event — extract session info
|
|
145
|
+
const sessionId = obj.session_id;
|
|
146
|
+
const model = obj.model;
|
|
147
|
+
if (sessionId || model) {
|
|
148
|
+
onLog(`session: ${sessionId ?? '?'} model: ${model ?? '?'}`, 'stdout');
|
|
149
|
+
}
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
case 'assistant': {
|
|
153
|
+
// Message from the agent — extract text + tool calls
|
|
154
|
+
const msg = obj.message;
|
|
155
|
+
if (!msg)
|
|
156
|
+
break;
|
|
157
|
+
const content = msg.content ?? [];
|
|
158
|
+
const textLines = extractText(content);
|
|
159
|
+
for (const t of textLines) {
|
|
160
|
+
// Split multi-line text blocks into individual log lines
|
|
161
|
+
for (const subLine of t.split('\n')) {
|
|
162
|
+
onLog(subLine, 'stdout');
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
break;
|
|
166
|
+
}
|
|
167
|
+
case 'tool_result': {
|
|
168
|
+
// Tool execution result
|
|
169
|
+
const content = obj.content;
|
|
170
|
+
if (content) {
|
|
171
|
+
onLog(content, 'stdout');
|
|
172
|
+
}
|
|
173
|
+
break;
|
|
174
|
+
}
|
|
175
|
+
case 'result': {
|
|
176
|
+
// Final result — extract usage metadata
|
|
177
|
+
if (onMeta) {
|
|
178
|
+
const usage = obj.usage;
|
|
179
|
+
const meta = {
|
|
180
|
+
session_id: obj.session_id,
|
|
181
|
+
cost_usd: obj.total_cost_usd,
|
|
182
|
+
duration_ms: obj.duration_ms,
|
|
183
|
+
num_turns: obj.num_turns,
|
|
184
|
+
input_tokens: usage?.input_tokens,
|
|
185
|
+
output_tokens: usage?.output_tokens,
|
|
186
|
+
cache_read_tokens: usage?.cache_read_input_tokens,
|
|
187
|
+
cache_creation_tokens: usage?.cache_creation_input_tokens,
|
|
188
|
+
};
|
|
189
|
+
onMeta(meta);
|
|
190
|
+
}
|
|
191
|
+
// Log summary line
|
|
192
|
+
const cost = obj.total_cost_usd;
|
|
193
|
+
const duration = obj.duration_ms;
|
|
194
|
+
const turns = obj.num_turns;
|
|
195
|
+
const usage = obj.usage;
|
|
196
|
+
const inTok = usage?.input_tokens;
|
|
197
|
+
const outTok = usage?.output_tokens;
|
|
198
|
+
const parts = [];
|
|
199
|
+
if (turns)
|
|
200
|
+
parts.push(`${turns} turn${turns > 1 ? 's' : ''}`);
|
|
201
|
+
if (inTok || outTok)
|
|
202
|
+
parts.push(`${inTok ?? 0} in / ${outTok ?? 0} out tokens`);
|
|
203
|
+
if (cost != null)
|
|
204
|
+
parts.push(`$${cost.toFixed(4)}`);
|
|
205
|
+
if (duration)
|
|
206
|
+
parts.push(`${(duration / 1000).toFixed(1)}s`);
|
|
207
|
+
if (parts.length > 0) {
|
|
208
|
+
onLog(parts.join(' | '), 'stdout');
|
|
209
|
+
}
|
|
210
|
+
break;
|
|
211
|
+
}
|
|
212
|
+
// Skip rate_limit_event, etc. — not useful for the user
|
|
213
|
+
default:
|
|
214
|
+
break;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
109
217
|
cancel() {
|
|
110
218
|
if (!this.process)
|
|
111
219
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAqB,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC,SAAS,gBAAgB;IACvB,wFAAwF;IACxF,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC7C,CAAC,CAAC;YACE,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,CAAC;YAC9C,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,CAAC;YAC1D,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,CAAC;SAChD;QACH,CAAC,CAAC;YACE,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC;YAC1C,uBAAuB;YACvB,0BAA0B;SAC3B,CAAC;IAEN,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,uBAAuB;IACvB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,cAAc,CAAC;QACnF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC;YAAE,OAAO,KAAK,CAAC;IAC/C,CAAC;IAAC,MAAM,CAAC;QACP,cAAc;IAChB,CAAC;IAED,OAAO,QAAQ,CAAC,CAAC,6CAA6C;AAChE,CAAC;AAED,MAAM,OAAO,iBAAiB;IACpB,OAAO,GAAwB,IAAI,CAAC;IAE5C,KAAK,CAAC,GAAG,CAAC,MAAqB;QAC7B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/adapters/claude-code.ts"],"names":[],"mappings":"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"}
|
package/dist/adapters/codex.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { Adapter, AdapterConfig } from './interface.js';
|
|
|
2
2
|
export declare class CodexAdapter implements Adapter {
|
|
3
3
|
private process;
|
|
4
4
|
run(config: AdapterConfig): Promise<number>;
|
|
5
|
+
private handleJsonLine;
|
|
5
6
|
cancel(): void;
|
|
6
7
|
}
|
|
7
8
|
//# sourceMappingURL=codex.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"codex.d.ts","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,aAAa,EAAkB,MAAM,gBAAgB,CAAC;AAqD7E,qBAAa,YAAa,YAAW,OAAO;IAC1C,OAAO,CAAC,OAAO,CAA6B;IAEtC,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAkHjD,OAAO,CAAC,cAAc;IA8EtB,MAAM,IAAI,IAAI;CAcf"}
|
package/dist/adapters/codex.js
CHANGED
|
@@ -55,42 +55,53 @@ function resolveCodexBin() {
|
|
|
55
55
|
export class CodexAdapter {
|
|
56
56
|
process = null;
|
|
57
57
|
async run(config) {
|
|
58
|
-
const { workspace, command, onLog, agentOptions } = config;
|
|
58
|
+
const { workspace, command, onLog, onMeta, agentOptions } = config;
|
|
59
59
|
if (!existsSync(workspace)) {
|
|
60
60
|
throw new Error(`workspace_not_found:${workspace}`);
|
|
61
61
|
}
|
|
62
62
|
const codexBin = resolveCodexBin();
|
|
63
63
|
log.info(`using codex: ${codexBin}`);
|
|
64
|
+
const args = [
|
|
65
|
+
'exec',
|
|
66
|
+
'--json',
|
|
67
|
+
'--dangerously-bypass-approvals-and-sandbox',
|
|
68
|
+
'-C', workspace,
|
|
69
|
+
];
|
|
70
|
+
if (agentOptions?.model) {
|
|
71
|
+
args.push('-m', agentOptions.model);
|
|
72
|
+
}
|
|
73
|
+
args.push(command);
|
|
64
74
|
return new Promise((resolve, reject) => {
|
|
65
|
-
const
|
|
66
|
-
'exec',
|
|
67
|
-
'--dangerously-bypass-approvals-and-sandbox',
|
|
68
|
-
'-C', workspace,
|
|
69
|
-
];
|
|
70
|
-
if (agentOptions?.model) {
|
|
71
|
-
args.push('-m', agentOptions.model);
|
|
72
|
-
}
|
|
73
|
-
args.push(command);
|
|
75
|
+
const startTime = Date.now();
|
|
74
76
|
this.process = spawn(codexBin, args, {
|
|
75
77
|
cwd: workspace,
|
|
76
|
-
stdio: ['
|
|
78
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
79
|
+
shell: false,
|
|
77
80
|
env: { ...process.env }
|
|
78
81
|
});
|
|
79
82
|
const proc = this.process;
|
|
80
|
-
proc.stdin?.end();
|
|
81
83
|
let stdoutBuf = '';
|
|
82
84
|
let stderrBuf = '';
|
|
83
|
-
|
|
85
|
+
// Accumulate usage across all turns
|
|
86
|
+
let totalInputTokens = 0;
|
|
87
|
+
let totalCachedTokens = 0;
|
|
88
|
+
let totalOutputTokens = 0;
|
|
89
|
+
let numTurns = 0;
|
|
90
|
+
let sessionId;
|
|
84
91
|
proc.stdout?.setEncoding('utf8');
|
|
85
92
|
proc.stdout?.on('data', (chunk) => {
|
|
86
93
|
stdoutBuf += chunk;
|
|
87
94
|
const lines = stdoutBuf.split('\n');
|
|
88
95
|
stdoutBuf = lines.pop() ?? '';
|
|
89
96
|
for (const line of lines) {
|
|
90
|
-
if (line)
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
97
|
+
if (!line)
|
|
98
|
+
continue;
|
|
99
|
+
this.handleJsonLine(line, onLog, (tokens) => {
|
|
100
|
+
totalInputTokens += tokens.input;
|
|
101
|
+
totalCachedTokens += tokens.cached;
|
|
102
|
+
totalOutputTokens += tokens.output;
|
|
103
|
+
numTurns++;
|
|
104
|
+
}, (id) => { sessionId = id; });
|
|
94
105
|
}
|
|
95
106
|
});
|
|
96
107
|
proc.stderr?.setEncoding('utf8');
|
|
@@ -99,7 +110,7 @@ export class CodexAdapter {
|
|
|
99
110
|
const lines = stderrBuf.split('\n');
|
|
100
111
|
stderrBuf = lines.pop() ?? '';
|
|
101
112
|
for (const line of lines) {
|
|
102
|
-
if (line
|
|
113
|
+
if (line)
|
|
103
114
|
onLog(line, 'stderr');
|
|
104
115
|
}
|
|
105
116
|
});
|
|
@@ -112,17 +123,114 @@ export class CodexAdapter {
|
|
|
112
123
|
}
|
|
113
124
|
});
|
|
114
125
|
proc.on('close', (code) => {
|
|
115
|
-
if (stdoutBuf)
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
126
|
+
if (stdoutBuf)
|
|
127
|
+
this.handleJsonLine(stdoutBuf, onLog, (tokens) => {
|
|
128
|
+
totalInputTokens += tokens.input;
|
|
129
|
+
totalCachedTokens += tokens.cached;
|
|
130
|
+
totalOutputTokens += tokens.output;
|
|
131
|
+
numTurns++;
|
|
132
|
+
}, (id) => { sessionId = id; });
|
|
133
|
+
if (stderrBuf)
|
|
120
134
|
onLog(stderrBuf, 'stderr');
|
|
135
|
+
// Emit usage metadata
|
|
136
|
+
if (onMeta && (totalInputTokens > 0 || totalOutputTokens > 0)) {
|
|
137
|
+
const durationMs = Date.now() - startTime;
|
|
138
|
+
const meta = {
|
|
139
|
+
session_id: sessionId,
|
|
140
|
+
duration_ms: durationMs,
|
|
141
|
+
num_turns: numTurns,
|
|
142
|
+
input_tokens: totalInputTokens,
|
|
143
|
+
output_tokens: totalOutputTokens,
|
|
144
|
+
cache_read_tokens: totalCachedTokens,
|
|
145
|
+
};
|
|
146
|
+
// Log summary
|
|
147
|
+
const parts = [];
|
|
148
|
+
if (numTurns)
|
|
149
|
+
parts.push(`${numTurns} turn${numTurns > 1 ? 's' : ''}`);
|
|
150
|
+
parts.push(`${totalInputTokens} in / ${totalOutputTokens} out tokens`);
|
|
151
|
+
if (totalCachedTokens)
|
|
152
|
+
parts.push(`${totalCachedTokens} cached`);
|
|
153
|
+
parts.push(`${(durationMs / 1000).toFixed(1)}s`);
|
|
154
|
+
onLog(parts.join(' | '), 'stdout');
|
|
155
|
+
onMeta(meta);
|
|
156
|
+
}
|
|
121
157
|
this.process = null;
|
|
122
158
|
resolve(code ?? 1);
|
|
123
159
|
});
|
|
124
160
|
});
|
|
125
161
|
}
|
|
162
|
+
handleJsonLine(line, onLog, onTokens, onSession) {
|
|
163
|
+
if (!line.startsWith('{')) {
|
|
164
|
+
onLog(line, 'stdout');
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
let obj;
|
|
168
|
+
try {
|
|
169
|
+
obj = JSON.parse(line);
|
|
170
|
+
}
|
|
171
|
+
catch {
|
|
172
|
+
onLog(line, 'stdout');
|
|
173
|
+
return;
|
|
174
|
+
}
|
|
175
|
+
const type = obj.type;
|
|
176
|
+
switch (type) {
|
|
177
|
+
case 'thread.started': {
|
|
178
|
+
const threadId = obj.thread_id;
|
|
179
|
+
if (threadId) {
|
|
180
|
+
onSession(threadId);
|
|
181
|
+
onLog(`session: ${threadId}`, 'stdout');
|
|
182
|
+
}
|
|
183
|
+
break;
|
|
184
|
+
}
|
|
185
|
+
case 'item.completed': {
|
|
186
|
+
const item = obj.item;
|
|
187
|
+
if (!item)
|
|
188
|
+
break;
|
|
189
|
+
const itemType = item.type;
|
|
190
|
+
const text = item.text;
|
|
191
|
+
if (itemType === 'agent_message' && text) {
|
|
192
|
+
for (const subLine of text.split('\n')) {
|
|
193
|
+
onLog(subLine, 'stdout');
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
else if (itemType === 'reasoning' && text) {
|
|
197
|
+
onLog(`[reasoning] ${text}`, 'stdout');
|
|
198
|
+
}
|
|
199
|
+
else if (itemType === 'command_execution') {
|
|
200
|
+
const cmd = item.command;
|
|
201
|
+
const exitCode = item.exit_code;
|
|
202
|
+
if (cmd)
|
|
203
|
+
onLog(`[exec] ${cmd}${exitCode != null ? ` (exit ${exitCode})` : ''}`, 'stdout');
|
|
204
|
+
}
|
|
205
|
+
else if (itemType === 'file_change') {
|
|
206
|
+
const filePath = item.file_path;
|
|
207
|
+
const changeType = item.change_type;
|
|
208
|
+
if (filePath)
|
|
209
|
+
onLog(`[file] ${changeType ?? 'change'}: ${filePath}`, 'stdout');
|
|
210
|
+
}
|
|
211
|
+
break;
|
|
212
|
+
}
|
|
213
|
+
case 'turn.completed': {
|
|
214
|
+
const usage = obj.usage;
|
|
215
|
+
if (usage) {
|
|
216
|
+
const input = usage.input_tokens ?? 0;
|
|
217
|
+
const cached = usage.cached_input_tokens ?? 0;
|
|
218
|
+
const output = usage.output_tokens ?? 0;
|
|
219
|
+
onTokens({ input, cached, output });
|
|
220
|
+
}
|
|
221
|
+
break;
|
|
222
|
+
}
|
|
223
|
+
case 'error': {
|
|
224
|
+
const message = obj.message;
|
|
225
|
+
if (message)
|
|
226
|
+
onLog(`[error] ${message}`, 'stderr');
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
// Skip turn.started, item.started, etc.
|
|
230
|
+
default:
|
|
231
|
+
break;
|
|
232
|
+
}
|
|
233
|
+
}
|
|
126
234
|
cancel() {
|
|
127
235
|
if (!this.process)
|
|
128
236
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAqB,MAAM,oBAAoB,CAAC;AACtF,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;;;GAIG;AACH,SAAS,eAAe;IACtB,8DAA8D;IAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;IACnG,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,+DAA+D;QAC/D,MAAM,gBAAgB,GAAG;YACvB,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,iBAAiB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,WAAW,CAAC;YACvH,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,SAAS,EAAE,mBAAmB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,OAAO,EAAE,WAAW,CAAC;YAC1H,wDAAwD;YACxD,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,wBAAwB,EAAE,OAAO,EAAE,WAAW,CAAC;SAC1E,CAAC;QACF,KAAK,MAAM,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACjC,IAAI,UAAU,CAAC,CAAC,CAAC;gBAAE,OAAO,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC7C,CAAC,CAAC;YACE,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC;YAC7C,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC;SAC/C;QACH,CAAC,CAAC;YACE,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC;YACzC,sBAAsB;YACtB,yBAAyB;SAC1B,CAAC;IAEN,KAAK,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,UAAU,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC;IAC9B,CAAC;IAED,sBAAsB;IACtB,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,aAAa,CAAC;QACjF,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/F,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,KAAK,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,cAAc;IAChB,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,MAAM,OAAO,YAAY;IACf,OAAO,GAAwB,IAAI,CAAC;IAE5C,KAAK,CAAC,GAAG,CAAC,MAAqB;QAC7B,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../src/adapters/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,14 +5,35 @@ export interface AgentOptions {
|
|
|
5
5
|
allow_tools?: string[];
|
|
6
6
|
continue?: boolean;
|
|
7
7
|
}
|
|
8
|
+
export interface PermissionPrompt {
|
|
9
|
+
id: string;
|
|
10
|
+
text: string;
|
|
11
|
+
tool_name?: string;
|
|
12
|
+
tool_input?: string;
|
|
13
|
+
options: string[];
|
|
14
|
+
}
|
|
15
|
+
export interface AdapterRunMeta {
|
|
16
|
+
session_id?: string;
|
|
17
|
+
model?: string;
|
|
18
|
+
cost_usd?: number;
|
|
19
|
+
duration_ms?: number;
|
|
20
|
+
input_tokens?: number;
|
|
21
|
+
output_tokens?: number;
|
|
22
|
+
cache_read_tokens?: number;
|
|
23
|
+
cache_creation_tokens?: number;
|
|
24
|
+
num_turns?: number;
|
|
25
|
+
}
|
|
8
26
|
export interface AdapterConfig {
|
|
9
27
|
workspace: string;
|
|
10
28
|
command: string;
|
|
11
29
|
onLog: (line: string, stream: 'stdout' | 'stderr') => void;
|
|
30
|
+
onPermissionPrompt?: (prompt: Omit<PermissionPrompt, 'id'>) => void;
|
|
31
|
+
onMeta?: (meta: AdapterRunMeta) => void;
|
|
12
32
|
agentOptions?: AgentOptions;
|
|
13
33
|
}
|
|
14
34
|
export interface Adapter {
|
|
15
35
|
run(config: AdapterConfig): Promise<number>;
|
|
16
36
|
cancel(): void;
|
|
37
|
+
respondToPrompt?(response: string): void;
|
|
17
38
|
}
|
|
18
39
|
//# sourceMappingURL=interface.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/adapters/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,KAAK,IAAI,CAAC;IAC3D,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,OAAO;IACtB,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../src/adapters/interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,GAAG,QAAQ,KAAK,IAAI,CAAC;IAC3D,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,IAAI,CAAC;IACpE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,cAAc,KAAK,IAAI,CAAC;IACxC,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED,MAAM,WAAW,OAAO;IACtB,GAAG,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,IAAI,IAAI,CAAC;IACf,eAAe,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1C"}
|
package/dist/api-client.d.ts
CHANGED
|
@@ -5,11 +5,22 @@ export declare function connectRunner(serverUrl: string, apiKey: string, info: {
|
|
|
5
5
|
}): Promise<RunnerConnectResponse>;
|
|
6
6
|
export declare function sendHeartbeat(serverUrl: string, apiKey: string, metrics?: HeartbeatMetrics): Promise<void>;
|
|
7
7
|
export declare function updateRunStatus(serverUrl: string, apiKey: string, runId: string, status: RunStatus, snapshotCommit?: string): Promise<void>;
|
|
8
|
-
export declare function appendRunEvent(serverUrl: string, apiKey: string, runId: string, type: 'log' | 'status' | 'error' | 'snapshot' | 'rollback', data: Record<string, unknown>): Promise<void>;
|
|
8
|
+
export declare function appendRunEvent(serverUrl: string, apiKey: string, runId: string, type: 'log' | 'status' | 'error' | 'snapshot' | 'rollback' | 'permission_prompt' | 'usage', data: Record<string, unknown>): Promise<void>;
|
|
9
9
|
export declare function appendRunEventBatch(serverUrl: string, apiKey: string, runId: string, events: Array<{
|
|
10
10
|
type: string;
|
|
11
11
|
data: Record<string, unknown>;
|
|
12
12
|
}>): Promise<void>;
|
|
13
13
|
export declare function fetchRunStatus(serverUrl: string, apiKey: string, runId: string): Promise<string | null>;
|
|
14
|
+
export declare function sendPermissionPrompt(serverUrl: string, apiKey: string, runId: string, prompt: {
|
|
15
|
+
prompt_text: string;
|
|
16
|
+
tool_name?: string;
|
|
17
|
+
tool_input?: string;
|
|
18
|
+
options?: string[];
|
|
19
|
+
}): Promise<string | null>;
|
|
20
|
+
export declare function pollPromptResponse(serverUrl: string, apiKey: string, runId: string, promptId: string, intervalMs?: number, timeoutMs?: number): Promise<{
|
|
21
|
+
status: string;
|
|
22
|
+
response: string | null;
|
|
23
|
+
}>;
|
|
24
|
+
export declare function markPromptTimeout(serverUrl: string, apiKey: string, runId: string, promptId: string): Promise<void>;
|
|
14
25
|
export declare function replayJournal(serverUrl: string, apiKey: string): Promise<void>;
|
|
15
26
|
//# sourceMappingURL=api-client.d.ts.map
|
package/dist/api-client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAkBrF,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,qBAAqB,CAAC,CAgBhC;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,IAAI,CAAC,CAcf;AAMD,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,EACjB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAkBrF,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GACrC,OAAO,CAAC,qBAAqB,CAAC,CAgBhC;AAED,wBAAsB,aAAa,CACjC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,IAAI,CAAC,CAcf;AAMD,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,SAAS,EACjB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CA2Bf;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,KAAK,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,UAAU,GAAG,mBAAmB,GAAG,OAAO,EAC1F,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED,wBAAsB,mBAAmB,CACvC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAC7D,OAAO,CAAC,IAAI,CAAC,CAyBf;AAED,wBAAsB,cAAc,CAClC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAexB;AAID,wBAAsB,oBAAoB,CACxC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,MAAM,EAAE;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAC3F,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBxB;AAED,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,UAAU,SAAO,EACjB,SAAS,SAAgB,GACxB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,CA+BtD;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAcf;AAGD,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CA6CpF"}
|
package/dist/api-client.js
CHANGED
|
@@ -125,6 +125,59 @@ export async function fetchRunStatus(serverUrl, apiKey, runId) {
|
|
|
125
125
|
return null;
|
|
126
126
|
}
|
|
127
127
|
}
|
|
128
|
+
// -- Permission prompts ----------------------------------------------------
|
|
129
|
+
export async function sendPermissionPrompt(serverUrl, apiKey, runId, prompt) {
|
|
130
|
+
try {
|
|
131
|
+
const { ok, payload } = await apiFetch(serverUrl, `/api/runs/${encodeURIComponent(runId)}/prompts`, {
|
|
132
|
+
method: 'POST',
|
|
133
|
+
headers: { 'content-type': 'application/json', authorization: `Bearer ${apiKey}` },
|
|
134
|
+
body: JSON.stringify(prompt)
|
|
135
|
+
});
|
|
136
|
+
if (!ok)
|
|
137
|
+
return null;
|
|
138
|
+
return payload?.prompt_id ?? null;
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
return null;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
export async function pollPromptResponse(serverUrl, apiKey, runId, promptId, intervalMs = 1500, timeoutMs = 5 * 60 * 1000) {
|
|
145
|
+
const deadline = Date.now() + timeoutMs;
|
|
146
|
+
while (Date.now() < deadline) {
|
|
147
|
+
try {
|
|
148
|
+
const { ok, payload } = await apiFetch(serverUrl, `/api/runs/${encodeURIComponent(runId)}/prompts/${encodeURIComponent(promptId)}`, {
|
|
149
|
+
method: 'GET',
|
|
150
|
+
headers: { authorization: `Bearer ${apiKey}` }
|
|
151
|
+
});
|
|
152
|
+
if (ok) {
|
|
153
|
+
const data = payload;
|
|
154
|
+
const status = data?.status;
|
|
155
|
+
if (status && status !== 'pending') {
|
|
156
|
+
return { status, response: data?.response ?? null };
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
// network error — keep polling
|
|
162
|
+
}
|
|
163
|
+
await new Promise((resolve) => setTimeout(resolve, intervalMs));
|
|
164
|
+
}
|
|
165
|
+
// Timeout — mark on server
|
|
166
|
+
await markPromptTimeout(serverUrl, apiKey, runId, promptId);
|
|
167
|
+
return { status: 'timed_out', response: null };
|
|
168
|
+
}
|
|
169
|
+
export async function markPromptTimeout(serverUrl, apiKey, runId, promptId) {
|
|
170
|
+
try {
|
|
171
|
+
await apiFetch(serverUrl, `/api/runs/${encodeURIComponent(runId)}/prompts/${encodeURIComponent(promptId)}`, {
|
|
172
|
+
method: 'POST',
|
|
173
|
+
headers: { 'content-type': 'application/json', authorization: `Bearer ${apiKey}` },
|
|
174
|
+
body: JSON.stringify({})
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
catch {
|
|
178
|
+
// best effort
|
|
179
|
+
}
|
|
180
|
+
}
|
|
128
181
|
// Replay all buffered journal entries. Called after a successful heartbeat.
|
|
129
182
|
export async function replayJournal(serverUrl, apiKey) {
|
|
130
183
|
const entries = readJournal();
|
package/dist/api-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../src/api-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-handler.d.ts","sourceRoot":"","sources":["../src/run-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"run-handler.d.ts","sourceRoot":"","sources":["../src/run-handler.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAoC,MAAM,yBAAyB,CAAC;AACzF,OAAO,KAAK,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAIvD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACxE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAcD,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,QAAQ,GAAE,WAA+B,EACzC,MAAM,GAAE,SAAS,GAAG,IAAW,GAC9B,OAAO,CAAC,IAAI,CAAC,CAwLf"}
|
package/dist/run-handler.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { updateRunStatus, appendRunEvent, appendRunEventBatch, fetchRunStatus } from './api-client.js';
|
|
1
|
+
import { updateRunStatus, appendRunEvent, appendRunEventBatch, fetchRunStatus, sendPermissionPrompt, pollPromptResponse } from './api-client.js';
|
|
2
2
|
import { sanitizeLogLine } from './log-sanitizer.js';
|
|
3
3
|
import { log } from './logger.js';
|
|
4
4
|
const simulatedExecutor = {};
|
|
@@ -93,6 +93,25 @@ export async function handleRunDispatch(serverUrl, apiKey, userId, payload, exec
|
|
|
93
93
|
const timeoutSec = rawTimeout > 0 ? rawTimeout : 7 * 24 * 3600;
|
|
94
94
|
let timedOut = false;
|
|
95
95
|
let cancelled = false;
|
|
96
|
+
// Permission prompt handler: send to server, poll for response, write back to adapter
|
|
97
|
+
const onPermissionPrompt = async (prompt) => {
|
|
98
|
+
log.info(`[run:${run_id.slice(0, 8)}] permission prompt: ${prompt.text}`);
|
|
99
|
+
const promptId = await sendPermissionPrompt(serverUrl, apiKey, run_id, {
|
|
100
|
+
prompt_text: prompt.text,
|
|
101
|
+
tool_name: prompt.tool_name,
|
|
102
|
+
tool_input: prompt.tool_input,
|
|
103
|
+
options: prompt.options,
|
|
104
|
+
});
|
|
105
|
+
if (!promptId) {
|
|
106
|
+
log.warn(`[run:${run_id.slice(0, 8)}] failed to send prompt, auto-declining`);
|
|
107
|
+
activeAdapter.respondToPrompt?.('no');
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
const result = await pollPromptResponse(serverUrl, apiKey, run_id, promptId);
|
|
111
|
+
const answer = result.response ?? 'no';
|
|
112
|
+
log.info(`[run:${run_id.slice(0, 8)}] prompt ${promptId.slice(0, 8)} → ${answer}`);
|
|
113
|
+
activeAdapter.respondToPrompt?.(answer);
|
|
114
|
+
};
|
|
96
115
|
const timeoutHandle = setTimeout(() => {
|
|
97
116
|
timedOut = true;
|
|
98
117
|
log.warn(`policy timeout (${timeoutSec}s) — killing run ${run_id.slice(0, 8)}`);
|
|
@@ -108,8 +127,13 @@ export async function handleRunDispatch(serverUrl, apiKey, userId, payload, exec
|
|
|
108
127
|
clearInterval(cancelPoll);
|
|
109
128
|
}
|
|
110
129
|
}, 2000);
|
|
130
|
+
// Usage metadata handler: send tokens/cost/session as a 'usage' event
|
|
131
|
+
const onMeta = (meta) => {
|
|
132
|
+
log.info(`[run:${run_id.slice(0, 8)}] usage: ${JSON.stringify(meta)}`);
|
|
133
|
+
appendRunEvent(serverUrl, apiKey, run_id, 'usage', meta).catch((e) => log.warn(`failed to send usage event: ${e}`));
|
|
134
|
+
};
|
|
111
135
|
try {
|
|
112
|
-
exitCode = await activeAdapter.run({ workspace, command, onLog, agentOptions: agent_options });
|
|
136
|
+
exitCode = await activeAdapter.run({ workspace, command, onLog, onPermissionPrompt, onMeta, agentOptions: agent_options });
|
|
113
137
|
}
|
|
114
138
|
finally {
|
|
115
139
|
clearTimeout(timeoutHandle);
|
package/dist/run-handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-handler.js","sourceRoot":"","sources":["../src/run-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"run-handler.js","sourceRoot":"","sources":["../src/run-handler.ts"],"names":[],"mappings":"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"}
|