evolcore 0.0.41-test.2 → 0.0.42-test.0
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 +38 -2
- 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
|
@@ -98,26 +98,54 @@ export function buildCliSessionPreview(messages, backend, options = {}) {
|
|
|
98
98
|
/**
|
|
99
99
|
* 会话/话题名称的长度常量,自动生成与手动改名共用。
|
|
100
100
|
*
|
|
101
|
-
* - `SESSION_TITLE_MAX_LEN`(
|
|
102
|
-
* - `SESSION_TITLE_STORED_MAX_LEN`(
|
|
101
|
+
* - `SESSION_TITLE_MAX_LEN`(30):正文字数,超长文本截到这里再加省略号;
|
|
102
|
+
* - `SESSION_TITLE_STORED_MAX_LEN`(33):落盘上限 = 30 + `...`。
|
|
103
103
|
*
|
|
104
|
-
*
|
|
104
|
+
* 30 是与客户端的共同口径:Evol Flutter 端的 `showTopicNameDialog` 与
|
|
105
|
+
* AUN Web 的 `TOPIC_TITLE_MAX_LENGTH` 都是 30。**计数单位也必须是同一个**——
|
|
106
|
+
* 两端都按字形簇(grapheme cluster)计,所以这里不能用 `String.length`
|
|
107
|
+
* (UTF-16 码元):一个 emoji 或带变音符的组合字符在两端算 1 个字,
|
|
108
|
+
* 在这里会算 2 个,同一个名字就会截得比客户端短。
|
|
109
|
+
*
|
|
110
|
+
* 30~33 字符的名字本身就是合法落盘形态,不再二次截断——
|
|
105
111
|
* 否则「系统自动生成的名字」会变成改一次短一点。
|
|
106
112
|
*/
|
|
107
|
-
export const SESSION_TITLE_MAX_LEN =
|
|
113
|
+
export const SESSION_TITLE_MAX_LEN = 30;
|
|
108
114
|
export const SESSION_TITLE_ELLIPSIS = '...';
|
|
109
115
|
/** 落盘名称的硬上限(截断后的最长长度)。 */
|
|
110
116
|
export const SESSION_TITLE_STORED_MAX_LEN = SESSION_TITLE_MAX_LEN + SESSION_TITLE_ELLIPSIS.length;
|
|
117
|
+
const titleGraphemes = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
|
|
118
|
+
/** 按字形簇计数,口径与 Flutter / AUN Web 一致。 */
|
|
119
|
+
export function sessionTitleLength(title) {
|
|
120
|
+
let count = 0;
|
|
121
|
+
for (const _ of titleGraphemes.segment(title))
|
|
122
|
+
count += 1;
|
|
123
|
+
return count;
|
|
124
|
+
}
|
|
125
|
+
/** 取前 n 个字形簇;不拆开组合字符(emoji ZWJ 序列、带变音符的字母)。 */
|
|
126
|
+
export function sliceSessionTitle(title, limit) {
|
|
127
|
+
if (limit <= 0)
|
|
128
|
+
return '';
|
|
129
|
+
let result = '';
|
|
130
|
+
let count = 0;
|
|
131
|
+
for (const { segment } of titleGraphemes.segment(title)) {
|
|
132
|
+
if (count >= limit)
|
|
133
|
+
break;
|
|
134
|
+
result += segment;
|
|
135
|
+
count += 1;
|
|
136
|
+
}
|
|
137
|
+
return result;
|
|
138
|
+
}
|
|
111
139
|
/**
|
|
112
140
|
* 截断到落盘上限并补省略号;未超长时原样返回。
|
|
113
141
|
*
|
|
114
|
-
* 判据是 `SESSION_TITLE_STORED_MAX_LEN`(
|
|
115
|
-
*
|
|
142
|
+
* 判据是 `SESSION_TITLE_STORED_MAX_LEN`(33)而不是正文上限(30):
|
|
143
|
+
* 30~33 字符的名称本来就是合法落盘形态(含历史遗留),截断它们会把
|
|
116
144
|
* 「系统生成的名字原样改回去」变成「改一次短一点」。
|
|
117
145
|
*/
|
|
118
146
|
export function truncateSessionTitle(title) {
|
|
119
|
-
return title
|
|
120
|
-
? `${title
|
|
147
|
+
return sessionTitleLength(title) > SESSION_TITLE_STORED_MAX_LEN
|
|
148
|
+
? `${sliceSessionTitle(title, SESSION_TITLE_MAX_LEN)}${SESSION_TITLE_ELLIPSIS}`
|
|
121
149
|
: title;
|
|
122
150
|
}
|
|
123
151
|
export function sanitizeSessionTitle(title) {
|
|
@@ -29,7 +29,7 @@ const MEMORY_MANIFEST = 'eck_manifest.memory.json';
|
|
|
29
29
|
const ALLOWED_MEMORY_SUBCOMMANDS = new Set(['create', 'update', 'archive']);
|
|
30
30
|
const BASH_COMMAND_RULE = 'Bash 只允许两类命令:单条 `ec memory create|update|archive`(不能与其他命令拼接);'
|
|
31
31
|
+ '或路径落在可读根内、可证明只读的查询(如 ls / cat / grep),多条查询可用 `&&` 或 `;` 连接,最多 8 段。'
|
|
32
|
-
+ '有文件工具时用 Read / Glob / Grep;只有 Bash/Shell 时可用 cat,明确的 pwsh/powershell -NoProfile -Command
|
|
32
|
+
+ '有文件工具时用 Read / Glob / Grep;只有 Bash/Shell 时可用 cat,明确的 pwsh/powershell -NoProfile -Command 包装内只接受单条 Get-Content -LiteralPath <绝对路径> [-Raw](该包装内的 cat / ls 不接受)。'
|
|
33
33
|
+ '整理反馈用文件写入工具写到任务书指定的反馈文件。';
|
|
34
34
|
function layerDir(layer, ctx) {
|
|
35
35
|
const root = resolveRoot();
|
|
@@ -144,11 +144,6 @@ function checkReadWithinMatrix(toolName, input, ctx) {
|
|
|
144
144
|
}
|
|
145
145
|
/** 写入判定只看 canonicalToolCall 给出的目标,不读工具入参。 */
|
|
146
146
|
function checkWrite(call, ctx) {
|
|
147
|
-
// shell 里的 apply_patch 跑的是 runner 自带的补丁器还是任意可执行文件,取决于 runner;
|
|
148
|
-
// 需要它的 runner 由适配层先转成 FileChange 再交给模块,模块这里一律不认。
|
|
149
|
-
if (call.via === 'shell') {
|
|
150
|
-
return deny('memory_session_shell_write_forbidden', '不能经由 shell 写文件,整理反馈请用文件写入工具写到任务书指定的反馈文件');
|
|
151
|
-
}
|
|
152
147
|
const { writeFiles } = memoryGrants(ctx);
|
|
153
148
|
if (writeFiles.length === 0) {
|
|
154
149
|
return deny('memory_session_write_no_target', '当前会话缺少批次目录,没有可写的反馈文件');
|
|
@@ -228,7 +223,7 @@ function readonlyDenialHint(command, policyCode, ctx) {
|
|
|
228
223
|
return '命令可证明只读,但读取的路径不在可读根内。用任务书「可读根」列出的绝对路径;相对路径按会话 cwd 解析,cwd 本身不可读。';
|
|
229
224
|
case 'readonly_h_class_read':
|
|
230
225
|
case 'readonly_l_class_read':
|
|
231
|
-
return '
|
|
226
|
+
return '命令读取了受保护路径,整理会话不能读。源码检索请把范围直接限定为 `src/`、`tests/` 等源码目录,不要从仓库根 `.` 递归扫描;PowerShell 查询请使用明确的 `pwsh -NoProfile -Command "Get-Content -LiteralPath <绝对路径> [-Raw]"`,不要用包装内的 `cat` / `ls`。';
|
|
232
227
|
default:
|
|
233
228
|
break;
|
|
234
229
|
}
|
|
@@ -12,7 +12,11 @@ const OPTIONS = {
|
|
|
12
12
|
delete: [], 'rebuild-index': ['--check', '--agent'], 'check-index': ['--agent'],
|
|
13
13
|
'summary-show': [], 'summary-set': ['--name', '--if-rev'], 'summary-log': [], 'summary-clear': [],
|
|
14
14
|
};
|
|
15
|
-
|
|
15
|
+
/**
|
|
16
|
+
* @param context.selfAid 调用方已认证的本端 AID(托管会话取自委托凭据)。命令里没写
|
|
17
|
+
* `--self` 时用它解析 `main:<a>:<b>` 与裸对端 AID 这类依赖本端的引用。
|
|
18
|
+
*/
|
|
19
|
+
export function resolveThreadCommandArgv(argv, context = {}) {
|
|
16
20
|
if (argv[0] !== 'thread' || argv.some(value => typeof value !== 'string' || value.includes('\0')))
|
|
17
21
|
throw new Error('Invalid thread argv');
|
|
18
22
|
const command = argv[1] === 'summary' ? `summary-${argv[2]}` : argv[1];
|
|
@@ -89,7 +93,7 @@ export function resolveThreadCommandArgv(argv) {
|
|
|
89
93
|
if (request.ref !== 'current') {
|
|
90
94
|
// 与 CLI 共用同一套解析:主话题是 `main:<aid>:<aid>`,话题是裸 id,
|
|
91
95
|
// 历史写法 `<peer>/<id>` 仍接受。裸 `main` 与 `<peer>/main` 都被拒绝。
|
|
92
|
-
const selfForRef = selfAid ??
|
|
96
|
+
const selfForRef = selfAid ?? context.selfAid?.replace(/^@/, '') ?? '';
|
|
93
97
|
const resolved = resolveThreadRef(request.ref, selfForRef);
|
|
94
98
|
if (resolved.kind === 'invalid')
|
|
95
99
|
throw new Error(resolved.error);
|
|
@@ -11,43 +11,48 @@ export function createThreadOperationExecutor(dependencies) {
|
|
|
11
11
|
try {
|
|
12
12
|
if (!Array.isArray(incoming.argv))
|
|
13
13
|
return { ok: false, code: 'INVALID_REQUEST', error: 'Thread operations require argv' };
|
|
14
|
-
const request = resolveThreadCommandArgv(incoming.argv);
|
|
15
14
|
const token = typeof incoming.delegationToken === 'string' ? incoming.delegationToken.trim() : '';
|
|
16
|
-
//
|
|
17
|
-
//
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
if (token) {
|
|
21
|
-
request.delegationToken = token;
|
|
22
|
-
if (incoming.delegationCommandHash)
|
|
23
|
-
request.delegationCommandHash = incoming.delegationCommandHash;
|
|
24
|
-
if (incoming.sessionId)
|
|
25
|
-
request.sessionId = incoming.sessionId;
|
|
26
|
-
}
|
|
27
|
-
let currentPeer;
|
|
28
|
-
let relationOnly = false;
|
|
15
|
+
// 托管调用先认证再解析 argv:`main:<a>:<b>` 与裸对端 AID 都要靠本端身份解析,
|
|
16
|
+
// 命令里没写 --self 时本端只能取自委托凭据(托管 runner 不注入 EVOLCORE_SELF_AID)。
|
|
17
|
+
let grant;
|
|
18
|
+
let session;
|
|
29
19
|
if (token) {
|
|
30
20
|
if (!incoming.sessionId)
|
|
31
21
|
return { ok: false, code: 'INVALID_REQUEST', error: 'Caller sessionId is required' };
|
|
32
22
|
const delegation = dependencies.agentDelegationRegistry.validate(token, incoming.sessionId, incoming.delegationCommandHash);
|
|
33
23
|
if (!delegation.ok)
|
|
34
24
|
return { ok: false, code: delegation.code, error: delegation.reason };
|
|
35
|
-
|
|
25
|
+
session = await dependencies.sessionManager.getSessionById(incoming.sessionId);
|
|
36
26
|
if (!session || session.selfAID !== delegation.grant.selfAid)
|
|
37
27
|
return { ok: false, code: 'INVALID_DELEGATION', error: 'Delegation does not match the caller session' };
|
|
38
|
-
|
|
28
|
+
grant = delegation.grant;
|
|
29
|
+
}
|
|
30
|
+
else if (incoming.sessionId || incoming.delegationToken || incoming.localControl !== true) {
|
|
31
|
+
return { ok: false, code: 'INVALID_CONTROL_TOKEN', error: 'Valid local control token is required' };
|
|
32
|
+
}
|
|
33
|
+
const request = resolveThreadCommandArgv(incoming.argv, { selfAid: grant?.selfAid });
|
|
34
|
+
let currentPeer;
|
|
35
|
+
let subject;
|
|
36
|
+
if (grant && session) {
|
|
37
|
+
if (request.selfAid && request.selfAid !== grant.selfAid)
|
|
39
38
|
return { ok: false, code: 'SCOPE_MISMATCH', error: 'Only the current Agent can be targeted' };
|
|
40
|
-
request.selfAid =
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
39
|
+
request.selfAid = grant.selfAid;
|
|
40
|
+
// `request` 是从 argv 重建的,不含调用方凭据。创建话题的旧式
|
|
41
|
+
// `topic-created` 通知仍经 `sendAunMsg` 走托管授权;宿主终端没有 token,
|
|
42
|
+
// 这类通知会按尽力而为处理。`topic.renamed` 是已有的系统事件,发送器
|
|
43
|
+
// 对它沿用系统事件豁免,因此菜单改名不需要伪造托管任务凭据。
|
|
44
|
+
request.delegationToken = token;
|
|
45
|
+
if (incoming.delegationCommandHash)
|
|
46
|
+
request.delegationCommandHash = incoming.delegationCommandHash;
|
|
47
|
+
request.originSessionId = session.id;
|
|
48
|
+
currentPeer = parsePeerKey(grant.peerKey).channelId;
|
|
49
|
+
subject = buildAuthSubject({
|
|
50
|
+
selfAid: request.selfAid, actorId: grant.actorId,
|
|
51
|
+
channel: grant.channel, channelType: grant.channelType,
|
|
52
|
+
channelId: currentPeer, conversationId: currentPeer, chatType: grant.chatType,
|
|
53
|
+
permissionMode: grant.permissionMode, processOwners: dependencies.getProcessOwners(),
|
|
54
|
+
...trustedExecutionIdentityInput(grant),
|
|
49
55
|
});
|
|
50
|
-
relationOnly = subject.dataScope === 'relation';
|
|
51
56
|
const readOnly = ['list', 'list-peers', 'show', 'history', 'check-index', 'summary-show', 'summary-log'].includes(request.op);
|
|
52
57
|
// 话题数据是**本 agent 自己的**(`agents/<self>/data/threads/`),与当前
|
|
53
58
|
// 所在的关系(私聊对端 / 群)无关。因此:
|
|
@@ -68,29 +73,39 @@ export function createThreadOperationExecutor(dependencies) {
|
|
|
68
73
|
request.threadId = indexed?.threadId ?? sessionTopicThreadId(session) ?? '';
|
|
69
74
|
request.sessionId = session.id;
|
|
70
75
|
}
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
if (!request.selfAid)
|
|
79
|
+
return { ok: false, code: 'INVALID_REQUEST', error: 'Host commands require --self' };
|
|
80
|
+
if (request.ref === 'current')
|
|
81
|
+
return { ok: false, code: 'INVALID_REQUEST', error: 'current requires a managed caller session' };
|
|
82
|
+
}
|
|
83
|
+
// 裸话题 id 不带对端:话题 id 在本端唯一,按本端数据反查对端。查不到就是不存在,
|
|
84
|
+
// 不能退回"当前会话"——那会把读/改静默落到另一个话题上。
|
|
85
|
+
if (request.ref !== undefined && request.ref !== 'current' && !request.peer && isTopicThreadId(request.threadId)) {
|
|
86
|
+
const peer = threadService.findTopicPeer(request.selfAid, request.threadId);
|
|
87
|
+
if (!peer)
|
|
88
|
+
return { ok: false, code: 'TOPIC_NOT_FOUND', error: `话题不存在: ${request.threadId}` };
|
|
89
|
+
request.peer = peer;
|
|
90
|
+
}
|
|
91
|
+
if (grant && subject) {
|
|
92
|
+
const relationOnly = subject.dataScope === 'relation';
|
|
71
93
|
const globalOperation = ['list-peers', 'check-index', 'rebuild-index'].includes(request.op);
|
|
72
94
|
const decision = await authorizeOperation({
|
|
73
95
|
source: 'agent-tool', subject,
|
|
74
|
-
intent: { operation: `ec.thread.${request.op}`, scope: globalOperation && !(relationOnly && request.op === 'list-peers') ? 'agent' : 'relation', source: 'agent-tool', args: { self: request.selfAid, peer: request.peer ?? currentPeer, peerKey:
|
|
75
|
-
auditMetadata: { taskId:
|
|
96
|
+
intent: { operation: `ec.thread.${request.op}`, scope: globalOperation && !(relationOnly && request.op === 'list-peers') ? 'agent' : 'relation', source: 'agent-tool', args: { self: request.selfAid, peer: request.peer ?? currentPeer, peerKey: grant.peerKey } },
|
|
97
|
+
auditMetadata: { taskId: grant.taskId, messageId: grant.messageId },
|
|
76
98
|
});
|
|
77
99
|
if (!decision.allow)
|
|
78
100
|
return { ok: false, code: decision.code, error: decision.reason };
|
|
79
101
|
if (relationOnly && globalOperation && request.op !== 'list-peers')
|
|
80
102
|
return { ok: false, code: 'SCOPE_MISMATCH', error: 'Index management requires Agent scope' };
|
|
81
103
|
}
|
|
82
|
-
else {
|
|
83
|
-
if (incoming.sessionId || incoming.delegationToken || incoming.localControl !== true)
|
|
84
|
-
return { ok: false, code: 'INVALID_CONTROL_TOKEN', error: 'Valid local control token is required' };
|
|
85
|
-
if (!request.selfAid)
|
|
86
|
-
return { ok: false, code: 'INVALID_REQUEST', error: 'Host commands require --self' };
|
|
87
|
-
if (request.ref === 'current')
|
|
88
|
-
return { ok: false, code: 'INVALID_REQUEST', error: 'current requires a managed caller session' };
|
|
89
|
-
}
|
|
90
104
|
// 话题操作的目标对端与"当前在哪个关系里被触发"是两个不同维度:
|
|
91
105
|
// 索引、话题会话、摘要全部落在本 agent 自己的数据目录下。在群 G 里
|
|
92
106
|
// 被要求联系 C 时,查/建/写的是我与 C 的话题,不属于 G,也不该受 G 约束。
|
|
93
107
|
// "只能操作自己数据"由 authorizeOperation 的 targetCurrentAgentOnly 负责。
|
|
108
|
+
// summary 的目标会话由 ref 决定;只有 `current` 在上面直接取调用方会话。
|
|
94
109
|
if (request.op.startsWith('summary-') && !request.sessionId) {
|
|
95
110
|
const target = isTopicThreadId(request.threadId)
|
|
96
111
|
? await threadService.showThread({ selfAid: request.selfAid, peer: request.peer, threadId: request.threadId })
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { logger } from '../../utils/logger.js';
|
|
2
|
-
import { normalizeThreadPeer } from './thread-service.js';
|
|
3
|
-
import { isMainSessionThreadId, isTopicThreadId } from './topic-id.js';
|
|
2
|
+
import { ThreadService, normalizeThreadPeer } from './thread-service.js';
|
|
3
|
+
import { isMainSessionThreadId, isTopicThreadId, safeFormatMainTopicId } from './topic-id.js';
|
|
4
4
|
/**
|
|
5
5
|
* Emit the existing cross-device rename event after a local rename succeeds.
|
|
6
6
|
* Storage stays in ThreadService; transport stays in the operation layer.
|
|
@@ -9,19 +9,33 @@ export async function notifyThreadRename(input) {
|
|
|
9
9
|
logger.info(`[Thread] notifyRename called: peer=${input.peer} threadId=${input.threadId} changed=${input.result.changed} nameUpdatedAt=${input.result.nameUpdatedAt} sendSystemMsg=${!!input.sendSystemMsg}`);
|
|
10
10
|
if (!input.sendSystemMsg || !input.result.changed || !input.result.nameUpdatedAt)
|
|
11
11
|
return;
|
|
12
|
+
// peerKind 只影响投递 scope 与“群主话题不通知”的判定。主话题不进索引,
|
|
13
|
+
// 得问会话目录;查不到按私聊兜底(群主话题由上面的分支拦掉,不会走到这里)。
|
|
12
14
|
const peerKind = input.result.peerKind
|
|
13
15
|
?? (isMainSessionThreadId(input.threadId)
|
|
14
|
-
?
|
|
16
|
+
? ThreadService.findMainSessionEntry(input.selfAid, input.peer)?.peerKind
|
|
15
17
|
: input.threadService.findInIndex(input.selfAid, input.peer, input.threadId)?.peerKind)
|
|
16
18
|
?? 'private';
|
|
17
19
|
// 群主话题是“本地对群的称呼”,发给群只会覆盖所有人的本地叫法。
|
|
18
20
|
if (peerKind === 'group' && isMainSessionThreadId(input.threadId))
|
|
19
21
|
return;
|
|
22
|
+
// 主话题的线上形态是规范 id `main:<a>:<b>`:本端的空串/`main` 只表示“当前主会话”,
|
|
23
|
+
// 直接发出去对端拿到空 thread_id 会整条丢弃(`applyInboundTopicRename` 要求非空)。
|
|
24
|
+
// 主话题 id 由双方 AID 拼成,两端算出来的字符串一致,对端据此就能落到主会话上。
|
|
25
|
+
let wireThreadId = input.threadId;
|
|
26
|
+
if (isMainSessionThreadId(input.threadId)) {
|
|
27
|
+
const mainTopicId = safeFormatMainTopicId(input.selfAid, input.peer);
|
|
28
|
+
if (!mainTopicId) {
|
|
29
|
+
logger.warn(`[Thread] topic.renamed skipped: cannot build main topic id for self=${input.selfAid} peer=${input.peer}`);
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
wireThreadId = mainTopicId;
|
|
33
|
+
}
|
|
20
34
|
try {
|
|
21
35
|
await input.sendSystemMsg({
|
|
22
36
|
from: input.selfAid,
|
|
23
37
|
to: input.peer,
|
|
24
|
-
threadId:
|
|
38
|
+
threadId: wireThreadId,
|
|
25
39
|
topicName: input.result.name,
|
|
26
40
|
peerKind,
|
|
27
41
|
kind: 'topic.renamed',
|
|
@@ -45,6 +59,8 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
45
59
|
const selfAid = typeof request.selfAid === 'string' ? request.selfAid : '';
|
|
46
60
|
if (!selfAid)
|
|
47
61
|
return { ok: false, code: 'MISSING_SELF_AID', error: 'selfAid is required' };
|
|
62
|
+
// peer/threadId 由入口解析完毕:`current` 已换成调用方会话所在话题,裸话题 id 已按本端
|
|
63
|
+
// 数据补上对端。这里不再按 sessionId 回落到当前会话——那会把读/改静默落到别的话题上。
|
|
48
64
|
// 入口归一:调用方可能传入裸 ID 或带渠道前缀的写法,统一成索引里存储的形态。
|
|
49
65
|
// 归一失败(解析不出)时保留原值,由下游按"无此对端"处理,不改变 arg 缺失的语义。
|
|
50
66
|
request = { ...request, peer: normalizeThreadPeer(request.peer) ?? request.peer };
|
|
@@ -73,15 +89,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
73
89
|
return { ok: true, result: { peers } };
|
|
74
90
|
}
|
|
75
91
|
case 'show': {
|
|
76
|
-
|
|
77
|
-
let threadId = request.threadId;
|
|
78
|
-
if ((!peer || threadId === undefined) && request.sessionId) {
|
|
79
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
80
|
-
if (resolved) {
|
|
81
|
-
peer = resolved.peer;
|
|
82
|
-
threadId = resolved.threadId;
|
|
83
|
-
}
|
|
84
|
-
}
|
|
92
|
+
const { peer, threadId } = request;
|
|
85
93
|
if (!peer)
|
|
86
94
|
return { ok: false, code: 'MISSING_ARGS', error: 'peer is required' };
|
|
87
95
|
// 主话题(空 / `main` / 规范 id)→ 读该关系的主会话
|
|
@@ -114,15 +122,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
114
122
|
return { ok: true, result, indexWarning: warning };
|
|
115
123
|
}
|
|
116
124
|
case 'history': {
|
|
117
|
-
|
|
118
|
-
let threadId = request.threadId;
|
|
119
|
-
if (!peer && request.sessionId) {
|
|
120
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
121
|
-
if (resolved) {
|
|
122
|
-
peer = resolved.peer;
|
|
123
|
-
threadId = resolved.threadId;
|
|
124
|
-
}
|
|
125
|
-
}
|
|
125
|
+
const { peer, threadId } = request;
|
|
126
126
|
// threadId 可选:不传时读主会话(threadId=null)消息
|
|
127
127
|
if (!peer)
|
|
128
128
|
return { ok: false, code: 'MISSING_ARGS', error: 'peer is required' };
|
|
@@ -157,7 +157,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
157
157
|
topicName: result.name,
|
|
158
158
|
peerKind: request.peerKind ?? 'private',
|
|
159
159
|
// 与 rename 相同:授权链需要托管上下文,宿主调用则留空(跳过通知)。
|
|
160
|
-
originSessionId: request.
|
|
160
|
+
originSessionId: request.originSessionId,
|
|
161
161
|
delegationToken: request.delegationToken,
|
|
162
162
|
delegationCommandHash: request.delegationCommandHash,
|
|
163
163
|
});
|
|
@@ -169,15 +169,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
169
169
|
return { ok: true, result };
|
|
170
170
|
}
|
|
171
171
|
case 'rename': {
|
|
172
|
-
|
|
173
|
-
let threadId = request.threadId;
|
|
174
|
-
if ((!peer || threadId === undefined) && request.sessionId) {
|
|
175
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
176
|
-
if (resolved) {
|
|
177
|
-
peer = resolved.peer;
|
|
178
|
-
threadId = resolved.threadId;
|
|
179
|
-
}
|
|
180
|
-
}
|
|
172
|
+
const { peer, threadId } = request;
|
|
181
173
|
// threadId === '' 是主会话的合法写法(`<peer>/main`),不能被当成缺参。
|
|
182
174
|
if (!peer || threadId === undefined || !request.name) {
|
|
183
175
|
return { ok: false, code: 'MISSING_ARGS', error: 'peer, threadId and name required' };
|
|
@@ -191,22 +183,14 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
191
183
|
result,
|
|
192
184
|
threadService,
|
|
193
185
|
sendSystemMsg,
|
|
194
|
-
originSessionId: request.
|
|
186
|
+
originSessionId: request.originSessionId,
|
|
195
187
|
delegationToken: request.delegationToken,
|
|
196
188
|
delegationCommandHash: request.delegationCommandHash,
|
|
197
189
|
});
|
|
198
190
|
return { ok: true, result };
|
|
199
191
|
}
|
|
200
192
|
case 'label': {
|
|
201
|
-
|
|
202
|
-
let threadId = request.threadId;
|
|
203
|
-
if ((!peer || threadId === undefined) && request.sessionId) {
|
|
204
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
205
|
-
if (resolved) {
|
|
206
|
-
peer = resolved.peer;
|
|
207
|
-
threadId = resolved.threadId;
|
|
208
|
-
}
|
|
209
|
-
}
|
|
193
|
+
const { peer, threadId } = request;
|
|
210
194
|
if (!peer || !isTopicThreadId(threadId)) {
|
|
211
195
|
return { ok: false, code: 'MISSING_ARGS', error: '标签只适用于话题(主话题没有标签)' };
|
|
212
196
|
}
|
|
@@ -214,15 +198,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
214
198
|
return { ok: true };
|
|
215
199
|
}
|
|
216
200
|
case 'status': {
|
|
217
|
-
|
|
218
|
-
let threadId = request.threadId;
|
|
219
|
-
if ((!peer || threadId === undefined) && request.sessionId) {
|
|
220
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
221
|
-
if (resolved) {
|
|
222
|
-
peer = resolved.peer;
|
|
223
|
-
threadId = resolved.threadId;
|
|
224
|
-
}
|
|
225
|
-
}
|
|
201
|
+
const { peer, threadId } = request;
|
|
226
202
|
if (!peer || !isTopicThreadId(threadId) || !request.topicStatus) {
|
|
227
203
|
return { ok: false, code: 'MISSING_ARGS', error: '状态只适用于话题(主话题没有业务状态)' };
|
|
228
204
|
}
|
|
@@ -240,15 +216,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
240
216
|
return { ok: true, result };
|
|
241
217
|
}
|
|
242
218
|
case 'delete': {
|
|
243
|
-
|
|
244
|
-
let threadId = request.threadId;
|
|
245
|
-
if ((!peer || threadId === undefined) && request.sessionId) {
|
|
246
|
-
const resolved = threadService.resolveCurrentThread(selfAid, request.sessionId);
|
|
247
|
-
if (resolved) {
|
|
248
|
-
peer = resolved.peer;
|
|
249
|
-
threadId = resolved.threadId;
|
|
250
|
-
}
|
|
251
|
-
}
|
|
219
|
+
const { peer, threadId } = request;
|
|
252
220
|
if (!peer || !isTopicThreadId(threadId)) {
|
|
253
221
|
return { ok: false, code: 'NOT_A_TOPIC', error: '只能删除话题(主话题不可删除)' };
|
|
254
222
|
}
|
|
@@ -295,7 +263,7 @@ async function _executeThreadOperation(request, threadService, sendSystemMsg) {
|
|
|
295
263
|
result: renamed,
|
|
296
264
|
threadService,
|
|
297
265
|
sendSystemMsg,
|
|
298
|
-
originSessionId: request.
|
|
266
|
+
originSessionId: request.originSessionId,
|
|
299
267
|
delegationToken: request.delegationToken,
|
|
300
268
|
delegationCommandHash: request.delegationCommandHash,
|
|
301
269
|
});
|
|
@@ -4,7 +4,7 @@ import path from 'path';
|
|
|
4
4
|
import { agentSessionsDir, agentDir, agentThreadIndexPath, agentThreadSummariesDir, agentThreadSummaryPath } from '../../paths.js';
|
|
5
5
|
import { atomicWriteJson, atomicReadJson } from '../../utils/atomic-write.js';
|
|
6
6
|
import { appendJsonl, appendJsonlDurable, readAllJsonlLines, readLastJsonlLine, readLastJsonlLineStrict, chatDirPath, scanChatDirs, tryParseChannelSessionKey } from '../session/session-fs-store.js';
|
|
7
|
-
import { sanitizeSessionTitle, SESSION_TITLE_MAX_LEN, SESSION_TITLE_STORED_MAX_LEN, SESSION_TITLE_ELLIPSIS } from '../session/session-title.js';
|
|
7
|
+
import { sanitizeSessionTitle, sessionTitleLength, SESSION_TITLE_MAX_LEN, SESSION_TITLE_STORED_MAX_LEN, SESSION_TITLE_ELLIPSIS } from '../session/session-title.js';
|
|
8
8
|
import { isMainSessionThreadId, isTopicThreadId, mainTopicPeer, safeFormatMainTopicId, sessionTopicThreadId } from './topic-id.js';
|
|
9
9
|
import { PeerIdentityCache } from '../relation/peer-identity.js';
|
|
10
10
|
import { ThreadContextStorage } from './thread-context-storage.js';
|
|
@@ -13,18 +13,23 @@ const RESERVED_THREAD_IDS = new Set(['current', 'main', 'all']);
|
|
|
13
13
|
/**
|
|
14
14
|
* 话题名长度校验:自动生成与手动改名共用 `session-title.ts` 的两个常量。
|
|
15
15
|
*
|
|
16
|
-
* - `SESSION_TITLE_MAX_LEN`(
|
|
17
|
-
* - `SESSION_TITLE_STORED_MAX_LEN`(
|
|
16
|
+
* - `SESSION_TITLE_MAX_LEN`(30):正文上限,`sanitizeSessionTitle` 按它截断并补省略号;
|
|
17
|
+
* - `SESSION_TITLE_STORED_MAX_LEN`(33):30 字符正文 + `...`,落盘上限。
|
|
18
18
|
*
|
|
19
|
-
* 校验按落盘上限而不是正文上限:系统自动生成的话题名最长就是
|
|
20
|
-
* 按
|
|
19
|
+
* 校验按落盘上限而不是正文上限:系统自动生成的话题名最长就是 33 字符,
|
|
20
|
+
* 按 30 拒绝会让这些名字「改不回去」。超过 33 的直接拒绝并报出当前长度,
|
|
21
21
|
* 不静默截断——让调用方以为完整名称生效了比报错更糟。
|
|
22
|
+
*
|
|
23
|
+
* 长度按字形簇计(`sessionTitleLength`),与 `sanitizeSessionTitle` 的截断
|
|
24
|
+
* 以及 Flutter / AUN Web 的 30 字输入框同一口径。用 `String.length` 会把
|
|
25
|
+
* 一个 emoji 算成 2 个字,30 个 emoji 的名字在这里会被误判超长。
|
|
22
26
|
*/
|
|
23
|
-
function assertThreadNameLength(rawName,
|
|
27
|
+
function assertThreadNameLength(rawName, _sanitized) {
|
|
24
28
|
const raw = rawName.trim();
|
|
25
|
-
|
|
29
|
+
const length = sessionTitleLength(raw);
|
|
30
|
+
if (length <= SESSION_TITLE_STORED_MAX_LEN)
|
|
26
31
|
return;
|
|
27
|
-
throw new ThreadServiceError(`话题名称超过 ${SESSION_TITLE_STORED_MAX_LEN} 字符上限(当前 ${
|
|
32
|
+
throw new ThreadServiceError(`话题名称超过 ${SESSION_TITLE_STORED_MAX_LEN} 字符上限(当前 ${length} 字符,含标点;`
|
|
28
33
|
+ `其中前 ${SESSION_TITLE_MAX_LEN} 字符为正文,末尾可带 ${SESSION_TITLE_ELLIPSIS} 省略号)。`
|
|
29
34
|
+ `请缩写后重试`, 'NAME_TOO_LONG');
|
|
30
35
|
}
|
|
@@ -578,7 +583,6 @@ export class ThreadService {
|
|
|
578
583
|
// 用户也没法从列表确认改名是否生效。`[主话题]` 前缀由 CLI 渲染。
|
|
579
584
|
name: active?.name || '主会话',
|
|
580
585
|
label: null,
|
|
581
|
-
topicStatus: 'pending',
|
|
582
586
|
createdAt: lastTs,
|
|
583
587
|
lastActiveAt: lastTs,
|
|
584
588
|
mainSession: true,
|
|
@@ -875,7 +879,6 @@ export class ThreadService {
|
|
|
875
879
|
name: session.name ?? peer,
|
|
876
880
|
nameUpdatedAt: typeof session.metadata?.nameUpdatedAt === 'number' ? session.metadata.nameUpdatedAt : undefined,
|
|
877
881
|
label: session.label ?? null,
|
|
878
|
-
topicStatus: session.topicStatus ?? 'pending',
|
|
879
882
|
createdAt: session.createdAt ?? 0,
|
|
880
883
|
lastActiveAt: session.updatedAt ?? 0,
|
|
881
884
|
running: session.processingState?.startsWith('processing') ?? false,
|
|
@@ -895,7 +898,6 @@ export class ThreadService {
|
|
|
895
898
|
name: entry.name,
|
|
896
899
|
nameUpdatedAt: undefined,
|
|
897
900
|
label: null,
|
|
898
|
-
topicStatus: 'pending',
|
|
899
901
|
createdAt: entry.createdAt,
|
|
900
902
|
lastActiveAt: entry.lastActiveAt,
|
|
901
903
|
running: false,
|
|
@@ -1000,6 +1002,50 @@ export class ThreadService {
|
|
|
1000
1002
|
});
|
|
1001
1003
|
}
|
|
1002
1004
|
// ── P1b static helpers (SessionManager 不参与) ──
|
|
1005
|
+
/**
|
|
1006
|
+
* 裸话题 id 反查对端。话题 id 在本端唯一,调用方只给 id 时据此补全 peer。
|
|
1007
|
+
*
|
|
1008
|
+
* 先查索引;索引里没有时扫会话目录的 `_threads/` 与 `_trash/`——前者是索引漏记的
|
|
1009
|
+
* 旧话题,后者是已删除话题(历史仍可读)。只读,不回写索引。
|
|
1010
|
+
*/
|
|
1011
|
+
findTopicPeer(selfAid, threadId) {
|
|
1012
|
+
if (!isTopicThreadId(threadId) || RESERVED_THREAD_IDS.has(threadId))
|
|
1013
|
+
return undefined;
|
|
1014
|
+
const indexed = this.readThreadIndex(selfAid).threads.find(t => t.threadId === threadId);
|
|
1015
|
+
if (indexed)
|
|
1016
|
+
return indexed.peer;
|
|
1017
|
+
const sessionsDir = agentSessionsDir(selfAid);
|
|
1018
|
+
if (!fs.existsSync(sessionsDir))
|
|
1019
|
+
return undefined;
|
|
1020
|
+
for (const dirEntry of fs.readdirSync(sessionsDir, { withFileTypes: true })) {
|
|
1021
|
+
if (!dirEntry.isDirectory())
|
|
1022
|
+
continue;
|
|
1023
|
+
const parsedDir = tryParseChannelSessionKey(dirEntry.name);
|
|
1024
|
+
if (!parsedDir)
|
|
1025
|
+
continue;
|
|
1026
|
+
for (const sub of ['_threads', '_trash']) {
|
|
1027
|
+
const dir = path.join(sessionsDir, dirEntry.name, sub);
|
|
1028
|
+
if (!fs.existsSync(dir))
|
|
1029
|
+
continue;
|
|
1030
|
+
for (const file of fs.readdirSync(dir, { withFileTypes: true })) {
|
|
1031
|
+
if (!file.isFile() || !file.name.endsWith('.jsonl'))
|
|
1032
|
+
continue;
|
|
1033
|
+
try {
|
|
1034
|
+
const last = readLastJsonlLine(path.join(dir, file.name));
|
|
1035
|
+
if (last?.threadId !== threadId)
|
|
1036
|
+
continue;
|
|
1037
|
+
if (last.selfAID && last.selfAID !== selfAid)
|
|
1038
|
+
continue;
|
|
1039
|
+
return normalizeThreadPeer(parsedDir.channelId) ?? parsedDir.channelId;
|
|
1040
|
+
}
|
|
1041
|
+
catch {
|
|
1042
|
+
// 损坏或无关的历史文件跳过
|
|
1043
|
+
}
|
|
1044
|
+
}
|
|
1045
|
+
}
|
|
1046
|
+
}
|
|
1047
|
+
return undefined;
|
|
1048
|
+
}
|
|
1003
1049
|
/** 按 threadId 查找话题条目。用于 CLI 层校验,不需要实例化。 */
|
|
1004
1050
|
static findThreadById(selfAid, threadId) {
|
|
1005
1051
|
const index = readIndex(agentThreadIndexPath(selfAid));
|
|
@@ -1050,7 +1096,6 @@ export class ThreadService {
|
|
|
1050
1096
|
channelType: 'aun',
|
|
1051
1097
|
peerKind,
|
|
1052
1098
|
name: normalizedPeer,
|
|
1053
|
-
topicStatus: 'pending',
|
|
1054
1099
|
createdAt: 0,
|
|
1055
1100
|
lastActiveAt: 0,
|
|
1056
1101
|
};
|
|
@@ -1064,7 +1109,6 @@ export class ThreadService {
|
|
|
1064
1109
|
channelType: 'aun',
|
|
1065
1110
|
peerKind,
|
|
1066
1111
|
name: String(raw['name'] ?? normalizedPeer),
|
|
1067
|
-
topicStatus: raw['topicStatus'] ?? 'pending',
|
|
1068
1112
|
createdAt: Number(raw['createdAt'] ?? 0),
|
|
1069
1113
|
lastActiveAt: Number(raw['updatedAt'] ?? 0),
|
|
1070
1114
|
};
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Canonical JSON + content_digest for the Owner directory snapshot.
|
|
3
|
+
*
|
|
4
|
+
* 协议定义(contacts-directory-v2 §5):摘要输入严格是 `{"entries": [...]}`,
|
|
5
|
+
* 键按字典序递归排序、数组保序、不输出空白,UTF-8 编码后取 SHA-256。
|
|
6
|
+
* 只有读取方自己重算的结果才能和 `content_digest` 比较——文件里写的那个只是
|
|
7
|
+
* 待校验的声明值。
|
|
8
|
+
*
|
|
9
|
+
* 只支持 string / number / boolean / null / array / object:这是名录快照的全部
|
|
10
|
+
* 值域。遇到其它类型直接抛错,不做静默转换。
|
|
11
|
+
*/
|
|
12
|
+
import { createHash } from 'node:crypto';
|
|
13
|
+
export function canonicalJson(value) {
|
|
14
|
+
return serialize(value);
|
|
15
|
+
}
|
|
16
|
+
function serialize(value) {
|
|
17
|
+
if (value === null)
|
|
18
|
+
return 'null';
|
|
19
|
+
if (typeof value === 'string')
|
|
20
|
+
return JSON.stringify(value);
|
|
21
|
+
if (typeof value === 'boolean')
|
|
22
|
+
return value ? 'true' : 'false';
|
|
23
|
+
if (typeof value === 'number') {
|
|
24
|
+
if (!Number.isFinite(value)) {
|
|
25
|
+
throw new TypeError('canonical JSON cannot encode a non-finite number');
|
|
26
|
+
}
|
|
27
|
+
return JSON.stringify(value);
|
|
28
|
+
}
|
|
29
|
+
if (Array.isArray(value)) {
|
|
30
|
+
return `[${value.map(serialize).join(',')}]`;
|
|
31
|
+
}
|
|
32
|
+
if (typeof value === 'object') {
|
|
33
|
+
const record = value;
|
|
34
|
+
// 未定义等价于该键不存在;协议里的可选字段就是这么表达的。
|
|
35
|
+
const keys = Object.keys(record).filter(key => record[key] !== undefined).sort();
|
|
36
|
+
return `{${keys.map(key => `${JSON.stringify(key)}:${serialize(record[key])}`).join(',')}}`;
|
|
37
|
+
}
|
|
38
|
+
throw new TypeError(`canonical JSON cannot encode ${typeof value}`);
|
|
39
|
+
}
|
|
40
|
+
/**
|
|
41
|
+
* 联系人快照的 `content_digest`。
|
|
42
|
+
*
|
|
43
|
+
* 摘要输入是 `{owner?, personal_assistant?, entries}`:身份对象存在才加入,
|
|
44
|
+
* 缺失时不补 `null`。入参必须是文件里原样的值——不删可选字段、不删 null、
|
|
45
|
+
* 不补默认值。归一化之后再算必然对不上。
|
|
46
|
+
*/
|
|
47
|
+
export function directoryContentDigest(input) {
|
|
48
|
+
const payload = { entries: input.entries };
|
|
49
|
+
if (input.owner !== undefined)
|
|
50
|
+
payload.owner = input.owner;
|
|
51
|
+
if (input.personalAssistant !== undefined)
|
|
52
|
+
payload.personal_assistant = input.personalAssistant;
|
|
53
|
+
return createHash('sha256').update(canonicalJson(payload), 'utf8').digest('hex');
|
|
54
|
+
}
|