evolcore 0.0.9 → 0.0.11

package/dist/cli/agent-command.js

@@ -179,6 +179,8 @@ Options:
                 }
                 process.exit(1);
             }
+            if (result.ownerBindInterrupted)
+                return;
             if (formatJson) {
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -211,6 +213,8 @@ Options:
                 }
                 process.exit(1);
             }
+            if (result.ownerBindInterrupted)
+                return;
             if (formatJson) {
                 console.log(JSON.stringify(result, null, 2));
             }
@@ -259,15 +263,16 @@ Options:
     // --- reload ---
     if (sub === 'reload') {
         if (wantsHelp(args)) {
-            console.log(`用法: ec agent reload [aid] [--format json]
+            console.log(`用法: ec agent reload [aid] [--force] [--format json]
 
 热重载 agent 配置。
   无参数      全量 resync（扫磁盘，新增上线、删除下线、修改热更新）
-  <aid>       仅热重载指定 agent`);
+  <aid>       仅热重载指定 agent
+  --force     中断目标 Agent 的运行中任务并清空排队任务后重载（仅与 <aid> 同用）`);
             return;
         }
         const target = args[1] && !args[1].startsWith('--') ? args[1] : undefined;
-        const result = await agentReload(target);
+        const result = await agentReload(target, { force: args.includes('--force') });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -294,9 +299,10 @@ Options:
     // --- enable ---
     if (sub === 'enable') {
         if (wantsHelp(args)) {
-            console.log(`用法: ec agent enable <aid> [--format json]
+            console.log(`用法: ec agent enable <aid> [--force] [--format json]
 
-启用 agent。若服务运行中会热重载，否则下次 ec start 时生效。`);
+启用 agent。若服务运行中会热重载，否则下次 ec start 时生效。
+  --force     中断目标 Agent 的运行中任务并清空排队任务后重载`);
             return;
         }
         const aid = args[1];
@@ -304,7 +310,7 @@ Options:
             console.error('用法: ec agent enable <aid>');
             process.exit(1);
         }
-        const result = await agentEnable(aid);
+        const result = await agentEnable(aid, { force: args.includes('--force') });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));
@@ -325,9 +331,10 @@ Options:
     // --- disable ---
     if (sub === 'disable') {
         if (wantsHelp(args)) {
-            console.log(`用法: ec agent disable <aid> [--format json]
+            console.log(`用法: ec agent disable <aid> [--force] [--format json]
 
-停用 agent。若服务运行中会热重载离线，否则在配置中标记为禁用。`);
+停用 agent。若服务运行中会热重载离线，否则在配置中标记为禁用。
+  --force     中断目标 Agent 的运行中任务并清空排队任务后重载`);
             return;
         }
         const aid = args[1];
@@ -335,7 +342,7 @@ Options:
             console.error('用法: ec agent disable <aid>');
             process.exit(1);
         }
-        const result = await agentDisable(aid);
+        const result = await agentDisable(aid, { force: args.includes('--force') });
         if (!result.ok) {
             if (formatJson) {
                 console.log(JSON.stringify(result));

package/dist/cli/agent.js

@@ -8,7 +8,8 @@ import { resolveConfigCommand } from '../config/resolved-config-op.js';
 import { executeResolvedConfigCommand } from '../config/config-operation-service.js';
 import { ipcQuery } from '../ipc.js';
 import { CONFIG_SCHEMA_VERSION } from '../types.js';
-import { withLifecycleForWrite } from '../config/lifecycle.js';
+import { normalizeAgentLifecycle, withLifecycleForWrite } from '../config/lifecycle.js';
+import { preparePostBootstrapWelcomeOutbox } from '../core/bootstrap-messages.js';
 import { ensureInitialRoleRegistry } from '../config/role-service.js';
 import { isValidChannelName } from '../core/channel-loader.js';
 import { commandExists } from '../utils/cross-platform.js';
@@ -16,6 +17,7 @@ import { getCodexAppServerAvailability, isCodexAppServerAvailable } from '../age
 import { resolveEcagentConfig } from '../agents/baseagent.js';
 import { agentProjectRootFromDefaults, deriveAgentProjectPath } from '../utils/project-path.js';
 import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
+import { readTaskRuntimeContextFromEnv } from './task-context.js';
 function withStaticOwner(config, owner) {
     const value = owner?.trim();
     if (!value)
@@ -458,6 +460,7 @@ export async function agentCreateInteractive(opts = {}) {
         catch { /* daemon not running */ }
         let ownerBoundAid;
         let ownerBindSkipped = false;
+        let ownerBindInterrupted = false;
         // Only prompt for agent owner binding if:
         // 1. User didn't manually input owner during setup (owner is undefined)
         // 2. User didn't skip QR binding explicitly (skipQrBinding is false)
@@ -467,15 +470,18 @@ export async function agentCreateInteractive(opts = {}) {
             console.log('\n📡 Agent owner 绑定 — 请用 evol app 扫描二维码，10 分钟内有效\n');
             try {
                 const { runAgentOwnerQrBindFlow } = await import('./init-channel.js');
-                const bound = await runAgentOwnerQrBindFlow(aid, agentName, 'append');
-                if (bound?.boundAid) {
+                const bound = await runAgentOwnerQrBindFlow(aid, agentName);
+                if (bound.action === 'bound') {
                     ownerBoundAid = bound.boundAid;
                     console.log(`  ✓ 已配置 agent owner: ${bound.boundAid}`);
                 }
-                else {
+                else if (bound.action === 'manual') {
                     ownerBindSkipped = true;
                     ownerBoundAid = await promptAgentOwnerManually(aid);
                 }
+                else {
+                    ownerBindInterrupted = true;
+                }
             }
             catch (e) {
                 ownerBindSkipped = true;
@@ -493,6 +499,7 @@ export async function agentCreateInteractive(opts = {}) {
             hotLoadError,
             ownerBoundAid,
             ownerBindSkipped,
+            ownerBindInterrupted,
         };
     }
     finally {
@@ -784,12 +791,17 @@ export async function agentSyncAids() {
     return { ok: true, created, template: templateAgent.aid, hotReloaded };
 }
 // ==================== agentReload ====================
-export async function agentReload(aid) {
+const AGENT_RELOAD_TIMEOUT_MS = 45_000;
+const AGENT_RESYNC_TIMEOUT_MS = 5 * 60_000;
+export async function agentReload(aid, options = {}) {
     const p = resolvePaths();
     if (!aid) {
+        if (options.force) {
+            return { ok: false, code: 'INVALID_ARGS', error: '--force requires a target Agent AID' };
+        }
         // Full resync
         try {
-            const result = await ipcQuery(p.socket, { type: 'evolagent.resync' });
+            const result = await ipcQuery(p.socket, { type: 'evolagent.resync' }, AGENT_RESYNC_TIMEOUT_MS);
             if (result === null) {
                 return { ok: false, error: 'evolcore 未运行，请先 ec start' };
             }
@@ -804,27 +816,27 @@ export async function agentReload(aid) {
     }
     // Single agent reload
     try {
-        const result = await ipcQuery(p.socket, { type: 'evolagent.reload', name: aid });
+        const result = await ipcQuery(p.socket, { type: 'evolagent.reload', name: aid, force: options.force === true }, AGENT_RELOAD_TIMEOUT_MS);
         if (result === null) {
             return { ok: false, error: 'evolcore 未运行，请先 ec start 后再 reload' };
         }
         if (result?.ok) {
             return { ok: true };
         }
-        return { ok: false, error: result?.error || 'unknown error' };
+        return { ok: false, code: result?.code, error: result?.error || 'unknown error' };
     }
     catch {
         return { ok: false, error: 'evolcore 未运行，请先 ec start 后再 reload' };
     }
 }
 // ==================== agentEnable / agentDisable ====================
-export async function agentEnable(aid) {
-    return agentSetEnabled(aid, true);
+export async function agentEnable(aid, options = {}) {
+    return agentSetEnabled(aid, true, options);
 }
-export async function agentDisable(aid) {
-    return agentSetEnabled(aid, false);
+export async function agentDisable(aid, options = {}) {
+    return agentSetEnabled(aid, false, options);
 }
-async function agentSetEnabled(aid, enabled) {
+async function agentSetEnabled(aid, enabled, options = {}) {
     const p = resolvePaths();
     let config;
     try {
@@ -836,15 +848,28 @@ async function agentSetEnabled(aid, enabled) {
     if (!config) {
         return { ok: false, error: `Agent "${aid}" not found` };
     }
+    const previousEnabled = config.enabled;
     config.enabled = enabled;
     saveAgent(config);
     // Try to hot-reload if daemon is running, but don't fail if it's not
     let reloaded = false;
     try {
-        const result = await ipcQuery(p.socket, { type: 'evolagent.reload', name: aid }, 1000);
+        const result = await ipcQuery(p.socket, {
+            type: 'evolagent.reload',
+            name: aid,
+            force: options.force === true,
+        }, AGENT_RELOAD_TIMEOUT_MS);
         if (result?.ok) {
             reloaded = true;
         }
+        else if (result?.code === 'AGENT_BUSY') {
+            if (previousEnabled === undefined)
+                delete config.enabled;
+            else
+                config.enabled = previousEnabled;
+            saveAgent(config);
+            return { ok: false, code: result.code, error: result.error || 'Agent is busy' };
+        }
     }
     catch {
         // Daemon not running or unreachable — that's ok, config is already saved
@@ -1075,16 +1100,54 @@ export async function agentRename(aid, name) {
 }
 // ==================== agentReady ====================
 export async function agentReady(aid) {
+    const taskSelfAid = readTaskRuntimeContextFromEnv()?.selfAid;
+    if (taskSelfAid && taskSelfAid.replace(/^@/, '') !== aid.replace(/^@/, '')) {
+        return {
+            ok: false,
+            code: 'SELF_AGENT_REQUIRED',
+            error: `A managed task can only complete bootstrap for itself (${taskSelfAid})`,
+        };
+    }
     const p = resolvePaths();
     const config = loadAgent(aid);
     if (!config)
         return { ok: false, error: `Agent "${aid}" not found` };
-    saveAgent(withLifecycleForWrite(config, 'active'));
-    let reloaded = false;
     try {
         const result = await ipcQuery(p.socket, { type: 'evolagent.bootstrapComplete', aid }, 30_000);
-        reloaded = !!result?.ok;
+        if (!result) {
+            const offlineConfig = loadAgent(aid) || config;
+            const lifecycle = normalizeAgentLifecycle(offlineConfig).lifecycle;
+            if (lifecycle === 'active')
+                return { ok: true, aid, reloaded: false };
+            if (lifecycle !== 'bootstrapping') {
+                return { ok: false, code: 'INVALID_LIFECYCLE', error: `Agent "${aid}" is ${lifecycle}; only a bootstrapping agent can become ready` };
+            }
+            const owner = offlineConfig.owners?.[0];
+            if (!owner)
+                return { ok: false, code: 'OWNER_REQUIRED', error: `Agent "${aid}" has no owner for the completion welcome` };
+            try {
+                preparePostBootstrapWelcomeOutbox(aid, owner);
+                saveAgent(withLifecycleForWrite(offlineConfig, 'active'));
+            }
+            catch (e) {
+                return {
+                    ok: false,
+                    code: 'READY_PERSIST_FAILED',
+                    error: e instanceof Error ? e.message : 'Failed to persist bootstrap completion',
+                };
+            }
+            return { ok: true, aid, reloaded: false };
+        }
+        if (!result.ok) {
+            return { ok: false, code: result.code, error: result.error || 'Failed to complete bootstrap' };
+        }
+        return { ok: true, aid, reloaded: true };
+    }
+    catch (e) {
+        return {
+            ok: false,
+            code: 'DAEMON_UNAVAILABLE',
+            error: e instanceof Error ? e.message : 'Unable to connect to the EvolCore daemon',
+        };
     }
-    catch { /* daemon not running */ }
-    return { ok: true, aid, reloaded };
 }

package/dist/cli/daemon-commands.js

@@ -28,7 +28,20 @@ import { AGENT_DELEGATION_TOKEN_ENV } from '../core/auth/agent-delegation.js';
 import { WEB_CLI_BIN, WEB_PACKAGE_LATEST, WEB_PACKAGE_NAME } from '../product.js';
 import { rotateStdoutLog } from '../utils/log-writer.js';
 import { inspectDataMigrationRequirement } from '../core/data-migration.js';
+import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
 const execFileAsync = promisify(execFile);
+async function runAutomaticInit(action) {
+    try {
+        return await action();
+    }
+    catch (error) {
+        if (!isInitCancelledError(error))
+            throw error;
+        console.log('\n已退出初始化，未启动 EvolCore。');
+        process.exitCode = 130;
+        return false;
+    }
+}
 function printNoSelfAgentHints(options) {
     const { daemonConfig, ecwebStarted, skipped } = options;
     console.log('\nℹ 未配置任何 self-agent，Control Plane 已启动。');
@@ -265,7 +278,11 @@ export async function cmdStart(opts = {}) {
             // 这里需显式抑制 AUN SDK 的常规 keystore 日志。
             const { suppressSdkLogs } = await import('../aun/aid/index.js');
             suppressSdkLogs();
-            await cmdInit({ invokedByStart: true });
+            if (!await runAutomaticInit(() => cmdInit({ invokedByStart: true }))) {
+                if (process.exitCode == null)
+                    console.log('⚠ 初始化未完成，未启动 EvolCore。');
+                return;
+            }
             if (!loadDefaults()) {
                 console.log('⚠ 初始化未完成，未启动 EvolCore。');
                 return;
@@ -280,7 +297,9 @@ export async function cmdStart(opts = {}) {
         console.log('⚡ 控制 AID 未配置，自动补全...\n');
         const { suppressSdkLogs } = await import('../aun/aid/index.js');
         suppressSdkLogs();
-        await initTail();
+        printInitCancelHint();
+        if (!await runAutomaticInit(() => initTail()))
+            return;
         return;
     }
     if (!daemonCfgStart.aid) {

package/dist/cli/index.js

@@ -15,6 +15,7 @@ import { cmdCtl } from './ctl-command.js';
 import { cmdQueue } from './queue-command.js';
 import { cmdStart, cmdStop, cmdRestart, cmdStatus, cmdLogs, cmdWatchCommand, cmdMv, cmdDiagnose } from './daemon-commands.js';
 import { logCliCommand } from './command-log.js';
+import { isInitCancelledError, printInitCancelHint } from './init-cancel.js';
 const MAIN_HELP = `用法: ec <command> [选项]
 
 服务:
@@ -97,9 +98,10 @@ export async function main(args) {
         return;
     }
     switch (cmd) {
-        case 'init':
-            if (wantsHelp(args.slice(1))) {
-                console.log(`用法: ec init [渠道] [选项]
+        case 'init': {
+            try {
+                if (wantsHelp(args.slice(1))) {
+                    console.log(`用法: ec init [渠道] [选项]
 
 仅初始化 defaults.json:
   ec init                          交互式（写完 defaults.json 后嵌套 agent new）
@@ -119,72 +121,85 @@ export async function main(args) {
     --force                              已有不同 owner 时强制覆盖
 
 配置渠道（先 ec agent new 创建 agent）:
-  ec init aun           AUN owner 绑定（daemon 或指定 agent）
+  ec init aun           AUN owner 追加绑定（daemon 或指定 agent）
   ec init feishu        飞书扫码登录
   ec init wechat        微信扫码登录
   ec init dingtalk      钉钉扫码登录
   ec init qqbot         QQ 机器人扫码绑定
   ec init wecom         企业微信 AI Bot 扫码创建/手工配置`);
-            }
-            else if (args[1] === 'aun') {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                await cmdInitAun();
-            }
-            else if (args[1] === 'wechat') {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                await cmdInitWechat();
-            }
-            else if (args[1] === 'feishu') {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                await cmdInitFeishu();
-            }
-            else if (args[1] === 'dingtalk') {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                await cmdInitDingtalk();
-            }
-            else if (args[1] === 'qqbot') {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                await cmdInitQQBot();
-            }
-            else if (args[1] === 'wecom') {
-                await cmdInitWecom();
-            }
-            else if (args[1] && !args[1].startsWith('-')) {
-                const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
-                console.error(`❌ 不支持的渠道: ${args[1]}`);
-                console.error(`   支持的渠道: ${supported.join(', ')}`);
-                process.exit(1);
-            }
-            else {
-                const { suppressSdkLogs } = await import('../aun/aid/index.js');
-                suppressSdkLogs();
-                const nonInteractive = args.includes('--non-interactive');
-                const wantsAutoStart = args.includes('--auto-start');
-                const wantsNoAutoStart = args.includes('--no-auto-start');
-                if (wantsAutoStart && wantsNoAutoStart) {
-                    console.error('❌ --auto-start 与 --no-auto-start 不能同时使用');
-                    process.exitCode = 1;
-                    break;
                 }
-                const initialized = await cmdInit({
-                    nonInteractive,
-                    baseagent: getArgValue(args, '--baseagent'),
-                    force: args.includes('--force'),
-                    owner: getArgValue(args, '--owner'),
-                    projectpath: getArgValue(args, '--projectpath'),
-                    ecweb: args.includes('--ecweb') ? true : undefined,
-                    format: getArgValue(args, '--format'),
-                    autoStart: wantsAutoStart ? true : wantsNoAutoStart ? false : undefined,
-                });
-                if (!initialized)
-                    process.exitCode = 1;
+                else {
+                    const hasChannelTarget = Boolean(args[1] && !args[1].startsWith('-'));
+                    if (hasChannelTarget)
+                        printInitCancelHint();
+                    if (args[1] === 'aun') {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        await cmdInitAun();
+                    }
+                    else if (args[1] === 'wechat') {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        await cmdInitWechat();
+                    }
+                    else if (args[1] === 'feishu') {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        await cmdInitFeishu();
+                    }
+                    else if (args[1] === 'dingtalk') {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        await cmdInitDingtalk();
+                    }
+                    else if (args[1] === 'qqbot') {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        await cmdInitQQBot();
+                    }
+                    else if (args[1] === 'wecom') {
+                        await cmdInitWecom();
+                    }
+                    else if (args[1] && !args[1].startsWith('-')) {
+                        const supported = ['feishu', 'wechat', 'aun', 'dingtalk', 'qqbot', 'wecom'];
+                        console.error(`❌ 不支持的渠道: ${args[1]}`);
+                        console.error(`   支持的渠道: ${supported.join(', ')}`);
+                        process.exit(1);
+                    }
+                    else {
+                        const { suppressSdkLogs } = await import('../aun/aid/index.js');
+                        suppressSdkLogs();
+                        const nonInteractive = args.includes('--non-interactive');
+                        const wantsAutoStart = args.includes('--auto-start');
+                        const wantsNoAutoStart = args.includes('--no-auto-start');
+                        if (wantsAutoStart && wantsNoAutoStart) {
+                            console.error('❌ --auto-start 与 --no-auto-start 不能同时使用');
+                            process.exitCode = 1;
+                            break;
+                        }
+                        const initialized = await cmdInit({
+                            nonInteractive,
+                            baseagent: getArgValue(args, '--baseagent'),
+                            force: args.includes('--force'),
+                            owner: getArgValue(args, '--owner'),
+                            projectpath: getArgValue(args, '--projectpath'),
+                            ecweb: args.includes('--ecweb') ? true : undefined,
+                            format: getArgValue(args, '--format'),
+                            autoStart: wantsAutoStart ? true : wantsNoAutoStart ? false : undefined,
+                        });
+                        if (!initialized && process.exitCode == null)
+                            process.exitCode = 1;
+                    }
+                }
+            }
+            catch (error) {
+                if (!isInitCancelledError(error))
+                    throw error;
+                console.log('\n已退出初始化');
+                process.exitCode = 130;
             }
             break;
+        }
         case 'start':
             if (wantsHelp(args.slice(1))) {
                 printLifecycleHelp('start');