create-principles-disciple 1.142.11 → 1.142.13
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/core/dist/runtime-v2/__tests__/architecture-regression.test.js +5 -3
- package/core/dist/runtime-v2/__tests__/architecture-regression.test.js.map +1 -1
- package/core/dist/runtime-v2/adapter/__tests__/artificer-l2-adapter.test.js +221 -0
- package/core/dist/runtime-v2/adapter/__tests__/artificer-l2-adapter.test.js.map +1 -1
- package/core/dist/runtime-v2/adapter/__tests__/l2-resolve-model-compat.test.js +66 -0
- package/core/dist/runtime-v2/adapter/__tests__/l2-resolve-model-compat.test.js.map +1 -1
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.d.ts +17 -0
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.d.ts.map +1 -1
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.js +217 -28
- package/core/dist/runtime-v2/adapter/artificer-l2-adapter.js.map +1 -1
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.d.ts +21 -5
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.d.ts.map +1 -1
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.js +60 -9
- package/core/dist/runtime-v2/adapter/l2-agent-loop-adapter.js.map +1 -1
- package/core/dist/runtime-v2/index.d.ts +0 -2
- package/core/dist/runtime-v2/index.d.ts.map +1 -1
- package/core/dist/runtime-v2/index.js +4 -2
- package/core/dist/runtime-v2/index.js.map +1 -1
- package/core/dist/runtime-v2/tools/__tests__/artificer-l2-tool-contract.test.js +8 -0
- package/core/dist/runtime-v2/tools/__tests__/artificer-l2-tool-contract.test.js.map +1 -1
- package/core/dist/runtime-v2/tools/__tests__/artificer-output-typebox.test.js +15 -1
- package/core/dist/runtime-v2/tools/__tests__/artificer-output-typebox.test.js.map +1 -1
- package/core/dist/runtime-v2/tools/artificer-l2-tool-contract.d.ts.map +1 -1
- package/core/dist/runtime-v2/tools/artificer-l2-tool-contract.js +24 -4
- package/core/dist/runtime-v2/tools/artificer-l2-tool-contract.js.map +1 -1
- package/core/dist/runtime-v2/tools/artificer-output-typebox.d.ts +1 -0
- package/core/dist/runtime-v2/tools/artificer-output-typebox.d.ts.map +1 -1
- package/core/dist/runtime-v2/tools/artificer-output-typebox.js +6 -0
- package/core/dist/runtime-v2/tools/artificer-output-typebox.js.map +1 -1
- package/core/dist/telemetry-event.js +1 -1
- package/core/dist/telemetry-event.js.map +1 -1
- package/core/package.json +1 -1
- package/host-runtime/dist/internalization-consumer-cycle.js +23 -4
- package/host-runtime/dist/workspace-telemetry-emitter.js +5 -1
- package/package.json +2 -2
- package/pd-cli/dist/commands/build-trajectory-evidence.d.ts +10 -0
- package/pd-cli/dist/commands/build-trajectory-evidence.d.ts.map +1 -1
- package/pd-cli/dist/commands/build-trajectory-evidence.js +12 -0
- package/pd-cli/dist/commands/build-trajectory-evidence.js.map +1 -1
- package/pd-cli/dist/commands/pain-record.d.ts.map +1 -1
- package/pd-cli/dist/commands/pain-record.js +63 -29
- package/pd-cli/dist/commands/pain-record.js.map +1 -1
- package/pd-cli/dist/commands/runtime-internalization-run-rulehost.d.ts.map +1 -1
- package/pd-cli/dist/commands/runtime-internalization-run-rulehost.js +21 -1
- package/pd-cli/dist/commands/runtime-internalization-run-rulehost.js.map +1 -1
- package/pd-cli/package.json +1 -1
- package/plugin/dist/bundle.js +448 -452
- package/plugin/dist/governance-audit.js +70 -70
- package/plugin/dist/rulehost-evidence.js +76 -76
- package/plugin/openclaw.plugin.json +1 -1
- package/plugin/package.json +1 -1
- package/release-manager/package.json +2 -2
- package/core/dist/runtime-v2/__tests__/workspace-guidance-migration.test.d.ts +0 -2
- package/core/dist/runtime-v2/__tests__/workspace-guidance-migration.test.d.ts.map +0 -1
- package/core/dist/runtime-v2/__tests__/workspace-guidance-migration.test.js +0 -328
- package/core/dist/runtime-v2/__tests__/workspace-guidance-migration.test.js.map +0 -1
- package/core/dist/runtime-v2/workspace-guidance-migration.d.ts +0 -12
- package/core/dist/runtime-v2/workspace-guidance-migration.d.ts.map +0 -1
- package/core/dist/runtime-v2/workspace-guidance-migration.js +0 -193
- package/core/dist/runtime-v2/workspace-guidance-migration.js.map +0 -1
- package/plugin/dist/core/workspace-guidance-migrator.d.ts +0 -12
|
@@ -47,6 +47,100 @@ const DEFAULT_MAX_TURNS = 12;
|
|
|
47
47
|
const DEFAULT_TOTAL_BUDGET_MS = 300_000;
|
|
48
48
|
const DEFAULT_MAX_TOKENS = 8192;
|
|
49
49
|
const MAX_RETAINED_RUNS = 100;
|
|
50
|
+
/**
|
|
51
|
+
* Sum pi-ai Usage off the loop transcript's assistant messages. The transcript
|
|
52
|
+
* is produced by pi-agent-core in-process (not a trust boundary), but the walk
|
|
53
|
+
* still guards shapes (rc-1/rc-4): any non-finite field disqualifies that
|
|
54
|
+
* message; zero qualifying messages yields `unavailable` — never fabricated.
|
|
55
|
+
*/
|
|
56
|
+
function summarizeTranscriptUsage(transcript) {
|
|
57
|
+
let inputTokens = 0;
|
|
58
|
+
let outputTokens = 0;
|
|
59
|
+
let sawUsage = false;
|
|
60
|
+
for (const msg of transcript) {
|
|
61
|
+
if (!msg || typeof msg !== 'object' || msg.role !== 'assistant')
|
|
62
|
+
continue;
|
|
63
|
+
const { usage } = msg;
|
|
64
|
+
if (!usage || typeof usage !== 'object')
|
|
65
|
+
continue;
|
|
66
|
+
const input = Reflect.get(usage, 'input');
|
|
67
|
+
const output = Reflect.get(usage, 'output');
|
|
68
|
+
if (typeof input === 'number' && Number.isFinite(input)) {
|
|
69
|
+
inputTokens += input;
|
|
70
|
+
sawUsage = true;
|
|
71
|
+
}
|
|
72
|
+
if (typeof output === 'number' && Number.isFinite(output)) {
|
|
73
|
+
outputTokens += output;
|
|
74
|
+
sawUsage = true;
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return sawUsage ? { status: 'ok', inputTokens, outputTokens, totalTokens: inputTokens + outputTokens } : { status: 'unavailable' };
|
|
78
|
+
}
|
|
79
|
+
/** stopReason of the last assistant message in the transcript, guarded. */
|
|
80
|
+
function lastAssistantStopReason(transcript) {
|
|
81
|
+
for (let i = transcript.length - 1; i >= 0; i -= 1) {
|
|
82
|
+
const msg = transcript[i];
|
|
83
|
+
if (!msg || msg.role !== 'assistant')
|
|
84
|
+
continue;
|
|
85
|
+
const { stopReason } = msg;
|
|
86
|
+
return typeof stopReason === 'string' && stopReason.length > 0 ? stopReason : null;
|
|
87
|
+
}
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
/**
|
|
91
|
+
* Map a loop failure to (coarse PDErrorCategory, fine-grained kind, reason,
|
|
92
|
+
* nextAction). Coarse categories reuse the existing union — 'timeout' and
|
|
93
|
+
* 'execution_failed' are retriable, 'cancelled' permanent — fixing the old
|
|
94
|
+
* behavior where every abort/provider error was permanently 'output_invalid'.
|
|
95
|
+
*/
|
|
96
|
+
function classifyL2Failure(input) {
|
|
97
|
+
const evidence = `abortOwner=${input.abortOwner ?? 'none'} budgetMs=${input.budgetMs} elapsedMs=${input.elapsedMs} stopReason=${input.stopReason ?? 'unavailable'} turns=${input.turnCount} tokenUsage=${input.tokenUsage.status === 'ok' ? `${input.tokenUsage.inputTokens}in/${input.tokenUsage.outputTokens}out` : 'unavailable'}`;
|
|
98
|
+
if (input.abortOwner === 'pd_budget') {
|
|
99
|
+
return {
|
|
100
|
+
category: 'timeout',
|
|
101
|
+
kind: 'pd_budget_timeout',
|
|
102
|
+
reason: `Artificer L2 total budget (${input.budgetMs}ms) exhausted; failureKind=pd_budget_timeout; ${evidence}`,
|
|
103
|
+
nextAction: 'increase totalBudgetMs (--timeout-ms or profile timeoutMs) or lower the profile reasoning level; verify the model supports tool use',
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
if (input.abortOwner === 'cancelled') {
|
|
107
|
+
return {
|
|
108
|
+
category: 'cancelled',
|
|
109
|
+
kind: 'cancelled',
|
|
110
|
+
reason: `Artificer L2 run cancelled; failureKind=cancelled; ${evidence}`,
|
|
111
|
+
nextAction: 're-invoke the pipeline when the run is intended',
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
if (input.abortOwner === 'unknown') {
|
|
115
|
+
// The signal was aborted but neither known aborter fired — an ownership
|
|
116
|
+
// gap. Scream loudly instead of guessing (rc-9); never output_invalid.
|
|
117
|
+
return {
|
|
118
|
+
category: 'execution_failed',
|
|
119
|
+
kind: 'stream_aborted',
|
|
120
|
+
reason: `Artificer L2 abort signal aborted with UNKNOWN owner (no first-writer ownership claim recorded)${input.loopError !== null ? `: ${input.loopError}` : ''}; failureKind=stream_aborted; ${evidence}`,
|
|
121
|
+
nextAction: 'report this run: abort ownership gap — an aborter outside the adapter contract fired the AbortController',
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
if (input.loopError !== null) {
|
|
125
|
+
// Provider-side timeout recognition (bounded match on our own recorded
|
|
126
|
+
// loopError text, not a trust boundary). With the SDK ceiling now explicit
|
|
127
|
+
// (= budget), a provider timeout surfacing without an abort is a
|
|
128
|
+
// provider-side failure; both kinds share the retriable category.
|
|
129
|
+
const isTimeoutLike = /timed?[ _-]?out|timeout/i.test(input.loopError);
|
|
130
|
+
return {
|
|
131
|
+
category: 'execution_failed',
|
|
132
|
+
kind: isTimeoutLike ? 'provider_timeout' : 'provider_error',
|
|
133
|
+
reason: `Artificer L2 agent loop threw: ${input.loopError}; failureKind=${isTimeoutLike ? 'provider_timeout' : 'provider_error'}; ${evidence}`,
|
|
134
|
+
nextAction: 'check provider availability / API key / network; retry when the provider recovers',
|
|
135
|
+
};
|
|
136
|
+
}
|
|
137
|
+
return {
|
|
138
|
+
category: 'output_invalid',
|
|
139
|
+
kind: 'no_submit',
|
|
140
|
+
reason: `Artificer L2 agent loop ended without a submit_rulecode call after ${input.turnCount} turn(s); failureKind=no_submit; ${evidence}`,
|
|
141
|
+
nextAction: 'inspect artificer L2 telemetry; verify the model calls submit_rulecode with a valid ArtificerRuleOutput',
|
|
142
|
+
};
|
|
143
|
+
}
|
|
50
144
|
export class ArtificerL2Adapter {
|
|
51
145
|
config;
|
|
52
146
|
gateDeps;
|
|
@@ -54,6 +148,15 @@ export class ArtificerL2Adapter {
|
|
|
54
148
|
eventEmitter;
|
|
55
149
|
runs = new Map();
|
|
56
150
|
abortControllers = new Map();
|
|
151
|
+
/**
|
|
152
|
+
* PRI-795 (review P1): FIRST-WRITER-WINS abort ownership. Both the budget
|
|
153
|
+
* timer and cancelRun can abort the same controller, and a cancel may be
|
|
154
|
+
* followed by a slow stream exit that lets the budget timer fire afterwards
|
|
155
|
+
* — a fixed budget-first precedence would then record a manual cancel as a
|
|
156
|
+
* budget timeout. Whoever claims FIRST becomes the authoritative owner;
|
|
157
|
+
* later aborters never overwrite the claim.
|
|
158
|
+
*/
|
|
159
|
+
abortOwners = new Map();
|
|
57
160
|
constructor(config) {
|
|
58
161
|
this.config = config;
|
|
59
162
|
this.gateDeps = config.gateDeps;
|
|
@@ -121,11 +224,16 @@ export class ArtificerL2Adapter {
|
|
|
121
224
|
const maxTokens = this.config.maxTokens ?? DEFAULT_MAX_TOKENS;
|
|
122
225
|
const abortController = new AbortController();
|
|
123
226
|
this.abortControllers.set(runId, abortController);
|
|
124
|
-
//
|
|
125
|
-
//
|
|
126
|
-
//
|
|
127
|
-
|
|
128
|
-
const budgetTimer = setTimeout(() => {
|
|
227
|
+
// PRI-795 (review P1): the budget timer claims ownership ONLY if nobody
|
|
228
|
+
// (i.e. cancelRun) has claimed it already — first writer wins. A cancel
|
|
229
|
+
// followed by a slow stream exit that lets this timer fire must still be
|
|
230
|
+
// recorded as 'cancelled', never as a budget timeout.
|
|
231
|
+
const budgetTimer = setTimeout(() => {
|
|
232
|
+
if (!this.abortOwners.has(runId))
|
|
233
|
+
this.abortOwners.set(runId, 'pd_budget');
|
|
234
|
+
abortController.abort();
|
|
235
|
+
}, totalBudgetMs);
|
|
236
|
+
const startedWallMs = Date.now();
|
|
129
237
|
// Build the prompt message. Serialized before the try block so a
|
|
130
238
|
// non-serializable inputPayload fails loud with cleanup (no timer leak).
|
|
131
239
|
let messageContent;
|
|
@@ -137,6 +245,7 @@ export class ArtificerL2Adapter {
|
|
|
137
245
|
catch (err) {
|
|
138
246
|
clearTimeout(budgetTimer);
|
|
139
247
|
this.abortControllers.delete(runId);
|
|
248
|
+
this.abortOwners.delete(runId);
|
|
140
249
|
const reason = err instanceof Error ? err.message : String(err);
|
|
141
250
|
runState.status = 'failed';
|
|
142
251
|
runState.reason = `inputPayload not serializable: ${reason}`;
|
|
@@ -192,10 +301,37 @@ export class ArtificerL2Adapter {
|
|
|
192
301
|
};
|
|
193
302
|
const MAX_NO_TOOL_CALL_NUDGES = 2;
|
|
194
303
|
let nudges = 0;
|
|
304
|
+
// PRI-795 timeout contract (three explicit layers, one authority):
|
|
305
|
+
// 1. Artificer total budget — totalBudgetMs, armed HERE (t0). The single
|
|
306
|
+
// authoritative deadline for the whole loop.
|
|
307
|
+
// 2. Per-request SDK timeout — `timeoutMs` below. AgentLoopConfig extends
|
|
308
|
+
// SimpleStreamOptions, so this flows verbatim to pi-ai's
|
|
309
|
+
// requestOptions.timeout (OpenAI SDK `timeout`), replacing the SDK's
|
|
310
|
+
// silent 600s default that previously coexisted unobservably with the
|
|
311
|
+
// budget. Set equal to the budget: the budget timer is always armed
|
|
312
|
+
// earlier (t0 ≤ any request start), so the budget is provably the
|
|
313
|
+
// tightest timer on the wire (EP-07) and the SDK ceiling is a pure
|
|
314
|
+
// backstop that never wins the race.
|
|
315
|
+
// 3. Runner poll deadline — BasePeerRunner.timeoutMs; polls only after
|
|
316
|
+
// startRun returns (this adapter blocks through the loop), so it can
|
|
317
|
+
// never abort mid-loop.
|
|
195
318
|
const loopConfig = {
|
|
196
|
-
model: resolveL2Model(this.config.provider, this.config.model, this.config.baseUrl
|
|
319
|
+
model: resolveL2Model(this.config.provider, this.config.model, this.config.baseUrl, {
|
|
320
|
+
// Model-level maxTokens is the thinking-budget clamp ceiling; keep it
|
|
321
|
+
// coherent with the request-level cap (loopConfig.maxTokens) instead
|
|
322
|
+
// of the hardcoded literal that previously diverged (8192/32000/16000).
|
|
323
|
+
reasoning: this.config.reasoning !== undefined && this.config.reasoning !== false,
|
|
324
|
+
maxTokens,
|
|
325
|
+
}),
|
|
197
326
|
apiKey,
|
|
198
327
|
maxTokens,
|
|
328
|
+
// PRI-795: per-request SDK timeout = total budget (see contract above).
|
|
329
|
+
timeoutMs: totalBudgetMs,
|
|
330
|
+
// Profile thinking level; `false` means "disable" and is expressed by
|
|
331
|
+
// omitting the field (model default), mirroring PiAiRuntimeAdapter.
|
|
332
|
+
...(this.config.reasoning !== undefined && this.config.reasoning !== false
|
|
333
|
+
? { reasoning: this.config.reasoning }
|
|
334
|
+
: {}),
|
|
199
335
|
convertToLlm: (msgs) => msgs.map((m) => {
|
|
200
336
|
if (m.role === 'user' || m.role === 'assistant' || m.role === 'toolResult') {
|
|
201
337
|
return m;
|
|
@@ -222,7 +358,7 @@ export class ArtificerL2Adapter {
|
|
|
222
358
|
getFollowUpMessages: async () => {
|
|
223
359
|
if (outputCapture.output !== null)
|
|
224
360
|
return [];
|
|
225
|
-
if (
|
|
361
|
+
if (this.abortOwners.has(runId) || turnCount >= maxTurns)
|
|
226
362
|
return [];
|
|
227
363
|
if (nudges >= MAX_NO_TOOL_CALL_NUDGES)
|
|
228
364
|
return [];
|
|
@@ -250,9 +386,18 @@ export class ArtificerL2Adapter {
|
|
|
250
386
|
timestamp: new Date().toISOString(),
|
|
251
387
|
sessionId: 'l2-adapter',
|
|
252
388
|
agentId: 'artificer-l2',
|
|
253
|
-
payload: {
|
|
389
|
+
payload: {
|
|
390
|
+
runId,
|
|
391
|
+
phase: 'loop_started',
|
|
392
|
+
maxTurns,
|
|
393
|
+
totalBudgetMs,
|
|
394
|
+
maxTokens,
|
|
395
|
+
requestTimeoutMs: totalBudgetMs,
|
|
396
|
+
reasoning: this.config.reasoning ?? 'unavailable',
|
|
397
|
+
provider: this.config.provider,
|
|
398
|
+
model: this.config.model,
|
|
399
|
+
},
|
|
254
400
|
});
|
|
255
|
-
let timedOut = false;
|
|
256
401
|
let loopError = null;
|
|
257
402
|
// EP002-R3: streamAssistantResponse reports LLM-call failures as a message
|
|
258
403
|
// with stopReason 'error'/'aborted' and the agent loop then ends WITHOUT
|
|
@@ -260,19 +405,21 @@ export class ArtificerL2Adapter {
|
|
|
260
405
|
// no nudge, generic failure reason). Capture it here so the underlying
|
|
261
406
|
// provider error surfaces loudly (rc-9) instead of a generic message.
|
|
262
407
|
let lastErrorMessage = null;
|
|
408
|
+
let lastStopReason = null;
|
|
409
|
+
let transcript = [];
|
|
263
410
|
try {
|
|
264
|
-
await runAgentLoop(prompts, agentContext, loopConfig, async (event) => {
|
|
411
|
+
transcript = await runAgentLoop(prompts, agentContext, loopConfig, async (event) => {
|
|
265
412
|
if (event.type === 'message_end') {
|
|
266
413
|
const { message } = event;
|
|
267
414
|
if (message && (message.stopReason === 'error' || message.stopReason === 'aborted')) {
|
|
268
415
|
lastErrorMessage = `LLM stream ended with stopReason=${message.stopReason}${message.errorMessage ? `: ${message.errorMessage}` : ''}`;
|
|
416
|
+
lastStopReason = message.stopReason ?? null;
|
|
269
417
|
}
|
|
270
418
|
}
|
|
271
419
|
}, abortController.signal, pdStreamSimple);
|
|
272
420
|
}
|
|
273
421
|
catch (err) {
|
|
274
422
|
const reason = err instanceof Error ? err.message : String(err);
|
|
275
|
-
timedOut = budgetTimedOut;
|
|
276
423
|
loopError = reason;
|
|
277
424
|
}
|
|
278
425
|
if (loopError === null && lastErrorMessage !== null) {
|
|
@@ -280,29 +427,56 @@ export class ArtificerL2Adapter {
|
|
|
280
427
|
}
|
|
281
428
|
clearTimeout(budgetTimer);
|
|
282
429
|
this.abortControllers.delete(runId);
|
|
430
|
+
// PRI-795 (review P1): resolve abort ownership AFTER the loop from the
|
|
431
|
+
// first-writer-wins claim map — never from which control path returned
|
|
432
|
+
// (the loop returns silently on abort; the old `timedOut =
|
|
433
|
+
// budgetTimedOut` lived only in the catch block and was dead code on that
|
|
434
|
+
// path, misclassifying budget aborts as output_invalid). The claim was
|
|
435
|
+
// set by whichever aborter fired FIRST, so a cancel followed by a slow
|
|
436
|
+
// stream exit stays 'cancelled' even when the budget timer fires late.
|
|
437
|
+
const claimedOwner = this.abortOwners.get(runId);
|
|
438
|
+
this.abortOwners.delete(runId);
|
|
439
|
+
const abortOwner = claimedOwner
|
|
440
|
+
?? (abortController.signal.aborted
|
|
441
|
+
? 'unknown'
|
|
442
|
+
: undefined);
|
|
443
|
+
const elapsedMs = Date.now() - startedWallMs;
|
|
444
|
+
const tokenUsage = summarizeTranscriptUsage(transcript);
|
|
445
|
+
const finalStopReason = lastStopReason ?? lastAssistantStopReason(transcript);
|
|
283
446
|
// Extract output from the capture (set by submit_rulecode).
|
|
284
447
|
if (outputCapture.output !== null) {
|
|
285
448
|
runState.status = 'succeeded';
|
|
286
449
|
runState.endedAt = new Date().toISOString();
|
|
287
450
|
runState.output = { runId, payload: outputCapture.output };
|
|
288
|
-
this.emitComplete({
|
|
451
|
+
this.emitComplete({
|
|
452
|
+
taskId, runId, turnCount, toolsInvoked, succeeded: true,
|
|
453
|
+
evidence: { abortOwner: undefined, budgetMs: totalBudgetMs, elapsedMs, stopReason: finalStopReason, tokenUsage },
|
|
454
|
+
});
|
|
289
455
|
return this.runHandle(runId, startedAt);
|
|
290
456
|
}
|
|
291
457
|
// No output captured — fail loud (Runtime Contract Rule 9, ERR-002).
|
|
292
458
|
// PRI-439: no V1/L1 fallback. Missing/invalid/replay-failing RuleCode
|
|
293
459
|
// creates no rule artifact, approval, or activation.
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
460
|
+
// PRI-795: classify by abort ownership / failure kind, not by control path.
|
|
461
|
+
const { category, kind, reason, nextAction } = classifyL2Failure({
|
|
462
|
+
abortOwner,
|
|
463
|
+
budgetMs: totalBudgetMs,
|
|
464
|
+
elapsedMs,
|
|
465
|
+
turnCount,
|
|
466
|
+
stopReason: finalStopReason,
|
|
467
|
+
loopError,
|
|
468
|
+
tokenUsage,
|
|
469
|
+
});
|
|
470
|
+
runState.status = kind === 'pd_budget_timeout' ? 'timed_out' : kind === 'cancelled' ? 'cancelled' : 'failed';
|
|
298
471
|
runState.endedAt = new Date().toISOString();
|
|
299
|
-
runState.reason =
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
472
|
+
runState.reason = reason;
|
|
473
|
+
runState.abortOwner = abortOwner;
|
|
474
|
+
runState.elapsedMs = elapsedMs;
|
|
475
|
+
this.emitComplete({
|
|
476
|
+
taskId, runId, turnCount, toolsInvoked, succeeded: false,
|
|
477
|
+
evidence: { abortOwner, budgetMs: totalBudgetMs, elapsedMs, stopReason: finalStopReason, tokenUsage, failureKind: kind },
|
|
305
478
|
});
|
|
479
|
+
throw new PDRuntimeError(category, reason, { nextAction });
|
|
306
480
|
}
|
|
307
481
|
async pollRun(runId) {
|
|
308
482
|
const state = this.runs.get(runId);
|
|
@@ -318,15 +492,23 @@ export class ArtificerL2Adapter {
|
|
|
318
492
|
};
|
|
319
493
|
}
|
|
320
494
|
async cancelRun(runId) {
|
|
321
|
-
|
|
322
|
-
if
|
|
323
|
-
|
|
495
|
+
// PRI-795 (review P1): claim ownership BEFORE aborting — first writer
|
|
496
|
+
// wins, so even if the budget timer fires later during a slow stream exit
|
|
497
|
+
// the run is still recorded as 'cancelled'. Guarded by abortControllers
|
|
498
|
+
// membership so a late cancel of an already-terminal run neither leaks a
|
|
499
|
+
// claim entry nor rewrites the recorded terminal state.
|
|
500
|
+
if (this.abortControllers.has(runId)) {
|
|
501
|
+
if (!this.abortOwners.has(runId))
|
|
502
|
+
this.abortOwners.set(runId, 'cancelled');
|
|
503
|
+
const controller = this.abortControllers.get(runId);
|
|
504
|
+
controller?.abort();
|
|
324
505
|
}
|
|
325
506
|
const state = this.runs.get(runId);
|
|
326
|
-
if (state && state.status !== 'succeeded') {
|
|
327
|
-
state.status = '
|
|
507
|
+
if (state && this.abortControllers.has(runId) && state.status !== 'succeeded') {
|
|
508
|
+
state.status = 'cancelled';
|
|
328
509
|
state.endedAt = new Date().toISOString();
|
|
329
510
|
state.reason = 'cancelled';
|
|
511
|
+
state.abortOwner = 'cancelled';
|
|
330
512
|
}
|
|
331
513
|
}
|
|
332
514
|
async fetchOutput(runId) {
|
|
@@ -357,11 +539,18 @@ export class ArtificerL2Adapter {
|
|
|
357
539
|
sessionId: 'l2-adapter',
|
|
358
540
|
agentId: 'artificer-l2',
|
|
359
541
|
payload: {
|
|
542
|
+
taskId: opts.taskId,
|
|
360
543
|
runId: opts.runId,
|
|
361
544
|
turnCount: opts.turnCount,
|
|
362
545
|
toolsInvoked: opts.toolsInvoked,
|
|
363
546
|
succeeded: opts.succeeded,
|
|
364
|
-
|
|
547
|
+
abortOwner: opts.evidence.abortOwner ?? 'none',
|
|
548
|
+
budgetMs: opts.evidence.budgetMs,
|
|
549
|
+
elapsedMs: opts.evidence.elapsedMs,
|
|
550
|
+
stopReason: opts.evidence.stopReason ?? 'unavailable',
|
|
551
|
+
tokenUsage: opts.evidence.tokenUsage,
|
|
552
|
+
...(opts.evidence.failureKind !== undefined ? { failureKind: opts.evidence.failureKind } : {}),
|
|
553
|
+
model: { provider: this.config.provider, model: this.config.model, maxTokens: this.config.maxTokens ?? DEFAULT_MAX_TOKENS },
|
|
365
554
|
outputPreview: safeStringifyPreview(this.runs.get(opts.runId)?.output?.payload, 300),
|
|
366
555
|
},
|
|
367
556
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"artificer-l2-adapter.js","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"artificer-l2-adapter.js","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/artificer-l2-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,12 +46,28 @@ export interface L2AgentLoopAdapterConfig {
|
|
|
46
46
|
* on a streaming agent loop rather than one-shot completeSimple; both now live
|
|
47
47
|
* on the single @earendil-works scope, so the historical "no cross-import"
|
|
48
48
|
* reason for full duplication is gone and a dedupe is planned as PR3 follow-up).
|
|
49
|
-
*
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
49
|
+
*
|
|
50
|
+
* PRI-795 r2 — catalog-first for custom endpoints, mirroring
|
|
51
|
+
* PiAiRuntimeAdapter.resolveModel: a custom baseUrl relaying a catalog-known
|
|
52
|
+
* model keeps the catalog's authoritative metadata (reasoning, contextWindow,
|
|
53
|
+
* maxTokens, thinkingLevelMap, compat incl. thinkingFormat/supportsReasoningEffort)
|
|
54
|
+
* with only the transport (provider name + baseUrl) overridden. The previous
|
|
55
|
+
* hand-built literal hardcoded `reasoning:false`, `contextWindow:128000`,
|
|
56
|
+
* `maxTokens:32000`, and a compat that could not send `reasoning_effort` —
|
|
57
|
+
* EP002-R3 live evidence: for glm-5.3-flash (catalog: 1M context / 131072
|
|
58
|
+
* output / zai thinking / effort-capable) the profile's `reasoning:low` never
|
|
59
|
+
* reached the wire, so the model thought at default strength and burned the
|
|
60
|
+
* entire 16000-token response budget before emitting a tool call. The literal
|
|
61
|
+
* remains only as the fallback for model ids absent from every catalog.
|
|
62
|
+
* (The original "deliberately NOT catalog-first" caution is superseded by
|
|
63
|
+
* EP002-R3: the PiAi path has run catalog-borrowed entries in production
|
|
64
|
+
* since PRI-758, and the L2 loop ran 25 live model calls against this exact
|
|
65
|
+
* model without shape issues.)
|
|
53
66
|
*/
|
|
54
|
-
export declare function resolveL2Model(provider: string, modelId: string, baseUrl?: string
|
|
67
|
+
export declare function resolveL2Model(provider: string, modelId: string, baseUrl?: string, opts?: {
|
|
68
|
+
reasoning?: boolean;
|
|
69
|
+
maxTokens?: number;
|
|
70
|
+
}): Model<string>;
|
|
55
71
|
/** Read-only readers injected by the factory (bound to the dreamer's task + stores). */
|
|
56
72
|
export interface L2AgentLoopAdapterDeps {
|
|
57
73
|
artifactReader: PdL2ArtifactReader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"l2-agent-loop-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/l2-agent-loop-adapter.ts"],"names":[],"mappings":"AAqCA,OAAO,KAAK,EAAE,KAAK,EAA0B,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC3F,OAAO,KAAK,EAAE,GAAG,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAOnE,OAAO,KAAK,EACV,gBAAgB,EAChB,WAAW,EACX,mBAAmB,EACnB,aAAa,EACb,SAAS,EACT,SAAS,EACT,aAAa,EACb,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAIL,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,EAEzB,MAAM,iCAAiC,CAAC;AAEzC,4CAA4C;AAC5C,MAAM,WAAW,wBAAwB;IACvC,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gEAAgE;IAChE,YAAY,CAAC,EAAE,iBAAiB,CAAC;IACjC,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED
|
|
1
|
+
{"version":3,"file":"l2-agent-loop-adapter.d.ts","sourceRoot":"","sources":["../../../src/runtime-v2/adapter/l2-agent-loop-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,12 +47,26 @@ import { buildDreamerL2Tools, DREAMER_L2_TOOL_WHITELIST, } from '../tools/agent-
|
|
|
47
47
|
* on a streaming agent loop rather than one-shot completeSimple; both now live
|
|
48
48
|
* on the single @earendil-works scope, so the historical "no cross-import"
|
|
49
49
|
* reason for full duplication is gone and a dedupe is planned as PR3 follow-up).
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
53
|
-
*
|
|
50
|
+
*
|
|
51
|
+
* PRI-795 r2 — catalog-first for custom endpoints, mirroring
|
|
52
|
+
* PiAiRuntimeAdapter.resolveModel: a custom baseUrl relaying a catalog-known
|
|
53
|
+
* model keeps the catalog's authoritative metadata (reasoning, contextWindow,
|
|
54
|
+
* maxTokens, thinkingLevelMap, compat incl. thinkingFormat/supportsReasoningEffort)
|
|
55
|
+
* with only the transport (provider name + baseUrl) overridden. The previous
|
|
56
|
+
* hand-built literal hardcoded `reasoning:false`, `contextWindow:128000`,
|
|
57
|
+
* `maxTokens:32000`, and a compat that could not send `reasoning_effort` —
|
|
58
|
+
* EP002-R3 live evidence: for glm-5.3-flash (catalog: 1M context / 131072
|
|
59
|
+
* output / zai thinking / effort-capable) the profile's `reasoning:low` never
|
|
60
|
+
* reached the wire, so the model thought at default strength and burned the
|
|
61
|
+
* entire 16000-token response budget before emitting a tool call. The literal
|
|
62
|
+
* remains only as the fallback for model ids absent from every catalog.
|
|
63
|
+
* (The original "deliberately NOT catalog-first" caution is superseded by
|
|
64
|
+
* EP002-R3: the PiAi path has run catalog-borrowed entries in production
|
|
65
|
+
* since PRI-758, and the L2 loop ran 25 live model calls against this exact
|
|
66
|
+
* model without shape issues.)
|
|
54
67
|
*/
|
|
55
|
-
|
|
68
|
+
// eslint-disable-next-line @typescript-eslint/max-params -- 4th param is an optional opts bag; keeping (provider, modelId, baseUrl?) positional preserves the existing exported signature and all call sites
|
|
69
|
+
export function resolveL2Model(provider, modelId, baseUrl, opts) {
|
|
56
70
|
const knownProviders = getProviders();
|
|
57
71
|
if (knownProviders.includes(provider) && !baseUrl) {
|
|
58
72
|
// @ts-expect-error — getModel requires literal model ID types; runtime strings from config are acceptable
|
|
@@ -61,19 +75,56 @@ export function resolveL2Model(provider, modelId, baseUrl) {
|
|
|
61
75
|
if (!baseUrl) {
|
|
62
76
|
throw new PDRuntimeError('runtime_unavailable', `Provider '${provider}' is not a built-in pi-ai provider and requires a custom baseUrl.`);
|
|
63
77
|
}
|
|
64
|
-
//
|
|
65
|
-
//
|
|
78
|
+
// PRI-795 r2: catalog-first — same rationale and openai-completions guard
|
|
79
|
+
// as PiAiRuntimeAdapter.resolveModel. Lookup order matters because several
|
|
80
|
+
// catalog namespaces carry entries for the SAME model id with semantically
|
|
81
|
+
// different gateway compat (e.g. 'opencode-go' relaying 'glm-5.3-flash'
|
|
82
|
+
// without the zai thinking format):
|
|
83
|
+
// 1. the configured provider's own namespace — highest authority when the
|
|
84
|
+
// configured name IS a catalog namespace;
|
|
85
|
+
// 2. other namespaces, preferring entries that DECLARE a thinkingFormat
|
|
86
|
+
// (protocol-complete provider entries over relay/gateway variants);
|
|
87
|
+
// 3. any openai-completions entry at all.
|
|
88
|
+
// A total miss falls through to the literal.
|
|
89
|
+
// @ts-expect-error — runtime strings are acceptable against the literal-typed signature
|
|
90
|
+
const configuredHit = getModel(provider, modelId);
|
|
91
|
+
if (configuredHit && configuredHit.api === 'openai-completions') {
|
|
92
|
+
return { ...configuredHit, provider, baseUrl };
|
|
93
|
+
}
|
|
94
|
+
const isProtocolComplete = (m) => {
|
|
95
|
+
const compat = m.compat;
|
|
96
|
+
return !!compat && compat.thinkingFormat !== undefined;
|
|
97
|
+
};
|
|
98
|
+
let anyHit;
|
|
99
|
+
for (const catalogProvider of knownProviders) {
|
|
100
|
+
if (catalogProvider === provider)
|
|
101
|
+
continue;
|
|
102
|
+
// @ts-expect-error — runtime strings are acceptable against the literal-typed signature
|
|
103
|
+
const catalogModel = getModel(catalogProvider, modelId);
|
|
104
|
+
if (!catalogModel || catalogModel.api !== 'openai-completions')
|
|
105
|
+
continue;
|
|
106
|
+
if (isProtocolComplete(catalogModel)) {
|
|
107
|
+
return { ...catalogModel, provider, baseUrl };
|
|
108
|
+
}
|
|
109
|
+
anyHit ??= catalogModel;
|
|
110
|
+
}
|
|
111
|
+
if (anyHit) {
|
|
112
|
+
return { ...anyHit, provider, baseUrl };
|
|
113
|
+
}
|
|
114
|
+
// Custom model unknown to every catalog — construct a Model object directly
|
|
115
|
+
// (openai-completions API). The literal object doesn't fully satisfy
|
|
116
|
+
// Model<string>'s discriminant union, so narrow via unknown.
|
|
66
117
|
const customModel = {
|
|
67
118
|
id: modelId,
|
|
68
119
|
name: modelId,
|
|
69
120
|
api: 'openai-completions',
|
|
70
121
|
provider,
|
|
71
122
|
baseUrl,
|
|
72
|
-
reasoning: false,
|
|
123
|
+
reasoning: opts?.reasoning ?? false,
|
|
73
124
|
input: ['text'],
|
|
74
125
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
75
126
|
contextWindow: 128000,
|
|
76
|
-
maxTokens: 32000,
|
|
127
|
+
maxTokens: opts?.maxTokens ?? 32000,
|
|
77
128
|
compat: {
|
|
78
129
|
supportsStore: false,
|
|
79
130
|
supportsDeveloperRole: false,
|