evolcore 0.0.46 → 0.0.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +93 -0
- package/bin/ec-build.mjs +86 -0
- package/dist/agent-template/jobs.js +12 -4
- package/dist/agent-template/runtime.js +139 -39
- package/dist/agent-template/service.js +66 -13
- package/dist/agents/baseagent.js +60 -20
- package/dist/agents/claude-runner.js +43 -18
- package/dist/agents/codex/app-server-client.js +32 -23
- package/dist/agents/codex-runner.js +31 -16
- package/dist/agents/ecagent-runner.js +7 -4
- package/dist/agents/gemini-runner.js +5 -2
- package/dist/agents/runner-types.js +5 -21
- package/dist/aun/aid/agentmd.js +5 -1
- package/dist/aun/group/fs-download.js +1 -1
- package/dist/aun/service-proxy.js +4 -2
- package/dist/build-identity.json +1 -0
- package/dist/channels/aun.js +100 -32
- package/dist/channels/daemon.js +10 -26
- package/dist/cli/aun-commands.js +86 -51
- package/dist/cli/code-stats.js +19 -8
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +65 -76
- package/dist/cli/daemon-lifecycle-client.js +17 -3
- package/dist/cli/directory.js +7 -1
- package/dist/cli/ecmsg-gateway.js +5 -2
- package/dist/cli/index.js +2 -8
- package/dist/cli/init-channel.js +6 -8
- package/dist/cli/init.js +74 -46
- package/dist/cli/invoke-command.js +1 -1
- package/dist/cli/provider-command.js +74 -13
- package/dist/cli/restart-monitor.js +104 -28
- package/dist/cli/role.js +61 -17
- package/dist/cli/stats.js +3 -3
- package/dist/cli/task-context.js +83 -15
- package/dist/cli/thread-command.js +16 -51
- package/dist/cli/upgrade-command.js +4 -2
- package/dist/config/boot-log.js +3 -9
- package/dist/config/builtin-roles.js +5 -7
- package/dist/config/config-manager.js +31 -23
- package/dist/config/daemon-services.js +30 -3
- package/dist/config/gateway-config.js +2 -2
- package/dist/config/invoke-ipc-service.js +6 -4
- package/dist/config/peer-bind-code.js +3 -4
- package/dist/config/peer-book-store.js +59 -218
- package/dist/config/peer-book.js +26 -27
- package/dist/config/peer-role-resolver.js +16 -1
- package/dist/config/provider-identity-migration.js +161 -6
- package/dist/config/provider-ipc-service.js +56 -11
- package/dist/config/provider-menu-request.js +24 -5
- package/dist/config/provider-templates.js +127 -0
- package/dist/config/providers-config.js +59 -8
- package/dist/config/providers-management.js +467 -49
- package/dist/config/role-command-service.js +248 -1
- package/dist/config/schema-migration.js +228 -20
- package/dist/config/schema-registry.js +6 -2
- package/dist/core/agent-application-service.js +6 -1
- package/dist/core/agent-runtime.js +10 -5
- package/dist/core/auth/agent-delegation.js +10 -4
- package/dist/core/auth/auth-gateway.js +2 -1
- package/dist/core/auth/delegation-authorization.js +3 -0
- package/dist/core/auth/delegation-diagnostics.js +56 -15
- package/dist/core/auth/operation-authorizer.js +26 -1
- package/dist/core/auth/operation-catalog.js +28 -64
- package/dist/core/capability/providers/codex-capability-provider.js +7 -8
- package/dist/core/channel-loader.js +18 -0
- package/dist/core/command/agent-control.js +32 -0
- package/dist/core/command/command-handler.js +81 -85
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +65 -153
- package/dist/core/command/menu-protocol.js +7 -1
- package/dist/core/command/provider-menu.js +13 -3
- package/dist/core/command/role-menu.js +47 -23
- package/dist/core/command/slash-handler.js +30 -49
- package/dist/core/command/team-workspace-items.js +81 -12
- package/dist/core/command/team-workspace-team.js +9 -71
- package/dist/core/command/topic-slash.js +9 -30
- package/dist/core/daemon-bootstrap.js +19 -10
- package/dist/core/daemon-control.js +8 -10
- package/dist/core/daemon-lifecycle.js +50 -40
- package/dist/core/evolagent-registry.js +22 -3
- package/dist/core/file-integrity/store.js +2 -0
- package/dist/core/handoff/runtime.js +37 -1
- package/dist/core/host-snapshot.js +9 -4
- package/dist/core/inference/text-inference.js +3 -1
- package/dist/core/initialization/service.js +31 -8
- package/dist/core/interaction-router.js +3 -0
- package/dist/core/invoke/executors/text.js +72 -19
- package/dist/core/ipc-registration.js +6 -4
- package/dist/core/memory/consolidation.js +6 -6
- package/dist/core/message/aun-ipc-sender.js +165 -55
- package/dist/core/message/im-renderer.js +1 -1
- package/dist/core/message/message-bridge.js +51 -334
- package/dist/core/message/message-log.js +5 -0
- package/dist/core/message/message-queue.js +22 -0
- package/dist/core/message/message-utils.js +8 -0
- package/dist/core/message/response-engine.js +429 -116
- package/dist/core/message/send-routing.js +5 -1
- package/dist/core/model/catalog-service.js +31 -11
- package/dist/core/model/model-capabilities.js +22 -4
- package/dist/core/model/model-catalog.js +1 -0
- package/dist/core/ownership/owner-resolver.js +355 -60
- package/dist/core/permission/protected-paths.js +6 -6
- package/dist/core/relation/peer-identity.js +28 -2
- package/dist/core/relation/same-owner-proof.js +81 -111
- package/dist/core/session/adapters/claude-session-file-adapter.js +1 -1
- package/dist/core/session/adapters/codex-session-file-adapter.js +96 -15
- package/dist/core/session/session-file-health.js +49 -14
- package/dist/core/session/session-fs-store.js +91 -35
- package/dist/core/session/session-manager.js +68 -24
- package/dist/core/session/session-mapper.js +14 -34
- package/dist/core/session/session-transcript.js +5 -1
- package/dist/core/task/task-activity-store.js +84 -0
- package/dist/core/task/task-image-resources.js +1 -1
- package/dist/core/task/task-recovery-service.js +12 -0
- package/dist/core/thread/command-parser.js +7 -12
- package/dist/core/thread/thread-context-storage.js +3 -2
- package/dist/core/thread/thread-operation.js +2 -13
- package/dist/core/thread/thread-service.js +15 -46
- package/dist/directory/owner-directory-admission.js +1 -1
- package/dist/directory/owner-directory-cache.js +45 -28
- package/dist/directory/owner-directory-markdown.js +13 -1
- package/dist/directory/owner-directory-query-operation.js +29 -3
- package/dist/directory/owner-directory-remarks.js +11 -3
- package/dist/eck/message-renderer.js +84 -24
- package/dist/ecweb/basic-settings-service.js +3 -1
- package/dist/ecweb/message-context-service.js +1 -1
- package/dist/ecweb/pairing.js +4 -3
- package/dist/ecweb/providers-service.js +26 -1
- package/dist/ecweb/runtime/lifecycle.js +82 -23
- package/dist/ecweb/runtime/proxy-access.js +74 -0
- package/dist/ecweb/runtime/supervisor.js +6 -17
- package/dist/event-center/registry.js +13 -2
- package/dist/event-center/runtime.js +103 -11
- package/dist/event-center/script-runner.js +5 -5
- package/dist/index.js +129 -93
- package/dist/ipc.js +15 -3
- package/dist/outputs/events.js +62 -0
- package/dist/outputs/protocol.js +102 -0
- package/dist/outputs/service.js +279 -0
- package/dist/paths.js +3 -0
- package/dist/proxy/manager.js +43 -13
- package/dist/services/index.js +89 -4
- package/dist/services/ipc-operation.js +4 -15
- package/dist/services/pack-manager.js +12 -1
- package/dist/services/router.js +21 -6
- package/dist/services/script-runner.js +5 -4
- package/dist/services/validation.js +1 -1
- package/dist/stats/budget.js +1 -1
- package/dist/stats/db.js +19 -0
- package/dist/stats/index.js +1 -1
- package/dist/stats/{price-resolver.js → model-resolver.js} +305 -24
- package/dist/stats/normalizer.js +2 -0
- package/dist/stats/query.js +35 -27
- package/dist/stats/role-budget.js +5 -2
- package/dist/stats/writer.js +10 -6
- package/dist/trigger/audit.js +7 -0
- package/dist/trigger/authorization.js +105 -11
- package/dist/trigger/feedback.js +10 -0
- package/dist/trigger/history.js +37 -11
- package/dist/trigger/ipc-service.js +12 -1
- package/dist/trigger/manager.js +1 -0
- package/dist/trigger/scheduler.js +11 -5
- package/dist/trigger/script-executor.js +2 -1
- package/dist/trigger/script-sandbox.js +9 -3
- package/dist/trigger/state.js +7 -0
- package/dist/trigger/validation.js +22 -0
- package/dist/utils/aid-bind.js +155 -18
- package/dist/utils/atomic-write.js +3 -3
- package/dist/utils/cross-platform.js +97 -31
- package/dist/utils/error-dict.json +94 -4
- package/dist/utils/error-utils.js +40 -4
- package/dist/utils/evolcore-version.js +36 -65
- package/dist/utils/instance-registry.js +61 -0
- package/dist/utils/msg-diag.js +1 -0
- package/dist/utils/process-introspect.js +158 -8
- package/dist/utils/process-tree.js +50 -2
- package/dist/utils/upgrade-jobs.js +4 -4
- package/dist/utils/windows-shell-trust.js +2 -0
- package/dist/workbench/protocol.js +80 -0
- package/dist/workbench/service.js +359 -0
- package/ecagent/dist/types.d.ts +6 -2
- package/kits/docs/context-assembly.md +1 -1
- package/kits/docs/evolcore/INDEX.md +2 -2
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +12 -0
- package/kits/docs/evolcore/directory.md +22 -3
- package/kits/docs/evolcore/ecweb-lifecycle.md +15 -0
- package/kits/docs/evolcore/model.md +10 -0
- package/kits/docs/evolcore/peer.md +19 -65
- package/kits/docs/evolcore/provider.md +133 -5
- package/kits/docs/evolcore/role.md +80 -0
- package/kits/docs/evolcore/services.md +6 -6
- package/kits/docs/evolcore/team-workspace.md +1 -1
- package/kits/docs/evolcore/thread-chain.md +14 -15
- package/kits/docs/evolcore/tool-authorization.md +5 -0
- package/kits/docs/evolcore/trigger.md +10 -0
- package/kits/eck_message_manifest.json +12 -0
- package/kits/provider-templates.json +1213 -0
- package/kits/rules/04-relation.md +3 -3
- package/kits/schemas/_meta.json +14 -2
- package/kits/schemas/contact-book.schema.4.json +52 -0
- package/kits/schemas/providers.schema.3.json +200 -0
- package/kits/skills/.switches.json +4 -0
- package/kits/skills/ability/references/calling.md +1 -1
- package/kits/skills/ec-group/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +19 -72
- package/kits/skills/ec-provider/SKILL.md +221 -0
- package/kits/skills/ec-provider/scripts/check-model.mjs +80 -0
- package/kits/skills/ec-trigger/SKILL.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +34 -21
- package/kits/templates/message-fragments/group-batch-item.md +1 -1
- package/kits/templates/message-fragments/group-batch.md +1 -1
- package/kits/templates/message-fragments/inject-default.md +1 -1
- package/kits/templates/message-fragments/interrupt-insert.md +1 -0
- package/kits/templates/message-fragments/item-group.md +1 -1
- package/kits/templates/message-fragments/item-private.md +1 -1
- package/kits/templates/message-fragments/thread-context.md +1 -1
- package/kits/templates/message-fragments/trigger-session.md +1 -1
- package/kits/templates/message-fragments/trigger-thread-check.md +1 -1
- package/kits/templates/roles/admin.json +2 -19
- package/kits/templates/roles/member.json +0 -3
- package/kits/templates/system-fragments/baseagent.md +6 -0
- package/kits/templates/system-fragments/commands.md +3 -3
- package/kits/templates/system-fragments/managed-runtime.md +1 -1
- package/kits/templates/system-fragments/relation.md +1 -1
- package/kits/templates/system-fragments/thread.md +6 -5
- package/package.json +6 -4
- package/scripts/agent-template/inspect.mjs +4 -1
- package/scripts/agent-template/shared/common.mjs +2 -3
- package/scripts/agent-template/shared/template-contract.mjs +2 -1
- package/scripts/agent-template/shared/template-package.mjs +9 -2
- package/scripts/agent-template/shared/template-runtime.mjs +20 -5
- package/scripts/agent-template/team-pack.mjs +6 -3
- package/dist/cli/peer.js +0 -127
- package/dist/config/peer-operation-service.js +0 -132
- package/dist/config/peer-request-service.js +0 -532
- package/dist/core/command/connect-menu.js +0 -624
package/dist/cli/aun-commands.js
CHANGED
|
@@ -1527,6 +1527,9 @@ export function buildThreadCheckTrigger(input) {
|
|
|
1527
1527
|
// labels 只收字符串(validation.ts 校验);scheduler 读取时用 Number() 还原。
|
|
1528
1528
|
...(input.firstSentAt ? { firstSentAt: String(input.firstSentAt) } : {}),
|
|
1529
1529
|
...(input.originThreadName ? { originThreadName: input.originThreadName } : {}),
|
|
1530
|
+
...(input.originPeerName && input.originPeerName !== input.originPeer
|
|
1531
|
+
? { originPeerName: input.originPeerName } : {}),
|
|
1532
|
+
...(input.originPeerType ? { originPeerType: input.originPeerType } : {}),
|
|
1530
1533
|
...(input.targetThreadName ? { targetThreadName: input.targetThreadName } : {}),
|
|
1531
1534
|
},
|
|
1532
1535
|
...(input.origin ? { origin: input.origin } : {}),
|
|
@@ -1596,16 +1599,22 @@ export function buildCrossThreadReviewPrompt(input) {
|
|
|
1596
1599
|
/**
|
|
1597
1600
|
* 解析并校验 `--check-every`。返回 `{ durationMs }` 或错误。
|
|
1598
1601
|
* 私聊与群聊两条跨话题发送路径共用,保证错误码一致。
|
|
1602
|
+
*
|
|
1603
|
+
* `--check-every none` = 跨话题发送但**不建复查 Trigger**(收尾场景:结果带回原话题)。
|
|
1604
|
+
* 此时仍写 thread-inbox —— 「我发过这条」是事实,与「要不要定时唤醒我」是两件事。
|
|
1605
|
+
* 不传 `--check-every` 仍然报错:逼调用方显式区分「发起」和「无需跟进」。
|
|
1599
1606
|
*/
|
|
1600
1607
|
function parseCheckEveryArgs(checkEveryRaw, hasCheckEvery) {
|
|
1601
1608
|
if (!hasCheckEvery) {
|
|
1602
|
-
return { code: 'CHECK_EVERY_REQUIRED', error: '跨话题发送必须指定 --check-every
|
|
1609
|
+
return { code: 'CHECK_EVERY_REQUIRED', error: '跨话题发送必须指定 --check-every <时长|none>(如 5m / 30m / 2h / none)' };
|
|
1603
1610
|
}
|
|
1604
1611
|
if (checkEveryRaw === undefined)
|
|
1605
1612
|
return { durationMs: 5 * 60 * 1000 };
|
|
1613
|
+
if (checkEveryRaw.trim().toLowerCase() === 'none')
|
|
1614
|
+
return { durationMs: undefined };
|
|
1606
1615
|
const parsed = parseDuration(checkEveryRaw);
|
|
1607
1616
|
if (parsed === null) {
|
|
1608
|
-
return { code: 'INVALID_DURATION', error: `--check-every 时长格式无效: ${checkEveryRaw}(示例: 5m / 30m / 2h / 1d)` };
|
|
1617
|
+
return { code: 'INVALID_DURATION', error: `--check-every 时长格式无效: ${checkEveryRaw}(示例: 5m / 30m / 2h / 1d / none)` };
|
|
1609
1618
|
}
|
|
1610
1619
|
return { durationMs: parsed };
|
|
1611
1620
|
}
|
|
@@ -1644,6 +1653,15 @@ async function applyCrossThreadSendEffects(input) {
|
|
|
1644
1653
|
let originPeerName = originPeer;
|
|
1645
1654
|
let targetThreadName = input.targetThreadId;
|
|
1646
1655
|
let targetPeerName = input.targetChannelId;
|
|
1656
|
+
// 来源话题对端的主体类型:只有运行时上下文知道(话题索引不存 type)。
|
|
1657
|
+
// 伪对端(trigger: / bg:)不是主体,不能把 'system' 写进信封。
|
|
1658
|
+
const originPeerType = (() => {
|
|
1659
|
+
const type = String(runtime?.peerType ?? '').trim();
|
|
1660
|
+
const peerId = String(runtime?.peerId ?? '');
|
|
1661
|
+
if (!type || peerId.startsWith('trigger:') || peerId.startsWith('bg:'))
|
|
1662
|
+
return undefined;
|
|
1663
|
+
return type;
|
|
1664
|
+
})();
|
|
1647
1665
|
try {
|
|
1648
1666
|
const { ThreadService } = await import('../core/thread/index.js');
|
|
1649
1667
|
const originEntry = isTopicThreadId(originThreadId)
|
|
@@ -1691,49 +1709,54 @@ async function applyCrossThreadSendEffects(input) {
|
|
|
1691
1709
|
extra: input.triggerPromptExtra,
|
|
1692
1710
|
});
|
|
1693
1711
|
let createdTriggerId;
|
|
1694
|
-
|
|
1695
|
-
|
|
1696
|
-
|
|
1697
|
-
|
|
1698
|
-
|
|
1699
|
-
|
|
1700
|
-
|
|
1701
|
-
|
|
1702
|
-
|
|
1703
|
-
|
|
1704
|
-
|
|
1705
|
-
|
|
1706
|
-
|
|
1707
|
-
|
|
1708
|
-
|
|
1709
|
-
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1718
|
-
|
|
1719
|
-
|
|
1720
|
-
|
|
1721
|
-
|
|
1722
|
-
|
|
1723
|
-
|
|
1724
|
-
|
|
1725
|
-
|
|
1726
|
-
|
|
1712
|
+
// `--check-every none`:跳过 Trigger,只保留 inbox(「我发过」是事实,定时唤醒是可选项)。
|
|
1713
|
+
if (input.durationMs !== undefined) {
|
|
1714
|
+
try {
|
|
1715
|
+
const { formatChannelKey } = await import('../core/channel-loader.js');
|
|
1716
|
+
const triggerDef = buildThreadCheckTrigger({
|
|
1717
|
+
agentAid: input.selfAid,
|
|
1718
|
+
id: triggerId,
|
|
1719
|
+
name: triggerName,
|
|
1720
|
+
prompt,
|
|
1721
|
+
everyMs: input.durationMs,
|
|
1722
|
+
checkEvery: input.checkEveryLabel,
|
|
1723
|
+
channelKey: formatChannelKey({ type: 'aun', selfAID: input.selfAid, name: 'main' }),
|
|
1724
|
+
targetChannelId: input.targetChannelId,
|
|
1725
|
+
targetThreadId: input.targetThreadId,
|
|
1726
|
+
originThreadId,
|
|
1727
|
+
originPeer,
|
|
1728
|
+
feedbackChatType: input.feedbackChatType,
|
|
1729
|
+
originalText: input.contentSummary,
|
|
1730
|
+
firstSentAt: input.timestamp,
|
|
1731
|
+
originThreadName,
|
|
1732
|
+
originPeerName,
|
|
1733
|
+
originPeerType,
|
|
1734
|
+
targetThreadName,
|
|
1735
|
+
});
|
|
1736
|
+
const { response: triggerRes, transportError } = await queryDaemon(resolvePaths().socket, {
|
|
1737
|
+
type: 'trigger.create',
|
|
1738
|
+
definition: triggerDef,
|
|
1739
|
+
files: [],
|
|
1740
|
+
enable: true,
|
|
1741
|
+
// daemon 侧 authenticatedTriggerActor 先看 actorSessionId:缺了它会回落到
|
|
1742
|
+
// controlToken 分支(CLI 从不读 control.token),必然抛
|
|
1743
|
+
// "valid local control token is required"。与 trigger-command.ts 的组装保持一致。
|
|
1744
|
+
actorSessionId: originSessionId,
|
|
1745
|
+
delegationToken: readDelegationCredential(),
|
|
1746
|
+
}, 30_000);
|
|
1747
|
+
if (!triggerRes?.ok) {
|
|
1748
|
+
process.stderr.write(`⚠ Trigger 创建失败: ${triggerRes?.error ?? daemonUnavailableMessage(transportError, 'unknown')}(inbox 仍会写入)\n`);
|
|
1749
|
+
}
|
|
1750
|
+
else {
|
|
1751
|
+
// 以 daemon 落盘的结果为准(definition 已带 id,正常应与预设值相同;
|
|
1752
|
+
// 若 daemon 因任何原因改写了 id,回填真值而不是本地预设值)。
|
|
1753
|
+
createdTriggerId = triggerRes.trigger?.id ?? triggerId;
|
|
1754
|
+
}
|
|
1727
1755
|
}
|
|
1728
|
-
|
|
1729
|
-
|
|
1730
|
-
// 若 daemon 因任何原因改写了 id,回填真值而不是本地预设值)。
|
|
1731
|
-
createdTriggerId = triggerRes.trigger?.id ?? triggerId;
|
|
1756
|
+
catch (e) {
|
|
1757
|
+
process.stderr.write(`⚠ Trigger 创建异常: ${e?.message ?? e}(inbox 仍会写入)\n`);
|
|
1732
1758
|
}
|
|
1733
1759
|
}
|
|
1734
|
-
catch (e) {
|
|
1735
|
-
process.stderr.write(`⚠ Trigger 创建异常: ${e?.message ?? e}(inbox 仍会写入)\n`);
|
|
1736
|
-
}
|
|
1737
1760
|
const { ThreadService } = await import('../core/thread/index.js');
|
|
1738
1761
|
ThreadService.appendInbox(input.selfAid, {
|
|
1739
1762
|
messageId: input.messageId,
|
|
@@ -1741,6 +1764,10 @@ async function applyCrossThreadSendEffects(input) {
|
|
|
1741
1764
|
timestamp: input.timestamp,
|
|
1742
1765
|
originThreadId,
|
|
1743
1766
|
originPeer,
|
|
1767
|
+
// 显示名随条目落盘:渲染时不必再查话题索引,也保住了改名前的历史值。
|
|
1768
|
+
...(originPeerName && originPeerName !== originPeer ? { originPeerName } : {}),
|
|
1769
|
+
// 主体类型同样落盘:渲染层不能猜,旧条目缺失时退回 unknown。
|
|
1770
|
+
...(originPeerType ? { originPeerType } : {}),
|
|
1744
1771
|
originSessionId,
|
|
1745
1772
|
targetSessionId: input.targetSessionId,
|
|
1746
1773
|
...(createdTriggerId ? { triggerId: createdTriggerId } : {}),
|
|
@@ -1797,7 +1824,7 @@ Options:
|
|
|
1797
1824
|
--channel-name <name> 历史渠道实例名(非 AUN 渠道必须匹配 Agent 配置)
|
|
1798
1825
|
--channel-key <key> 非 AUN 已落盘渠道的完整实例键(与 --peer-id 成对)
|
|
1799
1826
|
--peer-id <id> 非 AUN 渠道的原生对端 ID(与 --channel-key 成对)
|
|
1800
|
-
--check-every <duration> 跨话题发送后自动创建**跨话题复查**(如 5m/30m/2h
|
|
1827
|
+
--check-every <duration|none> 跨话题发送后自动创建**跨话题复查**(如 5m/30m/2h),跨话题时**必填**;none = 不建复查
|
|
1801
1828
|
每 duration 向**目标话题**投递一条【跨话题复查】通知(不新建会话),
|
|
1802
1829
|
由目标话题侧的 agent 在自己的上下文里决定结束/调整周期/继续
|
|
1803
1830
|
Trigger 名:check-<目标threadId>-from-<来源threadId>-<唯一后缀>
|
|
@@ -2368,7 +2395,8 @@ Options:
|
|
|
2368
2395
|
: body.mode === 'file' ? `[file] ${body.filePath}`
|
|
2369
2396
|
: '[payload]',
|
|
2370
2397
|
timestamp: result.timestamp ?? Date.now(),
|
|
2371
|
-
|
|
2398
|
+
// undefined 原样透传(= --check-every none),不要兜底成 5m。
|
|
2399
|
+
durationMs: checkEveryDurationMs,
|
|
2372
2400
|
checkEveryLabel: checkEveryRaw || '5m',
|
|
2373
2401
|
triggerPromptExtra,
|
|
2374
2402
|
});
|
|
@@ -2634,7 +2662,7 @@ Options:
|
|
|
2634
2662
|
--encrypt 强制端到端加密(未指定时使用 daemon 默认值;仅 send)
|
|
2635
2663
|
--no-encrypt 强制明文发送(优先于 --encrypt;仅 send)
|
|
2636
2664
|
--thread <id> 指定话题 ID(仅 send;话题必须存在于本端索引)
|
|
2637
|
-
--check-every
|
|
2665
|
+
--check-every <时长|none> 跨话题发送(带 --thread)时**必填**,创建跨话题复查(如 5m/30m/2h);none = 不建复查
|
|
2638
2666
|
到期向**目标话题**投递【跨话题复查】通知,不新建会话
|
|
2639
2667
|
无值时默认 5m;Trigger 名:check-<目标threadId>-from-<来源threadId>-<唯一后缀>
|
|
2640
2668
|
结束/调整用返回的 trigger_id(trig_…),show/update/delete 只认 id
|
|
@@ -3035,7 +3063,8 @@ g- 是名称的一部分,会完整保留;默认命名格式为 g-10000 至 g
|
|
|
3035
3063
|
: body.mode === 'file' ? `[file] ${body.filePath}`
|
|
3036
3064
|
: '[payload]',
|
|
3037
3065
|
timestamp: r.timestamp ?? Date.now(),
|
|
3038
|
-
|
|
3066
|
+
// undefined 原样透传(= --check-every none),不要兜底成 5m。
|
|
3067
|
+
durationMs: groupCheckEveryMs,
|
|
3039
3068
|
checkEveryLabel: groupCheckEveryRaw || '5m',
|
|
3040
3069
|
triggerPromptExtra: groupTriggerPromptExtra,
|
|
3041
3070
|
});
|
|
@@ -3728,11 +3757,17 @@ export function resolveManagedSendArgv(argv, routing) {
|
|
|
3728
3757
|
let checkEveryMs;
|
|
3729
3758
|
if (thread) {
|
|
3730
3759
|
if (checkEvery === undefined)
|
|
3731
|
-
throw new Error('Cross-thread sends require --check-every');
|
|
3732
|
-
|
|
3733
|
-
if (
|
|
3734
|
-
|
|
3735
|
-
|
|
3760
|
+
throw new Error('Cross-thread sends require --check-every (or "none")');
|
|
3761
|
+
// `none` = 跨话题发送但不建复查 Trigger;checkEveryMs 保持 undefined,下游据此跳过建 Trigger。
|
|
3762
|
+
if (checkEvery.trim().toLowerCase() === 'none') {
|
|
3763
|
+
checkEveryMs = undefined;
|
|
3764
|
+
}
|
|
3765
|
+
else {
|
|
3766
|
+
const parsedCheckEveryMs = parseDuration(checkEvery);
|
|
3767
|
+
if (parsedCheckEveryMs === null)
|
|
3768
|
+
throw new Error('Invalid --check-every duration');
|
|
3769
|
+
checkEveryMs = parsedCheckEveryMs;
|
|
3770
|
+
}
|
|
3736
3771
|
}
|
|
3737
3772
|
if (scope === 'msg' && (mentions.length || booleans.has('--mention-all')))
|
|
3738
3773
|
throw new Error('Mentions require a group send');
|
package/dist/cli/code-stats.js
CHANGED
|
@@ -204,11 +204,11 @@ function listUntrackedFiles(pkgRoot, pathspecs) {
|
|
|
204
204
|
return [];
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
|
-
function countFileSet(files) {
|
|
207
|
+
function countFileSet(files, countedLines) {
|
|
208
208
|
let lines = 0;
|
|
209
209
|
for (const file of files) {
|
|
210
210
|
try {
|
|
211
|
-
lines += countFileLines(file);
|
|
211
|
+
lines += countedLines?.get(file) ?? countFileLines(file);
|
|
212
212
|
}
|
|
213
213
|
catch {
|
|
214
214
|
/* 读不到的文件跳过 */
|
|
@@ -217,18 +217,21 @@ function countFileSet(files) {
|
|
|
217
217
|
return { lines, files: files.length };
|
|
218
218
|
}
|
|
219
219
|
export function collectTrackedComparison(pkgRoot) {
|
|
220
|
+
return collectTrackedComparisonFromFiles(pkgRoot, listTrackedFiles(pkgRoot));
|
|
221
|
+
}
|
|
222
|
+
function collectTrackedComparisonFromFiles(pkgRoot, trackedFiles, countedLines) {
|
|
220
223
|
const codeExt = /\.(ts|tsx|mts|cts|js|jsx|mjs|cjs)$/i;
|
|
221
|
-
const tracked =
|
|
224
|
+
const tracked = trackedFiles.map(file => path.relative(pkgRoot, file));
|
|
222
225
|
const pick = (list, match) => list.filter(match);
|
|
223
226
|
const untrackedMarkdown = listUntrackedFiles(pkgRoot, ['*.md', '*.mdx']);
|
|
224
227
|
const untrackedTests = listUntrackedFiles(pkgRoot, ['tests']).filter(file => codeExt.test(file));
|
|
225
228
|
return {
|
|
226
229
|
markdown: {
|
|
227
|
-
tracked: countFileSet(pick(tracked, item => /\.(md|mdx)$/i.test(item)).map(item => path.join(pkgRoot, item))),
|
|
230
|
+
tracked: countFileSet(pick(tracked, item => /\.(md|mdx)$/i.test(item)).map(item => path.join(pkgRoot, item)), countedLines),
|
|
228
231
|
untracked: countFileSet(untrackedMarkdown),
|
|
229
232
|
},
|
|
230
233
|
tests: {
|
|
231
|
-
tracked: countFileSet(pick(tracked, item => item.split(path.sep)[0] === 'tests' && codeExt.test(item)).map(item => path.join(pkgRoot, item))),
|
|
234
|
+
tracked: countFileSet(pick(tracked, item => item.split(path.sep)[0] === 'tests' && codeExt.test(item)).map(item => path.join(pkgRoot, item)), countedLines),
|
|
232
235
|
untracked: countFileSet(untrackedTests),
|
|
233
236
|
},
|
|
234
237
|
};
|
|
@@ -238,6 +241,9 @@ export function collectTrackedComparison(pkgRoot) {
|
|
|
238
241
|
* 先发现全部文件再归类,新目录/新扩展名不会被漏掉。
|
|
239
242
|
*/
|
|
240
243
|
export function collectCodeStats(pkgRoot, cacheFile) {
|
|
244
|
+
return collectCodeStatsFromFiles(pkgRoot, listTrackedFiles(pkgRoot), cacheFile);
|
|
245
|
+
}
|
|
246
|
+
function collectCodeStatsFromFiles(pkgRoot, trackedFiles, cacheFile, countedLines) {
|
|
241
247
|
const cache = cacheFile ? loadCache(cacheFile) : {};
|
|
242
248
|
const nextCache = {};
|
|
243
249
|
const sections = new Map(SECTIONS.map(def => [def.key, { ...def, lines: 0, files: 0 }]));
|
|
@@ -245,7 +251,7 @@ export function collectCodeStats(pkgRoot, cacheFile) {
|
|
|
245
251
|
const otherDirectories = new Set();
|
|
246
252
|
let cacheHits = 0;
|
|
247
253
|
let cacheMisses = 0;
|
|
248
|
-
for (const filePath of
|
|
254
|
+
for (const filePath of trackedFiles) {
|
|
249
255
|
const fileName = path.basename(filePath);
|
|
250
256
|
// 锁文件动辄几万行,且是生成物 —— 即便入库也不计入。
|
|
251
257
|
if (EXCLUDE_FILE_NAMES.has(fileName))
|
|
@@ -279,6 +285,7 @@ export function collectCodeStats(pkgRoot, cacheFile) {
|
|
|
279
285
|
cacheMisses++;
|
|
280
286
|
}
|
|
281
287
|
nextCache[relative] = { mtime, lines };
|
|
288
|
+
countedLines?.set(filePath, lines);
|
|
282
289
|
const language = languages.get(languageKey);
|
|
283
290
|
language.lines += lines;
|
|
284
291
|
language.files++;
|
|
@@ -525,11 +532,15 @@ export function printCodeStats(pkgRoot, logDir, options = {}) {
|
|
|
525
532
|
const cacheFile = options.cacheFile ?? path.join(logDir, 'code-stats-cache.json');
|
|
526
533
|
const dailyLimit = options.dailyLimit ?? 10;
|
|
527
534
|
console.log('\n[launcher] 正在统计代码行数...');
|
|
528
|
-
|
|
535
|
+
// Both tables describe this invocation's tracked files. Reuse its inventory
|
|
536
|
+
// and line counts instead of enumerating and reading them a second time.
|
|
537
|
+
const trackedFiles = listTrackedFiles(pkgRoot);
|
|
538
|
+
const countedLines = new Map();
|
|
539
|
+
const stats = collectCodeStatsFromFiles(pkgRoot, trackedFiles, cacheFile, countedLines);
|
|
529
540
|
console.log(`[launcher] 统计耗时: ${((Date.now() - startedAt) / 1000).toFixed(2)}秒\n`);
|
|
530
541
|
printLanguageTable(stats);
|
|
531
542
|
printSectionTable(stats);
|
|
532
|
-
printTrackedComparison(
|
|
543
|
+
printTrackedComparison(collectTrackedComparisonFromFiles(pkgRoot, trackedFiles, countedLines));
|
|
533
544
|
const records = readJsonArrayFile(historyFile);
|
|
534
545
|
const record = buildRecord(stats);
|
|
535
546
|
const previous = records.at(-1);
|
package/dist/cli/command-log.js
CHANGED
|
@@ -92,7 +92,7 @@ function loggableArgs(args) {
|
|
|
92
92
|
continue;
|
|
93
93
|
}
|
|
94
94
|
const flag = arg.replace(/^--?/, '').replace(/=.*$/, '').toLowerCase();
|
|
95
|
-
if (/^(?:remote-token|ecweb-token|menu-token|token|password|secret|workspace)$/.test(flag)) {
|
|
95
|
+
if (/^(?:api-key|remote-token|ecweb-token|menu-token|token|password|secret|workspace)$/.test(flag)) {
|
|
96
96
|
output.push(arg.includes('=') ? `${arg.slice(0, arg.indexOf('=') + 1)}[REDACTED]` : arg);
|
|
97
97
|
redactNext = !arg.includes('=');
|
|
98
98
|
continue;
|
|
@@ -16,9 +16,10 @@ import { resolveGlobalPkg } from '../utils/npm-ops.js';
|
|
|
16
16
|
import { ensureFreshPackageVersionInfo } from '../utils/package-version-info.js';
|
|
17
17
|
import { ecwebVersionRequirementError, resolveEcwebLaunchCommand } from '../ecweb/runtime/launch.js';
|
|
18
18
|
import { stopEcwebForRestart } from '../ecweb/runtime/lifecycle.js';
|
|
19
|
-
import {
|
|
19
|
+
import { fetchRemotePairingCode, buildEcwebPairingUrl } from '../ecweb/pairing.js';
|
|
20
|
+
import { readEcwebProxyAccess } from '../ecweb/runtime/proxy-access.js';
|
|
20
21
|
import { isHostChinese } from '../utils/locale.js';
|
|
21
|
-
import { scanInstances, cleanupInstances, findOrphanProcesses } from '../utils/instance-registry.js';
|
|
22
|
+
import { scanInstances, hasLiveMain, hasLiveRestartMonitor, cleanupInstances, findOrphanProcesses } from '../utils/instance-registry.js';
|
|
22
23
|
import { filterLogFiles, deriveLogTypes, computePreChecked, validateLogTypes, shortLogName as shortLogNameLocal, isWatchLogFile } from './watch-logs.js';
|
|
23
24
|
import { printCodeStats } from './code-stats.js';
|
|
24
25
|
import { StartupTracer, STARTUP_TRACE_ID_ENV, formatMs, formatSlowestSpans, findTraceRecord } from '../utils/startup-trace.js';
|
|
@@ -322,14 +323,15 @@ async function launchPackageLifecycle(source, log, options = {}) {
|
|
|
322
323
|
const result = await platform.launchMonitorAndConfirm(args, env, pid => requestId
|
|
323
324
|
? readRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId)?.status === 'accepted'
|
|
324
325
|
|| readRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId)?.status === 'ready'
|
|
325
|
-
:
|
|
326
|
-
|
|
327
|
-
|
|
326
|
+
: hasLiveRestartMonitor({ pid }),
|
|
327
|
+
// Launch confirmation only observes monitors. Probing the still-running
|
|
328
|
+
// daemon here adds process-table queries to each unsuccessful poll.
|
|
329
|
+
pid => hasLiveRestartMonitor({ excludePid: pid, ...(requestId ? { requestId, phase: 'accepted' } : {}) }), {
|
|
328
330
|
requestId,
|
|
329
331
|
logFilePath: requestId ? path.join(root, 'logs', `restart-launch-${requestId}.log`) : undefined,
|
|
330
332
|
onSpawn: pid => { if (requestId)
|
|
331
333
|
updateRestartRequest(path.join(root, 'data', 'daemon', 'control', 'restart-pending.json'), requestId, { launcherPid: pid }); },
|
|
332
|
-
isPendingInRegistry: () =>
|
|
334
|
+
isPendingInRegistry: () => requestId ? hasLiveRestartMonitor({ requestId }) : false,
|
|
333
335
|
});
|
|
334
336
|
if (!result.ok && !result.pending && launch.stageDir)
|
|
335
337
|
platform.cleanupMonitorStage(launch.stageDir);
|
|
@@ -648,23 +650,12 @@ export async function cmdStart(opts = {}) {
|
|
|
648
650
|
const { autoMigrateIfNeeded } = await import('../config-store.js');
|
|
649
651
|
autoMigrateIfNeeded();
|
|
650
652
|
trace.mark('cli.initCheck');
|
|
651
|
-
const defaults = loadDefaults();
|
|
652
|
-
const hasAnyAgent = loadAllAgents().agents.length > 0;
|
|
653
|
-
if (!defaults && !hasAnyAgent && !opts.bindBootstrap) {
|
|
654
|
-
trace.finish(false);
|
|
655
|
-
process.exitCode = 1;
|
|
656
|
-
console.error('⚠ 未检测到初始化配置,请先运行 ec init;未启动 EvolCore。');
|
|
657
|
-
return;
|
|
658
|
-
}
|
|
659
653
|
trace.mark('cli.controlAidCheck');
|
|
660
654
|
const daemonCfgStart = loadDaemonConfig();
|
|
661
655
|
if (!daemonCfgStart.aid) {
|
|
662
|
-
|
|
663
|
-
process.exitCode = 1;
|
|
664
|
-
console.error('⚠ 控制 AID 未配置,请先运行 ec init;未启动 EvolCore。');
|
|
665
|
-
return;
|
|
656
|
+
console.log('ℹ 主机身份待准备:先启动本地 ECWeb,运行 ec init --web 准备控制 AID。');
|
|
666
657
|
}
|
|
667
|
-
if (opts.webInit) {
|
|
658
|
+
if (opts.webInit && daemonCfgStart.aid) {
|
|
668
659
|
const { hasLocalControlIdentity, missingControlIdentityMessage } = await import('../aun/aid/control-aid.js');
|
|
669
660
|
if (!hasLocalControlIdentity(daemonCfgStart.aid)) {
|
|
670
661
|
trace.finish(false);
|
|
@@ -676,7 +667,7 @@ export async function cmdStart(opts = {}) {
|
|
|
676
667
|
trace.finish(false);
|
|
677
668
|
return;
|
|
678
669
|
}
|
|
679
|
-
if (!opts.webInit && process.stdin.isTTY) {
|
|
670
|
+
if (daemonCfgStart.aid && !opts.webInit && process.stdin.isTTY) {
|
|
680
671
|
// 证书缺失时在 CLI 侧提示,daemon 是后台进程无终端不做交互
|
|
681
672
|
const certKey = path.join(resolvePaths().root, 'AIDs', daemonCfgStart.aid, 'private', 'key.json');
|
|
682
673
|
if (!fs.existsSync(certKey)) {
|
|
@@ -1208,19 +1199,20 @@ export async function cmdRestart(opts = {}) {
|
|
|
1208
1199
|
writeAsModeOverride(undefined);
|
|
1209
1200
|
console.log(` ${describeRunMode()}`);
|
|
1210
1201
|
if (!await ensureCodexHookBeforeLifecycle())
|
|
1211
|
-
return;
|
|
1212
|
-
const initialStatus = scanInstances();
|
|
1202
|
+
return false;
|
|
1213
1203
|
const socketPath = resolvePaths().socket;
|
|
1214
1204
|
const ping = await probeDaemon(socketPath);
|
|
1215
|
-
if (ping && !
|
|
1216
|
-
//
|
|
1217
|
-
//
|
|
1218
|
-
|
|
1219
|
-
|
|
1220
|
-
|
|
1221
|
-
|
|
1222
|
-
|
|
1223
|
-
|
|
1205
|
+
if (ping && !await hasLiveMain(ping.pid)) {
|
|
1206
|
+
// Keep the full PID-namespace fallback for unregistered/unobservable targets.
|
|
1207
|
+
// Normal restarts only inspect the responding PID, without AID activity logs.
|
|
1208
|
+
const initialStatus = scanInstances({ includeAidActivity: false });
|
|
1209
|
+
if (!hasVisibleDaemonPid(initialStatus, ping)) {
|
|
1210
|
+
const initialRuntimeOrphans = findOrphanProcesses(initialStatus).filter(orphan => isRuntimeOrphan(orphan));
|
|
1211
|
+
if (await tryDelegatedDaemonRestart(socketPath))
|
|
1212
|
+
return true;
|
|
1213
|
+
if (initialRuntimeOrphans.length === 0 && rejectPidIsolatedLifecycle('restart', initialStatus, ping))
|
|
1214
|
+
return false;
|
|
1215
|
+
}
|
|
1224
1216
|
}
|
|
1225
1217
|
// The shared launchPackageLifecycle path delegates to launchMonitorAndConfirm;
|
|
1226
1218
|
// the monitor retains shutdown, orphan checks, build and rollback ownership.
|
|
@@ -1232,18 +1224,19 @@ export async function cmdRestart(opts = {}) {
|
|
|
1232
1224
|
if (!readRestartRequest(pendingFile, requestId)) {
|
|
1233
1225
|
console.error('❌ 重启请求已被替换或过期,服务未停止;请重新发起重启。');
|
|
1234
1226
|
process.exitCode = 1;
|
|
1235
|
-
return;
|
|
1227
|
+
return false;
|
|
1236
1228
|
}
|
|
1237
1229
|
}
|
|
1238
|
-
const launched = await launchPackageLifecycle('restart', console.log, { clear: opts.clear, requestId });
|
|
1230
|
+
const launched = await launchPackageLifecycle('restart', console.log, { clear: opts.clear, requestId, applyPackageUpgrades: opts.applyPackageUpgrades });
|
|
1239
1231
|
if (!launched.ok) {
|
|
1240
1232
|
console.error(launched.pending
|
|
1241
1233
|
? `⚠ 重启状态暂不可确认(PID ${launched.pid ?? 'unknown'}):restart-monitor 仍在运行,可能继续执行;请勿立即重复发起。`
|
|
1242
1234
|
: `❌ 重启中止:restart-monitor 未能启动(${launched.reason});当前服务未主动停止`);
|
|
1243
1235
|
process.exitCode = 1;
|
|
1244
|
-
return;
|
|
1236
|
+
return false;
|
|
1245
1237
|
}
|
|
1246
1238
|
console.log(`🔄 Restart monitor started (${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s); service is restarting...`);
|
|
1239
|
+
return true;
|
|
1247
1240
|
}
|
|
1248
1241
|
function normalizeRuntimePath(value) {
|
|
1249
1242
|
return value.replace(/[\\/]+/g, '/').toLowerCase();
|
|
@@ -1571,18 +1564,25 @@ function renderStatusOverview(snapshot) {
|
|
|
1571
1564
|
]], [0, 1, 2], [12, 12, 12]);
|
|
1572
1565
|
}
|
|
1573
1566
|
}
|
|
1574
|
-
function renderStatusServiceProxy(serviceProxy) {
|
|
1567
|
+
function renderStatusServiceProxy(serviceProxy, ecwebAccess) {
|
|
1575
1568
|
console.log('\n服务代理(配置)');
|
|
1576
1569
|
if (serviceProxy?.source !== 'unavailable' && Array.isArray(serviceProxy?.items)) {
|
|
1577
1570
|
const configured = serviceProxy.items;
|
|
1578
1571
|
if (configured.length > 0) {
|
|
1579
|
-
|
|
1572
|
+
const transport = serviceProxy.transport;
|
|
1573
|
+
renderStatusTable(['服务', '配置', '状态', '来源', '协议', '可见性'], configured.map((item) => [
|
|
1580
1574
|
item.name,
|
|
1581
1575
|
!item.serviceEnabled ? '服务已禁用' : item.proxyEnabled ? '已启用' : '代理已禁用',
|
|
1576
|
+
!item.serviceEnabled || !item.proxyEnabled ? '未发布'
|
|
1577
|
+
: item.name === 'ecweb' && ecwebAccess ? ecwebAccess.message
|
|
1578
|
+
: !transport ? '未知'
|
|
1579
|
+
: transport.gatewayRegistered && transport.registeredServices?.includes(item.name) ? '已登记'
|
|
1580
|
+
: transport.state === 'degraded' ? '登记未完成'
|
|
1581
|
+
: '等待登记',
|
|
1582
1582
|
item.source ?? '—',
|
|
1583
1583
|
item.serviceType ?? '—',
|
|
1584
1584
|
item.visibility ?? '—',
|
|
1585
|
-
]), [], [12, 10, 10, 6, 10]);
|
|
1585
|
+
]), [], [12, 10, 12, 10, 6, 10]);
|
|
1586
1586
|
}
|
|
1587
1587
|
}
|
|
1588
1588
|
else {
|
|
@@ -1851,7 +1851,7 @@ function renderStatusSnapshot(snapshot) {
|
|
|
1851
1851
|
if (hasStatus) {
|
|
1852
1852
|
renderStatusOverview(snapshot);
|
|
1853
1853
|
renderStatusAgents(snapshot.agents.items, snapshot.aun.items, snapshot.daemon.queue, snapshot.controlAid, snapshot.agents.registered);
|
|
1854
|
-
renderStatusServiceProxy(snapshot.proxy);
|
|
1854
|
+
renderStatusServiceProxy(snapshot.proxy, snapshot.ecweb.proxyAccess);
|
|
1855
1855
|
}
|
|
1856
1856
|
renderEcwebStatus(snapshot.ecweb);
|
|
1857
1857
|
}
|
|
@@ -3214,19 +3214,21 @@ async function waitForExistingEcweb(p, timeoutMs = 3_000) {
|
|
|
3214
3214
|
*/
|
|
3215
3215
|
async function collectEcwebStatus(p) {
|
|
3216
3216
|
let externalUrl = null;
|
|
3217
|
+
let proxyAccess;
|
|
3217
3218
|
let enabled = true;
|
|
3218
3219
|
let configuredPort = DEFAULT_ECWEB_PORT;
|
|
3219
3220
|
try {
|
|
3220
3221
|
const cfg = loadDaemonConfig();
|
|
3221
3222
|
enabled = ecwebService(cfg.services)?.enabled !== false;
|
|
3222
3223
|
configuredPort = ecwebService(cfg.services)?.port ?? DEFAULT_ECWEB_PORT;
|
|
3223
|
-
|
|
3224
|
+
proxyAccess = await readEcwebProxyAccess(cfg);
|
|
3225
|
+
externalUrl = proxyAccess.url;
|
|
3224
3226
|
}
|
|
3225
3227
|
catch {
|
|
3226
3228
|
// Runtime and HTTP checks remain useful when config access is restricted.
|
|
3227
3229
|
}
|
|
3228
3230
|
if (!enabled)
|
|
3229
|
-
return { source: 'config', status: 'disabled', port: null, url: null, externalUrl };
|
|
3231
|
+
return { source: 'config', status: 'disabled', port: null, url: null, externalUrl, proxyAccess };
|
|
3230
3232
|
const entries = readEcwebInstanceEntries(p);
|
|
3231
3233
|
// Probe before consulting PID visibility. The daemon and CLI can be in
|
|
3232
3234
|
// different PID namespaces while sharing the host network namespace.
|
|
@@ -3269,6 +3271,7 @@ async function collectEcwebStatus(p) {
|
|
|
3269
3271
|
port: liveEntry.record.port,
|
|
3270
3272
|
url: `http://localhost:${liveEntry.record.port}`,
|
|
3271
3273
|
externalUrl,
|
|
3274
|
+
proxyAccess,
|
|
3272
3275
|
};
|
|
3273
3276
|
}
|
|
3274
3277
|
const occupiedPids = new Set();
|
|
@@ -3281,13 +3284,13 @@ async function collectEcwebStatus(p) {
|
|
|
3281
3284
|
}
|
|
3282
3285
|
}
|
|
3283
3286
|
if (aliveEntries.length > 0) {
|
|
3284
|
-
return { source: 'instance+process', status: 'process-not-ready', pid: aliveEntries[0].record.pid, port: aliveEntries[0].record.port, url: null, externalUrl };
|
|
3287
|
+
return { source: 'instance+process', status: 'process-not-ready', pid: aliveEntries[0].record.pid, port: aliveEntries[0].record.port, url: null, externalUrl, proxyAccess };
|
|
3285
3288
|
}
|
|
3286
3289
|
if (occupiedPids.size > 0) {
|
|
3287
|
-
return { source: 'port-scan', status: 'port-occupied', pids: [...occupiedPids], port: occupiedPort, url: null, externalUrl };
|
|
3290
|
+
return { source: 'port-scan', status: 'port-occupied', pids: [...occupiedPids], port: occupiedPort, url: null, externalUrl, proxyAccess };
|
|
3288
3291
|
}
|
|
3289
3292
|
if (entries.length > 0) {
|
|
3290
|
-
return { source: 'instance-record', status: 'recorded-unavailable', port: entries[0].record.port, url: null, externalUrl };
|
|
3293
|
+
return { source: 'instance-record', status: 'recorded-unavailable', port: entries[0].record.port, url: null, externalUrl, proxyAccess };
|
|
3291
3294
|
}
|
|
3292
3295
|
return {
|
|
3293
3296
|
source: 'daemon-config',
|
|
@@ -3295,6 +3298,7 @@ async function collectEcwebStatus(p) {
|
|
|
3295
3298
|
port: configuredPort,
|
|
3296
3299
|
url: null,
|
|
3297
3300
|
externalUrl,
|
|
3301
|
+
proxyAccess,
|
|
3298
3302
|
};
|
|
3299
3303
|
}
|
|
3300
3304
|
function renderEcwebStatus(status) {
|
|
@@ -3313,7 +3317,7 @@ function renderEcwebStatus(status) {
|
|
|
3313
3317
|
}
|
|
3314
3318
|
}
|
|
3315
3319
|
else if (status.startupState === 'waiting') {
|
|
3316
|
-
console.log('🔭 ECWeb:
|
|
3320
|
+
console.log('🔭 ECWeb: 等待启动');
|
|
3317
3321
|
}
|
|
3318
3322
|
else if (status.startupState === 'starting' && status.status !== 'process-not-ready') {
|
|
3319
3323
|
console.log('🔭 ECWeb: 正在启动,等待健康检查');
|
|
@@ -3437,7 +3441,6 @@ export async function startEcwebIfEnabled(p, options = {}) {
|
|
|
3437
3441
|
const service = ecwebService(cfg.services);
|
|
3438
3442
|
if (!service?.enabled)
|
|
3439
3443
|
return false;
|
|
3440
|
-
const externalUrl = resolveEcwebExternalUrl(cfg);
|
|
3441
3444
|
// The daemon is the lifecycle owner. CLI callers normally only need to
|
|
3442
3445
|
// ensure ECWeb is available, so adopt a healthy process instead of killing
|
|
3443
3446
|
// it. `ec watch web` passes forceRestart explicitly for an intentional
|
|
@@ -3445,12 +3448,12 @@ export async function startEcwebIfEnabled(p, options = {}) {
|
|
|
3445
3448
|
if (!options.forceRestart) {
|
|
3446
3449
|
const existing = await waitForExistingEcweb(p);
|
|
3447
3450
|
if (existing) {
|
|
3448
|
-
console.log(`✓ ECWeb 已在运行 (PID: ${existing.pid}) http://localhost:${existing.port}`);
|
|
3451
|
+
console.log(`✓ ECWeb 已在运行 (PID: ${existing.pid})${options.initialization ? '' : ` http://localhost:${existing.port}`}`);
|
|
3449
3452
|
const readiness = await probeEcwebReadiness(existing.port);
|
|
3450
3453
|
if (!readiness.ready)
|
|
3451
3454
|
console.log(`⚠ ECWeb 进程存活但 daemon 未就绪: ${readiness.error || 'unknown'}`);
|
|
3452
|
-
if (
|
|
3453
|
-
|
|
3455
|
+
if (!options.initialization)
|
|
3456
|
+
await printEcwebAccessInfo(cfg, readiness.ready);
|
|
3454
3457
|
return true;
|
|
3455
3458
|
}
|
|
3456
3459
|
}
|
|
@@ -3513,36 +3516,23 @@ export async function startEcwebIfEnabled(p, options = {}) {
|
|
|
3513
3516
|
startedAt = getProcessStartTime(pid);
|
|
3514
3517
|
let processAlive = false;
|
|
3515
3518
|
let readiness = null;
|
|
3516
|
-
let pair = null;
|
|
3517
3519
|
for (let i = 0; i < 40; i++) {
|
|
3518
3520
|
const registered = readEcwebInstanceEntries(p).find(entry => entry.record.pid === pid)?.record;
|
|
3519
3521
|
processAlive = registered ? await probeEcwebLiveness(registered.port, registered) : false;
|
|
3520
3522
|
if (processAlive) {
|
|
3521
3523
|
readiness = await probeEcwebReadiness(port);
|
|
3522
|
-
if (readiness.ready)
|
|
3523
|
-
pair = await fetchRemotePairingCode();
|
|
3524
3524
|
break;
|
|
3525
3525
|
}
|
|
3526
3526
|
await sleep(250);
|
|
3527
3527
|
}
|
|
3528
3528
|
if (processAlive) {
|
|
3529
3529
|
const actionLabel = wasRunning ? '已重启' : '启动成功';
|
|
3530
|
-
console.log(`✓ ECWeb ${actionLabel} (PID: ${pid}) http://localhost:${port}`);
|
|
3531
|
-
if (externalUrl)
|
|
3532
|
-
console.log(` 外网访问: ${externalUrl}`);
|
|
3530
|
+
console.log(`✓ ECWeb ${actionLabel} (PID: ${pid})${options.initialization ? '' : ` http://localhost:${port}`}`);
|
|
3533
3531
|
if (!readiness?.ready) {
|
|
3534
3532
|
console.log(`⚠ ECWeb 进程存活但 daemon 未就绪: ${readiness?.error || 'unknown'}`);
|
|
3535
3533
|
}
|
|
3536
|
-
|
|
3537
|
-
|
|
3538
|
-
console.log(` 配对码: ${pair.code} (约 ${mins} 分钟内有效,仅可配对一次,已配对过的浏览器无需重新配对)`);
|
|
3539
|
-
const pairingUrl = buildEcwebPairingUrl(cfg, pair.code);
|
|
3540
|
-
if (pairingUrl)
|
|
3541
|
-
console.log(` 一键登录: ${pairingUrl}`);
|
|
3542
|
-
}
|
|
3543
|
-
else {
|
|
3544
|
-
console.log(' daemon 尚未提供配对码;EvolCore 启动后可通过 /pair 或 ECWeb 页面获取');
|
|
3545
|
-
}
|
|
3534
|
+
if (!options.initialization)
|
|
3535
|
+
await printEcwebAccessInfo(cfg, readiness?.ready === true);
|
|
3546
3536
|
return true;
|
|
3547
3537
|
}
|
|
3548
3538
|
console.log(`❌ ECWeb 启动失败:端口 ${port} 未就绪(进程 PID ${pid} 可能已退出,查看 logs/watch-web.log)`);
|
|
@@ -3566,24 +3556,23 @@ export async function startEcwebIfEnabled(p, options = {}) {
|
|
|
3566
3556
|
return false;
|
|
3567
3557
|
}
|
|
3568
3558
|
}
|
|
3569
|
-
/**
|
|
3570
|
-
async function
|
|
3571
|
-
|
|
3572
|
-
|
|
3573
|
-
|
|
3574
|
-
|
|
3575
|
-
|
|
3576
|
-
|
|
3577
|
-
}
|
|
3559
|
+
/** 新启动和复用已有 ECWeb 时,统一显示 daemon 提供的配对信息。 */
|
|
3560
|
+
async function printEcwebAccessInfo(config, ready) {
|
|
3561
|
+
const access = await readEcwebProxyAccess(config);
|
|
3562
|
+
console.log(` 外网代理: ${access.message}`);
|
|
3563
|
+
if (!ready || access.state !== 'ready' || !access.url)
|
|
3564
|
+
return;
|
|
3565
|
+
console.log(` 外网访问: ${access.url}`);
|
|
3566
|
+
const pair = await fetchRemotePairingCode();
|
|
3578
3567
|
if (pair) {
|
|
3579
3568
|
const mins = Math.max(0, Math.round((pair.expiresAt - Date.now()) / 60000));
|
|
3580
3569
|
console.log(` 配对码: ${pair.code} (约 ${mins} 分钟内有效,仅可配对一次,token 缓存 7 天,有访问自动续期)`);
|
|
3581
|
-
const pairingUrl = buildEcwebPairingUrl(
|
|
3570
|
+
const pairingUrl = buildEcwebPairingUrl(config, pair.code);
|
|
3582
3571
|
if (pairingUrl)
|
|
3583
3572
|
console.log(` 一键登录: ${pairingUrl}`);
|
|
3584
3573
|
}
|
|
3585
3574
|
else {
|
|
3586
|
-
console.log(' 配对码:
|
|
3575
|
+
console.log(' 配对码: 暂不可用(稍后重新运行 ec init --web,或在本机 ECWeb 页面获取)');
|
|
3587
3576
|
}
|
|
3588
3577
|
}
|
|
3589
3578
|
async function cmdWatchWeb() {
|
|
@@ -3606,7 +3595,7 @@ async function cmdWatchWeb() {
|
|
|
3606
3595
|
const ok = await startEcwebIfEnabled(p, { forceRestart: true });
|
|
3607
3596
|
if (!ok)
|
|
3608
3597
|
process.exit(1); // 失败原因已由 startEcwebIfEnabled 打印
|
|
3609
|
-
// 启动成功的访问信息已由 startEcwebIfEnabled
|
|
3598
|
+
// 启动成功的访问信息已由 startEcwebIfEnabled 打印。
|
|
3610
3599
|
}
|
|
3611
3600
|
function sleep(ms) {
|
|
3612
3601
|
return new Promise(resolve => setTimeout(resolve, ms));
|