evolcore 0.0.45 → 0.0.46

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.
Files changed (204) hide show
  1. package/CHANGELOG.md +75 -0
  2. package/bin/ecmsg.js +33 -23
  3. package/dist/ability/application-service.js +1 -2
  4. package/dist/ability/package.js +28 -0
  5. package/dist/agent-template/jobs.js +158 -36
  6. package/dist/agent-template/runtime.js +401 -34
  7. package/dist/agent-template/service.js +764 -369
  8. package/dist/agent-template/tool-runner.js +35 -17
  9. package/dist/agent-template/types.js +7 -4
  10. package/dist/agents/baseagent.js +10 -9
  11. package/dist/agents/claude-runner.js +13 -5
  12. package/dist/agents/codex/app-server-client.js +2 -4
  13. package/dist/agents/codex/diagnostics.js +18 -1
  14. package/dist/agents/codex-runner.js +3 -1
  15. package/dist/agents/ecagent-runner.js +3 -1
  16. package/dist/agents/gemini-runner.js +2 -1
  17. package/dist/aun/menu/client.js +142 -182
  18. package/dist/aun/rpc/client.js +33 -17
  19. package/dist/aun/service-proxy.js +6 -23
  20. package/dist/channels/aun.js +656 -112
  21. package/dist/cli/agent-create.js +37 -10
  22. package/dist/cli/agent-template.js +105 -84
  23. package/dist/cli/agent.js +31 -18
  24. package/dist/cli/daemon-commands.js +15 -17
  25. package/dist/cli/daemon-lifecycle-client.js +40 -18
  26. package/dist/cli/directory.js +12 -4
  27. package/dist/cli/ecmsg-gateway.js +5 -2
  28. package/dist/cli/events-command.js +2 -1
  29. package/dist/cli/init.js +50 -20
  30. package/dist/cli/integrity-command.js +2 -0
  31. package/dist/cli/managed-command-guard.js +20 -1
  32. package/dist/cli/menu-client.js +7 -5
  33. package/dist/cli/restart-monitor.js +33 -20
  34. package/dist/cli/services-command.js +28 -5
  35. package/dist/config/config-field-policy.js +24 -0
  36. package/dist/config/config-manager.js +20 -2
  37. package/dist/config/peer-book-store.js +152 -120
  38. package/dist/config/peer-role-resolver.js +24 -4
  39. package/dist/config/provider-identity-migration.js +1 -1
  40. package/dist/config/provider-identity.js +10 -4
  41. package/dist/config/provider-ipc-service.js +10 -2
  42. package/dist/config/provider-local-sync.js +2 -2
  43. package/dist/config/providers-config.js +95 -10
  44. package/dist/config/providers-import.js +4 -6
  45. package/dist/config/providers.js +14 -3
  46. package/dist/config/role-store.js +1 -1
  47. package/dist/config-store.js +9 -1
  48. package/dist/core/agent-application-service.js +56 -29
  49. package/dist/core/agent-create-status.js +3 -1
  50. package/dist/core/agent-creation-claim.js +1 -0
  51. package/dist/core/agent-ipc-registration.js +2 -2
  52. package/dist/core/agent-reload-coordinator.js +38 -1
  53. package/dist/core/agent-runtime.js +85 -38
  54. package/dist/core/auth/agent-delegation.js +5 -0
  55. package/dist/core/auth/operation-authorizer.js +1 -1
  56. package/dist/core/auth/operation-catalog.js +3 -3
  57. package/dist/core/bootstrap-service.js +3 -0
  58. package/dist/core/capability/capability-manager.js +3 -1
  59. package/dist/core/channel-loader.js +29 -3
  60. package/dist/core/channel-runtime.js +1 -1
  61. package/dist/core/command/agent-control.js +6 -5
  62. package/dist/core/command/agent-template-menu.js +32 -97
  63. package/dist/core/command/eventcenter-menu.js +61 -13
  64. package/dist/core/command/menu-catalog.js +11 -4
  65. package/dist/core/command/menu-handler.js +35 -8
  66. package/dist/core/command/menu-protocol.js +8 -16
  67. package/dist/core/command/skill-slash.js +6 -2
  68. package/dist/core/command/team-workspace-bootstrap.js +1 -2
  69. package/dist/core/command/team-workspace-management-store.js +83 -0
  70. package/dist/core/command/team-workspace-management.js +1 -2
  71. package/dist/core/command/team-workspace-team.js +26 -3
  72. package/dist/core/daemon-control.js +3 -4
  73. package/dist/core/daemon-lifecycle.js +146 -110
  74. package/dist/core/evolagent-registry.js +42 -0
  75. package/dist/core/evolagent.js +2 -1
  76. package/dist/core/file-integrity/read.js +9 -16
  77. package/dist/core/file-integrity/store.js +94 -34
  78. package/dist/core/handoff/dispatcher.js +33 -7
  79. package/dist/core/handoff/runtime.js +8 -0
  80. package/dist/core/inference/text-inference.js +12 -2
  81. package/dist/core/invoke/invoke-service.js +24 -3
  82. package/dist/core/ipc-registration.js +3 -0
  83. package/dist/core/message/aun-ipc-sender.js +109 -7
  84. package/dist/core/message/contact-admission.js +6 -2
  85. package/dist/core/message/message-bridge.js +13 -0
  86. package/dist/core/message/message-queue.js +131 -30
  87. package/dist/core/message/pending-hints.js +8 -0
  88. package/dist/core/message/response-engine.js +48 -2
  89. package/dist/core/message/send-routing.js +3 -12
  90. package/dist/core/model/catalog-service.js +13 -0
  91. package/dist/core/model/model-catalog.js +57 -18
  92. package/dist/core/pack-auth.js +163 -31
  93. package/dist/core/pack-install.js +42 -1
  94. package/dist/{services/ledger.js → core/pack-ledger.js} +17 -6
  95. package/dist/core/permission/ec-command-parser.js +3 -1
  96. package/dist/core/permission/shell-environment.js +23 -0
  97. package/dist/core/rate-window.js +6 -1
  98. package/dist/core/session/session-idle-monitor.js +0 -1
  99. package/dist/core/session/session-manager.js +14 -0
  100. package/dist/core/session/session-title.js +26 -6
  101. package/dist/core/skill/index-generator.js +3 -4
  102. package/dist/core/thread/thread-service.js +0 -1
  103. package/dist/core/thread/topic-id.js +8 -0
  104. package/dist/directory/owner-directory-admission.js +17 -0
  105. package/dist/directory/owner-directory-cache.js +3 -1
  106. package/dist/directory/owner-directory-markdown.js +145 -23
  107. package/dist/directory/owner-directory-policy.js +23 -0
  108. package/dist/directory/owner-directory-query-operation.js +20 -6
  109. package/dist/directory/owner-directory-search.js +47 -0
  110. package/dist/eck/message-renderer.js +171 -32
  111. package/dist/ecweb/basic-settings-service.js +7 -3
  112. package/dist/ecweb/providers-service.js +17 -10
  113. package/dist/ecweb/runtime/lifecycle.js +1 -1
  114. package/dist/ecweb/runtime/supervisor.js +77 -35
  115. package/dist/event-center/admission-materializer.js +1 -1
  116. package/dist/event-center/bus-gate.js +48 -4
  117. package/dist/event-center/bus-host.js +3 -3
  118. package/dist/event-center/center-config.js +57 -28
  119. package/dist/event-center/dispatcher.js +8 -0
  120. package/dist/event-center/event-log.js +69 -27
  121. package/dist/event-center/index-generator.js +6 -1
  122. package/dist/event-center/ipc-operation.js +66 -25
  123. package/dist/event-center/pack-loader.js +12 -55
  124. package/dist/event-center/pack-manager.js +5 -3
  125. package/dist/event-center/registry.js +48 -52
  126. package/dist/event-center/runtime.js +219 -81
  127. package/dist/event-center/script-runner.js +18 -7
  128. package/dist/event-center/types.js +9 -1
  129. package/dist/event-center/validation.js +33 -4
  130. package/dist/index.js +96 -42
  131. package/dist/ipc.js +33 -7
  132. package/dist/product.js +1 -0
  133. package/dist/proxy/manager.js +52 -11
  134. package/dist/proxy/service-supervisor.js +265 -67
  135. package/dist/services/dispatcher.js +26 -3
  136. package/dist/services/idempotency.js +128 -0
  137. package/dist/services/identity.js +3 -27
  138. package/dist/services/index-generator.js +5 -1
  139. package/dist/services/index.js +244 -45
  140. package/dist/services/ipc-operation.js +164 -20
  141. package/dist/services/pack-manager.js +37 -9
  142. package/dist/services/router.js +100 -31
  143. package/dist/services/script-runner.js +15 -4
  144. package/dist/services/service-payload.js +50 -2
  145. package/dist/services/validation.js +107 -3
  146. package/dist/trigger/scheduler.js +14 -4
  147. package/dist/trigger/script-sandbox.js +39 -2
  148. package/dist/utils/cross-platform.js +35 -11
  149. package/dist/utils/error-utils.js +13 -1
  150. package/dist/utils/instance-registry.js +33 -35
  151. package/dist/utils/process-introspect.js +35 -20
  152. package/dist/utils/project-path.js +47 -3
  153. package/dist/utils/windows-shell-trust.js +174 -68
  154. package/kits/docs/context-assembly.md +3 -3
  155. package/kits/docs/evolcore/agent.md +28 -10
  156. package/kits/docs/evolcore/config.md +22 -0
  157. package/kits/docs/evolcore/directory.md +46 -12
  158. package/kits/docs/evolcore/event-center.md +6 -6
  159. package/kits/docs/evolcore/group-collaboration.md +1 -1
  160. package/kits/docs/evolcore/menu-client.md +7 -5
  161. package/kits/docs/evolcore/menu-protocol.md +5 -3
  162. package/kits/docs/evolcore/msg.md +10 -3
  163. package/kits/docs/evolcore/provider.md +7 -3
  164. package/kits/docs/evolcore/services.md +145 -12
  165. package/kits/docs/evolcore/thread-chain.md +17 -9
  166. package/kits/docs/prompt-loading-architecture.md +4 -4
  167. package/kits/eck_message_manifest.json +46 -3
  168. package/kits/rules/04-relation.md +10 -2
  169. package/kits/rules/06-channel.md +2 -1
  170. package/kits/schemas/providers.schema.2.json +1 -0
  171. package/kits/skills/ec-group/SKILL.md +4 -0
  172. package/kits/skills/ec-skill/scripts/cli.mjs +1 -1
  173. package/kits/skills/ec-skill/scripts/skill.mjs +13 -2
  174. package/kits/skills/thread-ops/SKILL.md +8 -5
  175. package/kits/templates/message-fragments/group-batch-item.md +3 -0
  176. package/kits/templates/message-fragments/group-batch.md +1 -0
  177. package/kits/templates/message-fragments/item-group.md +4 -0
  178. package/kits/templates/message-fragments/item-private.md +4 -0
  179. package/kits/templates/message-fragments/thread-context.md +1 -1
  180. package/kits/templates/system-fragments/commands.md +5 -5
  181. package/kits/templates/system-fragments/managed-runtime.md +1 -1
  182. package/kits/templates/system-fragments/relation.md +11 -7
  183. package/package.json +3 -2
  184. package/scripts/agent-template/index.mjs +9 -4
  185. package/scripts/agent-template/inspect.mjs +16 -9
  186. package/scripts/agent-template/shared/plan.mjs +3 -33
  187. package/scripts/agent-template/shared/template-contract.mjs +186 -3
  188. package/scripts/agent-template/shared/template-package.mjs +119 -10
  189. package/scripts/agent-template/shared/template-runtime.mjs +49 -6
  190. package/scripts/agent-template/shared/template.mjs +5 -5
  191. package/scripts/agent-template/team-pack.mjs +245 -0
  192. package/scripts/agent-template/team-preview.mjs +111 -0
  193. package/scripts/aid-batch/identity-batch.mjs +143 -0
  194. package/dist/ability/versions.js +0 -32
  195. package/dist/aun/model-headers.js +0 -17
  196. package/dist/channels/builtin-plugins.js +0 -19
  197. package/dist/core/command/team-workspace-initializer.js +0 -2
  198. package/dist/core/command/team-workspace-job-store.js +0 -88
  199. package/dist/core/command/team-workspace-management-service.js +0 -2
  200. package/dist/core/contact-bind-registry.js +0 -27
  201. package/dist/event-center/ledger.js +0 -52
  202. package/dist/services/reply.js +0 -55
  203. package/kits/templates/message-fragments/item.md +0 -3
  204. package/scripts/agent-template/pack.mjs +0 -169
@@ -1,6 +1,6 @@
1
1
  import { ipcQuery } from '../ipc.js';
2
2
  import * as platform from '../utils/cross-platform.js';
3
- import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
3
+ import { getProcessStartTimeAsync, startTimeMatches } from '../utils/process-introspect.js';
4
4
  import { listCodexAppServerProcesses, unregisterCodexAppServerProcess } from '../agents/codex/app-server-registry.js';
5
5
  // A busy Windows named pipe may need several seconds to accept a connection.
6
6
  export const DAEMON_PROBE_TIMEOUT_MS = platform.isWindows ? 5_000 : 1_000;
@@ -28,34 +28,56 @@ export async function requestDaemonShutdown(socketPath, timeoutMs = DAEMON_SHUTD
28
28
  return null;
29
29
  return response.pid;
30
30
  }
31
+ /** A stale or unavailable observation must never authorize a PID-addressed signal. */
32
+ export async function isRecordedProcessGone(pid, expectedStartedAt) {
33
+ if (!await platform.isProcessRunningAsync(pid))
34
+ return true;
35
+ const actual = await getProcessStartTimeAsync(pid, { fresh: true });
36
+ if (actual === null) {
37
+ if (!await platform.isProcessRunningAsync(pid))
38
+ return true;
39
+ throw new Error(`Cannot verify process identity for PID ${pid}; refusing termination`);
40
+ }
41
+ if (!Number.isFinite(expectedStartedAt) || expectedStartedAt <= 0) {
42
+ throw new Error(`Missing recorded process identity for PID ${pid}; refusing termination`);
43
+ }
44
+ return !startTimeMatches(expectedStartedAt, actual);
45
+ }
31
46
  /** Clean up only registered, identity-verified EvolCore Codex app-server children. */
32
- export function stopCodexAppServerOrphans() {
47
+ export async function stopCodexAppServerOrphans() {
33
48
  const entries = listCodexAppServerProcesses();
34
49
  if (entries.length === 0)
35
50
  return 0;
36
51
  const codexProcs = new Set(platform.findProcesses('codex app-server'));
37
- let killed = 0;
52
+ const exits = [];
38
53
  for (const entry of entries) {
39
54
  const { pid, startedAt } = entry.record;
40
- if (!platform.isProcessRunning(pid)) {
41
- unregisterCodexAppServerProcess(entry.filePath);
42
- continue;
43
- }
44
- // Discard reused PIDs without signalling; retain unverified commands to retry.
45
- const actualStartedAt = getProcessStartTime(pid);
46
- if (!startTimeMatches(startedAt, actualStartedAt)) {
47
- unregisterCodexAppServerProcess(entry.filePath);
48
- continue;
49
- }
50
- if (!codexProcs.has(pid))
51
- continue;
52
55
  try {
53
- if (platform.killProcess(pid, true)) {
54
- killed++;
56
+ // An unknown identity retains its registration for a later retry.
57
+ if (await isRecordedProcessGone(pid, startedAt)) {
55
58
  unregisterCodexAppServerProcess(entry.filePath);
59
+ continue;
60
+ }
61
+ if (!codexProcs.has(pid))
62
+ continue;
63
+ if (platform.killProcess(pid, true)) {
64
+ // Signal acceptance is not proof of exit. Confirm children concurrently
65
+ // so multiple survivors do not add a separate timeout to the restart.
66
+ exits.push((async () => {
67
+ try {
68
+ if (!await platform.waitForProcessExit(pid, 2_000)
69
+ && !await isRecordedProcessGone(pid, startedAt))
70
+ return false;
71
+ unregisterCodexAppServerProcess(entry.filePath);
72
+ return true;
73
+ }
74
+ catch {
75
+ return false;
76
+ }
77
+ })());
56
78
  }
57
79
  }
58
80
  catch { }
59
81
  }
60
- return killed;
82
+ return (await Promise.all(exits)).filter(Boolean).length;
61
83
  }
@@ -151,7 +151,12 @@ function printListRow(entry) {
151
151
  function printPageFooter(result) {
152
152
  const pages = Math.max(1, Math.ceil(result.total / result.limit));
153
153
  const next = result.hasMore ? ';加 --page ' + (result.page + 1) + ' 看下一页' : '';
154
- console.log(`(第 ${result.page}/${pages} 页,共 ${result.total} 条${next})`);
154
+ // `--scope my-agent-team` 被 50 人上限截断时,注入里只列了前 50 人,
155
+ // 这里必须把被截掉的条数说出来,否则"共 50 条"会被当成名单只有 50 人。
156
+ const dropped = typeof result.myAgentTeamDropped === 'number' && result.myAgentTeamDropped > 0
157
+ ? `;另有 ${result.myAgentTeamDropped} 人超过注入上限未列出(名单共 ${result.myAgentTeamTotal} 人)`
158
+ : '';
159
+ console.log(`(第 ${result.page}/${pages} 页,共 ${result.total} 条${next}${dropped})`);
155
160
  }
156
161
  async function runManaged(argv, json) {
157
162
  const sessionId = process.env.EVOLCORE_SESSION_ID;
@@ -176,7 +181,7 @@ async function runManaged(argv, json) {
176
181
  }
177
182
  function printHelp() {
178
183
  console.log(`用法:
179
- ec directory list [<关键词>] [--filter '<kw1,kw2>']... [--type <type>] [--scope internal|external|pa-team|all] [--owner <aid|unbound>] [--limit <n>] [--page <n>]
184
+ ec directory list [<关键词>] [--filter '<kw1,kw2>']... [--type <type>] [--scope internal|external|pa-team|my-agent-team|all] [--owner <aid|unbound>] [--limit <n>] [--page <n>]
180
185
  ec directory info <contact-aid|名字> [--limit <n>]
181
186
  ec directory refresh
182
187
  ec directory blocked
@@ -191,8 +196,11 @@ list:
191
196
  位置参数按“多个词同时命中”处理。
192
197
  默认每页 20 条,--page / --limit 可翻页;输出包含 type、exttype、描述、备注、
193
198
  Owner 绑定关系与 Ownership 核验状态。本地备注正文不在 list 展示。
194
- --scope internal|external|pa-team|all(默认 all):pa-team 只列 open_pa_context
195
- 里且 ownership_status=owned 的成员。
199
+ --scope internal|external|pa-team|my-agent-team|all(默认 all):
200
+ pa-team 只列 open_pa_context 里且 ownership_status=owned 的成员。
201
+ my-agent-team 列 config.team(Evol App 里配的「我的 agent 团队」)里的成员,
202
+ 以名单为准,**包含名录里已经没有的残留**——这些条目只有 AID、
203
+ ownerAid 为空,用来排查"配了但联系不上"。不受准入开关影响。
196
204
 
197
205
  info:
198
206
  接受 AID 或名字。AID 大小写不敏感、可带 @ 前缀;名字先做归一后的精确匹配
@@ -146,8 +146,8 @@ export function buildDownstreamArgv(route, text, passthrough) {
146
146
  const targetAsPositional = looksLikeAid(targetId)
147
147
  || (route.peer.peerKind === 'group' && !route.crossTopic);
148
148
  const argv = targetAsPositional
149
- ? [scope, 'send', route.self, targetId, ...text, ...passthrough]
150
- : [scope, 'send', route.self, ...text, ...passthrough];
149
+ ? [scope, 'send', route.self, targetId, ...passthrough]
150
+ : [scope, 'send', route.self, ...passthrough];
151
151
  // 首次联系:主话题还没被创建,带上 --thread 反而会被下游判成"话题不存在",
152
152
  // 所以按普通私聊发出,会话随这条消息建立,也就不建复查。
153
153
  if (route.crossTopic && route.threadId && !route.firstContact) {
@@ -156,6 +156,9 @@ export function buildDownstreamArgv(route, text, passthrough) {
156
156
  argv.push('--check-every', formatDuration(route.checkEveryMs));
157
157
  }
158
158
  argv.push(route.encryptResolved ? '--encrypt' : '--no-encrypt');
159
+ // 保留网关正文的字面量语义,包括经 `--` 传入的 --encrypt 等文本。
160
+ if (text.length > 0)
161
+ argv.push('--', ...text);
159
162
  return argv;
160
163
  }
161
164
  /**
@@ -16,7 +16,7 @@ const HELP = `ec events — 事件中心运维
16
16
  ec events ledger [<包名>] [--tail N] 台账(不传包名=中心台账)
17
17
  ec events tail <包名> [--tail N] 事件日志
18
18
  ec events doctor <包名> 诊断
19
- ec events reload [<包名>] 重载(重新扫描目录并重建订阅)
19
+ ec events reload 重载(重新扫描全部包并重建订阅)
20
20
  ec events rules add <事件> --publish <aid> [--subscribe <aid>] [--deny]
21
21
  ec events rules remove <事件> --publish <aid> [--subscribe <aid>] [--deny]
22
22
  ec events rules show [--event <事件>]
@@ -25,6 +25,7 @@ const HELP = `ec events — 事件中心运维
25
25
  安装与卸载(L 类目录只能由 daemon 代写):
26
26
  ec events pack add <包名> --from <源目录> [--aid <aid>]
27
27
  ec events pack remove <包名> [--aid <aid>] [--purge]
28
+ ec events pack enable / disable <包名> [--aid <aid>]
28
29
  ec events pack list [--aid <aid>]
29
30
 
30
31
  add 遇到已安装的包直接报错,先 remove 再装。
package/dist/cli/init.js CHANGED
@@ -6,6 +6,7 @@ import { resolvePaths, ensureDataDirs } from '../paths.js';
6
6
  import { commandExists } from '../utils/cross-platform.js';
7
7
  import { scanInstances } from '../utils/instance-registry.js';
8
8
  import { saveDefaultsSafe, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
9
+ import { currentVersion } from '../config/schema-registry.js';
9
10
  import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
10
11
  import { ensureControlAgentMd, generateControlAid, hasLocalControlIdentity, missingControlIdentityMessage, resolveControlAidDomain, submitControlAidRegistration, } from '../aun/aid/control-aid.js';
11
12
  import { isValidAid } from '../aun/aid/validation.js';
@@ -20,7 +21,7 @@ async function probeCodexAvailability() {
20
21
  return getCodexAppServerAvailability();
21
22
  }
22
23
  import { resolveCodexCliPath, resolveCodexPowerShellShimPath, } from '../agents/baseagent.js';
23
- import { defaultProjectsRoot } from '../utils/project-path.js';
24
+ import { assertProjectPathReference, defaultProjectsRoot, hasProjectPathEnvironmentReference } from '../utils/project-path.js';
24
25
  import { WEB_CLI_BIN, WEB_PACKAGE_LATEST } from '../product.js';
25
26
  import { autostartInstalled, autostartPlatformLabel, configureAutostart } from '../utils/autostart.js';
26
27
  import { askInit, printInitCancelHint } from './init-cancel.js';
@@ -91,7 +92,7 @@ function buildDefaults(chosen, available, projectsDefaultPath) {
91
92
  // supplies a reduced availability list (for example, a test probe).
92
93
  baseagents.ecagent = baseagents.ecagent ?? {};
93
94
  return {
94
- $schema_version: 1,
95
+ $schema_version: currentVersion('defaults'),
95
96
  active_baseagent: chosen,
96
97
  baseagents,
97
98
  ...(projectsDefaultPath ? { projects: { defaultPath: projectsDefaultPath } } : {}),
@@ -101,20 +102,38 @@ function writeDefaults(chosen, available, projectsDefaultPath) {
101
102
  saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
102
103
  }
103
104
  export async function importProvidersForCliInit(available, options = {}) {
104
- const { providerFromBaseagent } = await import('../config/providers-import.js');
105
+ const { IMPORTABLE_BASEAGENTS, providerFromBaseagent } = await import('../config/providers-import.js');
105
106
  const { importOrMergeBaseagentProvider, readProvidersSnapshot } = await import('../config/providers-management.js');
106
107
  const { readProvidersFile } = await import('../config/providers.js');
107
108
  const { resolveProviderId, resolveProviderServiceForBaseagent } = await import('../config/providers-config.js');
108
109
  const { ConfigTarget, mutateConfig } = await import('../config/config-manager.js');
110
+ const messages = {
111
+ LOCAL_PROVIDER_SOURCE_UNAVAILABLE: '未找到可导入的本机连接或有效凭据',
112
+ PROVIDER_REQUIRED: '最终仍缺少可用 Provider',
113
+ PROVIDER_CONFLICT: 'Provider 域名配置冲突,未覆盖原配置',
114
+ PROVIDER_ID_COLLISION: 'Provider ID 冲突,未覆盖原配置',
115
+ PROVIDER_DOMAIN_REQUIRED: '接入地址使用环境变量时,必须显式填写 Provider 主机名',
116
+ PROVIDER_DOMAIN_INVALID: 'Provider 主机名无效(支持 DNS 域名、IP 和 localhost,不含协议、端口或路径)',
117
+ PROVIDER_DOMAIN_MISMATCH: 'Provider 身份与接入地址的主机名不一致',
118
+ PROVIDER_DOMAIN_IMMUTABLE: '已有 Provider 的主机名不能更改,请新建 Provider',
119
+ CONFLICT: '配置已变更,请重试导入',
120
+ PROVIDER_IMPORT_FAILED: 'Provider 导入失败,原因未归类',
121
+ };
122
+ const warningCode = (error, fallback) => {
123
+ const code = error?.code;
124
+ return typeof code === 'string' && Object.hasOwn(messages, code) ? code : fallback;
125
+ };
109
126
  const imported = [];
110
127
  const warnings = [];
111
128
  for (const baseagent of available) {
129
+ if (!IMPORTABLE_BASEAGENTS.some(importable => importable === baseagent))
130
+ continue;
112
131
  let value;
113
132
  try {
114
133
  value = (options.source ?? providerFromBaseagent)(baseagent);
115
134
  }
116
- catch {
117
- warnings.push({ baseagent, code: 'LOCAL_PROVIDER_SOURCE_UNAVAILABLE' });
135
+ catch (error) {
136
+ warnings.push({ baseagent, code: warningCode(error, 'LOCAL_PROVIDER_SOURCE_UNAVAILABLE') });
118
137
  continue;
119
138
  }
120
139
  try {
@@ -122,8 +141,7 @@ export async function importProvidersForCliInit(available, options = {}) {
122
141
  imported.push({ baseagent, providerId: result.providerId, merged: result.merged });
123
142
  }
124
143
  catch (error) {
125
- const code = error.code;
126
- warnings.push({ baseagent, code: ['PROVIDER_CONFLICT', 'PROVIDER_ID_COLLISION', 'CONFLICT'].includes(code ?? '') ? code : 'PROVIDER_IMPORT_FAILED' });
144
+ warnings.push({ baseagent, code: warningCode(error, 'PROVIDER_IMPORT_FAILED') });
127
145
  }
128
146
  }
129
147
  const snapshot = readProvidersSnapshot();
@@ -153,16 +171,12 @@ export async function importProvidersForCliInit(available, options = {}) {
153
171
  if (!options.quiet) {
154
172
  for (const item of imported)
155
173
  console.log(`✓ Provider ${item.merged ? '已合并' : '已导入'}: ${item.baseagent} → ${item.providerId}`);
156
- const messages = {
157
- LOCAL_PROVIDER_SOURCE_UNAVAILABLE: '未找到可导入的本机连接或有效凭据',
158
- PROVIDER_REQUIRED: '最终仍缺少可用 Provider',
159
- PROVIDER_CONFLICT: 'Provider 域名配置冲突,未覆盖原配置',
160
- PROVIDER_ID_COLLISION: 'Provider ID 冲突,未覆盖原配置',
161
- CONFLICT: '配置已变更,请重试导入',
162
- PROVIDER_IMPORT_FAILED: 'Provider 导入失败,未返回凭据详情',
163
- };
164
- for (const item of warnings)
165
- console.warn(`⚠ ${item.baseagent}: ${messages[item.code]}(${item.code});可使用 ec provider import 或 ECWEB 检查并补齐。`);
174
+ for (const item of warnings) {
175
+ const hint = item.baseagent === 'ecagent'
176
+ ? '请在内部配置中为内置 ecagent 选择可用 Provider。'
177
+ : '可使用 ec provider import 或 ECWEB 检查并补齐。';
178
+ console.warn(`⚠ ${item.baseagent}: ${messages[item.code]}(${item.code});${hint}`);
179
+ }
166
180
  }
167
181
  return { imported, warnings };
168
182
  }
@@ -547,6 +561,15 @@ export async function cmdInit(options) {
547
561
  return undefined;
548
562
  }
549
563
  const resolved = expandLeadingTildePath(input || defaultDir);
564
+ try {
565
+ assertProjectPathReference(resolved);
566
+ }
567
+ catch (error) {
568
+ console.log(` ⚠ ${error.message}`);
569
+ continue;
570
+ }
571
+ if (hasProjectPathEnvironmentReference(resolved))
572
+ return resolved;
550
573
  if (!path.isAbsolute(resolved)) {
551
574
  console.log(' ⚠ 请输入绝对路径或回车使用默认值;输入 skip 可跳过');
552
575
  continue;
@@ -880,10 +903,17 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
880
903
  // ── 4. projectpath 校验 + 创建 ──
881
904
  let projectsDefaultPath;
882
905
  if (opts.projectpath !== undefined) {
883
- if (!path.isAbsolute(opts.projectpath)) {
884
- fail('INVALID_PROJECT_PATH', `--projectpath must be absolute: ${opts.projectpath}`, EXIT_USAGE, format);
906
+ try {
907
+ assertProjectPathReference(opts.projectpath);
908
+ }
909
+ catch (error) {
910
+ fail('INVALID_PROJECT_PATH', error.message, EXIT_USAGE, format);
911
+ }
912
+ const reference = hasProjectPathEnvironmentReference(opts.projectpath);
913
+ if (!reference && !path.isAbsolute(opts.projectpath)) {
914
+ fail('INVALID_PROJECT_PATH', '--projectpath must be absolute or use environment references', EXIT_USAGE, format);
885
915
  }
886
- if (!fs.existsSync(opts.projectpath)) {
916
+ if (!reference && !fs.existsSync(opts.projectpath)) {
887
917
  try {
888
918
  fs.mkdirSync(opts.projectpath, { recursive: true });
889
919
  }
@@ -92,6 +92,8 @@ function cmdQuery(target) {
92
92
  console.log(` 登记时间: ${fmtTime(rec.registered_at)}`);
93
93
  console.log(` 最后校验: ${fmtTime(rec.last_verified_at)}`);
94
94
  console.log(` 登记方: ${rec.registrar_aid ?? '(系统)'}`);
95
+ if (rec.package_version)
96
+ console.log(` 包基线版本: ${rec.package_version}`);
95
97
  }
96
98
  function cmdList() {
97
99
  if (!fs.existsSync(integrityDbPath())) {
@@ -1,4 +1,5 @@
1
1
  import { isHelpFlag, wantsHelp } from './help.js';
2
+ import { logger } from '../utils/logger.js';
2
3
  import { isTrustedFullAccessRuntimeContext, readVerifiedTaskRuntimeContext } from './task-context.js';
3
4
  const MANAGED_TASK_COMMANDS = new Set([
4
5
  'aid',
@@ -44,6 +45,12 @@ const MANAGED_TASK_COMMANDS = new Set([
44
45
  // `events` 事件中心运维(白名单自动维护脚本用它加白名单),通过 events.op IPC
45
46
  // 且要求本地 control token,daemon 侧鉴权。
46
47
  'events',
48
+ // `services` 服务路由运维,同样通过 services.op IPC 由 daemon 侧
49
+ // `authorizePackTarget` 逐操作判定(只读放行、enable/disable/pack add|remove
50
+ // 要 owner|admin)。本白名单只管"能不能进到脚本"。
51
+ // 不列入时连 `ec services status` 都会被拒:daemon 忙(例如一条 30s 的
52
+ // services call 占着 IPC 队列)时 1s 探测超时,整条命令被误判成 NOT_ALLOWED。
53
+ 'services',
47
54
  // $EVOLCORE_HOME/skills/ 与 kits/skills/ 下的技能文件,不触碰进程生命周期。
48
55
  // 本白名单只负责让它进到脚本;具体某一级的读写权限由 skill.mjs 的
49
56
  // assertPermission() 按会话上下文判定(群聊一律拒,Agent 级要 owner,
@@ -83,7 +90,19 @@ export async function assertManagedTopLevelCommandAllowed(command, args, env = p
83
90
  return;
84
91
  // A trusted fullaccess task may enter any implemented CLI command. The
85
92
  // command's own daemon/operation handler still performs its normal checks.
86
- const verified = await readVerifiedTaskRuntimeContext(env);
93
+ //
94
+ // 探测本身给 1s:daemon 正忙(例如一条 30s 的 services call 占着 IPC 队列)时
95
+ // 第一次探测可能超时返回 undefined,随后 `MANAGED_TASK_COMMANDS` 不认识
96
+ // `services`,整条命令被误拒成 NOT_ALLOWED。这不是权限结论,是探测失手——
97
+ // 再试一次再判,并且把两次都失败的原因打出来,便于事后区分"真无权"与"没问上"。
98
+ let verified = await readVerifiedTaskRuntimeContext(env);
99
+ if (!verified) {
100
+ verified = await readVerifiedTaskRuntimeContext(env, 3_000);
101
+ if (!verified) {
102
+ logger.warn(`[ManagedGuard] task runtime context unavailable for "${command}" `
103
+ + `(session=${env.EVOLCORE_SESSION_ID}); falling back to the static allowlist`);
104
+ }
105
+ }
87
106
  if (isTrustedFullAccessRuntimeContext(verified)) {
88
107
  if (SELF_PROTECTED_LIFECYCLE_COMMANDS.has(command)) {
89
108
  throw new ManagedCommandNotAllowedError(command);
@@ -36,7 +36,7 @@ function readRequest(args, readFile = (file) => fs.readFileSync(file, 'utf8')) {
36
36
  }
37
37
  function validateOptions(args) {
38
38
  const valueOptions = new Set(['--request-file', '--request-json', '--timeout', '--remote-token', '--ecweb-token', '--app', '--aun-path', '--format']);
39
- const booleanOptions = new Set(['--encrypt', '--no-encrypt']);
39
+ const booleanOptions = new Set(['--encrypt', '--no-encrypt', '--wait']);
40
40
  const seen = new Set();
41
41
  for (let index = 0; index < args.length; index += 1) {
42
42
  const option = args[index];
@@ -71,7 +71,8 @@ export function parseMenuClientArgs(args, readFile) {
71
71
  return {
72
72
  fromAid, targetAid, request: readRequest(options, readFile),
73
73
  timeoutMs: parseDurationMs(getArgValue(options, '--timeout')),
74
- encrypt: !options.includes('--no-encrypt'),
74
+ encrypt: options.includes('--encrypt') ? true : options.includes('--no-encrypt') ? false : undefined,
75
+ waitForCompletion: options.includes('--wait'),
75
76
  remoteAccessToken: getArgValue(options, '--remote-token') ?? getArgValue(options, '--ecweb-token'),
76
77
  slotId: getArgValue(options, '--app'), aunPath: getArgValue(options, '--aun-path'),
77
78
  };
@@ -83,8 +84,9 @@ export async function cmdMenuClient(args) {
83
84
  --request-file <path> 从 JSON 文件读取一个 menu.* 请求
84
85
  --request-json <json> 直接传入一个 menu.* JSON 请求
85
86
  --timeout <时长> 默认 15s,最大 120s
86
- --encrypt 使用 E2EE(默认)
87
- --no-encrypt 已拒绝:ec-menu-client 必须使用 E2EE
87
+ --encrypt 使用 E2EE;省略时沿用本机 daemon 默认配置
88
+ --no-encrypt 使用明文;携带授权 token 时不可用
89
+ --wait 等待升级或模板作业终态;超时后可按 jobId 查询
88
90
  --remote-token <token> 使用 daemon 远程访问 token 临时授权
89
91
  --ecweb-token <token> --remote-token 的兼容别名
90
92
  --app <slot> 覆盖默认 evolcore-menu-client 消费槽位
@@ -113,6 +115,6 @@ export async function cmdMenuClient(args) {
113
115
  console.log(JSON.stringify(response, null, 2));
114
116
  // Transport success does not imply the requested operation succeeded.
115
117
  // Preserve the complete wire response for callers while failing the CLI.
116
- if (response?.error)
118
+ if (response?.error || args.includes('--wait') && ['failed', 'cancelled'].includes(response?.data?.status))
117
119
  process.exitCode = 1;
118
120
  }
@@ -15,8 +15,8 @@ import { CHANNEL_LOGS_ENV, MAIN_PACKAGE_NAME, RESTART_REQUEST_ID_ENV, TARGET_PAC
15
15
  import { readRestartRequest, updateRestartRequest, removeRestartRequest, shouldSuppressRealRestart } from '../utils/restart-safety.js';
16
16
  import { rotateStdoutLog } from '../utils/log-writer.js';
17
17
  import { applyDataMigration, finalizeDataMigration, planDataMigration, verifyDataMigration, } from '../core/data-migration.js';
18
- import { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
19
- import { getProcessStartTimeAsync, getProcessSnapshotAsync, invalidateProcessSnapshot, startTimeMatches } from '../utils/process-introspect.js';
18
+ import { DAEMON_SHUTDOWN_TIMEOUT_MS, isRecordedProcessGone, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
19
+ import { getProcessSnapshotAsync, invalidateProcessSnapshot } from '../utils/process-introspect.js';
20
20
  import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode } from '../config/daemon-services.js';
21
21
  import { stopEcwebForRestart } from '../ecweb/runtime/lifecycle.js';
22
22
  import { StartupTracer, STARTUP_TRACE_ID_ENV } from '../utils/startup-trace.js';
@@ -100,12 +100,6 @@ function cleanEnv() {
100
100
  delete process.env[key];
101
101
  }
102
102
  }
103
- async function isPidReused(pid, expectedStartedAt) {
104
- if (expectedStartedAt === undefined)
105
- return false;
106
- const actualStartedAt = await getProcessStartTimeAsync(pid);
107
- return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
108
- }
109
103
  function reportPidReused(pid, log) {
110
104
  log(`Process ${pid} no longer refers to the recorded daemon; treating the original process as exited`);
111
105
  }
@@ -293,9 +287,8 @@ export async function cmdRestartMonitor() {
293
287
  {
294
288
  const leakedTestDaemons = orphanSnapshot.filter(o => o.confirmedTestDaemon);
295
289
  if (leakedTestDaemons.length > 0) {
296
- const killed = killOrphans(leakedTestDaemons);
290
+ const killed = await killOrphans(leakedTestDaemons);
297
291
  log(`Cleaned ${killed.length} leaked test daemon(s): ${killed.join(', ')}`);
298
- await trace.waitForDependency(sleep(500), 'test daemon exit');
299
292
  }
300
293
  }
301
294
  // A stale instance record can disappear while the real Windows process is
@@ -315,14 +308,23 @@ export async function cmdRestartMonitor() {
315
308
  log(`Stopping unregistered EvolCore process(es): ${pids}`);
316
309
  const orphanPids = new Set(runtimeOrphans.map(orphan => orphan.pid));
317
310
  const ping = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor orphan cleanup', orphanPids), 'old daemon shutdown acknowledgement');
311
+ const retiredOrphans = new Set();
318
312
  for (const orphan of runtimeOrphans) {
319
- if (orphan.pid !== ping)
320
- platform.killProcess(orphan.pid, false);
313
+ if (orphan.pid !== ping) {
314
+ if (await isRecordedProcessGone(orphan.pid, orphan.startedAt))
315
+ retiredOrphans.add(orphan.pid);
316
+ else
317
+ platform.killProcessOnly(orphan.pid, false);
318
+ }
321
319
  }
322
320
  const exited = await trace.waitForDependency(Promise.all(runtimeOrphans.map(async (orphan) => {
321
+ if (retiredOrphans.has(orphan.pid))
322
+ return true;
323
323
  if (await platform.waitForProcessExit(orphan.pid, orphan.pid === ping ? 30_000 : 10_000))
324
324
  return true;
325
- platform.killProcess(orphan.pid, true);
325
+ if (await isRecordedProcessGone(orphan.pid, orphan.startedAt))
326
+ return true;
327
+ platform.killProcessOnly(orphan.pid, true);
326
328
  return platform.waitForProcessExit(orphan.pid, 5_000);
327
329
  })), 'unregistered daemon exit');
328
330
  if (exited.some(result => !result)) {
@@ -346,8 +348,14 @@ export async function cmdRestartMonitor() {
346
348
  const gracefulPid = await trace.waitForDependency(requestDaemonShutdown(p.socket, DAEMON_SHUTDOWN_TIMEOUT_MS, 'restart-monitor', new Set(oldPids)), 'old daemon shutdown acknowledgement');
347
349
  log(`Graceful shutdown request ${gracefulPid === null ? 'was not accepted' : `accepted by PID ${gracefulPid}`}`);
348
350
  // 没有收到 IPC shutdown 确认的进程才走信号兜底
351
+ const retiredPids = new Set();
349
352
  for (const pid of oldPids) {
350
353
  if (pid !== gracefulPid) {
354
+ if (await isRecordedProcessGone(pid, expectedStarts.get(pid))) {
355
+ reportPidReused(pid, log);
356
+ retiredPids.add(pid);
357
+ continue;
358
+ }
351
359
  try {
352
360
  const killed = platform.killProcessOnly(pid, false);
353
361
  log(`Sent graceful termination to PID ${pid}: ${killed ? 'accepted' : 'failed'}`);
@@ -358,6 +366,8 @@ export async function cmdRestartMonitor() {
358
366
  }
359
367
  }
360
368
  const exited = await trace.waitForDependency(Promise.all(oldPids.map(async (oldPid) => {
369
+ if (retiredPids.has(oldPid))
370
+ return true;
361
371
  const expectedStartedAt = expectedStarts.get(oldPid);
362
372
  // The phase snapshot verified the registered identity before requesting shutdown.
363
373
  if (await platform.waitForProcessExit(oldPid, 30_000)) {
@@ -366,7 +376,7 @@ export async function cmdRestartMonitor() {
366
376
  }
367
377
  const state = platform.getProcessState(oldPid);
368
378
  log(`ERROR: Process ${oldPid} still running after 30s${state ? ` (state=${state})` : ''}, force killing`);
369
- if (await isPidReused(oldPid, expectedStartedAt)) {
379
+ if (await isRecordedProcessGone(oldPid, expectedStartedAt)) {
370
380
  reportPidReused(oldPid, log);
371
381
  return true;
372
382
  }
@@ -374,7 +384,7 @@ export async function cmdRestartMonitor() {
374
384
  log(`Forced termination for PID ${oldPid}: ${forcedKill ? 'accepted' : 'failed'}`);
375
385
  const forced = await platform.waitForProcessExit(oldPid, 5_000);
376
386
  log(`Forced termination wait for PID ${oldPid}: ${forced ? 'exited' : 'still running'}`);
377
- if (!forced && await isPidReused(oldPid, expectedStartedAt)) {
387
+ if (!forced && await isRecordedProcessGone(oldPid, expectedStartedAt)) {
378
388
  reportPidReused(oldPid, log);
379
389
  return true;
380
390
  }
@@ -422,12 +432,12 @@ export async function cmdRestartMonitor() {
422
432
  }
423
433
  const otherHome = remaining.filter(o => !o.confirmedTestDaemon && !belongsToRuntime(o));
424
434
  if (process.argv.includes('--clear') && otherHome.length) {
425
- log(`Cleaned cross-HOME orphans: ${killOrphans(otherHome).join(', ')}`);
435
+ log(`Cleaned cross-HOME orphans: ${(await killOrphans(otherHome)).join(', ')}`);
426
436
  }
427
437
  else if (otherHome.length) {
428
438
  log(`Other HOME orphan processes left running: ${otherHome.map(o => o.pid).join(', ')}`);
429
439
  }
430
- const stoppedCodex = stopCodexAppServerOrphans();
440
+ const stoppedCodex = await stopCodexAppServerOrphans();
431
441
  if (stoppedCodex)
432
442
  log(`Cleaned ${stoppedCodex} EvolCore codex app-server orphan(s)`);
433
443
  try {
@@ -1239,7 +1249,8 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
1239
1249
  fs.closeSync(out);
1240
1250
  fs.closeSync(err);
1241
1251
  log(`Spawned new process PID: ${childPid}, waiting for ready signal...`);
1242
- const isChildRunning = () => trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness');
1252
+ const childExited = () => child.exitCode !== null || child.signalCode !== null;
1253
+ const isChildRunning = async () => !childExited() && await trace.waitForDependency(platform.isProcessRunningAsync(childPid), 'daemon process liveness') && !childExited();
1243
1254
  // 轮询等待 ready.signal 出现
1244
1255
  const start = Date.now();
1245
1256
  while (Date.now() - start < timeout) {
@@ -1267,10 +1278,12 @@ async function spawnAndWaitReady(p, log, timeout, trace) {
1267
1278
  // A timeout is still a live-process race: do not let self-heal spawn a
1268
1279
  // replacement while the timed-out daemon owns the IPC endpoint or a port.
1269
1280
  if (await isChildRunning()) {
1270
- platform.killProcessOnly(childPid, false);
1281
+ // Signal the captured child handle, not a numeric PID that may be reused.
1282
+ child.kill('SIGTERM');
1271
1283
  if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'timed out daemon exit')) {
1272
1284
  log(`Process ${childPid} survived graceful termination, forcing kill`);
1273
- platform.killProcessOnly(childPid, true);
1285
+ if (!childExited())
1286
+ child.kill('SIGKILL');
1274
1287
  if (!await trace.waitForDependency(platform.waitForProcessExit(childPid, 5_000), 'forced daemon exit')) {
1275
1288
  throw new Error(`Process ${childPid} survived forced termination; refusing rollback or duplicate startup`);
1276
1289
  }
@@ -17,12 +17,16 @@ const HELP = `ec services — 服务路由运维
17
17
  ec services ledger <包名> [--tail N] [--aid <aid>] 台账
18
18
  ec services tail <包名> [--tail N] [--aid <aid>] 服务消息日志
19
19
  ec services doctor [<包名>] [--aid <aid>] 诊断
20
- ec services reload [<包名>] [--aid <aid>] 重载
20
+ ec services reload [--aid <aid>] 重载(全部包)
21
21
  ec services enable / disable [--aid <aid>] 总闸
22
+ ec services rules show [<type>] [--aid <aid>] 调用准入规则
23
+ ec services rules add <type> <aid...> [--deny] [--aid <aid>]
24
+ ec services rules remove <type> <aid...> [--deny] [--aid <aid>]
22
25
 
23
26
  安装与卸载(L 类目录只能由 daemon 代写):
24
27
  ec services pack add <包名> --from <源目录> [--aid <aid>]
25
28
  ec services pack remove <包名> [--aid <aid>] [--purge]
29
+ ec services pack enable / disable <包名> [--aid <aid>]
26
30
 
27
31
  add 遇到已安装的包直接报错,先 remove 再装。
28
32
  remove 默认把日志与台账归档到 <包>/logs/archive-<时间戳>/;--purge 连归档一起删。
@@ -48,15 +52,25 @@ function readControlToken() {
48
52
  async function queryServices(argv, timeoutMs = 20_000) {
49
53
  // 托管会话优先带 delegation 身份:daemon 要靠它判定 owner/admin/member,
50
54
  // 只带 control token 会被当成"主机终端",任何角色都能管理。
55
+ // 委托令牌缺失时快速失败,与 events 侧一致:托管任务不该回退去借宿主
56
+ // control token 充当本机身份——那会把一个 member 会话静默提成 local-control,
57
+ // 反手拿到 pack add / enable / disable 的全部权限。
51
58
  const sessionId = process.env.EVOLCORE_SESSION_ID;
52
59
  const delegationToken = sessionId ? readDelegationCredential() : undefined;
60
+ if (sessionId && !delegationToken) {
61
+ return { transportError: 'DELEGATION_REQUIRED: 当前任务缺少委托令牌' };
62
+ }
53
63
  const controlToken = delegationToken ? undefined : readControlToken();
54
64
  try {
55
65
  const response = await ipcQuery(resolvePaths().socket, {
56
66
  type: 'services.op', argv, controlToken,
57
67
  ...(sessionId && delegationToken ? { sessionId, delegationToken, delegationCommandHash: hashCurrentDelegatedCommand() } : {}),
58
68
  }, timeoutMs, { throwOnError: false });
59
- if (!response || typeof response !== 'object')
69
+ // null = 本次 IPC 等到超时都没拿到应答(daemon 仍在跑,可能还在等对端)。
70
+ // 不能说成"不可达":那句话会把人引向重启 daemon,而实际问题是对端没回。
71
+ if (!response)
72
+ return { transportError: `daemon did not answer before the IPC deadline (${timeoutMs}ms)` };
73
+ if (typeof response !== 'object')
60
74
  return { transportError: 'invalid daemon response' };
61
75
  return { response };
62
76
  }
@@ -87,8 +101,10 @@ export async function runServicesCommand(argv) {
87
101
  console.log(HELP);
88
102
  return;
89
103
  }
90
- // `call` 要等结果:IPC 超时必须覆盖调用预算,否则 CLI 先断而 daemon 还在等。
91
- const callTimeoutMs = args[0] === 'call' ? readCallBudget(args) : undefined;
104
+ // `call` / `describe` / `schema` 都要等对端回包(daemon 侧是同一个 `runCall`,
105
+ // 默认等 30s):IPC 超时必须覆盖调用预算,否则 CLI 先断而 daemon 还在等,
106
+ // 空响应被误报成"daemon 不可达",request_id 也一起丢掉。
107
+ const callTimeoutMs = RELAY_COMMANDS.has(args[0] ?? '') ? readCallBudget(args) : undefined;
92
108
  const query = await queryServices(args, callTimeoutMs);
93
109
  if ('transportError' in query) {
94
110
  console.error(`daemon 不可达:${query.transportError}`);
@@ -109,7 +125,14 @@ export async function runServicesCommand(argv) {
109
125
  // 对端调用的成功输出是应答正文;--no-wait 时没有 response,回落到 request_id。
110
126
  const result = response.result;
111
127
  if (RELAY_COMMANDS.has(args[0] ?? '') && result && 'response' in result) {
112
- printResult(result.response, json);
128
+ const body = result.response;
129
+ printResult(body, json);
130
+ // 脚本跑完了但报了业务失败(`ok:false`):CLI 层面这是失败,退出码 1。
131
+ // 否则调用方必须解析 JSON 才能发现失败,`cmd && next` 这类用法会被骗过去。
132
+ // 注意与「没等到结果」区分:后者由上面 NO_RESULT 分支给退出码 2。
133
+ if (body && typeof body === 'object' && body.ok === false) {
134
+ process.exitCode = 1;
135
+ }
113
136
  return;
114
137
  }
115
138
  printResult(result, json);