@calliopelabs/cli 3.8.0 → 3.8.1
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 +18 -0
- package/dist/acp.d.ts.map +1 -1
- package/dist/acp.js +2 -0
- package/dist/acp.js.map +1 -1
- package/dist/bin.d.ts.map +1 -1
- package/dist/bin.js +25 -3
- package/dist/bin.js.map +1 -1
- package/dist/build-metadata.json +1 -1
- package/dist/config.d.ts +6 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -0
- package/dist/config.js.map +1 -1
- package/dist/execution/authority.d.ts +18 -4
- package/dist/execution/authority.d.ts.map +1 -1
- package/dist/execution/authority.js +66 -12
- package/dist/execution/authority.js.map +1 -1
- package/dist/execution/child-grants.js +4 -1
- package/dist/execution/child-grants.js.map +1 -1
- package/dist/execution/guard.d.ts.map +1 -1
- package/dist/execution/guard.js +7 -3
- package/dist/execution/guard.js.map +1 -1
- package/dist/execution/ledger-protocol.d.ts +1 -1
- package/dist/execution/ledger-protocol.d.ts.map +1 -1
- package/dist/execution/ledger-protocol.js +1 -1
- package/dist/execution/ledger-protocol.js.map +1 -1
- package/dist/execution/ledger-server.d.ts +5 -1
- package/dist/execution/ledger-server.d.ts.map +1 -1
- package/dist/execution/ledger-server.js +29 -3
- package/dist/execution/ledger-server.js.map +1 -1
- package/dist/execution/ledger.d.ts +2 -0
- package/dist/execution/ledger.d.ts.map +1 -1
- package/dist/execution/ledger.js +46 -12
- package/dist/execution/ledger.js.map +1 -1
- package/dist/execution/parent-budget.d.ts +25 -3
- package/dist/execution/parent-budget.d.ts.map +1 -1
- package/dist/execution/parent-budget.js +126 -4
- package/dist/execution/parent-budget.js.map +1 -1
- package/dist/execution/parent-uncertainty.d.ts +3 -0
- package/dist/execution/parent-uncertainty.d.ts.map +1 -0
- package/dist/execution/parent-uncertainty.js +6 -0
- package/dist/execution/parent-uncertainty.js.map +1 -0
- package/dist/execution/portable-identity.d.ts +15 -0
- package/dist/execution/portable-identity.d.ts.map +1 -0
- package/dist/execution/portable-identity.js +80 -0
- package/dist/execution/portable-identity.js.map +1 -0
- package/dist/execution/remote-checkpoint.d.ts.map +1 -1
- package/dist/execution/remote-checkpoint.js +23 -16
- package/dist/execution/remote-checkpoint.js.map +1 -1
- package/dist/execution/remote-ledger.d.ts +13 -0
- package/dist/execution/remote-ledger.d.ts.map +1 -1
- package/dist/execution/remote-ledger.js +71 -9
- package/dist/execution/remote-ledger.js.map +1 -1
- package/dist/execution/types.d.ts +30 -2
- package/dist/execution/types.d.ts.map +1 -1
- package/dist/execution/types.js.map +1 -1
- package/dist/headless.d.ts +27 -1
- package/dist/headless.d.ts.map +1 -1
- package/dist/headless.js +107 -7
- package/dist/headless.js.map +1 -1
- package/dist/health/target.d.ts +11 -0
- package/dist/health/target.d.ts.map +1 -1
- package/dist/health/target.js +41 -21
- package/dist/health/target.js.map +1 -1
- package/dist/orchestration/coordinator-types.d.ts +12 -2
- package/dist/orchestration/coordinator-types.d.ts.map +1 -1
- package/dist/orchestration/coordinator.d.ts.map +1 -1
- package/dist/orchestration/coordinator.js +18 -3
- package/dist/orchestration/coordinator.js.map +1 -1
- package/dist/orchestration/execution-journal.d.ts.map +1 -1
- package/dist/orchestration/execution-journal.js +44 -6
- package/dist/orchestration/execution-journal.js.map +1 -1
- package/dist/orchestration/execution-store.js +1 -1
- package/dist/orchestration/execution-store.js.map +1 -1
- package/dist/orchestration/index.d.ts +1 -0
- package/dist/orchestration/index.d.ts.map +1 -1
- package/dist/orchestration/index.js +1 -0
- package/dist/orchestration/index.js.map +1 -1
- package/dist/orchestration/remote-task-capacity.d.ts +31 -0
- package/dist/orchestration/remote-task-capacity.d.ts.map +1 -0
- package/dist/orchestration/remote-task-capacity.js +83 -0
- package/dist/orchestration/remote-task-capacity.js.map +1 -0
- package/dist/orchestration/reviewed-ledger.d.ts +16 -0
- package/dist/orchestration/reviewed-ledger.d.ts.map +1 -1
- package/dist/orchestration/reviewed-ledger.js +16 -2
- package/dist/orchestration/reviewed-ledger.js.map +1 -1
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +17 -1
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/bedrock.d.ts.map +1 -1
- package/dist/providers/bedrock.js +16 -1
- package/dist/providers/bedrock.js.map +1 -1
- package/dist/providers/compat.d.ts.map +1 -1
- package/dist/providers/compat.js +33 -16
- package/dist/providers/compat.js.map +1 -1
- package/dist/providers/openai.d.ts +1 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +24 -11
- package/dist/providers/openai.js.map +1 -1
- package/dist/routing/select.d.ts.map +1 -1
- package/dist/routing/select.js +20 -1
- package/dist/routing/select.js.map +1 -1
- package/dist/runlog.d.ts +2 -0
- package/dist/runlog.d.ts.map +1 -1
- package/dist/runlog.js.map +1 -1
- package/dist/runtime/turn.d.ts +12 -1
- package/dist/runtime/turn.d.ts.map +1 -1
- package/dist/runtime/turn.js +30 -7
- package/dist/runtime/turn.js.map +1 -1
- package/dist/supervision/runtime.d.ts.map +1 -1
- package/dist/supervision/runtime.js +10 -3
- package/dist/supervision/runtime.js.map +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/ui/agent.d.ts.map +1 -1
- package/dist/ui/agent.js +4 -0
- package/dist/ui/agent.js.map +1 -1
- package/docs/delegation-ledger.md +126 -2
- package/docs/releases/3.8.1.md +40 -0
- package/package.json +5 -2
package/dist/headless.js
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
* Designed for piping, CI, scripting, and multi-agent fleet coordination.
|
|
7
7
|
*/
|
|
8
8
|
import { runTurn } from './runtime/index.js';
|
|
9
|
+
import { MAX_CONSECUTIVE_CONTINUATIONS } from './runtime/turn.js';
|
|
9
10
|
import { connectDelegatedExecution, executionBinding } from './execution/delegated.js';
|
|
10
11
|
import { ExecutionGuard } from './execution/guard.js';
|
|
11
12
|
import { createSession, saveSessionConversation } from './storage.js';
|
|
@@ -20,6 +21,11 @@ import { resolveIterationLimit } from './iteration-limit.js';
|
|
|
20
21
|
import { RunLog } from './runlog.js';
|
|
21
22
|
import { formatBudgetHalt } from './budget.js';
|
|
22
23
|
import { resolvePreferences } from './preferences/index.js';
|
|
24
|
+
import { isReasoningEffort, REASONING_EFFORTS } from './models/index.js';
|
|
25
|
+
/** Exit code when a hard cap stops the run; shared with configured budget caps. */
|
|
26
|
+
export const BUDGET_EXIT_CODE = 3;
|
|
27
|
+
/** A --max-cost or --max-time cap stopped the run (5 is planning-review). */
|
|
28
|
+
export const CAP_EXIT_CODE = 6;
|
|
23
29
|
// ============================================================================
|
|
24
30
|
// Output
|
|
25
31
|
// ============================================================================
|
|
@@ -45,6 +51,9 @@ function emit(event, mode) {
|
|
|
45
51
|
case 'status':
|
|
46
52
|
process.stderr.write(`STATUS: ${event.data.message}\n`);
|
|
47
53
|
break;
|
|
54
|
+
case 'budget_exceeded':
|
|
55
|
+
process.stderr.write(`BUDGET: ${event.data.message}\n`);
|
|
56
|
+
break;
|
|
48
57
|
case 'done':
|
|
49
58
|
// Silence
|
|
50
59
|
break;
|
|
@@ -54,12 +63,78 @@ function emit(event, mode) {
|
|
|
54
63
|
function now() {
|
|
55
64
|
return new Date().toISOString();
|
|
56
65
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
66
|
+
/**
|
|
67
|
+
* Parse `--max-cost <usd>` / `--max-time <seconds>`, falling back to
|
|
68
|
+
* CALLIOPE_MAX_COST / CALLIOPE_MAX_TIME. A flag wins over its env var; an empty
|
|
69
|
+
* env var is unset. Invalid values throw: silently dropping a cap would let a
|
|
70
|
+
* run overspend while the caller believes it is bounded.
|
|
71
|
+
*/
|
|
72
|
+
export function parseHeadlessCaps(args, env = process.env) {
|
|
73
|
+
const read = (flag, variable) => {
|
|
74
|
+
const index = args.indexOf(flag);
|
|
75
|
+
const source = index === -1 ? variable : flag;
|
|
76
|
+
const raw = index === -1 ? env[variable]?.trim() || undefined : args[index + 1];
|
|
77
|
+
if (index === -1 && raw === undefined)
|
|
78
|
+
return undefined;
|
|
79
|
+
const value = raw === undefined || raw.startsWith('--') ? NaN : Number(raw);
|
|
80
|
+
if (!Number.isFinite(value) || value <= 0)
|
|
81
|
+
throw new Error(`${source} must be a positive number (got ${raw === undefined ? 'no value' : JSON.stringify(raw)})`);
|
|
82
|
+
return value;
|
|
83
|
+
};
|
|
84
|
+
const maxCost = read('--max-cost', 'CALLIOPE_MAX_COST');
|
|
85
|
+
const maxTime = read('--max-time', 'CALLIOPE_MAX_TIME');
|
|
86
|
+
return { ...(maxCost !== undefined ? { maxCost } : {}), ...(maxTime !== undefined ? { maxTime } : {}) };
|
|
87
|
+
}
|
|
88
|
+
/** A requested effort is never silently dropped; the flag wins over its environment default. */
|
|
89
|
+
export function parseHeadlessEffort(args, env = process.env) {
|
|
90
|
+
const flag = '--reasoning-effort';
|
|
91
|
+
const found = args.map((value, index) => ({ value, index })).filter(({ value }) => value === flag || value.startsWith(flag + '='));
|
|
92
|
+
if (found.length > 1)
|
|
93
|
+
throw new Error(`${flag} may be specified only once`);
|
|
94
|
+
const item = found[0];
|
|
95
|
+
const raw = item ? (item.value === flag ? args[item.index + 1] : item.value.slice(flag.length + 1))?.trim() : env.CALLIOPE_REASONING_EFFORT?.trim();
|
|
96
|
+
if (!item && !raw)
|
|
97
|
+
return undefined;
|
|
98
|
+
if (!isReasoningEffort(raw))
|
|
99
|
+
throw new Error(`${item ? flag : 'CALLIOPE_REASONING_EFFORT'} must be one of ${REASONING_EFFORTS.join(', ')}`);
|
|
100
|
+
return raw;
|
|
101
|
+
}
|
|
60
102
|
export async function runHeadless(options) {
|
|
61
|
-
const
|
|
103
|
+
const clock = { started: Date.now(), timedOut: false };
|
|
104
|
+
if (options.maxTime === undefined)
|
|
105
|
+
return run(options, options.signal, clock);
|
|
106
|
+
// The time cap aborts like cancellation; `clock.timedOut` tells the two apart.
|
|
107
|
+
const deadline = new AbortController();
|
|
108
|
+
const timer = setTimeout(() => { clock.timedOut = true; deadline.abort(); }, Math.min(options.maxTime * 1000, 2 ** 31 - 1));
|
|
109
|
+
try {
|
|
110
|
+
return await run(options, options.signal ? AbortSignal.any([options.signal, deadline.signal]) : deadline.signal, clock);
|
|
111
|
+
}
|
|
112
|
+
finally {
|
|
113
|
+
clearTimeout(timer);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
async function run(options, signal, clock) {
|
|
62
117
|
const outputMode = options.outputMode || 'json';
|
|
118
|
+
if (options.reasoningEffort !== undefined && !isReasoningEffort(options.reasoningEffort)) {
|
|
119
|
+
emit({ type: 'error', timestamp: now(), data: { message: 'Invalid headless reasoning effort' } }, outputMode);
|
|
120
|
+
return 2;
|
|
121
|
+
}
|
|
122
|
+
const summary = (totals, stoppedBy) => ({
|
|
123
|
+
costUsd: totals?.cost ?? 0, inputTokens: totals?.inputTokens ?? 0, outputTokens: totals?.outputTokens ?? 0,
|
|
124
|
+
elapsedMs: Date.now() - clock.started, stoppedBy, limits: { maxCost: options.maxCost, maxTime: options.maxTime },
|
|
125
|
+
});
|
|
126
|
+
const timeCapHit = () => clock.timedOut && !options.signal?.aborted;
|
|
127
|
+
const capExceeded = (kind, totals, message) => {
|
|
128
|
+
const elapsedMs = Date.now() - clock.started;
|
|
129
|
+
emit({ type: 'budget_exceeded', kind, timestamp: now(), data: {
|
|
130
|
+
cap: kind === 'cost' ? options.maxCost : options.maxTime,
|
|
131
|
+
spent: kind === 'cost' ? totals?.cost ?? 0 : elapsedMs / 1000,
|
|
132
|
+
costUsd: totals?.cost ?? 0, elapsedMs, message
|
|
133
|
+
} }, outputMode);
|
|
134
|
+
if (outputMode === 'json')
|
|
135
|
+
process.stderr.write(message + '\n');
|
|
136
|
+
};
|
|
137
|
+
const timeMessage = () => `Time cap reached: ${((Date.now() - clock.started) / 1000).toFixed(1)}s of ${options.maxTime}s. Halting.`;
|
|
63
138
|
const maxIterations = resolveIterationLimit(options.maxIterations ?? config.get('maxIterations'));
|
|
64
139
|
const maxRetries = options.maxRetries ?? 3;
|
|
65
140
|
const cwd = options.cwd || process.cwd();
|
|
@@ -102,6 +177,11 @@ export async function runHeadless(options) {
|
|
|
102
177
|
}
|
|
103
178
|
}
|
|
104
179
|
catch (error) {
|
|
180
|
+
if (timeCapHit()) {
|
|
181
|
+
capExceeded('time', undefined, timeMessage());
|
|
182
|
+
emit({ type: 'done', timestamp: now(), data: { reason: 'budget', ...summary(undefined, 'time') } }, outputMode);
|
|
183
|
+
return CAP_EXIT_CODE;
|
|
184
|
+
}
|
|
105
185
|
if (signal?.aborted || isCancellation(error)) {
|
|
106
186
|
emit({ type: 'done', timestamp: now(), data: { reason: 'cancelled' } }, outputMode);
|
|
107
187
|
return 130;
|
|
@@ -195,9 +275,17 @@ export async function runHeadless(options) {
|
|
|
195
275
|
revision = saved.revision;
|
|
196
276
|
runlog.sessionCheckpoint({ revision: saved.revision, status, messageCount: saved.messages.length, checksum: saved.checksum });
|
|
197
277
|
},
|
|
278
|
+
continueOnLength: true,
|
|
279
|
+
onContinue: ({ reason, attempt, max }) => {
|
|
280
|
+
const message = `[continue ${attempt}/${max}] ${reason === 'length' ? 'output length limit reached' : 'empty model reply'}; asking the model to continue`;
|
|
281
|
+
emit({ type: 'status', timestamp: now(), data: { message, continuing: true, reason, attempt, max } }, outputMode);
|
|
282
|
+
process.stderr.write(message + '\n');
|
|
283
|
+
},
|
|
198
284
|
sessionId, cwd, provider, model, prompt, execution,
|
|
285
|
+
...(options.reasoningEffort !== undefined ? { reasoningEffort: options.reasoningEffort } : {}),
|
|
199
286
|
preferenceSources: preference.sources,
|
|
200
287
|
messages: { current: messages }, signal, maxIterations, maxRetries,
|
|
288
|
+
...(options.maxCost !== undefined ? { maxCostPerRun: options.maxCost } : {}),
|
|
201
289
|
runlog, confirmation: 'none', tools: getTools,
|
|
202
290
|
onResponse: response => {
|
|
203
291
|
if (!response.toolCalls?.length)
|
|
@@ -209,13 +297,25 @@ export async function runHeadless(options) {
|
|
|
209
297
|
onWarning: message => emit({ type: 'status', timestamp: now(), data: { message } }, outputMode),
|
|
210
298
|
onRoute: decision => emit({ type: 'status', timestamp: now(), data: { message: decision.reason, routing: decision, provider: decision.selected?.provider, model: decision.selected?.model } }, outputMode),
|
|
211
299
|
});
|
|
212
|
-
|
|
300
|
+
// A configured budget cap tighter than --max-cost keeps its own (status) reporting.
|
|
301
|
+
const stoppedBy = result.reason === 'cancelled' && timeCapHit() ? 'time'
|
|
302
|
+
: result.reason === 'budget' && result.budget?.scope === 'run' && result.budget.kind === 'cost' && options.maxCost !== undefined && result.budget.cap === options.maxCost ? 'cost' : null;
|
|
303
|
+
if (stoppedBy)
|
|
304
|
+
capExceeded(stoppedBy, result.totals, stoppedBy === 'time' ? timeMessage() : formatBudgetHalt(result.budget));
|
|
305
|
+
else if (result.budget?.exceeded) {
|
|
213
306
|
const message = formatBudgetHalt(result.budget);
|
|
214
307
|
emit({ type: 'status', timestamp: now(), data: { message } }, outputMode);
|
|
215
308
|
process.stderr.write(message + '\n');
|
|
216
309
|
}
|
|
217
|
-
|
|
218
|
-
|
|
310
|
+
if (!stoppedBy && (result.reason === 'length' || result.reason === 'empty_response')) {
|
|
311
|
+
const message = `Run gave up: ${result.reason === 'length' ? 'output length limit reached' : 'empty model replies'} (${result.reason}) after ${MAX_CONSECUTIVE_CONTINUATIONS} consecutive continuations.`;
|
|
312
|
+
emit({ type: 'error', timestamp: now(), data: { message, reason: result.reason } }, outputMode);
|
|
313
|
+
process.stderr.write(message + '\n');
|
|
314
|
+
}
|
|
315
|
+
emit({ type: 'done', timestamp: now(), data: { iterations: result.iterations, reason: stoppedBy ? 'budget' : result.reason, ...summary(result.totals, stoppedBy) } }, outputMode);
|
|
316
|
+
if (stoppedBy)
|
|
317
|
+
return CAP_EXIT_CODE;
|
|
318
|
+
return result.reason === 'cancelled' ? 130 : result.reason === 'budget' ? BUDGET_EXIT_CODE : result.reason === 'completed' ? 0 : 4;
|
|
219
319
|
}
|
|
220
320
|
catch (error) {
|
|
221
321
|
emit({ type: 'error', timestamp: now(), data: { message: error instanceof Error ? error.message : String(error) } }, outputMode);
|
package/dist/headless.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"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"}
|
package/dist/health/target.d.ts
CHANGED
|
@@ -1,3 +1,14 @@
|
|
|
1
1
|
import type { HealthProvider, HealthTarget } from './types.js';
|
|
2
|
+
/**
|
|
3
|
+
* Exact endpoint identity (origin + pathname) used to match declared private targets.
|
|
4
|
+
* Null for invalid URLs, non-http(s) schemes, and URLs carrying a query string or
|
|
5
|
+
* userinfo, so those never match a declaration.
|
|
6
|
+
*/
|
|
7
|
+
export declare function endpointIdentity(endpoint: string): string | null;
|
|
8
|
+
/**
|
|
9
|
+
* Whether the provider's live endpoint was declared private by the user in
|
|
10
|
+
* `routing.privateTargets`. Read from config only; nothing is inferred from the host.
|
|
11
|
+
*/
|
|
12
|
+
export declare function isDeclaredPrivate(provider: HealthProvider): boolean;
|
|
2
13
|
export declare function providerTarget(provider: HealthProvider): HealthTarget;
|
|
3
14
|
//# sourceMappingURL=target.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.d.ts","sourceRoot":"","sources":["../../src/health/target.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"target.d.ts","sourceRoot":"","sources":["../../src/health/target.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAW/D;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAMhE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAKnE;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,cAAc,GAAG,YAAY,CAwBrE"}
|
package/dist/health/target.js
CHANGED
|
@@ -3,6 +3,45 @@ import * as config from '../config.js';
|
|
|
3
3
|
import { PROVIDER_BASE_URLS } from '../providers/compat.js';
|
|
4
4
|
import { hasAWSCredentials } from '../providers/bedrock.js';
|
|
5
5
|
import { healthDigest } from './store.js';
|
|
6
|
+
function configuredEndpoint(provider) {
|
|
7
|
+
const credential = config.getProviderCred(provider);
|
|
8
|
+
if (provider === 'anthropic')
|
|
9
|
+
return { endpoint: credential.baseUrl || 'https://api.anthropic.com/v1', protocol: 'anthropic-messages' };
|
|
10
|
+
if (provider === 'google')
|
|
11
|
+
return { endpoint: credential.baseUrl || 'https://generativelanguage.googleapis.com/v1beta', protocol: 'google-genai' };
|
|
12
|
+
if (provider === 'openai')
|
|
13
|
+
return { endpoint: credential.baseUrl || 'https://api.openai.com/v1', protocol: 'openai-chat-and-responses' };
|
|
14
|
+
if (provider === 'bedrock' && !credential.baseUrl)
|
|
15
|
+
return { endpoint: `https://bedrock-runtime.${credential.region || 'us-east-1'}.amazonaws.com`, protocol: 'bedrock-converse' };
|
|
16
|
+
return { endpoint: config.getBaseUrl(provider) || PROVIDER_BASE_URLS[provider] || '', protocol: provider === 'ollama' ? 'ollama' : 'openai-chat' };
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Exact endpoint identity (origin + pathname) used to match declared private targets.
|
|
20
|
+
* Null for invalid URLs, non-http(s) schemes, and URLs carrying a query string or
|
|
21
|
+
* userinfo, so those never match a declaration.
|
|
22
|
+
*/
|
|
23
|
+
export function endpointIdentity(endpoint) {
|
|
24
|
+
try {
|
|
25
|
+
const url = new URL(endpoint);
|
|
26
|
+
if (!['http:', 'https:'].includes(url.protocol) || url.search || url.username || url.password)
|
|
27
|
+
return null;
|
|
28
|
+
return url.origin + url.pathname;
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
/**
|
|
35
|
+
* Whether the provider's live endpoint was declared private by the user in
|
|
36
|
+
* `routing.privateTargets`. Read from config only; nothing is inferred from the host.
|
|
37
|
+
*/
|
|
38
|
+
export function isDeclaredPrivate(provider) {
|
|
39
|
+
const live = endpointIdentity(chatGPTSelected() && provider === 'openai' ? 'https://api.openai.com/v1' : configuredEndpoint(provider).endpoint);
|
|
40
|
+
if (live === null)
|
|
41
|
+
return false;
|
|
42
|
+
const declared = config.get('routing')?.privateTargets;
|
|
43
|
+
return Array.isArray(declared) && declared.some(entry => entry?.provider === provider && typeof entry.endpoint === 'string' && endpointIdentity(entry.endpoint) === live);
|
|
44
|
+
}
|
|
6
45
|
export function providerTarget(provider) {
|
|
7
46
|
if (!config.getProviderNames().includes(provider))
|
|
8
47
|
throw new Error('Unknown or retired provider');
|
|
@@ -11,27 +50,8 @@ export function providerTarget(provider) {
|
|
|
11
50
|
const account = chatGPTAccountKey();
|
|
12
51
|
return { provider, endpoint: 'https://api.openai.com/v1', protocol: 'chatgpt-responses', credentials: account === 'signed-out' ? 'missing' : 'configured', key: healthDigest({ provider, protocol: 'chatgpt-responses', account }) };
|
|
13
52
|
}
|
|
14
|
-
let
|
|
15
|
-
|
|
16
|
-
endpoint = credential.baseUrl || 'https://api.anthropic.com/v1';
|
|
17
|
-
protocol = 'anthropic-messages';
|
|
18
|
-
}
|
|
19
|
-
else if (provider === 'google') {
|
|
20
|
-
endpoint = credential.baseUrl || 'https://generativelanguage.googleapis.com/v1beta';
|
|
21
|
-
protocol = 'google-genai';
|
|
22
|
-
}
|
|
23
|
-
else if (provider === 'openai') {
|
|
24
|
-
endpoint = credential.baseUrl || 'https://api.openai.com/v1';
|
|
25
|
-
protocol = 'openai-chat-and-responses';
|
|
26
|
-
}
|
|
27
|
-
else if (provider === 'bedrock' && !credential.baseUrl) {
|
|
28
|
-
endpoint = `https://bedrock-runtime.${credential.region || 'us-east-1'}.amazonaws.com`;
|
|
29
|
-
protocol = 'bedrock-converse';
|
|
30
|
-
}
|
|
31
|
-
else {
|
|
32
|
-
endpoint = config.getBaseUrl(provider) || PROVIDER_BASE_URLS[provider] || '';
|
|
33
|
-
protocol = provider === 'ollama' ? 'ollama' : 'openai-chat';
|
|
34
|
-
}
|
|
53
|
+
let credentials;
|
|
54
|
+
const { endpoint, protocol } = configuredEndpoint(provider);
|
|
35
55
|
if (provider === 'bedrock' && !credential.baseUrl)
|
|
36
56
|
credentials = hasAWSCredentials() || !!credential.profile ? 'configured' : 'missing';
|
|
37
57
|
else if (['ollama', 'openai-compat', 'bedrock'].includes(provider))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/health/target.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC7E,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAG1C,
|
|
1
|
+
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/health/target.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,6 +40,12 @@ export interface TaskOutput {
|
|
|
40
40
|
checks: CheckEvidence[];
|
|
41
41
|
}
|
|
42
42
|
export type ExecutionChange = {
|
|
43
|
+
type: 'remote_task_admitted';
|
|
44
|
+
admission: import('./remote-task-capacity.js').RemoteTaskAdmission;
|
|
45
|
+
} | {
|
|
46
|
+
type: 'remote_task_released';
|
|
47
|
+
admissionId: string;
|
|
48
|
+
} | {
|
|
43
49
|
type: 'task_feedback_recorded';
|
|
44
50
|
feedback: import('../improvement/task-feedback-contract.js').TaskFeedbackRecord;
|
|
45
51
|
} | {
|
|
@@ -144,7 +150,7 @@ export type ExecutionChange = {
|
|
|
144
150
|
status: Exclude<ExecutionStatus, 'ready' | 'running'>;
|
|
145
151
|
};
|
|
146
152
|
export interface ExecutionEvent {
|
|
147
|
-
version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
|
|
153
|
+
version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13;
|
|
148
154
|
id: string;
|
|
149
155
|
runId: string;
|
|
150
156
|
sequence: number;
|
|
@@ -167,7 +173,11 @@ export interface TaskState {
|
|
|
167
173
|
route?: import('./routing.js').RecordedAgentRoute;
|
|
168
174
|
}
|
|
169
175
|
export interface ExecutionProjection {
|
|
170
|
-
version: 1 | 2 | 3 | 4 | 5 | 6 | 7;
|
|
176
|
+
version: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8;
|
|
177
|
+
remoteTasks?: Record<string, {
|
|
178
|
+
admission: import('./remote-task-capacity.js').RemoteTaskAdmission;
|
|
179
|
+
status: 'active' | 'released';
|
|
180
|
+
}>;
|
|
171
181
|
runId: string;
|
|
172
182
|
revision: string;
|
|
173
183
|
status: ExecutionStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator-types.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator-types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"coordinator-types.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"coordinator.d.ts","sourceRoot":"","sources":["../../src/orchestration/coordinator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,KAAK,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAiBrE,OAAO,KAAK,EAAC,aAAa,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACxE,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,qBAAqB,CAAC;AAQ5D,OAAO,EAAqC,KAAK,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAC3F,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAE9C,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,mBAAmB,EAAgB,eAAe,EAAuB,MAAM,wBAAwB,CAAC;AAKpI,OAAO,EAAsC,KAAK,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAE1F,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D,yFAAyF;IACzF,YAAY,CAAC,EAAC,YAAY,CAAC;IAC3B,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,+FAA+F;IAC/F,YAAY,CAAC,EAAC,OAAO,CAAC;IAAA,kBAAkB,CAAC,EAAC,MAAM,CAAC;IAAA,oBAAoB,CAAC,EAAC,MAAM,CAAC;IAC9E,qEAAqE;IACrE,yBAAyB,CAAC,EAAC,MAAM,CAAC;IAClC,MAAM,CAAC,EAAC,OAAO,CAAC;IAAA,eAAe,CAAC,EAAC,MAAM,CAAC;IAAA,SAAS,CAAC,EAAC,aAAa,CAAC;IACjE,OAAO,CAAC,EAAC,CAAC,QAAQ,EAAC,kBAAkB,EAAC,MAAM,CAAC,EAAC,WAAW,KAAG,OAAO,CAAC,cAAc,CAAC,CAAC;IACpF,OAAO,CAAC,EAAC,CAAC,KAAK,EAAC,cAAc,KAAG,IAAI,CAAC;IACtC,UAAU,CAAC,EAAC,CAAC,QAAQ,EAAC,mBAAmB,KAAG,IAAI,CAAC;CAClD;AACD,MAAM,WAAW,iBAAiB;IAAE,OAAO,EAAC,CAAC,CAAC;IAAA,IAAI,EAAC,yBAAyB,CAAC;IAAA,KAAK,EAAC,MAAM,CAAC;IAAA,MAAM,EAAC,eAAe,CAAC;IAAA,SAAS,EAAC,mBAAmB,CAAC;IAAA,QAAQ,EAAC,MAAM,CAAC;IAAA,UAAU,EAAC,aAAa,CAAA;CAAC;AAgCxL,2EAA2E;AAC3E,wBAAsB,kBAAkB,CAAC,GAAG,EAAC,MAAM,EAAC,KAAK,EAAC,MAAM,EAAC,OAAO,GAAC,kBAAqB,GAAE,OAAO,CAAC,iBAAiB,CAAC,CA8NzH"}
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { acquireParentTask } from '../execution/parent-budget.js';
|
|
2
|
+
import { activeRemoteTasks } from './remote-task-capacity.js';
|
|
1
3
|
import { readRunAccounting } from './accounting.js';
|
|
2
4
|
import { taskSmartSelection, recordAgentRoute } from './routing.js';
|
|
3
5
|
import { join, relative, resolve, isAbsolute } from 'node:path';
|
|
@@ -139,7 +141,7 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
139
141
|
const context = store.context(), agent = context.plan.agents.find(a => a.id === task.agentId), agentDeadline = budget.createdAt + agent.timeBudgetMs;
|
|
140
142
|
let timedOut = false;
|
|
141
143
|
const taskTimer = setTimeout(() => { timedOut = true; child.abort(); }, Math.max(0, agentDeadline - Date.now()));
|
|
142
|
-
let began = false, agentBegan = false, taskLog;
|
|
144
|
+
let began = false, agentBegan = false, taskLog, parentTask;
|
|
143
145
|
const finish = async (status, output, verify = false) => {
|
|
144
146
|
const persistedStatus = status === 'completed' ? 'success' : status === 'review_required' ? 'partial' : status === 'unknown' ? 'failed' : status;
|
|
145
147
|
const persistedOutput = { ...output, status: persistedStatus };
|
|
@@ -163,6 +165,8 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
163
165
|
const attempt = state.tasks[task.id].attempts + 1;
|
|
164
166
|
const start = await store.append({ type: 'task_started', taskId: task.id, attempt, sessionId: session.id, requestAttribution: 1 }, child.signal);
|
|
165
167
|
began = true;
|
|
168
|
+
const taskAttribution = { version: 1, kind: 'task', eventId: start.id, eventHash: start.hash, sessionId: session.id, taskId: task.id, attempt };
|
|
169
|
+
parentTask = await acquireParentTask(rootAuthority.ledger.read(cwd).manifest, cwd, agent.id, taskAttribution, child.signal);
|
|
166
170
|
await store.append({ type: 'agent_started', agentId: agent.id, taskId: task.id }, child.signal);
|
|
167
171
|
agentBegan = true;
|
|
168
172
|
const workspace = await taskWorktree(store, task, { ...childOptions(child.signal), runlog: log });
|
|
@@ -302,6 +306,13 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
302
306
|
controller.signal.removeEventListener('abort', parentAbort);
|
|
303
307
|
children.delete(task.id);
|
|
304
308
|
await taskLog?.flush();
|
|
309
|
+
if (parentTask)
|
|
310
|
+
try {
|
|
311
|
+
await parentTask.release();
|
|
312
|
+
}
|
|
313
|
+
catch {
|
|
314
|
+
throw new OrchestrationError('unavailable', 'Remote task release was not acknowledged; its parent slot remains reserved.');
|
|
315
|
+
}
|
|
305
316
|
}
|
|
306
317
|
};
|
|
307
318
|
try {
|
|
@@ -336,7 +347,7 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
336
347
|
}
|
|
337
348
|
}
|
|
338
349
|
if (!controller.signal.aborted && state.supervision && needsSupervision(store) && !(options.proposalOnly && state.supervision.phase === 'decision' && (state.supervision.review?.announced || !state.supervision.decision || !('hypothesis' in state.supervision.decision)))) {
|
|
339
|
-
if (active.size) {
|
|
350
|
+
if (active.size || activeRemoteTasks(state).length) {
|
|
340
351
|
await Promise.race([...active.values(), cancellableDelay(100)]);
|
|
341
352
|
continue;
|
|
342
353
|
}
|
|
@@ -376,7 +387,7 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
376
387
|
// is being committed.
|
|
377
388
|
const supervisionPausesWork = state.supervision?.phase === 'halted' || state.supervision?.phase === 'decision' || state.supervision?.phase === 'draft-ready';
|
|
378
389
|
for (const task of supervisionPausesWork || options.proposalOnly ? [] : context.plan.tasks) {
|
|
379
|
-
if (controller.signal.aborted || active.size >= context.plan.limits.maxConcurrent)
|
|
390
|
+
if (controller.signal.aborted || active.size + activeRemoteTasks(state).length >= context.plan.limits.maxConcurrent)
|
|
380
391
|
break;
|
|
381
392
|
if (state.tasks[task.id].status !== 'pending' || active.has(task.id) || agentStopped(state, context, task.agentId) || task.dependencies.some(d => !['completed', 'review_required'].includes(state.tasks[d].status)) || [...active.keys()].some(id => analysis.conflicts.some(c => c.tasks.includes(id) && c.tasks.includes(task.id))))
|
|
382
393
|
continue;
|
|
@@ -389,6 +400,10 @@ export async function executeReviewedRun(cwd, runId, options = {}) {
|
|
|
389
400
|
await Promise.race(controller.signal.aborted ? [...active.values()] : [...active.values(), cancellableDelay(100)]);
|
|
390
401
|
continue;
|
|
391
402
|
}
|
|
403
|
+
if (!controller.signal.aborted && activeRemoteTasks(store.read().state).length) {
|
|
404
|
+
await cancellableDelay(100, controller.signal);
|
|
405
|
+
continue;
|
|
406
|
+
}
|
|
392
407
|
const candidate = store.read();
|
|
393
408
|
if ((candidate.state.graph?.hash ?? view.manifest.planHash) !== graphHash)
|
|
394
409
|
continue;
|