@3ngram/server 1.0.2 → 1.1.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/dist/app.d.ts +6 -0
- package/dist/app.js +10 -2
- package/dist/app.js.map +1 -1
- package/dist/boot.d.ts +6 -0
- package/dist/boot.js +6 -0
- package/dist/boot.js.map +1 -1
- package/dist/mcp/errors.d.ts +1 -1
- package/dist/mcp/prompts.d.ts +1 -1
- package/dist/mcp/prompts.js +7 -13
- package/dist/mcp/prompts.js.map +1 -1
- package/dist/mcp/server.d.ts +9 -2
- package/dist/mcp/server.js +17 -5
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tools-admin.js +10 -12
- package/dist/mcp/tools-admin.js.map +1 -1
- package/dist/mcp/tools-orient.js +4 -4
- package/dist/mcp/tools-orient.js.map +1 -1
- package/dist/mcp/tools.d.ts +8 -13
- package/dist/mcp/tools.js +9 -9
- package/dist/mcp/tools.js.map +1 -1
- package/dist/middleware/authenticate.d.ts +2 -0
- package/dist/middleware/authenticate.js.map +1 -1
- package/dist/middleware/mcp-header-observability.d.ts +19 -0
- package/dist/middleware/mcp-header-observability.js +73 -0
- package/dist/middleware/mcp-header-observability.js.map +1 -0
- package/dist/middleware/oauth-bearer.js +12 -2
- package/dist/middleware/oauth-bearer.js.map +1 -1
- package/dist/routes/health.d.ts +2 -2
- package/dist/routes/health.js +27 -2
- package/dist/routes/health.js.map +1 -1
- package/dist/routes/mcp.d.ts +13 -5
- package/dist/routes/mcp.js +50 -49
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/oauth-authorize.d.ts +2 -0
- package/dist/routes/oauth-authorize.js +22 -11
- package/dist/routes/oauth-authorize.js.map +1 -1
- package/dist/routes/oauth-token.d.ts +3 -1
- package/dist/routes/oauth-token.js +24 -31
- package/dist/routes/oauth-token.js.map +1 -1
- package/dist/routes/well-known.js +3 -1
- package/dist/routes/well-known.js.map +1 -1
- package/package.json +8 -5
package/dist/app.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ClientMetadataResolver } from '@3ngram/core/auth';
|
|
1
2
|
import { type Gateway } from '@3ngram/llm';
|
|
2
3
|
import { type Express } from 'express';
|
|
3
4
|
import type { Redis } from 'ioredis';
|
|
@@ -64,6 +65,11 @@ export interface AppOptions {
|
|
|
64
65
|
* injection-only change (incl. failed-exchange progressive delay).
|
|
65
66
|
*/
|
|
66
67
|
oauthLimiter?: RateLimiterMiddleware;
|
|
68
|
+
/**
|
|
69
|
+
* Shared CIMD resolver/cache. Tests inject a networkless resolver; production
|
|
70
|
+
* gets one bounded SSRF-safe instance per app process.
|
|
71
|
+
*/
|
|
72
|
+
clientMetadataResolver?: ClientMetadataResolver;
|
|
67
73
|
/**
|
|
68
74
|
* Per-API-key limiter on /api/v1. Keyed on req.apiKeyId (the prefix
|
|
69
75
|
* segment set by apiKeyAuth after a successful key lookup). Mounted before
|
package/dist/app.js
CHANGED
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
import { budgetGateLookupFailure, loadBudgetConfig, loadLlmGatewayConfig, log, } from '@3ngram/config';
|
|
3
3
|
import { crashSafeError } from '@3ngram/config/otel';
|
|
4
4
|
import { allowAllAccess, SELFHOST_LIMITS } from '@3ngram/core';
|
|
5
|
+
import { ClientMetadataResolver } from '@3ngram/core/auth';
|
|
5
6
|
import { createOpenAIGateway } from '@3ngram/llm';
|
|
6
7
|
import express, {} from 'express';
|
|
7
8
|
import { baseCapabilities, noOpExtension } from './composition/extension.js';
|
|
9
|
+
import { mcpHeaderObservability } from './middleware/mcp-header-observability.js';
|
|
8
10
|
import { apiKeyIdKey, createRateLimiter, ipKey, userIdKey, } from './middleware/rate-limit.js';
|
|
9
11
|
import { requestContext } from './middleware/request-context.js';
|
|
10
12
|
import { resolveRedis } from './redis.js';
|
|
@@ -197,6 +199,7 @@ export function createApp(options = {}) {
|
|
|
197
199
|
// would open a redundant connection. An explicit override wins (the test
|
|
198
200
|
// seam); else the env-derived client (undefined ⇒ in-memory fallbacks).
|
|
199
201
|
const redis = options.redis ?? resolveRedis();
|
|
202
|
+
const clientMetadataResolver = options.clientMetadataResolver ?? new ClientMetadataResolver();
|
|
200
203
|
const { edgeLimiter, mcpLimiter, authLimiter, signupLimiter, resendVerificationLimiter, verifyEmailLimiter, forgotPasswordLimiter, resetPasswordLimiter, registerLimiter, oauthLimiter, apiKeyLimiter, } = resolveLimiters(options, redis);
|
|
201
204
|
// Railway terminates TLS at a proxy; without this, req.ip (and the SDK auth
|
|
202
205
|
// router's rate limiter) see the proxy address.
|
|
@@ -208,6 +211,11 @@ export function createApp(options = {}) {
|
|
|
208
211
|
// an overloaded API from a dead process. Every other surface gets a coarse
|
|
209
212
|
// per-IP cap before body parsing or any handler work.
|
|
210
213
|
app.use(edgeLimiter);
|
|
214
|
+
// SEP-2243 routing headers are useful before JSON parsing, but untrusted.
|
|
215
|
+
// This narrow middleware records only allowlisted values and sets MCP log
|
|
216
|
+
// context. The SDK later cross-checks headers against the body; authorization
|
|
217
|
+
// remains inside the verified handler.
|
|
218
|
+
app.use('/mcp', mcpHeaderObservability);
|
|
211
219
|
// Capture the exact raw bytes alongside JSON parsing so a private webhook
|
|
212
220
|
// (mounted by the extension below) can verify the signature over the
|
|
213
221
|
// unmodified payload — re-serializing a parsed body would change the bytes and
|
|
@@ -266,11 +274,11 @@ export function createApp(options = {}) {
|
|
|
266
274
|
// APPEND-ONLY after the existing routers, before the error handler. Both are
|
|
267
275
|
// unauthenticated and sit behind the shared injected per-IP limiter seam
|
|
268
276
|
// (real bucket by default).
|
|
269
|
-
app.use(oauthAuthorizeRouter({ limiter: oauthLimiter }));
|
|
277
|
+
app.use(oauthAuthorizeRouter({ limiter: oauthLimiter, clientMetadataResolver }));
|
|
270
278
|
// The same shared ioredis client backs the progressive-delay failure counter
|
|
271
279
|
// so the budget is shared across Railway replicas; a missing client
|
|
272
280
|
// makes the tracker fall back to a per-process Map.
|
|
273
|
-
app.use(oauthTokenRouter({ limiter: oauthLimiter, redis, limits }));
|
|
281
|
+
app.use(oauthTokenRouter({ limiter: oauthLimiter, redis, limits, clientMetadataResolver }));
|
|
274
282
|
// Composition seam: the injected extension attaches its hosted-only
|
|
275
283
|
// routes/handlers here, at the composition root, AFTER every Apache router and
|
|
276
284
|
// BEFORE the error handler. On self-host this is the no-op default (attaches
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,oBAAoB,EACpB,GAAG,GACJ,MAAM,gBAAgB,CAAA;AACvB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,cAAc,EAA0B,eAAe,EAAE,MAAM,cAAc,CAAA;AACtF,OAAO,EAAE,mBAAmB,EAAgB,MAAM,aAAa,CAAA;AAC/D,OAAO,OAAO,EAAE,EAAgE,MAAM,SAAS,CAAA;AAE/F,OAAO,EAAE,gBAAgB,EAAkB,aAAa,EAAE,MAAM,4BAA4B,CAAA;AAC5F,OAAO,EACL,WAAW,EACX,iBAAiB,EACjB,KAAK,EAEL,SAAS,GACV,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAOxD;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/boot.d.ts
CHANGED
|
@@ -31,6 +31,12 @@ export interface BootstrapOptions {
|
|
|
31
31
|
* keeps core's graph behind initObservability, like the app graph below.
|
|
32
32
|
* 5. Dynamic-import createApp (express graph) and listen; wire signal handlers.
|
|
33
33
|
*
|
|
34
|
+
* The fail-closed tenant-isolation check (runtime role is NOBYPASSRLS/
|
|
35
|
+
* non-superuser, FORCE RLS set on the tenant-data tables) runs in readiness
|
|
36
|
+
* (`GET /ready`), not here: boot must stay DB-free so liveness comes up without
|
|
37
|
+
* a database (the S5 capture hook and the container smoke both rely on that),
|
|
38
|
+
* while a misprovisioned DB is held OUT of rotation by /ready reporting 503.
|
|
39
|
+
*
|
|
34
40
|
* Reused verbatim by both entrypoints so hosted cloud gets the SAME fail-closed
|
|
35
41
|
* env/key checks and OTel/request instrumentation as the Apache server.
|
|
36
42
|
*/
|
package/dist/boot.js
CHANGED
|
@@ -22,6 +22,12 @@ async function resolveExtension(extension) {
|
|
|
22
22
|
* keeps core's graph behind initObservability, like the app graph below.
|
|
23
23
|
* 5. Dynamic-import createApp (express graph) and listen; wire signal handlers.
|
|
24
24
|
*
|
|
25
|
+
* The fail-closed tenant-isolation check (runtime role is NOBYPASSRLS/
|
|
26
|
+
* non-superuser, FORCE RLS set on the tenant-data tables) runs in readiness
|
|
27
|
+
* (`GET /ready`), not here: boot must stay DB-free so liveness comes up without
|
|
28
|
+
* a database (the S5 capture hook and the container smoke both rely on that),
|
|
29
|
+
* while a misprovisioned DB is held OUT of rotation by /ready reporting 503.
|
|
30
|
+
*
|
|
25
31
|
* Reused verbatim by both entrypoints so hosted cloud gets the SAME fail-closed
|
|
26
32
|
* env/key checks and OTel/request instrumentation as the Apache server.
|
|
27
33
|
*/
|
package/dist/boot.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"boot.js","sourceRoot":"","sources":["../src/boot.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,gFAAgF;AAChF,yDAAyD;AACzD,OAAO,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAA;AAuB/D,sGAAsG;AACtG,KAAK,UAAU,gBAAgB,CAC7B,SAAmD;IAEnD,IAAI,OAAO,SAAS,KAAK,UAAU;QAAE,OAAO,SAAS,EAAE,CAAA;IACvD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"boot.js","sourceRoot":"","sources":["../src/boot.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,gFAAgF;AAChF,yDAAyD;AACzD,OAAO,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAA;AAuB/D,sGAAsG;AACtG,KAAK,UAAU,gBAAgB,CAC7B,SAAmD;IAEnD,IAAI,OAAO,SAAS,KAAK,UAAU;QAAE,OAAO,SAAS,EAAE,CAAA;IACvD,OAAO,SAAS,CAAA;AAClB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,UAA4B,EAAE;IAC5D,iBAAiB,EAAE,CAAA;IACnB,MAAM,GAAG,GAAG,OAAO,EAAE,CAAA;IACrB,iCAAiC,EAAE,CAAA;IACnC,IAAI,GAAG,CAAC,QAAQ,KAAK,SAAS,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/D,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAA;QACrE,MAAM,uBAAuB,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAA;IACvD,CAAC;IAED,uEAAuE;IACvE,iEAAiE;IACjE,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;IAC3D,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAA;IAC9C,+EAA+E;IAC/E,sEAAsE;IACtE,MAAM,MAAM,GAAG,SAAS,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE;QAC3F,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,mBAAmB,CAAC,CAAA;IACrD,CAAC,CAAC,CAAA;IAEF,KAAK,MAAM,MAAM,IAAI,CAAC,QAAQ,EAAE,SAAS,CAAU,EAAE,CAAC;QACpD,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;YACtB,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,uBAAuB,CAAC,CAAA;YAC/C,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
package/dist/mcp/errors.d.ts
CHANGED
package/dist/mcp/prompts.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { McpServer } from '@modelcontextprotocol/
|
|
1
|
+
import type { McpServer } from '@modelcontextprotocol/server';
|
|
2
2
|
/**
|
|
3
3
|
* A code-defined prompt, erased to a name + a server-bound registrar. The arg
|
|
4
4
|
* shape is captured at the typed {@link definePrompt} call site, so the
|
package/dist/mcp/prompts.js
CHANGED
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
// is the ceiling.
|
|
22
22
|
//
|
|
23
23
|
// ARG TYPING: MCP delivers prompt arguments as STRINGS over the wire, so every
|
|
24
|
-
// arg shape is string-valued — z.enum for the bounded selectors/modes
|
|
25
|
-
//
|
|
24
|
+
// arg shape is string-valued — z.enum for the bounded selectors/modes. The
|
|
25
|
+
// registry wraps that shape into a full Zod Standard Schema object for SDK v2.
|
|
26
26
|
//
|
|
27
27
|
// SCHEMA ALIGNMENT (hard rule 2 — constraints live in @3ngram/schema): the
|
|
28
28
|
// rendered text instructs the agent to call the briefing/remember TOOLS, so the
|
|
@@ -35,27 +35,21 @@
|
|
|
35
35
|
import { briefingModeSchema, briefingSelectorSchema, scopeSchema } from '@3ngram/schema';
|
|
36
36
|
import { z } from 'zod';
|
|
37
37
|
/**
|
|
38
|
-
* Define a code-defined prompt.
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
* convention as `registerTool`). `render` returns the bounded
|
|
38
|
+
* Define a code-defined prompt. The local raw shape is wrapped once into a full
|
|
39
|
+
* Zod object because SDK v2 registers Standard Schema objects directly.
|
|
40
|
+
* `render` returns the bounded
|
|
42
41
|
* {@link GetPromptResult}: a single user message whose text orients the agent;
|
|
43
42
|
* it receives the SDK-VALIDATED, re-parsed args and reads NOTHING else (no DB,
|
|
44
43
|
* no env). The returned registrar binds the prompt onto an McpServer;
|
|
45
44
|
* registerPrompt auto-enables the `prompts` capability.
|
|
46
45
|
*/
|
|
47
46
|
function definePrompt(prompt) {
|
|
48
|
-
// The SDK already validates inbound args against `
|
|
47
|
+
// The SDK already validates inbound args against `argsObject` before invoking
|
|
49
48
|
// the callback; re-parsing through the same z.object is a zero-risk TYPE BRIDGE
|
|
50
49
|
// that yields the exact `z.infer<z.ZodObject<Args>>` `render` declares (the
|
|
51
50
|
// SDK's structurally-equal arg type does not generically unify with zod's).
|
|
52
51
|
const argsObject = z.object(prompt.config.argsSchema);
|
|
53
|
-
|
|
54
|
-
// infers a CONCRETE `Args` (mirrors how server.ts calls registerTool with the
|
|
55
|
-
// wide tool config): a callback taking `unknown` is then assignable to the
|
|
56
|
-
// resolved PromptCallback. A conditional PromptCallback over an UNRESOLVED
|
|
57
|
-
// generic `Args` blocks assignability, so we must register non-generically.
|
|
58
|
-
const config = prompt.config;
|
|
52
|
+
const config = { ...prompt.config, argsSchema: argsObject };
|
|
59
53
|
return {
|
|
60
54
|
name: prompt.name,
|
|
61
55
|
register: (server) => server.registerPrompt(prompt.name, config, (args) => prompt.render(argsObject.parse(args))),
|
package/dist/mcp/prompts.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/mcp/prompts.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,0EAA0E;AAC1E,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,kFAAkF;AAClF,gFAAgF;AAChF,iFAAiF;AACjF,6DAA6D;AAC7D,EAAE;AACF,iFAAiF;AACjF,gFAAgF;AAChF,kFAAkF;AAClF,+EAA+E;AAC/E,gFAAgF;AAChF,gFAAgF;AAChF,2EAA2E;AAC3E,EAAE;AACF,8FAA8F;AAC9F,+EAA+E;AAC/E,kBAAkB;AAClB,EAAE;AACF,+EAA+E;AAC/E,+EAA+E;AAC/E,
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/mcp/prompts.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,0EAA0E;AAC1E,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,kFAAkF;AAClF,gFAAgF;AAChF,iFAAiF;AACjF,6DAA6D;AAC7D,EAAE;AACF,iFAAiF;AACjF,gFAAgF;AAChF,kFAAkF;AAClF,+EAA+E;AAC/E,gFAAgF;AAChF,gFAAgF;AAChF,2EAA2E;AAC3E,EAAE;AACF,8FAA8F;AAC9F,+EAA+E;AAC/E,kBAAkB;AAClB,EAAE;AACF,+EAA+E;AAC/E,2EAA2E;AAC3E,+EAA+E;AAC/E,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;AAChF,kFAAkF;AAClF,gFAAgF;AAChF,kFAAkF;AAClF,gEAAgE;AAChE,gFAAgF;AAChF,8DAA8D;AAC9D,OAAO,EAAE,kBAAkB,EAAE,sBAAsB,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAExF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAavB;;;;;;;;GAQG;AACH,SAAS,YAAY,CAA6B,MAIjD;IACC,8EAA8E;IAC9E,gFAAgF;IAChF,4EAA4E;IAC5E,4EAA4E;IAC5E,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;IACrD,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,CAAA;IAC3D,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CACnB,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE,CAC3D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CACtC;KACJ,CAAA;AACH,CAAC;AAED,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAA;AAC1E,CAAC;AAED,6EAA6E;AAC7E,4EAA4E;AAC5E,uEAAuE;AACvE,+EAA+E;AAC/E,iFAAiF;AACjF,MAAM,cAAc,GAAG,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAG5F,CAAA;AAED,MAAM,iBAAiB,GAAG,CAAC;KACxB,IAAI,CAAC,cAAc,CAAC;KACpB,QAAQ,CAAC,+EAA+E,CAAC,CAAA;AAE5F,6EAA6E;AAC7E,2DAA2D;AAC3D,MAAM,aAAa,GAAG,kBAAkB,CAAC,QAAQ,CAC/C,sEAAsE,CACvE,CAAA;AAED;;;;;GAKG;AACH,MAAM,cAAc,GAAG,YAAY,CAAC;IAClC,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE;QACN,KAAK,EAAE,kBAAkB;QACzB,WAAW,EACT,yNAAyN;QAC3N,UAAU,EAAE;YACV,QAAQ,EAAE,iBAAiB;YAC3B,IAAI,EAAE,aAAa,CAAC,QAAQ,EAAE;SAC/B;KACF;IACD,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvB,MAAM,KAAK,GAAG,IAAI,IAAI,OAAO,CAAA;QAC7B,MAAM,YAAY,GAChB,QAAQ,KAAK,KAAK;YAChB,CAAC,CAAC,mBAAmB;YACrB,CAAC,CAAC,QAAQ,KAAK,OAAO;gBACpB,CAAC,CAAC,8CAA8C;gBAChD,CAAC,CAAC,oDAAoD,CAAA;QAC5D,OAAO,WAAW,CAChB;YACE,iFAAiF;YACjF,qFAAqF;YACrF,EAAE;YACF,gBAAgB,YAAY,cAAc,KAAK,IAAI;YACnD,EAAE;YACF,2EAA2E;YAC3E,gFAAgF;YAChF,iFAAiF;YACjF,6EAA6E;YAC7E,wBAAwB;SACzB,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;IACH,CAAC;CACF,CAAC,CAAA;AAEF;;;;;;GAMG;AACH,MAAM,aAAa,GAAG,YAAY,CAAC;IACjC,IAAI,EAAE,SAAS;IACf,MAAM,EAAE;QACN,KAAK,EAAE,iBAAiB;QACxB,WAAW,EACT,4MAA4M;QAC9M,UAAU,EAAE;YACV,6EAA6E;YAC7E,6EAA6E;YAC7E,2EAA2E;YAC3E,oEAAoE;YACpE,KAAK,EAAE,WAAW;iBACf,QAAQ,EAAE;iBACV,QAAQ,CAAC,2EAA2E,CAAC;SACzF;KACF;IACD,MAAM,CAAC,EAAE,KAAK,EAAE;QACd,MAAM,SAAS,GACb,KAAK,KAAK,SAAS;YACjB,CAAC,CAAC,sDAAsD;YACxD,CAAC,CAAC,+BAA+B,KAAK,IAAI,CAAA;QAC9C,OAAO,WAAW,CAChB;YACE,iFAAiF;YACjF,8EAA8E;YAC9E,EAAE;YACF,oFAAoF;YACpF,+FAA+F;YAC/F,wFAAwF;YACxF,iEAAiE;YACjE,EAAE;YACF,SAAS;YACT,EAAE;YACF,sFAAsF;YACtF,wFAAwF;SACzF,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAA;IACH,CAAC;CACF,CAAC,CAAA;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,OAAO,GAAkC,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;AAErF,yFAAyF;AACzF,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,CAAA;AAE5B;;;;;;GAMG;AACH,MAAM,UAAU,eAAe,CAAC,MAAiB;IAC/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IACzB,CAAC;AACH,CAAC"}
|
package/dist/mcp/server.d.ts
CHANGED
|
@@ -1,8 +1,15 @@
|
|
|
1
|
-
import { McpServer } from '@modelcontextprotocol/
|
|
1
|
+
import { McpServer } from '@modelcontextprotocol/server';
|
|
2
2
|
import { type ToolContext } from './tools.js';
|
|
3
|
+
/**
|
|
4
|
+
* Tool and prompt definitions change only with a server deployment. One hour
|
|
5
|
+
* avoids reconnect refetches without making a rolling deployment's old catalog
|
|
6
|
+
* sticky for long. Both lists are identical across tenants, so shared caching
|
|
7
|
+
* is safe; tool authorization still runs on every tools/call.
|
|
8
|
+
*/
|
|
9
|
+
export declare const MCP_CATALOG_CACHE_TTL_MS: number;
|
|
3
10
|
/**
|
|
4
11
|
* Build an McpServer with every registry tool registered, bound to one request's
|
|
5
|
-
* {@link ToolContext}. Each tool registers its Zod
|
|
12
|
+
* {@link ToolContext}. Each tool registers its full Zod Standard Schema objects (the
|
|
6
13
|
* SDK validates inbound args against inputSchema and the structured result
|
|
7
14
|
* against outputSchema), and delegates to {@link runTool} for uniform metrics +
|
|
8
15
|
* typed-error mapping. The code-defined PROMPTS (briefing, debrief)
|
package/dist/mcp/server.js
CHANGED
|
@@ -1,20 +1,27 @@
|
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
|
2
2
|
// MCP server factory — builds a per-request McpServer from the {@link TOOLS}
|
|
3
|
-
// registry. STATELESS (docs/concepts/mcp-design.mdx):
|
|
4
|
-
//
|
|
3
|
+
// registry. STATELESS (docs/concepts/mcp-design.mdx): createMcpHandler invokes
|
|
4
|
+
// this factory per request for both eras, so NO tenant/session state survives a
|
|
5
5
|
// request — any instance serves any request and a Railway redeploy is a
|
|
6
6
|
// non-event. The authenticated tenant + optional embedding gateway are captured
|
|
7
7
|
// in the handler closure (the per-request context), never stored on the server.
|
|
8
|
-
import { McpServer } from '@modelcontextprotocol/
|
|
8
|
+
import { McpServer } from '@modelcontextprotocol/server';
|
|
9
9
|
import { SERVER_VERSION } from '../version.js';
|
|
10
10
|
import { registerPrompts } from './prompts.js';
|
|
11
11
|
import { runTool, TOOLS } from './tools.js';
|
|
12
12
|
// `version` derives from package.json (see ../version.ts) so the `initialize`
|
|
13
13
|
// result always matches the published package version and never skews.
|
|
14
14
|
const SERVER_INFO = { name: '3ngram', version: SERVER_VERSION };
|
|
15
|
+
/**
|
|
16
|
+
* Tool and prompt definitions change only with a server deployment. One hour
|
|
17
|
+
* avoids reconnect refetches without making a rolling deployment's old catalog
|
|
18
|
+
* sticky for long. Both lists are identical across tenants, so shared caching
|
|
19
|
+
* is safe; tool authorization still runs on every tools/call.
|
|
20
|
+
*/
|
|
21
|
+
export const MCP_CATALOG_CACHE_TTL_MS = 60 * 60_000;
|
|
15
22
|
/**
|
|
16
23
|
* Build an McpServer with every registry tool registered, bound to one request's
|
|
17
|
-
* {@link ToolContext}. Each tool registers its Zod
|
|
24
|
+
* {@link ToolContext}. Each tool registers its full Zod Standard Schema objects (the
|
|
18
25
|
* SDK validates inbound args against inputSchema and the structured result
|
|
19
26
|
* against outputSchema), and delegates to {@link runTool} for uniform metrics +
|
|
20
27
|
* typed-error mapping. The code-defined PROMPTS (briefing, debrief)
|
|
@@ -24,7 +31,12 @@ const SERVER_INFO = { name: '3ngram', version: SERVER_VERSION };
|
|
|
24
31
|
* no {@link ToolContext}.
|
|
25
32
|
*/
|
|
26
33
|
export function createMcpServer(ctx) {
|
|
27
|
-
const server = new McpServer(SERVER_INFO
|
|
34
|
+
const server = new McpServer(SERVER_INFO, {
|
|
35
|
+
cacheHints: {
|
|
36
|
+
'tools/list': { ttlMs: MCP_CATALOG_CACHE_TTL_MS, cacheScope: 'public' },
|
|
37
|
+
'prompts/list': { ttlMs: MCP_CATALOG_CACHE_TTL_MS, cacheScope: 'public' },
|
|
38
|
+
},
|
|
39
|
+
});
|
|
28
40
|
for (const tool of TOOLS) {
|
|
29
41
|
server.registerTool(tool.name, tool.config, (args) => runTool(tool, args, ctx));
|
|
30
42
|
}
|
package/dist/mcp/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,6EAA6E;AAC7E
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/mcp/server.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,6EAA6E;AAC7E,+EAA+E;AAC/E,gFAAgF;AAChF,wEAAwE;AACxE,gFAAgF;AAChF,gFAAgF;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAoB,MAAM,YAAY,CAAA;AAE7D,8EAA8E;AAC9E,uEAAuE;AACvE,MAAM,WAAW,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAW,CAAA;AAExE;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,EAAE,GAAG,MAAM,CAAA;AAEnD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,eAAe,CAAC,GAAgB;IAC9C,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC,WAAW,EAAE;QACxC,UAAU,EAAE;YACV,YAAY,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,QAAQ,EAAE;YACvE,cAAc,EAAE,EAAE,KAAK,EAAE,wBAAwB,EAAE,UAAU,EAAE,QAAQ,EAAE;SAC1E;KACF,CAAC,CAAA;IACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,IAAa,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;IAC1F,CAAC;IACD,eAAe,CAAC,MAAM,CAAC,CAAA;IACvB,OAAO,MAAM,CAAA;AACf,CAAC"}
|
package/dist/mcp/tools-admin.js
CHANGED
|
@@ -23,15 +23,13 @@
|
|
|
23
23
|
// an env value, DSN, key, or base URL. The output schema has no field for one and
|
|
24
24
|
// no handler here reads process.env or a secret.
|
|
25
25
|
//
|
|
26
|
-
// REGISTRATION
|
|
27
|
-
// discriminated unions
|
|
28
|
-
//
|
|
29
|
-
// optional) and re-parse with the STRICT union in the handler — the precise
|
|
30
|
-
// per-action validation still happens, at the one boundary.
|
|
26
|
+
// REGISTRATION SCHEMAS: SDK v2 accepts Standard Schema objects directly, so the
|
|
27
|
+
// action-discriminated unions are registered without a permissive raw-shape
|
|
28
|
+
// bridge. The exact per-action contract is enforced at the transport boundary.
|
|
31
29
|
import { log, mcpToolErrors } from '@3ngram/config';
|
|
32
30
|
import { applyProposal, createScope, deleteScope, describeEnvironment, listProposals, listScopes, rejectProposal, renameScope, setScopeAliases, } from '@3ngram/core';
|
|
33
31
|
import { MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE } from '@3ngram/core/auth';
|
|
34
|
-
import { configureScopeInputSchema, configureScopeOutputSchema,
|
|
32
|
+
import { configureScopeInputSchema, configureScopeOutputSchema, describeEnvironmentInputSchema, describeEnvironmentOutputSchema, reviewProposalsInputSchema, reviewProposalsOutputSchema, } from '@3ngram/schema';
|
|
35
33
|
import { parseOutput } from '../output-validation.js';
|
|
36
34
|
import { SERVER_VERSION } from '../version.js';
|
|
37
35
|
/** Wrap a structured payload as a tool success result (text mirror + structured). */
|
|
@@ -199,8 +197,8 @@ export function createAdminTools(toolNames) {
|
|
|
199
197
|
config: {
|
|
200
198
|
title: 'Configure Scope',
|
|
201
199
|
description: 'Manage your memory scopes: list, create, rename, set aliases, or delete (registry only — existing memories keep their scope). Mutating actions require the write scope.',
|
|
202
|
-
inputSchema:
|
|
203
|
-
outputSchema:
|
|
200
|
+
inputSchema: configureScopeInputSchema,
|
|
201
|
+
outputSchema: configureScopeOutputSchema,
|
|
204
202
|
},
|
|
205
203
|
async handler(args, ctx) {
|
|
206
204
|
const input = configureScopeInputSchema.parse(args);
|
|
@@ -213,8 +211,8 @@ export function createAdminTools(toolNames) {
|
|
|
213
211
|
config: {
|
|
214
212
|
title: 'Describe Environment',
|
|
215
213
|
description: 'Report server capabilities (tool names, count, version), your registered scopes, and bounded memory/commitment counts. Exposes no secrets or configuration values.',
|
|
216
|
-
inputSchema: describeEnvironmentInputSchema
|
|
217
|
-
outputSchema: describeEnvironmentOutputSchema
|
|
214
|
+
inputSchema: describeEnvironmentInputSchema,
|
|
215
|
+
outputSchema: describeEnvironmentOutputSchema,
|
|
218
216
|
},
|
|
219
217
|
async handler(args, ctx) {
|
|
220
218
|
describeEnvironmentInputSchema.parse(args);
|
|
@@ -247,8 +245,8 @@ export function createAdminTools(toolNames) {
|
|
|
247
245
|
config: {
|
|
248
246
|
title: 'Review Proposals',
|
|
249
247
|
description: 'List consolidation proposals (optionally by status), reject one, or accept one (materializes the proposed edge; a supersedes/updates edge also closes the predecessor). Reject and accept require the write scope.',
|
|
250
|
-
inputSchema:
|
|
251
|
-
outputSchema:
|
|
248
|
+
inputSchema: reviewProposalsInputSchema,
|
|
249
|
+
outputSchema: reviewProposalsOutputSchema,
|
|
252
250
|
},
|
|
253
251
|
async handler(args, ctx) {
|
|
254
252
|
const input = reviewProposalsInputSchema.parse(args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-admin.js","sourceRoot":"","sources":["../../src/mcp/tools-admin.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,0DAA0D;AAC1D,6DAA6D;AAC7D,sDAAsD;AACtD,4EAA4E;AAC5E,yCAAyC;AACzC,EAAE;AACF,oEAAoE;AACpE,+EAA+E;AAC/E,iFAAiF;AACjF,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,0EAA0E;AAC1E,8EAA8E;AAC9E,6EAA6E;AAC7E,gFAAgF;AAChF,gFAAgF;AAChF,+DAA+D;AAC/D,EAAE;AACF,6DAA6D;AAC7D,gFAAgF;AAChF,kFAAkF;AAClF,iDAAiD;AACjD,EAAE;AACF,
|
|
1
|
+
{"version":3,"file":"tools-admin.js","sourceRoot":"","sources":["../../src/mcp/tools-admin.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/tools-orient.js
CHANGED
|
@@ -47,8 +47,8 @@ const briefingTool = {
|
|
|
47
47
|
config: {
|
|
48
48
|
title: 'Briefing',
|
|
49
49
|
description: 'Structured session orientation: open/overdue commitments, blockers, stale candidates, recent decisions, preferences. Requires an explicit selector (scope, project, or all) — no unfiltered default. A PROJECT selector only matches commitments/blockers written WITH that project; a NULL-project memory never appears in a project briefing (issue #244). Active blockers leave this set when resolved (resolve archives the blocker memory). brief mode (default) returns counts plus top items; full returns the bounded lists.',
|
|
50
|
-
inputSchema: briefingToolInputSchema
|
|
51
|
-
outputSchema: briefingToolOutputSchema
|
|
50
|
+
inputSchema: briefingToolInputSchema,
|
|
51
|
+
outputSchema: briefingToolOutputSchema,
|
|
52
52
|
},
|
|
53
53
|
async handler(args, ctx) {
|
|
54
54
|
const input = briefingToolInputSchema.parse(args);
|
|
@@ -79,8 +79,8 @@ const handoffTool = {
|
|
|
79
79
|
config: {
|
|
80
80
|
title: 'Handoff',
|
|
81
81
|
description: 'Export structured context (decisions, open commitments, preferences — with content) for another agent or provider to pick up the thread. Requires an explicit selector (scope, project, or all); the payload is bounded.',
|
|
82
|
-
inputSchema: handoffToolInputSchema
|
|
83
|
-
outputSchema: handoffToolOutputSchema
|
|
82
|
+
inputSchema: handoffToolInputSchema,
|
|
83
|
+
outputSchema: handoffToolOutputSchema,
|
|
84
84
|
},
|
|
85
85
|
async handler(args, ctx) {
|
|
86
86
|
const input = handoffToolInputSchema.parse(args);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-orient.js","sourceRoot":"","sources":["../../src/mcp/tools-orient.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,wCAAwC;AACxC,gFAAgF;AAChF,kEAAkE;AAClE,sDAAsD;AACtD,EAAE;AACF,yEAAyE;AACzE,+EAA+E;AAC/E,4EAA4E;AAC5E,mEAAmE;AACnE,EAAE;AACF,kGAAkG;AAClG,kFAAkF;AAClF,0EAA0E;AAC1E,6EAA6E;AAC7E,oBAAoB;AACpB,EAAE;AACF,gFAAgF;AAChF,2EAA2E;AAC3E,uEAAuE;AACvE,EAAE;AACF,+DAA+D;AAC/D,kFAAkF;AAClF,mFAAmF;AACnF,gFAAgF;AAChF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAGrD,qFAAqF;AACrF,SAAS,EAAE,CAAC,UAAmC;IAC7C,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7D,iBAAiB,EAAE,UAAU;KAC9B,CAAA;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,YAAY,GAAmB;IACnC,IAAI,EAAE,UAAU;IAChB,aAAa,EAAE,iBAAiB;IAChC,MAAM,EAAE;QACN,KAAK,EAAE,UAAU;QACjB,WAAW,EACT,sgBAAsgB;QACxgB,WAAW,EAAE,uBAAuB
|
|
1
|
+
{"version":3,"file":"tools-orient.js","sourceRoot":"","sources":["../../src/mcp/tools-orient.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,wCAAwC;AACxC,gFAAgF;AAChF,kEAAkE;AAClE,sDAAsD;AACtD,EAAE;AACF,yEAAyE;AACzE,+EAA+E;AAC/E,4EAA4E;AAC5E,mEAAmE;AACnE,EAAE;AACF,kGAAkG;AAClG,kFAAkF;AAClF,0EAA0E;AAC1E,6EAA6E;AAC7E,oBAAoB;AACpB,EAAE;AACF,gFAAgF;AAChF,2EAA2E;AAC3E,uEAAuE;AACvE,EAAE;AACF,+DAA+D;AAC/D,kFAAkF;AAClF,mFAAmF;AACnF,gFAAgF;AAChF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,GACxB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAGrD,qFAAqF;AACrF,SAAS,EAAE,CAAC,UAAmC;IAC7C,OAAO;QACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7D,iBAAiB,EAAE,UAAU;KAC9B,CAAA;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,YAAY,GAAmB;IACnC,IAAI,EAAE,UAAU;IAChB,aAAa,EAAE,iBAAiB;IAChC,MAAM,EAAE;QACN,KAAK,EAAE,UAAU;QACjB,WAAW,EACT,sgBAAsgB;QACxgB,WAAW,EAAE,uBAAuB;QACpC,YAAY,EAAE,wBAAwB;KACvC;IACD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAgB;QAC3C,MAAM,KAAK,GAAG,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACjD,2EAA2E;QAC3E,6EAA6E;QAC7E,kBAAkB;QAClB,IAAI,GAAG,CAAC,MAAM;YAAE,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACvD,0EAA0E;QAC1E,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE;YACxC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,GAAG,EAAE,IAAI,IAAI,EAAE;SAChB,CAAC,CAAA;QACF,OAAO,EAAE,CAAC,WAAW,CAAC,UAAU,EAAE,wBAAwB,EAAE,MAAM,CAAC,CAAC,CAAA;IACtE,CAAC;CACF,CAAA;AAED;;;;;;GAMG;AACH,MAAM,WAAW,GAAmB;IAClC,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,iBAAiB;IAChC,MAAM,EAAE;QACN,KAAK,EAAE,SAAS;QAChB,WAAW,EACT,0NAA0N;QAC5N,WAAW,EAAE,sBAAsB;QACnC,YAAY,EAAE,uBAAuB;KACtC;IACD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAgB;QAC3C,MAAM,KAAK,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAChD,2EAA2E;QAC3E,6EAA6E;QAC7E,kBAAkB;QAClB,IAAI,GAAG,CAAC,MAAM;YAAE,MAAM,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACvD,4EAA4E;QAC5E,sEAAsE;QACtE,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE;YACvC,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,EAAE,IAAI,IAAI,EAAE;YACf,GAAG,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClF,CAAC,CAAA;QACF,mEAAmE;QACnE,mEAAmE;QACnE,uDAAuD;QACvD,OAAO,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAA;IACpE,CAAC;CACF,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,YAAY,GAA8B,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA"}
|
package/dist/mcp/tools.d.ts
CHANGED
|
@@ -1,20 +1,15 @@
|
|
|
1
1
|
import { type AccessGate, type BudgetEnforcement, type LimitsResolver } from '@3ngram/core';
|
|
2
2
|
import { type MemoryScope } from '@3ngram/core/auth';
|
|
3
3
|
import type { Gateway } from '@3ngram/llm';
|
|
4
|
-
import type { CallToolResult } from '@modelcontextprotocol/
|
|
5
|
-
import type {
|
|
4
|
+
import type { CallToolResult } from '@modelcontextprotocol/server';
|
|
5
|
+
import type { ZodType } from 'zod';
|
|
6
6
|
/** The SDK result a tool returns: a text content mirror plus structured output. */
|
|
7
7
|
type ToolResult = CallToolResult;
|
|
8
8
|
/**
|
|
9
|
-
* A registered tool.
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* strictly at the SDK boundary and an unknown key is REJECTED before the handler
|
|
14
|
-
* runs — a raw shape, by contrast, is wrapped non-strict and silently STRIPS
|
|
15
|
-
* unknown keys. Pass the strict object directly when the tool's contract rejects
|
|
16
|
-
* unknown keys end-to-end (search). The handler receives the
|
|
17
|
-
* SDK-validated args plus the per-request adapter context.
|
|
9
|
+
* A registered tool. SDK v2 accepts full Standard Schema objects, so every
|
|
10
|
+
* input/output uses the canonical Zod schema directly. Strict objects and
|
|
11
|
+
* discriminated unions therefore retain their exact boundary semantics instead
|
|
12
|
+
* of being widened to permissive raw shapes.
|
|
18
13
|
*/
|
|
19
14
|
/**
|
|
20
15
|
* The registry-level scope floor a token must satisfy to reach a tool's handler
|
|
@@ -39,8 +34,8 @@ export interface ToolDefinition {
|
|
|
39
34
|
config: {
|
|
40
35
|
title: string;
|
|
41
36
|
description: string;
|
|
42
|
-
inputSchema:
|
|
43
|
-
outputSchema:
|
|
37
|
+
inputSchema: ZodType;
|
|
38
|
+
outputSchema: ZodType;
|
|
44
39
|
};
|
|
45
40
|
handler: (args: unknown, ctx: ToolContext) => Promise<ToolResult>;
|
|
46
41
|
}
|
package/dist/mcp/tools.js
CHANGED
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
import { log, mcpToolCalls, mcpToolErrors } from '@3ngram/config';
|
|
18
18
|
import { getFacts, remember, resolveByMemoryId, revise, search, } from '@3ngram/core';
|
|
19
19
|
import { MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE } from '@3ngram/core/auth';
|
|
20
|
-
import { factsQueryInputSchema, factsToolOutputSchema, rememberToolInputSchema, rememberToolOutputSchema, resolveToolInputSchema, resolveToolOutputSchema, reviseToolInputSchema, reviseToolOutputSchema, searchQuerySchema, searchToolOutputSchema, } from '@3ngram/schema';
|
|
20
|
+
import { factsQueryInputSchema, factsToolOutputSchema, MAX_CONTENT_LENGTH, rememberToolInputSchema, rememberToolOutputSchema, resolveToolInputSchema, resolveToolOutputSchema, reviseToolInputSchema, reviseToolOutputSchema, searchQuerySchema, searchToolOutputSchema, } from '@3ngram/schema';
|
|
21
21
|
import { parseOutput } from '../output-validation.js';
|
|
22
22
|
import { mapToolError } from './errors.js';
|
|
23
23
|
// Admin tools: configure_scope / describe_environment /
|
|
@@ -65,9 +65,9 @@ const rememberTool = {
|
|
|
65
65
|
requiredScope: MEMORY_WRITE_SCOPE,
|
|
66
66
|
config: {
|
|
67
67
|
title: 'Remember',
|
|
68
|
-
description:
|
|
68
|
+
description: `Append a new memory (decision, fact, preference, blocker, commitment, ...). Never merges; append-only. Content is capped at ${MAX_CONTENT_LENGTH} characters. To surface a commitment or blocker in a PROJECT-scoped briefing, pass \`project\` — a memory written with a NULL project never matches a project filter (issue #244).`,
|
|
69
69
|
inputSchema: rememberToolInputSchema,
|
|
70
|
-
outputSchema: rememberToolOutputSchema
|
|
70
|
+
outputSchema: rememberToolOutputSchema,
|
|
71
71
|
},
|
|
72
72
|
async handler(args, ctx) {
|
|
73
73
|
// core remember() is THE validation boundary; pass the args straight through.
|
|
@@ -129,7 +129,7 @@ const searchTool = {
|
|
|
129
129
|
title: 'Search',
|
|
130
130
|
description: 'Unified semantic + keyword retrieval over your memories, supersession-aware. Accepts a query and an optional result limit, plus five optional filters that narrow the candidate set BEFORE fusion (no change to ranking weights): memoryType, scope, project, status, and asOf (bi-temporal time travel with validAt/asKnownAt). Omit a filter to leave that axis unconstrained.',
|
|
131
131
|
inputSchema: searchQuerySchema,
|
|
132
|
-
outputSchema: searchToolOutputSchema
|
|
132
|
+
outputSchema: searchToolOutputSchema,
|
|
133
133
|
},
|
|
134
134
|
async handler(args, ctx) {
|
|
135
135
|
if (ctx.gateway === undefined) {
|
|
@@ -181,8 +181,8 @@ const getFactsTool = {
|
|
|
181
181
|
config: {
|
|
182
182
|
title: 'Get Facts',
|
|
183
183
|
description: 'Currently-valid facts for a subject, with optional bi-temporal time travel. List mode (no subject) returns the most recent facts, bounded by an optional limit (default 50, max 200).',
|
|
184
|
-
inputSchema: factsQueryInputSchema
|
|
185
|
-
outputSchema: factsToolOutputSchema
|
|
184
|
+
inputSchema: factsQueryInputSchema,
|
|
185
|
+
outputSchema: factsToolOutputSchema,
|
|
186
186
|
},
|
|
187
187
|
async handler(args, ctx) {
|
|
188
188
|
const input = factsQueryInputSchema.parse(args);
|
|
@@ -242,7 +242,7 @@ const reviseTool = {
|
|
|
242
242
|
// boundary so a supplied `scope`/`project` reaches the handler and an unknown
|
|
243
243
|
// key is rejected, never silently stripped.
|
|
244
244
|
inputSchema: reviseToolInputSchema,
|
|
245
|
-
outputSchema: reviseToolOutputSchema
|
|
245
|
+
outputSchema: reviseToolOutputSchema,
|
|
246
246
|
},
|
|
247
247
|
async handler(args, ctx) {
|
|
248
248
|
// core revise() is THE validation boundary; pass args straight through. It
|
|
@@ -287,8 +287,8 @@ const resolveTool = {
|
|
|
287
287
|
config: {
|
|
288
288
|
title: 'Resolve',
|
|
289
289
|
description: 'Settle a memory by its id. A commitment transitions to a target status (open, waiting, resolved, expired) — serves resolve and unresolve (resolved -> open); illegal transitions are rejected. A blocker is archived (status active -> archived) and leaves the active-blocker briefing; the passed status is ignored for blockers and the result reports archived. Commitments AND blockers must be written WITH a project to be resolvable from a project-scoped briefing.',
|
|
290
|
-
inputSchema: resolveToolInputSchema
|
|
291
|
-
outputSchema: resolveToolOutputSchema
|
|
290
|
+
inputSchema: resolveToolInputSchema,
|
|
291
|
+
outputSchema: resolveToolOutputSchema,
|
|
292
292
|
},
|
|
293
293
|
async handler(args, ctx) {
|
|
294
294
|
const input = resolveToolInputSchema.parse(args);
|
package/dist/mcp/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/mcp/tools.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,qEAAqE;AACrE,yEAAyE;AACzE,gFAAgF;AAChF,4EAA4E;AAC5E,6CAA6C;AAC7C,EAAE;AACF,6FAA6F;AAC7F,4EAA4E;AAC5E,6EAA6E;AAC7E,mCAAmC;AACnC,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,kEAAkE;AAClE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAGL,QAAQ,EAER,QAAQ,EACR,iBAAiB,EACjB,MAAM,EACN,MAAM,GACP,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAoB,MAAM,mBAAmB,CAAA;AAE3F,OAAO,EAEL,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EACvB,wBAAwB,EACxB,sBAAsB,EACtB,uBAAuB,EACvB,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,EACjB,sBAAsB,GACvB,MAAM,gBAAgB,CAAA;AAGvB,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,wDAAwD;AACxD,iFAAiF;AACjF,qEAAqE;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAA;AACnD,2DAA2D;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/mcp/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import type { AuthInfo } from '@modelcontextprotocol/server';
|
|
1
2
|
import type { NextFunction, Request, Response } from 'express';
|
|
2
3
|
declare module 'express' {
|
|
3
4
|
interface Request {
|
|
4
5
|
userId?: string;
|
|
5
6
|
oauthScopes?: readonly string[];
|
|
7
|
+
auth?: AuthInfo;
|
|
6
8
|
apiKeyId?: string;
|
|
7
9
|
}
|
|
8
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/middleware/authenticate.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,+CAA+C;AAC/C,EAAE;AACF,uEAAuE;AACvE,6EAA6E;AAC7E,0BAA0B;AAC1B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"authenticate.js","sourceRoot":"","sources":["../../src/middleware/authenticate.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,+EAA+E;AAC/E,8EAA8E;AAC9E,+CAA+C;AAC/C,EAAE;AACF,uEAAuE;AACvE,6EAA6E;AAC7E,0BAA0B;AAC1B,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAyBrD,MAAM,aAAa,GAAG,SAAS,CAAA;AAE/B;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAAC,MAA0B;IACxD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAA;IAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;QACxF,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAA;IACvD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;AAC7C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;IAC1E,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAA;IAC1D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;QAC/C,OAAM;IACR,CAAC;IACD,iBAAiB,CAAC,KAAK,CAAC;SACrB,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;QACf,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAA;YAC/C,OAAM;QACR,CAAC;QACD,GAAG,CAAC,MAAM,GAAG,MAAM,CAAA;QACnB,WAAW,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;QAC/C,IAAI,EAAE,CAAA;IACR,CAAC,CAAC;SACD,KAAK,CAAC,IAAI,CAAC,CAAA;AAChB,CAAC"}
|