evolcore 0.0.35 → 0.0.37

package/dist/cli/thread-command.js

@@ -2,6 +2,8 @@ import { resolvePaths } from '../paths.js';
 import { ipcQuery } from '../ipc.js';
 import { readDelegationCredential } from '../core/auth/agent-delegation.js';
 import { canonicalizeEvolcoreCommandArgv } from '../core/permission/ec-command-parser.js';
+import { isMainSessionThreadId, resolveThreadRef } from '../core/thread/topic-id.js';
+import { parseTimeArg, TIME_ARG_FORMATS } from './cli-argv.js';
 const TOPIC_STATUSES = ['pending', 'in_progress', 'completed', 'archived'];
 const SORT_ORDERS = ['recent', 'created'];
 const HELP_TEXT = `
@@ -45,8 +47,12 @@ list 选项:
 
 history 选项:
   --limit <n>              消息条数上限（默认 50）
-  --before <timestamp>     截止时间戳（ms）
-  --after <timestamp>      起始时间戳（ms）
+  --before <time>          截止时间
+  --after <time>           起始时间
+                           <time> 支持：epoch 毫秒/秒、ISO 8601、
+                           '2026-10-20 23:18:46 +08:00'（消息信封头原样）、
+                           '2026/10/20 23:18:46'（history 输出原样，按本机时区）、
+                           相对时间 30s/5m/2h/1d（多久之前）、now
 
 summary 与增量总结:
   summary show <ref> 会打印 coveredThroughTs（本条摘要覆盖到的时间戳）。
@@ -128,13 +134,17 @@ function printItem(item) {
         const running = obj.running ? ' [运行中]' : '';
         // 内部话题（daemon 会话记录）不是真实联系人，标注出来避免误认
         const internal = obj.internal ? ' [内部会话记录·无消息]' : '';
-        // 主会话的 threadId 是空串；显示成 /main 比留一个空尾巴好读。
-        console.log(`${obj.peer}/${obj.threadId || 'main'}${running}${internal}`);
+        // 打印的就是可直接作为 `--thread` 的值：话题是 threadId，主话题是
+        // `main:<aid>:<aid>`。不再拼 `<peer>/` 前缀——那种写法从不可消费。
+        console.log(`${obj.threadId}${running}${internal}`);
         // 名称只放名称本身：状态、标签各自单独一行，避免污染标题（标题会被 summary set --name 引用）。
-        // 主会话（threadId 为空）加 `[主会话]` 前缀，与普通话题区分开；前缀只在展示层加，
+        // 主话题加 `[主话题]` 前缀，与话题区分开；前缀只在展示层加，
         // 不进索引与 session 的 name 字段，避免被 summary set --name 当成真实标题。
-        const namePrefix = obj.threadId ? '' : '[主会话] ';
-        console.log(`  名称: ${namePrefix}${obj.name}`);
+        const namePrefix = isMainSessionThreadId(obj.threadId) ? '[主话题] ' : '';
+        // 旧版本曾把 `[主会话] ` 写进 name 本体（历史遗留），展示前剥掉，
+        // 否则会渲染成 `[主话题] [主会话] …`。存储值不改，避免误改用户起的名字。
+        const displayName = String(obj.name ?? '').replace(/^\[(?:主会话|主话题)\]\s*/, '');
+        console.log(`  名称: ${namePrefix}${displayName}`);
         if (obj.topicStatus)
             console.log(`  状态: ${obj.topicStatus}`);
         if (obj.label)
@@ -228,17 +238,26 @@ export async function runThreadCommand(args) {
     const commandArgv = canonicalizeEvolcoreCommandArgv(['ec', 'thread', ...args]).slice(1);
     const sendOp = (req) => sendThreadOp(req, commandArgv);
     // resolve <ref> → peer + threadId
+    //
+    // 规范形态只有两种：`main:<aid>:<aid>`（主话题）与话题 id（话题）。
+    // 历史写法 `<peer>/<threadId>` 仍接受；裸 `main` 与 `<peer>/main` 都拒绝——
+    // 前者没有对端、后者从未实现过。
+    // 返回 undefined 表示引用非法（已打印原因）。调用方必须直接返回，
+    // 不能把空对象当成"当前会话"继续执行——那会静默操作错会话。
     function resolveRef(ref) {
         if (ref === 'current')
             return {};
-        const slash = ref.lastIndexOf('/');
-        if (slash < 0)
-            return { peer: ref };
-        const raw = ref.slice(slash + 1);
-        // 主会话的 threadId 是空串；`<peer>/main` 是同义写法，`list` 也这样显示。
-        if (raw === 'main')
-            return { peer: ref.slice(0, slash), threadId: '' };
-        return { peer: ref.slice(0, slash), threadId: raw };
+        const resolved = resolveThreadRef(ref, selfAid ?? '');
+        if (resolved.kind === 'invalid') {
+            console.error(`✗ ${resolved.error}`);
+            process.exitCode = 1;
+            return undefined;
+        }
+        if (resolved.kind === 'current')
+            return {};
+        if (resolved.kind === 'main')
+            return { peer: resolved.peer, threadId: resolved.topicId };
+        return { peer: resolved.peer, threadId: resolved.threadId };
     }
     switch (sub) {
         case 'list': {
@@ -282,7 +301,10 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
             const resp = await sendOp({ op: 'show', selfAid, peer, threadId });
             if (!resp.ok) {
                 console.error(`✗ ${resp.error}`);
@@ -301,10 +323,29 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
             const limit = argValue(args, '--limit') ? Number(argValue(args, '--limit')) : undefined;
-            const before = argValue(args, '--before') ? Number(argValue(args, '--before')) : undefined;
-            const after = argValue(args, '--after') ? Number(argValue(args, '--after')) : undefined;
+            const timeOption = (flag) => {
+                const raw = argValue(args, flag);
+                if (raw === undefined)
+                    return undefined;
+                const value = parseTimeArg(raw);
+                if (value === undefined) {
+                    console.error(`✗ ${flag} 不是有效时间: ${raw}（支持 ${TIME_ARG_FORMATS}）`);
+                    process.exitCode = 1;
+                    return null;
+                }
+                return value;
+            };
+            const before = timeOption('--before');
+            if (before === null)
+                return;
+            const after = timeOption('--after');
+            if (after === null)
+                return;
             // threadId 可选：不传时读主会话（threadId=null）消息，与 show <peer> 行为对齐
             const resp = await sendOp({ op: 'history', selfAid, peer, threadId, limit, before, after });
             if (!resp.ok) {
@@ -354,7 +395,10 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
             const resp = await sendOp({ op: 'rename', selfAid, peer, threadId, name: newName });
             if (!resp.ok) {
                 console.error(`✗ ${resp.error}`);
@@ -371,7 +415,10 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
             const label = hasFlag(args, '--clear') ? null : args[2] ?? null;
             const resp = await sendOp({ op: 'label', selfAid, peer, threadId, label });
             if (!resp.ok) {
@@ -395,7 +442,10 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
             const resp = await sendOp({ op: 'status', selfAid, peer, threadId, topicStatus: statusVal });
             if (!resp.ok) {
                 console.error(`✗ ${resp.error}`);
@@ -470,10 +520,13 @@ export async function runThreadCommand(args) {
                 process.exitCode = 1;
                 return;
             }
-            const { peer, threadId } = resolveRef(ref);
-            // current ref 允许通过（daemon 侧通过 sessionId 反查）；其他情况必须带 threadId
-            if (ref !== 'current' && !threadId) {
-                console.error('✗ delete 必须指定 threadId（格式: <peer>/<threadId>）');
+            const target = resolveRef(ref);
+            if (!target)
+                return;
+            const { peer, threadId } = target;
+            // current ref 允许通过（daemon 侧通过 sessionId 反查）；其他情况必须是话题 id。
+            if (ref !== 'current' && (!threadId || isMainSessionThreadId(threadId))) {
+                console.error('✗ delete 只能删除话题（主话题不可删除）');
                 process.exitCode = 1;
                 return;
             }
@@ -495,12 +548,20 @@ export async function runThreadCommand(args) {
                 return;
             }
             if (subCmd === 'show') {
-                const resp = await sendOp({ op: 'summary-show', selfAid });
+                const target = resolveRef(ref);
+                if (!target)
+                    return;
+                const { peer, threadId } = target;
+                const resp = await sendOp({ op: 'summary-show', selfAid, peer, threadId });
                 if (!resp.ok) {
                     console.error(`✗ ${resp.error}`);
                     process.exitCode = 1;
                     return;
                 }
+                if (jsonFormat) {
+                    console.log(JSON.stringify(resp.result ?? null, null, 2));
+                    return;
+                }
                 if (!resp.result) {
                     console.log('（暂无 summary）');
                 }
@@ -539,7 +600,10 @@ export async function runThreadCommand(args) {
                     return;
                 }
                 // 覆盖游标由 daemon 侧自动记录，无需传参
-                const { peer: setPeer, threadId: setThreadId } = resolveRef(ref);
+                const setTarget = resolveRef(ref);
+                if (!setTarget)
+                    return;
+                const { peer: setPeer, threadId: setThreadId } = setTarget;
                 const resp = await sendOp({
                     op: 'summary-set', selfAid, content, ifRev: ifRevRaw,
                     ...(setPeer ? { peer: setPeer } : {}),
@@ -562,13 +626,21 @@ export async function runThreadCommand(args) {
                     console.log(`⚠ 改名失败（摘要已写入）: ${setRes.renameError}`);
             }
             else if (subCmd === 'log') {
-                const resp = await sendOp({ op: 'summary-log', selfAid });
+                const target = resolveRef(ref);
+                if (!target)
+                    return;
+                const { peer, threadId } = target;
+                const resp = await sendOp({ op: 'summary-log', selfAid, peer, threadId });
                 if (!resp.ok) {
                     console.error(`✗ ${resp.error}`);
                     process.exitCode = 1;
                     return;
                 }
                 const entries = resp.result;
+                if (jsonFormat) {
+                    console.log(JSON.stringify(entries ?? [], null, 2));
+                    return;
+                }
                 if (!entries?.length) {
                     console.log('（暂无历史）');
                     return;
@@ -619,7 +691,8 @@ export async function runThreadCommand(args) {
                 }
                 for (const p of peers) {
                     const kind = p.peerKind === 'group' ? ' [群]' : '';
-                    console.log(`${p.peer}${kind}  话题数:${p.threadCount}  活跃:${new Date(p.lastActiveAt).toLocaleString('zh-CN')}`);
+                    const name = p.peerName && p.peerName !== p.peer ? `  (${p.peerName})` : '';
+                    console.log(`${p.peer}${kind}${name}  话题数:${p.threadCount}  活跃:${new Date(p.lastActiveAt).toLocaleString('zh-CN')}`);
                 }
                 return;
             }

package/dist/cli/trigger-command.js

@@ -642,7 +642,7 @@ async function request(cmd, timeoutMs = 10_000) {
         }
         catch { }
     }
-    const res = await ipcQuery(resolvePaths().socket, actorSessionId ? { ...cmd, actorSessionId, delegationToken } : { ...cmd, controlToken }, timeoutMs);
+    const res = await ipcQuery(resolvePaths().socket, actorSessionId ? { ...cmd, actorSessionId, delegationToken } : delegationToken ? { ...cmd, delegationToken } : { ...cmd, controlToken }, timeoutMs);
     if (!res)
         throw new Error('错误: 无法连接 evolcore 服务');
     if (res.ok === false || res.error)

package/dist/cli/watch-msg-diag.js

@@ -28,6 +28,7 @@ const STAGES = [
     { stage: 'task_start', label: '4. 任务开始   ', color: YELLOW },
     { stage: 'task_done', label: '5. 任务完成   ', color: BLUE },
     { stage: 'aun_out', label: '6. AUN出站    ', color: GREEN },
+    { stage: 'send_ok', label: '7. 发送成功   ', color: GREEN },
 ];
 const state = new Map();
 for (const s of STAGES)

package/dist/config/access-policy.js

@@ -78,9 +78,9 @@ function accessPolicySnapshotFromAgent(selfAid, agent) {
     return { policy, accessRevision: accessPolicyRevision(policy) };
 }
 function assertAccessPolicyWrite(input, agent, policy) {
-    const owners = validAgentOwnerIds(agent);
+    const owners = validAgentOwnerIds({ aid: input.selfAid });
     const normalizedActorAid = String(input.actorAid || '').trim();
-    const isOwner = input.actorRole === 'owner' || owners.includes(normalizedActorAid);
+    const isOwner = owners.includes(normalizedActorAid);
     if (!isOwner) {
         throw new AccessPolicyError('access_policy_owner_required', 'Only an Agent Owner can change access policy');
     }

package/dist/config/boot-log.js

@@ -13,12 +13,13 @@ import path from 'path';
 import { resolvePaths } from '../paths.js';
 import { logger } from '../utils/logger.js';
 import { autoMigrateIfNeeded } from '../config-store.js';
-import { initConfigManager } from './config-manager.js';
+import { ConfigTarget, initConfigManager, notifyConfigWrite } from './config-manager.js';
 import { ensureRoleConfigV4OnStartup, ensureRoleConfigV5OnStartup } from './role-migration-startup.js';
 import { ensureAuxiliaryModelMigrationOnStartup } from './schema-migration.js';
 import { ensureContactBookV2OnStartup } from './contact-book-v2-startup.js';
+import { synchronizeAllManagementContactsSync } from './contact-book-store.js';
 import { readInstalledEvolcoreVersion, readFastaunVersion } from '../utils/evolcore-version.js';
-import { readCurrent, readWVersion, writeWVersion, materializeVersion, listAllVersions, diffVersions, snapshot, isConfigSnapshotsEnabled, ensureStartupConfigSnapshot, incrementSuccessCount, retentionCleanup, } from './snapshot.js';
+import { readCurrent, readWVersion, writeWVersion, materializeVersion, listAllVersions, diffVersions, snapshot, isConfigSnapshotsEnabled, ensureStartupConfigSnapshot, incrementSuccessCount, retentionCleanup, writeSnapshotConfigFile, removeSnapshotConfigFile, } from './snapshot.js';
 const MAX_LINES = 300;
 const KEEP_MIN = 150;
 const FALLBACK_MAX_TRIES = 20;
@@ -54,6 +55,12 @@ export async function prepareStartupConfig(recoverRoleMutations) {
         logger.info(message);
         console.error(message);
     }
+    const synchronizedContacts = synchronizeAllManagementContactsSync();
+    if (synchronizedContacts > 0) {
+        const message = `✓ Contact management identities synchronized: ${synchronizedContacts} agent(s)`;
+        logger.info(message);
+        console.error(message);
+    }
 }
 export async function initializeStartupConfig(abort) {
     try {
@@ -292,18 +299,14 @@ async function expandToW(version, root) {
     const { collectConfigFiles } = await import('./snapshot.js');
     const existing = collectConfigFiles(root);
     for (const rel of existing) {
-        if (!files.has(rel)) {
-            try {
-                fs.unlinkSync(path.join(root, rel));
-            }
-            catch { /* */ }
-        }
+        if (!files.has(rel))
+            removeSnapshotConfigFile(root, rel);
     }
     for (const [rel, content] of files) {
-        const dest = path.join(root, rel);
-        fs.mkdirSync(path.dirname(dest), { recursive: true });
-        fs.writeFileSync(dest, content, 'utf-8');
+        writeSnapshotConfigFile(root, rel, content);
     }
+    if (existing.includes('providers.json') || files.has('providers.json'))
+        notifyConfigWrite(ConfigTarget.Providers);
     writeWVersion({ full, delta: version });
 }
 async function workingDiffersFromVersion(version) {

package/dist/config/config-field-policy.js

@@ -48,6 +48,7 @@ const SENSITIVE_TOP_FIELDS = new Set([
     'lifecycle',
     'initialized',
     'initialization',
+    'owner',
     'owners',
     'access',
     'fullaccess',
@@ -64,7 +65,7 @@ const SENSITIVE_TOP_FIELDS = new Set([
     'extra_backup',
     'decision_model',
 ]);
-const CRITICAL_AGENT_FIELDS = new Set(['owners', 'admins', 'roles', 'access']);
+const CRITICAL_AGENT_FIELDS = new Set(['owner', 'owners', 'admins', 'roles', 'access']);
 const EFFORTS = new Set(['low', 'medium', 'high', 'xhigh', 'max']);
 function scalar(rolePermissionKey, valueKind, access = 'role-overridable') {
     return { class: 'safe-scalar', access, rolePermissionKey, valueKind };
@@ -87,6 +88,11 @@ export function resolveConfigFieldRule(fieldPath, scope) {
     const top = parts[0];
     if (SENSITIVE_TOP_FIELDS.has(top))
         return { class: 'sensitive' };
+    if (top === 'Services') {
+        return parts.length === 3 && /^[A-Za-z0-9_-]+$/u.test(parts[1]) && ['provider', 'model', 'effort'].includes(parts[2])
+            ? scalar(field, parts[2] === 'effort' ? 'effort' : 'string', 'owner-only')
+            : { class: 'sensitive' };
+    }
     if (top === 'baseagents') {
         if (parts.length < 3)
             return { class: 'sensitive' };
@@ -101,6 +107,8 @@ export function resolveConfigFieldRule(fieldPath, scope) {
                     ? 'effort'
                     : leaf;
         const permissionKey = `baseagents.${baseagent}.${normalizedLeaf}`;
+        if (leaf === 'provider' && parts.length === 3)
+            return scalar(permissionKey, 'string', 'owner-only');
         if ((leaf === 'model' || leaf === 'auxiliaryModel') && parts.length === 3)
             return scalar(permissionKey, 'string');
         if ((leaf === 'effort' || leaf === 'reasoning' || leaf === 'auxiliaryEffort') && parts.length === 3)