@3ngram/server 1.8.7 → 1.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/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 +58 -18
- 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/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 +76 -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/package.json +5 -5
package/dist/mcp/tools-search.js
CHANGED
|
@@ -69,7 +69,9 @@ function toFilters(input) {
|
|
|
69
69
|
* packages/core/src/read/excerpt.ts; contentLength/truncated let the caller
|
|
70
70
|
* fetch the full memory by id when the excerpt was cut). `compact` omits the
|
|
71
71
|
* triple (~5x fewer tokens per hit) for broad scans — the caller batch-fetches
|
|
72
|
-
* the interesting ids with get_memories.
|
|
72
|
+
* the interesting ids with get_memories. BOTH projections carry the filing
|
|
73
|
+
* (`scope`/`project`) and, only for a commitment, its lifecycle
|
|
74
|
+
* `commitmentStatus` — a resolved commitment stays a valid hit, labelled.
|
|
73
75
|
*/
|
|
74
76
|
function projectHit(hit, projection) {
|
|
75
77
|
const compact = {
|
|
@@ -78,6 +80,9 @@ function projectHit(hit, projection) {
|
|
|
78
80
|
topic: hit.topic,
|
|
79
81
|
score: hit.score,
|
|
80
82
|
superseded: hit.superseded,
|
|
83
|
+
scope: hit.scope,
|
|
84
|
+
project: hit.project,
|
|
85
|
+
...(hit.commitmentStatus === undefined ? {} : { commitmentStatus: hit.commitmentStatus }),
|
|
81
86
|
};
|
|
82
87
|
if (projection === 'compact')
|
|
83
88
|
return compact;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools-search.js","sourceRoot":"","sources":["../../src/mcp/tools-search.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,8EAA8E;AAC9E,4EAA4E;AAC5E,+EAA+E;AAC/E,uCAAuC;AACvC,EAAE;AACF,yEAAyE;AACzE,+EAA+E;AAC/E,oEAAoE;AACpE,mEAAmE;AACnE,OAAO,EACL,wBAAwB,EAGxB,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAML,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,gBAAgB,CAAA;AAEvB,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAA;AAG7D;;;;;GAKG;AACH,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,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,mFAAmF;AACnF,SAAS,OAAO,CACd,GAAM;IAEN,OAAO,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,CAE/E,CAAA;AACH,CAAC;AAED,mFAAmF;AACnF,SAAS,MAAM,CAAC,KAAyB;IACvC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAA;AAC1D,CAAC;AAED,SAAS,MAAM,CAAC,IAA2B;IACzC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAA;IACxC,OAAO,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;AACtF,CAAC;AAqBD;;;;;;;GAOG;AACH,SAAS,SAAS,CAAC,KAAsB;IACvC,OAAO,OAAO,CAAC;QACb,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;QAC9B,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC;QAC1C,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC;KAC7C,CAAC,CAAA;AACJ,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"tools-search.js","sourceRoot":"","sources":["../../src/mcp/tools-search.ts"],"names":[],"mappings":"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"}
|
package/dist/mcp/tools.js
CHANGED
|
@@ -19,9 +19,9 @@
|
|
|
19
19
|
// credential enters a log. A tool error returns a typed isError result to the
|
|
20
20
|
// client; the message names the failure class, never the content.
|
|
21
21
|
import { log, mcpToolCalls, mcpToolErrors } from '@3ngram/config';
|
|
22
|
-
import { getFacts, remember, resolveByMemoryId, revise, } from '@3ngram/core';
|
|
22
|
+
import { getFacts, remember, resolveByMemoryId, revise, reviseDisposition, } from '@3ngram/core';
|
|
23
23
|
import { MEMORY_READ_SCOPE, MEMORY_WRITE_SCOPE } from '@3ngram/core/auth';
|
|
24
|
-
import { factsQueryInputV2Schema, factsToolOutputSchema, MAX_CONTENT_LENGTH, rememberToolInputV2Schema, rememberToolOutputV2Schema, resolveToolInputSchema, resolveToolOutputSchema, reviseToolOutputSchema, reviseToolRequestSchema, } from '@3ngram/schema';
|
|
24
|
+
import { factsQueryInputV2Schema, factsToolOutputSchema, MAX_CONTENT_LENGTH, rememberToolInputV2Schema, rememberToolOutputV2Schema, resolveToolInputSchema, resolveToolOutputSchema, reviseToolOutputSchema, reviseToolOutputV2Schema, reviseToolRequestSchema, } from '@3ngram/schema';
|
|
25
25
|
import { parseOutput } from '../output-validation.js';
|
|
26
26
|
import { mapToolError } from './errors.js';
|
|
27
27
|
import { READ_ONLY_ANNOTATIONS } from './tool-annotations.js';
|
|
@@ -121,8 +121,9 @@ const rememberTool = {
|
|
|
121
121
|
},
|
|
122
122
|
async handler(args, ctx) {
|
|
123
123
|
// core remember() is THE validation boundary; pass the args straight through.
|
|
124
|
-
//
|
|
125
|
-
//
|
|
124
|
+
// The echoed scope is the one core WROTE (an omitted scope is resolved by
|
|
125
|
+
// the tenant's write-scope policy, issue #235); the rest echoes the
|
|
126
|
+
// normalized input (null project applied here).
|
|
126
127
|
// Embedding is on iff a gateway is configured — best-effort, never blocks.
|
|
127
128
|
const input = rememberToolInputV2Schema.parse(args);
|
|
128
129
|
const gatewayOpts = ctx.gateway === undefined
|
|
@@ -147,7 +148,7 @@ const rememberTool = {
|
|
|
147
148
|
id: written.id,
|
|
148
149
|
memoryType: input.memoryType,
|
|
149
150
|
topic: input.topic,
|
|
150
|
-
scope:
|
|
151
|
+
scope: written.scope,
|
|
151
152
|
project: input.project ?? null,
|
|
152
153
|
},
|
|
153
154
|
embedded,
|
|
@@ -243,14 +244,16 @@ const reviseTool = {
|
|
|
243
244
|
// boundary so a supplied `scope`/`project` reaches the handler and an unknown
|
|
244
245
|
// key is rejected, never silently stripped.
|
|
245
246
|
inputSchema: reviseToolRequestSchema,
|
|
246
|
-
outputSchema:
|
|
247
|
+
outputSchema: reviseToolOutputV2Schema,
|
|
247
248
|
// destructiveHint: false is the claim worth making visible. AGENTS.md hard
|
|
248
249
|
// rule 1: no write path destroys memory data. revise closes the
|
|
249
250
|
// predecessor's validity and APPENDS a successor row — the predecessor's
|
|
250
251
|
// content is never rewritten (packages/db/src/memory-revise.ts), and archive
|
|
251
252
|
// moves `status`, not content. The move disposition (issue #233) rewrites
|
|
252
253
|
// filing metadata only (scope/project/tags) and keeps the previous filing in
|
|
253
|
-
// its audit event.
|
|
254
|
+
// its audit event. The archive disposition (issue #217) flips `status`
|
|
255
|
+
// only, audited by an `archive` event, and a repeat reports
|
|
256
|
+
// `already_archived`. Not idempotent: each successor call appends a new row,
|
|
254
257
|
// and a repeat against an already-superseded predecessor is a typed
|
|
255
258
|
// rejection rather than a no-op (a repeated move is a harmless no-op).
|
|
256
259
|
annotations: {
|
|
@@ -267,6 +270,13 @@ const reviseTool = {
|
|
|
267
270
|
// echo comes from the write, not from the input. Embedding is best-effort
|
|
268
271
|
// and never blocks (same ack-before-embed as remember).
|
|
269
272
|
const input = reviseToolRequestSchema.parse(args);
|
|
273
|
+
// Only a disposition carries `memoryIds`: route it to its core entry point
|
|
274
|
+
// (the per-action dispatch configure_scope uses), which reports per-id
|
|
275
|
+
// outcomes and embeds nothing.
|
|
276
|
+
if ('memoryIds' in input) {
|
|
277
|
+
const result = await reviseDisposition(ctx.userId, input, 'user_mcp', { access: ctx.access });
|
|
278
|
+
return ok(parseOutput('revise', reviseToolOutputV2Schema, result));
|
|
279
|
+
}
|
|
270
280
|
const gatewayOpts = ctx.gateway === undefined
|
|
271
281
|
? { access: ctx.access, limits: ctx.limits }
|
|
272
282
|
: { gateway: ctx.gateway, budget: ctx.budget, access: ctx.access, limits: ctx.limits };
|
|
@@ -328,7 +338,7 @@ const resolveTool = {
|
|
|
328
338
|
// core fn takes no access gate, so the transport asserts it here.
|
|
329
339
|
if (ctx.access)
|
|
330
340
|
await ctx.access.assertWrite(ctx.userId);
|
|
331
|
-
const result = await resolveByMemoryId(ctx.userId, input.memoryId, input.status, 'user_mcp', input.sessionRunId);
|
|
341
|
+
const result = await resolveByMemoryId(ctx.userId, input.memoryId, input.status, 'user_mcp', input.sessionRunId, input.reason);
|
|
332
342
|
const output = parseOutput('resolve', resolveToolOutputSchema, {
|
|
333
343
|
commitmentId: result.id,
|
|
334
344
|
status: result.status,
|
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,kFAAkF;AAClF,8EAA8E;AAC9E,gFAAgF;AAChF,6EAA6E;AAC7E,iFAAiF;AACjF,kFAAkF;AAClF,kFAAkF;AAClF,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,8EAA8E;AAC9E,kEAAkE;AAClE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACjE,OAAO,EAGL,QAAQ,EAGR,QAAQ,EACR,iBAAiB,EACjB,MAAM,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/mcp/tools.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/errors.js
CHANGED
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
// bounded ids/hashes the typed error already carries (a uuid, a content hash, an
|
|
26
26
|
// FSM state — never content).
|
|
27
27
|
import { log } from '@3ngram/config';
|
|
28
|
-
import { AccessDeniedError, AccountDeletedError, AgentSessionNotFoundError, AgentSessionParamsConflictError, AgentSessionTriageConflictError, BudgetExceededError, CommitmentExistsError, CommitmentNotFoundError, CommitmentStateChangedError, DuplicateMemoryError, EdgeConflictError, EpisodicSupersessionError, formatUnscopedRetrievalDetail, IllegalCommitmentTransitionError, InvalidCommitmentTransitionError, InvalidEmbeddingError, MemoryNotFoundError, MissingSelectorError, NotCommitmentMemoryError, PredecessorAlreadySupersededError, PredecessorNotFoundError, ProposalNotFoundError, ResourceLimitExceededError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, UnknownSessionRunError, UnscopedRetrievalError, } from '@3ngram/core';
|
|
28
|
+
import { AccessDeniedError, AccountDeletedError, AgentSessionNotFoundError, AgentSessionParamsConflictError, AgentSessionTriageConflictError, BudgetExceededError, CommitmentExistsError, CommitmentNotFoundError, CommitmentStateChangedError, DuplicateMemoryError, EdgeConflictError, EpisodicSupersessionError, formatUnscopedRetrievalDetail, IllegalCommitmentTransitionError, InvalidCommitmentTransitionError, InvalidEmbeddingError, MemoryNotFoundError, MissingSelectorError, NotCommitmentMemoryError, PredecessorAlreadySupersededError, PredecessorNotFoundError, ProposalNotFoundError, ResolveReasonNotSupportedError, ResourceLimitExceededError, ScopeNameConflictError, ScopeNotFoundError, SuccessorNotLiveError, UnknownSessionRunError, UnscopedRetrievalError, UnscopedWriteError, } from '@3ngram/core';
|
|
29
29
|
import { ZodError } from 'zod';
|
|
30
30
|
import { CursorQueryMismatchError } from '../cursor.js';
|
|
31
31
|
import { OutputValidationError } from '../output-validation.js';
|
|
@@ -58,6 +58,20 @@ export function mapRestError(route, err) {
|
|
|
58
58
|
detail: formatUnscopedRetrievalDetail(err.registeredScopes),
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
|
+
// A `remember` without scope rejected by the caller's own write-scope policy
|
|
62
|
+
// (mode 'require', issue #235): 400 invalid_input, with the fixed recovery
|
|
63
|
+
// text as detail (names the fix; no content). Mirrors MCP.
|
|
64
|
+
if (err instanceof UnscopedWriteError) {
|
|
65
|
+
log().warn({ route, err: err.name }, 'rest: unscoped write rejected by policy');
|
|
66
|
+
return { status: 400, reason: 'invalid_input', detail: err.message };
|
|
67
|
+
}
|
|
68
|
+
// A blocker resolve carrying a `reason` (issue #234): blockers have no
|
|
69
|
+
// commitment row to hold one. 400 invalid_input with the fixed recovery text
|
|
70
|
+
// as detail — never the reason itself. Mirrors MCP.
|
|
71
|
+
if (err instanceof ResolveReasonNotSupportedError) {
|
|
72
|
+
log().warn({ route, err: err.name }, 'rest: resolve reason rejected for a blocker');
|
|
73
|
+
return { status: 400, reason: 'invalid_input', detail: err.message };
|
|
74
|
+
}
|
|
61
75
|
// Malformed CLIENT input — a ZodError from a boundary INPUT .parse() or a
|
|
62
76
|
// typed core validation error — is a 400, not a server fault: only the error
|
|
63
77
|
// class name is logged.
|
package/dist/rest/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,gFAAgF;AAChF,gFAAgF;AAChF,0EAA0E;AAC1E,iFAAiF;AACjF,gFAAgF;AAChF,mEAAmE;AACnE,EAAE;AACF,uDAAuD;AACvD,qFAAqF;AACrF,sFAAsF;AACtF,wFAAwF;AACxF,uEAAuE;AACvE,wEAAwE;AACxE,0DAA0D;AAC1D,0FAA0F;AAC1F,oFAAoF;AACpF,+EAA+E;AAC/E,8EAA8E;AAC9E,iFAAiF;AACjF,oCAAoC;AACpC,EAAE;AACF,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,8BAA8B;AAC9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EACL,iBAAiB,EACjB,mBAAmB,EACnB,yBAAyB,EACzB,+BAA+B,EAC/B,+BAA+B,EAC/B,mBAAmB,EACnB,qBAAqB,EACrB,uBAAuB,EACvB,2BAA2B,EAC3B,oBAAoB,EACpB,iBAAiB,EACjB,yBAAyB,EACzB,6BAA6B,EAC7B,gCAAgC,EAChC,gCAAgC,EAChC,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,wBAAwB,EACxB,iCAAiC,EACjC,wBAAwB,EACxB,qBAAqB,EACrB,0BAA0B,EAC1B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,EACtB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/rest/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,17 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type AsOfInput, type FactsRangeInput } from '@3ngram/schema';
|
|
2
2
|
import type { Request, Response } from 'express';
|
|
3
3
|
/** Drop undefined values so exact-optional core parameters remain absent. */
|
|
4
4
|
export declare function defined<T extends Record<string, unknown>>(obj: T): {
|
|
5
5
|
[K in keyof T]?: Exclude<T[K], undefined>;
|
|
6
6
|
};
|
|
7
|
+
/**
|
|
8
|
+
* Merge the revise route's URL id into its body BEFORE the single parse (the
|
|
9
|
+
* URL wins): the predecessorId of a successor or move, the one-element
|
|
10
|
+
* memoryIds batch of a disposition (issue #217). A body predecessorId on a
|
|
11
|
+
* disposition is dropped rather than rejected, since the SDK sends it for every
|
|
12
|
+
* kind and the URL governs anyway.
|
|
13
|
+
*/
|
|
14
|
+
export declare function mergeReviseTarget(body: unknown, id: string | undefined): Record<string, unknown>;
|
|
7
15
|
/** Map optional ISO coordinates to core Date values. */
|
|
8
16
|
export declare function toAsOf(asOf: AsOfInput | undefined): {
|
|
9
17
|
validAt?: Date;
|
|
@@ -3,11 +3,27 @@
|
|
|
3
3
|
// authenticated tenant access, temporal coercion, and uniform error mapping.
|
|
4
4
|
import { log } from '@3ngram/config';
|
|
5
5
|
import { crashSafeError } from '@3ngram/config/otel';
|
|
6
|
+
import { reviseDispositionKindSchema } from '@3ngram/schema';
|
|
6
7
|
import { mapRestError } from './errors.js';
|
|
7
8
|
/** Drop undefined values so exact-optional core parameters remain absent. */
|
|
8
9
|
export function defined(obj) {
|
|
9
10
|
return Object.fromEntries(Object.entries(obj).filter(([, value]) => value !== undefined));
|
|
10
11
|
}
|
|
12
|
+
const DISPOSITION_KINDS = new Set(reviseDispositionKindSchema.options);
|
|
13
|
+
/**
|
|
14
|
+
* Merge the revise route's URL id into its body BEFORE the single parse (the
|
|
15
|
+
* URL wins): the predecessorId of a successor or move, the one-element
|
|
16
|
+
* memoryIds batch of a disposition (issue #217). A body predecessorId on a
|
|
17
|
+
* disposition is dropped rather than rejected, since the SDK sends it for every
|
|
18
|
+
* kind and the URL governs anyway.
|
|
19
|
+
*/
|
|
20
|
+
export function mergeReviseTarget(body, id) {
|
|
21
|
+
const fields = { ...body };
|
|
22
|
+
if (!DISPOSITION_KINDS.has(fields.kind))
|
|
23
|
+
return { ...fields, predecessorId: id };
|
|
24
|
+
const { predecessorId: _urlWins, ...rest } = fields;
|
|
25
|
+
return { ...rest, memoryIds: [id] };
|
|
26
|
+
}
|
|
11
27
|
/** Map optional ISO coordinates to core Date values. */
|
|
12
28
|
export function toAsOf(asOf) {
|
|
13
29
|
if (asOf === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"route-helpers.js","sourceRoot":"","sources":["../../src/rest/route-helpers.ts"],"names":[],"mappings":"AAAA,sCAAsC;AACtC,wEAAwE;AACxE,6EAA6E;AAC7E,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAA;AACpC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"route-helpers.js","sourceRoot":"","sources":["../../src/rest/route-helpers.ts"],"names":[],"mappings":"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"}
|
package/dist/rest/router.js
CHANGED
|
@@ -20,13 +20,15 @@
|
|
|
20
20
|
// PARITY: this ships a SMOKE-level parity guarantee (REST remember -> the
|
|
21
21
|
// same content found via core search); FULL REST≡MCP≡core parity comes later.
|
|
22
22
|
import { log } from '@3ngram/config';
|
|
23
|
-
import { applyProposal, archiveMemory, briefing, deleteAccount, describeEnvironment, exportUserData, getAgentSessionRun, getBudgetStatus, getCurrentUser, getFacts, getMemoryById, getMemoryHistory, getSessionTriageAttempts, listMemories, listMemoryFacets,
|
|
24
|
-
import { accountDeleteBodySchema, archiveMemoryBodySchema, briefingToolInputV3Schema, factsQueryInputV2Schema, memoriesListQuerySchema, proposalRejectBodySchema, proposalsListQuerySchema, rememberToolInputV2Schema, resolveToolInputSchema, reviseToolRequestSchema, sessionEventsQuerySchema, sessionRunIdSchema, } from '@3ngram/schema';
|
|
23
|
+
import { applyProposal, archiveMemory, briefing, deleteAccount, describeEnvironment, exportUserData, getAgentSessionRun, getBudgetStatus, getCurrentUser, getFacts, getMemoryById, getMemoryHistory, getSessionTriageAttempts, listEdgeProposalsPage, listMemories, listMemoryFacets, listScopes, listSessionEvents, rejectProposal, remember, resolveByMemoryId, resolveRetrievalPolicy, revise, reviseDisposition, } from '@3ngram/core';
|
|
24
|
+
import { accountDeleteBodySchema, archiveMemoryBodySchema, briefingToolInputV3Schema, factsQueryInputV2Schema, memoriesListQuerySchema, proposalRejectBodySchema, proposalsListQuerySchema, proposalsListResponseSchema, rememberToolInputV2Schema, resolveToolInputSchema, reviseToolRequestSchema, sessionEventsQuerySchema, sessionRunIdSchema, } from '@3ngram/schema';
|
|
25
25
|
import { Router } from 'express';
|
|
26
26
|
import { z } from 'zod';
|
|
27
|
+
import { decodeProposalsCursor, encodeProposalsCursor, proposalsFingerprint } from '../cursor.js';
|
|
27
28
|
import { apiOrSessionAuth } from '../middleware/api-or-session.js';
|
|
29
|
+
import { parseOutput } from '../output-validation.js';
|
|
28
30
|
import { SERVER_VERSION } from '../version.js';
|
|
29
|
-
import { defined, guard, tenant, toAsOf, toRange } from './route-helpers.js';
|
|
31
|
+
import { defined, guard, mergeReviseTarget, tenant, toAsOf, toRange } from './route-helpers.js';
|
|
30
32
|
import { searchRouter } from './search-router.js';
|
|
31
33
|
import { sessionRouter } from './session-router.js';
|
|
32
34
|
// A non-UUID :id path segment can never match a stored uuid column, so treat a
|
|
@@ -93,8 +95,9 @@ export function restRouter(options) {
|
|
|
93
95
|
router.use(sessionRouter(options));
|
|
94
96
|
// POST /api/v1/memories — remember (mirrors the MCP remember tool). Core
|
|
95
97
|
// remember() is THE validation boundary; we re-parse here only to echo the
|
|
96
|
-
//
|
|
97
|
-
//
|
|
98
|
+
// normalized write (null project) in the response, exactly as the MCP tool
|
|
99
|
+
// does. The echoed scope is the one core WROTE (write-scope policy, #235).
|
|
100
|
+
// Embedding is ack-before-embed: never awaited.
|
|
98
101
|
router.post('/api/v1/memories', (req, res) => {
|
|
99
102
|
void guard('memories', res, async () => {
|
|
100
103
|
const input = rememberToolInputV2Schema.parse(req.body);
|
|
@@ -118,7 +121,7 @@ export function restRouter(options) {
|
|
|
118
121
|
id: written.id,
|
|
119
122
|
memoryType: input.memoryType,
|
|
120
123
|
topic: input.topic,
|
|
121
|
-
scope:
|
|
124
|
+
scope: written.scope,
|
|
122
125
|
project: input.project ?? null,
|
|
123
126
|
},
|
|
124
127
|
embedded,
|
|
@@ -338,7 +341,14 @@ export function restRouter(options) {
|
|
|
338
341
|
// GET /api/v1/memories/:id/history — identity-only lineage + audit trail for
|
|
339
342
|
// dashboard detail. Registered before /:id for route clarity. Returns no
|
|
340
343
|
// content and no raw audit payload values: only identity fields, typed edges,
|
|
341
|
-
// event kind/actor/time, and payload
|
|
344
|
+
// event kind/actor/time, payload metadata, and ALLOWLISTED payload keys as
|
|
345
|
+
// sibling fields — today only `sessionRunId` (issue #262), projected and
|
|
346
|
+
// re-parsed in packages/db the same way the agent-sessions events route
|
|
347
|
+
// narrows it, plus `createdBySessionRunId` (the run on this memory's own
|
|
348
|
+
// native `create` event). Both are ids, not content. The one content field is
|
|
349
|
+
// `lastResolutionReason` (issue #234): the owner's reason for the latest
|
|
350
|
+
// transition of the commitment riding this memory, returned only on this
|
|
351
|
+
// authenticated, tenant-scoped read and never logged.
|
|
342
352
|
router.get('/api/v1/memories/:id/history', (req, res) => {
|
|
343
353
|
void guard('memories.history', res, async () => {
|
|
344
354
|
const id = pathIdSchema.safeParse(req.params.id);
|
|
@@ -381,8 +391,11 @@ export function restRouter(options) {
|
|
|
381
391
|
actorKind: event.actorKind,
|
|
382
392
|
createdAt: event.createdAt.toISOString(),
|
|
383
393
|
payloadMetadata: event.payloadMetadata,
|
|
394
|
+
sessionRunId: event.sessionRunId,
|
|
384
395
|
})),
|
|
385
396
|
eventsTruncated: history.eventsTruncated,
|
|
397
|
+
createdBySessionRunId: history.createdBySessionRunId,
|
|
398
|
+
lastResolutionReason: history.lastResolutionReason,
|
|
386
399
|
sections: history.sections,
|
|
387
400
|
});
|
|
388
401
|
});
|
|
@@ -534,14 +547,23 @@ export function restRouter(options) {
|
|
|
534
547
|
});
|
|
535
548
|
});
|
|
536
549
|
// POST /api/v1/memories/:id/revise — revise (mirrors the MCP revise tool). The
|
|
537
|
-
// body is the full successor write,
|
|
538
|
-
//
|
|
539
|
-
//
|
|
540
|
-
//
|
|
550
|
+
// body is the full successor write, a `kind: "move"` refile (issue #233), or
|
|
551
|
+
// a `kind: "archive"` disposition (issue #217); core is THE validation
|
|
552
|
+
// boundary.
|
|
553
|
+
// :id is the target — merged into the body BEFORE the single parse, so the URL
|
|
554
|
+
// and body cannot disagree (the URL wins): as predecessorId for a successor or
|
|
555
|
+
// move, as the one-element memoryIds batch for a disposition.
|
|
541
556
|
router.post('/api/v1/memories/:id/revise', (req, res) => {
|
|
542
557
|
void guard('revise', res, async () => {
|
|
543
|
-
const
|
|
544
|
-
|
|
558
|
+
const input = reviseToolRequestSchema.parse(mergeReviseTarget(req.body, req.params.id));
|
|
559
|
+
// Only a disposition carries `memoryIds` (same dispatch as the MCP tool).
|
|
560
|
+
if ('memoryIds' in input) {
|
|
561
|
+
const result = await reviseDisposition(tenant(req), input, 'user_api', {
|
|
562
|
+
access: options.access,
|
|
563
|
+
});
|
|
564
|
+
res.status(200).json(result);
|
|
565
|
+
return;
|
|
566
|
+
}
|
|
545
567
|
const gatewayOpts = options.gateway === undefined
|
|
546
568
|
? { access: options.access, limits: options.limits }
|
|
547
569
|
: {
|
|
@@ -572,7 +594,8 @@ export function restRouter(options) {
|
|
|
572
594
|
// POST /api/v1/memories/:id/resolve — resolve (mirrors the MCP resolve tool,
|
|
573
595
|
// keyed on the MEMORY id from D1). :id -> memoryId merged with body -> status,
|
|
574
596
|
// THEN validated against resolveToolInputSchema (single boundary). Serves
|
|
575
|
-
// resolve AND unresolve (resolved -> open) — the FSM owns legality.
|
|
597
|
+
// resolve AND unresolve (resolved -> open) — the FSM owns legality. The
|
|
598
|
+
// optional `reason` (issue #234) passes straight through to core.
|
|
576
599
|
router.post('/api/v1/memories/:id/resolve', (req, res) => {
|
|
577
600
|
void guard('resolve', res, async () => {
|
|
578
601
|
const merged = { ...req.body, memoryId: req.params.id };
|
|
@@ -581,12 +604,13 @@ export function restRouter(options) {
|
|
|
581
604
|
// allowAllAccess allows all).
|
|
582
605
|
if (options.access)
|
|
583
606
|
await options.access.assertWrite(tenant(req));
|
|
584
|
-
const result = await resolveByMemoryId(tenant(req), input.memoryId, input.status, 'user_api', input.sessionRunId);
|
|
607
|
+
const result = await resolveByMemoryId(tenant(req), input.memoryId, input.status, 'user_api', input.sessionRunId, input.reason);
|
|
585
608
|
res.status(200).json({ commitmentId: result.id, status: result.status });
|
|
586
609
|
});
|
|
587
610
|
});
|
|
588
611
|
// POST /api/v1/memories/:id/archive — archive an active memory of ANY type
|
|
589
|
-
// (
|
|
612
|
+
// (the unguarded operator form; the agent-facing form is the revise archive
|
|
613
|
+
// disposition, issue #217, which rejects blockers and live commitments). status flips
|
|
590
614
|
// 'active' -> 'archived'; valid_to stays NULL, so the row lands in the archived
|
|
591
615
|
// bucket GET /memories?status=archived and GET /stats read. Optional body
|
|
592
616
|
// carries sessionRunId; omitted body is the same as {}. A malformed uuid path
|
|
@@ -608,29 +632,40 @@ export function restRouter(options) {
|
|
|
608
632
|
res.status(200).json({ id: archived.id, status: archived.status });
|
|
609
633
|
});
|
|
610
634
|
});
|
|
611
|
-
// GET /api/v1/proposals — bounded
|
|
612
|
-
//
|
|
613
|
-
//
|
|
614
|
-
//
|
|
635
|
+
// GET /api/v1/proposals — bounded, cursor-paginated EDGE-proposal list
|
|
636
|
+
// (issue #320). status/limit/cursor arrive as query params; limit is coerced
|
|
637
|
+
// before the single parse against proposalsListQuerySchema. The cursor is
|
|
638
|
+
// bound to the REST edge-only walk, the status filter and the tenant (hashed),
|
|
639
|
+
// so an MCP cursor, a cursor for another status, or another tenant's cursor is
|
|
640
|
+
// a 400. The route shapes the records (timestamps to ISO; rationale may be
|
|
641
|
+
// null) and validates the envelope against proposalsListResponseSchema
|
|
642
|
+
// (a shape fault is a 500 invalid_output, never a silently wrong page).
|
|
615
643
|
router.get('/api/v1/proposals', (req, res) => {
|
|
616
644
|
void guard('proposals.list', res, async () => {
|
|
617
645
|
const query = proposalsListQuerySchema.parse(defined({
|
|
618
646
|
status: req.query.status,
|
|
619
647
|
limit: req.query.limit === undefined ? undefined : Number(req.query.limit),
|
|
648
|
+
cursor: req.query.cursor,
|
|
620
649
|
}));
|
|
621
650
|
// ACCESS GUARD: proposals are memory-derived (consolidation candidates over
|
|
622
651
|
// the tenant's memories), so read access is asserted BEFORE the read
|
|
623
652
|
// (self-host allowAllAccess allows all).
|
|
624
653
|
if (options.access)
|
|
625
654
|
await options.access.assertRead(tenant(req));
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
|
|
655
|
+
const fp = proposalsFingerprint({
|
|
656
|
+
surface: 'rest',
|
|
657
|
+
kinds: ['edge'],
|
|
658
|
+
status: query.status,
|
|
659
|
+
tenant: tenant(req),
|
|
660
|
+
});
|
|
661
|
+
const after = query.cursor === undefined ? undefined : decodeProposalsCursor(query.cursor, fp);
|
|
662
|
+
const page = await listEdgeProposalsPage(tenant(req), {
|
|
663
|
+
status: query.status,
|
|
629
664
|
limit: query.limit,
|
|
630
|
-
|
|
665
|
+
after,
|
|
631
666
|
});
|
|
632
|
-
|
|
633
|
-
proposals: proposals.map((proposal) => ({
|
|
667
|
+
const body = parseOutput('proposals.list', proposalsListResponseSchema, {
|
|
668
|
+
proposals: page.proposals.map((proposal) => ({
|
|
634
669
|
id: proposal.id,
|
|
635
670
|
fromId: proposal.fromId,
|
|
636
671
|
toId: proposal.toId,
|
|
@@ -642,8 +677,13 @@ export function restRouter(options) {
|
|
|
642
677
|
decidedAt: proposal.decidedAt?.toISOString() ?? null,
|
|
643
678
|
createdAt: proposal.createdAt.toISOString(),
|
|
644
679
|
})),
|
|
645
|
-
count:
|
|
680
|
+
// `count` keeps its shipped meaning: rows on THIS page, never a total.
|
|
681
|
+
count: page.proposals.length,
|
|
682
|
+
totals: page.totals,
|
|
683
|
+
hasMore: page.hasMore,
|
|
684
|
+
...(page.next === undefined ? {} : { nextCursor: encodeProposalsCursor(page.next, fp) }),
|
|
646
685
|
});
|
|
686
|
+
res.status(200).json(body);
|
|
647
687
|
});
|
|
648
688
|
});
|
|
649
689
|
// POST /api/v1/proposals/:id/apply — accept a proposal over the
|
|
@@ -809,6 +849,7 @@ export function restRouter(options) {
|
|
|
809
849
|
recordedAt: memory.recordedAt.toISOString(),
|
|
810
850
|
createdAt: memory.createdAt.toISOString(),
|
|
811
851
|
updatedAt: memory.updatedAt.toISOString(),
|
|
852
|
+
lastReviewedAt: memory.lastReviewedAt?.toISOString() ?? null,
|
|
812
853
|
})),
|
|
813
854
|
facts: data.facts.map((fact) => ({
|
|
814
855
|
id: fact.id,
|
|
@@ -831,6 +872,7 @@ export function restRouter(options) {
|
|
|
831
872
|
recurrence: commitment.recurrence ?? null,
|
|
832
873
|
nextSurfacingAt: commitment.nextSurfacingAt?.toISOString() ?? null,
|
|
833
874
|
resolvedAt: commitment.resolvedAt?.toISOString() ?? null,
|
|
875
|
+
lastResolutionReason: commitment.lastResolutionReason ?? null,
|
|
834
876
|
createdAt: commitment.createdAt.toISOString(),
|
|
835
877
|
updatedAt: commitment.updatedAt.toISOString(),
|
|
836
878
|
})),
|
|
@@ -941,6 +983,13 @@ export function restRouter(options) {
|
|
|
941
983
|
updatedAt: data.retrievalPolicy.updatedAt.toISOString(),
|
|
942
984
|
}
|
|
943
985
|
: null,
|
|
986
|
+
writeScopePolicy: data.writeScopePolicy
|
|
987
|
+
? {
|
|
988
|
+
mode: data.writeScopePolicy.mode,
|
|
989
|
+
defaultScope: data.writeScopePolicy.defaultScope,
|
|
990
|
+
updatedAt: data.writeScopePolicy.updatedAt.toISOString(),
|
|
991
|
+
}
|
|
992
|
+
: null,
|
|
944
993
|
counts: {
|
|
945
994
|
memories: data.memories.length,
|
|
946
995
|
facts: data.facts.length,
|