@lemoncat7/dsh-partner 2.3.0 → 2.4.1
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/README.md +6 -0
- package/docs/channel-message-format.md +2 -0
- package/docs/mcp.md +54 -0
- package/docs/releases/2.4.0.md +11 -0
- package/docs/releases/2.4.1.md +9 -0
- package/lib/agent-runtime.d.ts.map +1 -1
- package/lib/agent-runtime.js +4 -0
- package/lib/agent-runtime.js.map +1 -1
- package/lib/api/features/mcp-api.d.ts +4 -0
- package/lib/api/features/mcp-api.d.ts.map +1 -0
- package/lib/api/features/mcp-api.js +37 -0
- package/lib/api/features/mcp-api.js.map +1 -0
- package/lib/api.d.ts +2 -0
- package/lib/api.d.ts.map +1 -1
- package/lib/api.js +3 -0
- package/lib/api.js.map +1 -1
- package/lib/capabilities.d.ts +1 -1
- package/lib/capabilities.d.ts.map +1 -1
- package/lib/capabilities.js +2 -2
- package/lib/capabilities.js.map +1 -1
- package/lib/client.d.ts.map +1 -1
- package/lib/client.js +1480 -1033
- package/lib/client.js.map +4 -4
- package/lib/collaboration/composition.d.ts +3 -0
- package/lib/collaboration/composition.d.ts.map +1 -1
- package/lib/collaboration/composition.js +5 -1
- package/lib/collaboration/composition.js.map +1 -1
- package/lib/collaboration/domain.d.ts +3 -0
- package/lib/collaboration/domain.d.ts.map +1 -1
- package/lib/collaboration/domain.js.map +1 -1
- package/lib/collaboration/review-dispatch.d.ts +5 -0
- package/lib/collaboration/review-dispatch.d.ts.map +1 -0
- package/lib/collaboration/review-dispatch.js +23 -0
- package/lib/collaboration/review-dispatch.js.map +1 -0
- package/lib/collaboration/service.d.ts.map +1 -1
- package/lib/collaboration/service.js +12 -3
- package/lib/collaboration/service.js.map +1 -1
- package/lib/companions/management.d.ts +4 -4
- package/lib/companions/removal.d.ts.map +1 -1
- package/lib/companions/removal.js +2 -0
- package/lib/companions/removal.js.map +1 -1
- package/lib/companions/session-configuration.d.ts.map +1 -1
- package/lib/companions/session-configuration.js +2 -0
- package/lib/companions/session-configuration.js.map +1 -1
- package/lib/core/validation.d.ts +2 -0
- package/lib/core/validation.d.ts.map +1 -1
- package/lib/core/validation.js +9 -0
- package/lib/core/validation.js.map +1 -1
- package/lib/domain.d.ts +2 -0
- package/lib/domain.d.ts.map +1 -1
- package/lib/domain.js.map +1 -1
- package/lib/execution/service.d.ts +3 -1
- package/lib/execution/service.d.ts.map +1 -1
- package/lib/execution/service.js +4 -0
- package/lib/execution/service.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +7 -1
- package/lib/index.js.map +1 -1
- package/lib/mcp/config.d.ts +10 -0
- package/lib/mcp/config.d.ts.map +1 -0
- package/lib/mcp/config.js +54 -0
- package/lib/mcp/config.js.map +1 -0
- package/lib/mcp/connection-error.d.ts +3 -0
- package/lib/mcp/connection-error.d.ts.map +1 -0
- package/lib/mcp/connection-error.js +31 -0
- package/lib/mcp/connection-error.js.map +1 -0
- package/lib/mcp/connections.d.ts +11 -0
- package/lib/mcp/connections.d.ts.map +1 -0
- package/lib/mcp/connections.js +91 -0
- package/lib/mcp/connections.js.map +1 -0
- package/lib/mcp/credentials.d.ts +11 -0
- package/lib/mcp/credentials.d.ts.map +1 -0
- package/lib/mcp/credentials.js +25 -0
- package/lib/mcp/credentials.js.map +1 -0
- package/lib/mcp/domain.d.ts +41 -0
- package/lib/mcp/domain.d.ts.map +1 -0
- package/lib/mcp/domain.js +2 -0
- package/lib/mcp/domain.js.map +1 -0
- package/lib/mcp/edit-config.d.ts +6 -0
- package/lib/mcp/edit-config.d.ts.map +1 -0
- package/lib/mcp/edit-config.js +36 -0
- package/lib/mcp/edit-config.js.map +1 -0
- package/lib/mcp/service.d.ts +31 -0
- package/lib/mcp/service.d.ts.map +1 -0
- package/lib/mcp/service.js +227 -0
- package/lib/mcp/service.js.map +1 -0
- package/lib/mcp/state.d.ts +4 -0
- package/lib/mcp/state.d.ts.map +1 -0
- package/lib/mcp/state.js +29 -0
- package/lib/mcp/state.js.map +1 -0
- package/lib/requirements/plan-schema.d.ts +1 -0
- package/lib/requirements/plan-schema.d.ts.map +1 -1
- package/lib/requirements/plan-schema.js +2 -2
- package/lib/requirements/plan-schema.js.map +1 -1
- package/lib/requirements/service.js +2 -2
- package/lib/requirements/service.js.map +1 -1
- package/lib/requirements/tool.js +2 -2
- package/lib/requirements/tool.js.map +1 -1
- package/lib/skills/task-planning.d.ts +2 -2
- package/lib/skills/task-planning.d.ts.map +1 -1
- package/lib/skills/task-planning.js +3 -2
- package/lib/skills/task-planning.js.map +1 -1
- package/lib/storage/migrate-layout.d.ts.map +1 -1
- package/lib/storage/migrate-layout.js +1 -0
- package/lib/storage/migrate-layout.js.map +1 -1
- package/lib/storage/split-state.js +2 -2
- package/lib/storage/split-state.js.map +1 -1
- package/lib/store.d.ts.map +1 -1
- package/lib/store.js +2 -0
- package/lib/store.js.map +1 -1
- package/lib/tasks/result.d.ts.map +1 -1
- package/lib/tasks/result.js +4 -18
- package/lib/tasks/result.js.map +1 -1
- package/lib/tasks/scheduling.d.ts.map +1 -1
- package/lib/tasks/scheduling.js +3 -0
- package/lib/tasks/scheduling.js.map +1 -1
- package/lib/ui/capability-editor.d.ts.map +1 -1
- package/lib/ui/capability-editor.js +26 -17
- package/lib/ui/capability-editor.js.map +1 -1
- package/lib/ui/capability-resources.d.ts +12 -0
- package/lib/ui/capability-resources.d.ts.map +1 -0
- package/lib/ui/capability-resources.js +39 -0
- package/lib/ui/capability-resources.js.map +1 -0
- package/lib/ui/companion-access-panel.d.ts +2 -1
- package/lib/ui/companion-access-panel.d.ts.map +1 -1
- package/lib/ui/companion-access-panel.js +5 -1
- package/lib/ui/companion-access-panel.js.map +1 -1
- package/lib/ui/mcp-capabilities.d.ts +6 -0
- package/lib/ui/mcp-capabilities.d.ts.map +1 -0
- package/lib/ui/mcp-capabilities.js +53 -0
- package/lib/ui/mcp-capabilities.js.map +1 -0
- package/lib/ui/mcp-editor.d.ts +7 -0
- package/lib/ui/mcp-editor.d.ts.map +1 -0
- package/lib/ui/mcp-editor.js +85 -0
- package/lib/ui/mcp-editor.js.map +1 -0
- package/lib/ui/mcp-panel.d.ts +2 -0
- package/lib/ui/mcp-panel.d.ts.map +1 -0
- package/lib/ui/mcp-panel.js +61 -0
- package/lib/ui/mcp-panel.js.map +1 -0
- package/lib/ui/skills-panel.d.ts +2 -1
- package/lib/ui/skills-panel.d.ts.map +1 -1
- package/lib/ui/skills-panel.js +5 -1
- package/lib/ui/skills-panel.js.map +1 -1
- package/lib/ui/workspace-components.d.ts +2 -1
- package/lib/ui/workspace-components.d.ts.map +1 -1
- package/lib/ui/workspace-components.js +2 -2
- package/lib/ui/workspace-components.js.map +1 -1
- package/lib/ui/workspace-navigation.d.ts +9 -1
- package/lib/ui/workspace-navigation.d.ts.map +1 -1
- package/lib/ui/workspace-navigation.js +1 -0
- package/lib/ui/workspace-navigation.js.map +1 -1
- 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 @@
|
|
|
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":"AAAA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAGzE,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACtE,OAAO,EAAE,qBAAqB,EAAuB,MAAM,kBAAkB,CAAA;AAG7E,MAAM,OAAO,UAAU;IAEQ;IAAsC;IAAwC;IADnG,MAAM,GAAqB,OAAO,CAAC,OAAO,EAAE,CAAA;IACpD,YAA6B,KAAmB,EAAmB,KAAqB,EAAmB,cAAc,IAAI,cAAc,EAAE;QAAhH,UAAK,GAAL,KAAK,CAAc;QAAmB,UAAK,GAAL,KAAK,CAAgB;QAAmB,gBAAW,GAAX,WAAW,CAAuB;IAAG,CAAC;IACjJ,OAAO;QACL,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QACnC,OAAO,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAA;IACvI,CAAC;IACO,MAAM,CAAI,IAAsB;QACtC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACxC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QACjC,OAAO,GAAG,CAAA;IACZ,CAAC;IACO,MAAM,CAAC,EAAU;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;QAC7E,IAAI,CAAC,MAAM;YAAE,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC3C,OAAO,MAAM,CAAA;IACf,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,KAAc,EAAE,EAAW;QACpC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;QAC1B,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;QAC9C,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS;YAAE,MAAM,KAAK,CAAC,gBAAgB,CAAC,CAAA;QAClG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC3B,MAAM,QAAQ,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YACjD,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,IAAI,IAAI,CAAC,gBAAgB,KAAK,QAAQ,EAAE,QAAQ;gBAAE,MAAM,KAAK,CAAC,gCAAgC,CAAC,CAAA;YACtI,MAAM,SAAS,GAAG,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAClH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAA;YAC/G,MAAM,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;YAClG,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,KAAK,CAAC,YAAY,CAAC,CAAA;YACnD,MAAM,YAAY,GAAG,MAAM,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,QAAS,CAAC,YAAY,CAAA;YAC9E,IAAI,MAAM;gBAAE,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YACxD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oBAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,KAAK,EAAE,CAAA;oBACvC,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;wBAAE,MAAM,KAAK,CAAC,WAAW,CAAC,CAAA;oBACxF,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,MAAM,IAAI,EAAE;wBAAE,MAAM,KAAK,CAAC,kBAAkB,CAAC,CAAA;oBACtE,MAAM,MAAM,GAAc;wBACxB,EAAE,EAAE,QAAQ,EAAE,EAAE,IAAI,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,IAAI,QAAS,CAAC,SAAS;wBAC3F,OAAO,EAAE,OAAO,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,IAAI,IAAI;wBACrF,YAAY,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAS,CAAC,KAAK;wBAC3F,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC,MAAM,IAAI,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;qBAC1G,CAAA;oBACD,KAAK,CAAC,UAAU,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;gBAC/E,CAAC,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAAC,IAAI,MAAM;oBAAE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAAC,MAAM,KAAK,CAAA;YAAC,CAAC;YAClG,IAAI,MAAM,IAAI,QAAQ;gBAAE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QACxF,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,EAAU,EAAE,MAAM,GAAG,KAAK;QACnC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QACzD,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAA;IAC9G,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,KAAc;QACzB,MAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;QACrC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,UAAU,IAAI,EAAE,CAAA;YACvD,IAAI,OAAO,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,GAAG,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;gBAAE,MAAM,KAAK,CAAC,kCAAkC,CAAC,CAAA;YACxK,MAAM,WAAW,GAAa,EAAE,CAAA;YAChC,IAAI,CAAC;gBACH,MAAM,OAAO,GAAgB,EAAE,CAAA;gBAC/B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;oBAC5B,MAAM,YAAY,GAAG,qBAAqB,EAAE,CAAC;oBAAC,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;oBAC5E,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;oBAClD,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;gBACrK,CAAC;gBACD,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAA,CAAC,CAAC,CAAC,CAAA;YAClF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAAC,MAAM,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAAC,MAAM,KAAK,CAAA;YAAC,CAAC;QAClH,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,MAAM,CAAC,EAAU;QACrB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;YAC9B,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC9B,KAAK,CAAC,UAAU,GAAG,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBAC1E,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,EAAE,CAAC,CAAA;YACpF,CAAC,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAA;QAC9D,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,WAAmB,EAAE,QAAgB,EAAE,OAAgB;QAChE,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;YAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC;gBAAE,MAAM,KAAK,CAAC,YAAY,CAAC,CAAA;YAC/H,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC;gBAAE,MAAM,KAAK,CAAC,WAAW,CAAC,CAAA;YAC7E,KAAK,CAAC,WAAW,GAAG,CAAC,KAAK,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAA;YACnH,IAAI,OAAO;gBAAE,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAA;QAChE,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,EAAU;QACtB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC9B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;YACzD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,CAAA;YAC9D,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBACxD,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,IAAI,OAAO,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ;oBAAE,MAAM,KAAK,CAAC,mBAAmB,CAAC,CAAA;gBACtI,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAAC,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAAC,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAAC,OAAO,OAAO,CAAC,KAAK,CAAA;YACnI,CAAC,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B,CAAA;YAC1H,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;gBAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAA;gBACxD,IAAI,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAC,QAAQ,IAAI,OAAO,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY;oBAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAA;YACpH,CAAC,CAAC,CAAA;YACF,MAAM,KAAK,CAAC,OAAO,CAAC,CAAA;QACtB,CAAC;IACH,CAAC;IACO,QAAQ,CAAC,EAAU,EAAE,MAAiB;QAC5C,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YAC5F,MAAM,KAAK,GAAc,EAAE,EAAE,OAAO,GAAG,IAAI,GAAG,EAAU,EAAE,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;YACnF,IAAI,MAA0B,CAAA;YAC9B,GAAG,CAAC;gBACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAA;gBAC5F,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBAChC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;wBAAE,MAAM,KAAK,CAAC,eAAe,CAAC,CAAA;oBACpE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;oBACpB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;gBAChI,CAAC;gBACD,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,OAAO;oBAAE,MAAM,KAAK,CAAC,+BAA+B,CAAC,CAAA;gBAC9G,MAAM,GAAG,MAAM,CAAC,UAAU,CAAA;gBAC1B,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;oBAAE,MAAM,KAAK,CAAC,cAAc,CAAC,CAAA;gBACtF,IAAI,MAAM;oBAAE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;YACjC,CAAC,QAAQ,MAAM,EAAC;YAChB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAC3D,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,WAAW,CAAC,WAAmB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAA;QACnC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,WAAW,CAAC,EAAE,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC;YAAE,OAAO,EAAE,CAAA;QAC9F,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAA;QACvG,OAAO,CAAC,KAAK,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAClH,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI,EAAE;YACzG,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAiB,EAAE,EAAE,MAAM,EAAE,CAAC,KAAc,EAAE,KAAc,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YAC7I,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,IAAI,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC;YACzF,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;gBACjC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;gBACzD,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;oBAClG,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;oBAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;oBACzC,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,SAAS,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;wBACrI,MAAM,CAAC,cAAc,EAAE,CAAA;wBACvB,sEAAsE;wBACtE,mEAAmE;wBACnE,MAAM,KAAK,CAAC,yCAAyC,CAAC,CAAA;oBACxD,CAAC,CAAC,CAAA;oBACF,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;oBACpD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;wBACzC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe;4BAAE,OAAO,KAAK,CAAA;wBACzE,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,QAAQ,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,IAAI,MAAM,IAAI,KAAK,CAAC,QAAQ;4BAAE,OAAO,KAAK,CAAA;wBACxI,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,KAAK,CAAC,IAAI,oCAAoC,EAAE,CAAA;oBACzF,CAAC,CAAC,CAAA;oBACF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;oBAC5K,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO;wBAAE,MAAM,KAAK,CAAC,2BAA2B,CAAC,CAAA;oBACnE,IAAI,MAAM,CAAC,OAAO;wBAAE,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;oBACrC,OAAO,IAAI,CAAA;gBACb,CAAC,CAAC,CAAA;YACJ,CAAC;SACF,CAAC,CAAC,CAAC,CAAA;IACN,CAAC;IACO,SAAS,CAAC,WAAmB,EAAE,QAAmB,EAAE,IAAY;QACtE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,EAAE,CAAC,CAAA;QAChG,IAAI,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,WAAW,IAAI,CAAC,CAAC,QAAQ,KAAK,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO;YAAE,MAAM,KAAK,CAAC,iBAAiB,CAAC,CAAA;QACnP,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAA;QAC3G,IAAI,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC,YAAY,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC;YAAE,MAAM,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACjL,CAAC;IACD,KAAK,CAAC,KAAK,KAAoB,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAA,CAAC,CAAC;CACnF;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB,EAAE,IAAY;IACxD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;IAC3F,OAAO,QAAQ,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,IAAI,EAAE,CAAA;AAC5E,CAAC"}
|
|
@@ -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"}
|
package/lib/mcp/state.js
ADDED
|
@@ -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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-schema.d.ts","sourceRoot":"","sources":["../../src/requirements/plan-schema.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc
|
|
1
|
+
{"version":3,"file":"plan-schema.d.ts","sourceRoot":"","sources":["../../src/requirements/plan-schema.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAa1B,CAAA"}
|
|
@@ -3,10 +3,10 @@ export const planParameters = {
|
|
|
3
3
|
submissionKey: { type: 'string', maxLength: 120, description: 'Stable unique key for this exact plan. Reuse it on transport retries, never regenerate a key to retry. A changed plan needs explicit reconciliation and a new key.' },
|
|
4
4
|
autoRun: { type: 'boolean', description: 'submit_plan: default true for requested execution; false saves the WHOLE plan without running it.' },
|
|
5
5
|
completeScope: { type: 'boolean', description: 'submit_plan: default false. true confirms the whole requirement scope, enabling automatic final archive after all children pass review. Independent of autoRun.' },
|
|
6
|
-
tasks: { type: 'array', minItems: 1, maxItems: 40, items: { type: 'object', additionalProperties: false, required: ['key', 'title', 'assigneeCompanionId'], properties: {
|
|
6
|
+
tasks: { type: 'array', minItems: 1, maxItems: 40, items: { type: 'object', additionalProperties: false, required: ['key', 'title', 'assigneeCompanionId', 'reviewerCompanionId'], properties: {
|
|
7
7
|
key: { type: 'string', maxLength: 80 }, title: { type: 'string', maxLength: 200 }, description: { type: 'string', maxLength: 8000 },
|
|
8
8
|
assigneeCompanionId: { type: 'string', description: 'Actual executor stable ID from authorized directory, not a name.' },
|
|
9
|
-
reviewerCompanionId: { type: 'string', description: '
|
|
9
|
+
reviewerCompanionId: { type: 'string', minLength: 1, description: 'Explicit authorized reviewer stable ID. When a specialist is designated to verify this deliverable, use that specialist here, not just as executor of a later review task. Dependencies wait for acceptance, not merely execution. Use creator ID only when no other reviewer was designated. Overall synthesis may be a separate task; it does not replace task acceptance.' },
|
|
10
10
|
dependsOn: { type: 'array', maxItems: 20, items: { type: 'string' }, description: 'Other task KEYS within this same plan; forward references are supported.' },
|
|
11
11
|
dependencyTaskIds: { type: 'array', maxItems: 20, items: { type: 'string' }, description: 'Existing task IDs within the original requirement.' },
|
|
12
12
|
priority: { type: 'string', enum: ['low', 'normal', 'high', 'urgent'] },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan-schema.js","sourceRoot":"","sources":["../../src/requirements/plan-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,oKAAoK,EAAE;IACpO,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,mGAAmG,EAAE;IAC9I,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,iKAAiK,EAAE;IAClN,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,qBAAqB,CAAC,EAAE,UAAU,EAAE;
|
|
1
|
+
{"version":3,"file":"plan-schema.js","sourceRoot":"","sources":["../../src/requirements/plan-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,aAAa,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,oKAAoK,EAAE;IACpO,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,mGAAmG,EAAE;IAC9I,aAAa,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,iKAAiK,EAAE;IAClN,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,EAAE,UAAU,EAAE;gBAC7L,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,EAAE,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE;gBACnI,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,kEAAkE,EAAE;gBACxH,mBAAmB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,EAAE,WAAW,EAAE,8WAA8W,EAAE;gBAClb,SAAS,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,0EAA0E,EAAE;gBAC9J,iBAAiB,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,oDAAoD,EAAE;gBAChJ,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE;gBACvE,QAAQ,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,GAAG,kBAAkB;aAC5F,EAAE,EAAE;CACN,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { optionalText, record, requiredText } from '../core/validation.js';
|
|
1
|
+
import { optionalText, record, requiredText, requiredMarkdown } from '../core/validation.js';
|
|
2
2
|
import { invalidateTaskWork } from '../tasks/context.js';
|
|
3
3
|
import { retainRequirementArchive } from './archive.js';
|
|
4
4
|
import { requirementProgressKey } from './progress.js';
|
|
@@ -115,7 +115,7 @@ export class RequirementService {
|
|
|
115
115
|
});
|
|
116
116
|
}
|
|
117
117
|
async finish(id, revision, summary, actor) {
|
|
118
|
-
const text =
|
|
118
|
+
const text = requiredMarkdown(summary, 'summary', 12000);
|
|
119
119
|
return this.change(id, revision, actor, (item, tasks) => {
|
|
120
120
|
if (item.status === 'done' || !tasks.length || tasks.some(t => t.status !== 'done'))
|
|
121
121
|
throw new RequirementError(409, '需求已归档或仍有未验收任务,不能完成归档');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/requirements/service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/requirements/service.ts"],"names":[],"mappings":"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"}
|
package/lib/requirements/tool.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { record, requiredText } from '../core/validation.js';
|
|
1
|
+
import { record, requiredText, requiredMarkdown } from '../core/validation.js';
|
|
2
2
|
import { RequirementConflictError } from './revisions.js';
|
|
3
3
|
import { planParameters } from './plan-schema.js';
|
|
4
4
|
export function requirementTool(companionId, service, tasks, dispatch) {
|
|
@@ -66,7 +66,7 @@ export function requirementTool(companionId, service, tasks, dispatch) {
|
|
|
66
66
|
if (action === 'reopen')
|
|
67
67
|
return JSON.stringify(await service.reopen(id, revision, actor, input));
|
|
68
68
|
if (action === 'finish')
|
|
69
|
-
return JSON.stringify(await service.finish(id, revision,
|
|
69
|
+
return JSON.stringify(await service.finish(id, revision, requiredMarkdown(input.summary, 'summary', 12000), actor));
|
|
70
70
|
throw new Error('需求操作无效');
|
|
71
71
|
}
|
|
72
72
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/requirements/tool.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;
|
|
1
|
+
{"version":3,"file":"tool.js","sourceRoot":"","sources":["../../src/requirements/tool.ts"],"names":[],"mappings":"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"}
|