@mastra/factory 0.9.0 → 0.10.0-alpha.10

package/dist/session/first-exec-capture.d.ts

@@ -12,18 +12,24 @@ export interface FirstExecCaptureDependencies {
     };
 }
 /**
- * Record when a session's agent completed its first successful sandbox exec
- * (the TTFME anchor — "time to first meaningful exec").
+ * Record when a session's agent completed its first successful meaningful
+ * tool call (the TTFME anchor — "time to first meaningful exec").
  *
- * `command_exit` is emitted only for the agent's own foreground
- * `execute_command` tool calls: direct `sandbox.executeCommand()` calls from
- * the skill loader / preflight / materializer never flow through the tool, so
- * the first successful exit event is definitionally the agent's first
- * meaningful exec — no command classifier needed. Background spawns emit no
- * exit event at spawn time and are intentionally excluded.
+ * Meaningful = a workspace tool the agent invoked itself (filesystem,
+ * search, code intelligence, sandbox exec, process control). We accept any
+ * tool whose name starts with the workspace prefix `mastra_workspace_` or
+ * matches the post-remap mastracode tool names. Non-workspace tools (memory,
+ * notification inbox, subagent, etc.) and skill-loader / preflight /
+ * materializer `sandbox.executeCommand()` calls that never flow through the
+ * tool layer are intentionally excluded.
  *
- * Failed commands (nonzero exit) don't count; the listener stays subscribed
- * until a successful exit, then unsubscribes. The storage write is guarded
+ * Failed tool calls (`isError === true`) don't count. Approval-denied and
+ * abort-while-parked tool completions (`denied === true`) also don't count:
+ * the run-engine emits `tool_end` with `isError: false` for those paths
+ * because the tool didn't fail, but it also never ran, so treating them as
+ * "meaningful exec" would re-introduce the same contamination this fix is
+ * removing on the message side. The listener stays subscribed until a
+ * successful qualifying end, then unsubscribes. The storage write is guarded
  * (`first_meaningful_exec_at IS NULL`), so restarts, re-materialized
  * sessions, and sessions without a source-control row are no-ops.
  */

package/dist/session/first-exec-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"first-exec-capture.d.ts","sourceRoot":"","sources":["../../src/session/first-exec-capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,4BAA4B;IAC3C,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,yBAAyB,CAAC,CAAC;KACnF,CAAC;CACH;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,uBAAuB,EAChC,EAAE,aAAa,EAAE,EAAE,4BAA4B,GAC9C,MAAM,IAAI,CAWZ"}
+{"version":3,"file":"first-exec-capture.d.ts","sourceRoot":"","sources":["../../src/session/first-exec-capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAG1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,4BAA4B;IAC3C,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,yBAAyB,CAAC,CAAC;KACnF,CAAC;CACH;AAmCD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,uBAAuB,EAChC,EAAE,aAAa,EAAE,EAAE,4BAA4B,GAC9C,MAAM,IAAI,CAoDZ"}

package/dist/session/first-exec-capture.js

@@ -1,27 +1,87 @@
+import { WORKSPACE_TOOLS_PREFIX } from "@mastra/core/workspace";
 //#region src/session/first-exec-capture.ts
 /**
-* Record when a session's agent completed its first successful sandbox exec
-* (the TTFME anchor — "time to first meaningful exec").
+* Tool names that count as "meaningful exec" independent of the workspace
+* prefix. The workspace tools get remapped from `mastra_workspace_*` to
+* mastracode-friendly names (see `mastracode/sdk/src/tool-names.ts`), and
+* this listener runs on the emitted tool name after remap, so both spellings
+* need to match.
+*/
+const MEANINGFUL_TOOL_NAMES = /* @__PURE__ */ new Set([
+	"view",
+	"write_file",
+	"string_replace_lsp",
+	"find_files",
+	"delete_file",
+	"file_stat",
+	"mkdir",
+	"search_content",
+	"ast_smart_edit",
+	"lsp_inspect",
+	"execute_command",
+	"get_process_output",
+	"kill_process"
+]);
+function isMeaningfulToolName(name) {
+	if (!name) return false;
+	if (name.startsWith(`${WORKSPACE_TOOLS_PREFIX}_`)) return true;
+	return MEANINGFUL_TOOL_NAMES.has(name);
+}
+/**
+* Record when a session's agent completed its first successful meaningful
+* tool call (the TTFME anchor — "time to first meaningful exec").
 *
-* `command_exit` is emitted only for the agent's own foreground
-* `execute_command` tool calls: direct `sandbox.executeCommand()` calls from
-* the skill loader / preflight / materializer never flow through the tool, so
-* the first successful exit event is definitionally the agent's first
-* meaningful exec — no command classifier needed. Background spawns emit no
-* exit event at spawn time and are intentionally excluded.
+* Meaningful = a workspace tool the agent invoked itself (filesystem,
+* search, code intelligence, sandbox exec, process control). We accept any
+* tool whose name starts with the workspace prefix `mastra_workspace_` or
+* matches the post-remap mastracode tool names. Non-workspace tools (memory,
+* notification inbox, subagent, etc.) and skill-loader / preflight /
+* materializer `sandbox.executeCommand()` calls that never flow through the
+* tool layer are intentionally excluded.
 *
-* Failed commands (nonzero exit) don't count; the listener stays subscribed
-* until a successful exit, then unsubscribes. The storage write is guarded
+* Failed tool calls (`isError === true`) don't count. Approval-denied and
+* abort-while-parked tool completions (`denied === true`) also don't count:
+* the run-engine emits `tool_end` with `isError: false` for those paths
+* because the tool didn't fail, but it also never ran, so treating them as
+* "meaningful exec" would re-introduce the same contamination this fix is
+* removing on the message side. The listener stays subscribed until a
+* successful qualifying end, then unsubscribes. The storage write is guarded
 * (`first_meaningful_exec_at IS NULL`), so restarts, re-materialized
 * sessions, and sessions without a source-control row are no-ops.
 */
 function observeSessionFirstExec(session, { sourceControl }) {
 	let seen = false;
+	const toolNames = /* @__PURE__ */ new Map();
+	const suspended = /* @__PURE__ */ new Set();
 	const unsubscribe = session.subscribe((event) => {
-		if (seen || event.type !== "command_exit" || !event.success) return;
-		seen = true;
-		unsubscribe();
-		sourceControl.sessions.markFirstMeaningfulExec({ sessionId: session.identity.getResourceId() }).catch((error) => console.warn("[Factory first-exec capture] Unable to persist first exec time.", error));
+		if (seen) return;
+		switch (event.type) {
+			case "tool_start":
+				toolNames.set(event.toolCallId, event.toolName);
+				return;
+			case "tool_suspended":
+				suspended.add(event.toolCallId);
+				return;
+			case "tool_suspension_cancelled":
+				toolNames.delete(event.toolCallId);
+				suspended.delete(event.toolCallId);
+				return;
+			case "agent_end":
+				for (const id of toolNames.keys()) if (!suspended.has(id)) toolNames.delete(id);
+				return;
+			case "tool_end": {
+				const toolName = toolNames.get(event.toolCallId);
+				toolNames.delete(event.toolCallId);
+				suspended.delete(event.toolCallId);
+				if (event.isError) return;
+				if (event.denied) return;
+				if (!isMeaningfulToolName(toolName)) return;
+				seen = true;
+				unsubscribe();
+				sourceControl.sessions.markFirstMeaningfulExec({ sessionId: session.identity.getResourceId() }).catch((error) => console.warn("[Factory first-exec capture] Unable to persist first exec time.", error));
+				return;
+			}
+		}
 	});
 	return unsubscribe;
 }

package/dist/session/first-exec-capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"first-exec-capture.js","names":[],"sources":["../../src/session/first-exec-capture.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\n\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\n\nexport interface FirstExecCaptureSession {\n  readonly identity: { getResourceId(): string };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\nexport interface FirstExecCaptureDependencies {\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'markFirstMeaningfulExec'>;\n  };\n}\n\n/**\n * Record when a session's agent completed its first successful sandbox exec\n * (the TTFME anchor — \"time to first meaningful exec\").\n *\n * `command_exit` is emitted only for the agent's own foreground\n * `execute_command` tool calls: direct `sandbox.executeCommand()` calls from\n * the skill loader / preflight / materializer never flow through the tool, so\n * the first successful exit event is definitionally the agent's first\n * meaningful exec — no command classifier needed. Background spawns emit no\n * exit event at spawn time and are intentionally excluded.\n *\n * Failed commands (nonzero exit) don't count; the listener stays subscribed\n * until a successful exit, then unsubscribes. The storage write is guarded\n * (`first_meaningful_exec_at IS NULL`), so restarts, re-materialized\n * sessions, and sessions without a source-control row are no-ops.\n */\nexport function observeSessionFirstExec(\n  session: FirstExecCaptureSession,\n  { sourceControl }: FirstExecCaptureDependencies,\n): () => void {\n  let seen = false;\n  const unsubscribe = session.subscribe(event => {\n    if (seen || event.type !== 'command_exit' || !event.success) return;\n    seen = true;\n    unsubscribe();\n    void sourceControl.sessions\n      .markFirstMeaningfulExec({ sessionId: session.identity.getResourceId() })\n      .catch(error => console.warn('[Factory first-exec capture] Unable to persist first exec time.', error));\n  });\n  return unsubscribe;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AA+BA,SAAgB,wBACd,SACA,EAAE,iBACU;CACZ,IAAI,OAAO;CACX,MAAM,cAAc,QAAQ,WAAU,UAAS;EAC7C,IAAI,QAAQ,MAAM,SAAS,kBAAkB,CAAC,MAAM,SAAS;EAC7D,OAAO;EACP,YAAY;EACZ,cAAmB,SAChB,wBAAwB,EAAE,WAAW,QAAQ,SAAS,cAAc,EAAE,CAAC,CAAC,CACxE,OAAM,UAAS,QAAQ,KAAK,mEAAmE,KAAK,CAAC;CAC1G,CAAC;CACD,OAAO;AACT"}
+{"version":3,"file":"first-exec-capture.js","names":[],"sources":["../../src/session/first-exec-capture.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\nimport { WORKSPACE_TOOLS_PREFIX } from '@mastra/core/workspace';\n\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\n\nexport interface FirstExecCaptureSession {\n  readonly identity: { getResourceId(): string };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\nexport interface FirstExecCaptureDependencies {\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'markFirstMeaningfulExec'>;\n  };\n}\n\n/**\n * Tool names that count as \"meaningful exec\" independent of the workspace\n * prefix. The workspace tools get remapped from `mastra_workspace_*` to\n * mastracode-friendly names (see `mastracode/sdk/src/tool-names.ts`), and\n * this listener runs on the emitted tool name after remap, so both spellings\n * need to match.\n */\nconst MEANINGFUL_TOOL_NAMES: ReadonlySet<string> = new Set([\n  // Filesystem (post-remap)\n  'view',\n  'write_file',\n  'string_replace_lsp',\n  'find_files',\n  'delete_file',\n  'file_stat',\n  'mkdir',\n  // Search\n  'search_content',\n  // Code intelligence\n  'ast_smart_edit',\n  'lsp_inspect',\n  // Sandbox\n  'execute_command',\n  'get_process_output',\n  'kill_process',\n]);\n\nfunction isMeaningfulToolName(name: string | undefined): boolean {\n  if (!name) return false;\n  if (name.startsWith(`${WORKSPACE_TOOLS_PREFIX}_`)) return true;\n  return MEANINGFUL_TOOL_NAMES.has(name);\n}\n\n/**\n * Record when a session's agent completed its first successful meaningful\n * tool call (the TTFME anchor — \"time to first meaningful exec\").\n *\n * Meaningful = a workspace tool the agent invoked itself (filesystem,\n * search, code intelligence, sandbox exec, process control). We accept any\n * tool whose name starts with the workspace prefix `mastra_workspace_` or\n * matches the post-remap mastracode tool names. Non-workspace tools (memory,\n * notification inbox, subagent, etc.) and skill-loader / preflight /\n * materializer `sandbox.executeCommand()` calls that never flow through the\n * tool layer are intentionally excluded.\n *\n * Failed tool calls (`isError === true`) don't count. Approval-denied and\n * abort-while-parked tool completions (`denied === true`) also don't count:\n * the run-engine emits `tool_end` with `isError: false` for those paths\n * because the tool didn't fail, but it also never ran, so treating them as\n * \"meaningful exec\" would re-introduce the same contamination this fix is\n * removing on the message side. The listener stays subscribed until a\n * successful qualifying end, then unsubscribes. The storage write is guarded\n * (`first_meaningful_exec_at IS NULL`), so restarts, re-materialized\n * sessions, and sessions without a source-control row are no-ops.\n */\nexport function observeSessionFirstExec(\n  session: FirstExecCaptureSession,\n  { sourceControl }: FirstExecCaptureDependencies,\n): () => void {\n  let seen = false;\n  // toolCallId -> toolName. Populated on `tool_start`, consumed on `tool_end`.\n  // Suspended entries survive `agent_end` so the resumed run can still resolve\n  // its tool name when the eventual `tool_end` arrives.\n  const toolNames = new Map<string, string>();\n  const suspended = new Set<string>();\n  const unsubscribe = session.subscribe(event => {\n    if (seen) return;\n    switch (event.type) {\n      case 'tool_start': {\n        toolNames.set(event.toolCallId, event.toolName);\n        return;\n      }\n      case 'tool_suspended': {\n        suspended.add(event.toolCallId);\n        return;\n      }\n      case 'tool_suspension_cancelled': {\n        toolNames.delete(event.toolCallId);\n        suspended.delete(event.toolCallId);\n        return;\n      }\n      case 'agent_end': {\n        // Drop any in-flight starts that will never see a matching `tool_end`\n        // on this run. Genuinely suspended calls stay so their eventual\n        // resume-time `tool_end` can still map back to a tool name. Without\n        // this, sessions that repeatedly abort or error before a qualifying\n        // completion would accumulate stale entries for the entire lifetime\n        // of the subscription.\n        for (const id of toolNames.keys()) {\n          if (!suspended.has(id)) toolNames.delete(id);\n        }\n        return;\n      }\n      case 'tool_end': {\n        const toolName = toolNames.get(event.toolCallId);\n        toolNames.delete(event.toolCallId);\n        suspended.delete(event.toolCallId);\n        if (event.isError) return;\n        if (event.denied) return;\n        if (!isMeaningfulToolName(toolName)) return;\n        seen = true;\n        unsubscribe();\n        void sourceControl.sessions\n          .markFirstMeaningfulExec({ sessionId: session.identity.getResourceId() })\n          .catch(error => console.warn('[Factory first-exec capture] Unable to persist first exec time.', error));\n        return;\n      }\n    }\n  });\n  return unsubscribe;\n}\n"],"mappings":";;;;;;;;;AAuBA,MAAM,wCAA6C,IAAI,IAAI;CAEzD;CACA;CACA;CACA;CACA;CACA;CACA;CAEA;CAEA;CACA;CAEA;CACA;CACA;AACF,CAAC;AAED,SAAS,qBAAqB,MAAmC;CAC/D,IAAI,CAAC,MAAM,OAAO;CAClB,IAAI,KAAK,WAAW,GAAG,uBAAuB,EAAE,GAAG,OAAO;CAC1D,OAAO,sBAAsB,IAAI,IAAI;AACvC;;;;;;;;;;;;;;;;;;;;;;;AAwBA,SAAgB,wBACd,SACA,EAAE,iBACU;CACZ,IAAI,OAAO;CAIX,MAAM,4BAAY,IAAI,IAAoB;CAC1C,MAAM,4BAAY,IAAI,IAAY;CAClC,MAAM,cAAc,QAAQ,WAAU,UAAS;EAC7C,IAAI,MAAM;EACV,QAAQ,MAAM,MAAd;GACE,KAAK;IACH,UAAU,IAAI,MAAM,YAAY,MAAM,QAAQ;IAC9C;GAEF,KAAK;IACH,UAAU,IAAI,MAAM,UAAU;IAC9B;GAEF,KAAK;IACH,UAAU,OAAO,MAAM,UAAU;IACjC,UAAU,OAAO,MAAM,UAAU;IACjC;GAEF,KAAK;IAOH,KAAK,MAAM,MAAM,UAAU,KAAK,GAC9B,IAAI,CAAC,UAAU,IAAI,EAAE,GAAG,UAAU,OAAO,EAAE;IAE7C;GAEF,KAAK,YAAY;IACf,MAAM,WAAW,UAAU,IAAI,MAAM,UAAU;IAC/C,UAAU,OAAO,MAAM,UAAU;IACjC,UAAU,OAAO,MAAM,UAAU;IACjC,IAAI,MAAM,SAAS;IACnB,IAAI,MAAM,QAAQ;IAClB,IAAI,CAAC,qBAAqB,QAAQ,GAAG;IACrC,OAAO;IACP,YAAY;IACZ,cAAmB,SAChB,wBAAwB,EAAE,WAAW,QAAQ,SAAS,cAAc,EAAE,CAAC,CAAC,CACxE,OAAM,UAAS,QAAQ,KAAK,mEAAmE,KAAK,CAAC;IACxG;GACF;EACF;CACF,CAAC;CACD,OAAO;AACT"}

package/dist/session/first-message-capture.d.ts

@@ -12,18 +12,22 @@ export interface FirstMessageCaptureDependencies {
     };
 }
 /**
- * Record when a session's agent first started working on a message.
+ * Record when a session's agent first produced an actual conversational
+ * message (the TTFI anchor — "time to first interaction").
  *
- * `agent_start` is the earliest reliable session event for "a message reached
- * the agent": it fires when the run engine begins processing an accepted
- * message — a user's chat message, a factory run's kickoff prompt, or a
- * channel message — for every session kind (user, work, review). The plain
- * user message itself is never emitted as a `message_start` event, so the run
- * start is the observable proxy, milliseconds after arrival.
+ * We stamp on the first `message_start` whose role is `user` or `assistant`.
+ * The coordinator writes `role='signal'` rows into the thread (skill loads,
+ * phase markers, memory reminders) before the model is ever invoked; those
+ * signals used to trigger a stamp via `agent_start`, giving every session —
+ * including zero-message model-init failures — a false TTFI of a few seconds.
+ * Gating on real conversational roles keeps the TTFI column honest: sessions
+ * that never produced a user or assistant message stay NULL and drop out of
+ * TTFI percentiles instead of contaminating them.
  *
- * The listener unsubscribes after the first event; the storage write is
- * guarded (`first_message_at IS NULL`), so restarts, re-materialized sessions,
- * and sessions without a source-control row (chat-only channels) are no-ops.
+ * The listener unsubscribes after the first qualifying message; the storage
+ * write is guarded (`first_message_at IS NULL`), so restarts, re-materialized
+ * sessions, and sessions without a source-control row (chat-only channels)
+ * are no-ops.
  */
 export declare function observeSessionFirstMessage(session: FirstMessageCaptureSession, { sourceControl }: FirstMessageCaptureDependencies): () => void;
 //# sourceMappingURL=first-message-capture.d.ts.map

package/dist/session/first-message-capture.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"first-message-capture.d.ts","sourceRoot":"","sources":["../../src/session/first-message-capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,+BAA+B;IAC9C,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;KAC5E,CAAC;CACH;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,0BAA0B,EACnC,EAAE,aAAa,EAAE,EAAE,+BAA+B,GACjD,MAAM,IAAI,CAWZ"}
+{"version":3,"file":"first-message-capture.d.ts","sourceRoot":"","sources":["../../src/session/first-message-capture.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAE5F,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,+BAA+B;IAC9C,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,kBAAkB,CAAC,CAAC;KAC5E,CAAC;CACH;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,0BAA0B,EACnC,EAAE,aAAa,EAAE,EAAE,+BAA+B,GACjD,MAAM,IAAI,CAaZ"}

package/dist/session/first-message-capture.js

@@ -1,22 +1,28 @@
 //#region src/session/first-message-capture.ts
 /**
-* Record when a session's agent first started working on a message.
+* Record when a session's agent first produced an actual conversational
+* message (the TTFI anchor — "time to first interaction").
 *
-* `agent_start` is the earliest reliable session event for "a message reached
-* the agent": it fires when the run engine begins processing an accepted
-* message — a user's chat message, a factory run's kickoff prompt, or a
-* channel message — for every session kind (user, work, review). The plain
-* user message itself is never emitted as a `message_start` event, so the run
-* start is the observable proxy, milliseconds after arrival.
+* We stamp on the first `message_start` whose role is `user` or `assistant`.
+* The coordinator writes `role='signal'` rows into the thread (skill loads,
+* phase markers, memory reminders) before the model is ever invoked; those
+* signals used to trigger a stamp via `agent_start`, giving every session —
+* including zero-message model-init failures — a false TTFI of a few seconds.
+* Gating on real conversational roles keeps the TTFI column honest: sessions
+* that never produced a user or assistant message stay NULL and drop out of
+* TTFI percentiles instead of contaminating them.
 *
-* The listener unsubscribes after the first event; the storage write is
-* guarded (`first_message_at IS NULL`), so restarts, re-materialized sessions,
-* and sessions without a source-control row (chat-only channels) are no-ops.
+* The listener unsubscribes after the first qualifying message; the storage
+* write is guarded (`first_message_at IS NULL`), so restarts, re-materialized
+* sessions, and sessions without a source-control row (chat-only channels)
+* are no-ops.
 */
 function observeSessionFirstMessage(session, { sourceControl }) {
 	let seen = false;
 	const unsubscribe = session.subscribe((event) => {
-		if (seen || event.type !== "agent_start") return;
+		if (seen || event.type !== "message_start") return;
+		const role = event.message.role;
+		if (role !== "user" && role !== "assistant") return;
 		seen = true;
 		unsubscribe();
 		sourceControl.sessions.markFirstMessage({ sessionId: session.identity.getResourceId() }).catch((error) => console.warn("[Factory first-message capture] Unable to persist first message time.", error));

package/dist/session/first-message-capture.js.map

@@ -1 +1 @@
-{"version":3,"file":"first-message-capture.js","names":[],"sources":["../../src/session/first-message-capture.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\n\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\n\nexport interface FirstMessageCaptureSession {\n  readonly identity: { getResourceId(): string };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\nexport interface FirstMessageCaptureDependencies {\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'markFirstMessage'>;\n  };\n}\n\n/**\n * Record when a session's agent first started working on a message.\n *\n * `agent_start` is the earliest reliable session event for \"a message reached\n * the agent\": it fires when the run engine begins processing an accepted\n * message — a user's chat message, a factory run's kickoff prompt, or a\n * channel message — for every session kind (user, work, review). The plain\n * user message itself is never emitted as a `message_start` event, so the run\n * start is the observable proxy, milliseconds after arrival.\n *\n * The listener unsubscribes after the first event; the storage write is\n * guarded (`first_message_at IS NULL`), so restarts, re-materialized sessions,\n * and sessions without a source-control row (chat-only channels) are no-ops.\n */\nexport function observeSessionFirstMessage(\n  session: FirstMessageCaptureSession,\n  { sourceControl }: FirstMessageCaptureDependencies,\n): () => void {\n  let seen = false;\n  const unsubscribe = session.subscribe(event => {\n    if (seen || event.type !== 'agent_start') return;\n    seen = true;\n    unsubscribe();\n    void sourceControl.sessions\n      .markFirstMessage({ sessionId: session.identity.getResourceId() })\n      .catch(error => console.warn('[Factory first-message capture] Unable to persist first message time.', error));\n  });\n  return unsubscribe;\n}\n"],"mappings":";;;;;;;;;;;;;;;AA6BA,SAAgB,2BACd,SACA,EAAE,iBACU;CACZ,IAAI,OAAO;CACX,MAAM,cAAc,QAAQ,WAAU,UAAS;EAC7C,IAAI,QAAQ,MAAM,SAAS,eAAe;EAC1C,OAAO;EACP,YAAY;EACZ,cAAmB,SAChB,iBAAiB,EAAE,WAAW,QAAQ,SAAS,cAAc,EAAE,CAAC,CAAC,CACjE,OAAM,UAAS,QAAQ,KAAK,yEAAyE,KAAK,CAAC;CAChH,CAAC;CACD,OAAO;AACT"}
+{"version":3,"file":"first-message-capture.js","names":[],"sources":["../../src/session/first-message-capture.ts"],"sourcesContent":["import type { AgentControllerEvent } from '@mastra/core/agent-controller';\n\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\n\nexport interface FirstMessageCaptureSession {\n  readonly identity: { getResourceId(): string };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\nexport interface FirstMessageCaptureDependencies {\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'markFirstMessage'>;\n  };\n}\n\n/**\n * Record when a session's agent first produced an actual conversational\n * message (the TTFI anchor — \"time to first interaction\").\n *\n * We stamp on the first `message_start` whose role is `user` or `assistant`.\n * The coordinator writes `role='signal'` rows into the thread (skill loads,\n * phase markers, memory reminders) before the model is ever invoked; those\n * signals used to trigger a stamp via `agent_start`, giving every session —\n * including zero-message model-init failures — a false TTFI of a few seconds.\n * Gating on real conversational roles keeps the TTFI column honest: sessions\n * that never produced a user or assistant message stay NULL and drop out of\n * TTFI percentiles instead of contaminating them.\n *\n * The listener unsubscribes after the first qualifying message; the storage\n * write is guarded (`first_message_at IS NULL`), so restarts, re-materialized\n * sessions, and sessions without a source-control row (chat-only channels)\n * are no-ops.\n */\nexport function observeSessionFirstMessage(\n  session: FirstMessageCaptureSession,\n  { sourceControl }: FirstMessageCaptureDependencies,\n): () => void {\n  let seen = false;\n  const unsubscribe = session.subscribe(event => {\n    if (seen || event.type !== 'message_start') return;\n    const role = event.message.role;\n    if (role !== 'user' && role !== 'assistant') return;\n    seen = true;\n    unsubscribe();\n    void sourceControl.sessions\n      .markFirstMessage({ sessionId: session.identity.getResourceId() })\n      .catch(error => console.warn('[Factory first-message capture] Unable to persist first message time.', error));\n  });\n  return unsubscribe;\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAiCA,SAAgB,2BACd,SACA,EAAE,iBACU;CACZ,IAAI,OAAO;CACX,MAAM,cAAc,QAAQ,WAAU,UAAS;EAC7C,IAAI,QAAQ,MAAM,SAAS,iBAAiB;EAC5C,MAAM,OAAO,MAAM,QAAQ;EAC3B,IAAI,SAAS,UAAU,SAAS,aAAa;EAC7C,OAAO;EACP,YAAY;EACZ,cAAmB,SAChB,iBAAiB,EAAE,WAAW,QAAQ,SAAS,cAAc,EAAE,CAAC,CAAC,CACjE,OAAM,UAAS,QAAQ,KAAK,yEAAyE,KAAK,CAAC;CAChH,CAAC;CACD,OAAO;AACT"}

package/dist/session/session-title.d.ts

@@ -0,0 +1,7 @@
+/**
+ * The one shape a session row's title may take, wherever it comes from — typed
+ * by a user at creation, generated for its thread, or refined by the observer.
+ * Returns null when nothing readable is left, so callers can reject or skip.
+ */
+export declare function normalizeSessionTitle(title: string): string | null;
+//# sourceMappingURL=session-title.d.ts.map

package/dist/session/session-title.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-title.d.ts","sourceRoot":"","sources":["../../src/session/session-title.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIlE"}

package/dist/session/session-title.js

@@ -0,0 +1,14 @@
+//#region src/session/session-title.ts
+const MAX_SESSION_TITLE_LENGTH = 80;
+/**
+* The one shape a session row's title may take, wherever it comes from — typed
+* by a user at creation, generated for its thread, or refined by the observer.
+* Returns null when nothing readable is left, so callers can reject or skip.
+*/
+function normalizeSessionTitle(title) {
+	return [...title.replace(/\s+/g, " ").trim()].slice(0, MAX_SESSION_TITLE_LENGTH).join("").trimEnd() || null;
+}
+//#endregion
+export { normalizeSessionTitle };
+
+//# sourceMappingURL=session-title.js.map

package/dist/session/session-title.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-title.js","names":[],"sources":["../../src/session/session-title.ts"],"sourcesContent":["const MAX_SESSION_TITLE_LENGTH = 80;\n\n/**\n * The one shape a session row's title may take, wherever it comes from — typed\n * by a user at creation, generated for its thread, or refined by the observer.\n * Returns null when nothing readable is left, so callers can reject or skip.\n */\nexport function normalizeSessionTitle(title: string): string | null {\n  // Cap code points, not UTF-16 units: an emoji straddling the cap would store a lone surrogate.\n  const capped = [...title.replace(/\\s+/g, ' ').trim()].slice(0, MAX_SESSION_TITLE_LENGTH).join('');\n  return capped.trimEnd() || null;\n}\n"],"mappings":";AAAA,MAAM,2BAA2B;;;;;;AAOjC,SAAgB,sBAAsB,OAA8B;CAGlE,OADe,CAAC,GAAG,MAAM,QAAQ,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,GAAG,wBAAwB,CAAC,CAAC,KAAK,EAClF,CAAC,CAAC,QAAQ,KAAK;AAC7B"}

package/dist/session/thread-title-mirror.d.ts

@@ -0,0 +1,35 @@
+import type { AgentControllerEvent, AgentControllerThread } from '@mastra/core/agent-controller';
+import type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';
+export interface ThreadTitleMirrorSession {
+    readonly identity: {
+        getResourceId(): string;
+    };
+    readonly thread: {
+        getById(args: {
+            threadId: string;
+        }): Promise<AgentControllerThread | null>;
+    };
+    subscribe(listener: (event: AgentControllerEvent) => void): () => void;
+}
+export interface ThreadTitleMirrorDependencies {
+    sourceControl: {
+        sessions: Pick<SourceControlStorageHandle['sessions'], 'getBySessionId' | 'rename'>;
+    };
+}
+/**
+ * Project the bound thread's title onto its source-control session row, from
+ * whichever namer produced it — core on the first turn, the observational-memory
+ * observer as the thread grows, or an explicit rename.
+ *
+ * The factory sidebar reads the session row, which otherwise keeps the raw first
+ * prompt (chat sessions) or nothing at all (work sessions, which then show their
+ * branch). Binding a thread reconciles the row against the stored title, so a
+ * session started before this ran — or one whose rename event was missed — is
+ * named the next time it is opened.
+ *
+ * A session names threads it is no longer showing, and each write reads the row
+ * before replacing it. Titles for any other thread are therefore dropped, and
+ * writes run one at a time so the last event wins rather than the fastest.
+ */
+export declare function observeSessionThreadTitle(session: ThreadTitleMirrorSession, { sourceControl }: ThreadTitleMirrorDependencies): () => void;
+//# sourceMappingURL=thread-title-mirror.d.ts.map

package/dist/session/thread-title-mirror.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-title-mirror.d.ts","sourceRoot":"","sources":["../../src/session/thread-title-mirror.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAEjG,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,2CAA2C,CAAC;AAG5F,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,QAAQ,CAAC,MAAM,EAAE;QAAE,OAAO,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAA;KAAE,CAAC;IAChG,SAAS,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,IAAI,GAAG,MAAM,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,6BAA6B;IAC5C,aAAa,EAAE;QACb,QAAQ,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,gBAAgB,GAAG,QAAQ,CAAC,CAAC;KACrF,CAAC;CACH;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,wBAAwB,EACjC,EAAE,aAAa,EAAE,EAAE,6BAA6B,GAC/C,MAAM,IAAI,CAuCZ"}

package/dist/session/thread-title-mirror.js

@@ -0,0 +1,51 @@
+import { normalizeSessionTitle } from "./session-title.js";
+//#region src/session/thread-title-mirror.ts
+/**
+* Project the bound thread's title onto its source-control session row, from
+* whichever namer produced it — core on the first turn, the observational-memory
+* observer as the thread grows, or an explicit rename.
+*
+* The factory sidebar reads the session row, which otherwise keeps the raw first
+* prompt (chat sessions) or nothing at all (work sessions, which then show their
+* branch). Binding a thread reconciles the row against the stored title, so a
+* session started before this ran — or one whose rename event was missed — is
+* named the next time it is opened.
+*
+* A session names threads it is no longer showing, and each write reads the row
+* before replacing it. Titles for any other thread are therefore dropped, and
+* writes run one at a time so the last event wins rather than the fastest.
+*/
+function observeSessionThreadTitle(session, { sourceControl }) {
+	const sessionId = session.identity.getResourceId();
+	let boundThreadId;
+	let writes = Promise.resolve();
+	const project = (threadId, rawTitle) => {
+		boundThreadId ??= threadId;
+		if (threadId !== boundThreadId) return;
+		const title = rawTitle ? normalizeSessionTitle(rawTitle) : null;
+		if (!title) return;
+		writes = writes.then(async () => {
+			if (threadId !== boundThreadId) return;
+			const row = await sourceControl.sessions.getBySessionId(sessionId);
+			if (!row || row.title === title) return;
+			await sourceControl.sessions.rename({
+				sessionId,
+				title
+			});
+		}).catch((error) => console.warn("[Factory thread-title mirror] Unable to persist the session title.", error));
+	};
+	return session.subscribe((event) => {
+		switch (event.type) {
+			case "thread_title_updated": return project(event.threadId, event.title);
+			case "om_thread_title_updated": return project(event.threadId, event.newTitle);
+			case "thread_changed":
+				boundThreadId = event.threadId;
+				session.thread.getById({ threadId: event.threadId }).then((thread) => project(event.threadId, thread?.title)).catch((error) => console.warn("[Factory thread-title mirror] Unable to read the bound thread.", error));
+				return;
+		}
+	});
+}
+//#endregion
+export { observeSessionThreadTitle };
+
+//# sourceMappingURL=thread-title-mirror.js.map

package/dist/session/thread-title-mirror.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"thread-title-mirror.js","names":[],"sources":["../../src/session/thread-title-mirror.ts"],"sourcesContent":["import type { AgentControllerEvent, AgentControllerThread } from '@mastra/core/agent-controller';\n\nimport type { SourceControlStorageHandle } from '../storage/domains/source-control/base.js';\nimport { normalizeSessionTitle } from './session-title.js';\n\nexport interface ThreadTitleMirrorSession {\n  readonly identity: { getResourceId(): string };\n  readonly thread: { getById(args: { threadId: string }): Promise<AgentControllerThread | null> };\n  subscribe(listener: (event: AgentControllerEvent) => void): () => void;\n}\n\nexport interface ThreadTitleMirrorDependencies {\n  sourceControl: {\n    sessions: Pick<SourceControlStorageHandle['sessions'], 'getBySessionId' | 'rename'>;\n  };\n}\n\n/**\n * Project the bound thread's title onto its source-control session row, from\n * whichever namer produced it — core on the first turn, the observational-memory\n * observer as the thread grows, or an explicit rename.\n *\n * The factory sidebar reads the session row, which otherwise keeps the raw first\n * prompt (chat sessions) or nothing at all (work sessions, which then show their\n * branch). Binding a thread reconciles the row against the stored title, so a\n * session started before this ran — or one whose rename event was missed — is\n * named the next time it is opened.\n *\n * A session names threads it is no longer showing, and each write reads the row\n * before replacing it. Titles for any other thread are therefore dropped, and\n * writes run one at a time so the last event wins rather than the fastest.\n */\nexport function observeSessionThreadTitle(\n  session: ThreadTitleMirrorSession,\n  { sourceControl }: ThreadTitleMirrorDependencies,\n): () => void {\n  const sessionId = session.identity.getResourceId();\n  let boundThreadId: string | undefined;\n  let writes: Promise<void> = Promise.resolve();\n\n  const project = (threadId: string, rawTitle: string | undefined): void => {\n    // A thread can be named before anything binds one, so the first thread to\n    // surface a title speaks for the row until `thread_changed` rebinds it.\n    boundThreadId ??= threadId;\n    if (threadId !== boundThreadId) return;\n    const title = rawTitle ? normalizeSessionTitle(rawTitle) : null;\n    if (!title) return;\n\n    writes = writes\n      .then(async () => {\n        if (threadId !== boundThreadId) return;\n        const row = await sourceControl.sessions.getBySessionId(sessionId);\n        if (!row || row.title === title) return;\n        await sourceControl.sessions.rename({ sessionId, title });\n      })\n      .catch(error => console.warn('[Factory thread-title mirror] Unable to persist the session title.', error));\n  };\n\n  return session.subscribe(event => {\n    switch (event.type) {\n      case 'thread_title_updated':\n        return project(event.threadId, event.title);\n      case 'om_thread_title_updated':\n        return project(event.threadId, event.newTitle);\n      case 'thread_changed': {\n        boundThreadId = event.threadId;\n        void session.thread\n          .getById({ threadId: event.threadId })\n          .then(thread => project(event.threadId, thread?.title))\n          .catch(error => console.warn('[Factory thread-title mirror] Unable to read the bound thread.', error));\n        return;\n      }\n    }\n  });\n}\n"],"mappings":";;;;;;;;;;;;;;;;;AAgCA,SAAgB,0BACd,SACA,EAAE,iBACU;CACZ,MAAM,YAAY,QAAQ,SAAS,cAAc;CACjD,IAAI;CACJ,IAAI,SAAwB,QAAQ,QAAQ;CAE5C,MAAM,WAAW,UAAkB,aAAuC;EAGxE,kBAAkB;EAClB,IAAI,aAAa,eAAe;EAChC,MAAM,QAAQ,WAAW,sBAAsB,QAAQ,IAAI;EAC3D,IAAI,CAAC,OAAO;EAEZ,SAAS,OACN,KAAK,YAAY;GAChB,IAAI,aAAa,eAAe;GAChC,MAAM,MAAM,MAAM,cAAc,SAAS,eAAe,SAAS;GACjE,IAAI,CAAC,OAAO,IAAI,UAAU,OAAO;GACjC,MAAM,cAAc,SAAS,OAAO;IAAE;IAAW;GAAM,CAAC;EAC1D,CAAC,CAAC,CACD,OAAM,UAAS,QAAQ,KAAK,sEAAsE,KAAK,CAAC;CAC7G;CAEA,OAAO,QAAQ,WAAU,UAAS;EAChC,QAAQ,MAAM,MAAd;GACE,KAAK,wBACH,OAAO,QAAQ,MAAM,UAAU,MAAM,KAAK;GAC5C,KAAK,2BACH,OAAO,QAAQ,MAAM,UAAU,MAAM,QAAQ;GAC/C,KAAK;IACH,gBAAgB,MAAM;IACtB,QAAa,OACV,QAAQ,EAAE,UAAU,MAAM,SAAS,CAAC,CAAC,CACrC,MAAK,WAAU,QAAQ,MAAM,UAAU,QAAQ,KAAK,CAAC,CAAC,CACtD,OAAM,UAAS,QAAQ,KAAK,kEAAkE,KAAK,CAAC;IACvG;EAEJ;CACF,CAAC;AACH"}

package/dist/storage/domains/credentials/base.d.ts

@@ -25,6 +25,7 @@
 import type { AuthCredential, OAuthCredential } from '@mastra/code-sdk/auth/types';
 import { FactoryStorageDomain } from '@mastra/core/storage';
 import type { CollectionSchema } from '@mastra/core/storage';
+import type { FactorySecretEncryption } from '../../../secret-encryption.js';
 /** Owning tenant of a credential row. `userId` absent = org-scoped row. */
 export interface CredentialTenant {
     orgId: string;
@@ -88,7 +89,8 @@ export declare const OAUTH_LOGIN_SESSIONS_SCHEMA: CollectionSchema;
  */
 export declare class ModelCredentialsStorage extends FactoryStorageDomain {
     #private;
-    constructor();
+    private readonly encryption;
+    constructor(encryption?: FactorySecretEncryption);
     init(): Promise<void>;
     dangerouslyClearAll(): Promise<void>;
     /** Read the tenant's credential for a provider at exactly that scope. */

package/dist/storage/domains/credentials/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/storage/domains/credentials/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/storage/domains/credentials/base.ts"],"names":[],"mappings":"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"}

package/dist/storage/domains/credentials/base.js

@@ -1,3 +1,4 @@
+import { createPlaintextFactorySecretEncryption } from "../../../secret-encryption.js";
 import { FactoryStorageDomain, UniqueViolationError } from "@mastra/core/storage";
 //#region src/storage/domains/credentials/base.ts
 /** Mirror of `AuthStorage.getApiKey()`'s expiry check. */
@@ -86,11 +87,15 @@ function tenantWhere(tenant, provider) {
 * invalidating each other's rotating tokens / double-claiming a flow.
 */
 var ModelCredentialsStorage = class extends FactoryStorageDomain {
-	constructor() {
+	encryption;
+	constructor(encryption = createPlaintextFactorySecretEncryption()) {
 		super("model-credentials");
+		this.encryption = encryption;
 	}
 	async init() {
 		await this.ensureCollections([MODEL_CREDENTIALS_SCHEMA, OAUTH_LOGIN_SESSIONS_SCHEMA]);
+		const rows = await this.ops.findMany("model_provider_credentials", {});
+		await Promise.all(rows.map((row) => this.#migrateCredential(row.id)));
 	}
 	async dangerouslyClearAll() {
 		await this.ops.deleteMany("oauth_login_sessions", {});
@@ -99,16 +104,28 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 	get #db() {
 		return this.ops;
 	}
+	async #decryptCredential(value) {
+		return (await this.encryption.decrypt(value)).value;
+	}
+	async #migrateCredential(id) {
+		await this.#db.updateAtomic("model_provider_credentials", { id }, async (row) => {
+			const decrypted = await this.encryption.decrypt(row.data);
+			if (!decrypted.needsReencryption) return null;
+			return { data: await this.encryption.encrypt(decrypted.value) };
+		});
+	}
 	/** Read the tenant's credential for a provider at exactly that scope. */
 	async getCredential(tenant, provider) {
-		return (await this.#db.findOne("model_provider_credentials", tenantWhere(tenant, provider)))?.data;
+		const row = await this.#db.findOne("model_provider_credentials", tenantWhere(tenant, provider));
+		return row ? this.#decryptCredential(row.data) : void 0;
 	}
 	/** Upsert the tenant's credential (`created_at` is preserved on update). */
 	async setCredential(tenant, provider, credential) {
 		const where = tenantWhere(tenant, provider);
+		const encrypted = await this.encryption.encrypt(credential);
 		const update = async () => this.#db.updateMany("model_provider_credentials", where, {
 			type: credential.type,
-			data: credential,
+			data: encrypted,
 			updated_at: /* @__PURE__ */ new Date()
 		});
 		let lastError;
@@ -121,7 +138,7 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 					user_id: tenant.userId ?? null,
 					provider,
 					type: credential.type,
-					data: credential,
+					data: encrypted,
 					created_at: now,
 					updated_at: now
 				});
@@ -146,17 +163,17 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 			org_id: orgId,
 			user_id: null
 		})]);
-		return [...userRows.map((row) => ({
+		return Promise.all([...userRows.map(async (row) => ({
 			provider: row.provider,
 			scope: "user",
-			credential: row.data,
+			credential: await this.#decryptCredential(row.data),
 			updatedAt: row.updated_at
-		})), ...orgRows.map((row) => ({
+		})), ...orgRows.map(async (row) => ({
 			provider: row.provider,
 			scope: "org",
-			credential: row.data,
+			credential: await this.#decryptCredential(row.data),
 			updatedAt: row.updated_at
-		}))];
+		}))]);
 	}
 	/**
 	* Resolve the credential a caller should use for a provider. By default the
@@ -173,7 +190,7 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 			return row ? {
 				provider: row.provider,
 				scope: "user",
-				credential: row.data
+				credential: await this.#decryptCredential(row.data)
 			} : void 0;
 		};
 		const readOrg = async () => {
@@ -185,7 +202,7 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 			return row ? {
 				provider: row.provider,
 				scope: "org",
-				credential: row.data
+				credential: await this.#decryptCredential(row.data)
 			} : void 0;
 		};
 		return precedence === "org" ? await readOrg() ?? await readUser() : await readUser() ?? await readOrg();
@@ -201,16 +218,17 @@ var ModelCredentialsStorage = class extends FactoryStorageDomain {
 	async refreshOAuth(tenant, provider, refreshFn) {
 		let result;
 		await this.#db.updateAtomic("model_provider_credentials", tenantWhere(tenant, provider), async (row) => {
-			if (row.data.type !== "oauth") return null;
-			const current = row.data;
+			const decrypted = await this.encryption.decrypt(row.data);
+			if (decrypted.value.type !== "oauth") return null;
+			const current = decrypted.value;
 			if (!isOAuthCredentialExpired(current)) {
 				result = current;
-				return null;
+				return decrypted.needsReencryption ? { data: await this.encryption.encrypt(current) } : null;
 			}
 			const next = await refreshFn(current);
 			result = next;
 			return {
-				data: next,
+				data: await this.encryption.encrypt(next),
 				updated_at: /* @__PURE__ */ new Date()
 			};
 		});