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
@@ -27,6 +27,7 @@ import { getCatalog, getProviderCatalog, resolveCatalogModel, catalogEfforts, as
27
27
  import { resolveProviderId, resolveProviderServiceForBaseagent } from '../config/providers.js';
28
28
  import { claimAgentCreation, claimAgentCreationAsync, readAgentCreationClaim, updateAgentCreationClaim } from '../core/agent-creation-claim.js';
29
29
  import { initializationRuntimePlan } from '../config/providers-config.js';
30
+ import { templateInstallationGate, TEMPLATE_JOB_ID } from '../agent-template/jobs.js';
30
31
  /** Select the creation lifecycle independently of --non-interactive. */
31
32
  export function resolveAgentCreateMode(args) {
32
33
  if (args.includes('--initialize') && args.includes('--bootstrap')) {
@@ -311,8 +312,8 @@ export async function agentCreateInteractive(opts = {}) {
311
312
  try {
312
313
  suggestedProjectPath = deriveAgentProjectPath(agentProjectRootFromDefaults(loadDefaults(), p.root), aid);
313
314
  }
314
- catch {
315
- suggestedProjectPath = deriveAgentProjectPath(agentProjectRootFromDefaults(null, p.root), aid);
315
+ catch (error) {
316
+ return { ok: false, error: error instanceof Error ? error.message : String(error) };
316
317
  }
317
318
  const projectInput = (await ask(`Project path [${suggestedProjectPath}]: `)).trim();
318
319
  const projectPath = projectInput || suggestedProjectPath;
@@ -920,8 +921,11 @@ export function readInitialization(aid) {
920
921
  if (!record || typeof record !== 'object' || Array.isArray(record)) {
921
922
  throw new InitializationStateError('invalid_record');
922
923
  }
923
- if (record.version !== 1 && record.version !== 2)
924
+ if (record.version !== 1 && record.version !== 2 && record.version !== 3)
924
925
  throw new InitializationStateError('unsupported_version');
926
+ if (record.version === 3 ? !TEMPLATE_JOB_ID.test(record.teamJobId ?? '') : record.teamJobId !== undefined) {
927
+ throw new InitializationStateError('invalid_record');
928
+ }
925
929
  if (!record.plan || typeof record.plan !== 'object' || Array.isArray(record.plan)) {
926
930
  throw new InitializationStateError('invalid_plan');
927
931
  }
@@ -983,7 +987,7 @@ export function saveInitialization(record) {
983
987
  const file = initializationPath(record.plan.aid);
984
988
  fs.mkdirSync(path.dirname(file), { recursive: true, mode: 0o700 });
985
989
  record.updatedAt = Date.now();
986
- if (record.version === 2) {
990
+ if (record.version !== 1) {
987
991
  // The Windows EPERM fallback keeps a complete hot backup before updating
988
992
  // this small journal in place. Core reads it synchronously on this event
989
993
  // loop, so a local reader cannot observe a partial checkpoint.
@@ -1049,12 +1053,14 @@ export function initializationSummary(aid) {
1049
1053
  if (!r)
1050
1054
  return undefined;
1051
1055
  const mode = recordMode(r);
1056
+ const team = templateInstallationGate(aid, r.teamJobId);
1052
1057
  return {
1053
1058
  mode, operationId: r.operationId, fingerprint: r.fingerprint,
1054
1059
  ...(r.creationId ? { creationId: r.creationId } : {}),
1055
1060
  ...(r.clientRequestId ? { clientRequestId: r.clientRequestId } : {}),
1056
1061
  ...(r.requesterAid ? { requesterAid: r.requesterAid } : {}),
1057
- status: r.status, phase: r.phase, complete: r.status === 'complete',
1062
+ status: r.status, phase: r.phase, complete: r.status === 'complete' && !team.blocked,
1063
+ ...(r.teamJobId ? { teamJobId: r.teamJobId, teamPending: team.blocked } : {}),
1058
1064
  code: r.code ?? null, error: r.error ?? null,
1059
1065
  retryable: r.status === 'failed' && r.bindAttempt?.state !== 'unknown',
1060
1066
  nextStep: r.status === 'complete' || r.status === 'cancelled' ? null
@@ -1084,6 +1090,8 @@ export function initializationSummary(aid) {
1084
1090
  export function initializationBlocksTasks(config) {
1085
1091
  try {
1086
1092
  const r = readInitialization(config.aid);
1093
+ if (templateInstallationGate(config.aid, r?.teamJobId).blocked)
1094
+ return true;
1087
1095
  if (!r && config.initialization === undefined)
1088
1096
  return false;
1089
1097
  return !r || config.initialization?.operationId !== r.operationId
@@ -1359,7 +1367,8 @@ export class AgentInitializationService {
1359
1367
  // accepted request remains recoverable if its project or model catalog
1360
1368
  // changes while the caller is waiting for the lost receipt.
1361
1369
  validateInitializationPlan(plan);
1362
- if (fs.existsSync(agentConfig(plan.aid)) || fs.existsSync(aidLocalDir(plan.aid))) {
1370
+ if (fs.existsSync(agentConfig(plan.aid)) || fs.existsSync(aidLocalDir(plan.aid))
1371
+ && !this.deps.preparedIdentity?.(plan.aid, plan.ownerAid)) {
1363
1372
  failure('INITIALIZE_TARGET_EXISTS');
1364
1373
  }
1365
1374
  if (dryRun) {
@@ -1368,7 +1377,8 @@ export class AgentInitializationService {
1368
1377
  }
1369
1378
  const now = Date.now();
1370
1379
  const r = {
1371
- version: 2,
1380
+ version: templateInstallationGate(plan.aid).jobId ? 3 : 2,
1381
+ ...(templateInstallationGate(plan.aid).jobId ? { teamJobId: templateInstallationGate(plan.aid).jobId } : {}),
1372
1382
  mode: 'one_shot',
1373
1383
  operationId: `init-${randomBytes(12).toString('hex')}`,
1374
1384
  creationId: randomUUID(),
@@ -1391,10 +1401,12 @@ export class AgentInitializationService {
1391
1401
  const claim = claimAgentCreation({
1392
1402
  aid: plan.aid, mode: 'one_shot', creationId: r.creationId, operationId: r.operationId,
1393
1403
  actor, requesterAid: actor, ownerAid: plan.ownerAid, clientRequestId, fingerprint,
1404
+ ...(r.teamJobId ? { teamJobId: r.teamJobId } : {}),
1394
1405
  });
1395
1406
  if (!claim.claimed) {
1396
1407
  if (claim.claim.mode === 'one_shot' && claim.claim.actor === actor
1397
- && claim.claim.clientRequestId === clientRequestId && claim.claim.fingerprint === fingerprint) {
1408
+ && claim.claim.clientRequestId === clientRequestId && claim.claim.fingerprint === fingerprint
1409
+ && claim.claim.teamJobId === r.teamJobId) {
1398
1410
  if (claim.claim.status !== 'in_progress' || !UUID_V4.test(claim.claim.creationId)
1399
1411
  || !claim.claim.operationId || !/^init-[a-f0-9]{24}$/.test(claim.claim.operationId)) {
1400
1412
  failure('INITIALIZE_STATE_INVALID', 'The accepted creation receipt is incomplete');
@@ -1471,6 +1483,8 @@ export class AgentInitializationService {
1471
1483
  const record = readInitialization(aid);
1472
1484
  if (!record || this.running.has(aid))
1473
1485
  return;
1486
+ if (record.teamJobId)
1487
+ return; // The durable parent owns all team recovery.
1474
1488
  const waitingForOwner = record.status === 'in_progress' && record.phase === 'ownerpending';
1475
1489
  // Records written before ownerBindSubmitted existed could fail by resubmitting the bind
1476
1490
  // while SDK ownership events invalidated the consensus cache. Retry them once the
@@ -1577,6 +1591,11 @@ export class AgentInitializationService {
1577
1591
  }
1578
1592
  check(r) {
1579
1593
  assertAgentAidAvailable(r.plan.aid);
1594
+ if (r.teamJobId) {
1595
+ const gate = templateInstallationGate(r.plan.aid, r.teamJobId);
1596
+ if (gate.blocked && !gate.executing)
1597
+ failure('TEAM_PAUSED');
1598
+ }
1580
1599
  if (this.deps.authorize && !this.deps.authorize(r.actor))
1581
1600
  failure('NOT_ALLOWED');
1582
1601
  const current = readInitialization(r.plan.aid);
@@ -1584,7 +1603,7 @@ export class AgentInitializationService {
1584
1603
  failure('INITIALIZE_CANCELLED');
1585
1604
  if (current.fingerprint !== r.fingerprint || current.creationId !== r.creationId
1586
1605
  || current.clientRequestId !== r.clientRequestId || current.actor !== r.actor
1587
- || (current.version === 2 && initializationFingerprintV2(r.plan) !== current.fingerprint)) {
1606
+ || (current.version !== 1 && initializationFingerprintV2(r.plan) !== current.fingerprint)) {
1588
1607
  failure('INITIALIZE_STATE_INVALID');
1589
1608
  }
1590
1609
  // An exact binding is write-once. A stale worker must never replace a
@@ -1940,12 +1959,20 @@ export class AgentInitializationService {
1940
1959
  saveInitialization(r);
1941
1960
  }
1942
1961
  this.phase(r, 'activating');
1962
+ const teamGate = templateInstallationGate(p.aid, r.teamJobId);
1963
+ if (r.teamJobId && !teamGate.activating && teamGate.blocked) {
1964
+ r.phase = 'team_prepared';
1965
+ saveInitialization(r);
1966
+ return;
1967
+ }
1943
1968
  if (p.persona !== undefined && fs.readFileSync(path.join(agentSoulDir(p.aid), SOUL_PERSONA_FILE), 'utf8') !== p.persona) {
1944
1969
  failure('INITIALIZE_PLAN_CONFLICT');
1945
1970
  }
1946
1971
  r.activationPrepared = true;
1947
1972
  saveInitialization(r);
1948
- const result = await this.deps.activate(p.aid);
1973
+ const result = r.teamJobId
1974
+ ? await (this.deps.activatePrepared ?? (() => failure('TEAM_ACTIVATION_UNAVAILABLE')))(p.aid)
1975
+ : await this.deps.activate(p.aid);
1949
1976
  this.check(r);
1950
1977
  if (!result.ok)
1951
1978
  failure(result.code ?? 'INITIALIZE_WELCOME_UNAVAILABLE');
@@ -1,89 +1,108 @@
1
1
  import fs from 'node:fs';
2
2
  import { randomUUID } from 'node:crypto';
3
- import { getArgValue, queryDaemon, wantsHelp } from './help.js';
3
+ import { queryDaemon, wantsHelp } from './help.js';
4
4
  import { runManagedAgentOperation } from './agent.js';
5
5
  import { resolvePaths } from '../paths.js';
6
6
  import { MAIN_CLI_BIN, SESSION_ID_ENV } from '../product.js';
7
7
  import { getDaemonOwners, refreshOwnershipForAuthorization } from '../core/ownership/owner-resolver.js';
8
8
  import { getAgentTemplateService } from '../agent-template/service.js';
9
- import { validateTemplateRequest } from '../core/command/agent-template-menu.js';
10
- import { templateError } from '../agent-template/types.js';
9
+ import { templateError, TEMPLATE_ACTIONS } from '../agent-template/types.js';
10
+ const templateContract = await import(new URL('../../scripts/agent-template/shared/template-contract.mjs', import.meta.url).href);
11
11
  export function parseTemplateCommand(argv) {
12
12
  const action = argv[0];
13
- const target = argv[1];
14
- const value = (flag) => getArgValue(argv, flag);
15
- const json = (flag, fallback) => value(flag) ? JSON.parse(value(flag)) : fallback;
16
- const comma = (flag) => value(flag)?.split(',').map(v => v.trim()).filter(Boolean) ?? [];
17
- const allowed = new Set(['--request-id', '--wait', '--format', '--version', '--id', '--name', '--description', '--os', '--baseagent',
18
- '--baseagents-json', '--skill', '--trigger', '--workspace', '--owner', '--path', '--released-json', '--share-id', '--digest',
19
- '--agent', '--targets-json', '--members-json', '--providers-json', '--external-aids-json']);
20
- for (let i = 2; i < argv.length; i += 2) {
21
- if (!allowed.has(argv[i]) || argv[i + 1] === undefined || argv[i + 1].startsWith('--'))
22
- throw new Error('Invalid template option: ' + argv[i]);
13
+ if (!TEMPLATE_ACTIONS.includes(action))
14
+ throw templateError('INVALID_ARGUMENT', 'Unknown template action');
15
+ const jsonAction = ['inspect', 'build', 'push', 'pull', 'preview'].includes(action);
16
+ const controls = ['resume', 'cancel'].includes(action);
17
+ const asynchronous = !['status', 'capabilities'].includes(action);
18
+ const flags = new Map();
19
+ const positionals = [];
20
+ const allowed = new Set(['--format', ...(asynchronous ? ['--wait'] : []),
21
+ '--request-id', ...(jsonAction ? ['--input-file'] : []),
22
+ ...(action === 'deploy' ? ['--preview-id', '--plan-digest'] : [])]);
23
+ for (let i = 1; i < argv.length; i++) {
24
+ const token = argv[i];
25
+ if (!token.startsWith('--')) {
26
+ positionals.push(token);
27
+ continue;
28
+ }
29
+ if (!allowed.has(token) || flags.has(token) || !argv[i + 1] || argv[i + 1].startsWith('--')) {
30
+ throw templateError('INVALID_ARGUMENT', 'Invalid template option: ' + token);
31
+ }
32
+ flags.set(token, argv[++i]);
23
33
  }
34
+ if (flags.has('--format') && flags.get('--format') !== 'json')
35
+ throw templateError('INVALID_ARGUMENT', '--format must be json');
24
36
  let args;
25
- if (action === 'inspect')
26
- args = { aid: target };
27
- else if (action === 'build') {
28
- const baseagents = comma('--baseagent');
29
- args = { aid: target, template: { id: value('--id'), version: value('--version'), name: value('--name') ?? target?.split('.')[0],
30
- description: value('--description') }, include: {
31
- ...(value('--os') ? { platforms: comma('--os') } : {}),
32
- ...(baseagents.length ? { baseagents: baseagents.map((name, i) => ({ name, default: i === 0 })) } : {}),
33
- ...(value('--baseagents-json') ? { baseagents: json('--baseagents-json', []) } : {}),
34
- triggers: comma('--trigger'), skills: comma('--skill'), files: comma('--workspace'),
35
- } };
37
+ if (jsonAction) {
38
+ if (!flags.has('--input-file') || positionals.length)
39
+ throw templateError('INVALID_ARGUMENT', '--input-file is required');
40
+ args = JSON.parse(fs.readFileSync(flags.get('--input-file'), 'utf8'));
41
+ }
42
+ else if (action === 'deploy') {
43
+ if (positionals.length)
44
+ throw templateError('INVALID_ARGUMENT', 'deploy accepts --preview-id and --plan-digest');
45
+ args = { previewId: flags.get('--preview-id'), planDigest: flags.get('--plan-digest') };
46
+ }
47
+ else if (action === 'status') {
48
+ if (positionals.length > 1 || (!!positionals.length === flags.has('--request-id'))) {
49
+ throw templateError('INVALID_ARGUMENT', 'Use status JOB_ID or status --request-id ORIGINAL');
50
+ }
51
+ args = positionals.length ? { jobId: positionals[0] } : { requestId: flags.get('--request-id') };
52
+ }
53
+ else if (controls) {
54
+ if (positionals.length !== 1)
55
+ throw templateError('INVALID_ARGUMENT', 'Job ID required');
56
+ args = { jobId: positionals[0] };
36
57
  }
37
- else if (action === 'push')
38
- args = { buildId: target, ownerAid: value('--owner'), targetPath: value('--path'), releasedFindings: json('--released-json', []) };
39
- else if (action === 'pull') {
40
- const separator = target?.indexOf(':/') ?? -1;
41
- args = { location: { aid: target?.slice(0, separator), path: target?.slice(separator + 1) },
42
- download: { shareId: value('--share-id') }, digest: value('--digest'), targetAid: value('--agent'),
43
- ...(value('--targets-json') ? { targets: json('--targets-json', {}) } : {}) };
58
+ else {
59
+ if (positionals.length || flags.has('--request-id'))
60
+ throw templateError('INVALID_ARGUMENT', 'capabilities accepts no business arguments');
61
+ args = {};
44
62
  }
45
- else if (action === 'deploy')
46
- args = { pullId: target,
47
- ...(value('--members-json') ? { members: json('--members-json', {}),
48
- ...(value('--providers-json') ? { providers: json('--providers-json', {}) } : {}),
49
- ...(value('--external-aids-json') ? { externalAids: json('--external-aids-json', {}) } : {}) }
50
- : { providers: json('--providers-json', {}), externalAids: json('--external-aids-json', {}) }) };
51
- else if (action === 'status')
52
- args = { view: 'template-job', jobId: target };
53
- else
54
- throw new Error('Expected inspect/build/push/pull/deploy/status');
55
- args = JSON.parse(JSON.stringify(args));
56
- const invalid = validateTemplateRequest({ name: 'agent', type: action === 'status' ? 'menu.query' : 'menu.action', action, args });
57
- if (invalid)
58
- throw new Error(invalid.message);
59
- const wait = Number(value('--wait') ?? 60);
60
- if (!Number.isFinite(wait) || wait < 0 || wait > 300)
61
- throw new Error('--wait must be 0–300 seconds');
62
- return { action: action, args, requestId: value('--request-id') ?? randomUUID(), wait };
63
+ const requestId = action === 'status' ? randomUUID() : flags.get('--request-id') ?? randomUUID();
64
+ args = templateContract.normalizeTemplateRequest({ requestId, action, args }).args;
65
+ const wait = Number(flags.get('--wait') ?? 0);
66
+ if (!Number.isInteger(wait) || wait < 0 || wait > 300)
67
+ throw templateError('INVALID_ARGUMENT', '--wait must be 0..300 seconds');
68
+ return { action, args, requestId, wait };
69
+ }
70
+ export function templateExitCode(response, waited = false) {
71
+ if (response.transportError)
72
+ return 1;
73
+ if (response.error)
74
+ return response.error.code === 'INVALID_ARGUMENT' ? 2 : 1;
75
+ const status = response.data?.status;
76
+ if (['failed', 'cancelled'].includes(status))
77
+ return 1;
78
+ if (status === 'paused' || waited && ['running', 'queued', 'cancelling'].includes(status))
79
+ return 3;
80
+ return 0;
63
81
  }
64
82
  export async function executeTemplateCommand(actor, argv) {
65
83
  const parsed = parseTemplateCommand(argv);
66
- const service = getAgentTemplateService();
67
- if (parsed.action === 'status')
68
- return { ok: true, data: await service.query(actor, parsed.args) };
69
- const data = await service.action(actor, parsed.requestId, parsed.action, parsed.args);
70
- if (data.jobId && parsed.wait) {
71
- let timer;
72
- try {
73
- await Promise.race([service.wait(data.jobId), new Promise(resolve => { timer = setTimeout(resolve, parsed.wait * 1000); })]);
74
- }
75
- finally {
76
- if (timer)
77
- clearTimeout(timer);
84
+ try {
85
+ const service = getAgentTemplateService();
86
+ let data = await service.action(actor, parsed.requestId, parsed.action, parsed.args);
87
+ if (data.jobId && parsed.wait && ['queued', 'running', 'cancelling'].includes(data.status)) {
88
+ let timer;
89
+ try {
90
+ await Promise.race([service.wait(data.jobId), new Promise(resolve => { timer = setTimeout(resolve, parsed.wait * 1000); })]);
91
+ }
92
+ finally {
93
+ if (timer)
94
+ clearTimeout(timer);
95
+ }
96
+ data = await service.query(actor, { jobId: data.jobId });
78
97
  }
79
- const event = await service.query(actor, { jobId: data.jobId });
80
- if (event.status === 'failed')
81
- return { ok: false, code: event.code, error: event.message, data: event.data, jobId: data.jobId };
82
- return { ok: true, data: event.status === 'succeeded' ? { ...event.data, jobId: data.jobId } : event };
98
+ return { requestId: parsed.requestId, data };
99
+ }
100
+ catch (error) {
101
+ return { requestId: parsed.requestId, error: {
102
+ code: error.code ?? 'TEMPLATE_FAILED', message: error.message, retryable: false, ...(error.details ? { details: error.details } : {})
103
+ } };
83
104
  }
84
- return { ok: true, data };
85
105
  }
86
- /** Called only after IPC has authenticated the standalone host control token. */
87
106
  export async function executeHostTemplateCommand(argv) {
88
107
  await refreshOwnershipForAuthorization(undefined, { force: true, allowTransient: false, source: 'agent-template-cli' });
89
108
  const actor = getDaemonOwners()[0];
@@ -93,32 +112,34 @@ export async function executeHostTemplateCommand(argv) {
93
112
  }
94
113
  export async function cmdAgentTemplate(args) {
95
114
  if (!args.length || wantsHelp(args)) {
96
- console.log(`${MAIN_CLI_BIN} agent template <inspect|build|push|pull|deploy|status> <aid|id|location> [options]\n`
97
- + 'build: --version X.Y.Z --name NAME [--os linux,darwin] [--baseagents-json JSON] [--skill a,b] [--trigger a,b] [--workspace dist,docs]\n'
98
- + 'push: --owner AID --path /templates/ID/ID-VERSION.ectpl [--released-json JSON]\n'
99
- + 'pull: OWNER:/templates/ID/ID-VERSION.ectpl --share-id CODE --digest sha256:HASH (--agent AID | --targets-json KEY_TO_AID_JSON)\n'
100
- + 'deploy: PULL_ID [--providers-json JSON] [--external-aids-json JSON] | --members-json KEY_TO_SELECTIONS_JSON\n'
101
- + 'All commands: --format json --request-id ID --wait 0..300 (default 60). status JOB_ID recovers a task.');
115
+ console.log(MAIN_CLI_BIN + ' agent template <inspect|build|push|pull|preview|deploy|status|resume|cancel|capabilities>\n'
116
+ + 'inspect/build/push/pull/preview: --input-file FILE\n'
117
+ + 'deploy: --preview-id ID --plan-digest DIGEST\n'
118
+ + 'status JOB_ID | status --request-id ORIGINAL; resume/cancel JOB_ID\n'
119
+ + 'Asynchronous/control: --request-id ID --wait 0..300 (default 0). --format json');
102
120
  return;
103
121
  }
122
+ let parsed;
104
123
  try {
105
- parseTemplateCommand(args);
124
+ parsed = parseTemplateCommand(args);
125
+ const frozenArgs = ['status', 'capabilities'].includes(parsed.action) || args.includes('--request-id') ? args : [...args, '--request-id', parsed.requestId];
106
126
  let result;
107
- if (process.env[SESSION_ID_ENV])
108
- result = await runManagedAgentOperation(['template', ...args], 310_000);
127
+ if (process.env[SESSION_ID_ENV]) {
128
+ const managed = await runManagedAgentOperation(['template', ...frozenArgs], 310_000);
129
+ result = managed.result ?? managed;
130
+ }
109
131
  else {
110
132
  const controlToken = fs.readFileSync(resolvePaths().controlToken, 'utf8').trim();
111
- const { response, transportError } = await queryDaemon(resolvePaths().socket, { type: 'agent-template.op', controlToken, argv: args }, 310_000);
112
- if (!response)
113
- throw new Error(transportError ? JSON.stringify(transportError) : 'Daemon unavailable');
114
- result = response;
133
+ const { response, transportError } = await queryDaemon(resolvePaths().socket, { type: 'agent-template.op', controlToken, argv: frozenArgs }, 310_000);
134
+ result = response ?? { requestId: parsed.requestId, transportError: transportError ?? { message: 'Daemon unavailable' } };
115
135
  }
116
136
  console.log(JSON.stringify(result, null, 2));
117
- if (result.ok === false)
118
- process.exitCode = 1;
137
+ process.exitCode = templateExitCode(result, parsed.wait > 0);
119
138
  }
120
139
  catch (error) {
121
- console.error(JSON.stringify({ ok: false, code: error.code ?? 'INVALID_ARGUMENT', error: error.message }));
122
- process.exitCode = 1;
140
+ console.error(JSON.stringify({ requestId: parsed?.requestId, error: {
141
+ code: error.code ?? 'INVALID_ARGUMENT', message: error.message, retryable: false
142
+ } }));
143
+ process.exitCode = error.code === 'INVALID_ARGUMENT' || !parsed ? 2 : 1;
123
144
  }
124
145
  }
package/dist/cli/agent.js CHANGED
@@ -8,7 +8,7 @@ import { assertAgentAidAvailable, assertAgentModelConfigured, resolveEffective,
8
8
  import { resolveRuntimeBaseagentModelSelection } from '../agents/baseagent.js';
9
9
  import { resolveConfigCommand } from '../config/resolved-config-op.js';
10
10
  import { executeResolvedConfigCommandAsync } from '../config/config-operation-service.js';
11
- import { ipcQuery, IpcTransportError } from '../ipc.js';
11
+ import { ipcQuery, ipcHostQuery, IpcTransportError } from '../ipc.js';
12
12
  import { daemonUnavailableMessage, queryDaemon } from './help.js';
13
13
  import { CONFIG_SCHEMA_VERSION } from '../types.js';
14
14
  import { ensureInitialRoleRegistry } from '../config/role-service.js';
@@ -365,6 +365,23 @@ export async function agentReload(aid, options = {}) {
365
365
  }
366
366
  }
367
367
  // ==================== agentEnable / agentDisable ====================
368
+ /** Online host mutations use the same application service as Menu and managed CLI. */
369
+ async function hostAgentLifecycle(action, aid, options) {
370
+ try {
371
+ const result = await ipcHostQuery(resolvePaths().socket, {
372
+ type: 'evolagent.lifecycle', action, aid, ...options,
373
+ }, AGENT_RELOAD_TIMEOUT_MS, { throwOnError: true });
374
+ return result ?? { ok: false, code: 'IPC_INVALID_RESPONSE', error: 'daemon IPC returned no lifecycle result' };
375
+ }
376
+ catch (error) {
377
+ // A timed-out mutation may already have happened. Only an absent daemon
378
+ // permits the offline disk implementation; never retry an unknown outcome.
379
+ if (error instanceof IpcTransportError && ['ENOENT', 'ECONNREFUSED'].includes(error.code))
380
+ return undefined;
381
+ return { ok: false, code: error instanceof IpcTransportError ? `IPC_${error.code}` : 'IPC_FAILED',
382
+ error: error instanceof Error ? error.message : String(error) };
383
+ }
384
+ }
368
385
  export async function agentEnable(aid, options = {}) {
369
386
  return agentSetEnabled(aid, true, options);
370
387
  }
@@ -372,6 +389,9 @@ export async function agentDisable(aid, options = {}) {
372
389
  return agentSetEnabled(aid, false, options);
373
390
  }
374
391
  async function agentSetEnabled(aid, enabled, options = {}) {
392
+ const online = await hostAgentLifecycle(enabled ? 'enable' : 'disable', aid, options);
393
+ if (online)
394
+ return online;
375
395
  if (enabled) {
376
396
  try {
377
397
  assertAgentAidAvailable(aid);
@@ -665,26 +685,19 @@ export async function agentChannelUpsert(opts) {
665
685
  }
666
686
  // ==================== agentDelete ====================
667
687
  export async function agentDelete(aid, purge = false) {
668
- const p = resolvePaths();
669
- const agentDir = path.join(p.agentsDir, aid);
670
- const configPath = path.join(agentDir, 'config.json');
671
- if (!fs.existsSync(configPath)) {
672
- return { ok: false, error: `Agent "${aid}" not found` };
673
- }
674
- // Try to stop via IPC first
675
- let stopped = false;
688
+ const online = await hostAgentLifecycle('delete', aid, { purge });
689
+ if (online)
690
+ return online;
691
+ if (!isValidAid(aid))
692
+ return { ok: false, code: 'INVALID_ARGS', error: 'Invalid Agent AID' };
676
693
  try {
677
- const result = await ipcQuery(p.socket, { type: 'evolagent.reload', name: aid });
678
- stopped = !!result?.ok;
694
+ await removeAgentFiles(aid, purge);
695
+ return { ok: true, aid, purged: purge, stopped: false };
679
696
  }
680
- catch { }
681
- await removeAgentFiles(aid, purge);
682
- // Trigger resync so daemon drops the agent
683
- try {
684
- await ipcQuery(p.socket, { type: 'evolagent.resync' });
697
+ catch (error) {
698
+ return { ok: false, code: error.code,
699
+ error: error instanceof Error ? error.message : String(error) };
685
700
  }
686
- catch { }
687
- return { ok: true, aid, purged: purge, stopped };
688
701
  }
689
702
  // ==================== agentRename ====================
690
703
  export async function agentRename(aid, name) {
@@ -32,7 +32,7 @@ import { logLevelRank } from '../utils/logger.js';
32
32
  import { inspectDataMigrationRequirement } from '../core/data-migration.js';
33
33
  import { readHostInfo, readVersionInfo } from '../utils/host-info.js';
34
34
  import { queryStatusActivity, queryStatusActivityByAgent } from '../stats/query.js';
35
- import { DAEMON_PROBE_TIMEOUT_MS, DAEMON_SHUTDOWN_TIMEOUT_MS, probeDaemon, requestDaemonShutdown } from './daemon-lifecycle-client.js';
35
+ import { DAEMON_PROBE_TIMEOUT_MS, DAEMON_SHUTDOWN_TIMEOUT_MS, isRecordedProcessGone, probeDaemon, requestDaemonShutdown } from './daemon-lifecycle-client.js';
36
36
  export { DAEMON_SHUTDOWN_TIMEOUT_MS, requestDaemonShutdown, stopCodexAppServerOrphans } from './daemon-lifecycle-client.js';
37
37
  import { DEFAULT_ECWEB_PORT, ecwebService, serviceRuntimeMode, setEcwebEnabled } from '../config/daemon-services.js';
38
38
  import { checkCodexProjectPath, inspectCodexManagedHook, ensureCodexManagedHook, runCodexHookLaunchDiagnostic, } from '../agents/codex/diagnostics.js';
@@ -1047,12 +1047,6 @@ export async function cmdStart(opts = {}) {
1047
1047
  };
1048
1048
  setTimeout(checkReady, 200);
1049
1049
  }
1050
- function isPidReused(pid, expectedStartedAt) {
1051
- if (expectedStartedAt === undefined)
1052
- return false;
1053
- const actualStartedAt = getProcessStartTime(pid);
1054
- return actualStartedAt !== null && !startTimeMatches(expectedStartedAt, actualStartedAt);
1055
- }
1056
1050
  function reportPidReused(pid) {
1057
1051
  console.log(`ℹ EvolCore PID ${pid} no longer refers to the recorded process; treating it as stopped`);
1058
1052
  }
@@ -1062,7 +1056,7 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
1062
1056
  // A graceful request was accepted by the daemon that answered for this exact
1063
1057
  // PID over IPC, so its identity is already proven; the start-time probe (a
1064
1058
  // PowerShell launch on Windows) only guards the kill path.
1065
- if (!gracefulRequested && isPidReused(pid, expectedStartedAt)) {
1059
+ if (!gracefulRequested && await isRecordedProcessGone(pid, expectedStartedAt)) {
1066
1060
  reportPidReused(pid);
1067
1061
  return true;
1068
1062
  }
@@ -1079,14 +1073,10 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
1079
1073
  console.log('✓ EvolCore stopped');
1080
1074
  return true;
1081
1075
  }
1082
- if (isPidReused(pid, expectedStartedAt)) {
1083
- reportPidReused(pid);
1084
- return true;
1085
- }
1086
1076
  const state = platform.getProcessState(pid);
1087
1077
  const stateSuffix = state ? ` (state=${state})` : '';
1088
1078
  console.log(`⚠ EvolCore PID ${pid} did not exit gracefully${stateSuffix}; forcing termination...`);
1089
- if (isPidReused(pid, expectedStartedAt)) {
1079
+ if (await isRecordedProcessGone(pid, expectedStartedAt)) {
1090
1080
  reportPidReused(pid);
1091
1081
  return true;
1092
1082
  }
@@ -1098,7 +1088,7 @@ async function stopPid(pid, gracefulRequested = false, expectedStartedAt, trace)
1098
1088
  console.log('✓ EvolCore stopped (forced)');
1099
1089
  return true;
1100
1090
  }
1101
- if (isPidReused(pid, expectedStartedAt)) {
1091
+ if (await isRecordedProcessGone(pid, expectedStartedAt)) {
1102
1092
  reportPidReused(pid);
1103
1093
  return true;
1104
1094
  }
@@ -1155,6 +1145,10 @@ export async function cmdStop() {
1155
1145
  }
1156
1146
  const pids = new Set([...aliveMains.map(entry => entry.record.pid), ...runtimeOrphans.map(orphan => orphan.pid)]);
1157
1147
  const expectedStarts = new Map(aliveMains.map(entry => [entry.record.pid, entry.record.startedAt]));
1148
+ for (const orphan of runtimeOrphans) {
1149
+ if (orphan.startedAt !== undefined && !expectedStarts.has(orphan.pid))
1150
+ expectedStarts.set(orphan.pid, orphan.startedAt);
1151
+ }
1158
1152
  if (runtimeOrphans.length > 0) {
1159
1153
  console.log(`⚠ 检测到未登记的 EvolCore 进程,将一并停止: ${runtimeOrphans.map(orphan => orphan.pid).join(', ')}`);
1160
1154
  }
@@ -1698,7 +1692,6 @@ function projectStatusAgentItems(evolcoreHome, now, statusAgents, fallbackAgents
1698
1692
  }
1699
1693
  async function collectStatusSnapshot() {
1700
1694
  const p = resolvePaths();
1701
- const started = Date.now();
1702
1695
  const instances = scanInstances();
1703
1696
  const aliveMains = instances.mains.filter(instance => instance.alive);
1704
1697
  const restartMonitors = instances.restartMonitors.filter(instance => instance.alive);
@@ -1710,15 +1703,20 @@ async function collectStatusSnapshot() {
1710
1703
  const agentsPromise = process.env.EVOLCORE_SESSION_ID
1711
1704
  ? Promise.resolve(null)
1712
1705
  : ipcQuery(p.socket, { type: 'evolagent.list' }).catch(() => null);
1706
+ // Measure the status request itself, excluding instance scans and ECWeb checks.
1707
+ const statusStartedAt = performance.now();
1708
+ let latencyMs = 0;
1709
+ const statusPromise = ipcQuery(p.socket, { type: 'status' }).catch(() => null).finally(() => {
1710
+ latencyMs = Math.round(performance.now() - statusStartedAt);
1711
+ });
1713
1712
  const [ping, statusResponse, aidsResponse, agentsResponse, agentStatsResponse, ecweb] = await Promise.all([
1714
1713
  pingPromise,
1715
- ipcQuery(p.socket, { type: 'status' }).catch(() => null),
1714
+ statusPromise,
1716
1715
  ipcQuery(p.socket, { type: 'aun-aids' }).catch(() => null),
1717
1716
  agentsPromise,
1718
1717
  ipcQuery(p.socket, { type: 'agent-stats' }).catch(() => null),
1719
1718
  collectEcwebStatus(p),
1720
1719
  ]);
1721
- const latencyMs = Date.now() - started;
1722
1720
  const now = Date.now();
1723
1721
  const pid = ping?.pid ?? statusResponse?.pid ?? aliveMains[0]?.record.pid ?? null;
1724
1722
  const mainRecord = aliveMains.find(instance => instance.record.pid === pid)?.record;