evolcore 0.0.46 → 0.0.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +93 -0
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +139 -39
- package/dist/agent-template/service.js +66 -13
- package/dist/agents/baseagent.js +60 -20
- package/dist/agents/claude-runner.js +43 -18
- package/dist/agents/codex/app-server-client.js +32 -23
- package/dist/agents/codex-runner.js +31 -16
- package/dist/agents/ecagent-runner.js +7 -4
- package/dist/agents/gemini-runner.js +5 -2
- package/dist/agents/runner-types.js +5 -21
- package/dist/aun/aid/agentmd.js +5 -1
- package/dist/aun/group/fs-download.js +1 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +100 -32
- package/dist/channels/daemon.js +10 -26
- package/dist/cli/aun-commands.js +86 -51
- package/dist/cli/code-stats.js +19 -8
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +65 -76
- package/dist/cli/daemon-lifecycle-client.js +17 -3
- package/dist/cli/directory.js +7 -1
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +2 -8
- package/dist/cli/init-channel.js +6 -8
- package/dist/cli/init.js +74 -46
- package/dist/cli/invoke-command.js +1 -1
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/restart-monitor.js +104 -28
- package/dist/cli/role.js +61 -17
- package/dist/cli/stats.js +3 -3
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/thread-command.js +16 -51
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/boot-log.js +3 -9
- package/dist/config/builtin-roles.js +5 -7
- package/dist/config/config-manager.js +31 -23
- package/dist/config/daemon-services.js +30 -3
- package/dist/config/gateway-config.js +2 -2
- package/dist/config/invoke-ipc-service.js +6 -4
- package/dist/config/peer-bind-code.js +3 -4
- package/dist/config/peer-book-store.js +59 -218
- package/dist/config/peer-book.js +26 -27
- package/dist/config/peer-role-resolver.js +16 -1
- package/dist/config/provider-identity-migration.js +161 -6
- package/dist/config/provider-ipc-service.js +56 -11
- package/dist/config/provider-menu-request.js +24 -5
- package/dist/config/provider-templates.js +127 -0
- package/dist/config/providers-config.js +59 -8
- package/dist/config/providers-management.js +467 -49
- package/dist/config/role-command-service.js +248 -1
- package/dist/config/schema-migration.js +228 -20
- package/dist/config/schema-registry.js +6 -2
- package/dist/core/agent-application-service.js +6 -1
- package/dist/core/agent-runtime.js +10 -5
- package/dist/core/auth/agent-delegation.js +10 -4
- package/dist/core/auth/auth-gateway.js +2 -1
- package/dist/core/auth/delegation-authorization.js +3 -0
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +26 -1
- package/dist/core/auth/operation-catalog.js +28 -64
- package/dist/core/capability/providers/codex-capability-provider.js +7 -8
- package/dist/core/channel-loader.js +18 -0
- package/dist/core/command/agent-control.js +32 -0
- package/dist/core/command/command-handler.js +81 -85
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +65 -153
- package/dist/core/command/menu-protocol.js +7 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/role-menu.js +47 -23
- package/dist/core/command/slash-handler.js +30 -49
- package/dist/core/command/team-workspace-items.js +81 -12
- package/dist/core/command/team-workspace-team.js +9 -71
- package/dist/core/command/topic-slash.js +9 -30
- package/dist/core/daemon-bootstrap.js +19 -10
- package/dist/core/daemon-control.js +8 -10
- package/dist/core/daemon-lifecycle.js +50 -40
- package/dist/core/evolagent-registry.js +22 -3
- package/dist/core/file-integrity/store.js +2 -0
- package/dist/core/handoff/runtime.js +37 -1
- package/dist/core/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +3 -1
- package/dist/core/initialization/service.js +31 -8
- package/dist/core/interaction-router.js +3 -0
- package/dist/core/invoke/executors/text.js +72 -19
- package/dist/core/ipc-registration.js +6 -4
- package/dist/core/memory/consolidation.js +6 -6
- package/dist/core/message/aun-ipc-sender.js +165 -55
- package/dist/core/message/im-renderer.js +1 -1
- package/dist/core/message/message-bridge.js +51 -334
- package/dist/core/message/message-log.js +5 -0
- package/dist/core/message/message-queue.js +22 -0
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +429 -116
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/ownership/owner-resolver.js +355 -60
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/relation/peer-identity.js +28 -2
- package/dist/core/relation/same-owner-proof.js +81 -111
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
- package/dist/core/session/session-file-health.js +49 -14
- package/dist/core/session/session-fs-store.js +91 -35
- package/dist/core/session/session-manager.js +68 -24
- package/dist/core/session/session-mapper.js +14 -34
- package/dist/core/session/session-transcript.js +5 -1
- package/dist/core/task/task-activity-store.js +84 -0
- package/dist/core/task/task-image-resources.js +1 -1
- package/dist/core/task/task-recovery-service.js +12 -0
- package/dist/core/thread/command-parser.js +7 -12
- package/dist/core/thread/thread-context-storage.js +3 -2
- package/dist/core/thread/thread-operation.js +2 -13
- package/dist/core/thread/thread-service.js +15 -46
- package/dist/directory/owner-directory-admission.js +1 -1
- package/dist/directory/owner-directory-cache.js +45 -28
- package/dist/directory/owner-directory-markdown.js +13 -1
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/eck/message-renderer.js +84 -24
- package/dist/ecweb/basic-settings-service.js +3 -1
- package/dist/ecweb/message-context-service.js +1 -1
- package/dist/ecweb/pairing.js +4 -3
- package/dist/ecweb/providers-service.js +26 -1
- package/dist/ecweb/runtime/lifecycle.js +82 -23
- package/dist/ecweb/runtime/proxy-access.js +74 -0
- package/dist/ecweb/runtime/supervisor.js +6 -17
- package/dist/event-center/registry.js +13 -2
- package/dist/event-center/runtime.js +103 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +129 -93
- package/dist/ipc.js +15 -3
- package/dist/outputs/events.js +62 -0
- package/dist/outputs/protocol.js +102 -0
- package/dist/outputs/service.js +279 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +89 -4
- package/dist/services/ipc-operation.js +4 -15
- package/dist/services/pack-manager.js +12 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/role-budget.js +5 -2
- package/dist/stats/writer.js +10 -6
- package/dist/trigger/audit.js +7 -0
- package/dist/trigger/authorization.js +105 -11
- package/dist/trigger/feedback.js +10 -0
- package/dist/trigger/history.js +37 -11
- package/dist/trigger/ipc-service.js +12 -1
- package/dist/trigger/manager.js +1 -0
- package/dist/trigger/scheduler.js +11 -5
- package/dist/trigger/script-executor.js +2 -1
- package/dist/trigger/script-sandbox.js +9 -3
- package/dist/trigger/state.js +7 -0
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +97 -31
- package/dist/utils/error-dict.json +94 -4
- package/dist/utils/error-utils.js +40 -4
- package/dist/utils/evolcore-version.js +36 -65
- package/dist/utils/instance-registry.js +61 -0
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/process-introspect.js +158 -8
- package/dist/utils/process-tree.js +50 -2
- package/dist/utils/upgrade-jobs.js +4 -4
- package/dist/utils/windows-shell-trust.js +2 -0
- package/dist/workbench/protocol.js +80 -0
- package/dist/workbench/service.js +359 -0
- package/ecagent/dist/types.d.ts +6 -2
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -2
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +12 -0
- package/kits/docs/evolcore/directory.md +22 -3
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +133 -5
- package/kits/docs/evolcore/role.md +80 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/team-workspace.md +1 -1
- package/kits/docs/evolcore/thread-chain.md +14 -15
- package/kits/docs/evolcore/tool-authorization.md +5 -0
- package/kits/docs/evolcore/trigger.md +10 -0
- package/kits/eck_message_manifest.json +12 -0
- package/kits/provider-templates.json +1213 -0
- package/kits/rules/04-relation.md +3 -3
- package/kits/schemas/_meta.json +14 -2
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/ec-group/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +19 -72
- package/kits/skills/ec-provider/SKILL.md +221 -0
- package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +34 -21
- package/kits/templates/message-fragments/group-batch-item.md +1 -1
- package/kits/templates/message-fragments/group-batch.md +1 -1
- package/kits/templates/message-fragments/inject-default.md +1 -1
- package/kits/templates/message-fragments/interrupt-insert.md +1 -0
- package/kits/templates/message-fragments/item-group.md +1 -1
- package/kits/templates/message-fragments/item-private.md +1 -1
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/message-fragments/trigger-session.md +1 -1
- package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
- package/kits/templates/roles/admin.json +2 -19
- package/kits/templates/roles/member.json +0 -3
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +3 -3
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +1 -1
- package/kits/templates/system-fragments/thread.md +6 -5
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +4 -1
- package/scripts/agent-template/shared/common.mjs +2 -3
- package/scripts/agent-template/shared/template-contract.mjs +2 -1
- package/scripts/agent-template/shared/template-package.mjs +9 -2
- package/scripts/agent-template/shared/template-runtime.mjs +20 -5
- package/scripts/agent-template/team-pack.mjs +6 -3
- package/dist/cli/peer.js +0 -127
- package/dist/config/peer-operation-service.js +0 -132
- package/dist/config/peer-request-service.js +0 -532
- package/dist/core/command/connect-menu.js +0 -624
package/dist/agents/baseagent.js
CHANGED
|
@@ -14,10 +14,12 @@ import path from 'path';
|
|
|
14
14
|
import os from 'os';
|
|
15
15
|
import { createHash } from 'node:crypto';
|
|
16
16
|
import { buildCliLaunchCommand, commandExists, isWindows, resolvePowerShellShimPath, resolveProbePath, } from '../utils/cross-platform.js';
|
|
17
|
-
import {
|
|
17
|
+
import { execFile } from 'child_process';
|
|
18
|
+
import { requireTrustedWindowsCmdPathAsync } from '../utils/windows-shell-trust.js';
|
|
18
19
|
import { parse as parseToml } from 'smol-toml';
|
|
19
20
|
import { readRuntimeEnvironmentVariable } from '../config/runtime-env.js';
|
|
20
21
|
import { providerModelEnabled, resolveProviderServiceForBaseagent, resolveProviderService } from '../config/providers.js';
|
|
22
|
+
import { errorQuestionRule } from '../utils/error-utils.js';
|
|
21
23
|
/** Resolve the installed Codex CLI entrypoint, including npm shims on Windows. */
|
|
22
24
|
export function resolveCodexCliPath() {
|
|
23
25
|
return resolveProbePath('codex');
|
|
@@ -36,18 +38,23 @@ export function resolveCodexLaunchCommand(args, options = {}) {
|
|
|
36
38
|
comSpec: options.comSpec,
|
|
37
39
|
});
|
|
38
40
|
}
|
|
39
|
-
/** Execute a Codex CLI command
|
|
40
|
-
export function
|
|
41
|
+
/** Execute a Codex CLI command without blocking the daemon, including shim trust checks. */
|
|
42
|
+
export async function execCodexCli(args, options) {
|
|
41
43
|
const commandPath = resolveCodexCliPath();
|
|
42
44
|
if (!commandPath)
|
|
43
45
|
throw new Error('Codex CLI not found');
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
46
|
+
const resolveWindowsCmd = isWindows && /\.(?:cmd|bat)$/i.test(commandPath)
|
|
47
|
+
? await requireTrustedWindowsCmdPathAsync().then(cmd => () => cmd,
|
|
48
|
+
// Keep launch failures on the existing diagnostic and error path.
|
|
49
|
+
error => () => { throw error; }) : undefined;
|
|
50
|
+
const launchCommand = buildCliLaunchCommand(commandPath, args, { resolveWindowsCmd });
|
|
51
|
+
return new Promise((resolve, reject) => {
|
|
52
|
+
const child = execFile(launchCommand.command, launchCommand.args, {
|
|
53
|
+
...options,
|
|
54
|
+
windowsHide: isWindows,
|
|
55
|
+
windowsVerbatimArguments: launchCommand.windowsVerbatimArguments,
|
|
56
|
+
}, (error, stdout) => error ? reject(error) : resolve(stdout));
|
|
57
|
+
child.stdin?.end();
|
|
51
58
|
});
|
|
52
59
|
}
|
|
53
60
|
const BASEAGENT_ALIASES = {
|
|
@@ -253,8 +260,14 @@ export async function resolveRuntimeBaseagentModelSelection(baseagent, configure
|
|
|
253
260
|
discoveredDefaultModels.set(key, model);
|
|
254
261
|
return model;
|
|
255
262
|
}
|
|
256
|
-
catch {
|
|
263
|
+
catch (error) {
|
|
257
264
|
// Provider/app-server payloads can contain credentials or physical paths.
|
|
265
|
+
// Retain only the dictionary-owned repair hint, never the raw response.
|
|
266
|
+
const rule = errorQuestionRule(error);
|
|
267
|
+
if (rule)
|
|
268
|
+
throw Object.assign(new Error(rule.message ?? '模型连接需要补充信息'), {
|
|
269
|
+
code: rule.question?.fields.includes('baseUrl') ? 'PROVIDER_BASE_URL_MISSING' : 'PROVIDER_CREDENTIAL_INVALID',
|
|
270
|
+
});
|
|
258
271
|
throw defaultModelUnavailable(canonical);
|
|
259
272
|
}
|
|
260
273
|
})().finally(() => discoveringDefaultModels.delete(key));
|
|
@@ -313,6 +326,36 @@ function normalizeRequestMetadata(value) {
|
|
|
313
326
|
queryParams: normalizeStringMap(value?.queryParams, 'queryParams'),
|
|
314
327
|
};
|
|
315
328
|
}
|
|
329
|
+
/** Retain known connection facts when resolution stops at a missing native key. */
|
|
330
|
+
class NativeConnectionIncompleteError extends Error {
|
|
331
|
+
#connection;
|
|
332
|
+
constructor(message, connection) {
|
|
333
|
+
super(message);
|
|
334
|
+
this.#connection = connection;
|
|
335
|
+
}
|
|
336
|
+
get connection() { return this.#connection; }
|
|
337
|
+
}
|
|
338
|
+
/** Resolve exactly the same native credential precedence as the runner, without model discovery. */
|
|
339
|
+
export function resolveNativeConnectionForRepair(baseagent, configured, runtime) {
|
|
340
|
+
const override = { ...configured, model: '<connection-repair>' };
|
|
341
|
+
try {
|
|
342
|
+
if (baseagent === 'claude')
|
|
343
|
+
return resolveAnthropicConfig({ agents: {} }, override, runtime);
|
|
344
|
+
if (baseagent === 'codex')
|
|
345
|
+
return resolveOpenaiConfig({ agents: {} }, override);
|
|
346
|
+
if (baseagent === 'ecagent')
|
|
347
|
+
return resolveEcagentConfig({ agents: {} }, override);
|
|
348
|
+
if (baseagent === 'gemini')
|
|
349
|
+
return { ...resolveGoogleConfig({ agents: {} }, override),
|
|
350
|
+
baseUrl: process.env.GOOGLE_GEMINI_BASE_URL };
|
|
351
|
+
}
|
|
352
|
+
catch (error) {
|
|
353
|
+
if (error instanceof NativeConnectionIncompleteError)
|
|
354
|
+
return error.connection;
|
|
355
|
+
throw error;
|
|
356
|
+
}
|
|
357
|
+
return undefined;
|
|
358
|
+
}
|
|
316
359
|
/** Claude Code accepts both names; AUTH_TOKEN is kept first for compatibility. */
|
|
317
360
|
function resolveAnthropicApiKey(...values) {
|
|
318
361
|
return directInferenceValue(...values);
|
|
@@ -389,9 +432,6 @@ export function resolveAnthropicConfig(config, override, runtime) {
|
|
|
389
432
|
const runtimeAuthToken = readRuntimeEnvironmentVariable('ANTHROPIC_AUTH_TOKEN', runtime?.agentAid, runtime?.projectPath).value;
|
|
390
433
|
const runtimeApiKey = readRuntimeEnvironmentVariable('ANTHROPIC_API_KEY', runtime?.agentAid, runtime?.projectPath).value;
|
|
391
434
|
const apiKey = resolveAnthropicApiKey(isPlaceholder(overrideApiKey) ? undefined : overrideApiKey, undefined, runtimeAuthToken, runtimeApiKey, settings.env?.ANTHROPIC_AUTH_TOKEN, settings.env?.ANTHROPIC_API_KEY);
|
|
392
|
-
if (!apiKey) {
|
|
393
|
-
throw new Error('No API key found for Claude. Select a Provider via baseagents.claude.provider, or set env ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY.');
|
|
394
|
-
}
|
|
395
435
|
const isPlaceholderUrl = (v) => !v || v.includes('api.anthropic.com');
|
|
396
436
|
const overrideBaseUrlValue = resolveGatewayReference(override?.baseUrl);
|
|
397
437
|
const overrideBaseUrl = isPlaceholderUrl(overrideBaseUrlValue) ? undefined : overrideBaseUrlValue;
|
|
@@ -401,6 +441,8 @@ export function resolveAnthropicConfig(config, override, runtime) {
|
|
|
401
441
|
|| settings.env?.ANTHROPIC_BASE_URL;
|
|
402
442
|
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
403
443
|
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
444
|
+
if (!apiKey)
|
|
445
|
+
throw new NativeConnectionIncompleteError('No API key found for Claude. Select a Provider via baseagents.claude.provider, or set env ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY.', { baseUrl, headers, queryParams });
|
|
404
446
|
const model = override?.model
|
|
405
447
|
|| config.agents?.claude?.model
|
|
406
448
|
|| settings.model
|
|
@@ -578,9 +620,6 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
578
620
|
const apiKey = credential?.apiKey;
|
|
579
621
|
const authType = credential?.authType;
|
|
580
622
|
const authSource = credential?.authSource;
|
|
581
|
-
if (!apiKey) {
|
|
582
|
-
throw new Error('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.');
|
|
583
|
-
}
|
|
584
623
|
const isPlaceholderUrl = (v) => !v || v.includes('api.openai.com');
|
|
585
624
|
const overrideBaseUrl = isPlaceholderUrl(override?.baseUrl) ? undefined : override?.baseUrl;
|
|
586
625
|
const baseUrl = overrideBaseUrl
|
|
@@ -589,6 +628,8 @@ export function resolveOpenaiConfig(config, override, runtime) {
|
|
|
589
628
|
|| undefined;
|
|
590
629
|
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
591
630
|
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
631
|
+
if (!apiKey)
|
|
632
|
+
throw new NativeConnectionIncompleteError('No Codex credential found. Select a Provider via baseagents.codex.provider, or set env OPENAI_API_KEY / CODEX_API_KEY.', { baseUrl, headers, queryParams });
|
|
592
633
|
const model = override?.model
|
|
593
634
|
|| config.agents?.codex?.model
|
|
594
635
|
|| codexSettings.model
|
|
@@ -684,9 +725,6 @@ export function resolveEcagentConfig(config, override) {
|
|
|
684
725
|
const apiKey = (isPlaceholder(override?.apiKey) ? undefined : override?.apiKey)
|
|
685
726
|
|| process.env.ECAGENT_API_KEY
|
|
686
727
|
|| process.env.OPENAI_API_KEY;
|
|
687
|
-
if (!apiKey) {
|
|
688
|
-
throw new Error('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.');
|
|
689
|
-
}
|
|
690
728
|
const baseUrl = (override?.baseUrl && !override.baseUrl.includes('placeholder') ? override.baseUrl : undefined)
|
|
691
729
|
|| process.env.ECAGENT_BASE_URL
|
|
692
730
|
|| DEFAULT_ECAGENT_BASE_URL;
|
|
@@ -694,6 +732,8 @@ export function resolveEcagentConfig(config, override) {
|
|
|
694
732
|
|| discoveredDefaultModel('ecagent', { ...configured, ...override }) || '';
|
|
695
733
|
const headers = normalizeStringMap(override?.headers, 'headers');
|
|
696
734
|
const queryParams = normalizeStringMap(override?.queryParams, 'queryParams');
|
|
735
|
+
if (!apiKey)
|
|
736
|
+
throw new NativeConnectionIncompleteError('No ecagent API key found. Select a Provider via baseagents.ecagent.provider, or set env ECAGENT_API_KEY / OPENAI_API_KEY.', { baseUrl, headers, queryParams });
|
|
697
737
|
const effort = override?.effort ?? configured?.effort;
|
|
698
738
|
const numberOr = (value, fallback) => (typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : fallback);
|
|
699
739
|
return {
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { assertRunnerModelAllowed, getRunnerCatalog, peekRunnerCatalog, catalogEfforts, resolveCatalogModel, assertCatalogSelectable } from '../core/model/model-catalog.js';
|
|
2
|
-
import { query, forkSession as sdkForkSession, getSessionMessages as sdkGetSessionMessages, resolveSettings as sdkResolveSettings, } from '@anthropic-ai/claude-agent-sdk';
|
|
3
2
|
import { spawn } from 'child_process';
|
|
4
3
|
import { createRequire } from 'module';
|
|
5
4
|
import { ensureDir } from '../utils/atomic-write.js';
|
|
6
5
|
import { resolveAnthropicConfig } from './baseagent.js';
|
|
7
|
-
import {
|
|
6
|
+
import { resolveProviderService } from '../config/providers.js';
|
|
8
7
|
import { buildModelRequestHeaders } from './request-identity.js';
|
|
9
8
|
import { DEFAULT_PERMISSION_MODE } from '../types.js';
|
|
10
9
|
import { renderActionAsText } from '../core/interaction-router.js';
|
|
@@ -35,9 +34,9 @@ import { buildClaudeUnixSocketAllowlist } from '../core/permission/unix-socket-p
|
|
|
35
34
|
import { auditToolInfrastructureFailure, auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
|
|
36
35
|
import { getManagedTaskTempDir, isManagedSessionRuntimeDir } from '../cli/task-context.js';
|
|
37
36
|
import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext } from './runner-types.js';
|
|
38
|
-
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/
|
|
39
|
-
import {
|
|
40
|
-
import {
|
|
37
|
+
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
|
|
38
|
+
import { contextTokensForUsage, usageForContext, realContextWindowForModel } from './runner-types.js';
|
|
39
|
+
import { CLAUDE_AUTO_COMPACT_MAX_TOKENS, CLAUDE_AUTO_COMPACT_MIN_TOKENS, resolveCatalogAutoCompactPolicy, resolveModelCapabilities, } from '../core/model/model-capabilities.js';
|
|
41
40
|
import { hasContextWindowSuffix, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
|
|
42
41
|
const resolveModule = createRequire(import.meta.url);
|
|
43
42
|
const CLAUDE_INTERRUPT_TIMEOUT_MS = 5_000;
|
|
@@ -445,6 +444,7 @@ function resolveClaudeSettingsDirectory(runtimeEnv) {
|
|
|
445
444
|
async function assertClaudeSettingSourcesHaveLiteralSandboxPaths(cwd, settingSources, managedSettings) {
|
|
446
445
|
if (process.platform !== 'linux' || settingSources.length === 0)
|
|
447
446
|
return;
|
|
447
|
+
const { resolveSettings: sdkResolveSettings } = await import('@anthropic-ai/claude-agent-sdk');
|
|
448
448
|
const resolved = await sdkResolveSettings({ cwd, settingSources, managedSettings });
|
|
449
449
|
for (const source of resolved.sources) {
|
|
450
450
|
const filesystem = source.settings.sandbox?.filesystem;
|
|
@@ -459,7 +459,7 @@ async function assertClaudeSettingSourcesHaveLiteralSandboxPaths(cwd, settingSou
|
|
|
459
459
|
}
|
|
460
460
|
}
|
|
461
461
|
// ── 网关价格缓存 ─────────────────────────────────────────────────────────────
|
|
462
|
-
// 价格获取、缓存与计费统一由
|
|
462
|
+
// 价格获取、缓存与计费统一由 model-resolver.ts 管理,各基座共用一份缓存
|
|
463
463
|
// (按 baseUrl、1h TTL、stale-while-revalidate)。
|
|
464
464
|
/**
|
|
465
465
|
* 为支持 1M 上下文的模型追加 `[1m]` 后缀——仅在交给 SDK query() 时调用。
|
|
@@ -475,7 +475,7 @@ function applyContextWindow(modelId, contextWindow, catalog) {
|
|
|
475
475
|
const variantListed = catalog?.models.some(m => hasContextWindowSuffix(m.id) && stripContextWindowSuffix(m.id) === modelId);
|
|
476
476
|
if (variantListed)
|
|
477
477
|
return modelId;
|
|
478
|
-
if (contextWindow
|
|
478
|
+
if (contextWindow >= 1_000_000)
|
|
479
479
|
return `${modelId}[1m]`;
|
|
480
480
|
return modelId;
|
|
481
481
|
}
|
|
@@ -484,9 +484,12 @@ function resolveClaudeModelContext(modelId, catalog) {
|
|
|
484
484
|
catalog,
|
|
485
485
|
fallbackContextWindow: realContextWindowForModel(modelId),
|
|
486
486
|
});
|
|
487
|
+
const policy = resolveCatalogAutoCompactPolicy(catalog, modelId);
|
|
488
|
+
const contextWindow = policy?.contextWindow ?? capabilities.contextWindow;
|
|
487
489
|
return {
|
|
488
|
-
sdkModel: applyContextWindow(capabilities.model,
|
|
489
|
-
contextWindow
|
|
490
|
+
sdkModel: applyContextWindow(capabilities.model, contextWindow, catalog),
|
|
491
|
+
contextWindow,
|
|
492
|
+
autoCompactTokens: policy?.autoCompactTokens,
|
|
490
493
|
};
|
|
491
494
|
}
|
|
492
495
|
class MessageStream {
|
|
@@ -748,7 +751,11 @@ export class AgentRunner {
|
|
|
748
751
|
/** 返回当前网关 /v1/models 的价格缓存(1h TTL,stale-while-revalidate)。
|
|
749
752
|
* 缺失/过期时 fire-and-forget 触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
|
|
750
753
|
getGatewayPricing() {
|
|
751
|
-
|
|
754
|
+
const pricing = getSharedGatewayPricing(this.baseUrl, this.apiKey, this.customHeaders);
|
|
755
|
+
if (!pricing)
|
|
756
|
+
return undefined;
|
|
757
|
+
// 附带本次调用实际使用的连接来源,供 usage_events 记录 Provider 维度。
|
|
758
|
+
return { ...pricing, source: { baseUrl: this.baseUrl, providerId: this.config?.agents?.claude?.provider } };
|
|
752
759
|
}
|
|
753
760
|
async resolveCapabilityRunOptions(projectPath) {
|
|
754
761
|
let agentConfig = this.agentConfig;
|
|
@@ -1441,7 +1448,7 @@ export class AgentRunner {
|
|
|
1441
1448
|
* SDK 原始事件 → 标准 AgentEvent 转换
|
|
1442
1449
|
* 所有 SDK 特有的事件类型引用封装在此方法内
|
|
1443
1450
|
*/
|
|
1444
|
-
async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, isResuming = false, sandboxSettingsFile, permissionMode, turn, projectPath = process.cwd(), topicBinding = false, recoverySessionId, resolvedContextWindow) {
|
|
1451
|
+
async *transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, isResuming = false, sandboxSettingsFile, permissionMode, turn, projectPath = process.cwd(), topicBinding = false, recoverySessionId, resolvedContextWindow, resolvedAutoCompactTokens) {
|
|
1445
1452
|
let lastSessionId;
|
|
1446
1453
|
let pendingSessionId;
|
|
1447
1454
|
let hasTurnActivity = false;
|
|
@@ -1874,7 +1881,7 @@ export class AgentRunner {
|
|
|
1874
1881
|
const effectiveModel = callModel ?? this.model;
|
|
1875
1882
|
const totalTokens = contextTokensForUsage(u, effectiveModel);
|
|
1876
1883
|
const contextWindowTokens = resolvedContextWindow ?? realContextWindowForModel(sdkModel);
|
|
1877
|
-
const autoCompactTokens =
|
|
1884
|
+
const autoCompactTokens = resolvedAutoCompactTokens;
|
|
1878
1885
|
const aggregateContextUsage = totalTokens > 0 ? {
|
|
1879
1886
|
totalTokens,
|
|
1880
1887
|
maxTokens: contextWindowTokens,
|
|
@@ -2094,7 +2101,7 @@ export class AgentRunner {
|
|
|
2094
2101
|
// 同步用户级配置到内存
|
|
2095
2102
|
this.syncFromUserSettings();
|
|
2096
2103
|
// Run preparation and model menus resolve aliases from the same snapshot.
|
|
2097
|
-
const runCatalog = modelOverride?.provider
|
|
2104
|
+
const runCatalog = modelOverride?.provider
|
|
2098
2105
|
? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
|
|
2099
2106
|
: await this.getModelCatalog();
|
|
2100
2107
|
if (this.baseUrl) {
|
|
@@ -2777,13 +2784,16 @@ export class AgentRunner {
|
|
|
2777
2784
|
logger.info(`[AgentRunner] systemPromptAppend: none`);
|
|
2778
2785
|
}
|
|
2779
2786
|
const catalogModel = resolveCatalogModel(runCatalog, callModel);
|
|
2780
|
-
const { sdkModel, contextWindow } = resolveClaudeModelContext(catalogModel, runCatalog);
|
|
2787
|
+
const { sdkModel, contextWindow, autoCompactTokens } = resolveClaudeModelContext(catalogModel, runCatalog);
|
|
2781
2788
|
const agentEnv = this.getAgentEnv(runtimeEnv, sessionId, callPermissionMode, modelOverride?.provider);
|
|
2782
2789
|
const dependencies = executionSandbox.state !== 'off' && !sandboxFallback
|
|
2783
2790
|
? inspectClaudeSandboxDependencies(agentEnv)
|
|
2784
2791
|
: undefined;
|
|
2785
2792
|
if (dependencies?.status === 'missing')
|
|
2786
2793
|
throw createClaudeSandboxDependencyError(dependencies);
|
|
2794
|
+
// Load before creating temporary settings, so an import failure cannot
|
|
2795
|
+
// leave a partially prepared query behind.
|
|
2796
|
+
const { query } = await import('@anthropic-ai/claude-agent-sdk');
|
|
2787
2797
|
const capabilityOptions = await this.resolveCapabilityRunOptions(projectPath);
|
|
2788
2798
|
const managedSettings = callPermissionMode === 'fullaccess'
|
|
2789
2799
|
? undefined
|
|
@@ -2860,6 +2870,11 @@ export class AgentRunner {
|
|
|
2860
2870
|
logger.debug(`[Claude-stderr] ${trimmed}`);
|
|
2861
2871
|
}
|
|
2862
2872
|
};
|
|
2873
|
+
// Claude Code 的自动压缩阈值只能经 CLI 参数下发:SDK 顶层没有
|
|
2874
|
+
// `autoCompactWindow` 这个 Options 字段(它在 Settings 契约里),旧写法被
|
|
2875
|
+
// 静默丢弃——实测 deepseek-flash 仍在 ~168k 处自动压缩,旧阈值从未生效。
|
|
2876
|
+
// 这里改用 `--autocompact <tokens>`,低于 CLI 下限 100k 时不下发,交给 CLI 默认。
|
|
2877
|
+
const capabilityExtraArgs = capabilityOptions.extraArgs;
|
|
2863
2878
|
const commonOptions = {
|
|
2864
2879
|
cwd: projectPath,
|
|
2865
2880
|
model: sdkModel,
|
|
@@ -2872,7 +2887,12 @@ export class AgentRunner {
|
|
|
2872
2887
|
&& callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
|
|
2873
2888
|
spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
|
|
2874
2889
|
} : {}),
|
|
2875
|
-
|
|
2890
|
+
...(autoCompactTokens !== undefined && autoCompactTokens >= CLAUDE_AUTO_COMPACT_MIN_TOKENS ? {
|
|
2891
|
+
extraArgs: {
|
|
2892
|
+
...capabilityExtraArgs,
|
|
2893
|
+
autocompact: String(Math.min(autoCompactTokens, CLAUDE_AUTO_COMPACT_MAX_TOKENS)),
|
|
2894
|
+
},
|
|
2895
|
+
} : {}),
|
|
2876
2896
|
advisorModel: 'haiku',
|
|
2877
2897
|
canUseTool: canUseToolCallback,
|
|
2878
2898
|
permissionMode: sdkPermissionMode,
|
|
@@ -3157,7 +3177,7 @@ export class AgentRunner {
|
|
|
3157
3177
|
this.interruptFns.set(sessionId, () => sdkStream.interrupt());
|
|
3158
3178
|
}
|
|
3159
3179
|
// 返回标准 AgentEvent 流(重试由 MessageProcessor 层负责)
|
|
3160
|
-
let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3180
|
+
let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow, autoCompactTokens);
|
|
3161
3181
|
const self = this;
|
|
3162
3182
|
return (async function* () {
|
|
3163
3183
|
try {
|
|
@@ -3175,7 +3195,7 @@ export class AgentRunner {
|
|
|
3175
3195
|
else {
|
|
3176
3196
|
self.interruptFns.delete(sessionId);
|
|
3177
3197
|
}
|
|
3178
|
-
transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3198
|
+
transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow, autoCompactTokens);
|
|
3179
3199
|
emittedAnyEvent = false;
|
|
3180
3200
|
yield* transformed;
|
|
3181
3201
|
return;
|
|
@@ -3373,7 +3393,7 @@ export class AgentRunner {
|
|
|
3373
3393
|
const callEffort = (modelOverride?.effortMode === 'model_default'
|
|
3374
3394
|
? undefined
|
|
3375
3395
|
: modelOverride?.effort ?? (useModel ? this.effort : undefined));
|
|
3376
|
-
const catalog = useModel ? modelOverride?.provider
|
|
3396
|
+
const catalog = useModel ? modelOverride?.provider
|
|
3377
3397
|
? await getRunnerCatalog('claude', undefined, { providerId: modelOverride.provider })
|
|
3378
3398
|
: await this.getModelCatalog() : undefined;
|
|
3379
3399
|
if (callModel)
|
|
@@ -3383,6 +3403,7 @@ export class AgentRunner {
|
|
|
3383
3403
|
const resolvedModel = catalog && callModel
|
|
3384
3404
|
? resolveClaudeModelContext(resolveCatalogModel(catalog, callModel), catalog)
|
|
3385
3405
|
: undefined;
|
|
3406
|
+
const { query } = await import('@anthropic-ai/claude-agent-sdk');
|
|
3386
3407
|
return query({
|
|
3387
3408
|
prompt,
|
|
3388
3409
|
options: {
|
|
@@ -3624,10 +3645,12 @@ export class AgentRunner {
|
|
|
3624
3645
|
return fs.existsSync(sessionFile) ? sessionFile : null;
|
|
3625
3646
|
}
|
|
3626
3647
|
async forkSession(agentSessionId, projectPath, title) {
|
|
3648
|
+
const { forkSession: sdkForkSession } = await import('@anthropic-ai/claude-agent-sdk');
|
|
3627
3649
|
const result = await sdkForkSession(agentSessionId, { dir: projectPath, title });
|
|
3628
3650
|
return result.sessionId;
|
|
3629
3651
|
}
|
|
3630
3652
|
async forkSessionAt(agentSessionId, projectPath, assistantMessageId, title) {
|
|
3653
|
+
const { forkSession: sdkForkSession } = await import('@anthropic-ai/claude-agent-sdk');
|
|
3631
3654
|
const result = await sdkForkSession(agentSessionId, {
|
|
3632
3655
|
dir: projectPath,
|
|
3633
3656
|
upToMessageId: assistantMessageId,
|
|
@@ -3636,11 +3659,13 @@ export class AgentRunner {
|
|
|
3636
3659
|
return result.sessionId;
|
|
3637
3660
|
}
|
|
3638
3661
|
async getSessionMessages(agentSessionId, projectPath) {
|
|
3662
|
+
const { getSessionMessages: sdkGetSessionMessages } = await import('@anthropic-ai/claude-agent-sdk');
|
|
3639
3663
|
return sdkGetSessionMessages(agentSessionId, { dir: projectPath });
|
|
3640
3664
|
}
|
|
3641
3665
|
async rewindFiles(agentSessionId, projectPath, userMessageId) {
|
|
3642
3666
|
logger.info(`[RewindFiles] agentSessionId=${agentSessionId} userMessageId=${userMessageId}`);
|
|
3643
3667
|
const stderrChunks = [];
|
|
3668
|
+
const { query } = await import('@anthropic-ai/claude-agent-sdk');
|
|
3644
3669
|
const tempQuery = query({
|
|
3645
3670
|
prompt: '',
|
|
3646
3671
|
options: {
|
|
@@ -9,7 +9,7 @@ import fs from 'fs';
|
|
|
9
9
|
import path from 'path';
|
|
10
10
|
import { ensureProcessManagedTempDir } from '../../cli/task-context.js';
|
|
11
11
|
import { getPackageRoot, resolvePaths } from '../../paths.js';
|
|
12
|
-
import {
|
|
12
|
+
import { killProcessAsync } from '../../utils/cross-platform.js';
|
|
13
13
|
import { isCurrentManagedHookLauncher } from './diagnostics.js';
|
|
14
14
|
import { registerCodexAppServerProcess, unregisterCodexAppServerProcess, } from './app-server-registry.js';
|
|
15
15
|
const BUILT_IN_CODEX_PROVIDER_IDS = new Set(['openai']);
|
|
@@ -444,35 +444,44 @@ export class CodexAppServerClient {
|
|
|
444
444
|
this.cleanupManagedHookRuntime();
|
|
445
445
|
return;
|
|
446
446
|
}
|
|
447
|
-
//
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
458
|
-
|
|
447
|
+
// Observe this child before closing stdin or dispatching termination. The
|
|
448
|
+
// Windows command is asynchronous, so its exit can arrive while we await it.
|
|
449
|
+
let exited = proc.exitCode !== null || proc.signalCode !== null;
|
|
450
|
+
let resolveExit;
|
|
451
|
+
const exit = new Promise(resolve => { resolveExit = resolve; });
|
|
452
|
+
const onExit = () => { exited = true; resolveExit(); };
|
|
453
|
+
proc.once('exit', onExit);
|
|
454
|
+
let timeout;
|
|
455
|
+
try {
|
|
456
|
+
if (!exited)
|
|
457
|
+
proc.stdin.end();
|
|
458
|
+
if (!exited) {
|
|
459
|
+
if (process.platform === 'win32' && proc.pid)
|
|
460
|
+
await killProcessAsync(proc.pid, false);
|
|
461
|
+
else
|
|
462
|
+
proc.kill('SIGTERM');
|
|
463
|
+
}
|
|
464
|
+
if (exited)
|
|
465
|
+
return;
|
|
466
|
+
// Retain the original five-second grace period after the termination
|
|
467
|
+
// command settles; an observed exit cancels escalation.
|
|
468
|
+
await Promise.race([exit, new Promise(resolve => { timeout = setTimeout(resolve, 5_000); })]);
|
|
469
|
+
if (!exited) {
|
|
459
470
|
logger.warn('[CodexAppServer] Process did not exit after SIGTERM, sending SIGKILL');
|
|
460
471
|
try {
|
|
461
472
|
if (process.platform === 'win32' && proc.pid)
|
|
462
|
-
|
|
473
|
+
await killProcessAsync(proc.pid, true);
|
|
463
474
|
else
|
|
464
475
|
proc.kill('SIGKILL');
|
|
465
476
|
}
|
|
466
477
|
catch { }
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
});
|
|
475
|
-
this.cleanupManagedHookRuntime();
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
finally {
|
|
481
|
+
clearTimeout(timeout);
|
|
482
|
+
proc.off('exit', onExit);
|
|
483
|
+
this.cleanupManagedHookRuntime();
|
|
484
|
+
}
|
|
476
485
|
}
|
|
477
486
|
async ensureStarted() {
|
|
478
487
|
if (this.initialized)
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { assertRunnerModelAllowed, getRunnerCatalog, catalogEfforts, assertCatalogSelectable } from '../core/model/model-catalog.js';
|
|
2
2
|
// Codex/OpenAI API 不认识 Claude Code SDK 的窗口后缀,必须传入基础模型 ID。
|
|
3
3
|
import { parseModelId, stripContextWindowSuffix } from '../core/model/context-window-suffix.js';
|
|
4
|
+
import { EVOLCORE_AUTO_COMPACT_WINDOW_TOKENS, evolcoreAutoCompactTokens } from '../core/model/model-capabilities.js';
|
|
4
5
|
import { formatAsyncQuestionAnswer, hasTrustedFullAccessContext, parseAsyncUserQuestions, unsettledInterruptError, withInterruptDeadline } from './runner-types.js';
|
|
5
6
|
import { requestDangerousCommandPermissionResult } from '../core/permission/approval-gateway.js';
|
|
6
7
|
import { permissionFailureResult } from '../core/permission/permission-result.js';
|
|
@@ -17,7 +18,7 @@ import { catalogHash } from '../core/model/catalog-service.js';
|
|
|
17
18
|
import { summarizeToolInputForAudit } from '../utils/tool-summary.js';
|
|
18
19
|
import { auditCodexApprovalDecision, auditPermissionLifecycle, auditToolInfrastructureFailure, auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
|
|
19
20
|
import { classifyError, ErrorType, getToolResultErrorText, isOutputTokenLimitError, isRetryableError } from '../utils/error-utils.js';
|
|
20
|
-
import { findModelSpec, getGatewayPricing as getSharedGatewayPricing } from '../stats/
|
|
21
|
+
import { findModelSpec, getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
|
|
21
22
|
import { renderActionAsText } from '../core/interaction-router.js';
|
|
22
23
|
import { buildEnvelope, isInteractionSendAccepted, sendInteractionPayload } from '../core/message/message-utils.js';
|
|
23
24
|
import { resolveCodexCapabilityThreadConfigForProject } from '../core/capability/capability-manager.js';
|
|
@@ -28,9 +29,10 @@ import { classifyEvolcoreShellCommand, canonicalizeEvolcoreCommandArgv, literalS
|
|
|
28
29
|
import { compareVersions } from '../utils/npm-ops.js';
|
|
29
30
|
import { agentCodexTokenPath, getPackageRoot, resolvePaths, resolveRoot } from '../paths.js';
|
|
30
31
|
import { CODEX_HOOK_TOKEN_ENV, MAIN_CLI_BIN } from '../product.js';
|
|
31
|
-
import { ensureSessionRuntimeDir, getManagedTaskTempDir } from '../cli/task-context.js';
|
|
32
|
+
import { ensureSessionRuntimeDir, ensureSessionRuntimeDirAsync, getManagedTaskTempDir } from '../cli/task-context.js';
|
|
32
33
|
import { buildTranscriptTurns } from '../core/session/session-transcript.js';
|
|
33
34
|
import { CodexSessionFileAdapter } from '../core/session/adapters/codex-session-file-adapter.js';
|
|
35
|
+
import { readSessionHistoryBackward } from '../core/session/session-fs-store.js';
|
|
34
36
|
import { repairCodexSessionProvider } from '../core/session/session-file-health.js';
|
|
35
37
|
import { execFileSync } from 'child_process';
|
|
36
38
|
import { probeCli, probeCliSync, CODEX_CLI_PROBE_TIMEOUT_MS, CODEX_CLI_PROBE_RETRY_TIMEOUT_MS } from '../utils/cross-platform.js';
|
|
@@ -1090,12 +1092,12 @@ export class CodexRunner {
|
|
|
1090
1092
|
return true;
|
|
1091
1093
|
}
|
|
1092
1094
|
async waitForCodexTurnPersistence(sessionManager, projectPath, threadId, turnId, timeoutMs = 0) {
|
|
1093
|
-
const check = () => {
|
|
1095
|
+
const check = async () => {
|
|
1094
1096
|
try {
|
|
1095
1097
|
if (typeof sessionManager?.checkSessionTurnPersisted === 'function') {
|
|
1096
|
-
return sessionManager.checkSessionTurnPersisted(projectPath, threadId, 'codex', turnId, this.resolvedConfig.agentAid) === true;
|
|
1098
|
+
return await sessionManager.checkSessionTurnPersisted(projectPath, threadId, 'codex', turnId, this.resolvedConfig.agentAid) === true;
|
|
1097
1099
|
}
|
|
1098
|
-
return this.codexSessionFileAdapter.checkTurnPersisted(projectPath, threadId, turnId, this.resolvedConfig.agentAid);
|
|
1100
|
+
return await this.codexSessionFileAdapter.checkTurnPersisted(projectPath, threadId, turnId, this.resolvedConfig.agentAid);
|
|
1099
1101
|
}
|
|
1100
1102
|
catch (error) {
|
|
1101
1103
|
logger.debug(`[CodexRunner] rollout persistence check failed: session=${threadId} turn=${turnId} `
|
|
@@ -1105,7 +1107,7 @@ export class CodexRunner {
|
|
|
1105
1107
|
};
|
|
1106
1108
|
const deadline = Date.now() + Math.max(0, timeoutMs);
|
|
1107
1109
|
while (true) {
|
|
1108
|
-
if (check())
|
|
1110
|
+
if (await check())
|
|
1109
1111
|
return true;
|
|
1110
1112
|
const remaining = deadline - Date.now();
|
|
1111
1113
|
if (remaining <= 0)
|
|
@@ -1154,6 +1156,18 @@ export class CodexRunner {
|
|
|
1154
1156
|
});
|
|
1155
1157
|
}
|
|
1156
1158
|
}
|
|
1159
|
+
/**
|
|
1160
|
+
* Codex 自动压缩阈值:由 EvolCore 统一下发,不依赖 Codex 对模型窗口的推断。
|
|
1161
|
+
* 窗口本身超过 550k 的模型才覆盖,其余保持 Codex 自带的默认策略。
|
|
1162
|
+
*/
|
|
1163
|
+
buildAutoCompactThreadConfig(model) {
|
|
1164
|
+
if (!model)
|
|
1165
|
+
return null;
|
|
1166
|
+
const window = findModelSpec(resolveRoot(), model)?.context_window ?? 0;
|
|
1167
|
+
if (!(window > EVOLCORE_AUTO_COMPACT_WINDOW_TOKENS))
|
|
1168
|
+
return null;
|
|
1169
|
+
return { model_auto_compact_token_limit: evolcoreAutoCompactTokens(window) };
|
|
1170
|
+
}
|
|
1157
1171
|
mergeThreadConfig(...configs) {
|
|
1158
1172
|
const merged = {};
|
|
1159
1173
|
for (const config of configs) {
|
|
@@ -1412,7 +1426,10 @@ export class CodexRunner {
|
|
|
1412
1426
|
* 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
|
|
1413
1427
|
getGatewayPricing() {
|
|
1414
1428
|
const conn = this.currentProviderConfig();
|
|
1415
|
-
|
|
1429
|
+
const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
|
|
1430
|
+
if (!pricing)
|
|
1431
|
+
return undefined;
|
|
1432
|
+
return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
|
|
1416
1433
|
}
|
|
1417
1434
|
getModelCatalog() {
|
|
1418
1435
|
return getRunnerCatalog('codex', this.resolvedConfig.agentAid, this.currentProviderConfig());
|
|
@@ -2345,7 +2362,7 @@ export class CodexRunner {
|
|
|
2345
2362
|
...(fallback
|
|
2346
2363
|
? { sandbox: 'danger-full-access' }
|
|
2347
2364
|
: executionSandbox.sandbox ? { sandbox: executionSandbox.sandbox } : {}),
|
|
2348
|
-
config: this.sanitizeThreadEnvironmentConfig(this.mergeThreadConfig(fallback ? undefined : executionSandbox.permissionProfileConfig, persistentRuntimeEnv ? { shell_environment_policy: { set: persistentRuntimeEnv } } : undefined, capabilityConfig, userInputConfig, externalToolConfig, this.buildEvolcoreShellEnvironmentConfig(sessionId, threadSessionToken, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined), this.buildLifecycleLockdownConfig(callMode)), callMode, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined),
|
|
2365
|
+
config: this.sanitizeThreadEnvironmentConfig(this.mergeThreadConfig(fallback ? undefined : executionSandbox.permissionProfileConfig, persistentRuntimeEnv ? { shell_environment_policy: { set: persistentRuntimeEnv } } : undefined, capabilityConfig, userInputConfig, this.buildAutoCompactThreadConfig(callModel), externalToolConfig, this.buildEvolcoreShellEnvironmentConfig(sessionId, threadSessionToken, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined), this.buildLifecycleLockdownConfig(callMode)), callMode, callMode === 'fullaccess' ? runtimeEnv?.[AGENT_DELEGATION_TOKEN_ENV] : undefined),
|
|
2349
2366
|
...(developerInstructions ? { developerInstructions } : {}),
|
|
2350
2367
|
});
|
|
2351
2368
|
let threadOptions = buildThreadOptions();
|
|
@@ -3079,6 +3096,7 @@ export class CodexRunner {
|
|
|
3079
3096
|
if (!this.isThreadNotFoundError(error))
|
|
3080
3097
|
throw error;
|
|
3081
3098
|
logger.info(`[CodexRunner] Compact thread not loaded, resuming before compact: ${agentSessionId}`);
|
|
3099
|
+
await ensureSessionRuntimeDirAsync(_sessionId);
|
|
3082
3100
|
const compactModel = stripContextWindowSuffix(modelOverride?.model || this.model);
|
|
3083
3101
|
const compactEffort = modelOverride?.effortMode === 'model_default'
|
|
3084
3102
|
? undefined
|
|
@@ -3198,17 +3216,13 @@ export class CodexRunner {
|
|
|
3198
3216
|
const sessionFile = this.findCodexSessionFile(threadId);
|
|
3199
3217
|
if (!sessionFile)
|
|
3200
3218
|
return undefined;
|
|
3201
|
-
let text = '';
|
|
3202
|
-
try {
|
|
3203
|
-
text = fs.readFileSync(sessionFile, 'utf8');
|
|
3204
|
-
}
|
|
3205
|
-
catch {
|
|
3206
|
-
return undefined;
|
|
3207
|
-
}
|
|
3208
3219
|
const threshold = startedAtMs - 1000;
|
|
3209
|
-
|
|
3220
|
+
let atTail = true;
|
|
3221
|
+
for (const raw of readSessionHistoryBackward(sessionFile)) {
|
|
3222
|
+
const line = atTail ? raw.trimEnd() : raw;
|
|
3210
3223
|
if (!line.trim())
|
|
3211
3224
|
continue;
|
|
3225
|
+
atTail = false;
|
|
3212
3226
|
let entry;
|
|
3213
3227
|
try {
|
|
3214
3228
|
entry = JSON.parse(line);
|
|
@@ -3407,6 +3421,7 @@ export class CodexRunner {
|
|
|
3407
3421
|
// callers without that context remain readonly, including old fullaccess
|
|
3408
3422
|
// threads. Do not mutate shared turn/session permission maps while forking.
|
|
3409
3423
|
const sessionKey = context?.sessionId ?? this.findSessionKeyByThread(agentSessionId);
|
|
3424
|
+
await ensureSessionRuntimeDirAsync(sessionKey);
|
|
3410
3425
|
const mode = normalizePermissionMode(context?.permissionMode).mode;
|
|
3411
3426
|
const executionSandbox = this.buildExecutionSandboxOptions(sessionKey, mode, projectPath, undefined, undefined, context ?? {});
|
|
3412
3427
|
const capabilityConfig = await this.resolveCapabilityThreadConfig(projectPath);
|
|
@@ -22,8 +22,8 @@ import { auditToolPreflightDenial } from '../core/auth/authorization-audit.js';
|
|
|
22
22
|
import { resolveEcagentConfig, resolveRuntimeBaseagentModelSelection } from './baseagent.js';
|
|
23
23
|
import { resolveProviderServiceForBaseagent } from '../config/providers.js';
|
|
24
24
|
import { buildModelRequestHeaders } from './request-identity.js';
|
|
25
|
-
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/
|
|
26
|
-
import {
|
|
25
|
+
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
|
|
26
|
+
import { evolcoreAutoCompactTokens, resolveModelCapabilities } from '../core/model/model-capabilities.js';
|
|
27
27
|
import { appendRequestPath } from './request-identity.js';
|
|
28
28
|
import { getManagedTaskTempDir } from '../cli/task-context.js';
|
|
29
29
|
import { unsettledInterruptError, withInterruptDeadline, hasTrustedFullAccessContext, isOneMillionContextModel } from './runner-types.js';
|
|
@@ -478,7 +478,7 @@ function createModel(capabilities, baseUrl) {
|
|
|
478
478
|
contextWindow: capabilities.contextWindow,
|
|
479
479
|
maxTokens: capabilities.maxOutputTokens,
|
|
480
480
|
capabilities,
|
|
481
|
-
autoCompactWindow:
|
|
481
|
+
autoCompactWindow: evolcoreAutoCompactTokens(capabilities.contextWindow, Math.max(DEFAULT_COMPACTION_SETTINGS.reserveTokens, capabilities.maxOutputTokens)),
|
|
482
482
|
compat: {
|
|
483
483
|
maxTokensField: 'max_tokens',
|
|
484
484
|
supportsUsageInStreaming: true,
|
|
@@ -849,7 +849,10 @@ export class EcagentRunner {
|
|
|
849
849
|
* 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
|
|
850
850
|
getGatewayPricing() {
|
|
851
851
|
const conn = this.currentProviderConfig();
|
|
852
|
-
|
|
852
|
+
const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
|
|
853
|
+
if (!pricing)
|
|
854
|
+
return undefined;
|
|
855
|
+
return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
|
|
853
856
|
}
|
|
854
857
|
currentProviderConfig(providerOverride) {
|
|
855
858
|
const providerId = providerOverride ?? this.config.providerId;
|
|
@@ -26,7 +26,7 @@ import { GeminiSessionFileAdapter } from '../core/session/adapters/gemini-sessio
|
|
|
26
26
|
import { logger } from '../utils/logger.js';
|
|
27
27
|
import { normalizeExecutionPermissionMode, normalizePermissionMode } from '../core/permission/mode.js';
|
|
28
28
|
import { resolveRoot } from '../paths.js';
|
|
29
|
-
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/
|
|
29
|
+
import { getGatewayPricing as getSharedGatewayPricing } from '../stats/model-resolver.js';
|
|
30
30
|
import { workspaceContainsHClassPaths } from '../core/permission/protected-paths.js';
|
|
31
31
|
import { buildBubblewrapCommand } from '../core/permission/sandbox-runtime.js';
|
|
32
32
|
import { getManagedTaskTempDir } from '../cli/task-context.js';
|
|
@@ -345,7 +345,10 @@ export class GeminiRunner {
|
|
|
345
345
|
* 缺失/过期时异步触发刷新,本轮先返回旧值或 undefined(回退本地价表)。 */
|
|
346
346
|
getGatewayPricing() {
|
|
347
347
|
const conn = this.currentProviderConfig();
|
|
348
|
-
|
|
348
|
+
const pricing = getSharedGatewayPricing(conn.baseUrl, conn.apiKey, conn.headers);
|
|
349
|
+
if (!pricing)
|
|
350
|
+
return undefined;
|
|
351
|
+
return { ...pricing, source: { baseUrl: conn.baseUrl, providerId: conn.providerId } };
|
|
349
352
|
}
|
|
350
353
|
getModelCatalog() {
|
|
351
354
|
return getRunnerCatalog('gemini', this.agentAid, this.currentProviderConfig());
|