evolcore 0.0.41-test.0 → 0.0.41-test.2
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 +62 -0
- package/dist/agents/baseagent-availability.js +1 -1
- package/dist/agents/baseagent.js +88 -49
- package/dist/agents/claude-runner.js +177 -92
- package/dist/agents/codex-runner.js +146 -71
- package/dist/agents/ecagent-runner.js +1 -1
- package/dist/agents/gemini-runner.js +1 -1
- package/dist/aun/aid/agentmd.js +98 -11
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +26 -2
- package/dist/aun/aid/identity.js +91 -0
- package/dist/aun/aid/index.js +1 -1
- package/dist/aun/aid/managed-operation.js +1 -1
- package/dist/aun/aid/ownership-operation.js +23 -22
- package/dist/aun/group/fs-download.js +39 -0
- package/dist/aun/group/identity.js +36 -21
- package/dist/aun/group/operations.js +5 -0
- package/dist/aun/menu/client.js +27 -0
- package/dist/aun/msg/managed-operation.js +68 -7
- package/dist/aun/msg/p2p.js +8 -8
- package/dist/aun/service-proxy.js +53 -12
- package/dist/channels/aun.js +633 -32
- package/dist/channels/daemon.js +15 -1
- package/dist/cli/agent-command.js +5 -2
- package/dist/cli/agent-create.js +991 -233
- package/dist/cli/agent.js +49 -10
- package/dist/cli/aid-bind-command.js +48 -19
- package/dist/cli/aun-commands.js +48 -36
- package/dist/cli/daemon-commands.js +679 -697
- package/dist/cli/fs-command.js +64 -2
- package/dist/cli/index.js +72 -5
- package/dist/cli/init-channel.js +1 -1
- package/dist/cli/init.js +75 -1
- package/dist/cli/managed-command-guard.js +17 -1
- package/dist/cli/model.js +40 -40
- package/dist/cli/provider-command.js +57 -0
- package/dist/cli/proxy-command.js +92 -0
- package/dist/cli/restart-monitor.js +4 -2
- package/dist/cli/role.js +85 -0
- package/dist/cli/stats.js +10 -3
- package/dist/cli/task-context.js +19 -0
- package/dist/config/access-policy.js +7 -2
- package/dist/config/boot-log.js +39 -1
- package/dist/config/config-field-policy.js +17 -39
- package/dist/config/config-manager.js +183 -44
- package/dist/config/config-operation-service.js +5 -19
- package/dist/config/contact-book-store.js +47 -21
- package/dist/config/contact-book.js +18 -12
- package/dist/config/contact-operation-service.js +3 -4
- package/dist/config/contact-request-service.js +11 -0
- package/dist/config/daemon-services.js +11 -0
- package/dist/config/gateway-config.js +88 -594
- package/dist/config/owner-config.js +2 -2
- package/dist/config/peer-role-resolver.js +15 -12
- package/dist/config/provider-ipc-service.js +132 -0
- package/dist/config/provider-menu-request.js +58 -0
- package/dist/config/providers-config.js +12 -7
- package/dist/config/providers-import.js +3 -21
- package/dist/config/providers-management.js +78 -5
- package/dist/config/resolved-config-op.js +11 -1
- package/dist/config/role-command-service.js +166 -0
- package/dist/config/role-request-service.js +193 -0
- package/dist/config/schema-migration.js +1000 -25
- package/dist/config-store.js +89 -4
- package/dist/contracts/ecweb-instance.js +41 -0
- package/dist/contracts/ecweb-service-protocol.js +4 -1
- package/dist/core/agent-application-service.js +60 -11
- package/dist/core/agent-create-status.js +203 -0
- package/dist/core/agent-creation-claim.js +177 -0
- package/dist/core/agent-ipc-registration.js +39 -18
- package/dist/core/agent-runtime.js +194 -24
- package/dist/core/auth/agent-delegation.js +6 -3
- package/dist/core/auth/auth-gateway.js +67 -2
- package/dist/core/auth/authorization-audit.js +58 -11
- package/dist/core/auth/delegation-authorization.js +5 -2
- package/dist/core/auth/operation-authorizer.js +43 -6
- package/dist/core/auth/operation-catalog.js +45 -7
- package/dist/core/channel-loader.js +2 -0
- package/dist/core/command/agent-control.js +260 -21
- package/dist/core/command/agent-storage-menu.js +5 -3
- package/dist/core/command/cli-intent-parser.js +8 -3
- package/dist/core/command/command-handler.js +112 -154
- package/dist/core/command/connect-menu.js +11 -3
- package/dist/core/command/data-root-resolver.js +5 -4
- package/dist/core/command/memory-slash.js +16 -8
- package/dist/core/command/menu-catalog.js +10 -6
- package/dist/core/command/menu-handler.js +106 -73
- package/dist/core/command/menu-protocol.js +15 -1
- package/dist/core/command/provider-menu.js +46 -0
- package/dist/core/command/role-menu.js +147 -30
- package/dist/core/command/slash-handler.js +125 -255
- package/dist/core/daemon-control.js +26 -27
- package/dist/core/event-catalog.js +10 -0
- package/dist/core/evolagent-registry.js +7 -5
- package/dist/core/evolagent.js +10 -8
- package/dist/core/file-integrity/store.js +11 -0
- package/dist/core/handoff/ipc-registration.js +3 -0
- package/dist/core/inference/text-inference.js +31 -40
- package/dist/core/initialization/service.js +491 -0
- package/dist/core/ipc-registration.js +40 -24
- package/dist/core/memory/consolidation-context.js +51 -5
- package/dist/core/memory/consolidation-ops-records.js +96 -1
- package/dist/core/memory/consolidation-trigger.js +208 -191
- package/dist/core/memory/consolidation.js +333 -35
- package/dist/core/memory/index-manager.js +27 -5
- package/dist/core/memory/memory-admin.js +45 -5
- package/dist/core/memory/memory-writer.js +163 -18
- package/dist/core/memory/relation-idle-monitor.js +119 -58
- package/dist/core/memory/relation-sweep.js +55 -45
- package/dist/core/message/aun-ipc-sender.js +81 -69
- package/dist/core/message/im-renderer.js +25 -4
- package/dist/core/message/message-admission.js +89 -4
- package/dist/core/message/message-bridge.js +66 -21
- package/dist/core/message/response-engine.js +108 -35
- package/dist/core/model/catalog-service.js +5 -3
- package/dist/core/model/config-scope.js +29 -71
- package/dist/core/model/field-scope.js +1 -1
- package/dist/core/model/model-catalog.js +30 -41
- package/dist/core/model/model-diagnostics.js +4 -3
- package/dist/core/model/model-fallback.js +10 -7
- package/dist/core/model/model-permission.js +3 -2
- package/dist/core/ownership/owner-resolver.js +772 -158
- package/dist/core/permission/approval-gateway.js +103 -403
- package/dist/core/permission/ec-command-parser.js +62 -6
- package/dist/core/permission/index.js +1 -0
- package/dist/core/permission/permission-result.js +78 -0
- package/dist/core/permission/sandbox-runtime.js +18 -1
- package/dist/core/permission/tool-policy.js +21 -46
- package/dist/core/relation/peer-identity.js +64 -1
- package/dist/core/role/runtime-policy.js +72 -13
- package/dist/core/session/session-capsule.js +1 -1
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +20 -0
- package/dist/core/session/session-renew.js +3 -3
- package/dist/core/skill/index-generator.js +15 -5
- package/dist/core/system-session/memory.js +43 -8
- package/dist/core/thread/thread-service.js +19 -6
- package/dist/directory/owner-directory-admission.js +95 -0
- package/dist/directory/owner-directory-authorization.js +309 -0
- package/dist/directory/owner-directory-cache.js +635 -0
- package/dist/eck/kit-renderer.js +2 -2
- package/dist/ecweb/basic-settings-service.js +33 -40
- package/dist/ecweb/init-menu.js +32 -0
- package/dist/ecweb/message-context-service.js +110 -0
- package/dist/index.js +93 -19
- package/dist/ipc.js +247 -29
- package/dist/paths.js +7 -0
- package/dist/proxy/command.js +122 -0
- package/dist/proxy/ipc-service.js +68 -0
- package/dist/proxy/manager.js +484 -0
- package/dist/proxy/service-supervisor.js +603 -0
- package/dist/response-system/engines/v1/proactive-flow.js +16 -6
- package/dist/trigger/authorization.js +27 -17
- package/dist/trigger/feedback.js +2 -3
- package/dist/trigger/ipc-service.js +105 -78
- package/dist/trigger/local-files.js +2 -1
- package/dist/trigger/manager.js +5 -3
- package/dist/trigger/scheduler.js +88 -6
- package/dist/utils/atomic-write.js +28 -0
- package/dist/utils/cross-platform.js +14 -0
- package/dist/utils/ecweb-supervisor.js +258 -83
- package/dist/utils/error-utils.js +26 -2
- package/dist/utils/logger.js +92 -6
- package/dist/utils/package-version-info.js +4 -2
- package/dist/utils/welcome.js +1 -1
- package/kits/docs/INDEX.md +1 -0
- package/kits/docs/aun/SDK.md +4 -1
- package/kits/docs/channels/aun.md +9 -0
- package/kits/docs/evolcore/INDEX.md +1 -0
- package/kits/docs/evolcore/agent.md +8 -1
- package/kits/docs/evolcore/aid.md +67 -17
- package/kits/docs/evolcore/config.md +28 -7
- package/kits/docs/evolcore/contact.md +3 -0
- package/kits/docs/evolcore/fs.md +11 -0
- package/kits/docs/evolcore/group.md +1 -1
- package/kits/docs/evolcore/memory-architecture.md +2 -2
- package/kits/docs/evolcore/memory-consolidation.md +32 -8
- package/kits/docs/evolcore/memory.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +4 -0
- package/kits/docs/evolcore/model.md +23 -20
- package/kits/docs/evolcore/msg.md +4 -7
- package/kits/docs/evolcore/provider.md +50 -0
- package/kits/docs/identity/AID_PROFILE_SPEC.md +52 -17
- package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
- package/kits/rules/01-overview.md +3 -0
- package/kits/rules/04-relation.md +1 -1
- package/kits/schemas/_meta.json +37 -4
- package/kits/schemas/agent-config.schema.13.json +8 -3
- package/kits/schemas/agent-config.schema.16.json +891 -0
- package/kits/schemas/daemon.schema.9.json +366 -0
- package/kits/schemas/defaults.schema.5.json +406 -127
- package/kits/schemas/relation-config.schema.11.json +277 -0
- package/kits/schemas/role-config.schema.1.json +7 -7
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ec-agent-create/SKILL.md +3 -0
- package/kits/skills/ec-identity/SKILL.md +2 -2
- package/kits/skills/ec-service-proxy/SKILL.md +118 -0
- package/kits/skills/ec-skill/scripts/skill.mjs +6 -0
- package/kits/skills/personal-assistant/SKILL.md +176 -0
- package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
- package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
- package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
- package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
- package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
- package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
- package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
- package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
- package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
- package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
- package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
- package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
- package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
- package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
- package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
- package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
- package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
- package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
- package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
- package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
- package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
- package/kits/skills/thread-ops/SKILL.md +5 -0
- package/kits/templates/memory-consolidation/forget.md +19 -6
- package/kits/templates/memory-consolidation/notes.md +1 -1
- package/kits/templates/memory-consolidation/profile.md +2 -2
- package/kits/templates/memory-consolidation/promote.md +20 -3
- package/kits/templates/roles/member.json +8 -1
- package/kits/templates/system-fragments/baseagent.md +2 -2
- package/kits/templates/system-fragments/memory.md +4 -4
- package/kits/templates/system-fragments/venue.md +1 -1
- package/package.json +7 -3
- package/dist/core/message/create-status.js +0 -96
|
@@ -662,7 +662,7 @@ export class AgentRunner {
|
|
|
662
662
|
if (!this.agentAid)
|
|
663
663
|
return this.config;
|
|
664
664
|
try {
|
|
665
|
-
const raw = resolveEffective({ self: this.agentAid }, { cache: true
|
|
665
|
+
const raw = resolveEffective({ self: this.agentAid }, { cache: true });
|
|
666
666
|
return { agents: { claude: raw.baseagents?.claude ?? this.config?.agents?.claude } };
|
|
667
667
|
}
|
|
668
668
|
catch {
|
|
@@ -733,7 +733,7 @@ export class AgentRunner {
|
|
|
733
733
|
let agentConfig = this.agentConfig;
|
|
734
734
|
if (this.agentAid) {
|
|
735
735
|
try {
|
|
736
|
-
agentConfig = resolveEffective({ self: this.agentAid }, { cache: true
|
|
736
|
+
agentConfig = resolveEffective({ self: this.agentAid }, { cache: true });
|
|
737
737
|
}
|
|
738
738
|
catch { }
|
|
739
739
|
}
|
|
@@ -2174,51 +2174,59 @@ export class AgentRunner {
|
|
|
2174
2174
|
}
|
|
2175
2175
|
: resolvePhaseOneExecutionSandbox(callPermissionMode, runPermissionContext?.role);
|
|
2176
2176
|
const inputId = modelOverride?.turn?.inputId ?? crypto.randomUUID();
|
|
2177
|
-
|
|
2178
|
-
|
|
2179
|
-
|
|
2180
|
-
|
|
2181
|
-
|
|
2182
|
-
|
|
2183
|
-
|
|
2184
|
-
|
|
2185
|
-
|
|
2186
|
-
|
|
2187
|
-
|
|
2188
|
-
|
|
2189
|
-
|
|
2190
|
-
|
|
2191
|
-
|
|
2192
|
-
|
|
2193
|
-
|
|
2194
|
-
|
|
2195
|
-
|
|
2196
|
-
|
|
2197
|
-
|
|
2198
|
-
|
|
2199
|
-
|
|
2200
|
-
|
|
2201
|
-
|
|
2202
|
-
|
|
2203
|
-
|
|
2204
|
-
|
|
2205
|
-
|
|
2206
|
-
|
|
2207
|
-
|
|
2208
|
-
|
|
2209
|
-
|
|
2210
|
-
|
|
2211
|
-
|
|
2212
|
-
|
|
2213
|
-
|
|
2214
|
-
|
|
2215
|
-
|
|
2216
|
-
|
|
2217
|
-
|
|
2218
|
-
|
|
2219
|
-
|
|
2220
|
-
|
|
2221
|
-
|
|
2177
|
+
const activeSandboxFailure = executionSandbox.state !== 'off'
|
|
2178
|
+
? getActiveSandboxInitializationFailure(undefined, undefined, sessionId)
|
|
2179
|
+
: undefined;
|
|
2180
|
+
let sandboxFallback = !!activeSandboxFailure && process.platform === 'linux';
|
|
2181
|
+
if (activeSandboxFailure) {
|
|
2182
|
+
const detail = createSandboxInitializationError(new Error(`sandbox bootstrap circuit open; firstObservedAt=${activeSandboxFailure.openedAt} ` +
|
|
2183
|
+
`occurrences=${activeSandboxFailure.occurrences}; ${activeSandboxFailure.detail}`));
|
|
2184
|
+
const context = this.permissionContexts.get(sessionId);
|
|
2185
|
+
auditToolInfrastructureFailure({
|
|
2186
|
+
toolName: 'Bash',
|
|
2187
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
2188
|
+
reason: detail.message.slice(0, 512),
|
|
2189
|
+
sessionId,
|
|
2190
|
+
agentAid: context?.selfAid,
|
|
2191
|
+
agentName: context?.agentName,
|
|
2192
|
+
permissionMode: callPermissionMode,
|
|
2193
|
+
role: context?.role,
|
|
2194
|
+
callId: inputId,
|
|
2195
|
+
taskId: context?.taskId,
|
|
2196
|
+
occurrences: activeSandboxFailure.occurrences,
|
|
2197
|
+
fallback: sandboxFallback,
|
|
2198
|
+
sandboxFailure: {
|
|
2199
|
+
kind: activeSandboxFailure.kind,
|
|
2200
|
+
observation: sandboxFallback ? 'fallback' : 'circuit_open',
|
|
2201
|
+
counters: getSandboxInitializationFailureCounters(),
|
|
2202
|
+
},
|
|
2203
|
+
});
|
|
2204
|
+
await context?.recordExecutionAnomaly?.({
|
|
2205
|
+
code: 'capability_unavailable',
|
|
2206
|
+
severity: 'warning',
|
|
2207
|
+
phase: 'execution',
|
|
2208
|
+
occurredAt: Date.now(),
|
|
2209
|
+
correlationId: inputId,
|
|
2210
|
+
requestId: inputId,
|
|
2211
|
+
sessionId,
|
|
2212
|
+
toolName: 'Bash',
|
|
2213
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
2214
|
+
decisionSource: 'infrastructure',
|
|
2215
|
+
agentAid: context?.selfAid,
|
|
2216
|
+
agentName: context?.agentName,
|
|
2217
|
+
permissionMode: callPermissionMode,
|
|
2218
|
+
summary: detail.message.slice(0, 512),
|
|
2219
|
+
effect: sandboxFallback ? 'fallback_used' : 'operation_skipped',
|
|
2220
|
+
});
|
|
2221
|
+
if (sandboxFallback) {
|
|
2222
|
+
logger.warn(`[ClaudeSandbox] inner sandbox circuit open; continuing with outer H-class guard ` +
|
|
2223
|
+
`cooldownMs=${SANDBOX_INITIALIZATION_COOLDOWN_MS} occurrences=${activeSandboxFailure.occurrences}`);
|
|
2224
|
+
}
|
|
2225
|
+
else if (shouldLogSandboxCircuitNotice()) {
|
|
2226
|
+
logger.warn(`[ClaudeSandbox] bootstrap circuit open; skipping subprocess spawn ` +
|
|
2227
|
+
`cooldownMs=${SANDBOX_INITIALIZATION_COOLDOWN_MS} occurrences=${activeSandboxFailure.occurrences}`);
|
|
2228
|
+
}
|
|
2229
|
+
if (!sandboxFallback)
|
|
2222
2230
|
return (async function* () {
|
|
2223
2231
|
yield {
|
|
2224
2232
|
type: 'complete',
|
|
@@ -2229,7 +2237,6 @@ export class AgentRunner {
|
|
|
2229
2237
|
queryFinal: true,
|
|
2230
2238
|
};
|
|
2231
2239
|
})();
|
|
2232
|
-
}
|
|
2233
2240
|
}
|
|
2234
2241
|
const permissionPrompt = runPermissionContext?.sendPrompt ?? this.sendPromptFn;
|
|
2235
2242
|
const permissionContext = (signal) => {
|
|
@@ -2707,7 +2714,7 @@ export class AgentRunner {
|
|
|
2707
2714
|
const excludeDynamic = this.config?.agents?.claude?.excludeDynamicSections === true;
|
|
2708
2715
|
// 公共 options(新旧模式共用)
|
|
2709
2716
|
const sdkPermissionMode = this.toSdkPermissionMode(requestedPermissionMode);
|
|
2710
|
-
// 本次调用使用的模型/强度:优先 modelOverride(
|
|
2717
|
+
// 本次调用使用的模型/强度:优先 modelOverride(response-engine 取 Agent 级配置后传入),
|
|
2711
2718
|
// 缺省回落 agent 级 this.model。作为 per-call 入参传入,无共享状态,多对端并发互不污染。
|
|
2712
2719
|
const callModel = modelOverride?.model || this.model;
|
|
2713
2720
|
const callEffort = (modelOverride?.effortMode === 'model_default'
|
|
@@ -2716,7 +2723,7 @@ export class AgentRunner {
|
|
|
2716
2723
|
const callSessionTitle = sanitizeSessionTitle(modelOverride?.sessionTitle);
|
|
2717
2724
|
logger.info(`[AgentRunner] runQuery model=${callModel} effort=${callEffort ?? 'auto'} ` +
|
|
2718
2725
|
`permMode=${requestedPermissionMode}->${callPermissionMode} role=${runPermissionContext?.role ?? 'none'} ` +
|
|
2719
|
-
`sandbox=${executionSandbox.state} sdkMode=${sdkPermissionMode}`);
|
|
2726
|
+
`sandbox=${sandboxFallback ? 'outer-guard-fallback' : executionSandbox.state} sdkMode=${sdkPermissionMode}`);
|
|
2720
2727
|
if (systemPromptAppend) {
|
|
2721
2728
|
logger.info(`[AgentRunner] systemPromptAppend: ${systemPromptAppend.length} chars`);
|
|
2722
2729
|
}
|
|
@@ -2726,14 +2733,16 @@ export class AgentRunner {
|
|
|
2726
2733
|
const catalogModel = resolveCatalogModel(runCatalog, callModel);
|
|
2727
2734
|
const { sdkModel, contextWindow } = resolveClaudeModelContext(catalogModel, runCatalog);
|
|
2728
2735
|
const agentEnv = this.getAgentEnv(runtimeEnv, sessionId, callPermissionMode, modelOverride?.provider);
|
|
2729
|
-
const dependencies = executionSandbox.state !== 'off'
|
|
2736
|
+
const dependencies = executionSandbox.state !== 'off' && !sandboxFallback
|
|
2737
|
+
? inspectClaudeSandboxDependencies(agentEnv)
|
|
2738
|
+
: undefined;
|
|
2730
2739
|
if (dependencies?.status === 'missing')
|
|
2731
2740
|
throw createClaudeSandboxDependencyError(dependencies);
|
|
2732
2741
|
const capabilityOptions = await this.resolveCapabilityRunOptions(projectPath);
|
|
2733
2742
|
const managedSettings = callPermissionMode === 'fullaccess'
|
|
2734
2743
|
? undefined
|
|
2735
2744
|
: buildClaudeManagedLockdownSettings(capabilityOptions, dependencies);
|
|
2736
|
-
|
|
2745
|
+
let sandboxOptions = executionSandbox.state === 'off' || sandboxFallback
|
|
2737
2746
|
? { enabled: false }
|
|
2738
2747
|
: await (async () => {
|
|
2739
2748
|
const sandboxProjectionStartedAt = Date.now();
|
|
@@ -2812,7 +2821,8 @@ export class AgentRunner {
|
|
|
2812
2821
|
...(managedSettings ? { managedSettings } : {}),
|
|
2813
2822
|
...(callEffort ? { effort: callEffort } : {}),
|
|
2814
2823
|
...(this.claudeExecutablePath ? { pathToClaudeCodeExecutable: this.claudeExecutablePath } : {}),
|
|
2815
|
-
...(executionSandbox.state === 'off'
|
|
2824
|
+
...((executionSandbox.state === 'off' || sandboxFallback)
|
|
2825
|
+
&& callPermissionMode !== 'fullaccess' && process.platform === 'linux' ? {
|
|
2816
2826
|
spawnClaudeCodeProcess: (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid),
|
|
2817
2827
|
} : {}),
|
|
2818
2828
|
autoCompactWindow: sdkAutoCompactWindowForModel(sdkModel, contextWindow),
|
|
@@ -2985,46 +2995,100 @@ export class AgentRunner {
|
|
|
2985
2995
|
}
|
|
2986
2996
|
}
|
|
2987
2997
|
let sdkStream;
|
|
2988
|
-
const
|
|
2989
|
-
|
|
2990
|
-
|
|
2991
|
-
|
|
2992
|
-
|
|
2993
|
-
|
|
2994
|
-
|
|
2995
|
-
|
|
2996
|
-
|
|
2997
|
-
|
|
2998
|
-
|
|
2999
|
-
|
|
3000
|
-
|
|
3001
|
-
|
|
3002
|
-
|
|
3003
|
-
|
|
3004
|
-
|
|
2998
|
+
const createMessageStream = () => {
|
|
2999
|
+
const stream = new MessageStream();
|
|
3000
|
+
stream.push(prompt, images && images.length > 0 ? images : undefined, inputId);
|
|
3001
|
+
return stream;
|
|
3002
|
+
};
|
|
3003
|
+
let msgStream = createMessageStream();
|
|
3004
|
+
const retryWithOuterGuard = async (error, stderr, failureAlreadyRecorded = false) => {
|
|
3005
|
+
if (process.platform !== 'linux' || executionSandbox.state === 'off' || sandboxFallback
|
|
3006
|
+
|| !isSandboxInitializationFailure(error, stderr))
|
|
3007
|
+
return false;
|
|
3008
|
+
const previousCircuit = failureAlreadyRecorded
|
|
3009
|
+
? getActiveSandboxInitializationFailure(undefined, undefined, sessionId)
|
|
3010
|
+
: undefined;
|
|
3011
|
+
const { detail, occurrences } = failureAlreadyRecorded
|
|
3012
|
+
? {
|
|
3013
|
+
detail: createSandboxInitializationError(error, stderr),
|
|
3014
|
+
occurrences: previousCircuit?.occurrences ?? 1,
|
|
3005
3015
|
}
|
|
3006
|
-
|
|
3016
|
+
: await this.recordSandboxInfrastructureFailure(sessionId, inputId, callPermissionMode, error, stderr);
|
|
3017
|
+
const context = this.permissionContexts.get(sessionId);
|
|
3018
|
+
const circuit = previousCircuit ?? getActiveSandboxInitializationFailure(undefined, undefined, sessionId);
|
|
3019
|
+
if (circuit) {
|
|
3020
|
+
auditToolInfrastructureFailure({
|
|
3021
|
+
toolName: 'Bash',
|
|
3022
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
3023
|
+
reason: detail.message.slice(0, 512),
|
|
3024
|
+
sessionId,
|
|
3025
|
+
agentAid: context?.selfAid,
|
|
3026
|
+
agentName: context?.agentName,
|
|
3027
|
+
permissionMode: callPermissionMode,
|
|
3028
|
+
role: context?.role,
|
|
3029
|
+
callId: inputId,
|
|
3030
|
+
taskId: context?.taskId,
|
|
3031
|
+
occurrences,
|
|
3032
|
+
fallback: true,
|
|
3033
|
+
sandboxFailure: {
|
|
3034
|
+
kind: circuit.kind,
|
|
3035
|
+
observation: 'fallback',
|
|
3036
|
+
counters: getSandboxInitializationFailureCounters(),
|
|
3037
|
+
},
|
|
3038
|
+
});
|
|
3007
3039
|
}
|
|
3008
|
-
|
|
3009
|
-
|
|
3010
|
-
|
|
3011
|
-
|
|
3012
|
-
|
|
3013
|
-
|
|
3040
|
+
await context?.recordExecutionAnomaly?.({
|
|
3041
|
+
code: 'capability_unavailable',
|
|
3042
|
+
severity: 'warning',
|
|
3043
|
+
phase: 'execution',
|
|
3044
|
+
occurredAt: Date.now(),
|
|
3045
|
+
correlationId: inputId,
|
|
3046
|
+
requestId: inputId,
|
|
3047
|
+
sessionId,
|
|
3048
|
+
toolName: 'Bash',
|
|
3049
|
+
policyCode: SANDBOX_INITIALIZATION_FAILED,
|
|
3050
|
+
decisionSource: 'infrastructure',
|
|
3051
|
+
agentAid: context?.selfAid,
|
|
3052
|
+
agentName: context?.agentName,
|
|
3053
|
+
permissionMode: callPermissionMode,
|
|
3054
|
+
summary: `Claude inner sandbox unavailable; retrying with outer H-class guard: ${detail.message}`.slice(0, 512),
|
|
3055
|
+
effect: 'fallback_used',
|
|
3056
|
+
});
|
|
3057
|
+
sandboxFallback = true;
|
|
3058
|
+
sandboxOptions = { enabled: false };
|
|
3059
|
+
commonOptions.sandbox = sandboxOptions;
|
|
3060
|
+
if (callPermissionMode !== 'fullaccess') {
|
|
3061
|
+
commonOptions.spawnClaudeCodeProcess = (options) => spawnClaudeWithHClassGuard(options, resolvePaths().root, handleClaudeStderr, runPermissionContext?.selfAid ?? this.agentAid);
|
|
3014
3062
|
}
|
|
3015
|
-
|
|
3016
|
-
|
|
3017
|
-
|
|
3018
|
-
|
|
3019
|
-
|
|
3020
|
-
|
|
3021
|
-
|
|
3022
|
-
|
|
3023
|
-
|
|
3024
|
-
|
|
3025
|
-
|
|
3026
|
-
|
|
3063
|
+
logger.warn(`[ClaudeSandbox] inner sandbox initialization failed; retrying with outer H-class guard session=${sessionId}: ${detail.message}`);
|
|
3064
|
+
return true;
|
|
3065
|
+
};
|
|
3066
|
+
const createPushedQuery = () => {
|
|
3067
|
+
msgStream = createMessageStream();
|
|
3068
|
+
return createQuery(msgStream, agentSessionId, resumeAt);
|
|
3069
|
+
};
|
|
3070
|
+
try {
|
|
3071
|
+
if (images && images.length > 0) {
|
|
3072
|
+
logger.info('[AgentRunner] Creating query with images:', images.length, 'first image size:', images[0]?.data?.length ?? 0);
|
|
3073
|
+
}
|
|
3074
|
+
else {
|
|
3075
|
+
logger.debug('[AgentRunner] Creating query with text only, agentSessionId:', initialClaudeSessionId);
|
|
3027
3076
|
}
|
|
3077
|
+
sdkStream = createPushedQuery();
|
|
3078
|
+
}
|
|
3079
|
+
catch (error) {
|
|
3080
|
+
const stderr = this.recentStderr.get(sessionId) ?? [];
|
|
3081
|
+
if (isClaudeStartupArgumentsTooLong(error))
|
|
3082
|
+
throw createClaudeStartupArgumentsTooLongError(error);
|
|
3083
|
+
if (isClaudeCodeStartupProcessError(error))
|
|
3084
|
+
throw createClaudeCodeStartupError(error);
|
|
3085
|
+
if (await retryWithOuterGuard(error, stderr))
|
|
3086
|
+
sdkStream = createPushedQuery();
|
|
3087
|
+
else if (isSandboxInitializationFailure(error, stderr)) {
|
|
3088
|
+
throw createSandboxInitializationError(error, stderr);
|
|
3089
|
+
}
|
|
3090
|
+
else
|
|
3091
|
+
throw error;
|
|
3028
3092
|
}
|
|
3029
3093
|
this.activeMessageStreams.set(sessionId, msgStream);
|
|
3030
3094
|
this.activeQueries.set(sessionId, sdkStream);
|
|
@@ -3037,11 +3101,32 @@ export class AgentRunner {
|
|
|
3037
3101
|
this.interruptFns.set(sessionId, () => sdkStream.interrupt());
|
|
3038
3102
|
}
|
|
3039
3103
|
// 返回标准 AgentEvent 流(重试由 MessageProcessor 层负责)
|
|
3040
|
-
|
|
3104
|
+
let transformed = this.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, sandboxSettingsFile, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3041
3105
|
const self = this;
|
|
3042
3106
|
return (async function* () {
|
|
3043
3107
|
try {
|
|
3044
|
-
|
|
3108
|
+
let emittedAnyEvent = false;
|
|
3109
|
+
for await (const event of transformed) {
|
|
3110
|
+
if (!emittedAnyEvent && event.type === 'complete'
|
|
3111
|
+
&& event.terminalReason === SANDBOX_INITIALIZATION_FAILED
|
|
3112
|
+
&& await retryWithOuterGuard(new Error(event.errors?.[0] ?? SANDBOX_INITIALIZATION_FAILED), [], true)) {
|
|
3113
|
+
sdkStream = createPushedQuery();
|
|
3114
|
+
self.activeQueries.set(sessionId, sdkStream);
|
|
3115
|
+
self.activeMessageStreams.set(sessionId, msgStream);
|
|
3116
|
+
if ('interrupt' in sdkStream && typeof sdkStream.interrupt === 'function') {
|
|
3117
|
+
self.interruptFns.set(sessionId, () => sdkStream.interrupt());
|
|
3118
|
+
}
|
|
3119
|
+
else {
|
|
3120
|
+
self.interruptFns.delete(sessionId);
|
|
3121
|
+
}
|
|
3122
|
+
transformed = self.transformStream(sdkStream, sessionId, inputId, callModel, callEffort, sdkModel, !!agentSessionId, undefined, callPermissionMode, modelOverride?.turn, projectPath, topicBinding, recoverySessionId, contextWindow);
|
|
3123
|
+
emittedAnyEvent = false;
|
|
3124
|
+
yield* transformed;
|
|
3125
|
+
return;
|
|
3126
|
+
}
|
|
3127
|
+
emittedAnyEvent = true;
|
|
3128
|
+
yield event;
|
|
3129
|
+
}
|
|
3045
3130
|
}
|
|
3046
3131
|
finally {
|
|
3047
3132
|
self.cleanupSandboxSettingsFile(sessionId, sandboxSettingsFile);
|
|
@@ -3553,7 +3638,7 @@ export class ClaudeAgentPlugin {
|
|
|
3553
3638
|
}
|
|
3554
3639
|
createAgent(agent, callbacks) {
|
|
3555
3640
|
const override = agent.config.baseagents?.claude;
|
|
3556
|
-
const rawConfig = resolveEffective({ self: agent.aid }, { cache: true
|
|
3641
|
+
const rawConfig = resolveEffective({ self: agent.aid }, { cache: true });
|
|
3557
3642
|
const anthropic = resolveAnthropicConfig({ agents: { claude: rawConfig.baseagents?.claude } }, undefined, { agentAid: agent.aid, projectPath: agent.projectPath });
|
|
3558
3643
|
const merged = {
|
|
3559
3644
|
agents: { claude: { ...(override || {}) } },
|