evolcore 0.0.43-test.5 → 0.0.43-test.7
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 +95 -0
- package/bin/ecmsg.js +281 -81
- package/dist/agents/baseagent-availability.js +20 -5
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +36 -3
- package/dist/agents/codex-runner.js +75 -8
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/msg/p2p.js +6 -1
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +306 -30
- package/dist/cli/agent-create.js +18 -8
- package/dist/cli/aun-commands.js +9 -1
- package/dist/cli/daemon-commands.js +34 -65
- package/dist/cli/daemon-lifecycle-client.js +61 -0
- package/dist/cli/ecmsg-gateway.js +38 -3
- package/dist/cli/events-command.js +73 -0
- package/dist/cli/index.js +31 -14
- package/dist/cli/init.js +75 -0
- package/dist/cli/invoke-command.js +182 -0
- package/dist/cli/managed-command-guard.js +6 -1
- package/dist/cli/provider-command.js +1 -1
- package/dist/cli/restart-monitor.js +67 -50
- package/dist/cli/services-command.js +111 -0
- package/dist/cli/task-context.js +38 -1
- package/dist/cli/team-workspace-command.js +134 -0
- package/dist/cli/thread-command.js +6 -2
- package/dist/cli/watch-logs.js +6 -4
- package/dist/cli/watch-msg.js +1 -1
- package/dist/config/boot-log.js +6 -4
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-field-policy.js +2 -2
- package/dist/config/config-manager.js +1 -8
- package/dist/config/invoke-ipc-service.js +118 -0
- package/dist/config/peer-role-resolver.js +1 -1
- package/dist/config/provider-identity-migration.js +92 -17
- package/dist/config/provider-local-sync.js +2 -0
- package/dist/config/providers-config.js +13 -0
- package/dist/config/providers-management.js +100 -10
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +86 -88
- package/dist/config/snapshot.js +70 -41
- package/dist/config-store.js +2 -1
- package/dist/core/agent-reload-coordinator.js +6 -4
- package/dist/core/agent-runtime.js +146 -15
- package/dist/core/auth/delegation-authorization.js +66 -0
- package/dist/core/auth/operation-catalog.js +20 -0
- package/dist/core/baseagent-loader.js +75 -42
- package/dist/core/channel-loader.js +45 -13
- package/dist/core/channel-runtime.js +116 -45
- package/dist/core/command/agent-control.js +1 -1
- package/dist/core/command/agent-storage-menu.js +1 -1
- package/dist/core/command/chatmode-config.js +2 -36
- package/dist/core/command/command-handler.js +58 -16
- package/dist/core/command/data-root-resolver.js +32 -23
- package/dist/core/command/eventcenter-menu.js +338 -0
- package/dist/core/command/menu-catalog.js +8 -0
- package/dist/core/command/menu-handler.js +206 -87
- package/dist/core/command/menu-protocol.js +142 -22
- package/dist/core/command/menu-query-batch.js +194 -0
- package/dist/core/command/role-menu.js +27 -15
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +34 -42
- package/dist/core/command/team-workspace-bootstrap.js +350 -0
- package/dist/core/command/{pa-workspace-calendar.js → team-workspace-calendar.js} +7 -7
- package/dist/core/command/team-workspace-initializer.js +2 -0
- package/dist/core/command/{pa-workspace-items.js → team-workspace-items.js} +83 -68
- package/dist/core/command/team-workspace-job-store.js +88 -0
- package/dist/core/command/team-workspace-management-service.js +2 -0
- package/dist/core/command/team-workspace-management-store.js +96 -0
- package/dist/core/command/team-workspace-management.js +265 -0
- package/dist/core/command/team-workspace-members-menu.js +88 -0
- package/dist/core/command/team-workspace-store.js +612 -0
- package/dist/core/command/team-workspace-team.js +193 -0
- package/dist/core/daemon-control.js +45 -15
- package/dist/core/daemon-lifecycle.js +478 -75
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +130 -42
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +4 -4
- package/dist/core/invoke/executors/index.js +13 -0
- package/dist/core/invoke/executors/media.js +283 -0
- package/dist/core/invoke/executors/text.js +198 -0
- package/dist/core/invoke/invoke-service.js +157 -0
- package/dist/core/invoke/style-router.js +48 -0
- package/dist/core/invoke/types.js +19 -0
- package/dist/core/ipc-registration.js +51 -11
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/memory/consolidation.js +7 -5
- package/dist/core/message/aun-ipc-sender.js +149 -19
- package/dist/core/message/im-renderer.js +28 -84
- package/dist/core/message/message-bridge.js +57 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/message-utils.js +10 -2
- package/dist/core/message/peer-mode.js +7 -34
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +163 -52
- package/dist/core/message/send-options.js +7 -4
- package/dist/core/message/send-routing.js +55 -7
- package/dist/core/ownership/owner-resolver.js +8 -0
- package/dist/core/permission/ec-command-parser.js +14 -3
- package/dist/core/permission/protected-paths.js +12 -2
- package/dist/core/permission/shell-environment.js +9 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-file-health.js +243 -0
- package/dist/core/session/session-fs-store.js +163 -3
- package/dist/core/session/session-idle-monitor.js +9 -1
- package/dist/core/session/session-manager.js +36 -2
- package/dist/core/task/task-recovery-service.js +13 -2
- package/dist/core/thread/command-parser.js +9 -2
- package/dist/core/thread/thread-operation.js +21 -2
- package/dist/core/thread/thread-route.js +13 -2
- package/dist/directory/owner-directory-admission.js +42 -30
- package/dist/directory/owner-directory-cache.js +143 -126
- package/dist/directory/owner-directory-query-operation.js +9 -8
- package/dist/eck/kit-renderer.js +7 -5
- package/dist/ecweb/basic-settings-service.js +1 -1
- package/dist/ecweb/message-context-service.js +0 -4
- package/dist/ecweb/runtime/lifecycle.js +14 -8
- package/dist/ecweb/runtime/supervisor.js +62 -30
- package/dist/event-center/admission-materializer.js +114 -0
- package/dist/event-center/bus-gate.js +136 -0
- package/dist/event-center/bus-host.js +290 -0
- package/dist/event-center/bus-resolver.js +120 -0
- package/dist/event-center/center-config.js +100 -0
- package/dist/event-center/client-factory.js +50 -0
- package/dist/event-center/daemon.js +45 -0
- package/dist/event-center/directory-source.js +53 -0
- package/dist/event-center/dispatcher.js +157 -0
- package/dist/event-center/event-log.js +110 -0
- package/dist/event-center/index-generator.js +63 -0
- package/dist/event-center/ipc-operation.js +308 -0
- package/dist/event-center/ledger.js +52 -0
- package/dist/event-center/pack-loader.js +202 -0
- package/dist/event-center/pack-manager.js +85 -0
- package/dist/event-center/registry.js +238 -0
- package/dist/event-center/runtime.js +641 -0
- package/dist/event-center/script-runner.js +356 -0
- package/dist/event-center/types.js +35 -0
- package/dist/event-center/validation.js +413 -0
- package/dist/index.js +751 -268
- package/dist/ipc.js +66 -12
- package/dist/paths.js +20 -0
- package/dist/product.js +14 -0
- package/dist/proxy/manager.js +43 -18
- package/dist/proxy/service-supervisor.js +78 -35
- package/dist/response-system/engines/v1/index.js +0 -1
- package/dist/response-system/modes/single-session/index.js +1 -1
- package/dist/services/dispatcher.js +100 -0
- package/dist/services/idempotency.js +90 -0
- package/dist/services/identity.js +52 -0
- package/dist/services/index-generator.js +70 -0
- package/dist/services/index.js +449 -0
- package/dist/services/ipc-operation.js +458 -0
- package/dist/services/ledger.js +52 -0
- package/dist/services/message-log.js +112 -0
- package/dist/services/pack-manager.js +204 -0
- package/dist/services/reply.js +55 -0
- package/dist/services/router.js +95 -0
- package/dist/services/script-runner.js +422 -0
- package/dist/services/service-payload.js +70 -0
- package/dist/services/types.js +18 -0
- package/dist/services/validation.js +297 -0
- package/dist/trigger/application-service.js +21 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +1 -1
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/ipc-service.js +3 -1
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +78 -5
- package/dist/trigger/script-sandbox.js +118 -22
- package/dist/utils/cross-platform.js +175 -13
- package/dist/utils/evolcore-version.js +69 -27
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/instance-registry.js +19 -13
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +109 -10
- package/dist/utils/startup-trace.js +222 -44
- package/dist/utils/windows-shell-trust.js +80 -6
- package/kits/docs/INDEX.md +2 -2
- package/kits/docs/aun/ABILITY_CALLING.md +10 -17
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +5 -2
- package/kits/docs/evolcore/ability.md +4 -0
- package/kits/docs/evolcore/aid.md +1 -1
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/event-center.md +207 -0
- package/kits/docs/evolcore/file-navigation.md +10 -264
- package/kits/docs/evolcore/fs.md +3 -2
- package/kits/docs/evolcore/group.md +2 -2
- package/kits/docs/evolcore/memory-architecture.md +2 -0
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +21 -0
- package/kits/docs/evolcore/msg.md +27 -8
- package/kits/docs/evolcore/provider.md +23 -3
- package/kits/docs/evolcore/response.md +5 -5
- package/kits/docs/evolcore/services.md +277 -0
- package/kits/docs/evolcore/task.md +2 -0
- package/kits/docs/evolcore/team-workspace.md +41 -0
- package/kits/eck_manifest.json +45 -7
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/02-navigation.md +10 -1
- package/kits/rules/06-channel.md +5 -6
- package/kits/schemas/_meta.json +17 -6
- package/kits/schemas/agent-config.schema.19.json +5 -7
- package/kits/schemas/agent-config.schema.20.json +936 -0
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/relation-config.schema.12.json +2 -3
- package/kits/schemas/role-config.schema.2.json +4 -4
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/.switches.json +1 -5
- package/kits/skills/ability/SKILL.md +56 -0
- package/kits/skills/ability/references/calling.md +56 -0
- package/kits/skills/{ec-ability → ability}/references/contract-checklist.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/development.md +9 -33
- package/kits/skills/{ec-ability → ability}/references/management.md +2 -2
- package/kits/skills/{ec-ability → ability}/references/recovery.md +1 -1
- package/kits/skills/{ec-ability → ability}/references/runtime-protocol.md +2 -0
- package/kits/skills/ec-agent-create/SKILL.md +0 -1
- package/kits/skills/ec-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +34 -5
- package/kits/skills/ec-trigger/SKILL.md +4 -4
- package/kits/skills/personal-assistant/SKILL.md +6 -6
- package/kits/skills/personal-assistant/references/02-bootstrap.md +4 -4
- package/kits/skills/personal-assistant/scripts/clean.mjs +4 -4
- package/kits/skills/personal-assistant/scripts/init.mjs +2 -2
- package/kits/skills/personal-assistant/scripts/pa.mjs +4 -4
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +3 -3
- package/kits/templates/system-fragments/commands.md +9 -7
- package/kits/templates/system-fragments/reply.md +2 -6
- package/kits/templates/system-fragments/session.md +1 -1
- package/kits/templates/system-fragments/thread.md +11 -9
- package/package.json +5 -6
- package/dist/cli/pa-workspace-command.js +0 -225
- package/dist/core/command/pa-workspace-store.js +0 -468
- package/dist/core/relation/pa-team.js +0 -132
- package/kits/docs/evolcore/pa-workspace.md +0 -51
- package/kits/skills/aid-ability/SKILL.md +0 -244
- package/kits/skills/ec-ability/SKILL.md +0 -67
- package/kits/skills/ec-ability/references/workflows.md +0 -15
|
@@ -0,0 +1,422 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 服务脚本执行器:stdin=契约 JSON、env=EC_*、stdout 末行 JSON、超时杀进程树。
|
|
3
|
+
*
|
|
4
|
+
* 形态与 src/event-center/script-runner.ts 一一对应(同层职责、同一沙箱入口),
|
|
5
|
+
* 差异只在 stdin 契约:`message` 替代 `event`,且没有 threadId / topicName / chatmode。
|
|
6
|
+
* 沙箱复用 buildTriggerScriptLaunch(scoped 路径),fullaccess 走无沙箱路径。
|
|
7
|
+
*/
|
|
8
|
+
import { spawn } from 'node:child_process';
|
|
9
|
+
import path from 'node:path';
|
|
10
|
+
import { buildTriggerScriptLaunch } from '../trigger/script-sandbox.js';
|
|
11
|
+
import { sanitizeShellExecutionEnvironment } from '../core/permission/shell-environment.js';
|
|
12
|
+
import { resolveRuntimePermissionMode } from '../core/role/runtime-policy.js';
|
|
13
|
+
import { resolvePhaseOneExecutionSandbox } from '../core/permission/mode.js';
|
|
14
|
+
import { killProcessTree, resolveCommandPath } from '../utils/cross-platform.js';
|
|
15
|
+
import { logger } from '../utils/logger.js';
|
|
16
|
+
import { SCRIPTS_DIR } from './pack-manager.js';
|
|
17
|
+
import { errorMessage } from './types.js';
|
|
18
|
+
const SCRIPT_OUTPUT_LIMIT_BYTES = 1024 * 1024;
|
|
19
|
+
const NOOP_SENTINEL = '[[NOOP]]';
|
|
20
|
+
/** 与 trigger / event-center 同款排除名单。 */
|
|
21
|
+
const ENVIRONMENT_EXCLUDES = [
|
|
22
|
+
'CODEX_HOME', 'OPENAI_API_KEY', 'CODEX_API_KEY', 'ANTHROPIC_API_KEY',
|
|
23
|
+
'ANTHROPIC_AUTH_TOKEN', 'GEMINI_API_KEY', 'GOOGLE_API_KEY', 'ECAGENT_API_KEY',
|
|
24
|
+
];
|
|
25
|
+
export function resolveRuntimeExecutable(runtime) {
|
|
26
|
+
if (runtime === 'node')
|
|
27
|
+
return process.execPath;
|
|
28
|
+
const candidate = runtime === 'python'
|
|
29
|
+
? (process.platform === 'win32' ? 'python' : 'python3')
|
|
30
|
+
: runtime === 'bash'
|
|
31
|
+
? 'bash'
|
|
32
|
+
: 'powershell.exe';
|
|
33
|
+
if (runtime === 'powershell' && process.platform !== 'win32') {
|
|
34
|
+
throw Object.assign(new Error('runtime "powershell" is only available on Windows'), { code: 'INVALID_RUNTIME' });
|
|
35
|
+
}
|
|
36
|
+
const resolved = resolveCommandPath(candidate);
|
|
37
|
+
if (!resolved) {
|
|
38
|
+
throw Object.assign(new Error(`runtime "${runtime}" not found on PATH (${candidate})`), { code: 'RUNTIME_NOT_FOUND' });
|
|
39
|
+
}
|
|
40
|
+
return resolved;
|
|
41
|
+
}
|
|
42
|
+
/** 扩展名推断 runtime;推断不出抛错(校验层已挡,这里是运行时兜底)。 */
|
|
43
|
+
export function inferRuntime(script) {
|
|
44
|
+
const ext = path.extname(script).slice(1).toLowerCase();
|
|
45
|
+
if (ext === 'mjs' || ext === 'cjs' || ext === 'js')
|
|
46
|
+
return 'node';
|
|
47
|
+
if (ext === 'py')
|
|
48
|
+
return 'python';
|
|
49
|
+
if (ext === 'sh')
|
|
50
|
+
return 'bash';
|
|
51
|
+
if (ext === 'ps1')
|
|
52
|
+
return 'powershell';
|
|
53
|
+
throw Object.assign(new Error(`cannot infer runtime from extension: ${ext}`), { code: 'INVALID_RUNTIME' });
|
|
54
|
+
}
|
|
55
|
+
export class ServiceScriptRunner {
|
|
56
|
+
deps;
|
|
57
|
+
constructor(deps) {
|
|
58
|
+
this.deps = deps;
|
|
59
|
+
}
|
|
60
|
+
async run(pack, handler, message) {
|
|
61
|
+
const startedAt = Date.now();
|
|
62
|
+
let cmd = handler.script;
|
|
63
|
+
const finish = (partial) => ({
|
|
64
|
+
...partial,
|
|
65
|
+
durationMs: Date.now() - startedAt,
|
|
66
|
+
});
|
|
67
|
+
let launch;
|
|
68
|
+
let sandboxFallbackReason;
|
|
69
|
+
try {
|
|
70
|
+
const runtime = handler.runtime ?? inferRuntime(handler.script);
|
|
71
|
+
const executable = resolveRuntimeExecutable(runtime);
|
|
72
|
+
const scriptPath = path.join(pack.paths.scriptsDir, handler.script.slice(SCRIPTS_DIR.length + 1));
|
|
73
|
+
const scriptArgs = handler.args ?? [];
|
|
74
|
+
cmd = [executable, scriptPath, ...scriptArgs].join(' ');
|
|
75
|
+
launch = this.buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs);
|
|
76
|
+
if (launch.prepare) {
|
|
77
|
+
try {
|
|
78
|
+
await launch.prepare();
|
|
79
|
+
}
|
|
80
|
+
catch (error) {
|
|
81
|
+
// 沙箱不可用 → 降级:清掉这次 launch,改用无沙箱配置重跑。
|
|
82
|
+
launch.cleanup?.();
|
|
83
|
+
sandboxFallbackReason = errorMessage(error);
|
|
84
|
+
launch = this.buildUnsandboxedLaunch(pack, message, executable, scriptPath, scriptArgs, 'sandbox-fallback');
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
catch (error) {
|
|
89
|
+
const code = error.code;
|
|
90
|
+
if (code === 'RUNTIME_NOT_FOUND' || code === 'INVALID_RUNTIME') {
|
|
91
|
+
return finish({ outcome: 'error', exitCode: 126, error: { code: String(code), message: errorMessage(error) }, stdoutPreview: '', stderrPreview: '' });
|
|
92
|
+
}
|
|
93
|
+
// 沙箱构造失败(缺 codex / 缺 bubblewrap / 平台不支持)→ 降级执行。
|
|
94
|
+
sandboxFallbackReason = errorMessage(error);
|
|
95
|
+
try {
|
|
96
|
+
const runtime = handler.runtime ?? inferRuntime(handler.script);
|
|
97
|
+
const executable = resolveRuntimeExecutable(runtime);
|
|
98
|
+
const scriptPath = path.join(pack.paths.scriptsDir, handler.script.slice(SCRIPTS_DIR.length + 1));
|
|
99
|
+
launch = this.buildUnsandboxedLaunch(pack, message, executable, scriptPath, handler.args ?? [], 'sandbox-fallback');
|
|
100
|
+
}
|
|
101
|
+
catch (fallbackError) {
|
|
102
|
+
return finish({ outcome: 'error', exitCode: 126, error: { code: 'SCRIPT_SANDBOX_UNAVAILABLE', message: `${errorMessage(error)} / fallback failed: ${errorMessage(fallbackError)}` }, stdoutPreview: '', stderrPreview: '' });
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
// 任何「无沙箱」执行都必须留痕:这是事后排查「脚本为什么能读到不该读的东西」的唯一线索。
|
|
106
|
+
if (launch.sandboxAbsent) {
|
|
107
|
+
const detail = sandboxFallbackReason
|
|
108
|
+
? ` sandbox unavailable: ${sandboxFallbackReason.slice(0, 300)}`
|
|
109
|
+
: '';
|
|
110
|
+
logger.warn(`[Services] script executed WITHOUT sandbox (reason=${launch.sandboxAbsent}) `
|
|
111
|
+
+ `pack=${pack.id} handler=${handler.script} aid=${this.deps.aid}; `
|
|
112
|
+
+ `file isolation is NOT applied, secrets in env are NOT scrubbed.${detail}`);
|
|
113
|
+
}
|
|
114
|
+
try {
|
|
115
|
+
const result = await this.execute(launch, pack, message, handler, cmd, finish);
|
|
116
|
+
// 把「本次没沙箱」透传给上游,供日志/台账/reply 明示。
|
|
117
|
+
return launch.sandboxAbsent ? { ...result, sandboxAbsent: launch.sandboxAbsent } : result;
|
|
118
|
+
}
|
|
119
|
+
finally {
|
|
120
|
+
launch.cleanup?.();
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* 无沙箱启动配置:清掉 `*_API_KEY` / `*_TOKEN` 等敏感变量后直接 spawn。
|
|
125
|
+
*
|
|
126
|
+
* 三条路径共用:fullaccess、bypass+owner、以及**沙箱不可用时的降级**。
|
|
127
|
+
* 没有任何文件隔离——`sandboxAbsent` 字段是这件事的唯一标记,调用方必须据此告警。
|
|
128
|
+
*/
|
|
129
|
+
buildUnsandboxedLaunch(pack, message, executable, scriptPath, scriptArgs, reason, precomputedEcEnv) {
|
|
130
|
+
const env = {};
|
|
131
|
+
const sanitized = sanitizeShellExecutionEnvironment(process.env);
|
|
132
|
+
for (const [key, value] of Object.entries(sanitized)) {
|
|
133
|
+
if (typeof value !== 'string')
|
|
134
|
+
continue;
|
|
135
|
+
if (isExcludedEnv(key))
|
|
136
|
+
continue;
|
|
137
|
+
env[key] = value;
|
|
138
|
+
}
|
|
139
|
+
Object.assign(env, precomputedEcEnv ?? this.buildEcEnv(pack, message));
|
|
140
|
+
return {
|
|
141
|
+
command: executable,
|
|
142
|
+
args: [scriptPath, ...scriptArgs],
|
|
143
|
+
cwd: pack.dir,
|
|
144
|
+
env,
|
|
145
|
+
sandboxAbsent: reason,
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
/** 构造启动配置:fullaccess(或 bypass+owner)→ 无沙箱;否则 trigger 沙箱。 */
|
|
149
|
+
buildLaunch(pack, handler, message, executable, scriptPath, scriptArgs) {
|
|
150
|
+
const effective = this.deps.permissionMode
|
|
151
|
+
? this.deps.permissionMode()
|
|
152
|
+
: resolveRuntimePermissionMode({ selfAid: this.deps.aid }).effectiveValue;
|
|
153
|
+
// 传调用方角色:只有 bypass + owner 才免沙箱(与 trigger 的 owner-bypass 同语义)。
|
|
154
|
+
const peerRole = this.deps.resolvePeerRole?.(message.fromAid) ?? undefined;
|
|
155
|
+
const sandboxDecision = resolvePhaseOneExecutionSandbox(effective, peerRole);
|
|
156
|
+
const ecEnv = this.buildEcEnv(pack, message);
|
|
157
|
+
if (sandboxDecision.state === 'off') {
|
|
158
|
+
const reason = sandboxDecision.reason === 'fullaccess' ? 'fullaccess' : 'owner-bypass';
|
|
159
|
+
return this.buildUnsandboxedLaunch(pack, message, executable, scriptPath, scriptArgs, reason, ecEnv);
|
|
160
|
+
}
|
|
161
|
+
const projectPath = this.deps.getProjectPath();
|
|
162
|
+
if (!projectPath) {
|
|
163
|
+
throw Object.assign(new Error('agent project path unavailable; scoped script execution refused'), { code: 'SCRIPT_SANDBOX_UNAVAILABLE' });
|
|
164
|
+
}
|
|
165
|
+
const authorization = {
|
|
166
|
+
allowed: true,
|
|
167
|
+
scope: 'agent',
|
|
168
|
+
permissionMode: effective,
|
|
169
|
+
};
|
|
170
|
+
const trigger = this.syntheticTrigger(pack, handler, executable);
|
|
171
|
+
const launch = buildTriggerScriptLaunch({
|
|
172
|
+
trigger,
|
|
173
|
+
triggerDir: pack.dir,
|
|
174
|
+
scriptPath,
|
|
175
|
+
scriptArgs,
|
|
176
|
+
projectPath,
|
|
177
|
+
executionAuthorization: authorization,
|
|
178
|
+
});
|
|
179
|
+
return { ...launch, env: { ...launch.env, ...ecEnv } };
|
|
180
|
+
}
|
|
181
|
+
buildEcEnv(pack, message) {
|
|
182
|
+
return {
|
|
183
|
+
EC_SELF_AID: this.deps.aid,
|
|
184
|
+
EC_SELF_TYPE: this.deps.identity().type,
|
|
185
|
+
EC_SELF_EXTTYPE: this.deps.identity().exttype,
|
|
186
|
+
EC_PACK_DIR: pack.dir,
|
|
187
|
+
EC_SERVICE: message.type,
|
|
188
|
+
EC_REQUEST_ID: message.requestId,
|
|
189
|
+
EC_FROM: message.fromAid,
|
|
190
|
+
EC_MESSAGE_ID: message.messageId,
|
|
191
|
+
EC_ENCRYPTED: message.encrypted ? '1' : '0',
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
syntheticTrigger(pack, handler, executable) {
|
|
195
|
+
return {
|
|
196
|
+
$schema_version: 3.1,
|
|
197
|
+
id: `services:${pack.id}:${handler.script}`,
|
|
198
|
+
agentAid: this.deps.aid,
|
|
199
|
+
name: `服务包 ${pack.name}`,
|
|
200
|
+
enabled: true,
|
|
201
|
+
createdAt: 0,
|
|
202
|
+
updatedAt: 0,
|
|
203
|
+
labels: { kind: 'services', packId: pack.id },
|
|
204
|
+
source: { type: 'event', eventPattern: '*' },
|
|
205
|
+
execution: {
|
|
206
|
+
type: 'script',
|
|
207
|
+
script: { path: handler.script, runtime: executable, args: handler.args ?? [], timeoutMs: handler.timeoutMs ?? 30_000 },
|
|
208
|
+
onError: 'fail',
|
|
209
|
+
noopSentinel: NOOP_SENTINEL,
|
|
210
|
+
},
|
|
211
|
+
};
|
|
212
|
+
}
|
|
213
|
+
async execute(launch, pack, message, handler, cmd, finish) {
|
|
214
|
+
return await new Promise(resolve => {
|
|
215
|
+
const child = spawn(launch.command, launch.args, {
|
|
216
|
+
cwd: launch.cwd,
|
|
217
|
+
env: launch.env,
|
|
218
|
+
shell: false,
|
|
219
|
+
detached: process.platform !== 'win32',
|
|
220
|
+
windowsHide: true,
|
|
221
|
+
...(launch.windowsVerbatimArguments !== undefined ? { windowsVerbatimArguments: launch.windowsVerbatimArguments } : {}),
|
|
222
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
223
|
+
});
|
|
224
|
+
let stdout = '';
|
|
225
|
+
let stderr = '';
|
|
226
|
+
let totalBytes = 0;
|
|
227
|
+
let truncated = false;
|
|
228
|
+
let timedOut = false;
|
|
229
|
+
let killed = false;
|
|
230
|
+
let settled = false;
|
|
231
|
+
const killTree = () => {
|
|
232
|
+
if (killed)
|
|
233
|
+
return;
|
|
234
|
+
killed = true;
|
|
235
|
+
try {
|
|
236
|
+
killProcessTree(child.pid, true);
|
|
237
|
+
}
|
|
238
|
+
catch {
|
|
239
|
+
try {
|
|
240
|
+
child.kill('SIGKILL');
|
|
241
|
+
}
|
|
242
|
+
catch { /* already gone */ }
|
|
243
|
+
}
|
|
244
|
+
};
|
|
245
|
+
const cap = (chunk) => {
|
|
246
|
+
totalBytes += chunk.length;
|
|
247
|
+
if (totalBytes > SCRIPT_OUTPUT_LIMIT_BYTES) {
|
|
248
|
+
truncated = true;
|
|
249
|
+
killTree();
|
|
250
|
+
return '';
|
|
251
|
+
}
|
|
252
|
+
return chunk.toString('utf8');
|
|
253
|
+
};
|
|
254
|
+
child.stdout?.on('data', (chunk) => { stdout += cap(chunk); });
|
|
255
|
+
child.stderr?.on('data', (chunk) => { stderr += cap(chunk); });
|
|
256
|
+
const timer = setTimeout(() => {
|
|
257
|
+
timedOut = true;
|
|
258
|
+
killTree();
|
|
259
|
+
}, handler.timeoutMs ?? 30_000);
|
|
260
|
+
timer.unref?.();
|
|
261
|
+
const settle = (exitCode, spawnError) => {
|
|
262
|
+
if (settled)
|
|
263
|
+
return;
|
|
264
|
+
settled = true;
|
|
265
|
+
clearTimeout(timer);
|
|
266
|
+
const stdoutPreview = stdout.slice(-512);
|
|
267
|
+
const stderrPreview = stderr.slice(-512);
|
|
268
|
+
if (spawnError) {
|
|
269
|
+
resolve(finish({ outcome: 'error', exitCode: 127, error: { code: 'SCRIPT_SPAWN_ERROR', message: spawnError.message }, stdoutPreview, stderrPreview }));
|
|
270
|
+
return;
|
|
271
|
+
}
|
|
272
|
+
if (timedOut) {
|
|
273
|
+
resolve(finish({ outcome: 'timeout', exitCode: 124, error: { code: 'TIMEOUT', message: `timed out after ${handler.timeoutMs ?? 30_000}ms` }, stdoutPreview, stderrPreview }));
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
276
|
+
if (truncated) {
|
|
277
|
+
resolve(finish({ outcome: 'error', exitCode: 125, error: { code: 'SCRIPT_OUTPUT_LIMIT', message: `output exceeded ${SCRIPT_OUTPUT_LIMIT_BYTES} bytes` }, stdoutPreview, stderrPreview }));
|
|
278
|
+
return;
|
|
279
|
+
}
|
|
280
|
+
if (exitCode !== 0) {
|
|
281
|
+
resolve(finish({
|
|
282
|
+
outcome: 'error',
|
|
283
|
+
exitCode,
|
|
284
|
+
error: { code: 'HANDLER_FAILED', message: stderrPreview || `exit code ${exitCode}` },
|
|
285
|
+
stdoutPreview,
|
|
286
|
+
stderrPreview,
|
|
287
|
+
}));
|
|
288
|
+
return;
|
|
289
|
+
}
|
|
290
|
+
const lines = stdout.trimEnd().split('\n').filter(line => line.trim().length > 0);
|
|
291
|
+
const lastLine = lines[lines.length - 1] ?? '';
|
|
292
|
+
if (lastLine.trimStart().startsWith(NOOP_SENTINEL)) {
|
|
293
|
+
resolve(finish({ outcome: 'noop', exitCode: 0, stdoutPreview, stderrPreview }));
|
|
294
|
+
return;
|
|
295
|
+
}
|
|
296
|
+
// 末行必须是契约 JSON:{outcome:"success",data} / {outcome:"error",error} / {outcome:"noop"}。
|
|
297
|
+
let parsed;
|
|
298
|
+
try {
|
|
299
|
+
const value = JSON.parse(lastLine);
|
|
300
|
+
if (value && typeof value === 'object' && !Array.isArray(value))
|
|
301
|
+
parsed = value;
|
|
302
|
+
}
|
|
303
|
+
catch {
|
|
304
|
+
parsed = undefined;
|
|
305
|
+
}
|
|
306
|
+
if (!parsed || typeof parsed.outcome !== 'string') {
|
|
307
|
+
resolve(finish({
|
|
308
|
+
outcome: 'error',
|
|
309
|
+
exitCode: 0,
|
|
310
|
+
error: { code: 'HANDLER_PROTOCOL', message: 'script stdout must end with a contract JSON line' },
|
|
311
|
+
stdoutPreview,
|
|
312
|
+
stderrPreview,
|
|
313
|
+
}));
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
316
|
+
if (parsed.outcome === 'noop') {
|
|
317
|
+
resolve(finish({ outcome: 'noop', exitCode: 0, stdoutPreview, stderrPreview }));
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
if (parsed.outcome === 'success') {
|
|
321
|
+
resolve(finish({ outcome: 'success', exitCode: 0, data: parsed.data, stdoutPreview, stderrPreview }));
|
|
322
|
+
return;
|
|
323
|
+
}
|
|
324
|
+
if (parsed.outcome === 'error') {
|
|
325
|
+
const error = parsed.error && typeof parsed.error === 'object' ? parsed.error : {};
|
|
326
|
+
resolve(finish({
|
|
327
|
+
outcome: 'error',
|
|
328
|
+
exitCode: 0,
|
|
329
|
+
error: {
|
|
330
|
+
code: typeof error.code === 'string' && error.code ? error.code : 'HANDLER_FAILED',
|
|
331
|
+
message: typeof error.message === 'string' ? error.message : 'handler reported an error',
|
|
332
|
+
},
|
|
333
|
+
stdoutPreview,
|
|
334
|
+
stderrPreview,
|
|
335
|
+
}));
|
|
336
|
+
return;
|
|
337
|
+
}
|
|
338
|
+
resolve(finish({
|
|
339
|
+
outcome: 'error',
|
|
340
|
+
exitCode: 0,
|
|
341
|
+
error: { code: 'HANDLER_PROTOCOL', message: `unknown outcome: ${parsed.outcome}` },
|
|
342
|
+
stdoutPreview,
|
|
343
|
+
stderrPreview,
|
|
344
|
+
}));
|
|
345
|
+
};
|
|
346
|
+
child.on('error', error => settle(-1, error));
|
|
347
|
+
child.on('close', code => settle(typeof code === 'number' ? code : -1));
|
|
348
|
+
// 契约 JSON 必须先构造成功再写:构造失败若被吞掉,stdin 永远不会 close,
|
|
349
|
+
// 脚本会一直等 stdin 直到超时,症状是「无输出 + TIMEOUT」,极难排查。
|
|
350
|
+
let stdinPayload;
|
|
351
|
+
try {
|
|
352
|
+
stdinPayload = this.buildStdin(pack, message);
|
|
353
|
+
}
|
|
354
|
+
catch (error) {
|
|
355
|
+
killTree();
|
|
356
|
+
resolve(finish({
|
|
357
|
+
outcome: 'error',
|
|
358
|
+
exitCode: 0,
|
|
359
|
+
error: { code: 'HANDLER_PROTOCOL', message: `failed to build script stdin: ${errorMessage(error)}` },
|
|
360
|
+
stdoutPreview: '',
|
|
361
|
+
stderrPreview: '',
|
|
362
|
+
}));
|
|
363
|
+
return;
|
|
364
|
+
}
|
|
365
|
+
try {
|
|
366
|
+
child.stdin?.end(stdinPayload);
|
|
367
|
+
}
|
|
368
|
+
catch {
|
|
369
|
+
// 写 stdin 失败(进程早退)由 close 事件兜底。
|
|
370
|
+
}
|
|
371
|
+
});
|
|
372
|
+
}
|
|
373
|
+
/** 脚本契约 stdin(design.md §十一)。 */
|
|
374
|
+
buildStdin(pack, message) {
|
|
375
|
+
const identity = this.deps.identity();
|
|
376
|
+
return JSON.stringify({
|
|
377
|
+
v: 1,
|
|
378
|
+
service: { name: pack.name, dir: pack.dir },
|
|
379
|
+
message: {
|
|
380
|
+
type: message.type,
|
|
381
|
+
requestId: message.requestId,
|
|
382
|
+
from: message.fromAid,
|
|
383
|
+
receivedAt: message.receivedAt,
|
|
384
|
+
encrypted: message.encrypted,
|
|
385
|
+
data: extractServiceData(message.payload),
|
|
386
|
+
},
|
|
387
|
+
agent: { aid: this.deps.aid, dir: this.deps.getProjectPath() ?? '', type: identity.type, exttype: identity.exttype },
|
|
388
|
+
paths: { ledger: pack.paths.ledger, logs: pack.paths.logsDir },
|
|
389
|
+
});
|
|
390
|
+
}
|
|
391
|
+
}
|
|
392
|
+
/**
|
|
393
|
+
* AUN / EvolCore 注入的传输层字段。脚本契约里 `message.data` 是"调用方传来的正文",
|
|
394
|
+
* 这些字段不是调用方写的,剥掉才能让脚本只面对业务数据。
|
|
395
|
+
*
|
|
396
|
+
* 说明:`client_signature` 由 SDK 自动附加(验签发生在 SDK 层、脚本之前),
|
|
397
|
+
* 剥掉不影响任何安全性;`chatmode` / `thread_id` / `topic_name` 等是会话概念,
|
|
398
|
+
* 服务调用本就不该有(见 docs/services/design.md §十一)。
|
|
399
|
+
*/
|
|
400
|
+
const SERVICE_TRANSPORT_FIELDS = new Set([
|
|
401
|
+
'type', 'request_id', 'call_id', 'client_signature',
|
|
402
|
+
'chatmode', 'thread_id', 'topic_name', 'topic_status', 'label',
|
|
403
|
+
'task_id', '_evolcore_causation_ref', 'debug',
|
|
404
|
+
]);
|
|
405
|
+
/**
|
|
406
|
+
* 脚本看到的 data:去掉传输层字段,其余原样。
|
|
407
|
+
* 不把整条 payload 交给脚本,避免它依赖 daemon 的内部字段。
|
|
408
|
+
*/
|
|
409
|
+
export function extractServiceData(payload) {
|
|
410
|
+
const data = {};
|
|
411
|
+
for (const [key, value] of Object.entries(payload)) {
|
|
412
|
+
if (SERVICE_TRANSPORT_FIELDS.has(key))
|
|
413
|
+
continue;
|
|
414
|
+
data[key] = value;
|
|
415
|
+
}
|
|
416
|
+
return data;
|
|
417
|
+
}
|
|
418
|
+
function isExcludedEnv(key) {
|
|
419
|
+
if (ENVIRONMENT_EXCLUDES.includes(key))
|
|
420
|
+
return true;
|
|
421
|
+
return key.toUpperCase().startsWith('EVOLCORE_');
|
|
422
|
+
}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* services.* 命名空间的形状判定。
|
|
3
|
+
*
|
|
4
|
+
* 这里只回答「这条 payload.type 是不是服务消息、是请求还是应答」,
|
|
5
|
+
* 不涉及「本机有没有包能接」(那是 pack-manager 的事),也不涉及
|
|
6
|
+
* 「这条消息来自谁」(那是准入的事)。三层判据互不推导。
|
|
7
|
+
*/
|
|
8
|
+
/** 请求 type:≤3 段。 */
|
|
9
|
+
const SERVICE_REQUEST = /^services(\.[A-Za-z0-9_-]+){0,2}$/;
|
|
10
|
+
/** 应答 type:请求 type + .result,≤4 段。 */
|
|
11
|
+
const SERVICE_RESULT = /^services(\.[A-Za-z0-9_-]+){0,2}\.result$/;
|
|
12
|
+
/** listen 可用的通配形式:末段整段为 *。 */
|
|
13
|
+
const SERVICE_WILDCARD = /^services(\.[A-Za-z0-9_-]+){0,1}\.\*$/;
|
|
14
|
+
/**
|
|
15
|
+
* SERVICE_REQUEST 与 SERVICE_RESULT 有意重叠:
|
|
16
|
+
* `services.order.result` 同时匹配两条({0,2} 允许两段后缀,.order + .result 正好凑满)。
|
|
17
|
+
* 靠 result 优先消解——先判应答,再判请求。
|
|
18
|
+
*
|
|
19
|
+
* 因此 `services.result` 既是合法请求(裸 services 的 action),也是裸 `services` 的应答;
|
|
20
|
+
* 由于 listen 禁止 `.result` 结尾,实际上不会有包声明它。
|
|
21
|
+
*/
|
|
22
|
+
export function classifyServicePayloadType(type) {
|
|
23
|
+
if (typeof type !== 'string')
|
|
24
|
+
return undefined;
|
|
25
|
+
if (SERVICE_RESULT.test(type))
|
|
26
|
+
return 'result';
|
|
27
|
+
if (SERVICE_REQUEST.test(type))
|
|
28
|
+
return 'request';
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
/** 拆成 exttype / action;结果 type 的 action 不含 .result。 */
|
|
32
|
+
export function parseServiceType(type) {
|
|
33
|
+
const parts = type.replace(/\.result$/, '').split('.');
|
|
34
|
+
return { exttype: parts[1] ?? '', action: parts.slice(2).join('.') };
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* 保留字只占两段请求形式:`services.<保留字>` 精确相等才算。
|
|
38
|
+
* `services.order.list` 归业务包,`services.list.create` 也归业务包。
|
|
39
|
+
*/
|
|
40
|
+
export const RESERVED_TYPES = new Set([
|
|
41
|
+
'services.ping', 'services.list', 'services.describe', 'services.schema', 'services.skill',
|
|
42
|
+
]);
|
|
43
|
+
export function isReservedServiceType(type) {
|
|
44
|
+
return RESERVED_TYPES.has(type);
|
|
45
|
+
}
|
|
46
|
+
/** listen 校验:末段不得是 result;允许末段整段通配。 */
|
|
47
|
+
export function isListenableType(type) {
|
|
48
|
+
if (/\.result$/.test(type))
|
|
49
|
+
return false;
|
|
50
|
+
return SERVICE_REQUEST.test(type) || SERVICE_WILDCARD.test(type);
|
|
51
|
+
}
|
|
52
|
+
/**
|
|
53
|
+
* listen 匹配。通配只吃一整段,且**永不吃 result**——防回环:
|
|
54
|
+
* 监听 `services.order.*` 的包不能收到 `services.order.result`(那是应答)。
|
|
55
|
+
*/
|
|
56
|
+
export function matchesListen(listenType, actualType) {
|
|
57
|
+
if (actualType.endsWith('.result'))
|
|
58
|
+
return false; // 应答不参与包路由
|
|
59
|
+
if (!listenType.endsWith('.*'))
|
|
60
|
+
return listenType === actualType;
|
|
61
|
+
const prefix = listenType.slice(0, -1); // 保留尾部 '.'
|
|
62
|
+
if (!actualType.startsWith(prefix))
|
|
63
|
+
return false;
|
|
64
|
+
const tail = actualType.slice(prefix.length); // 通配命中的那一段
|
|
65
|
+
return tail.length > 0 && !tail.includes('.');
|
|
66
|
+
}
|
|
67
|
+
/** 应答 type 一律是「请求 type + .result」。 */
|
|
68
|
+
export function resultTypeFor(requestType) {
|
|
69
|
+
return requestType.endsWith('.result') ? requestType : `${requestType}.result`;
|
|
70
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* 服务路由(Services)共享类型。
|
|
3
|
+
* 设计:docs/services/design.md;Schema:docs/services/schema/。
|
|
4
|
+
*/
|
|
5
|
+
/** 带稳定错误码的错误。 */
|
|
6
|
+
export class ServiceError extends Error {
|
|
7
|
+
code;
|
|
8
|
+
data;
|
|
9
|
+
constructor(code, message, data) {
|
|
10
|
+
super(message);
|
|
11
|
+
this.code = code;
|
|
12
|
+
this.data = data;
|
|
13
|
+
this.name = 'ServiceError';
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export function errorMessage(error) {
|
|
17
|
+
return error instanceof Error ? error.message : String(error);
|
|
18
|
+
}
|