evolcore 0.0.41 → 0.0.42
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 +36 -0
- package/bin/codex-managed-hook.mjs +9 -5
- package/dist/agents/baseagent.js +156 -16
- package/dist/agents/claude-runner.js +10 -3
- package/dist/agents/codex/catalog.js +8 -4
- package/dist/agents/codex-runner.js +236 -59
- package/dist/agents/ecagent-runner.js +82 -13
- package/dist/aun/aid/agentmd.js +106 -27
- package/dist/aun/aid/client.js +1 -1
- package/dist/aun/aid/control-aid.js +65 -13
- package/dist/aun/aid/identity.js +70 -4
- package/dist/aun/aid/index.js +2 -2
- package/dist/aun/service-proxy.js +25 -1
- package/dist/channels/aun.js +242 -209
- package/dist/channels/dingtalk.js +1 -1
- package/dist/channels/feishu.js +1 -1
- package/dist/channels/qqbot.js +1 -1
- package/dist/channels/wechat.js +1 -1
- package/dist/channels/wecom.js +1 -1
- package/dist/cli/agent-command.js +183 -3
- package/dist/cli/agent-create.js +92 -86
- package/dist/cli/agent.js +136 -1
- package/dist/cli/aun-commands.js +137 -35
- package/dist/cli/bench.js +8 -2
- package/dist/cli/command-log.js +1 -1
- package/dist/cli/daemon-commands.js +235 -51
- package/dist/cli/debug-mode.js +1 -1
- package/dist/cli/directory.js +170 -0
- package/dist/cli/index.js +40 -30
- package/dist/cli/init-channel.js +4 -4
- package/dist/cli/init.js +47 -32
- package/dist/cli/managed-command-guard.js +4 -1
- package/dist/cli/model.js +27 -18
- package/dist/cli/pa-workspace-command.js +191 -0
- package/dist/cli/{contact.js → peer.js} +19 -25
- package/dist/cli/restart-monitor.js +11 -4
- package/dist/cli/thread-command.js +47 -18
- package/dist/cli/version.js +18 -18
- package/dist/config/access-policy.js +29 -12
- package/dist/config/boot-log.js +65 -10
- package/dist/config/builtin-roles.js +2 -4
- package/dist/config/config-field-policy.js +3 -0
- package/dist/config/config-manager.js +28 -20
- package/dist/config/{contact-bind-code.js → peer-bind-code.js} +6 -6
- package/dist/config/{contact-book-store.js → peer-book-store.js} +75 -75
- package/dist/config/{contact-book-v2-startup.js → peer-book-v2-startup.js} +2 -2
- package/dist/config/{contact-book.js → peer-book.js} +47 -47
- package/dist/config/peer-operation-service.js +132 -0
- package/dist/config/{contact-request-service.js → peer-request-service.js} +90 -90
- package/dist/config/peer-role-resolver.js +3 -3
- package/dist/config/providers-config.js +17 -8
- package/dist/config/providers.js +1 -1
- package/dist/config/schema-migration.js +336 -39
- package/dist/core/agent-application-service.js +8 -2
- package/dist/core/agent-create-status.js +4 -5
- package/dist/core/agent-ipc-registration.js +5 -4
- package/dist/core/agent-runtime.js +30 -17
- package/dist/core/auth/operation-authorizer.js +0 -24
- package/dist/core/auth/operation-catalog.js +4 -20
- package/dist/core/baseagent-loader.js +27 -3
- package/dist/core/bootstrap-service.js +5 -22
- package/dist/core/capability/capability-manager.js +52 -35
- package/dist/core/channel-loader.js +43 -2
- package/dist/core/channel-runtime.js +2 -2
- package/dist/core/command/agent-control.js +54 -18
- package/dist/core/command/command-handler.js +92 -72
- package/dist/core/command/connect-menu.js +35 -42
- package/dist/core/command/daemon-diagnostics.js +41 -5
- package/dist/core/command/data-root-error.js +10 -0
- package/dist/core/command/data-root-resolver.js +53 -13
- package/dist/core/command/menu-catalog.js +1 -0
- package/dist/core/command/menu-handler.js +163 -65
- package/dist/core/command/menu-protocol.js +52 -0
- package/dist/core/command/pa-workspace-calendar.js +223 -0
- package/dist/core/command/pa-workspace-store.js +459 -0
- package/dist/core/command/role-menu.js +2 -2
- package/dist/core/command/slash-gate.js +1 -1
- package/dist/core/command/slash-handler.js +57 -41
- package/dist/core/daemon-lifecycle.js +90 -31
- package/dist/core/evolagent.js +6 -10
- package/dist/core/handoff/runtime.js +11 -4
- package/dist/core/host-snapshot.js +208 -0
- package/dist/core/initialization/service.js +152 -20
- package/dist/core/ipc-registration.js +33 -4
- package/dist/core/memory/batch-meta.js +27 -0
- package/dist/core/memory/consolidation-ops-records.js +44 -1
- package/dist/core/memory/consolidation.js +169 -27
- package/dist/core/message/aun-ipc-sender.js +2 -8
- package/dist/core/message/im-renderer.js +56 -3
- package/dist/core/message/message-admission.js +121 -124
- package/dist/core/message/message-bridge.js +38 -54
- package/dist/core/message/message-queue.js +7 -0
- package/dist/core/message/outbound.js +34 -9
- package/dist/core/message/response-engine.js +154 -73
- package/dist/core/model/catalog-service.js +1 -1
- package/dist/core/model/config-scope.js +2 -2
- package/dist/core/model/model-catalog.js +5 -4
- package/dist/core/model/model-diagnostics.js +6 -5
- package/dist/core/model/model-fallback.js +3 -6
- package/dist/core/model/model-permission.js +1 -1
- package/dist/core/ownership/owner-resolver.js +9 -9
- package/dist/core/permission/approval-gateway.js +1 -1
- package/dist/core/permission/ec-command-parser.js +2 -2
- package/dist/core/permission/tool-canonical.js +96 -46
- package/dist/core/permission/tool-error-code.js +41 -0
- package/dist/core/permission/tool-policy.js +71 -47
- package/dist/core/role/runtime-policy.js +1 -1
- package/dist/core/session/session-idle-monitor.js +10 -0
- package/dist/core/session/session-manager.js +2 -4
- package/dist/core/session/session-title.js +36 -8
- package/dist/core/system-session/memory.js +2 -7
- package/dist/core/thread/command-parser.js +6 -2
- package/dist/core/thread/ipc-operation.js +51 -36
- package/dist/core/thread/thread-operation.js +29 -61
- package/dist/core/thread/thread-service.js +57 -13
- package/dist/directory/canonical-digest.js +54 -0
- package/dist/directory/owner-directory-admission.js +114 -43
- package/dist/directory/owner-directory-agentmd-sync.js +89 -0
- package/dist/directory/owner-directory-cache.js +847 -459
- package/dist/directory/owner-directory-markdown.js +272 -0
- package/dist/directory/owner-directory-query-operation.js +195 -0
- package/dist/directory/owner-directory-remark-operation.js +147 -0
- package/dist/directory/owner-directory-remarks.js +145 -0
- package/dist/directory/owner-directory-scope.js +55 -0
- package/dist/directory/owner-directory-search.js +148 -0
- package/dist/directory/owner-directory-store.js +227 -0
- package/dist/eck/kit-renderer.js +1 -0
- package/dist/ecweb/basic-settings-service.js +4 -1
- package/dist/ecweb/message-context-service.js +13 -9
- package/dist/index.js +195 -37
- package/dist/ipc.js +86 -22
- package/dist/paths.js +11 -8
- package/dist/product.js +2 -0
- package/dist/proxy/manager.js +13 -2
- package/dist/proxy/service-supervisor.js +8 -1
- package/dist/trigger/history.js +23 -0
- package/dist/trigger/scheduler.js +3 -0
- package/dist/utils/atomic-write.js +21 -0
- package/dist/utils/cross-platform.js +35 -0
- package/dist/utils/ecweb-supervisor.js +42 -0
- package/dist/utils/error-utils.js +2 -1
- package/dist/utils/evolcore-version.js +19 -0
- package/dist/utils/host-info.js +242 -5
- package/dist/utils/instance-registry.js +28 -6
- package/dist/utils/logger.js +59 -14
- package/dist/utils/machine-info.js +46 -0
- package/dist/utils/process-introspect.js +166 -2
- package/dist/utils/startup-trace.js +245 -0
- package/ecagent/dist/agent-loop.js +27 -13
- package/ecagent/dist/harness/agent-harness.js +3 -3
- package/ecagent/dist/harness/types.d.ts +1 -0
- package/ecagent/dist/types.d.ts +1 -0
- package/kits/docs/INDEX.md +1 -1
- package/kits/docs/aun/AUN/346/266/210/346/201/257/347/261/273/345/236/213/344/270/216/345/261/236/346/200/247.md +72 -0
- package/kits/docs/evolcore/INDEX.md +3 -2
- package/kits/docs/evolcore/agent-create.md +17 -27
- package/kits/docs/evolcore/agent.md +4 -1
- package/kits/docs/evolcore/aid.md +3 -1
- package/kits/docs/evolcore/config.md +16 -5
- package/kits/docs/evolcore/ctl.md +9 -0
- package/kits/docs/evolcore/ec-capabilities.md +19 -0
- package/kits/docs/evolcore/memory-consolidation-batches.md +79 -5
- package/kits/docs/evolcore/menu-exec-schema-commands.md +2 -1
- package/kits/docs/evolcore/menu-protocol.md +1 -0
- package/kits/docs/evolcore/model.md +13 -4
- package/kits/docs/evolcore/msg.md +1 -1
- package/kits/docs/evolcore/pa-workspace.md +51 -0
- package/kits/docs/evolcore/peer.md +73 -0
- package/kits/docs/evolcore/thread-chain.md +4 -1
- package/kits/eck_manifest.json +21 -0
- package/kits/rules/06-channel.md +1 -1
- package/kits/schemas/_meta.json +12 -1
- package/kits/schemas/agent-config.schema.16.json +6 -0
- package/kits/schemas/agent-config.schema.17.json +897 -0
- package/kits/schemas/daemon.schema.9.json +8 -1
- package/kits/skills/ec-agent-create/SKILL.md +2 -2
- package/kits/skills/ec-identity/SKILL.md +45 -27
- package/kits/skills/ec-service-proxy/SKILL.md +7 -2
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +4 -5
- package/kits/skills/thread-ops/SKILL.md +11 -11
- package/kits/templates/bootstrap-welcome.md +3 -15
- package/kits/templates/message-fragments/item.md +1 -1
- package/kits/templates/system-fragments/bootstrap.md +24 -23
- package/kits/templates/system-fragments/commands.md +12 -5
- package/kits/templates/system-fragments/thread.md +18 -3
- package/package.json +6 -4
- package/dist/config/contact-operation-service.js +0 -235
- package/dist/directory/owner-directory-authorization.js +0 -309
- package/kits/docs/evolcore/contact.md +0 -78
- /package/dist/config/{contact-alias.js → peer-alias.js} +0 -0
|
@@ -22,7 +22,7 @@ import { resolveAunTargetKind } from '../../aun/group/identity.js';
|
|
|
22
22
|
import { readJsonFile, readLastJsonlLine, scanChatDirs, scanMetaFiles } from '../session/session-fs-store.js';
|
|
23
23
|
import { constrainResolvedModelForRole } from '../model/model-permission.js';
|
|
24
24
|
import { resolveRuntimePermissionMode, resolveRuntimeStringField } from '../role/runtime-policy.js';
|
|
25
|
-
import {
|
|
25
|
+
import { mutatePeerBookTransactionSync } from '../../config/peer-book-store.js';
|
|
26
26
|
import { readRoleDefinition, readRoleRegistry, registerRole, writeRoleDefinition, writeRoleRegistry, } from '../../config/role-service.js';
|
|
27
27
|
import { clearRoleStoreCache, readRoleStore, roleRegistryExists } from '../../config/role-store.js';
|
|
28
28
|
const ROLE_MENU_SCHEMA_VERSION = 1;
|
|
@@ -1547,7 +1547,7 @@ function normalizeRelationForScene(value, scene) {
|
|
|
1547
1547
|
return normalized;
|
|
1548
1548
|
}
|
|
1549
1549
|
function commitJournal(self, changes) {
|
|
1550
|
-
|
|
1550
|
+
mutatePeerBookTransactionSync({
|
|
1551
1551
|
selfAid: self,
|
|
1552
1552
|
actor: 'role-delete-transaction',
|
|
1553
1553
|
mutation: { type: 'sync-management-roles' },
|
|
@@ -78,7 +78,7 @@ const aliases = {
|
|
|
78
78
|
};
|
|
79
79
|
const GROUP_READ_ONLY_COMMANDS = new Set(['/model', '/effort', '/perm', '/baseagent']);
|
|
80
80
|
const GROUP_TASK_COMMANDS = new Set([
|
|
81
|
-
'/help', '/evolhelp', '/status', '/check', '/ask', '/pause', '/resume', '/stop', '/compact', '/renew', '/mention', '/memory',
|
|
81
|
+
'/help', '/evolhelp', '/status', '/check', '/ask', '/new', '/pause', '/resume', '/stop', '/compact', '/renew', '/mention', '/memory',
|
|
82
82
|
// /skill 与 /thread 在群里只放行到 handler:写操作由各自 handler 内部按 admin 判定拒绝
|
|
83
83
|
'/skill', '/thread', '/loop',
|
|
84
84
|
]);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { parsePermissionApprovalDecision } from '../permission/approval-gateway.js';
|
|
2
2
|
import { hasModelSwitcher, hasPermissionController } from '../../agents/runner-types.js';
|
|
3
|
-
import { normalizeBaseagent } from '../../agents/baseagent.js';
|
|
3
|
+
import { normalizeBaseagent, resolveBaseagentModelSelection } from '../../agents/baseagent.js';
|
|
4
4
|
import { buildEnvelope, isDeliveryTargetForChannel } from '../message/message-utils.js';
|
|
5
5
|
import { resolvePaths, getPackageRoot, daemonControlDir } from '../../paths.js';
|
|
6
6
|
import { logger } from '../../utils/logger.js';
|
|
@@ -829,6 +829,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
829
829
|
' /resume - 继续已暂停的任务',
|
|
830
830
|
' /stop - 中断当前任务',
|
|
831
831
|
...(isAdmin ? [
|
|
832
|
+
...(!threadId ? [' /new [名称] - 为本群主会话创建新的 baseagent 会话'] : []),
|
|
832
833
|
' /compact - 压缩会话上下文',
|
|
833
834
|
...(threadId ? [' /renew - 轮换当前话题的后端会话'] : []),
|
|
834
835
|
' /memory - 查看本群关系记忆',
|
|
@@ -1057,7 +1058,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1057
1058
|
{ command: '/stop', description: '中断当前任务', category: '运维', roles: ['admin', 'owner'] },
|
|
1058
1059
|
];
|
|
1059
1060
|
if (isAdmin) {
|
|
1060
|
-
commands.push({ command: '/compact', description: '压缩会话上下文', category: '会话管理', roles: ['admin', 'owner'] }, ...(threadId ? [{ command: '/renew', description: '轮换当前话题 backend', category: '会话管理', roles: ['admin', 'owner'] }] : []));
|
|
1061
|
+
commands.push(...(!threadId ? [{ command: '/new', args: '[名称]', description: '为本群主会话创建新的 baseagent 会话', category: '会话管理', roles: ['admin', 'owner'] }] : []), { command: '/compact', description: '压缩会话上下文', category: '会话管理', roles: ['admin', 'owner'] }, ...(threadId ? [{ command: '/renew', description: '轮换当前话题 backend', category: '会话管理', roles: ['admin', 'owner'] }] : []));
|
|
1061
1062
|
}
|
|
1062
1063
|
// 记忆管理紧跟权限管理;技能 / 话题管理跟随其后
|
|
1063
1064
|
const groupMemoryEntries = memoryHelpEntries({ chatType: 'group', role: identity.role, isAdmin, isOwnerSelf: false });
|
|
@@ -1569,19 +1570,25 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1569
1570
|
modelConfig = (resolveEffective(modelSelector, { cache: true }).baseagents || {})[fallbackBaseagent] || {};
|
|
1570
1571
|
}
|
|
1571
1572
|
catch { }
|
|
1572
|
-
const
|
|
1573
|
-
const
|
|
1573
|
+
const modelSelection = resolveBaseagentModelSelection(fallbackBaseagent, modelConfig);
|
|
1574
|
+
const configuredModel = modelSelection?.model;
|
|
1575
|
+
const configuredEffort = modelSelection?.effort;
|
|
1574
1576
|
const catalog = await getCatalog(modelSelector.self, fallbackBaseagent);
|
|
1575
1577
|
assertCatalogSelectable(catalog);
|
|
1576
1578
|
const rawModels = catalog.models.map(m => m.id);
|
|
1577
1579
|
const models = hasModelSwitcher(modelAgent)
|
|
1578
1580
|
? filterModelsForRole(identity.role, fallbackBaseagent, rawModels, model => resolveCatalogModel(catalog, model), modelSelector.self)
|
|
1579
1581
|
: rawModels;
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
|
|
1582
|
+
const currentModel = constrainResolvedModelForRole({
|
|
1583
|
+
role: identity.role, baseagent: fallbackBaseagent, model: configuredModel, selfAid: modelSelector.self,
|
|
1584
|
+
resolveModelId: modelAgent.resolveModelId?.bind(modelAgent),
|
|
1585
|
+
}).model ?? '';
|
|
1586
|
+
const currentModelLabel = currentModel ? modelDisplayLabel(modelAgent, currentModel) : '未配置';
|
|
1583
1587
|
const efforts = currentModel ? await getAvailableEfforts(modelAgent, currentModel) : [];
|
|
1584
|
-
const currentEffort =
|
|
1588
|
+
const currentEffort = resolveRuntimeStringField({
|
|
1589
|
+
selfAid: modelSelector.self, role: identity.role,
|
|
1590
|
+
field: `baseagents.${fallbackBaseagent}.effort`, configuredValue: configuredEffort,
|
|
1591
|
+
}).effectiveValue ?? 'auto';
|
|
1585
1592
|
const canReadModelList = await canReadSlashModelList({
|
|
1586
1593
|
subject: authSubject,
|
|
1587
1594
|
identity,
|
|
@@ -1680,7 +1687,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1680
1687
|
const modelSelector = { self: selfAID ?? modelSession?.selfAID ?? this.resolveSelfAID(channel) };
|
|
1681
1688
|
let configuredModel;
|
|
1682
1689
|
try {
|
|
1683
|
-
|
|
1690
|
+
const modelConfig = (resolveEffective(modelSelector, { cache: true }).baseagents || {})[fallbackBaseagent] || {};
|
|
1691
|
+
configuredModel = resolveBaseagentModelSelection(fallbackBaseagent, modelConfig)?.model;
|
|
1684
1692
|
}
|
|
1685
1693
|
catch { }
|
|
1686
1694
|
const models = hasModelSwitcher(modelAgent) ? await modelAgent.listModels() : [];
|
|
@@ -1811,14 +1819,26 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1811
1819
|
modelConfig = (resolveEffective(effortSelector, { cache: true }).baseagents || {})[fallbackBaseagent] || {};
|
|
1812
1820
|
}
|
|
1813
1821
|
catch { }
|
|
1814
|
-
const
|
|
1815
|
-
const
|
|
1822
|
+
const modelSelection = resolveBaseagentModelSelection(fallbackBaseagent, modelConfig);
|
|
1823
|
+
const configuredModel = modelSelection?.model;
|
|
1824
|
+
const configuredEffort = modelSelection?.effort;
|
|
1816
1825
|
if (!configuredModel) {
|
|
1817
1826
|
return { kind: 'command.error', text: '⚠️ 当前 Agent 未配置模型,请 owner/admin 先用 /model 设置模型' };
|
|
1818
1827
|
}
|
|
1819
|
-
const currentModel =
|
|
1828
|
+
const currentModel = constrainResolvedModelForRole({
|
|
1829
|
+
role: effortSession?.identity?.role || identity.role,
|
|
1830
|
+
baseagent: fallbackBaseagent,
|
|
1831
|
+
model: configuredModel,
|
|
1832
|
+
selfAid: effortSelector.self,
|
|
1833
|
+
resolveModelId: effortAgent.resolveModelId?.bind(effortAgent),
|
|
1834
|
+
}).model ?? configuredModel;
|
|
1820
1835
|
const efforts = await getAvailableEfforts(effortAgent, currentModel);
|
|
1821
|
-
const currentEffort =
|
|
1836
|
+
const currentEffort = resolveRuntimeStringField({
|
|
1837
|
+
selfAid: effortSelector.self,
|
|
1838
|
+
role: effortSession?.identity?.role || identity.role,
|
|
1839
|
+
field: `baseagents.${fallbackBaseagent}.effort`,
|
|
1840
|
+
configuredValue: configuredEffort,
|
|
1841
|
+
}).effectiveValue ?? 'auto';
|
|
1822
1842
|
if (efforts.length === 0) {
|
|
1823
1843
|
return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
|
|
1824
1844
|
}
|
|
@@ -1865,11 +1885,17 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1865
1885
|
modelConfig = (resolveEffective({ self: effortSelf }, { cache: true }).baseagents || {})[fallbackBaseagent] || {};
|
|
1866
1886
|
}
|
|
1867
1887
|
catch { }
|
|
1868
|
-
const configuredModel = modelConfig
|
|
1888
|
+
const configuredModel = resolveBaseagentModelSelection(fallbackBaseagent, modelConfig)?.model;
|
|
1869
1889
|
if (!configuredModel) {
|
|
1870
1890
|
return { kind: 'command.error', text: '⚠️ 当前 Agent 未配置模型,请 owner/admin 先用 /model 设置模型' };
|
|
1871
1891
|
}
|
|
1872
|
-
const currentModel =
|
|
1892
|
+
const currentModel = constrainResolvedModelForRole({
|
|
1893
|
+
role: effortSession?.identity?.role || identity.role,
|
|
1894
|
+
baseagent: fallbackBaseagent,
|
|
1895
|
+
model: configuredModel,
|
|
1896
|
+
selfAid: effortSelf,
|
|
1897
|
+
resolveModelId: effortAgent.resolveModelId?.bind(effortAgent),
|
|
1898
|
+
}).model ?? configuredModel;
|
|
1873
1899
|
const efforts = await getAvailableEfforts(effortAgent, currentModel);
|
|
1874
1900
|
if (efforts.length === 0) {
|
|
1875
1901
|
return { kind: 'command.error', text: '⚠️ 当前模型不支持推理强度设置' };
|
|
@@ -1893,7 +1919,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1893
1919
|
});
|
|
1894
1920
|
if (effortAuthDenied)
|
|
1895
1921
|
return effortAuthDenied;
|
|
1896
|
-
// /effort auto:清除 Agent 级 effort
|
|
1922
|
+
// /effort auto:清除 Agent 级 effort,回落到较低优先级的设置。
|
|
1897
1923
|
if (args === 'auto') {
|
|
1898
1924
|
try {
|
|
1899
1925
|
writeAgentModelConfig(effortSelf, effortAgent.name, { effort: null });
|
|
@@ -1912,7 +1938,7 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
1912
1938
|
});
|
|
1913
1939
|
if (this.shouldSuppressCardTriggerResult(source, channel))
|
|
1914
1940
|
return null;
|
|
1915
|
-
return { kind: 'command.result', text: '✓
|
|
1941
|
+
return { kind: 'command.result', text: '✓ 已清除 Agent 级推理强度,使用默认配置' };
|
|
1916
1942
|
}
|
|
1917
1943
|
// /effort <level>:切换推理强度
|
|
1918
1944
|
if (!efforts.includes(args)) {
|
|
@@ -2513,13 +2539,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
2513
2539
|
catch {
|
|
2514
2540
|
compactConfig = {};
|
|
2515
2541
|
}
|
|
2516
|
-
|
|
2542
|
+
const compactSelection = resolveBaseagentModelSelection(compactBaseagent, compactConfig);
|
|
2543
|
+
if (!compactSelection?.model) {
|
|
2517
2544
|
return { kind: 'command.error', text: `⚠️ 当前 Agent 未配置模型(baseagents.${compactBaseagent}.model),无法压缩。请 owner/admin 先用 /model 设置模型。` };
|
|
2518
2545
|
}
|
|
2519
2546
|
const compactModelDecision = constrainResolvedModelForRole({
|
|
2520
2547
|
role: session.identity?.role || identity.role,
|
|
2521
2548
|
baseagent: compactBaseagent,
|
|
2522
|
-
model:
|
|
2549
|
+
model: compactSelection.model,
|
|
2523
2550
|
resolveModelId: typeof currentSessionAgent.resolveModelId === 'function'
|
|
2524
2551
|
? currentSessionAgent.resolveModelId.bind(currentSessionAgent)
|
|
2525
2552
|
: undefined,
|
|
@@ -2531,25 +2558,12 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
2531
2558
|
selfAid: compactSelector.self,
|
|
2532
2559
|
role: session.identity?.role || identity.role,
|
|
2533
2560
|
field: `baseagents.${compactBaseagent}.effort`,
|
|
2534
|
-
configuredValue:
|
|
2561
|
+
configuredValue: compactSelection.effort,
|
|
2535
2562
|
});
|
|
2536
2563
|
const compactConfiguredEffort = compactEffortDecision.effectiveValue;
|
|
2537
|
-
const compactEffort = compactConfiguredEffort
|
|
2538
|
-
|
|
2539
|
-
: (
|
|
2540
|
-
// Only send an explicit override when config/role resolution decided a
|
|
2541
|
-
// value. If neither scope provides one, the runner's own getModel/getEffort
|
|
2542
|
-
// fallback is the same effective value and preserving an omitted fourth
|
|
2543
|
-
// argument keeps older runner adapters source-compatible.
|
|
2544
|
-
const hasExplicitCompactModel = typeof compactConfig.model === 'string' && compactConfig.model.trim().length > 0
|
|
2545
|
-
|| compactModelDecision.constrained;
|
|
2546
|
-
const hasExplicitCompactEffort = typeof compactConfig.effort === 'string' && compactConfig.effort.trim().length > 0
|
|
2547
|
-
|| compactEffortDecision.decidedBy === 'role';
|
|
2548
|
-
const compactOverride = (hasExplicitCompactModel && compactModel) || (hasExplicitCompactEffort && compactEffort)
|
|
2549
|
-
? {
|
|
2550
|
-
...(hasExplicitCompactModel && compactModel ? { model: compactModel } : {}),
|
|
2551
|
-
...(hasExplicitCompactEffort && compactEffort ? { effort: compactEffort } : {}),
|
|
2552
|
-
}
|
|
2564
|
+
const compactEffort = compactConfiguredEffort === 'auto' ? undefined : compactConfiguredEffort;
|
|
2565
|
+
const compactOverride = compactModel
|
|
2566
|
+
? { model: compactModel, ...(compactEffort ? { effort: compactEffort } : { effortMode: 'model_default' }) }
|
|
2553
2567
|
: undefined;
|
|
2554
2568
|
const compacted = compactOverride
|
|
2555
2569
|
? await currentSessionAgent.compactSession(session.id, session.agentSessionId, projectPath, compactOverride)
|
|
@@ -2597,12 +2611,14 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
2597
2611
|
}
|
|
2598
2612
|
const sessionKey = this.getQueueKey(session, channel, channelId);
|
|
2599
2613
|
const sessionAgent = this.getAgent(channel, session.baseagent);
|
|
2600
|
-
const isCurrentlyProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey)
|
|
2614
|
+
const isCurrentlyProcessing = this.messageQueue.isProcessing(sessionKey) || sessionAgent.hasActiveStream(sessionKey)
|
|
2615
|
+
|| sessionAgent.hasActiveOperation?.(sessionKey) === true;
|
|
2601
2616
|
const queueLength = this.messageQueue.getQueueLength(sessionKey);
|
|
2602
2617
|
const isThread = isTopicSession(session);
|
|
2603
|
-
|
|
2618
|
+
const executionState = sessionAgent.getExecutionState?.(sessionKey);
|
|
2619
|
+
let sessionStatus = executionState === 'interrupting' ? '中断收尾中(等待旧执行退出)' : isCurrentlyProcessing || queueLength > 0 ? '处理中' : '空闲';
|
|
2604
2620
|
// 处理中时显示时长
|
|
2605
|
-
if (isCurrentlyProcessing) {
|
|
2621
|
+
if (isCurrentlyProcessing && executionState !== 'interrupting') {
|
|
2606
2622
|
const elapsed = Date.now() - parseInt(session.processingState, 10);
|
|
2607
2623
|
if (!isNaN(elapsed) && elapsed > 0) {
|
|
2608
2624
|
const sec = Math.floor(elapsed / 1000);
|
|
@@ -2615,8 +2631,8 @@ export async function handleSlashCommand(content, channel, channelId, sendMessag
|
|
|
2615
2631
|
const owningAgent = this.getOwningAgent(channel);
|
|
2616
2632
|
const agentName = owningAgent?.name ?? 'DefaultAgent';
|
|
2617
2633
|
const health = await this.sessionManager.getHealthStatus(session.id);
|
|
2618
|
-
const timeSinceSuccess = Date.now() - health.lastSuccessTime;
|
|
2619
|
-
const timeStr = timeSinceSuccess < 60000 ? '刚刚' :
|
|
2634
|
+
const timeSinceSuccess = health.lastSuccessTime === undefined ? undefined : Date.now() - health.lastSuccessTime;
|
|
2635
|
+
const timeStr = timeSinceSuccess === undefined ? '暂无成功记录' : timeSinceSuccess < 60000 ? '刚刚' :
|
|
2620
2636
|
timeSinceSuccess < 3600000 ? `${Math.floor(timeSinceSuccess / 60000)}分钟前` :
|
|
2621
2637
|
`${Math.floor(timeSinceSuccess / 3600000)}小时前`;
|
|
2622
2638
|
// 获取会话文件信息并同步 name
|
|
@@ -4,6 +4,7 @@ import { logger } from '../utils/logger.js';
|
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
import { disposeAgentInstances } from './runner-reload-transaction.js';
|
|
6
6
|
import { sessionTopicThreadId } from './thread/topic-id.js';
|
|
7
|
+
import { StartupTracer } from '../utils/startup-trace.js';
|
|
7
8
|
export function daemonIdleTimeoutMs(settings) {
|
|
8
9
|
const idleTimeoutSec = settings.idleMonitor?.timeout;
|
|
9
10
|
return typeof idleTimeoutSec === 'number' && Number.isFinite(idleTimeoutSec) && idleTimeoutSec > 0
|
|
@@ -21,7 +22,9 @@ export function daemonConversationTotalExecutionMs(settings) {
|
|
|
21
22
|
: undefined;
|
|
22
23
|
}
|
|
23
24
|
export async function cleanupStartupHandoffs(recoveryAids, handoffRuntime) {
|
|
24
|
-
|
|
25
|
+
// 各 AID 的 handoff 目录互相独立,discard 走 per-target 互斥锁,
|
|
26
|
+
// 因此可以并发;串行执行只会把 21 个 AID 的启动清理时间叠加起来。
|
|
27
|
+
await Promise.all(recoveryAids.map(async (aid) => {
|
|
25
28
|
try {
|
|
26
29
|
const discarded = await handoffRuntime.discardExpired([aid]);
|
|
27
30
|
if (discarded > 0)
|
|
@@ -33,9 +36,9 @@ export async function cleanupStartupHandoffs(recoveryAids, handoffRuntime) {
|
|
|
33
36
|
catch (error) {
|
|
34
37
|
logger.error(`[Handoff] startup TTL cleanup failed for ${aid}:`, error);
|
|
35
38
|
}
|
|
36
|
-
}
|
|
39
|
+
}));
|
|
37
40
|
}
|
|
38
|
-
export async function recoverStartupHandoffs({ channelInstances, recoveryAids, agentRegistry, queuePendingObserverHints, startupObserverRecoveries, handoffRuntime,
|
|
41
|
+
export async function recoverStartupHandoffs({ channelInstances, recoveryAids, agentRegistry, queuePendingObserverHints, startupObserverRecoveries, handoffRuntime, setStartupRecoveryPending, onStartupHintsRecovered, }) {
|
|
39
42
|
try {
|
|
40
43
|
for (const inst of channelInstances) {
|
|
41
44
|
if (inst.channelType !== 'aun')
|
|
@@ -46,7 +49,9 @@ export async function recoverStartupHandoffs({ channelInstances, recoveryAids, a
|
|
|
46
49
|
}
|
|
47
50
|
}
|
|
48
51
|
await Promise.all(startupObserverRecoveries);
|
|
49
|
-
|
|
52
|
+
// cleanupStartupHandoffs 已经对同一批 AID 做过 TTL 清理,这里不要再重扫一遍
|
|
53
|
+
// 事件流与快照目录:recover 默认会再跑一次 discardExpired,等于把整段 I/O 翻倍。
|
|
54
|
+
const outcomes = await Promise.allSettled(recoveryAids.map(aid => handoffRuntime.recover([aid], { discardExpired: false })));
|
|
50
55
|
outcomes.forEach((outcome, index) => {
|
|
51
56
|
if (outcome.status === 'rejected') {
|
|
52
57
|
logger.error(`[Handoff] startup recovery failed for ${recoveryAids[index]}:`, outcome.reason);
|
|
@@ -54,10 +59,44 @@ export async function recoverStartupHandoffs({ channelInstances, recoveryAids, a
|
|
|
54
59
|
});
|
|
55
60
|
}
|
|
56
61
|
finally {
|
|
57
|
-
|
|
62
|
+
// 这里只关掉"启动恢复还在等"的标志,不再顺带放行队列:
|
|
63
|
+
// 渠道可能永远不会全连上,放行改由 releaseRestoredQueue 的超时兜底负责。
|
|
64
|
+
setStartupRecoveryPending(false);
|
|
65
|
+
// hint 恢复可能抛错,但队列放行不能因此永远等下去——失败也视为已恢复完。
|
|
66
|
+
onStartupHintsRecovered?.();
|
|
58
67
|
startupObserverRecoveries.length = 0;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
/** 恢复队列放行的兜底时限:与 CLI 等待 ready 的 30s 对齐。 */
|
|
71
|
+
export const RESTORE_QUEUE_TIMEOUT_MS = 30_000;
|
|
72
|
+
/**
|
|
73
|
+
* 放行启动时从磁盘读回的消息队列。
|
|
74
|
+
*
|
|
75
|
+
* 正常情况下等渠道首连结束再放行(此时发送侧大概率可用);但 `connectAll` 对总时长
|
|
76
|
+
* 没有任何上限,一条通道卡在握手/认证退避里就会让重启前的消息永远躺在内存里——
|
|
77
|
+
* 没有日志、不报错,表现为"重启后老消息没回音、新消息正常"。
|
|
78
|
+
*
|
|
79
|
+
* 所以这里加兜底:超时就先放行,最坏结果是某个 session 的一轮回复走发送侧排队重试,
|
|
80
|
+
* 好过整批消息静默卡死。超时必须打日志,否则等于把"静默卡死"换成"静默提前放行"。
|
|
81
|
+
*/
|
|
82
|
+
export async function releaseRestoredQueue({ channelConnectSettled, pendingCount, startRestoredQueue, timeoutMs = RESTORE_QUEUE_TIMEOUT_MS, }) {
|
|
83
|
+
const pending = pendingCount();
|
|
84
|
+
if (pending === 0) {
|
|
59
85
|
startRestoredQueue();
|
|
86
|
+
return;
|
|
60
87
|
}
|
|
88
|
+
let timedOut = false;
|
|
89
|
+
const timer = new Promise(resolve => {
|
|
90
|
+
const handle = setTimeout(() => { timedOut = true; resolve(); }, timeoutMs);
|
|
91
|
+
// 不等它:渠道先连上时不应挂住事件循环到超时。
|
|
92
|
+
if (typeof handle.unref === 'function')
|
|
93
|
+
handle.unref();
|
|
94
|
+
});
|
|
95
|
+
await Promise.race([channelConnectSettled.catch(() => undefined), timer]);
|
|
96
|
+
if (timedOut) {
|
|
97
|
+
logger.warn(`[Queue] Channel connect still pending after ${Math.round(timeoutMs / 1000)}s; releasing ${pending} restored message(s) anyway`);
|
|
98
|
+
}
|
|
99
|
+
startRestoredQueue();
|
|
61
100
|
}
|
|
62
101
|
export function resumePendingSessions({ sessionManager, messageQueue, droppedTriggerSessionIds, agentRegistry, agentMap, }) {
|
|
63
102
|
const pendingSessions = sessionManager.getPendingProcessingSessions();
|
|
@@ -130,7 +169,7 @@ export function resumePendingSessions({ sessionManager, messageQueue, droppedTri
|
|
|
130
169
|
export function createDaemonShutdown({ ipcServer, readySignalPath, bindService, ecwebSupervisor, messageQueue, permissionGateway, removePermissionConfigListener, stopStatsPersistence, triggerSchedulers, agentMap, eventBus, removeGroupInviteConfigListener, groupInviteReviewService, channelLoader, channelInstances, controlChannel, sessionManager, removeAll, exit, }) {
|
|
131
170
|
let shutdownSignal = 'unknown';
|
|
132
171
|
let shutdownInProgress = false;
|
|
133
|
-
return async (signal) => {
|
|
172
|
+
return async (signal, traceId) => {
|
|
134
173
|
if (shutdownInProgress)
|
|
135
174
|
return;
|
|
136
175
|
shutdownInProgress = true;
|
|
@@ -139,35 +178,51 @@ export function createDaemonShutdown({ ipcServer, readySignalPath, bindService,
|
|
|
139
178
|
const pid = process.pid;
|
|
140
179
|
const ppid = process.ppid;
|
|
141
180
|
logger.info(`\n\nShutting down gracefully... (signal=${shutdownSignal}, pid=${pid}, ppid=${ppid})`);
|
|
181
|
+
// 停止甘特图埋点。基线是"收到停止请求的这一刻",不能回推进程启动时刻——
|
|
182
|
+
// daemon 可能已经跑了几小时。traceId 由 `ec stop` 通过 IPC 带进来,
|
|
183
|
+
// 没有的话(信号退出、超时兜底)自己生成一条独立的记录。
|
|
184
|
+
const trace = new StartupTracer('daemon', {
|
|
185
|
+
kind: 'stop',
|
|
186
|
+
traceId: traceId || undefined,
|
|
187
|
+
processStartMs: Date.now(),
|
|
188
|
+
firstPhase: 'daemon.shutdown',
|
|
189
|
+
});
|
|
190
|
+
trace.setMeta('signal', shutdownSignal);
|
|
191
|
+
trace.setMeta('via', traceId ? 'ipc' : 'signal');
|
|
142
192
|
ipcServer.stopCpuTracking();
|
|
193
|
+
trace.mark('daemon.stopIpcServer');
|
|
143
194
|
ipcServer.stop();
|
|
144
195
|
try {
|
|
145
196
|
fs.unlinkSync(readySignalPath);
|
|
146
197
|
}
|
|
147
198
|
catch { }
|
|
148
199
|
bindService?.stopCleanup();
|
|
149
|
-
|
|
200
|
+
// 每个阶段单独闭合一次,甘特图上才能看到"卡在哪一段"而不是一整块。
|
|
201
|
+
const shutdownStep = async (name, label, operation) => {
|
|
202
|
+
trace.mark(name);
|
|
150
203
|
try {
|
|
151
204
|
await operation();
|
|
152
205
|
}
|
|
153
206
|
catch (error) {
|
|
207
|
+
trace.note(`失败: ${error instanceof Error ? error.message : String(error)}`);
|
|
154
208
|
logger.error(`[Shutdown] ${label} failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
155
209
|
}
|
|
156
210
|
};
|
|
157
211
|
try {
|
|
158
|
-
await shutdownStep('stop ECWeb supervisor', async () => {
|
|
212
|
+
await shutdownStep('daemon.stopEcweb', 'stop ECWeb supervisor', async () => {
|
|
159
213
|
await ecwebSupervisor?.stop();
|
|
160
214
|
});
|
|
161
215
|
const queueShutdown = messageQueue.shutdownGracefully();
|
|
162
|
-
await shutdownStep('cancel pending permissions', () => permissionGateway.cancelAllPending('daemon_restart'));
|
|
163
|
-
|
|
216
|
+
await shutdownStep('daemon.stopPermissions', 'cancel pending permissions', () => permissionGateway.cancelAllPending('daemon_restart'));
|
|
217
|
+
// 这两步各带超时(5s / 6.5s),退出慢的头号嫌疑就是它们空等到超时。
|
|
218
|
+
await shutdownStep('daemon.triggerIdle', 'wait for trigger schedulers', async () => {
|
|
164
219
|
await triggerSchedulers.waitForIdle(5_000);
|
|
165
220
|
});
|
|
166
|
-
await shutdownStep('suspend trigger schedulers', async () => {
|
|
221
|
+
await shutdownStep('daemon.triggerSuspend', 'suspend trigger schedulers', async () => {
|
|
167
222
|
await triggerSchedulers.suspendForDaemonExit();
|
|
168
223
|
});
|
|
169
|
-
await shutdownStep('interrupt active message queue tasks', async () => { await queueShutdown; });
|
|
170
|
-
await shutdownStep('dispose agent runners', async () => {
|
|
224
|
+
await shutdownStep('daemon.queueDrain', 'interrupt active message queue tasks', async () => { await queueShutdown; });
|
|
225
|
+
await shutdownStep('daemon.agentRunners', 'dispose agent runners', async () => {
|
|
171
226
|
const currentInstances = [...agentMap.entries()].map(([key, agent]) => {
|
|
172
227
|
const split = key.lastIndexOf('::');
|
|
173
228
|
return {
|
|
@@ -182,12 +237,23 @@ export function createDaemonShutdown({ ipcServer, readySignalPath, bindService,
|
|
|
182
237
|
});
|
|
183
238
|
eventBus.publish({ type: 'system:shutdown', timestamp: Date.now() });
|
|
184
239
|
removeGroupInviteConfigListener();
|
|
185
|
-
await shutdownStep('stop group invitation review', () => groupInviteReviewService.dispose());
|
|
186
|
-
await shutdownStep('stop global skill watcher', async () => {
|
|
240
|
+
await shutdownStep('daemon.groupInvite', 'stop group invitation review', () => groupInviteReviewService.dispose());
|
|
241
|
+
await shutdownStep('daemon.skillWatcher', 'stop global skill watcher', async () => {
|
|
187
242
|
const { stopGlobalSkillWatcher } = await import('./skill/global-watcher.js');
|
|
188
243
|
await stopGlobalSkillWatcher();
|
|
189
244
|
});
|
|
190
|
-
await shutdownStep('disconnect channels', () =>
|
|
245
|
+
await shutdownStep('daemon.channels', 'disconnect channels', async () => {
|
|
246
|
+
const timings = await channelLoader.disconnectAll(channelInstances);
|
|
247
|
+
// 慢的渠道和超时的渠道写进阶段附注,甘特图上悬停就能看到,不用再翻日志。
|
|
248
|
+
const slowest = timings[0];
|
|
249
|
+
const timedOut = timings.filter(t => t.timedOut);
|
|
250
|
+
if (timedOut.length > 0) {
|
|
251
|
+
trace.note(`${timings.length} 个渠道;${timedOut.length} 个超时放弃(最慢 ${slowest?.name} ${slowest?.durationMs}ms)`);
|
|
252
|
+
}
|
|
253
|
+
else if (slowest && slowest.durationMs >= 1_000) {
|
|
254
|
+
trace.note(`${timings.length} 个渠道;最慢 ${slowest.name} ${slowest.durationMs}ms`);
|
|
255
|
+
}
|
|
256
|
+
});
|
|
191
257
|
for (const instance of channelInstances) {
|
|
192
258
|
const type = instance.channelType || instance.adapter.channelName;
|
|
193
259
|
eventBus.publish({
|
|
@@ -198,28 +264,21 @@ export function createDaemonShutdown({ ipcServer, readySignalPath, bindService,
|
|
|
198
264
|
});
|
|
199
265
|
}
|
|
200
266
|
if (controlChannel) {
|
|
201
|
-
await shutdownStep('disconnect control AID', () => controlChannel?.disconnect());
|
|
267
|
+
await shutdownStep('daemon.controlAid', 'disconnect control AID', () => controlChannel?.disconnect());
|
|
202
268
|
}
|
|
203
269
|
}
|
|
204
270
|
catch (error) {
|
|
205
271
|
logger.error(`[Shutdown] Unexpected shutdown failure: ${error instanceof Error ? error.stack || error.message : String(error)}`);
|
|
206
272
|
}
|
|
207
273
|
finally {
|
|
208
|
-
await shutdownStep('remove permission config listener', () => removePermissionConfigListener?.());
|
|
209
|
-
await shutdownStep('stop stats persistence', () => stopStatsPersistence?.());
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
}
|
|
213
|
-
catch (error) {
|
|
214
|
-
logger.error(`[Shutdown] session manager close failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
215
|
-
}
|
|
216
|
-
try {
|
|
217
|
-
removeAll();
|
|
218
|
-
}
|
|
219
|
-
catch (error) {
|
|
220
|
-
logger.error(`[Shutdown] instance cleanup failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
221
|
-
}
|
|
274
|
+
await shutdownStep('daemon.finalizers', 'remove permission config listener', () => removePermissionConfigListener?.());
|
|
275
|
+
await shutdownStep('daemon.statsPersistence', 'stop stats persistence', () => stopStatsPersistence?.());
|
|
276
|
+
await shutdownStep('daemon.sessionManager', 'close session manager', () => { sessionManager.close(); });
|
|
277
|
+
await shutdownStep('daemon.instanceCleanup', 'instance cleanup', () => { removeAll(); });
|
|
222
278
|
logger.info('✓ Shutdown complete');
|
|
279
|
+
// 必须在 exit 之前落盘:appendFileSync 是同步写,记录不会随进程消失。
|
|
280
|
+
trace.mark('daemon.exit');
|
|
281
|
+
trace.finish(true);
|
|
223
282
|
exit(0);
|
|
224
283
|
}
|
|
225
284
|
};
|
package/dist/core/evolagent.js
CHANGED
|
@@ -6,8 +6,8 @@ import { ConfigTarget, assertAgentModelConfigured, read as cfgRead, write as cfg
|
|
|
6
6
|
import { withLifecycleForWrite } from '../config/lifecycle.js';
|
|
7
7
|
import { isStaticAgentAdmin, isStaticAgentOwner } from '../config/peer-role-resolver.js';
|
|
8
8
|
import { getPrimaryOwner } from './ownership/owner-resolver.js';
|
|
9
|
-
import { resolvePrincipal } from '../config/
|
|
10
|
-
import { isSupportedBaseagent } from '../agents/baseagent.js';
|
|
9
|
+
import { resolvePrincipal } from '../config/peer-book.js';
|
|
10
|
+
import { isSupportedBaseagent, resolveBaseagentModelSelection } from '../agents/baseagent.js';
|
|
11
11
|
/**
|
|
12
12
|
* EvolAgent —— 一个 self-agent 的运行时表示。
|
|
13
13
|
*
|
|
@@ -56,12 +56,12 @@ export class EvolAgent {
|
|
|
56
56
|
try {
|
|
57
57
|
const effective = resolveEffective({ self: this.aid }, { cache: true });
|
|
58
58
|
const block = effective.baseagents?.[ba];
|
|
59
|
-
return block?.model;
|
|
59
|
+
return resolveBaseagentModelSelection(ba, block)?.model;
|
|
60
60
|
}
|
|
61
61
|
catch {
|
|
62
62
|
// 降级:读取快照
|
|
63
63
|
const block = this.merged.baseagents?.[ba];
|
|
64
|
-
return block?.model;
|
|
64
|
+
return resolveBaseagentModelSelection(ba, block)?.model;
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
67
|
get effort() {
|
|
@@ -70,16 +70,12 @@ export class EvolAgent {
|
|
|
70
70
|
try {
|
|
71
71
|
const effective = resolveEffective({ self: this.aid }, { cache: true });
|
|
72
72
|
const block = effective.baseagents?.[ba];
|
|
73
|
-
|
|
74
|
-
return block?.effort ?? block?.reasoning;
|
|
75
|
-
return block?.effort;
|
|
73
|
+
return resolveBaseagentModelSelection(ba, block)?.effort;
|
|
76
74
|
}
|
|
77
75
|
catch {
|
|
78
76
|
// 降级:读取快照
|
|
79
77
|
const block = this.merged.baseagents?.[ba];
|
|
80
|
-
|
|
81
|
-
return block?.effort ?? block?.reasoning;
|
|
82
|
-
return block?.effort;
|
|
78
|
+
return resolveBaseagentModelSelection(ba, block)?.effort;
|
|
83
79
|
}
|
|
84
80
|
}
|
|
85
81
|
get projectPath() {
|
|
@@ -679,18 +679,25 @@ export class HandoffRuntime {
|
|
|
679
679
|
// finish it before version reconciliation instead of prompting again.
|
|
680
680
|
this.store.migrateLegacyNonePending(selfAid, this.now?.());
|
|
681
681
|
this.expireQueued([selfAid]);
|
|
682
|
+
// 单次读取事件流并建索引:下面每个 instance 都要用它,逐条 filter 是 O(实例×事件),
|
|
683
|
+
// 在实例数上百的 AID 上足以把启动拖慢数秒。
|
|
682
684
|
const events = this.store.events(selfAid);
|
|
683
685
|
const lastSendEvent = new Map();
|
|
686
|
+
const latestEventVersion = new Map();
|
|
684
687
|
for (const event of events) {
|
|
685
|
-
if (event.handoff_id
|
|
688
|
+
if (!event.handoff_id)
|
|
689
|
+
continue;
|
|
690
|
+
if (event.event_type.startsWith('target_send_')) {
|
|
686
691
|
lastSendEvent.set(event.handoff_id, event.event_type);
|
|
687
692
|
}
|
|
693
|
+
if (event.to_version !== undefined) {
|
|
694
|
+
latestEventVersion.set(event.handoff_id, Math.max(latestEventVersion.get(event.handoff_id) ?? 0, event.to_version));
|
|
695
|
+
}
|
|
688
696
|
}
|
|
689
697
|
for (const instance of this.store.list(selfAid)) {
|
|
690
698
|
this.warnIfStale(instance);
|
|
691
|
-
const
|
|
692
|
-
|
|
693
|
-
if (latestEventVersion !== instance.version) {
|
|
699
|
+
const instanceVersion = latestEventVersion.get(instance.handoff_id) ?? 0;
|
|
700
|
+
if (instanceVersion !== instance.version) {
|
|
694
701
|
if (!instance.attention_required) {
|
|
695
702
|
this.store.markAttention(selfAid, instance.handoff_id, 'STORE_CONFLICT');
|
|
696
703
|
}
|