@3ngram/server 1.1.3 → 1.2.2
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/cursor.d.ts +66 -0
- package/dist/cursor.js +130 -0
- package/dist/cursor.js.map +1 -0
- package/dist/mcp/errors.js +22 -2
- package/dist/mcp/errors.js.map +1 -1
- package/dist/mcp/tools-admin.js +32 -15
- package/dist/mcp/tools-admin.js.map +1 -1
- package/dist/mcp/tools-inspect.d.ts +6 -0
- package/dist/mcp/tools-inspect.js +95 -0
- package/dist/mcp/tools-inspect.js.map +1 -0
- package/dist/mcp/tools-orient.js +38 -18
- package/dist/mcp/tools-orient.js.map +1 -1
- package/dist/mcp/tools-search.d.ts +7 -0
- package/dist/mcp/tools-search.js +188 -0
- package/dist/mcp/tools-search.js.map +1 -0
- package/dist/mcp/tools.d.ts +13 -4
- package/dist/mcp/tools.js +12 -69
- package/dist/mcp/tools.js.map +1 -1
- package/dist/rest/errors.d.ts +6 -0
- package/dist/rest/errors.js +19 -2
- package/dist/rest/errors.js.map +1 -1
- package/dist/rest/route-helpers.d.ts +15 -0
- package/dist/rest/route-helpers.js +40 -0
- package/dist/rest/route-helpers.js.map +1 -0
- package/dist/rest/router.js +59 -130
- package/dist/rest/router.js.map +1 -1
- package/dist/rest/search-router.d.ts +9 -0
- package/dist/rest/search-router.js +118 -0
- package/dist/rest/search-router.js.map +1 -0
- package/dist/routes/mcp.d.ts +1 -1
- package/dist/routes/mcp.js +28 -8
- package/dist/routes/mcp.js.map +1 -1
- package/dist/routes/oauth-authorize.js +46 -14
- package/dist/routes/oauth-authorize.js.map +1 -1
- package/package.json +3 -3
- package/dist/rest/cursor.d.ts +0 -14
- package/dist/rest/cursor.js +0 -38
- package/dist/rest/cursor.js.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-router.js","sourceRoot":"","sources":["../../src/rest/search-router.ts"],"names":[],"mappings":"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"}
|
package/dist/routes/mcp.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AccessGate, type BudgetEnforcement, type LimitsResolver } from '@3ngram/core';
|
|
2
2
|
import type { Gateway } from '@3ngram/llm';
|
|
3
3
|
import { type McpHttpHandler } from '@modelcontextprotocol/server';
|
|
4
4
|
import { Router } from 'express';
|
package/dist/routes/mcp.js
CHANGED
|
@@ -19,6 +19,7 @@
|
|
|
19
19
|
// here echoes request content.
|
|
20
20
|
import { log } from '@3ngram/config';
|
|
21
21
|
import { crashSafeError } from '@3ngram/config/otel';
|
|
22
|
+
import { resolveRetrievalPolicy, } from '@3ngram/core';
|
|
22
23
|
import { toNodeHandler } from '@modelcontextprotocol/node';
|
|
23
24
|
import { createMcpHandler, } from '@modelcontextprotocol/server';
|
|
24
25
|
import { Router } from 'express';
|
|
@@ -32,20 +33,39 @@ function requireUserId(ctx) {
|
|
|
32
33
|
}
|
|
33
34
|
return userId;
|
|
34
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Request-scoped retrieval-scope policy resolver (issue #47): a MEMOIZED
|
|
38
|
+
* thunk over core resolveRetrievalPolicy, built once per request so the
|
|
39
|
+
* policy is resolved AT MOST ONCE — and lazily, only when a policy-enforced
|
|
40
|
+
* read tool actually runs (write tools never pay the lookup). Pure wiring:
|
|
41
|
+
* the resolution semantics live in core (hard rule 5).
|
|
42
|
+
*/
|
|
43
|
+
function lazyRetrievalPolicy(userId) {
|
|
44
|
+
let cached;
|
|
45
|
+
return () => {
|
|
46
|
+
cached ??= resolveRetrievalPolicy(userId);
|
|
47
|
+
return cached;
|
|
48
|
+
};
|
|
49
|
+
}
|
|
35
50
|
/**
|
|
36
51
|
* Build the web-standard dual-era handler. The default legacy mode is
|
|
37
52
|
* deliberately explicit here: 2025-era stateless requests and modern
|
|
38
53
|
* 2026-07-28 requests share this one factory and therefore cannot drift.
|
|
39
54
|
*/
|
|
40
55
|
export function createMcpProtocolHandler(options) {
|
|
41
|
-
return createMcpHandler((ctx) =>
|
|
42
|
-
userId
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
56
|
+
return createMcpHandler((ctx) => {
|
|
57
|
+
const userId = requireUserId(ctx);
|
|
58
|
+
return createMcpServer({
|
|
59
|
+
userId,
|
|
60
|
+
scopes: ctx.authInfo?.scopes ?? [],
|
|
61
|
+
gateway: options.gateway,
|
|
62
|
+
budget: options.budget,
|
|
63
|
+
access: options.access,
|
|
64
|
+
limits: options.limits,
|
|
65
|
+
// Once-per-request policy resolution (issue #47), lazily memoized.
|
|
66
|
+
retrievalPolicy: lazyRetrievalPolicy(userId),
|
|
67
|
+
});
|
|
68
|
+
}, {
|
|
49
69
|
legacy: 'stateless',
|
|
50
70
|
onerror: (err) => log().error(crashSafeError(err), 'mcp: protocol handler error'),
|
|
51
71
|
});
|
package/dist/routes/mcp.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gDAAgD;AAChD,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,2EAA2E;AAC3E,EAAE;AACF,6DAA6D;AAC7D,2EAA2E;AAC3E,gFAAgF;AAChF,gFAAgF;AAChF,6EAA6E;AAC7E,gFAAgF;AAChF,8DAA8D;AAC9D,EAAE;AACF,+DAA+D;AAC/D,2EAA2E;AAC3E,iEAAiE;AACjE,+BAA+B;AAC/B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"mcp.js","sourceRoot":"","sources":["../../src/routes/mcp.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
//
|
|
22
22
|
// Never log credentials, codes, or CSRF tokens.
|
|
23
23
|
import { randomBytes, timingSafeEqual } from 'node:crypto';
|
|
24
|
-
import { loadOAuthConfig } from '@3ngram/config';
|
|
24
|
+
import { contentDigest, loadOAuthConfig, log } from '@3ngram/config';
|
|
25
25
|
import { createOAuthServerProvider, EmailNotVerifiedError, MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE, resolveOAuthClient, resolveRegisteredRedirectUri, verifyCredentials, } from '@3ngram/core/auth';
|
|
26
26
|
import { authorizeRequestSchema, consentSubmissionSchema, } from '@3ngram/schema';
|
|
27
27
|
import { Router, urlencoded } from 'express';
|
|
@@ -135,23 +135,52 @@ button{margin-top:1rem;padding:.6rem 1.2rem;cursor:pointer}.host{color:#555}.err
|
|
|
135
135
|
</body></html>`;
|
|
136
136
|
}
|
|
137
137
|
/**
|
|
138
|
-
* Resolve client + redirect URI for a validated request, or
|
|
139
|
-
* client is unknown / the redirect_uri is not
|
|
140
|
-
* the caller — NEVER a redirect (the URI is
|
|
138
|
+
* Resolve client + redirect URI for a validated request, or the reason it could
|
|
139
|
+
* not be resolved when the client is unknown / the redirect_uri is not
|
|
140
|
+
* registered. The 400 is emitted by the caller — NEVER a redirect (the URI is
|
|
141
|
+
* unvetted by definition here).
|
|
141
142
|
*/
|
|
142
143
|
async function resolveConsentTarget(params, redirectUriSupplied, clientMetadataResolver) {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
144
|
+
let resolutionFailure;
|
|
145
|
+
const client = await resolveOAuthClient(params.client_id, clientMetadataResolver, {
|
|
146
|
+
onFailure: (reason) => {
|
|
147
|
+
resolutionFailure = reason;
|
|
148
|
+
},
|
|
149
|
+
});
|
|
150
|
+
if (client === undefined)
|
|
151
|
+
return { ok: false, reason: resolutionFailure ?? 'not_registered' };
|
|
152
|
+
if (!client.grant_types.includes('authorization_code')) {
|
|
153
|
+
return { ok: false, reason: 'unsupported_grant_type' };
|
|
154
|
+
}
|
|
146
155
|
const redirectUri = resolveRegisteredRedirectUri(client, params.redirect_uri);
|
|
147
156
|
if (redirectUri === undefined)
|
|
148
|
-
return
|
|
157
|
+
return { ok: false, reason: 'redirect_uri_mismatch' };
|
|
149
158
|
// RFC 6749 §4.1.3: supplied-ness is captured at the INITIAL GET
|
|
150
159
|
// /authorize (whether the CLIENT's request carried redirect_uri) and threaded
|
|
151
160
|
// through the consent form — NOT derived from the POST's redirect_uri, which
|
|
152
161
|
// always carries the RESOLVED URI as a hidden field. Pure pass-through of the
|
|
153
162
|
// caller-supplied flag; the RFC decision stays in core.
|
|
154
|
-
return { client, redirectUri, redirectUriSupplied };
|
|
163
|
+
return { ok: true, target: { client, redirectUri, redirectUriSupplied } };
|
|
164
|
+
}
|
|
165
|
+
/**
|
|
166
|
+
* A non-throwing, content-free fingerprint of the presented client_id — mirrors
|
|
167
|
+
* the /oauth/token audit line. CIMD client_ids are URLs that may carry a query
|
|
168
|
+
* component, so no raw prefix is safe to log (hard rule 6).
|
|
169
|
+
*/
|
|
170
|
+
function clientIdPrefix(clientId) {
|
|
171
|
+
if (typeof clientId !== 'string' || clientId.length === 0)
|
|
172
|
+
return '(none)';
|
|
173
|
+
return `sha8:${contentDigest(clientId)}`;
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* ONE structured, content-free line per REJECTED /authorize request. Without it
|
|
177
|
+
* a CIMD failure is indistinguishable from a stale registration: both surface as
|
|
178
|
+
* a bare 400 invalid_client with nothing written anywhere. Successes are already
|
|
179
|
+
* observable (the consent form renders, then /oauth/token logs the exchange), so
|
|
180
|
+
* only the rejection path needs this.
|
|
181
|
+
*/
|
|
182
|
+
function logAuthorizeRejection(clientId, reason) {
|
|
183
|
+
log().info({ client_id_prefix: clientIdPrefix(clientId), outcome: 'invalid_client', reason }, 'oauth: authorize endpoint');
|
|
155
184
|
}
|
|
156
185
|
/** GET: validate, then serve the consent form with a fresh CSRF pair. */
|
|
157
186
|
async function handleAuthorizeGet(req, res, clientMetadataResolver) {
|
|
@@ -162,8 +191,9 @@ async function handleAuthorizeGet(req, res, clientMetadataResolver) {
|
|
|
162
191
|
}
|
|
163
192
|
// Capture supplied-ness from the CLIENT's authorize request here, GET-time —
|
|
164
193
|
// this is the only point that sees whether redirect_uri was actually sent.
|
|
165
|
-
const
|
|
166
|
-
if (
|
|
194
|
+
const result = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri !== undefined, clientMetadataResolver);
|
|
195
|
+
if (!result.ok) {
|
|
196
|
+
logAuthorizeRejection(parsed.data.client_id, result.reason);
|
|
167
197
|
res.status(400).json({ error: 'invalid_client' });
|
|
168
198
|
return;
|
|
169
199
|
}
|
|
@@ -171,7 +201,7 @@ async function handleAuthorizeGet(req, res, clientMetadataResolver) {
|
|
|
171
201
|
res
|
|
172
202
|
.status(200)
|
|
173
203
|
.type('html')
|
|
174
|
-
.send(renderConsentPage({ ...target, params: parsed.data, csrfToken }));
|
|
204
|
+
.send(renderConsentPage({ ...result.target, params: parsed.data, csrfToken }));
|
|
175
205
|
}
|
|
176
206
|
/** POST: CSRF + credentials, then issue the code and 302 back with state. */
|
|
177
207
|
async function handleConsentPost(req, res, clientMetadataResolver) {
|
|
@@ -182,11 +212,13 @@ async function handleConsentPost(req, res, clientMetadataResolver) {
|
|
|
182
212
|
}
|
|
183
213
|
// Read supplied-ness from the GET-time hidden field — NOT from the POST's
|
|
184
214
|
// redirect_uri, which always carries the resolved URI.
|
|
185
|
-
const
|
|
186
|
-
if (
|
|
215
|
+
const result = await resolveConsentTarget(parsed.data, parsed.data.redirect_uri_was_supplied === '1', clientMetadataResolver);
|
|
216
|
+
if (!result.ok) {
|
|
217
|
+
logAuthorizeRejection(parsed.data.client_id, result.reason);
|
|
187
218
|
res.status(400).json({ error: 'invalid_client' });
|
|
188
219
|
return;
|
|
189
220
|
}
|
|
221
|
+
const target = result.target;
|
|
190
222
|
if (!csrfMatches(readCsrfCookie(req.header('cookie')), parsed.data.csrf_token)) {
|
|
191
223
|
res.status(403).json({ error: 'invalid_request' });
|
|
192
224
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../src/routes/oauth-authorize.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,6EAA6E;AAC7E,4EAA4E;AAC5E,iEAAiE;AACjE,kEAAkE;AAClE,0DAA0D;AAC1D,EAAE;AACF,mBAAmB;AACnB,4EAA4E;AAC5E,yEAAyE;AACzE,4GAA4G;AAC5G,wEAAwE;AACxE,4EAA4E;AAC5E,8EAA8E;AAC9E,EAAE;AACF,iEAAiE;AACjE,8EAA8E;AAC9E,2EAA2E;AAC3E,4EAA4E;AAC5E,gEAAgE;AAChE,EAAE;AACF,gDAAgD;AAChD,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"oauth-authorize.js","sourceRoot":"","sources":["../../src/routes/oauth-authorize.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@3ngram/server",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.2",
|
|
4
4
|
"description": "MCP server and REST API for persistent, typed AI-agent memory.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://3ngram.ai",
|
|
@@ -62,9 +62,9 @@
|
|
|
62
62
|
"rate-limiter-flexible": "11.2.0",
|
|
63
63
|
"zod": "4.4.3",
|
|
64
64
|
"@3ngram/config": "0.2.3",
|
|
65
|
-
"@3ngram/core": "0.
|
|
65
|
+
"@3ngram/core": "0.8.0",
|
|
66
66
|
"@3ngram/llm": "0.2.2",
|
|
67
|
-
"@3ngram/schema": "0.
|
|
67
|
+
"@3ngram/schema": "0.6.0"
|
|
68
68
|
},
|
|
69
69
|
"devDependencies": {
|
|
70
70
|
"@modelcontextprotocol/client": "2.0.0",
|
package/dist/rest/cursor.d.ts
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { type CursorPayload } from '@3ngram/schema';
|
|
2
|
-
/** Serialize a cursor payload to an opaque base64url token. */
|
|
3
|
-
export declare function encodeCursor(payload: CursorPayload): string;
|
|
4
|
-
/**
|
|
5
|
-
* Decode + validate an opaque cursor token back to its v2 payload.
|
|
6
|
-
*
|
|
7
|
-
* Returns `undefined` for a legacy v1 keyset cursor (`{ s, id }`) minted before
|
|
8
|
-
* the v2 deploy — the caller restarts at page 1 rather than erroring
|
|
9
|
-
* mid-session across the deploy boundary. A genuinely malformed token (bad
|
|
10
|
-
* base64/JSON, or a shape that is neither v2 nor v1) throws a ZodError, which
|
|
11
|
-
* mapRestError turns into a 400 — a forged or garbled cursor is client input,
|
|
12
|
-
* never a server crash.
|
|
13
|
-
*/
|
|
14
|
-
export declare function decodeCursor(token: string): CursorPayload | undefined;
|
package/dist/rest/cursor.js
DELETED
|
@@ -1,38 +0,0 @@
|
|
|
1
|
-
// SPDX-License-Identifier: Apache-2.0
|
|
2
|
-
// Node-side opaque encode/decode for the dashboard search frozen-ordering cursor.
|
|
3
|
-
// The payload SHAPE (cursorPayloadSchema) is the shared contract in
|
|
4
|
-
// @3ngram/schema; the base64url serialization lives here so the schema package
|
|
5
|
-
// stays dependency-light (zod only — no @types/node for Buffer). The browser
|
|
6
|
-
// treats the token as opaque and never decodes it (see lib/search/api.ts).
|
|
7
|
-
import { cursorPayloadSchema, legacyCursorPayloadSchema } from '@3ngram/schema';
|
|
8
|
-
/** Serialize a cursor payload to an opaque base64url token. */
|
|
9
|
-
export function encodeCursor(payload) {
|
|
10
|
-
return Buffer.from(JSON.stringify(payload), 'utf8').toString('base64url');
|
|
11
|
-
}
|
|
12
|
-
/**
|
|
13
|
-
* Decode + validate an opaque cursor token back to its v2 payload.
|
|
14
|
-
*
|
|
15
|
-
* Returns `undefined` for a legacy v1 keyset cursor (`{ s, id }`) minted before
|
|
16
|
-
* the v2 deploy — the caller restarts at page 1 rather than erroring
|
|
17
|
-
* mid-session across the deploy boundary. A genuinely malformed token (bad
|
|
18
|
-
* base64/JSON, or a shape that is neither v2 nor v1) throws a ZodError, which
|
|
19
|
-
* mapRestError turns into a 400 — a forged or garbled cursor is client input,
|
|
20
|
-
* never a server crash.
|
|
21
|
-
*/
|
|
22
|
-
export function decodeCursor(token) {
|
|
23
|
-
let json;
|
|
24
|
-
try {
|
|
25
|
-
json = JSON.parse(Buffer.from(token, 'base64url').toString('utf8'));
|
|
26
|
-
}
|
|
27
|
-
catch {
|
|
28
|
-
json = undefined;
|
|
29
|
-
}
|
|
30
|
-
const v2 = cursorPayloadSchema.safeParse(json);
|
|
31
|
-
if (v2.success)
|
|
32
|
-
return v2.data;
|
|
33
|
-
if (legacyCursorPayloadSchema.safeParse(json).success)
|
|
34
|
-
return undefined;
|
|
35
|
-
// Neither v2 nor a recognized legacy cursor → malformed client input (400).
|
|
36
|
-
return cursorPayloadSchema.parse(json);
|
|
37
|
-
}
|
|
38
|
-
//# sourceMappingURL=cursor.js.map
|
package/dist/rest/cursor.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../../src/rest/cursor.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,kFAAkF;AAClF,oEAAoE;AACpE,+EAA+E;AAC/E,6EAA6E;AAC7E,2EAA2E;AAC3E,OAAO,EAAsB,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAA;AAEnG,+DAA+D;AAC/D,MAAM,UAAU,YAAY,CAAC,OAAsB;IACjD,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;AAC3E,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,IAAI,IAAa,CAAA;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAA;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,IAAI,GAAG,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,EAAE,GAAG,mBAAmB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC9C,IAAI,EAAE,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC,IAAI,CAAA;IAC9B,IAAI,yBAAyB,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACvE,4EAA4E;IAC5E,OAAO,mBAAmB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;AACxC,CAAC"}
|