evolcore 0.0.43-test.4 → 0.0.43-test.6
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/ecmsg.js +437 -91
- package/dist/agents/baseagent-availability.js +19 -4
- package/dist/agents/baseagent.js +2 -2
- package/dist/agents/claude-runner.js +19 -4
- package/dist/agents/codex/app-server-client.js +14 -3
- package/dist/agents/codex-runner.js +18 -23
- package/dist/aun/aid/agentmd.js +25 -0
- package/dist/aun/aid/control-aid.js +15 -0
- package/dist/aun/aid/identity.js +8 -0
- package/dist/aun/aid/ownership-operation.js +12 -3
- package/dist/aun/group/invite-service.js +3 -2
- package/dist/aun/service-proxy.js +18 -6
- package/dist/channels/aun.js +99 -23
- package/dist/channels/daemon.js +2 -2
- package/dist/cli/agent-create.js +19 -7
- package/dist/cli/aid-bind-command.js +3 -0
- package/dist/cli/aun-commands.js +19 -4
- package/dist/cli/code-stats.js +451 -213
- package/dist/cli/ctl-command.js +1 -3
- package/dist/cli/daemon-commands.js +42 -4
- package/dist/cli/directory.js +3 -1
- package/dist/cli/ecmsg-gateway.js +206 -0
- package/dist/cli/index.js +6 -0
- package/dist/cli/init.js +120 -13
- package/dist/cli/provider-command.js +82 -5
- package/dist/cli/restart-monitor.js +35 -24
- package/dist/cli/stats.js +8 -1
- package/dist/cli/task-context.js +41 -1
- package/dist/cli/watch-logs.js +6 -4
- package/dist/config/boot-log.js +16 -3
- package/dist/config/builtin-roles.js +2 -2
- package/dist/config/config-manager.js +5 -14
- package/dist/config/daemon-services.js +1 -0
- package/dist/config/peer-role-resolver.js +6 -6
- package/dist/config/provider-identity-migration.js +277 -0
- package/dist/config/provider-identity.js +37 -0
- package/dist/config/provider-ipc-service.js +40 -3
- package/dist/config/provider-local-sync.js +155 -0
- package/dist/config/providers-config.js +45 -4
- package/dist/config/providers-management.js +242 -76
- package/dist/config/providers.js +4 -1
- package/dist/config/role-service.js +8 -8
- package/dist/config/role-store.js +22 -22
- package/dist/config/schema-migration.js +143 -86
- package/dist/config/snapshot.js +70 -41
- package/dist/core/agent-runtime.js +48 -9
- package/dist/core/auth/auth-gateway.js +5 -3
- package/dist/core/auth/delegation-diagnostics.js +6 -2
- package/dist/core/auth/operation-authorizer.js +3 -1
- package/dist/core/auth/operation-catalog.js +6 -4
- package/dist/core/baseagent-loader.js +114 -11
- package/dist/core/channel-loader.js +36 -13
- package/dist/core/channel-runtime.js +112 -42
- package/dist/core/command/cli-intent-parser.js +2 -1
- package/dist/core/command/command-handler.js +16 -11
- package/dist/core/command/menu-handler.js +8 -3
- package/dist/core/command/menu-protocol.js +80 -7
- package/dist/core/command/provider-menu.js +4 -2
- package/dist/core/command/role-menu.js +29 -17
- package/dist/core/command/slash-handler.js +52 -16
- package/dist/core/daemon-control.js +42 -15
- package/dist/core/daemon-lifecycle.js +411 -67
- package/dist/core/handoff/dispatcher.js +9 -3
- package/dist/core/handoff/runtime.js +139 -45
- package/dist/core/handoff/store.js +190 -2
- package/dist/core/handoff/types.js +5 -0
- package/dist/core/initialization/service.js +7 -6
- package/dist/core/ipc-registration.js +5 -4
- package/dist/core/lifecycle-notice.js +10 -4
- package/dist/core/message/aun-ipc-sender.js +83 -5
- package/dist/core/message/message-admission.js +2 -0
- package/dist/core/message/message-bridge.js +53 -4
- package/dist/core/message/message-queue.js +46 -4
- package/dist/core/message/pending-hints.js +4 -10
- package/dist/core/message/response-engine.js +33 -25
- package/dist/core/message/send-options.js +40 -0
- package/dist/core/message/send-routing.js +320 -0
- package/dist/core/ownership/owner-resolver.js +112 -8
- package/dist/core/permission/ec-command-parser.js +159 -16
- package/dist/core/permission/readonly-shell-query.js +66 -7
- package/dist/core/permission/tool-error-code.js +13 -1
- package/dist/core/permission/tool-policy.js +74 -20
- package/dist/core/relation/same-owner-proof.js +131 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +24 -0
- package/dist/core/session/adapters/codex-session-file-adapter.js +80 -0
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +22 -0
- package/dist/core/session/adapters/gemini-session-file-adapter.js +39 -0
- package/dist/core/session/session-fs-store.js +164 -3
- package/dist/core/session/session-idle-monitor.js +103 -17
- package/dist/core/session/session-manager.js +105 -18
- package/dist/core/thread/thread-route.js +5 -2
- package/dist/directory/owner-directory-admission.js +26 -1
- package/dist/directory/owner-directory-cache.js +739 -109
- package/dist/directory/owner-directory-markdown.js +146 -36
- package/dist/directory/owner-directory-query-operation.js +6 -3
- package/dist/directory/owner-directory-scope.js +12 -0
- package/dist/directory/owner-directory-search.js +5 -1
- package/dist/directory/owner-directory-store.js +28 -0
- package/dist/ecweb/basic-settings-service.js +15 -1
- package/dist/ecweb/message-context-service.js +2 -2
- package/dist/ecweb/providers-service.js +3 -1
- package/dist/ecweb/runtime/lifecycle.js +26 -15
- package/dist/ecweb/runtime/supervisor.js +120 -51
- package/dist/index.js +551 -250
- package/dist/paths.js +2 -1
- package/dist/proxy/manager.js +40 -17
- package/dist/proxy/service-supervisor.js +67 -33
- package/dist/response-system/engines/v1/proactive-flow.js +4 -0
- package/dist/trigger/application-service.js +4 -1
- package/dist/trigger/audit.js +19 -4
- package/dist/trigger/authorization.js +14 -5
- package/dist/trigger/event-source.js +4 -0
- package/dist/trigger/feedback.js +26 -2
- package/dist/trigger/history.js +176 -7
- package/dist/trigger/manager.js +1 -3
- package/dist/trigger/scheduler.js +81 -8
- package/dist/trigger/system-definitions.js +2 -2
- package/dist/trigger/validation.js +4 -0
- package/dist/utils/autostart.js +2 -2
- package/dist/utils/cross-platform.js +188 -12
- package/dist/utils/host-info.js +11 -8
- package/dist/utils/npm-ops.js +48 -0
- package/dist/utils/process-introspect.js +64 -1
- package/dist/utils/public-suffix.js +5811 -0
- package/dist/utils/startup-trace.js +160 -19
- package/dist/utils/windows-autostart.js +41 -7
- package/ecagent/dist/harness/env/nodejs.js +46 -2
- package/kits/docs/aun/ABILITY_CALLING.md +6 -6
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/channels/feishu.md +2 -2
- package/kits/docs/context-assembly.md +20 -4
- package/kits/docs/evolcore/INDEX.md +5 -3
- package/kits/docs/evolcore/agent.md +2 -2
- package/kits/docs/evolcore/aid.md +8 -2
- package/kits/docs/evolcore/ctl.md +15 -5
- package/kits/docs/evolcore/directory.md +48 -15
- package/kits/docs/evolcore/group.md +8 -8
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/menu-exec-schema-commands.md +1 -1
- package/kits/docs/evolcore/menu-protocol.md +32 -3
- package/kits/docs/evolcore/msg.md +38 -30
- package/kits/docs/evolcore/provider.md +57 -5
- package/kits/docs/evolcore/response.md +2 -2
- package/kits/docs/evolcore/thread-chain.md +11 -13
- package/kits/docs/evolcore/tool-authorization.md +17 -0
- package/kits/docs/evolcore/trigger.md +2 -2
- package/kits/docs/identity/ROLE_DETAIL.md +1 -1
- package/kits/docs/prompt-loading-architecture.md +30 -20
- package/kits/eck_manifest.auxiliary.json +5 -5
- package/kits/eck_manifest.json +44 -32
- package/kits/eck_manifest.memory.json +18 -18
- package/kits/eck_message_manifest.json +3 -3
- package/kits/rules/01-overview.md +1 -1
- package/kits/rules/06-channel.md +7 -8
- package/kits/schemas/_meta.json +7 -1
- package/kits/schemas/daemon.schema.1.json +5 -0
- package/kits/schemas/daemon.schema.2.json +5 -0
- package/kits/schemas/daemon.schema.3.json +2 -1
- package/kits/schemas/daemon.schema.4.json +2 -1
- package/kits/schemas/daemon.schema.5.json +2 -1
- package/kits/schemas/daemon.schema.6.json +1 -1
- package/kits/schemas/daemon.schema.7.json +1 -1
- package/kits/schemas/daemon.schema.8.json +2 -1
- package/kits/schemas/daemon.schema.9.json +2 -1
- package/kits/schemas/providers.schema.2.json +74 -0
- package/kits/schemas/role-registry.schema.1.json +2 -2
- package/kits/schemas/single-session.schema.1.json +1 -1
- package/kits/schemas/single-session.schema.2.json +1 -1
- package/kits/schemas/single-session.schema.3.json +1 -1
- package/kits/skills/aid-ability/SKILL.md +7 -7
- package/kits/skills/ec-agent-create/SKILL.md +1 -0
- package/kits/skills/ec-group/SKILL.md +8 -5
- package/kits/skills/ec-group-collaboration/SKILL.md +7 -7
- package/kits/skills/ec-service-proxy/SKILL.md +3 -10
- package/kits/skills/ec-trigger/SKILL.md +9 -9
- package/kits/skills/ec-trigger/references/examples.md +1 -1
- package/kits/skills/thread-ops/SKILL.md +10 -10
- package/kits/templates/system-fragments/channel.md +5 -5
- package/kits/templates/system-fragments/commands.md +7 -6
- package/kits/templates/system-fragments/directory-contacts.md +10 -3
- package/kits/templates/system-fragments/personal-assistant.md +22 -3
- package/kits/templates/system-fragments/reply.md +48 -28
- package/kits/templates/system-fragments/session.md +3 -10
- package/kits/templates/system-fragments/thread.md +5 -5
- package/package.json +4 -4
package/dist/cli/ctl-command.js
CHANGED
|
@@ -14,8 +14,7 @@ const CTL_HELP = `用法: ec ctl <command> [args...]
|
|
|
14
14
|
会话:
|
|
15
15
|
name <名称> 重命名当前会话
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
send <消息内容> 主动发送文本消息(proactive 模式)
|
|
17
|
+
文件:
|
|
19
18
|
file [channel] <path> 发送项目内文件
|
|
20
19
|
queue [--after <time>] [--before <time>] 查看/管理会话消息队列
|
|
21
20
|
|
|
@@ -23,7 +22,6 @@ const CTL_HELP = `用法: ec ctl <command> [args...]
|
|
|
23
22
|
ec ctl status
|
|
24
23
|
ec ctl status --format json
|
|
25
24
|
ec ctl name "新会话名称"
|
|
26
|
-
ec ctl send "任务已完成"
|
|
27
25
|
ec ctl file report.md
|
|
28
26
|
ec ctl queue --full
|
|
29
27
|
ec ctl path list
|
|
@@ -694,12 +694,19 @@ export async function cmdStart(opts = {}) {
|
|
|
694
694
|
console.error('⚠ 控制 AID 未配置,请先运行 ec init;未启动 EvolCore。');
|
|
695
695
|
return;
|
|
696
696
|
}
|
|
697
|
+
if (opts.webInit) {
|
|
698
|
+
const { hasLocalControlIdentity, missingControlIdentityMessage } = await import('../aun/aid/control-aid.js');
|
|
699
|
+
if (!hasLocalControlIdentity(daemonCfgStart.aid)) {
|
|
700
|
+
trace.finish(false);
|
|
701
|
+
throw new Error(missingControlIdentityMessage(daemonCfgStart.aid));
|
|
702
|
+
}
|
|
703
|
+
}
|
|
697
704
|
trace.mark('cli.codexHookCheck');
|
|
698
705
|
if (!await ensureCodexHookBeforeLifecycle()) {
|
|
699
706
|
trace.finish(false);
|
|
700
707
|
return;
|
|
701
708
|
}
|
|
702
|
-
if (process.stdin.isTTY) {
|
|
709
|
+
if (!opts.webInit && process.stdin.isTTY) {
|
|
703
710
|
// 证书缺失时在 CLI 侧提示,daemon 是后台进程无终端不做交互
|
|
704
711
|
const certKey = path.join(resolvePaths().root, 'AIDs', daemonCfgStart.aid, 'private', 'key.json');
|
|
705
712
|
if (!fs.existsSync(certKey)) {
|
|
@@ -986,8 +993,10 @@ export async function cmdStart(opts = {}) {
|
|
|
986
993
|
}
|
|
987
994
|
}
|
|
988
995
|
console.log('');
|
|
989
|
-
//
|
|
990
|
-
|
|
996
|
+
// 代码统计仅在开发仓(link 模式)显示。判据与「安装类型」一行保持一致:
|
|
997
|
+
// 看包路径是否含 node_modules,而不是比较 EVOLCORE_HOME 与包目录——
|
|
998
|
+
// 运行时 home 默认是 ~/.evolcore,那个比较永远不会成立。
|
|
999
|
+
if (packageIsDevMode()) {
|
|
991
1000
|
printCodeStats(getPackageRoot(), p.logs);
|
|
992
1001
|
}
|
|
993
1002
|
console.log(`⏱ done in ${((Date.now() - cmdStartedAt) / 1000).toFixed(1)}s`);
|
|
@@ -1502,6 +1511,28 @@ function renderStatusOverview(snapshot) {
|
|
|
1502
1511
|
['Memory', `${Number.isFinite(totalMemory) ? `${formatBytes(totalMemory)} 主机总量` : '主机信息不可用'}${processMemory}`],
|
|
1503
1512
|
];
|
|
1504
1513
|
renderStatusFields(overviewFields);
|
|
1514
|
+
const startup = snapshot.daemon.startup;
|
|
1515
|
+
if (startup) {
|
|
1516
|
+
const phases = { classifying: '识别待恢复任务(控制面可用)', recovering: '优先恢复进行中任务', loading: '加载其余 Agent', ready: '正常 Ready', failed: '启动未就绪(关键模块失败)' };
|
|
1517
|
+
const states = { waiting: '等待前置阶段', starting: '启动中', recovering: '恢复运行中任务', ready: '已就绪', failed: '失败', disabled: '已禁用' };
|
|
1518
|
+
const agents = startup.agents;
|
|
1519
|
+
renderStatusFields([
|
|
1520
|
+
['启动进度', phases[startup.phase]],
|
|
1521
|
+
['已加载', `Runner ${agents.filter(agent => agent.runner === 'ready').length}/${agents.length}`
|
|
1522
|
+
+ ` · AUN ${agents.filter(agent => agent.aun).length}/${agents.length}`
|
|
1523
|
+
+ ` · 恢复登记 ${agents.filter(agent => agent.recovery).length}/${agents.length}`
|
|
1524
|
+
+ ` · Trigger ${startup.triggers.loaded}/${startup.triggers.total}`],
|
|
1525
|
+
['ECWeb 启动', states[startup.ecweb]],
|
|
1526
|
+
...(startup.priorityRelease === 'timeout' || startup.optionalRelease === 'timeout'
|
|
1527
|
+
? [['启动放行', '已按等待预算放行后续模块;正常 Ready 仍按实际条件判断']] : []),
|
|
1528
|
+
]);
|
|
1529
|
+
if (startup.phase !== 'ready') {
|
|
1530
|
+
renderStatusTable(['Agent', '启动组', 'Runner', 'AUN', '恢复登记', 'Trigger'], agents.map(agent => [
|
|
1531
|
+
agent.aid, startup.phase === 'classifying' ? '待判断' : agent.priority ? '优先恢复' : '空闲', states[agent.runner], agent.aun ? '已连接' : '等待连接',
|
|
1532
|
+
agent.recovery ? '完成' : '等待恢复', states[agent.trigger],
|
|
1533
|
+
]));
|
|
1534
|
+
}
|
|
1535
|
+
}
|
|
1505
1536
|
const baseagents = snapshot.baseagents?.items;
|
|
1506
1537
|
const activity = snapshot.activity;
|
|
1507
1538
|
if (activity) {
|
|
@@ -1772,6 +1803,7 @@ async function collectStatusSnapshot() {
|
|
|
1772
1803
|
build: statusResponse?.build
|
|
1773
1804
|
? { runtimeMode: statusResponse.build.runtimeMode, version: statusResponse.build.version ?? null } : null,
|
|
1774
1805
|
queue: statusResponse?.queue ?? { pending: null, processing: null },
|
|
1806
|
+
startup: statusResponse?.startup,
|
|
1775
1807
|
restartMonitorPids: restartMonitors.map(item => item.record.pid),
|
|
1776
1808
|
},
|
|
1777
1809
|
baseagents: statusResponse?.baseagents ?? { source: 'unavailable', items: [] },
|
|
@@ -1807,7 +1839,7 @@ async function collectStatusSnapshot() {
|
|
|
1807
1839
|
? { source: 'runtime+history', ...statusResponse.triggers }
|
|
1808
1840
|
: { source: 'unavailable', enabled: null, today: { calls: null, failures: null } },
|
|
1809
1841
|
proxy: statusResponse?.serviceProxy ?? { source: 'unavailable', items: [] },
|
|
1810
|
-
ecweb, diagnostics,
|
|
1842
|
+
ecweb: { ...ecweb, startupState: statusResponse?.startup?.ecweb }, diagnostics,
|
|
1811
1843
|
};
|
|
1812
1844
|
}
|
|
1813
1845
|
function renderStatusHeader(snapshot) {
|
|
@@ -3306,6 +3338,12 @@ function renderEcwebStatus(status) {
|
|
|
3306
3338
|
console.log(` 命令行输入 ${MAIN_CLI_BIN} watch web/${WEB_CLI_BIN} 获取配对码`);
|
|
3307
3339
|
}
|
|
3308
3340
|
}
|
|
3341
|
+
else if (status.startupState === 'waiting') {
|
|
3342
|
+
console.log('🔭 ECWeb: 等待优先恢复组放行,将与空闲 Agent 一起启动');
|
|
3343
|
+
}
|
|
3344
|
+
else if (status.startupState === 'starting' && status.status !== 'process-not-ready') {
|
|
3345
|
+
console.log('🔭 ECWeb: 正在启动,等待健康检查');
|
|
3346
|
+
}
|
|
3309
3347
|
else if (status.status === 'process-not-ready') {
|
|
3310
3348
|
if (status.reason === 'daemon-not-ready') {
|
|
3311
3349
|
const detail = status.readinessError ? `:${status.readinessError}` : '';
|
package/dist/cli/directory.js
CHANGED
|
@@ -176,7 +176,7 @@ async function runManaged(argv, json) {
|
|
|
176
176
|
}
|
|
177
177
|
function printHelp() {
|
|
178
178
|
console.log(`用法:
|
|
179
|
-
ec directory list [<关键词>] [--filter '<kw1,kw2>']... [--type <type>] [--scope internal|external|all] [--owner <aid|unbound>] [--limit <n>] [--page <n>]
|
|
179
|
+
ec directory list [<关键词>] [--filter '<kw1,kw2>']... [--type <type>] [--scope internal|external|pa-team|all] [--owner <aid|unbound>] [--limit <n>] [--page <n>]
|
|
180
180
|
ec directory info <contact-aid|名字> [--limit <n>]
|
|
181
181
|
ec directory refresh
|
|
182
182
|
ec directory blocked
|
|
@@ -191,6 +191,8 @@ list:
|
|
|
191
191
|
位置参数按“多个词同时命中”处理。
|
|
192
192
|
默认每页 20 条,--page / --limit 可翻页;输出包含 type、exttype、描述、备注、
|
|
193
193
|
Owner 绑定关系与 Ownership 核验状态。本地备注正文不在 list 展示。
|
|
194
|
+
--scope internal|external|pa-team|all(默认 all):pa-team 只列 open_pa_context
|
|
195
|
+
里且 ownership_status=owned 的成员。
|
|
194
196
|
|
|
195
197
|
info:
|
|
196
198
|
接受 AID 或名字。AID 大小写不敏感、可带 @ 前缀;名字先做归一后的精确匹配
|
|
@@ -0,0 +1,206 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `ecmsg` 网关的可测部分:参数解析与下游 argv 构造。
|
|
3
|
+
*
|
|
4
|
+
* 与 `bin/ecmsg.js` 的分工:
|
|
5
|
+
* - 本模块:纯函数,无 IO,可单测
|
|
6
|
+
* - `bin/ecmsg.js`:读环境、加载模块、IPC、渲染回执
|
|
7
|
+
*
|
|
8
|
+
* 为什么单独拆出来:网关最容易出错的两处(选项归类、跨话题参数注入)都是纯逻辑,
|
|
9
|
+
* 混在带 IO 的入口脚本里就无法回归验证。
|
|
10
|
+
*/
|
|
11
|
+
import { isThreadTopicId, parseDurationToMs } from '../core/message/send-routing.js';
|
|
12
|
+
import { GATEWAY_FLAG_ALIASES, GATEWAY_ROUTE_VALUE_FLAGS, MANAGED_SEND_BOOLEAN_FLAGS, MANAGED_SEND_VALUE_FLAGS, } from '../core/message/send-options.js';
|
|
13
|
+
/**
|
|
14
|
+
* 选项表来自 `send-options.ts`(唯一事实源),网关**不再维护第二份**。
|
|
15
|
+
*
|
|
16
|
+
* 网关消费的:路由选项 + 三态 `--encrypt`;其余一律原样透传给下游通道,
|
|
17
|
+
* 因此 `--file` / `--link` / `--payload` / `--trigger-prompt` 等能力与
|
|
18
|
+
* `ec msg send` 天然一致,不存在"两边各实现一套"的漂移。
|
|
19
|
+
*/
|
|
20
|
+
const ROUTE_VALUE_FLAGS = new Set(GATEWAY_ROUTE_VALUE_FLAGS);
|
|
21
|
+
/** 原样透传给底层发送通道的选项(取一个值)。 */
|
|
22
|
+
const PASSTHROUGH_VALUE_FLAGS = new Set(MANAGED_SEND_VALUE_FLAGS.filter(flag => !ROUTE_VALUE_FLAGS.has(flag)));
|
|
23
|
+
/** 原样透传的布尔选项(`--encrypt`/`--no-encrypt` 由网关单独处理)。 */
|
|
24
|
+
const PASSTHROUGH_BOOLEAN_FLAGS = new Set(MANAGED_SEND_BOOLEAN_FLAGS.filter(flag => flag === '--mention-all'));
|
|
25
|
+
/** 正文来源类选项:出现即表示有正文,不再要求位置参数。 */
|
|
26
|
+
export const BODY_FLAGS = new Set([
|
|
27
|
+
'--text-from-file', '--file', '--link', '--payload', '--payload-file',
|
|
28
|
+
]);
|
|
29
|
+
/**
|
|
30
|
+
* 把 argv 切成「路由选项」「正文」「透传选项」三部分。
|
|
31
|
+
*
|
|
32
|
+
* 正文与透传选项原样交给底层通道,保证 `--file` / `--link` / `--payload` 等
|
|
33
|
+
* 能力与 `ec msg send` 完全一致——网关不重新实现任何正文形态。
|
|
34
|
+
*/
|
|
35
|
+
export function parseGatewayArgs(args) {
|
|
36
|
+
const route = {};
|
|
37
|
+
const passthrough = [];
|
|
38
|
+
const text = [];
|
|
39
|
+
let endOfOptions = false;
|
|
40
|
+
for (let index = 0; index < args.length; index++) {
|
|
41
|
+
const token = args[index];
|
|
42
|
+
if (endOfOptions) {
|
|
43
|
+
text.push(token);
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
if (token === '--') {
|
|
47
|
+
endOfOptions = true;
|
|
48
|
+
continue;
|
|
49
|
+
}
|
|
50
|
+
if (token === '--help' || token === '-h') {
|
|
51
|
+
route.help = true;
|
|
52
|
+
continue;
|
|
53
|
+
}
|
|
54
|
+
if (token === '--no-encrypt') {
|
|
55
|
+
route.noEncrypt = true;
|
|
56
|
+
continue;
|
|
57
|
+
}
|
|
58
|
+
if (PASSTHROUGH_BOOLEAN_FLAGS.has(token)) {
|
|
59
|
+
passthrough.push(token);
|
|
60
|
+
continue;
|
|
61
|
+
}
|
|
62
|
+
// `--self` 是 `--from` 的别名:托管发送里本端恒为会话本端,两者同义。
|
|
63
|
+
const flag = GATEWAY_FLAG_ALIASES[token] ?? token;
|
|
64
|
+
if (ROUTE_VALUE_FLAGS.has(flag)) {
|
|
65
|
+
const value = args[++index];
|
|
66
|
+
if (value === undefined)
|
|
67
|
+
return { ok: false, error: `${token} 需要一个值` };
|
|
68
|
+
if (flag === '--format') {
|
|
69
|
+
if (value !== 'json')
|
|
70
|
+
return { ok: false, error: '--format 只支持 json' };
|
|
71
|
+
route.format = 'json';
|
|
72
|
+
}
|
|
73
|
+
else if (flag === '--thread')
|
|
74
|
+
route.thread = value;
|
|
75
|
+
else if (flag === '--to')
|
|
76
|
+
route.to = value;
|
|
77
|
+
else if (flag === '--from')
|
|
78
|
+
route.from = value;
|
|
79
|
+
else if (flag === '--check-every')
|
|
80
|
+
route.checkEvery = value;
|
|
81
|
+
else if (flag === '--encrypt')
|
|
82
|
+
route.encrypt = value;
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (PASSTHROUGH_VALUE_FLAGS.has(flag)) {
|
|
86
|
+
const value = args[++index];
|
|
87
|
+
if (value === undefined)
|
|
88
|
+
return { ok: false, error: `${token} 需要一个值` };
|
|
89
|
+
passthrough.push(flag, value);
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
if (token.startsWith('--')) {
|
|
93
|
+
return { ok: false, error: `未知选项 ${token}(用 --help 查看用法)` };
|
|
94
|
+
}
|
|
95
|
+
text.push(token);
|
|
96
|
+
}
|
|
97
|
+
return { ok: true, route, passthrough, text };
|
|
98
|
+
}
|
|
99
|
+
/** 毫秒 → `20m` / `90s` / `2h` / `1d`,供下游 `--check-every` 使用。 */
|
|
100
|
+
export function formatDuration(ms) {
|
|
101
|
+
if (!ms || ms <= 0)
|
|
102
|
+
return '-';
|
|
103
|
+
if (ms % 86_400_000 === 0)
|
|
104
|
+
return `${ms / 86_400_000}d`;
|
|
105
|
+
if (ms % 3_600_000 === 0)
|
|
106
|
+
return `${ms / 3_600_000}h`;
|
|
107
|
+
if (ms % 60_000 === 0)
|
|
108
|
+
return `${ms / 60_000}m`;
|
|
109
|
+
return `${Math.round(ms / 1000)}s`;
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* 由路由结果构造下游发送通道的 argv。
|
|
113
|
+
*
|
|
114
|
+
* 关键设计:
|
|
115
|
+
* - **同话题绝不注入 `--thread` / `--check-every`**。目标本来就是当前会话,
|
|
116
|
+
* 剥掉这两个参数后语义完全等价,且天然不会创建复查 Trigger,也避开了底层
|
|
117
|
+
* "跨话题参数必须成对"的校验。
|
|
118
|
+
* - **跨话题必须成对注入**。`--check-every` 由网关按判定结果给出(缺省 20m),
|
|
119
|
+
* 不依赖调用方是否传了它。
|
|
120
|
+
* - **加密显式下发二态**,不依赖 daemon 默认值:`--encrypt` 或 `--no-encrypt`。
|
|
121
|
+
*/
|
|
122
|
+
/**
|
|
123
|
+
* 目标 ID 是否是 AID 形态。
|
|
124
|
+
*
|
|
125
|
+
* 与 `ec-command-parser` 的 `looksLikeAid` 同口径(至少三级、只含域名安全字符)。
|
|
126
|
+
* 非 AUN 渠道的原生 ID(`ou_xxx`、`wxid_xxx`)不是 AID,因此**不能**作为位置
|
|
127
|
+
* 参数传给下游——那会被当成正文,目标改由 `--thread` 推导。
|
|
128
|
+
*/
|
|
129
|
+
function looksLikeAid(value) {
|
|
130
|
+
const labels = value.split('.');
|
|
131
|
+
return labels.length >= 3
|
|
132
|
+
&& labels.every(label => /^[a-zA-Z0-9]([a-zA-Z0-9-]*[a-zA-Z0-9])?$/.test(label));
|
|
133
|
+
}
|
|
134
|
+
export function buildDownstreamArgv(route, text, passthrough) {
|
|
135
|
+
const scope = route.peer.peerKind === 'group' ? 'group' : 'msg';
|
|
136
|
+
// 目标为原生 ID 时必须靠 --thread 推导,写成位置参数会变成正文的一部分。
|
|
137
|
+
const targetAsPositional = looksLikeAid(route.peer.id)
|
|
138
|
+
|| (route.peer.peerKind === 'group' && !route.crossTopic);
|
|
139
|
+
const argv = targetAsPositional
|
|
140
|
+
? [scope, 'send', route.self, route.peer.id, ...text, ...passthrough]
|
|
141
|
+
: [scope, 'send', route.self, ...text, ...passthrough];
|
|
142
|
+
// 首次联系:主话题还没被创建,带上 --thread 反而会被下游判成"话题不存在",
|
|
143
|
+
// 所以按普通私聊发出,会话随这条消息建立,也就不建复查。
|
|
144
|
+
if (route.crossTopic && route.threadId && !route.firstContact) {
|
|
145
|
+
argv.push('--thread', route.threadId);
|
|
146
|
+
if (route.checkEveryMs)
|
|
147
|
+
argv.push('--check-every', formatDuration(route.checkEveryMs));
|
|
148
|
+
}
|
|
149
|
+
argv.push(route.encryptResolved ? '--encrypt' : '--no-encrypt');
|
|
150
|
+
return argv;
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* 校验 `--thread` 是否需要在本地索引里查表。
|
|
154
|
+
*
|
|
155
|
+
* 主话题 id(`main:a:b`)自带两端,不需要索引;独立话题(`thread-…`)需要。
|
|
156
|
+
* 其他形态由 `resolveSendRoute` 直接拒绝,这里返回 false 以免做无谓的 IO。
|
|
157
|
+
*/
|
|
158
|
+
export function needsThreadIndexLookup(thread) {
|
|
159
|
+
return typeof thread === 'string' && isThreadTopicId(thread);
|
|
160
|
+
}
|
|
161
|
+
/** 跨话题时下游必须拿到合法时长;返回 undefined 表示无需复查。 */
|
|
162
|
+
export function downstreamCheckEveryMs(route) {
|
|
163
|
+
if (!route.crossTopic)
|
|
164
|
+
return undefined;
|
|
165
|
+
if (route.checkEveryMs === undefined)
|
|
166
|
+
return undefined;
|
|
167
|
+
// 兜底:解析结果来自网关自己补的默认值或调用方输入,两者都已是毫秒
|
|
168
|
+
return parseDurationToMs(formatDuration(route.checkEveryMs)) ?? route.checkEveryMs;
|
|
169
|
+
}
|
|
170
|
+
/**
|
|
171
|
+
* 决定这次发送走哪条内部通道。
|
|
172
|
+
*
|
|
173
|
+
* 判据是**当前会话所在渠道**,不是目标对端的渠道:
|
|
174
|
+
* - 当前会话在 AUN 上 → 走 `aun-msg-send`。它同时覆盖同话题与跨话题;
|
|
175
|
+
* 跨话题的投递由 handoff 负责,目标会话属于哪个渠道由目标会话自己决定。
|
|
176
|
+
* - 当前会话在其它渠道上 → 只有"会话级发送"(发往该会话自己的 `channelId`),
|
|
177
|
+
* 因此只能同话题。跨话题需要别的入口,本端尚未提供。
|
|
178
|
+
*
|
|
179
|
+
* 换句话说:跨话题从来不是某个渠道的特性,而是"当前会话能不能把消息投到
|
|
180
|
+
* 另一条会话"。AUN 会话能,靠 handoff;其它渠道的会话暂时不能。
|
|
181
|
+
*/
|
|
182
|
+
export function decideDispatch(route, text, passthrough, currentChannelType) {
|
|
183
|
+
if (currentChannelType === 'aun') {
|
|
184
|
+
return { kind: 'aun', argv: buildDownstreamArgv(route, text, passthrough) };
|
|
185
|
+
}
|
|
186
|
+
if (route.crossTopic) {
|
|
187
|
+
return {
|
|
188
|
+
kind: 'reject',
|
|
189
|
+
code: 'CROSS_TOPIC_REQUIRES_AUN_SESSION',
|
|
190
|
+
message: `跨话题发送需要从 AUN 会话发起;当前会话在 ${currentChannelType} 渠道上`,
|
|
191
|
+
hint: '该渠道的会话目前只能回复本会话对端',
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
if (passthrough.length > 0) {
|
|
195
|
+
return {
|
|
196
|
+
kind: 'reject',
|
|
197
|
+
code: 'UNSUPPORTED_OPTION',
|
|
198
|
+
message: `${currentChannelType} 渠道的会话发送目前只支持纯文本,不支持的选项:${passthrough.join(' ')}`,
|
|
199
|
+
hint: "改用纯文本:ecmsg send '<正文>'",
|
|
200
|
+
};
|
|
201
|
+
}
|
|
202
|
+
if (!text.join(' ').trim()) {
|
|
203
|
+
return { kind: 'reject', code: 'INVALID_ARGUMENT', message: '缺少正文' };
|
|
204
|
+
}
|
|
205
|
+
return { kind: 'session' };
|
|
206
|
+
}
|
package/dist/cli/index.js
CHANGED
|
@@ -50,6 +50,12 @@ AUN:
|
|
|
50
50
|
aid 管理 AID 身份与 agent.md
|
|
51
51
|
msg 私聊消息收发、撤回、在线状态与历史
|
|
52
52
|
group 群消息与群管理
|
|
53
|
+
|
|
54
|
+
发送消息请用独立入口 ecmsg(统一入口):
|
|
55
|
+
ecmsg send '<正文>' 回复当前会话
|
|
56
|
+
ecmsg send '<正文>' --thread <话题id> 指定话题(跨话题)
|
|
57
|
+
ecmsg send '<正文>' --to <对端AID> 指定对端
|
|
58
|
+
详见 ecmsg --help。
|
|
53
59
|
fs AUN 文件系统
|
|
54
60
|
storage 底层对象存储命令
|
|
55
61
|
rpc 调用底层 AUN RPC
|
package/dist/cli/init.js
CHANGED
|
@@ -7,7 +7,7 @@ import { commandExists } from '../utils/cross-platform.js';
|
|
|
7
7
|
import { scanInstances } from '../utils/instance-registry.js';
|
|
8
8
|
import { saveDefaultsSafe, loadDaemonConfig, saveDaemonConfig } from '../config-store.js';
|
|
9
9
|
import { DEFAULT_ECWEB_PORT, ecwebService, setEcwebEnabled } from '../config/daemon-services.js';
|
|
10
|
-
import { ensureControlAgentMd, generateControlAid, resolveControlAidDomain, submitControlAidRegistration, } from '../aun/aid/control-aid.js';
|
|
10
|
+
import { ensureControlAgentMd, generateControlAid, hasLocalControlIdentity, missingControlIdentityMessage, resolveControlAidDomain, submitControlAidRegistration, } from '../aun/aid/control-aid.js';
|
|
11
11
|
import { isValidAid } from '../aun/aid/validation.js';
|
|
12
12
|
/**
|
|
13
13
|
* `agents/codex-runner.js` 是 CLI 里最重的单个模块(整包冷加载约 380ms,因为
|
|
@@ -100,6 +100,72 @@ function buildDefaults(chosen, available, projectsDefaultPath) {
|
|
|
100
100
|
function writeDefaults(chosen, available, projectsDefaultPath) {
|
|
101
101
|
saveDefaultsSafe(buildDefaults(chosen, available, projectsDefaultPath));
|
|
102
102
|
}
|
|
103
|
+
export async function importProvidersForCliInit(available, options = {}) {
|
|
104
|
+
const { providerFromBaseagent } = await import('../config/providers-import.js');
|
|
105
|
+
const { importOrMergeBaseagentProvider, readProvidersSnapshot } = await import('../config/providers-management.js');
|
|
106
|
+
const { readProvidersFile } = await import('../config/providers.js');
|
|
107
|
+
const { resolveProviderId, resolveProviderServiceForBaseagent } = await import('../config/providers-config.js');
|
|
108
|
+
const { ConfigTarget, mutateConfig } = await import('../config/config-manager.js');
|
|
109
|
+
const imported = [];
|
|
110
|
+
const warnings = [];
|
|
111
|
+
for (const baseagent of available) {
|
|
112
|
+
let value;
|
|
113
|
+
try {
|
|
114
|
+
value = (options.source ?? providerFromBaseagent)(baseagent);
|
|
115
|
+
}
|
|
116
|
+
catch {
|
|
117
|
+
warnings.push({ baseagent, code: 'LOCAL_PROVIDER_SOURCE_UNAVAILABLE' });
|
|
118
|
+
continue;
|
|
119
|
+
}
|
|
120
|
+
try {
|
|
121
|
+
const result = await importOrMergeBaseagentProvider({ revision: readProvidersSnapshot().revision, value });
|
|
122
|
+
imported.push({ baseagent, providerId: result.providerId, merged: result.merged });
|
|
123
|
+
}
|
|
124
|
+
catch (error) {
|
|
125
|
+
const code = error.code;
|
|
126
|
+
warnings.push({ baseagent, code: ['PROVIDER_CONFLICT', 'PROVIDER_ID_COLLISION', 'CONFLICT'].includes(code ?? '') ? code : 'PROVIDER_IMPORT_FAILED' });
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
const snapshot = readProvidersSnapshot();
|
|
130
|
+
const registry = readProvidersFile();
|
|
131
|
+
mutateConfig(ConfigTarget.Defaults, undefined, defaults => {
|
|
132
|
+
if (readProvidersSnapshot().revision !== snapshot.revision)
|
|
133
|
+
throw new Error('Providers changed during CLI initialization; retry');
|
|
134
|
+
defaults.baseagents ??= {};
|
|
135
|
+
for (const baseagent of available) {
|
|
136
|
+
const selection = defaults.baseagents[baseagent] ??= {};
|
|
137
|
+
const usable = (providerId) => {
|
|
138
|
+
try {
|
|
139
|
+
return !!resolveProviderServiceForBaseagent(providerId, baseagent, undefined, registry).apiKey?.trim();
|
|
140
|
+
}
|
|
141
|
+
catch {
|
|
142
|
+
return false;
|
|
143
|
+
}
|
|
144
|
+
};
|
|
145
|
+
const providerId = selection.provider && usable(selection.provider) ? resolveProviderId(selection.provider, registry)
|
|
146
|
+
: imported.find(item => item.baseagent === baseagent)?.providerId ?? Object.keys(registry.providers).find(usable);
|
|
147
|
+
if (providerId && usable(providerId))
|
|
148
|
+
selection.provider = providerId;
|
|
149
|
+
else
|
|
150
|
+
warnings.push({ baseagent, code: 'PROVIDER_REQUIRED' });
|
|
151
|
+
}
|
|
152
|
+
});
|
|
153
|
+
if (!options.quiet) {
|
|
154
|
+
for (const item of imported)
|
|
155
|
+
console.log(`✓ Provider ${item.merged ? '已合并' : '已导入'}: ${item.baseagent} → ${item.providerId}`);
|
|
156
|
+
const messages = {
|
|
157
|
+
LOCAL_PROVIDER_SOURCE_UNAVAILABLE: '未找到可导入的本机连接或有效凭据',
|
|
158
|
+
PROVIDER_REQUIRED: '最终仍缺少可用 Provider',
|
|
159
|
+
PROVIDER_CONFLICT: 'Provider 域名配置冲突,未覆盖原配置',
|
|
160
|
+
PROVIDER_ID_COLLISION: 'Provider ID 冲突,未覆盖原配置',
|
|
161
|
+
CONFLICT: '配置已变更,请重试导入',
|
|
162
|
+
PROVIDER_IMPORT_FAILED: 'Provider 导入失败,未返回凭据详情',
|
|
163
|
+
};
|
|
164
|
+
for (const item of warnings)
|
|
165
|
+
console.warn(`⚠ ${item.baseagent}: ${messages[item.code]}(${item.code});可使用 ec provider import 或 ECWEB 检查并补齐。`);
|
|
166
|
+
}
|
|
167
|
+
return { imported, warnings };
|
|
168
|
+
}
|
|
103
169
|
function hasCompletedInitConfig() {
|
|
104
170
|
const p = resolvePaths();
|
|
105
171
|
const daemon = loadDaemonConfig();
|
|
@@ -122,8 +188,25 @@ function isAutostartOnlyRequest(options) {
|
|
|
122
188
|
&& options.ecweb === undefined
|
|
123
189
|
&& options.format === undefined;
|
|
124
190
|
}
|
|
125
|
-
function
|
|
191
|
+
export async function configureAutostartForInit(enabled, runtimeRoot, interactive = true) {
|
|
126
192
|
const result = configureAutostart(enabled, runtimeRoot);
|
|
193
|
+
if (!result.repairTask || !interactive || !process.stdin.isTTY || !process.stdout.isTTY)
|
|
194
|
+
return result;
|
|
195
|
+
console.log(`检测到失效的 \\EvolCore 登录任务:启动命令匹配当前运行目录,但启动脚本与归属记录均缺失。`);
|
|
196
|
+
console.log(`重建将覆盖该任务并生成启动脚本:${result.repairTask.wrapperPath};不修改 AIDs、配置或数据。`);
|
|
197
|
+
const prompt = readline.createInterface({ input: process.stdin, output: process.stdout });
|
|
198
|
+
try {
|
|
199
|
+
const answer = (await ask(prompt, '是否重建此登录自启动任务?[y/N] ')).trim().toLowerCase();
|
|
200
|
+
if (answer !== 'y' && answer !== 'yes')
|
|
201
|
+
return result;
|
|
202
|
+
return configureAutostart(enabled, runtimeRoot, { confirmedTaskXml: result.repairTask.xml });
|
|
203
|
+
}
|
|
204
|
+
finally {
|
|
205
|
+
prompt.close();
|
|
206
|
+
}
|
|
207
|
+
}
|
|
208
|
+
async function applyExplicitAutostart(enabled, runtimeRoot, interactive) {
|
|
209
|
+
const result = await configureAutostartForInit(enabled, runtimeRoot, interactive);
|
|
127
210
|
if (!result.ok) {
|
|
128
211
|
if (result.nonFatal) {
|
|
129
212
|
console.log(`⚠ ${autostartPlatformLabel() || '登录自启'}未配置:${result.error || '检测到外部配置占用,未覆盖。'}`);
|
|
@@ -179,6 +262,12 @@ export async function ensureEcwebInstalledForInit(options = {}) {
|
|
|
179
262
|
}
|
|
180
263
|
export async function cmdInitWeb(dependencies = {}) {
|
|
181
264
|
const p = resolvePaths();
|
|
265
|
+
const hasIdentity = dependencies.hasLocalIdentity ?? hasLocalControlIdentity;
|
|
266
|
+
const existingConfig = (dependencies.loadConfig ?? loadDaemonConfig)();
|
|
267
|
+
if (existingConfig.aid && !hasIdentity(existingConfig.aid)) {
|
|
268
|
+
console.error(`❌ ${missingControlIdentityMessage(existingConfig.aid)}`);
|
|
269
|
+
return false;
|
|
270
|
+
}
|
|
182
271
|
ensureDataDirs();
|
|
183
272
|
const daemonRunning = dependencies.isDaemonRunning?.()
|
|
184
273
|
?? scanInstances().mains.some(instance => instance.alive);
|
|
@@ -208,6 +297,10 @@ export async function cmdInitWeb(dependencies = {}) {
|
|
|
208
297
|
console.error("❌ 主机控制 AID 未配置。");
|
|
209
298
|
return false;
|
|
210
299
|
}
|
|
300
|
+
if (!hasIdentity(controlAid)) {
|
|
301
|
+
console.error(`❌ ${missingControlIdentityMessage(controlAid)}`);
|
|
302
|
+
return false;
|
|
303
|
+
}
|
|
211
304
|
if (config.owner) {
|
|
212
305
|
try {
|
|
213
306
|
await submitControlAidRegistration(controlAid, config.owner);
|
|
@@ -216,11 +309,16 @@ export async function cmdInitWeb(dependencies = {}) {
|
|
|
216
309
|
console.warn(`⚠️ 主机控制 AID Owner 绑定暂未提交,将由 daemon 后续重试: ${installErrorMessage(error)}`);
|
|
217
310
|
}
|
|
218
311
|
}
|
|
219
|
-
|
|
220
|
-
|
|
312
|
+
if (config.owner) {
|
|
313
|
+
try {
|
|
314
|
+
await (dependencies.ensureAgentMd ?? ensureControlAgentMd)(controlAid, { ownerAid: config.owner });
|
|
315
|
+
}
|
|
316
|
+
catch (error) {
|
|
317
|
+
console.warn(`⚠️ 主机控制 AID 名片暂未发布,将由 daemon 后续重试: ${installErrorMessage(error)}`);
|
|
318
|
+
}
|
|
221
319
|
}
|
|
222
|
-
|
|
223
|
-
console.
|
|
320
|
+
else {
|
|
321
|
+
console.log('ℹ 主机名片将在 Web 初始化完成 Owner 绑定后发布。');
|
|
224
322
|
}
|
|
225
323
|
if (ecwebService(config.services)?.enabled !== true) {
|
|
226
324
|
config = { ...config, services: setEcwebEnabled(config.services, true) };
|
|
@@ -284,7 +382,7 @@ export async function cmdInit(options) {
|
|
|
284
382
|
// A bound installation may toggle login autostart independently of the
|
|
285
383
|
// Baseagent setup wizard. This is also the path used by public installers.
|
|
286
384
|
if (isAutostartOnlyRequest(options) && hasCompletedInitConfig()) {
|
|
287
|
-
return applyExplicitAutostart(options.autoStart, p.root);
|
|
385
|
+
return applyExplicitAutostart(options.autoStart, p.root, !options?.nonInteractive);
|
|
288
386
|
}
|
|
289
387
|
// ── 1. 单进程互斥 ──
|
|
290
388
|
const aliveMains = scanInstances().mains.filter(m => m.alive);
|
|
@@ -292,7 +390,7 @@ export async function cmdInit(options) {
|
|
|
292
390
|
// Explicit autostart flags only change the login task; they do not need
|
|
293
391
|
// to rewrite init configuration or stop an already running daemon.
|
|
294
392
|
if (isAutostartOnlyRequest(options)) {
|
|
295
|
-
return applyExplicitAutostart(options.autoStart, p.root);
|
|
393
|
+
return applyExplicitAutostart(options.autoStart, p.root, !options?.nonInteractive);
|
|
296
394
|
}
|
|
297
395
|
const pids = aliveMains.map(m => m.record.pid).join(', ');
|
|
298
396
|
console.log(`❌ EvolCore 正在运行 (PID: ${pids}),请先执行 ec stop`);
|
|
@@ -410,6 +508,7 @@ export async function cmdInit(options) {
|
|
|
410
508
|
await runInteractive();
|
|
411
509
|
}
|
|
412
510
|
// ── 共享 tail(单一出口):提示创建 agent + 生成控制 AID ──
|
|
511
|
+
await importProvidersForCliInit(available);
|
|
413
512
|
return initTail({
|
|
414
513
|
nonInteractive: options?.nonInteractive,
|
|
415
514
|
autoStart: options?.autoStart,
|
|
@@ -546,7 +645,7 @@ export async function initTail(options = {}) {
|
|
|
546
645
|
return false;
|
|
547
646
|
}
|
|
548
647
|
if (options.autoStart !== undefined) {
|
|
549
|
-
autoStartReady = applyAutostart(options.autoStart);
|
|
648
|
+
autoStartReady = await applyAutostart(options.autoStart);
|
|
550
649
|
}
|
|
551
650
|
}
|
|
552
651
|
const configuredOwner = loadDaemonConfig().owner;
|
|
@@ -564,7 +663,7 @@ export async function initTail(options = {}) {
|
|
|
564
663
|
}
|
|
565
664
|
async function handleAutostartPrompt() {
|
|
566
665
|
if (options.autoStart !== undefined) {
|
|
567
|
-
autoStartReady = applyAutostart(options.autoStart);
|
|
666
|
+
autoStartReady = await applyAutostart(options.autoStart);
|
|
568
667
|
return;
|
|
569
668
|
}
|
|
570
669
|
if (!autostartPlatformLabel())
|
|
@@ -573,10 +672,10 @@ export async function initTail(options = {}) {
|
|
|
573
672
|
console.log(`✓ ${autostartPlatformLabel()} 登录自启已启用`);
|
|
574
673
|
return;
|
|
575
674
|
}
|
|
576
|
-
autoStartReady = applyAutostart(true);
|
|
675
|
+
autoStartReady = await applyAutostart(true);
|
|
577
676
|
}
|
|
578
|
-
function applyAutostart(enabled) {
|
|
579
|
-
const result =
|
|
677
|
+
async function applyAutostart(enabled) {
|
|
678
|
+
const result = await configureAutostartForInit(enabled, resolvePaths().root, !options?.nonInteractive);
|
|
580
679
|
if (!result.ok) {
|
|
581
680
|
if (result.nonFatal) {
|
|
582
681
|
console.log(` ⚠ ${autostartPlatformLabel() || '登录自启'}未配置:${result.error || '检测到外部配置占用,未覆盖。'}`);
|
|
@@ -822,6 +921,13 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
|
|
|
822
921
|
catch (e) {
|
|
823
922
|
fail('IO_ERROR', `failed to write defaults.json: ${e?.message || e}`, EXIT_RUNTIME, format);
|
|
824
923
|
}
|
|
924
|
+
let providers;
|
|
925
|
+
try {
|
|
926
|
+
providers = await importProvidersForCliInit(available, { quiet: format === 'json', source: dependencies.providerSource });
|
|
927
|
+
}
|
|
928
|
+
catch {
|
|
929
|
+
fail('PROVIDER_SETUP_FAILED', 'Provider 扫描或默认选择保存失败,请检查配置后重试;未返回凭据详情', EXIT_RUNTIME, format);
|
|
930
|
+
}
|
|
825
931
|
// ── 8. 控制 AID:缺失则生成 ──
|
|
826
932
|
let controlAid = existingCfg.aid;
|
|
827
933
|
if (!controlAid) {
|
|
@@ -895,6 +1001,7 @@ export async function cmdInitNonInteractive(opts, dependencies = {}) {
|
|
|
895
1001
|
ownerAid,
|
|
896
1002
|
ecwebEnabled: opts.ecweb === true || ecwebService(existingCfg.services)?.enabled === true,
|
|
897
1003
|
baseagent: chosenBaseagent,
|
|
1004
|
+
providers,
|
|
898
1005
|
projectsDefaultPath: projectsDefaultPath ?? null,
|
|
899
1006
|
defaultsPath: p.defaultsConfig,
|
|
900
1007
|
daemonConfigPath: p.daemonConfig,
|