@lemoncat7/dsh-partner 2.2.0 → 2.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (231) hide show
  1. package/README.md +10 -0
  2. package/docs/direct-channels.md +17 -0
  3. package/docs/mcp.md +54 -0
  4. package/docs/memory-quality.md +26 -0
  5. package/docs/releases/2.3.0.md +29 -0
  6. package/docs/releases/2.4.0.md +11 -0
  7. package/lib/agent-runtime.d.ts.map +1 -1
  8. package/lib/agent-runtime.js +16 -9
  9. package/lib/agent-runtime.js.map +1 -1
  10. package/lib/api/features/mcp-api.d.ts +4 -0
  11. package/lib/api/features/mcp-api.d.ts.map +1 -0
  12. package/lib/api/features/mcp-api.js +37 -0
  13. package/lib/api/features/mcp-api.js.map +1 -0
  14. package/lib/api/features/memory-layers-api.d.ts.map +1 -1
  15. package/lib/api/features/memory-layers-api.js +10 -1
  16. package/lib/api/features/memory-layers-api.js.map +1 -1
  17. package/lib/api.d.ts +2 -0
  18. package/lib/api.d.ts.map +1 -1
  19. package/lib/api.js +11 -2
  20. package/lib/api.js.map +1 -1
  21. package/lib/capabilities.d.ts +1 -1
  22. package/lib/capabilities.d.ts.map +1 -1
  23. package/lib/capabilities.js +2 -2
  24. package/lib/capabilities.js.map +1 -1
  25. package/lib/channels/direct/discovery.d.ts.map +1 -1
  26. package/lib/channels/direct/discovery.js +9 -4
  27. package/lib/channels/direct/discovery.js.map +1 -1
  28. package/lib/channels/direct/dispatcher.d.ts +16 -0
  29. package/lib/channels/direct/dispatcher.d.ts.map +1 -0
  30. package/lib/channels/direct/dispatcher.js +46 -0
  31. package/lib/channels/direct/dispatcher.js.map +1 -0
  32. package/lib/channels/direct/matrix-timeline.d.ts +4 -0
  33. package/lib/channels/direct/matrix-timeline.d.ts.map +1 -0
  34. package/lib/channels/direct/matrix-timeline.js +49 -0
  35. package/lib/channels/direct/matrix-timeline.js.map +1 -0
  36. package/lib/channels/direct/retry-policy.d.ts +3 -0
  37. package/lib/channels/direct/retry-policy.d.ts.map +1 -0
  38. package/lib/channels/direct/retry-policy.js +9 -0
  39. package/lib/channels/direct/retry-policy.js.map +1 -0
  40. package/lib/channels/direct/transport.d.ts.map +1 -1
  41. package/lib/channels/direct/transport.js +9 -3
  42. package/lib/channels/direct/transport.js.map +1 -1
  43. package/lib/channels/manager.d.ts +2 -1
  44. package/lib/channels/manager.d.ts.map +1 -1
  45. package/lib/channels/manager.js +104 -54
  46. package/lib/channels/manager.js.map +1 -1
  47. package/lib/client-api.d.ts +1 -0
  48. package/lib/client-api.d.ts.map +1 -1
  49. package/lib/client.d.ts.map +1 -1
  50. package/lib/client.js +2508 -1976
  51. package/lib/client.js.map +4 -4
  52. package/lib/collaboration/composition.d.ts +3 -0
  53. package/lib/collaboration/composition.d.ts.map +1 -1
  54. package/lib/collaboration/composition.js +5 -1
  55. package/lib/collaboration/composition.js.map +1 -1
  56. package/lib/collaboration/domain.d.ts +3 -0
  57. package/lib/collaboration/domain.d.ts.map +1 -1
  58. package/lib/collaboration/domain.js.map +1 -1
  59. package/lib/collaboration/review-dispatch.d.ts +5 -0
  60. package/lib/collaboration/review-dispatch.d.ts.map +1 -0
  61. package/lib/collaboration/review-dispatch.js +23 -0
  62. package/lib/collaboration/review-dispatch.js.map +1 -0
  63. package/lib/collaboration/service.d.ts.map +1 -1
  64. package/lib/collaboration/service.js +12 -3
  65. package/lib/collaboration/service.js.map +1 -1
  66. package/lib/companions/management.d.ts +4 -4
  67. package/lib/companions/removal.d.ts.map +1 -1
  68. package/lib/companions/removal.js +2 -0
  69. package/lib/companions/removal.js.map +1 -1
  70. package/lib/companions/session-configuration.d.ts.map +1 -1
  71. package/lib/companions/session-configuration.js +2 -0
  72. package/lib/companions/session-configuration.js.map +1 -1
  73. package/lib/domain.d.ts +2 -0
  74. package/lib/domain.d.ts.map +1 -1
  75. package/lib/domain.js.map +1 -1
  76. package/lib/execution/service.d.ts +3 -1
  77. package/lib/execution/service.d.ts.map +1 -1
  78. package/lib/execution/service.js +4 -0
  79. package/lib/execution/service.js.map +1 -1
  80. package/lib/index.d.ts.map +1 -1
  81. package/lib/index.js +31 -5
  82. package/lib/index.js.map +1 -1
  83. package/lib/mcp/config.d.ts +10 -0
  84. package/lib/mcp/config.d.ts.map +1 -0
  85. package/lib/mcp/config.js +54 -0
  86. package/lib/mcp/config.js.map +1 -0
  87. package/lib/mcp/connection-error.d.ts +3 -0
  88. package/lib/mcp/connection-error.d.ts.map +1 -0
  89. package/lib/mcp/connection-error.js +31 -0
  90. package/lib/mcp/connection-error.js.map +1 -0
  91. package/lib/mcp/connections.d.ts +11 -0
  92. package/lib/mcp/connections.d.ts.map +1 -0
  93. package/lib/mcp/connections.js +91 -0
  94. package/lib/mcp/connections.js.map +1 -0
  95. package/lib/mcp/credentials.d.ts +11 -0
  96. package/lib/mcp/credentials.d.ts.map +1 -0
  97. package/lib/mcp/credentials.js +25 -0
  98. package/lib/mcp/credentials.js.map +1 -0
  99. package/lib/mcp/domain.d.ts +41 -0
  100. package/lib/mcp/domain.d.ts.map +1 -0
  101. package/lib/mcp/domain.js +2 -0
  102. package/lib/mcp/domain.js.map +1 -0
  103. package/lib/mcp/edit-config.d.ts +6 -0
  104. package/lib/mcp/edit-config.d.ts.map +1 -0
  105. package/lib/mcp/edit-config.js +36 -0
  106. package/lib/mcp/edit-config.js.map +1 -0
  107. package/lib/mcp/service.d.ts +31 -0
  108. package/lib/mcp/service.d.ts.map +1 -0
  109. package/lib/mcp/service.js +227 -0
  110. package/lib/mcp/service.js.map +1 -0
  111. package/lib/mcp/state.d.ts +4 -0
  112. package/lib/mcp/state.d.ts.map +1 -0
  113. package/lib/mcp/state.js +29 -0
  114. package/lib/mcp/state.js.map +1 -0
  115. package/lib/memory-domain.d.ts +3 -0
  116. package/lib/memory-domain.d.ts.map +1 -1
  117. package/lib/memory-journal.d.ts +3 -0
  118. package/lib/memory-journal.d.ts.map +1 -1
  119. package/lib/memory-journal.js +32 -3
  120. package/lib/memory-journal.js.map +1 -1
  121. package/lib/memory-quality.d.ts +2 -0
  122. package/lib/memory-quality.d.ts.map +1 -1
  123. package/lib/memory-quality.js +8 -0
  124. package/lib/memory-quality.js.map +1 -1
  125. package/lib/memory-reflection.d.ts +1 -1
  126. package/lib/memory-reflection.d.ts.map +1 -1
  127. package/lib/memory-reflection.js +26 -13
  128. package/lib/memory-reflection.js.map +1 -1
  129. package/lib/memory-scope-migration.d.ts +4 -0
  130. package/lib/memory-scope-migration.d.ts.map +1 -0
  131. package/lib/memory-scope-migration.js +48 -0
  132. package/lib/memory-scope-migration.js.map +1 -0
  133. package/lib/memory-scope.d.ts +11 -0
  134. package/lib/memory-scope.d.ts.map +1 -0
  135. package/lib/memory-scope.js +7 -0
  136. package/lib/memory-scope.js.map +1 -0
  137. package/lib/memory-store.d.ts +9 -0
  138. package/lib/memory-store.d.ts.map +1 -1
  139. package/lib/memory-store.js +52 -3
  140. package/lib/memory-store.js.map +1 -1
  141. package/lib/persona/domain.d.ts +6 -0
  142. package/lib/persona/domain.d.ts.map +1 -0
  143. package/lib/persona/domain.js +44 -0
  144. package/lib/persona/domain.js.map +1 -0
  145. package/lib/persona/migration.d.ts +4 -0
  146. package/lib/persona/migration.d.ts.map +1 -0
  147. package/lib/persona/migration.js +22 -0
  148. package/lib/persona/migration.js.map +1 -0
  149. package/lib/persona/service.d.ts +20 -0
  150. package/lib/persona/service.d.ts.map +1 -0
  151. package/lib/persona/service.js +69 -0
  152. package/lib/persona/service.js.map +1 -0
  153. package/lib/persona/store.d.ts +11 -0
  154. package/lib/persona/store.d.ts.map +1 -0
  155. package/lib/persona/store.js +153 -0
  156. package/lib/persona/store.js.map +1 -0
  157. package/lib/persona/types.d.ts +41 -0
  158. package/lib/persona/types.d.ts.map +1 -0
  159. package/lib/persona/types.js +2 -0
  160. package/lib/persona/types.js.map +1 -0
  161. package/lib/profile-domain.d.ts.map +1 -1
  162. package/lib/profile-domain.js +2 -1
  163. package/lib/profile-domain.js.map +1 -1
  164. package/lib/requirements/plan-schema.d.ts +1 -0
  165. package/lib/requirements/plan-schema.d.ts.map +1 -1
  166. package/lib/requirements/plan-schema.js +2 -2
  167. package/lib/requirements/plan-schema.js.map +1 -1
  168. package/lib/skills/task-planning.d.ts +2 -2
  169. package/lib/skills/task-planning.d.ts.map +1 -1
  170. package/lib/skills/task-planning.js +3 -2
  171. package/lib/skills/task-planning.js.map +1 -1
  172. package/lib/storage/migrate-layout.d.ts.map +1 -1
  173. package/lib/storage/migrate-layout.js +1 -0
  174. package/lib/storage/migrate-layout.js.map +1 -1
  175. package/lib/storage/split-state.js +2 -2
  176. package/lib/storage/split-state.js.map +1 -1
  177. package/lib/store.d.ts.map +1 -1
  178. package/lib/store.js +2 -0
  179. package/lib/store.js.map +1 -1
  180. package/lib/tasks/scheduling.d.ts.map +1 -1
  181. package/lib/tasks/scheduling.js +3 -0
  182. package/lib/tasks/scheduling.js.map +1 -1
  183. package/lib/ui/capability-editor.d.ts.map +1 -1
  184. package/lib/ui/capability-editor.js +26 -17
  185. package/lib/ui/capability-editor.js.map +1 -1
  186. package/lib/ui/capability-resources.d.ts +12 -0
  187. package/lib/ui/capability-resources.d.ts.map +1 -0
  188. package/lib/ui/capability-resources.js +39 -0
  189. package/lib/ui/capability-resources.js.map +1 -0
  190. package/lib/ui/companion-access-panel.d.ts +2 -1
  191. package/lib/ui/companion-access-panel.d.ts.map +1 -1
  192. package/lib/ui/companion-access-panel.js +5 -1
  193. package/lib/ui/companion-access-panel.js.map +1 -1
  194. package/lib/ui/mcp-capabilities.d.ts +6 -0
  195. package/lib/ui/mcp-capabilities.d.ts.map +1 -0
  196. package/lib/ui/mcp-capabilities.js +53 -0
  197. package/lib/ui/mcp-capabilities.js.map +1 -0
  198. package/lib/ui/mcp-editor.d.ts +7 -0
  199. package/lib/ui/mcp-editor.d.ts.map +1 -0
  200. package/lib/ui/mcp-editor.js +85 -0
  201. package/lib/ui/mcp-editor.js.map +1 -0
  202. package/lib/ui/mcp-panel.d.ts +2 -0
  203. package/lib/ui/mcp-panel.d.ts.map +1 -0
  204. package/lib/ui/mcp-panel.js +61 -0
  205. package/lib/ui/mcp-panel.js.map +1 -0
  206. package/lib/ui/memory/memory-library.d.ts +2 -1
  207. package/lib/ui/memory/memory-library.d.ts.map +1 -1
  208. package/lib/ui/memory/memory-library.js +7 -6
  209. package/lib/ui/memory/memory-library.js.map +1 -1
  210. package/lib/ui/memory/memory-panel.d.ts.map +1 -1
  211. package/lib/ui/memory/memory-panel.js +10 -3
  212. package/lib/ui/memory/memory-panel.js.map +1 -1
  213. package/lib/ui/memory/persona-view.d.ts +9 -0
  214. package/lib/ui/memory/persona-view.d.ts.map +1 -0
  215. package/lib/ui/memory/persona-view.js +43 -0
  216. package/lib/ui/memory/persona-view.js.map +1 -0
  217. package/lib/ui/memory/types.d.ts +1 -1
  218. package/lib/ui/memory/types.d.ts.map +1 -1
  219. package/lib/ui/skills-panel.d.ts +2 -1
  220. package/lib/ui/skills-panel.d.ts.map +1 -1
  221. package/lib/ui/skills-panel.js +5 -1
  222. package/lib/ui/skills-panel.js.map +1 -1
  223. package/lib/ui/workspace-components.d.ts +2 -1
  224. package/lib/ui/workspace-components.d.ts.map +1 -1
  225. package/lib/ui/workspace-components.js +10 -5
  226. package/lib/ui/workspace-components.js.map +1 -1
  227. package/lib/ui/workspace-navigation.d.ts +9 -1
  228. package/lib/ui/workspace-navigation.d.ts.map +1 -1
  229. package/lib/ui/workspace-navigation.js +1 -0
  230. package/lib/ui/workspace-navigation.js.map +1 -1
  231. package/package.json +7 -3
@@ -0,0 +1,41 @@
1
+ export interface McpTool {
2
+ name: string;
3
+ description?: string;
4
+ inputSchema: Record<string, unknown>;
5
+ }
6
+ export interface McpServer {
7
+ id: string;
8
+ name: string;
9
+ transport: 'stdio' | 'streamable-http';
10
+ enabled: boolean;
11
+ credentialId: string;
12
+ revision: number;
13
+ tools: McpTool[];
14
+ updatedAt: number;
15
+ refreshedAt?: number;
16
+ error?: string;
17
+ }
18
+ export interface McpBinding {
19
+ companionId: string;
20
+ serverId: string;
21
+ }
22
+ export interface McpConfig {
23
+ transport: McpServer['transport'];
24
+ url?: string;
25
+ headers?: Record<string, string>;
26
+ command?: string;
27
+ args?: string[];
28
+ env?: Record<string, string>;
29
+ cwd?: string;
30
+ }
31
+ export type McpServerView = Omit<McpServer, 'credentialId'>;
32
+ export interface McpCatalog {
33
+ servers: McpServerView[];
34
+ bindings: McpBinding[];
35
+ }
36
+ export interface McpEditView {
37
+ name: string;
38
+ revision: number;
39
+ config: McpConfig;
40
+ }
41
+ //# sourceMappingURL=domain.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"domain.d.ts","sourceRoot":"","sources":["../../src/mcp/domain.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,OAAO;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE;AACrG,MAAM,WAAW,SAAS;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,OAAO,GAAG,iBAAiB,CAAA;IACtC,OAAO,EAAE,OAAO,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,EAAE,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AACD,MAAM,WAAW,UAAU;IAAG,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE;AACrE,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;IACjC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAA;CACb;AACD,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;AAC3D,MAAM,WAAW,UAAU;IAAG,OAAO,EAAE,aAAa,EAAE,CAAC;IAAC,QAAQ,EAAE,UAAU,EAAE,CAAA;CAAE;AAChF,MAAM,WAAW,WAAW;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,CAAA;CAAE"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=domain.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"domain.js","sourceRoot":"","sources":["../../src/mcp/domain.ts"],"names":[],"mappings":""}
@@ -0,0 +1,6 @@
1
+ import type { McpConfig } from './domain.js';
2
+ /** Arbitrary command arguments may contain secrets; mask all of them by default. */
3
+ export declare function editableMcpConfig(config: McpConfig): McpConfig;
4
+ /** A saved-value reference can only preserve the same field in the same server. */
5
+ export declare function restoreMcpConfig(value: unknown, previous?: McpConfig): Record<string, unknown>;
6
+ //# sourceMappingURL=edit-config.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"edit-config.d.ts","sourceRoot":"","sources":["../../src/mcp/edit-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAM5C,oFAAoF;AACpF,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,SAAS,CAQ9D;AAED,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAa9F"}
@@ -0,0 +1,36 @@
1
+ import { unwrapMcpConfig } from './config.js';
2
+ const PREFIX = '{{DSH_MCP_SAVED:';
3
+ const marker = (path) => `${PREFIX}${encodeURIComponent(path)}}}`;
4
+ /** Arbitrary command arguments may contain secrets; mask all of them by default. */
5
+ export function editableMcpConfig(config) {
6
+ const result = structuredClone(config);
7
+ for (const field of ['headers', 'env']) {
8
+ if (result[field])
9
+ for (const key of Object.keys(result[field]))
10
+ result[field][key] = marker(`${field}/${key}`);
11
+ }
12
+ if (result.args)
13
+ result.args = result.args.map((_arg, index) => marker(`args/${index}`));
14
+ if (result.url && (new URL(result.url).search || new URL(result.url).hash))
15
+ result.url = marker('url');
16
+ return result;
17
+ }
18
+ /** A saved-value reference can only preserve the same field in the same server. */
19
+ export function restoreMcpConfig(value, previous) {
20
+ const input = unwrapMcpConfig(value);
21
+ const masked = previous ? editableMcpConfig(previous) : undefined;
22
+ function restore(next, old, view) {
23
+ if (typeof next === 'string' && next.startsWith(PREFIX)) {
24
+ if (typeof old !== 'string' || next !== view || !next.endsWith('}}'))
25
+ throw Error('已保存凭据的占位符无效;请重新打开编辑,或填写新的实际值');
26
+ return old;
27
+ }
28
+ if (Array.isArray(next))
29
+ return next.map((item, index) => restore(item, Array.isArray(old) ? old[index] : undefined, Array.isArray(view) ? view[index] : undefined));
30
+ if (next && typeof next === 'object')
31
+ return Object.fromEntries(Object.entries(next).map(([key, item]) => [key, restore(item, old && typeof old === 'object' ? old[key] : undefined, view && typeof view === 'object' ? view[key] : undefined)]));
32
+ return next;
33
+ }
34
+ return restore(input, previous, masked);
35
+ }
36
+ //# sourceMappingURL=edit-config.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"edit-config.js","sourceRoot":"","sources":["../../src/mcp/edit-config.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,31 @@
1
+ import type { ToolDefinition } from '@deepseek-ai/dsh-tools';
2
+ import type { PartnerStore } from '../store.js';
3
+ import { McpConnections } from './connections.js';
4
+ import { type McpCredentials } from './credentials.js';
5
+ import type { McpCatalog, McpConfig } from './domain.js';
6
+ export declare class McpService {
7
+ private readonly store;
8
+ private readonly vault;
9
+ private readonly connections;
10
+ private writes;
11
+ constructor(store: PartnerStore, vault: McpCredentials, connections?: McpConnections);
12
+ catalog(): McpCatalog;
13
+ private serial;
14
+ private server;
15
+ save(input: unknown, id?: string): Promise<void>;
16
+ edit(id: string, reveal?: boolean): Promise<{
17
+ name: string;
18
+ revision: number;
19
+ config: McpConfig;
20
+ }>;
21
+ import(value: unknown): Promise<void>;
22
+ remove(id: string): Promise<void>;
23
+ bind(companionId: string, serverId: string, enabled: boolean): Promise<void>;
24
+ refresh(id: string): Promise<void>;
25
+ private discover;
26
+ definitions(companionId: string): ToolDefinition[];
27
+ private authorize;
28
+ close(): Promise<void>;
29
+ }
30
+ export declare function mcpToolName(serverId: string, name: string): string;
31
+ //# sourceMappingURL=service.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/mcp/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAG/C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEjD,OAAO,EAAyB,KAAK,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAC7E,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAsB,MAAM,aAAa,CAAA;AAE5E,qBAAa,UAAU;IAET,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAgB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAAkB,OAAO,CAAC,QAAQ,CAAC,WAAW;IADtH,OAAO,CAAC,MAAM,CAAsC;gBACvB,KAAK,EAAE,YAAY,EAAmB,KAAK,EAAE,cAAc,EAAmB,WAAW,iBAAuB;IAC7I,OAAO,IAAI,UAAU;IAIrB,OAAO,CAAC,MAAM;IAKd,OAAO,CAAC,MAAM;IAKR,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA8BhD,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,UAAQ;;;;;IAK/B,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBrC,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAUjC,IAAI,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ5E,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxC,OAAO,CAAC,QAAQ;IAmBhB,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,cAAc,EAAE;IAmClD,OAAO,CAAC,SAAS;IAMX,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAC7B;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAGlE"}
@@ -0,0 +1,227 @@
1
+ import { createHash, randomUUID } from 'node:crypto';
2
+ import { CallToolResultSchema } from '@modelcontextprotocol/sdk/types.js';
3
+ import { record, requiredText } from '../core/validation.js';
4
+ import { parseMcpConfig, parseMcpImport } from './config.js';
5
+ import { McpConnections } from './connections.js';
6
+ import { editableMcpConfig, restoreMcpConfig } from './edit-config.js';
7
+ import { createMcpCredentialId } from './credentials.js';
8
+ export class McpService {
9
+ store;
10
+ vault;
11
+ connections;
12
+ writes = Promise.resolve();
13
+ constructor(store, vault, connections = new McpConnections()) {
14
+ this.store = store;
15
+ this.vault = vault;
16
+ this.connections = connections;
17
+ }
18
+ catalog() {
19
+ const state = this.store.snapshot();
20
+ return { servers: (state.mcpServers ?? []).map(({ credentialId: _secret, ...server }) => server), bindings: state.mcpBindings ?? [] };
21
+ }
22
+ serial(work) {
23
+ const job = this.writes.then(work, work);
24
+ this.writes = job.catch(() => { });
25
+ return job;
26
+ }
27
+ server(id) {
28
+ const server = this.store.snapshot().mcpServers?.find(item => item.id === id);
29
+ if (!server)
30
+ throw Error('MCP 服务不存在,请刷新列表');
31
+ return server;
32
+ }
33
+ async save(input, id) {
34
+ const body = record(input);
35
+ const name = requiredText(body.name, '名称', 80);
36
+ if (body.enabled !== undefined && typeof body.enabled !== 'boolean')
37
+ throw Error('enabled 必须是布尔值');
38
+ await this.serial(async () => {
39
+ const previous = id ? this.server(id) : undefined;
40
+ if (body.expectedRevision !== undefined && body.expectedRevision !== previous?.revision)
41
+ throw Error('MCP 配置已被修改,请重新打开编辑后保存,避免覆盖其他修改');
42
+ const oldConfig = previous && body.config !== undefined ? await this.vault.read(previous.credentialId) : undefined;
43
+ const parsed = body.config === undefined ? undefined : parseMcpConfig(restoreMcpConfig(body.config, oldConfig));
44
+ const config = parsed && JSON.stringify(parsed) !== JSON.stringify(oldConfig) ? parsed : undefined;
45
+ if (!previous && !config)
46
+ throw Error('请填写 MCP 配置');
47
+ const credentialId = config ? createMcpCredentialId() : previous.credentialId;
48
+ if (config)
49
+ await this.vault.write(credentialId, config);
50
+ try {
51
+ await this.store.update(state => {
52
+ const servers = state.mcpServers ??= [];
53
+ if (servers.some(item => item.id !== id && item.name === name))
54
+ throw Error('MCP 名称已存在');
55
+ if (!previous && servers.length >= 50)
56
+ throw Error('最多配置 50 个 MCP 服务');
57
+ const server = {
58
+ id: previous?.id ?? randomUUID(), name, transport: config?.transport ?? previous.transport,
59
+ enabled: typeof body.enabled === 'boolean' ? body.enabled : previous?.enabled ?? true,
60
+ credentialId, revision: (previous?.revision ?? 0) + 1, tools: config ? [] : previous.tools,
61
+ updatedAt: Date.now(), ...(!config && previous?.refreshedAt ? { refreshedAt: previous.refreshedAt } : {}),
62
+ };
63
+ state.mcpServers = [...servers.filter(item => item.id !== server.id), server];
64
+ });
65
+ }
66
+ catch (error) {
67
+ if (config)
68
+ await this.vault.delete(credentialId).catch(() => { });
69
+ throw error;
70
+ }
71
+ if (config && previous)
72
+ await this.vault.delete(previous.credentialId).catch(() => { });
73
+ });
74
+ }
75
+ async edit(id, reveal = false) {
76
+ const server = this.server(id);
77
+ const config = await this.vault.read(server.credentialId);
78
+ return { name: server.name, revision: server.revision, config: reveal ? config : editableMcpConfig(config) };
79
+ }
80
+ async import(value) {
81
+ const entries = parseMcpImport(value);
82
+ await this.serial(async () => {
83
+ const existing = this.store.snapshot().mcpServers ?? [];
84
+ if (entries.length + existing.length > 50 || entries.some(entry => existing.some(server => server.name === entry.name)))
85
+ throw Error('存在重名服务或超过 50 个服务,请修改后重试;没有导入任何配置');
86
+ const credentials = [];
87
+ try {
88
+ const servers = [];
89
+ for (const entry of entries) {
90
+ const credentialId = createMcpCredentialId();
91
+ credentials.push(credentialId);
92
+ await this.vault.write(credentialId, entry.config);
93
+ servers.push({ id: randomUUID(), name: entry.name, transport: entry.config.transport, enabled: true, credentialId, revision: 1, tools: [], updatedAt: Date.now() });
94
+ }
95
+ await this.store.update(state => { (state.mcpServers ??= []).push(...servers); });
96
+ }
97
+ catch (error) {
98
+ await Promise.all(credentials.map(id => this.vault.delete(id).catch(() => { })));
99
+ throw error;
100
+ }
101
+ });
102
+ }
103
+ async remove(id) {
104
+ await this.serial(async () => {
105
+ const server = this.server(id);
106
+ await this.store.update(state => {
107
+ state.mcpServers = (state.mcpServers ?? []).filter(item => item.id !== id);
108
+ state.mcpBindings = (state.mcpBindings ?? []).filter(item => item.serverId !== id);
109
+ });
110
+ await this.vault.delete(server.credentialId).catch(() => { });
111
+ });
112
+ }
113
+ async bind(companionId, serverId, enabled) {
114
+ await this.store.update(state => {
115
+ if (!state.companions.some(c => c.id === companionId) || this.store.isCompanionRemoving(companionId))
116
+ throw Error('伙伴不存在或正在删除');
117
+ if (!state.mcpServers?.some(s => s.id === serverId))
118
+ throw Error('MCP 服务不存在');
119
+ state.mcpBindings = (state.mcpBindings ?? []).filter(b => b.companionId !== companionId || b.serverId !== serverId);
120
+ if (enabled)
121
+ state.mcpBindings.push({ companionId, serverId });
122
+ });
123
+ }
124
+ async refresh(id) {
125
+ const server = this.server(id);
126
+ try {
127
+ const config = await this.vault.read(server.credentialId);
128
+ const tools = await this.discover(server.credentialId, config);
129
+ await this.store.update(state => {
130
+ const current = state.mcpServers?.find(s => s.id === id);
131
+ if (!current || current.credentialId !== server.credentialId || current.revision !== server.revision)
132
+ throw Error('MCP 配置已变化,请重新刷新工具');
133
+ current.tools = tools;
134
+ current.revision++;
135
+ current.refreshedAt = Date.now();
136
+ current.updatedAt = Date.now();
137
+ delete current.error;
138
+ });
139
+ }
140
+ catch (error) {
141
+ const message = error instanceof Error && error.message.startsWith('MCP ') ? error.message : 'MCP 工具刷新失败,请检查连接、认证和服务日志后重试';
142
+ await this.store.update(state => {
143
+ const current = state.mcpServers?.find(s => s.id === id);
144
+ if (current?.revision === server.revision && current.credentialId === server.credentialId)
145
+ current.error = message;
146
+ });
147
+ throw Error(message);
148
+ }
149
+ }
150
+ discover(id, config) {
151
+ return this.connections.use(id, config, AbortSignal.timeout(30_000), async (client, signal) => {
152
+ const tools = [], cursors = new Set(), names = new Set();
153
+ let cursor;
154
+ do {
155
+ const result = await client.listTools(cursor ? { cursor } : {}, { signal, timeout: 30_000 });
156
+ for (const tool of result.tools) {
157
+ if (!tool.name || names.has(tool.name))
158
+ throw Error('MCP 工具名称为空或重复');
159
+ names.add(tool.name);
160
+ tools.push({ name: tool.name, ...(tool.description ? { description: tool.description } : {}), inputSchema: tool.inputSchema });
161
+ }
162
+ if (tools.length > 200 || JSON.stringify(tools).length > 512_000)
163
+ throw Error('MCP 工具目录过大(最多 200 项 / 512 KB)');
164
+ cursor = result.nextCursor;
165
+ if (cursor && (cursors.has(cursor) || cursors.size >= 20))
166
+ throw Error('MCP 工具目录分页异常');
167
+ if (cursor)
168
+ cursors.add(cursor);
169
+ } while (cursor);
170
+ return tools.sort((a, b) => a.name.localeCompare(b.name));
171
+ });
172
+ }
173
+ definitions(companionId) {
174
+ const state = this.store.snapshot();
175
+ if (!state.companions.find(c => c.id === companionId)?.capabilities.includes('mcp'))
176
+ return [];
177
+ const ids = new Set(state.mcpBindings?.filter(b => b.companionId === companionId).map(b => b.serverId));
178
+ return (state.mcpServers ?? []).filter(s => s.enabled && ids.has(s.id)).flatMap(server => server.tools.map(tool => ({
179
+ name: mcpToolName(server.id, tool.name), description: `[${server.name}] ${tool.description ?? tool.name}`,
180
+ parameters: tool.inputSchema,
181
+ output: { schema: { type: 'string' }, render: (_args, value) => [{ type: 'text', text: String(value) }] },
182
+ presentCall: () => ({ card: 'generic', title: `${server.name} · ${tool.name}` }),
183
+ execute: async (args, execution) => {
184
+ this.authorize(companionId, server, tool.name);
185
+ const config = await this.vault.read(server.credentialId);
186
+ return this.connections.use(server.credentialId, config, execution.signal, async (client, signal) => {
187
+ this.authorize(companionId, server, tool.name);
188
+ const parameters = record(args, 'MCP 参数');
189
+ const rawResult = await client.callTool({ name: tool.name, arguments: parameters }, undefined, { signal, timeout: 60_000 }).catch(() => {
190
+ signal.throwIfAborted();
191
+ // Transport diagnostics can contain URLs, headers or subprocess args.
192
+ // Do not replay a potentially side-effecting tool call on failure.
193
+ throw Error('MCP 调用未成功返回,请检查服务连接或认证;未自动重试,请先确认远端执行结果');
194
+ });
195
+ const result = CallToolResultSchema.parse(rawResult);
196
+ const content = result.content.map(block => {
197
+ if (block.type === 'text' || block.type === 'resource_link')
198
+ return block;
199
+ if (block.type === 'resource' && typeof block.resource === 'object' && block.resource !== null && 'text' in block.resource)
200
+ return block;
201
+ return { type: 'text', text: `MCP 返回 ${block.type} 内容;此处不直接传送二进制,请使用服务的资源下载工具获取文件地址。` };
202
+ });
203
+ const text = JSON.stringify({ content, ...(result.structuredContent ? { structuredContent: result.structuredContent } : {}), ...(result.isError ? { isError: true } : {}) });
204
+ if (text.length > 256_000)
205
+ throw Error('MCP 返回内容过大,请缩小查询或请求文件下载地址');
206
+ if (result.isError)
207
+ throw Error(text);
208
+ return text;
209
+ });
210
+ },
211
+ })));
212
+ }
213
+ authorize(companionId, snapshot, name) {
214
+ const state = this.store.snapshot(), current = state.mcpServers?.find(s => s.id === snapshot.id);
215
+ if (this.store.isCompanionRemoving(companionId) || !this.store.hasCapability(companionId, 'mcp') || !state.mcpBindings?.some(b => b.companionId === companionId && b.serverId === snapshot.id) || !current?.enabled)
216
+ throw Error('MCP 授权已撤回,未执行调用');
217
+ const tool = current.tools.find(t => t.name === name), previous = snapshot.tools.find(t => t.name === name);
218
+ if (current.credentialId !== snapshot.credentialId || !tool || JSON.stringify(tool.inputSchema) !== JSON.stringify(previous?.inputSchema))
219
+ throw Error('MCP 配置或工具已变更,请下一轮对话重试');
220
+ }
221
+ async close() { await this.writes; await this.connections.close(); }
222
+ }
223
+ export function mcpToolName(serverId, name) {
224
+ const hash = createHash('sha256').update(`${serverId}\0${name}`).digest('hex').slice(0, 16);
225
+ return `mcp__${name.replace(/[^A-Za-z0-9_-]/g, '_').slice(0, 40)}_${hash}`;
226
+ }
227
+ //# sourceMappingURL=service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/mcp/service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,4 @@
1
+ import type { PartnerState } from '../domain.js';
2
+ /** Validates persisted optional fields without rewriting older partner data. */
3
+ export declare function validateMcpState(state: Partial<PartnerState>): void;
4
+ //# sourceMappingURL=state.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../src/mcp/state.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAEhD,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,IAAI,CAoBnE"}
@@ -0,0 +1,29 @@
1
+ /** Validates persisted optional fields without rewriting older partner data. */
2
+ export function validateMcpState(state) {
3
+ if (state.mcpServers !== undefined && (!Array.isArray(state.mcpServers) || state.mcpServers.length > 50))
4
+ throw Error('Invalid MCP server state');
5
+ if (state.mcpBindings !== undefined && !Array.isArray(state.mcpBindings))
6
+ throw Error('Invalid MCP bindings');
7
+ const ids = new Set();
8
+ for (const server of state.mcpServers ?? []) {
9
+ if (!server || typeof server.id !== 'string' || ids.has(server.id) || typeof server.name !== 'string' || typeof server.credentialId !== 'string' || typeof server.enabled !== 'boolean' || !['stdio', 'streamable-http'].includes(server.transport) || !Number.isSafeInteger(server.revision) || server.revision < 1 || !Number.isFinite(server.updatedAt) || !Array.isArray(server.tools) || server.tools.length > 200)
10
+ throw Error('Invalid MCP server record');
11
+ const names = new Set();
12
+ for (const tool of server.tools) {
13
+ if (!tool || typeof tool.name !== 'string' || !tool.name || names.has(tool.name) || !tool.inputSchema || tool.inputSchema.type !== 'object' || (tool.description !== undefined && typeof tool.description !== 'string'))
14
+ throw Error('Invalid MCP tool catalog');
15
+ names.add(tool.name);
16
+ }
17
+ ids.add(server.id);
18
+ }
19
+ const companions = new Set(state.companions?.map(c => c.id)), pairs = new Set();
20
+ for (const binding of state.mcpBindings ?? []) {
21
+ if (!binding || !ids.has(binding.serverId) || !companions.has(binding.companionId))
22
+ throw Error('Invalid MCP authorization');
23
+ const pair = `${binding.companionId}\0${binding.serverId}`;
24
+ if (pairs.has(pair))
25
+ throw Error('Duplicate MCP authorization');
26
+ pairs.add(pair);
27
+ }
28
+ }
29
+ //# sourceMappingURL=state.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"state.js","sourceRoot":"","sources":["../../src/mcp/state.ts"],"names":[],"mappings":"AAEA,gFAAgF;AAChF,MAAM,UAAU,gBAAgB,CAAC,KAA4B;IAC3D,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,GAAG,EAAE,CAAC;QAAE,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;IACjJ,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;QAAE,MAAM,KAAK,CAAC,sBAAsB,CAAC,CAAA;IAC7G,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAC7B,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;QAC5C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,EAAE,KAAK,QAAQ,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,YAAY,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG;YAAE,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAA;QACjc,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;QAC/B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YAChC,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,CAAC;gBAAE,MAAM,KAAK,CAAC,0BAA0B,CAAC,CAAA;YAChQ,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;IACpB,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IACvF,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;QAC9C,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC;YAAE,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAA;QAC5H,MAAM,IAAI,GAAG,GAAG,OAAO,CAAC,WAAW,KAAK,OAAO,CAAC,QAAQ,EAAE,CAAA;QAC1D,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAA;QAC/D,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;IACjB,CAAC;AACH,CAAC"}
@@ -3,6 +3,8 @@ import type { SceneProposal, ExperienceProposal, SceneView } from './memory-arti
3
3
  export type MemoryKind = 'profile' | 'preference' | 'task' | 'event' | 'relationship' | 'emotion';
4
4
  export type MemoryStatus = 'active' | 'completed' | 'superseded' | 'expired';
5
5
  export interface ConversationTurn {
6
+ /** Transport identity for concern delivery, independent of shared memory. */
7
+ concernScopeId?: string;
6
8
  id: string;
7
9
  companionId: string;
8
10
  scopeId: string;
@@ -34,6 +36,7 @@ export interface PartnerMemory {
34
36
  evidence: MemoryEvidence[];
35
37
  }
36
38
  export interface UserProfileSnapshot {
39
+ persona?: import('./persona/types.js').PersonaView;
37
40
  preferences?: PartnerMemory[];
38
41
  companionId: string;
39
42
  scopeId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"memory-domain.d.ts","sourceRoot":"","sources":["../src/memory-domain.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory-domain.d.ts","sourceRoot":"","sources":["../src/memory-domain.ts"],"names":[],"mappings":"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"}
@@ -5,9 +5,12 @@ export interface MemoryJob {
5
5
  token: string;
6
6
  attempts: number;
7
7
  result?: ReflectionResult;
8
+ repair?: boolean;
8
9
  }
9
10
  /** SQL-only durable journal. Connections and transactions belong to the memory store. */
10
11
  export declare function initializeMemoryJournal(db: DatabaseSync): void;
12
+ /** One bounded repair per scope. Original turn IDs and completed diaries survive. */
13
+ export declare function scheduleProfileRepair(db: DatabaseSync, scopeId: string): number;
11
14
  export declare function enqueueMemoryJob(db: DatabaseSync, turn: ConversationTurn): void;
12
15
  export declare function claimMemoryJob(db: DatabaseSync, now: number): MemoryJob | undefined;
13
16
  export declare function checkpointMemoryJob(db: DatabaseSync, job: MemoryJob, result: ReflectionResult): void;
@@ -1 +1 @@
1
- {"version":3,"file":"memory-journal.d.ts","sourceRoot":"","sources":["../src/memory-journal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE5E,MAAM,WAAW,SAAS;IAAG,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,gBAAgB,CAAA;CAAE;AAGjH,yFAAyF;AACzF,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAS9D;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAG/E;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAcnF;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAIpG;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI,CAMxG;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,GAAG,IAAI,CAIxE"}
1
+ {"version":3,"file":"memory-journal.d.ts","sourceRoot":"","sources":["../src/memory-journal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,KAAK,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE5E,MAAM,WAAW,SAAS;IAAG,IAAI,EAAE,gBAAgB,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE;AAGnI,yFAAyF;AACzF,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CAa9D;AAED,qFAAqF;AACrF,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAc/E;AAED,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI,CAG/E;AAED,wBAAgB,cAAc,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAenF;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAIpG;AAED,wBAAgB,eAAe,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,IAAI,CAMxG;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,GAAG,IAAI,CAIxE"}
@@ -10,6 +10,34 @@ export function initializeMemoryJournal(db) {
10
10
  );
11
11
  CREATE INDEX IF NOT EXISTS memory_jobs_pending ON memory_jobs(done, next_at, at);
12
12
  CREATE INDEX IF NOT EXISTS memory_jobs_scope ON memory_jobs(scope_id, at);`);
13
+ if (!db.prepare('PRAGMA table_info(memory_jobs)').all().some(row => row.name === 'repair')) {
14
+ db.exec('ALTER TABLE memory_jobs ADD COLUMN repair INTEGER NOT NULL DEFAULT 0');
15
+ }
16
+ db.exec('CREATE TABLE IF NOT EXISTS memory_maintenance (key TEXT PRIMARY KEY)');
17
+ }
18
+ /** One bounded repair per scope. Original turn IDs and completed diaries survive. */
19
+ export function scheduleProfileRepair(db, scopeId) {
20
+ const key = `profile-evidence-v1:${scopeId}`;
21
+ db.exec('BEGIN IMMEDIATE');
22
+ try {
23
+ if (db.prepare('SELECT 1 FROM memory_maintenance WHERE key=?').get(key)) {
24
+ db.exec('COMMIT');
25
+ return 0;
26
+ }
27
+ const rows = db.prepare(`SELECT id FROM memory_jobs WHERE scope_id=? AND done=1 AND repair=0
28
+ AND result_json IS NOT NULL AND json_array_length(result_json, '$.memories')=0
29
+ ORDER BY at DESC LIMIT 30`).all(scopeId);
30
+ for (const row of rows)
31
+ db.prepare(`UPDATE memory_jobs SET done=0, repair=1, attempts=0, next_at=0,
32
+ result_json=NULL, lease_token=NULL, lease_until=0, last_error=NULL WHERE id=?`).run(String(row.id));
33
+ db.prepare('INSERT INTO memory_maintenance VALUES (?)').run(key);
34
+ db.exec('COMMIT');
35
+ return rows.length;
36
+ }
37
+ catch (error) {
38
+ db.exec('ROLLBACK');
39
+ throw error;
40
+ }
13
41
  }
14
42
  export function enqueueMemoryJob(db, turn) {
15
43
  db.prepare('INSERT OR IGNORE INTO memory_jobs (id, scope_id, at, turn_json) VALUES (?, ?, ?, ?)')
@@ -22,13 +50,14 @@ export function claimMemoryJob(db, now) {
22
50
  const row = db.prepare(`UPDATE memory_jobs SET lease_token=?, lease_until=? WHERE id=(
23
51
  SELECT j.id FROM memory_jobs j WHERE j.done=0 AND j.next_at<=? AND j.lease_until<=?
24
52
  AND NOT EXISTS (SELECT 1 FROM memory_jobs WHERE done=0 AND lease_until>?)
25
- AND NOT EXISTS (SELECT 1 FROM memory_jobs p WHERE p.scope_id=j.scope_id AND p.done=0 AND (p.attempts<3 OR p.next_at<=?)
53
+ AND NOT EXISTS (SELECT 1 FROM memory_jobs p WHERE p.scope_id=j.scope_id AND p.repair=j.repair AND p.done=0 AND (p.attempts<3 OR p.next_at<=?)
26
54
  AND (p.at<j.at OR (p.at=j.at AND p.rowid<j.rowid)))
27
- ORDER BY j.at, j.rowid LIMIT 1
28
- ) RETURNING turn_json, result_json, attempts`).get(token, now + LEASE_MS, now, now, now, now);
55
+ ORDER BY (j.repair>0), j.at, j.rowid LIMIT 1
56
+ ) RETURNING turn_json, result_json, attempts, repair`).get(token, now + LEASE_MS, now, now, now, now);
29
57
  if (!row)
30
58
  return undefined;
31
59
  return { turn: JSON.parse(String(row.turn_json)), token, attempts: Number(row.attempts),
60
+ ...(Number(row.repair) > 0 ? { repair: true } : {}),
32
61
  ...(row.result_json ? { result: JSON.parse(String(row.result_json)) } : {}) };
33
62
  }
34
63
  export function checkpointMemoryJob(db, job, result) {
@@ -1 +1 @@
1
- {"version":3,"file":"memory-journal.js","sourceRoot":"","sources":["../src/memory-journal.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"memory-journal.js","sourceRoot":"","sources":["../src/memory-journal.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,6 @@
1
1
  import type { ConversationTurn, MemoryCandidate } from './memory-domain.js';
2
2
  /** Ground model proposals in user speech, never in assistant summaries. */
3
3
  export declare function groundMemoryCandidates(candidates: MemoryCandidate[], turns: ConversationTurn[]): MemoryCandidate[];
4
+ /** Invalid evidence is a retryable extraction failure, not successful empty memory. */
5
+ export declare function requireGroundedMemories(candidates: MemoryCandidate[], turns: ConversationTurn[]): MemoryCandidate[];
4
6
  //# sourceMappingURL=memory-quality.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"memory-quality.d.ts","sourceRoot":"","sources":["../src/memory-quality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAI3E,2EAA2E;AAC3E,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,eAAe,EAAE,CAUlH"}
1
+ {"version":3,"file":"memory-quality.d.ts","sourceRoot":"","sources":["../src/memory-quality.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAI3E,2EAA2E;AAC3E,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,eAAe,EAAE,CAUlH;AAED,uFAAuF;AACvF,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,eAAe,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,GAAG,eAAe,EAAE,CAMnH"}
@@ -13,4 +13,12 @@ export function groundMemoryCandidates(candidates, turns) {
13
13
  return [{ ...candidate, sourceEvidence: { turnId: source.id, at: source.at, excerpt: quote.slice(0, 300) } }];
14
14
  });
15
15
  }
16
+ /** Invalid evidence is a retryable extraction failure, not successful empty memory. */
17
+ export function requireGroundedMemories(candidates, turns) {
18
+ const grounded = groundMemoryCandidates(candidates, turns);
19
+ if (grounded.length !== candidates.length) {
20
+ throw new Error(`记忆证据校验失败:${candidates.length - grounded.length} 项缺少可匹配的用户原话或轮次 ID;将自动重试`);
21
+ }
22
+ return grounded;
23
+ }
16
24
  //# sourceMappingURL=memory-quality.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"memory-quality.js","sourceRoot":"","sources":["../src/memory-quality.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;AAEjG,2EAA2E;AAC3E,MAAM,UAAU,sBAAsB,CAAC,UAA6B,EAAE,KAAyB;IAC7F,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;QACvD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,EAAE,CAAA;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC;eAC/F,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAA;QAC1B,OAAO,CAAC,EAAE,GAAG,SAAS,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAC/G,CAAC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"memory-quality.js","sourceRoot":"","sources":["../src/memory-quality.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,GAAG,CAAC,KAAa,EAAU,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAA;AAEjG,2EAA2E;AAC3E,MAAM,UAAU,sBAAsB,CAAC,UAA6B,EAAE,KAAyB;IAC7F,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;QACpC,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,aAAa,IAAI,EAAE,CAAC,CAAA;QACvD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,EAAE,CAAA;QAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,YAAY,CAAC;eAC/F,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QACnC,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAE,CAAA;QAC1B,OAAO,CAAC,EAAE,GAAG,SAAS,EAAE,cAAc,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAC/G,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,uBAAuB,CAAC,UAA6B,EAAE,KAAyB;IAC9F,MAAM,QAAQ,GAAG,sBAAsB,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;IAC1D,IAAI,QAAQ,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;QAC1C,MAAM,IAAI,KAAK,CAAC,YAAY,UAAU,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,0BAA0B,CAAC,CAAA;IAC5F,CAAC;IACD,OAAO,QAAQ,CAAA;AACjB,CAAC"}