@mastra/factory 0.29.1-alpha.1 → 0.29.1-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +10 -3
- package/dist/factory.js.map +1 -1
- package/dist/routes/contracts.d.ts +8 -0
- package/dist/routes/contracts.d.ts.map +1 -1
- package/dist/routes/contracts.js +3 -1
- package/dist/routes/contracts.js.map +1 -1
- package/dist/routes/run-stop-marker.d.ts +13 -0
- package/dist/routes/run-stop-marker.d.ts.map +1 -0
- package/dist/routes/run-stop-marker.js +36 -0
- package/dist/routes/run-stop-marker.js.map +1 -0
- package/dist/routes/session-access.d.ts +1 -0
- package/dist/routes/session-access.d.ts.map +1 -1
- package/dist/routes/session-access.js +1 -1
- package/dist/routes/session-access.js.map +1 -1
- package/dist/routes/session-rows.d.ts.map +1 -1
- package/dist/routes/session-rows.js +1 -0
- package/dist/routes/session-rows.js.map +1 -1
- package/dist/rules/dispatcher.d.ts.map +1 -1
- package/dist/rules/dispatcher.js +57 -16
- package/dist/rules/dispatcher.js.map +1 -1
- package/dist/session/session-row-query.d.ts +6 -0
- package/dist/session/session-row-query.d.ts.map +1 -1
- package/dist/session/session-row-query.js +6 -2
- package/dist/session/session-row-query.js.map +1 -1
- package/dist/session/session-row-view.d.ts.map +1 -1
- package/dist/session/session-row-view.js +7 -2
- package/dist/session/session-row-view.js.map +1 -1
- package/dist/storage/domains/work-items/base.d.ts +19 -0
- package/dist/storage/domains/work-items/base.d.ts.map +1 -1
- package/dist/storage/domains/work-items/base.js +29 -0
- package/dist/storage/domains/work-items/base.js.map +1 -1
- package/package.json +8 -8
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { MiddlewareHandler } from 'hono';
|
|
2
|
+
import type { WorkItemsStorage } from '../storage/domains/work-items/base.js';
|
|
3
|
+
import type { RouteAuth } from './route.js';
|
|
4
|
+
/**
|
|
5
|
+
* Records a session abort request on the session's Factory run bindings before the abort runs, so
|
|
6
|
+
* the dispatcher settles the run as stopped instead of retrying it. Only explicit client requests
|
|
7
|
+
* pass through here; a process going away aborts without one, and that run still retries.
|
|
8
|
+
*/
|
|
9
|
+
export declare function createRunStopMarker({ auth, workItems, }: {
|
|
10
|
+
auth: Pick<RouteAuth, 'enabled' | 'ensureUser' | 'tenant'>;
|
|
11
|
+
workItems: () => Pick<WorkItemsStorage, 'requestRunBindingStop'> | undefined;
|
|
12
|
+
}): MiddlewareHandler;
|
|
13
|
+
//# sourceMappingURL=run-stop-marker.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-stop-marker.d.ts","sourceRoot":"","sources":["../../src/routes/run-stop-marker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAE9C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAG5C;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,EAClC,IAAI,EACJ,SAAS,GACV,EAAE;IACD,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,CAAC;IAC3D,SAAS,EAAE,MAAM,IAAI,CAAC,gBAAgB,EAAE,uBAAuB,CAAC,GAAG,SAAS,CAAC;CAC9E,GAAG,iBAAiB,CAyBpB"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { SESSION_PATH } from "./session-access.js";
|
|
2
|
+
// src/routes/run-stop-marker.ts
|
|
3
|
+
/**
|
|
4
|
+
* Records a session abort request on the session's Factory run bindings before the abort runs, so
|
|
5
|
+
* the dispatcher settles the run as stopped instead of retrying it. Only explicit client requests
|
|
6
|
+
* pass through here; a process going away aborts without one, and that run still retries.
|
|
7
|
+
*/
|
|
8
|
+
function createRunStopMarker({ auth, workItems }) {
|
|
9
|
+
const callerOrgId = async (c) => {
|
|
10
|
+
if (!auth.enabled()) return "local";
|
|
11
|
+
await auth.ensureUser(c);
|
|
12
|
+
return auth.tenant(c)?.orgId;
|
|
13
|
+
};
|
|
14
|
+
return async (c, next) => {
|
|
15
|
+
const match = c.req.method === "POST" ? SESSION_PATH.exec(c.req.path) : null;
|
|
16
|
+
const storage = match !== null && c.req.path.slice(match.index + match[0].length) === "/abort" ? workItems() : void 0;
|
|
17
|
+
if (!match || !storage) return next();
|
|
18
|
+
try {
|
|
19
|
+
const orgId = await callerOrgId(c);
|
|
20
|
+
if (orgId) await storage.requestRunBindingStop({
|
|
21
|
+
orgId,
|
|
22
|
+
sessionId: decodeURIComponent(match[1]),
|
|
23
|
+
at: /* @__PURE__ */ new Date()
|
|
24
|
+
});
|
|
25
|
+
} catch (error) {
|
|
26
|
+
console.warn("[Factory] Could not record a stop request", {
|
|
27
|
+
path: c.req.path,
|
|
28
|
+
error: error instanceof Error ? error.message : String(error)
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
return next();
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export { createRunStopMarker };
|
|
35
|
+
|
|
36
|
+
//# sourceMappingURL=run-stop-marker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-stop-marker.js","names":[],"sources":["../../src/routes/run-stop-marker.ts"],"sourcesContent":["import type { MiddlewareHandler } from 'hono';\n\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { RouteAuth } from './route.js';\nimport { SESSION_PATH } from './session-access.js';\n\n/**\n * Records a session abort request on the session's Factory run bindings before the abort runs, so\n * the dispatcher settles the run as stopped instead of retrying it. Only explicit client requests\n * pass through here; a process going away aborts without one, and that run still retries.\n */\nexport function createRunStopMarker({\n auth,\n workItems,\n}: {\n auth: Pick<RouteAuth, 'enabled' | 'ensureUser' | 'tenant'>;\n workItems: () => Pick<WorkItemsStorage, 'requestRunBindingStop'> | undefined;\n}): MiddlewareHandler {\n const callerOrgId = async (c: Parameters<MiddlewareHandler>[0]): Promise<string | undefined> => {\n if (!auth.enabled()) return 'local';\n await auth.ensureUser(c);\n return auth.tenant(c)?.orgId;\n };\n return async (c, next) => {\n // The session the access guard authorized, and only when the rest of the path is the abort route.\n const match = c.req.method === 'POST' ? SESSION_PATH.exec(c.req.path) : null;\n const aborts = match !== null && c.req.path.slice(match.index + match[0].length) === '/abort';\n const storage = aborts ? workItems() : undefined;\n if (!match || !storage) return next();\n try {\n const orgId = await callerOrgId(c);\n if (orgId)\n await storage.requestRunBindingStop({ orgId, sessionId: decodeURIComponent(match[1]!), at: new Date() });\n } catch (error) {\n // Stop still stops; only the retry decision loses its signal.\n console.warn('[Factory] Could not record a stop request', {\n path: c.req.path,\n error: error instanceof Error ? error.message : String(error),\n });\n }\n return next();\n };\n}\n"],"mappings":";;;;;;;AAWA,SAAgB,oBAAoB,EAClC,MACA,aAIoB;CACpB,MAAM,cAAc,OAAO,MAAqE;EAC9F,IAAI,CAAC,KAAK,QAAQ,GAAG,OAAO;EAC5B,MAAM,KAAK,WAAW,CAAC;EACvB,OAAO,KAAK,OAAO,CAAC,CAAC,EAAE;CACzB;CACA,OAAO,OAAO,GAAG,SAAS;EAExB,MAAM,QAAQ,EAAE,IAAI,WAAW,SAAS,aAAa,KAAK,EAAE,IAAI,IAAI,IAAI;EAExE,MAAM,UADS,UAAU,QAAQ,EAAE,IAAI,KAAK,MAAM,MAAM,QAAQ,MAAM,EAAE,CAAC,MAAM,MAAM,WAC5D,UAAU,IAAI,KAAA;EACvC,IAAI,CAAC,SAAS,CAAC,SAAS,OAAO,KAAK;EACpC,IAAI;GACF,MAAM,QAAQ,MAAM,YAAY,CAAC;GACjC,IAAI,OACF,MAAM,QAAQ,sBAAsB;IAAE;IAAO,WAAW,mBAAmB,MAAM,EAAG;IAAG,oBAAI,IAAI,KAAK;GAAE,CAAC;EAC3G,SAAS,OAAO;GAEd,QAAQ,KAAK,6CAA6C;IACxD,MAAM,EAAE,IAAI;IACZ,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;GAC9D,CAAC;EACH;EACA,OAAO,KAAK;CACd;AACF"}
|
|
@@ -32,6 +32,7 @@ export interface SessionResourceLookup {
|
|
|
32
32
|
resourceId: string;
|
|
33
33
|
} | null>;
|
|
34
34
|
}
|
|
35
|
+
export declare const SESSION_PATH: RegExp;
|
|
35
36
|
/**
|
|
36
37
|
* Keeps private sessions private. A memory resource says who may read it: a
|
|
37
38
|
* private session runs on its owner's user id, a shared one on its Factory's
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-access.d.ts","sourceRoot":"","sources":["../../src/routes/session-access.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEtF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAC7C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACzB,OAAO,CAET;AAED,gGAAgG;AAChG,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC,EACtE,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAGT;AAED,gHAAgH;AAChH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAC7C,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACzB,OAAO,CAET;AAED,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE;YAAE,aAAa,IAAI,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAC9F,eAAe,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACtF;
|
|
1
|
+
{"version":3,"file":"session-access.d.ts","sourceRoot":"","sources":["../../src/routes/session-access.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAW,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEtF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAC7C,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACzB,OAAO,CAET;AAED,gGAAgG;AAChG,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,OAAO,GAAG,QAAQ,GAAG,YAAY,CAAC,EACtE,MAAM,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACzC,OAAO,CAGT;AAED,gHAAgH;AAChH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,EAC7C,MAAM,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GACzB,OAAO,CAET;AAED,qFAAqF;AACrF,MAAM,WAAW,qBAAqB;IACpC,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE;YAAE,aAAa,IAAI,MAAM,CAAA;SAAE,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAC9F,eAAe,CAAC,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;CACtF;AAMD,eAAO,MAAM,YAAY,QAAiD,CAAC;AA+F3E;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,IAAI,EACJ,QAAQ,EACR,QAAQ,EACR,UAAU,GACX,EAAE;IACD,IAAI,EAAE,SAAS,CAAC;IAChB,QAAQ,EAAE,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;IAC7D,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,KAAK,CAAC,CAAC;IAC9C,6EAA6E;IAC7E,UAAU,EAAE,MAAM,qBAAqB,GAAG,SAAS,CAAC;CACrD,GAAG,iBAAiB,CAiEpB"}
|
|
@@ -205,6 +205,6 @@ async function filterActiveRuns(c, canReach) {
|
|
|
205
205
|
headers
|
|
206
206
|
});
|
|
207
207
|
}
|
|
208
|
-
export { canReadSessionResource, canSwitchSessionModel, canViewSourceControlSession, createSessionAccessGuard };
|
|
208
|
+
export { SESSION_PATH, canReadSessionResource, canSwitchSessionModel, canViewSourceControlSession, createSessionAccessGuard };
|
|
209
209
|
|
|
210
210
|
//# sourceMappingURL=session-access.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-access.js","names":[],"sources":["../../src/routes/session-access.ts"],"sourcesContent":["import { MASTRA_RESOURCE_ID_KEY } from '@mastra/core/request-context';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport type { Context, MiddlewareHandler } from 'hono';\n\nimport type { SourceControlSessionLookup } from '../session/factory-session.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { SourceControlSession } from '../storage/domains/source-control/base.js';\nimport { UUID_PATTERN } from './contracts.js';\nimport type { RouteAuth } from './route.js';\n\n/**\n * Whether the viewer may read a visible session's conversation. A session on its owner's memory is\n * the owner's alone, whatever its row says.\n */\nexport function canReadSessionResource(\n session: Pick<SourceControlSession, 'userId'>,\n resourceId: string,\n viewer: { userId: string },\n): boolean {\n return viewer.userId === session.userId || resourceId !== session.userId;\n}\n\n/** Whether a viewer may read or drive a session: same org, and the owner when it is private. */\nexport function canViewSourceControlSession(\n session: Pick<SourceControlSession, 'orgId' | 'userId' | 'visibility'>,\n viewer: { orgId?: string; userId: string },\n): boolean {\n if (session.orgId !== viewer.orgId) return false;\n return session.visibility !== 'private' || session.userId === viewer.userId;\n}\n\n/** A teammate steers a shared session; only its owner changes the model and thinking level its turns run on. */\nexport function canSwitchSessionModel(\n session: Pick<SourceControlSession, 'userId'>,\n viewer: { userId: string },\n): boolean {\n return session.userId === viewer.userId;\n}\n\n/** The controller reads the guard needs to find which resource a session runs on. */\nexport interface SessionResourceLookup {\n getSession(sessionId: string): Promise<{ identity: { getResourceId(): string } } | undefined>;\n queryThreadById(input: { threadId: string }): Promise<{ resourceId: string } | null>;\n}\n\ntype Viewer = { orgId?: string; userId: string };\n\nconst FACTORY_PROJECT_ID = new RegExp(UUID_PATTERN);\n\nconst SESSION_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/([^/]+)/;\nconst CREATE_SESSION_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/?$/;\nconst SET_RESOURCE_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/resource\\/?$/;\nconst OM_CONFIG_PATH = /^\\/web\\/config\\/om(\\/|$)/;\nconst MEMORY_PATH = /^\\/api\\/memory(\\/|$)/;\nconst ACTIVE_RUNS_PATH = /\\/agent-controller\\/[^/]+\\/active-runs\\/?$/;\nconst SWITCH_MODEL_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/model\\/?$/;\nconst SET_STATE_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/state\\/?$/;\n\n/** A form field as the server adapter reads it: JSON when it parses, else the raw text. */\nfunction parseFormField(value: string): unknown {\n try {\n return JSON.parse(value);\n } catch {\n return value;\n }\n}\n\n/** The body a handler can see: a multipart form parsed field by field as the server adapter does, else JSON. */\nasync function requestBody(c: Context): Promise<unknown> {\n // Read a clone: the Mastra adapter clones `c.req.raw` again to parse params,\n // which throws once anything has consumed the original body.\n const request = c.req.raw.clone();\n if (!c.req.header('content-type')?.includes('multipart/form-data')) return request.json().catch(() => undefined);\n const form = await request.formData().catch(() => undefined);\n if (!form) return undefined;\n return Object.fromEntries(\n [...form].map(([name, value]) => [name, typeof value === 'string' ? parseFormField(value) : value]),\n );\n}\n\nasync function bodyValue(c: Context, field: string): Promise<unknown> {\n const body = await requestBody(c);\n return (body as Record<string, unknown> | undefined)?.[field];\n}\n\nasync function bodyField(c: Context, field: string): Promise<string | undefined> {\n const value = await bodyValue(c, field);\n return typeof value === 'string' && value ? value : undefined;\n}\n\nasync function switchesModel(c: Context): Promise<boolean> {\n const { method, path } = c.req;\n if (method === 'POST' && SWITCH_MODEL_PATH.test(path)) return true;\n if (method !== 'PUT' || !SET_STATE_PATH.test(path)) return false;\n const state = await bodyValue(c, 'state');\n return typeof state === 'object' && state !== null && 'thinkingLevel' in state;\n}\n\nfunction decodeSegment(segment: string): string {\n try {\n return decodeURIComponent(segment);\n } catch {\n return segment;\n }\n}\n\n/** The value of `field` from the query or the body; `null` when they differ, since handlers read one or the other. */\nasync function queryOrBody(c: Context, field: string): Promise<string | undefined | null> {\n const fromQuery = c.req.query(field) || undefined;\n const fromBody = c.req.method === 'GET' ? undefined : await bodyField(c, field);\n if (fromQuery && fromBody && fromQuery !== fromBody) return null;\n return fromQuery ?? fromBody;\n}\n\n/** The sessions and memory resources a request addresses. `null` when it names one ambiguously. */\nasync function addressed(c: Context): Promise<{ sessionIds: string[]; resourceIds: string[] } | null> {\n const path = c.req.path;\n const method = c.req.method;\n const sessionMatch = SESSION_PATH.exec(path);\n if (sessionMatch) {\n const sessionId = decodeSegment(sessionMatch[1]!);\n // Re-keying moves the session onto `newResourceId`, so that resource must be reachable too.\n const target = method === 'POST' && SET_RESOURCE_PATH.test(path) ? await bodyField(c, 'newResourceId') : undefined;\n return { sessionIds: [sessionId], resourceIds: target ? [target] : [] };\n }\n if (method === 'POST' && CREATE_SESSION_PATH.test(path)) {\n // Get-or-create: without a `sessionId` the session is addressed by its resourceId.\n const [sessionId, resourceId] = await Promise.all([bodyField(c, 'sessionId'), bodyField(c, 'resourceId')]);\n const id = sessionId ?? resourceId;\n return { sessionIds: id ? [id] : [], resourceIds: resourceId ? [resourceId] : [] };\n }\n if (OM_CONFIG_PATH.test(path)) {\n const sessionId = await queryOrBody(c, 'sessionId');\n if (sessionId === null) return null;\n return { sessionIds: sessionId ? [sessionId] : [], resourceIds: [] };\n }\n if (MEMORY_PATH.test(path)) {\n const resourceId = await queryOrBody(c, 'resourceId');\n if (resourceId === null) return null;\n return { sessionIds: [], resourceIds: resourceId ? [resourceId] : [] };\n }\n return { sessionIds: [], resourceIds: [] };\n}\n\n/**\n * Keeps private sessions private. A memory resource says who may read it: a\n * private session runs on its owner's user id, a shared one on its Factory's\n * id, and a session from before resources were shared on its own id. So a\n * caller reaches a resource only when it is their own user id, a Factory in\n * their organization, or a session id whose session they can view; any other\n * resource (another person's user id) answers 404.\n *\n * Session routes (stream, messages, threads, state, OM settings) resolve the\n * session from an in-memory map or its stored thread with no ownership check,\n * so both the session row and the resource it runs on are checked. Memory\n * routes trust a client-supplied resourceId or threadId, so they are bound to\n * the authorized resource, or the caller's own user id when none is named. The\n * controller-wide active-runs list drops runs on unreachable resources.\n * Denials answer 404 so ids do not leak existence. A teammate who can see a\n * session but tries to change its model or thinking level gets 403. With auth\n * disabled there is no tenant to protect and everything passes through.\n */\nexport function createSessionAccessGuard({\n auth,\n sessions,\n projects,\n controller,\n}: {\n auth: RouteAuth;\n sessions: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n projects: Pick<FactoryProjectsStorage, 'get'>;\n /** Resolved per request: the controller is built after the server config. */\n controller: () => SessionResourceLookup | undefined;\n}): MiddlewareHandler {\n const canReachResource = async (resourceId: string, viewer: Viewer): Promise<boolean> => {\n if (resourceId === viewer.userId) return true;\n const session = await sessions.getBySessionId(resourceId);\n if (session) return canViewSourceControlSession(session, viewer);\n // What is left is a Factory id or another person's user id, and only a Factory id is a uuid.\n if (!viewer.orgId || !FACTORY_PROJECT_ID.test(resourceId)) return false;\n return (await projects.get({ orgId: viewer.orgId, id: resourceId })) !== null;\n };\n\n const sessionResourceId = async (sessionId: string): Promise<string> => {\n const lookup = controller();\n if (!lookup) return sessionId;\n const live = await lookup.getSession(sessionId);\n if (live) return live.identity.getResourceId();\n return (await lookup.queryThreadById({ threadId: sessionId }))?.resourceId ?? sessionId;\n };\n\n const canReachSession = async (sessionId: string, viewer: Viewer): Promise<boolean> => {\n const session = await sessions.getBySessionId(sessionId);\n if (session && !canViewSourceControlSession(session, viewer)) return false;\n const resourceId = await sessionResourceId(sessionId);\n // A session on its own id was just checked by its row; one without a row is nobody's private session.\n if (resourceId === sessionId) return true;\n return canReachResource(resourceId, viewer);\n };\n\n return async (c, next) => {\n if (!auth.enabled()) return next();\n const ctx = c as unknown as Context;\n const target = await addressed(ctx);\n if (!target) return c.json({ error: 'The query and body must name the same session' }, 400);\n const isMemory = MEMORY_PATH.test(ctx.req.path);\n const isActiveRuns = ctx.req.method === 'GET' && ACTIVE_RUNS_PATH.test(ctx.req.path);\n if (!target.sessionIds.length && !target.resourceIds.length && !isMemory && !isActiveRuns) return next();\n\n await auth.ensureUser(ctx);\n const viewer = auth.tenant(ctx);\n if (!viewer) return c.json({ error: 'Session not found' }, 404);\n for (const sessionId of target.sessionIds) {\n if (!(await canReachSession(sessionId, viewer))) return c.json({ error: 'Session not found' }, 404);\n }\n for (const resourceId of target.resourceIds) {\n if (!(await canReachResource(resourceId, viewer))) return c.json({ error: 'Session not found' }, 404);\n }\n if (await switchesModel(ctx)) {\n for (const sessionId of target.sessionIds) {\n const session = await sessions.getBySessionId(sessionId);\n if (session && !canSwitchSessionModel(session, viewer)) {\n return c.json({ error: 'Only the session’s owner can change its model' }, 403);\n }\n }\n }\n\n if (isMemory) {\n // Memory routes only check that a thread belongs to the request's resource\n // when one is bound server-side. Bind the resource just authorized, or the\n // caller's own user id, so a threadId cannot reach another resource's thread.\n const requestContext = ctx.get('requestContext') as RequestContext | undefined;\n requestContext?.set(MASTRA_RESOURCE_ID_KEY, target.resourceIds[0] ?? viewer.userId);\n }\n if (!isActiveRuns) return next();\n await next();\n await filterActiveRuns(ctx, resourceId => canReachResource(resourceId, viewer));\n };\n}\n\n/** Drops runs on resources the caller cannot reach from the controller-wide active-runs list. */\nasync function filterActiveRuns(c: Context, canReach: (resourceId: string) => Promise<boolean>): Promise<void> {\n if (!c.res.ok) return;\n const body = (await c.res\n .clone()\n .json()\n .catch(() => undefined)) as { runs?: Array<{ resourceId?: unknown }> } | undefined;\n if (!body || !Array.isArray(body.runs)) return;\n const resourceIds = [\n ...new Set(body.runs.flatMap(run => (typeof run.resourceId === 'string' ? [run.resourceId] : []))),\n ];\n // A resource whose check fails is treated as unreachable, so one run cannot fail the whole list.\n const checks = await Promise.allSettled(resourceIds.map(id => canReach(id)));\n checks.forEach((check, index) => {\n if (check.status === 'rejected') {\n console.warn('[Factory Sessions] Could not check access to an active run resource; hiding its runs', {\n resourceId: resourceIds[index],\n error: check.reason,\n });\n }\n });\n const reachable = new Set(\n resourceIds.filter((_, index) => checks[index]!.status === 'fulfilled' && checks[index]!.value),\n );\n const runs = body.runs.filter(run => typeof run.resourceId !== 'string' || reachable.has(run.resourceId));\n if (runs.length === body.runs.length) return;\n const headers = new Headers(c.res.headers);\n headers.delete('content-length');\n c.res.headers.delete('content-length');\n c.res = new Response(JSON.stringify({ ...body, runs }), { status: c.res.status, headers });\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-access.js","names":[],"sources":["../../src/routes/session-access.ts"],"sourcesContent":["import { MASTRA_RESOURCE_ID_KEY } from '@mastra/core/request-context';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport type { Context, MiddlewareHandler } from 'hono';\n\nimport type { SourceControlSessionLookup } from '../session/factory-session.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { SourceControlSession } from '../storage/domains/source-control/base.js';\nimport { UUID_PATTERN } from './contracts.js';\nimport type { RouteAuth } from './route.js';\n\n/**\n * Whether the viewer may read a visible session's conversation. A session on its owner's memory is\n * the owner's alone, whatever its row says.\n */\nexport function canReadSessionResource(\n session: Pick<SourceControlSession, 'userId'>,\n resourceId: string,\n viewer: { userId: string },\n): boolean {\n return viewer.userId === session.userId || resourceId !== session.userId;\n}\n\n/** Whether a viewer may read or drive a session: same org, and the owner when it is private. */\nexport function canViewSourceControlSession(\n session: Pick<SourceControlSession, 'orgId' | 'userId' | 'visibility'>,\n viewer: { orgId?: string; userId: string },\n): boolean {\n if (session.orgId !== viewer.orgId) return false;\n return session.visibility !== 'private' || session.userId === viewer.userId;\n}\n\n/** A teammate steers a shared session; only its owner changes the model and thinking level its turns run on. */\nexport function canSwitchSessionModel(\n session: Pick<SourceControlSession, 'userId'>,\n viewer: { userId: string },\n): boolean {\n return session.userId === viewer.userId;\n}\n\n/** The controller reads the guard needs to find which resource a session runs on. */\nexport interface SessionResourceLookup {\n getSession(sessionId: string): Promise<{ identity: { getResourceId(): string } } | undefined>;\n queryThreadById(input: { threadId: string }): Promise<{ resourceId: string } | null>;\n}\n\ntype Viewer = { orgId?: string; userId: string };\n\nconst FACTORY_PROJECT_ID = new RegExp(UUID_PATTERN);\n\nexport const SESSION_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/([^/]+)/;\nconst CREATE_SESSION_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/?$/;\nconst SET_RESOURCE_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/resource\\/?$/;\nconst OM_CONFIG_PATH = /^\\/web\\/config\\/om(\\/|$)/;\nconst MEMORY_PATH = /^\\/api\\/memory(\\/|$)/;\nconst ACTIVE_RUNS_PATH = /\\/agent-controller\\/[^/]+\\/active-runs\\/?$/;\nconst SWITCH_MODEL_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/model\\/?$/;\nconst SET_STATE_PATH = /\\/agent-controller\\/[^/]+\\/sessions\\/[^/]+\\/state\\/?$/;\n\n/** A form field as the server adapter reads it: JSON when it parses, else the raw text. */\nfunction parseFormField(value: string): unknown {\n try {\n return JSON.parse(value);\n } catch {\n return value;\n }\n}\n\n/** The body a handler can see: a multipart form parsed field by field as the server adapter does, else JSON. */\nasync function requestBody(c: Context): Promise<unknown> {\n // Read a clone: the Mastra adapter clones `c.req.raw` again to parse params,\n // which throws once anything has consumed the original body.\n const request = c.req.raw.clone();\n if (!c.req.header('content-type')?.includes('multipart/form-data')) return request.json().catch(() => undefined);\n const form = await request.formData().catch(() => undefined);\n if (!form) return undefined;\n return Object.fromEntries(\n [...form].map(([name, value]) => [name, typeof value === 'string' ? parseFormField(value) : value]),\n );\n}\n\nasync function bodyValue(c: Context, field: string): Promise<unknown> {\n const body = await requestBody(c);\n return (body as Record<string, unknown> | undefined)?.[field];\n}\n\nasync function bodyField(c: Context, field: string): Promise<string | undefined> {\n const value = await bodyValue(c, field);\n return typeof value === 'string' && value ? value : undefined;\n}\n\nasync function switchesModel(c: Context): Promise<boolean> {\n const { method, path } = c.req;\n if (method === 'POST' && SWITCH_MODEL_PATH.test(path)) return true;\n if (method !== 'PUT' || !SET_STATE_PATH.test(path)) return false;\n const state = await bodyValue(c, 'state');\n return typeof state === 'object' && state !== null && 'thinkingLevel' in state;\n}\n\nfunction decodeSegment(segment: string): string {\n try {\n return decodeURIComponent(segment);\n } catch {\n return segment;\n }\n}\n\n/** The value of `field` from the query or the body; `null` when they differ, since handlers read one or the other. */\nasync function queryOrBody(c: Context, field: string): Promise<string | undefined | null> {\n const fromQuery = c.req.query(field) || undefined;\n const fromBody = c.req.method === 'GET' ? undefined : await bodyField(c, field);\n if (fromQuery && fromBody && fromQuery !== fromBody) return null;\n return fromQuery ?? fromBody;\n}\n\n/** The sessions and memory resources a request addresses. `null` when it names one ambiguously. */\nasync function addressed(c: Context): Promise<{ sessionIds: string[]; resourceIds: string[] } | null> {\n const path = c.req.path;\n const method = c.req.method;\n const sessionMatch = SESSION_PATH.exec(path);\n if (sessionMatch) {\n const sessionId = decodeSegment(sessionMatch[1]!);\n // Re-keying moves the session onto `newResourceId`, so that resource must be reachable too.\n const target = method === 'POST' && SET_RESOURCE_PATH.test(path) ? await bodyField(c, 'newResourceId') : undefined;\n return { sessionIds: [sessionId], resourceIds: target ? [target] : [] };\n }\n if (method === 'POST' && CREATE_SESSION_PATH.test(path)) {\n // Get-or-create: without a `sessionId` the session is addressed by its resourceId.\n const [sessionId, resourceId] = await Promise.all([bodyField(c, 'sessionId'), bodyField(c, 'resourceId')]);\n const id = sessionId ?? resourceId;\n return { sessionIds: id ? [id] : [], resourceIds: resourceId ? [resourceId] : [] };\n }\n if (OM_CONFIG_PATH.test(path)) {\n const sessionId = await queryOrBody(c, 'sessionId');\n if (sessionId === null) return null;\n return { sessionIds: sessionId ? [sessionId] : [], resourceIds: [] };\n }\n if (MEMORY_PATH.test(path)) {\n const resourceId = await queryOrBody(c, 'resourceId');\n if (resourceId === null) return null;\n return { sessionIds: [], resourceIds: resourceId ? [resourceId] : [] };\n }\n return { sessionIds: [], resourceIds: [] };\n}\n\n/**\n * Keeps private sessions private. A memory resource says who may read it: a\n * private session runs on its owner's user id, a shared one on its Factory's\n * id, and a session from before resources were shared on its own id. So a\n * caller reaches a resource only when it is their own user id, a Factory in\n * their organization, or a session id whose session they can view; any other\n * resource (another person's user id) answers 404.\n *\n * Session routes (stream, messages, threads, state, OM settings) resolve the\n * session from an in-memory map or its stored thread with no ownership check,\n * so both the session row and the resource it runs on are checked. Memory\n * routes trust a client-supplied resourceId or threadId, so they are bound to\n * the authorized resource, or the caller's own user id when none is named. The\n * controller-wide active-runs list drops runs on unreachable resources.\n * Denials answer 404 so ids do not leak existence. A teammate who can see a\n * session but tries to change its model or thinking level gets 403. With auth\n * disabled there is no tenant to protect and everything passes through.\n */\nexport function createSessionAccessGuard({\n auth,\n sessions,\n projects,\n controller,\n}: {\n auth: RouteAuth;\n sessions: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n projects: Pick<FactoryProjectsStorage, 'get'>;\n /** Resolved per request: the controller is built after the server config. */\n controller: () => SessionResourceLookup | undefined;\n}): MiddlewareHandler {\n const canReachResource = async (resourceId: string, viewer: Viewer): Promise<boolean> => {\n if (resourceId === viewer.userId) return true;\n const session = await sessions.getBySessionId(resourceId);\n if (session) return canViewSourceControlSession(session, viewer);\n // What is left is a Factory id or another person's user id, and only a Factory id is a uuid.\n if (!viewer.orgId || !FACTORY_PROJECT_ID.test(resourceId)) return false;\n return (await projects.get({ orgId: viewer.orgId, id: resourceId })) !== null;\n };\n\n const sessionResourceId = async (sessionId: string): Promise<string> => {\n const lookup = controller();\n if (!lookup) return sessionId;\n const live = await lookup.getSession(sessionId);\n if (live) return live.identity.getResourceId();\n return (await lookup.queryThreadById({ threadId: sessionId }))?.resourceId ?? sessionId;\n };\n\n const canReachSession = async (sessionId: string, viewer: Viewer): Promise<boolean> => {\n const session = await sessions.getBySessionId(sessionId);\n if (session && !canViewSourceControlSession(session, viewer)) return false;\n const resourceId = await sessionResourceId(sessionId);\n // A session on its own id was just checked by its row; one without a row is nobody's private session.\n if (resourceId === sessionId) return true;\n return canReachResource(resourceId, viewer);\n };\n\n return async (c, next) => {\n if (!auth.enabled()) return next();\n const ctx = c as unknown as Context;\n const target = await addressed(ctx);\n if (!target) return c.json({ error: 'The query and body must name the same session' }, 400);\n const isMemory = MEMORY_PATH.test(ctx.req.path);\n const isActiveRuns = ctx.req.method === 'GET' && ACTIVE_RUNS_PATH.test(ctx.req.path);\n if (!target.sessionIds.length && !target.resourceIds.length && !isMemory && !isActiveRuns) return next();\n\n await auth.ensureUser(ctx);\n const viewer = auth.tenant(ctx);\n if (!viewer) return c.json({ error: 'Session not found' }, 404);\n for (const sessionId of target.sessionIds) {\n if (!(await canReachSession(sessionId, viewer))) return c.json({ error: 'Session not found' }, 404);\n }\n for (const resourceId of target.resourceIds) {\n if (!(await canReachResource(resourceId, viewer))) return c.json({ error: 'Session not found' }, 404);\n }\n if (await switchesModel(ctx)) {\n for (const sessionId of target.sessionIds) {\n const session = await sessions.getBySessionId(sessionId);\n if (session && !canSwitchSessionModel(session, viewer)) {\n return c.json({ error: 'Only the session’s owner can change its model' }, 403);\n }\n }\n }\n\n if (isMemory) {\n // Memory routes only check that a thread belongs to the request's resource\n // when one is bound server-side. Bind the resource just authorized, or the\n // caller's own user id, so a threadId cannot reach another resource's thread.\n const requestContext = ctx.get('requestContext') as RequestContext | undefined;\n requestContext?.set(MASTRA_RESOURCE_ID_KEY, target.resourceIds[0] ?? viewer.userId);\n }\n if (!isActiveRuns) return next();\n await next();\n await filterActiveRuns(ctx, resourceId => canReachResource(resourceId, viewer));\n };\n}\n\n/** Drops runs on resources the caller cannot reach from the controller-wide active-runs list. */\nasync function filterActiveRuns(c: Context, canReach: (resourceId: string) => Promise<boolean>): Promise<void> {\n if (!c.res.ok) return;\n const body = (await c.res\n .clone()\n .json()\n .catch(() => undefined)) as { runs?: Array<{ resourceId?: unknown }> } | undefined;\n if (!body || !Array.isArray(body.runs)) return;\n const resourceIds = [\n ...new Set(body.runs.flatMap(run => (typeof run.resourceId === 'string' ? [run.resourceId] : []))),\n ];\n // A resource whose check fails is treated as unreachable, so one run cannot fail the whole list.\n const checks = await Promise.allSettled(resourceIds.map(id => canReach(id)));\n checks.forEach((check, index) => {\n if (check.status === 'rejected') {\n console.warn('[Factory Sessions] Could not check access to an active run resource; hiding its runs', {\n resourceId: resourceIds[index],\n error: check.reason,\n });\n }\n });\n const reachable = new Set(\n resourceIds.filter((_, index) => checks[index]!.status === 'fulfilled' && checks[index]!.value),\n );\n const runs = body.runs.filter(run => typeof run.resourceId !== 'string' || reachable.has(run.resourceId));\n if (runs.length === body.runs.length) return;\n const headers = new Headers(c.res.headers);\n headers.delete('content-length');\n c.res.headers.delete('content-length');\n c.res = new Response(JSON.stringify({ ...body, runs }), { status: c.res.status, headers });\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-rows.d.ts","sourceRoot":"","sources":["../../src/routes/session-rows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAGpF,OAAO,KAAK,EAAmB,qBAAqB,EAAgB,MAAM,uBAAuB,CAAC;AAIlG,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,KAAK,WAAW,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,UAAU,2BAA2B;IACnC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;IAChF,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,aAAa,GAAG,0BAA0B,CAAC,CAAC;IAC9E,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,iBAAiB,CAAC,CAAC;IAC/D,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC5D,eAAe,EAAE,qBAAqB,CAAC;IACvC,UAAU,EAAE,MAAM,SAAS;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvE,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B;AAgDD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,2BAA2B,GAAG,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"session-rows.d.ts","sourceRoot":"","sources":["../../src/routes/session-rows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAGpD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAIhE,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAGpF,OAAO,KAAK,EAAmB,qBAAqB,EAAgB,MAAM,uBAAuB,CAAC;AAIlG,UAAU,YAAY;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,KAAK,WAAW,GAAG,YAAY,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAErD,UAAU,2BAA2B;IACnC,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,WAAW,GAAG;QAAE,QAAQ,EAAE,QAAQ,CAAA;KAAE,CAAC,CAAC;IAChF,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,aAAa,GAAG,0BAA0B,CAAC,CAAC;IAC9E,MAAM,EAAE,kBAAkB,CAAC;IAC3B,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,iBAAiB,CAAC,CAAC;IAC/D,YAAY,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;IAC5D,eAAe,EAAE,qBAAqB,CAAC;IACvC,UAAU,EAAE,MAAM,SAAS;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACvE,WAAW,EAAE,MAAM,OAAO,CAAC;CAC5B;AAgDD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,2BAA2B,GAAG,QAAQ,EAAE,CAwDnF"}
|
|
@@ -56,6 +56,7 @@ function buildSessionRowRoutes(deps) {
|
|
|
56
56
|
owner: context.req.query("owner"),
|
|
57
57
|
status: context.req.query("status"),
|
|
58
58
|
updated: context.req.query("updated"),
|
|
59
|
+
source: context.req.query("source"),
|
|
59
60
|
children: context.req.query("children"),
|
|
60
61
|
pin: context.req.queries("pin"),
|
|
61
62
|
open: context.req.query("open"),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-rows.js","names":[],"sources":["../../src/routes/session-rows.ts"],"sourcesContent":["import type { ApiRoute } from '@mastra/core/server';\nimport { registerApiRoute } from '@mastra/core/server';\n\nimport type { ProjectBoardSource } from '../boards/project-boards.js';\nimport type { LiveSessions } from '../session/live-sessions.js';\nimport { sessionActivity, sessionRowsView } from '../session/session-row-view.js';\nimport { runningSessionIds } from '../session/session-rows.js';\nimport type { SessionRowIndex, SessionStatusViewer } from '../session/session-rows.js';\nimport type { Card, WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport { hashedBody, sendRevalidated, sessionIdsWhere } from './board-snapshot.js';\nimport { FACTORY_ROUTE_CONTRACTS } from './contracts.js';\nimport type { ProjectSessions, ProjectSessionsReader, SeenSessions } from './project-sessions.js';\nimport { loose } from './route.js';\nimport { CARD_DECISION_PAGE_SIZE, CARD_DECISION_STATUSES, cardsAwaitingPerson } from './work-item-starters.js';\n\ninterface ProjectScope {\n orgId: string;\n factoryProjectId: string;\n}\n\ntype ViewerScope = ProjectScope & { userId: string };\n\ninterface SessionRowRouteDependencies {\n resolveProject(context: unknown): Promise<ViewerScope | { response: Response }>;\n workItems: Pick<WorkItemsStorage, 'ensureReady' | 'listDeferredDecisionPage'>;\n boards: ProjectBoardSource;\n liveSessions: Pick<LiveSessions, 'parked' | 'sessionOnThread'>;\n sessionCards(scope: ProjectScope): Promise<readonly Card[]>;\n projectSessions: ProjectSessionsReader;\n activeRuns: () => readonly { threadId: string; resourceId?: string }[];\n authEnabled: () => boolean;\n}\n\ninterface SessionFacts {\n seen: SeenSessions;\n cards: readonly Card[];\n index: SessionRowIndex;\n viewer: SessionStatusViewer;\n}\n\nasync function sessionFacts(deps: SessionRowRouteDependencies, scope: ViewerScope): Promise<SessionFacts> {\n const project = { orgId: scope.orgId, factoryProjectId: scope.factoryProjectId };\n await deps.workItems.ensureReady();\n const [sessions, cards, boards, { decisions }] = await Promise.all([\n deps.projectSessions(project),\n deps.sessionCards(project),\n deps.boards.load(project),\n deps.workItems.listDeferredDecisionPage({\n ...project,\n statuses: [...CARD_DECISION_STATUSES],\n limit: CARD_DECISION_PAGE_SIZE,\n }),\n ]);\n const seen = sessions.seenBy(scope.userId);\n const isParked = (sessionId: string) => deps.liveSessions.parked(sessionId) !== undefined;\n return {\n seen,\n cards,\n index: sessions.rowIndex(cards, boards),\n viewer: {\n viewerUserId: scope.userId,\n awaitingPerson: cardsAwaitingPerson(decisions),\n runningSessionIds: runningSessionIds(deps.activeRuns(), {\n authEnabled: deps.authEnabled(),\n viewerUserId: scope.userId,\n factoryProjectId: scope.factoryProjectId,\n visibleSessionIds: seen,\n sessionOnThread: threadId => deps.liveSessions.sessionOnThread(threadId),\n }),\n parkedSessionIds: new Set([\n ...sessionIdsWhere(cards, isParked),\n ...seen.sessions.flatMap(({ sessionId, userId }) =>\n userId === scope.userId && isParked(sessionId) ? [sessionId] : [],\n ),\n ]),\n },\n };\n}\n\nexport function buildSessionRowRoutes(deps: SessionRowRouteDependencies): ApiRoute[] {\n return [\n registerApiRoute(FACTORY_ROUTE_CONTRACTS.sessionRows.path, {\n method: FACTORY_ROUTE_CONTRACTS.sessionRows.method,\n requiresAuth: false,\n handler: async c => {\n const context = loose(c);\n const resolved = await deps.resolveProject(context);\n if ('response' in resolved) return resolved.response;\n const query = FACTORY_ROUTE_CONTRACTS.sessionRows.querySchema.safeParse({\n sort: context.req.query('sort'),\n groupBy: context.req.query('groupBy'),\n owner: context.req.query('owner'),\n status: context.req.query('status'),\n updated: context.req.query('updated'),\n children: context.req.query('children'),\n pin: context.req.queries('pin'),\n open: context.req.query('open'),\n window: context.req.queries('window'),\n });\n if (!query.success) return c.json({ error: 'invalid_session_rows_query' }, 400);\n const { pin, children, ...view } = query.data;\n const facts = await sessionFacts(deps, resolved);\n const rows = facts.index.rows({\n ...facts.viewer,\n pinnedSessionIds: pin,\n revealChildSessions: children === 'true',\n });\n return sendRevalidated(context, hashedBody(sessionRowsView(rows, view, resolved.userId, Date.now())));\n },\n }),\n\n registerApiRoute(FACTORY_ROUTE_CONTRACTS.sessionActivity.path, {\n method: FACTORY_ROUTE_CONTRACTS.sessionActivity.method,\n requiresAuth: false,\n handler: async c => {\n const context = loose(c);\n const resolved = await deps.resolveProject(context);\n if ('response' in resolved) return resolved.response;\n const { seen, cards, index, viewer } = await sessionFacts(deps, resolved);\n return sendRevalidated(\n context,\n hashedBody(\n sessionActivity({\n sessions: seen.sessions,\n cards,\n runningSessionIds: viewer.runningSessionIds,\n parkedSessionIds: viewer.parkedSessionIds,\n cardStatuses: index.cardStatuses(viewer),\n }),\n ),\n );\n },\n }),\n ];\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"session-rows.js","names":[],"sources":["../../src/routes/session-rows.ts"],"sourcesContent":["import type { ApiRoute } from '@mastra/core/server';\nimport { registerApiRoute } from '@mastra/core/server';\n\nimport type { ProjectBoardSource } from '../boards/project-boards.js';\nimport type { LiveSessions } from '../session/live-sessions.js';\nimport { sessionActivity, sessionRowsView } from '../session/session-row-view.js';\nimport { runningSessionIds } from '../session/session-rows.js';\nimport type { SessionRowIndex, SessionStatusViewer } from '../session/session-rows.js';\nimport type { Card, WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport { hashedBody, sendRevalidated, sessionIdsWhere } from './board-snapshot.js';\nimport { FACTORY_ROUTE_CONTRACTS } from './contracts.js';\nimport type { ProjectSessions, ProjectSessionsReader, SeenSessions } from './project-sessions.js';\nimport { loose } from './route.js';\nimport { CARD_DECISION_PAGE_SIZE, CARD_DECISION_STATUSES, cardsAwaitingPerson } from './work-item-starters.js';\n\ninterface ProjectScope {\n orgId: string;\n factoryProjectId: string;\n}\n\ntype ViewerScope = ProjectScope & { userId: string };\n\ninterface SessionRowRouteDependencies {\n resolveProject(context: unknown): Promise<ViewerScope | { response: Response }>;\n workItems: Pick<WorkItemsStorage, 'ensureReady' | 'listDeferredDecisionPage'>;\n boards: ProjectBoardSource;\n liveSessions: Pick<LiveSessions, 'parked' | 'sessionOnThread'>;\n sessionCards(scope: ProjectScope): Promise<readonly Card[]>;\n projectSessions: ProjectSessionsReader;\n activeRuns: () => readonly { threadId: string; resourceId?: string }[];\n authEnabled: () => boolean;\n}\n\ninterface SessionFacts {\n seen: SeenSessions;\n cards: readonly Card[];\n index: SessionRowIndex;\n viewer: SessionStatusViewer;\n}\n\nasync function sessionFacts(deps: SessionRowRouteDependencies, scope: ViewerScope): Promise<SessionFacts> {\n const project = { orgId: scope.orgId, factoryProjectId: scope.factoryProjectId };\n await deps.workItems.ensureReady();\n const [sessions, cards, boards, { decisions }] = await Promise.all([\n deps.projectSessions(project),\n deps.sessionCards(project),\n deps.boards.load(project),\n deps.workItems.listDeferredDecisionPage({\n ...project,\n statuses: [...CARD_DECISION_STATUSES],\n limit: CARD_DECISION_PAGE_SIZE,\n }),\n ]);\n const seen = sessions.seenBy(scope.userId);\n const isParked = (sessionId: string) => deps.liveSessions.parked(sessionId) !== undefined;\n return {\n seen,\n cards,\n index: sessions.rowIndex(cards, boards),\n viewer: {\n viewerUserId: scope.userId,\n awaitingPerson: cardsAwaitingPerson(decisions),\n runningSessionIds: runningSessionIds(deps.activeRuns(), {\n authEnabled: deps.authEnabled(),\n viewerUserId: scope.userId,\n factoryProjectId: scope.factoryProjectId,\n visibleSessionIds: seen,\n sessionOnThread: threadId => deps.liveSessions.sessionOnThread(threadId),\n }),\n parkedSessionIds: new Set([\n ...sessionIdsWhere(cards, isParked),\n ...seen.sessions.flatMap(({ sessionId, userId }) =>\n userId === scope.userId && isParked(sessionId) ? [sessionId] : [],\n ),\n ]),\n },\n };\n}\n\nexport function buildSessionRowRoutes(deps: SessionRowRouteDependencies): ApiRoute[] {\n return [\n registerApiRoute(FACTORY_ROUTE_CONTRACTS.sessionRows.path, {\n method: FACTORY_ROUTE_CONTRACTS.sessionRows.method,\n requiresAuth: false,\n handler: async c => {\n const context = loose(c);\n const resolved = await deps.resolveProject(context);\n if ('response' in resolved) return resolved.response;\n const query = FACTORY_ROUTE_CONTRACTS.sessionRows.querySchema.safeParse({\n sort: context.req.query('sort'),\n groupBy: context.req.query('groupBy'),\n owner: context.req.query('owner'),\n status: context.req.query('status'),\n updated: context.req.query('updated'),\n source: context.req.query('source'),\n children: context.req.query('children'),\n pin: context.req.queries('pin'),\n open: context.req.query('open'),\n window: context.req.queries('window'),\n });\n if (!query.success) return c.json({ error: 'invalid_session_rows_query' }, 400);\n const { pin, children, ...view } = query.data;\n const facts = await sessionFacts(deps, resolved);\n const rows = facts.index.rows({\n ...facts.viewer,\n pinnedSessionIds: pin,\n revealChildSessions: children === 'true',\n });\n return sendRevalidated(context, hashedBody(sessionRowsView(rows, view, resolved.userId, Date.now())));\n },\n }),\n\n registerApiRoute(FACTORY_ROUTE_CONTRACTS.sessionActivity.path, {\n method: FACTORY_ROUTE_CONTRACTS.sessionActivity.method,\n requiresAuth: false,\n handler: async c => {\n const context = loose(c);\n const resolved = await deps.resolveProject(context);\n if ('response' in resolved) return resolved.response;\n const { seen, cards, index, viewer } = await sessionFacts(deps, resolved);\n return sendRevalidated(\n context,\n hashedBody(\n sessionActivity({\n sessions: seen.sessions,\n cards,\n runningSessionIds: viewer.runningSessionIds,\n parkedSessionIds: viewer.parkedSessionIds,\n cardStatuses: index.cardStatuses(viewer),\n }),\n ),\n );\n },\n }),\n ];\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/rules/dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAyC,MAAM,+BAA+B,CAAC;AA0B5G,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAaxD,OAAO,KAAK,EAAE,kBAAkB,EAAqB,MAAM,6BAA6B,CAAC;AAGzF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAetE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AAQzE,OAAO,KAAK,EACV,yBAAyB,EACzB,6BAA6B,EAG7B,uBAAuB,EACvB,IAAI,EACJ,gBAAgB,EAEjB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAcjE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAA4C,MAAM,YAAY,CAAC;AAuClG;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,aACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,0BACT,yBAAyB,KAChD,OAO8B,CAAC;
|
|
1
|
+
{"version":3,"file":"dispatcher.d.ts","sourceRoot":"","sources":["../../src/rules/dispatcher.ts"],"names":[],"mappings":"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"}
|
package/dist/rules/dispatcher.js
CHANGED
|
@@ -57,6 +57,11 @@ const STALE_BINDING_TTL_MS = 864e5;
|
|
|
57
57
|
const RECONCILE_INTERVAL_MS = 3e4;
|
|
58
58
|
/** The card moved on before this run could act; it settles as superseded, not succeeded. */
|
|
59
59
|
var FactoryDecisionSuperseded = class extends Error {};
|
|
60
|
+
/**
|
|
61
|
+
* A client stopped the run on purpose (Stop, Esc, /stop). Like a card that moved on, nothing is
|
|
62
|
+
* left for the decision to do: it settles as superseded, neither failed nor retried.
|
|
63
|
+
*/
|
|
64
|
+
var FactoryRunStopped = class extends FactoryDecisionSuperseded {};
|
|
60
65
|
/** The decision cannot act yet and did nothing: it goes back to the queue and is claimed again later. */
|
|
61
66
|
var FactoryDecisionPostponed = class extends Error {
|
|
62
67
|
availableAt;
|
|
@@ -113,7 +118,7 @@ function isPermanentProviderRejection(error) {
|
|
|
113
118
|
const normalized = error.toLowerCase();
|
|
114
119
|
return /\bhttp(?:\/\d(?:\.\d)?)?\s*400\b/.test(normalized) || /\bstatus(?:\s*code)?\s*[:=]?\s*400\b/.test(normalized) || /\b400\s*(?:bad request|status)\b/.test(normalized) || normalized.includes("model not supported") || normalized.includes("model is not supported") || normalized.includes("unsupported model") || normalized.includes("not supported with") || normalized.includes("unauthorized") || normalized.includes("authentication") || normalized.includes("invalid") && normalized.includes("model");
|
|
115
120
|
}
|
|
116
|
-
function watchRun(session, { timeoutMs, autoApprovedTool, autoApproving, requestContext, onAgentEnd, label, runStillActive }) {
|
|
121
|
+
function watchRun(session, { timeoutMs, autoApprovedTool, autoApproving, requestContext, onAgentEnd, label, runStillActive, stopRequested }) {
|
|
117
122
|
let resolveAgentEnd;
|
|
118
123
|
let agentEnd;
|
|
119
124
|
let endReason;
|
|
@@ -203,6 +208,7 @@ function watchRun(session, { timeoutMs, autoApprovedTool, autoApproving, request
|
|
|
203
208
|
if (!observed) throw new FactoryDispatchError("run_terminal_event_missing", `${label} terminal event was not observed before timeout.`);
|
|
204
209
|
if (endReason === "error") throw runErrorFailure(label, runError);
|
|
205
210
|
if (endReason === "aborted") {
|
|
211
|
+
if (await stopRequested?.()) throw new FactoryRunStopped();
|
|
206
212
|
if (omFailure) {
|
|
207
213
|
if (isPermanentProviderRejection(omFailure)) throw new FactoryDispatchError("run_configuration_invalid", `${label} was aborted by an observational-memory failure that will not succeed on retry: ${omFailure}`);
|
|
208
214
|
throw new Error(`${label} was aborted after an observational-memory failure: ${omFailure}`);
|
|
@@ -1147,6 +1153,7 @@ var FactoryDecisionDispatcher = class {
|
|
|
1147
1153
|
item: runItem,
|
|
1148
1154
|
limit: 100
|
|
1149
1155
|
})).map((card) => card.id));
|
|
1156
|
+
const stopRequested = () => this.#runStopRequested(record.orgId, binding.id);
|
|
1150
1157
|
const run = watchRun(session, {
|
|
1151
1158
|
timeoutMs: this.#skillCompletionObservationTimeoutMs,
|
|
1152
1159
|
autoApprovedTool: await this.#autoApprovedExitTool(record),
|
|
@@ -1154,9 +1161,14 @@ var FactoryDecisionDispatcher = class {
|
|
|
1154
1161
|
requestContext,
|
|
1155
1162
|
onAgentEnd: () => this.#roleSuperseded(record, decision.role),
|
|
1156
1163
|
label: "Factory skill run",
|
|
1157
|
-
runStillActive
|
|
1164
|
+
runStillActive,
|
|
1165
|
+
stopRequested
|
|
1158
1166
|
});
|
|
1159
1167
|
const sendKickoff = async () => {
|
|
1168
|
+
await this.#storage.clearRunBindingStopRequest({
|
|
1169
|
+
orgId: record.orgId,
|
|
1170
|
+
bindingId: binding.id
|
|
1171
|
+
});
|
|
1160
1172
|
const settled = await session.sendSignal({
|
|
1161
1173
|
id: deliveryId,
|
|
1162
1174
|
...kickoffSignal,
|
|
@@ -1175,6 +1187,7 @@ var FactoryDecisionDispatcher = class {
|
|
|
1175
1187
|
if (!await run.wait()) throw new FactoryDispatchError("run_terminal_event_missing", "Factory skill invocation is waiting on a run whose terminal event was not observed.");
|
|
1176
1188
|
if (await kickoffLanded()) break;
|
|
1177
1189
|
if (await kickoffStale()) throw new FactoryDecisionSuperseded();
|
|
1190
|
+
if (await stopRequested()) throw new FactoryRunStopped();
|
|
1178
1191
|
run.arm();
|
|
1179
1192
|
settled = await sendKickoff();
|
|
1180
1193
|
}
|
|
@@ -2289,6 +2302,21 @@ var FactoryDecisionDispatcher = class {
|
|
|
2289
2302
|
}
|
|
2290
2303
|
}
|
|
2291
2304
|
/**
|
|
2305
|
+
* An unreadable stop counts as a stop: retrying would clear the marker and restart a run a person
|
|
2306
|
+
* may have just stopped, while a wrongly settled run only leaves the card idle until started again.
|
|
2307
|
+
*/
|
|
2308
|
+
async #runStopRequested(orgId, bindingId) {
|
|
2309
|
+
try {
|
|
2310
|
+
return await this.#storage.runBindingStopRequested({
|
|
2311
|
+
orgId,
|
|
2312
|
+
bindingId
|
|
2313
|
+
});
|
|
2314
|
+
} catch (error) {
|
|
2315
|
+
console.warn(`[factory] could not read the stop request for binding ${bindingId}; treating the run as stopped:`, error);
|
|
2316
|
+
return true;
|
|
2317
|
+
}
|
|
2318
|
+
}
|
|
2319
|
+
/**
|
|
2292
2320
|
* Settle a watched run; when it fails terminally, tell the item's followers.
|
|
2293
2321
|
* A retryable failure says nothing, since the retry reports. How a run that
|
|
2294
2322
|
* ran ends (done, blocked, an error) is reported by the session's own
|
|
@@ -2377,6 +2405,7 @@ var FactoryDecisionDispatcher = class {
|
|
|
2377
2405
|
orgId: record.orgId
|
|
2378
2406
|
});
|
|
2379
2407
|
const since = /* @__PURE__ */ new Date();
|
|
2408
|
+
const stopRequested = () => this.#runStopRequested(record.orgId, binding.id);
|
|
2380
2409
|
const run = watchRun(session, {
|
|
2381
2410
|
timeoutMs: this.#skillCompletionObservationTimeoutMs,
|
|
2382
2411
|
autoApprovedTool: await this.#autoApprovedExitTool({
|
|
@@ -2386,26 +2415,34 @@ var FactoryDecisionDispatcher = class {
|
|
|
2386
2415
|
autoApproving: this.#autoApproving,
|
|
2387
2416
|
requestContext,
|
|
2388
2417
|
label: "Factory kickoff run",
|
|
2389
|
-
runStillActive: () => this.#controller.listActiveThreadRuns().some((active) => active.threadId === binding.threadId)
|
|
2418
|
+
runStillActive: () => this.#controller.listActiveThreadRuns().some((active) => active.threadId === binding.threadId),
|
|
2419
|
+
stopRequested
|
|
2390
2420
|
});
|
|
2391
|
-
const sendKickoff = (dedupeKey) =>
|
|
2392
|
-
|
|
2393
|
-
|
|
2394
|
-
|
|
2395
|
-
|
|
2396
|
-
|
|
2397
|
-
|
|
2398
|
-
|
|
2399
|
-
|
|
2400
|
-
|
|
2401
|
-
|
|
2402
|
-
|
|
2403
|
-
|
|
2421
|
+
const sendKickoff = async (dedupeKey) => {
|
|
2422
|
+
await this.#storage.clearRunBindingStopRequest({
|
|
2423
|
+
orgId: record.orgId,
|
|
2424
|
+
bindingId: binding.id
|
|
2425
|
+
});
|
|
2426
|
+
return awaitNotification(() => session.sendNotificationSignal({
|
|
2427
|
+
source: "factory",
|
|
2428
|
+
kind: "run-kickoff",
|
|
2429
|
+
summary: record.message,
|
|
2430
|
+
priority: "high",
|
|
2431
|
+
payload: { message: record.message },
|
|
2432
|
+
sourceId: record.id,
|
|
2433
|
+
dedupeKey
|
|
2434
|
+
}, {
|
|
2435
|
+
ifActive: { behavior: "deliver" },
|
|
2436
|
+
ifIdle: { behavior: "wake" },
|
|
2437
|
+
requestContext
|
|
2438
|
+
}), true);
|
|
2439
|
+
};
|
|
2404
2440
|
try {
|
|
2405
2441
|
let settled = await sendKickoff(`factory-kickoff:${record.kickoffKey}`);
|
|
2406
2442
|
let deliveryGeneration = 0;
|
|
2407
2443
|
while (settled?.action === "deliver") {
|
|
2408
2444
|
if (!await run.wait()) throw new Error("Factory kickoff is waiting on a run that has not ended.");
|
|
2445
|
+
if (await stopRequested()) throw new FactoryRunStopped();
|
|
2409
2446
|
run.arm();
|
|
2410
2447
|
deliveryGeneration += 1;
|
|
2411
2448
|
settled = await sendKickoff(`factory-kickoff:${record.kickoffKey}:retry:${record.attempts}:${deliveryGeneration}`);
|
|
@@ -2423,6 +2460,10 @@ var FactoryDecisionDispatcher = class {
|
|
|
2423
2460
|
});
|
|
2424
2461
|
if (!await this.#storage.completePendingStart(leaseIdentity(record, this.#ownerId), /* @__PURE__ */ new Date())) throw new Error("Factory kickoff lease was lost before completion.");
|
|
2425
2462
|
} catch (error) {
|
|
2463
|
+
if (error instanceof FactoryRunStopped) {
|
|
2464
|
+
await this.#storage.completePendingStart(leaseIdentity(record, this.#ownerId), /* @__PURE__ */ new Date());
|
|
2465
|
+
return;
|
|
2466
|
+
}
|
|
2426
2467
|
const failureCode = factoryDispatchFailureCode(error);
|
|
2427
2468
|
await this.#storage.failPendingStart({
|
|
2428
2469
|
...leaseIdentity(record, this.#ownerId),
|