@namzu/sdk 0.4.4 → 0.5.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/CHANGELOG.md +241 -0
- package/dist/advisory/executor.d.ts.map +1 -1
- package/dist/advisory/executor.js +3 -2
- package/dist/advisory/executor.js.map +1 -1
- package/dist/advisory/executor.test.js +36 -14
- package/dist/advisory/executor.test.js.map +1 -1
- package/dist/agents/ReactiveAgent.d.ts.map +1 -1
- package/dist/agents/ReactiveAgent.js +1 -0
- package/dist/agents/ReactiveAgent.js.map +1 -1
- package/dist/agents/RouterAgent.d.ts.map +1 -1
- package/dist/agents/RouterAgent.js +3 -2
- package/dist/agents/RouterAgent.js.map +1 -1
- package/dist/agents/SupervisorAgent.d.ts.map +1 -1
- package/dist/agents/SupervisorAgent.js +2 -0
- package/dist/agents/SupervisorAgent.js.map +1 -1
- package/dist/bridge/a2a/mapper.d.ts.map +1 -1
- package/dist/bridge/a2a/mapper.js +23 -9
- package/dist/bridge/a2a/mapper.js.map +1 -1
- package/dist/bridge/a2a/mapper.test.js +35 -9
- package/dist/bridge/a2a/mapper.test.js.map +1 -1
- package/dist/bridge/sse/mapper.d.ts.map +1 -1
- package/dist/bridge/sse/mapper.js +60 -8
- package/dist/bridge/sse/mapper.js.map +1 -1
- package/dist/bridge/sse/mapper.test.js +123 -16
- package/dist/bridge/sse/mapper.test.js.map +1 -1
- package/dist/compaction/verifier.d.ts.map +1 -1
- package/dist/compaction/verifier.js +3 -2
- package/dist/compaction/verifier.js.map +1 -1
- package/dist/config/runtime.d.ts +14 -14
- package/dist/config/runtime.js +1 -1
- package/dist/config/runtime.js.map +1 -1
- package/dist/contracts/api.d.ts +1 -1
- package/dist/contracts/api.d.ts.map +1 -1
- package/dist/contracts/schemas.js +1 -1
- package/dist/contracts/schemas.js.map +1 -1
- package/dist/gateway/local.d.ts +1 -1
- package/dist/gateway/local.d.ts.map +1 -1
- package/dist/gateway/local.js +1 -0
- package/dist/gateway/local.js.map +1 -1
- package/dist/manager/agent/__tests__/lifecycle.test.js +2 -2
- package/dist/provider/collect.d.ts +25 -0
- package/dist/provider/collect.d.ts.map +1 -0
- package/dist/provider/collect.js +82 -0
- package/dist/provider/collect.js.map +1 -0
- package/dist/provider/collect.test.d.ts +22 -0
- package/dist/provider/collect.test.d.ts.map +1 -0
- package/dist/provider/collect.test.js +123 -0
- package/dist/provider/collect.test.js.map +1 -0
- package/dist/provider/instrumentation.d.ts.map +1 -1
- package/dist/provider/instrumentation.js +10 -43
- package/dist/provider/instrumentation.js.map +1 -1
- package/dist/provider/instrumentation.test.d.ts +15 -0
- package/dist/provider/instrumentation.test.d.ts.map +1 -1
- package/dist/provider/instrumentation.test.js +73 -87
- package/dist/provider/instrumentation.test.js.map +1 -1
- package/dist/provider/mock.d.ts +1 -2
- package/dist/provider/mock.d.ts.map +1 -1
- package/dist/provider/mock.js +2 -5
- package/dist/provider/mock.js.map +1 -1
- package/dist/public-runtime.d.ts +1 -0
- package/dist/public-runtime.d.ts.map +1 -1
- package/dist/public-runtime.js +5 -0
- package/dist/public-runtime.js.map +1 -1
- package/dist/run/LimitChecker.test.d.ts +2 -0
- package/dist/run/LimitChecker.test.d.ts.map +1 -0
- package/dist/run/LimitChecker.test.js +26 -0
- package/dist/run/LimitChecker.test.js.map +1 -0
- package/dist/run/reporter.d.ts.map +1 -1
- package/dist/run/reporter.js +10 -6
- package/dist/run/reporter.js.map +1 -1
- package/dist/runtime/query/__tests__/prompt.test.d.ts +2 -0
- package/dist/runtime/query/__tests__/prompt.test.d.ts.map +1 -0
- package/dist/runtime/query/__tests__/prompt.test.js +35 -0
- package/dist/runtime/query/__tests__/prompt.test.js.map +1 -0
- package/dist/runtime/query/context-cache.d.ts +2 -0
- package/dist/runtime/query/context-cache.d.ts.map +1 -1
- package/dist/runtime/query/context-cache.js +3 -0
- package/dist/runtime/query/context-cache.js.map +1 -1
- package/dist/runtime/query/events.d.ts +2 -0
- package/dist/runtime/query/events.d.ts.map +1 -1
- package/dist/runtime/query/events.js +48 -1
- package/dist/runtime/query/events.js.map +1 -1
- package/dist/runtime/query/executor.d.ts.map +1 -1
- package/dist/runtime/query/executor.js +55 -5
- package/dist/runtime/query/executor.js.map +1 -1
- package/dist/runtime/query/index.d.ts +2 -1
- package/dist/runtime/query/index.d.ts.map +1 -1
- package/dist/runtime/query/index.js +2 -0
- package/dist/runtime/query/index.js.map +1 -1
- package/dist/runtime/query/iteration/index.d.ts.map +1 -1
- package/dist/runtime/query/iteration/index.js +245 -13
- package/dist/runtime/query/iteration/index.js.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction.d.ts.map +1 -1
- package/dist/runtime/query/iteration/phases/compaction.js +2 -0
- package/dist/runtime/query/iteration/phases/compaction.js.map +1 -1
- package/dist/runtime/query/prompt.d.ts +2 -0
- package/dist/runtime/query/prompt.d.ts.map +1 -1
- package/dist/runtime/query/prompt.js +35 -13
- package/dist/runtime/query/prompt.js.map +1 -1
- package/dist/session/__tests__/integration/e2e-spawn.test.js +2 -2
- package/dist/session/__tests__/integration/event-stream-ordering.test.d.ts +1 -1
- package/dist/session/__tests__/integration/event-stream-ordering.test.js +7 -7
- package/dist/streaming/coalesce.d.ts +28 -0
- package/dist/streaming/coalesce.d.ts.map +1 -0
- package/dist/streaming/coalesce.js +75 -0
- package/dist/streaming/coalesce.js.map +1 -0
- package/dist/streaming/coalesce.test.d.ts +19 -0
- package/dist/streaming/coalesce.test.d.ts.map +1 -0
- package/dist/streaming/coalesce.test.js +120 -0
- package/dist/streaming/coalesce.test.js.map +1 -0
- package/dist/tools/coordinator/index.d.ts +2 -0
- package/dist/tools/coordinator/index.d.ts.map +1 -1
- package/dist/tools/coordinator/index.js +1 -0
- package/dist/tools/coordinator/index.js.map +1 -1
- package/dist/types/agent/base.d.ts +7 -0
- package/dist/types/agent/base.d.ts.map +1 -1
- package/dist/types/agent/gateway.d.ts +2 -1
- package/dist/types/agent/gateway.d.ts.map +1 -1
- package/dist/types/ids/index.d.ts +10 -0
- package/dist/types/ids/index.d.ts.map +1 -1
- package/dist/types/ids/index.js.map +1 -1
- package/dist/types/provider/interface.d.ts +26 -2
- package/dist/types/provider/interface.d.ts.map +1 -1
- package/dist/types/provider/stream.d.ts +18 -0
- package/dist/types/provider/stream.d.ts.map +1 -1
- package/dist/types/run/events.d.ts +58 -8
- package/dist/types/run/events.d.ts.map +1 -1
- package/dist/types/run/events.js +23 -1
- package/dist/types/run/events.js.map +1 -1
- package/dist/types/run/schema-version.d.ts +7 -1
- package/dist/types/run/schema-version.d.ts.map +1 -1
- package/dist/types/run/schema-version.js +7 -1
- package/dist/types/run/schema-version.js.map +1 -1
- package/dist/types/run/stop-reason.d.ts +9 -0
- package/dist/types/run/stop-reason.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/advisory/executor.test.ts +37 -15
- package/src/advisory/executor.ts +10 -7
- package/src/agents/ReactiveAgent.ts +1 -0
- package/src/agents/RouterAgent.ts +9 -6
- package/src/agents/SupervisorAgent.ts +2 -0
- package/src/bridge/a2a/mapper.test.ts +35 -9
- package/src/bridge/a2a/mapper.ts +23 -9
- package/src/bridge/sse/mapper.test.ts +152 -24
- package/src/bridge/sse/mapper.ts +66 -9
- package/src/compaction/verifier.ts +9 -6
- package/src/config/runtime.ts +1 -1
- package/src/contracts/api.ts +7 -0
- package/src/contracts/schemas.ts +1 -1
- package/src/gateway/local.ts +3 -2
- package/src/manager/agent/__tests__/lifecycle.test.ts +2 -2
- package/src/provider/collect.test.ts +142 -0
- package/src/provider/collect.ts +85 -0
- package/src/provider/instrumentation.test.ts +81 -100
- package/src/provider/instrumentation.ts +11 -53
- package/src/provider/mock.ts +2 -6
- package/src/public-runtime.ts +6 -0
- package/src/run/LimitChecker.test.ts +32 -0
- package/src/run/reporter.ts +10 -7
- package/src/runtime/query/__tests__/prompt.test.ts +38 -0
- package/src/runtime/query/context-cache.ts +5 -0
- package/src/runtime/query/events.ts +52 -1
- package/src/runtime/query/executor.ts +54 -5
- package/src/runtime/query/index.ts +5 -1
- package/src/runtime/query/iteration/index.ts +301 -26
- package/src/runtime/query/iteration/phases/compaction.ts +2 -0
- package/src/runtime/query/prompt.ts +45 -17
- package/src/session/__tests__/integration/e2e-spawn.test.ts +2 -2
- package/src/session/__tests__/integration/event-stream-ordering.test.ts +7 -7
- package/src/streaming/coalesce.test.ts +132 -0
- package/src/streaming/coalesce.ts +89 -0
- package/src/tools/coordinator/index.ts +3 -0
- package/src/types/agent/base.ts +9 -0
- package/src/types/agent/gateway.ts +3 -1
- package/src/types/ids/index.ts +10 -0
- package/src/types/provider/interface.ts +28 -3
- package/src/types/provider/stream.ts +18 -0
- package/src/types/run/events.ts +105 -9
- package/src/types/run/schema-version.ts +7 -1
- package/src/types/run/stop-reason.ts +17 -0
|
@@ -1,15 +1,235 @@
|
|
|
1
1
|
import { SpanStatusCode } from '@opentelemetry/api';
|
|
2
2
|
import { extractFromAssistantMessage } from '../../../compaction/extractor.js';
|
|
3
|
+
import { collect } from '../../../provider/collect.js';
|
|
3
4
|
import { GENAI, NAMZU, agentIterationSpanName } from '../../../telemetry/attributes.js';
|
|
4
5
|
import { getTracer } from '../../../telemetry/runtime-accessors.js';
|
|
5
6
|
import { createAssistantMessage, createUserMessage } from '../../../types/message/index.js';
|
|
6
7
|
import { toErrorMessage } from '../../../utils/error.js';
|
|
8
|
+
import { generateMessageId } from '../../../utils/id.js';
|
|
7
9
|
import { applyLifecycleHookResults } from '../plugin-hooks.js';
|
|
8
10
|
import { runAdvisoryPhase } from './phases/advisory.js';
|
|
9
11
|
import { runIterationCheckpoint } from './phases/checkpoint.js';
|
|
10
12
|
import { runCompactionCheck } from './phases/compaction.js';
|
|
11
13
|
import { runPlanGate } from './phases/plan.js';
|
|
12
14
|
import { runToolReview } from './phases/tool-review.js';
|
|
15
|
+
/**
|
|
16
|
+
* Map a provider's coarse `finishReason` plus the orchestrator's
|
|
17
|
+
* `forceFinalize` flag onto the per-message {@link MessageStopReason}
|
|
18
|
+
* union the v3 `message_completed` event surfaces.
|
|
19
|
+
*/
|
|
20
|
+
function synthesizeMessageStopReason(finishReason, forceFinalize) {
|
|
21
|
+
if (forceFinalize)
|
|
22
|
+
return 'forced_finalize';
|
|
23
|
+
switch (finishReason) {
|
|
24
|
+
case 'tool_calls':
|
|
25
|
+
return 'tool_use';
|
|
26
|
+
case 'length':
|
|
27
|
+
return 'max_tokens';
|
|
28
|
+
case 'content_filter':
|
|
29
|
+
return 'refusal';
|
|
30
|
+
default:
|
|
31
|
+
return 'end_turn';
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Consume a provider's streaming response and emit the v3 RunEvent
|
|
36
|
+
* lifecycle natively (message_started → text_delta* + tool_input_*
|
|
37
|
+
* → message_completed). Returns the aggregated `ChatCompletionResponse`
|
|
38
|
+
* for downstream code that still expects the legacy shape (assistant
|
|
39
|
+
* message construction, working-state extraction, telemetry attribute
|
|
40
|
+
* stamping).
|
|
41
|
+
*
|
|
42
|
+
* Per-delta `emitEvent` calls are followed by a `drainPending()`
|
|
43
|
+
* yield so SSE consumers see live progress instead of a burst at
|
|
44
|
+
* end-of-message. The bus's ephemeral filter (D1) ensures these
|
|
45
|
+
* deltas never hit transcript.jsonl.
|
|
46
|
+
*
|
|
47
|
+
* Edge cases (codex A3, A4, A5):
|
|
48
|
+
* - Stream ends without `finishReason` (anthropic-sdk-typescript#842
|
|
49
|
+
* dropped message_stop): we still emit `message_completed` from a
|
|
50
|
+
* finally-style fall-through path with `stopReason: 'refusal'`.
|
|
51
|
+
* - `tool_input_delta` with no `toolUseId` registered yet: we drop
|
|
52
|
+
* the fragment and log a warning (proxies seen to misorder events).
|
|
53
|
+
* - `chunk.error`: we surface as a thrown error after emitting the
|
|
54
|
+
* message_completed terminator so consumer cards still close.
|
|
55
|
+
*/
|
|
56
|
+
async function* streamProviderTurn(provider, params, emitEvent, drainPending, runId, iteration, forceFinalize, log) {
|
|
57
|
+
const messageId = generateMessageId();
|
|
58
|
+
await emitEvent({ type: 'message_started', runId, iteration, messageId });
|
|
59
|
+
yield* drainPending();
|
|
60
|
+
let id = '';
|
|
61
|
+
const model = '';
|
|
62
|
+
let textBuf = '';
|
|
63
|
+
let finishReason = 'stop';
|
|
64
|
+
let usage = {
|
|
65
|
+
promptTokens: 0,
|
|
66
|
+
completionTokens: 0,
|
|
67
|
+
totalTokens: 0,
|
|
68
|
+
cachedTokens: 0,
|
|
69
|
+
cacheWriteTokens: 0,
|
|
70
|
+
};
|
|
71
|
+
const toolBuckets = new Map();
|
|
72
|
+
let streamError;
|
|
73
|
+
const stream = provider.chatStream({ ...params, stream: true });
|
|
74
|
+
try {
|
|
75
|
+
for await (const chunk of stream) {
|
|
76
|
+
if (chunk.error) {
|
|
77
|
+
streamError = chunk.error;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
if (!id && chunk.id)
|
|
81
|
+
id = chunk.id;
|
|
82
|
+
if (chunk.delta.content) {
|
|
83
|
+
textBuf += chunk.delta.content;
|
|
84
|
+
await emitEvent({
|
|
85
|
+
type: 'text_delta',
|
|
86
|
+
runId,
|
|
87
|
+
iteration,
|
|
88
|
+
messageId,
|
|
89
|
+
text: chunk.delta.content,
|
|
90
|
+
});
|
|
91
|
+
yield* drainPending();
|
|
92
|
+
}
|
|
93
|
+
for (const tc of chunk.delta.toolCalls ?? []) {
|
|
94
|
+
let bucket = toolBuckets.get(tc.index);
|
|
95
|
+
if (!bucket) {
|
|
96
|
+
bucket = {
|
|
97
|
+
id: tc.id ?? '',
|
|
98
|
+
name: tc.function?.name ?? '',
|
|
99
|
+
argsBuf: '',
|
|
100
|
+
started: false,
|
|
101
|
+
completed: false,
|
|
102
|
+
};
|
|
103
|
+
toolBuckets.set(tc.index, bucket);
|
|
104
|
+
}
|
|
105
|
+
if (tc.id && !bucket.id)
|
|
106
|
+
bucket.id = tc.id;
|
|
107
|
+
if (tc.function?.name && !bucket.name)
|
|
108
|
+
bucket.name = tc.function.name;
|
|
109
|
+
if (!bucket.started && bucket.id && bucket.name) {
|
|
110
|
+
bucket.started = true;
|
|
111
|
+
await emitEvent({
|
|
112
|
+
type: 'tool_input_started',
|
|
113
|
+
runId,
|
|
114
|
+
iteration,
|
|
115
|
+
messageId,
|
|
116
|
+
toolUseId: bucket.id,
|
|
117
|
+
toolName: bucket.name,
|
|
118
|
+
});
|
|
119
|
+
yield* drainPending();
|
|
120
|
+
}
|
|
121
|
+
const fragment = tc.function?.arguments;
|
|
122
|
+
if (fragment) {
|
|
123
|
+
if (!bucket.id) {
|
|
124
|
+
log.warn('tool_input_delta arrived before tool id was known; dropping fragment', {
|
|
125
|
+
runId,
|
|
126
|
+
index: tc.index,
|
|
127
|
+
length: fragment.length,
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
else {
|
|
131
|
+
bucket.argsBuf += fragment;
|
|
132
|
+
await emitEvent({
|
|
133
|
+
type: 'tool_input_delta',
|
|
134
|
+
runId,
|
|
135
|
+
toolUseId: bucket.id,
|
|
136
|
+
partialJson: fragment,
|
|
137
|
+
});
|
|
138
|
+
yield* drainPending();
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
if (chunk.delta.toolCallEnd) {
|
|
143
|
+
const { index, id: endId } = chunk.delta.toolCallEnd;
|
|
144
|
+
const bucket = toolBuckets.get(index);
|
|
145
|
+
if (bucket && !bucket.completed) {
|
|
146
|
+
bucket.completed = true;
|
|
147
|
+
let parsed = {};
|
|
148
|
+
try {
|
|
149
|
+
parsed = bucket.argsBuf ? JSON.parse(bucket.argsBuf) : {};
|
|
150
|
+
}
|
|
151
|
+
catch (err) {
|
|
152
|
+
log.warn('tool input JSON parse failed at content_block_stop', {
|
|
153
|
+
runId,
|
|
154
|
+
toolUseId: endId,
|
|
155
|
+
error: err instanceof Error ? err.message : String(err),
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
await emitEvent({
|
|
159
|
+
type: 'tool_input_completed',
|
|
160
|
+
runId,
|
|
161
|
+
toolUseId: endId,
|
|
162
|
+
input: parsed,
|
|
163
|
+
});
|
|
164
|
+
yield* drainPending();
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
if (chunk.finishReason)
|
|
168
|
+
finishReason = chunk.finishReason;
|
|
169
|
+
if (chunk.usage)
|
|
170
|
+
usage = chunk.usage;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
catch (err) {
|
|
174
|
+
streamError = err instanceof Error ? err.message : String(err);
|
|
175
|
+
}
|
|
176
|
+
// Flush any tool buckets the provider failed to close (no toolCallEnd
|
|
177
|
+
// arrived — defensive against providers that don't yet emit it).
|
|
178
|
+
for (const bucket of toolBuckets.values()) {
|
|
179
|
+
if (bucket.started && !bucket.completed) {
|
|
180
|
+
bucket.completed = true;
|
|
181
|
+
let parsed = {};
|
|
182
|
+
try {
|
|
183
|
+
parsed = bucket.argsBuf ? JSON.parse(bucket.argsBuf) : {};
|
|
184
|
+
}
|
|
185
|
+
catch {
|
|
186
|
+
// leave parsed = {}
|
|
187
|
+
}
|
|
188
|
+
await emitEvent({
|
|
189
|
+
type: 'tool_input_completed',
|
|
190
|
+
runId,
|
|
191
|
+
toolUseId: bucket.id,
|
|
192
|
+
input: parsed,
|
|
193
|
+
});
|
|
194
|
+
yield* drainPending();
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
const stopReason = streamError
|
|
198
|
+
? 'refusal'
|
|
199
|
+
: synthesizeMessageStopReason(finishReason, forceFinalize);
|
|
200
|
+
await emitEvent({
|
|
201
|
+
type: 'message_completed',
|
|
202
|
+
runId,
|
|
203
|
+
iteration,
|
|
204
|
+
messageId,
|
|
205
|
+
stopReason,
|
|
206
|
+
usage,
|
|
207
|
+
content: textBuf || undefined,
|
|
208
|
+
});
|
|
209
|
+
yield* drainPending();
|
|
210
|
+
if (streamError) {
|
|
211
|
+
throw new Error(`Provider stream error: ${streamError}`);
|
|
212
|
+
}
|
|
213
|
+
const toolCalls = [...toolBuckets.entries()]
|
|
214
|
+
.sort(([a], [b]) => a - b)
|
|
215
|
+
.map(([, b]) => ({
|
|
216
|
+
id: b.id,
|
|
217
|
+
type: 'function',
|
|
218
|
+
function: { name: b.name, arguments: b.argsBuf },
|
|
219
|
+
}));
|
|
220
|
+
const response = {
|
|
221
|
+
id: id || messageId,
|
|
222
|
+
model: model || params.model,
|
|
223
|
+
message: {
|
|
224
|
+
role: 'assistant',
|
|
225
|
+
content: textBuf.length > 0 ? textBuf : null,
|
|
226
|
+
toolCalls: toolCalls.length > 0 ? toolCalls : undefined,
|
|
227
|
+
},
|
|
228
|
+
finishReason,
|
|
229
|
+
usage,
|
|
230
|
+
};
|
|
231
|
+
return { response, messageId };
|
|
232
|
+
}
|
|
13
233
|
export class IterationOrchestrator {
|
|
14
234
|
ctx;
|
|
15
235
|
constructor(config, runMgr, toolExecutor, guard, activityStore, emitEvent, drainPending, abortController, log, resumeHandler, checkpointMgr, planManager) {
|
|
@@ -134,14 +354,22 @@ export class IterationOrchestrator {
|
|
|
134
354
|
applyLifecycleHookResults('pre_llm_call', hookResults);
|
|
135
355
|
yield* this.ctx.drainPending();
|
|
136
356
|
}
|
|
137
|
-
|
|
357
|
+
// Phase 4 (ses_001-tool-stream-events): consume the
|
|
358
|
+
// streaming response natively, emitting message and
|
|
359
|
+
// tool-input lifecycle events as deltas arrive. The
|
|
360
|
+
// helper yields RunEvents through drainPending() so SSE
|
|
361
|
+
// consumers see live progress; its return value is the
|
|
362
|
+
// aggregated `ChatCompletionResponse` for the legacy
|
|
363
|
+
// downstream paths (assistantMsg construction, working
|
|
364
|
+
// state extraction, telemetry attribute stamping).
|
|
365
|
+
const { response } = yield* streamProviderTurn(this.ctx.provider, {
|
|
138
366
|
model,
|
|
139
367
|
messages,
|
|
140
368
|
tools: openAITools && openAITools.length > 0 ? openAITools : undefined,
|
|
141
369
|
temperature: runConfig.temperature,
|
|
142
370
|
maxTokens: runConfig.maxResponseTokens,
|
|
143
371
|
cacheControl: { type: 'auto' },
|
|
144
|
-
});
|
|
372
|
+
}, this.ctx.emitEvent, this.ctx.drainPending, runMgr.id, iterationNum, forceFinalize, this.ctx.log);
|
|
145
373
|
runMgr.accumulateUsage(response.usage);
|
|
146
374
|
if (this.ctx.pluginManager) {
|
|
147
375
|
const hookResults = await this.ctx.pluginManager.executeHooks('post_llm_call', { runId: runMgr.id, iteration: iterationNum }, this.ctx.emitEvent);
|
|
@@ -170,12 +398,6 @@ export class IterationOrchestrator {
|
|
|
170
398
|
if (this.ctx.workingStateManager && this.ctx.compactionConfig && assistantMsg.content) {
|
|
171
399
|
extractFromAssistantMessage(this.ctx.workingStateManager, assistantMsg.content, this.ctx.compactionConfig);
|
|
172
400
|
}
|
|
173
|
-
await this.ctx.emitEvent({
|
|
174
|
-
type: 'llm_response',
|
|
175
|
-
runId: runMgr.id,
|
|
176
|
-
content: response.message.content,
|
|
177
|
-
hasToolCalls: forceFinalize ? false : !!response.message.toolCalls?.length,
|
|
178
|
-
});
|
|
179
401
|
yield* this.ctx.drainPending();
|
|
180
402
|
iterSpan.setAttributes({
|
|
181
403
|
[GENAI.USAGE_INPUT_TOKENS]: response.usage.promptTokens,
|
|
@@ -348,21 +570,31 @@ export class IterationOrchestrator {
|
|
|
348
570
|
...this.ctx.runMgr.messages,
|
|
349
571
|
createUserMessage(`[SYSTEM] Run is ending due to ${reason}. You MUST provide a final response now summarizing all your findings and work so far. Do not use any tools.`),
|
|
350
572
|
];
|
|
351
|
-
const response = await this.ctx.provider.
|
|
573
|
+
const response = await collect(this.ctx.provider.chatStream({
|
|
352
574
|
model,
|
|
353
575
|
messages: finalMessages,
|
|
354
576
|
temperature: this.ctx.runConfig.temperature,
|
|
355
577
|
maxTokens: this.ctx.runConfig.maxResponseTokens,
|
|
356
578
|
cacheControl: { type: 'auto' },
|
|
357
|
-
});
|
|
579
|
+
}));
|
|
358
580
|
this.ctx.runMgr.accumulateUsage(response.usage);
|
|
359
581
|
const assistantMsg = createAssistantMessage(response.message.content);
|
|
360
582
|
this.ctx.runMgr.pushMessage(assistantMsg);
|
|
583
|
+
const finalMessageId = generateMessageId();
|
|
584
|
+
await this.ctx.emitEvent({
|
|
585
|
+
type: 'message_started',
|
|
586
|
+
runId: this.ctx.runMgr.id,
|
|
587
|
+
iteration: this.ctx.runMgr.currentIteration,
|
|
588
|
+
messageId: finalMessageId,
|
|
589
|
+
});
|
|
361
590
|
await this.ctx.emitEvent({
|
|
362
|
-
type: '
|
|
591
|
+
type: 'message_completed',
|
|
363
592
|
runId: this.ctx.runMgr.id,
|
|
364
|
-
|
|
365
|
-
|
|
593
|
+
iteration: this.ctx.runMgr.currentIteration,
|
|
594
|
+
messageId: finalMessageId,
|
|
595
|
+
stopReason: 'forced_finalize',
|
|
596
|
+
usage: response.usage,
|
|
597
|
+
content: response.message.content ?? undefined,
|
|
366
598
|
});
|
|
367
599
|
}
|
|
368
600
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/runtime/query/iteration/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAoBpD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AAoBpD,wBAAsB,kBAAkB,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2E7E"}
|
|
@@ -28,6 +28,8 @@ export async function runCompactionCheck(ctx) {
|
|
|
28
28
|
return;
|
|
29
29
|
const estimatedTokens = estimateTokens(ctx);
|
|
30
30
|
const budget = ctx.runConfig.tokenBudget;
|
|
31
|
+
if (budget <= 0)
|
|
32
|
+
return;
|
|
31
33
|
const usage = estimatedTokens / budget;
|
|
32
34
|
if (usage < config.triggerThreshold)
|
|
33
35
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"compaction.js","sourceRoot":"","sources":["../../../../../src/runtime/query/iteration/phases/compaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { AgentRuntimeContext } from '../../types/agent/base.js';
|
|
1
2
|
import type { AgentContextLevel } from '../../types/agent/factory.js';
|
|
2
3
|
import type { AgentPersona } from '../../types/persona/index.js';
|
|
3
4
|
import type { Skill } from '../../types/skills/index.js';
|
|
@@ -15,6 +16,7 @@ export interface PromptBuilderConfig {
|
|
|
15
16
|
basePrompt?: string;
|
|
16
17
|
tools: ToolRegistryContract;
|
|
17
18
|
allowedTools?: string[];
|
|
19
|
+
runtimeContext?: AgentRuntimeContext;
|
|
18
20
|
}
|
|
19
21
|
export declare class PromptBuilder {
|
|
20
22
|
private config;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/prompt.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAErE,MAAM,WAAW,cAAc;IAC9B,gHAAgH;IAChH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,0FAA0F;IAC1F,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,mBAAmB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB,OAAO,CAAC,EAAE,YAAY,CAAA;IAEtB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAEhB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,KAAK,EAAE,oBAAoB,CAAA;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../../src/runtime/query/prompt.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAA;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAChE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAErE,MAAM,WAAW,cAAc;IAC9B,gHAAgH;IAChH,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,0FAA0F;IAC1F,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,mBAAmB;IACnC,YAAY,CAAC,EAAE,MAAM,CAAA;IAErB,OAAO,CAAC,EAAE,YAAY,CAAA;IAEtB,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAEhB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,KAAK,EAAE,oBAAoB,CAAA;IAC3B,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,cAAc,CAAC,EAAE,mBAAmB,CAAA;CACpC;AAwCD,qBAAa,aAAa;IACzB,OAAO,CAAC,MAAM,CAAqB;gBAEvB,MAAM,EAAE,mBAAmB;IAIvC,KAAK,CAAC,YAAY,GAAE,iBAA0B,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM;IAqClF,cAAc,CACb,YAAY,GAAE,iBAA0B,EACxC,gBAAgB,CAAC,EAAE,MAAM,GACvB,cAAc;CAiDjB"}
|
|
@@ -1,12 +1,30 @@
|
|
|
1
1
|
import { FILESYSTEM_TOOLS } from '../../constants/tools/index.js';
|
|
2
2
|
import { assembleSystemPrompt } from '../../persona/assembler.js';
|
|
3
|
-
function buildEnvContext(workingDirectory) {
|
|
4
|
-
|
|
3
|
+
function buildEnvContext(workingDirectory, runtimeContext) {
|
|
4
|
+
const lines = [
|
|
5
|
+
`<env>
|
|
5
6
|
Working directory: ${workingDirectory}
|
|
6
|
-
Platform: ${process.platform}
|
|
7
|
-
|
|
7
|
+
Platform: ${process.platform}`,
|
|
8
|
+
];
|
|
9
|
+
if (runtimeContext?.label) {
|
|
10
|
+
lines.push(`Runtime: ${runtimeContext.label}`);
|
|
11
|
+
}
|
|
12
|
+
if (runtimeContext?.outputDirectory) {
|
|
13
|
+
lines.push(`Output directory: ${runtimeContext.outputDirectory}`);
|
|
14
|
+
}
|
|
15
|
+
if (runtimeContext?.outputFileMarker) {
|
|
16
|
+
lines.push(`Output file marker: ${runtimeContext.outputFileMarker}`);
|
|
17
|
+
}
|
|
18
|
+
if (runtimeContext?.notes?.length) {
|
|
19
|
+
lines.push('Runtime notes:');
|
|
20
|
+
for (const note of runtimeContext.notes) {
|
|
21
|
+
lines.push(`- ${note}`);
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
lines.push(`</env>
|
|
8
25
|
|
|
9
|
-
IMPORTANT: Always use absolute paths based on the working directory above. Before reading a file, use the glob tool to discover actual file paths — never guess or hallucinate paths
|
|
26
|
+
IMPORTANT: Always use absolute paths based on the working directory above. Before reading a file, use the glob tool to discover actual file paths — never guess or hallucinate paths.`);
|
|
27
|
+
return lines.join('\n');
|
|
10
28
|
}
|
|
11
29
|
function hasFilesystemTools(tools, allowedTools) {
|
|
12
30
|
const activeTools = allowedTools ?? tools.listNames();
|
|
@@ -38,10 +56,12 @@ export class PromptBuilder {
|
|
|
38
56
|
parts.push(tierGuidance);
|
|
39
57
|
}
|
|
40
58
|
}
|
|
41
|
-
if (contextLevel !== 'minimal' &&
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
59
|
+
if (contextLevel !== 'minimal' && workingDirectory) {
|
|
60
|
+
const shouldIncludeEnv = hasFilesystemTools(this.config.tools, this.config.allowedTools) ||
|
|
61
|
+
Boolean(this.config.runtimeContext);
|
|
62
|
+
if (shouldIncludeEnv) {
|
|
63
|
+
parts.push(buildEnvContext(workingDirectory, this.config.runtimeContext));
|
|
64
|
+
}
|
|
45
65
|
}
|
|
46
66
|
return parts.join('\n\n---\n\n');
|
|
47
67
|
}
|
|
@@ -75,10 +95,12 @@ export class PromptBuilder {
|
|
|
75
95
|
dynamicParts.push(tierGuidance);
|
|
76
96
|
}
|
|
77
97
|
}
|
|
78
|
-
if (contextLevel !== 'minimal' &&
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
98
|
+
if (contextLevel !== 'minimal' && workingDirectory) {
|
|
99
|
+
const shouldIncludeEnv = hasFilesystemTools(this.config.tools, this.config.allowedTools) ||
|
|
100
|
+
Boolean(this.config.runtimeContext);
|
|
101
|
+
if (shouldIncludeEnv) {
|
|
102
|
+
dynamicParts.push(buildEnvContext(workingDirectory, this.config.runtimeContext));
|
|
103
|
+
}
|
|
82
104
|
}
|
|
83
105
|
return {
|
|
84
106
|
static: staticParts.join(separator),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/runtime/query/prompt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAA;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/runtime/query/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -145,12 +145,12 @@ describe('E2E — SubSession spawn → kernel summary → parent drill', () => {
|
|
|
145
145
|
expect(spawned.lineage.parentSessionId).toBe(parentSession.id);
|
|
146
146
|
expect(spawned.lineage.rootSessionId).toBe(parentSession.id);
|
|
147
147
|
expect(spawned.lineage.depth).toBe(1);
|
|
148
|
-
expect(spawned.schemaVersion).toBe(
|
|
148
|
+
expect(spawned.schemaVersion).toBe(3);
|
|
149
149
|
}
|
|
150
150
|
if (idled && 'lineage' in idled && 'schemaVersion' in idled) {
|
|
151
151
|
expect(idled.lineage.rootSessionId).toBe(parentSession.id);
|
|
152
152
|
expect(idled.lineage.depth).toBe(1);
|
|
153
|
-
expect(idled.schemaVersion).toBe(
|
|
153
|
+
expect(idled.schemaVersion).toBe(3);
|
|
154
154
|
}
|
|
155
155
|
// --- Summary materialized by kernel ---
|
|
156
156
|
const spawnRecord = manager.getSpawnRecord(task.taskId);
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Integration — event stream ordering + lineage + schemaVersion envelope.
|
|
3
3
|
*
|
|
4
4
|
* Covers roadmap §5 invariants:
|
|
5
|
-
* - §10.1 schemaVersion:
|
|
5
|
+
* - §10.1 schemaVersion: 3 on every sub-session RunEvent
|
|
6
6
|
* - §10.3 tree-scoped monotonic ordering by (rootSessionId, eventId)
|
|
7
7
|
* - §10.3 depth filter ('self' vs 'tree') at subscribe time
|
|
8
8
|
* - §10.4 lineage stamped on every sub-session event with parent + root + depth
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Integration — event stream ordering + lineage + schemaVersion envelope.
|
|
3
3
|
*
|
|
4
4
|
* Covers roadmap §5 invariants:
|
|
5
|
-
* - §10.1 schemaVersion:
|
|
5
|
+
* - §10.1 schemaVersion: 3 on every sub-session RunEvent
|
|
6
6
|
* - §10.3 tree-scoped monotonic ordering by (rootSessionId, eventId)
|
|
7
7
|
* - §10.3 depth filter ('self' vs 'tree') at subscribe time
|
|
8
8
|
* - §10.4 lineage stamped on every sub-session event with parent + root + depth
|
|
@@ -17,7 +17,7 @@ import { createAssistantMessage } from '../../../types/message/index.js';
|
|
|
17
17
|
import { ZERO_COST } from '../../../utils/cost.js';
|
|
18
18
|
import { DEFAULT_TENANT, buildAgent, buildAgentCustom, buildDefinition, buildHarness, buildSendMessageOptions, buildTaskContext, seedActiveParent, } from './_fixtures.js';
|
|
19
19
|
describe('Integration — event stream ordering + lineage + schemaVersion', () => {
|
|
20
|
-
it('every sub-session RunEvent carries schemaVersion:
|
|
20
|
+
it('every sub-session RunEvent carries schemaVersion: 3', async () => {
|
|
21
21
|
const harness = buildHarness();
|
|
22
22
|
const { project, thread, session, actor } = await seedActiveParent(harness);
|
|
23
23
|
harness.registry.register(buildDefinition(buildAgent('worker')));
|
|
@@ -38,13 +38,13 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
|
|
|
38
38
|
captured.push(ev);
|
|
39
39
|
});
|
|
40
40
|
await harness.manager.waitForCompletion(task.taskId);
|
|
41
|
-
// Every sub-session lifecycle event is stamped with schemaVersion:
|
|
41
|
+
// Every sub-session lifecycle event is stamped with schemaVersion: 3.
|
|
42
42
|
const subSessionEvents = captured.filter((e) => e.type === 'subsession_spawned' ||
|
|
43
43
|
e.type === 'subsession_messaged' ||
|
|
44
44
|
e.type === 'subsession_idled');
|
|
45
45
|
expect(subSessionEvents.length).toBeGreaterThan(0);
|
|
46
46
|
for (const ev of subSessionEvents) {
|
|
47
|
-
expect(ev.schemaVersion).toBe(
|
|
47
|
+
expect(ev.schemaVersion).toBe(3);
|
|
48
48
|
}
|
|
49
49
|
});
|
|
50
50
|
it('every sub-session event carries lineage { parentSessionId, rootSessionId, depth }', async () => {
|
|
@@ -277,9 +277,9 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
|
|
|
277
277
|
.map((e) => ('lineage' in e && e.lineage ? e.lineage.depth : -1));
|
|
278
278
|
expect(outerDepths.every((d) => d === 1)).toBe(true);
|
|
279
279
|
});
|
|
280
|
-
it('run_started and other core RunEvents also carry schemaVersion:
|
|
280
|
+
it('run_started and other core RunEvents also carry schemaVersion: 3 when stamped by the child listener wrapper', async () => {
|
|
281
281
|
// The listener wrapper in `manager/agent/lifecycle.ts#wrapChildListener`
|
|
282
|
-
// stamps `schemaVersion:
|
|
282
|
+
// stamps `schemaVersion: 3` + `lineage` on EVERY event emitted inside
|
|
283
283
|
// the child's run. Core events that pass through the wrapped listener
|
|
284
284
|
// therefore inherit the envelope even though they have no lineage in
|
|
285
285
|
// their own type definition.
|
|
@@ -323,7 +323,7 @@ describe('Integration — event stream ordering + lineage + schemaVersion', () =
|
|
|
323
323
|
const runStarted = captured.find((e) => e.type === 'run_started');
|
|
324
324
|
expect(runStarted).toBeDefined();
|
|
325
325
|
if (runStarted && 'schemaVersion' in runStarted) {
|
|
326
|
-
expect(runStarted.schemaVersion).toBe(
|
|
326
|
+
expect(runStarted.schemaVersion).toBe(3);
|
|
327
327
|
}
|
|
328
328
|
});
|
|
329
329
|
});
|