evolcore 0.0.49 → 0.0.51
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 +103 -3
- package/bin/ec-build.mjs +60 -0
- package/bin/ecmsg.js +64 -57
- package/dist/ability/caller/authorization.js +21 -0
- package/dist/ability/caller/command.js +173 -0
- package/dist/ability/caller/contract.js +117 -0
- package/dist/ability/caller/credential-files.js +132 -0
- package/dist/ability/caller/daemon.js +183 -0
- package/dist/ability/caller/schema-view.js +157 -0
- package/dist/ability/caller/service.js +519 -0
- package/dist/ability/command-contract.js +5 -0
- package/dist/ability/daemon.js +5 -1
- package/dist/ability/interop-v1.js +156 -106
- package/dist/ability/management.js +1 -0
- package/dist/agent-template/jobs.js +79 -3
- package/dist/agent-template/runtime.js +459 -47
- package/dist/agent-template/service.js +1242 -198
- package/dist/agent-template/share.js +103 -0
- package/dist/agent-template/tool-runner.js +25 -0
- package/dist/agent-template/types.js +10 -2
- package/dist/agents/claude/availability.js +94 -0
- package/dist/agents/claude/capability-provider.js +154 -0
- package/dist/agents/claude/index.js +145 -0
- package/dist/agents/{claude-runner.js → claude/runner.js} +78 -166
- package/dist/agents/claude/session-file-adapter.js +246 -0
- package/dist/agents/codex/app-server-client.js +90 -10
- package/dist/agents/codex/availability.js +164 -0
- package/dist/agents/codex/capability-provider.js +138 -0
- package/dist/agents/codex/cli.js +38 -0
- package/dist/agents/codex/index.js +345 -0
- package/dist/agents/codex/mcp-elicitation.js +135 -0
- package/dist/agents/{codex-runner.js → codex/runner.js} +652 -383
- package/dist/agents/codex/session-file-adapter.js +834 -0
- package/dist/agents/dsh/availability.js +28 -0
- package/dist/agents/dsh/capability-provider.js +56 -0
- package/dist/agents/dsh/desktop-locations.ps1 +66 -0
- package/dist/agents/dsh/desktop-probe.cjs +37 -0
- package/dist/agents/dsh/index.js +98 -0
- package/dist/agents/dsh/installation.js +400 -0
- package/dist/agents/dsh/resources.js +755 -0
- package/dist/agents/dsh/runner.js +1183 -0
- package/dist/agents/dsh/runtime/README.md +243 -0
- package/dist/agents/dsh/runtime/authorization.js +23 -0
- package/dist/agents/dsh/runtime/bridge.js +837 -0
- package/dist/agents/dsh/runtime/config.js +271 -0
- package/dist/agents/dsh/runtime/entry.js +229 -0
- package/dist/agents/dsh/runtime/session-inspector.js +340 -0
- package/dist/agents/dsh/runtime/tool-policy.js +49 -0
- package/dist/agents/dsh/session-file-adapter.js +145 -0
- package/dist/agents/ecagent/index.js +215 -0
- package/dist/agents/{ecagent-runner.js → ecagent/runner.js} +592 -106
- package/dist/agents/ecagent/session-file-adapter.js +134 -0
- package/dist/agents/gemini/index.js +96 -0
- package/dist/agents/{gemini-runner.js → gemini/runner.js} +18 -23
- package/dist/{core/session/adapters/gemini-session-file-adapter.js → agents/gemini/session-file-adapter.js} +2 -2
- package/dist/aun/ability-device-routing.js +11 -17
- package/dist/aun/aid/agentmd.js +27 -1
- package/dist/aun/aid/control-aid.js +52 -32
- package/dist/aun/aid/managed-operation.js +6 -4
- package/dist/aun/group/invite-service.js +7 -37
- package/dist/aun/group/operations.js +6 -0
- package/dist/aun/menu/client.js +1 -1
- package/dist/aun/msg/history.js +1 -1
- package/dist/aun/msg/managed-operation.js +93 -21
- package/dist/aun/msg/mention-schema.js +1 -1
- package/dist/aun/msg/p2p.js +32 -4
- package/dist/aun/msg/upload.js +126 -3
- package/dist/aun/service-proxy.js +1 -1
- package/dist/aun/storage/index.js +242 -0
- package/dist/build-identity.json +1 -1
- package/dist/channels/aun.js +698 -213
- package/dist/channels/daemon.js +3 -2
- package/dist/channels/dingtalk.js +1 -1
- package/dist/channels/feishu.js +9 -9
- package/dist/channels/qqbot.js +1 -1
- package/dist/channels/wechat.js +2 -2
- package/dist/channels/wecom.js +1 -1
- package/dist/claude-gateway/agent-registration.js +389 -0
- package/dist/claude-gateway/binding.js +96 -0
- package/dist/claude-gateway/inbox.js +138 -0
- package/dist/claude-gateway/index.js +125 -0
- package/dist/claude-gateway/listing.js +330 -0
- package/dist/claude-gateway/router.js +328 -0
- package/dist/claude-gateway/sessions.js +128 -0
- package/dist/claude-gateway/terminal.js +250 -0
- package/dist/claude-gateway/transcript.js +272 -0
- package/dist/claude-gateway/types.js +14 -0
- package/dist/cli/ability-command.js +45 -0
- package/dist/cli/ability-output.js +182 -0
- package/dist/cli/agent-command.js +21 -2
- package/dist/cli/agent-create.js +197 -56
- package/dist/cli/agent-template.js +400 -27
- package/dist/cli/agent.js +105 -11
- package/dist/cli/aun-commands.js +237 -123
- package/dist/cli/bench.js +5 -2
- package/dist/cli/config.js +22 -6
- package/dist/cli/daemon-commands.js +283 -109
- package/dist/cli/data-command.js +1 -1
- package/dist/cli/debug-mode.js +9 -0
- package/dist/cli/directory.js +1 -2
- package/dist/cli/ecmsg-gateway.js +64 -26
- package/dist/cli/fs-command.js +67 -39
- package/dist/cli/index.js +45 -12
- package/dist/cli/init.js +161 -90
- package/dist/cli/managed-command-guard.js +3 -0
- package/dist/cli/menu-client.js +32 -7
- package/dist/cli/model.js +1 -1
- package/dist/cli/pay-command.js +30 -0
- package/dist/cli/provider-command.js +6 -2
- package/dist/cli/restart-monitor.js +4 -4
- package/dist/cli/services-command.js +35 -10
- package/dist/cli/skill-command.js +4 -4
- package/dist/cli/task-context.js +24 -14
- package/dist/cli/team-workspace-command.js +50 -52
- package/dist/cli/thread-command.js +81 -14
- package/dist/cli/trigger-command.js +47 -12
- package/dist/cli/watch-logs.js +2 -1
- package/dist/config/access-policy.js +16 -3
- package/dist/config/boot-log.js +3 -0
- package/dist/config/builtin-role-templates.js +1 -1
- package/dist/config/config-field-policy.js +26 -13
- package/dist/config/config-manager.js +113 -52
- package/dist/config/config-operation-service.js +22 -1
- package/dist/config/gateway-config.js +29 -44
- package/dist/config/invoke-ipc-service.js +1 -1
- package/dist/config/owner-config.js +5 -19
- package/dist/config/peer-book-store.js +2 -3
- package/dist/config/peer-book.js +2 -2
- package/dist/config/peer-role-resolver.js +3 -9
- package/dist/config/provider-identity-migration.js +24 -105
- package/dist/config/provider-ipc-service.js +13 -3
- package/dist/config/provider-local-sync.js +4 -1
- package/dist/config/provider-menu-request.js +21 -3
- package/dist/config/provider-templates.js +1 -1
- package/dist/config/providers-config.js +138 -31
- package/dist/config/providers-import.js +3 -3
- package/dist/config/providers-management.js +109 -118
- package/dist/config/resolved-config-op.js +1 -42
- package/dist/config/schema-migration.js +254 -15
- package/dist/config/schema-registry.js +53 -8
- package/dist/config-store.js +1343 -63
- package/dist/core/{agent-application-service.js → agent/agent-application-service.js} +228 -9
- package/dist/core/{agent-create-status.js → agent/agent-create-status.js} +112 -4
- package/dist/core/{agent-creation-claim.js → agent/agent-creation-claim.js} +3 -3
- package/dist/core/{agent-ipc-registration.js → agent/agent-ipc-registration.js} +119 -25
- package/dist/core/{agent-reload-coordinator.js → agent/agent-reload-coordinator.js} +65 -0
- package/dist/core/{agent-runtime.js → agent/agent-runtime.js} +249 -79
- package/dist/core/{evolagent-registry.js → agent/evolagent-registry.js} +23 -18
- package/dist/core/{evolagent.js → agent/evolagent.js} +11 -11
- package/dist/core/auth/agent-delegation.js +15 -8
- package/dist/core/auth/delegation-authorization.js +28 -0
- package/dist/core/auth/operation-authorizer.js +20 -2
- package/dist/core/auth/operation-catalog.js +80 -8
- package/dist/core/baseagent/baseagent-availability.js +197 -0
- package/dist/core/baseagent/baseagent-capability-adapter.js +288 -0
- package/dist/core/baseagent/baseagent-config-shared.js +56 -0
- package/dist/core/baseagent/baseagent-identity.js +68 -0
- package/dist/core/{baseagent-loader.js → baseagent/baseagent-loader.js} +89 -6
- package/dist/core/baseagent/baseagent-model-defaults.js +26 -0
- package/dist/core/baseagent/baseagent-plugin-descriptor.js +357 -0
- package/dist/core/baseagent/baseagent-plugin-loader.js +367 -0
- package/dist/core/baseagent/baseagent.js +157 -0
- package/dist/{agents → core/baseagent}/runner-types.js +36 -4
- package/dist/core/capability/capability-manager.js +91 -33
- package/dist/core/capability/providers/claude-capability-provider.js +2 -154
- package/dist/core/capability/providers/codex-capability-provider.js +2 -136
- package/dist/core/{channel-loader.js → channel/channel-loader.js} +226 -38
- package/dist/core/{channel-runtime.js → channel/channel-runtime.js} +21 -19
- package/dist/core/command/agent-control.js +80 -17
- package/dist/core/command/agent-template-menu.js +23 -10
- package/dist/core/command/agentmd-menu-request.js +19 -8
- package/dist/core/command/agentmd-menu.js +14 -5
- package/dist/core/command/cli-intent-parser.js +15 -0
- package/dist/core/command/command-handler.js +127 -57
- package/dist/core/command/context-policy-menu.js +122 -0
- package/dist/core/command/data-root-resolver.js +157 -20
- package/dist/core/command/memory-slash.js +6 -6
- package/dist/core/command/menu-catalog.js +95 -19
- package/dist/core/command/menu-file-path.js +70 -0
- package/dist/core/command/menu-handler.js +392 -93
- package/dist/core/command/menu-protocol.js +47 -8
- package/dist/core/command/menu-query-batch.js +9 -5
- package/dist/core/command/private-mention-menu.js +71 -0
- package/dist/core/command/provider-menu.js +7 -11
- package/dist/core/command/role-menu.js +1 -1
- package/dist/core/command/skill-slash.js +17 -5
- package/dist/core/command/slash-gate.js +2 -4
- package/dist/core/command/slash-handler.js +143 -121
- package/dist/core/command/team-workspace-bootstrap.js +2 -1
- package/dist/core/command/team-workspace-team.js +3 -3
- package/dist/core/command/topic-slash.js +16 -10
- package/dist/core/{daemon-bootstrap.js → daemon/daemon-bootstrap.js} +14 -18
- package/dist/core/{daemon-control.js → daemon/daemon-control.js} +48 -21
- package/dist/core/{daemon-lifecycle.js → daemon/daemon-lifecycle.js} +28 -20
- package/dist/core/{host-snapshot.js → daemon/host-snapshot.js} +10 -5
- package/dist/core/{ipc-registration.js → daemon/ipc-registration.js} +101 -37
- package/dist/core/{lifecycle-notice.js → daemon/lifecycle-notice.js} +4 -5
- package/dist/core/file-integrity/store.js +1 -1
- package/dist/core/handoff/ipc-registration.js +3 -3
- package/dist/core/handoff/runtime.js +2 -2
- package/dist/{agents → core/inference}/request-identity.js +2 -2
- package/dist/core/inference/text-inference.js +4 -4
- package/dist/core/{bootstrap-messages.js → initialization/bootstrap-messages.js} +10 -10
- package/dist/core/{bootstrap-service.js → initialization/bootstrap-service.js} +24 -23
- package/dist/core/initialization/service.js +57 -9
- package/dist/core/invoke/executors/media.js +1 -1
- package/dist/core/invoke/executors/text.js +1 -1
- package/dist/core/memory/consolidation-context.js +3 -2
- package/dist/core/memory/consolidation-trigger.js +9 -3
- package/dist/core/memory/consolidation.js +39 -68
- package/dist/core/memory/memory-admin.js +6 -6
- package/dist/core/memory/memory-writer.js +1 -1
- package/dist/core/memory/relation-idle-monitor.js +1 -1
- package/dist/core/message/aun-ipc-sender.js +204 -88
- package/dist/core/message/aun-request-registry.js +44 -5
- package/dist/core/message/auto-mention-gate.js +1 -1
- package/dist/core/message/contact-admission.js +1 -1
- package/dist/core/message/im-renderer.js +19 -0
- package/dist/core/{interaction-router.js → message/interaction-router.js} +131 -1
- package/dist/core/message/items-formatter.js +5 -5
- package/dist/core/message/message-admission.js +1 -1
- package/dist/core/message/message-bridge.js +239 -59
- package/dist/core/message/message-log.js +8 -0
- package/dist/core/message/message-queue.js +88 -7
- package/dist/core/message/message-utils.js +1 -1
- package/dist/core/message/peer-mode.js +16 -5
- package/dist/core/message/response-engine.js +351 -152
- package/dist/core/message/send-options.js +44 -7
- package/dist/core/message/send-routing.js +55 -115
- package/dist/core/message/stream-idle-monitor.js +1 -1
- package/dist/core/{data-migration.js → migration/data-migration.js} +29 -1
- package/dist/core/model/catalog-service.js +29 -8
- package/dist/core/model/model-capabilities.js +88 -0
- package/dist/core/model/model-catalog.js +18 -7
- package/dist/core/model/model-diagnostics.js +4 -4
- package/dist/core/ownership/owner-resolver.js +107 -101
- package/dist/core/{pack-auth.js → pack/pack-auth.js} +34 -3
- package/dist/core/{pack-install.js → pack/pack-install.js} +95 -17
- package/dist/core/permission/approval-gateway.js +9 -18
- package/dist/core/permission/ec-command-parser.js +242 -82
- package/dist/core/permission/managed-file.js +234 -0
- package/dist/core/permission/protected-paths.js +120 -9
- package/dist/core/permission/sandbox-runtime.js +267 -3
- package/dist/core/permission/services-path-acl.js +9 -2
- package/dist/core/permission/session-path-grants.js +1 -1
- package/dist/core/permission/shell-environment.js +15 -1
- package/dist/core/permission/tool-policy.js +21 -9
- package/dist/core/plugin/plugin-lifecycle.js +442 -0
- package/dist/core/session/adapters/claude-session-file-adapter.js +2 -242
- package/dist/core/session/adapters/codex-session-file-adapter.js +2 -562
- package/dist/core/session/adapters/ecagent-session-file-adapter.js +2 -134
- package/dist/core/{background-session → session/background}/session-cleanup.js +2 -2
- package/dist/core/{background-session → session/background}/types.js +1 -1
- package/dist/core/session/session-file-health.js +2 -272
- package/dist/core/session/session-idle-monitor.js +1 -1
- package/dist/core/session/session-manager.js +76 -12
- package/dist/core/session/session-mapper.js +16 -0
- package/dist/core/session/session-terminal.js +185 -0
- package/dist/core/session/session-title.js +8 -11
- package/dist/core/{system-session → session/system}/memory.js +43 -9
- package/dist/core/{system-session → session/system}/registry.js +1 -1
- package/dist/core/{system-session → session/system}/types.js +1 -1
- package/dist/core/skill/index-generator.js +3 -3
- package/dist/core/skill/switch-resolver.js +3 -0
- package/dist/core/task/task-activity-store.js +112 -0
- package/dist/core/task/task-recovery-service.js +2 -2
- package/dist/core/thread/command-parser.js +4 -1
- package/dist/core/thread/ipc-operation.js +6 -4
- package/dist/core/thread/thread-operation.js +27 -11
- package/dist/core/thread/thread-route.js +5 -3
- package/dist/core/thread/thread-service.js +307 -58
- package/dist/core/thread/topic-id.js +52 -2
- package/dist/core/thread/types.js +15 -1
- package/dist/directory/{owner-directory-admission.js → admission.js} +3 -3
- package/dist/directory/{owner-directory-cache.js → cache.js} +90 -8
- package/dist/directory/{owner-directory-markdown.js → markdown.js} +2 -2
- package/dist/directory/{owner-directory-query-operation.js → query-operation.js} +83 -9
- package/dist/directory/{owner-directory-search.js → search.js} +50 -2
- package/dist/directory/{owner-directory-store.js → store.js} +2 -2
- package/dist/eck/kit-renderer.js +3 -2
- package/dist/eck/manifest-engine.js +64 -2
- package/dist/eck/message-renderer.js +35 -0
- package/dist/ecweb/basic-settings-service.js +12 -10
- package/dist/{contracts → ecweb/contracts}/ecweb-service-protocol.js +2 -1
- package/dist/ecweb/dsh-native-service.js +413 -0
- package/dist/ecweb/providers-service.js +5 -3
- package/dist/ecweb/runtime/lifecycle.js +1 -1
- package/dist/ecweb/runtime/supervisor.js +1 -1
- package/dist/event-center/center-config.js +2 -2
- package/dist/event-center/dispatcher.js +1 -1
- package/dist/event-center/ipc-operation.js +12 -3
- package/dist/event-center/pack-loader.js +2 -2
- package/dist/event-center/registry.js +6 -6
- package/dist/event-center/runtime.js +2 -2
- package/dist/index.js +181 -77
- package/dist/ipc.js +161 -12
- package/dist/outputs/authorization.js +27 -0
- package/dist/outputs/events.js +10 -1
- package/dist/outputs/panel-cards.js +960 -0
- package/dist/paths.js +60 -1
- package/dist/pay/command.js +38 -0
- package/dist/pay/protocol.js +136 -0
- package/dist/pay/runtime.js +196 -0
- package/dist/pay/service.js +384 -0
- package/dist/pay/store.js +81 -0
- package/dist/response-system/engines/v1/proactive-flow.js +30 -3
- package/dist/services/dispatcher.js +25 -7
- package/dist/services/host/main.js +397 -0
- package/dist/services/host/protocol.js +125 -0
- package/dist/services/host/resident.js +347 -0
- package/dist/services/host-client.js +398 -0
- package/dist/services/host-deploy.js +180 -0
- package/dist/services/host-launch.js +117 -0
- package/dist/services/host-recycle.js +208 -0
- package/dist/services/host-runtime.js +841 -0
- package/dist/services/idempotency.js +44 -86
- package/dist/services/index-generator.js +4 -3
- package/dist/services/index.js +258 -36
- package/dist/services/ipc-operation.js +503 -78
- package/dist/services/pack-manager.js +2 -2
- package/dist/services/router.js +43 -3
- package/dist/services/script-runner.js +541 -100
- package/dist/services/service-payload.js +28 -1
- package/dist/services/validation.js +136 -5
- package/dist/stats/context-usage.js +110 -0
- package/dist/stats/model-resolver.js +103 -17
- package/dist/stats/query.js +5 -0
- package/dist/trigger/application-service.js +9 -6
- package/dist/trigger/authorization.js +36 -33
- package/dist/trigger/ipc-service.js +4 -4
- package/dist/trigger/local-files.js +8 -166
- package/dist/trigger/manager.js +2 -2
- package/dist/trigger/parser.js +48 -0
- package/dist/trigger/scheduler.js +35 -13
- package/dist/trigger/script-executor.js +21 -0
- package/dist/trigger/script-sandbox.js +77 -232
- package/dist/trigger/system-definitions.js +25 -0
- package/dist/trigger/validation.js +1 -1
- package/dist/utils/aid-bind.js +3 -0
- package/dist/utils/atomic-write.js +88 -1
- package/dist/utils/cross-platform.js +4 -42
- package/dist/utils/error-dict.json +22 -1
- package/dist/utils/error-utils.js +193 -6
- package/dist/utils/evolcore-version.js +2 -2
- package/dist/utils/host-info.js +74 -1
- package/dist/utils/logger.js +5 -3
- package/dist/utils/media-cache.js +284 -42
- package/dist/utils/restart-safety.js +14 -1
- package/dist/utils/startup-trace.js +20 -4
- package/dist/utils/system-memory.js +113 -25
- package/dist/utils/systemd-lifecycle.js +154 -0
- package/dist/utils/welcome.js +64 -20
- package/dist/utils/windows-shell-trust.js +7 -3
- package/ecagent/README.md +35 -0
- package/ecagent/dist/agent-loop.js +80 -30
- package/ecagent/dist/harness/env/nodejs.d.ts +16 -0
- package/ecagent/dist/harness/env/nodejs.js +49 -20
- package/ecagent/dist/harness/messages.js +3 -2
- package/ecagent/dist/harness/types.d.ts +1 -0
- package/ecagent/dist/runtime/types.d.ts +2 -0
- package/ecagent/dist/runtime/utils/validation.d.ts +7 -1
- package/ecagent/dist/runtime/utils/validation.js +42 -0
- package/ecagent/dist/types.d.ts +2 -0
- package/kits/docs/INDEX.md +3 -2
- 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 +1 -0
- package/kits/docs/channels/aun.md +1 -1
- package/kits/docs/channels/feishu.md +1 -1
- package/kits/docs/evolcore/INDEX.md +13 -9
- package/kits/docs/evolcore/agent-create.md +2 -0
- package/kits/docs/evolcore/agent.md +133 -11
- package/kits/docs/evolcore/aid.md +39 -6
- package/kits/docs/evolcore/config.md +95 -1
- package/kits/docs/evolcore/ctl.md +2 -1
- package/kits/docs/evolcore/ec-capabilities.md +7 -10
- package/kits/docs/evolcore/ecweb-lifecycle.md +5 -1
- package/kits/docs/evolcore/event.md +1 -1
- package/kits/docs/evolcore/fs.md +49 -3
- package/kits/docs/evolcore/group.md +5 -4
- package/kits/docs/evolcore/memory-consolidation.md +1 -1
- package/kits/docs/evolcore/memory-tags.md +2 -0
- package/kits/docs/evolcore/menu-client.md +3 -3
- package/kits/docs/evolcore/menu-protocol.md +31 -2
- package/kits/docs/evolcore/model.md +12 -1
- package/kits/docs/evolcore/msg.md +96 -36
- package/kits/docs/evolcore/pay.md +22 -0
- package/kits/docs/evolcore/plugin.md +74 -0
- package/kits/docs/evolcore/provider.md +29 -2
- package/kits/docs/evolcore/rpc.md +2 -2
- package/kits/docs/evolcore/services.md +46 -18
- package/kits/docs/evolcore/skill.md +17 -1
- package/kits/docs/evolcore/stats.md +5 -0
- package/kits/docs/evolcore/storage.md +22 -0
- package/kits/docs/evolcore/thread-chain.md +20 -9
- package/kits/docs/evolcore/tool-authorization.md +14 -0
- package/kits/docs/evolcore/trigger.md +89 -13
- package/kits/docs/identity/AID_PROFILE_SPEC.md +1 -1
- package/kits/docs/venues/feishu-group.md +3 -2
- package/kits/docs/venues/feishu-private.md +3 -2
- package/kits/rules/01-overview.md +11 -32
- package/kits/rules/02-navigation.md +20 -6
- package/kits/rules/06-channel.md +20 -4
- package/kits/schemas/_meta.json +42 -5
- package/kits/schemas/agent-config.schema.21.json +974 -0
- package/kits/schemas/agent-config.schema.22.json +977 -0
- package/kits/schemas/agent-config.schema.23.json +974 -0
- package/kits/schemas/agent-config.schema.24.json +986 -0
- package/kits/schemas/agent-config.schema.25.json +986 -0
- package/kits/schemas/daemon.schema.10.json +373 -0
- package/kits/schemas/daemon.schema.11.json +487 -0
- package/kits/schemas/daemon.schema.12.json +505 -0
- package/kits/schemas/daemon.schema.9.json +12 -0
- package/kits/schemas/defaults.schema.7.json +472 -0
- package/kits/schemas/defaults.schema.8.json +484 -0
- package/kits/schemas/providers.schema.1.json +1 -1
- package/kits/schemas/providers.schema.2.json +1 -1
- package/kits/schemas/providers.schema.3.json +26 -4
- package/kits/schemas/relation-config.schema.13.json +289 -0
- package/kits/skills/.switches.json +17 -1
- package/kits/skills/ability/SKILL.md +395 -33
- package/kits/skills/ability/STRUCTURE.md +338 -0
- package/kits/skills/ability/references/cli.md +208 -0
- package/kits/skills/ability/references/development.md +107 -37
- package/kits/skills/ability/references/management.md +106 -46
- package/kits/skills/ability/references/runtime-protocol.md +65 -63
- package/kits/skills/agent-output-cards/SKILL.md +80 -37
- package/kits/skills/agent-output-cards/examples/html-surface.json +11 -0
- package/kits/skills/agent-output-cards/examples/meeting-followups.json +16 -0
- package/kits/skills/agent-output-cards/examples/meeting-latest.json +24 -0
- package/kits/skills/agent-output-cards/examples/project-metrics.json +16 -0
- package/kits/skills/agent-output-cards/examples/quick-links.json +18 -0
- package/kits/skills/agent-output-cards/examples/surface.html +8 -0
- package/kits/skills/agent-template-project/SKILL.md +51 -0
- package/kits/skills/agent-template-project/references/01-collect-and-pack.md +174 -0
- package/kits/skills/agent-template-project/references/02-upload-and-share.md +109 -0
- package/kits/skills/agent-template-project/references/03-download-and-install.md +189 -0
- package/kits/skills/agent-template-project/references/04-upgrade-and-recovery.md +74 -0
- package/kits/skills/agent-template-project/references/05-publish-to-platform.md +62 -0
- package/kits/skills/ec-group/SKILL.md +8 -6
- package/kits/skills/ec-group/TASK.md +186 -0
- package/kits/skills/ec-group/WORKLOG.md +180 -0
- package/kits/skills/ec-group-collaboration/SKILL.md +5 -5
- package/kits/skills/ec-identity/SKILL.md +9 -6
- package/kits/skills/ec-pay/SKILL.md +223 -0
- package/kits/skills/ec-provider/SKILL.md +6 -6
- package/kits/skills/{ec-service-proxy → ec-proxy}/SKILL.md +8 -5
- package/kits/skills/ec-service-call/SKILL.md +138 -0
- package/kits/skills/ec-service-pack/SKILL.md +277 -0
- package/kits/skills/ec-skill/SKILL.md +25 -9
- package/kits/skills/ec-skill/scripts/cli.mjs +7 -7
- package/kits/skills/ec-skill/scripts/skill.mjs +55 -41
- package/kits/skills/ec-skill/scripts/template/SKILL.md.tmpl +9 -0
- package/kits/skills/ec-trigger/SKILL.md +3 -3
- package/kits/skills/personal-assistant/SKILL.md +22 -22
- package/kits/skills/personal-assistant/references/03-data-flow-and-gaps.md +1 -1
- package/kits/skills/scrapling-article-fetch/SKILL.md +5 -5
- package/kits/skills/thread-ops/SKILL.md +19 -9
- package/kits/skills/wechat-article-media-download/SKILL.md +2 -2
- package/kits/skills/wechat-article-reader/SKILL.md +2 -2
- package/kits/templates/memory-consolidation/notes.md +2 -2
- package/kits/templates/memory-consolidation/workflow.md +46 -0
- package/kits/templates/system-fragments/channel.md +13 -4
- package/kits/templates/system-fragments/commands.md +5 -4
- package/kits/templates/system-fragments/personal-assistant.md +2 -2
- package/kits/templates/system-fragments/reply.md +15 -9
- package/kits/templates/system-fragments/session.md +2 -2
- package/kits/templates/system-fragments/thread.md +30 -127
- package/kits/templates/system-fragments/venue.md +16 -0
- package/package.json +7 -7
- package/scripts/agent-template/index.mjs +7 -1
- package/scripts/agent-template/inspect.mjs +99 -39
- package/scripts/agent-template/overlay.mjs +126 -2
- package/scripts/agent-template/shared/common.mjs +49 -5
- package/scripts/agent-template/shared/plan.mjs +4 -2
- package/scripts/agent-template/shared/service-packs.mjs +104 -0
- package/scripts/agent-template/shared/team-schema.json +468 -39
- package/scripts/agent-template/shared/template-contract.mjs +93 -51
- package/scripts/agent-template/shared/template-package.mjs +225 -44
- package/scripts/agent-template/shared/template-runtime.mjs +137 -15
- package/scripts/agent-template/shared/template.mjs +31 -8
- package/scripts/agent-template/team-pack.mjs +528 -56
- package/scripts/agent-template/team-preview.mjs +102 -9
- package/scripts/aid-batch/identity-batch.mjs +1 -1
- package/dist/agents/baseagent-availability.js +0 -152
- package/dist/agents/baseagent.js +0 -750
- package/dist/agents/codex/catalog.js +0 -80
- package/dist/agents/ecagent-plugin-lazy.js +0 -41
- package/dist/agents/tool-time-context.js +0 -55
- package/dist/core/legacy-rename.js +0 -41
- package/dist/core/plugin-lifecycle.js +0 -137
- package/dist/core/rate-window.js +0 -53
- package/dist/core/runner-reload-transaction.js +0 -60
- package/dist/core/runtime-lock.js +0 -90
- package/dist/core/soul.js +0 -66
- package/dist/core/system-session/grants.js +0 -40
- package/dist/directory/owner-directory-agentmd-sync.js +0 -89
- package/dist/directory/owner-directory-request-operation.js +0 -79
- package/dist/directory/owner-directory-text.js +0 -60
- package/kits/docs/aun/ABILITY_CALLING.md +0 -280
- package/kits/docs/evolcore/ability.md +0 -185
- package/kits/skills/ability/references/calling.md +0 -56
- package/kits/skills/ability/references/contract-checklist.md +0 -37
- package/kits/skills/ability/references/recovery.md +0 -27
- /package/dist/{core/capability/providers/gemini-capability-provider.js → agents/gemini/capability-provider.js} +0 -0
- /package/dist/core/{system-channels.js → channel/system-channels.js} +0 -0
- /package/dist/core/{daemon-file-cache.js → daemon/daemon-file-cache.js} +0 -0
- /package/dist/core/{event-bus.js → event/event-bus.js} +0 -0
- /package/dist/core/{event-catalog.js → event/event-catalog.js} +0 -0
- /package/dist/core/{pack-ledger.js → pack/pack-ledger.js} +0 -0
- /package/dist/directory/{owner-directory-identity.js → identity.js} +0 -0
- /package/dist/directory/{owner-directory-policy.js → policy.js} +0 -0
- /package/dist/directory/{owner-directory-remarks.js → remarks.js} +0 -0
- /package/dist/directory/{owner-directory-scope.js → scope.js} +0 -0
- /package/dist/{contracts → ecweb/contracts}/ecweb-instance.js +0 -0
- /package/kits/templates/{bootstrap-welcome.md → bootstrap-intro.md} +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { sameGroupAid } from '../../aun/group/identity.js';
|
|
2
|
-
import { isNonAgentSessionChannel } from '../system-channels.js';
|
|
2
|
+
import { isNonAgentSessionChannel } from '../channel/system-channels.js';
|
|
3
3
|
import { ThreadService } from './thread-service.js';
|
|
4
4
|
import { isMainSessionThreadId, resolveThreadRef } from './topic-id.js';
|
|
5
5
|
/**
|
|
@@ -55,7 +55,9 @@ export function resolveThreadRouteTarget(selfAid, threadRef, scope, target, opti
|
|
|
55
55
|
// 这里只排掉非会话渠道(daemon/系统控制面)——它们不是可投递的对话。
|
|
56
56
|
if (isNonAgentSessionChannel(entry.channelType ?? 'aun'))
|
|
57
57
|
return undefined;
|
|
58
|
-
|
|
58
|
+
// 自派:线上 scope 恒为 msg(发给本端),落点仍是话题会话,其 peerKind
|
|
59
|
+
// 可能是 group。类型过滤只对「委托给话题对端」生效。
|
|
60
|
+
if (!selfTargeted && entry.peerKind !== (scope === 'group' ? 'group' : 'private'))
|
|
59
61
|
return undefined;
|
|
60
62
|
return entry;
|
|
61
63
|
}
|
|
@@ -71,7 +73,7 @@ export function resolveThreadRouteTarget(selfAid, threadRef, scope, target, opti
|
|
|
71
73
|
return undefined;
|
|
72
74
|
if (isNonAgentSessionChannel(entry.channelType ?? 'aun'))
|
|
73
75
|
return undefined;
|
|
74
|
-
if (entry.peerKind !== (scope === 'group' ? 'group' : 'private'))
|
|
76
|
+
if (!selfTargeted && entry.peerKind !== (scope === 'group' ? 'group' : 'private'))
|
|
75
77
|
return undefined;
|
|
76
78
|
// 引用里写了 `<peer>/<id>` 时,peer 必须与索引一致——不一致说明引用来自别处。
|
|
77
79
|
if (resolved.peer !== undefined) {
|
|
@@ -2,12 +2,19 @@ import crypto from 'crypto';
|
|
|
2
2
|
import fs from 'fs';
|
|
3
3
|
import path from 'path';
|
|
4
4
|
import { agentSessionsDir, agentDir, agentThreadIndexPath, agentThreadSummariesDir, agentThreadSummaryPath } from '../../paths.js';
|
|
5
|
+
import { resolveProjectDefaultPath } from '../../utils/project-path.js';
|
|
6
|
+
import { resolveEffective } from '../../config/config-manager.js';
|
|
5
7
|
import { atomicWriteJson, atomicReadJson } from '../../utils/atomic-write.js';
|
|
6
8
|
import { appendJsonl, appendJsonlDurable, readAllJsonlLines, readLastJsonlLine, readLastJsonlLineStrict, chatDirPath, scanChatDirs, tryParseChannelSessionKey } from '../session/session-fs-store.js';
|
|
7
9
|
import { sanitizeSessionTitle, sessionTitleLength, SESSION_TITLE_MAX_LEN, SESSION_TITLE_STORED_MAX_LEN, SESSION_TITLE_ELLIPSIS } from '../session/session-title.js';
|
|
8
|
-
import {
|
|
10
|
+
import { readTopicStatusLenient } from '../session/session-mapper.js';
|
|
11
|
+
import { isMainSessionThreadId, isSelfTopicPeer, isTopicPeerAid, isTopicThreadId, mainTopicPeer, safeFormatMainTopicId, sessionTopicThreadId, normalizeThreadPeer, sameThreadPeer, isInternalThreadPeer } from './topic-id.js';
|
|
12
|
+
import { sanitizeIndexEntry } from './types.js';
|
|
13
|
+
export { normalizeThreadPeer, isInternalThreadPeer } from './topic-id.js';
|
|
9
14
|
import { PeerIdentityCache } from '../relation/peer-identity.js';
|
|
10
15
|
import { ThreadContextStorage } from './thread-context-storage.js';
|
|
16
|
+
import { isValidAid } from '../../aun/aid/validation.js';
|
|
17
|
+
import { logger } from '../../utils/logger.js';
|
|
11
18
|
const RESERVED_THREAD_IDS = new Set(['current', 'main', 'all']);
|
|
12
19
|
/**
|
|
13
20
|
* 话题名长度校验:自动生成与手动改名共用 `session-title.ts` 的两个常量。
|
|
@@ -32,6 +39,55 @@ function assertThreadNameLength(rawName, _sanitized) {
|
|
|
32
39
|
+ `其中前 ${SESSION_TITLE_MAX_LEN} 字符为正文,末尾可带 ${SESSION_TITLE_ELLIPSIS} 省略号)。`
|
|
33
40
|
+ `请缩写后重试`, 'NAME_TOO_LONG');
|
|
34
41
|
}
|
|
42
|
+
/** 由索引条目与会话文件末行算出一处漂移。 */
|
|
43
|
+
export function describeStatusDrift(entry, last) {
|
|
44
|
+
const indexStatus = readTopicStatusLenient(entry.topicStatus);
|
|
45
|
+
const fileStatus = readTopicStatusLenient(last?.topicStatus);
|
|
46
|
+
const indexUpdatedAt = Number.isSafeInteger(entry.topicStatusUpdatedAt) && entry.topicStatusUpdatedAt > 0 ? entry.topicStatusUpdatedAt : undefined;
|
|
47
|
+
const fileUpdatedAt = Number.isSafeInteger(last?.metadata?.topicStatusUpdatedAt) && last.metadata.topicStatusUpdatedAt > 0
|
|
48
|
+
? last.metadata.topicStatusUpdatedAt
|
|
49
|
+
: undefined;
|
|
50
|
+
const nameDiffers = last?.name !== entry.name;
|
|
51
|
+
const statusDiffers = indexStatus !== fileStatus;
|
|
52
|
+
if (!nameDiffers && !statusDiffers) {
|
|
53
|
+
return { threadId: entry.threadId, peer: entry.peer, kind: 'same', indexStatus, fileStatus, indexUpdatedAt, fileUpdatedAt, winner: 'ambiguous' };
|
|
54
|
+
}
|
|
55
|
+
// Activity timestamps cannot prove a status change. Unversioned history stays ambiguous.
|
|
56
|
+
let winner = 'ambiguous';
|
|
57
|
+
if (indexUpdatedAt !== undefined && fileUpdatedAt !== undefined) {
|
|
58
|
+
if (fileUpdatedAt > indexUpdatedAt)
|
|
59
|
+
winner = 'file';
|
|
60
|
+
else if (indexUpdatedAt > fileUpdatedAt)
|
|
61
|
+
winner = 'index';
|
|
62
|
+
}
|
|
63
|
+
else if (indexUpdatedAt !== undefined)
|
|
64
|
+
winner = 'index';
|
|
65
|
+
else if (fileUpdatedAt !== undefined)
|
|
66
|
+
winner = 'file';
|
|
67
|
+
return {
|
|
68
|
+
threadId: entry.threadId,
|
|
69
|
+
peer: entry.peer,
|
|
70
|
+
kind: nameDiffers && statusDiffers ? 'both' : nameDiffers ? 'name' : 'status',
|
|
71
|
+
indexStatus,
|
|
72
|
+
fileStatus,
|
|
73
|
+
indexUpdatedAt,
|
|
74
|
+
fileUpdatedAt,
|
|
75
|
+
winner,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
/**
|
|
79
|
+
* 索引条目的**写入闸门**:所有来源(创建、改名、改状态、会话侧 upsert、索引恢复、
|
|
80
|
+
* 重建、对账)在落盘前都必须过一遍。
|
|
81
|
+
*
|
|
82
|
+
* 为什么需要它:以前每个写入点各自 `push` 或改字段,任何一处漏掉校验,脏数据就
|
|
83
|
+
* 永久留在索引里,只能靠维护脚本清理。实测踩过的三类:
|
|
84
|
+
* - 内部对端(`bg:`/`trigger:`)被当成话题写进去,613 条残留;
|
|
85
|
+
* - 旧版状态值(`pending`/`completed`)原样落盘,与三态模型冲突;
|
|
86
|
+
* - 对端大小写不一致,同一对端出现两条。
|
|
87
|
+
*
|
|
88
|
+
* 闸门的职责是**拒绝**而不是修复:拿不出合法形态的条目直接丢弃并留日志,宁可
|
|
89
|
+
* 少一条也不写入一条永久性的脏数据。
|
|
90
|
+
*/
|
|
35
91
|
const LIST_DEFAULT_LIMIT = 10;
|
|
36
92
|
const LIST_MAX_LIMIT = 200;
|
|
37
93
|
export class ThreadServiceError extends Error {
|
|
@@ -58,18 +114,59 @@ function newThreadId() {
|
|
|
58
114
|
* 新索引缺失或为空时回退读旧文件,转换后写回新路径。写回是幂等的:
|
|
59
115
|
* 成功一次之后新索引存在,后续不会再走旧文件;旧文件保持原样,不删除。
|
|
60
116
|
*/
|
|
117
|
+
/**
|
|
118
|
+
* 索引 schema 版本。当前是 2:
|
|
119
|
+
*
|
|
120
|
+
* - 1 → 2:条目形态收口。`topicStatus` 归一为三态、`channelType` 补全、
|
|
121
|
+
* 内部对端(`bg:`/`trigger:`)与非法对端条目丢弃。
|
|
122
|
+
*
|
|
123
|
+
* 之前 `version: 1` 从来没被读过,所以结构演进只能靠一次性维护脚本清数据
|
|
124
|
+
* (2026-11-16 清过 613 条 `bg:`/`trigger:` 残留就是这个原因)。现在版本号
|
|
125
|
+
* 参与决策:读取旧版本时归一内存视图,显式写入时保存当前版本。
|
|
126
|
+
*/
|
|
127
|
+
const THREAD_INDEX_VERSION = 2;
|
|
128
|
+
/**
|
|
129
|
+
* 读时迁移:把旧版本索引的条目过一遍写入闸门,必要时写回。
|
|
130
|
+
*
|
|
131
|
+
* 迁移是**幂等**的:版本已是最新时直接返回原对象,不产生额外磁盘写。
|
|
132
|
+
* 写回失败不阻断读取——内存里已经是迁移后的形态,下次读取会再试一次。
|
|
133
|
+
*/
|
|
134
|
+
function migrateIndexOnRead(indexPath, raw) {
|
|
135
|
+
if (Number(raw.version) >= THREAD_INDEX_VERSION)
|
|
136
|
+
return raw;
|
|
137
|
+
const migratedThreads = [];
|
|
138
|
+
const dropped = [];
|
|
139
|
+
for (const entry of raw.threads) {
|
|
140
|
+
const gated = sanitizeIndexEntry(entry);
|
|
141
|
+
if (gated.ok)
|
|
142
|
+
migratedThreads.push(gated.entry);
|
|
143
|
+
else
|
|
144
|
+
dropped.push(`${entry.threadId ?? '?'}(${gated.reason})`);
|
|
145
|
+
}
|
|
146
|
+
const migrated = { version: THREAD_INDEX_VERSION, threads: migratedThreads };
|
|
147
|
+
if (dropped.length > 0) {
|
|
148
|
+
logger.warn(`[Thread] 索引迁移丢弃 ${dropped.length} 条无法归一的条目: ${dropped.slice(0, 5).join(', ')}${dropped.length > 5 ? ' …' : ''}`);
|
|
149
|
+
}
|
|
150
|
+
// Persist normalization only during an explicit write operation.
|
|
151
|
+
return migrated;
|
|
152
|
+
}
|
|
61
153
|
function readIndex(indexPath) {
|
|
62
154
|
const raw = atomicReadJson(indexPath);
|
|
63
155
|
if (raw && Array.isArray(raw.threads) && raw.threads.length > 0) {
|
|
64
|
-
return raw;
|
|
156
|
+
return migrateIndexOnRead(indexPath, raw);
|
|
65
157
|
}
|
|
66
158
|
const legacyPath = path.join(path.dirname(path.dirname(indexPath)), 'thread-index.json');
|
|
67
159
|
if (legacyPath !== indexPath) {
|
|
68
160
|
const legacy = atomicReadJson(legacyPath);
|
|
69
161
|
if (legacy && Array.isArray(legacy.threads) && legacy.threads.length > 0) {
|
|
162
|
+
// 旧文件的条目也要过闸门:从旧路径搬过来的数据同样是历史形态。
|
|
163
|
+
const gatedThreads = legacy.threads
|
|
164
|
+
.map(e => sanitizeIndexEntry(e))
|
|
165
|
+
.filter((g) => g.ok)
|
|
166
|
+
.map(g => g.entry);
|
|
70
167
|
const migrated = {
|
|
71
|
-
version:
|
|
72
|
-
threads:
|
|
168
|
+
version: THREAD_INDEX_VERSION,
|
|
169
|
+
threads: gatedThreads,
|
|
73
170
|
};
|
|
74
171
|
// 顺手落盘;失败不影响本次读取(例如目录只读),下次仍能走回退。
|
|
75
172
|
try {
|
|
@@ -80,9 +177,10 @@ function readIndex(indexPath) {
|
|
|
80
177
|
return migrated;
|
|
81
178
|
}
|
|
82
179
|
}
|
|
180
|
+
// 空 threads 的索引也走一遍迁移,保证返回值的版本号与条目形态一致。
|
|
83
181
|
if (raw && Array.isArray(raw.threads))
|
|
84
|
-
return raw;
|
|
85
|
-
return { version:
|
|
182
|
+
return migrateIndexOnRead(indexPath, raw);
|
|
183
|
+
return { version: THREAD_INDEX_VERSION, threads: [] };
|
|
86
184
|
}
|
|
87
185
|
/**
|
|
88
186
|
* 把用户传入的 peer 归一成索引里实际存储的形态(对端在该渠道下的原生 ID)。
|
|
@@ -95,30 +193,23 @@ function readIndex(indexPath) {
|
|
|
95
193
|
*
|
|
96
194
|
* 对已经是裸 ID 的输入是幂等的;解析不出前缀时原样返回(由调用方按"无此对端"处理)。
|
|
97
195
|
*/
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
const seg = raw.split('#').pop() ?? '';
|
|
107
|
-
try {
|
|
108
|
-
return decodeURIComponent(seg).trim() || undefined;
|
|
109
|
-
}
|
|
110
|
-
catch {
|
|
111
|
-
return seg.trim() || undefined;
|
|
112
|
-
}
|
|
196
|
+
/**
|
|
197
|
+
* 索引条目的对端是否就是本端自己。
|
|
198
|
+
*
|
|
199
|
+
* 与 `topic-id.isSelfTopicPeer` 同义,区别只在入参形态:索引里存的是已经归一过的
|
|
200
|
+
* 裸对端 ID,创建入口拿到的可能是 `aun#<aid>` 这类带渠道前缀的写法,这里先归一。
|
|
201
|
+
*/
|
|
202
|
+
export function isSelfThreadPeer(peer, selfAid) {
|
|
203
|
+
return isSelfTopicPeer(normalizeThreadPeer(peer), normalizeThreadPeer(selfAid));
|
|
113
204
|
}
|
|
114
205
|
/** 内部话题(daemon 命名空间的会话记录)的对端标识前缀。 */
|
|
115
206
|
const INTERNAL_PEER_RE = /^(bg:|trigger:|daemon:|memory:)/;
|
|
116
207
|
/** 该条目是否为内部话题(非真实联系人,通常没有消息日志)。 */
|
|
117
|
-
export function isInternalThreadPeer(peer) {
|
|
118
|
-
return INTERNAL_PEER_RE.test(peer);
|
|
119
|
-
}
|
|
120
208
|
function writeIndex(indexPath, index) {
|
|
121
|
-
|
|
209
|
+
const threads = index.threads.map(entry => sanitizeIndexEntry(entry))
|
|
210
|
+
.filter((result) => result.ok)
|
|
211
|
+
.map(result => result.entry);
|
|
212
|
+
atomicWriteJson(indexPath, { ...index, version: THREAD_INDEX_VERSION, threads });
|
|
122
213
|
}
|
|
123
214
|
/**
|
|
124
215
|
* 索引条目所属的渠道类型。
|
|
@@ -173,7 +264,7 @@ export class ThreadService {
|
|
|
173
264
|
findInIndex(selfAid, peer, threadId) {
|
|
174
265
|
const want = normalizeThreadPeer(peer);
|
|
175
266
|
const index = this.readThreadIndex(selfAid);
|
|
176
|
-
const indexed = index.threads.find(t =>
|
|
267
|
+
const indexed = index.threads.find(t => sameThreadPeer(t.peer, want, entryChannelType(t)) && t.threadId === threadId);
|
|
177
268
|
if (indexed)
|
|
178
269
|
return indexed;
|
|
179
270
|
// Older agents can still have a valid topic session under the per-chat
|
|
@@ -183,9 +274,14 @@ export class ThreadService {
|
|
|
183
274
|
const recovered = this.recoverThreadFromSessionFiles(selfAid, want, threadId);
|
|
184
275
|
if (!recovered)
|
|
185
276
|
return undefined;
|
|
277
|
+
const gated = sanitizeIndexEntry(recovered);
|
|
278
|
+
if (!gated.ok) {
|
|
279
|
+
logger.warn(`[Thread] 丢弃无法恢复的索引条目 thread=${threadId} peer=${want}: ${gated.reason}`);
|
|
280
|
+
return undefined;
|
|
281
|
+
}
|
|
186
282
|
const next = {
|
|
187
283
|
version: 1,
|
|
188
|
-
threads: [...index.threads,
|
|
284
|
+
threads: [...index.threads, gated.entry],
|
|
189
285
|
};
|
|
190
286
|
try {
|
|
191
287
|
this.writeThreadIndex(selfAid, next);
|
|
@@ -206,7 +302,7 @@ export class ThreadService {
|
|
|
206
302
|
if (!dirEntry.isDirectory())
|
|
207
303
|
continue;
|
|
208
304
|
const parsedDir = tryParseChannelSessionKey(dirEntry.name);
|
|
209
|
-
if (!parsedDir ||
|
|
305
|
+
if (!parsedDir || !sameThreadPeer(parsedDir.channelId, peer, parsedDir.channelType))
|
|
210
306
|
continue;
|
|
211
307
|
const chatDir = path.join(sessionsDir, dirEntry.name);
|
|
212
308
|
const threadsDir = path.join(chatDir, '_threads');
|
|
@@ -220,7 +316,7 @@ export class ThreadService {
|
|
|
220
316
|
const last = readLastJsonlLine(path.join(threadsDir, file.name));
|
|
221
317
|
if (!last || last.threadId !== threadId)
|
|
222
318
|
continue;
|
|
223
|
-
if (
|
|
319
|
+
if (!sameThreadPeer(last.channelId, peer, parsedDir.channelType))
|
|
224
320
|
continue;
|
|
225
321
|
if (last.selfAID && last.selfAID !== selfAid)
|
|
226
322
|
continue;
|
|
@@ -233,7 +329,7 @@ export class ThreadService {
|
|
|
233
329
|
channelType: parsedDir.channelType,
|
|
234
330
|
peerKind: last.chatType === 'group' ? 'group' : 'private',
|
|
235
331
|
name: last.name ?? threadId,
|
|
236
|
-
topicStatus: last.topicStatus
|
|
332
|
+
topicStatus: readTopicStatusLenient(last.topicStatus),
|
|
237
333
|
createdAt: last.createdAt ?? 0,
|
|
238
334
|
lastActiveAt: last.updatedAt ?? 0,
|
|
239
335
|
...(typeof last.metadata?.nameUpdatedAt === 'number'
|
|
@@ -261,27 +357,77 @@ export class ThreadService {
|
|
|
261
357
|
}
|
|
262
358
|
// ── P1a.1.2: 话题创建 ──
|
|
263
359
|
async createThread(input) {
|
|
264
|
-
const {
|
|
360
|
+
const { peerKind, name, topicStatus } = input;
|
|
361
|
+
const selfAid = normalizeThreadPeer(input.selfAid) ?? input.selfAid;
|
|
265
362
|
const peer = normalizeThreadPeer(input.peer) ?? input.peer;
|
|
363
|
+
// 本端是拼路径的原料(`aun#<selfAid>#main` 与 `agents/<selfAid>/…`),不校验会
|
|
364
|
+
// 让 `../` 之类的值直接进目录名。CLI 侧 `--self` 走 `isValidAid`,但直调
|
|
365
|
+
// (`ThreadService.createThread`)没有那一层,校验必须落在这里。
|
|
366
|
+
// 用 `isValidAid`(三级)而不是对端那套两级门槛:本端永远是自己这台机器的
|
|
367
|
+
// 完整 AID,不像群 AID 那样有两级形态。
|
|
368
|
+
if (!isValidAid(selfAid)) {
|
|
369
|
+
throw new ThreadServiceError(`本端 AID 不是有效的三级域名形态: ${selfAid}`, 'INVALID_SELF_AID');
|
|
370
|
+
}
|
|
266
371
|
// Validate name
|
|
267
372
|
const sanitized = sanitizeSessionTitle(name);
|
|
268
373
|
if (!sanitized)
|
|
269
374
|
throw new ThreadServiceError('话题名称不能为空', 'INVALID_NAME');
|
|
270
375
|
assertThreadNameLength(name, sanitized);
|
|
376
|
+
// 内部对端(`bg:` / `trigger:` / `daemon:` / `memory:`)先单独拦一次:
|
|
377
|
+
// 它们不是 AID,而是 daemon 自己会话的标识,走不到任何真实对端。最主要的
|
|
378
|
+
// 触发场景是「在后台会话 / 定时任务里执行 `/thread create`」——那里的
|
|
379
|
+
// `peerKey` 就是这类标识。归一后的 AID 报错("应为两级以上域名")会让人以为
|
|
380
|
+
// 是拼写问题,实际原因是当前会话根本没有对话方。
|
|
381
|
+
if (isInternalThreadPeer(peer)) {
|
|
382
|
+
throw new ThreadServiceError(`话题对端不能是内部会话标识(${peer})。话题是两端结构,需要一个真实对端 AID。`
|
|
383
|
+
+ '当前会话是后台任务或定时触发,没有对话方,请在有对端的会话里创建,'
|
|
384
|
+
+ '或用 ec thread create <对端AID> --name <名称> 指定对端', 'INTERNAL_PEER_NOT_ALLOWED');
|
|
385
|
+
}
|
|
386
|
+
// 初步筛查对端形态。门槛按话题口径(两级即可)而非 `isValidAid`(三级),
|
|
387
|
+
// 否则 `g-xxx.agentid.cn` 这类群 AID 会被误杀。
|
|
388
|
+
if (!isTopicPeerAid(peer)) {
|
|
389
|
+
throw new ThreadServiceError(`话题对端不是有效的 AID: ${peer}。应为两级以上域名(如 alice.agentid.cn、g-xxx.agentid.cn)`, 'INVALID_PEER_AID');
|
|
390
|
+
}
|
|
391
|
+
// 话题是两端结构,对端不能是本端。放在建会话之前:一旦建成「我↔我」的会话,
|
|
392
|
+
// 后续索引、会话元数据、回复目标都会指向本端,只能靠人工清理。
|
|
393
|
+
if (isSelfThreadPeer(peer, selfAid)) {
|
|
394
|
+
throw new ThreadServiceError(`话题对端不能是本端自己(${peer})。跨话题自派请先以真实对端建话题,再用 --thread <话题id> --selfmode 投递`, 'SELF_PEER_NOT_ALLOWED');
|
|
395
|
+
}
|
|
271
396
|
// Check for duplicate name on same peer
|
|
272
397
|
const index = this.readThreadIndex(selfAid);
|
|
273
|
-
|
|
398
|
+
// 比对走 `sameThreadPeer`(剥前缀 + 小写),两侧都是:历史条目可能带
|
|
399
|
+
// `aun#<peer>` 前缀,也可能与本次输入大小写不同,裸 `t.peer === peer` 两种都漏判。
|
|
400
|
+
const dup = index.threads.find(t => sameThreadPeer(t.peer, peer, entryChannelType(t)) && t.name === sanitized);
|
|
274
401
|
if (dup) {
|
|
275
402
|
throw new ThreadServiceError(`与 ${peer} 已有同名话题: ${sanitized}`, 'TOPIC_CONFLICT');
|
|
276
403
|
}
|
|
404
|
+
// 名片检查只做本地缓存筛查,绝不联网:建话题不发送任何东西,离线必须可建。
|
|
405
|
+
//
|
|
406
|
+
// 「这个对端口」已经有话题时直接视为已知对端,跳过检查——已有话题本身就
|
|
407
|
+
// 证明关系成立,再去看名片是多余的一次磁盘读。
|
|
408
|
+
//
|
|
409
|
+
// 判据是 PeerIdentityCache 的快照,不是「缓存文件在不在」:`markUnknown`
|
|
410
|
+
// 也会落盘(source='unknown'),只判存在性会把"从未取到名片"当成"有名片"。
|
|
411
|
+
// 验签未通过的 `agentmd-unverified` 仍算见过名片:对端轮换密钥的窗口期
|
|
412
|
+
// 很常见,卡在这里是误杀,与「初步筛查」的定位不符。
|
|
413
|
+
const knownPeer = index.threads.some(t => sameThreadPeer(t.peer, peer, entryChannelType(t)));
|
|
414
|
+
let peerUnverified = false;
|
|
415
|
+
if (!knownPeer) {
|
|
416
|
+
const cached = PeerIdentityCache.get('aun', peer, agentDir(selfAid));
|
|
417
|
+
peerUnverified = !cached || cached.source === 'unknown';
|
|
418
|
+
}
|
|
277
419
|
const threadId = newThreadId();
|
|
278
420
|
const now = Date.now();
|
|
279
421
|
// Create local session via SessionManager
|
|
280
|
-
// channel = 'aun#<selfAid>#main', channelId = peer
|
|
422
|
+
// channel = 'aun#<selfAid>#main', channelId = peer
|
|
423
|
+
// 话题会话的 projectPath 沿用本端 agent 的 defaultPath:入队时队列键与 item 都会带上它,
|
|
424
|
+
// 否则空 projectPath 会让 parseQueueSnapshot 的 validPart 拒绝整个快照(见 message-queue.ts)。
|
|
281
425
|
const channelKey = `aun#${selfAid}#main`;
|
|
426
|
+
const threadProjectPath = resolveProjectDefaultPath(resolveEffective({ self: selfAid }, { cache: true }).projects?.defaultPath)
|
|
427
|
+
|| process.cwd();
|
|
282
428
|
const session = await this.sessionManager.getOrCreateSession(channelKey, // channel
|
|
283
429
|
peer, // channelId
|
|
284
|
-
|
|
430
|
+
threadProjectPath, // defaultProjectPath — 沿用 agent 的 defaultPath,不再传空
|
|
285
431
|
threadId, // threadId
|
|
286
432
|
{ peerName: peer, nameUpdatedAt: now }, // metadata
|
|
287
433
|
sanitized, // name
|
|
@@ -305,7 +451,13 @@ export class ThreadService {
|
|
|
305
451
|
createdAt: now,
|
|
306
452
|
lastActiveAt: now,
|
|
307
453
|
};
|
|
308
|
-
|
|
454
|
+
// 过写入闸门再落盘。正常路径必然通过(peer 与 name 已经校验过),
|
|
455
|
+
// 这里是防御:以后新增分支不用各自记得校验。
|
|
456
|
+
const gated = sanitizeIndexEntry(entry);
|
|
457
|
+
if (!gated.ok) {
|
|
458
|
+
throw new ThreadServiceError(`索引条目无法写入:${gated.reason}`, 'INVALID_INDEX_ENTRY');
|
|
459
|
+
}
|
|
460
|
+
index.threads.push(gated.entry);
|
|
309
461
|
this.writeThreadIndex(selfAid, index);
|
|
310
462
|
return {
|
|
311
463
|
threadId,
|
|
@@ -314,6 +466,9 @@ export class ThreadService {
|
|
|
314
466
|
peer,
|
|
315
467
|
peerKind,
|
|
316
468
|
createdAt: now,
|
|
469
|
+
// 只有为 true 时才出现在返回值里:老调用方按 `'createdAt' in obj` 判类型,
|
|
470
|
+
// 恒带一个 false 字段会让输出与历史结果产生无意义差异。
|
|
471
|
+
...(peerUnverified ? { peerUnverified: true } : {}),
|
|
317
472
|
};
|
|
318
473
|
}
|
|
319
474
|
// ── P1a.1.5: 话题改名 ──
|
|
@@ -345,7 +500,7 @@ export class ThreadService {
|
|
|
345
500
|
return { changed: true, name: sanitized, nameUpdatedAt, peerKind: main.peerKind };
|
|
346
501
|
}
|
|
347
502
|
const index = this.readThreadIndex(selfAid);
|
|
348
|
-
const entry = index.threads.find(t => t.peer
|
|
503
|
+
const entry = index.threads.find(t => sameThreadPeer(t.peer, peer, entryChannelType(t)) && t.threadId === threadId);
|
|
349
504
|
if (!entry)
|
|
350
505
|
throw new ThreadServiceError(`话题不存在: ${threadId}`, 'TOPIC_NOT_FOUND');
|
|
351
506
|
if (entry.name === sanitized)
|
|
@@ -393,12 +548,12 @@ export class ThreadService {
|
|
|
393
548
|
return renamed ? { applied: true } : { applied: false, reason: 'invalid' };
|
|
394
549
|
}
|
|
395
550
|
const index = this.readThreadIndex(input.selfAid);
|
|
396
|
-
const entry = index.threads.find(t => t.peer
|
|
551
|
+
const entry = index.threads.find(t => sameThreadPeer(t.peer, peer, entryChannelType(t)) && t.threadId === input.threadId);
|
|
397
552
|
const current = entry?.nameUpdatedAt ?? 0;
|
|
398
553
|
if (input.nameUpdatedAt <= current)
|
|
399
554
|
return { applied: false, reason: 'stale' };
|
|
400
555
|
if (!entry) {
|
|
401
|
-
|
|
556
|
+
const created = {
|
|
402
557
|
threadId: input.threadId,
|
|
403
558
|
sessionId: '',
|
|
404
559
|
peer,
|
|
@@ -409,7 +564,13 @@ export class ThreadService {
|
|
|
409
564
|
topicStatus: 'active',
|
|
410
565
|
createdAt: input.nameUpdatedAt,
|
|
411
566
|
lastActiveAt: input.nameUpdatedAt,
|
|
412
|
-
}
|
|
567
|
+
};
|
|
568
|
+
// 对端发来的改名通知也会建条目,同样要过闸门:对端可能是群 AID、
|
|
569
|
+
// 也可能是被伪造的畸形值,不能因为"对方说的"就绕开校验。
|
|
570
|
+
const gated = sanitizeIndexEntry(created);
|
|
571
|
+
if (!gated.ok)
|
|
572
|
+
return { applied: false, reason: 'invalid' };
|
|
573
|
+
index.threads.push(gated.entry);
|
|
413
574
|
this.writeThreadIndex(input.selfAid, index);
|
|
414
575
|
return { applied: true };
|
|
415
576
|
}
|
|
@@ -427,16 +588,22 @@ export class ThreadService {
|
|
|
427
588
|
const { selfAid, threadId, topicStatus } = input;
|
|
428
589
|
const peer = normalizeThreadPeer(input.peer) ?? input.peer;
|
|
429
590
|
const index = this.readThreadIndex(selfAid);
|
|
430
|
-
const entry = index.threads.find(t => t.peer
|
|
591
|
+
const entry = index.threads.find(t => sameThreadPeer(t.peer, peer, entryChannelType(t)) && t.threadId === threadId);
|
|
431
592
|
if (!entry)
|
|
432
593
|
throw new ThreadServiceError(`话题不存在: ${threadId}`, 'TOPIC_NOT_FOUND');
|
|
594
|
+
// 版本号取「当前时间」与「旧值 + 1」的较大者,与改名同一口径:时钟回拨或
|
|
595
|
+
// 同一毫秒内连续改状态时,版本仍然严格递增,不会让后一次修改被判成过期。
|
|
596
|
+
const previous = Number(entry.topicStatusUpdatedAt ?? 0);
|
|
597
|
+
const updatedAt = Math.max(Date.now(), previous + 1);
|
|
433
598
|
entry.topicStatus = topicStatus;
|
|
434
|
-
entry.
|
|
599
|
+
entry.topicStatusUpdatedAt = updatedAt;
|
|
600
|
+
entry.lastActiveAt = updatedAt;
|
|
435
601
|
this.writeThreadIndex(selfAid, index);
|
|
436
602
|
this.appendThreadSnapshot(selfAid, entry);
|
|
437
603
|
const session = await this.sessionManager.getThreadSession(entryChannelType(entry), entry.peer, threadId, selfAid);
|
|
438
604
|
if (session) {
|
|
439
|
-
|
|
605
|
+
// 会话文件那一侧带着同一个版本号写,两边因此可以按版本判定谁新。
|
|
606
|
+
await this.sessionManager.setTopicStatus(session.id, topicStatus, updatedAt);
|
|
440
607
|
}
|
|
441
608
|
}
|
|
442
609
|
// ── list-peers ──
|
|
@@ -540,15 +707,19 @@ export class ThreadService {
|
|
|
540
707
|
const peer = normalizeThreadPeer(input.peer);
|
|
541
708
|
const limit = Math.min(rawLimit ?? LIST_DEFAULT_LIMIT, LIST_MAX_LIMIT);
|
|
542
709
|
const { index, state: indexState } = this.readThreadIndexWithState(selfAid);
|
|
710
|
+
// 内部话题(`bg:`/`trigger:`)不会出现在这里:读时迁移已经把它们从索引里
|
|
711
|
+
// 摘掉了(见 `migrateIndexOnRead`),不需要在展示层再过滤一次。
|
|
712
|
+
const visible = index.threads;
|
|
543
713
|
// 未套过滤条件的话题数:用于把「该对端确实没有话题」与
|
|
544
714
|
// 「有话题但被 --status 挡掉」区分开。
|
|
545
715
|
const peerTopicCount = peer
|
|
546
|
-
?
|
|
547
|
-
:
|
|
548
|
-
let threads =
|
|
549
|
-
if (peer &&
|
|
716
|
+
? visible.filter(t => sameThreadPeer(t.peer, peer, entryChannelType(t))).length
|
|
717
|
+
: visible.length;
|
|
718
|
+
let threads = visible.filter(t => {
|
|
719
|
+
if (peer && !sameThreadPeer(t.peer, peer, entryChannelType(t)))
|
|
550
720
|
return false;
|
|
551
|
-
|
|
721
|
+
// 同理:过滤按归一后的状态比,否则 `--status active` 会漏掉索引里残留旧值的话题。
|
|
722
|
+
if (status && readTopicStatusLenient(t.topicStatus) !== status)
|
|
552
723
|
return false;
|
|
553
724
|
return true;
|
|
554
725
|
});
|
|
@@ -727,7 +898,7 @@ export class ThreadService {
|
|
|
727
898
|
// 索引里能查到条目时用条目的命名空间(内部话题在 daemon 下),查不到时退回 aun。
|
|
728
899
|
const indexed = isMainSessionThreadId(threadId)
|
|
729
900
|
? undefined
|
|
730
|
-
: this.readThreadIndex(selfAid).threads.find(t => t.threadId === threadId &&
|
|
901
|
+
: this.readThreadIndex(selfAid).threads.find(t => t.threadId === threadId && sameThreadPeer(t.peer, peer, entryChannelType(t)));
|
|
731
902
|
const chatDir = this.chatDirFor(selfAid, indexed?.peer ?? peer, indexed?.channelType);
|
|
732
903
|
const logPath = path.join(chatDir, 'messages.jsonl');
|
|
733
904
|
if (!fs.existsSync(logPath))
|
|
@@ -827,7 +998,7 @@ export class ThreadService {
|
|
|
827
998
|
: typeof last.nameUpdatedAt === 'number'
|
|
828
999
|
? { nameUpdatedAt: last.nameUpdatedAt }
|
|
829
1000
|
: {}),
|
|
830
|
-
topicStatus: last.topicStatus
|
|
1001
|
+
topicStatus: readTopicStatusLenient(last.topicStatus),
|
|
831
1002
|
createdAt: last.createdAt ?? 0,
|
|
832
1003
|
lastActiveAt: last.updatedAt ?? 0,
|
|
833
1004
|
});
|
|
@@ -838,21 +1009,36 @@ export class ThreadService {
|
|
|
838
1009
|
}
|
|
839
1010
|
}
|
|
840
1011
|
if (!dryRun) {
|
|
841
|
-
|
|
1012
|
+
// 重建同样过闸门:扫描的是磁盘上的历史文件,里面可能还有旧格式残留。
|
|
1013
|
+
const gatedEntries = entries
|
|
1014
|
+
.map(e => sanitizeIndexEntry(e))
|
|
1015
|
+
.filter((g) => g.ok)
|
|
1016
|
+
.map(g => g.entry);
|
|
1017
|
+
const index = { version: THREAD_INDEX_VERSION, threads: gatedEntries };
|
|
842
1018
|
this.writeThreadIndex(selfAid, index);
|
|
843
1019
|
}
|
|
844
1020
|
return { rebuilt: entries.length };
|
|
845
1021
|
}
|
|
846
1022
|
/**
|
|
847
|
-
*
|
|
848
|
-
* missing
|
|
849
|
-
* stale
|
|
1023
|
+
* 检查话题索引的健康状态,区分四类问题:
|
|
1024
|
+
* missing — _threads JSONL 文件不存在(数据问题,严重,rebuild 会丢失属性改动)
|
|
1025
|
+
* stale — 文件存在但最后一行的 name/topicStatus 与索引不一致(写盘时序问题,轻微)
|
|
1026
|
+
* selfPeer — 对端就是本端自己的残缺话题(结构不成立,rebuild 修不好,只能删除)
|
|
1027
|
+
*
|
|
1028
|
+
* 内部话题(`bg:`/`trigger:`)不在检查范围内:读时迁移已经把这类条目从索引里
|
|
1029
|
+
* 摘掉,它们不会再出现在 `missing` 里淹没真实的数据问题。
|
|
850
1030
|
*/
|
|
851
1031
|
checkIndex(selfAid) {
|
|
852
1032
|
const index = this.readThreadIndex(selfAid);
|
|
853
1033
|
const missingIds = [];
|
|
854
1034
|
const staleIds = [];
|
|
1035
|
+
const selfPeerIds = [];
|
|
1036
|
+
const staleDetails = [];
|
|
855
1037
|
for (const entry of index.threads) {
|
|
1038
|
+
// 残缺结构单独计数:它既不是文件缺失也不是属性不同步,rebuild 也无从修复,
|
|
1039
|
+
// 混进另外两类会让用户按建议执行 rebuild 却发现问题依旧。
|
|
1040
|
+
if (isSelfThreadPeer(entry.peer, selfAid))
|
|
1041
|
+
selfPeerIds.push(entry.threadId);
|
|
856
1042
|
// 按条目自己的命名空间(aun / daemon)拼目录。历史上这里写死 `aun#main#`,
|
|
857
1043
|
// 导致 daemon 命名空间的内部话题 100% 被误判为 missing。
|
|
858
1044
|
const chatDir = this.chatDirFor(selfAid, entry.peer, entry.channelType);
|
|
@@ -861,13 +1047,16 @@ export class ThreadService {
|
|
|
861
1047
|
missingIds.push(entry.threadId);
|
|
862
1048
|
continue;
|
|
863
1049
|
}
|
|
864
|
-
// 检查最后一行是否与索引一致(name / topicStatus
|
|
1050
|
+
// 检查最后一行是否与索引一致(name / topicStatus)。
|
|
1051
|
+
// 状态先归一再比:两侧都可能存着旧版本的 `pending`/`in_progress`/`completed`,
|
|
1052
|
+
// 直接比原始值会把"同一个状态"(如两边都是旧值 pending 与 active)判成 stale。
|
|
865
1053
|
try {
|
|
866
1054
|
const lines = readAllJsonlLines(metaPath);
|
|
867
1055
|
const last = lines[lines.length - 1];
|
|
868
1056
|
if (last && (last.name !== entry.name ||
|
|
869
|
-
(last.topicStatus
|
|
1057
|
+
readTopicStatusLenient(last.topicStatus) !== readTopicStatusLenient(entry.topicStatus))) {
|
|
870
1058
|
staleIds.push(entry.threadId);
|
|
1059
|
+
staleDetails.push(describeStatusDrift(entry, last));
|
|
871
1060
|
}
|
|
872
1061
|
}
|
|
873
1062
|
catch {
|
|
@@ -879,8 +1068,61 @@ export class ThreadService {
|
|
|
879
1068
|
total: index.threads.length,
|
|
880
1069
|
missing: missingIds.length, missingIds,
|
|
881
1070
|
stale: staleIds.length, staleIds,
|
|
1071
|
+
selfPeer: selfPeerIds.length, selfPeerIds,
|
|
1072
|
+
staleDetails,
|
|
882
1073
|
};
|
|
883
1074
|
}
|
|
1075
|
+
/**
|
|
1076
|
+
* 按版本号把「索引 ↔ 会话文件」的状态漂移对齐。
|
|
1077
|
+
*
|
|
1078
|
+
* 与 `rebuildIndex` 的区别是**逐条、可预览、不丢东西**:只改状态冲突的那几个
|
|
1079
|
+
* 字段,其余条目与属性一概不碰。`apply: false` 时只报告不落盘。
|
|
1080
|
+
*
|
|
1081
|
+
* 方向由版本号决定(`topicStatusUpdatedAt` 较新者胜);两侧都没有版本号的历史
|
|
1082
|
+
* 无状态版本的历史条目保持 ambiguous;消息活跃时间不能证明状态变更。
|
|
1083
|
+
*/
|
|
1084
|
+
reconcileStatus(selfAid, options = {}) {
|
|
1085
|
+
const index = this.readThreadIndex(selfAid);
|
|
1086
|
+
const drift = [];
|
|
1087
|
+
let applied = 0;
|
|
1088
|
+
for (const entry of index.threads) {
|
|
1089
|
+
if (isInternalThreadPeer(entry.peer))
|
|
1090
|
+
continue;
|
|
1091
|
+
const chatDir = this.chatDirFor(selfAid, entry.peer, entry.channelType);
|
|
1092
|
+
const metaPath = path.join(chatDir, '_threads', `${entry.sessionId}.jsonl`);
|
|
1093
|
+
if (!fs.existsSync(metaPath))
|
|
1094
|
+
continue;
|
|
1095
|
+
let last;
|
|
1096
|
+
try {
|
|
1097
|
+
const lines = readAllJsonlLines(metaPath);
|
|
1098
|
+
last = lines[lines.length - 1];
|
|
1099
|
+
}
|
|
1100
|
+
catch {
|
|
1101
|
+
continue;
|
|
1102
|
+
}
|
|
1103
|
+
if (!last)
|
|
1104
|
+
continue;
|
|
1105
|
+
const d = describeStatusDrift(entry, last);
|
|
1106
|
+
if (d.kind === 'same')
|
|
1107
|
+
continue;
|
|
1108
|
+
drift.push(d);
|
|
1109
|
+
if (!options.apply)
|
|
1110
|
+
continue;
|
|
1111
|
+
if (d.kind === 'name')
|
|
1112
|
+
continue;
|
|
1113
|
+
if (d.winner === 'index' || d.winner === 'ambiguous')
|
|
1114
|
+
continue;
|
|
1115
|
+
// 只有「文件更新」才回写索引:反过来改会话文件要新增一行快照,属于
|
|
1116
|
+
// append 语义,等下一次真实的 status 写入一并完成,避免这里伪造状态变更。
|
|
1117
|
+
entry.topicStatus = d.fileStatus;
|
|
1118
|
+
entry.topicStatusUpdatedAt = d.fileUpdatedAt ?? Date.now();
|
|
1119
|
+
entry.lastActiveAt = Math.max(Number(entry.lastActiveAt ?? 0), Number(d.fileUpdatedAt ?? 0));
|
|
1120
|
+
applied++;
|
|
1121
|
+
}
|
|
1122
|
+
if (applied > 0)
|
|
1123
|
+
this.writeThreadIndex(selfAid, index);
|
|
1124
|
+
return { drift, applied };
|
|
1125
|
+
}
|
|
884
1126
|
/**
|
|
885
1127
|
* 查主会话(show <peer> 不带 threadId):读取与某对端的 active session。
|
|
886
1128
|
*/
|
|
@@ -927,7 +1169,7 @@ export class ThreadService {
|
|
|
927
1169
|
const want = normalizeThreadPeer(peer);
|
|
928
1170
|
const indexPath = agentThreadIndexPath(selfAid);
|
|
929
1171
|
const index = readIndex(indexPath);
|
|
930
|
-
const entry = index.threads.find(t =>
|
|
1172
|
+
const entry = index.threads.find(t => sameThreadPeer(t.peer, want, entryChannelType(t)) && t.threadId === threadId);
|
|
931
1173
|
if (!entry)
|
|
932
1174
|
return;
|
|
933
1175
|
entry.lastActiveAt = Date.now();
|
|
@@ -946,7 +1188,7 @@ export class ThreadService {
|
|
|
946
1188
|
const want = normalizeThreadPeer(peer);
|
|
947
1189
|
const indexPath = agentThreadIndexPath(selfAid);
|
|
948
1190
|
const index = readIndex(indexPath);
|
|
949
|
-
const entryIdx = index.threads.findIndex(t =>
|
|
1191
|
+
const entryIdx = index.threads.findIndex(t => sameThreadPeer(t.peer, want, entryChannelType(t)) && t.threadId === threadId);
|
|
950
1192
|
if (entryIdx < 0)
|
|
951
1193
|
throw new ThreadServiceError(`话题不存在: ${threadId}`, 'TOPIC_NOT_FOUND');
|
|
952
1194
|
const entry = index.threads[entryIdx];
|
|
@@ -1007,6 +1249,9 @@ export class ThreadService {
|
|
|
1007
1249
|
metadata: {
|
|
1008
1250
|
...(latest.metadata ?? {}),
|
|
1009
1251
|
...(entry.nameUpdatedAt !== undefined ? { nameUpdatedAt: entry.nameUpdatedAt } : {}),
|
|
1252
|
+
...(entry.topicStatusUpdatedAt !== undefined
|
|
1253
|
+
? { topicStatusUpdatedAt: entry.topicStatusUpdatedAt }
|
|
1254
|
+
: {}),
|
|
1010
1255
|
},
|
|
1011
1256
|
// topic metadata — updated values
|
|
1012
1257
|
threadId: entry.threadId,
|
|
@@ -1167,6 +1412,10 @@ export class ThreadService {
|
|
|
1167
1412
|
if (ifRev !== undefined && ifRev !== currentRev) {
|
|
1168
1413
|
throw new ThreadServiceError(`summary CAS 冲突:期望版本 ${ifRev},当前版本 ${currentRev}`, 'SUMMARY_CAS_CONFLICT');
|
|
1169
1414
|
}
|
|
1415
|
+
const latest = existing[existing.length - 1];
|
|
1416
|
+
if (latest?.content === content && latest.coveredThroughTs === coveredThroughTs) {
|
|
1417
|
+
return { rev: latest.rev, updated: false, ...(coveredThroughTs !== undefined ? { coveredThroughTs } : {}) };
|
|
1418
|
+
}
|
|
1170
1419
|
const entry = {
|
|
1171
1420
|
rev: currentRev + 1,
|
|
1172
1421
|
content,
|
|
@@ -1174,7 +1423,7 @@ export class ThreadService {
|
|
|
1174
1423
|
...(coveredThroughTs !== undefined ? { coveredThroughTs } : {}),
|
|
1175
1424
|
};
|
|
1176
1425
|
appendJsonl(filePath, entry);
|
|
1177
|
-
return { rev: entry.rev, ...(coveredThroughTs !== undefined ? { coveredThroughTs } : {}) };
|
|
1426
|
+
return { rev: entry.rev, updated: true, ...(coveredThroughTs !== undefined ? { coveredThroughTs } : {}) };
|
|
1178
1427
|
}
|
|
1179
1428
|
/**
|
|
1180
1429
|
* 取该话题最新一条消息的时间戳,作为摘要的覆盖游标。
|