@ai-ecoverse/slicc-agent 7.10.0 → 7.11.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 +4 -4
- package/dist/client.js +2 -1
- package/dist/client.js.map +2 -2
- package/dist/gelatiere/index.js +5 -4
- package/dist/gelatiere/index.js.map +2 -2
- package/dist/guests/client.js +2 -1
- package/dist/guests/client.js.map +2 -2
- package/dist/host.js +7 -2
- package/dist/host.js.map +2 -2
- package/dist/index.js.map +2 -2
- package/dist/kernel/agent-users.js +11 -2
- package/dist/kernel/agent-users.js.map +2 -2
- package/dist/licks/sources.js +4 -2
- package/dist/licks/sources.js.map +2 -2
- package/dist/mcp/accounts.js +6 -1
- package/dist/mcp/accounts.js.map +2 -2
- package/dist/mcp/config.js +50 -25
- package/dist/mcp/config.js.map +2 -2
- package/dist/mcp/file.js +23 -17
- package/dist/mcp/file.js.map +2 -2
- package/dist/mcp/index.js +6 -1
- package/dist/mcp/index.js.map +2 -2
- package/dist/readonly.js +10 -2
- package/dist/readonly.js.map +2 -2
- package/dist/services.js +2 -1
- package/dist/services.js.map +2 -2
- package/dist/settings.js +6 -1
- package/dist/settings.js.map +2 -2
- package/dist/spectrum/settings-port.js +2 -0
- package/dist/spectrum/settings-port.js.map +2 -2
- package/dist/types/gelatiere/index.d.ts +1 -1
- package/dist/types/index.d.ts +1 -1
- package/dist/types/mcp/accounts.d.ts +2 -1
- package/dist/types/mcp/config.d.ts +7 -2
- package/dist/types/readonly.d.ts +1 -0
- package/dist/types/services.d.ts +9 -3
- package/dist/types/spectrum/settings-port.d.ts +2 -1
- package/package.json +2 -2
package/dist/mcp/config.js
CHANGED
|
@@ -47,23 +47,25 @@ function urlSecret(url) {
|
|
|
47
47
|
for (const name of url.searchParams.keys()) if (SECRET_PARAM.test(name)) return `url ?${name}`;
|
|
48
48
|
return void 0;
|
|
49
49
|
}
|
|
50
|
-
function fail(server, message, field) {
|
|
51
|
-
return { server, ...field ? { field } : {}, message };
|
|
50
|
+
function fail(server, code, message, field) {
|
|
51
|
+
return { server, ...field ? { field } : {}, message, code };
|
|
52
52
|
}
|
|
53
53
|
function checkHeaders(name, headers) {
|
|
54
54
|
if (headers === void 0) return void 0;
|
|
55
55
|
if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === "string"))
|
|
56
|
-
return fail(name, "headers must map names to strings", "headers");
|
|
56
|
+
return fail(name, "invalid", "headers must map names to strings", "headers");
|
|
57
57
|
for (const [header, value] of Object.entries(headers)) {
|
|
58
58
|
if (value.trim().startsWith("!"))
|
|
59
59
|
return fail(
|
|
60
60
|
name,
|
|
61
|
+
"invalid",
|
|
61
62
|
`headers.${header} runs a command, which SLICC can't do`,
|
|
62
63
|
`headers.${header}`
|
|
63
64
|
);
|
|
64
65
|
if (literalSecret(header, value))
|
|
65
66
|
return fail(
|
|
66
67
|
name,
|
|
68
|
+
"header-secret",
|
|
67
69
|
`headers.${header} holds a literal secret. mcp.json takes no secrets: write \${NAME} instead, and add the value in Settings \u203A MCP servers`,
|
|
68
70
|
`headers.${header}`
|
|
69
71
|
);
|
|
@@ -73,21 +75,23 @@ function checkHeaders(name, headers) {
|
|
|
73
75
|
function checkOAuth(name, value) {
|
|
74
76
|
const { oauth } = value;
|
|
75
77
|
if (oauth === void 0) return void 0;
|
|
76
|
-
if (!isRecord(oauth)) return fail(name, "oauth must be an object", "oauth");
|
|
78
|
+
if (!isRecord(oauth)) return fail(name, "invalid", "oauth must be an object", "oauth");
|
|
77
79
|
if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === "authorization"))
|
|
78
|
-
return fail(name, "oauth and an Authorization header exclude each other", "oauth");
|
|
80
|
+
return fail(name, "invalid", "oauth and an Authorization header exclude each other", "oauth");
|
|
79
81
|
for (const [key, entry] of Object.entries(oauth)) {
|
|
80
82
|
const refused = OAUTH_REFUSED[key];
|
|
81
|
-
if (refused)
|
|
83
|
+
if (refused)
|
|
84
|
+
return fail(name, "invalid", `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);
|
|
82
85
|
if (!OAUTH_STRINGS.includes(key))
|
|
83
|
-
return fail(name, `oauth.${key} is not a known field`, `oauth.${key}`);
|
|
86
|
+
return fail(name, "invalid", `oauth.${key} is not a known field`, `oauth.${key}`);
|
|
84
87
|
if (typeof entry !== "string" || !entry.trim())
|
|
85
|
-
return fail(name, `oauth.${key} must be a non-empty string`, `oauth.${key}`);
|
|
88
|
+
return fail(name, "invalid", `oauth.${key} must be a non-empty string`, `oauth.${key}`);
|
|
86
89
|
}
|
|
87
90
|
const metadata = oauth.authServerMetadataUrl;
|
|
88
91
|
if (metadata !== void 0 && (!URL.canParse(metadata) || new URL(metadata).protocol !== "https:"))
|
|
89
92
|
return fail(
|
|
90
93
|
name,
|
|
94
|
+
URL.canParse(metadata) ? "insecure-url" : "bad-url",
|
|
91
95
|
"oauth.authServerMetadataUrl must be an https URL",
|
|
92
96
|
"oauth.authServerMetadataUrl"
|
|
93
97
|
);
|
|
@@ -101,42 +105,55 @@ function usesOAuth(config) {
|
|
|
101
105
|
function checkExposures(name, value) {
|
|
102
106
|
const allowed = EXPOSURES.map((item) => `"${item}"`).join(", ");
|
|
103
107
|
if (value.exposure !== void 0 && !isExposure(value.exposure))
|
|
104
|
-
return fail(name, `exposure must be one of ${allowed}`, "exposure");
|
|
108
|
+
return fail(name, "invalid", `exposure must be one of ${allowed}`, "exposure");
|
|
105
109
|
if (value.toolExposure === void 0) return void 0;
|
|
106
110
|
if (!isRecord(value.toolExposure))
|
|
107
|
-
return fail(name, "toolExposure must map tool names to exposures", "toolExposure");
|
|
111
|
+
return fail(name, "invalid", "toolExposure must map tool names to exposures", "toolExposure");
|
|
108
112
|
for (const [tool, exposure] of Object.entries(value.toolExposure))
|
|
109
113
|
if (!isExposure(exposure))
|
|
110
|
-
return fail(
|
|
114
|
+
return fail(
|
|
115
|
+
name,
|
|
116
|
+
"invalid",
|
|
117
|
+
`toolExposure "${tool}" must be one of ${allowed}`,
|
|
118
|
+
`toolExposure.${tool}`
|
|
119
|
+
);
|
|
111
120
|
return void 0;
|
|
112
121
|
}
|
|
113
122
|
function checkFields(name, value) {
|
|
114
123
|
if (value.enabled !== void 0 && typeof value.enabled !== "boolean")
|
|
115
|
-
return fail(name, "enabled must be a boolean", "enabled");
|
|
124
|
+
return fail(name, "invalid", "enabled must be a boolean", "enabled");
|
|
116
125
|
if (value.description !== void 0 && typeof value.description !== "string")
|
|
117
|
-
return fail(name, "description must be a string", "description");
|
|
126
|
+
return fail(name, "invalid", "description must be a string", "description");
|
|
118
127
|
if (value.timeout !== void 0 && (typeof value.timeout !== "number" || !(value.timeout > 0)))
|
|
119
|
-
return fail(name, "timeout must be a positive number of seconds", "timeout");
|
|
128
|
+
return fail(name, "invalid", "timeout must be a positive number of seconds", "timeout");
|
|
120
129
|
return void 0;
|
|
121
130
|
}
|
|
122
131
|
function checkTransport(name, value) {
|
|
123
132
|
if (value.command !== void 0 || value.type === "stdio")
|
|
124
|
-
return fail(
|
|
133
|
+
return fail(
|
|
134
|
+
name,
|
|
135
|
+
"stdio",
|
|
136
|
+
"stdio servers need slicc-kernel#68, so this one is skipped",
|
|
137
|
+
"command"
|
|
138
|
+
);
|
|
125
139
|
if (value.type === "sse")
|
|
126
140
|
return fail(
|
|
127
141
|
name,
|
|
142
|
+
"sse",
|
|
128
143
|
"the legacy SSE transport is not supported; use the streamable HTTP URL",
|
|
129
144
|
"type"
|
|
130
145
|
);
|
|
131
146
|
if (value.type !== void 0 && value.type !== "http" && value.type !== "streamable-http")
|
|
132
|
-
return fail(name, 'type must be "http" or "streamable-http"', "type");
|
|
133
|
-
if (typeof value.url !== "string")
|
|
147
|
+
return fail(name, "invalid", 'type must be "http" or "streamable-http"', "type");
|
|
148
|
+
if (typeof value.url !== "string")
|
|
149
|
+
return fail(name, "bad-url", 'needs a "url" (streamable HTTP)', "url");
|
|
134
150
|
if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))
|
|
135
|
-
return fail(name, "url must be an http or https URL", "url");
|
|
151
|
+
return fail(name, "bad-url", "url must be an http or https URL", "url");
|
|
136
152
|
const secret = urlSecret(new URL(value.url));
|
|
137
153
|
if (secret)
|
|
138
154
|
return fail(
|
|
139
155
|
name,
|
|
156
|
+
"url-secret",
|
|
140
157
|
`${secret} holds a literal secret. Put it in a header as \${NAME} and add the value in Settings \u203A MCP servers`,
|
|
141
158
|
"url"
|
|
142
159
|
);
|
|
@@ -144,15 +161,20 @@ function checkTransport(name, value) {
|
|
|
144
161
|
}
|
|
145
162
|
function validateServer(name, raw) {
|
|
146
163
|
if (!SERVER_NAME.test(name))
|
|
147
|
-
return fail(
|
|
148
|
-
|
|
164
|
+
return fail(
|
|
165
|
+
name,
|
|
166
|
+
"bad-name",
|
|
167
|
+
`invalid server name "${name}" (use letters, digits, "_" and "-")`
|
|
168
|
+
);
|
|
169
|
+
if (!isRecord(raw)) return fail(name, "not-object", "must be an object");
|
|
149
170
|
const value = { ...raw, exposure: alias(raw.exposure) };
|
|
150
171
|
if (raw.exposure === void 0) delete value.exposure;
|
|
151
172
|
if (isRecord(raw.toolExposure))
|
|
152
173
|
value.toolExposure = Object.fromEntries(
|
|
153
174
|
Object.entries(raw.toolExposure).map(([tool, exposure]) => [tool, alias(exposure)])
|
|
154
175
|
);
|
|
155
|
-
if (value.auth !== void 0)
|
|
176
|
+
if (value.auth !== void 0)
|
|
177
|
+
return fail(name, "invalid", "auth is not supported in SLICC yet", "auth");
|
|
156
178
|
const problem = checkTransport(name, value) ?? checkHeaders(name, value.headers) ?? checkOAuth(name, value) ?? checkExposures(name, value) ?? checkFields(name, value);
|
|
157
179
|
if (problem) return problem;
|
|
158
180
|
const config = {};
|
|
@@ -185,16 +207,19 @@ function parseMcpConfig(text) {
|
|
|
185
207
|
const problems = [];
|
|
186
208
|
const refused = [];
|
|
187
209
|
const seen = /* @__PURE__ */ new Set();
|
|
210
|
+
const refuse = (name, raw, problem) => {
|
|
211
|
+
problems.push(problem);
|
|
212
|
+
refused.push({ name, host: hostOf(raw), code: problem.code, reason: problem.message });
|
|
213
|
+
};
|
|
188
214
|
for (const [name, raw] of Object.entries(parsed.mcpServers ?? {})) {
|
|
189
215
|
const checked = validateServer(name, raw);
|
|
190
216
|
if ("message" in checked) {
|
|
191
|
-
|
|
192
|
-
refused.push({ name, host: hostOf(raw) });
|
|
217
|
+
refuse(name, raw, checked);
|
|
193
218
|
continue;
|
|
194
219
|
}
|
|
195
220
|
if (seen.has(canonical(name))) {
|
|
196
|
-
|
|
197
|
-
|
|
221
|
+
const twin = 'names that differ only in "-" and "_" count as the same server';
|
|
222
|
+
refuse(name, raw, fail(name, "duplicate", twin));
|
|
198
223
|
continue;
|
|
199
224
|
}
|
|
200
225
|
seen.add(canonical(name));
|
package/dist/mcp/config.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/config.ts"],
|
|
4
|
-
"sourcesContent": ["import { hash } from '../licks/sources.ts';\n\nexport type McpExposure = 'codemode' | 'deferred' | 'direct' | 'hidden';\n\nexport interface McpServerConfig {\n url: string;\n headers?: Record<string, string>;\n exposure?: McpExposure;\n toolExposure?: Record<string, McpExposure>;\n enabled?: boolean;\n timeout?: number;\n description?: string;\n oauth?: McpOAuthConfig;\n}\n\nexport interface McpOAuthConfig {\n clientId?: string;\n clientName?: string;\n scope?: string;\n authServerMetadataUrl?: string;\n}\n\nexport interface McpServerEntry {\n name: string;\n config: McpServerConfig;\n}\n\nexport interface McpConfigProblem {\n server?: string;\n field?: string;\n message: string;\n}\n\nexport interface McpRefusedServer {\n name: string;\n host: string;\n}\n\nexport interface McpConfig {\n servers: McpServerEntry[];\n problems: McpConfigProblem[];\n refused: McpRefusedServer[];\n}\n\nconst SERVER_NAME = /^[A-Za-z0-9_-]+$/;\nconst EXPOSURES: readonly string[] = ['codemode', 'deferred', 'direct', 'hidden'];\nconst ALIASES: Record<string, McpExposure> = { 'codemode-deferred': 'codemode' };\nconst ACCEPTED = new Set([\n 'type',\n 'url',\n 'headers',\n 'exposure',\n 'toolExposure',\n 'enabled',\n 'timeout',\n 'description',\n 'oauth',\n]);\nconst OAUTH_STRINGS = ['clientId', 'clientName', 'scope', 'authServerMetadataUrl'];\nconst OAUTH_REFUSED: Record<string, string> = {\n clientSecret: 'a client secret would have to live in mcp.json; SLICC signs in as a public client',\n callbackPort: 'SLICC signs in through its own page, not a loopback port',\n callbackUrl: 'SLICC signs in through its own page, not a loopback URL',\n clientRegistration:\n 'SLICC registers dynamically, sends a client metadata document or uses oauth.clientId',\n};\nconst SECRET_HEADER = /authorization|cookie|token|key|secret|password|session/i;\nconst SECRET_PARAM = /token|key|secret|password|signature|sig|auth|code/i;\nconst PLACEHOLDER = /\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/g;\nconst SCHEME = /^\\s*(?:bearer|basic|token|apikey|api-key)\\s+/i;\nconst MAX_TOOL_NAME = 64;\nexport const DEFAULT_TIMEOUT_SECONDS = 60;\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nfunction alias(value: unknown): unknown {\n return typeof value === 'string' ? (ALIASES[value] ?? value) : value;\n}\n\nfunction isExposure(value: unknown): value is McpExposure {\n return typeof value === 'string' && EXPOSURES.includes(value);\n}\n\nexport function placeholders(value: string): string[] {\n return [...value.matchAll(PLACEHOLDER)].map((match) => match[1] as string);\n}\n\nexport function literalSecret(header: string, value: string): boolean {\n if (!SECRET_HEADER.test(header)) return false;\n return value.replace(PLACEHOLDER, '').replace(SCHEME, '').trim() !== '';\n}\n\nfunction urlSecret(url: URL): string | undefined {\n if (url.username || url.password) return 'url';\n for (const name of url.searchParams.keys()) if (SECRET_PARAM.test(name)) return `url ?${name}`;\n return undefined;\n}\n\ntype Checked = McpServerConfig | McpConfigProblem;\n\nfunction fail(server: string, message: string, field?: string): McpConfigProblem {\n return { server, ...(field ? { field } : {}), message };\n}\n\nfunction checkHeaders(name: string, headers: unknown): McpConfigProblem | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'headers must map names to strings', 'headers');\n for (const [header, value] of Object.entries(headers as Record<string, string>)) {\n if (value.trim().startsWith('!'))\n return fail(\n name,\n `headers.${header} runs a command, which SLICC can't do`,\n `headers.${header}`\n );\n if (literalSecret(header, value))\n return fail(\n name,\n `headers.${header} holds a literal secret. mcp.json takes no secrets: write \\${NAME} instead, and add the value in Settings \u203A MCP servers`,\n `headers.${header}`\n );\n }\n return undefined;\n}\n\nfunction checkOAuth(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'oauth and an Authorization header exclude each other', 'oauth');\n for (const [key, entry] of Object.entries(oauth)) {\n const refused = OAUTH_REFUSED[key];\n if (refused) return fail(name, `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, `oauth.${key} must be a non-empty string`, `oauth.${key}`);\n }\n const metadata = oauth.authServerMetadataUrl as string | undefined;\n if (\n metadata !== undefined &&\n (!URL.canParse(metadata) || new URL(metadata).protocol !== 'https:')\n )\n return fail(\n name,\n 'oauth.authServerMetadataUrl must be an https URL',\n 'oauth.authServerMetadataUrl'\n );\n return undefined;\n}\n\nexport function usesOAuth(config: McpServerConfig): boolean {\n return !Object.keys(config.headers ?? {}).some(\n (header) => header.toLowerCase() === 'authorization'\n );\n}\n\nfunction checkExposures(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'toolExposure must map tool names to exposures', 'toolExposure');\n for (const [tool, exposure] of Object.entries(value.toolExposure))\n if (!isExposure(exposure))\n return fail(name, `toolExposure \"${tool}\" must be one of ${allowed}`, `toolExposure.${tool}`);\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): McpConfigProblem | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(\n name: string,\n value: Record<string, unknown>\n): McpConfigProblem | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(name, 'stdio servers need slicc-kernel#68, so this one is skipped', 'command');\n if (value.type === 'sse')\n return fail(\n name,\n 'the legacy SSE transport is not supported; use the streamable HTTP URL',\n 'type'\n );\n if (value.type !== undefined && value.type !== 'http' && value.type !== 'streamable-http')\n return fail(name, 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string') return fail(name, 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'url must be an http or https URL', 'url');\n const secret = urlSecret(new URL(value.url));\n if (secret)\n return fail(\n name,\n `${secret} holds a literal secret. Put it in a header as \\${NAME} and add the value in Settings \u203A MCP servers`,\n 'url'\n );\n return undefined;\n}\n\nexport function validateServer(name: string, raw: unknown): Checked {\n if (!SERVER_NAME.test(name))\n return fail(name, `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`);\n if (!isRecord(raw)) return fail(name, 'must be an object');\n const value: Record<string, unknown> = { ...raw, exposure: alias(raw.exposure) };\n if (raw.exposure === undefined) delete value.exposure;\n if (isRecord(raw.toolExposure))\n value.toolExposure = Object.fromEntries(\n Object.entries(raw.toolExposure).map(([tool, exposure]) => [tool, alias(exposure)])\n );\n if (value.auth !== undefined) return fail(name, 'auth is not supported in SLICC yet', 'auth');\n const problem =\n checkTransport(name, value) ??\n checkHeaders(name, value.headers) ??\n checkOAuth(name, value) ??\n checkExposures(name, value) ??\n checkFields(name, value);\n if (problem) return problem;\n const config: Record<string, unknown> = {};\n for (const [key, entry] of Object.entries(value))\n if (ACCEPTED.has(key) && key !== 'type') config[key] = entry;\n return config as unknown as McpServerConfig;\n}\n\nfunction canonical(name: string): string {\n return name.replace(/-/g, '_');\n}\n\nfunction hostOf(raw: unknown): string {\n const url = isRecord(raw) ? raw.url : undefined;\n return typeof url === 'string' && URL.canParse(url) ? new URL(url).host : '';\n}\n\nexport function parseMcpConfig(text: string | undefined): McpConfig {\n if (text === undefined || text.trim() === '') return { servers: [], problems: [], refused: [] };\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (error) {\n return {\n servers: [],\n problems: [{ message: `not valid JSON: ${(error as Error).message}` }],\n refused: [],\n };\n }\n if (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)))\n return { servers: [], problems: [{ message: 'mcpServers must be an object' }], refused: [] };\n const servers: McpServerEntry[] = [];\n const problems: McpConfigProblem[] = [];\n const refused: McpRefusedServer[] = [];\n const seen = new Set<string>();\n for (const [name, raw] of Object.entries((parsed.mcpServers ?? {}) as Record<string, unknown>)) {\n const checked = validateServer(name, raw);\n if ('message' in checked) {\n problems.push(checked);\n refused.push({ name, host: hostOf(raw) });\n continue;\n }\n if (seen.has(canonical(name))) {\n problems.push(fail(name, 'names that differ only in \"-\" and \"_\" count as the same server'));\n refused.push({ name, host: hostOf(raw) });\n continue;\n }\n seen.add(canonical(name));\n servers.push({ name, config: checked });\n }\n return { servers, problems, refused };\n}\n\nfunction patternRegExp(pattern: string): RegExp {\n const source = pattern\n .split('*')\n .map((part) => part.replace(/[.+?^${}()|[\\]\\\\]/g, '\\\\$&'))\n .join('.*');\n return new RegExp(`^${source}$`);\n}\n\nexport function nameMatcher(entries: readonly string[]): (name: string) => boolean {\n const names = new Set(entries.filter((entry) => !entry.includes('*')));\n const patterns = entries.filter((entry) => entry.includes('*')).map(patternRegExp);\n return (name) => names.has(name) || patterns.some((pattern) => pattern.test(name));\n}\n\nexport function toolExposure(config: McpServerConfig, tool: string): McpExposure {\n const overrides = config.toolExposure ?? {};\n const exact = overrides[tool];\n if (exact !== undefined) return exact;\n for (const [pattern, exposure] of Object.entries(overrides))\n if (pattern.includes('*') && patternRegExp(pattern).test(tool)) return exposure;\n return config.exposure ?? 'codemode';\n}\n\nexport function mcpNamespace(server: string): string {\n return `mcp__${canonical(server)}`;\n}\n\nexport function mcpToolName(\n server: string,\n tool: string,\n taken: (name: string) => boolean = () => false\n): string {\n const name = `mcp__${server}__${tool}`.replace(/[^A-Za-z0-9_]/g, '_');\n if (name.length <= MAX_TOOL_NAME && !taken(name)) return name;\n const suffix = hash(`${server}\\0${tool}`).padStart(7, '0').slice(0, 7);\n return `${name.slice(0, MAX_TOOL_NAME - suffix.length - 1)}_${suffix}`;\n}\n\nexport function sameConfig(a: McpServerConfig, b: McpServerConfig): boolean {\n return JSON.stringify(a) === JSON.stringify(b);\n}\n"],
|
|
5
|
-
"mappings": "AAAA,SAAS,YAAY;
|
|
4
|
+
"sourcesContent": ["import { hash } from '../licks/sources.ts';\nimport type { McpRefusal, McpRefusalCode } from '../services.ts';\n\nexport type McpExposure = 'codemode' | 'deferred' | 'direct' | 'hidden';\n\nexport interface McpServerConfig {\n url: string;\n headers?: Record<string, string>;\n exposure?: McpExposure;\n toolExposure?: Record<string, McpExposure>;\n enabled?: boolean;\n timeout?: number;\n description?: string;\n oauth?: McpOAuthConfig;\n}\n\nexport interface McpOAuthConfig {\n clientId?: string;\n clientName?: string;\n scope?: string;\n authServerMetadataUrl?: string;\n}\n\nexport interface McpServerEntry {\n name: string;\n config: McpServerConfig;\n}\n\nexport interface McpConfigProblem {\n server?: string;\n field?: string;\n message: string;\n code?: McpRefusalCode;\n}\n\nexport interface McpRefusedServer extends McpRefusal {\n name: string;\n host: string;\n}\n\nexport interface McpConfig {\n servers: McpServerEntry[];\n problems: McpConfigProblem[];\n refused: McpRefusedServer[];\n}\n\nconst SERVER_NAME = /^[A-Za-z0-9_-]+$/;\nconst EXPOSURES: readonly string[] = ['codemode', 'deferred', 'direct', 'hidden'];\nconst ALIASES: Record<string, McpExposure> = { 'codemode-deferred': 'codemode' };\nconst ACCEPTED = new Set([\n 'type',\n 'url',\n 'headers',\n 'exposure',\n 'toolExposure',\n 'enabled',\n 'timeout',\n 'description',\n 'oauth',\n]);\nconst OAUTH_STRINGS = ['clientId', 'clientName', 'scope', 'authServerMetadataUrl'];\nconst OAUTH_REFUSED: Record<string, string> = {\n clientSecret: 'a client secret would have to live in mcp.json; SLICC signs in as a public client',\n callbackPort: 'SLICC signs in through its own page, not a loopback port',\n callbackUrl: 'SLICC signs in through its own page, not a loopback URL',\n clientRegistration:\n 'SLICC registers dynamically, sends a client metadata document or uses oauth.clientId',\n};\nconst SECRET_HEADER = /authorization|cookie|token|key|secret|password|session/i;\nconst SECRET_PARAM = /token|key|secret|password|signature|sig|auth|code/i;\nconst PLACEHOLDER = /\\$\\{([A-Za-z_][A-Za-z0-9_]*)\\}/g;\nconst SCHEME = /^\\s*(?:bearer|basic|token|apikey|api-key)\\s+/i;\nconst MAX_TOOL_NAME = 64;\nexport const DEFAULT_TIMEOUT_SECONDS = 60;\n\nexport function isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nfunction alias(value: unknown): unknown {\n return typeof value === 'string' ? (ALIASES[value] ?? value) : value;\n}\n\nfunction isExposure(value: unknown): value is McpExposure {\n return typeof value === 'string' && EXPOSURES.includes(value);\n}\n\nexport function placeholders(value: string): string[] {\n return [...value.matchAll(PLACEHOLDER)].map((match) => match[1] as string);\n}\n\nexport function literalSecret(header: string, value: string): boolean {\n if (!SECRET_HEADER.test(header)) return false;\n return value.replace(PLACEHOLDER, '').replace(SCHEME, '').trim() !== '';\n}\n\nfunction urlSecret(url: URL): string | undefined {\n if (url.username || url.password) return 'url';\n for (const name of url.searchParams.keys()) if (SECRET_PARAM.test(name)) return `url ?${name}`;\n return undefined;\n}\n\ntype Failed = McpConfigProblem & { code: McpRefusalCode };\ntype Checked = McpServerConfig | Failed;\n\nfunction fail(server: string, code: McpRefusalCode, message: string, field?: string): Failed {\n return { server, ...(field ? { field } : {}), message, code };\n}\n\nfunction checkHeaders(name: string, headers: unknown): Failed | undefined {\n if (headers === undefined) return undefined;\n if (!isRecord(headers) || !Object.values(headers).every((value) => typeof value === 'string'))\n return fail(name, 'invalid', 'headers must map names to strings', 'headers');\n for (const [header, value] of Object.entries(headers as Record<string, string>)) {\n if (value.trim().startsWith('!'))\n return fail(\n name,\n 'invalid',\n `headers.${header} runs a command, which SLICC can't do`,\n `headers.${header}`\n );\n if (literalSecret(header, value))\n return fail(\n name,\n 'header-secret',\n `headers.${header} holds a literal secret. mcp.json takes no secrets: write \\${NAME} instead, and add the value in Settings \u203A MCP servers`,\n `headers.${header}`\n );\n }\n return undefined;\n}\n\nfunction checkOAuth(name: string, value: Record<string, unknown>): Failed | undefined {\n const { oauth } = value;\n if (oauth === undefined) return undefined;\n if (!isRecord(oauth)) return fail(name, 'invalid', 'oauth must be an object', 'oauth');\n if (Object.keys(value.headers ?? {}).some((header) => header.toLowerCase() === 'authorization'))\n return fail(name, 'invalid', 'oauth and an Authorization header exclude each other', 'oauth');\n for (const [key, entry] of Object.entries(oauth)) {\n const refused = OAUTH_REFUSED[key];\n if (refused)\n return fail(name, 'invalid', `oauth.${key} is not supported: ${refused}`, `oauth.${key}`);\n if (!OAUTH_STRINGS.includes(key))\n return fail(name, 'invalid', `oauth.${key} is not a known field`, `oauth.${key}`);\n if (typeof entry !== 'string' || !entry.trim())\n return fail(name, 'invalid', `oauth.${key} must be a non-empty string`, `oauth.${key}`);\n }\n const metadata = oauth.authServerMetadataUrl as string | undefined;\n if (\n metadata !== undefined &&\n (!URL.canParse(metadata) || new URL(metadata).protocol !== 'https:')\n )\n return fail(\n name,\n URL.canParse(metadata) ? 'insecure-url' : 'bad-url',\n 'oauth.authServerMetadataUrl must be an https URL',\n 'oauth.authServerMetadataUrl'\n );\n return undefined;\n}\n\nexport function usesOAuth(config: McpServerConfig): boolean {\n return !Object.keys(config.headers ?? {}).some(\n (header) => header.toLowerCase() === 'authorization'\n );\n}\n\nfunction checkExposures(name: string, value: Record<string, unknown>): Failed | undefined {\n const allowed = EXPOSURES.map((item) => `\"${item}\"`).join(', ');\n if (value.exposure !== undefined && !isExposure(value.exposure))\n return fail(name, 'invalid', `exposure must be one of ${allowed}`, 'exposure');\n if (value.toolExposure === undefined) return undefined;\n if (!isRecord(value.toolExposure))\n return fail(name, 'invalid', 'toolExposure must map tool names to exposures', 'toolExposure');\n for (const [tool, exposure] of Object.entries(value.toolExposure))\n if (!isExposure(exposure))\n return fail(\n name,\n 'invalid',\n `toolExposure \"${tool}\" must be one of ${allowed}`,\n `toolExposure.${tool}`\n );\n return undefined;\n}\n\nfunction checkFields(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.enabled !== undefined && typeof value.enabled !== 'boolean')\n return fail(name, 'invalid', 'enabled must be a boolean', 'enabled');\n if (value.description !== undefined && typeof value.description !== 'string')\n return fail(name, 'invalid', 'description must be a string', 'description');\n if (value.timeout !== undefined && (typeof value.timeout !== 'number' || !(value.timeout > 0)))\n return fail(name, 'invalid', 'timeout must be a positive number of seconds', 'timeout');\n return undefined;\n}\n\nfunction checkTransport(name: string, value: Record<string, unknown>): Failed | undefined {\n if (value.command !== undefined || value.type === 'stdio')\n return fail(\n name,\n 'stdio',\n 'stdio servers need slicc-kernel#68, so this one is skipped',\n 'command'\n );\n if (value.type === 'sse')\n return fail(\n name,\n 'sse',\n 'the legacy SSE transport is not supported; use the streamable HTTP URL',\n 'type'\n );\n if (value.type !== undefined && value.type !== 'http' && value.type !== 'streamable-http')\n return fail(name, 'invalid', 'type must be \"http\" or \"streamable-http\"', 'type');\n if (typeof value.url !== 'string')\n return fail(name, 'bad-url', 'needs a \"url\" (streamable HTTP)', 'url');\n if (!URL.canParse(value.url) || !/^https?:$/.test(new URL(value.url).protocol))\n return fail(name, 'bad-url', 'url must be an http or https URL', 'url');\n const secret = urlSecret(new URL(value.url));\n if (secret)\n return fail(\n name,\n 'url-secret',\n `${secret} holds a literal secret. Put it in a header as \\${NAME} and add the value in Settings \u203A MCP servers`,\n 'url'\n );\n return undefined;\n}\n\nexport function validateServer(name: string, raw: unknown): Checked {\n if (!SERVER_NAME.test(name))\n return fail(\n name,\n 'bad-name',\n `invalid server name \"${name}\" (use letters, digits, \"_\" and \"-\")`\n );\n if (!isRecord(raw)) return fail(name, 'not-object', 'must be an object');\n const value: Record<string, unknown> = { ...raw, exposure: alias(raw.exposure) };\n if (raw.exposure === undefined) delete value.exposure;\n if (isRecord(raw.toolExposure))\n value.toolExposure = Object.fromEntries(\n Object.entries(raw.toolExposure).map(([tool, exposure]) => [tool, alias(exposure)])\n );\n if (value.auth !== undefined)\n return fail(name, 'invalid', 'auth is not supported in SLICC yet', 'auth');\n const problem =\n checkTransport(name, value) ??\n checkHeaders(name, value.headers) ??\n checkOAuth(name, value) ??\n checkExposures(name, value) ??\n checkFields(name, value);\n if (problem) return problem;\n const config: Record<string, unknown> = {};\n for (const [key, entry] of Object.entries(value))\n if (ACCEPTED.has(key) && key !== 'type') config[key] = entry;\n return config as unknown as McpServerConfig;\n}\n\nfunction canonical(name: string): string {\n return name.replace(/-/g, '_');\n}\n\nfunction hostOf(raw: unknown): string {\n const url = isRecord(raw) ? raw.url : undefined;\n return typeof url === 'string' && URL.canParse(url) ? new URL(url).host : '';\n}\n\nexport function parseMcpConfig(text: string | undefined): McpConfig {\n if (text === undefined || text.trim() === '') return { servers: [], problems: [], refused: [] };\n let parsed: unknown;\n try {\n parsed = JSON.parse(text);\n } catch (error) {\n return {\n servers: [],\n problems: [{ message: `not valid JSON: ${(error as Error).message}` }],\n refused: [],\n };\n }\n if (!isRecord(parsed) || (parsed.mcpServers !== undefined && !isRecord(parsed.mcpServers)))\n return { servers: [], problems: [{ message: 'mcpServers must be an object' }], refused: [] };\n const servers: McpServerEntry[] = [];\n const problems: McpConfigProblem[] = [];\n const refused: McpRefusedServer[] = [];\n const seen = new Set<string>();\n const refuse = (name: string, raw: unknown, problem: Failed) => {\n problems.push(problem);\n refused.push({ name, host: hostOf(raw), code: problem.code, reason: problem.message });\n };\n for (const [name, raw] of Object.entries((parsed.mcpServers ?? {}) as Record<string, unknown>)) {\n const checked = validateServer(name, raw);\n if ('message' in checked) {\n refuse(name, raw, checked);\n continue;\n }\n if (seen.has(canonical(name))) {\n const twin = 'names that differ only in \"-\" and \"_\" count as the same server';\n refuse(name, raw, fail(name, 'duplicate', twin));\n continue;\n }\n seen.add(canonical(name));\n servers.push({ name, config: checked });\n }\n return { servers, problems, refused };\n}\n\nfunction patternRegExp(pattern: string): RegExp {\n const source = pattern\n .split('*')\n .map((part) => part.replace(/[.+?^${}()|[\\]\\\\]/g, '\\\\$&'))\n .join('.*');\n return new RegExp(`^${source}$`);\n}\n\nexport function nameMatcher(entries: readonly string[]): (name: string) => boolean {\n const names = new Set(entries.filter((entry) => !entry.includes('*')));\n const patterns = entries.filter((entry) => entry.includes('*')).map(patternRegExp);\n return (name) => names.has(name) || patterns.some((pattern) => pattern.test(name));\n}\n\nexport function toolExposure(config: McpServerConfig, tool: string): McpExposure {\n const overrides = config.toolExposure ?? {};\n const exact = overrides[tool];\n if (exact !== undefined) return exact;\n for (const [pattern, exposure] of Object.entries(overrides))\n if (pattern.includes('*') && patternRegExp(pattern).test(tool)) return exposure;\n return config.exposure ?? 'codemode';\n}\n\nexport function mcpNamespace(server: string): string {\n return `mcp__${canonical(server)}`;\n}\n\nexport function mcpToolName(\n server: string,\n tool: string,\n taken: (name: string) => boolean = () => false\n): string {\n const name = `mcp__${server}__${tool}`.replace(/[^A-Za-z0-9_]/g, '_');\n if (name.length <= MAX_TOOL_NAME && !taken(name)) return name;\n const suffix = hash(`${server}\\0${tool}`).padStart(7, '0').slice(0, 7);\n return `${name.slice(0, MAX_TOOL_NAME - suffix.length - 1)}_${suffix}`;\n}\n\nexport function sameConfig(a: McpServerConfig, b: McpServerConfig): boolean {\n return JSON.stringify(a) === JSON.stringify(b);\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/mcp/file.js
CHANGED
|
@@ -6,24 +6,25 @@ import {
|
|
|
6
6
|
validateServer
|
|
7
7
|
} from "./config.js";
|
|
8
8
|
import { shown } from "./paths.js";
|
|
9
|
-
const refused = (reason) => ({ ok: false, reason });
|
|
9
|
+
const refused = ({ code, reason }) => ({ ok: false, code, reason });
|
|
10
|
+
const refusal = (code, reason) => ({ code, reason });
|
|
10
11
|
function tokenName(server) {
|
|
11
12
|
return `MCP_${server.toUpperCase().replace(/[^A-Z0-9]/g, "_")}_TOKEN`;
|
|
12
13
|
}
|
|
13
14
|
function entryOf(name, given) {
|
|
14
|
-
if (!isRecord(given)) return
|
|
15
|
+
if (!isRecord(given)) return refusal("not-object", "must be an object");
|
|
15
16
|
const { token, ...entry } = given;
|
|
16
17
|
if (token !== void 0 && typeof token !== "boolean")
|
|
17
|
-
return
|
|
18
|
+
return refusal("bad-token", "token must be true or false");
|
|
18
19
|
const checked = validateServer(name, entry);
|
|
19
|
-
if ("message" in checked) return
|
|
20
|
+
if ("message" in checked) return refusal(checked.code, checked.message);
|
|
20
21
|
if (!token) return checked;
|
|
21
22
|
if (!usesOAuth(checked))
|
|
22
|
-
return
|
|
23
|
+
return refusal("token-conflict", "a token and an Authorization header exclude each other");
|
|
23
24
|
const authorization = `Bearer \${${tokenName(name)}}`;
|
|
24
25
|
const headers = { ...checked.headers, Authorization: authorization };
|
|
25
26
|
const signed = validateServer(name, { ...checked, headers });
|
|
26
|
-
return "message" in signed ?
|
|
27
|
+
return "message" in signed ? refusal("token-conflict", signed.message) : signed;
|
|
27
28
|
}
|
|
28
29
|
function rendered(root, servers) {
|
|
29
30
|
return `${JSON.stringify({ ...root, mcpServers: servers }, null, 2)}
|
|
@@ -46,7 +47,7 @@ async function replace(env, path, text, context) {
|
|
|
46
47
|
}
|
|
47
48
|
function mcpFile(env, path, home, context) {
|
|
48
49
|
const named = shown(path, home);
|
|
49
|
-
const unwritten = `Couldn't write ${named}, so it is unchanged
|
|
50
|
+
const unwritten = refusal("file-unwritable", `Couldn't write ${named}, so it is unchanged.`);
|
|
50
51
|
let queue = Promise.resolve();
|
|
51
52
|
const inTurn = (run) => {
|
|
52
53
|
const next = queue.then(run);
|
|
@@ -56,37 +57,42 @@ function mcpFile(env, path, home, context) {
|
|
|
56
57
|
const load = async () => {
|
|
57
58
|
const read = await env.readTextFile(path, context);
|
|
58
59
|
if (!read.ok && read.error.code !== "not_found")
|
|
59
|
-
return
|
|
60
|
+
return refusal("file-unreadable", `Couldn't read ${named}, so it is unchanged.`);
|
|
60
61
|
const text = read.ok ? read.value : "";
|
|
61
62
|
if (text.trim() === "") return { root: {}, servers: {}, text };
|
|
62
63
|
let root;
|
|
63
64
|
try {
|
|
64
65
|
root = JSON.parse(text);
|
|
65
66
|
} catch {
|
|
66
|
-
return
|
|
67
|
+
return refusal(
|
|
68
|
+
"file-invalid",
|
|
69
|
+
`${named} isn't valid JSON, so it is unchanged. Fix the file first.`
|
|
70
|
+
);
|
|
67
71
|
}
|
|
68
72
|
if (!isRecord(root) || root.mcpServers !== void 0 && !isRecord(root.mcpServers))
|
|
69
|
-
return
|
|
73
|
+
return refusal("file-invalid", `${named} needs an object of mcpServers, so it is unchanged.`);
|
|
70
74
|
return { root, servers: root.mcpServers ?? {}, text };
|
|
71
75
|
};
|
|
72
76
|
return {
|
|
73
77
|
add: (name, entry) => inTurn(async () => {
|
|
74
78
|
const file = await load();
|
|
75
|
-
if ("reason" in file) return refused(file
|
|
79
|
+
if ("reason" in file) return refused(file);
|
|
76
80
|
if (Object.hasOwn(file.servers, name))
|
|
77
|
-
return refused(
|
|
81
|
+
return refused(
|
|
82
|
+
refusal("duplicate", `${named} already has a server called "${name}". Remove it first.`)
|
|
83
|
+
);
|
|
78
84
|
const config = entryOf(name, entry);
|
|
79
|
-
if ("reason" in config) return refused(config
|
|
85
|
+
if ("reason" in config) return refused(config);
|
|
80
86
|
const text = rendered(file.root, { ...file.servers, [name]: config });
|
|
81
|
-
const clash = parseMcpConfig(text).
|
|
82
|
-
if (clash) return refused(clash
|
|
87
|
+
const clash = parseMcpConfig(text).refused.find((server) => server.name === name);
|
|
88
|
+
if (clash) return refused(clash);
|
|
83
89
|
return await replace(env, path, text, context) ? { ok: true } : refused(unwritten);
|
|
84
90
|
}),
|
|
85
91
|
remove: (name) => inTurn(async () => {
|
|
86
92
|
const file = await load();
|
|
87
|
-
if ("reason" in file) return refused(file
|
|
93
|
+
if ("reason" in file) return refused(file);
|
|
88
94
|
if (!Object.hasOwn(file.servers, name))
|
|
89
|
-
return refused(`${named} has no server called "${name}".`);
|
|
95
|
+
return refused(refusal("not-found", `${named} has no server called "${name}".`));
|
|
90
96
|
const removed = parseMcpConfig(file.text).servers.find((entry) => entry.name === name);
|
|
91
97
|
const { [name]: _gone, ...servers } = file.servers;
|
|
92
98
|
const text = rendered(file.root, servers);
|
package/dist/mcp/file.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/file.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport { quote } from '../kernel/env.ts';\nimport type { McpEdit } from '../services.ts';\nimport {\n isRecord,\n type McpServerConfig,\n type McpServerEntry,\n parseMcpConfig,\n usesOAuth,\n validateServer,\n} from './config.ts';\nimport { shown } from './paths.ts';\n\nexport type McpRemoved = McpEdit & { removed?: McpServerEntry };\n\nexport interface McpFile {\n add(name: string, entry: unknown): Promise<McpEdit>;\n remove(name: string): Promise<McpRemoved>;\n}\n\ninterface McpDocument {\n root: Record<string, unknown>;\n servers: Record<string, unknown>;\n text: string;\n}\n\nconst refused = (reason:
|
|
5
|
-
"mappings": "AAEA,SAAS,aAAa;AAEtB;AAAA,EACE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,aAAa;AAetB,MAAM,UAAU,CAAC,
|
|
4
|
+
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type { ExecutionEnv } from '@earendil-works/pi-durable/env';\nimport { quote } from '../kernel/env.ts';\nimport type { McpEdit, McpRefusal, McpRefusalCode } from '../services.ts';\nimport {\n isRecord,\n type McpServerConfig,\n type McpServerEntry,\n parseMcpConfig,\n usesOAuth,\n validateServer,\n} from './config.ts';\nimport { shown } from './paths.ts';\n\nexport type McpRemoved = McpEdit & { removed?: McpServerEntry };\n\nexport interface McpFile {\n add(name: string, entry: unknown): Promise<McpEdit>;\n remove(name: string): Promise<McpRemoved>;\n}\n\ninterface McpDocument {\n root: Record<string, unknown>;\n servers: Record<string, unknown>;\n text: string;\n}\n\nconst refused = ({ code, reason }: McpRefusal) => ({ ok: false as const, code, reason });\nconst refusal = (code: McpRefusalCode, reason: string): McpRefusal => ({ code, reason });\n\nexport function tokenName(server: string): string {\n return `MCP_${server.toUpperCase().replace(/[^A-Z0-9]/g, '_')}_TOKEN`;\n}\n\nfunction entryOf(name: string, given: unknown): McpServerConfig | McpRefusal {\n if (!isRecord(given)) return refusal('not-object', 'must be an object');\n const { token, ...entry } = given;\n if (token !== undefined && typeof token !== 'boolean')\n return refusal('bad-token', 'token must be true or false');\n const checked = validateServer(name, entry);\n if ('message' in checked) return refusal(checked.code, checked.message);\n if (!token) return checked;\n if (!usesOAuth(checked))\n return refusal('token-conflict', 'a token and an Authorization header exclude each other');\n const authorization = `Bearer \\${${tokenName(name)}}`;\n const headers = { ...checked.headers, Authorization: authorization };\n const signed = validateServer(name, { ...checked, headers });\n return 'message' in signed ? refusal('token-conflict', signed.message) : signed;\n}\n\nfunction rendered(root: Record<string, unknown>, servers: Record<string, unknown>): string {\n return `${JSON.stringify({ ...root, mcpServers: servers }, null, 2)}\\n`;\n}\n\nasync function replace(\n env: ExecutionEnv,\n path: string,\n text: string,\n context: Context\n): Promise<boolean> {\n const staged = `${path}.${crypto.randomUUID()}.tmp`;\n const dir = quote(path.slice(0, path.lastIndexOf('/')));\n const made = await env.exec(\n `mkdir -p ${dir} && (umask 077 && : > ${quote(staged)}) && chmod 600 ${quote(staged)}`,\n undefined,\n context\n );\n if (made.ok && made.value.exitCode === 0) {\n const wrote = await env.writeFile(staged, text, context);\n if (wrote.ok && (await env.renameFile(staged, path, context)).ok) return true;\n }\n await env.remove(staged, { force: true }, context);\n return false;\n}\n\nexport function mcpFile(env: ExecutionEnv, path: string, home: string, context: Context): McpFile {\n const named = shown(path, home);\n const unwritten = refusal('file-unwritable', `Couldn't write ${named}, so it is unchanged.`);\n let queue: Promise<unknown> = Promise.resolve();\n const inTurn = <T>(run: () => Promise<T>): Promise<T> => {\n const next = queue.then(run);\n queue = next.catch(() => undefined);\n return next;\n };\n const load = async (): Promise<McpDocument | McpRefusal> => {\n const read = await env.readTextFile(path, context);\n if (!read.ok && read.error.code !== 'not_found')\n return refusal('file-unreadable', `Couldn't read ${named}, so it is unchanged.`);\n const text = read.ok ? read.value : '';\n if (text.trim() === '') return { root: {}, servers: {}, text };\n let root: unknown;\n try {\n root = JSON.parse(text);\n } catch {\n return refusal(\n 'file-invalid',\n `${named} isn't valid JSON, so it is unchanged. Fix the file first.`\n );\n }\n if (!isRecord(root) || (root.mcpServers !== undefined && !isRecord(root.mcpServers)))\n return refusal('file-invalid', `${named} needs an object of mcpServers, so it is unchanged.`);\n return { root, servers: (root.mcpServers ?? {}) as Record<string, unknown>, text };\n };\n return {\n add: (name, entry) =>\n inTurn(async () => {\n const file = await load();\n if ('reason' in file) return refused(file);\n if (Object.hasOwn(file.servers, name))\n return refused(\n refusal('duplicate', `${named} already has a server called \"${name}\". Remove it first.`)\n );\n const config = entryOf(name, entry);\n if ('reason' in config) return refused(config);\n const text = rendered(file.root, { ...file.servers, [name]: config });\n const clash = parseMcpConfig(text).refused.find((server) => server.name === name);\n if (clash) return refused(clash);\n return (await replace(env, path, text, context)) ? { ok: true } : refused(unwritten);\n }),\n remove: (name) =>\n inTurn(async () => {\n const file = await load();\n if ('reason' in file) return refused(file);\n if (!Object.hasOwn(file.servers, name))\n return refused(refusal('not-found', `${named} has no server called \"${name}\".`));\n const removed = parseMcpConfig(file.text).servers.find((entry) => entry.name === name);\n const { [name]: _gone, ...servers } = file.servers;\n const text = rendered(file.root, servers);\n if (!(await replace(env, path, text, context))) return refused(unwritten);\n return { ok: true, ...(removed ? { removed } : {}) };\n }),\n };\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/mcp/index.js
CHANGED
|
@@ -2,7 +2,11 @@ import { parseMcpConfig } from "./config.js";
|
|
|
2
2
|
import { configPath, shown } from "./paths.js";
|
|
3
3
|
import { allows, McpAllowDoc, mcpEntries, serverAllowed } from "./allow.js";
|
|
4
4
|
const loadRuntime = () => import("./runtime.js");
|
|
5
|
-
const NOT_LOADED = {
|
|
5
|
+
const NOT_LOADED = {
|
|
6
|
+
ok: false,
|
|
7
|
+
code: "invalid",
|
|
8
|
+
reason: "the MCP client didn't load: update SLICC"
|
|
9
|
+
};
|
|
6
10
|
const idle = {
|
|
7
11
|
accounts: async () => [],
|
|
8
12
|
signIn: async (id) => {
|
|
@@ -15,6 +19,7 @@ const idle = {
|
|
|
15
19
|
serverUrl: async () => null,
|
|
16
20
|
addServer: async () => NOT_LOADED,
|
|
17
21
|
removeServer: async () => NOT_LOADED,
|
|
22
|
+
refusals: async () => ({}),
|
|
18
23
|
onChange: () => () => void 0,
|
|
19
24
|
status: () => [],
|
|
20
25
|
reload: async () => void 0,
|
package/dist/mcp/index.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/mcp/index.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type {\n Agent,\n Registry,\n ToolExecutionApi,\n ToolRegistration,\n} from '@earendil-works/pi-durable';\nimport type { CodemodeExtra } from './allow.ts';\nimport type { McpCatalog } from './catalog.ts';\nimport { parseMcpConfig } from './config.ts';\nimport { configPath, shown } from './paths.ts';\nimport type { McpAttach, McpRuntime } from './runtime.ts';\n\nexport { allows, type CodemodeExtra, McpAllowDoc, mcpEntries, serverAllowed } from './allow.ts';\nexport type { McpAccounts, McpAttach, McpRuntime, ServerStatus } from './runtime.ts';\n\nexport type McpLoader = () => Promise<typeof import('./runtime.ts')>;\n\nexport const loadRuntime: McpLoader = () => import('./runtime.ts');\n\nexport interface McpSetup {\n catalog(): McpCatalog | undefined;\n direct(names: readonly string[]): ToolRegistration[];\n codemode(api: ToolExecutionApi, agent: Agent, context: Context): Promise<CodemodeExtra>;\n attach(options: McpAttach, context: Context): Promise<McpRuntime>;\n}\n\nconst NOT_LOADED = {
|
|
5
|
-
"mappings": "AASA,SAAS,sBAAsB;AAC/B,SAAS,YAAY,aAAa;AAGlC,SAAS,QAA4B,aAAa,YAAY,qBAAqB;AAK5E,MAAM,cAAyB,MAAM,OAAO,cAAc;AASjE,MAAM,aAAa,
|
|
4
|
+
"sourcesContent": ["import type { Context } from '@earendil-works/chord';\nimport type {\n Agent,\n Registry,\n ToolExecutionApi,\n ToolRegistration,\n} from '@earendil-works/pi-durable';\nimport type { CodemodeExtra } from './allow.ts';\nimport type { McpCatalog } from './catalog.ts';\nimport { parseMcpConfig } from './config.ts';\nimport { configPath, shown } from './paths.ts';\nimport type { McpAttach, McpRuntime } from './runtime.ts';\n\nexport { allows, type CodemodeExtra, McpAllowDoc, mcpEntries, serverAllowed } from './allow.ts';\nexport type { McpAccounts, McpAttach, McpRuntime, ServerStatus } from './runtime.ts';\n\nexport type McpLoader = () => Promise<typeof import('./runtime.ts')>;\n\nexport const loadRuntime: McpLoader = () => import('./runtime.ts');\n\nexport interface McpSetup {\n catalog(): McpCatalog | undefined;\n direct(names: readonly string[]): ToolRegistration[];\n codemode(api: ToolExecutionApi, agent: Agent, context: Context): Promise<CodemodeExtra>;\n attach(options: McpAttach, context: Context): Promise<McpRuntime>;\n}\n\nconst NOT_LOADED = {\n ok: false as const,\n code: 'invalid' as const,\n reason: \"the MCP client didn't load: update SLICC\",\n};\n\nconst idle: McpRuntime = {\n accounts: async () => [],\n signIn: async (id) => {\n throw new Error(`${id} is not an MCP server that signs in`);\n },\n connect: async (id) => {\n throw new Error(`${id} is not an MCP server that takes a token`);\n },\n disconnect: async () => undefined,\n serverUrl: async () => null,\n addServer: async () => NOT_LOADED,\n removeServer: async () => NOT_LOADED,\n refusals: async () => ({}),\n onChange: () => () => undefined,\n status: () => [],\n reload: async () => undefined,\n close: async () => undefined,\n};\n\nasync function unavailable(options: McpAttach, error: unknown, context: Context) {\n const file = configPath(options.home, options.agentDir);\n const named = shown(file, options.home);\n const read = await options.env.readTextFile(file, context);\n if (!parseMcpConfig(read.ok ? read.value : undefined).servers.length) return;\n await options.licks\n .deliver(\n {\n channel: 'fswatch',\n source: `mcp:${named}`,\n title: \"MCP servers can't start in this SLICC\",\n text: error instanceof Error ? error.message : String(error),\n body: `The MCP client didn't load, so the servers in ${named} stay off until SLICC is updated.`,\n target: 'cone',\n severity: 'warn',\n eventId: 'mcp\\nunavailable',\n },\n context\n )\n .catch(() => undefined);\n}\n\nexport function setupMcp(registry: Registry, load: McpLoader = loadRuntime): McpSetup {\n let catalog: McpCatalog | undefined;\n return {\n catalog: () => catalog,\n direct: (names) => catalog?.direct(names) ?? [],\n codemode: async (api, agent, context) =>\n catalog ? catalog.codemode(api, agent, context) : { tools: [], globals: [] },\n async attach(options, context) {\n let started: Awaited<ReturnType<Awaited<ReturnType<McpLoader>>['startMcp']>>;\n try {\n started = await (await load()).startMcp(registry, options, context);\n } catch (error) {\n await unavailable(options, error, context);\n return idle;\n }\n catalog = started.catalog;\n return started.runtime;\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "AASA,SAAS,sBAAsB;AAC/B,SAAS,YAAY,aAAa;AAGlC,SAAS,QAA4B,aAAa,YAAY,qBAAqB;AAK5E,MAAM,cAAyB,MAAM,OAAO,cAAc;AASjE,MAAM,aAAa;AAAA,EACjB,IAAI;AAAA,EACJ,MAAM;AAAA,EACN,QAAQ;AACV;AAEA,MAAM,OAAmB;AAAA,EACvB,UAAU,YAAY,CAAC;AAAA,EACvB,QAAQ,OAAO,OAAO;AACpB,UAAM,IAAI,MAAM,GAAG,EAAE,qCAAqC;AAAA,EAC5D;AAAA,EACA,SAAS,OAAO,OAAO;AACrB,UAAM,IAAI,MAAM,GAAG,EAAE,0CAA0C;AAAA,EACjE;AAAA,EACA,YAAY,YAAY;AAAA,EACxB,WAAW,YAAY;AAAA,EACvB,WAAW,YAAY;AAAA,EACvB,cAAc,YAAY;AAAA,EAC1B,UAAU,aAAa,CAAC;AAAA,EACxB,UAAU,MAAM,MAAM;AAAA,EACtB,QAAQ,MAAM,CAAC;AAAA,EACf,QAAQ,YAAY;AAAA,EACpB,OAAO,YAAY;AACrB;AAEA,eAAe,YAAY,SAAoB,OAAgB,SAAkB;AAC/E,QAAM,OAAO,WAAW,QAAQ,MAAM,QAAQ,QAAQ;AACtD,QAAM,QAAQ,MAAM,MAAM,QAAQ,IAAI;AACtC,QAAM,OAAO,MAAM,QAAQ,IAAI,aAAa,MAAM,OAAO;AACzD,MAAI,CAAC,eAAe,KAAK,KAAK,KAAK,QAAQ,MAAS,EAAE,QAAQ,OAAQ;AACtE,QAAM,QAAQ,MACX;AAAA,IACC;AAAA,MACE,SAAS;AAAA,MACT,QAAQ,OAAO,KAAK;AAAA,MACpB,OAAO;AAAA,MACP,MAAM,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,MAC3D,MAAM,iDAAiD,KAAK;AAAA,MAC5D,QAAQ;AAAA,MACR,UAAU;AAAA,MACV,SAAS;AAAA,IACX;AAAA,IACA;AAAA,EACF,EACC,MAAM,MAAM,MAAS;AAC1B;AAEO,SAAS,SAAS,UAAoB,OAAkB,aAAuB;AACpF,MAAI;AACJ,SAAO;AAAA,IACL,SAAS,MAAM;AAAA,IACf,QAAQ,CAAC,UAAU,SAAS,OAAO,KAAK,KAAK,CAAC;AAAA,IAC9C,UAAU,OAAO,KAAK,OAAO,YAC3B,UAAU,QAAQ,SAAS,KAAK,OAAO,OAAO,IAAI,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC,EAAE;AAAA,IAC7E,MAAM,OAAO,SAAS,SAAS;AAC7B,UAAI;AACJ,UAAI;AACF,kBAAU,OAAO,MAAM,KAAK,GAAG,SAAS,UAAU,SAAS,OAAO;AAAA,MACpE,SAAS,OAAO;AACd,cAAM,YAAY,SAAS,OAAO,OAAO;AACzC,eAAO;AAAA,MACT;AACA,gBAAU,QAAQ;AAClB,aAAO,QAAQ;AAAA,IACjB;AAAA,EACF;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/readonly.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { VIEW_ONLY } from "./view-only.js";
|
|
2
2
|
const NOT_OWNER = "Only the owner's page can change MCP servers.";
|
|
3
|
+
const REFUSALS_OWNER = "Only the owner's page can see why MCP servers were refused.";
|
|
3
4
|
const refuse = () => Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: "EACCES" }));
|
|
4
5
|
const refused = async () => ({
|
|
5
6
|
accepted: false,
|
|
@@ -8,8 +9,14 @@ const refused = async () => ({
|
|
|
8
9
|
});
|
|
9
10
|
const sends = /* @__PURE__ */ new Set(["send", "compact", "compactAgent"]);
|
|
10
11
|
const controlAnswer = (name) => sends.has(name) ? refused : refuse;
|
|
11
|
-
const notOwner = () =>
|
|
12
|
-
const
|
|
12
|
+
const notOwner = async () => ({ ok: false, code: "not-owner", reason: NOT_OWNER });
|
|
13
|
+
const noRefusals = () => Promise.reject(Object.assign(new Error(REFUSALS_OWNER), { code: "EACCES" }));
|
|
14
|
+
const settingsAnswers = {
|
|
15
|
+
addServer: notOwner,
|
|
16
|
+
removeServer: notOwner,
|
|
17
|
+
refusals: noRefusals
|
|
18
|
+
};
|
|
19
|
+
const settingsAnswer = (name) => settingsAnswers[name] ?? refuse;
|
|
13
20
|
const remoteAnswer = (name) => name === "prompt" ? async () => ({ ok: false, code: "EACCES", message: VIEW_ONLY }) : refuse;
|
|
14
21
|
function viewPages() {
|
|
15
22
|
return {
|
|
@@ -46,6 +53,7 @@ function viewRemote(remote) {
|
|
|
46
53
|
}
|
|
47
54
|
export {
|
|
48
55
|
NOT_OWNER,
|
|
56
|
+
REFUSALS_OWNER,
|
|
49
57
|
VIEW_ONLY,
|
|
50
58
|
controlAnswer,
|
|
51
59
|
pageAnswer,
|
package/dist/readonly.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/readonly.ts"],
|
|
4
|
-
"sourcesContent": ["import type { AgentRemote } from './remote/host.ts';\nimport type { AgentPages } from './remote/pages.ts';\nimport { VIEW_ONLY } from './view-only.ts';\n\nexport { VIEW_ONLY };\n\nexport const NOT_OWNER = \"Only the owner's page can change MCP servers.\";\n\ntype Answer = (...args: unknown[]) => Promise<unknown>;\n\nconst refuse: Answer = () =>\n Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: 'EACCES' }));\n\nconst refused: Answer = async () => ({\n accepted: false as const,\n submissionId: null,\n error: { code: 'EACCES', message: VIEW_ONLY },\n});\n\nconst sends = new Set(['send', 'compact', 'compactAgent']);\n\nexport const controlAnswer = (name: string): Answer => (sends.has(name) ? refused : refuse);\n\nconst notOwner: Answer = () =>\n Promise.reject(Object.assign(new Error(
|
|
5
|
-
"mappings": "AAEA,SAAS,iBAAiB;AAInB,MAAM,YAAY;
|
|
4
|
+
"sourcesContent": ["import type { AgentRemote } from './remote/host.ts';\nimport type { AgentPages } from './remote/pages.ts';\nimport { VIEW_ONLY } from './view-only.ts';\n\nexport { VIEW_ONLY };\n\nexport const NOT_OWNER = \"Only the owner's page can change MCP servers.\";\nexport const REFUSALS_OWNER = \"Only the owner's page can see why MCP servers were refused.\";\n\ntype Answer = (...args: unknown[]) => Promise<unknown>;\n\nconst refuse: Answer = () =>\n Promise.reject(Object.assign(new Error(VIEW_ONLY), { code: 'EACCES' }));\n\nconst refused: Answer = async () => ({\n accepted: false as const,\n submissionId: null,\n error: { code: 'EACCES', message: VIEW_ONLY },\n});\n\nconst sends = new Set(['send', 'compact', 'compactAgent']);\n\nexport const controlAnswer = (name: string): Answer => (sends.has(name) ? refused : refuse);\n\nconst notOwner: Answer = async () => ({ ok: false, code: 'not-owner', reason: NOT_OWNER });\n\nconst noRefusals: Answer = () =>\n Promise.reject(Object.assign(new Error(REFUSALS_OWNER), { code: 'EACCES' }));\n\nconst settingsAnswers: Record<string, Answer> = {\n addServer: notOwner,\n removeServer: notOwner,\n refusals: noRefusals,\n};\n\nexport const settingsAnswer = (name: string): Answer => settingsAnswers[name] ?? refuse;\n\nexport const remoteAnswer = (name: string): Answer =>\n name === 'prompt' ? async () => ({ ok: false, code: 'EACCES', message: VIEW_ONLY }) : refuse;\n\nexport function viewPages(): AgentPages {\n return {\n open: async () => ({ error: VIEW_ONLY }),\n report: async () => {},\n next: async () => ({ requests: [], done: true }),\n answer: async () => {},\n close: async () => {},\n };\n}\n\nexport const pageAnswer = (name: string): Answer =>\n (viewPages() as unknown as Record<string, Answer>)[name] as Answer;\n\nexport function viewRemote(remote: AgentRemote): Pick<AgentRemote, 'watch' | 'next' | 'close'> {\n const mine = new Set<string>();\n return {\n async watch(request, context) {\n const opened = await remote.watch(request, context);\n if (opened.ok) mine.add(opened.stream);\n return opened;\n },\n async next(stream, waitMs, context) {\n if (!mine.has(stream)) return { events: [], done: true };\n const batch = await remote.next(stream, waitMs, context);\n if (batch.done) mine.delete(stream);\n return batch;\n },\n async close(stream, context) {\n if (!mine.delete(stream)) return;\n await remote.close(stream, context);\n },\n };\n}\n"],
|
|
5
|
+
"mappings": "AAEA,SAAS,iBAAiB;AAInB,MAAM,YAAY;AAClB,MAAM,iBAAiB;AAI9B,MAAM,SAAiB,MACrB,QAAQ,OAAO,OAAO,OAAO,IAAI,MAAM,SAAS,GAAG,EAAE,MAAM,SAAS,CAAC,CAAC;AAExE,MAAM,UAAkB,aAAa;AAAA,EACnC,UAAU;AAAA,EACV,cAAc;AAAA,EACd,OAAO,EAAE,MAAM,UAAU,SAAS,UAAU;AAC9C;AAEA,MAAM,QAAQ,oBAAI,IAAI,CAAC,QAAQ,WAAW,cAAc,CAAC;AAElD,MAAM,gBAAgB,CAAC,SAA0B,MAAM,IAAI,IAAI,IAAI,UAAU;AAEpF,MAAM,WAAmB,aAAa,EAAE,IAAI,OAAO,MAAM,aAAa,QAAQ,UAAU;AAExF,MAAM,aAAqB,MACzB,QAAQ,OAAO,OAAO,OAAO,IAAI,MAAM,cAAc,GAAG,EAAE,MAAM,SAAS,CAAC,CAAC;AAE7E,MAAM,kBAA0C;AAAA,EAC9C,WAAW;AAAA,EACX,cAAc;AAAA,EACd,UAAU;AACZ;AAEO,MAAM,iBAAiB,CAAC,SAAyB,gBAAgB,IAAI,KAAK;AAE1E,MAAM,eAAe,CAAC,SAC3B,SAAS,WAAW,aAAa,EAAE,IAAI,OAAO,MAAM,UAAU,SAAS,UAAU,KAAK;AAEjF,SAAS,YAAwB;AACtC,SAAO;AAAA,IACL,MAAM,aAAa,EAAE,OAAO,UAAU;AAAA,IACtC,QAAQ,YAAY;AAAA,IAAC;AAAA,IACrB,MAAM,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,KAAK;AAAA,IAC9C,QAAQ,YAAY;AAAA,IAAC;AAAA,IACrB,OAAO,YAAY;AAAA,IAAC;AAAA,EACtB;AACF;AAEO,MAAM,aAAa,CAAC,SACxB,UAAU,EAAwC,IAAI;AAElD,SAAS,WAAW,QAAoE;AAC7F,QAAM,OAAO,oBAAI,IAAY;AAC7B,SAAO;AAAA,IACL,MAAM,MAAM,SAAS,SAAS;AAC5B,YAAM,SAAS,MAAM,OAAO,MAAM,SAAS,OAAO;AAClD,UAAI,OAAO,GAAI,MAAK,IAAI,OAAO,MAAM;AACrC,aAAO;AAAA,IACT;AAAA,IACA,MAAM,KAAK,QAAQ,QAAQ,SAAS;AAClC,UAAI,CAAC,KAAK,IAAI,MAAM,EAAG,QAAO,EAAE,QAAQ,CAAC,GAAG,MAAM,KAAK;AACvD,YAAM,QAAQ,MAAM,OAAO,KAAK,QAAQ,QAAQ,OAAO;AACvD,UAAI,MAAM,KAAM,MAAK,OAAO,MAAM;AAClC,aAAO;AAAA,IACT;AAAA,IACA,MAAM,MAAM,QAAQ,SAAS;AAC3B,UAAI,CAAC,KAAK,OAAO,MAAM,EAAG;AAC1B,YAAM,OAAO,MAAM,QAAQ,OAAO;AAAA,IACpC;AAAA,EACF;AACF;",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/services.js
CHANGED
|
@@ -134,7 +134,8 @@ const SETTINGS_METHODS = keys({
|
|
|
134
134
|
const OWNER_SETTINGS_METHODS = [
|
|
135
135
|
...SETTINGS_METHODS,
|
|
136
136
|
"addServer",
|
|
137
|
-
"removeServer"
|
|
137
|
+
"removeServer",
|
|
138
|
+
"refusals"
|
|
138
139
|
];
|
|
139
140
|
const AgentSettings = contract("slicc.agent.settings", {
|
|
140
141
|
owner: { state: ["state"], methods: OWNER_SETTINGS_METHODS },
|