@mastra/factory 0.24.0-alpha.1 → 0.24.0-alpha.11

package/dist/session/live-sessions.js.map

@@ -1 +1 @@
-{"version":3,"file":"live-sessions.js","names":["#byId","#parkedListeners","#track","#lastParkStamp","#nextParkStamp"],"sources":["../../src/session/live-sessions.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\n\n/** The slice of a live session this registry needs: its id, its run, its parked tools, and who it works for. */\nexport interface LiveSession {\n  readonly identity: { getId(): string };\n  readonly run: { isRunning(): boolean };\n  readonly state: { get(): Readonly<{ factoryOrgId?: string; factoryProjectId?: string }> };\n  readonly displayState: { get(): { pendingSuspensions: ReadonlyMap<string, { toolName: string }> } };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\ninterface SessionNotifier {\n  onSessionCreated(listener: (session: LiveSession) => void): () => void;\n  onSessionDeleted(listener: (session: LiveSession) => void): () => void;\n}\n\n/** The tool a session has waited on longest, and since when (epoch ms). */\nexport interface ParkedRun {\n  toolName: string;\n  suspendedAt: number;\n}\n\ninterface TrackedSession {\n  session: LiveSession;\n  seenAt: number;\n  suspendedAt: Map<string, number>;\n  unsubscribe: () => void;\n}\n\n/**\n * The sessions this process has materialized, by session id.\n *\n * Membership comes from the controller's notifications rather than\n * `getSessionByResource`, which hands back the pending creation — awaiting it\n * from a request blocks for as long as the session takes to materialize its\n * sandbox, minutes on a cold clone. Notifications only fire once a session\n * exists, so a read never waits.\n *\n * Whether a session is *running* or *parked* is read from the session itself,\n * never tracked here: no missed run event can leave the answer stuck. Only the\n * moment each suspension arrived is kept, since the session does not date them.\n */\nexport class LiveSessions {\n  readonly #byId = new Map<string, TrackedSession>();\n  readonly #parkedListeners = new Set<(session: LiveSession) => void>();\n  /** A park stamp doubles as the receipt key, so two suspensions in one millisecond must not share one. */\n  #lastParkStamp = 0;\n\n  constructor(controller: SessionNotifier) {\n    controller.onSessionCreated(session => this.#track(session));\n    controller.onSessionDeleted(session => {\n      const id = session.identity.getId();\n      const wasParked = this.parked(id) !== undefined;\n      this.#byId.get(id)?.unsubscribe();\n      this.#byId.delete(id);\n      if (wasParked) for (const listener of this.#parkedListeners) listener(session);\n    });\n  }\n\n  #nextParkStamp(): number {\n    this.#lastParkStamp = Math.max(Date.now(), this.#lastParkStamp + 1);\n    return this.#lastParkStamp;\n  }\n\n  #track(session: LiveSession): void {\n    const suspendedAt = new Map<string, number>();\n    const unsubscribe = session.subscribe(event => {\n      if (event.type === 'tool_suspended') suspendedAt.set(event.toolCallId, this.#nextParkStamp());\n      else if (event.type === 'tool_suspension_cancelled') suspendedAt.delete(event.toolCallId);\n      else if (event.type === 'agent_end' && event.reason !== 'suspended') suspendedAt.clear();\n      else return;\n      for (const listener of this.#parkedListeners) listener(session);\n    });\n    this.#byId.set(session.identity.getId(), { session, seenAt: Date.now(), suspendedAt, unsubscribe });\n  }\n\n  /** Whether the session has an agent run in flight right now. */\n  isRunning(sessionId: string): boolean {\n    return this.#byId.get(sessionId)?.session.run.isRunning() ?? false;\n  }\n\n  /** The tool the session is parked on, oldest first, or nothing when no answer is owed. */\n  parked(sessionId: string): ParkedRun | undefined {\n    const tracked = this.#byId.get(sessionId);\n    if (!tracked) return undefined;\n    let oldest: ParkedRun | undefined;\n    for (const [toolCallId, { toolName }] of tracked.session.displayState.get().pendingSuspensions) {\n      const suspendedAt = tracked.suspendedAt.get(toolCallId) ?? tracked.seenAt;\n      if (!oldest || suspendedAt < oldest.suspendedAt) oldest = { toolName, suspendedAt };\n    }\n    return oldest;\n  }\n\n  /** Every parked session of a project, so the inbox reads no card when nothing waits. */\n  parkedIn(factoryProjectId: string): Array<{ sessionId: string; run: ParkedRun }> {\n    const parked: Array<{ sessionId: string; run: ParkedRun }> = [];\n    for (const [sessionId, tracked] of this.#byId) {\n      if (tracked.session.state.get().factoryProjectId !== factoryProjectId) continue;\n      const run = this.parked(sessionId);\n      if (run) parked.push({ sessionId, run });\n    }\n    return parked;\n  }\n\n  /** Fires when a session parks, is answered, or finishes a turn: whoever shows parked runs re-reads. */\n  onParkedChanged(listener: (session: LiveSession) => void): () => void {\n    this.#parkedListeners.add(listener);\n    return () => this.#parkedListeners.delete(listener);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AA0CA,IAAa,eAAb,MAA0B;CACxB,wBAAiB,IAAI,IAA4B;CACjD,mCAA4B,IAAI,IAAoC;;CAEpE,iBAAiB;CAEjB,YAAY,YAA6B;EACvC,WAAW,kBAAiB,YAAW,KAAKE,OAAO,OAAO,CAAC;EAC3D,WAAW,kBAAiB,YAAW;GACrC,MAAM,KAAK,QAAQ,SAAS,MAAM;GAClC,MAAM,YAAY,KAAK,OAAO,EAAE,MAAM,KAAA;GACtC,KAAKF,MAAM,IAAI,EAAE,CAAC,EAAE,YAAY;GAChC,KAAKA,MAAM,OAAO,EAAE;GACpB,IAAI,WAAW,KAAK,MAAM,YAAY,KAAKC,kBAAkB,SAAS,OAAO;EAC/E,CAAC;CACH;CAEA,iBAAyB;EACvB,KAAKE,iBAAiB,KAAK,IAAI,KAAK,IAAI,GAAG,KAAKA,iBAAiB,CAAC;EAClE,OAAO,KAAKA;CACd;CAEA,OAAO,SAA4B;EACjC,MAAM,8BAAc,IAAI,IAAoB;EAC5C,MAAM,cAAc,QAAQ,WAAU,UAAS;GAC7C,IAAI,MAAM,SAAS,kBAAkB,YAAY,IAAI,MAAM,YAAY,KAAKC,eAAe,CAAC;QACvF,IAAI,MAAM,SAAS,6BAA6B,YAAY,OAAO,MAAM,UAAU;QACnF,IAAI,MAAM,SAAS,eAAe,MAAM,WAAW,aAAa,YAAY,MAAM;QAClF;GACL,KAAK,MAAM,YAAY,KAAKH,kBAAkB,SAAS,OAAO;EAChE,CAAC;EACD,KAAKD,MAAM,IAAI,QAAQ,SAAS,MAAM,GAAG;GAAE;GAAS,QAAQ,KAAK,IAAI;GAAG;GAAa;EAAY,CAAC;CACpG;;CAGA,UAAU,WAA4B;EACpC,OAAO,KAAKA,MAAM,IAAI,SAAS,CAAC,EAAE,QAAQ,IAAI,UAAU,KAAK;CAC/D;;CAGA,OAAO,WAA0C;EAC/C,MAAM,UAAU,KAAKA,MAAM,IAAI,SAAS;EACxC,IAAI,CAAC,SAAS,OAAO,KAAA;EACrB,IAAI;EACJ,KAAK,MAAM,CAAC,YAAY,EAAE,eAAe,QAAQ,QAAQ,aAAa,IAAI,CAAC,CAAC,oBAAoB;GAC9F,MAAM,cAAc,QAAQ,YAAY,IAAI,UAAU,KAAK,QAAQ;GACnE,IAAI,CAAC,UAAU,cAAc,OAAO,aAAa,SAAS;IAAE;IAAU;GAAY;EACpF;EACA,OAAO;CACT;;CAGA,SAAS,kBAAwE;EAC/E,MAAM,SAAuD,CAAC;EAC9D,KAAK,MAAM,CAAC,WAAW,YAAY,KAAKA,OAAO;GAC7C,IAAI,QAAQ,QAAQ,MAAM,IAAI,CAAC,CAAC,qBAAqB,kBAAkB;GACvE,MAAM,MAAM,KAAK,OAAO,SAAS;GACjC,IAAI,KAAK,OAAO,KAAK;IAAE;IAAW;GAAI,CAAC;EACzC;EACA,OAAO;CACT;;CAGA,gBAAgB,UAAsD;EACpE,KAAKC,iBAAiB,IAAI,QAAQ;EAClC,aAAa,KAAKA,iBAAiB,OAAO,QAAQ;CACpD;AACF"}
+{"version":3,"file":"live-sessions.js","names":["#byId","#parkedListeners","#track","#lastParkStamp","#nextParkStamp"],"sources":["../../src/session/live-sessions.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\n\n/** The slice of a live session this registry needs: its id, its run, its parked tools, and who it works for. */\nexport interface LiveSession {\n  readonly identity: { getId(): string };\n  readonly run: { isRunning(): boolean };\n  readonly state: { get(): Readonly<{ factoryOrgId?: string; factoryProjectId?: string }> };\n  readonly displayState: { get(): { pendingSuspensions: ReadonlyMap<string, { toolName: string }> } };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\ninterface SessionNotifier {\n  onSessionCreated(listener: (session: LiveSession) => void): () => void;\n  onSessionDeleted(listener: (session: LiveSession) => void): () => void;\n}\n\n/** The tool a session has waited on longest, and since when (epoch ms). */\nexport interface ParkedRun {\n  toolName: string;\n  suspendedAt: number;\n}\n\ninterface TrackedSession {\n  session: LiveSession;\n  seenAt: number;\n  suspendedAt: Map<string, number>;\n  unsubscribe: () => void;\n}\n\n/**\n * The sessions this process has materialized, by session id.\n *\n * Membership comes from the controller's notifications rather than\n * `getSession`, which hands back the pending creation — awaiting it\n * from a request blocks for as long as the session takes to materialize its\n * sandbox, minutes on a cold clone. Notifications only fire once a session\n * exists, so a read never waits.\n *\n * Whether a session is *running* or *parked* is read from the session itself,\n * never tracked here: no missed run event can leave the answer stuck. Only the\n * moment each suspension arrived is kept, since the session does not date them.\n */\nexport class LiveSessions {\n  readonly #byId = new Map<string, TrackedSession>();\n  readonly #parkedListeners = new Set<(session: LiveSession) => void>();\n  /** A park stamp doubles as the receipt key, so two suspensions in one millisecond must not share one. */\n  #lastParkStamp = 0;\n\n  constructor(controller: SessionNotifier) {\n    controller.onSessionCreated(session => this.#track(session));\n    controller.onSessionDeleted(session => {\n      const id = session.identity.getId();\n      const wasParked = this.parked(id) !== undefined;\n      this.#byId.get(id)?.unsubscribe();\n      this.#byId.delete(id);\n      if (wasParked) for (const listener of this.#parkedListeners) listener(session);\n    });\n  }\n\n  #nextParkStamp(): number {\n    this.#lastParkStamp = Math.max(Date.now(), this.#lastParkStamp + 1);\n    return this.#lastParkStamp;\n  }\n\n  #track(session: LiveSession): void {\n    const suspendedAt = new Map<string, number>();\n    const unsubscribe = session.subscribe(event => {\n      if (event.type === 'tool_suspended') suspendedAt.set(event.toolCallId, this.#nextParkStamp());\n      else if (event.type === 'tool_suspension_cancelled') suspendedAt.delete(event.toolCallId);\n      else if (event.type === 'agent_end' && event.reason !== 'suspended') suspendedAt.clear();\n      else return;\n      for (const listener of this.#parkedListeners) listener(session);\n    });\n    this.#byId.set(session.identity.getId(), { session, seenAt: Date.now(), suspendedAt, unsubscribe });\n  }\n\n  /** Whether the session has an agent run in flight right now. */\n  isRunning(sessionId: string): boolean {\n    return this.#byId.get(sessionId)?.session.run.isRunning() ?? false;\n  }\n\n  /** The tool the session is parked on, oldest first, or nothing when no answer is owed. */\n  parked(sessionId: string): ParkedRun | undefined {\n    const tracked = this.#byId.get(sessionId);\n    if (!tracked) return undefined;\n    let oldest: ParkedRun | undefined;\n    for (const [toolCallId, { toolName }] of tracked.session.displayState.get().pendingSuspensions) {\n      const suspendedAt = tracked.suspendedAt.get(toolCallId) ?? tracked.seenAt;\n      if (!oldest || suspendedAt < oldest.suspendedAt) oldest = { toolName, suspendedAt };\n    }\n    return oldest;\n  }\n\n  /** Every parked session of a project, so the inbox reads no card when nothing waits. */\n  parkedIn(factoryProjectId: string): Array<{ sessionId: string; run: ParkedRun }> {\n    const parked: Array<{ sessionId: string; run: ParkedRun }> = [];\n    for (const [sessionId, tracked] of this.#byId) {\n      if (tracked.session.state.get().factoryProjectId !== factoryProjectId) continue;\n      const run = this.parked(sessionId);\n      if (run) parked.push({ sessionId, run });\n    }\n    return parked;\n  }\n\n  /** Fires when a session parks, is answered, or finishes a turn: whoever shows parked runs re-reads. */\n  onParkedChanged(listener: (session: LiveSession) => void): () => void {\n    this.#parkedListeners.add(listener);\n    return () => this.#parkedListeners.delete(listener);\n  }\n}\n"],"mappings":";;;;;;;;;;;;;;AA0CA,IAAa,eAAb,MAA0B;CACxB,wBAAiB,IAAI,IAA4B;CACjD,mCAA4B,IAAI,IAAoC;;CAEpE,iBAAiB;CAEjB,YAAY,YAA6B;EACvC,WAAW,kBAAiB,YAAW,KAAKE,OAAO,OAAO,CAAC;EAC3D,WAAW,kBAAiB,YAAW;GACrC,MAAM,KAAK,QAAQ,SAAS,MAAM;GAClC,MAAM,YAAY,KAAK,OAAO,EAAE,MAAM,KAAA;GACtC,KAAKF,MAAM,IAAI,EAAE,CAAC,EAAE,YAAY;GAChC,KAAKA,MAAM,OAAO,EAAE;GACpB,IAAI,WAAW,KAAK,MAAM,YAAY,KAAKC,kBAAkB,SAAS,OAAO;EAC/E,CAAC;CACH;CAEA,iBAAyB;EACvB,KAAKE,iBAAiB,KAAK,IAAI,KAAK,IAAI,GAAG,KAAKA,iBAAiB,CAAC;EAClE,OAAO,KAAKA;CACd;CAEA,OAAO,SAA4B;EACjC,MAAM,8BAAc,IAAI,IAAoB;EAC5C,MAAM,cAAc,QAAQ,WAAU,UAAS;GAC7C,IAAI,MAAM,SAAS,kBAAkB,YAAY,IAAI,MAAM,YAAY,KAAKC,eAAe,CAAC;QACvF,IAAI,MAAM,SAAS,6BAA6B,YAAY,OAAO,MAAM,UAAU;QACnF,IAAI,MAAM,SAAS,eAAe,MAAM,WAAW,aAAa,YAAY,MAAM;QAClF;GACL,KAAK,MAAM,YAAY,KAAKH,kBAAkB,SAAS,OAAO;EAChE,CAAC;EACD,KAAKD,MAAM,IAAI,QAAQ,SAAS,MAAM,GAAG;GAAE;GAAS,QAAQ,KAAK,IAAI;GAAG;GAAa;EAAY,CAAC;CACpG;;CAGA,UAAU,WAA4B;EACpC,OAAO,KAAKA,MAAM,IAAI,SAAS,CAAC,EAAE,QAAQ,IAAI,UAAU,KAAK;CAC/D;;CAGA,OAAO,WAA0C;EAC/C,MAAM,UAAU,KAAKA,MAAM,IAAI,SAAS;EACxC,IAAI,CAAC,SAAS,OAAO,KAAA;EACrB,IAAI;EACJ,KAAK,MAAM,CAAC,YAAY,EAAE,eAAe,QAAQ,QAAQ,aAAa,IAAI,CAAC,CAAC,oBAAoB;GAC9F,MAAM,cAAc,QAAQ,YAAY,IAAI,UAAU,KAAK,QAAQ;GACnE,IAAI,CAAC,UAAU,cAAc,OAAO,aAAa,SAAS;IAAE;IAAU;GAAY;EACpF;EACA,OAAO;CACT;;CAGA,SAAS,kBAAwE;EAC/E,MAAM,SAAuD,CAAC;EAC9D,KAAK,MAAM,CAAC,WAAW,YAAY,KAAKA,OAAO;GAC7C,IAAI,QAAQ,QAAQ,MAAM,IAAI,CAAC,CAAC,qBAAqB,kBAAkB;GACvE,MAAM,MAAM,KAAK,OAAO,SAAS;GACjC,IAAI,KAAK,OAAO,KAAK;IAAE;IAAW;GAAI,CAAC;EACzC;EACA,OAAO;CACT;;CAGA,gBAAgB,UAAsD;EACpE,KAAKC,iBAAiB,IAAI,QAAQ;EAClC,aAAa,KAAKA,iBAAiB,OAAO,QAAQ;CACpD;AACF"}

package/dist/session/memory-settings-hydration.d.ts

@@ -13,7 +13,7 @@ export declare const DEFAULT_REFLECTION_THRESHOLD = 40000;
 export declare function layerPersonalMemorySettings(project: MemorySettingsRecord | null, personal: MemorySettingsRecord | null): MemorySettingsRecord | null;
 export interface MemorySettingsHydrationSession {
     readonly identity: {
-        getResourceId(): string;
+        getId(): string;
     };
     state: {
         get: () => MastraCodeState | undefined;

package/dist/session/memory-settings-hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"memory-settings-hydration.d.ts","sourceRoot":"","sources":["../../src/session/memory-settings-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F,yDAAyD;AACzD,eAAO,MAAM,6BAA6B,QAAS,CAAC;AACpD,eAAO,MAAM,4BAA4B,QAAS,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,oBAAoB,GAAG,IAAI,EACpC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,GACpC,oBAAoB,GAAG,IAAI,CAW7B;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,KAAK,EAAE;QACL,GAAG,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;QACvC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAClE,CAAC;CACH;AAED,MAAM,WAAW,mCAAmC;IAClD,4FAA4F;IAC5F,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC;KAC1E,CAAC;CACH;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,8BAA8B,EACvC,EAAE,aAAa,EAAE,EAAE,mCAAmC,GACrD,OAAO,CAAC,IAAI,CAAC,CAYf"}
+{"version":3,"file":"memory-settings-hydration.d.ts","sourceRoot":"","sources":["../../src/session/memory-settings-hydration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AACvF,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F,yDAAyD;AACzD,eAAO,MAAM,6BAA6B,QAAS,CAAC;AACpD,eAAO,MAAM,4BAA4B,QAAS,CAAC;AAEnD;;;;;GAKG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,oBAAoB,GAAG,IAAI,EACpC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,GACpC,oBAAoB,GAAG,IAAI,CAW7B;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,QAAQ,EAAE;QAAE,KAAK,IAAI,MAAM,CAAA;KAAE,CAAC;IACvC,KAAK,EAAE;QACL,GAAG,EAAE,MAAM,eAAe,GAAG,SAAS,CAAC;QACvC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;KAClE,CAAC;CACH;AAED,MAAM,WAAW,mCAAmC;IAClD,4FAA4F;IAC5F,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,gBAAgB,CAAC,CAAC;KAC1E,CAAC;CACH;AAED;;;;;GAKG;AACH,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,8BAA8B,EACvC,EAAE,aAAa,EAAE,EAAE,mCAAmC,GACrD,OAAO,CAAC,IAAI,CAAC,CAYf"}

package/dist/session/memory-settings-hydration.js

@@ -31,7 +31,7 @@ async function hydrateSessionMemorySettings(session, { sourceControl }) {
 	const state = session.state.get() ?? {};
 	if (Boolean(state.factoryProjectId) && hasResolvedOrg(state.factoryOrgId)) return;
 	try {
-		await seedSessionOrg(session, (await sourceControl.sessions.getBySessionId(session.identity.getResourceId()))?.orgId);
+		await seedSessionOrg(session, (await sourceControl.sessions.getBySessionId(session.identity.getId()))?.orgId);
 	} catch (error) {
 		console.warn("[Factory session hydration] Unable to resolve the session organization.", error);
 		if (!session.state.get()?.factoryOrgId) await seedSessionOrg(session, void 0);

package/dist/session/memory-settings-hydration.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory-settings-hydration.js","names":[],"sources":["../../src/session/memory-settings-hydration.ts"],"sourcesContent":["import type { MastraCodeState } from '@mastra/code-sdk/schema';\n\nimport type { MemorySettingsRecord } from '../storage/domains/memory-settings/base.js';\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\nimport { hasResolvedOrg, seedSessionOrg } from './org-seed.js';\n\n/** Default thresholds mirror the TUI `/om` fallbacks. */\nexport const DEFAULT_OBSERVATION_THRESHOLD = 30_000;\nexport const DEFAULT_REFLECTION_THRESHOLD = 40_000;\n\n/**\n * Layer a channel sender's own row over the project's shared row. The sender\n * wins only for knobs they saved; an unsaved (`null`) knob keeps the project's\n * value rather than resetting to Auto or the built-in default, because the\n * project's choice may be the only credentialed one.\n */\nexport function layerPersonalMemorySettings(\n  project: MemorySettingsRecord | null,\n  personal: MemorySettingsRecord | null,\n): MemorySettingsRecord | null {\n  if (!personal) return project;\n  if (!project) return personal;\n  return {\n    ...project,\n    observerModelId: personal.observerModelId ?? project.observerModelId,\n    reflectorModelId: personal.reflectorModelId ?? project.reflectorModelId,\n    observationThreshold: personal.observationThreshold ?? project.observationThreshold,\n    reflectionThreshold: personal.reflectionThreshold ?? project.reflectionThreshold,\n    observeAttachments: personal.observeAttachments ?? project.observeAttachments,\n  };\n}\n\nexport interface MemorySettingsHydrationSession {\n  readonly identity: { getResourceId(): string };\n  state: {\n    get: () => MastraCodeState | undefined;\n    set: (updates: Partial<MastraCodeState>) => Promise<void> | void;\n  };\n}\n\nexport interface MemorySettingsHydrationDependencies {\n  /** GitHub-integration source-control rows — the only creator of web user sessions today. */\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'getBySessionId'>;\n  };\n}\n\n/**\n * Seed a freshly created controller session's tenant org from its source-control\n * row. Memory settings remain DB-authoritative and are loaded into request\n * context for each invocation instead of being copied into mutable session\n * state.\n */\nexport async function hydrateSessionMemorySettings(\n  session: MemorySettingsHydrationSession,\n  { sourceControl }: MemorySettingsHydrationDependencies,\n): Promise<void> {\n  const state: Partial<MastraCodeState> = session.state.get() ?? {};\n  const isFactoryRun = Boolean(state.factoryProjectId);\n  if (isFactoryRun && hasResolvedOrg(state.factoryOrgId)) return;\n\n  try {\n    const record = await sourceControl.sessions.getBySessionId(session.identity.getResourceId());\n    await seedSessionOrg(session, record?.orgId);\n  } catch (error) {\n    console.warn('[Factory session hydration] Unable to resolve the session organization.', error);\n    if (!session.state.get()?.factoryOrgId) await seedSessionOrg(session, undefined);\n  }\n}\n"],"mappings":";;;AAOA,MAAa,gCAAgC;AAC7C,MAAa,+BAA+B;;;;;;;AAQ5C,SAAgB,4BACd,SACA,UAC6B;CAC7B,IAAI,CAAC,UAAU,OAAO;CACtB,IAAI,CAAC,SAAS,OAAO;CACrB,OAAO;EACL,GAAG;EACH,iBAAiB,SAAS,mBAAmB,QAAQ;EACrD,kBAAkB,SAAS,oBAAoB,QAAQ;EACvD,sBAAsB,SAAS,wBAAwB,QAAQ;EAC/D,qBAAqB,SAAS,uBAAuB,QAAQ;EAC7D,oBAAoB,SAAS,sBAAsB,QAAQ;CAC7D;AACF;;;;;;;AAuBA,eAAsB,6BACpB,SACA,EAAE,iBACa;CACf,MAAM,QAAkC,QAAQ,MAAM,IAAI,KAAK,CAAC;CAEhE,IADqB,QAAQ,MAAM,gBACpB,KAAK,eAAe,MAAM,YAAY,GAAG;CAExD,IAAI;EAEF,MAAM,eAAe,UAAS,MADT,cAAc,SAAS,eAAe,QAAQ,SAAS,cAAc,CAAC,EAAA,EACrD,KAAK;CAC7C,SAAS,OAAO;EACd,QAAQ,KAAK,2EAA2E,KAAK;EAC7F,IAAI,CAAC,QAAQ,MAAM,IAAI,CAAC,EAAE,cAAc,MAAM,eAAe,SAAS,KAAA,CAAS;CACjF;AACF"}
+{"version":3,"file":"memory-settings-hydration.js","names":[],"sources":["../../src/session/memory-settings-hydration.ts"],"sourcesContent":["import type { MastraCodeState } from '@mastra/code-sdk/schema';\n\nimport type { MemorySettingsRecord } from '../storage/domains/memory-settings/base.js';\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\nimport { hasResolvedOrg, seedSessionOrg } from './org-seed.js';\n\n/** Default thresholds mirror the TUI `/om` fallbacks. */\nexport const DEFAULT_OBSERVATION_THRESHOLD = 30_000;\nexport const DEFAULT_REFLECTION_THRESHOLD = 40_000;\n\n/**\n * Layer a channel sender's own row over the project's shared row. The sender\n * wins only for knobs they saved; an unsaved (`null`) knob keeps the project's\n * value rather than resetting to Auto or the built-in default, because the\n * project's choice may be the only credentialed one.\n */\nexport function layerPersonalMemorySettings(\n  project: MemorySettingsRecord | null,\n  personal: MemorySettingsRecord | null,\n): MemorySettingsRecord | null {\n  if (!personal) return project;\n  if (!project) return personal;\n  return {\n    ...project,\n    observerModelId: personal.observerModelId ?? project.observerModelId,\n    reflectorModelId: personal.reflectorModelId ?? project.reflectorModelId,\n    observationThreshold: personal.observationThreshold ?? project.observationThreshold,\n    reflectionThreshold: personal.reflectionThreshold ?? project.reflectionThreshold,\n    observeAttachments: personal.observeAttachments ?? project.observeAttachments,\n  };\n}\n\nexport interface MemorySettingsHydrationSession {\n  readonly identity: { getId(): string };\n  state: {\n    get: () => MastraCodeState | undefined;\n    set: (updates: Partial<MastraCodeState>) => Promise<void> | void;\n  };\n}\n\nexport interface MemorySettingsHydrationDependencies {\n  /** GitHub-integration source-control rows — the only creator of web user sessions today. */\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'getBySessionId'>;\n  };\n}\n\n/**\n * Seed a freshly created controller session's tenant org from its source-control\n * row. Memory settings remain DB-authoritative and are loaded into request\n * context for each invocation instead of being copied into mutable session\n * state.\n */\nexport async function hydrateSessionMemorySettings(\n  session: MemorySettingsHydrationSession,\n  { sourceControl }: MemorySettingsHydrationDependencies,\n): Promise<void> {\n  const state: Partial<MastraCodeState> = session.state.get() ?? {};\n  const isFactoryRun = Boolean(state.factoryProjectId);\n  if (isFactoryRun && hasResolvedOrg(state.factoryOrgId)) return;\n\n  try {\n    const record = await sourceControl.sessions.getBySessionId(session.identity.getId());\n    await seedSessionOrg(session, record?.orgId);\n  } catch (error) {\n    console.warn('[Factory session hydration] Unable to resolve the session organization.', error);\n    if (!session.state.get()?.factoryOrgId) await seedSessionOrg(session, undefined);\n  }\n}\n"],"mappings":";;;AAOA,MAAa,gCAAgC;AAC7C,MAAa,+BAA+B;;;;;;;AAQ5C,SAAgB,4BACd,SACA,UAC6B;CAC7B,IAAI,CAAC,UAAU,OAAO;CACtB,IAAI,CAAC,SAAS,OAAO;CACrB,OAAO;EACL,GAAG;EACH,iBAAiB,SAAS,mBAAmB,QAAQ;EACrD,kBAAkB,SAAS,oBAAoB,QAAQ;EACvD,sBAAsB,SAAS,wBAAwB,QAAQ;EAC/D,qBAAqB,SAAS,uBAAuB,QAAQ;EAC7D,oBAAoB,SAAS,sBAAsB,QAAQ;CAC7D;AACF;;;;;;;AAuBA,eAAsB,6BACpB,SACA,EAAE,iBACa;CACf,MAAM,QAAkC,QAAQ,MAAM,IAAI,KAAK,CAAC;CAEhE,IADqB,QAAQ,MAAM,gBACpB,KAAK,eAAe,MAAM,YAAY,GAAG;CAExD,IAAI;EAEF,MAAM,eAAe,UAAS,MADT,cAAc,SAAS,eAAe,QAAQ,SAAS,MAAM,CAAC,EAAA,EAC7C,KAAK;CAC7C,SAAS,OAAO;EACd,QAAQ,KAAK,2EAA2E,KAAK;EAC7F,IAAI,CAAC,QAAQ,MAAM,IAAI,CAAC,EAAE,cAAc,MAAM,eAAe,SAAS,KAAA,CAAS;CACjF;AACF"}

package/dist/session/reply-credential-processor.d.ts

@@ -0,0 +1,15 @@
+import type { Processor, ProcessOutputStepArgs } from '@mastra/core/processors';
+/**
+ * Stamps each assistant reply with the credential that answered it, as
+ * `content.metadata.credentialLabel` ("Claude Pro/Max", "Anthropic API key")
+ * and, for a personal credential, `content.metadata.credentialOwnerId`. A
+ * reply without an owner id was answered by the organization's credential.
+ * Stamped at send time so a reply keeps its label after the thread's
+ * credential scope changes.
+ */
+export declare class FactoryReplyCredentialProcessor implements Processor {
+    readonly id = "factory-reply-credential";
+    readonly name = "Factory reply credential";
+    processOutputStep({ messageList, requestContext }: ProcessOutputStepArgs): import("@mastra/core/agent").MessageList;
+}
+//# sourceMappingURL=reply-credential-processor.d.ts.map

package/dist/session/reply-credential-processor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"reply-credential-processor.d.ts","sourceRoot":"","sources":["../../src/session/reply-credential-processor.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAIhF;;;;;;;GAOG;AACH,qBAAa,+BAAgC,YAAW,SAAS;IAC/D,QAAQ,CAAC,EAAE,8BAA8B;IACzC,QAAQ,CAAC,IAAI,8BAA8B;IAE3C,iBAAiB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,qBAAqB;CAkBzE"}

package/dist/session/reply-credential-processor.js

@@ -0,0 +1,38 @@
+import { credentialLabel, getAuthProviderId } from "../routes/provider-credentials.js";
+import { resolveCredentialStore, resolveTenantFromRequestContext } from "@mastra/code-sdk/agents/credential-resolver";
+import { normalizeLegacyProviderId } from "@mastra/code-sdk/providers/model-ids";
+//#region src/session/reply-credential-processor.ts
+/**
+* Stamps each assistant reply with the credential that answered it, as
+* `content.metadata.credentialLabel` ("Claude Pro/Max", "Anthropic API key")
+* and, for a personal credential, `content.metadata.credentialOwnerId`. A
+* reply without an owner id was answered by the organization's credential.
+* Stamped at send time so a reply keeps its label after the thread's
+* credential scope changes.
+*/
+var FactoryReplyCredentialProcessor = class {
+	id = "factory-reply-credential";
+	name = "Factory reply credential";
+	processOutputStep({ messageList, requestContext }) {
+		const tenant = resolveTenantFromRequestContext(requestContext);
+		const store = resolveCredentialStore(requestContext);
+		if (!tenant || !store) return messageList;
+		for (const message of messageList.get.response.db()) {
+			const metadata = message.content.metadata;
+			if (message.role !== "assistant" || !metadata || typeof metadata.provider !== "string") continue;
+			if (metadata.credentialLabel !== void 0) continue;
+			const [sdkProviderRoot = metadata.provider] = metadata.provider.split(".");
+			const provider = normalizeLegacyProviderId(sdkProviderRoot);
+			const credential = store.get(getAuthProviderId(provider));
+			const label = credential && credentialLabel(provider, credential.type);
+			if (!label) continue;
+			metadata.credentialLabel = label;
+			if (tenant.credentialScope === "user") metadata.credentialOwnerId = tenant.userId;
+		}
+		return messageList;
+	}
+};
+//#endregion
+export { FactoryReplyCredentialProcessor };
+
+//# sourceMappingURL=reply-credential-processor.js.map

package/dist/session/reply-credential-processor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"reply-credential-processor.js","names":[],"sources":["../../src/session/reply-credential-processor.ts"],"sourcesContent":["import { resolveCredentialStore, resolveTenantFromRequestContext } from '@mastra/code-sdk/agents/credential-resolver';\nimport { normalizeLegacyProviderId } from '@mastra/code-sdk/providers/model-ids';\nimport type { Processor, ProcessOutputStepArgs } from '@mastra/core/processors';\n\nimport { credentialLabel, getAuthProviderId } from '../routes/provider-credentials.js';\n\n/**\n * Stamps each assistant reply with the credential that answered it, as\n * `content.metadata.credentialLabel` (\"Claude Pro/Max\", \"Anthropic API key\")\n * and, for a personal credential, `content.metadata.credentialOwnerId`. A\n * reply without an owner id was answered by the organization's credential.\n * Stamped at send time so a reply keeps its label after the thread's\n * credential scope changes.\n */\nexport class FactoryReplyCredentialProcessor implements Processor {\n  readonly id = 'factory-reply-credential';\n  readonly name = 'Factory reply credential';\n\n  processOutputStep({ messageList, requestContext }: ProcessOutputStepArgs) {\n    const tenant = resolveTenantFromRequestContext(requestContext);\n    const store = resolveCredentialStore(requestContext);\n    if (!tenant || !store) return messageList;\n    for (const message of messageList.get.response.db()) {\n      const metadata = message.content.metadata;\n      if (message.role !== 'assistant' || !metadata || typeof metadata.provider !== 'string') continue;\n      if (metadata.credentialLabel !== undefined) continue;\n      const [sdkProviderRoot = metadata.provider] = metadata.provider.split('.');\n      const provider = normalizeLegacyProviderId(sdkProviderRoot);\n      const credential = store.get(getAuthProviderId(provider));\n      const label = credential && credentialLabel(provider, credential.type);\n      if (!label) continue;\n      metadata.credentialLabel = label;\n      if (tenant.credentialScope === 'user') metadata.credentialOwnerId = tenant.userId;\n    }\n    return messageList;\n  }\n}\n"],"mappings":";;;;;;;;;;;;AAcA,IAAa,kCAAb,MAAkE;CAChE,KAAc;CACd,OAAgB;CAEhB,kBAAkB,EAAE,aAAa,kBAAyC;EACxE,MAAM,SAAS,gCAAgC,cAAc;EAC7D,MAAM,QAAQ,uBAAuB,cAAc;EACnD,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO;EAC9B,KAAK,MAAM,WAAW,YAAY,IAAI,SAAS,GAAG,GAAG;GACnD,MAAM,WAAW,QAAQ,QAAQ;GACjC,IAAI,QAAQ,SAAS,eAAe,CAAC,YAAY,OAAO,SAAS,aAAa,UAAU;GACxF,IAAI,SAAS,oBAAoB,KAAA,GAAW;GAC5C,MAAM,CAAC,kBAAkB,SAAS,YAAY,SAAS,SAAS,MAAM,GAAG;GACzE,MAAM,WAAW,0BAA0B,eAAe;GAC1D,MAAM,aAAa,MAAM,IAAI,kBAAkB,QAAQ,CAAC;GACxD,MAAM,QAAQ,cAAc,gBAAgB,UAAU,WAAW,IAAI;GACrE,IAAI,CAAC,OAAO;GACZ,SAAS,kBAAkB;GAC3B,IAAI,OAAO,oBAAoB,QAAQ,SAAS,oBAAoB,OAAO;EAC7E;EACA,OAAO;CACT;AACF"}

package/dist/session/resource-migration.d.ts

@@ -0,0 +1,87 @@
+import type { StorageThreadType } from '@mastra/core/memory';
+import type { MemoryStorage } from '@mastra/core/storage';
+import type { SourceControlSession } from '../storage/domains/source-control/base.js';
+import type { WorkItemRow } from '../storage/domains/work-items/base.js';
+export interface SessionResourceMigrationDeps {
+    sessions: {
+        listSessionsAwaitingResourceMigration(): Promise<SourceControlSession[]>;
+        markResourcesMigrated(sessionId: string): Promise<void>;
+    };
+    workItems: {
+        listRunBoundItems(sessionId: string): Promise<(Pick<WorkItemRow, 'externalSource' | 'metadata'> | null)[]>;
+        moveRunBindingsToResource(input: {
+            sessionId: string;
+            resourceId: string;
+        }): Promise<number>;
+    };
+    /** Absent when the integrations domain is not ready; subscriptions then stay where they are. */
+    integrations?: {
+        moveSubscriptionsToResource(input: {
+            fromResourceId: string;
+            toResourceId: string;
+        }): Promise<number>;
+    };
+    memory: Pick<MemoryStorage, 'listThreads' | 'patchThread' | 'getObservationalMemory' | 'supportsObservationalMemory'>;
+    /**
+     * Moves a thread with everything keyed by its resource, such as observation vectors. Pass the
+     * sessions' `Memory`; the bare memory store only moves the thread and its messages.
+     */
+    threads: {
+        updateThreadResourceId(input: {
+            threadId: string;
+            resourceId: string;
+        }): Promise<StorageThreadType>;
+    };
+}
+export interface SessionResourceMigrationReport {
+    sessions: number;
+    factorySessions: number;
+    userSessions: number;
+    /** Runs on untrusted content; they keep their own resource. */
+    isolatedSessions: number;
+    /** Factory-owned sessions with no Factory to move them onto; left untouched. */
+    skipped: string[];
+    /** Sessions whose move threw; the next startup retries them. */
+    failed: string[];
+    /**
+     * Moved sessions whose subscriptions couldn't move because the integrations
+     * domain wasn't ready; left unmarked so a later startup moves them.
+     */
+    subscriptionsPending: string[];
+    threads: number;
+    runBindings: number;
+    subscriptions: number;
+    /** Moved sessions whose resource-scoped observational memory stays under their old resource. */
+    resourceObservationsLeft: string[];
+}
+/**
+ * The memory resource a session belongs to: its Factory for runs, side
+ * sessions and Slack channel threads, its owner for sessions a person opened,
+ * private side sessions and Slack DMs. A run on untrusted content (a pull request, or a card
+ * written outside the write-access circle) keeps its own resource, like a new
+ * run would; so does a run whose work item no longer loads, since nothing then
+ * shows its content was trusted. `null` when a Factory-owned session has no
+ * Factory recorded — guessing would merge it into the wrong resource.
+ */
+export declare function sessionMemoryResource(session: SourceControlSession, boundItems: (Pick<WorkItemRow, 'externalSource' | 'metadata'> | null)[]): {
+    owner: 'factory' | 'user' | 'isolated';
+    resourceId: string | null;
+};
+/**
+ * Move sessions stored under the legacy `resourceId = sessionId` onto their
+ * Factory or user resource. Threads keep their id (`threadId === sessionId`)
+ * and get `factorySessionId` so per-session listings still find them.
+ *
+ * Threads move through the sessions' `Memory`, so their observation vectors
+ * follow them and recall search finds their past observations under the new
+ * resource. Every write only touches values still equal to the session id, so
+ * a rerun is a no-op and a crash leaves a state the next run resumes from. A
+ * session is marked once moved, so later starts only read sessions that are not
+ * (new sessions are created marked).
+ * Nothing is deleted. Thread-scoped observational memory is keyed by thread id
+ * and keeps working. Resource-scoped observational memory written under
+ * `resource:<sessionId>` stays under that key and is no longer read: several
+ * sessions merge into one resource, and their records cannot be merged.
+ */
+export declare function migrateSessionResources(deps: SessionResourceMigrationDeps): Promise<SessionResourceMigrationReport>;
+//# sourceMappingURL=resource-migration.d.ts.map

package/dist/session/resource-migration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-migration.d.ts","sourceRoot":"","sources":["../../src/session/resource-migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAG1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACtF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAazE,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE;QACR,qCAAqC,IAAI,OAAO,CAAC,oBAAoB,EAAE,CAAC,CAAC;QACzE,qBAAqB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KACzD,CAAC;IACF,SAAS,EAAE;QACT,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;QAC3G,yBAAyB,CAAC,KAAK,EAAE;YAAE,SAAS,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KAC9F,CAAC;IACF,gGAAgG;IAChG,YAAY,CAAC,EAAE;QACb,2BAA2B,CAAC,KAAK,EAAE;YAAE,cAAc,EAAE,MAAM,CAAC;YAAC,YAAY,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;KACvG,CAAC;IACF,MAAM,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,GAAG,aAAa,GAAG,wBAAwB,GAAG,6BAA6B,CAAC,CAAC;IACtH;;;OAGG;IACH,OAAO,EAAE;QAAE,sBAAsB,CAAC,KAAK,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAC;YAAC,UAAU,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAA;KAAE,CAAC;CAClH;AAED,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,+DAA+D;IAC/D,gBAAgB,EAAE,MAAM,CAAC;IACzB,gFAAgF;IAChF,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,gEAAgE;IAChE,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB;;;OAGG;IACH,oBAAoB,EAAE,MAAM,EAAE,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,EAAE,CAAC;CACpC;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,oBAAoB,EAC7B,UAAU,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,gBAAgB,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,EAAE,GACtE;IAAE,KAAK,EAAE,SAAS,GAAG,MAAM,GAAG,UAAU,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAYvE;AAMD;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,4BAA4B,GACjC,OAAO,CAAC,8BAA8B,CAAC,CAwGzC"}

package/dist/session/resource-migration.js

@@ -0,0 +1,163 @@
+import { externallyAuthoredWorkItem } from "../rules/types.js";
+import { sessionStampCounts } from "./session-threads.js";
+//#region src/session/resource-migration.ts
+/** Slack-started sessions live on a `slack/<thread>` branch (see `threadBranch` in the Slack integration). */
+const SLACK_SESSION_BRANCH_PREFIX = "slack/";
+/**
+* Set on a thread while it moves and turned off once the move, vectors included, is done. A
+* crash in between leaves the thread moved in storage but no longer listed under its
+* session id, so the next start finds it by this flag and its session stamp and finishes the move.
+*/
+const MOVE_PENDING_KEY = "factoryResourceMovePending";
+/**
+* The memory resource a session belongs to: its Factory for runs, side
+* sessions and Slack channel threads, its owner for sessions a person opened,
+* private side sessions and Slack DMs. A run on untrusted content (a pull request, or a card
+* written outside the write-access circle) keeps its own resource, like a new
+* run would; so does a run whose work item no longer loads, since nothing then
+* shows its content was trusted. `null` when a Factory-owned session has no
+* Factory recorded — guessing would merge it into the wrong resource.
+*/
+function sessionMemoryResource(session, boundItems) {
+	if (boundItems.some((item) => item === null || untrustedWorkItem(item))) return {
+		owner: "isolated",
+		resourceId: session.sessionId
+	};
+	const sharedWithOrg = session.visibility !== "private" && (session.originSessionId !== null || session.branch.startsWith(SLACK_SESSION_BRANCH_PREFIX));
+	return boundItems.length > 0 || sharedWithOrg ? {
+		owner: "factory",
+		resourceId: session.factoryProjectId
+	} : {
+		owner: "user",
+		resourceId: session.userId
+	};
+}
+function untrustedWorkItem(item) {
+	return item.externalSource?.type === "pull-request" || externallyAuthoredWorkItem(item);
+}
+/**
+* Move sessions stored under the legacy `resourceId = sessionId` onto their
+* Factory or user resource. Threads keep their id (`threadId === sessionId`)
+* and get `factorySessionId` so per-session listings still find them.
+*
+* Threads move through the sessions' `Memory`, so their observation vectors
+* follow them and recall search finds their past observations under the new
+* resource. Every write only touches values still equal to the session id, so
+* a rerun is a no-op and a crash leaves a state the next run resumes from. A
+* session is marked once moved, so later starts only read sessions that are not
+* (new sessions are created marked).
+* Nothing is deleted. Thread-scoped observational memory is keyed by thread id
+* and keeps working. Resource-scoped observational memory written under
+* `resource:<sessionId>` stays under that key and is no longer read: several
+* sessions merge into one resource, and their records cannot be merged.
+*/
+async function migrateSessionResources(deps) {
+	const report = {
+		sessions: 0,
+		factorySessions: 0,
+		userSessions: 0,
+		isolatedSessions: 0,
+		skipped: [],
+		failed: [],
+		subscriptionsPending: [],
+		threads: 0,
+		runBindings: 0,
+		subscriptions: 0,
+		resourceObservationsLeft: []
+	};
+	const sessions = await deps.sessions.listSessionsAwaitingResourceMigration();
+	for (const session of sessions) {
+		report.sessions += 1;
+		const { sessionId } = session;
+		try {
+			const { owner, resourceId } = sessionMemoryResource(session, await deps.workItems.listRunBoundItems(sessionId));
+			if (!resourceId) {
+				report.skipped.push(sessionId);
+				continue;
+			}
+			if (owner === "factory") report.factorySessions += 1;
+			else if (owner === "isolated") report.isolatedSessions += 1;
+			else report.userSessions += 1;
+			if (resourceId === sessionId) {
+				await deps.sessions.markResourcesMigrated(sessionId);
+				continue;
+			}
+			const { threads: interrupted } = await deps.memory.listThreads({
+				filter: {
+					resourceId,
+					metadata: {
+						factorySessionId: sessionId,
+						[MOVE_PENDING_KEY]: true
+					}
+				},
+				perPage: false
+			});
+			for (const thread of interrupted) {
+				if (thread.resourceId === sessionId) continue;
+				await moveThread(deps, thread, thread.resourceId);
+				report.threads += 1;
+			}
+			const { threads } = await deps.memory.listThreads({
+				filter: { resourceId: sessionId },
+				perPage: false
+			});
+			const stampsCount = sessionStampCounts(session, resourceId);
+			for (const thread of threads) {
+				if (!stampsCount && thread.id !== sessionId) continue;
+				const metadata = {
+					...thread.metadata,
+					factorySessionId: sessionId,
+					[MOVE_PENDING_KEY]: true
+				};
+				await deps.memory.patchThread({
+					id: thread.id,
+					metadata
+				});
+				await moveThread(deps, {
+					...thread,
+					metadata
+				}, resourceId);
+				report.threads += 1;
+			}
+			report.runBindings += await deps.workItems.moveRunBindingsToResource({
+				sessionId,
+				resourceId
+			});
+			if (deps.integrations) report.subscriptions += await deps.integrations.moveSubscriptionsToResource({
+				fromResourceId: sessionId,
+				toResourceId: resourceId
+			});
+			if (threads.length > 0 && deps.memory.supportsObservationalMemory && await deps.memory.getObservationalMemory(null, sessionId)) {
+				report.resourceObservationsLeft.push(sessionId);
+				console.warn(`[factory] session resource migration: session ${sessionId} has resource-scoped observational memory; it stays under resource ${sessionId} and is not carried into ${resourceId}`);
+			}
+			if (!deps.integrations) {
+				report.subscriptionsPending.push(sessionId);
+				continue;
+			}
+			await deps.sessions.markResourcesMigrated(sessionId);
+		} catch (error) {
+			report.failed.push(sessionId);
+			console.warn(`[factory] session resource migration: session ${sessionId} not moved: ${error instanceof Error ? error.message : error}`);
+		}
+	}
+	if (report.threads + report.runBindings + report.subscriptions + report.skipped.length + report.failed.length + report.subscriptionsPending.length > 0) console.info(`[factory] session resource migration: ${report.threads} threads, ${report.runBindings} run bindings, ${report.subscriptions} subscriptions moved; ${report.skipped.length} Factory sessions without a Factory skipped; ${report.failed.length} sessions failed; ${report.subscriptionsPending.length} sessions wait for integrations to move their subscriptions`);
+	return report;
+}
+async function moveThread(deps, thread, resourceId) {
+	await deps.threads.updateThreadResourceId({
+		threadId: thread.id,
+		resourceId
+	});
+	await deps.memory.patchThread({
+		id: thread.id,
+		metadata: {
+			...thread.metadata,
+			[MOVE_PENDING_KEY]: false
+		}
+	});
+}
+//#endregion
+export { migrateSessionResources, sessionMemoryResource };
+
+//# sourceMappingURL=resource-migration.js.map

package/dist/session/resource-migration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resource-migration.js","names":[],"sources":["../../src/session/resource-migration.ts"],"sourcesContent":["import type { StorageThreadType } from '@mastra/core/memory';\nimport type { MemoryStorage } from '@mastra/core/storage';\n\nimport { externallyAuthoredWorkItem } from '../rules/types.js';\nimport type { SourceControlSession } from '../storage/domains/source-control/base.js';\nimport type { WorkItemRow } from '../storage/domains/work-items/base.js';\nimport { sessionStampCounts } from './session-threads.js';\n\n/** Slack-started sessions live on a `slack/<thread>` branch (see `threadBranch` in the Slack integration). */\nconst SLACK_SESSION_BRANCH_PREFIX = 'slack/';\n\n/**\n * Set on a thread while it moves and turned off once the move, vectors included, is done. A\n * crash in between leaves the thread moved in storage but no longer listed under its\n * session id, so the next start finds it by this flag and its session stamp and finishes the move.\n */\nconst MOVE_PENDING_KEY = 'factoryResourceMovePending';\n\nexport interface SessionResourceMigrationDeps {\n  sessions: {\n    listSessionsAwaitingResourceMigration(): Promise<SourceControlSession[]>;\n    markResourcesMigrated(sessionId: string): Promise<void>;\n  };\n  workItems: {\n    listRunBoundItems(sessionId: string): Promise<(Pick<WorkItemRow, 'externalSource' | 'metadata'> | null)[]>;\n    moveRunBindingsToResource(input: { sessionId: string; resourceId: string }): Promise<number>;\n  };\n  /** Absent when the integrations domain is not ready; subscriptions then stay where they are. */\n  integrations?: {\n    moveSubscriptionsToResource(input: { fromResourceId: string; toResourceId: string }): Promise<number>;\n  };\n  memory: Pick<MemoryStorage, 'listThreads' | 'patchThread' | 'getObservationalMemory' | 'supportsObservationalMemory'>;\n  /**\n   * Moves a thread with everything keyed by its resource, such as observation vectors. Pass the\n   * sessions' `Memory`; the bare memory store only moves the thread and its messages.\n   */\n  threads: { updateThreadResourceId(input: { threadId: string; resourceId: string }): Promise<StorageThreadType> };\n}\n\nexport interface SessionResourceMigrationReport {\n  sessions: number;\n  factorySessions: number;\n  userSessions: number;\n  /** Runs on untrusted content; they keep their own resource. */\n  isolatedSessions: number;\n  /** Factory-owned sessions with no Factory to move them onto; left untouched. */\n  skipped: string[];\n  /** Sessions whose move threw; the next startup retries them. */\n  failed: string[];\n  /**\n   * Moved sessions whose subscriptions couldn't move because the integrations\n   * domain wasn't ready; left unmarked so a later startup moves them.\n   */\n  subscriptionsPending: string[];\n  threads: number;\n  runBindings: number;\n  subscriptions: number;\n  /** Moved sessions whose resource-scoped observational memory stays under their old resource. */\n  resourceObservationsLeft: string[];\n}\n\n/**\n * The memory resource a session belongs to: its Factory for runs, side\n * sessions and Slack channel threads, its owner for sessions a person opened,\n * private side sessions and Slack DMs. A run on untrusted content (a pull request, or a card\n * written outside the write-access circle) keeps its own resource, like a new\n * run would; so does a run whose work item no longer loads, since nothing then\n * shows its content was trusted. `null` when a Factory-owned session has no\n * Factory recorded — guessing would merge it into the wrong resource.\n */\nexport function sessionMemoryResource(\n  session: SourceControlSession,\n  boundItems: (Pick<WorkItemRow, 'externalSource' | 'metadata'> | null)[],\n): { owner: 'factory' | 'user' | 'isolated'; resourceId: string | null } {\n  if (boundItems.some(item => item === null || untrustedWorkItem(item))) {\n    return { owner: 'isolated', resourceId: session.sessionId };\n  }\n  // A Slack DM or private side session is its owner's, so it belongs with their own sessions.\n  const sharedWithOrg =\n    session.visibility !== 'private' &&\n    (session.originSessionId !== null || session.branch.startsWith(SLACK_SESSION_BRANCH_PREFIX));\n  const factoryOwned = boundItems.length > 0 || sharedWithOrg;\n  return factoryOwned\n    ? { owner: 'factory', resourceId: session.factoryProjectId }\n    : { owner: 'user', resourceId: session.userId };\n}\n\nfunction untrustedWorkItem(item: Pick<WorkItemRow, 'externalSource' | 'metadata'>): boolean {\n  return item.externalSource?.type === 'pull-request' || externallyAuthoredWorkItem(item);\n}\n\n/**\n * Move sessions stored under the legacy `resourceId = sessionId` onto their\n * Factory or user resource. Threads keep their id (`threadId === sessionId`)\n * and get `factorySessionId` so per-session listings still find them.\n *\n * Threads move through the sessions' `Memory`, so their observation vectors\n * follow them and recall search finds their past observations under the new\n * resource. Every write only touches values still equal to the session id, so\n * a rerun is a no-op and a crash leaves a state the next run resumes from. A\n * session is marked once moved, so later starts only read sessions that are not\n * (new sessions are created marked).\n * Nothing is deleted. Thread-scoped observational memory is keyed by thread id\n * and keeps working. Resource-scoped observational memory written under\n * `resource:<sessionId>` stays under that key and is no longer read: several\n * sessions merge into one resource, and their records cannot be merged.\n */\nexport async function migrateSessionResources(\n  deps: SessionResourceMigrationDeps,\n): Promise<SessionResourceMigrationReport> {\n  const report: SessionResourceMigrationReport = {\n    sessions: 0,\n    factorySessions: 0,\n    userSessions: 0,\n    isolatedSessions: 0,\n    skipped: [],\n    failed: [],\n    subscriptionsPending: [],\n    threads: 0,\n    runBindings: 0,\n    subscriptions: 0,\n    resourceObservationsLeft: [],\n  };\n  const sessions = await deps.sessions.listSessionsAwaitingResourceMigration();\n\n  for (const session of sessions) {\n    report.sessions += 1;\n    const { sessionId } = session;\n    try {\n      const { owner, resourceId } = sessionMemoryResource(session, await deps.workItems.listRunBoundItems(sessionId));\n      if (!resourceId) {\n        report.skipped.push(sessionId);\n        continue;\n      }\n      if (owner === 'factory') report.factorySessions += 1;\n      else if (owner === 'isolated') report.isolatedSessions += 1;\n      else report.userSessions += 1;\n      if (resourceId === sessionId) {\n        await deps.sessions.markResourcesMigrated(sessionId);\n        continue;\n      }\n\n      // Finish moves a crash interrupted after storage moved the thread.\n      const { threads: interrupted } = await deps.memory.listThreads({\n        filter: { resourceId, metadata: { factorySessionId: sessionId, [MOVE_PENDING_KEY]: true } },\n        perPage: false,\n      });\n      for (const thread of interrupted) {\n        if (thread.resourceId === sessionId) continue; // listed under the session id below\n        await moveThread(deps, thread, thread.resourceId);\n        report.threads += 1;\n      }\n      const { threads } = await deps.memory.listThreads({ filter: { resourceId: sessionId }, perPage: false });\n      // A private session's stamps don't count under its Factory, so only its own\n      // thread moves there; its other threads stay listed under its id.\n      const stampsCount = sessionStampCounts(session, resourceId);\n      for (const thread of threads) {\n        if (!stampsCount && thread.id !== sessionId) continue;\n        // Tag before moving: once moved, the thread is no longer found under the session id.\n        const metadata = { ...thread.metadata, factorySessionId: sessionId, [MOVE_PENDING_KEY]: true };\n        await deps.memory.patchThread({ id: thread.id, metadata });\n        await moveThread(deps, { ...thread, metadata }, resourceId);\n        report.threads += 1;\n      }\n      report.runBindings += await deps.workItems.moveRunBindingsToResource({ sessionId, resourceId });\n      if (deps.integrations) {\n        report.subscriptions += await deps.integrations.moveSubscriptionsToResource({\n          fromResourceId: sessionId,\n          toResourceId: resourceId,\n        });\n      }\n      // Reported once, on the run that moves the session's threads.\n      if (\n        threads.length > 0 &&\n        deps.memory.supportsObservationalMemory &&\n        (await deps.memory.getObservationalMemory(null, sessionId))\n      ) {\n        report.resourceObservationsLeft.push(sessionId);\n        console.warn(\n          `[factory] session resource migration: session ${sessionId} has resource-scoped observational memory; ` +\n            `it stays under resource ${sessionId} and is not carried into ${resourceId}`,\n        );\n      }\n      if (!deps.integrations) {\n        report.subscriptionsPending.push(sessionId);\n        continue;\n      }\n      await deps.sessions.markResourcesMigrated(sessionId);\n    } catch (error) {\n      report.failed.push(sessionId);\n      console.warn(\n        `[factory] session resource migration: session ${sessionId} not moved: ${error instanceof Error ? error.message : error}`,\n      );\n    }\n  }\n\n  if (\n    report.threads +\n      report.runBindings +\n      report.subscriptions +\n      report.skipped.length +\n      report.failed.length +\n      report.subscriptionsPending.length >\n    0\n  ) {\n    console.info(\n      `[factory] session resource migration: ${report.threads} threads, ${report.runBindings} run bindings, ` +\n        `${report.subscriptions} subscriptions moved; ${report.skipped.length} Factory sessions without a Factory skipped; ` +\n        `${report.failed.length} sessions failed; ${report.subscriptionsPending.length} sessions wait for integrations ` +\n        `to move their subscriptions`,\n    );\n  }\n  return report;\n}\n\nasync function moveThread(\n  deps: SessionResourceMigrationDeps,\n  thread: StorageThreadType,\n  resourceId: string,\n): Promise<void> {\n  await deps.threads.updateThreadResourceId({ threadId: thread.id, resourceId });\n  // Stores merge thread metadata, so the flag is switched off rather than removed.\n  await deps.memory.patchThread({ id: thread.id, metadata: { ...thread.metadata, [MOVE_PENDING_KEY]: false } });\n}\n"],"mappings":";;;;AASA,MAAM,8BAA8B;;;;;;AAOpC,MAAM,mBAAmB;;;;;;;;;;AAsDzB,SAAgB,sBACd,SACA,YACuE;CACvE,IAAI,WAAW,MAAK,SAAQ,SAAS,QAAQ,kBAAkB,IAAI,CAAC,GAClE,OAAO;EAAE,OAAO;EAAY,YAAY,QAAQ;CAAU;CAG5D,MAAM,gBACJ,QAAQ,eAAe,cACtB,QAAQ,oBAAoB,QAAQ,QAAQ,OAAO,WAAW,2BAA2B;CAE5F,OADqB,WAAW,SAAS,KAAK,gBAE1C;EAAE,OAAO;EAAW,YAAY,QAAQ;CAAiB,IACzD;EAAE,OAAO;EAAQ,YAAY,QAAQ;CAAO;AAClD;AAEA,SAAS,kBAAkB,MAAiE;CAC1F,OAAO,KAAK,gBAAgB,SAAS,kBAAkB,2BAA2B,IAAI;AACxF;;;;;;;;;;;;;;;;;AAkBA,eAAsB,wBACpB,MACyC;CACzC,MAAM,SAAyC;EAC7C,UAAU;EACV,iBAAiB;EACjB,cAAc;EACd,kBAAkB;EAClB,SAAS,CAAC;EACV,QAAQ,CAAC;EACT,sBAAsB,CAAC;EACvB,SAAS;EACT,aAAa;EACb,eAAe;EACf,0BAA0B,CAAC;CAC7B;CACA,MAAM,WAAW,MAAM,KAAK,SAAS,sCAAsC;CAE3E,KAAK,MAAM,WAAW,UAAU;EAC9B,OAAO,YAAY;EACnB,MAAM,EAAE,cAAc;EACtB,IAAI;GACF,MAAM,EAAE,OAAO,eAAe,sBAAsB,SAAS,MAAM,KAAK,UAAU,kBAAkB,SAAS,CAAC;GAC9G,IAAI,CAAC,YAAY;IACf,OAAO,QAAQ,KAAK,SAAS;IAC7B;GACF;GACA,IAAI,UAAU,WAAW,OAAO,mBAAmB;QAC9C,IAAI,UAAU,YAAY,OAAO,oBAAoB;QACrD,OAAO,gBAAgB;GAC5B,IAAI,eAAe,WAAW;IAC5B,MAAM,KAAK,SAAS,sBAAsB,SAAS;IACnD;GACF;GAGA,MAAM,EAAE,SAAS,gBAAgB,MAAM,KAAK,OAAO,YAAY;IAC7D,QAAQ;KAAE;KAAY,UAAU;MAAE,kBAAkB;OAAY,mBAAmB;KAAK;IAAE;IAC1F,SAAS;GACX,CAAC;GACD,KAAK,MAAM,UAAU,aAAa;IAChC,IAAI,OAAO,eAAe,WAAW;IACrC,MAAM,WAAW,MAAM,QAAQ,OAAO,UAAU;IAChD,OAAO,WAAW;GACpB;GACA,MAAM,EAAE,YAAY,MAAM,KAAK,OAAO,YAAY;IAAE,QAAQ,EAAE,YAAY,UAAU;IAAG,SAAS;GAAM,CAAC;GAGvG,MAAM,cAAc,mBAAmB,SAAS,UAAU;GAC1D,KAAK,MAAM,UAAU,SAAS;IAC5B,IAAI,CAAC,eAAe,OAAO,OAAO,WAAW;IAE7C,MAAM,WAAW;KAAE,GAAG,OAAO;KAAU,kBAAkB;MAAY,mBAAmB;IAAK;IAC7F,MAAM,KAAK,OAAO,YAAY;KAAE,IAAI,OAAO;KAAI;IAAS,CAAC;IACzD,MAAM,WAAW,MAAM;KAAE,GAAG;KAAQ;IAAS,GAAG,UAAU;IAC1D,OAAO,WAAW;GACpB;GACA,OAAO,eAAe,MAAM,KAAK,UAAU,0BAA0B;IAAE;IAAW;GAAW,CAAC;GAC9F,IAAI,KAAK,cACP,OAAO,iBAAiB,MAAM,KAAK,aAAa,4BAA4B;IAC1E,gBAAgB;IAChB,cAAc;GAChB,CAAC;GAGH,IACE,QAAQ,SAAS,KACjB,KAAK,OAAO,+BACX,MAAM,KAAK,OAAO,uBAAuB,MAAM,SAAS,GACzD;IACA,OAAO,yBAAyB,KAAK,SAAS;IAC9C,QAAQ,KACN,iDAAiD,UAAU,qEAC9B,UAAU,2BAA2B,YACpE;GACF;GACA,IAAI,CAAC,KAAK,cAAc;IACtB,OAAO,qBAAqB,KAAK,SAAS;IAC1C;GACF;GACA,MAAM,KAAK,SAAS,sBAAsB,SAAS;EACrD,SAAS,OAAO;GACd,OAAO,OAAO,KAAK,SAAS;GAC5B,QAAQ,KACN,iDAAiD,UAAU,cAAc,iBAAiB,QAAQ,MAAM,UAAU,OACpH;EACF;CACF;CAEA,IACE,OAAO,UACL,OAAO,cACP,OAAO,gBACP,OAAO,QAAQ,SACf,OAAO,OAAO,SACd,OAAO,qBAAqB,SAC9B,GAEA,QAAQ,KACN,yCAAyC,OAAO,QAAQ,YAAY,OAAO,YAAY,iBAClF,OAAO,cAAc,wBAAwB,OAAO,QAAQ,OAAO,+CACnE,OAAO,OAAO,OAAO,oBAAoB,OAAO,qBAAqB,OAAO,4DAEnF;CAEF,OAAO;AACT;AAEA,eAAe,WACb,MACA,QACA,YACe;CACf,MAAM,KAAK,QAAQ,uBAAuB;EAAE,UAAU,OAAO;EAAI;CAAW,CAAC;CAE7E,MAAM,KAAK,OAAO,YAAY;EAAE,IAAI,OAAO;EAAI,UAAU;GAAE,GAAG,OAAO;IAAW,mBAAmB;EAAM;CAAE,CAAC;AAC9G"}

package/dist/session/run-audit.d.ts

@@ -37,6 +37,30 @@ export interface RunEndCaptureSession {
 type RunEndReason = Extract<AgentControllerEvent, {
     type: 'agent_end';
 }>['reason'];
+/**
+ * JSON budget for the per-step entries on a run's audit record. Audit metadata
+ * is capped at 4 KB as a whole and an oversized record loses all of it, so
+ * later steps are dropped (and counted) instead; totals always cover every step.
+ */
+export declare const FACTORY_RUN_USAGE_STEPS_JSON_BUDGET = 2400;
+declare const USAGE_FIELDS: readonly ["promptTokens", "completionTokens", "totalTokens", "reasoningTokens", "cachedInputTokens", "cacheCreationInputTokens", "cacheCreationInputTokens5m", "cacheCreationInputTokens1h"];
+type UsageCounts = Partial<Record<(typeof USAGE_FIELDS)[number], number>>;
+/**
+ * Token usage attached to a run's `factory.run.ended` audit record.
+ * `unreported` means this process saw no usage for the run (it ran elsewhere,
+ * the process restarted, or the model reported none). It is never zero spend.
+ */
+export type FactoryRunUsage = {
+    status: 'recorded';
+    stepCount: number;
+    totals: UsageCounts;
+    steps: UsageCounts[];
+    stepsTruncated?: number;
+    /** Other runs that ended in the same agent turn; the turn's usage can't be split between them. */
+    sharedWithKickoffIds?: string[];
+} | {
+    status: 'unreported';
+};
 export declare function listSessionOpenRuns(session: RunEndCaptureSession): Promise<FactoryOpenRun[]>;
 export declare function waitForSessionRunAudit(session: RunEndCaptureSession): Promise<void>;
 export declare function recordSessionRunStart(session: RunEndCaptureSession, { audit, run, actorType, observedEnd, }: {

package/dist/session/run-audit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-audit.d.ts","sourceRoot":"","sources":["../../src/session/run-audit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,yBAAyB,oBAAoB,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;iBAqBxB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,6GAA6G;AAC7G,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO,CAOtG;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE;QACf,UAAU,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,UAAU,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAClE,CAAC;IACF,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,KAAK,YAAY,GAAG,OAAO,CAAC,oBAAoB,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;AAWnF,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAGlG;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AA4CD,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,oBAAoB,EAC7B,EACE,KAAK,EACL,GAAG,EACH,SAAS,EACT,WAAW,GACZ,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,WAAW,EAAE,MAAM,YAAY,CAAC;CACjC,GACA,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,4FAA4F;AAC5F,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,MAAM,EACjB,EAAE,SAAa,GACd,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,IAAI,CAKnH"}
+{"version":3,"file":"run-audit.d.ts","sourceRoot":"","sources":["../../src/session/run-audit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAExE,eAAO,MAAM,yBAAyB,oBAAoB,CAAC;AAE3D,QAAA,MAAM,oBAAoB;;;;;;;;;;;;;;iBAqBxB,CAAC;AAEH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAElE,6GAA6G;AAC7G,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAEhD,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAa,GAAG,OAAO,CAOtG;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,MAAM,EAAE;QACf,UAAU,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACpD,UAAU,CAAC,IAAI,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,OAAO,CAAA;SAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;KAClE,CAAC;IACF,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,KAAK,YAAY,GAAG,OAAO,CAAC,oBAAoB,EAAE;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;AAInF;;;;GAIG;AACH,eAAO,MAAM,mCAAmC,OAAO,CAAC;AAExD,QAAA,MAAM,YAAY,8LASR,CAAC;AAEX,KAAK,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;AAE1E;;;;GAIG;AACH,MAAM,MAAM,eAAe,GACvB;IACE,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;IACpB,KAAK,EAAE,WAAW,EAAE,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kGAAkG;IAClG,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC,GACD;IAAE,MAAM,EAAE,YAAY,CAAA;CAAE,CAAC;AAoE7B,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC,CAGlG;AAED,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAsED,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,oBAAoB,EAC7B,EACE,KAAK,EACL,GAAG,EACH,SAAS,EACT,WAAW,GACZ,EAAE;IACD,KAAK,EAAE,aAAa,CAAC;IACrB,GAAG,EAAE,cAAc,CAAC;IACpB,SAAS,EAAE,cAAc,CAAC;IAC1B,WAAW,EAAE,MAAM,YAAY,CAAC;CACjC,GACA,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,4FAA4F;AAC5F,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,oBAAoB,EAC7B,SAAS,EAAE,MAAM,EACjB,EAAE,SAAa,GACd,OAAO,CAAC,IAAI,CAAC,CASf;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,IAAI,CAcnH"}

package/dist/session/run-audit.js

@@ -29,6 +29,61 @@ function isOpenRunLiveElsewhere(run, ownerId, now = Date.now()) {
 	return run.ownerId !== void 0 && run.ownerId !== ownerId && run.heartbeatAt !== void 0 && now - run.heartbeatAt < 3e4;
 }
 const pendingWrites = /* @__PURE__ */ new WeakMap();
+/**
+* JSON budget for the per-step entries on a run's audit record. Audit metadata
+* is capped at 4 KB as a whole and an oversized record loses all of it, so
+* later steps are dropped (and counted) instead; totals always cover every step.
+*/
+const FACTORY_RUN_USAGE_STEPS_JSON_BUDGET = 2400;
+const USAGE_FIELDS = [
+	"promptTokens",
+	"completionTokens",
+	"totalTokens",
+	"reasoningTokens",
+	"cachedInputTokens",
+	"cacheCreationInputTokens",
+	"cacheCreationInputTokens5m",
+	"cacheCreationInputTokens1h"
+];
+function usageCounts(usage) {
+	const counts = {};
+	for (const field of USAGE_FIELDS) {
+		const value = usage[field];
+		if (typeof value === "number") counts[field] = value;
+	}
+	return counts;
+}
+function runUsage(steps) {
+	if (steps.length === 0) return { status: "unreported" };
+	const totals = {};
+	for (const step of steps) for (const field of USAGE_FIELDS) if (step[field] !== void 0) totals[field] = (totals[field] ?? 0) + step[field];
+	const kept = [];
+	let length = 2;
+	for (const step of steps) {
+		length += JSON.stringify(step).length + 1;
+		if (length > 2400) break;
+		kept.push(step);
+	}
+	return {
+		status: "recorded",
+		stepCount: steps.length,
+		totals,
+		steps: kept,
+		...steps.length > kept.length ? { stepsTruncated: steps.length - kept.length } : {}
+	};
+}
+const sessionUsage = /* @__PURE__ */ new WeakMap();
+function usageFor(session) {
+	let usage = sessionUsage.get(session);
+	if (!usage) {
+		usage = {
+			current: [],
+			held: /* @__PURE__ */ new Map()
+		};
+		sessionUsage.set(session, usage);
+	}
+	return usage;
+}
 function serializeRunAudit(session, write) {
 	const pending = (pendingWrites.get(session) ?? Promise.resolve()).then(write).catch((error) => console.warn("[Factory run audit] Unable to record run lifecycle.", error));
 	pendingWrites.set(session, pending);
@@ -55,27 +110,47 @@ function runAuditInput(run) {
 		metadata
 	};
 }
-async function recordRunEnds(session, audit, reason, kickoffId) {
+async function recordRunEnds(session, audit, reason, kickoffId, endedTurn) {
 	if (!reason || reason === "suspended") return;
+	const usage = usageFor(session);
 	const runs = await listSessionOpenRuns(session);
 	if (runs.length === 0) return;
+	const ending = runs.filter((run) => !kickoffId || run.kickoffId === kickoffId);
+	const turn = endedTurn ?? usage.lastTurn;
+	const steps = turn && !turn.claimed ? turn.steps : [];
+	if (turn && ending.length > 0) turn.claimed = true;
+	const turnUsage = runUsage(steps);
 	const remaining = [];
 	for (const run of runs) {
-		if (kickoffId && run.kickoffId !== kickoffId) {
+		if (!ending.includes(run)) {
 			remaining.push(run);
 			continue;
 		}
+		let runUsageRecord = usage.held.get(run.kickoffId);
+		if (!runUsageRecord) {
+			const shared = ending.filter((other) => other !== run).map((other) => other.kickoffId);
+			runUsageRecord = turnUsage.status === "recorded" && shared.length > 0 ? {
+				...turnUsage,
+				sharedWithKickoffIds: shared
+			} : turnUsage;
+			usage.held.set(run.kickoffId, runUsageRecord);
+		}
 		const input = runAuditInput(run);
-		if (!await audit.record({
+		if (await audit.record({
 			...input,
 			actorId: `agent:${run.threadId}`,
 			actorType: "agent",
 			action: "factory.run.ended",
 			metadata: {
 				...input.metadata,
-				reason
+				reason,
+				usage: runUsageRecord
 			}
-		})) remaining.push(run);
+		})) usage.held.delete(run.kickoffId);
+		else {
+			console.warn(`[Factory run audit] Token usage for run ${run.kickoffId} (${run.role}) was not persisted; keeping it for the next attempt.`, runUsageRecord);
+			remaining.push(run);
+		}
 	}
 	await session.thread.setSetting({
 		key: FACTORY_OPEN_RUNS_SETTING,
@@ -113,12 +188,23 @@ function heartbeatSessionOpenRun(session, kickoffId, at = Date.now()) {
 	});
 }
 function observeSessionRunEnd(session, { audit }) {
+	const usage = usageFor(session);
 	return session.subscribe((event) => {
+		if (event.type === "usage_update") {
+			usage.current.push(usageCounts(event.usage));
+			return;
+		}
 		if (event.type !== "agent_end" || !event.reason || event.reason === "suspended") return;
-		serializeRunAudit(session, () => recordRunEnds(session, audit, event.reason));
+		const turn = {
+			steps: usage.current,
+			claimed: false
+		};
+		usage.current = [];
+		usage.lastTurn = turn;
+		serializeRunAudit(session, () => recordRunEnds(session, audit, event.reason, void 0, turn));
 	});
 }
 //#endregion
-export { FACTORY_OPEN_RUNS_SETTING, FACTORY_OPEN_RUN_STALE_MS, heartbeatSessionOpenRun, isOpenRunLiveElsewhere, listSessionOpenRuns, observeSessionRunEnd, recordSessionRunStart, waitForSessionRunAudit };
+export { FACTORY_OPEN_RUNS_SETTING, FACTORY_OPEN_RUN_STALE_MS, FACTORY_RUN_USAGE_STEPS_JSON_BUDGET, heartbeatSessionOpenRun, isOpenRunLiveElsewhere, listSessionOpenRuns, observeSessionRunEnd, recordSessionRunStart, waitForSessionRunAudit };
 
 //# sourceMappingURL=run-audit.js.map