@oeronteros-1/opencode-orchestra 1.0.25 → 1.0.26
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/README.md +23 -8
- package/dashboard-dist/assets/index-BcxwxSxG.js +124 -0
- package/dashboard-dist/assets/{index-1lUDKh9b.css → index-igZBUoKO.css} +1 -1
- package/dashboard-dist/index.html +2 -2
- package/dist/agents/build.d.ts +1 -0
- package/dist/agents/build.js +4 -4
- package/dist/agents/build.js.map +1 -1
- package/dist/agents/editor.d.ts +1 -1
- package/dist/agents/editor.js +2 -2
- package/dist/agents/editor.js.map +1 -1
- package/dist/agents/integrator.d.ts +1 -1
- package/dist/agents/integrator.js +2 -2
- package/dist/agents/integrator.js.map +1 -1
- package/dist/agents/merge.d.ts +1 -1
- package/dist/agents/merge.js +2 -2
- package/dist/agents/merge.js.map +1 -1
- package/dist/agents/workers.d.ts +2 -1
- package/dist/agents/workers.js +2 -2
- package/dist/agents/workers.js.map +1 -1
- package/dist/cli.js +5 -28
- package/dist/cli.js.map +1 -1
- package/dist/config/defaults.js +17 -3
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/schema.d.ts +5 -0
- package/dist/config/schema.js +14 -2
- package/dist/config/schema.js.map +1 -1
- package/dist/dashboard/server.js +36 -15
- package/dist/dashboard/server.js.map +1 -1
- package/dist/diagnostics/doctor.js +19 -25
- package/dist/diagnostics/doctor.js.map +1 -1
- package/dist/index.js +156 -12
- package/dist/index.js.map +1 -1
- package/dist/orchestration/worktrees.d.ts +1 -1
- package/dist/orchestration/worktrees.js +3 -2
- package/dist/orchestration/worktrees.js.map +1 -1
- package/dist/pricing/model-match.js +2 -0
- package/dist/pricing/model-match.js.map +1 -1
- package/dist/prompts/load.d.ts +5 -2
- package/dist/prompts/load.js +25 -13
- package/dist/prompts/load.js.map +1 -1
- package/dist/routing/classifier.d.ts +2 -0
- package/dist/routing/classifier.js +1 -0
- package/dist/routing/classifier.js.map +1 -1
- package/dist/routing/escalation.js +5 -1
- package/dist/routing/escalation.js.map +1 -1
- package/dist/routing/fallback.d.ts +2 -0
- package/dist/routing/fallback.js +6 -1
- package/dist/routing/fallback.js.map +1 -1
- package/dist/routing/model-resolver.d.ts +3 -0
- package/dist/routing/model-resolver.js +6 -2
- package/dist/routing/model-resolver.js.map +1 -1
- package/dist/spawn.d.ts +25 -0
- package/dist/spawn.js +52 -0
- package/dist/spawn.js.map +1 -0
- package/dist/telemetry/analytics.d.ts +2 -1
- package/dist/telemetry/analytics.js +4 -4
- package/dist/telemetry/analytics.js.map +1 -1
- package/dist/telemetry/ledger.d.ts +8 -1
- package/dist/telemetry/ledger.js +11 -1
- package/dist/telemetry/ledger.js.map +1 -1
- package/dist/telemetry/live.d.ts +4 -1
- package/dist/telemetry/live.js +8 -5
- package/dist/telemetry/live.js.map +1 -1
- package/dist/tools.js +50 -5
- package/dist/tools.js.map +1 -1
- package/package.json +2 -2
- package/prompts/critic.md +8 -0
- package/prompts/docs.md +7 -0
- package/prompts/editor.md +7 -0
- package/prompts/integrator.md +7 -0
- package/prompts/lead.md +3 -0
- package/prompts/merge.md +10 -0
- package/prompts/repo.md +7 -0
- package/prompts/research.md +8 -0
- package/prompts/security.md +8 -0
- package/prompts/tests.md +8 -0
- package/prompts/visual-generate.md +7 -0
- package/prompts/visual-reference.md +8 -0
- package/prompts/visual-review.md +8 -0
- package/schema/opencode-orchestra.schema.json +13 -3
- package/dashboard-dist/assets/index-Dc5lp8wX.js +0 -124
package/dist/index.js
CHANGED
|
@@ -50,6 +50,23 @@ const sessionModel = new Map();
|
|
|
50
50
|
// show "what the agent is doing" in the live dashboard panel. Bounded.
|
|
51
51
|
const liveTexts = new Map();
|
|
52
52
|
const liveTextLengths = new Map();
|
|
53
|
+
// Estimated reasoning accumulation, split from output text so the live output
|
|
54
|
+
// tok/s is not inflated by thinking output. Only lengths are kept; reasoning
|
|
55
|
+
// text is never persisted (same privacy policy as output snippets).
|
|
56
|
+
const liveReasoningLengths = new Map();
|
|
57
|
+
// Per-part dedupe between the two delta sources OpenCode can use:
|
|
58
|
+
// `message.part.delta` carries incremental chunks, while
|
|
59
|
+
// `message.part.updated` carries cumulative `part.text`. `livePartSeen` is how
|
|
60
|
+
// many characters per part have already been fed from either source, so the
|
|
61
|
+
// cumulative view only ever appends the unseen suffix (no double counting).
|
|
62
|
+
const livePartSeen = new Map();
|
|
63
|
+
// Part type remembered from part events so reasoning deltas (which arrive with
|
|
64
|
+
// field "text", same as output) can be routed to the reasoning estimate.
|
|
65
|
+
const livePartKinds = new Map();
|
|
66
|
+
// Message ids finalized by message.updated; guards against a late delta
|
|
67
|
+
// resurrecting an active row that no finish will ever remove.
|
|
68
|
+
const finishedLiveMessages = new Set();
|
|
69
|
+
const recoveryNotices = new Set();
|
|
53
70
|
function pruneOldest(map) {
|
|
54
71
|
while (map.size > MAX_TEXT_BUFFERS) {
|
|
55
72
|
const oldest = map.keys().next().value;
|
|
@@ -58,6 +75,32 @@ function pruneOldest(map) {
|
|
|
58
75
|
map.delete(oldest);
|
|
59
76
|
}
|
|
60
77
|
}
|
|
78
|
+
function pruneLiveAccumulators() {
|
|
79
|
+
const pruneNumberMap = (map) => {
|
|
80
|
+
while (map.size > MAX_TEXT_BUFFERS) {
|
|
81
|
+
const oldest = map.keys().next().value;
|
|
82
|
+
if (oldest === undefined)
|
|
83
|
+
break;
|
|
84
|
+
map.delete(oldest);
|
|
85
|
+
}
|
|
86
|
+
};
|
|
87
|
+
pruneNumberMap(liveReasoningLengths);
|
|
88
|
+
const pruneSeen = (map) => {
|
|
89
|
+
while (map.size > MAX_TEXT_BUFFERS * 4) {
|
|
90
|
+
const oldest = map.keys().next().value;
|
|
91
|
+
if (oldest === undefined)
|
|
92
|
+
break;
|
|
93
|
+
map.delete(oldest);
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
pruneSeen(livePartSeen);
|
|
97
|
+
while (livePartKinds.size > MAX_TEXT_BUFFERS * 4) {
|
|
98
|
+
const oldest = livePartKinds.keys().next().value;
|
|
99
|
+
if (oldest === undefined)
|
|
100
|
+
break;
|
|
101
|
+
livePartKinds.delete(oldest);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
61
104
|
/** Accumulate a text delta, retaining a bounded snippet and exact length. */
|
|
62
105
|
function appendLiveText(messageID, delta) {
|
|
63
106
|
const current = liveTexts.get(messageID) ?? "";
|
|
@@ -74,6 +117,21 @@ function appendLiveText(messageID, delta) {
|
|
|
74
117
|
}
|
|
75
118
|
return { text: next.length > 240 ? next.slice(-240) : next, chars };
|
|
76
119
|
}
|
|
120
|
+
/** Accumulate reasoning length only; reasoning text itself is never stored. */
|
|
121
|
+
function appendLiveReasoning(messageID, delta) {
|
|
122
|
+
const chars = (liveReasoningLengths.get(messageID) ?? 0) + delta.length;
|
|
123
|
+
liveReasoningLengths.set(messageID, chars);
|
|
124
|
+
while (liveReasoningLengths.size > MAX_TEXT_BUFFERS) {
|
|
125
|
+
const oldest = liveReasoningLengths.keys().next().value;
|
|
126
|
+
if (oldest === undefined)
|
|
127
|
+
break;
|
|
128
|
+
liveReasoningLengths.delete(oldest);
|
|
129
|
+
}
|
|
130
|
+
return chars;
|
|
131
|
+
}
|
|
132
|
+
function isLivePartDeltaEvent(event) {
|
|
133
|
+
return typeof event === "object" && event !== null && event.type === "message.part.delta";
|
|
134
|
+
}
|
|
77
135
|
function trackStreamDelta(sessionID, part, delta) {
|
|
78
136
|
if (!delta)
|
|
79
137
|
return;
|
|
@@ -165,6 +223,50 @@ export const OrchestraPlugin = async ({ client, directory, experimental_workspac
|
|
|
165
223
|
return undefined;
|
|
166
224
|
return { input: resolution.input ?? 0, output: resolution.output ?? 0 };
|
|
167
225
|
}, 200, 450, orchestra.telemetry.storeTexts);
|
|
226
|
+
/**
|
|
227
|
+
* Feed one incremental text chunk into the live stream + stream observer.
|
|
228
|
+
* Reasoning parts (announced earlier via `message.part.updated` part.type)
|
|
229
|
+
* are routed to the reasoning estimate so the dashboard output tok/s stays
|
|
230
|
+
* meaningful. Deduplicated against the cumulative part.updated view through
|
|
231
|
+
* `livePartSeen`, and skipped for already-finalized messages.
|
|
232
|
+
*/
|
|
233
|
+
const feedLiveStream = (sessionID, messageID, partID, delta) => {
|
|
234
|
+
if (!delta || finishedLiveMessages.has(messageID))
|
|
235
|
+
return;
|
|
236
|
+
const model = sessionModel.get(sessionID);
|
|
237
|
+
const kind = livePartKinds.get(partID);
|
|
238
|
+
const seen = livePartSeen.get(partID) ?? 0;
|
|
239
|
+
livePartSeen.set(partID, seen + delta.length);
|
|
240
|
+
trackStreamDelta(sessionID, { id: partID, messageID }, delta);
|
|
241
|
+
if (kind === "reasoning") {
|
|
242
|
+
const reasoningChars = appendLiveReasoning(messageID, delta);
|
|
243
|
+
const output = liveTexts.get(messageID);
|
|
244
|
+
live.delta({
|
|
245
|
+
key: messageID,
|
|
246
|
+
sessionID,
|
|
247
|
+
agent: sessionAgent.get(sessionID),
|
|
248
|
+
// Keep the last output snippet: reasoning text must not overwrite it.
|
|
249
|
+
text: output === undefined ? "" : output.length > 240 ? output.slice(-240) + "…" : output,
|
|
250
|
+
chars: liveTextLengths.get(messageID) ?? 0,
|
|
251
|
+
reasoningChars,
|
|
252
|
+
provider: model?.providerID,
|
|
253
|
+
model: model?.modelID,
|
|
254
|
+
});
|
|
255
|
+
}
|
|
256
|
+
else {
|
|
257
|
+
const text = appendLiveText(messageID, delta);
|
|
258
|
+
live.delta({
|
|
259
|
+
key: messageID,
|
|
260
|
+
sessionID,
|
|
261
|
+
agent: sessionAgent.get(sessionID),
|
|
262
|
+
text: text.text,
|
|
263
|
+
chars: text.chars,
|
|
264
|
+
reasoningChars: liveReasoningLengths.get(messageID) ?? 0,
|
|
265
|
+
provider: model?.providerID,
|
|
266
|
+
model: model?.modelID,
|
|
267
|
+
});
|
|
268
|
+
}
|
|
269
|
+
};
|
|
168
270
|
const systemHint = primarySystemHint(orchestra);
|
|
169
271
|
const pluginStatus = {
|
|
170
272
|
name: PACKAGE_NAME,
|
|
@@ -239,6 +341,11 @@ export const OrchestraPlugin = async ({ client, directory, experimental_workspac
|
|
|
239
341
|
replyBuffers.clear();
|
|
240
342
|
liveTexts.clear();
|
|
241
343
|
liveTextLengths.clear();
|
|
344
|
+
liveReasoningLengths.clear();
|
|
345
|
+
livePartSeen.clear();
|
|
346
|
+
livePartKinds.clear();
|
|
347
|
+
finishedLiveMessages.clear();
|
|
348
|
+
recoveryNotices.clear();
|
|
242
349
|
sessionAgent.clear();
|
|
243
350
|
sessionModel.clear();
|
|
244
351
|
streamObservers.clear();
|
|
@@ -274,10 +381,29 @@ export const OrchestraPlugin = async ({ client, directory, experimental_workspac
|
|
|
274
381
|
sessionModel.set(sessionID, { providerID: model.providerID, modelID: model.modelID ?? model.id });
|
|
275
382
|
},
|
|
276
383
|
event: async ({ event }) => {
|
|
384
|
+
const eventRecord = event;
|
|
385
|
+
if (eventRecord.type === "session.error" || eventRecord.type === "session.idle") {
|
|
386
|
+
const sessionID = eventRecord.properties?.sessionID;
|
|
387
|
+
if (sessionID && !recoveryNotices.has(`${sessionID}:${eventRecord.type}`)) {
|
|
388
|
+
recoveryNotices.add(`${sessionID}:${eventRecord.type}`);
|
|
389
|
+
await client.app.log({ body: {
|
|
390
|
+
service: "opencode-orchestra",
|
|
391
|
+
level: eventRecord.type === "session.error" ? "warn" : "info",
|
|
392
|
+
message: eventRecord.type === "session.error"
|
|
393
|
+
? "Orchestra session encountered an error; no automatic continuation was submitted."
|
|
394
|
+
: "Orchestra session is idle; orchestration remains available for the next explicit request.",
|
|
395
|
+
extra: { sessionID, ...(eventRecord.properties?.error ? { error: eventRecord.properties.error } : {}) },
|
|
396
|
+
} }).catch(() => undefined);
|
|
397
|
+
}
|
|
398
|
+
return;
|
|
399
|
+
}
|
|
277
400
|
if (event.type === "message.part.updated") {
|
|
278
401
|
const part = event.properties.part;
|
|
279
402
|
const delta = event.properties.delta ?? "";
|
|
280
|
-
|
|
403
|
+
// Remember the part type: reasoning deltas arrive through the channel
|
|
404
|
+
// below with field "text" and can only be split off via this record.
|
|
405
|
+
livePartKinds.set(part.id, part.type);
|
|
406
|
+
pruneLiveAccumulators();
|
|
281
407
|
// Assistant messages announce themselves via assistant-only part kinds
|
|
282
408
|
// (step-start begins every LLM step; reasoning/tool parts never appear
|
|
283
409
|
// in user messages). LiveStream.start() is idempotent per key, so this
|
|
@@ -293,20 +419,29 @@ export const OrchestraPlugin = async ({ client, directory, experimental_workspac
|
|
|
293
419
|
});
|
|
294
420
|
}
|
|
295
421
|
if (delta) {
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
422
|
+
// Legacy/older runtimes deliver incremental deltas here.
|
|
423
|
+
feedLiveStream(part.sessionID, part.messageID, part.id, delta);
|
|
424
|
+
}
|
|
425
|
+
else if (typeof part.text === "string") {
|
|
426
|
+
// Fallback for runtimes that only publish cumulative `part.text`
|
|
427
|
+
// (bootstrap replay / non-streaming paths): feed the unseen suffix.
|
|
428
|
+
const cumulative = part.text;
|
|
429
|
+
const seen = livePartSeen.get(part.id) ?? 0;
|
|
430
|
+
if (cumulative.length > seen) {
|
|
431
|
+
livePartSeen.set(part.id, cumulative.length);
|
|
432
|
+
feedLiveStream(part.sessionID, part.messageID, part.id, cumulative.slice(seen));
|
|
433
|
+
}
|
|
307
434
|
}
|
|
308
435
|
return;
|
|
309
436
|
}
|
|
437
|
+
const candidate = event;
|
|
438
|
+
if (isLivePartDeltaEvent(candidate)) {
|
|
439
|
+
const properties = candidate.properties;
|
|
440
|
+
if (properties.field !== "text")
|
|
441
|
+
return;
|
|
442
|
+
feedLiveStream(properties.sessionID, properties.messageID, properties.partID, properties.delta);
|
|
443
|
+
return;
|
|
444
|
+
}
|
|
310
445
|
if (event.type !== "message.updated")
|
|
311
446
|
return;
|
|
312
447
|
const info = event.properties.info;
|
|
@@ -339,6 +474,15 @@ export const OrchestraPlugin = async ({ client, directory, experimental_workspac
|
|
|
339
474
|
});
|
|
340
475
|
liveTexts.delete(info.id);
|
|
341
476
|
liveTextLengths.delete(info.id);
|
|
477
|
+
liveReasoningLengths.delete(info.id);
|
|
478
|
+
// Later parts must not resurrect the finished row as a fresh active one.
|
|
479
|
+
finishedLiveMessages.add(info.id);
|
|
480
|
+
while (finishedLiveMessages.size > MAX_TEXT_BUFFERS * 2) {
|
|
481
|
+
const oldest = finishedLiveMessages.values().next().value;
|
|
482
|
+
if (oldest === undefined)
|
|
483
|
+
break;
|
|
484
|
+
finishedLiveMessages.delete(oldest);
|
|
485
|
+
}
|
|
342
486
|
await ledger.recordAssistant(info);
|
|
343
487
|
if (storeTextsFlag) {
|
|
344
488
|
const prompt = promptBuffers.get(info.sessionID);
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ export interface ChangedPath {
|
|
|
13
13
|
oldPath?: string;
|
|
14
14
|
}
|
|
15
15
|
export declare function parseNameStatusZ(output: string): ChangedPath[];
|
|
16
|
-
export declare function createEditorWorktree(git: GitRunner, repo: string, taskId: string, nodeId: string, baseSha: string, root
|
|
16
|
+
export declare function createEditorWorktree(git: GitRunner, repo: string, taskId: string, nodeId: string, baseSha: string, root?: string): Promise<{
|
|
17
17
|
path: string;
|
|
18
18
|
branch: string;
|
|
19
19
|
}>;
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from "node:child_process";
|
|
2
|
+
import path from "node:path";
|
|
2
3
|
export const systemGit = { run(args, cwd) { return new Promise((resolve, reject) => { const child = spawn("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], windowsHide: true }); let stdout = "", stderr = ""; child.stdout.on("data", (chunk) => stdout += chunk); child.stderr.on("data", (chunk) => stderr += chunk); child.once("error", reject); child.once("exit", (exitCode) => resolve({ stdout, stderr, exitCode: exitCode ?? 1 })); }); } };
|
|
3
4
|
export function parseNameStatusZ(output) { const tokens = output.split("\0"); const result = []; for (let i = 0; i < tokens.length - 1;) {
|
|
4
5
|
const status = tokens[i++];
|
|
@@ -11,8 +12,8 @@ export function parseNameStatusZ(output) { const tokens = output.split("\0"); co
|
|
|
11
12
|
else
|
|
12
13
|
result.push({ status, path: first });
|
|
13
14
|
} return result; }
|
|
14
|
-
export async function createEditorWorktree(git, repo, taskId, nodeId, baseSha, root) { const safe = (value) => value.replace(/[^a-zA-Z0-9._-]/g, "-"); const branch = "orch/" + safe(taskId) + "/" + safe(nodeId); const
|
|
15
|
-
throw new Error(result.stderr || "git worktree add failed"); return { path, branch }; }
|
|
15
|
+
export async function createEditorWorktree(git, repo, taskId, nodeId, baseSha, root = ".orchestra/worktrees") { const safe = (value) => value.replace(/[^a-zA-Z0-9._-]/g, "-"); const branch = "orch/" + safe(taskId) + "/" + safe(nodeId); const worktreePath = path.join(root || ".orchestra/worktrees", safe(taskId) + "-" + safe(nodeId)); const result = await git.run(["worktree", "add", "-b", branch, worktreePath, baseSha], repo); if (result.exitCode !== 0)
|
|
16
|
+
throw new Error(result.stderr || "git worktree add failed"); return { path: worktreePath, branch }; }
|
|
16
17
|
export async function assertCommitDescendsFromBase(git, repo, baseSha, commitSha) { const result = await git.run(["merge-base", "--is-ancestor", baseSha, commitSha], repo); if (result.exitCode !== 0)
|
|
17
18
|
throw new Error("commit is not descended from base: " + commitSha); }
|
|
18
19
|
export async function integrateValidatedCommits(git, repo, commits) { for (const commit of commits) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/orchestration/worktrees.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/orchestration/worktrees.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,6 +103,8 @@ export function matchModel(rawId, entries, opts) {
|
|
|
103
103
|
if (alias)
|
|
104
104
|
return { canonical: alias.id, method: "alias" };
|
|
105
105
|
const candidateTokens = tokensOf(norm);
|
|
106
|
+
if (candidateTokens.length === 0)
|
|
107
|
+
continue;
|
|
106
108
|
const keywordHits = entries.filter((entry) => hasAllTokens(entryTokenSet(entry), candidateTokens));
|
|
107
109
|
if (keywordHits.length === 1) {
|
|
108
110
|
return { canonical: keywordHits[0].id, method: "keyword" };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-match.js","sourceRoot":"","sources":["../../src/pricing/model-match.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-match.js","sourceRoot":"","sources":["../../src/pricing/model-match.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,2EAA2E;AAC3E,uEAAuE;AACvE,+CAA+C;AAmC/C,mEAAmE;AACnE,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,OAAO,IAAI;SACR,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;AAC5B,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,eAAe,CAAC,GAAW;IACzC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IAC5B,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAA;IAClD,OAAO,EAAE,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAA;AACzE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,GAAW;IACtC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;IAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;IACjE,MAAM,OAAO,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAA;IACjF,OAAO;QACL,QAAQ,EAAE,QAAQ,CAAC,WAAW,EAAE;QAChC,KAAK,EAAE,kBAAkB,CAAC,IAAI,CAAC;QAC/B,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/B,GAAG;KACJ,CAAA;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,UAAkB;IAClC,OAAO,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;AAC9C,CAAC;AAED,SAAS,YAAY,CAAC,WAAwB,EAAE,eAAyB;IACvE,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACjE,CAAC;AAED,SAAS,aAAa,CAAC,KAAiB;IACtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;IACvC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;QACxC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAAE,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACzE,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,OAAO,CAAC,CAAS;IACxB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;IACjE,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,UAAU,CAAC,CAAS,EAAE,CAAS;IACtC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IACrB,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACpB,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;IACpB,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,CAAC;QAAE,OAAO,CAAC,CAAA;IAC1C,IAAI,MAAM,GAAG,CAAC,CAAA;IACd,KAAK,MAAM,IAAI,IAAI,CAAC;QAAE,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,CAAC,CAAA;IAClD,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;AACzC,CAAC;AASD,MAAM,uBAAuB,GAAG,IAAI,CAAA;AACpC,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAEhC;;;;;;;;;GASG;AACH,MAAM,UAAU,UAAU,CAAC,KAAa,EAAE,OAAqB,EAAE,IAAmB;IAClF,MAAM,SAAS,GAAG,IAAI,EAAE,cAAc,IAAI,uBAAuB,CAAA;IACjE,MAAM,MAAM,GAAG,IAAI,EAAE,WAAW,IAAI,oBAAoB,CAAA;IACxD,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,QAAQ,GAAG,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;IAErE,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,CAAA;IACxB,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1D,IAAI,IAAI,KAAK,QAAQ;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAA;QACxC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAQ;QAC5B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEd,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,IAAI,CAAC,CAAA;QACxD,IAAI,KAAK;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;QAE1D,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAA;QACxG,IAAI,KAAK;YAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAA;QAE1D,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC;YAAE,SAAQ;QAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,eAAe,CAAC,CAAC,CAAA;QAClG,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC,CAAE,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAA;QAC7D,CAAC;QACD,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,CAAA;QACnE,CAAC;QAED,MAAM,MAAM,GAAG,OAAO;aACnB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,IAAI,QAAQ,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ;gBAAE,OAAO,SAAS,CAAA;YAC/E,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAChI,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;QACzB,CAAC,CAAC;aACD,MAAM,CAAC,CAAC,IAAI,EAAgD,EAAE,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,KAAK,IAAI,SAAS,CAAC;aAC7G,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAA;QAEpC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;YAAE,SAAQ;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAE,CAAA;QACtB,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,CAAA;QACtC,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,GAAG,QAAQ,CAAA;QAChC,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;YAClB,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,CAAA;QAClE,CAAC;QACD,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAA;IAChF,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,kBAAkB,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACpE,CAAC"}
|
package/dist/prompts/load.d.ts
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
export declare function
|
|
1
|
+
export declare function readPrompt(relativePath: string, fallback?: string): Promise<string>;
|
|
2
|
+
export type PromptBundle = Record<string, string> & {
|
|
2
3
|
lead: string;
|
|
3
4
|
judge: string;
|
|
4
|
-
}
|
|
5
|
+
};
|
|
6
|
+
/** Load named markdown prompts, falling back safely when package files are absent. */
|
|
7
|
+
export declare function loadPrompts(names?: string[]): Promise<PromptBundle>;
|
package/dist/prompts/load.js
CHANGED
|
@@ -6,20 +6,32 @@ Escalate to orch-judge only for critical risk or unresolved disagreement. For im
|
|
|
6
6
|
const FALLBACK_JUDGE = `You are orch-judge, a costly independent arbiter.
|
|
7
7
|
You receive conflicting worker findings. Inspect only the evidence needed to resolve the disagreement.
|
|
8
8
|
Do not delegate and do not edit. State which claims are supported, which are rejected, remaining uncertainty, and the safest recommendation.`;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
9
|
+
const FALLBACKS = { lead: FALLBACK_LEAD, judge: FALLBACK_JUDGE };
|
|
10
|
+
export async function readPrompt(relativePath, fallback = "") {
|
|
11
|
+
const urls = [
|
|
12
|
+
new URL(`../../prompts/${relativePath}`, import.meta.url),
|
|
13
|
+
// Tests run compiled sources from dist-test/, while published builds use dist/.
|
|
14
|
+
new URL(`../../../prompts/${relativePath}`, import.meta.url),
|
|
15
|
+
];
|
|
16
|
+
for (const url of urls) {
|
|
17
|
+
try {
|
|
18
|
+
return await readFile(url, "utf8");
|
|
19
|
+
}
|
|
20
|
+
catch {
|
|
21
|
+
// Try the next package/source layout before using the inline fallback.
|
|
22
|
+
}
|
|
16
23
|
}
|
|
24
|
+
return fallback;
|
|
17
25
|
}
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
26
|
+
/** Load named markdown prompts, falling back safely when package files are absent. */
|
|
27
|
+
export async function loadPrompts(names = Object.keys(FALLBACKS)) {
|
|
28
|
+
const entries = await Promise.all([...new Set(names)].map(async (name) => [
|
|
29
|
+
name,
|
|
30
|
+
await readPrompt(`${name}.md`, FALLBACKS[name] ?? "You are an internal specialist agent. Return concise, evidence-backed findings and do not edit or delegate."),
|
|
31
|
+
]));
|
|
32
|
+
const prompts = Object.fromEntries(entries);
|
|
33
|
+
prompts.lead ??= FALLBACK_LEAD;
|
|
34
|
+
prompts.judge ??= FALLBACK_JUDGE;
|
|
35
|
+
return prompts;
|
|
24
36
|
}
|
|
25
37
|
//# sourceMappingURL=load.js.map
|
package/dist/prompts/load.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/prompts/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,aAAa,GAAG;;;0WAGoV,CAAA;AAE1W,MAAM,cAAc,GAAG;;6IAEsH,CAAA;AAE7I,KAAK,UAAU,UAAU,CAAC,YAAoB,EAAE,
|
|
1
|
+
{"version":3,"file":"load.js","sourceRoot":"","sources":["../../src/prompts/load.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAE3C,MAAM,aAAa,GAAG;;;0WAGoV,CAAA;AAE1W,MAAM,cAAc,GAAG;;6IAEsH,CAAA;AAE7I,MAAM,SAAS,GAA2B,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,cAAc,EAAE,CAAA;AAExF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,YAAoB,EAAE,QAAQ,GAAG,EAAE;IAClE,MAAM,IAAI,GAAG;QACX,IAAI,GAAG,CAAC,iBAAiB,YAAY,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;QACzD,gFAAgF;QAChF,IAAI,GAAG,CAAC,oBAAoB,YAAY,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;KAC7D,CAAA;IACD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC;YACH,OAAO,MAAM,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACpC,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC;AAID,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,QAAkB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;IACxE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC;QACxE,IAAI;QACJ,MAAM,UAAU,CAAC,GAAG,IAAI,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,IAAI,6GAA6G,CAAC;KACxJ,CAAC,CAAC,CAAA;IACZ,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,CAAC,OAAO,CAAiB,CAAA;IAC3D,OAAO,CAAC,IAAI,KAAK,aAAa,CAAA;IAC9B,OAAO,CAAC,KAAK,KAAK,cAAc,CAAA;IAChC,OAAO,OAAO,CAAA;AAChB,CAAC"}
|
|
@@ -6,5 +6,7 @@ export interface Classification {
|
|
|
6
6
|
matchedSignals: string[];
|
|
7
7
|
securityRelevant: boolean;
|
|
8
8
|
critical: boolean;
|
|
9
|
+
/** True when no domain signal matched and architecture is only a safe default. */
|
|
10
|
+
fallback?: boolean;
|
|
9
11
|
}
|
|
10
12
|
export declare function classifyTask(task: string, enabledProfiles?: Partial<Record<ProfileName, boolean>>): Classification;
|
|
@@ -155,6 +155,7 @@ export function classifyTask(task, enabledProfiles) {
|
|
|
155
155
|
matchedSignals: winner?.matched ?? [],
|
|
156
156
|
securityRelevant: profile === "security" || ranked.some((item) => item.profile === "security" && item.score > 0),
|
|
157
157
|
critical: CRITICAL_SIGNALS.some((signal) => normalized.includes(signal)),
|
|
158
|
+
fallback: topScore === 0,
|
|
158
159
|
};
|
|
159
160
|
}
|
|
160
161
|
//# sourceMappingURL=classifier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"classifier.js","sourceRoot":"","sources":["../../src/routing/classifier.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"classifier.js","sourceRoot":"","sources":["../../src/routing/classifier.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,11 @@ export function decideEscalation(config, input) {
|
|
|
5
5
|
if ((input.premiumCallsUsed ?? 0) >= config.orchestration.maxPremiumCallsPerTask) {
|
|
6
6
|
return { escalate: false, reason: "premium call budget exhausted" };
|
|
7
7
|
}
|
|
8
|
-
|
|
8
|
+
// A signal-free architecture fallback is explicitly provisional, but is not
|
|
9
|
+
// itself evidence that a premium judge is needed. Real criticality or stored
|
|
10
|
+
// worker disagreement can still escalate it.
|
|
11
|
+
const uncertain = input.classification.fallback !== true
|
|
12
|
+
&& input.classification.confidence < config.orchestration.confidenceThreshold;
|
|
9
13
|
const disagreement = input.consensus !== undefined && input.consensus < config.orchestration.confidenceThreshold;
|
|
10
14
|
if (config.budget === "ebobo") {
|
|
11
15
|
return { escalate: true, reason: "ebobo mode always requests frontier arbitration" };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"escalation.js","sourceRoot":"","sources":["../../src/routing/escalation.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,gBAAgB,CAC9B,MAAuB,EACvB,KAAsB;IAEtB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAA;IACnE,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;QACjF,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAA;IACrE,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"escalation.js","sourceRoot":"","sources":["../../src/routing/escalation.ts"],"names":[],"mappings":"AAcA,MAAM,UAAU,gBAAgB,CAC9B,MAAuB,EACvB,KAAsB;IAEtB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC;QAC5C,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,6BAA6B,EAAE,CAAA;IACnE,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,gBAAgB,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,aAAa,CAAC,sBAAsB,EAAE,CAAC;QACjF,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,+BAA+B,EAAE,CAAA;IACrE,CAAC;IAED,4EAA4E;IAC5E,6EAA6E;IAC7E,6CAA6C;IAC7C,MAAM,SAAS,GAAG,KAAK,CAAC,cAAc,CAAC,QAAQ,KAAK,IAAI;WACnD,KAAK,CAAC,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAA;IAC/E,MAAM,YAAY,GAAG,KAAK,CAAC,SAAS,KAAK,SAAS,IAAI,KAAK,CAAC,SAAS,GAAG,MAAM,CAAC,aAAa,CAAC,mBAAmB,CAAA;IAEhH,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,iDAAiD,EAAE,CAAA;IACtF,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC,cAAc,CAAC,QAAQ,IAAI,YAAY;YAClD,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,8BAA8B,EAAE;YAC5D,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,mDAAmD,EAAE,CAAA;IACtF,CAAC;IAED,IAAI,KAAK,CAAC,cAAc,CAAC,QAAQ,IAAI,SAAS,IAAI,YAAY,EAAE,CAAC;QAC/D,OAAO;YACL,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,KAAK,CAAC,cAAc,CAAC,QAAQ;gBACnC,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,YAAY;oBACZ,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,+BAA+B;SACtC,CAAA;IACH,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,gDAAgD,EAAE,CAAA;AACtF,CAAC"}
|
|
@@ -32,6 +32,8 @@ export declare function isRetryable(kind: RetryableError["kind"]): boolean;
|
|
|
32
32
|
export declare function buildFallbackChain(pool: ModelCandidateInput[], capability: Parameters<typeof resolveModel>[0]["capability"], budget: BudgetMode, allowPaid: boolean, options?: {
|
|
33
33
|
preferredCosts?: ModelCost[];
|
|
34
34
|
preferredTiers?: Parameters<typeof resolveModel>[0]["preferredTiers"];
|
|
35
|
+
paidCallsUsed?: number;
|
|
36
|
+
maxPaidCalls?: number;
|
|
35
37
|
}): FallbackChain | undefined;
|
|
36
38
|
/**
|
|
37
39
|
* Given a chain and the id of a model that just failed, return the next
|
package/dist/routing/fallback.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { normalizeCandidate, resolveModel } from "./model-resolver.js";
|
|
2
2
|
const COST_RANK = { paid: 2, subscription: 1, free: 0 };
|
|
3
|
+
function compareCodepoints(a, b) {
|
|
4
|
+
return a < b ? -1 : a > b ? 1 : 0;
|
|
5
|
+
}
|
|
3
6
|
/**
|
|
4
7
|
* Classify an error into retryable categories. A retryable failure should
|
|
5
8
|
* trigger failover to a cheaper model in the chain.
|
|
@@ -45,6 +48,8 @@ export function buildFallbackChain(pool, capability, budget, allowPaid, options
|
|
|
45
48
|
allowPaid,
|
|
46
49
|
...(options.preferredCosts ? { preferredCosts: options.preferredCosts } : {}),
|
|
47
50
|
...(options.preferredTiers ? { preferredTiers: options.preferredTiers } : {}),
|
|
51
|
+
...(options.paidCallsUsed !== undefined ? { paidCallsUsed: options.paidCallsUsed } : {}),
|
|
52
|
+
...(options.maxPaidCalls !== undefined ? { maxPaidCalls: options.maxPaidCalls } : {}),
|
|
48
53
|
});
|
|
49
54
|
const primary = winner?.id ?? normalized[0]?.id;
|
|
50
55
|
if (!primary)
|
|
@@ -53,7 +58,7 @@ export function buildFallbackChain(pool, capability, budget, allowPaid, options
|
|
|
53
58
|
const primaryEntry = toEntry(byId.get(primary));
|
|
54
59
|
const alternatives = normalized
|
|
55
60
|
.filter((candidate) => candidate.id !== primary)
|
|
56
|
-
.sort((a, b) => COST_RANK[a.cost] - COST_RANK[b.cost] || a.id
|
|
61
|
+
.sort((a, b) => COST_RANK[a.cost] - COST_RANK[b.cost] || compareCodepoints(a.id, b.id))
|
|
57
62
|
.map((candidate) => toEntry(candidate));
|
|
58
63
|
return {
|
|
59
64
|
primary,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fallback.js","sourceRoot":"","sources":["../../src/routing/fallback.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAuB,MAAM,qBAAqB,CAAA;AAsB3F,MAAM,SAAS,GAA8B,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"fallback.js","sourceRoot":"","sources":["../../src/routing/fallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,9 @@ export interface ResolveModelRequest {
|
|
|
19
19
|
allowPaid: boolean;
|
|
20
20
|
preferredCosts?: ModelCost[];
|
|
21
21
|
preferredTiers?: ModelTier[];
|
|
22
|
+
/** Session-level cap: paid candidates are excluded once this is reached. */
|
|
23
|
+
paidCallsUsed?: number;
|
|
24
|
+
maxPaidCalls?: number;
|
|
22
25
|
}
|
|
23
26
|
export interface ResolvedModel {
|
|
24
27
|
id: string;
|