@3ngram/server 0.8.0 → 1.1.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/LICENSE +0 -1
- package/NOTICE +7 -0
- package/README.md +21 -0
- package/dist/app.d.ts +19 -0
- package/dist/app.js +39 -7
- 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/composition/extension.d.ts +5 -5
- package/dist/mcp/errors.d.ts +1 -1
- package/dist/mcp/errors.js +6 -1
- package/dist/mcp/errors.js.map +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 +11 -14
- package/dist/mcp/tools.js +13 -13
- 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/rest/errors.js +6 -1
- package/dist/rest/errors.js.map +1 -1
- package/dist/rest/router.d.ts +3 -1
- package/dist/rest/router.js +38 -5
- package/dist/rest/router.js.map +1 -1
- package/dist/routes/auth.d.ts +3 -0
- package/dist/routes/auth.js +3 -1
- package/dist/routes/auth.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 +16 -6
- package/dist/routes/mcp.js +50 -48
- 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 +8 -0
- package/dist/routes/oauth-token.js +33 -35
- package/dist/routes/oauth-token.js.map +1 -1
- package/dist/routes/onboarding.d.ts +9 -1
- package/dist/routes/onboarding.js +41 -43
- package/dist/routes/onboarding.js.map +1 -1
- package/dist/routes/well-known.js +3 -1
- package/dist/routes/well-known.js.map +1 -1
- package/package.json +28 -8
|
@@ -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
|
-
import { type AccessGate, type BudgetEnforcement } from '@3ngram/core';
|
|
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
|
}
|
|
@@ -62,6 +57,8 @@ export interface ToolContext {
|
|
|
62
57
|
/** Access gate — asserts read/write access on every tool. Undefined → no access
|
|
63
58
|
* guard (test/back-compat). */
|
|
64
59
|
access?: AccessGate | undefined;
|
|
60
|
+
/** Billing-neutral resource-limit resolver. Omitted fields are unlimited. */
|
|
61
|
+
limits?: LimitsResolver | undefined;
|
|
65
62
|
}
|
|
66
63
|
/**
|
|
67
64
|
* THE registered tool surface. Length === registered count; the <=12 cap (hard
|
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.
|
|
@@ -76,8 +76,8 @@ const rememberTool = {
|
|
|
76
76
|
// Embedding is on iff a gateway is configured — best-effort, never blocks.
|
|
77
77
|
const input = rememberToolInputSchema.parse(args);
|
|
78
78
|
const gatewayOpts = ctx.gateway === undefined
|
|
79
|
-
? { access: ctx.access }
|
|
80
|
-
: { gateway: ctx.gateway, budget: ctx.budget, access: ctx.access };
|
|
79
|
+
? { access: ctx.access, limits: ctx.limits }
|
|
80
|
+
: { gateway: ctx.gateway, budget: ctx.budget, access: ctx.access, limits: ctx.limits };
|
|
81
81
|
const written = await remember(ctx.userId, input, 'user_mcp', gatewayOpts);
|
|
82
82
|
// ACK-BEFORE-EMBED: the write is already durable here. We DO NOT await the
|
|
83
83
|
// background embed — a gateway round-trip is up to 30s and blocking the MCP
|
|
@@ -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
|
|
@@ -251,8 +251,8 @@ const reviseTool = {
|
|
|
251
251
|
// is best-effort and never blocks (same ack-before-embed as remember).
|
|
252
252
|
const input = reviseToolInputSchema.parse(args);
|
|
253
253
|
const gatewayOpts = ctx.gateway === undefined
|
|
254
|
-
? { access: ctx.access }
|
|
255
|
-
: { gateway: ctx.gateway, budget: ctx.budget, access: ctx.access };
|
|
254
|
+
? { access: ctx.access, limits: ctx.limits }
|
|
255
|
+
: { gateway: ctx.gateway, budget: ctx.budget, access: ctx.access, limits: ctx.limits };
|
|
256
256
|
const written = await revise(ctx.userId, input, 'user_mcp', gatewayOpts);
|
|
257
257
|
void written.embed.settled.catch(() => false);
|
|
258
258
|
const embedded = ctx.gateway === undefined ? 'off' : 'pending';
|
|
@@ -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,
|
|
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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { NextFunction, Request, Response } from 'express';
|
|
2
|
+
type HeaderStatus = 'missing_method' | 'unknown_method' | 'missing_name' | 'unknown_name' | 'recognized';
|
|
3
|
+
export interface McpHeaderObservation {
|
|
4
|
+
method: string;
|
|
5
|
+
name: string;
|
|
6
|
+
status: HeaderStatus;
|
|
7
|
+
}
|
|
8
|
+
/**
|
|
9
|
+
* Collapse attacker-controlled headers into bounded metric labels. The literal
|
|
10
|
+
* raw values never leave this function.
|
|
11
|
+
*/
|
|
12
|
+
export declare function classifyMcpHeaders(methodHeader: string | undefined, nameHeader: string | undefined): McpHeaderObservation;
|
|
13
|
+
/**
|
|
14
|
+
* Observe MCP headers before express.json(). The downstream SDK remains the
|
|
15
|
+
* only header/body validator; this middleware never accepts, rejects, meters,
|
|
16
|
+
* rate-limits, or authorizes a request.
|
|
17
|
+
*/
|
|
18
|
+
export declare function mcpHeaderObservability(req: Request, _res: Response, next: NextFunction): void;
|
|
19
|
+
export {};
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
2
|
+
// Pre-parser MCP routing observability for SEP-2243 standard headers.
|
|
3
|
+
//
|
|
4
|
+
// Mcp-Method and Mcp-Name are UNTRUSTED hints here. Values are reduced to
|
|
5
|
+
// closed allowlists before entering metrics or log context. The SDK later
|
|
6
|
+
// cross-checks the headers against the parsed body, and tool authorization
|
|
7
|
+
// remains inside the verified per-request handler.
|
|
8
|
+
import { bindContext, mcpHeaderRequests } from '@3ngram/config';
|
|
9
|
+
import { PROMPTS } from '../mcp/prompts.js';
|
|
10
|
+
import { TOOLS } from '../mcp/tools.js';
|
|
11
|
+
const KNOWN_METHODS = new Set([
|
|
12
|
+
'server/discover',
|
|
13
|
+
'initialize',
|
|
14
|
+
'ping',
|
|
15
|
+
'tools/list',
|
|
16
|
+
'tools/call',
|
|
17
|
+
'prompts/list',
|
|
18
|
+
'prompts/get',
|
|
19
|
+
]);
|
|
20
|
+
const TOOL_NAMES = new Set(TOOLS.map((tool) => tool.name));
|
|
21
|
+
const PROMPT_NAMES = new Set(PROMPTS.map((prompt) => prompt.name));
|
|
22
|
+
/**
|
|
23
|
+
* Collapse attacker-controlled headers into bounded metric labels. The literal
|
|
24
|
+
* raw values never leave this function.
|
|
25
|
+
*/
|
|
26
|
+
export function classifyMcpHeaders(methodHeader, nameHeader) {
|
|
27
|
+
if (methodHeader === undefined) {
|
|
28
|
+
return { method: 'missing', name: 'none', status: 'missing_method' };
|
|
29
|
+
}
|
|
30
|
+
if (!KNOWN_METHODS.has(methodHeader)) {
|
|
31
|
+
return { method: 'unknown', name: 'none', status: 'unknown_method' };
|
|
32
|
+
}
|
|
33
|
+
const names = methodHeader === 'tools/call'
|
|
34
|
+
? TOOL_NAMES
|
|
35
|
+
: methodHeader === 'prompts/get'
|
|
36
|
+
? PROMPT_NAMES
|
|
37
|
+
: undefined;
|
|
38
|
+
if (names === undefined) {
|
|
39
|
+
return { method: methodHeader, name: 'none', status: 'recognized' };
|
|
40
|
+
}
|
|
41
|
+
if (nameHeader === undefined) {
|
|
42
|
+
return { method: methodHeader, name: 'missing', status: 'missing_name' };
|
|
43
|
+
}
|
|
44
|
+
if (!names.has(nameHeader)) {
|
|
45
|
+
return { method: methodHeader, name: 'unknown', status: 'unknown_name' };
|
|
46
|
+
}
|
|
47
|
+
return { method: methodHeader, name: nameHeader, status: 'recognized' };
|
|
48
|
+
}
|
|
49
|
+
/**
|
|
50
|
+
* Observe MCP headers before express.json(). The downstream SDK remains the
|
|
51
|
+
* only header/body validator; this middleware never accepts, rejects, meters,
|
|
52
|
+
* rate-limits, or authorizes a request.
|
|
53
|
+
*/
|
|
54
|
+
export function mcpHeaderObservability(req, _res, next) {
|
|
55
|
+
const observation = classifyMcpHeaders(req.header('mcp-method'), req.header('mcp-name'));
|
|
56
|
+
mcpHeaderRequests.add(1, {
|
|
57
|
+
method: observation.method,
|
|
58
|
+
name: observation.name,
|
|
59
|
+
status: observation.status,
|
|
60
|
+
});
|
|
61
|
+
const operation = observation.method === 'missing' || observation.method === 'unknown'
|
|
62
|
+
? undefined
|
|
63
|
+
: observation.method;
|
|
64
|
+
bindContext({
|
|
65
|
+
surface: 'mcp',
|
|
66
|
+
...(operation === undefined ? {} : { operation }),
|
|
67
|
+
...(observation.method === 'tools/call' && observation.status === 'recognized'
|
|
68
|
+
? { toolName: observation.name }
|
|
69
|
+
: {}),
|
|
70
|
+
});
|
|
71
|
+
next();
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=mcp-header-observability.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcp-header-observability.js","sourceRoot":"","sources":["../../src/middleware/mcp-header-observability.ts"],"names":[],"mappings":"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"}
|
|
@@ -91,7 +91,8 @@ export function oauthBearerAuth(req, res, next) {
|
|
|
91
91
|
challenge(res);
|
|
92
92
|
return;
|
|
93
93
|
}
|
|
94
|
-
|
|
94
|
+
const config = loadOAuthConfig();
|
|
95
|
+
verifyAccessToken(token, config)
|
|
95
96
|
.then((result) => {
|
|
96
97
|
if (!result.ok) {
|
|
97
98
|
challenge(res, 'invalid_token');
|
|
@@ -103,7 +104,16 @@ export function oauthBearerAuth(req, res, next) {
|
|
|
103
104
|
// a token with no/empty scope claim yields an empty set, so a later
|
|
104
105
|
// memory:write check fails. Scope VALUES are not content, but they are not
|
|
105
106
|
// logged either (only the user-id hash enters the log context).
|
|
106
|
-
|
|
107
|
+
const scopes = [...parseScopes(result.token.scope)];
|
|
108
|
+
req.oauthScopes = scopes;
|
|
109
|
+
req.auth = {
|
|
110
|
+
token,
|
|
111
|
+
clientId: result.token.clientId,
|
|
112
|
+
scopes,
|
|
113
|
+
expiresAt: Math.floor(result.token.expiresAt.getTime() / 1000),
|
|
114
|
+
resource: new URL(config.resource),
|
|
115
|
+
extra: { userId: result.token.userId },
|
|
116
|
+
};
|
|
107
117
|
bindContext({ userIdHash: hashUserId(result.token.userId) });
|
|
108
118
|
next();
|
|
109
119
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-bearer.js","sourceRoot":"","sources":["../../src/middleware/oauth-bearer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-bearer.js","sourceRoot":"","sources":["../../src/middleware/oauth-bearer.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/errors.js
CHANGED
|
@@ -11,6 +11,7 @@
|
|
|
11
11
|
// not_found -> 404 (predecessor / commitment / scope / proposal absent)
|
|
12
12
|
// conflict -> 409 (already superseded, edge conflict, commitment exists)
|
|
13
13
|
// duplicate_memory -> 409 (content already live for the tenant)
|
|
14
|
+
// resource_limit_exceeded -> 409 (injected resource capacity reached)
|
|
14
15
|
// invalid_transition -> 409 (illegal FSM transition)
|
|
15
16
|
// invalid_output -> 500 (a RESULT failed its output schema — server fault)
|
|
16
17
|
// auth statuses (401 unauthorized, 403 insufficient_scope, 503 resolver-or-DB)
|
|
@@ -23,7 +24,7 @@
|
|
|
23
24
|
// bounded ids/hashes the typed error already carries (a uuid, a content hash, an
|
|
24
25
|
// FSM state — never content).
|
|
25
26
|
import { log } from '@3ngram/config';
|
|
26
|
-
import { AccessDeniedError, BudgetExceededError, CommitmentExistsError, CommitmentNotFoundError, DuplicateMemoryError, EdgeConflictError, EpisodicSupersessionError, IllegalCommitmentTransitionError, InvalidCommitmentTransitionError, InvalidEmbeddingError, MemoryNotFoundError, MissingSelectorError, NotCommitmentMemoryError, PredecessorAlreadySupersededError, PredecessorNotFoundError, ProposalNotFoundError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, } from '@3ngram/core';
|
|
27
|
+
import { AccessDeniedError, BudgetExceededError, CommitmentExistsError, CommitmentNotFoundError, DuplicateMemoryError, EdgeConflictError, EpisodicSupersessionError, IllegalCommitmentTransitionError, InvalidCommitmentTransitionError, InvalidEmbeddingError, MemoryNotFoundError, MissingSelectorError, NotCommitmentMemoryError, PredecessorAlreadySupersededError, PredecessorNotFoundError, ProposalNotFoundError, ResourceLimitExceededError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, } from '@3ngram/core';
|
|
27
28
|
import { ZodError } from 'zod';
|
|
28
29
|
import { OutputValidationError } from '../output-validation.js';
|
|
29
30
|
/**
|
|
@@ -69,6 +70,10 @@ export function mapRestError(route, err) {
|
|
|
69
70
|
log().warn({ route, access: err.access }, 'rest: access denied');
|
|
70
71
|
return { status: 403, reason: 'access_denied' };
|
|
71
72
|
}
|
|
73
|
+
if (err instanceof ResourceLimitExceededError) {
|
|
74
|
+
log().warn({ route, resource: err.resource }, 'rest: resource limit reached');
|
|
75
|
+
return { status: 409, reason: 'resource_limit_exceeded' };
|
|
76
|
+
}
|
|
72
77
|
// Re-submitting content already live for the tenant is a documented domain
|
|
73
78
|
// CONFLICT (409), not a server fault. Only the content_hash is logged.
|
|
74
79
|
if (err instanceof DuplicateMemoryError) {
|
package/dist/rest/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/router.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type AccessGate, type BudgetEnforcement, type ExportEnricher } from '@3ngram/core';
|
|
1
|
+
import { type AccessGate, type BudgetEnforcement, type ExportEnricher, type LimitsResolver } from '@3ngram/core';
|
|
2
2
|
import type { Gateway } from '@3ngram/llm';
|
|
3
3
|
import { Router } from 'express';
|
|
4
4
|
import type { RateLimiterMiddleware } from '../middleware/rate-limit.js';
|
|
@@ -15,6 +15,8 @@ export interface RestRouterOptions {
|
|
|
15
15
|
/** Access gate — asserts read/write access on every /api/v1 route.
|
|
16
16
|
* Undefined → no access guard (test/back-compat). */
|
|
17
17
|
access?: AccessGate | undefined;
|
|
18
|
+
/** Billing-neutral resource-limit resolver. Omitted fields are unlimited. */
|
|
19
|
+
limits?: LimitsResolver | undefined;
|
|
18
20
|
/** Account-deletion cleanup hook. The private repo injects platform-specific
|
|
19
21
|
* cleanup; undefined → self-host runs no extra work. Apache code never imports
|
|
20
22
|
* the private repo. */
|
package/dist/rest/router.js
CHANGED
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
// same content found via core search); FULL REST≡MCP≡core parity comes later.
|
|
22
22
|
import { log } from '@3ngram/config';
|
|
23
23
|
import { crashSafeError } from '@3ngram/config/otel';
|
|
24
|
-
import { applyProposal, briefing, deleteAccount, describeEnvironment, exportUserData, getBudgetStatus, getCurrentUser, getFacts, getMemoryById, getMemoryHistory, listMemories, listMemoryFacets, listProposals, listScopes, rejectProposal, remember, resolveByMemoryId, revise, search, searchDashboardPage, } from '@3ngram/core';
|
|
24
|
+
import { applyProposal, archiveMemory, briefing, deleteAccount, describeEnvironment, exportUserData, getBudgetStatus, getCurrentUser, getFacts, getMemoryById, getMemoryHistory, listMemories, listMemoryFacets, listProposals, listScopes, rejectProposal, remember, resolveByMemoryId, revise, search, searchDashboardPage, } from '@3ngram/core';
|
|
25
25
|
import { accountDeleteBodySchema, briefingToolInputSchema, dashboardSearchQuerySchema, factsQueryInputSchema, memoriesListQuerySchema, proposalRejectBodySchema, proposalsListQuerySchema, rememberToolInputSchema, resolveToolInputSchema, reviseToolInputSchema, searchQuerySchema, } from '@3ngram/schema';
|
|
26
26
|
import { Router } from 'express';
|
|
27
27
|
import { z } from 'zod';
|
|
@@ -135,8 +135,13 @@ export function restRouter(options) {
|
|
|
135
135
|
// gate is threaded independently (even on the embeddings-off path) so the
|
|
136
136
|
// write access guard runs on every write (no bypass).
|
|
137
137
|
const gatewayOpts = options.gateway === undefined
|
|
138
|
-
? { access: options.access }
|
|
139
|
-
: {
|
|
138
|
+
? { access: options.access, limits: options.limits }
|
|
139
|
+
: {
|
|
140
|
+
gateway: options.gateway,
|
|
141
|
+
budget: options.budget,
|
|
142
|
+
access: options.access,
|
|
143
|
+
limits: options.limits,
|
|
144
|
+
};
|
|
140
145
|
const written = await remember(tenant(req), input, 'user_api', gatewayOpts);
|
|
141
146
|
void written.embed.settled.catch(() => false);
|
|
142
147
|
const embedded = options.gateway === undefined ? 'off' : 'pending';
|
|
@@ -492,8 +497,13 @@ export function restRouter(options) {
|
|
|
492
497
|
const merged = { ...req.body, predecessorId: req.params.id };
|
|
493
498
|
const input = reviseToolInputSchema.parse(merged);
|
|
494
499
|
const gatewayOpts = options.gateway === undefined
|
|
495
|
-
? { access: options.access }
|
|
496
|
-
: {
|
|
500
|
+
? { access: options.access, limits: options.limits }
|
|
501
|
+
: {
|
|
502
|
+
gateway: options.gateway,
|
|
503
|
+
budget: options.budget,
|
|
504
|
+
access: options.access,
|
|
505
|
+
limits: options.limits,
|
|
506
|
+
};
|
|
497
507
|
const written = await revise(tenant(req), input, 'user_api', gatewayOpts);
|
|
498
508
|
void written.embed.settled.catch(() => false);
|
|
499
509
|
const embedded = options.gateway === undefined ? 'off' : 'pending';
|
|
@@ -525,6 +535,29 @@ export function restRouter(options) {
|
|
|
525
535
|
res.status(200).json({ commitmentId: result.id, status: result.status });
|
|
526
536
|
});
|
|
527
537
|
});
|
|
538
|
+
// POST /api/v1/memories/:id/archive — archive an active memory of ANY type
|
|
539
|
+
// (adoption-gate Decision D: REST-only, no MCP tool mirrors it). status flips
|
|
540
|
+
// 'active' -> 'archived'; valid_to stays NULL, so the row lands in the archived
|
|
541
|
+
// bucket GET /memories?status=archived and GET /stats read. No body: the :id
|
|
542
|
+
// path segment is the whole input, bounded here (a malformed uuid can never
|
|
543
|
+
// match a stored uuid, so it is the same 404 as an unknown id — mirrors the
|
|
544
|
+
// proposals/:id routes). Core throws MemoryNotFoundError for an absent,
|
|
545
|
+
// cross-tenant, already-archived, or superseded id — the mapper's 404.
|
|
546
|
+
router.post('/api/v1/memories/:id/archive', (req, res) => {
|
|
547
|
+
void guard('archive', res, async () => {
|
|
548
|
+
const id = pathIdSchema.safeParse(req.params.id);
|
|
549
|
+
if (!id.success) {
|
|
550
|
+
res.status(404).json({ error: 'not_found' });
|
|
551
|
+
return;
|
|
552
|
+
}
|
|
553
|
+
// ACCESS GUARD: write access is asserted BEFORE the db op runs (self-host
|
|
554
|
+
// allowAllAccess allows all).
|
|
555
|
+
if (options.access)
|
|
556
|
+
await options.access.assertWrite(tenant(req));
|
|
557
|
+
const archived = await archiveMemory(tenant(req), id.data, 'user_api');
|
|
558
|
+
res.status(200).json({ id: archived.id, status: archived.status });
|
|
559
|
+
});
|
|
560
|
+
});
|
|
528
561
|
// GET /api/v1/proposals — bounded consolidation-proposal list over
|
|
529
562
|
// the EXISTING core listProposals. status/limit arrive as query params; limit is
|
|
530
563
|
// coerced before the single parse against proposalsListQuerySchema. The route
|