@3ngram/server 1.8.7 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/app.d.ts +8 -5
- package/dist/app.js +40 -29
- package/dist/app.js.map +1 -1
- package/dist/cursor.d.ts +34 -3
- package/dist/cursor.js +40 -3
- package/dist/cursor.js.map +1 -1
- package/dist/mcp/errors.js +20 -2
- package/dist/mcp/errors.js.map +1 -1
- package/dist/mcp/resources.d.ts +16 -0
- package/dist/mcp/resources.js +59 -2
- package/dist/mcp/resources.js.map +1 -1
- package/dist/mcp/server.js +5 -0
- package/dist/mcp/server.js.map +1 -1
- package/dist/mcp/tools-admin.js +92 -21
- package/dist/mcp/tools-admin.js.map +1 -1
- package/dist/mcp/tools-search.js +6 -1
- package/dist/mcp/tools-search.js.map +1 -1
- package/dist/mcp/tools.js +18 -8
- package/dist/mcp/tools.js.map +1 -1
- package/dist/middleware/rate-limit.d.ts +14 -5
- package/dist/middleware/rate-limit.js +21 -14
- package/dist/middleware/rate-limit.js.map +1 -1
- package/dist/rate-limit-store.d.ts +11 -0
- package/dist/rate-limit-store.js +41 -0
- package/dist/rate-limit-store.js.map +1 -0
- package/dist/rest/errors.js +15 -1
- package/dist/rest/errors.js.map +1 -1
- package/dist/rest/route-helpers.d.ts +9 -1
- package/dist/rest/route-helpers.js +16 -0
- package/dist/rest/route-helpers.js.map +1 -1
- package/dist/rest/router.js +95 -27
- package/dist/rest/router.js.map +1 -1
- package/dist/rest/search-router.js +3 -0
- package/dist/rest/search-router.js.map +1 -1
- package/dist/rest/session-router.js +7 -3
- package/dist/rest/session-router.js.map +1 -1
- package/dist/rest/settings-router.d.ts +2 -0
- package/dist/rest/settings-router.js +35 -0
- package/dist/rest/settings-router.js.map +1 -0
- package/dist/routes/oauth-token.d.ts +10 -13
- package/dist/routes/oauth-token.js +93 -78
- package/dist/routes/oauth-token.js.map +1 -1
- package/package.json +7 -7
package/dist/app.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { type Gateway } from '@3ngram/llm';
|
|
|
3
3
|
import { type Express } from 'express';
|
|
4
4
|
import type { Redis } from 'ioredis';
|
|
5
5
|
import { type Extension } from './composition/extension.js';
|
|
6
|
-
import { type RateLimiterMiddleware } from './middleware/rate-limit.js';
|
|
6
|
+
import { type RateLimiterMiddleware, type RateLimitStore } from './middleware/rate-limit.js';
|
|
7
7
|
export type { Extension } from './composition/extension.js';
|
|
8
8
|
/**
|
|
9
9
|
* Public composition compatibility sentinel. A downstream extension may require
|
|
@@ -21,14 +21,14 @@ export interface AppOptions {
|
|
|
21
21
|
*/
|
|
22
22
|
gateway?: Gateway;
|
|
23
23
|
/**
|
|
24
|
-
* Rate-limiter seam. When omitted, boot builds
|
|
25
|
-
*
|
|
24
|
+
* Rate-limiter seam. When omitted, boot builds limiters over the store
|
|
25
|
+
* RATE_LIMIT_STORE selects (#315). Tests inject limiters directly so NO
|
|
26
26
|
* real Redis is required in CI:
|
|
27
27
|
* - `mcpLimiter` — per-user bucket on /mcp (req.userId, set by oauthBearerAuth).
|
|
28
28
|
* - `authLimiter` — per-IP bucket on /auth/login (req.ip is the
|
|
29
29
|
* real client because trust proxy is set).
|
|
30
|
-
* Provide `
|
|
31
|
-
* explicit
|
|
30
|
+
* Provide `rateLimitStore` instead to let boot construct the default
|
|
31
|
+
* limiters over an explicit store (or omit both for the env-derived one).
|
|
32
32
|
*/
|
|
33
33
|
mcpLimiter?: RateLimiterMiddleware;
|
|
34
34
|
authLimiter?: RateLimiterMiddleware;
|
|
@@ -78,6 +78,9 @@ export interface AppOptions {
|
|
|
78
78
|
* Default: 300 req / 60s per key.
|
|
79
79
|
*/
|
|
80
80
|
apiKeyLimiter?: RateLimiterMiddleware;
|
|
81
|
+
/** Limiter store seam; when omitted, resolveRateLimitStore picks it from env (#315). */
|
|
82
|
+
rateLimitStore?: RateLimitStore;
|
|
83
|
+
/** Redis client injection seam; resolveRateLimitStore builds the redis store from it. */
|
|
81
84
|
redis?: Redis | undefined;
|
|
82
85
|
/**
|
|
83
86
|
* Composition seam. When omitted, resolves to `noOpExtension` — the self-host
|
package/dist/app.js
CHANGED
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
|
2
|
-
import { budgetGateLookupFailure, loadBudgetConfig, loadLlmGatewayConfig, log, } from '@3ngram/config';
|
|
2
|
+
import { budgetGateLookupFailure, loadBudgetConfig, loadJevGatewayConfig, loadLlmGatewayConfig, loadRateLimitStoreConfig, log, } from '@3ngram/config';
|
|
3
3
|
import { crashSafeError } from '@3ngram/config/otel';
|
|
4
4
|
import { allowAllAccess, SELFHOST_LIMITS } from '@3ngram/core';
|
|
5
5
|
import { ClientMetadataResolver } from '@3ngram/core/auth';
|
|
6
|
-
import { createOpenAIGateway } from '@3ngram/llm';
|
|
6
|
+
import { composeGateway, createJevGateway, createOpenAIGateway } from '@3ngram/llm';
|
|
7
7
|
import express, {} from 'express';
|
|
8
8
|
import { baseCapabilities, noOpExtension } from './composition/extension.js';
|
|
9
9
|
import { mcpHeaderObservability } from './middleware/mcp-header-observability.js';
|
|
10
10
|
import { apiKeyIdKey, createRateLimiter, ipKey, userIdKey, } from './middleware/rate-limit.js';
|
|
11
11
|
import { requestContext } from './middleware/request-context.js';
|
|
12
|
+
import { resolveRateLimitStore } from './rate-limit-store.js';
|
|
12
13
|
import { resolveRedis } from './redis.js';
|
|
13
14
|
import { restRouter } from './rest/router.js';
|
|
14
15
|
import { apiKeysRouter } from './routes/api-keys.js';
|
|
@@ -55,19 +56,29 @@ const REGISTER_IP_POINTS = 10;
|
|
|
55
56
|
const OAUTH_IP_POINTS = 30;
|
|
56
57
|
const API_KEY_POINTS = 300;
|
|
57
58
|
const RATE_WINDOW_SECONDS = 60;
|
|
58
|
-
/**
|
|
59
|
+
/**
|
|
60
|
+
* Resolve the gateway: an explicit override, else the env-gated clients composed
|
|
61
|
+
* into one — embed/complete from the OpenAI-compatible gateway, decide from the
|
|
62
|
+
* Jev gateway when JEV_API_KEY + JEV_MODEL are set (issue #225).
|
|
63
|
+
*/
|
|
59
64
|
function resolveGateway(override) {
|
|
60
65
|
if (override !== undefined)
|
|
61
66
|
return override;
|
|
62
|
-
const
|
|
63
|
-
|
|
67
|
+
const base = loadLlmGatewayConfig();
|
|
68
|
+
const judgment = loadJevGatewayConfig();
|
|
69
|
+
if (judgment !== undefined && base === undefined) {
|
|
70
|
+
log().warn({}, 'JEV_* set without LLM_GATEWAY_URL/LLM_GATEWAY_API_KEY: decide() unavailable');
|
|
71
|
+
}
|
|
72
|
+
return composeGateway({
|
|
73
|
+
base: base === undefined ? undefined : createOpenAIGateway(base),
|
|
74
|
+
judgment: judgment === undefined ? undefined : createJevGateway(judgment),
|
|
75
|
+
});
|
|
64
76
|
}
|
|
65
77
|
/**
|
|
66
78
|
* Resolve the rate limiters: explicit overrides win (the test seam), else build
|
|
67
|
-
* the defaults over the
|
|
68
|
-
* missing Redis client makes createRateLimiter fall back to RateLimiterMemory.
|
|
79
|
+
* the defaults over the store resolved once in createApp.
|
|
69
80
|
*/
|
|
70
|
-
function resolveLimiters(options,
|
|
81
|
+
function resolveLimiters(options, store) {
|
|
71
82
|
return {
|
|
72
83
|
edgeLimiter: options.edgeLimiter ??
|
|
73
84
|
createRateLimiter({
|
|
@@ -75,7 +86,7 @@ function resolveLimiters(options, redis) {
|
|
|
75
86
|
duration: RATE_WINDOW_SECONDS,
|
|
76
87
|
keyPrefix: 'edge:ip',
|
|
77
88
|
keyResolver: ipKey,
|
|
78
|
-
|
|
89
|
+
store,
|
|
79
90
|
}),
|
|
80
91
|
mcpLimiter: options.mcpLimiter ??
|
|
81
92
|
createRateLimiter({
|
|
@@ -83,7 +94,7 @@ function resolveLimiters(options, redis) {
|
|
|
83
94
|
duration: RATE_WINDOW_SECONDS,
|
|
84
95
|
keyPrefix: 'mcp:user',
|
|
85
96
|
keyResolver: userIdKey,
|
|
86
|
-
|
|
97
|
+
store,
|
|
87
98
|
}),
|
|
88
99
|
authLimiter: options.authLimiter ??
|
|
89
100
|
createRateLimiter({
|
|
@@ -91,7 +102,7 @@ function resolveLimiters(options, redis) {
|
|
|
91
102
|
duration: RATE_WINDOW_SECONDS,
|
|
92
103
|
keyPrefix: 'auth:ip',
|
|
93
104
|
keyResolver: ipKey,
|
|
94
|
-
|
|
105
|
+
store,
|
|
95
106
|
}),
|
|
96
107
|
signupLimiter: options.signupLimiter ??
|
|
97
108
|
createRateLimiter({
|
|
@@ -99,7 +110,7 @@ function resolveLimiters(options, redis) {
|
|
|
99
110
|
duration: RATE_WINDOW_SECONDS,
|
|
100
111
|
keyPrefix: 'auth:signup:ip',
|
|
101
112
|
keyResolver: ipKey,
|
|
102
|
-
|
|
113
|
+
store,
|
|
103
114
|
}),
|
|
104
115
|
resendVerificationLimiter: options.resendVerificationLimiter ??
|
|
105
116
|
createRateLimiter({
|
|
@@ -107,7 +118,7 @@ function resolveLimiters(options, redis) {
|
|
|
107
118
|
duration: RATE_WINDOW_SECONDS,
|
|
108
119
|
keyPrefix: 'auth:resend-verification:ip',
|
|
109
120
|
keyResolver: ipKey,
|
|
110
|
-
|
|
121
|
+
store,
|
|
111
122
|
}),
|
|
112
123
|
verifyEmailLimiter: options.verifyEmailLimiter ??
|
|
113
124
|
createRateLimiter({
|
|
@@ -115,7 +126,7 @@ function resolveLimiters(options, redis) {
|
|
|
115
126
|
duration: RATE_WINDOW_SECONDS,
|
|
116
127
|
keyPrefix: 'auth:verify-email:ip',
|
|
117
128
|
keyResolver: ipKey,
|
|
118
|
-
|
|
129
|
+
store,
|
|
119
130
|
}),
|
|
120
131
|
forgotPasswordLimiter: options.forgotPasswordLimiter ??
|
|
121
132
|
createRateLimiter({
|
|
@@ -123,7 +134,7 @@ function resolveLimiters(options, redis) {
|
|
|
123
134
|
duration: RATE_WINDOW_SECONDS,
|
|
124
135
|
keyPrefix: 'auth:forgot-password:ip',
|
|
125
136
|
keyResolver: ipKey,
|
|
126
|
-
|
|
137
|
+
store,
|
|
127
138
|
}),
|
|
128
139
|
resetPasswordLimiter: options.resetPasswordLimiter ??
|
|
129
140
|
createRateLimiter({
|
|
@@ -131,7 +142,7 @@ function resolveLimiters(options, redis) {
|
|
|
131
142
|
duration: RATE_WINDOW_SECONDS,
|
|
132
143
|
keyPrefix: 'auth:reset-password:ip',
|
|
133
144
|
keyResolver: ipKey,
|
|
134
|
-
|
|
145
|
+
store,
|
|
135
146
|
}),
|
|
136
147
|
registerLimiter: options.registerLimiter ??
|
|
137
148
|
createRateLimiter({
|
|
@@ -139,7 +150,7 @@ function resolveLimiters(options, redis) {
|
|
|
139
150
|
duration: RATE_WINDOW_SECONDS,
|
|
140
151
|
keyPrefix: 'oauth:register:ip',
|
|
141
152
|
keyResolver: ipKey,
|
|
142
|
-
|
|
153
|
+
store,
|
|
143
154
|
}),
|
|
144
155
|
oauthLimiter: options.oauthLimiter ??
|
|
145
156
|
createRateLimiter({
|
|
@@ -147,7 +158,7 @@ function resolveLimiters(options, redis) {
|
|
|
147
158
|
duration: RATE_WINDOW_SECONDS,
|
|
148
159
|
keyPrefix: 'oauth:as:ip',
|
|
149
160
|
keyResolver: ipKey,
|
|
150
|
-
|
|
161
|
+
store,
|
|
151
162
|
}),
|
|
152
163
|
apiKeyLimiter: options.apiKeyLimiter ??
|
|
153
164
|
createRateLimiter({
|
|
@@ -155,7 +166,7 @@ function resolveLimiters(options, redis) {
|
|
|
155
166
|
duration: RATE_WINDOW_SECONDS,
|
|
156
167
|
keyPrefix: 'api:key',
|
|
157
168
|
keyResolver: apiKeyIdKey,
|
|
158
|
-
|
|
169
|
+
store,
|
|
159
170
|
}),
|
|
160
171
|
};
|
|
161
172
|
}
|
|
@@ -208,13 +219,14 @@ export function createApp(options = {}) {
|
|
|
208
219
|
// Access gate, threaded into BOTH metered transports alongside the budget. The
|
|
209
220
|
// private repo injects a real access policy; self-host keeps allowAllAccess.
|
|
210
221
|
const access = extension.access ?? allowAllAccess;
|
|
211
|
-
// Resolve the shared ioredis client ONCE
|
|
212
|
-
//
|
|
213
|
-
//
|
|
214
|
-
//
|
|
215
|
-
const redis = options.redis ?? resolveRedis();
|
|
222
|
+
// Resolve the limiter store and the shared ioredis client ONCE (#315). Redis is
|
|
223
|
+
// dialled only for the redis store and is used only to build it; the
|
|
224
|
+
// /oauth/token failure tracker follows the resolved store. An explicit
|
|
225
|
+
// override wins (the test seam).
|
|
226
|
+
const redis = options.redis ?? (loadRateLimitStoreConfig().kind === 'redis' ? resolveRedis() : undefined);
|
|
227
|
+
const rateLimitStore = options.rateLimitStore ?? resolveRateLimitStore(redis);
|
|
216
228
|
const clientMetadataResolver = options.clientMetadataResolver ?? new ClientMetadataResolver();
|
|
217
|
-
const { edgeLimiter, mcpLimiter, authLimiter, signupLimiter, resendVerificationLimiter, verifyEmailLimiter, forgotPasswordLimiter, resetPasswordLimiter, registerLimiter, oauthLimiter, apiKeyLimiter, } = resolveLimiters(options,
|
|
229
|
+
const { edgeLimiter, mcpLimiter, authLimiter, signupLimiter, resendVerificationLimiter, verifyEmailLimiter, forgotPasswordLimiter, resetPasswordLimiter, registerLimiter, oauthLimiter, apiKeyLimiter, } = resolveLimiters(options, rateLimitStore);
|
|
218
230
|
// Railway terminates TLS at a proxy; without this, req.ip (and the SDK auth
|
|
219
231
|
// router's rate limiter) see the proxy address.
|
|
220
232
|
app.set('trust proxy', 1);
|
|
@@ -289,10 +301,9 @@ export function createApp(options = {}) {
|
|
|
289
301
|
// unauthenticated and sit behind the shared injected per-IP limiter seam
|
|
290
302
|
// (real bucket by default).
|
|
291
303
|
app.use(oauthAuthorizeRouter({ limiter: oauthLimiter, clientMetadataResolver }));
|
|
292
|
-
// The
|
|
293
|
-
//
|
|
294
|
-
|
|
295
|
-
app.use(oauthTokenRouter({ limiter: oauthLimiter, redis, limits, clientMetadataResolver }));
|
|
304
|
+
// The progressive-delay failure counter follows the resolved limiter store
|
|
305
|
+
// (Redis or Postgres share the budget across replicas; memory is per-process).
|
|
306
|
+
app.use(oauthTokenRouter({ limiter: oauthLimiter, rateLimitStore, limits, clientMetadataResolver }));
|
|
296
307
|
// Composition seam: the injected extension attaches its hosted-only
|
|
297
308
|
// routes/handlers here, at the composition root, AFTER every Apache router and
|
|
298
309
|
// 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,sBAAsB,EAAE,MAAM,mBAAmB,CAAA;AAC1D,OAAO,EAAE,mBAAmB,EAAgB,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"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"}
|
package/dist/cursor.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { type CursorPayload } from '@3ngram/schema';
|
|
1
|
+
import { type CursorPayload, type ProposalsCursorPayload } from '@3ngram/schema';
|
|
2
2
|
/** Serialize a cursor payload to an opaque base64url token. */
|
|
3
|
-
export declare function encodeCursor(payload: CursorPayload): string;
|
|
3
|
+
export declare function encodeCursor(payload: CursorPayload | ProposalsCursorPayload): string;
|
|
4
4
|
/**
|
|
5
5
|
* Decode + validate an opaque cursor token back to its v2 payload.
|
|
6
6
|
*
|
|
@@ -20,7 +20,7 @@ export declare function decodeCursor(token: string): CursorPayload | undefined;
|
|
|
20
20
|
* query text (hard rule 6).
|
|
21
21
|
*/
|
|
22
22
|
export declare class CursorQueryMismatchError extends Error {
|
|
23
|
-
constructor();
|
|
23
|
+
constructor(message?: string);
|
|
24
24
|
}
|
|
25
25
|
/**
|
|
26
26
|
* Short stable fingerprint of a search: sha256 over the POST-PARSE query text
|
|
@@ -64,3 +64,34 @@ export declare function searchFingerprint(query: string, filters: Record<string,
|
|
|
64
64
|
* so the binding cannot drift per transport.
|
|
65
65
|
*/
|
|
66
66
|
export declare function decodeSearchCursor(token: string, fingerprint: string): CursorPayload | undefined;
|
|
67
|
+
/** A position in the merged proposal order (structurally core's ProposalPosition). */
|
|
68
|
+
export interface ProposalsCursorPosition {
|
|
69
|
+
createdAt: string;
|
|
70
|
+
id: string;
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* What a proposals walk is bound to. `surface` + `kinds` keep an MCP (edge +
|
|
74
|
+
* fact) cursor from continuing a REST (edge-only) walk and vice versa; `status`
|
|
75
|
+
* is the filter the walk was started with; `tenant` is the authenticated user
|
|
76
|
+
* id — HASHED into the fingerprint only, so another tenant's cursor fails the
|
|
77
|
+
* check while the caller-visible token never carries the id itself.
|
|
78
|
+
*/
|
|
79
|
+
export interface ProposalsCursorBinding {
|
|
80
|
+
surface: 'mcp' | 'rest';
|
|
81
|
+
kinds: readonly string[];
|
|
82
|
+
status: string | undefined;
|
|
83
|
+
tenant: string;
|
|
84
|
+
}
|
|
85
|
+
/** Short stable fingerprint of a proposals walk (sha256, 16 hex — a mismatch guard). */
|
|
86
|
+
export declare function proposalsFingerprint(binding: ProposalsCursorBinding): string;
|
|
87
|
+
/** Mint the opaque continuation token for a proposals walk. */
|
|
88
|
+
export declare function encodeProposalsCursor(position: ProposalsCursorPosition, fp: string): string;
|
|
89
|
+
/**
|
|
90
|
+
* Decode a proposals continuation token AND bind it to the current walk.
|
|
91
|
+
* Garbled base64/JSON or a shape other than the v4 proposals payload throws a
|
|
92
|
+
* ZodError (invalid input: 400 on REST, invalid_input on MCP) — never a silent
|
|
93
|
+
* page-1 restart, which would let an auditor believe a partial walk completed.
|
|
94
|
+
* A well-formed token minted for a different surface, status filter, or tenant
|
|
95
|
+
* throws {@link CursorQueryMismatchError}. Neither error carries the token.
|
|
96
|
+
*/
|
|
97
|
+
export declare function decodeProposalsCursor(token: string, fingerprint: string): ProposalsCursorPosition;
|
package/dist/cursor.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
// stays dependency-light (zod only — no @types/node for Buffer). Clients treat
|
|
7
7
|
// the token as opaque and never decode it (see lib/search/api.ts).
|
|
8
8
|
import { createHash } from 'node:crypto';
|
|
9
|
-
import { cursorPayloadSchema, legacyCursorPayloadSchema } from '@3ngram/schema';
|
|
9
|
+
import { cursorPayloadSchema, legacyCursorPayloadSchema, proposalsCursorPayloadSchema, } from '@3ngram/schema';
|
|
10
10
|
/** Serialize a cursor payload to an opaque base64url token. */
|
|
11
11
|
export function encodeCursor(payload) {
|
|
12
12
|
return Buffer.from(JSON.stringify(payload), 'utf8').toString('base64url');
|
|
@@ -45,8 +45,8 @@ export function decodeCursor(token) {
|
|
|
45
45
|
* query text (hard rule 6).
|
|
46
46
|
*/
|
|
47
47
|
export class CursorQueryMismatchError extends Error {
|
|
48
|
-
constructor() {
|
|
49
|
-
super(
|
|
48
|
+
constructor(message = 'cursor was issued for a different query — omit the cursor to start a new search') {
|
|
49
|
+
super(message);
|
|
50
50
|
this.name = 'CursorQueryMismatchError';
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -127,4 +127,41 @@ export function decodeSearchCursor(token, fingerprint) {
|
|
|
127
127
|
}
|
|
128
128
|
return payload;
|
|
129
129
|
}
|
|
130
|
+
/** Short stable fingerprint of a proposals walk (sha256, 16 hex — a mismatch guard). */
|
|
131
|
+
export function proposalsFingerprint(binding) {
|
|
132
|
+
const canonical = JSON.stringify(canonicalize({ ...binding, order: 'created_at_desc' }));
|
|
133
|
+
return createHash('sha256').update(`proposals\n${canonical}`).digest('hex').slice(0, 16);
|
|
134
|
+
}
|
|
135
|
+
/** Mint the opaque continuation token for a proposals walk. */
|
|
136
|
+
export function encodeProposalsCursor(position, fp) {
|
|
137
|
+
return encodeCursor({
|
|
138
|
+
v: 4,
|
|
139
|
+
kind: 'proposals',
|
|
140
|
+
createdAt: position.createdAt,
|
|
141
|
+
id: position.id,
|
|
142
|
+
fp,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
/**
|
|
146
|
+
* Decode a proposals continuation token AND bind it to the current walk.
|
|
147
|
+
* Garbled base64/JSON or a shape other than the v4 proposals payload throws a
|
|
148
|
+
* ZodError (invalid input: 400 on REST, invalid_input on MCP) — never a silent
|
|
149
|
+
* page-1 restart, which would let an auditor believe a partial walk completed.
|
|
150
|
+
* A well-formed token minted for a different surface, status filter, or tenant
|
|
151
|
+
* throws {@link CursorQueryMismatchError}. Neither error carries the token.
|
|
152
|
+
*/
|
|
153
|
+
export function decodeProposalsCursor(token, fingerprint) {
|
|
154
|
+
let json;
|
|
155
|
+
try {
|
|
156
|
+
json = JSON.parse(Buffer.from(token, 'base64url').toString('utf8'));
|
|
157
|
+
}
|
|
158
|
+
catch {
|
|
159
|
+
json = undefined;
|
|
160
|
+
}
|
|
161
|
+
const payload = proposalsCursorPayloadSchema.parse(json);
|
|
162
|
+
if (payload.fp !== fingerprint) {
|
|
163
|
+
throw new CursorQueryMismatchError('cursor was issued for a different proposals listing — omit the cursor to start a new walk');
|
|
164
|
+
}
|
|
165
|
+
return { createdAt: payload.createdAt, id: payload.id };
|
|
166
|
+
}
|
|
130
167
|
//# sourceMappingURL=cursor.js.map
|
package/dist/cursor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../src/cursor.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,wEAAwE;AACxE,+EAA+E;AAC/E,oEAAoE;AACpE,+EAA+E;AAC/E,+EAA+E;AAC/E,mEAAmE;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,
|
|
1
|
+
{"version":3,"file":"cursor.js","sourceRoot":"","sources":["../src/cursor.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/errors.js
CHANGED
|
@@ -10,7 +10,7 @@ import { AccessDeniedError, AccountDeletedError, BudgetExceededError, Commitment
|
|
|
10
10
|
// Admin tools: scope registry + proposal review typed errors —
|
|
11
11
|
// appended block. ProposalNotFoundError now also covers the accept path's
|
|
12
12
|
// not-open / not-owned guard.
|
|
13
|
-
ProposalNotFoundError, ResourceLimitExceededError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, UnknownSessionRunError, UnscopedRetrievalError, } from '@3ngram/core';
|
|
13
|
+
ProposalNotFoundError, ResolveReasonNotSupportedError, ResourceLimitExceededError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, UnknownSessionRunError, UnscopedRetrievalError, UnscopedWriteError, } from '@3ngram/core';
|
|
14
14
|
import { ZodError } from 'zod';
|
|
15
15
|
import { CursorQueryMismatchError } from '../cursor.js';
|
|
16
16
|
import { OutputValidationError } from '../output-validation.js';
|
|
@@ -63,6 +63,22 @@ export function mapToolError(toolName, err) {
|
|
|
63
63
|
log().warn({ tool_name: toolName, err: err.name }, 'mcp: unscoped read rejected by policy');
|
|
64
64
|
return fail(`invalid input: ${formatUnscopedRetrievalDetail(err.registeredScopes)}`);
|
|
65
65
|
}
|
|
66
|
+
// A `remember` without scope rejected by the caller's own write-scope policy
|
|
67
|
+
// (mode 'require', issue #235): the write-side sibling above, same
|
|
68
|
+
// invalid_input reason. The message is fixed text naming the fix; no content.
|
|
69
|
+
if (err instanceof UnscopedWriteError) {
|
|
70
|
+
mcpToolErrors.add(1, { tool_name: toolName, reason_code: 'invalid_input' });
|
|
71
|
+
log().warn({ tool_name: toolName, err: err.name }, 'mcp: unscoped write rejected by policy');
|
|
72
|
+
return fail(`invalid input: ${err.message}`);
|
|
73
|
+
}
|
|
74
|
+
// A blocker resolve carrying a `reason` (issue #234): blockers have no
|
|
75
|
+
// commitment row to hold one. invalid_input with fixed text naming the fix;
|
|
76
|
+
// the reason itself is never echoed or logged. Mirrors REST.
|
|
77
|
+
if (err instanceof ResolveReasonNotSupportedError) {
|
|
78
|
+
mcpToolErrors.add(1, { tool_name: toolName, reason_code: 'invalid_input' });
|
|
79
|
+
log().warn({ tool_name: toolName, err: err.name }, 'mcp: resolve reason rejected for a blocker');
|
|
80
|
+
return fail(`invalid input: ${err.message}`);
|
|
81
|
+
}
|
|
66
82
|
// A continuation cursor replayed against a DIFFERENT query/filter set than
|
|
67
83
|
// the one that issued it — the caller's mistake, named honestly with the
|
|
68
84
|
// recovery (never a silent re-page of the old search's frozen ordering, and
|
|
@@ -70,7 +86,9 @@ export function mapToolError(toolName, err) {
|
|
|
70
86
|
if (err instanceof CursorQueryMismatchError) {
|
|
71
87
|
mcpToolErrors.add(1, { tool_name: toolName, reason_code: 'invalid_input' });
|
|
72
88
|
log().warn({ tool_name: toolName, err: err.name }, 'mcp: cursor query mismatch');
|
|
73
|
-
|
|
89
|
+
// The message is a fixed per-codec constant (search or proposals) — it
|
|
90
|
+
// never carries query text, the token, or a tenant id.
|
|
91
|
+
return fail(`invalid input: ${err.message}`);
|
|
74
92
|
}
|
|
75
93
|
// Over the per-user budget cap. A documented domain denial,
|
|
76
94
|
// not a server fault: a class-named isError result counted under budget_exceeded.
|
package/dist/mcp/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/mcp/errors.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,uEAAuE;AACvE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,gCAAgC,EAChC,gCAAgC,EAChC,qBAAqB,EACrB,oBAAoB,EACpB,wBAAwB,EACxB,iCAAiC,EACjC,wBAAwB;AACxB,+DAA+D;AAC/D,0EAA0E;AAC1E,8BAA8B;AAC9B,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/mcp/errors.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,iFAAiF;AACjF,uEAAuE;AACvE,OAAO,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACnD,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,gCAAgC,EAChC,gCAAgC,EAChC,qBAAqB,EACrB,oBAAoB,EACpB,wBAAwB,EACxB,iCAAiC,EACjC,wBAAwB;AACxB,+DAA+D;AAC/D,0EAA0E;AAC1E,8BAA8B;AAC9B,qBAAqB,EACrB,8BAA8B,EAC9B,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,EACtB,kBAAkB,GACnB,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAA;AAC9B,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAK/D,mFAAmF;AACnF,SAAS,IAAI,CAAC,OAAe;IAC3B,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AACtE,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB,EAAE,GAAY;IACzD,6DAA6D;IAC7D,0EAA0E;IAC1E,2EAA2E;IAC3E,yEAAyE;IACzE,0EAA0E;IAC1E,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;QAC5E,GAAG,EAAE,CAAC,KAAK,CACT,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,EAC1F,2CAA2C,CAC5C,CAAA;QACD,OAAO,IAAI,CACT,yCAAyC,QAAQ,0CAA0C,GAAG,CAAC,UAAU,iEAAiE,CAC3K,CAAA;IACH,CAAC;IACD,4EAA4E;IAC5E,4EAA4E;IAC5E,yEAAyE;IACzE,0EAA0E;IAC1E,wEAAwE;IACxE,IACE,GAAG,YAAY,QAAQ;QACvB,GAAG,YAAY,qBAAqB;QACpC,gGAAgG;QAChG,4EAA4E;QAC5E,GAAG,YAAY,oBAAoB;QACnC,GAAG,YAAY,sBAAsB,EACrC,CAAC;QACD,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,0BAA0B,CAAC,CAAA;QAC9E,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,uEAAuE;IACvE,4EAA4E;IAC5E,yEAAyE;IACzE,4EAA4E;IAC5E,8DAA8D;IAC9D,IAAI,GAAG,YAAY,sBAAsB,EAAE,CAAC;QAC1C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,uCAAuC,CAAC,CAAA;QAC3F,OAAO,IAAI,CAAC,kBAAkB,6BAA6B,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;IACtF,CAAC;IACD,6EAA6E;IAC7E,mEAAmE;IACnE,8EAA8E;IAC9E,IAAI,GAAG,YAAY,kBAAkB,EAAE,CAAC;QACtC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,wCAAwC,CAAC,CAAA;QAC5F,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,CAAC;IACD,uEAAuE;IACvE,4EAA4E;IAC5E,6DAA6D;IAC7D,IAAI,GAAG,YAAY,8BAA8B,EAAE,CAAC;QAClD,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,4CAA4C,CAAC,CAAA;QAChG,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,CAAC;IACD,2EAA2E;IAC3E,yEAAyE;IACzE,4EAA4E;IAC5E,yDAAyD;IACzD,IAAI,GAAG,YAAY,wBAAwB,EAAE,CAAC;QAC5C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAA;QAChF,uEAAuE;QACvE,uDAAuD;QACvD,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAA;IAC9C,CAAC;IACD,4DAA4D;IAC5D,kFAAkF;IAClF,0EAA0E;IAC1E,kBAAkB;IAClB,IAAI,GAAG,YAAY,mBAAmB,EAAE,CAAC;QACvC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAA;QAC7E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,EAAE,sBAAsB,CAAC,CAAA;QACrF,OAAO,IAAI,CAAC,oBAAoB,QAAQ,iCAAiC,CAAC,CAAA;IAC5E,CAAC;IACD,gFAAgF;IAChF,kFAAkF;IAClF,oDAAoD;IACpD,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;QACrC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAA;QAC7E,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,MAAM,sBAAsB,CAAC,CAAA;IACjE,CAAC;IACD,IAAI,GAAG,YAAY,0BAA0B,EAAE,CAAC;QAC9C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,yBAAyB,EAAE,CAAC,CAAA;QACrF,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,6BAA6B,CAAC,CAAA;QAC1F,OAAO,IAAI,CAAC,4BAA4B,GAAG,CAAC,QAAQ,gBAAgB,CAAC,CAAA;IACvE,CAAC;IACD,2EAA2E;IAC3E,0EAA0E;IAC1E,yEAAyE;IACzE,mEAAmE;IACnE,IAAI,GAAG,YAAY,oBAAoB,EAAE,CAAC;QACxC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC,CAAA;QAC9E,GAAG,EAAE,CAAC,IAAI,CACR,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,WAAW,EAAE,EACtD,gCAAgC,CACjC,CAAA;QACD,OAAO,IAAI,CAAC,yDAAyD,GAAG,CAAC,WAAW,GAAG,CAAC,CAAA;IAC1F,CAAC;IACD,0EAA0E;IAC1E,4EAA4E;IAC5E,uEAAuE;IACvE,IAAI,GAAG,YAAY,wBAAwB,EAAE,CAAC;QAC5C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC,CAAA;QAC3E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,8BAA8B,CAAC,CAAA;QAClF,OAAO,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IAC3C,CAAC;IACD,8EAA8E;IAC9E,0EAA0E;IAC1E,gCAAgC;IAChC,2EAA2E;IAC3E,yEAAyE;IACzE,kEAAkE;IAClE,IAAI,GAAG,YAAY,mBAAmB,EAAE,CAAC;QACvC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE,CAAC,CAAA;QAC7E,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,iCAAiC,CAAC,CAAA;QACrF,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,GAAG,YAAY,wBAAwB,EAAE,CAAC;QAC5C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;QACvE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,4BAA4B,CAAC,CAAA;QAChF,OAAO,IAAI,CAAC,0BAA0B,GAAG,CAAC,aAAa,EAAE,CAAC,CAAA;IAC5D,CAAC;IACD,IAAI,GAAG,YAAY,uBAAuB,EAAE,CAAC;QAC3C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;QACvE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,2BAA2B,CAAC,CAAA;QAC/E,2EAA2E;QAC3E,uEAAuE;QACvE,6EAA6E;QAC7E,qDAAqD;QACrD,OAAO,IAAI,CACT,GAAG,CAAC,OAAO,KAAK,QAAQ;YACtB,CAAC,CAAC,uCAAuC,GAAG,CAAC,YAAY,EAAE;YAC3D,CAAC,CAAC,yBAAyB,GAAG,CAAC,YAAY,EAAE,CAChD,CAAA;IACH,CAAC;IACD,2EAA2E;IAC3E,6EAA6E;IAC7E,sCAAsC;IACtC,IAAI,GAAG,YAAY,iCAAiC,EAAE,CAAC;QACrD,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,qCAAqC,CAAC,CAAA;QACzF,OAAO,IAAI,CAAC,6CAA6C,GAAG,CAAC,aAAa,GAAG,CAAC,CAAA;IAChF,CAAC;IACD,IAAI,GAAG,YAAY,iBAAiB,EAAE,CAAC;QACrC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,oBAAoB,CAAC,CAAA;QACxE,OAAO,IAAI,CAAC,aAAa,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IACtC,CAAC;IACD,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,gCAAgC,CAAC,CAAA;QACpF,OAAO,IAAI,CAAC,wCAAwC,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAA;IACtE,CAAC;IACD,4EAA4E;IAC5E,2EAA2E;IAC3E,6EAA6E;IAC7E,2DAA2D;IAC3D,IAAI,GAAG,YAAY,2BAA2B,EAAE,CAAC;QAC/C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CACR,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,YAAY,EAAE,EACvE,kDAAkD,CACnD,CAAA;QACD,OAAO,IAAI,CAAC,sCAAsC,GAAG,CAAC,YAAY,UAAU,CAAC,CAAA;IAC/E,CAAC;IACD,6EAA6E;IAC7E,yEAAyE;IACzE,IACE,GAAG,YAAY,gCAAgC;QAC/C,GAAG,YAAY,gCAAgC,EAC/C,CAAC;QACD,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC,CAAA;QAChF,GAAG,EAAE,CAAC,IAAI,CACR,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,EAClE,oCAAoC,CACrC,CAAA;QACD,OAAO,IAAI,CAAC,uBAAuB,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAC7D,CAAC;IACD,mEAAmE;IACnE,gFAAgF;IAChF,iFAAiF;IACjF,iBAAiB;IACjB,IAAI,GAAG,YAAY,sBAAsB,EAAE,CAAC;QAC1C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,0BAA0B,CAAC,CAAA;QAC9E,OAAO,IAAI,CAAC,oBAAoB,GAAG,CAAC,SAAS,kBAAkB,CAAC,CAAA;IAClE,CAAC;IACD,2EAA2E;IAC3E,4EAA4E;IAC5E,yCAAyC;IACzC,IAAI,GAAG,YAAY,kBAAkB,EAAE,CAAC;QACtC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;QACvE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,sBAAsB,CAAC,CAAA;QAC1E,OAAO,IAAI,CAAC,qBAAqB,GAAG,CAAC,SAAS,GAAG,CAAC,CAAA;IACpD,CAAC;IACD,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAA;QACvE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,oCAAoC,CAAC,CAAA;QACxF,OAAO,IAAI,CAAC,4BAA4B,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;IAC3D,CAAC;IACD,6HAA6H;IAC7H,+EAA+E;IAC/E,sEAAsE;IACtE,IAAI,GAAG,YAAY,yBAAyB,EAAE,CAAC;QAC7C,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,oCAAoC,CAAC,CAAA;QACxF,OAAO,IAAI,CACT,iCAAiC,GAAG,CAAC,UAAU,oDAAoD,CACpG,CAAA;IACH,CAAC;IACD,2EAA2E;IAC3E,2EAA2E;IAC3E,wEAAwE;IACxE,uEAAuE;IACvE,6EAA6E;IAC7E,IAAI,GAAG,YAAY,qBAAqB,EAAE,CAAC;QACzC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAA;QACtE,GAAG,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,EAAE,wCAAwC,CAAC,CAAA;QAC5F,OAAO,IAAI,CACT,sBAAsB,GAAG,CAAC,UAAU,cAAc,GAAG,CAAC,MAAM,mFAAmF,CAChJ,CAAA;IACH,CAAC;IACD,OAAO,SAAS,CAAA;AAClB,CAAC"}
|
package/dist/mcp/resources.d.ts
CHANGED
|
@@ -27,6 +27,22 @@ export declare const MEMORY_RESOURCE_TEMPLATE = "threengram://memory/{id}";
|
|
|
27
27
|
* cannot be reused by a caller whose token no longer authenticates.
|
|
28
28
|
*/
|
|
29
29
|
export declare const MEMORY_RESOURCE_CACHE_TTL_MS: number;
|
|
30
|
+
/**
|
|
31
|
+
* The tenant's scope/project inventory (issue #168): one FIXED uri, so unlike
|
|
32
|
+
* the memory template it IS listed on `resources/list` — an agent can discover
|
|
33
|
+
* it without already knowing a name. It enumerates labels, never memories, so
|
|
34
|
+
* listing it is not the corpus firehose the memory template refuses.
|
|
35
|
+
*/
|
|
36
|
+
export declare const FACETS_RESOURCE_URI = "threengram://facets";
|
|
37
|
+
/**
|
|
38
|
+
* TTL for the facets inventory. SHORT on purpose — the opposite of the memory
|
|
39
|
+
* body: every `remember` into a new scope or project, every `revise` move, and
|
|
40
|
+
* every supersede/archive of the last memory in a scope changes it. One minute
|
|
41
|
+
* bounds how stale a cached inventory can be while still sparing a client that
|
|
42
|
+
* re-reads it within a turn or two. Its own constant for the same reason as
|
|
43
|
+
* MEMORY_RESOURCE_CACHE_TTL_MS.
|
|
44
|
+
*/
|
|
45
|
+
export declare const FACETS_RESOURCE_CACHE_TTL_MS = 60000;
|
|
30
46
|
/**
|
|
31
47
|
* Register `threengram://memory/{id}`. registerResource AUTO-ENABLES the `resources`
|
|
32
48
|
* capability, so resources/templates/list + resources/read are served with no
|
package/dist/mcp/resources.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// SPDX-License-Identifier: Apache-2.0
|
|
2
|
-
// MCP RESOURCES — `threengram://memory/{id}` (issue #105)
|
|
2
|
+
// MCP RESOURCES — `threengram://memory/{id}` (issue #105) and the
|
|
3
|
+
// `threengram://facets` scope/project inventory (issue #168).
|
|
3
4
|
//
|
|
4
5
|
// Design and the reasoning behind every decision here: docs/concepts/mcp-resources.mdx.
|
|
5
6
|
// Read it before changing this file; the payload rule below is load-bearing, not
|
|
@@ -22,8 +23,9 @@
|
|
|
22
23
|
// schema boundary, asserts scope + access, calls the COMPLETE core service
|
|
23
24
|
// (which runs withTenant internally), and projects the result.
|
|
24
25
|
import { log } from '@3ngram/config';
|
|
25
|
-
import { getMemoryById, MemoryNotFoundError } from '@3ngram/core';
|
|
26
|
+
import { getMemoryById, listMemoryFacets, MemoryNotFoundError } from '@3ngram/core';
|
|
26
27
|
import { MEMORY_READ_SCOPE } from '@3ngram/core/auth';
|
|
28
|
+
import { memoriesFacetsResponseSchema } from '@3ngram/schema';
|
|
27
29
|
import { ResourceTemplate } from '@modelcontextprotocol/server';
|
|
28
30
|
import { z } from 'zod';
|
|
29
31
|
/**
|
|
@@ -53,6 +55,22 @@ export const MEMORY_RESOURCE_TEMPLATE = 'threengram://memory/{id}';
|
|
|
53
55
|
* cannot be reused by a caller whose token no longer authenticates.
|
|
54
56
|
*/
|
|
55
57
|
export const MEMORY_RESOURCE_CACHE_TTL_MS = 24 * 60 * 60_000;
|
|
58
|
+
/**
|
|
59
|
+
* The tenant's scope/project inventory (issue #168): one FIXED uri, so unlike
|
|
60
|
+
* the memory template it IS listed on `resources/list` — an agent can discover
|
|
61
|
+
* it without already knowing a name. It enumerates labels, never memories, so
|
|
62
|
+
* listing it is not the corpus firehose the memory template refuses.
|
|
63
|
+
*/
|
|
64
|
+
export const FACETS_RESOURCE_URI = 'threengram://facets';
|
|
65
|
+
/**
|
|
66
|
+
* TTL for the facets inventory. SHORT on purpose — the opposite of the memory
|
|
67
|
+
* body: every `remember` into a new scope or project, every `revise` move, and
|
|
68
|
+
* every supersede/archive of the last memory in a scope changes it. One minute
|
|
69
|
+
* bounds how stale a cached inventory can be while still sparing a client that
|
|
70
|
+
* re-reads it within a turn or two. Its own constant for the same reason as
|
|
71
|
+
* MEMORY_RESOURCE_CACHE_TTL_MS.
|
|
72
|
+
*/
|
|
73
|
+
export const FACETS_RESOURCE_CACHE_TTL_MS = 60_000;
|
|
56
74
|
/** Reject a non-uuid `{id}` before it reaches core (one validation boundary). */
|
|
57
75
|
const memoryIdSchema = z.uuid();
|
|
58
76
|
/**
|
|
@@ -95,6 +113,7 @@ const MEMORY_RESOURCE_FIELDS = [
|
|
|
95
113
|
* rule exists to prevent, so `resources/list` returns nothing for this template.
|
|
96
114
|
*/
|
|
97
115
|
export function registerResources(server, ctx) {
|
|
116
|
+
registerFacetsResource(server, ctx);
|
|
98
117
|
server.registerResource('memory', new ResourceTemplate(MEMORY_RESOURCE_TEMPLATE, { list: undefined }), {
|
|
99
118
|
title: 'Memory',
|
|
100
119
|
description: 'The stored body of one memory by id, addressed as threengram://memory/{id}. Carries only the fields that never change after write (content, topic, type, scope, project, recordedAt) so it can be cached; lifecycle state (status, validity, commitment status, tags) is deliberately absent — read search or get_memories for that.',
|
|
@@ -153,6 +172,44 @@ export function registerResources(server, ctx) {
|
|
|
153
172
|
};
|
|
154
173
|
});
|
|
155
174
|
}
|
|
175
|
+
/**
|
|
176
|
+
* Register `threengram://facets` (issue #168): `{ scopes, projects }` — the
|
|
177
|
+
* DISTINCT scope and project labels on the tenant's live memories, the SAME
|
|
178
|
+
* payload as REST `GET /api/v1/memories/facets` and the `facets` field
|
|
179
|
+
* describe_environment inlines for hosts that never surface resources.
|
|
180
|
+
* Scopes registered with no live memory are not here (`configure_scope list`
|
|
181
|
+
* reports the registry). Same guards as the memory resource and the facet
|
|
182
|
+
* completer: tenant from the verified authInfo closure, memory:read
|
|
183
|
+
* fail-closed, access gate before the read.
|
|
184
|
+
*/
|
|
185
|
+
function registerFacetsResource(server, ctx) {
|
|
186
|
+
server.registerResource('facets', FACETS_RESOURCE_URI, {
|
|
187
|
+
title: 'Scope and project inventory',
|
|
188
|
+
description: 'The scope and project names your live memories are filed under, as { scopes, projects }. Read it to learn valid scope/project filters without guessing. Registered scopes with no live memories are listed by configure_scope instead. Names only, never memory content; an empty account returns empty arrays.',
|
|
189
|
+
mimeType: 'application/json',
|
|
190
|
+
// PRIVATE: the labels are tenant data — a `public` entry could be served
|
|
191
|
+
// to another authorization context. SHORT TTL: the inventory mutates.
|
|
192
|
+
cacheHint: { ttlMs: FACETS_RESOURCE_CACHE_TTL_MS, cacheScope: 'private' },
|
|
193
|
+
}, async (uri) => {
|
|
194
|
+
if (!ctx.scopes.includes(MEMORY_READ_SCOPE)) {
|
|
195
|
+
throw new Error(`insufficient scope: ${MEMORY_READ_SCOPE} required`);
|
|
196
|
+
}
|
|
197
|
+
// ACCESS GUARD before the read — scope/project labels are memory-derived
|
|
198
|
+
// tenant data (the REST facets route and the completer guard them too).
|
|
199
|
+
if (ctx.access)
|
|
200
|
+
await ctx.access.assertRead(ctx.userId);
|
|
201
|
+
const facets = await listMemoryFacets(ctx.userId);
|
|
202
|
+
// Parsed through the REST response schema: one shape for both transports.
|
|
203
|
+
const body = memoriesFacetsResponseSchema.parse({
|
|
204
|
+
scopes: facets.scopes,
|
|
205
|
+
projects: facets.projects,
|
|
206
|
+
});
|
|
207
|
+
log().debug({ resource: 'facets' }, 'mcp: resource read');
|
|
208
|
+
return {
|
|
209
|
+
contents: [{ uri: uri.href, mimeType: 'application/json', text: JSON.stringify(body) }],
|
|
210
|
+
};
|
|
211
|
+
});
|
|
212
|
+
}
|
|
156
213
|
/** The projection's field list, exported so a test can assert it never widens. */
|
|
157
214
|
export const MEMORY_RESOURCE_PROJECTION = MEMORY_RESOURCE_FIELDS;
|
|
158
215
|
//# sourceMappingURL=resources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/mcp/resources.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../src/mcp/resources.ts"],"names":[],"mappings":"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"}
|