evolcore 0.0.26 → 0.0.28

package/dist/channels/daemon.js

@@ -1,3 +1,4 @@
+import { ExecutionTimeoutError } from '../utils/error-utils.js';
 import { normalizeExecutionMode } from '../trigger/validation.js';
 import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
 const DEFAULT_WATCHDOG_MS = 11 * 60 * 1000;
@@ -349,7 +350,7 @@ export class DaemonChannel {
             watchdogMs: this.watchdogMs,
         }))
             return;
-        this.cancelDeliveryInBackground(slot);
+        this.cancelDeliveryInBackground(slot, new ExecutionTimeoutError('daemon_watchdog_timeout', this.watchdogMs));
         this.settleTerminal(runId, slot);
     }
     resetWatchdog(runId, slot) {
@@ -373,20 +374,23 @@ export class DaemonChannel {
             totalExecutionMs,
         }))
             return;
-        this.cancelDeliveryInBackground(slot);
+        this.cancelDeliveryInBackground(slot, new ExecutionTimeoutError('daemon_total_execution_timeout', totalExecutionMs));
         this.settleTerminal(runId, slot);
     }
-    cancelDeliveryInBackground(slot) {
-        const cancellation = this.cancelDelivery(slot.messageId);
+    cancelDeliveryInBackground(slot, timeout) {
+        const cancellation = this.cancelDelivery(slot.messageId, timeout);
         slot.cancellationBarrier = cancellation;
         void cancellation.then(() => undefined, () => undefined);
     }
-    async cancelDelivery(messageId) {
+    async cancelDelivery(messageId, timeout) {
         const queue = this.messageQueue;
         if (queue.cancel?.(messageId))
             return;
         if (queue.cancelActiveAndWait) {
-            await queue.cancelActiveAndWait(messageId);
+            if (timeout)
+                await queue.cancelActiveAndWait(messageId, undefined, timeout);
+            else
+                await queue.cancelActiveAndWait(messageId);
             return;
         }
         queue.cancelActive?.(messageId);

package/dist/cli/agent-command.js

@@ -1,7 +1,23 @@
 import path from 'path';
+import { MAIN_CLI_BIN, SELF_AID_ENV, SESSION_ID_ENV } from '../product.js';
 import { getArgValue, isHelpFlag, wantsHelp } from './help.js';
 import { isHostChinese } from '../utils/locale.js';
 import { readTaskRuntimeContextFromEnv } from './task-context.js';
+import { parseAgentWelcomeArgs } from './agent-create.js';
+function printBootstrapDeliveries(result) {
+    for (const delivery of result?.deliveries ?? []) {
+        if (delivery.status === 'sent')
+            console.log(`  ${delivery.owner}: 消息已被网关接受 (${delivery.messageId})`);
+        else if (delivery.status === 'queued')
+            console.log(`  ${delivery.owner}: 消息已入队，等待重试 (${delivery.outboxId})`);
+        else if (delivery.status === 'failed')
+            console.error(`  ${delivery.owner}: 消息发送失败 [${delivery.code ?? 'unknown'}] ${delivery.error}`);
+        else
+            console.log(`  ${delivery.owner}: 没有消息投递记录`);
+    }
+    if (result?.error)
+        console.error(`  消息状态异常: ${result.error}`);
+}
 function formatTimeAgo(ms) {
     const sec = Math.floor(ms / 1000);
     if (sec < 60)
@@ -26,7 +42,7 @@ function formatBytes(bytes) {
 export async function cmdAgent(args) {
     const sub = args[0];
     const formatJson = getArgValue(args, '--format') === 'json';
-    const commands = new Set(['list', 'show', 'new', 'enable', 'disable', 'get', 'set', 'persona', 'rename', 'ready', 'reload', 'delete']);
+    const commands = new Set(['list', 'show', 'new', 'initialize', 'enable', 'disable', 'get', 'set', 'persona', 'welcome', 'rename', 'ready', 'reload', 'delete']);
     if (sub === 'create') {
         const error = { ok: false, code: 'INVALID_COMMAND', error: '`ec agent create` is not a command; use `ec agent new`.' };
         if (formatJson)
@@ -44,6 +60,8 @@ Commands:
   show <aid>              查看 agent 详情（身份 + 配置 + 连接 + 会话 + 路径）
   new [aid]               交互式创建 agent
   new <aid> --non-interactive ...  非交互式创建
+  new <aid> --initialize ...       创建并激活（隐含非交互）
+  initialize <aid> --resume        恢复一次性初始化
   enable <aid>            启用 agent
   disable <aid>           停用 agent
   get <aid> <key>         读取单个配置字段（支持点路径）
@@ -51,6 +69,8 @@ Commands:
   persona show            查看当前 Agent 的 persona.md
   persona --text <text>   用文本设置当前 Agent 的 persona.md
   persona --file <path>   用 .md/.txt 文件设置当前 Agent 的 persona.md
+  welcome show            查看已确认的 Bootstrap welcome 文案
+  welcome --text <text>  保存 Owner 已确认的 Bootstrap welcome 文案
   rename <aid> <name>     修改 agent.md 中的显示名称
   ready <aid>              标记 bootstrap 完成，进入 active 状态
   reload [aid]            热重载配置（无参数=全量 resync）
@@ -73,10 +93,39 @@ Options:
   ec agent delete mybot.agentid.pub --purge`);
         return;
     }
-    const { agentList, agentShow, agentCreateInteractive, agentCreateNonInteractive, agentReload, agentEnable, agentDisable, agentGet, agentSet, agentPersona, agentRename, agentDelete, agentReady, runManagedAgentOperation, } = await import('./agent.js');
+    if ((sub === 'new' && args.includes('--initialize')) || sub === 'initialize') {
+        if (wantsHelp(args)) {
+            console.log('ec agent new <aid> --initialize --name <name> --description <text> --tags <json> [--owner <aid> | --owners <json>] [--persona-file <path> | --persona-text <text>] [--wait 0..300] [--dry-run] [--format json]\nec agent initialize <aid> --resume [--wait 0..300] [--format json]\n--initialize implies --non-interactive; waits for activation (default 60 seconds).');
+            return;
+        }
+        try {
+            const { runInitializationCommand } = await import('./agent-create.js');
+            const result = await runInitializationCommand(args);
+            if (formatJson)
+                console.log(JSON.stringify(result, null, 2));
+            else if (result.dryRun)
+                console.log(JSON.stringify(result, null, 2));
+            else if (result.ok)
+                console.log(`✓ ${result.aid} initialized (active)`);
+            else
+                console.error(`[${result.code}] ${result.error ?? result.phase ?? 'Initialization failed'}`);
+            if (!result.ok)
+                process.exitCode = result.code === 'INITIALIZE_PENDING' ? 2 : 1;
+        }
+        catch (error) {
+            const result = { ok: false, code: 'INVALID_ARGS', error: error instanceof Error ? error.message : String(error) };
+            if (formatJson)
+                console.log(JSON.stringify(result));
+            else
+                console.error(result.error);
+            process.exitCode = 1;
+        }
+        return;
+    }
+    const { agentList, agentShow, agentCreateInteractive, agentCreateNonInteractive, agentReload, agentEnable, agentDisable, agentGet, agentSet, agentPersona, agentWelcome, agentRename, agentDelete, agentReady, runManagedAgentOperation, } = await import('./agent.js');
     const { parseAgentOwnerArgs, parseAgentTags, resolveAgentCreatePlan, validateAgentCreatePlan } = await import('./agent-create.js');
-    if (process.env.EVOLCORE_SESSION_ID && !wantsHelp(args) && !new Set(['get', 'set', 'persona', 'ready']).has(sub)) {
-        if (sub === 'new' && !args.includes('--non-interactive')) {
+    if (process.env.EVOLCORE_SESSION_ID && !wantsHelp(args) && !new Set(['get', 'set', 'persona', 'welcome', 'ready']).has(sub)) {
+        if (sub === 'new' && !args.includes('--non-interactive') && !args.includes('--initialize')) {
             const error = {
                 ok: false,
                 code: 'MANAGED_NON_INTERACTIVE_REQUIRED',
@@ -212,6 +261,9 @@ Options:
      ec agent new <aid> --non-interactive [选项]
 
 非交互模式选项:
+  --initialize                       使用显式名片直接完成初始化（隐含 --non-interactive）
+  --persona-file <path>               初始化人格 .md/.txt（或 --persona-text <text>）
+  --wait <seconds>                   初始化等待 0–300 秒，默认 60
   --project <path>                    默认: 当前目录
   --baseagent <claude|codex|gemini|ecagent>
                                       默认: defaults 配置，否则检测本机可用基座
@@ -220,7 +272,7 @@ Options:
   --handoff <context>                 当前任务的 Bootstrap 上下文
   --name <display-name>               默认: package.json name，否则目录名
   --description <text>                默认: package.json description，否则使用 EvolCore 默认描述
-  --type <type>                       主体类型: human|agent|group|service|device|org（默认 agent）
+  --type <type>                       主体类型: human|agent|group|service|device|org|host（默认 agent）
   --tags <json-array>                 3 到 6 个标签，例如 '["coding","diagnostics","logs"]'
   --dry-run                           只预览最终参数，不注册 AID、不写文件
   --force                             覆盖已有 config.json
@@ -617,6 +669,55 @@ Options:
             console.log(result.content ?? '(persona.md 不存在)');
         return;
     }
+    if (sub === 'welcome') {
+        if (args.length === 2 && isHelpFlag(args[1])) {
+            console.log(`用法: ${MAIN_CLI_BIN} agent welcome show [--format json]
+     ${MAIN_CLI_BIN} agent welcome --text <text> [--format json]
+
+读取或保存当前 Agent 在 Bootstrap 中经 Owner 确认的 welcome 文案。文案固定保存到 personal/welcome.md。`);
+            return;
+        }
+        let text;
+        try {
+            ({ text } = parseAgentWelcomeArgs(args.slice(1)));
+        }
+        catch (error) {
+            const result = { ok: false, code: 'INVALID_ARGS', error: error.message };
+            if (formatJson)
+                console.log(JSON.stringify(result));
+            else
+                console.error(`❌ ${result.error}`);
+            process.exitCode = 1;
+            return;
+        }
+        const taskAid = process.env[SESSION_ID_ENV] ? (readTaskRuntimeContextFromEnv()?.selfAid || '') : '';
+        const aid = taskAid || process.env[SELF_AID_ENV] || '';
+        if (!aid) {
+            const result = { ok: false, code: 'INVALID_ARGS', error: '无法确定当前 Agent AID' };
+            if (formatJson)
+                console.log(JSON.stringify(result));
+            else
+                console.error(`❌ ${result.error}`);
+            process.exitCode = 1;
+            return;
+        }
+        const result = await agentWelcome(aid, { text });
+        if (!result.ok) {
+            if (formatJson)
+                console.log(JSON.stringify(result));
+            else
+                console.error(`❌ ${result.error}`);
+            process.exitCode = 1;
+            return;
+        }
+        if (formatJson)
+            console.log(JSON.stringify(result, null, 2));
+        else if (result.saved)
+            console.log(`✓ ${aid} welcome.md 已保存`);
+        else
+            console.log(result.content ?? '(welcome.md 不存在)');
+        return;
+    }
     if (sub === 'get') {
         if (wantsHelp(args)) {
             console.log(`用法: ec agent get <aid> <key> [--format json]
@@ -722,7 +823,8 @@ Options:
             console.log(JSON.stringify(result, null, 2));
         }
         else {
-            console.log(`✓ ${aid} lifecycle=active${result.reloaded ? ' (runtime updated)' : ' (daemon offline or not updated)'}`);
+            console.log(`✓ ${aid} lifecycle=active${result.reloaded ? ' (runtime updated)' : ''}`);
+            printBootstrapDeliveries(result.welcome);
         }
         return;
     }