@myagentroam/agent 0.11.41 → 0.11.43
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/host/local-exec-tool.js +50 -26
- package/dist/runtime/async-queue.d.ts +1 -1
- package/dist/runtime/async-queue.js +4 -2
- package/dist/runtime/events.d.ts +1 -1
- package/dist/runtime/wait.js +13 -6
- package/dist/sdk/session-execution.d.ts +1 -0
- package/dist/sdk/session-execution.js +26 -3
- package/dist/tools/code-mode/cells.js +131 -1
- package/dist/tools/contracts.d.ts +14 -0
- package/dist/tools/execution.js +16 -3
- package/dist/tools/local/exec.js +5 -3
- package/dist/tools/output-projection.js +23 -1
- package/dist/tools/runtime-context.d.ts +1 -1
- package/dist/tools/runtime.js +2 -1
- package/package.json +1 -1
|
@@ -169,7 +169,8 @@ export class ExecTool {
|
|
|
169
169
|
...(child.signalCode == null ? {} : { exitSignal: child.signalCode }),
|
|
170
170
|
finalized: false,
|
|
171
171
|
terminalResultReturned: false,
|
|
172
|
-
waiters: new Set()
|
|
172
|
+
waiters: new Set(),
|
|
173
|
+
outputListeners: new Set()
|
|
173
174
|
};
|
|
174
175
|
this.#processes.set(id, managed);
|
|
175
176
|
if (native) {
|
|
@@ -188,6 +189,8 @@ export class ExecTool {
|
|
|
188
189
|
return;
|
|
189
190
|
const decoded = Buffer.from(managed[name].decoder.write(chunk));
|
|
190
191
|
appendDisplay(managed[name === 'stdout' ? 'stdoutDisplay' : 'stderrDisplay'], decoded);
|
|
192
|
+
for (const listener of managed.outputListeners)
|
|
193
|
+
listener(name, decoded);
|
|
191
194
|
appendOutput(managed[name], decoded, this.maxOutputBytes, chunk.length);
|
|
192
195
|
appendOutput(managed[name === 'stdout' ? 'stdoutHistory' : 'stderrHistory'], decoded, this.maxOutputBytes, chunk.length);
|
|
193
196
|
notifyProcessChange(managed);
|
|
@@ -226,6 +229,8 @@ export class ExecTool {
|
|
|
226
229
|
else {
|
|
227
230
|
const message = Buffer.from(error.message);
|
|
228
231
|
appendDisplay(managed.stderrDisplay, message);
|
|
232
|
+
for (const listener of managed.outputListeners)
|
|
233
|
+
listener('stderr', message);
|
|
229
234
|
appendOutput(managed.stderr, message, this.maxOutputBytes);
|
|
230
235
|
appendOutput(managed.stderrHistory, message, this.maxOutputBytes);
|
|
231
236
|
notifyProcessChange(managed);
|
|
@@ -421,7 +426,13 @@ export class ExecTool {
|
|
|
421
426
|
stderrBytes: process.stderr.totalBytes,
|
|
422
427
|
stdoutDroppedBytes: stdout.droppedBytes,
|
|
423
428
|
stderrDroppedBytes: stderr.droppedBytes,
|
|
424
|
-
displayOutput: displayOutput(process)
|
|
429
|
+
displayOutput: displayOutput(process),
|
|
430
|
+
executionSource: {
|
|
431
|
+
kind: 'SHELL',
|
|
432
|
+
text: process.command.slice(0, 10_000),
|
|
433
|
+
cwd: process.cwd.slice(0, 10_000),
|
|
434
|
+
truncated: process.command.length > 10_000 || process.cwd.length > 10_000
|
|
435
|
+
}
|
|
425
436
|
}
|
|
426
437
|
});
|
|
427
438
|
while (this.#completed.size > TOOL_EXECUTION_LIMITS.execMaxCompletedResults)
|
|
@@ -484,7 +495,13 @@ export class ExecTool {
|
|
|
484
495
|
stderrBytes: process.stderr.totalBytes,
|
|
485
496
|
stdoutDroppedBytes: stdout.droppedBytes,
|
|
486
497
|
stderrDroppedBytes: stderr.droppedBytes,
|
|
487
|
-
displayOutput: displayOutput(process)
|
|
498
|
+
displayOutput: displayOutput(process),
|
|
499
|
+
executionSource: {
|
|
500
|
+
kind: 'SHELL',
|
|
501
|
+
text: process.command.slice(0, 10_000),
|
|
502
|
+
cwd: process.cwd.slice(0, 10_000),
|
|
503
|
+
truncated: process.command.length > 10_000 || process.cwd.length > 10_000
|
|
504
|
+
}
|
|
488
505
|
};
|
|
489
506
|
}
|
|
490
507
|
async dispose() {
|
|
@@ -529,6 +546,10 @@ function finalizeManagedProcess(managed, maximumOutputBytes, exitCode) {
|
|
|
529
546
|
const stderrEnd = Buffer.from(managed.stderr.decoder.end());
|
|
530
547
|
appendDisplay(managed.stdoutDisplay, stdoutEnd);
|
|
531
548
|
appendDisplay(managed.stderrDisplay, stderrEnd);
|
|
549
|
+
for (const listener of managed.outputListeners) {
|
|
550
|
+
listener('stdout', stdoutEnd);
|
|
551
|
+
listener('stderr', stderrEnd);
|
|
552
|
+
}
|
|
532
553
|
appendOutput(managed.stdout, stdoutEnd, maximumOutputBytes);
|
|
533
554
|
appendOutput(managed.stderr, stderrEnd, maximumOutputBytes);
|
|
534
555
|
appendOutput(managed.stdoutHistory, stdoutEnd, maximumOutputBytes);
|
|
@@ -642,34 +663,36 @@ async function waitForProcessCompletion(processId, managed, waitMs, signal, inte
|
|
|
642
663
|
stopOutput?.();
|
|
643
664
|
}
|
|
644
665
|
}
|
|
645
|
-
/** Coalesce
|
|
666
|
+
/** Coalesce decoded chunks into bounded per-call frames without blocking the process. */
|
|
646
667
|
function watchProcessOutput(processId, managed, onOutput) {
|
|
647
668
|
let stopped = false;
|
|
648
|
-
let
|
|
669
|
+
let stdout = { value: Buffer.alloc(0), droppedBytes: 0 };
|
|
670
|
+
let stderr = { value: Buffer.alloc(0), droppedBytes: 0 };
|
|
649
671
|
let timer;
|
|
650
672
|
let inFlight;
|
|
651
673
|
let failed = false;
|
|
674
|
+
let initialSnapshot = managed.stdoutDisplay.value.length > 0 || managed.stderrDisplay.value.length > 0;
|
|
652
675
|
const publish = () => {
|
|
653
|
-
|
|
654
|
-
const
|
|
655
|
-
|
|
656
|
-
|
|
657
|
-
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
};
|
|
661
|
-
const stdout = preview(managed.stdout);
|
|
662
|
-
const stderr = preview(managed.stderr);
|
|
676
|
+
const frameOut = stdout;
|
|
677
|
+
const frameErr = stderr;
|
|
678
|
+
stdout = { value: Buffer.alloc(0), droppedBytes: 0 };
|
|
679
|
+
stderr = { value: Buffer.alloc(0), droppedBytes: 0 };
|
|
680
|
+
const snapshot = displayOutput(managed);
|
|
681
|
+
const snapshotFrame = initialSnapshot || frameOut.droppedBytes > 0 || frameErr.droppedBytes > 0;
|
|
682
|
+
initialSnapshot = false;
|
|
663
683
|
inFlight = Promise.resolve()
|
|
664
684
|
.then(() => {
|
|
665
685
|
if (stopped)
|
|
666
686
|
return;
|
|
667
687
|
return onOutput({
|
|
668
688
|
processId,
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
672
|
-
|
|
689
|
+
mode: snapshotFrame ? 'snapshot' : 'delta',
|
|
690
|
+
stdout: snapshotFrame ? snapshot.stdout : frameOut.value.toString('utf8'),
|
|
691
|
+
stderr: snapshotFrame ? snapshot.stderr : frameErr.value.toString('utf8'),
|
|
692
|
+
truncated: snapshotFrame
|
|
693
|
+
? snapshot.stdoutDroppedBytes > 0 || snapshot.stderrDroppedBytes > 0
|
|
694
|
+
: frameOut.droppedBytes > 0 || frameErr.droppedBytes > 0,
|
|
695
|
+
displayOutput: snapshot
|
|
673
696
|
});
|
|
674
697
|
})
|
|
675
698
|
.catch(() => {
|
|
@@ -678,7 +701,7 @@ function watchProcessOutput(processId, managed, onOutput) {
|
|
|
678
701
|
})
|
|
679
702
|
.finally(() => {
|
|
680
703
|
inFlight = undefined;
|
|
681
|
-
if (
|
|
704
|
+
if (stdout.value.length || stderr.value.length)
|
|
682
705
|
schedule();
|
|
683
706
|
});
|
|
684
707
|
};
|
|
@@ -691,17 +714,18 @@ function watchProcessOutput(processId, managed, onOutput) {
|
|
|
691
714
|
}, TOOL_EXECUTION_LIMITS.execProgressIntervalMs);
|
|
692
715
|
timer.unref();
|
|
693
716
|
};
|
|
694
|
-
const changed = () => {
|
|
695
|
-
if (
|
|
717
|
+
const changed = (channel, chunk) => {
|
|
718
|
+
if (chunk.length === 0)
|
|
696
719
|
return;
|
|
697
|
-
|
|
720
|
+
appendDisplay(channel === 'stdout' ? stdout : stderr, chunk);
|
|
698
721
|
schedule();
|
|
699
722
|
};
|
|
700
|
-
managed.
|
|
701
|
-
|
|
723
|
+
managed.outputListeners.add(changed);
|
|
724
|
+
if (initialSnapshot)
|
|
725
|
+
schedule();
|
|
702
726
|
return () => {
|
|
703
727
|
stopped = true;
|
|
704
|
-
managed.
|
|
728
|
+
managed.outputListeners.delete(changed);
|
|
705
729
|
if (timer)
|
|
706
730
|
clearTimeout(timer);
|
|
707
731
|
};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare class AsyncQueue<T> implements AsyncIterable<T> {
|
|
2
2
|
#private;
|
|
3
3
|
/** Best-effort live values are delivered only to an actively waiting consumer. */
|
|
4
|
-
pushIfWaiting(value: T):
|
|
4
|
+
pushIfWaiting(value: T): boolean;
|
|
5
5
|
push(value: T): void;
|
|
6
6
|
close(): void;
|
|
7
7
|
discardIfUnobserved(): boolean;
|
|
@@ -8,8 +8,10 @@ export class AsyncQueue {
|
|
|
8
8
|
#discarded = false;
|
|
9
9
|
/** Best-effort live values are delivered only to an actively waiting consumer. */
|
|
10
10
|
pushIfWaiting(value) {
|
|
11
|
-
if (this.#waiterOffset
|
|
12
|
-
|
|
11
|
+
if (this.#waiterOffset >= this.#waiters.length || this.#closed || this.#discarded)
|
|
12
|
+
return false;
|
|
13
|
+
this.push(value);
|
|
14
|
+
return true;
|
|
13
15
|
}
|
|
14
16
|
push(value) {
|
|
15
17
|
if (this.#closed || this.#discarded)
|
package/dist/runtime/events.d.ts
CHANGED
|
@@ -91,7 +91,7 @@ export type AgentEvent = AgentEventBase & ({
|
|
|
91
91
|
truncated?: boolean;
|
|
92
92
|
} | {
|
|
93
93
|
type: 'tool.output';
|
|
94
|
-
toolName: 'exec' | 'exec_wait';
|
|
94
|
+
toolName: 'exec' | 'exec_wait' | 'code_exec_wait';
|
|
95
95
|
callId: string;
|
|
96
96
|
parentCallId?: string;
|
|
97
97
|
output: import('../tools/contracts.js').ExecOutputSnapshot;
|
package/dist/runtime/wait.js
CHANGED
|
@@ -40,12 +40,19 @@ export function waitForToolCondition(input) {
|
|
|
40
40
|
reject(error);
|
|
41
41
|
};
|
|
42
42
|
const check = () => {
|
|
43
|
-
if (
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
43
|
+
if (settled)
|
|
44
|
+
return;
|
|
45
|
+
try {
|
|
46
|
+
if (input.signal?.aborted)
|
|
47
|
+
abort();
|
|
48
|
+
else if (input.ready())
|
|
49
|
+
finish('ready');
|
|
50
|
+
else if (input.interrupt?.pending())
|
|
51
|
+
finish('interrupted');
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
finish('interrupted', error);
|
|
55
|
+
}
|
|
49
56
|
};
|
|
50
57
|
const abort = () => finish('interrupted', input.signal?.reason ??
|
|
51
58
|
new AgentError('MAR_AGENT_EXECUTION_CANCELLED', 'Execution cancelled.'));
|
|
@@ -65,6 +65,7 @@ export class SessionExecution {
|
|
|
65
65
|
terminalAdmitted = false;
|
|
66
66
|
releaseLease;
|
|
67
67
|
eventSequence = 0;
|
|
68
|
+
missedOutput = new Set();
|
|
68
69
|
persistedTerminal = false;
|
|
69
70
|
completionAdmitted = false;
|
|
70
71
|
appendedMessages = [];
|
|
@@ -235,10 +236,32 @@ export class SessionExecution {
|
|
|
235
236
|
full.type === 'execution.failed' ||
|
|
236
237
|
full.type === 'execution.cancelled')
|
|
237
238
|
this.#observedTerminal = structuredClone(full);
|
|
238
|
-
if (full.type === 'tool.output')
|
|
239
|
-
this.
|
|
240
|
-
|
|
239
|
+
if (full.type === 'tool.output') {
|
|
240
|
+
const missed = this.missedOutput.has(full.callId);
|
|
241
|
+
const deliver = missed && full.output.displayOutput
|
|
242
|
+
? {
|
|
243
|
+
...full,
|
|
244
|
+
output: {
|
|
245
|
+
...full.output,
|
|
246
|
+
mode: 'snapshot',
|
|
247
|
+
stdout: full.output.displayOutput.stdout,
|
|
248
|
+
stderr: full.output.displayOutput.stderr,
|
|
249
|
+
truncated: full.output.truncated ||
|
|
250
|
+
full.output.displayOutput.stdoutDroppedBytes > 0 ||
|
|
251
|
+
full.output.displayOutput.stderrDroppedBytes > 0
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
: full;
|
|
255
|
+
if (this.events.pushIfWaiting(deliver))
|
|
256
|
+
this.missedOutput.delete(full.callId);
|
|
257
|
+
else
|
|
258
|
+
this.missedOutput.add(full.callId);
|
|
259
|
+
}
|
|
260
|
+
else {
|
|
261
|
+
if (full.type === 'tool.completed' || full.type === 'tool.failed')
|
|
262
|
+
this.missedOutput.delete(full.callId);
|
|
241
263
|
this.events.push(full);
|
|
264
|
+
}
|
|
242
265
|
ports.observe?.(full);
|
|
243
266
|
this.compactRequests.publish(full);
|
|
244
267
|
try {
|
|
@@ -20,6 +20,110 @@ export class CodeCellExecutionError extends AgentError {
|
|
|
20
20
|
this.result = result;
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
+
/** A waiting call owns its bounded display window; delivery never delays the cell. */
|
|
24
|
+
function forwardCellOutput(publish) {
|
|
25
|
+
let stopped = false;
|
|
26
|
+
let failed = false;
|
|
27
|
+
let inFlight = false;
|
|
28
|
+
let pending = false;
|
|
29
|
+
let latest;
|
|
30
|
+
// Source metadata is bounded by the cell's tool-call budget; text shares one window.
|
|
31
|
+
const sources = new Map();
|
|
32
|
+
const trim = (channel) => {
|
|
33
|
+
let excess = [...sources.values()].reduce((bytes, source) => bytes + Buffer.byteLength(source[channel]), 0) - limits.execProgressMaxOutputBytes;
|
|
34
|
+
for (const source of sources.values()) {
|
|
35
|
+
if (excess <= 0)
|
|
36
|
+
break;
|
|
37
|
+
const bytes = Buffer.from(source[channel]);
|
|
38
|
+
let removed = Math.min(excess, bytes.length);
|
|
39
|
+
while (removed < bytes.length && (bytes[removed] & 0xc0) === 0x80)
|
|
40
|
+
removed++;
|
|
41
|
+
source[channel] = bytes.subarray(removed).toString('utf8');
|
|
42
|
+
excess -= removed;
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
const snapshot = () => {
|
|
46
|
+
const entries = [...sources.values()];
|
|
47
|
+
const stdout = entries.map((source) => source.stdout).join('');
|
|
48
|
+
const stderr = entries.map((source) => source.stderr).join('');
|
|
49
|
+
const stdoutDroppedBytes = entries.reduce((bytes, source) => bytes + source.stdoutBytes, 0) - Buffer.byteLength(stdout);
|
|
50
|
+
const stderrDroppedBytes = entries.reduce((bytes, source) => bytes + source.stderrBytes, 0) - Buffer.byteLength(stderr);
|
|
51
|
+
return {
|
|
52
|
+
...latest,
|
|
53
|
+
mode: 'snapshot',
|
|
54
|
+
stdout,
|
|
55
|
+
stderr,
|
|
56
|
+
truncated: entries.some((source) => source.truncated) ||
|
|
57
|
+
stdoutDroppedBytes > 0 ||
|
|
58
|
+
stderrDroppedBytes > 0,
|
|
59
|
+
displayOutput: {
|
|
60
|
+
stdout,
|
|
61
|
+
stderr,
|
|
62
|
+
stdoutDroppedBytes,
|
|
63
|
+
stderrDroppedBytes
|
|
64
|
+
}
|
|
65
|
+
};
|
|
66
|
+
};
|
|
67
|
+
const send = (output) => {
|
|
68
|
+
inFlight = true;
|
|
69
|
+
void Promise.resolve()
|
|
70
|
+
.then(() => (stopped ? undefined : publish(output)))
|
|
71
|
+
.catch(() => {
|
|
72
|
+
failed = true;
|
|
73
|
+
})
|
|
74
|
+
.finally(() => {
|
|
75
|
+
inFlight = false;
|
|
76
|
+
if (!stopped && !failed && pending) {
|
|
77
|
+
pending = false;
|
|
78
|
+
send(snapshot());
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
};
|
|
82
|
+
return {
|
|
83
|
+
onOutput(output) {
|
|
84
|
+
if (stopped || failed)
|
|
85
|
+
return;
|
|
86
|
+
const isSnapshot = output.mode !== 'delta';
|
|
87
|
+
const source = sources.get(output.processId) ?? {
|
|
88
|
+
stdout: '',
|
|
89
|
+
stderr: '',
|
|
90
|
+
stdoutBytes: 0,
|
|
91
|
+
stderrBytes: 0,
|
|
92
|
+
truncated: false
|
|
93
|
+
};
|
|
94
|
+
if (isSnapshot) {
|
|
95
|
+
source.stdout = output.stdout;
|
|
96
|
+
source.stderr = output.stderr;
|
|
97
|
+
source.stdoutBytes =
|
|
98
|
+
Buffer.byteLength(output.stdout) + (output.displayOutput?.stdoutDroppedBytes ?? 0);
|
|
99
|
+
source.stderrBytes =
|
|
100
|
+
Buffer.byteLength(output.stderr) + (output.displayOutput?.stderrDroppedBytes ?? 0);
|
|
101
|
+
source.truncated = output.truncated;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
source.stdout += output.stdout;
|
|
105
|
+
source.stderr += output.stderr;
|
|
106
|
+
source.stdoutBytes += Buffer.byteLength(output.stdout);
|
|
107
|
+
source.stderrBytes += Buffer.byteLength(output.stderr);
|
|
108
|
+
source.truncated ||= output.truncated;
|
|
109
|
+
}
|
|
110
|
+
sources.set(output.processId, source);
|
|
111
|
+
trim('stdout');
|
|
112
|
+
trim('stderr');
|
|
113
|
+
latest = output;
|
|
114
|
+
if (inFlight)
|
|
115
|
+
pending = true;
|
|
116
|
+
else
|
|
117
|
+
send(isSnapshot ? snapshot() : { ...output, displayOutput: snapshot().displayOutput });
|
|
118
|
+
},
|
|
119
|
+
stop() {
|
|
120
|
+
stopped = true;
|
|
121
|
+
pending = false;
|
|
122
|
+
sources.clear();
|
|
123
|
+
latest = undefined;
|
|
124
|
+
}
|
|
125
|
+
};
|
|
126
|
+
}
|
|
23
127
|
function options(value, wait) {
|
|
24
128
|
if (!value || typeof value !== 'object' || Array.isArray(value))
|
|
25
129
|
throw new AgentError('MAR_AGENT_TOOL_INPUT_INVALID', 'Code Exec options must be an object.');
|
|
@@ -77,6 +181,7 @@ export class CodeCells {
|
|
|
77
181
|
throw new AgentError('MAR_AGENT_PROCESS_LIMIT', `The Local Host shared running-cell limit (${limits.codeMaxConcurrentCells}) was reached.`);
|
|
78
182
|
const controller = new AbortController();
|
|
79
183
|
const cell = {
|
|
184
|
+
source: { kind: 'CODE', text: source.slice(0, 10_000), truncated: source.length > 10_000 },
|
|
80
185
|
cellId: this.#handles.create(),
|
|
81
186
|
sessionId: context.sessionId,
|
|
82
187
|
executionId: context.executionId,
|
|
@@ -90,9 +195,14 @@ export class CodeCells {
|
|
|
90
195
|
yielded: false,
|
|
91
196
|
truncated: false,
|
|
92
197
|
listeners: new Set(),
|
|
198
|
+
outputListeners: new Set(),
|
|
93
199
|
done: Promise.resolve()
|
|
94
200
|
};
|
|
95
201
|
this.#cells.set(cell.cellId, cell);
|
|
202
|
+
const unsubscribeOutput = context.codeMode?.subscribeToolOutput?.((output) => {
|
|
203
|
+
for (const listener of cell.outputListeners)
|
|
204
|
+
listener(output);
|
|
205
|
+
});
|
|
96
206
|
const notify = () => {
|
|
97
207
|
for (const listener of cell.listeners)
|
|
98
208
|
listener();
|
|
@@ -124,6 +234,7 @@ export class CodeCells {
|
|
|
124
234
|
outcome = controller.signal.aborted ? 'cancelled' : 'failed';
|
|
125
235
|
})
|
|
126
236
|
.then(async () => {
|
|
237
|
+
unsubscribeOutput?.();
|
|
127
238
|
try {
|
|
128
239
|
await context.codeMode?.onSettled?.({
|
|
129
240
|
cellId: cell.cellId,
|
|
@@ -179,7 +290,23 @@ export class CodeCells {
|
|
|
179
290
|
abort();
|
|
180
291
|
});
|
|
181
292
|
}
|
|
182
|
-
|
|
293
|
+
const forward = cell.executionId !== context.executionId &&
|
|
294
|
+
input.action === 'poll' &&
|
|
295
|
+
input.yieldMs > 0 &&
|
|
296
|
+
context.onOutput
|
|
297
|
+
? forwardCellOutput(context.onOutput)
|
|
298
|
+
: undefined;
|
|
299
|
+
if (forward)
|
|
300
|
+
cell.outputListeners.add(forward.onOutput);
|
|
301
|
+
try {
|
|
302
|
+
return await this.#wait(cell, input, context.signal, false, context.codeMode?.supportsImages === true, input.action === 'poll' ? context.waitInterrupt : undefined);
|
|
303
|
+
}
|
|
304
|
+
finally {
|
|
305
|
+
if (forward) {
|
|
306
|
+
cell.outputListeners.delete(forward.onOutput);
|
|
307
|
+
forward.stop();
|
|
308
|
+
}
|
|
309
|
+
}
|
|
183
310
|
}
|
|
184
311
|
async #wait(cell, input, signal, initial, supportsImages, interrupt) {
|
|
185
312
|
const outcome = input.yieldMs === 0
|
|
@@ -232,6 +359,7 @@ export class CodeCells {
|
|
|
232
359
|
observations: visible.observations.map(visibleObservation)
|
|
233
360
|
}),
|
|
234
361
|
data,
|
|
362
|
+
eventData: { ...data, executionSource: cell.source },
|
|
235
363
|
truncated: data.truncated
|
|
236
364
|
};
|
|
237
365
|
}
|
|
@@ -247,6 +375,7 @@ export class CodeCells {
|
|
|
247
375
|
return {
|
|
248
376
|
...cell.terminal,
|
|
249
377
|
data,
|
|
378
|
+
eventData: { ...data, executionSource: cell.source },
|
|
250
379
|
content: JSON.stringify(data),
|
|
251
380
|
truncated: cell.terminal.truncated || bounded.truncated
|
|
252
381
|
};
|
|
@@ -301,6 +430,7 @@ export class CodeCells {
|
|
|
301
430
|
calls: [...cell.calls.values()],
|
|
302
431
|
observations: remapped,
|
|
303
432
|
data,
|
|
433
|
+
eventData: { ...data, executionSource: cell.source },
|
|
304
434
|
truncated: cell.truncated || structured.truncated,
|
|
305
435
|
...(visibleImages.length ? { images: visibleImages } : {})
|
|
306
436
|
};
|
|
@@ -41,6 +41,7 @@ export interface ToolExecutionContext {
|
|
|
41
41
|
readonly data: Buffer;
|
|
42
42
|
}[];
|
|
43
43
|
codeMode?: {
|
|
44
|
+
subscribeToolOutput?(listener: (output: ExecOutputSnapshot) => void): () => void;
|
|
44
45
|
retainSession?(): Promise<() => Promise<void>>;
|
|
45
46
|
onSettled?(result: CodeCellEventData): Promise<void>;
|
|
46
47
|
supportsImages?: boolean;
|
|
@@ -94,6 +95,8 @@ export interface AgentToolImageArtifact {
|
|
|
94
95
|
export type AgentToolArtifact = AgentToolImageArtifact;
|
|
95
96
|
export interface ExecOutputSnapshot {
|
|
96
97
|
processId: string;
|
|
98
|
+
/** Omitted for legacy snapshot sources; delta is a real decoded process chunk. */
|
|
99
|
+
mode?: 'delta' | 'snapshot';
|
|
97
100
|
stdout: string;
|
|
98
101
|
stderr: string;
|
|
99
102
|
truncated: boolean;
|
|
@@ -106,6 +109,13 @@ export interface ExecDisplayOutput {
|
|
|
106
109
|
stdoutDroppedBytes: number;
|
|
107
110
|
stderrDroppedBytes: number;
|
|
108
111
|
}
|
|
112
|
+
/** Bounded original input for public presentation, never added to model results. */
|
|
113
|
+
export interface ExecutionSource {
|
|
114
|
+
kind: 'SHELL' | 'CODE';
|
|
115
|
+
text: string;
|
|
116
|
+
cwd?: string;
|
|
117
|
+
truncated: boolean;
|
|
118
|
+
}
|
|
109
119
|
export interface ToolExecutionResult {
|
|
110
120
|
calls?: readonly import('../session/code-observation-contract.js').CodeToolCallRecord[];
|
|
111
121
|
content: string;
|
|
@@ -124,6 +134,7 @@ export interface ToolExecutionResult {
|
|
|
124
134
|
resultExtensions?: readonly import('./result-extension-contract.js').ToolResultExtension[];
|
|
125
135
|
}
|
|
126
136
|
export interface CodeCellEventData {
|
|
137
|
+
executionSource?: ExecutionSource;
|
|
127
138
|
permissionStop?: import('./permission-contract.js').PermissionStop;
|
|
128
139
|
calls?: readonly import('../session/code-observation-contract.js').CodeToolCallRecord[];
|
|
129
140
|
cellId: string;
|
|
@@ -132,6 +143,8 @@ export interface CodeCellEventData {
|
|
|
132
143
|
reason?: 'steer';
|
|
133
144
|
cached?: boolean;
|
|
134
145
|
truncated?: boolean;
|
|
146
|
+
/** Public output projection discarded older text; not inferred from source truncation. */
|
|
147
|
+
outputHeadTruncated?: boolean;
|
|
135
148
|
observations?: readonly import('../session/code-observation-contract.js').CodeObservation[];
|
|
136
149
|
error?: {
|
|
137
150
|
code: string;
|
|
@@ -139,6 +152,7 @@ export interface CodeCellEventData {
|
|
|
139
152
|
};
|
|
140
153
|
}
|
|
141
154
|
export interface ExecResult {
|
|
155
|
+
executionSource?: ExecutionSource;
|
|
142
156
|
status: 'running' | 'completed' | 'cancelled';
|
|
143
157
|
waitOutcome?: import('./wait.js').ToolWaitOutcome;
|
|
144
158
|
reason?: 'steer';
|
package/dist/tools/execution.js
CHANGED
|
@@ -24,6 +24,7 @@ export async function createRoundToolRuntimeContext(scope, call, signal) {
|
|
|
24
24
|
const assertSessionLive = scope.assertLive;
|
|
25
25
|
const assertExecutionLive = scope.assertExecutionLive;
|
|
26
26
|
const emitCodeEvent = scope.emit;
|
|
27
|
+
const outputListeners = new Set();
|
|
27
28
|
const retainSession = codeMode.retainSession?.bind(codeMode);
|
|
28
29
|
let retained = 0;
|
|
29
30
|
const assertDispatchLive = () => {
|
|
@@ -40,6 +41,10 @@ export async function createRoundToolRuntimeContext(scope, call, signal) {
|
|
|
40
41
|
signal,
|
|
41
42
|
codeMode: {
|
|
42
43
|
...codeMode,
|
|
44
|
+
subscribeToolOutput: (listener) => {
|
|
45
|
+
outputListeners.add(listener);
|
|
46
|
+
return () => outputListeners.delete(listener);
|
|
47
|
+
},
|
|
43
48
|
...(retainSession === undefined
|
|
44
49
|
? {}
|
|
45
50
|
: {
|
|
@@ -67,7 +72,12 @@ export async function createRoundToolRuntimeContext(scope, call, signal) {
|
|
|
67
72
|
parentCallId: call.callId,
|
|
68
73
|
schedule: scope.schedule,
|
|
69
74
|
assertLive: assertDispatchLive,
|
|
70
|
-
emit: (event) =>
|
|
75
|
+
emit: (event) => {
|
|
76
|
+
if (event.type === 'tool.output')
|
|
77
|
+
for (const listener of outputListeners)
|
|
78
|
+
listener(event.output);
|
|
79
|
+
return emitCodeEvent(event, assertDispatchLive);
|
|
80
|
+
}
|
|
71
81
|
})
|
|
72
82
|
},
|
|
73
83
|
...(scope.extensionToolNames.has(call.name) && recentImages !== undefined
|
|
@@ -118,7 +128,10 @@ export async function executeRoundTools(calls, scope) {
|
|
|
118
128
|
: typeof output.eventSummary === 'string'
|
|
119
129
|
? output.eventSummary
|
|
120
130
|
: '');
|
|
121
|
-
const structuredData = call.name === 'exec' ||
|
|
131
|
+
const structuredData = call.name === 'exec' ||
|
|
132
|
+
call.name === 'exec_wait' ||
|
|
133
|
+
call.name === 'code_exec' ||
|
|
134
|
+
call.name === 'code_exec_wait'
|
|
122
135
|
? structuredToolEventData(call.name, output.eventData ?? output.data)
|
|
123
136
|
: output.eventData === undefined
|
|
124
137
|
? structuredToolEventData(call.name, output.data)
|
|
@@ -159,7 +172,7 @@ export async function executeRoundTools(calls, scope) {
|
|
|
159
172
|
const eventData = failureData ??
|
|
160
173
|
(partial?.data === undefined
|
|
161
174
|
? undefined
|
|
162
|
-
: structuredToolEventData(call.name, partial.data));
|
|
175
|
+
: structuredToolEventData(call.name, partial.eventData ?? partial.data));
|
|
163
176
|
await scope.emit({
|
|
164
177
|
type: 'tool.failed',
|
|
165
178
|
...(failedToolResultExtensions(error)
|
package/dist/tools/local/exec.js
CHANGED
|
@@ -2,7 +2,7 @@ import { AgentError } from '../../error.js';
|
|
|
2
2
|
import { TOOL_EXECUTION_LIMITS } from '../execution-limits.js';
|
|
3
3
|
/** Share the model-facing body across direct calls and original Code Mode observations. */
|
|
4
4
|
export function formatExecResult(result) {
|
|
5
|
-
const { displayOutput, ...modelResult } = result;
|
|
5
|
+
const { displayOutput, executionSource, ...modelResult } = result;
|
|
6
6
|
const visible = { ...modelResult };
|
|
7
7
|
if (result.stderr === '')
|
|
8
8
|
delete visible.stderr;
|
|
@@ -22,8 +22,10 @@ export function formatExecResult(result) {
|
|
|
22
22
|
delete visible.cached;
|
|
23
23
|
return {
|
|
24
24
|
content: JSON.stringify(visible),
|
|
25
|
-
data: displayOutput === undefined ? result : modelResult,
|
|
26
|
-
...(displayOutput === undefined
|
|
25
|
+
data: executionSource === undefined && displayOutput === undefined ? result : modelResult,
|
|
26
|
+
...(displayOutput === undefined && executionSource === undefined
|
|
27
|
+
? {}
|
|
28
|
+
: { eventData: { ...modelResult, displayOutput, executionSource } }),
|
|
27
29
|
truncated: result.truncated
|
|
28
30
|
};
|
|
29
31
|
}
|
|
@@ -76,6 +76,7 @@ function publicCodeObservations(values, data) {
|
|
|
76
76
|
let displayedCount = 0;
|
|
77
77
|
let remaining = 10_000;
|
|
78
78
|
let truncated = false;
|
|
79
|
+
let headTruncated = data.outputHeadTruncated === true;
|
|
79
80
|
const clip = (text) => {
|
|
80
81
|
let start = Math.max(0, text.length - remaining);
|
|
81
82
|
if (start > 0 && /[\uDC00-\uDFFF]/u.test(text[start]))
|
|
@@ -83,6 +84,7 @@ function publicCodeObservations(values, data) {
|
|
|
83
84
|
const result = text.slice(start);
|
|
84
85
|
remaining -= result.length;
|
|
85
86
|
truncated ||= start > 0;
|
|
87
|
+
headTruncated ||= start > 0;
|
|
86
88
|
return result;
|
|
87
89
|
};
|
|
88
90
|
for (let index = values.length - 1; index >= 0; index--) {
|
|
@@ -95,6 +97,7 @@ function publicCodeObservations(values, data) {
|
|
|
95
97
|
(entry.format === 'text' || entry.format === 'json' || entry.format === 'image')) {
|
|
96
98
|
if (displayedCount >= 32) {
|
|
97
99
|
truncated = true;
|
|
100
|
+
headTruncated = true;
|
|
98
101
|
continue;
|
|
99
102
|
}
|
|
100
103
|
displayedCount++;
|
|
@@ -122,6 +125,7 @@ function publicCodeObservations(values, data) {
|
|
|
122
125
|
(entry.outcome === 'completed' || entry.outcome === 'failed')) {
|
|
123
126
|
if (displayedCount >= 32) {
|
|
124
127
|
truncated = true;
|
|
128
|
+
headTruncated = true;
|
|
125
129
|
continue;
|
|
126
130
|
}
|
|
127
131
|
displayedCount++;
|
|
@@ -146,7 +150,12 @@ function publicCodeObservations(values, data) {
|
|
|
146
150
|
}
|
|
147
151
|
}
|
|
148
152
|
}
|
|
149
|
-
return {
|
|
153
|
+
return {
|
|
154
|
+
...data,
|
|
155
|
+
observations: selected,
|
|
156
|
+
...(truncated ? { truncated: true } : {}),
|
|
157
|
+
...(headTruncated ? { outputHeadTruncated: true } : {})
|
|
158
|
+
};
|
|
150
159
|
}
|
|
151
160
|
/** Project only known, validated tool result shapes into public structured events. */
|
|
152
161
|
export function structuredToolEventData(toolName, value) {
|
|
@@ -176,7 +185,20 @@ export function structuredToolEventData(toolName, value) {
|
|
|
176
185
|
['running', 'completed', 'failed', 'cancelled'].includes(String(value.status)))
|
|
177
186
|
return publicCodeObservations(value.observations, {
|
|
178
187
|
cellId: value.cellId,
|
|
188
|
+
...(isRecord(value.executionSource) &&
|
|
189
|
+
value.executionSource.kind === 'CODE' &&
|
|
190
|
+
typeof value.executionSource.text === 'string'
|
|
191
|
+
? {
|
|
192
|
+
executionSource: {
|
|
193
|
+
kind: 'CODE',
|
|
194
|
+
text: value.executionSource.text.slice(0, 10_000),
|
|
195
|
+
truncated: value.executionSource.truncated === true ||
|
|
196
|
+
value.executionSource.text.length > 10_000
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
: {}),
|
|
179
200
|
status: value.status,
|
|
201
|
+
...(value.outputHeadTruncated === true ? { outputHeadTruncated: true } : {}),
|
|
180
202
|
cached: value.cached === true,
|
|
181
203
|
...(['snapshot', 'completion', 'timeout', 'yield', 'interrupted'].includes(String(value.waitOutcome))
|
|
182
204
|
? { waitOutcome: value.waitOutcome }
|
|
@@ -19,7 +19,7 @@ export interface ToolImageStore extends ResourceStore {
|
|
|
19
19
|
}
|
|
20
20
|
export type ToolRuntimeEvent = {
|
|
21
21
|
type: 'tool.output';
|
|
22
|
-
toolName: 'exec' | 'exec_wait';
|
|
22
|
+
toolName: 'exec' | 'exec_wait' | 'code_exec_wait';
|
|
23
23
|
callId: string;
|
|
24
24
|
parentCallId?: string;
|
|
25
25
|
output: import('./contracts.js').ExecOutputSnapshot;
|
package/dist/tools/runtime.js
CHANGED
|
@@ -50,7 +50,8 @@ export async function executeCapturedTool(kind, call, context) {
|
|
|
50
50
|
mode: context.mode,
|
|
51
51
|
signal: context.signal,
|
|
52
52
|
waitInterrupt: context.waitInterrupt,
|
|
53
|
-
...((name === 'exec' || name === 'exec_wait'
|
|
53
|
+
...((name === 'exec' || name === 'exec_wait' || name === 'code_exec_wait') &&
|
|
54
|
+
callId !== undefined
|
|
54
55
|
? {
|
|
55
56
|
onOutput: (output) => context.emit({
|
|
56
57
|
type: 'tool.output',
|