@downcity/agent 1.1.7 → 1.1.8
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/bin/agent/AgentContext.d.ts.map +1 -1
- package/bin/agent/AgentContext.js +1 -0
- package/bin/agent/AgentContext.js.map +1 -1
- package/bin/agent/AgentContextTypes.d.ts +5 -1
- package/bin/agent/AgentContextTypes.d.ts.map +1 -1
- package/bin/agent/AgentRuntime.d.ts +6 -1
- package/bin/agent/AgentRuntime.d.ts.map +1 -1
- package/bin/agent/AgentRuntime.js +22 -3
- package/bin/agent/AgentRuntime.js.map +1 -1
- package/bin/agent/AgentRuntimeState.d.ts.map +1 -1
- package/bin/agent/AgentRuntimeState.js +58 -2
- package/bin/agent/AgentRuntimeState.js.map +1 -1
- package/bin/agent/AgentRuntimeTypes.d.ts +5 -1
- package/bin/agent/AgentRuntimeTypes.d.ts.map +1 -1
- package/bin/agent/project/AgentInitializer.d.ts +3 -2
- package/bin/agent/project/AgentInitializer.d.ts.map +1 -1
- package/bin/agent/project/AgentInitializer.js +34 -44
- package/bin/agent/project/AgentInitializer.js.map +1 -1
- package/bin/config/Config.d.ts.map +1 -1
- package/bin/config/Config.js +2 -21
- package/bin/config/Config.js.map +1 -1
- package/bin/config/Paths.d.ts +1 -5
- package/bin/config/Paths.d.ts.map +1 -1
- package/bin/config/Paths.js +2 -8
- package/bin/config/Paths.js.map +1 -1
- package/bin/host/daemon/ProjectSetup.d.ts +2 -1
- package/bin/host/daemon/ProjectSetup.d.ts.map +1 -1
- package/bin/host/daemon/ProjectSetup.js +14 -21
- package/bin/host/daemon/ProjectSetup.js.map +1 -1
- package/bin/host/runtime/AgentHostRuntime.d.ts.map +1 -1
- package/bin/host/runtime/AgentHostRuntime.js +1 -2
- package/bin/host/runtime/AgentHostRuntime.js.map +1 -1
- package/bin/host/runtime/CityPaths.d.ts +0 -3
- package/bin/host/runtime/CityPaths.d.ts.map +1 -1
- package/bin/host/runtime/CityPaths.js +0 -3
- package/bin/host/runtime/CityPaths.js.map +1 -1
- package/bin/host/sdk/Agent.d.ts +1 -0
- package/bin/host/sdk/Agent.d.ts.map +1 -1
- package/bin/host/sdk/Agent.js +24 -2
- package/bin/host/sdk/Agent.js.map +1 -1
- package/bin/host/sdk/AgentSdkTypes.d.ts +9 -0
- package/bin/host/sdk/AgentSdkTypes.d.ts.map +1 -1
- package/bin/http/Server.d.ts.map +1 -1
- package/bin/http/Server.js +1 -11
- package/bin/http/Server.js.map +1 -1
- package/bin/http/auth/AuthEnv.d.ts +0 -9
- package/bin/http/auth/AuthEnv.d.ts.map +1 -1
- package/bin/http/auth/AuthEnv.js +0 -9
- package/bin/http/auth/AuthEnv.js.map +1 -1
- package/bin/http/auth/CliAuthStateStore.d.ts +0 -4
- package/bin/http/auth/CliAuthStateStore.d.ts.map +1 -1
- package/bin/http/auth/CliAuthStateStore.js +0 -4
- package/bin/http/auth/CliAuthStateStore.js.map +1 -1
- package/bin/http/control/ModelRoutes.d.ts.map +1 -1
- package/bin/http/control/ModelRoutes.js +3 -8
- package/bin/http/control/ModelRoutes.js.map +1 -1
- package/bin/index.d.ts +2 -6
- package/bin/index.d.ts.map +1 -1
- package/bin/index.js +2 -6
- package/bin/index.js.map +1 -1
- package/bin/model/CreateModel.d.ts +2 -2
- package/bin/model/CreateModel.d.ts.map +1 -1
- package/bin/model/CreateModel.js +13 -12
- package/bin/model/CreateModel.js.map +1 -1
- package/bin/plugin/Activation.d.ts +4 -0
- package/bin/plugin/Activation.d.ts.map +1 -1
- package/bin/plugin/Activation.js +2 -2
- package/bin/plugin/Activation.js.map +1 -1
- package/bin/plugin/LocalExecution.d.ts.map +1 -1
- package/bin/plugin/LocalExecution.js +23 -2
- package/bin/plugin/LocalExecution.js.map +1 -1
- package/bin/plugin/PluginRegistry.js +2 -2
- package/bin/plugin/PluginRegistry.js.map +1 -1
- package/bin/plugins/asr/Plugin.d.ts.map +1 -1
- package/bin/plugins/asr/Plugin.js +4 -5
- package/bin/plugins/asr/Plugin.js.map +1 -1
- package/bin/plugins/auth/Plugin.d.ts.map +1 -1
- package/bin/plugins/auth/Plugin.js +1 -0
- package/bin/plugins/auth/Plugin.js.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationConfig.d.ts +4 -4
- package/bin/plugins/auth/runtime/AuthorizationConfig.d.ts.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationConfig.js +28 -26
- package/bin/plugins/auth/runtime/AuthorizationConfig.js.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationPolicy.d.ts +2 -0
- package/bin/plugins/auth/runtime/AuthorizationPolicy.d.ts.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationPolicy.js +3 -2
- package/bin/plugins/auth/runtime/AuthorizationPolicy.js.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationStore.d.ts +1 -1
- package/bin/plugins/auth/runtime/AuthorizationStore.d.ts.map +1 -1
- package/bin/plugins/auth/runtime/AuthorizationStore.js +3 -4
- package/bin/plugins/auth/runtime/AuthorizationStore.js.map +1 -1
- package/bin/plugins/skill/Plugin.js +2 -2
- package/bin/plugins/skill/Plugin.js.map +1 -1
- package/bin/plugins/tts/Plugin.d.ts.map +1 -1
- package/bin/plugins/tts/Plugin.js +4 -5
- package/bin/plugins/tts/Plugin.js.map +1 -1
- package/bin/plugins/web/Plugin.d.ts.map +1 -1
- package/bin/plugins/web/Plugin.js +4 -5
- package/bin/plugins/web/Plugin.js.map +1 -1
- package/bin/plugins/workboard/Plugin.js +2 -2
- package/bin/plugins/workboard/Plugin.js.map +1 -1
- package/bin/service/builtins/chat/accounts/ChannelAccountService.d.ts +4 -1
- package/bin/service/builtins/chat/accounts/ChannelAccountService.d.ts.map +1 -1
- package/bin/service/builtins/chat/accounts/ChannelAccountService.js +64 -91
- package/bin/service/builtins/chat/accounts/ChannelAccountService.js.map +1 -1
- package/bin/service/builtins/chat/runtime/ChatChannelActions.d.ts.map +1 -1
- package/bin/service/builtins/chat/runtime/ChatChannelActions.js +11 -18
- package/bin/service/builtins/chat/runtime/ChatChannelActions.js.map +1 -1
- package/bin/service/builtins/chat/runtime/ChatChannelCore.d.ts +1 -1
- package/bin/service/builtins/chat/runtime/ChatChannelCore.d.ts.map +1 -1
- package/bin/service/builtins/chat/runtime/ChatChannelCore.js +9 -17
- package/bin/service/builtins/chat/runtime/ChatChannelCore.js.map +1 -1
- package/bin/service/builtins/memory/Action.d.ts +1 -5
- package/bin/service/builtins/memory/Action.d.ts.map +1 -1
- package/bin/service/builtins/memory/Action.js +4 -42
- package/bin/service/builtins/memory/Action.js.map +1 -1
- package/bin/service/builtins/memory/MemoryService.d.ts.map +1 -1
- package/bin/service/builtins/memory/MemoryService.js +2 -32
- package/bin/service/builtins/memory/MemoryService.js.map +1 -1
- package/bin/service/builtins/memory/runtime/Search.d.ts +7 -3
- package/bin/service/builtins/memory/runtime/Search.d.ts.map +1 -1
- package/bin/service/builtins/memory/runtime/Search.js +220 -16
- package/bin/service/builtins/memory/runtime/Search.js.map +1 -1
- package/bin/service/builtins/memory/runtime/Store.d.ts +9 -50
- package/bin/service/builtins/memory/runtime/Store.d.ts.map +1 -1
- package/bin/service/builtins/memory/runtime/Store.js +10 -130
- package/bin/service/builtins/memory/runtime/Store.js.map +1 -1
- package/bin/service/builtins/memory/runtime/Writer.d.ts.map +1 -1
- package/bin/service/builtins/memory/runtime/Writer.js +1 -2
- package/bin/service/builtins/memory/runtime/Writer.js.map +1 -1
- package/bin/service/builtins/memory/types/Memory.d.ts +3 -57
- package/bin/service/builtins/memory/types/Memory.d.ts.map +1 -1
- package/bin/service/schedule/Store.d.ts +22 -25
- package/bin/service/schedule/Store.d.ts.map +1 -1
- package/bin/service/schedule/Store.js +172 -154
- package/bin/service/schedule/Store.js.map +1 -1
- package/bin/session/composer/system/default/SystemDomain.d.ts.map +1 -1
- package/bin/session/composer/system/default/SystemDomain.js +1 -0
- package/bin/session/composer/system/default/SystemDomain.js.map +1 -1
- package/bin/shared/types/AgentHost.d.ts +120 -4
- package/bin/shared/types/AgentHost.d.ts.map +1 -1
- package/bin/shared/types/Plugin.d.ts +5 -1
- package/bin/shared/types/Plugin.d.ts.map +1 -1
- package/package.json +1 -4
- package/src/agent/AgentContext.ts +1 -0
- package/src/agent/AgentContextTypes.ts +5 -0
- package/src/agent/AgentRuntime.ts +32 -3
- package/src/agent/AgentRuntimeState.ts +66 -2
- package/src/agent/AgentRuntimeTypes.ts +5 -0
- package/src/agent/project/AgentInitializer.ts +40 -42
- package/src/config/Config.ts +2 -17
- package/src/config/Paths.ts +2 -9
- package/src/host/daemon/ProjectSetup.ts +19 -21
- package/src/host/runtime/AgentHostRuntime.ts +0 -2
- package/src/host/runtime/CityPaths.ts +0 -3
- package/src/host/sdk/Agent.ts +26 -2
- package/src/host/sdk/AgentSdkTypes.ts +10 -0
- package/src/http/Server.ts +0 -13
- package/src/http/auth/AuthEnv.ts +0 -9
- package/src/http/auth/CliAuthStateStore.ts +0 -4
- package/src/http/control/ModelRoutes.ts +3 -9
- package/src/index.ts +2 -12
- package/src/model/CreateModel.ts +15 -13
- package/src/plugin/Activation.ts +6 -2
- package/src/plugin/LocalExecution.ts +24 -2
- package/src/plugin/PluginRegistry.ts +2 -2
- package/src/plugins/asr/Plugin.ts +4 -5
- package/src/plugins/auth/Plugin.ts +1 -0
- package/src/plugins/auth/runtime/AuthorizationConfig.ts +47 -37
- package/src/plugins/auth/runtime/AuthorizationPolicy.ts +5 -2
- package/src/plugins/auth/runtime/AuthorizationStore.ts +6 -5
- package/src/plugins/skill/Plugin.ts +2 -2
- package/src/plugins/tts/Plugin.ts +4 -5
- package/src/plugins/web/Plugin.ts +4 -5
- package/src/plugins/workboard/Plugin.ts +2 -2
- package/src/service/builtins/chat/accounts/ChannelAccountService.ts +42 -62
- package/src/service/builtins/chat/runtime/ChatChannelActions.ts +12 -18
- package/src/service/builtins/chat/runtime/ChatChannelCore.ts +9 -14
- package/src/service/builtins/memory/Action.ts +6 -47
- package/src/service/builtins/memory/MemoryService.ts +1 -33
- package/src/service/builtins/memory/runtime/Search.ts +256 -16
- package/src/service/builtins/memory/runtime/Store.ts +13 -185
- package/src/service/builtins/memory/runtime/Writer.ts +1 -2
- package/src/service/builtins/memory/types/Memory.ts +2 -59
- package/src/service/schedule/Store.ts +215 -175
- package/src/session/composer/system/default/SystemDomain.ts +1 -0
- package/src/shared/types/AgentHost.ts +138 -4
- package/src/shared/types/Plugin.ts +5 -0
- package/tsconfig.tsbuildinfo +1 -1
- package/bin/http/auth/AuthMiddleware.d.ts +0 -36
- package/bin/http/auth/AuthMiddleware.d.ts.map +0 -1
- package/bin/http/auth/AuthMiddleware.js +0 -37
- package/bin/http/auth/AuthMiddleware.js.map +0 -1
- package/bin/http/auth/AuthRoutes.d.ts +0 -17
- package/bin/http/auth/AuthRoutes.d.ts.map +0 -1
- package/bin/http/auth/AuthRoutes.js +0 -78
- package/bin/http/auth/AuthRoutes.js.map +0 -1
- package/bin/http/auth/AuthService.d.ts +0 -119
- package/bin/http/auth/AuthService.d.ts.map +0 -1
- package/bin/http/auth/AuthService.js +0 -307
- package/bin/http/auth/AuthService.js.map +0 -1
- package/bin/http/auth/AuthStore.d.ts +0 -165
- package/bin/http/auth/AuthStore.d.ts.map +0 -1
- package/bin/http/auth/AuthStore.js +0 -442
- package/bin/http/auth/AuthStore.js.map +0 -1
- package/bin/http/auth/RoutePolicy.d.ts +0 -30
- package/bin/http/auth/RoutePolicy.d.ts.map +0 -1
- package/bin/http/auth/RoutePolicy.js +0 -229
- package/bin/http/auth/RoutePolicy.js.map +0 -1
- package/bin/plugin/Lifecycle.d.ts +0 -33
- package/bin/plugin/Lifecycle.d.ts.map +0 -1
- package/bin/plugin/Lifecycle.js +0 -102
- package/bin/plugin/Lifecycle.js.map +0 -1
- package/bin/service/builtins/memory/runtime/Indexer.d.ts +0 -71
- package/bin/service/builtins/memory/runtime/Indexer.d.ts.map +0 -1
- package/bin/service/builtins/memory/runtime/Indexer.js +0 -345
- package/bin/service/builtins/memory/runtime/Indexer.js.map +0 -1
- package/bin/service/schedule/Schema.d.ts +0 -171
- package/bin/service/schedule/Schema.d.ts.map +0 -1
- package/bin/service/schedule/Schema.js +0 -26
- package/bin/service/schedule/Schema.js.map +0 -1
- package/bin/shared/utils/store/StoreChannelAccountRepository.d.ts +0 -34
- package/bin/shared/utils/store/StoreChannelAccountRepository.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreChannelAccountRepository.js +0 -198
- package/bin/shared/utils/store/StoreChannelAccountRepository.js.map +0 -1
- package/bin/shared/utils/store/StoreEnvRepository.d.ts +0 -98
- package/bin/shared/utils/store/StoreEnvRepository.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreEnvRepository.js +0 -334
- package/bin/shared/utils/store/StoreEnvRepository.js.map +0 -1
- package/bin/shared/utils/store/StoreModelRepository.d.ts +0 -61
- package/bin/shared/utils/store/StoreModelRepository.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreModelRepository.js +0 -278
- package/bin/shared/utils/store/StoreModelRepository.js.map +0 -1
- package/bin/shared/utils/store/StoreSchema.d.ts +0 -13
- package/bin/shared/utils/store/StoreSchema.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreSchema.js +0 -319
- package/bin/shared/utils/store/StoreSchema.js.map +0 -1
- package/bin/shared/utils/store/StoreSecureSettings.d.ts +0 -33
- package/bin/shared/utils/store/StoreSecureSettings.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreSecureSettings.js +0 -91
- package/bin/shared/utils/store/StoreSecureSettings.js.map +0 -1
- package/bin/shared/utils/store/StoreShared.d.ts +0 -44
- package/bin/shared/utils/store/StoreShared.d.ts.map +0 -1
- package/bin/shared/utils/store/StoreShared.js +0 -40
- package/bin/shared/utils/store/StoreShared.js.map +0 -1
- package/bin/shared/utils/store/crypto.d.ts +0 -24
- package/bin/shared/utils/store/crypto.d.ts.map +0 -1
- package/bin/shared/utils/store/crypto.js +0 -101
- package/bin/shared/utils/store/crypto.js.map +0 -1
- package/bin/shared/utils/store/index.d.ts +0 -230
- package/bin/shared/utils/store/index.d.ts.map +0 -1
- package/bin/shared/utils/store/index.js +0 -360
- package/bin/shared/utils/store/index.js.map +0 -1
- package/bin/shared/utils/store/schema.d.ts +0 -690
- package/bin/shared/utils/store/schema.d.ts.map +0 -1
- package/bin/shared/utils/store/schema.js +0 -81
- package/bin/shared/utils/store/schema.js.map +0 -1
- package/src/http/auth/AuthMiddleware.ts +0 -61
- package/src/http/auth/AuthRoutes.ts +0 -100
- package/src/http/auth/AuthService.ts +0 -367
- package/src/http/auth/AuthStore.ts +0 -572
- package/src/http/auth/RoutePolicy.ts +0 -255
- package/src/plugin/Lifecycle.ts +0 -116
- package/src/service/builtins/memory/runtime/Indexer.ts +0 -466
- package/src/service/schedule/Schema.ts +0 -34
- package/src/shared/utils/store/StoreChannelAccountRepository.ts +0 -269
- package/src/shared/utils/store/StoreEnvRepository.ts +0 -452
- package/src/shared/utils/store/StoreModelRepository.ts +0 -324
- package/src/shared/utils/store/StoreSchema.ts +0 -344
- package/src/shared/utils/store/StoreSecureSettings.ts +0 -126
- package/src/shared/utils/store/StoreShared.ts +0 -67
- package/src/shared/utils/store/crypto.ts +0 -112
- package/src/shared/utils/store/index.ts +0 -497
- package/src/shared/utils/store/schema.ts +0 -103
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
* - 生命周期、配置写入、action 执行分别放到更细的模块中。
|
|
7
7
|
* - 目标是让 chat channel 子模块共享同一套最小公共基元。
|
|
8
8
|
*/
|
|
9
|
-
import { PlatformStore } from "../../../../shared/utils/store/index.js";
|
|
10
9
|
const CHAT_CHANNEL_NAMES = ["telegram", "feishu", "qq"];
|
|
11
10
|
function resolveChatServiceBindings(context) {
|
|
12
11
|
const candidate = context.agent?.services?.get?.("chat");
|
|
@@ -54,7 +53,7 @@ export function resolveChannelAccountId(context, channel) {
|
|
|
54
53
|
return String(config?.channelAccountId || "").trim();
|
|
55
54
|
}
|
|
56
55
|
/**
|
|
57
|
-
*
|
|
56
|
+
* 从宿主平台能力中解析渠道 account。
|
|
58
57
|
*/
|
|
59
58
|
export function resolveChannelAccount(context, channel) {
|
|
60
59
|
const service = resolveChatServiceBindings(context);
|
|
@@ -62,23 +61,16 @@ export function resolveChannelAccount(context, channel) {
|
|
|
62
61
|
if (explicit)
|
|
63
62
|
return explicit;
|
|
64
63
|
const channelAccountId = resolveChannelAccountId(context, channel);
|
|
65
|
-
|
|
64
|
+
const account = context.platform.resolveChannelAccount?.({
|
|
65
|
+
projectRoot: context.rootPath,
|
|
66
|
+
channel,
|
|
67
|
+
...(channelAccountId ? { channelAccountId } : {}),
|
|
68
|
+
}) || (channelAccountId ? context.platform.getChannelAccount(channelAccountId) : null);
|
|
69
|
+
if (!account)
|
|
66
70
|
return null;
|
|
67
|
-
|
|
68
|
-
try {
|
|
69
|
-
const account = store.getChannelAccountSync(channelAccountId);
|
|
70
|
-
if (!account)
|
|
71
|
-
return null;
|
|
72
|
-
if (account.channel !== channel)
|
|
73
|
-
return null;
|
|
74
|
-
return account;
|
|
75
|
-
}
|
|
76
|
-
catch {
|
|
71
|
+
if (account.channel !== channel)
|
|
77
72
|
return null;
|
|
78
|
-
|
|
79
|
-
finally {
|
|
80
|
-
store.close();
|
|
81
|
-
}
|
|
73
|
+
return account;
|
|
82
74
|
}
|
|
83
75
|
/**
|
|
84
76
|
* 判断渠道 credentials 是否已经配置完整。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatChannelCore.js","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatChannelCore.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;
|
|
1
|
+
{"version":3,"file":"ChatChannelCore.js","sourceRoot":"","sources":["../../../../../src/service/builtins/chat/runtime/ChatChannelCore.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,12 @@
|
|
|
8
8
|
import type { ServiceActionResult } from "../../../shared/types/Service.js";
|
|
9
9
|
import type { AgentContext } from "../../../agent/AgentContextTypes.js";
|
|
10
10
|
import type { JsonValue } from "../../../shared/types/Json.js";
|
|
11
|
-
import type { MemoryFlushPayload, MemoryGetPayload,
|
|
11
|
+
import type { MemoryFlushPayload, MemoryGetPayload, MemorySearchPayload, MemoryStorePayload } from "../../../service/builtins/memory/types/Memory.js";
|
|
12
12
|
import { type MemoryRuntimeState } from "./runtime/Store.js";
|
|
13
13
|
/**
|
|
14
14
|
* status action。
|
|
15
15
|
*/
|
|
16
16
|
export declare function statusMemoryAction(context: AgentContext, state: MemoryRuntimeState): Promise<ServiceActionResult<JsonValue>>;
|
|
17
|
-
/**
|
|
18
|
-
* index action。
|
|
19
|
-
*/
|
|
20
|
-
export declare function indexMemoryAction(context: AgentContext, state: MemoryRuntimeState, payload: MemoryIndexPayload): Promise<ServiceActionResult<JsonValue>>;
|
|
21
17
|
/**
|
|
22
18
|
* search action。
|
|
23
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../../../src/service/builtins/memory/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"Action.d.ts","sourceRoot":"","sources":["../../../../src/service/builtins/memory/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EACV,kBAAkB,EAClB,gBAAgB,EAChB,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,2CAA2C,CAAC;AAMnD,OAAO,EAEL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAG5B;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAazC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAazC;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,OAAO,EAAE,YAAY,EACrB,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAUzC;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAUzC;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,mBAAmB,CAAC,CAU9B;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB,CAgBnF"}
|
|
@@ -6,31 +6,18 @@
|
|
|
6
6
|
* - 所有动作统一返回结构化结果,失败不抛给上层。
|
|
7
7
|
*/
|
|
8
8
|
import { flushMemory } from "./runtime/Flush.js";
|
|
9
|
-
import { searchMemory } from "./runtime/Search.js";
|
|
10
|
-
import { MEMORY_DEFAULTS,
|
|
9
|
+
import { collectMemoryStatus, searchMemory, } from "./runtime/Search.js";
|
|
10
|
+
import { MEMORY_DEFAULTS, } from "./runtime/Store.js";
|
|
11
11
|
import { getMemory, storeMemory } from "./runtime/Writer.js";
|
|
12
12
|
/**
|
|
13
13
|
* status action。
|
|
14
14
|
*/
|
|
15
15
|
export async function statusMemoryAction(context, state) {
|
|
16
16
|
try {
|
|
17
|
-
const stats = state
|
|
17
|
+
const stats = await collectMemoryStatus(context, state);
|
|
18
18
|
return {
|
|
19
19
|
success: true,
|
|
20
|
-
data:
|
|
21
|
-
enabled: state.enabled,
|
|
22
|
-
backend: "builtin",
|
|
23
|
-
mode: "fts",
|
|
24
|
-
dbPath: state.indexer.getRelativeDbPath(),
|
|
25
|
-
dirty: state.dirty,
|
|
26
|
-
files: stats.files,
|
|
27
|
-
chunks: stats.chunks,
|
|
28
|
-
sourceCounts: stats.sourceCounts,
|
|
29
|
-
...(typeof state.lastSyncAt === "number"
|
|
30
|
-
? { lastSyncAt: state.lastSyncAt }
|
|
31
|
-
: {}),
|
|
32
|
-
...(state.lastError ? { lastError: state.lastError } : {}),
|
|
33
|
-
},
|
|
20
|
+
data: stats,
|
|
34
21
|
};
|
|
35
22
|
}
|
|
36
23
|
catch (error) {
|
|
@@ -40,31 +27,6 @@ export async function statusMemoryAction(context, state) {
|
|
|
40
27
|
};
|
|
41
28
|
}
|
|
42
29
|
}
|
|
43
|
-
/**
|
|
44
|
-
* index action。
|
|
45
|
-
*/
|
|
46
|
-
export async function indexMemoryAction(context, state, payload) {
|
|
47
|
-
try {
|
|
48
|
-
const result = await ensureMemoryIndexed(context, state, {
|
|
49
|
-
force: payload.force === true,
|
|
50
|
-
reason: payload.force ? "manual-force" : "manual",
|
|
51
|
-
});
|
|
52
|
-
const status = state.indexer.status();
|
|
53
|
-
const data = {
|
|
54
|
-
totalFiles: result?.totalFiles ?? status.files,
|
|
55
|
-
reindexedFiles: result?.reindexedFiles ?? 0,
|
|
56
|
-
removedFiles: result?.removedFiles ?? 0,
|
|
57
|
-
totalChunks: result?.totalChunks ?? 0,
|
|
58
|
-
};
|
|
59
|
-
return { success: true, data: data };
|
|
60
|
-
}
|
|
61
|
-
catch (error) {
|
|
62
|
-
return {
|
|
63
|
-
success: false,
|
|
64
|
-
error: String(error),
|
|
65
|
-
};
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
30
|
/**
|
|
69
31
|
* search action。
|
|
70
32
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../../../src/service/builtins/memory/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../../../src/service/builtins/memory/Action.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAWH,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,YAAY,GACb,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,eAAe,GAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAqB,EACrB,KAAyB;IAEzB,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QACxD,OAAO;YACL,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,KAA6B;SACpC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAqB,EACrB,KAAyB,EACzB,OAA4B;IAE5B,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7D,OAAO;YACL,OAAO,EAAE,IAAI;YACb,IAAI,EAAE,QAAgC;SACvC,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,OAAqB,EACrB,OAAyB;IAEzB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAA4B,EAAE,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAqB,EACrB,KAAyB,EACzB,OAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAA4B,EAAE,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,OAAqB,EACrB,KAAyB,EACzB,OAA2B;IAE3B,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACxD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAA4B,EAAE,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;SACrB,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,KAA8B;IAC5D,OAAO;QACL,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC;QAChC,UAAU,EACR,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ;YAClC,CAAC,CAAC,KAAK,CAAC,UAAU;YAClB,CAAC,CAAC,OAAO,KAAK,CAAC,UAAU,KAAK,QAAQ;gBACpC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC;gBAC1B,CAAC,CAAC,eAAe,CAAC,UAAU;QAClC,QAAQ,EACN,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;YAChC,CAAC,CAAC,KAAK,CAAC,QAAQ;YAChB,CAAC,CAAC,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ;gBAClC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;gBACxB,CAAC,CAAC,eAAe,CAAC,QAAQ;KACjC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryService.d.ts","sourceRoot":"","sources":["../../../../src/service/builtins/memory/MemoryService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"MemoryService.d.ts","sourceRoot":"","sources":["../../../../src/service/builtins/memory/MemoryService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAQhE,OAAO,EAKL,KAAK,kBAAkB,EACxB,MAAM,oBAAoB,CAAC;AAkD5B;;GAEG;AACH,qBAAa,aAAc,SAAQ,WAAW;IAC5C;;OAEG;IACH,QAAQ,CAAC,IAAI,YAAY;IAEzB;;OAEG;IACI,YAAY,EAAE,kBAAkB,GAAG,IAAI,CAAQ;IAEtD;;OAEG;IACG,MAAM,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpD;;OAEG;IACH,QAAQ,CAAC,SAAS;yBACO,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC;oBAKnC,OAAO,CAAC,IAAI,CAAC;MAK7B;IAEF;;OAEG;IACH,QAAQ,CAAC,OAAO,EAAE,cAAc,CAsK9B;IAEF;;OAEG;IACH,OAAO,CAAC,uBAAuB;CAQhC"}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* - 运行态只在实例内部缓存,不再放到模块级 Map。
|
|
8
8
|
*/
|
|
9
9
|
import { BaseService } from "../../../service/builtins/BaseService.js";
|
|
10
|
-
import { flushMemoryAction, getMemoryAction,
|
|
10
|
+
import { flushMemoryAction, getMemoryAction, searchMemoryAction, statusMemoryAction, storeMemoryAction, } from "./Action.js";
|
|
11
11
|
import { createMemoryRuntimeState, isMemoryEnabled, startMemoryRuntime, stopMemoryRuntime, } from "./runtime/Store.js";
|
|
12
12
|
import { buildMemoryServiceSystemText } from "./runtime/SystemProvider.js";
|
|
13
13
|
import { ensureMemoryDirectories } from "./runtime/Writer.js";
|
|
@@ -51,10 +51,6 @@ function readOptionalNumber(body, key) {
|
|
|
51
51
|
const value = body[key];
|
|
52
52
|
return typeof value === "number" ? value : undefined;
|
|
53
53
|
}
|
|
54
|
-
function readOptionalBoolean(body, key) {
|
|
55
|
-
const value = body[key];
|
|
56
|
-
return typeof value === "boolean" ? value : undefined;
|
|
57
|
-
}
|
|
58
54
|
/**
|
|
59
55
|
* Memory service 类实现。
|
|
60
56
|
*/
|
|
@@ -95,7 +91,7 @@ export class MemoryService extends BaseService {
|
|
|
95
91
|
actions = {
|
|
96
92
|
status: {
|
|
97
93
|
command: {
|
|
98
|
-
description: "查看 memory 状态(backend/files/chunks
|
|
94
|
+
description: "查看 memory 状态(backend/files/chunks)",
|
|
99
95
|
mapInput() {
|
|
100
96
|
return {};
|
|
101
97
|
},
|
|
@@ -108,32 +104,6 @@ export class MemoryService extends BaseService {
|
|
|
108
104
|
return await statusMemoryAction(params.context, state);
|
|
109
105
|
},
|
|
110
106
|
},
|
|
111
|
-
index: {
|
|
112
|
-
command: {
|
|
113
|
-
description: "重建 memory 索引",
|
|
114
|
-
configure(command) {
|
|
115
|
-
command.option("--force", "强制全量重建", false);
|
|
116
|
-
},
|
|
117
|
-
mapInput({ opts }) {
|
|
118
|
-
return {
|
|
119
|
-
force: opts.force === true,
|
|
120
|
-
};
|
|
121
|
-
},
|
|
122
|
-
},
|
|
123
|
-
api: {
|
|
124
|
-
method: "POST",
|
|
125
|
-
mapInput(ctx) {
|
|
126
|
-
return ctx.req.json();
|
|
127
|
-
},
|
|
128
|
-
},
|
|
129
|
-
execute: async (params) => {
|
|
130
|
-
const body = readBodyObject(params.payload);
|
|
131
|
-
const state = this.getOrCreateRuntimeState(params.context);
|
|
132
|
-
return await indexMemoryAction(params.context, state, {
|
|
133
|
-
force: readOptionalBoolean(body, "force"),
|
|
134
|
-
});
|
|
135
|
-
},
|
|
136
|
-
},
|
|
137
107
|
search: {
|
|
138
108
|
command: {
|
|
139
109
|
description: "检索记忆片段",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryService.js","sourceRoot":"","sources":["../../../../src/service/builtins/memory/MemoryService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EACL,iBAAiB,EACjB,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"MemoryService.js","sourceRoot":"","sources":["../../../../src/service/builtins/memory/MemoryService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,16 @@
|
|
|
2
2
|
* Memory Search 运行时。
|
|
3
3
|
*
|
|
4
4
|
* 关键点(中文)
|
|
5
|
-
* -
|
|
6
|
-
* -
|
|
5
|
+
* - 直接扫描 Markdown 文件,不依赖额外索引库。
|
|
6
|
+
* - 统一收敛检索、分块、打分与状态统计逻辑。
|
|
7
7
|
*/
|
|
8
8
|
import type { AgentContext } from "../../../../agent/AgentContextTypes.js";
|
|
9
|
-
import type { MemorySearchPayload, MemorySearchResponse } from "../../../../service/builtins/memory/types/Memory.js";
|
|
9
|
+
import type { MemorySearchPayload, MemorySearchResponse, MemoryStatusResponse } from "../../../../service/builtins/memory/types/Memory.js";
|
|
10
10
|
import { type MemoryRuntimeState } from "./Store.js";
|
|
11
|
+
/**
|
|
12
|
+
* 收集当前 memory Markdown 状态。
|
|
13
|
+
*/
|
|
14
|
+
export declare function collectMemoryStatus(context: AgentContext, state: MemoryRuntimeState): Promise<MemoryStatusResponse>;
|
|
11
15
|
/**
|
|
12
16
|
* 执行检索。
|
|
13
17
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Search.d.ts","sourceRoot":"","sources":["../../../../../src/service/builtins/memory/runtime/Search.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"Search.d.ts","sourceRoot":"","sources":["../../../../../src/service/builtins/memory/runtime/Search.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EACV,mBAAmB,EACnB,oBAAoB,EAGpB,oBAAoB,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAGL,KAAK,kBAAkB,EACxB,MAAM,YAAY,CAAC;AA8JpB;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,oBAAoB,CAAC,CA8B/B;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE,kBAAkB,EACzB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,oBAAoB,CAAC,CAyG/B"}
|
|
@@ -2,15 +2,175 @@
|
|
|
2
2
|
* Memory Search 运行时。
|
|
3
3
|
*
|
|
4
4
|
* 关键点(中文)
|
|
5
|
-
* -
|
|
6
|
-
* -
|
|
5
|
+
* - 直接扫描 Markdown 文件,不依赖额外索引库。
|
|
6
|
+
* - 统一收敛检索、分块、打分与状态统计逻辑。
|
|
7
7
|
*/
|
|
8
|
-
import
|
|
8
|
+
import fs from "node:fs/promises";
|
|
9
|
+
import { listMemorySourceFiles, MEMORY_DEFAULTS, } from "./Store.js";
|
|
10
|
+
const SNIPPET_MAX_CHARS = 700;
|
|
11
|
+
const CHUNK_MAX_CHARS = 1600;
|
|
12
|
+
const CHUNK_OVERLAP_CHARS = 240;
|
|
9
13
|
function clampNumber(value, min, max) {
|
|
10
14
|
if (!Number.isFinite(value))
|
|
11
15
|
return min;
|
|
12
16
|
return Math.max(min, Math.min(max, value));
|
|
13
17
|
}
|
|
18
|
+
function normalizeText(input) {
|
|
19
|
+
return String(input || "").replace(/\r\n/g, "\n");
|
|
20
|
+
}
|
|
21
|
+
function truncateText(value, maxChars) {
|
|
22
|
+
if (value.length <= maxChars) {
|
|
23
|
+
return value;
|
|
24
|
+
}
|
|
25
|
+
return value.slice(0, maxChars);
|
|
26
|
+
}
|
|
27
|
+
function tokenizeQuery(raw) {
|
|
28
|
+
return String(raw || "")
|
|
29
|
+
.toLowerCase()
|
|
30
|
+
.replace(/[^\p{L}\p{N}_-]+/gu, " ")
|
|
31
|
+
.split(/\s+/)
|
|
32
|
+
.map((item) => item.trim())
|
|
33
|
+
.filter(Boolean)
|
|
34
|
+
.slice(0, 12);
|
|
35
|
+
}
|
|
36
|
+
function countTokenOccurrences(text, token) {
|
|
37
|
+
if (!token)
|
|
38
|
+
return 0;
|
|
39
|
+
let hits = 0;
|
|
40
|
+
let start = 0;
|
|
41
|
+
while (start < text.length) {
|
|
42
|
+
const index = text.indexOf(token, start);
|
|
43
|
+
if (index < 0)
|
|
44
|
+
break;
|
|
45
|
+
hits += 1;
|
|
46
|
+
start = index + token.length;
|
|
47
|
+
}
|
|
48
|
+
return hits;
|
|
49
|
+
}
|
|
50
|
+
function buildSnippetScore(text, tokens) {
|
|
51
|
+
if (tokens.length === 0)
|
|
52
|
+
return 0;
|
|
53
|
+
const normalized = normalizeText(text).toLowerCase();
|
|
54
|
+
let matchedTokens = 0;
|
|
55
|
+
let totalHits = 0;
|
|
56
|
+
for (const token of tokens) {
|
|
57
|
+
const hits = countTokenOccurrences(normalized, token);
|
|
58
|
+
if (hits > 0) {
|
|
59
|
+
matchedTokens += 1;
|
|
60
|
+
totalHits += Math.min(hits, 4);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
if (matchedTokens === 0) {
|
|
64
|
+
return 0;
|
|
65
|
+
}
|
|
66
|
+
const coverageScore = matchedTokens / tokens.length;
|
|
67
|
+
const densityScore = Math.min(totalHits, tokens.length * 3) / (tokens.length * 3);
|
|
68
|
+
return Number((coverageScore * 0.75 + densityScore * 0.25).toFixed(4));
|
|
69
|
+
}
|
|
70
|
+
function chunkMarkdown(content) {
|
|
71
|
+
const lines = normalizeText(content).split("\n");
|
|
72
|
+
if (lines.length === 0) {
|
|
73
|
+
return [];
|
|
74
|
+
}
|
|
75
|
+
const out = [];
|
|
76
|
+
let bucket = [];
|
|
77
|
+
let chars = 0;
|
|
78
|
+
const flush = () => {
|
|
79
|
+
if (bucket.length === 0)
|
|
80
|
+
return;
|
|
81
|
+
const startLine = bucket[0]?.lineNo ?? 1;
|
|
82
|
+
const endLine = bucket[bucket.length - 1]?.lineNo ?? startLine;
|
|
83
|
+
const text = bucket.map((item) => item.line).join("\n").trim();
|
|
84
|
+
if (!text)
|
|
85
|
+
return;
|
|
86
|
+
out.push({
|
|
87
|
+
startLine,
|
|
88
|
+
endLine,
|
|
89
|
+
text,
|
|
90
|
+
});
|
|
91
|
+
};
|
|
92
|
+
const carryOverlap = () => {
|
|
93
|
+
if (bucket.length === 0 || CHUNK_OVERLAP_CHARS <= 0) {
|
|
94
|
+
bucket = [];
|
|
95
|
+
chars = 0;
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
let acc = 0;
|
|
99
|
+
const next = [];
|
|
100
|
+
for (let i = bucket.length - 1; i >= 0; i -= 1) {
|
|
101
|
+
const row = bucket[i];
|
|
102
|
+
if (!row)
|
|
103
|
+
continue;
|
|
104
|
+
acc += row.line.length + 1;
|
|
105
|
+
next.unshift(row);
|
|
106
|
+
if (acc >= CHUNK_OVERLAP_CHARS)
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
bucket = next;
|
|
110
|
+
chars = bucket.reduce((sum, item) => sum + item.line.length + 1, 0);
|
|
111
|
+
};
|
|
112
|
+
for (let i = 0; i < lines.length; i += 1) {
|
|
113
|
+
const line = lines[i] ?? "";
|
|
114
|
+
const rowSize = line.length + 1;
|
|
115
|
+
if (bucket.length > 0 && chars + rowSize > CHUNK_MAX_CHARS) {
|
|
116
|
+
flush();
|
|
117
|
+
carryOverlap();
|
|
118
|
+
}
|
|
119
|
+
bucket.push({ line, lineNo: i + 1 });
|
|
120
|
+
chars += rowSize;
|
|
121
|
+
}
|
|
122
|
+
flush();
|
|
123
|
+
return out;
|
|
124
|
+
}
|
|
125
|
+
async function readMemoryChunks(context) {
|
|
126
|
+
const files = await listMemorySourceFiles(context.rootPath);
|
|
127
|
+
const out = [];
|
|
128
|
+
for (const file of files) {
|
|
129
|
+
const content = String(await fs.readFile(file.absPath, "utf-8"));
|
|
130
|
+
for (const chunk of chunkMarkdown(content)) {
|
|
131
|
+
out.push({
|
|
132
|
+
path: file.relPath,
|
|
133
|
+
source: file.source,
|
|
134
|
+
startLine: chunk.startLine,
|
|
135
|
+
endLine: chunk.endLine,
|
|
136
|
+
text: chunk.text,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
return out;
|
|
141
|
+
}
|
|
142
|
+
/**
|
|
143
|
+
* 收集当前 memory Markdown 状态。
|
|
144
|
+
*/
|
|
145
|
+
export async function collectMemoryStatus(context, state) {
|
|
146
|
+
const files = await listMemorySourceFiles(context.rootPath);
|
|
147
|
+
const sourceCounts = [
|
|
148
|
+
{ source: "longterm", files: 0, chunks: 0 },
|
|
149
|
+
{ source: "daily", files: 0, chunks: 0 },
|
|
150
|
+
{ source: "working", files: 0, chunks: 0 },
|
|
151
|
+
];
|
|
152
|
+
let totalChunks = 0;
|
|
153
|
+
for (const file of files) {
|
|
154
|
+
const bucket = sourceCounts.find((item) => item.source === file.source);
|
|
155
|
+
if (bucket) {
|
|
156
|
+
bucket.files += 1;
|
|
157
|
+
}
|
|
158
|
+
const content = String(await fs.readFile(file.absPath, "utf-8"));
|
|
159
|
+
const chunks = chunkMarkdown(content).length;
|
|
160
|
+
totalChunks += chunks;
|
|
161
|
+
if (bucket) {
|
|
162
|
+
bucket.chunks += chunks;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return {
|
|
166
|
+
enabled: state.enabled,
|
|
167
|
+
backend: "builtin",
|
|
168
|
+
mode: "scan",
|
|
169
|
+
files: files.length,
|
|
170
|
+
chunks: totalChunks,
|
|
171
|
+
sourceCounts,
|
|
172
|
+
};
|
|
173
|
+
}
|
|
14
174
|
/**
|
|
15
175
|
* 执行检索。
|
|
16
176
|
*/
|
|
@@ -18,7 +178,7 @@ export async function searchMemory(context, state, payload) {
|
|
|
18
178
|
if (!state.enabled) {
|
|
19
179
|
return {
|
|
20
180
|
backend: "builtin",
|
|
21
|
-
mode: "
|
|
181
|
+
mode: "scan",
|
|
22
182
|
results: [],
|
|
23
183
|
disabled: true,
|
|
24
184
|
error: "memory service disabled",
|
|
@@ -29,35 +189,79 @@ export async function searchMemory(context, state, payload) {
|
|
|
29
189
|
if (!query) {
|
|
30
190
|
return {
|
|
31
191
|
backend: "builtin",
|
|
32
|
-
mode: "
|
|
192
|
+
mode: "scan",
|
|
193
|
+
results: [],
|
|
194
|
+
};
|
|
195
|
+
}
|
|
196
|
+
const tokens = tokenizeQuery(query);
|
|
197
|
+
if (tokens.length === 0) {
|
|
198
|
+
return {
|
|
199
|
+
backend: "builtin",
|
|
200
|
+
mode: "scan",
|
|
33
201
|
results: [],
|
|
34
202
|
};
|
|
35
203
|
}
|
|
36
204
|
const maxResults = Math.floor(clampNumber(Number(payload.maxResults ?? MEMORY_DEFAULTS.maxResults), 1, 20));
|
|
37
205
|
const minScore = clampNumber(Number(payload.minScore ?? MEMORY_DEFAULTS.minScore), 0, 1);
|
|
38
206
|
try {
|
|
39
|
-
await
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
207
|
+
const results = (await readMemoryChunks(context))
|
|
208
|
+
.map((chunk) => {
|
|
209
|
+
const score = buildSnippetScore(chunk.text, tokens);
|
|
210
|
+
const citation = chunk.startLine === chunk.endLine
|
|
211
|
+
? `${chunk.path}#L${chunk.startLine}`
|
|
212
|
+
: `${chunk.path}#L${chunk.startLine}-L${chunk.endLine}`;
|
|
213
|
+
return {
|
|
214
|
+
path: chunk.path,
|
|
215
|
+
source: chunk.source,
|
|
216
|
+
startLine: chunk.startLine,
|
|
217
|
+
endLine: chunk.endLine,
|
|
218
|
+
score,
|
|
219
|
+
snippet: truncateText(chunk.text, SNIPPET_MAX_CHARS),
|
|
220
|
+
citation,
|
|
221
|
+
};
|
|
222
|
+
})
|
|
223
|
+
.filter((item) => item.score >= minScore)
|
|
224
|
+
.sort((left, right) => {
|
|
225
|
+
if (right.score !== left.score) {
|
|
226
|
+
return right.score - left.score;
|
|
227
|
+
}
|
|
228
|
+
if (left.path !== right.path) {
|
|
229
|
+
return left.path.localeCompare(right.path);
|
|
230
|
+
}
|
|
231
|
+
return left.startLine - right.startLine;
|
|
232
|
+
})
|
|
233
|
+
.slice(0, maxResults * 3);
|
|
234
|
+
let remain = Math.max(0, MEMORY_DEFAULTS.maxInjectedChars);
|
|
235
|
+
const clamped = [];
|
|
236
|
+
for (const item of results) {
|
|
237
|
+
if (remain <= 0 || clamped.length >= maxResults)
|
|
238
|
+
break;
|
|
239
|
+
if (item.snippet.length <= remain) {
|
|
240
|
+
clamped.push(item);
|
|
241
|
+
remain -= item.snippet.length;
|
|
242
|
+
continue;
|
|
243
|
+
}
|
|
244
|
+
clamped.push({
|
|
245
|
+
...item,
|
|
246
|
+
snippet: item.snippet.slice(0, remain),
|
|
247
|
+
});
|
|
248
|
+
break;
|
|
249
|
+
}
|
|
46
250
|
return {
|
|
47
251
|
backend: "builtin",
|
|
48
|
-
mode: "
|
|
49
|
-
results,
|
|
252
|
+
mode: "scan",
|
|
253
|
+
results: clamped,
|
|
50
254
|
};
|
|
51
255
|
}
|
|
52
256
|
catch (error) {
|
|
53
257
|
const message = String(error);
|
|
54
258
|
return {
|
|
55
259
|
backend: "builtin",
|
|
56
|
-
mode: "
|
|
260
|
+
mode: "scan",
|
|
57
261
|
results: [],
|
|
58
262
|
disabled: true,
|
|
59
263
|
error: message,
|
|
60
|
-
action: "
|
|
264
|
+
action: "Check the Markdown memory files under `.downcity/memory/`.",
|
|
61
265
|
};
|
|
62
266
|
}
|
|
63
267
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../../../../src/service/builtins/memory/runtime/Search.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"Search.js","sourceRoot":"","sources":["../../../../../src/service/builtins/memory/runtime/Search.ts"],"names":[],"mappings":"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"}
|