evolcore 0.0.35 → 0.0.36

package/dist/channels/daemon.js

@@ -3,6 +3,7 @@ import { ExecutionTimeoutError } from '../utils/error-utils.js';
 import { normalizeExecutionMode } from '../trigger/validation.js';
 import { resolvePeerRoleDetail } from '../config/peer-role-resolver.js';
 import { assertSystemSessionLaunchable } from '../core/system-session/registry.js';
+import { sessionTopicThreadId } from '../core/thread/topic-id.js';
 const DEFAULT_WATCHDOG_MS = 11 * 60 * 1000;
 export class DaemonChannel {
     sessionManager;
@@ -75,7 +76,7 @@ export class DaemonChannel {
             channelId: ctx.session.channelId,
             selfAID: ctx.trigger.agentAid,
             baseagent: ctx.baseagent,
-            threadId: ctx.session.threadId || '',
+            threadId: sessionTopicThreadId(ctx.session) ?? '',
             chatType: 'private',
             peerId: `trigger:${ctx.trigger.id}`,
             peerName: ctx.trigger.name,
@@ -186,11 +187,11 @@ export class DaemonChannel {
                 slot.acc.files.push({ path: payload.filePath, name: payload.fileName });
                 break;
             case 'result.error':
-                slot.acc.error = { reason: payload.reason, text: payload.text };
+                slot.acc.error = { reason: payload.reason, text: payload.text, recoverable: payload.recoverable };
                 this.finish(runId, 'error', { errorType: payload.reason ?? 'result_error' });
                 break;
             case 'system.error':
-                slot.acc.error = { reason: payload.subtype, text: payload.text };
+                slot.acc.error = { reason: payload.subtype, text: payload.text, recoverable: payload.recoverable };
                 this.finish(runId, 'error', { errorType: payload.subtype });
                 break;
             case 'status.progress':
@@ -222,6 +223,7 @@ export class DaemonChannel {
                     slot.acc.error = {
                         reason: payload.metadata.errorType ?? 'status_error',
                         text: payload.metadata.message,
+                        recoverable: payload.metadata.recoverable,
                     };
                 }
                 this.finish(runId, 'error', payload.metadata);
@@ -611,7 +613,7 @@ export class DaemonChannel {
             channelId: session.channelId,
             selfAID: spec.agentAid,
             baseagent: spec.baseagent,
-            threadId: session.threadId || '',
+            threadId: sessionTopicThreadId(session) ?? '',
             chatType: 'private',
             peerId: `bg:${spec.kind}`,
             peerName: spec.kind,

package/dist/channels/feishu.js

@@ -1480,6 +1480,9 @@ export function buildResolvedV2(interaction, response) {
         'allow': '✅ 已允许',
         'always': temporaryGrantIsFileScoped ? '⏱ 已授权同文件 30 分钟' : '⏱ 已授权同操作 30 分钟',
         'approve_session_30m': temporaryGrantIsFileScoped ? '⏱ 已授权同文件 30 分钟' : '⏱ 已授权本会话 30 分钟',
+        'approve_file_60m': '⏱ 已授权同文件 60 分钟',
+        'approve_directory_60m': '⏱ 已授权当前目录及子目录 60 分钟',
+        'approve_all_directories_60m': '⏱ 已授权当前会话所有普通目录 60 分钟',
         'deny': '❌ 已拒绝',
         'cancel': '取消',
     };

package/dist/cli/agent-command.js

@@ -3,10 +3,15 @@ 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';
+import { parseAgentAvatarArgs, parseAgentWelcomeArgs, resolveAgentCreateMode } from './agent-create.js';
 import { assertEcSingleLine } from './cli-argv.js';
 import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
-import { parseAgentAvatarArgs } from './agent-create.js';
+function printCreatedAgentOwner(result) {
+    if (!result.ownerAid)
+        return;
+    console.log(`  Owner 绑定目标: ${result.ownerAid}（以 Ownership 协议共识为准）`);
+    console.log(`  查看绑定状态: ${MAIN_CLI_BIN} aid bind status --subject ${result.aid}`);
+}
 function printBootstrapDeliveries(result) {
     for (const delivery of result?.deliveries ?? []) {
         if (delivery.status === 'sent')
@@ -65,6 +70,36 @@ function displayWidth(s) {
 function padEndDisplay(s, targetWidth) {
     return s + ' '.repeat(Math.max(0, targetWidth - displayWidth(s)));
 }
+function printAgentNewHelp() {
+    console.log(`用法: ${MAIN_CLI_BIN} agent new <aid> [--initialize | --bootstrap] [选项]
+
+创建模式:
+  --initialize                       默认；使用显式名片直接初始化并激活
+  --bootstrap                        创建后进入 Bootstrap，与 --initialize 互斥
+  --non-interactive                  保留支持；两种创建模式均隐含非交互
+
+选项:
+  --project <path>                    默认: 当前目录
+  --baseagent <claude|codex|gemini|ecagent>
+                                      默认: defaults 配置，否则检测本机可用基座
+  --owner <aid>                       必填；初始协议 Owner 绑定意图
+  --name <display-name>               初始化必填；Bootstrap 默认取项目名称
+  --description <text>                初始化必填；Bootstrap 默认取项目描述
+  --tags <json-array>                 初始化必填；3 到 6 个标签
+  --type <type>                       主体类型，默认 agent
+  --avatar-file <path>                头像图片文件（或 attachment:<id>）
+  --avatar-url <https-url>            头像 HTTPS 地址；与 --avatar-file 互斥
+  --persona-file <path>               初始化人格 .md/.txt（或 --persona-text <text>）
+  --wait <seconds>                    初始化等待 0–300 秒，默认 60
+  --dry-run                          只预览最终参数，不注册 AID、不写文件
+  --force                            仅 --bootstrap 支持，覆盖已有 config.json
+  --format json                      输出 JSON
+
+示例:
+  ${MAIN_CLI_BIN} agent new mybot.agentid.pub --owner owner.agentid.pub --name 'My Bot' --description '项目助手' --tags '["coding","diagnostics","logs"]'
+  ${MAIN_CLI_BIN} agent new mybot.agentid.pub --bootstrap --owner owner.agentid.pub
+  ${MAIN_CLI_BIN} agent new mybot.agentid.pub --bootstrap --non-interactive --owner owner.agentid.pub --dry-run --format json`);
+}
 // ==================== Agent ====================
 export async function cmdAgent(args) {
     args = canonicalizeEvolcoreCommandArgv(['ec', 'agent', ...args]).slice(2);
@@ -91,9 +126,8 @@ export async function cmdAgent(args) {
 Commands:
   list                    列出所有 agent
   show <aid>              查看 agent 详情（身份 + 配置 + 连接 + 会话 + 路径）
-  new [aid]               交互式创建 agent
-  new <aid> --non-interactive ...  非交互式创建
-  new <aid> --initialize ...       创建并激活（隐含非交互）
+  new <aid> ...           创建并激活（默认 --initialize，隐含非交互）
+  new <aid> --bootstrap ...        创建后进入 Bootstrap（隐含非交互）
   initialize <aid> --resume        恢复一次性初始化
   enable <aid>            启用 agent
   disable <aid>           停用 agent
@@ -116,7 +150,7 @@ Options:
 示例:
   ec agent list
   ec agent show mybot.agentid.pub
-  ec agent new mybot.agentid.pub
+  ec agent new mybot.agentid.pub --help
   ec agent enable mybot.agentid.pub
   ec agent get mybot.agentid.pub active_baseagent
   ec agent set mybot.agentid.pub active_baseagent codex
@@ -126,9 +160,28 @@ Options:
   ec agent delete mybot.agentid.pub --purge`);
         return;
     }
-    if ((sub === 'new' && args.includes('--initialize')) || sub === 'initialize') {
+    if (sub === 'new' && wantsHelp(args)) {
+        printAgentNewHelp();
+        return;
+    }
+    let createMode;
+    if (sub === 'new') {
+        try {
+            createMode = resolveAgentCreateMode(args);
+        }
+        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;
+        }
+    }
+    if ((sub === 'new' && createMode === 'initialize') || sub === 'initialize') {
         if (wantsHelp(args)) {
-            console.log('ec agent new <aid> --initialize ... [--avatar-file <path> | --avatar-url <https-url>] [--wait 0..300] [--format json]\nec agent initialize <aid> --resume [--wait 0..300] [--format json]\n--initialize implies --non-interactive; waits for activation (default 60 seconds).');
+            console.log(`${MAIN_CLI_BIN} agent initialize <aid> --resume [--wait 0..300] [--format json]\n恢复一次性初始化；默认等待 60 秒。`);
             return;
         }
         try {
@@ -155,23 +208,9 @@ Options:
         }
         return;
     }
-    const { agentList, agentShow, agentCreateInteractive, agentCreateNonInteractive, agentReload, agentEnable, agentDisable, agentGet, agentSet, agentPersona, agentWelcome, agentRename, agentDelete, agentReady, runManagedAgentOperation, } = await import('./agent.js');
+    const { agentList, agentShow, 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', 'welcome', 'ready']).has(sub)) {
-        if (sub === 'new' && !args.includes('--non-interactive') && !args.includes('--initialize')) {
-            const error = {
-                ok: false,
-                code: 'MANAGED_NON_INTERACTIVE_REQUIRED',
-                error: 'Managed Agent tasks must use `ec agent new <aid> --non-interactive`; interactive creation is unavailable here. Use ECWeb for interactive setup.',
-                data: { reasonCode: 'MANAGED_NON_INTERACTIVE_REQUIRED', nextStep: 'Use `ec agent new <aid> --non-interactive` or ECWeb.' },
-            };
-            if (formatJson)
-                console.log(JSON.stringify(error));
-            else
-                console.error(`❌ [${error.code}] ${error.error}`);
-            process.exitCode = 1;
-            return;
-        }
         const result = await runManagedAgentOperation(args);
         if (!result.ok) {
             if (formatJson)
@@ -298,39 +337,8 @@ Options:
     }
     // --- new ---
     if (sub === 'new') {
-        if (wantsHelp(args)) {
-            console.log(`用法: ec agent new [aid]                    交互式创建
-     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 配置，否则检测本机可用基座
-  --owner <aid>                       默认: daemon.json 第一个 owner
-  --owners <json-array>               多个 Owner；与 --owner 互斥
-  --handoff <context>                 当前任务的 Bootstrap 上下文
-  --avatar-file <path>                  头像图片文件（沿用 ec aid avatar）
-  --avatar-url <https-url>              头像 HTTPS 地址（沿用 ec aid avatar）
-  --name <display-name>               默认: package.json name，否则目录名
-  --description <text>                默认: package.json description，否则使用 EvolCore 默认描述
-  --type <type>                       主体类型: human|agent|group|service|device|org|host（默认 agent）
-  --tags <json-array>                 3 到 6 个标签，例如 '["coding","diagnostics","logs"]'
-  --dry-run                           只预览最终参数，不注册 AID、不写文件
-  --force                             覆盖已有 config.json
-  --format json                       输出 JSON
-
-示例:
-  ec agent new mybot.agentid.pub
-  ec agent new mybot.agentid.pub --non-interactive
-  ec agent new mybot.agentid.pub --non-interactive --dry-run --format json
-  ec agent new mybot.agentid.pub --non-interactive --project ../project --baseagent claude`);
-            return;
-        }
         if (args.includes('--handoff')) {
-            const result = { ok: false, code: 'MANAGED_ONLY', error: '--handoff requires a managed Agent task' };
+            const result = { ok: false, code: 'INVALID_ARGS', error: 'Agent creation --handoff has been removed' };
             if (formatJson)
                 console.log(JSON.stringify(result));
             else
@@ -339,181 +347,111 @@ Options:
             return;
         }
         const name = args[1];
-        const nonInteractive = args.includes('--non-interactive');
-        if (nonInteractive) {
-            if (!name) {
-                console.error('Usage: ec agent new <aid> --non-interactive ...');
-                process.exit(1);
-            }
-            const getArg = (flag) => {
-                const idx = args.indexOf(flag);
-                return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
-            };
-            let ownerOptions;
-            let avatarOptions;
-            try {
-                ownerOptions = parseAgentOwnerArgs(args);
-                avatarOptions = parseAgentAvatarArgs(args);
-            }
-            catch (error) {
-                const result = { ok: false, error: error instanceof Error ? error.message : String(error) };
-                if (formatJson)
-                    console.log(JSON.stringify(result));
-                else
-                    console.error(`❌ ${result.error}`);
-                process.exitCode = 1;
-                return;
-            }
-            let tags;
-            try {
-                tags = parseAgentTags(getArg('--tags'));
-            }
-            catch (error) {
-                const result = { ok: false, 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 plan = resolveAgentCreatePlan({
-                aid: name,
-                project: getArg('--project'),
-                baseagent: getArg('--baseagent'),
-                ...ownerOptions,
-                ...avatarOptions,
-                handoff: getArg('--handoff'),
-                name: getArg('--name'),
-                description: getArg('--description'),
-                type: getArg('--type'),
-                tags,
-                force: args.includes('--force'),
-            });
-            const validationError = validateAgentCreatePlan(plan);
-            if (validationError) {
-                const error = { ok: false, error: validationError };
-                if (formatJson)
-                    console.log(JSON.stringify(error));
-                else
-                    console.error(`❌ ${error.error}`);
-                process.exitCode = 1;
-                return;
-            }
-            if (args.includes('--dry-run')) {
-                const preview = { ok: true, dryRun: true, plan };
-                if (formatJson)
-                    console.log(JSON.stringify(preview, null, 2));
-                else {
-                    console.log('EvolAgent 创建计划（dry-run）');
-                    console.log(`  AID: ${plan.aid}`);
-                    console.log(`  Project: ${plan.project}`);
-                    console.log(`  Baseagent: ${plan.baseagent} (${plan.baseagentSource})`);
-                    console.log(`  Owner: ${plan.owners?.join(', ') || plan.owner || '未设置'} (${plan.ownerSource})`);
-                    console.log(`  Name: ${plan.name} (${plan.nameSource})`);
-                    if (plan.description)
-                        console.log(`  Description: ${plan.description} (${plan.descriptionSource})`);
-                    console.log(`  Existing config: ${plan.configExists ? (plan.force ? '将覆盖' : '是') : '否'}`);
-                }
-                return;
-            }
-            const result = await agentCreateNonInteractive({
-                aid: plan.aid,
-                baseagent: plan.baseagent,
-                project: plan.project,
-                owner: plan.owner,
-                owners: plan.owners,
-                name: plan.name,
-                description: plan.description,
-                type: plan.type,
-                tags: plan.tags,
-                force: args.includes('--force'),
-                avatarFile: plan.avatarFile,
-                avatarUrl: plan.avatarUrl,
-            });
-            if (!result.ok) {
-                if (formatJson) {
-                    console.log(JSON.stringify(result));
-                }
-                else {
-                    console.error(`❌ ${result.error}`);
-                }
-                process.exit(1);
-            }
-            if (result.ownerBindInterrupted)
-                return;
-            if (formatJson) {
-                console.log(JSON.stringify(result, null, 2));
-            }
+        if (!name || name.startsWith('--')) {
+            const result = { ok: false, code: 'INVALID_ARGS', error: `${MAIN_CLI_BIN} agent new <aid> --bootstrap requires an AID` };
+            if (formatJson)
+                console.log(JSON.stringify(result));
+            else
+                console.error(result.error);
+            process.exitCode = 1;
+            return;
+        }
+        const getArg = (flag) => {
+            const idx = args.indexOf(flag);
+            return idx !== -1 && idx + 1 < args.length ? args[idx + 1] : undefined;
+        };
+        let ownerOptions;
+        let avatarOptions;
+        let tags;
+        try {
+            ownerOptions = parseAgentOwnerArgs(args);
+            avatarOptions = parseAgentAvatarArgs(args);
+            tags = parseAgentTags(getArg('--tags'));
+        }
+        catch (error) {
+            const result = { ok: false, 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 plan = resolveAgentCreatePlan({
+            aid: name,
+            project: getArg('--project'),
+            baseagent: getArg('--baseagent'),
+            ...ownerOptions,
+            ...avatarOptions,
+            name: getArg('--name'),
+            description: getArg('--description'),
+            type: getArg('--type'),
+            tags,
+            force: args.includes('--force'),
+        });
+        const validationError = validateAgentCreatePlan(plan);
+        if (validationError) {
+            const error = { ok: false, error: validationError };
+            if (formatJson)
+                console.log(JSON.stringify(error));
+            else
+                console.error(`❌ ${error.error}`);
+            process.exitCode = 1;
+            return;
+        }
+        if (args.includes('--dry-run')) {
+            const preview = { ok: true, dryRun: true, plan };
+            if (formatJson)
+                console.log(JSON.stringify(preview, null, 2));
             else {
-                console.log(`✓ Created: ${result.configPath}`);
-                console.log(result.agentmdUploaded
-                    ? '  ✓ agent.md 已发布'
-                    : '  ⚠ agent.md 上传失败（可用 ec aid agentmd put 重试）');
-                console.log(result.hotLoaded
-                    ? '  ✓ 已热重载，agent 已上线'
-                    : result.hotLoadError
-                        ? `  ✗ 热重载失败：${result.hotLoadError}`
-                        : '  ⚠ 服务未运行，下次 ec start 时生效');
-                if (result.ownerContactsSynced?.length) {
-                    console.log(`  ✓ 已同步 Owner 联系人: ${result.ownerContactsSynced.join(', ')}`);
-                }
-                if (result.ownerContactsSkipped?.length) {
-                    console.log(`  ⚠ 无本地联系人簿，跳过 Owner: ${result.ownerContactsSkipped.join(', ')}`);
-                }
-                if (result.ownerContactSyncErrors?.length) {
-                    console.log(`  ⚠ Owner 联系人同步失败: ${result.ownerContactSyncErrors.join('; ')}`);
-                }
-                if (result.ownerBoundAid) {
-                    console.log(`  ✓ agent owner 已绑定: ${result.ownerBoundAid}`);
-                }
-                else if (result.ownerBindSkipped) {
-                    console.log('  ⚠ agent owner 未通过二维码绑定');
-                }
+                console.log('EvolAgent 创建计划（dry-run）');
+                console.log(`  AID: ${plan.aid}`);
+                console.log(`  Project: ${plan.project}`);
+                console.log(`  Baseagent: ${plan.baseagent} (${plan.baseagentSource})`);
+                console.log(`  Owner: ${plan.owner || '未设置'} (${plan.ownerSource})`);
+                console.log(`  Name: ${plan.name} (${plan.nameSource})`);
+                if (plan.description)
+                    console.log(`  Description: ${plan.description} (${plan.descriptionSource})`);
+                console.log(`  Existing config: ${plan.configExists ? (plan.force ? '将覆盖' : '是') : '否'}`);
             }
+            return;
         }
-        else {
-            const result = await agentCreateInteractive({ suggestedName: name });
-            if (!result.ok) {
-                if (formatJson) {
-                    console.log(JSON.stringify(result));
-                }
-                else {
-                    console.error(`❌ ${result.error}`);
-                }
-                process.exit(1);
-            }
-            if (result.ownerBindInterrupted)
-                return;
+        const result = await agentCreateNonInteractive({
+            aid: plan.aid,
+            baseagent: plan.baseagent,
+            project: plan.project,
+            owner: plan.owner,
+            name: plan.name,
+            description: plan.description,
+            type: plan.type,
+            tags: plan.tags,
+            force: args.includes('--force'),
+            avatarFile: plan.avatarFile,
+            avatarUrl: plan.avatarUrl,
+        });
+        if (!result.ok) {
             if (formatJson) {
-                console.log(JSON.stringify(result, null, 2));
+                console.log(JSON.stringify(result));
             }
             else {
-                console.log(`\n✓ Created: ${result.configPath}`);
-                console.log(result.agentmdUploaded
-                    ? '  ✓ agent.md 已发布'
-                    : '  ⚠ agent.md 上传失败（可用 ec aid agentmd put 重试）');
-                console.log(result.hotLoaded
-                    ? '  ✓ 已热重载，agent 已上线'
-                    : result.hotLoadError
-                        ? `  ✗ 热重载失败：${result.hotLoadError}`
-                        : '  ⚠ 服务未运行，下次 ec start 时生效');
-                if (result.ownerContactsSynced?.length) {
-                    console.log(`  ✓ 已同步 Owner 联系人: ${result.ownerContactsSynced.join(', ')}`);
-                }
-                if (result.ownerContactsSkipped?.length) {
-                    console.log(`  ⚠ 无本地联系人簿，跳过 Owner: ${result.ownerContactsSkipped.join(', ')}`);
-                }
-                if (result.ownerContactSyncErrors?.length) {
-                    console.log(`  ⚠ Owner 联系人同步失败: ${result.ownerContactSyncErrors.join('; ')}`);
-                }
-                if (result.ownerBoundAid) {
-                    console.log(`  ✓ agent owner 已绑定: ${result.ownerBoundAid}`);
-                }
-                else if (result.ownerBindSkipped) {
-                    console.log('  ⚠ agent owner 未通过二维码绑定');
-                }
+                console.error(`❌ ${result.error}`);
             }
+            process.exit(1);
+        }
+        if (formatJson) {
+            console.log(JSON.stringify(result, null, 2));
+        }
+        else {
+            console.log(`✓ Created: ${result.configPath}`);
+            console.log(result.agentmdUploaded
+                ? '  ✓ agent.md 已发布'
+                : '  ⚠ agent.md 上传失败（可用 ec aid agentmd put 重试）');
+            console.log(result.hotLoaded
+                ? '  ✓ 已热重载，agent 已上线'
+                : result.hotLoadError
+                    ? `  ✗ 热重载失败：${result.hotLoadError}`
+                    : '  ⚠ 服务未运行，下次 ec start 时生效');
+            printCreatedAgentOwner(result);
         }
         return;
     }