evolcore 0.0.40 → 0.0.41-test.1

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 (226) hide show
  1. package/CHANGELOG.md +94 -1
  2. package/bin/codex-managed-hook.mjs +11 -0
  3. package/bin/ec-safe-output.js +11 -1
  4. package/dist/agents/baseagent-availability.js +1 -1
  5. package/dist/agents/baseagent.js +20 -43
  6. package/dist/agents/claude-runner.js +197 -197
  7. package/dist/agents/codex-runner.js +535 -259
  8. package/dist/agents/ecagent-runner.js +31 -12
  9. package/dist/agents/gemini-runner.js +27 -7
  10. package/dist/agents/runner-types.js +11 -3
  11. package/dist/aun/ability-device-routing.js +26 -0
  12. package/dist/aun/aid/client.js +1 -1
  13. package/dist/aun/group/fs-download.js +39 -0
  14. package/dist/aun/group/identity.js +36 -13
  15. package/dist/aun/group/operations.js +5 -0
  16. package/dist/aun/msg/managed-operation.js +72 -11
  17. package/dist/aun/msg/p2p.js +32 -7
  18. package/dist/aun/service-proxy.js +36 -12
  19. package/dist/aun/storage/download.js +30 -0
  20. package/dist/aun/storage/index.js +14 -6
  21. package/dist/channels/aun.js +367 -24
  22. package/dist/channels/daemon.js +39 -5
  23. package/dist/cli/agent-command.js +2 -0
  24. package/dist/cli/agent-create.js +98 -19
  25. package/dist/cli/agent.js +10 -3
  26. package/dist/cli/aun-commands.js +85 -41
  27. package/dist/cli/daemon-commands.js +678 -688
  28. package/dist/cli/fs-command.js +64 -2
  29. package/dist/cli/index.js +48 -4
  30. package/dist/cli/managed-command-guard.js +4 -0
  31. package/dist/cli/model.js +40 -40
  32. package/dist/cli/proxy-command.js +92 -0
  33. package/dist/cli/restart-monitor.js +17 -0
  34. package/dist/cli/role.js +85 -0
  35. package/dist/cli/session-command.js +128 -13
  36. package/dist/cli/stats.js +60 -4
  37. package/dist/cli/trigger-command.js +2 -2
  38. package/dist/config/access-policy.js +8 -1
  39. package/dist/config/boot-log.js +38 -1
  40. package/dist/config/config-field-policy.js +5 -32
  41. package/dist/config/config-manager.js +46 -39
  42. package/dist/config/config-operation-service.js +8 -11
  43. package/dist/config/contact-book-store.js +47 -21
  44. package/dist/config/contact-book.js +18 -12
  45. package/dist/config/contact-operation-service.js +3 -4
  46. package/dist/config/contact-request-service.js +11 -0
  47. package/dist/config/daemon-services.js +11 -0
  48. package/dist/config/gateway-config.js +89 -595
  49. package/dist/config/peer-role-resolver.js +15 -11
  50. package/dist/config/providers-config.js +12 -7
  51. package/dist/config/providers-import.js +3 -21
  52. package/dist/config/resolved-config-op.js +3 -0
  53. package/dist/config/role-command-service.js +166 -0
  54. package/dist/config/role-request-service.js +193 -0
  55. package/dist/config/schema-migration.js +686 -25
  56. package/dist/config-store.js +79 -3
  57. package/dist/contracts/ecweb-instance.js +41 -0
  58. package/dist/contracts/ecweb-service-protocol.js +3 -1
  59. package/dist/core/agent-application-service.js +11 -1
  60. package/dist/core/agent-ipc-registration.js +4 -0
  61. package/dist/core/agent-runtime.js +1 -1
  62. package/dist/core/auth/agent-delegation.js +82 -6
  63. package/dist/core/auth/auth-gateway.js +1 -1
  64. package/dist/core/auth/authorization-audit.js +37 -9
  65. package/dist/core/auth/delegation-authorization.js +3 -1
  66. package/dist/core/auth/operation-authorizer.js +15 -0
  67. package/dist/core/auth/operation-catalog.js +39 -6
  68. package/dist/core/command/agent-control.js +94 -19
  69. package/dist/core/command/agent-storage-menu.js +5 -3
  70. package/dist/core/command/cli-intent-parser.js +2 -1
  71. package/dist/core/command/command-handler.js +105 -145
  72. package/dist/core/command/connect-menu.js +31 -2
  73. package/dist/core/command/data-root-resolver.js +5 -4
  74. package/dist/core/command/memory-slash.js +16 -8
  75. package/dist/core/command/menu-catalog.js +6 -6
  76. package/dist/core/command/menu-handler.js +87 -163
  77. package/dist/core/command/menu-protocol.js +9 -2
  78. package/dist/core/command/role-menu.js +148 -30
  79. package/dist/core/command/slash-gate.js +13 -10
  80. package/dist/core/command/slash-handler.js +157 -352
  81. package/dist/core/daemon-control.js +8 -14
  82. package/dist/core/event-catalog.js +15 -0
  83. package/dist/core/evolagent-registry.js +4 -4
  84. package/dist/core/evolagent.js +2 -2
  85. package/dist/core/inference/text-inference.js +31 -40
  86. package/dist/core/ipc-registration.js +24 -3
  87. package/dist/core/memory/consolidation-context.js +51 -5
  88. package/dist/core/memory/consolidation-ops-records.js +1 -1
  89. package/dist/core/memory/consolidation-trigger.js +190 -190
  90. package/dist/core/memory/consolidation.js +316 -29
  91. package/dist/core/memory/forget-log.js +96 -0
  92. package/dist/core/memory/index-manager.js +27 -5
  93. package/dist/core/memory/memory-admin.js +45 -5
  94. package/dist/core/memory/memory-writer.js +163 -18
  95. package/dist/core/memory/relation-idle-monitor.js +119 -58
  96. package/dist/core/memory/relation-sweep.js +44 -39
  97. package/dist/core/message/aun-ipc-sender.js +34 -7
  98. package/dist/core/message/aun-request-registry.js +97 -3
  99. package/dist/core/message/im-renderer.js +11 -4
  100. package/dist/core/message/message-admission.js +97 -8
  101. package/dist/core/message/message-bridge.js +71 -24
  102. package/dist/core/message/message-log.js +55 -0
  103. package/dist/core/message/message-queue.js +5 -5
  104. package/dist/core/message/response-engine.js +387 -144
  105. package/dist/core/model/catalog-service.js +4 -2
  106. package/dist/core/model/config-scope.js +24 -64
  107. package/dist/core/model/field-scope.js +1 -1
  108. package/dist/core/model/model-catalog.js +37 -47
  109. package/dist/core/model/model-diagnostics.js +4 -3
  110. package/dist/core/model/model-fallback.js +10 -7
  111. package/dist/core/model/model-permission.js +3 -2
  112. package/dist/core/ownership/owner-resolver.js +25 -23
  113. package/dist/core/permission/ec-command-parser.js +138 -5
  114. package/dist/core/permission/sandbox-runtime.js +18 -1
  115. package/dist/core/permission/tool-policy.js +42 -10
  116. package/dist/core/relation/peer-identity.js +64 -1
  117. package/dist/core/role/runtime-policy.js +72 -13
  118. package/dist/core/session/session-capsule.js +197 -0
  119. package/dist/core/session/session-idle-monitor.js +1 -1
  120. package/dist/core/session/session-manager.js +168 -14
  121. package/dist/core/session/session-mapper.js +2 -0
  122. package/dist/core/session/session-renew.js +3 -3
  123. package/dist/core/skill/index-generator.js +15 -5
  124. package/dist/core/system-session/memory.js +6 -1
  125. package/dist/core/thread/thread-service.js +19 -6
  126. package/dist/directory/owner-directory-admission.js +95 -0
  127. package/dist/directory/owner-directory-authorization.js +309 -0
  128. package/dist/directory/owner-directory-cache.js +635 -0
  129. package/dist/eck/kit-renderer.js +2 -2
  130. package/dist/ecweb/basic-settings-service.js +33 -40
  131. package/dist/ecweb/message-context-service.js +110 -0
  132. package/dist/index.js +79 -17
  133. package/dist/ipc.js +189 -17
  134. package/dist/paths.js +4 -0
  135. package/dist/proxy/command.js +122 -0
  136. package/dist/proxy/ipc-service.js +68 -0
  137. package/dist/proxy/manager.js +485 -0
  138. package/dist/proxy/service-supervisor.js +603 -0
  139. package/dist/response-system/engines/v1/proactive-flow.js +16 -6
  140. package/dist/stats/budget.js +1 -1
  141. package/dist/stats/db.js +15 -0
  142. package/dist/stats/index.js +2 -2
  143. package/dist/stats/price-resolver.js +304 -5
  144. package/dist/stats/query.js +82 -3
  145. package/dist/stats/writer.js +38 -5
  146. package/dist/trigger/feedback.js +18 -7
  147. package/dist/trigger/manager.js +20 -3
  148. package/dist/trigger/parser.js +6 -3
  149. package/dist/trigger/patch.js +1 -1
  150. package/dist/trigger/system-definitions.js +43 -7
  151. package/dist/trigger/validation.js +13 -5
  152. package/dist/utils/cross-platform.js +14 -0
  153. package/dist/utils/ecweb-supervisor.js +258 -83
  154. package/dist/utils/error-utils.js +16 -2
  155. package/dist/utils/logger.js +24 -5
  156. package/dist/utils/npm-ops.js +2 -1
  157. package/dist/utils/package-version-info.js +5 -3
  158. package/dist/utils/upgrade-jobs.js +45 -5
  159. package/kits/docs/INDEX.md +1 -1
  160. package/kits/docs/aun/ABILITY_CALLING.md +20 -2
  161. package/kits/docs/channels/aun.md +9 -0
  162. package/kits/docs/evolcore/INDEX.md +2 -1
  163. package/kits/docs/evolcore/agent-create.md +3 -2
  164. package/kits/docs/evolcore/agent.md +1 -1
  165. package/kits/docs/evolcore/config.md +18 -7
  166. package/kits/docs/evolcore/contact.md +3 -0
  167. package/kits/docs/evolcore/event.md +1 -0
  168. package/kits/docs/evolcore/fs.md +16 -0
  169. package/kits/docs/evolcore/memory-architecture.md +2 -2
  170. package/kits/docs/evolcore/memory-consolidation.md +32 -8
  171. package/kits/docs/evolcore/memory.md +1 -1
  172. package/kits/docs/evolcore/menu-protocol.md +36 -0
  173. package/kits/docs/evolcore/model.md +23 -20
  174. package/kits/docs/evolcore/msg.md +21 -8
  175. package/kits/docs/evolcore/session.md +14 -0
  176. package/kits/migrations/migrate-contact-book-v2.mjs +30 -11
  177. package/kits/schemas/_meta.json +37 -4
  178. package/kits/schemas/agent-config.schema.13.json +23 -3
  179. package/kits/schemas/agent-config.schema.16.json +891 -0
  180. package/kits/schemas/daemon.schema.9.json +366 -0
  181. package/kits/schemas/defaults.schema.5.json +406 -127
  182. package/kits/schemas/relation-config.schema.11.json +260 -0
  183. package/kits/schemas/role-config.schema.1.json +7 -7
  184. package/kits/skills/.switches.json +3 -7
  185. package/kits/skills/aid-ability/SKILL.md +35 -6
  186. package/kits/skills/ec-service-proxy/SKILL.md +118 -0
  187. package/kits/skills/ec-trigger/SKILL.md +13 -5
  188. package/kits/skills/personal-assistant/SKILL.md +176 -0
  189. package/kits/skills/personal-assistant/references/01-workspace-spec.md +333 -0
  190. package/kits/skills/personal-assistant/references/02-bootstrap.md +205 -0
  191. package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +177 -0
  192. package/kits/skills/personal-assistant/references/04-frontend-contract.md +439 -0
  193. package/kits/skills/personal-assistant/references/05-directory-reference.md +292 -0
  194. package/kits/skills/personal-assistant/references/06-render-config.md +350 -0
  195. package/kits/skills/personal-assistant/schema/workspace.schema.json +85 -0
  196. package/kits/skills/personal-assistant/schema/workspace.v1.json +66 -0
  197. package/kits/skills/personal-assistant/scripts/archive.mjs +154 -0
  198. package/kits/skills/personal-assistant/scripts/check.mjs +114 -0
  199. package/kits/skills/personal-assistant/scripts/index-rebuild.mjs +252 -0
  200. package/kits/skills/personal-assistant/scripts/ingest.mjs +344 -0
  201. package/kits/skills/personal-assistant/scripts/init.mjs +270 -0
  202. package/kits/skills/personal-assistant/scripts/lib/apply.mjs +92 -0
  203. package/kits/skills/personal-assistant/scripts/lib/schema.mjs +96 -0
  204. package/kits/skills/personal-assistant/scripts/lib/time.mjs +28 -0
  205. package/kits/skills/personal-assistant/scripts/migrate.mjs +172 -0
  206. package/kits/skills/personal-assistant/scripts/search.mjs +172 -0
  207. package/kits/skills/personal-assistant/scripts/verify.mjs +196 -0
  208. package/kits/skills/personal-assistant/templates/INDEX.md.tpl +24 -0
  209. package/kits/skills/personal-assistant/templates/README.md.tpl +108 -0
  210. package/kits/skills/personal-assistant/triggers/ingest-daily.json +23 -0
  211. package/kits/skills/personal-assistant/triggers/memory-consolidate.json +23 -0
  212. package/kits/skills/personal-assistant/triggers/report-daily.json +23 -0
  213. package/kits/skills/personal-assistant/triggers/report-weekly.json +23 -0
  214. package/kits/templates/memory-consolidation/forget.md +19 -6
  215. package/kits/templates/memory-consolidation/notes.md +1 -1
  216. package/kits/templates/memory-consolidation/profile.md +2 -2
  217. package/kits/templates/memory-consolidation/promote.md +20 -3
  218. package/kits/templates/roles/member.json +8 -1
  219. package/kits/templates/session-capsule/recovery.md +5 -0
  220. package/kits/templates/session-capsule/renew.md +5 -0
  221. package/kits/templates/system-fragments/baseagent.md +2 -2
  222. package/kits/templates/system-fragments/bootstrap.md +6 -6
  223. package/kits/templates/system-fragments/channel.md +1 -1
  224. package/kits/templates/system-fragments/memory.md +4 -4
  225. package/package.json +7 -3
  226. package/dist/stats/billing.js +0 -215
@@ -13,6 +13,7 @@ import { loadDaemonConfig } from '../../config-store.js';
13
13
  import { formatPeerKey } from '../../core/relation/peer-identity.js';
14
14
  import { normalizeAunMentionEntries, withAunAttention } from './mention-schema.js';
15
15
  import { isTopicThreadId } from '../../core/thread/topic-id.js';
16
+ import { resolveAunSendDevice } from '../ability-device-routing.js';
16
17
  const DAEMON_SEND_TIMEOUT_GRACE_MS = 10_000;
17
18
  const DEFAULT_IDLE_TIMEOUT_MS = 120_000;
18
19
  const MAX_TIMER_MS = 2_147_483_647;
@@ -81,6 +82,11 @@ function applyRoutingPayloadFields(payload, args, runtimeContext, includeRuntime
81
82
  const refMessageId = runtimeRefMessageIdForMsgSend({ from: args.from, runtime: runtimeContext });
82
83
  if (refMessageId && !payload.ref_message_id)
83
84
  payload.ref_message_id = refMessageId;
85
+ // Mark the final user-visible text message so the wire ext carries isFinal.
86
+ // buildWireExt (daemon side) merges this into the outgoing ext dictionary.
87
+ if (payload.type === 'text') {
88
+ payload.ext = { isFinal: true, ...(payload.ext && typeof payload.ext === 'object' && !Array.isArray(payload.ext) ? payload.ext : {}) };
89
+ }
84
90
  }
85
91
  function msgSendThreadId(args, payload, runtimeContext) {
86
92
  const payloadThreadId = typeof payload?.thread_id === 'string' && payload.thread_id.trim()
@@ -98,7 +104,9 @@ function msgSendLogMetadata(args, payload, runtimeContext) {
98
104
  const isInSession = !!process.env.EVOLCORE_SESSION_ID || !!runtimeContext;
99
105
  const source = isInSession ? 'msg' : 'cli';
100
106
  const classified = payload === undefined ? undefined : classifyAunPayloadForLog(payload);
101
- const threadId = msgSendThreadId(args, payload && typeof payload === 'object' ? payload : undefined, runtimeContext);
107
+ const threadId = args.body.mode === 'payload'
108
+ ? args.thread
109
+ : msgSendThreadId(args, payload && typeof payload === 'object' ? payload : undefined, runtimeContext);
102
110
  const sessionId = runtimeContext?.channel === 'aun'
103
111
  && runtimeContext.chatType === 'private'
104
112
  && runtimeContext.selfAid === args.from
@@ -132,12 +140,15 @@ async function tryDaemonMsgSend(args, payload, runtimeContext, file) {
132
140
  if (args.slotId || args.aunPath) {
133
141
  return { ok: false, code: 'INVALID_DELEGATION', error: 'Task sends cannot override the daemon AUN connection' };
134
142
  }
135
- const thread = msgSendThreadId(args, payload, runtimeContext);
143
+ const thread = args.body.mode === 'payload'
144
+ ? args.thread
145
+ : msgSendThreadId(args, payload, runtimeContext);
136
146
  const response = await ipcQuery(resolvePaths().socket, {
137
147
  type: 'aun-msg-send',
138
148
  aid: args.from,
139
149
  to: args.to,
140
150
  scope: 'msg',
151
+ deviceId: args.deviceId,
141
152
  ...(payload ? { payload } : { file }),
142
153
  rawPayload: args.body.mode === 'payload',
143
154
  encrypt: args.encrypt,
@@ -169,8 +180,9 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
169
180
  };
170
181
  }
171
182
  const completedRequest = args.returnPolicy === 'required' && !!daemonResult.request_id
172
- && daemonResult.request_state === 'completed' && !!daemonResult.response
173
- && typeof daemonResult.response === 'object' && !Array.isArray(daemonResult.response);
183
+ && daemonResult.request_state === 'completed'
184
+ && ((!!daemonResult.response && typeof daemonResult.response === 'object' && !Array.isArray(daemonResult.response))
185
+ || (Array.isArray(daemonResult.responses) && daemonResult.responses.length > 0));
174
186
  if (!daemonResult.message_id && !daemonResult.handoff_id && !completedRequest) {
175
187
  return { ok: false, error: 'daemon AUN message send returned no message_id' };
176
188
  }
@@ -186,6 +198,8 @@ async function daemonMsgSendResult(args, payload, runtimeContext, daemonResult)
186
198
  request_id: daemonResult.request_id,
187
199
  request_state: daemonResult.request_state,
188
200
  response: daemonResult.response,
201
+ responses: daemonResult.responses,
202
+ request_diagnostics: daemonResult.request_diagnostics,
189
203
  transport_error: daemonResult.transport_error,
190
204
  };
191
205
  if (sent.message_id && !daemonResult.handoff_id && !daemonResult.log_written) {
@@ -232,6 +246,12 @@ async function appendMsgSendOutboundLog(args, result, opts) {
232
246
  catch { /* daemon 不在或 IPC 失败都忽略 */ }
233
247
  }
234
248
  export async function msgSend(args) {
249
+ try {
250
+ resolveAunSendDevice(args.deviceId, 'msg', args.body.mode === 'payload' ? args.body.payload : undefined);
251
+ }
252
+ catch (error) {
253
+ return { ok: false, code: error.code, error: error.message };
254
+ }
235
255
  if (args.handoffContext !== undefined && (!process.env.EVOLCORE_SESSION_ID
236
256
  || !args.handoffContext.trim() || args.handoffContext.length > 64 * 1024)) {
237
257
  return { ok: false, code: 'INVALID_HANDOFF_CONTEXT', error: 'handoff context requires a managed session and 1–65536 characters' };
@@ -252,7 +272,9 @@ export async function msgSend(args) {
252
272
  if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
253
273
  payload.mentions = normalizeAunMentionEntries(payload.mentions);
254
274
  }
255
- applyRoutingPayloadFields(payload, args, runtimeContext, false);
275
+ if (args.body.mode !== 'payload') {
276
+ applyRoutingPayloadFields(payload, args, runtimeContext, false);
277
+ }
256
278
  const daemonResult = await tryDaemonMsgSend(args, payload, runtimeContext);
257
279
  if (daemonResult)
258
280
  return daemonMsgSendResult(args, payload, runtimeContext, daemonResult);
@@ -336,14 +358,17 @@ export async function msgSend(args) {
336
358
  if (args.body.mode !== 'payload')
337
359
  payload.chatmode = chatmode;
338
360
  // 5. 写入 payload.thread_id/ref_message_id(如果指定)
339
- applyRoutingPayloadFields(payload, args, runtimeContext, args.body.mode !== 'payload');
361
+ if (args.body.mode !== 'payload') {
362
+ applyRoutingPayloadFields(payload, args, runtimeContext);
363
+ }
340
364
  if (args.body.mode !== 'payload' && Object.prototype.hasOwnProperty.call(payload, 'mentions')) {
341
365
  payload.mentions = normalizeAunMentionEntries(payload.mentions);
342
366
  }
343
367
  const encrypt = resolveAunMessageEncrypt(args.encrypt);
344
368
  if (args.body.mode !== 'payload')
345
369
  payload = withAunAttention(payload);
346
- const sendParams = { to: args.to, payload, encrypt };
370
+ const sendParams = { to: args.to, payload, encrypt,
371
+ ...(args.deviceId ? { device_id: args.deviceId } : {}) };
347
372
  const result = await conn.call('message.send', sendParams);
348
373
  const messageId = typeof result?.message_id === 'string' && result.message_id.trim()
349
374
  ? result.message_id
@@ -19,6 +19,8 @@ import path from 'path';
19
19
  import { ServiceProxyClient, EndpointPolicy } from '@agentunion/fastaun';
20
20
  import { resolvePaths } from '../paths.js';
21
21
  import { logger } from '../utils/logger.js';
22
+ import { parseEcwebInstanceRecord } from '../contracts/ecweb-instance.js';
23
+ import { getProcessStartTime, startTimeMatches } from '../utils/process-introspect.js';
22
24
  const LOG = '[ServiceProxy]';
23
25
  const INSTANCE_DISCOVERY_TIMEOUT_MS = 10_000;
24
26
  const INSTANCE_DISCOVERY_INTERVAL_MS = 250;
@@ -29,7 +31,7 @@ function sleep(ms) {
29
31
  * 读 data/instance/ 下指定服务的存活实例端口。
30
32
  * 取 startedAt 最新的一条(多实例保护下通常只有一条存活)。
31
33
  */
32
- function discoverInstancePort(serviceName) {
34
+ function discoverInstancePort(serviceName, expectedPort) {
33
35
  const dir = resolvePaths().instanceDir;
34
36
  let files;
35
37
  try {
@@ -47,7 +49,10 @@ function discoverInstancePort(serviceName) {
47
49
  continue;
48
50
  const filePid = Number(match[1]);
49
51
  try {
50
- const rec = JSON.parse(fs.readFileSync(path.join(dir, file), 'utf-8'));
52
+ const raw = JSON.parse(fs.readFileSync(path.join(dir, file), 'utf-8'));
53
+ const rec = serviceName === 'ecweb'
54
+ ? parseEcwebInstanceRecord(raw, resolvePaths().root, file)
55
+ : raw;
51
56
  if (rec
52
57
  && Number.isInteger(rec.pid)
53
58
  && rec.pid > 0
@@ -55,11 +60,13 @@ function discoverInstancePort(serviceName) {
55
60
  && isProcessAlive(rec.pid)
56
61
  && typeof rec.startedAt === 'number'
57
62
  && Number.isFinite(rec.startedAt)
63
+ && (serviceName !== 'ecweb' || !('schemaVersion' in rec) || startTimeMatches(rec.startedAt, getProcessStartTime(rec.pid)))
58
64
  && rec.startedAt >= 0
59
65
  && Number.isInteger(rec.port)
60
66
  && rec.port >= 1
61
- && rec.port <= 65535) {
62
- records.push(rec);
67
+ && rec.port <= 65535
68
+ && (expectedPort === undefined || rec.port === expectedPort)) {
69
+ records.push({ pid: rec.pid, port: rec.port, startedAt: rec.startedAt });
63
70
  }
64
71
  }
65
72
  catch {
@@ -81,11 +88,11 @@ function isProcessAlive(pid) {
81
88
  return e?.code === 'EPERM';
82
89
  }
83
90
  }
84
- async function waitForInstancePort(serviceName) {
91
+ async function waitForInstancePort(serviceName, expectedPort) {
85
92
  const deadline = Date.now() + INSTANCE_DISCOVERY_TIMEOUT_MS;
86
93
  let loggedWait = false;
87
94
  while (Date.now() <= deadline) {
88
- const port = discoverInstancePort(serviceName);
95
+ const port = discoverInstancePort(serviceName, expectedPort);
89
96
  if (port)
90
97
  return port;
91
98
  if (!loggedWait) {
@@ -101,7 +108,7 @@ async function waitForInstancePort(serviceName) {
101
108
  */
102
109
  async function resolveEndpoint(svc) {
103
110
  if (svc.proxy?.source === 'instance') {
104
- const port = await waitForInstancePort(svc.name);
111
+ const port = await waitForInstancePort(svc.name, svc.port);
105
112
  if (!port) {
106
113
  logger.warn(`${LOG} 服务 "${svc.name}" source=instance 等待 ${INSTANCE_DISCOVERY_TIMEOUT_MS}ms 后仍未发现存活实例,跳过`);
107
114
  return null;
@@ -181,10 +188,10 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
181
188
  let registered = 0;
182
189
  for (const svc of services) {
183
190
  if (stopped)
184
- return;
191
+ return { registered: 0, gatewayRegistered: false };
185
192
  const endpoint = await resolveEndpoint(svc);
186
193
  if (stopped)
187
- return;
194
+ return { registered: 0, gatewayRegistered: false };
188
195
  if (!endpoint)
189
196
  continue;
190
197
  try {
@@ -202,10 +209,18 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
202
209
  }
203
210
  if (registered === 0) {
204
211
  logger.warn(`${LOG} 没有成功注册任何服务,不启动隧道`);
205
- return;
212
+ return { registered: 0, gatewayRegistered: false };
206
213
  }
207
214
  if (stopped)
208
- return;
215
+ return { registered: 0, gatewayRegistered: false };
216
+ let gatewayRegistered = false;
217
+ try {
218
+ await proxyClient.registerServicesWithGateway();
219
+ gatewayRegistered = true;
220
+ }
221
+ catch (e) {
222
+ logger.warn(`${LOG} Gateway 登记暂不可用,隧道后台继续重试: ${e?.message || e}`);
223
+ }
209
224
  // 常驻持久隧道(内部自带指数退避重连 + client 缺失时自动等待)。
210
225
  // 不 await:后台运行,不阻塞 daemon 启动。
211
226
  proxyClient
@@ -217,13 +232,22 @@ export function startServiceProxy(controlChannel, providerAid, configuredService
217
232
  logger.error(`${LOG} serveForever 异常退出: ${e?.message || e}`);
218
233
  });
219
234
  logger.info(`${LOG} ✓ 已启动,provider=${providerAid},注册 ${registered} 个服务`);
235
+ return { registered, gatewayRegistered };
220
236
  }
221
237
  catch (e) {
222
238
  logger.warn(`${LOG} 启动失败(不影响 daemon 主流程): ${e?.message || e}`);
239
+ throw e;
223
240
  }
224
241
  };
225
- void run();
242
+ const ready = run();
243
+ void ready.catch(() => { });
226
244
  return {
245
+ ready,
246
+ unregister: async (serviceNames) => {
247
+ if (!proxyClient || serviceNames.length === 0)
248
+ return;
249
+ await proxyClient.unregisterServicesFromGateway(serviceNames);
250
+ },
227
251
  stop: () => {
228
252
  stopped = true;
229
253
  try {
@@ -27,3 +27,33 @@ export async function storageDownload(aid, url, localPath, opts) {
27
27
  fs.writeFileSync(outPath, buffer);
28
28
  return { ok: true, localPath: outPath, size: buffer.length };
29
29
  }
30
+ export async function storageGetByShare(aid, shareId, localPath, opts) {
31
+ const shareResult = await rpcCall(aid, 'storage.get_by_share', { share_id: shareId }, { aunPath: opts?.aunPath });
32
+ if (!shareResult.ok) {
33
+ return { ok: false, localPath: '', size: 0, error: JSON.stringify(shareResult.error) };
34
+ }
35
+ const res = shareResult.result;
36
+ const objectKey = typeof res.object_key === 'string' ? res.object_key : '';
37
+ const contentType = typeof res.content_type === 'string' ? res.content_type : undefined;
38
+ const sha256 = typeof res.sha256 === 'string' ? res.sha256 : undefined;
39
+ // Small object: content is inlined as base64
40
+ if (typeof res.content === 'string') {
41
+ const buffer = Buffer.from(res.content, 'base64');
42
+ const outPath = localPath ?? (objectKey ? path.basename(objectKey) : `share-${shareId}`);
43
+ fs.writeFileSync(outPath, buffer);
44
+ return { ok: true, localPath: outPath, size: buffer.length, objectKey, contentType, sha256 };
45
+ }
46
+ // Large object: download_url provided
47
+ const downloadUrl = typeof res.download_url === 'string' ? res.download_url : undefined;
48
+ if (!downloadUrl) {
49
+ return { ok: false, localPath: '', size: 0, error: 'storage.get_by_share returned neither content nor download_url' };
50
+ }
51
+ const resp = await fetch(downloadUrl);
52
+ if (!resp.ok) {
53
+ return { ok: false, localPath: '', size: 0, error: `HTTP GET failed: ${resp.status}` };
54
+ }
55
+ const buffer = Buffer.from(await resp.arrayBuffer());
56
+ const outPath = localPath ?? (objectKey ? path.basename(objectKey) : `share-${shareId}`);
57
+ fs.writeFileSync(outPath, buffer);
58
+ return { ok: true, localPath: outPath, size: buffer.length, objectKey, contentType, sha256 };
59
+ }
@@ -1,5 +1,5 @@
1
1
  export { storageUpload, storageUploadBuffer, storageLs, storageRm, storageQuota } from './client.js';
2
- export { storageDownload } from './download.js';
2
+ export { storageDownload, storageGetByShare } from './download.js';
3
3
  import { isValidAid } from '../aid/validation.js';
4
4
  export function resolveStorageCommandArgv(argv) {
5
5
  if (argv[0] !== 'storage')
@@ -18,14 +18,22 @@ export function resolveStorageCommandArgv(argv) {
18
18
  positionals.push(value);
19
19
  }
20
20
  const [sub, aid, source, destination] = positionals;
21
- const operation = { upload: 'storage.upload', download: 'storage.download', ls: 'storage.list', rm: 'storage.delete', quota: 'storage.quota' }[sub];
21
+ const operation = {
22
+ upload: 'storage.upload', download: 'storage.download', ls: 'storage.list',
23
+ rm: 'storage.delete', quota: 'storage.quota', 'get-by-share': 'storage.get_by_share',
24
+ }[sub];
22
25
  if (!operation || !aid || !isValidAid(aid))
23
26
  throw new Error('Invalid storage command or AID');
24
- const counts = { upload: [4], download: [3, 4], ls: [2, 3], rm: [3], quota: [2] };
27
+ const counts = {
28
+ upload: [4], download: [3, 4], ls: [2, 3], rm: [3], quota: [2], 'get-by-share': [3, 4],
29
+ };
25
30
  if (!counts[sub].includes(positionals.length) || (isPublic && sub !== 'upload'))
26
31
  throw new Error('Invalid storage arguments');
27
- return { sub, aid, operation, isPublic, localFile: sub === 'upload' ? source : undefined,
32
+ return { sub, aid, operation, isPublic,
33
+ localFile: sub === 'upload' ? source : undefined,
28
34
  remotePath: sub === 'upload' ? destination : sub === 'rm' ? source : undefined,
29
- url: sub === 'download' ? source : undefined, localPath: sub === 'download' ? destination : undefined,
30
- prefix: sub === 'ls' ? source ?? '' : undefined };
35
+ url: sub === 'download' ? source : undefined,
36
+ localPath: sub === 'download' ? destination : sub === 'get-by-share' ? destination : undefined,
37
+ prefix: sub === 'ls' ? source ?? '' : undefined,
38
+ shareId: sub === 'get-by-share' ? source : undefined };
31
39
  }