@curie-agent/core 0.4.2 → 0.4.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/.tsbuildinfo +1 -1
- package/dist/src/compaction.d.ts +76 -0
- package/dist/src/compaction.d.ts.map +1 -0
- package/dist/src/compaction.js +229 -0
- package/dist/src/compaction.js.map +1 -0
- package/dist/src/context-budget.d.ts +72 -0
- package/dist/src/context-budget.d.ts.map +1 -0
- package/dist/src/context-budget.js +132 -0
- package/dist/src/context-budget.js.map +1 -0
- package/dist/src/event-bus.d.ts +20 -0
- package/dist/src/event-bus.d.ts.map +1 -1
- package/dist/src/event-bus.js.map +1 -1
- package/dist/src/index.d.ts +6 -3
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +4 -2
- package/dist/src/index.js.map +1 -1
- package/dist/src/settings.d.ts +13 -0
- package/dist/src/settings.d.ts.map +1 -1
- package/dist/src/settings.js +37 -12
- package/dist/src/settings.js.map +1 -1
- package/dist/src/subagent-executor.d.ts +8 -0
- package/dist/src/subagent-executor.d.ts.map +1 -1
- package/dist/src/subagent-executor.js +20 -6
- package/dist/src/subagent-executor.js.map +1 -1
- package/dist/src/turn-loop.d.ts +22 -2
- package/dist/src/turn-loop.d.ts.map +1 -1
- package/dist/src/turn-loop.js +222 -95
- package/dist/src/turn-loop.js.map +1 -1
- package/package.json +1 -1
- package/templates/settings.json +100 -91
- package/dist/src/cron-manager.d.ts +0 -92
- package/dist/src/cron-manager.d.ts.map +0 -1
- package/dist/src/cron-manager.js +0 -410
- package/dist/src/cron-manager.js.map +0 -1
- package/dist/src/task-executor.d.ts +0 -31
- package/dist/src/task-executor.d.ts.map +0 -1
- package/dist/src/task-executor.js +0 -91
- package/dist/src/task-executor.js.map +0 -1
- package/dist/src/token-monitor.d.ts +0 -50
- package/dist/src/token-monitor.d.ts.map +0 -1
- package/dist/src/token-monitor.js +0 -119
- package/dist/src/token-monitor.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/settings.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC;CACvD;AAED,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,cAAc,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,UAAU,EAAE,cAAc,CAAC;IAC3B,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,cAAc,CAAC;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,IAAI,GAAG,KAAK,CAAC;IACvB,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,IAAI,GAAG,KAAK,CAAC;IACzB,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,IAAI,GAAG,KAAK,CAAC;IAC5B,SAAS,EAAE,IAAI,GAAG,KAAK,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,IAAI,GAAG,KAAK,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/settings.ts"],"names":[],"mappings":"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"}
|
package/dist/src/settings.js
CHANGED
|
@@ -2,18 +2,24 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
|
2
2
|
import { homedir } from 'node:os';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
// ── Default settings (nested format) ────────────────────────────────────────
|
|
5
|
+
/**
|
|
6
|
+
* Explicit per-provider output reserve. Previously `undefined`, which made the
|
|
7
|
+
* turn-loop fall back to an invisible 65536 — half of the 131072 default window.
|
|
8
|
+
*/
|
|
9
|
+
const DEFAULT_MAX_OUTPUT_TOKENS = 32768;
|
|
10
|
+
const DEFAULT_LOCAL_MAX_OUTPUT_TOKENS = 8192;
|
|
5
11
|
function makeDefaultProviders() {
|
|
6
12
|
const p = {};
|
|
7
13
|
for (const name of ['anthropic', 'openai', 'openrouter', 'google', 'ollama', 'local']) {
|
|
8
|
-
p[name] = { api_key: '', url: '', model: '', model_cost: '', model_context_window: 131072 };
|
|
14
|
+
p[name] = { api_key: '', url: '', model: '', model_cost: '', model_context_window: 131072, max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS };
|
|
9
15
|
}
|
|
10
16
|
return {
|
|
11
17
|
anthropic: { ...p.anthropic, url: 'https://api.anthropic.com', model: 'claude-sonnet-4-6', model_context_window: 200000 },
|
|
12
18
|
openai: { ...p.openai, url: 'https://api.openai.com', model: 'gpt-4o' },
|
|
13
19
|
openrouter: { ...p.openrouter, url: 'https://openrouter.ai/api/v1', model: 'anthropic/claude-sonnet-4-6', model_context_window: 200000 },
|
|
14
20
|
google: { ...p.google, model: 'gemini-2.5-pro' },
|
|
15
|
-
ollama: { ...p.ollama, url: 'http://localhost:11434/v1', model: 'llama3' },
|
|
16
|
-
local: { ...p.local, model: 'custom' },
|
|
21
|
+
ollama: { ...p.ollama, url: 'http://localhost:11434/v1', model: 'llama3', max_output_tokens: DEFAULT_LOCAL_MAX_OUTPUT_TOKENS },
|
|
22
|
+
local: { ...p.local, model: 'custom', max_output_tokens: DEFAULT_LOCAL_MAX_OUTPUT_TOKENS },
|
|
17
23
|
};
|
|
18
24
|
}
|
|
19
25
|
export const DEFAULT_SETTINGS = {
|
|
@@ -28,12 +34,14 @@ export const DEFAULT_SETTINGS = {
|
|
|
28
34
|
channels: { bot_token: '', user_id: '', chat_id: '', allow_groups: false, tab_active: 'main' },
|
|
29
35
|
tools_per_call: 10,
|
|
30
36
|
websearch_per_call: 5,
|
|
37
|
+
tools_per_run: 200,
|
|
38
|
+
websearch_per_run: 60,
|
|
31
39
|
system_prompt_files: ['AGENTS.md', 'SOUL.md', 'USER.md', 'MEMORY.md'],
|
|
32
40
|
brave_search_api_key: '',
|
|
33
41
|
heartbeat: { schedule: 'off', mode: 'yolo', intraday: '', daily: '6:00', weekly: 'monday@6:00', monthly: '1@6:00', dreaming: '2:00' },
|
|
34
42
|
mcp_servers: {},
|
|
35
43
|
safety: { path_guard: 'on', path_allowlist: '', command_guard: 'on', snapshots: 'on' },
|
|
36
|
-
auto_compact: { enabled: 'on', threshold: 75, warn_threshold: 60, forced_threshold: 85 },
|
|
44
|
+
auto_compact: { enabled: 'on', threshold: 75, warn_threshold: 60, forced_threshold: 85, model: '' },
|
|
37
45
|
pricing_tier_warn: 'on',
|
|
38
46
|
wiki: { path: '', autoLint: 'off' },
|
|
39
47
|
web_ip: '',
|
|
@@ -150,12 +158,12 @@ export function migrateFlatToNested(parsed) {
|
|
|
150
158
|
const localKey = pickString(parsed, 'MODEL_API_KEY') || '';
|
|
151
159
|
const localUrl = pickString(parsed, 'MODEL_URL') || '';
|
|
152
160
|
const providers = {
|
|
153
|
-
anthropic: { api_key: anthropicKey, url: anthropicUrl, model: DEFAULT_SETTINGS.providers.anthropic.model, model_cost: '', model_context_window: 200000 },
|
|
154
|
-
openai: { api_key: openaiKey, url: openaiUrl, model: DEFAULT_SETTINGS.providers.openai.model, model_cost: '', model_context_window: 131072 },
|
|
155
|
-
openrouter: { api_key: orKey, url: orUrl, model: DEFAULT_SETTINGS.providers.openrouter.model, model_cost: '', model_context_window: 200000 },
|
|
156
|
-
google: { api_key: googleKey, url: googleUrl, model: DEFAULT_SETTINGS.providers.google.model, model_cost: '', model_context_window: 131072 },
|
|
157
|
-
ollama: { api_key: ollamaKey, url: ollamaUrl, model: DEFAULT_SETTINGS.providers.ollama.model, model_cost: '', model_context_window: 131072 },
|
|
158
|
-
local: { api_key: localKey, url: localUrl, model: DEFAULT_SETTINGS.providers.local.model, model_cost: '', model_context_window: 131072 },
|
|
161
|
+
anthropic: { api_key: anthropicKey, url: anthropicUrl, model: DEFAULT_SETTINGS.providers.anthropic.model, model_cost: '', model_context_window: 200000, max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS },
|
|
162
|
+
openai: { api_key: openaiKey, url: openaiUrl, model: DEFAULT_SETTINGS.providers.openai.model, model_cost: '', model_context_window: 131072, max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS },
|
|
163
|
+
openrouter: { api_key: orKey, url: orUrl, model: DEFAULT_SETTINGS.providers.openrouter.model, model_cost: '', model_context_window: 200000, max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS },
|
|
164
|
+
google: { api_key: googleKey, url: googleUrl, model: DEFAULT_SETTINGS.providers.google.model, model_cost: '', model_context_window: 131072, max_output_tokens: DEFAULT_MAX_OUTPUT_TOKENS },
|
|
165
|
+
ollama: { api_key: ollamaKey, url: ollamaUrl, model: DEFAULT_SETTINGS.providers.ollama.model, model_cost: '', model_context_window: 131072, max_output_tokens: DEFAULT_LOCAL_MAX_OUTPUT_TOKENS },
|
|
166
|
+
local: { api_key: localKey, url: localUrl, model: DEFAULT_SETTINGS.providers.local.model, model_cost: '', model_context_window: 131072, max_output_tokens: DEFAULT_LOCAL_MAX_OUTPUT_TOKENS },
|
|
159
167
|
};
|
|
160
168
|
// Preserve flat model into the active provider's model
|
|
161
169
|
const flatModel = pickString(parsed, 'model') || DEFAULT_SETTINGS.model;
|
|
@@ -196,6 +204,10 @@ export function migrateFlatToNested(parsed) {
|
|
|
196
204
|
? pickNumber(parsed, 'TOOLS_PER_CALL', 'tools_per_call') : DEFAULT_SETTINGS.tools_per_call,
|
|
197
205
|
websearch_per_call: (typeof pickNumber(parsed, 'WEBSEARCH_PER_CALL', 'websearch_per_call') === 'number' && pickNumber(parsed, 'WEBSEARCH_PER_CALL', 'websearch_per_call') > 0)
|
|
198
206
|
? pickNumber(parsed, 'WEBSEARCH_PER_CALL', 'websearch_per_call') : DEFAULT_SETTINGS.websearch_per_call,
|
|
207
|
+
tools_per_run: (pickNumber(parsed, 'TOOLS_PER_RUN', 'tools_per_run') ?? 0) > 0
|
|
208
|
+
? pickNumber(parsed, 'TOOLS_PER_RUN', 'tools_per_run') : DEFAULT_SETTINGS.tools_per_run,
|
|
209
|
+
websearch_per_run: (pickNumber(parsed, 'WEBSEARCH_PER_RUN', 'websearch_per_run') ?? 0) > 0
|
|
210
|
+
? pickNumber(parsed, 'WEBSEARCH_PER_RUN', 'websearch_per_run') : DEFAULT_SETTINGS.websearch_per_run,
|
|
199
211
|
system_prompt_files: pickStringArray(parsed, 'system_prompt_files', 'SYSTEM_PROMPT_FILES') || DEFAULT_SETTINGS.system_prompt_files,
|
|
200
212
|
brave_search_api_key: pickString(parsed, 'BRAVE_SEARCH_API_KEY', 'brave_search_api_key', 'BRAVE_API_KEY') || '',
|
|
201
213
|
heartbeat: {
|
|
@@ -219,6 +231,7 @@ export function migrateFlatToNested(parsed) {
|
|
|
219
231
|
threshold: acThreshold,
|
|
220
232
|
warn_threshold: acWarnThreshold,
|
|
221
233
|
forced_threshold: acForcedThreshold,
|
|
234
|
+
model: pickString(parsed, 'AUTO_COMPACT_MODEL', 'auto_compact_model') || '',
|
|
222
235
|
},
|
|
223
236
|
pricing_tier_warn: (pickString(parsed, 'PRICING_TIER_WARN', 'pricing_tier_warn') || 'on'),
|
|
224
237
|
wiki: { path: '', autoLint: 'off' },
|
|
@@ -298,8 +311,15 @@ export class SettingsManager {
|
|
|
298
311
|
this.save();
|
|
299
312
|
return this.settings;
|
|
300
313
|
}
|
|
314
|
+
/**
|
|
315
|
+
* Returns a deep clone. A shallow copy used to let callers mutate nested
|
|
316
|
+
* objects (`auto_compact`, `providers`, …) in place while top-level scalar
|
|
317
|
+
* writes were silently dropped by `save()` — the two behaved differently for
|
|
318
|
+
* no reason a caller could see. Mutating the result is now always a no-op;
|
|
319
|
+
* persist through `update()` / `setProviderKey()`.
|
|
320
|
+
*/
|
|
301
321
|
get() {
|
|
302
|
-
return
|
|
322
|
+
return structuredClone(this.settings);
|
|
303
323
|
}
|
|
304
324
|
/** Get the currently active model name from provider config. */
|
|
305
325
|
getActiveModel() {
|
|
@@ -367,7 +387,7 @@ export function parseNestedSettings(parsed) {
|
|
|
367
387
|
model: getString([`providers.${name}.model`]) || raw.model || (DEFAULT_SETTINGS.providers[name].model),
|
|
368
388
|
model_cost: raw.model_cost || '',
|
|
369
389
|
model_context_window: typeof raw.model_context_window === 'number' ? raw.model_context_window : (DEFAULT_SETTINGS.providers[name].model_context_window),
|
|
370
|
-
max_output_tokens: typeof raw.max_output_tokens === 'number' ? raw.max_output_tokens :
|
|
390
|
+
max_output_tokens: typeof raw.max_output_tokens === 'number' ? raw.max_output_tokens : DEFAULT_SETTINGS.providers[name].max_output_tokens,
|
|
371
391
|
provider_order: Array.isArray(raw.provider_order) ? raw.provider_order : undefined,
|
|
372
392
|
};
|
|
373
393
|
}
|
|
@@ -404,6 +424,7 @@ export function parseNestedSettings(parsed) {
|
|
|
404
424
|
threshold: getNumber(['auto_compact.threshold', 'AUTO_COMPACT_THRESHOLD']) ?? rawAutoComp?.threshold ?? DEFAULT_SETTINGS.auto_compact.threshold,
|
|
405
425
|
warn_threshold: getNumber(['auto_compact.warn_threshold', 'AUTO_COMPACT_WARN_THRESHOLD']) ?? rawAutoComp?.warn_threshold ?? DEFAULT_SETTINGS.auto_compact.warn_threshold,
|
|
406
426
|
forced_threshold: getNumber(['auto_compact.forced_threshold', 'AUTO_COMPACT_FORCED_THRESHOLD']) ?? rawAutoComp?.forced_threshold ?? DEFAULT_SETTINGS.auto_compact.forced_threshold,
|
|
427
|
+
model: getString(['auto_compact.model']) || rawAutoComp?.model || '',
|
|
407
428
|
};
|
|
408
429
|
return {
|
|
409
430
|
model: getString(['model']) || DEFAULT_SETTINGS.model,
|
|
@@ -419,6 +440,10 @@ export function parseNestedSettings(parsed) {
|
|
|
419
440
|
? getNumber(['tools_per_call', 'TOOLS_PER_CALL']) : DEFAULT_SETTINGS.tools_per_call,
|
|
420
441
|
websearch_per_call: (typeof getNumber(['websearch_per_call', 'WEBSEARCH_PER_CALL']) === 'number' && getNumber(['websearch_per_call', 'WEBSEARCH_PER_CALL']) > 0)
|
|
421
442
|
? getNumber(['websearch_per_call', 'WEBSEARCH_PER_CALL']) : DEFAULT_SETTINGS.websearch_per_call,
|
|
443
|
+
tools_per_run: (getNumber(['tools_per_run', 'TOOLS_PER_RUN']) ?? 0) > 0
|
|
444
|
+
? getNumber(['tools_per_run', 'TOOLS_PER_RUN']) : DEFAULT_SETTINGS.tools_per_run,
|
|
445
|
+
websearch_per_run: (getNumber(['websearch_per_run', 'WEBSEARCH_PER_RUN']) ?? 0) > 0
|
|
446
|
+
? getNumber(['websearch_per_run', 'WEBSEARCH_PER_RUN']) : DEFAULT_SETTINGS.websearch_per_run,
|
|
422
447
|
system_prompt_files: pickStringArray(parsed, 'system_prompt_files', 'SYSTEM_PROMPT_FILES') || DEFAULT_SETTINGS.system_prompt_files,
|
|
423
448
|
brave_search_api_key: getString(['brave_search_api_key', 'BRAVE_SEARCH_API_KEY', 'BRAVE_API_KEY']),
|
|
424
449
|
heartbeat: heartbeatConfig,
|
package/dist/src/settings.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/settings.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/settings.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,9 +50,17 @@ export declare class SubagentExecutor {
|
|
|
50
50
|
private maxConcurrentOption?;
|
|
51
51
|
private agents;
|
|
52
52
|
private running;
|
|
53
|
+
/** Live TurnLoop per running agent, so cancel() can actually abort the child. */
|
|
54
|
+
private loops;
|
|
53
55
|
private maxConcurrent;
|
|
54
56
|
constructor(eventBus: EventBus, sessionStore: SessionStore, maxConcurrentOption?: number | undefined);
|
|
55
57
|
spawn(config: SubagentConfig): Promise<SubagentHandle>;
|
|
58
|
+
/**
|
|
59
|
+
* Await a spawned subagent's completion and return its final handle.
|
|
60
|
+
* Resolves immediately if the agent has already finished. Returns undefined
|
|
61
|
+
* for an unknown agentId.
|
|
62
|
+
*/
|
|
63
|
+
waitFor(agentId: string): Promise<SubagentHandle | undefined>;
|
|
56
64
|
private runSubagent;
|
|
57
65
|
cancel(agentId: string): boolean;
|
|
58
66
|
list(statusFilter?: string): SubagentHandle[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-executor.d.ts","sourceRoot":"","sources":["../../src/subagent-executor.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,eAAe,EAAE,KAAK,cAAc,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAc,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,MAAM,CAAC,EAAE,eAAe,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6EAA6E;IAC7E,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,6FAA6F;IAC7F,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,UAAU,GAAG,SAAS,GAAG,cAAc,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,CAAC;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qEAAqE;IACrE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACpC;AAED,qBAAa,gBAAgB;
|
|
1
|
+
{"version":3,"file":"subagent-executor.d.ts","sourceRoot":"","sources":["../../src/subagent-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ export class SubagentExecutor {
|
|
|
6
6
|
maxConcurrentOption;
|
|
7
7
|
agents = new Map();
|
|
8
8
|
running = new Map();
|
|
9
|
+
/** Live TurnLoop per running agent, so cancel() can actually abort the child. */
|
|
10
|
+
loops = new Map();
|
|
9
11
|
maxConcurrent;
|
|
10
12
|
constructor(eventBus, sessionStore, maxConcurrentOption) {
|
|
11
13
|
this.eventBus = eventBus;
|
|
@@ -62,10 +64,22 @@ export class SubagentExecutor {
|
|
|
62
64
|
sessionId: subSession.id,
|
|
63
65
|
}).finally(() => {
|
|
64
66
|
this.running.delete(agentId);
|
|
67
|
+
this.loops.delete(agentId);
|
|
65
68
|
});
|
|
66
69
|
this.running.set(agentId, promise);
|
|
67
70
|
return handle;
|
|
68
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* Await a spawned subagent's completion and return its final handle.
|
|
74
|
+
* Resolves immediately if the agent has already finished. Returns undefined
|
|
75
|
+
* for an unknown agentId.
|
|
76
|
+
*/
|
|
77
|
+
async waitFor(agentId) {
|
|
78
|
+
const promise = this.running.get(agentId);
|
|
79
|
+
if (promise)
|
|
80
|
+
await promise;
|
|
81
|
+
return this.agents.get(agentId);
|
|
82
|
+
}
|
|
69
83
|
async runSubagent(config) {
|
|
70
84
|
const { agentId } = findHandle(this.agents, config.sessionId) ?? { agentId: '' };
|
|
71
85
|
const turnLoop = new TurnLoop({
|
|
@@ -81,6 +95,8 @@ export class SubagentExecutor {
|
|
|
81
95
|
sessionId: config.sessionId,
|
|
82
96
|
type: config.type || 'subagent',
|
|
83
97
|
}, this.sessionStore);
|
|
98
|
+
if (agentId)
|
|
99
|
+
this.loops.set(agentId, turnLoop);
|
|
84
100
|
// Use config.system directly as the subagent's system prompt
|
|
85
101
|
const runPromise = config.system
|
|
86
102
|
? createAndRunTurnLoop(turnLoop, config.prompt, config.system)
|
|
@@ -181,12 +197,9 @@ export class SubagentExecutor {
|
|
|
181
197
|
}
|
|
182
198
|
handle.status = 'cancelled';
|
|
183
199
|
handle.doneAt = Date.now();
|
|
184
|
-
//
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
// We need to find and cancel the TurnLoop — stored in the running promise
|
|
188
|
-
// For now, emit cancellation event
|
|
189
|
-
}
|
|
200
|
+
// Abort the child TurnLoop so it actually stops mid-turn, rather than
|
|
201
|
+
// running to completion while the handle claims it was cancelled.
|
|
202
|
+
this.loops.get(agentId)?.cancel();
|
|
190
203
|
this.eventBus.emit({
|
|
191
204
|
type: 'agent-error',
|
|
192
205
|
id: randomUUID(),
|
|
@@ -231,6 +244,7 @@ export class SubagentExecutor {
|
|
|
231
244
|
}
|
|
232
245
|
this.agents.clear();
|
|
233
246
|
this.running.clear();
|
|
247
|
+
this.loops.clear();
|
|
234
248
|
}
|
|
235
249
|
getRunningCount() {
|
|
236
250
|
return [...this.agents.values()].filter((a) => a.status === 'running' || a.status === 'starting').length;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subagent-executor.js","sourceRoot":"","sources":["../../src/subagent-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAwD,MAAM,gBAAgB,CAAC;AAiDhG,MAAM,OAAO,gBAAgB;
|
|
1
|
+
{"version":3,"file":"subagent-executor.js","sourceRoot":"","sources":["../../src/subagent-executor.ts"],"names":[],"mappings":"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"}
|
package/dist/src/turn-loop.d.ts
CHANGED
|
@@ -26,11 +26,16 @@ export interface ProviderStream {
|
|
|
26
26
|
maxTokens?: number;
|
|
27
27
|
sessionId?: string;
|
|
28
28
|
}): CancelableIterable<ProviderEvent>;
|
|
29
|
-
/**
|
|
29
|
+
/**
|
|
30
|
+
* Non-streaming call — used for quick evaluations (harm-check) and for
|
|
31
|
+
* writing compaction summaries. `maxTokens` matters for the latter: the
|
|
32
|
+
* adapters' built-in defaults are sized for one-word harm verdicts.
|
|
33
|
+
*/
|
|
30
34
|
check(prompt: string, args?: {
|
|
31
35
|
model?: string;
|
|
32
36
|
system?: string;
|
|
33
37
|
signal?: AbortSignal;
|
|
38
|
+
maxTokens?: number;
|
|
34
39
|
}): Promise<string>;
|
|
35
40
|
}
|
|
36
41
|
export interface Tool {
|
|
@@ -135,6 +140,13 @@ export type Message = {
|
|
|
135
140
|
toolName?: string;
|
|
136
141
|
content: string;
|
|
137
142
|
};
|
|
143
|
+
/**
|
|
144
|
+
* Rebuild the provider message array from a session's persisted events.
|
|
145
|
+
*
|
|
146
|
+
* Module-level so the daemon can compact an idle session without instantiating
|
|
147
|
+
* a TurnLoop — one implementation, so live and out-of-band paths cannot drift.
|
|
148
|
+
*/
|
|
149
|
+
export declare function reconstructMessagesFromEvents(allEvents: Event[]): Message[];
|
|
138
150
|
export declare class TurnLoop {
|
|
139
151
|
private bus;
|
|
140
152
|
private store;
|
|
@@ -146,6 +158,15 @@ export declare class TurnLoop {
|
|
|
146
158
|
private messages;
|
|
147
159
|
private activeSessionId;
|
|
148
160
|
private recoveredTurns;
|
|
161
|
+
/**
|
|
162
|
+
* Learned chars-per-token for this session. Seeded at the English default and
|
|
163
|
+
* corrected from every real `usage` report — a Polish or CJK transcript runs
|
|
164
|
+
* well under 4 chars/token, which is how a run can be estimated at half its
|
|
165
|
+
* true size and sail past the gate.
|
|
166
|
+
*/
|
|
167
|
+
private calibration;
|
|
168
|
+
/** Characters in the last request sent, used to calibrate against its usage report. */
|
|
169
|
+
private lastRequestChars;
|
|
149
170
|
constructor(config: TurnLoopConfig, store?: SessionStore);
|
|
150
171
|
get eventBus(): EventBus;
|
|
151
172
|
get sessionStore(): SessionStore;
|
|
@@ -155,7 +176,6 @@ export declare class TurnLoop {
|
|
|
155
176
|
setCwd(newCwd: string): void;
|
|
156
177
|
private evaluateHarm;
|
|
157
178
|
private reconstructMessages;
|
|
158
|
-
private buildTurnMessages;
|
|
159
179
|
run(prompt: string): Promise<TurnLoopResult>;
|
|
160
180
|
}
|
|
161
181
|
//# sourceMappingURL=turn-loop.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turn-loop.d.ts","sourceRoot":"","sources":["../../src/turn-loop.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAoB,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACtE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"turn-loop.d.ts","sourceRoot":"","sources":["../../src/turn-loop.ts"],"names":[],"mappings":"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"}
|