@mastra/factory 0.24.0-alpha.9 → 0.24.0

package/dist/sandbox/session-retirement.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-retirement.js","names":["#invalidateSession","#sandbox","#warn","#destroyTimeoutMs","#locks","#withSessionLock","#retireSession","#recreateSessionSandbox","#teardownSessionSandbox","#invalidate","#destroyDetachedSandbox","#releaseSandbox","#destroyForRecreate","#settledWithin","#destroyDetachedForRecreate","#destroyDirectly"],"sources":["../../src/sandbox/session-retirement.ts"],"sourcesContent":["import type { FactorySandbox, WorkspaceSandbox } from '@mastra/core/workspace';\n\nimport { destroyDetachedSessionSandbox, releaseSessionSandbox } from '../integrations/github/sandbox-release.js';\nimport { DEFAULT_COMMAND_TIMEOUT_MS, runTeardownCommand } from '../integrations/github/sandbox.js';\nimport { peekSessionEnvironmentTeardown } from '../session/environment-state-processor.js';\nimport type {\n  ProjectRepository,\n  SourceControlSession,\n  SourceControlStorageHandle,\n} from '../storage/domains/source-control/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport { requireExec } from './materialization.js';\nimport { evictSessionSandbox, peekSessionSandbox } from './session-sandbox.js';\n\ntype WarningLogger = (message: string, details: Record<string, unknown>) => void;\n\nexport interface SessionRetirementCoordinatorOptions {\n  invalidateSession?: (sessionId: string) => Promise<void> | void;\n  /**\n   * The deploy's sandbox configuration. Used to destroy a deleted session's\n   * VM by identity when this process never attached to it (after a restart,\n   * or on another replica). Recreate uses it the same way.\n   */\n  sandbox?: FactorySandbox;\n  warn?: WarningLogger;\n  /** How long recreate waits on a started sandbox's lifecycle destroy before falling back. */\n  destroyTimeoutMs?: number;\n}\n\nexport interface RecreateSessionSandboxInput {\n  sourceControl: SourceControlStorageHandle;\n  orgId: string;\n  sessionId: string;\n}\n\nconst DEFAULT_DESTROY_TIMEOUT_MS = 30_000;\n\n/**\n * A provider error meaning the VM is already gone: 410, or a 404 the proxy\n * marks `not_found` (or leaves uncoded). A routing 404 with another code is\n * not proof the VM is gone.\n */\nfunction isSandboxGoneError(error: unknown): boolean {\n  if (typeof error !== 'object' || error === null) return false;\n  const { status, code } = error as { status?: unknown; code?: unknown };\n  if (status === 410) return true;\n  return status === 404 && (code === undefined || code === null || code === 'not_found');\n}\n\nexport interface RetireSessionInput {\n  sourceControl: SourceControlStorageHandle;\n  /** When provided, deleting the session row also strips its work-item refs. */\n  workItems?: Pick<WorkItemsStorage, 'clearSessionReferences'>;\n  orgId: string;\n  sessionId: string;\n  deleteSession: boolean;\n}\n\nfunction boundedError(error: unknown): string {\n  const detail = error instanceof Error ? error.message : String(error);\n  if (detail.length <= 2000) return detail;\n  return `${detail.slice(0, 200)}...${detail.slice(-1797)}`;\n}\n\n/**\n * Owns terminal and destructive session cleanup. Each session is serialized so\n * duplicate role bindings and competing deletion/transition requests cannot\n * run teardown concurrently.\n *\n * Sandbox identity is the session id: retirement stops (or, for deleted\n * sessions, destroys) the sandbox this process holds in the session memo.\n * Sessions opened on another replica (or before a restart) have no memo entry\n * here: stopping them is left to the provider's idle lifecycle, but deleting a\n * materialized session destroys its VM by identity through the configured\n * sandbox. Providers such as E2B keep paused VMs forever, so the row's\n * deletion must never orphan one.\n */\nexport class SessionRetirementCoordinator {\n  readonly #invalidateSession: NonNullable<SessionRetirementCoordinatorOptions['invalidateSession']>;\n  readonly #sandbox: FactorySandbox | undefined;\n  readonly #warn: WarningLogger;\n  readonly #destroyTimeoutMs: number;\n  readonly #locks = new Map<string, Promise<unknown>>();\n\n  constructor(options: SessionRetirementCoordinatorOptions = {}) {\n    this.#invalidateSession = options.invalidateSession ?? (() => {});\n    this.#sandbox = options.sandbox;\n    this.#warn = options.warn ?? ((message, details) => console.warn(`[Mastra Factory] ${message}`, details));\n    this.#destroyTimeoutMs = options.destroyTimeoutMs ?? DEFAULT_DESTROY_TIMEOUT_MS;\n  }\n\n  async retireSession(input: RetireSessionInput): Promise<void> {\n    await this.#withSessionLock(input.sessionId, () => this.#retireSession(input));\n  }\n\n  /**\n   * Destroy a session's sandbox so its next message boots a fresh VM from the\n   * template, keeping the session row, its conversation, and work-item refs.\n   * Skips teardown commands, and works without a memo entry in this process\n   * by destroying a detached instance built from the persisted `sandboxId`.\n   * A destroy failure keeps the persisted id so a retry can reach the VM.\n   */\n  async recreateSessionSandbox(input: RecreateSessionSandboxInput): Promise<'recreated' | 'not-found'> {\n    return this.#withSessionLock(input.sessionId, () => this.#recreateSessionSandbox(input));\n  }\n\n  async #withSessionLock<T>(sessionId: string, run: () => Promise<T>): Promise<T> {\n    const previous = this.#locks.get(sessionId) ?? Promise.resolve();\n    const current = previous.catch(() => {}).then(run);\n    this.#locks.set(sessionId, current);\n    try {\n      return await current;\n    } finally {\n      if (this.#locks.get(sessionId) === current) this.#locks.delete(sessionId);\n    }\n  }\n\n  async retireWorkItemSessions(options: {\n    workItems: Pick<WorkItemsStorage, 'get'>;\n    sourceControl: SourceControlStorageHandle;\n    orgId: string;\n    workItemId: string;\n  }): Promise<void> {\n    const item = await options.workItems.get({ orgId: options.orgId, id: options.workItemId });\n    if (!item) return;\n    const sessionIds = [...new Set(Object.values(item.sessions).map(session => session.sessionId))];\n    await Promise.all(\n      sessionIds.map(sessionId =>\n        this.retireSession({\n          sourceControl: options.sourceControl,\n          orgId: options.orgId,\n          sessionId,\n          deleteSession: false,\n        }),\n      ),\n    );\n  }\n\n  async retireProjectRepositorySessions(options: {\n    sourceControl: SourceControlStorageHandle;\n    workItems?: Pick<WorkItemsStorage, 'clearSessionReferences'>;\n    orgId: string;\n    projectRepositoryId: string;\n  }): Promise<void> {\n    const sessions = await options.sourceControl.sessions.listByProjectRepository({\n      projectRepositoryId: options.projectRepositoryId,\n    });\n    await Promise.all(\n      sessions.map(session =>\n        this.retireSession({\n          sourceControl: options.sourceControl,\n          ...(options.workItems ? { workItems: options.workItems } : {}),\n          orgId: options.orgId,\n          sessionId: session.sessionId,\n          deleteSession: true,\n        }),\n      ),\n    );\n  }\n\n  async #retireSession(input: RetireSessionInput): Promise<void> {\n    const session = await input.sourceControl.sessions.getBySessionId(input.sessionId);\n    if (!session || session.orgId !== input.orgId) return;\n\n    try {\n      await this.#teardownSessionSandbox(input, session);\n    } finally {\n      await this.#invalidate(session);\n\n      if (input.deleteSession) {\n        // Refs first: clearing again is a no-op, but refs on a deleted row would dangle forever.\n        await input.workItems?.clearSessionReferences({ orgId: input.orgId, sessionId: input.sessionId });\n        await input.sourceControl.sessions.delete(session.id);\n      }\n    }\n  }\n\n  async #teardownSessionSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    const entry = peekSessionSandbox(session.id);\n    if (!entry) {\n      await this.#destroyDetachedSandbox(input, session);\n      return;\n    }\n\n    // A session booted from its factory environment tears every repository\n    // down in position order, each in its own directory; a failure is logged\n    // and the next repository still runs.\n    const environmentTeardown = peekSessionEnvironmentTeardown(session.sessionId);\n    if (environmentTeardown.length > 0) {\n      for (const repo of environmentTeardown) {\n        try {\n          await runTeardownCommand(requireExec(entry.sandbox), repo.dir, repo.command, {\n            timeoutMs: DEFAULT_COMMAND_TIMEOUT_MS,\n          });\n        } catch (error) {\n          this.#warn('Factory teardown command failed', {\n            orgId: session.orgId,\n            sessionId: session.sessionId,\n            projectRepositoryId: session.projectRepositoryId,\n            repository: repo.slug,\n            error: boundedError(error),\n          });\n        }\n      }\n      await this.#releaseSandbox(input, session);\n      return;\n    }\n\n    let projectRepository: ProjectRepository | null | undefined;\n    try {\n      projectRepository = session.projectRepositoryId\n        ? await input.sourceControl.projectRepositories.get({ orgId: input.orgId, id: session.projectRepositoryId })\n        : null;\n    } catch (error) {\n      this.#warn('Factory repository settings could not be loaded for session retirement', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n\n    // An unresolved workdir means the sandbox never started in this process:\n    // nothing was set up, so there is nothing for a teardown command to undo.\n    if (projectRepository?.teardownCommand && entry.workdir) {\n      try {\n        await runTeardownCommand(requireExec(entry.sandbox), entry.workdir, projectRepository.teardownCommand, {\n          timeoutMs: DEFAULT_COMMAND_TIMEOUT_MS,\n        });\n      } catch (error) {\n        this.#warn('Factory teardown command failed', {\n          orgId: session.orgId,\n          sessionId: session.sessionId,\n          projectRepositoryId: session.projectRepositoryId,\n          error: boundedError(error),\n        });\n      }\n    }\n\n    await this.#releaseSandbox(input, session);\n  }\n\n  /**\n   * Destroy a deleted session's VM that this process never attached to. Only\n   * for sessions that materialized (a persisted `sandboxId`): nothing is\n   * started, no teardown command runs — the provider kills by identity.\n   */\n  async #destroyDetachedSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    if (!input.deleteSession || !session.sandboxId || !this.#sandbox) return;\n    try {\n      await destroyDetachedSessionSandbox({ sandbox: this.#sandbox, session });\n    } catch (error) {\n      this.#warn('Factory detached session sandbox destroy failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n\n  /** Bump the session's workspace generation; a failing unregister is logged, never fatal. */\n  async #invalidate(session: SourceControlSession): Promise<void> {\n    try {\n      await this.#invalidateSession(session.sessionId);\n    } catch (error) {\n      this.#warn('Factory session workspace cache invalidation failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n\n  async #recreateSessionSandbox(input: RecreateSessionSandboxInput): Promise<'recreated' | 'not-found'> {\n    const session = await input.sourceControl.sessions.getBySessionId(input.sessionId);\n    if (!session || session.orgId !== input.orgId) return 'not-found';\n\n    // Bump the generation first so an in-flight start hook for the old\n    // instance throws instead of republishing its sandbox id.\n    await this.#invalidate(session);\n    const entry = peekSessionSandbox(session.id);\n    evictSessionSandbox(session.id);\n\n    await this.#destroyForRecreate(session, entry?.sandbox);\n    await input.sourceControl.sessions.setSandbox({ id: session.id, sandboxId: null, sandboxWorkdir: '' });\n\n    // A resolve that ran between the eviction and clearing the id could have\n    // built a fresh instance from the old `sandboxId`; drop it and fence it.\n    evictSessionSandbox(session.id);\n    await this.#invalidate(session);\n    return 'recreated';\n  }\n\n  /**\n   * Destroy the session's VM. `_destroy()` silently no-ops on a never-started\n   * (`pending`) instance, so pending and detached instances call the\n   * provider's `destroy()` directly; a started instance goes through the\n   * lifecycle wrapper, bounded so a hung start can't hold the session lock.\n   */\n  async #destroyForRecreate(session: SourceControlSession, memo: WorkspaceSandbox | undefined): Promise<void> {\n    const lifecycle = memo as { _destroy?: () => Promise<void> } | undefined;\n    if (memo && memo.status !== 'pending' && lifecycle?._destroy) {\n      const destroying = lifecycle._destroy.call(memo);\n      if (await this.#settledWithin(destroying)) {\n        memo.status = 'destroyed';\n        return;\n      }\n      // Load-bearing: once the hung start settles, this destroy reaps any VM it\n      // provisioned. Its rejection must never surface as unhandled.\n      destroying.catch(error =>\n        this.#warn('Factory sandbox destroy failed after recreate stopped waiting', {\n          orgId: session.orgId,\n          sessionId: session.sessionId,\n          error: boundedError(error),\n        }),\n      );\n      if (!this.#sandbox) {\n        throw new Error(\n          'Timed out destroying the session sandbox, and no sandbox provider is configured to retry by identity.',\n        );\n      }\n      await this.#destroyDetachedForRecreate(this.#sandbox, session);\n      memo.status = 'destroyed';\n      return;\n    }\n\n    if (memo) {\n      await this.#destroyDirectly(memo);\n      memo.status = 'destroyed';\n      return;\n    }\n\n    // No instance in this process (restart, or another replica opened it):\n    // destroy through a never-started instance carrying the persisted id.\n    // Unlike retirement, this runs without a `sandboxId` too: E2B and Docker\n    // find the VM by session identity, and Platform's destroy no-ops safely.\n    if (this.#sandbox) await this.#destroyDetachedForRecreate(this.#sandbox, session);\n  }\n\n  async #destroyDetachedForRecreate(sandbox: FactorySandbox, session: SourceControlSession): Promise<void> {\n    try {\n      await destroyDetachedSessionSandbox({ sandbox, session });\n    } catch (error) {\n      if (!isSandboxGoneError(error)) throw error;\n    }\n  }\n\n  /** True when the destroy finished in time; false on timeout. Gone-VM errors count as finished. */\n  async #settledWithin(destroying: Promise<void>): Promise<boolean> {\n    let timer: ReturnType<typeof setTimeout> | undefined;\n    const timedOut = new Promise<false>(resolve => {\n      timer = setTimeout(() => resolve(false), this.#destroyTimeoutMs);\n    });\n    try {\n      return await Promise.race([destroying.then(() => true as const), timedOut]);\n    } catch (error) {\n      if (isSandboxGoneError(error)) return true;\n      throw error;\n    } finally {\n      clearTimeout(timer);\n    }\n  }\n\n  async #destroyDirectly(sandbox: WorkspaceSandbox): Promise<void> {\n    try {\n      await sandbox.destroy?.();\n    } catch (error) {\n      if (!isSandboxGoneError(error)) throw error;\n    }\n  }\n\n  async #releaseSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    try {\n      await releaseSessionSandbox({ sessionId: session.id, destroy: input.deleteSession });\n    } catch (error) {\n      this.#warn('Factory session sandbox release failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"session-retirement.js","names":[],"sources":["../../src/sandbox/session-retirement.ts"],"sourcesContent":["import type { FactorySandbox, WorkspaceSandbox } from '@mastra/core/workspace';\n\nimport { destroyDetachedSessionSandbox, releaseSessionSandbox } from '../integrations/github/sandbox-release.js';\nimport { DEFAULT_COMMAND_TIMEOUT_MS, runTeardownCommand } from '../integrations/github/sandbox.js';\nimport { peekSessionEnvironmentTeardown } from '../session/environment-state-processor.js';\nimport type {\n  ProjectRepository,\n  SourceControlSession,\n  SourceControlStorageHandle,\n} from '../storage/domains/source-control/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport { requireExec } from './materialization.js';\nimport { evictSessionSandbox, peekSessionSandbox } from './session-sandbox.js';\n\ntype WarningLogger = (message: string, details: Record<string, unknown>) => void;\n\nexport interface SessionRetirementCoordinatorOptions {\n  invalidateSession?: (sessionId: string) => Promise<void> | void;\n  /**\n   * The deploy's sandbox configuration. Used to destroy a deleted session's\n   * VM by identity when this process never attached to it (after a restart,\n   * or on another replica). Recreate uses it the same way.\n   */\n  sandbox?: FactorySandbox;\n  warn?: WarningLogger;\n  /** How long recreate waits on a started sandbox's lifecycle destroy before falling back. */\n  destroyTimeoutMs?: number;\n}\n\nexport interface RecreateSessionSandboxInput {\n  sourceControl: SourceControlStorageHandle;\n  orgId: string;\n  sessionId: string;\n}\n\nconst DEFAULT_DESTROY_TIMEOUT_MS = 30_000;\n\n/**\n * A provider error meaning the VM is already gone: 410, or a 404 the proxy\n * marks `not_found` (or leaves uncoded). A routing 404 with another code is\n * not proof the VM is gone.\n */\nfunction isSandboxGoneError(error: unknown): boolean {\n  if (typeof error !== 'object' || error === null) return false;\n  const { status, code } = error as { status?: unknown; code?: unknown };\n  if (status === 410) return true;\n  return status === 404 && (code === undefined || code === null || code === 'not_found');\n}\n\nexport interface RetireSessionInput {\n  sourceControl: SourceControlStorageHandle;\n  /** When provided, deleting the session row also strips its work-item refs. */\n  workItems?: Pick<WorkItemsStorage, 'clearSessionReferences'>;\n  orgId: string;\n  sessionId: string;\n  deleteSession: boolean;\n}\n\nfunction boundedError(error: unknown): string {\n  const detail = error instanceof Error ? error.message : String(error);\n  if (detail.length <= 2000) return detail;\n  return `${detail.slice(0, 200)}...${detail.slice(-1797)}`;\n}\n\n/**\n * Owns terminal and destructive session cleanup. Each session is serialized so\n * duplicate role bindings and competing deletion/transition requests cannot\n * run teardown concurrently.\n *\n * Sandbox identity is the session id: retirement stops (or, for deleted\n * sessions, destroys) the sandbox this process holds in the session memo.\n * Sessions opened on another replica (or before a restart) have no memo entry\n * here: stopping them is left to the provider's idle lifecycle, but deleting a\n * materialized session destroys its VM by identity through the configured\n * sandbox. Providers such as E2B keep paused VMs forever, so the row's\n * deletion must never orphan one.\n */\nexport class SessionRetirementCoordinator {\n  readonly #invalidateSession: NonNullable<SessionRetirementCoordinatorOptions['invalidateSession']>;\n  readonly #sandbox: FactorySandbox | undefined;\n  readonly #warn: WarningLogger;\n  readonly #destroyTimeoutMs: number;\n  readonly #locks = new Map<string, Promise<unknown>>();\n\n  constructor(options: SessionRetirementCoordinatorOptions = {}) {\n    this.#invalidateSession = options.invalidateSession ?? (() => {});\n    this.#sandbox = options.sandbox;\n    this.#warn = options.warn ?? ((message, details) => console.warn(`[Mastra Factory] ${message}`, details));\n    this.#destroyTimeoutMs = options.destroyTimeoutMs ?? DEFAULT_DESTROY_TIMEOUT_MS;\n  }\n\n  async retireSession(input: RetireSessionInput): Promise<void> {\n    await this.#withSessionLock(input.sessionId, () => this.#retireSession(input));\n  }\n\n  /**\n   * Destroy a session's sandbox so its next message boots a fresh VM from the\n   * template, keeping the session row, its conversation, and work-item refs.\n   * Skips teardown commands, and works without a memo entry in this process\n   * by destroying a detached instance built from the persisted `sandboxId`.\n   * A destroy failure keeps the persisted id so a retry can reach the VM.\n   */\n  async recreateSessionSandbox(input: RecreateSessionSandboxInput): Promise<'recreated' | 'not-found'> {\n    return this.#withSessionLock(input.sessionId, () => this.#recreateSessionSandbox(input));\n  }\n\n  async #withSessionLock<T>(sessionId: string, run: () => Promise<T>): Promise<T> {\n    const previous = this.#locks.get(sessionId) ?? Promise.resolve();\n    const current = previous.catch(() => {}).then(run);\n    this.#locks.set(sessionId, current);\n    try {\n      return await current;\n    } finally {\n      if (this.#locks.get(sessionId) === current) this.#locks.delete(sessionId);\n    }\n  }\n\n  async retireWorkItemSessions(options: {\n    workItems: Pick<WorkItemsStorage, 'get'>;\n    sourceControl: SourceControlStorageHandle;\n    orgId: string;\n    workItemId: string;\n  }): Promise<void> {\n    const item = await options.workItems.get({ orgId: options.orgId, id: options.workItemId });\n    if (!item) return;\n    const sessionIds = [...new Set(Object.values(item.sessions).map(session => session.sessionId))];\n    await Promise.all(\n      sessionIds.map(sessionId =>\n        this.retireSession({\n          sourceControl: options.sourceControl,\n          orgId: options.orgId,\n          sessionId,\n          deleteSession: false,\n        }),\n      ),\n    );\n  }\n\n  async retireProjectRepositorySessions(options: {\n    sourceControl: SourceControlStorageHandle;\n    workItems?: Pick<WorkItemsStorage, 'clearSessionReferences'>;\n    orgId: string;\n    projectRepositoryId: string;\n  }): Promise<void> {\n    const sessions = await options.sourceControl.sessions.listByProjectRepository({\n      projectRepositoryId: options.projectRepositoryId,\n    });\n    await Promise.all(\n      sessions.map(session =>\n        this.retireSession({\n          sourceControl: options.sourceControl,\n          ...(options.workItems ? { workItems: options.workItems } : {}),\n          orgId: options.orgId,\n          sessionId: session.sessionId,\n          deleteSession: true,\n        }),\n      ),\n    );\n  }\n\n  async #retireSession(input: RetireSessionInput): Promise<void> {\n    const session = await input.sourceControl.sessions.getBySessionId(input.sessionId);\n    if (!session || session.orgId !== input.orgId) return;\n\n    try {\n      await this.#teardownSessionSandbox(input, session);\n    } finally {\n      await this.#invalidate(session);\n\n      if (input.deleteSession) {\n        // Refs first: clearing again is a no-op, but refs on a deleted row would dangle forever.\n        await input.workItems?.clearSessionReferences({ orgId: input.orgId, sessionId: input.sessionId });\n        await input.sourceControl.sessions.delete(session.id);\n      }\n    }\n  }\n\n  async #teardownSessionSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    const entry = peekSessionSandbox(session.id);\n    if (!entry) {\n      await this.#destroyDetachedSandbox(input, session);\n      return;\n    }\n\n    // A session booted from its factory environment tears every repository\n    // down in position order, each in its own directory; a failure is logged\n    // and the next repository still runs.\n    const environmentTeardown = peekSessionEnvironmentTeardown(session.sessionId);\n    if (environmentTeardown.length > 0) {\n      for (const repo of environmentTeardown) {\n        try {\n          await runTeardownCommand(requireExec(entry.sandbox), repo.dir, repo.command, {\n            timeoutMs: DEFAULT_COMMAND_TIMEOUT_MS,\n          });\n        } catch (error) {\n          this.#warn('Factory teardown command failed', {\n            orgId: session.orgId,\n            sessionId: session.sessionId,\n            projectRepositoryId: session.projectRepositoryId,\n            repository: repo.slug,\n            error: boundedError(error),\n          });\n        }\n      }\n      await this.#releaseSandbox(input, session);\n      return;\n    }\n\n    let projectRepository: ProjectRepository | null | undefined;\n    try {\n      projectRepository = session.projectRepositoryId\n        ? await input.sourceControl.projectRepositories.get({ orgId: input.orgId, id: session.projectRepositoryId })\n        : null;\n    } catch (error) {\n      this.#warn('Factory repository settings could not be loaded for session retirement', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n\n    // An unresolved workdir means the sandbox never started in this process:\n    // nothing was set up, so there is nothing for a teardown command to undo.\n    if (projectRepository?.teardownCommand && entry.workdir) {\n      try {\n        await runTeardownCommand(requireExec(entry.sandbox), entry.workdir, projectRepository.teardownCommand, {\n          timeoutMs: DEFAULT_COMMAND_TIMEOUT_MS,\n        });\n      } catch (error) {\n        this.#warn('Factory teardown command failed', {\n          orgId: session.orgId,\n          sessionId: session.sessionId,\n          projectRepositoryId: session.projectRepositoryId,\n          error: boundedError(error),\n        });\n      }\n    }\n\n    await this.#releaseSandbox(input, session);\n  }\n\n  /**\n   * Destroy a deleted session's VM that this process never attached to. Only\n   * for sessions that materialized (a persisted `sandboxId`): nothing is\n   * started, no teardown command runs — the provider kills by identity.\n   */\n  async #destroyDetachedSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    if (!input.deleteSession || !session.sandboxId || !this.#sandbox) return;\n    try {\n      await destroyDetachedSessionSandbox({ sandbox: this.#sandbox, session });\n    } catch (error) {\n      this.#warn('Factory detached session sandbox destroy failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n\n  /** Bump the session's workspace generation; a failing unregister is logged, never fatal. */\n  async #invalidate(session: SourceControlSession): Promise<void> {\n    try {\n      await this.#invalidateSession(session.sessionId);\n    } catch (error) {\n      this.#warn('Factory session workspace cache invalidation failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n\n  async #recreateSessionSandbox(input: RecreateSessionSandboxInput): Promise<'recreated' | 'not-found'> {\n    const session = await input.sourceControl.sessions.getBySessionId(input.sessionId);\n    if (!session || session.orgId !== input.orgId) return 'not-found';\n\n    // Bump the generation first so an in-flight start hook for the old\n    // instance throws instead of republishing its sandbox id.\n    await this.#invalidate(session);\n    const entry = peekSessionSandbox(session.id);\n    evictSessionSandbox(session.id);\n\n    await this.#destroyForRecreate(session, entry?.sandbox);\n    await input.sourceControl.sessions.setSandbox({ id: session.id, sandboxId: null, sandboxWorkdir: '' });\n\n    // A resolve that ran between the eviction and clearing the id could have\n    // built a fresh instance from the old `sandboxId`; drop it and fence it.\n    evictSessionSandbox(session.id);\n    await this.#invalidate(session);\n    return 'recreated';\n  }\n\n  /**\n   * Destroy the session's VM. `_destroy()` silently no-ops on a never-started\n   * (`pending`) instance, so pending and detached instances call the\n   * provider's `destroy()` directly; a started instance goes through the\n   * lifecycle wrapper, bounded so a hung start can't hold the session lock.\n   */\n  async #destroyForRecreate(session: SourceControlSession, memo: WorkspaceSandbox | undefined): Promise<void> {\n    const lifecycle = memo as { _destroy?: () => Promise<void> } | undefined;\n    if (memo && memo.status !== 'pending' && lifecycle?._destroy) {\n      const destroying = lifecycle._destroy.call(memo);\n      if (await this.#settledWithin(destroying)) {\n        memo.status = 'destroyed';\n        return;\n      }\n      // Load-bearing: once the hung start settles, this destroy reaps any VM it\n      // provisioned. Its rejection must never surface as unhandled.\n      destroying.catch(error =>\n        this.#warn('Factory sandbox destroy failed after recreate stopped waiting', {\n          orgId: session.orgId,\n          sessionId: session.sessionId,\n          error: boundedError(error),\n        }),\n      );\n      if (!this.#sandbox) {\n        throw new Error(\n          'Timed out destroying the session sandbox, and no sandbox provider is configured to retry by identity.',\n        );\n      }\n      await this.#destroyDetachedForRecreate(this.#sandbox, session);\n      memo.status = 'destroyed';\n      return;\n    }\n\n    if (memo) {\n      await this.#destroyDirectly(memo);\n      memo.status = 'destroyed';\n      return;\n    }\n\n    // No instance in this process (restart, or another replica opened it):\n    // destroy through a never-started instance carrying the persisted id.\n    // Unlike retirement, this runs without a `sandboxId` too: E2B and Docker\n    // find the VM by session identity, and Platform's destroy no-ops safely.\n    if (this.#sandbox) await this.#destroyDetachedForRecreate(this.#sandbox, session);\n  }\n\n  async #destroyDetachedForRecreate(sandbox: FactorySandbox, session: SourceControlSession): Promise<void> {\n    try {\n      await destroyDetachedSessionSandbox({ sandbox, session });\n    } catch (error) {\n      if (!isSandboxGoneError(error)) throw error;\n    }\n  }\n\n  /** True when the destroy finished in time; false on timeout. Gone-VM errors count as finished. */\n  async #settledWithin(destroying: Promise<void>): Promise<boolean> {\n    let timer: ReturnType<typeof setTimeout> | undefined;\n    const timedOut = new Promise<false>(resolve => {\n      timer = setTimeout(() => resolve(false), this.#destroyTimeoutMs);\n    });\n    try {\n      return await Promise.race([destroying.then(() => true as const), timedOut]);\n    } catch (error) {\n      if (isSandboxGoneError(error)) return true;\n      throw error;\n    } finally {\n      clearTimeout(timer);\n    }\n  }\n\n  async #destroyDirectly(sandbox: WorkspaceSandbox): Promise<void> {\n    try {\n      await sandbox.destroy?.();\n    } catch (error) {\n      if (!isSandboxGoneError(error)) throw error;\n    }\n  }\n\n  async #releaseSandbox(input: RetireSessionInput, session: SourceControlSession): Promise<void> {\n    try {\n      await releaseSessionSandbox({ sessionId: session.id, destroy: input.deleteSession });\n    } catch (error) {\n      this.#warn('Factory session sandbox release failed', {\n        orgId: session.orgId,\n        sessionId: session.sessionId,\n        projectRepositoryId: session.projectRepositoryId,\n        error: boundedError(error),\n      });\n    }\n  }\n}\n"],"mappings":"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"}

package/dist/secret-encryption.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"secret-encryption.d.ts","sourceRoot":"","sources":["../src/secret-encryption.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC;IACT,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,kFAAkF;AAClF,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,0BAA0B;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,0BAA0B,CAAC;IACpC,QAAQ,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACzC;AAgCD;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,CAyD5G;AAED,+EAA+E;AAC/E,wBAAgB,sCAAsC,IAAI,uBAAuB,CAiBhF"}
+{"version":3,"file":"secret-encryption.d.ts","sourceRoot":"","sources":["../src/secret-encryption.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,sBAAsB,CAAC,CAAC;IACvC,KAAK,EAAE,CAAC,CAAC;IACT,iBAAiB,EAAE,OAAO,CAAC;CAC5B;AAED,kFAAkF;AAClF,MAAM,WAAW,uBAAuB;IACtC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,0BAA0B;IACzC,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,UAAU,CAAC;CACjB;AAED,MAAM,WAAW,6BAA6B;IAC5C,OAAO,EAAE,0BAA0B,CAAC;IACpC,QAAQ,CAAC,EAAE,0BAA0B,EAAE,CAAC;CACzC;AAgCD;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,6BAA6B,GAAG,uBAAuB,CA+E5G;AAED,+EAA+E;AAC/E,wBAAgB,sCAAsC,IAAI,uBAAuB,CA+BhF"}

package/dist/secret-encryption.js

@@ -3,6 +3,7 @@ import { createCipheriv, createDecipheriv } from "crypto";
 const ENVELOPE_PREFIX = "mastra:factory-secret:v1:";
 const ALGORITHM = "aes-256-gcm";
 const IV_BYTES = 12;
+const MAX_NESTED_ENVELOPES = 4;
 function validateKey({ id, key }) {
 	if (!id) throw new Error("[FactorySecretEncryption] Key id is required.");
 	const buffer = Buffer.from(key);
@@ -43,38 +44,66 @@ function createFactorySecretEncryption(config) {
 			};
 			return `${ENVELOPE_PREFIX}${Buffer.from(JSON.stringify(envelope), "utf8").toString("base64url")}`;
 		},
-		async decrypt(value) {
-			if (typeof value !== "string") return {
-				value: structuredClone(value),
-				needsReencryption: true
-			};
-			if (!value.startsWith(ENVELOPE_PREFIX)) try {
-				return {
-					value: JSON.parse(value),
-					needsReencryption: true
-				};
+		decrypt
+	};
+	async function decrypt(value, depth = 0) {
+		if (typeof value !== "string") return {
+			value: structuredClone(value),
+			needsReencryption: true
+		};
+		if (!value.startsWith(ENVELOPE_PREFIX)) {
+			let parsed;
+			try {
+				parsed = JSON.parse(value);
 			} catch {
 				return {
 					value,
 					needsReencryption: true
 				};
 			}
-			const envelope = parseEnvelope(value);
-			const key = keys.get(envelope.keyId);
-			if (!key) throw new Error(`[FactorySecretEncryption] Unknown key id "${envelope.keyId}".`);
-			try {
-				const decipher = createDecipheriv(ALGORITHM, key, Buffer.from(envelope.iv, "base64url"));
-				decipher.setAuthTag(Buffer.from(envelope.tag, "base64url"));
-				const plaintext = Buffer.concat([decipher.update(Buffer.from(envelope.ciphertext, "base64url")), decipher.final()]).toString("utf8");
-				return {
-					value: JSON.parse(plaintext),
-					needsReencryption: envelope.keyId !== config.primary.id
-				};
-			} catch {
-				throw new Error("[FactorySecretEncryption] Unable to decrypt encrypted value.");
-			}
+			return {
+				value: await unwrapNestedEnvelope(parsed, depth) ?? parsed,
+				needsReencryption: true
+			};
 		}
-	};
+		const envelope = parseEnvelope(value);
+		const key = keys.get(envelope.keyId);
+		if (!key) throw new Error(`[FactorySecretEncryption] Unknown key id "${envelope.keyId}".`);
+		let decoded;
+		try {
+			const decipher = createDecipheriv(ALGORITHM, key, Buffer.from(envelope.iv, "base64url"));
+			decipher.setAuthTag(Buffer.from(envelope.tag, "base64url"));
+			const plaintext = Buffer.concat([decipher.update(Buffer.from(envelope.ciphertext, "base64url")), decipher.final()]).toString("utf8");
+			decoded = JSON.parse(plaintext);
+		} catch {
+			throw new Error("[FactorySecretEncryption] Unable to decrypt encrypted value.");
+		}
+		const nested = await unwrapNestedEnvelope(decoded, depth);
+		if (nested !== void 0) return {
+			value: nested,
+			needsReencryption: true
+		};
+		return {
+			value: decoded,
+			needsReencryption: envelope.keyId !== config.primary.id
+		};
+	}
+	/**
+	* Older plaintext encryptors treated an envelope as a raw legacy secret and
+	* rewrote it as JSON text, which a keyed boot then re-encrypted. Peel those
+	* layers back to the real value so the row is repaired on the next write.
+	* A user-supplied secret can also look like an envelope, so anything that
+	* does not decrypt with our keys is kept as the literal value.
+	*/
+	async function unwrapNestedEnvelope(value, depth) {
+		if (typeof value !== "string" || !value.startsWith(ENVELOPE_PREFIX)) return void 0;
+		if (depth >= MAX_NESTED_ENVELOPES) return void 0;
+		try {
+			return (await decrypt(value, depth + 1)).value;
+		} catch {
+			return;
+		}
+	}
 }
 /** Explicit plaintext compatibility for local, no-auth Factory development. */
 function createPlaintextFactorySecretEncryption() {
@@ -87,6 +116,17 @@ function createPlaintextFactorySecretEncryption() {
 				value: structuredClone(value),
 				needsReencryption: false
 			};
+			if (value.startsWith(ENVELOPE_PREFIX)) {
+				try {
+					parseEnvelope(value);
+				} catch {
+					return {
+						value,
+						needsReencryption: true
+					};
+				}
+				throw new Error("[FactorySecretEncryption] Value is encrypted, but this instance has no secret encryption key configured. Configure 'secretEncryption' with the same key on every Factory instance.");
+			}
 			try {
 				return {
 					value: JSON.parse(value),

package/dist/secret-encryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"secret-encryption.js","names":[],"sources":["../src/secret-encryption.ts"],"sourcesContent":["import { createCipheriv, createDecipheriv } from 'node:crypto';\n\nconst ENVELOPE_PREFIX = 'mastra:factory-secret:v1:';\nconst ALGORITHM = 'aes-256-gcm';\nconst IV_BYTES = 12;\n\ninterface SecretEnvelopeV1 {\n  keyId: string;\n  iv: string;\n  ciphertext: string;\n  tag: string;\n}\n\nexport interface DecryptedFactorySecret<T> {\n  value: T;\n  needsReencryption: boolean;\n}\n\n/** Encrypts opaque JSON values before they cross the Factory storage boundary. */\nexport interface FactorySecretEncryption {\n  encrypt<T>(value: T): Promise<string>;\n  decrypt<T>(value: unknown): Promise<DecryptedFactorySecret<T>>;\n}\n\nexport interface FactorySecretEncryptionKey {\n  id: string;\n  key: Uint8Array;\n}\n\nexport interface FactorySecretEncryptionConfig {\n  primary: FactorySecretEncryptionKey;\n  previous?: FactorySecretEncryptionKey[];\n}\n\nfunction validateKey({ id, key }: FactorySecretEncryptionKey): Buffer {\n  if (!id) throw new Error('[FactorySecretEncryption] Key id is required.');\n  const buffer = Buffer.from(key);\n  if (buffer.byteLength !== 32) {\n    throw new Error(`[FactorySecretEncryption] Key \"${id}\" must be exactly 32 bytes.`);\n  }\n  return buffer;\n}\n\nfunction parseEnvelope(value: string): SecretEnvelopeV1 {\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(Buffer.from(value.slice(ENVELOPE_PREFIX.length), 'base64url').toString('utf8'));\n  } catch {\n    throw new Error('[FactorySecretEncryption] Invalid encrypted value.');\n  }\n\n  if (\n    !parsed ||\n    typeof parsed !== 'object' ||\n    typeof (parsed as SecretEnvelopeV1).keyId !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).iv !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).ciphertext !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).tag !== 'string'\n  ) {\n    throw new Error('[FactorySecretEncryption] Invalid encrypted value.');\n  }\n  return parsed as SecretEnvelopeV1;\n}\n\n/**\n * Creates a versioned AES-256-GCM encryptor. The primary key is used for new\n * writes; previous keys remain decrypt-only until stored values are rotated.\n */\nexport function createFactorySecretEncryption(config: FactorySecretEncryptionConfig): FactorySecretEncryption {\n  const primaryKey = validateKey(config.primary);\n  const keys = new Map<string, Buffer>([[config.primary.id, primaryKey]]);\n  for (const previous of config.previous ?? []) {\n    if (keys.has(previous.id)) throw new Error(`[FactorySecretEncryption] Duplicate key id \"${previous.id}\".`);\n    keys.set(previous.id, validateKey(previous));\n  }\n\n  return {\n    async encrypt<T>(value: T): Promise<string> {\n      const iv = Buffer.from(globalThis.crypto.getRandomValues(new Uint8Array(IV_BYTES)));\n      const cipher = createCipheriv(ALGORITHM, primaryKey, iv);\n      const ciphertext = Buffer.concat([cipher.update(JSON.stringify(value), 'utf8'), cipher.final()]);\n      const envelope: SecretEnvelopeV1 = {\n        keyId: config.primary.id,\n        iv: iv.toString('base64url'),\n        ciphertext: ciphertext.toString('base64url'),\n        tag: cipher.getAuthTag().toString('base64url'),\n      };\n      return `${ENVELOPE_PREFIX}${Buffer.from(JSON.stringify(envelope), 'utf8').toString('base64url')}`;\n    },\n\n    async decrypt<T>(value: unknown): Promise<DecryptedFactorySecret<T>> {\n      if (typeof value !== 'string') {\n        return { value: structuredClone(value) as T, needsReencryption: true };\n      }\n      if (!value.startsWith(ENVELOPE_PREFIX)) {\n        // JSON text written by the plaintext encryptor, or a raw pre-encryption\n        // secret string. Decode it the same way the plaintext encryptor does so\n        // migration encrypts the original value, not its JSON text.\n        try {\n          return { value: JSON.parse(value) as T, needsReencryption: true };\n        } catch {\n          return { value: value as T, needsReencryption: true };\n        }\n      }\n\n      const envelope = parseEnvelope(value);\n      const key = keys.get(envelope.keyId);\n      if (!key) throw new Error(`[FactorySecretEncryption] Unknown key id \"${envelope.keyId}\".`);\n\n      try {\n        const decipher = createDecipheriv(ALGORITHM, key, Buffer.from(envelope.iv, 'base64url'));\n        decipher.setAuthTag(Buffer.from(envelope.tag, 'base64url'));\n        const plaintext = Buffer.concat([\n          decipher.update(Buffer.from(envelope.ciphertext, 'base64url')),\n          decipher.final(),\n        ]).toString('utf8');\n        return {\n          value: JSON.parse(plaintext) as T,\n          needsReencryption: envelope.keyId !== config.primary.id,\n        };\n      } catch {\n        throw new Error('[FactorySecretEncryption] Unable to decrypt encrypted value.');\n      }\n    },\n  };\n}\n\n/** Explicit plaintext compatibility for local, no-auth Factory development. */\nexport function createPlaintextFactorySecretEncryption(): FactorySecretEncryption {\n  return {\n    async encrypt<T>(value: T): Promise<string> {\n      return JSON.stringify(value);\n    },\n    async decrypt<T>(value: unknown): Promise<DecryptedFactorySecret<T>> {\n      if (typeof value !== 'string') return { value: structuredClone(value) as T, needsReencryption: false };\n      try {\n        return { value: JSON.parse(value) as T, needsReencryption: false };\n      } catch {\n        // Pre-encryption rows stored raw secret strings (e.g. a bare\n        // `custom_providers.api_key`), not JSON. Treat the raw string as the\n        // value and flag it so migration rewrites it in the current format.\n        return { value: value as T, needsReencryption: true };\n      }\n    },\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"secret-encryption.js","names":[],"sources":["../src/secret-encryption.ts"],"sourcesContent":["import { createCipheriv, createDecipheriv } from 'node:crypto';\n\nconst ENVELOPE_PREFIX = 'mastra:factory-secret:v1:';\nconst ALGORITHM = 'aes-256-gcm';\nconst IV_BYTES = 12;\nconst MAX_NESTED_ENVELOPES = 4;\n\ninterface SecretEnvelopeV1 {\n  keyId: string;\n  iv: string;\n  ciphertext: string;\n  tag: string;\n}\n\nexport interface DecryptedFactorySecret<T> {\n  value: T;\n  needsReencryption: boolean;\n}\n\n/** Encrypts opaque JSON values before they cross the Factory storage boundary. */\nexport interface FactorySecretEncryption {\n  encrypt<T>(value: T): Promise<string>;\n  decrypt<T>(value: unknown): Promise<DecryptedFactorySecret<T>>;\n}\n\nexport interface FactorySecretEncryptionKey {\n  id: string;\n  key: Uint8Array;\n}\n\nexport interface FactorySecretEncryptionConfig {\n  primary: FactorySecretEncryptionKey;\n  previous?: FactorySecretEncryptionKey[];\n}\n\nfunction validateKey({ id, key }: FactorySecretEncryptionKey): Buffer {\n  if (!id) throw new Error('[FactorySecretEncryption] Key id is required.');\n  const buffer = Buffer.from(key);\n  if (buffer.byteLength !== 32) {\n    throw new Error(`[FactorySecretEncryption] Key \"${id}\" must be exactly 32 bytes.`);\n  }\n  return buffer;\n}\n\nfunction parseEnvelope(value: string): SecretEnvelopeV1 {\n  let parsed: unknown;\n  try {\n    parsed = JSON.parse(Buffer.from(value.slice(ENVELOPE_PREFIX.length), 'base64url').toString('utf8'));\n  } catch {\n    throw new Error('[FactorySecretEncryption] Invalid encrypted value.');\n  }\n\n  if (\n    !parsed ||\n    typeof parsed !== 'object' ||\n    typeof (parsed as SecretEnvelopeV1).keyId !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).iv !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).ciphertext !== 'string' ||\n    typeof (parsed as SecretEnvelopeV1).tag !== 'string'\n  ) {\n    throw new Error('[FactorySecretEncryption] Invalid encrypted value.');\n  }\n  return parsed as SecretEnvelopeV1;\n}\n\n/**\n * Creates a versioned AES-256-GCM encryptor. The primary key is used for new\n * writes; previous keys remain decrypt-only until stored values are rotated.\n */\nexport function createFactorySecretEncryption(config: FactorySecretEncryptionConfig): FactorySecretEncryption {\n  const primaryKey = validateKey(config.primary);\n  const keys = new Map<string, Buffer>([[config.primary.id, primaryKey]]);\n  for (const previous of config.previous ?? []) {\n    if (keys.has(previous.id)) throw new Error(`[FactorySecretEncryption] Duplicate key id \"${previous.id}\".`);\n    keys.set(previous.id, validateKey(previous));\n  }\n\n  return {\n    async encrypt<T>(value: T): Promise<string> {\n      const iv = Buffer.from(globalThis.crypto.getRandomValues(new Uint8Array(IV_BYTES)));\n      const cipher = createCipheriv(ALGORITHM, primaryKey, iv);\n      const ciphertext = Buffer.concat([cipher.update(JSON.stringify(value), 'utf8'), cipher.final()]);\n      const envelope: SecretEnvelopeV1 = {\n        keyId: config.primary.id,\n        iv: iv.toString('base64url'),\n        ciphertext: ciphertext.toString('base64url'),\n        tag: cipher.getAuthTag().toString('base64url'),\n      };\n      return `${ENVELOPE_PREFIX}${Buffer.from(JSON.stringify(envelope), 'utf8').toString('base64url')}`;\n    },\n\n    decrypt,\n  };\n\n  async function decrypt<T>(value: unknown, depth = 0): Promise<DecryptedFactorySecret<T>> {\n    if (typeof value !== 'string') {\n      return { value: structuredClone(value) as T, needsReencryption: true };\n    }\n    if (!value.startsWith(ENVELOPE_PREFIX)) {\n      // JSON text written by the plaintext encryptor, or a raw pre-encryption\n      // secret string. Decode it the same way the plaintext encryptor does so\n      // migration encrypts the original value, not its JSON text.\n      let parsed: unknown;\n      try {\n        parsed = JSON.parse(value);\n      } catch {\n        return { value: value as T, needsReencryption: true };\n      }\n      return { value: (await unwrapNestedEnvelope<T>(parsed, depth)) ?? (parsed as T), needsReencryption: true };\n    }\n\n    const envelope = parseEnvelope(value);\n    const key = keys.get(envelope.keyId);\n    if (!key) throw new Error(`[FactorySecretEncryption] Unknown key id \"${envelope.keyId}\".`);\n\n    let decoded: unknown;\n    try {\n      const decipher = createDecipheriv(ALGORITHM, key, Buffer.from(envelope.iv, 'base64url'));\n      decipher.setAuthTag(Buffer.from(envelope.tag, 'base64url'));\n      const plaintext = Buffer.concat([\n        decipher.update(Buffer.from(envelope.ciphertext, 'base64url')),\n        decipher.final(),\n      ]).toString('utf8');\n      decoded = JSON.parse(plaintext);\n    } catch {\n      throw new Error('[FactorySecretEncryption] Unable to decrypt encrypted value.');\n    }\n    const nested = await unwrapNestedEnvelope<T>(decoded, depth);\n    if (nested !== undefined) return { value: nested, needsReencryption: true };\n    return { value: decoded as T, needsReencryption: envelope.keyId !== config.primary.id };\n  }\n\n  /**\n   * Older plaintext encryptors treated an envelope as a raw legacy secret and\n   * rewrote it as JSON text, which a keyed boot then re-encrypted. Peel those\n   * layers back to the real value so the row is repaired on the next write.\n   * A user-supplied secret can also look like an envelope, so anything that\n   * does not decrypt with our keys is kept as the literal value.\n   */\n  async function unwrapNestedEnvelope<T>(value: unknown, depth: number): Promise<T | undefined> {\n    if (typeof value !== 'string' || !value.startsWith(ENVELOPE_PREFIX)) return undefined;\n    if (depth >= MAX_NESTED_ENVELOPES) return undefined;\n    try {\n      return (await decrypt<T>(value, depth + 1)).value;\n    } catch {\n      return undefined;\n    }\n  }\n}\n\n/** Explicit plaintext compatibility for local, no-auth Factory development. */\nexport function createPlaintextFactorySecretEncryption(): FactorySecretEncryption {\n  return {\n    async encrypt<T>(value: T): Promise<string> {\n      return JSON.stringify(value);\n    },\n    async decrypt<T>(value: unknown): Promise<DecryptedFactorySecret<T>> {\n      if (typeof value !== 'string') return { value: structuredClone(value) as T, needsReencryption: false };\n      if (value.startsWith(ENVELOPE_PREFIX)) {\n        // Never hand an envelope back as the secret, and never let migration\n        // rewrite it as plaintext JSON: that corrupts the row for keyed instances.\n        // A raw legacy secret can merely start with the prefix; keep those as-is.\n        try {\n          parseEnvelope(value);\n        } catch {\n          return { value: value as T, needsReencryption: true };\n        }\n        throw new Error(\n          '[FactorySecretEncryption] Value is encrypted, but this instance has no secret encryption key configured. ' +\n            \"Configure 'secretEncryption' with the same key on every Factory instance.\",\n        );\n      }\n      try {\n        return { value: JSON.parse(value) as T, needsReencryption: false };\n      } catch {\n        // Pre-encryption rows stored raw secret strings (e.g. a bare\n        // `custom_providers.api_key`), not JSON. Treat the raw string as the\n        // value and flag it so migration rewrites it in the current format.\n        return { value: value as T, needsReencryption: true };\n      }\n    },\n  };\n}\n"],"mappings":"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"}

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

@@ -20,16 +20,17 @@ export declare class FactoryChannelReplyProcessor implements Processor {
 }
 export interface SessionLinkTarget {
     threadId: string;
+    sessionId: string;
     resourceId: string;
     factoryProjectId?: string;
 }
 /**
  * The web URL for a session, or undefined without a public origin. Same
- * routes the Factory UI navigates to: a repo-backed thread's resourceId is the
- * Factory user-session id and doubles as the workspace segment; chat-only
- * threads keep the literal `channel` segment and name their resource in the
- * query; a session with no factory falls back to the factory-agnostic
- * /threads/ redirect, which forwards the query through.
+ * routes the Factory UI navigates to: a repo-backed thread's Factory session
+ * id is the workspace segment; chat-only threads keep the literal `channel`
+ * segment and name their session in the query; a session with no factory
+ * falls back to the factory-agnostic /threads/ redirect, which forwards the
+ * query through.
  */
-export declare function sessionLink({ threadId, resourceId, factoryProjectId }: SessionLinkTarget): string | undefined;
+export declare function sessionLink({ threadId, sessionId, resourceId, factoryProjectId, }: SessionLinkTarget): string | undefined;
 //# sourceMappingURL=channel-reply-processor.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"channel-reply-processor.d.ts","sourceRoot":"","sources":["../../src/session/channel-reply-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAI/E,eAAO,MAAM,kBAAkB,wBAAmB,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,qBAAa,4BAA6B,YAAW,SAAS;IAC5D,QAAQ,CAAC,EAAE,2BAAM;IAEjB,gBAAgB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;CAcvE;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAQ7G"}
+{"version":3,"file":"channel-reply-processor.d.ts","sourceRoot":"","sources":["../../src/session/channel-reply-processor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAI/E,eAAO,MAAM,kBAAkB,wBAAmB,CAAC;AAEnD;;;;;;;;;;;GAWG;AACH,qBAAa,4BAA6B,YAAW,SAAS;IAC5D,QAAQ,CAAC,EAAE,2BAAM;IAEjB,gBAAgB,CAAC,EAAE,WAAW,EAAE,cAAc,EAAE,EAAE,oBAAoB;;;CAcvE;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,EAC1B,QAAQ,EACR,SAAS,EACT,UAAU,EACV,gBAAgB,GACjB,EAAE,iBAAiB,GAAG,MAAM,GAAG,SAAS,CAQxC"}

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

@@ -26,19 +26,19 @@ var FactoryChannelReplyProcessor = class {
 };
 /**
 * The web URL for a session, or undefined without a public origin. Same
-* routes the Factory UI navigates to: a repo-backed thread's resourceId is the
-* Factory user-session id and doubles as the workspace segment; chat-only
-* threads keep the literal `channel` segment and name their resource in the
-* query; a session with no factory falls back to the factory-agnostic
-* /threads/ redirect, which forwards the query through.
+* routes the Factory UI navigates to: a repo-backed thread's Factory session
+* id is the workspace segment; chat-only threads keep the literal `channel`
+* segment and name their session in the query; a session with no factory
+* falls back to the factory-agnostic /threads/ redirect, which forwards the
+* query through.
 */
-function sessionLink({ threadId, resourceId, factoryProjectId }) {
+function sessionLink({ threadId, sessionId, resourceId, factoryProjectId }) {
 	const origin = process.env.MASTRACODE_PUBLIC_URL;
 	if (!origin) return void 0;
 	const isChatOnly = resourceId.startsWith("channel:");
-	const resourceParam = `?resourceId=${encodeURIComponent(resourceId)}`;
-	if (!factoryProjectId) return `${origin}/threads/${encodeURIComponent(threadId)}${resourceParam}`;
-	return `${origin}/factories/${encodeURIComponent(factoryProjectId)}/workspaces/${isChatOnly ? "channel" : encodeURIComponent(resourceId)}/threads/${encodeURIComponent(threadId)}${isChatOnly ? resourceParam : ""}`;
+	const sessionParam = `?sessionId=${encodeURIComponent(sessionId)}`;
+	if (!factoryProjectId) return `${origin}/threads/${encodeURIComponent(threadId)}${sessionParam}`;
+	return `${origin}/factories/${encodeURIComponent(factoryProjectId)}/workspaces/${isChatOnly ? "channel" : encodeURIComponent(sessionId)}/threads/${encodeURIComponent(threadId)}${isChatOnly ? sessionParam : ""}`;
 }
 //#endregion
 export { FactoryChannelReplyProcessor, SESSION_LINK_LABEL, sessionLink };

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

@@ -1 +1 @@
-{"version":3,"file":"channel-reply-processor.js","names":[],"sources":["../../src/session/channel-reply-processor.ts"],"sourcesContent":["import type { ProcessInputStepArgs, Processor } from '@mastra/core/processors';\n\nconst ID = 'factory-channel-reply';\n\nexport const SESSION_LINK_LABEL = 'Open session ↗';\n\n/**\n * Tells the agent how to open a reply when the run came in over a chat\n * channel (Slack, …): acknowledge a job in one line that names it — \"On it —\n * sleeping 30s, then running the echo\" — before starting, so the sender sees\n * a task-specific first message rather than a silent typing status until the\n * first tool finishes. The channel driver posts that opener on its own before\n * the tool widget, so the instruction and the rendering agree. The session\n * link is not the model's job: `FactoryChannelSessionLinkProcessor` appends it\n * to the first reply of a new session, so it is there whether or not the\n * model judged the request worth an opener. No-op for runs without channel\n * context (Studio, API, boards).\n */\nexport class FactoryChannelReplyProcessor implements Processor {\n  readonly id = ID;\n\n  processInputStep({ messageList, requestContext }: ProcessInputStepArgs) {\n    if (!requestContext?.get('channel')) return undefined;\n    messageList.addSystem(\n      {\n        role: 'system',\n        content: [\n          'When a request will take tools or more than a moment to answer, reply first with one short line that says what you are about to do — \"On it — <the task in a few words>.\" — then do the work; the opener posts as its own message before any progress is shown. Give direct answers and trivial replies without an opener.',\n          'Finish with the outcome, not a replay of the steps.',\n        ].join('\\n'),\n      },\n      ID,\n    );\n    return { messageList };\n  }\n}\n\nexport interface SessionLinkTarget {\n  threadId: string;\n  resourceId: string;\n  factoryProjectId?: string;\n}\n\n/**\n * The web URL for a session, or undefined without a public origin. Same\n * routes the Factory UI navigates to: a repo-backed thread's resourceId is the\n * Factory user-session id and doubles as the workspace segment; chat-only\n * threads keep the literal `channel` segment and name their resource in the\n * query; a session with no factory falls back to the factory-agnostic\n * /threads/ redirect, which forwards the query through.\n */\nexport function sessionLink({ threadId, resourceId, factoryProjectId }: SessionLinkTarget): string | undefined {\n  const origin = process.env.MASTRACODE_PUBLIC_URL;\n  if (!origin) return undefined;\n  const isChatOnly = resourceId.startsWith('channel:');\n  const resourceParam = `?resourceId=${encodeURIComponent(resourceId)}`;\n  if (!factoryProjectId) return `${origin}/threads/${encodeURIComponent(threadId)}${resourceParam}`;\n  const workspaceSegment = isChatOnly ? 'channel' : encodeURIComponent(resourceId);\n  return `${origin}/factories/${encodeURIComponent(factoryProjectId)}/workspaces/${workspaceSegment}/threads/${encodeURIComponent(threadId)}${isChatOnly ? resourceParam : ''}`;\n}\n"],"mappings":";AAEA,MAAM,KAAK;AAEX,MAAa,qBAAqB;;;;;;;;;;;;;AAclC,IAAa,+BAAb,MAA+D;CAC7D,KAAc;CAEd,iBAAiB,EAAE,aAAa,kBAAwC;EACtE,IAAI,CAAC,gBAAgB,IAAI,SAAS,GAAG,OAAO,KAAA;EAC5C,YAAY,UACV;GACE,MAAM;GACN,SAAS,CACP,gUACA,qDACF,CAAC,CAAC,KAAK,IAAI;EACb,GACA,EACF;EACA,OAAO,EAAE,YAAY;CACvB;AACF;;;;;;;;;AAgBA,SAAgB,YAAY,EAAE,UAAU,YAAY,oBAA2D;CAC7G,MAAM,SAAS,QAAQ,IAAI;CAC3B,IAAI,CAAC,QAAQ,OAAO,KAAA;CACpB,MAAM,aAAa,WAAW,WAAW,UAAU;CACnD,MAAM,gBAAgB,eAAe,mBAAmB,UAAU;CAClE,IAAI,CAAC,kBAAkB,OAAO,GAAG,OAAO,WAAW,mBAAmB,QAAQ,IAAI;CAElF,OAAO,GAAG,OAAO,aAAa,mBAAmB,gBAAgB,EAAE,cAD1C,aAAa,YAAY,mBAAmB,UAAU,EACmB,WAAW,mBAAmB,QAAQ,IAAI,aAAa,gBAAgB;AAC3K"}
+{"version":3,"file":"channel-reply-processor.js","names":[],"sources":["../../src/session/channel-reply-processor.ts"],"sourcesContent":["import type { ProcessInputStepArgs, Processor } from '@mastra/core/processors';\n\nconst ID = 'factory-channel-reply';\n\nexport const SESSION_LINK_LABEL = 'Open session ↗';\n\n/**\n * Tells the agent how to open a reply when the run came in over a chat\n * channel (Slack, …): acknowledge a job in one line that names it — \"On it —\n * sleeping 30s, then running the echo\" — before starting, so the sender sees\n * a task-specific first message rather than a silent typing status until the\n * first tool finishes. The channel driver posts that opener on its own before\n * the tool widget, so the instruction and the rendering agree. The session\n * link is not the model's job: `FactoryChannelSessionLinkProcessor` appends it\n * to the first reply of a new session, so it is there whether or not the\n * model judged the request worth an opener. No-op for runs without channel\n * context (Studio, API, boards).\n */\nexport class FactoryChannelReplyProcessor implements Processor {\n  readonly id = ID;\n\n  processInputStep({ messageList, requestContext }: ProcessInputStepArgs) {\n    if (!requestContext?.get('channel')) return undefined;\n    messageList.addSystem(\n      {\n        role: 'system',\n        content: [\n          'When a request will take tools or more than a moment to answer, reply first with one short line that says what you are about to do — \"On it — <the task in a few words>.\" — then do the work; the opener posts as its own message before any progress is shown. Give direct answers and trivial replies without an opener.',\n          'Finish with the outcome, not a replay of the steps.',\n        ].join('\\n'),\n      },\n      ID,\n    );\n    return { messageList };\n  }\n}\n\nexport interface SessionLinkTarget {\n  threadId: string;\n  sessionId: string;\n  resourceId: string;\n  factoryProjectId?: string;\n}\n\n/**\n * The web URL for a session, or undefined without a public origin. Same\n * routes the Factory UI navigates to: a repo-backed thread's Factory session\n * id is the workspace segment; chat-only threads keep the literal `channel`\n * segment and name their session in the query; a session with no factory\n * falls back to the factory-agnostic /threads/ redirect, which forwards the\n * query through.\n */\nexport function sessionLink({\n  threadId,\n  sessionId,\n  resourceId,\n  factoryProjectId,\n}: SessionLinkTarget): string | undefined {\n  const origin = process.env.MASTRACODE_PUBLIC_URL;\n  if (!origin) return undefined;\n  const isChatOnly = resourceId.startsWith('channel:');\n  const sessionParam = `?sessionId=${encodeURIComponent(sessionId)}`;\n  if (!factoryProjectId) return `${origin}/threads/${encodeURIComponent(threadId)}${sessionParam}`;\n  const workspaceSegment = isChatOnly ? 'channel' : encodeURIComponent(sessionId);\n  return `${origin}/factories/${encodeURIComponent(factoryProjectId)}/workspaces/${workspaceSegment}/threads/${encodeURIComponent(threadId)}${isChatOnly ? sessionParam : ''}`;\n}\n"],"mappings":";AAEA,MAAM,KAAK;AAEX,MAAa,qBAAqB;;;;;;;;;;;;;AAclC,IAAa,+BAAb,MAA+D;CAC7D,KAAc;CAEd,iBAAiB,EAAE,aAAa,kBAAwC;EACtE,IAAI,CAAC,gBAAgB,IAAI,SAAS,GAAG,OAAO,KAAA;EAC5C,YAAY,UACV;GACE,MAAM;GACN,SAAS,CACP,gUACA,qDACF,CAAC,CAAC,KAAK,IAAI;EACb,GACA,EACF;EACA,OAAO,EAAE,YAAY;CACvB;AACF;;;;;;;;;AAiBA,SAAgB,YAAY,EAC1B,UACA,WACA,YACA,oBACwC;CACxC,MAAM,SAAS,QAAQ,IAAI;CAC3B,IAAI,CAAC,QAAQ,OAAO,KAAA;CACpB,MAAM,aAAa,WAAW,WAAW,UAAU;CACnD,MAAM,eAAe,cAAc,mBAAmB,SAAS;CAC/D,IAAI,CAAC,kBAAkB,OAAO,GAAG,OAAO,WAAW,mBAAmB,QAAQ,IAAI;CAElF,OAAO,GAAG,OAAO,aAAa,mBAAmB,gBAAgB,EAAE,cAD1C,aAAa,YAAY,mBAAmB,SAAS,EACoB,WAAW,mBAAmB,QAAQ,IAAI,aAAa,eAAe;AAC1K"}

package/dist/session/channel-session-link-processor.js

@@ -89,6 +89,7 @@ function sessionLinkFromRequest(requestContext) {
 	if (!controller?.threadId) return void 0;
 	return sessionLink({
 		threadId: controller.threadId,
+		sessionId: controller.sessionId,
 		resourceId: controller.resourceId,
 		factoryProjectId: readFactorySessionScope(requestContext)?.factoryProjectId
 	});

package/dist/session/channel-session-link-processor.js.map

@@ -1 +1 @@
-{"version":3,"file":"channel-session-link-processor.js","names":[],"sources":["../../src/session/channel-session-link-processor.ts"],"sourcesContent":["import type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { Processor, ProcessOutputStepArgs, ProcessOutputStreamArgs } from '@mastra/core/processors';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport type { ChunkType } from '@mastra/core/stream';\n\nimport { readFactorySessionScope } from '../rules/binding-context.js';\nimport { SESSION_LINK_LABEL, sessionLink } from './channel-reply-processor.js';\n\n/**\n * Request-context marker a channel handler sets on the run that opens a new\n * thread. Only that run gets the link; follow-ups in the same thread don't.\n */\nexport const NEW_CHANNEL_SESSION_KEY = 'factory__newChannelSession';\n\nexport function markNewChannelSession(requestContext: RequestContext): void {\n  requestContext.set(NEW_CHANNEL_SESSION_KEY, true);\n}\n\n/**\n * State key the core ProcessorRunner reads to re-drive one extra part through\n * the output chain after the part a processor returned. Internal to core\n * (`processors/stream-reprocess.ts`, used by `BatchPartsProcessor`); mirrored\n * here rather than exported so Factory's one use doesn't widen core's API.\n */\nconst REPROCESS_PART_KEY = '__mastraReprocessPart';\n\n/** Text-part id of the link delta; never collides with a model block id. */\nconst LINK_PART_ID = 'factory-session-link';\n\n/**\n * Emits an `Open session ↗` link right after the first reply of a new channel\n * session, so the link closes the reply rather than leading it. The channel\n * driver ends a post at `text-end`, so Slack shows the link as its own short\n * message after the reply.\n *\n * \"End of the reply\" is not `text-end`: a reply with citations is several\n * text blocks (`text … source … text`), each with its own `text-end`. The\n * reply ends at the first `tool-call` (the opener before tools run) or at\n * `step-finish` (a reply with no tools), whichever comes first after some\n * text. A processor can only return one part, so on that chunk this returns\n * a `text-delta` carrying the link and stashes the chunk itself under\n * `REPROCESS_PART_KEY`, which the runner re-drives through the chain right\n * after — the link lands before it and downstream processors see both.\n * Factory-emitted rather than left to the model so a skipped opener can't\n * drop it. No-op without the new-session marker or a public origin.\n *\n * The streamed text is also what gets persisted, and the link is a Slack\n * display detail: in memory it would show the model its own `[↗](…)` on\n * later turns (inviting it to fabricate links) and render a self-link in\n * the web transcript. The link delta opens its own text part, so\n * `processOutputStep` drops that part from the assistant message before\n * `MessageHistory` saves it.\n */\nexport class FactoryChannelSessionLinkProcessor implements Processor {\n  readonly id = 'factory-channel-session-link';\n\n  async processOutputStream({ part, state, requestContext }: ProcessOutputStreamArgs): Promise<ChunkType> {\n    if (state.linked || !requestContext?.get(NEW_CHANNEL_SESSION_KEY)) return part;\n    if (part.type === 'text-delta') {\n      state.textStarted = true;\n      return part;\n    }\n    if ((part.type !== 'tool-call' && part.type !== 'step-finish') || !state.textStarted) return part;\n    state.linked = true;\n    const link = sessionLinkFromRequest(requestContext);\n    if (!link) return part;\n    state[REPROCESS_PART_KEY] = part;\n    return {\n      type: 'text-delta',\n      runId: part.runId,\n      from: part.from,\n      payload: { id: LINK_PART_ID, text: linkSuffix(link) },\n    };\n  }\n\n  processOutputStep({ messageList, requestContext }: ProcessOutputStepArgs) {\n    if (!requestContext?.get(NEW_CHANNEL_SESSION_KEY)) return messageList;\n    const link = sessionLinkFromRequest(requestContext);\n    if (!link) return messageList;\n    const suffix = linkSuffix(link);\n    for (const message of messageList.get.response.db()) {\n      if (message.role !== 'assistant') continue;\n      const index = message.content.parts.findIndex(part => part.type === 'text' && part.text === suffix);\n      if (index === -1) continue;\n      message.content.parts.splice(index, 1);\n      if (typeof message.content.content === 'string' && message.content.content.endsWith(suffix)) {\n        message.content.content = message.content.content.slice(0, -suffix.length);\n      }\n      return messageList;\n    }\n    return messageList;\n  }\n}\n\nfunction linkSuffix(link: string): string {\n  // Own paragraph: the link closes the message, it is not part of the last sentence.\n  return `\\n\\n[${SESSION_LINK_LABEL}](${link})`;\n}\n\nfunction sessionLinkFromRequest(requestContext: RequestContext): string | undefined {\n  const controller = requestContext.get('controller') as AgentControllerRequestContext | undefined;\n  if (!controller?.threadId) return undefined;\n  return sessionLink({\n    threadId: controller.threadId,\n    resourceId: controller.resourceId,\n    factoryProjectId: readFactorySessionScope(requestContext)?.factoryProjectId,\n  });\n}\n"],"mappings":";;;;;;;AAYA,MAAa,0BAA0B;AAEvC,SAAgB,sBAAsB,gBAAsC;CAC1E,eAAe,IAAI,yBAAyB,IAAI;AAClD;;;;;;;AAQA,MAAM,qBAAqB;;AAG3B,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;AA0BrB,IAAa,qCAAb,MAAqE;CACnE,KAAc;CAEd,MAAM,oBAAoB,EAAE,MAAM,OAAO,kBAA+D;EACtG,IAAI,MAAM,UAAU,CAAC,gBAAgB,IAAA,4BAA2B,GAAG,OAAO;EAC1E,IAAI,KAAK,SAAS,cAAc;GAC9B,MAAM,cAAc;GACpB,OAAO;EACT;EACA,IAAK,KAAK,SAAS,eAAe,KAAK,SAAS,iBAAkB,CAAC,MAAM,aAAa,OAAO;EAC7F,MAAM,SAAS;EACf,MAAM,OAAO,uBAAuB,cAAc;EAClD,IAAI,CAAC,MAAM,OAAO;EAClB,MAAM,sBAAsB;EAC5B,OAAO;GACL,MAAM;GACN,OAAO,KAAK;GACZ,MAAM,KAAK;GACX,SAAS;IAAE,IAAI;IAAc,MAAM,WAAW,IAAI;GAAE;EACtD;CACF;CAEA,kBAAkB,EAAE,aAAa,kBAAyC;EACxE,IAAI,CAAC,gBAAgB,IAAA,4BAA2B,GAAG,OAAO;EAC1D,MAAM,OAAO,uBAAuB,cAAc;EAClD,IAAI,CAAC,MAAM,OAAO;EAClB,MAAM,SAAS,WAAW,IAAI;EAC9B,KAAK,MAAM,WAAW,YAAY,IAAI,SAAS,GAAG,GAAG;GACnD,IAAI,QAAQ,SAAS,aAAa;GAClC,MAAM,QAAQ,QAAQ,QAAQ,MAAM,WAAU,SAAQ,KAAK,SAAS,UAAU,KAAK,SAAS,MAAM;GAClG,IAAI,UAAU,IAAI;GAClB,QAAQ,QAAQ,MAAM,OAAO,OAAO,CAAC;GACrC,IAAI,OAAO,QAAQ,QAAQ,YAAY,YAAY,QAAQ,QAAQ,QAAQ,SAAS,MAAM,GACxF,QAAQ,QAAQ,UAAU,QAAQ,QAAQ,QAAQ,MAAM,GAAG,CAAC,OAAO,MAAM;GAE3E,OAAO;EACT;EACA,OAAO;CACT;AACF;AAEA,SAAS,WAAW,MAAsB;CAExC,OAAO,QAAQ,mBAAmB,IAAI,KAAK;AAC7C;AAEA,SAAS,uBAAuB,gBAAoD;CAClF,MAAM,aAAa,eAAe,IAAI,YAAY;CAClD,IAAI,CAAC,YAAY,UAAU,OAAO,KAAA;CAClC,OAAO,YAAY;EACjB,UAAU,WAAW;EACrB,YAAY,WAAW;EACvB,kBAAkB,wBAAwB,cAAc,CAAC,EAAE;CAC7D,CAAC;AACH"}
+{"version":3,"file":"channel-session-link-processor.js","names":[],"sources":["../../src/session/channel-session-link-processor.ts"],"sourcesContent":["import type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { Processor, ProcessOutputStepArgs, ProcessOutputStreamArgs } from '@mastra/core/processors';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport type { ChunkType } from '@mastra/core/stream';\n\nimport { readFactorySessionScope } from '../rules/binding-context.js';\nimport { SESSION_LINK_LABEL, sessionLink } from './channel-reply-processor.js';\n\n/**\n * Request-context marker a channel handler sets on the run that opens a new\n * thread. Only that run gets the link; follow-ups in the same thread don't.\n */\nexport const NEW_CHANNEL_SESSION_KEY = 'factory__newChannelSession';\n\nexport function markNewChannelSession(requestContext: RequestContext): void {\n  requestContext.set(NEW_CHANNEL_SESSION_KEY, true);\n}\n\n/**\n * State key the core ProcessorRunner reads to re-drive one extra part through\n * the output chain after the part a processor returned. Internal to core\n * (`processors/stream-reprocess.ts`, used by `BatchPartsProcessor`); mirrored\n * here rather than exported so Factory's one use doesn't widen core's API.\n */\nconst REPROCESS_PART_KEY = '__mastraReprocessPart';\n\n/** Text-part id of the link delta; never collides with a model block id. */\nconst LINK_PART_ID = 'factory-session-link';\n\n/**\n * Emits an `Open session ↗` link right after the first reply of a new channel\n * session, so the link closes the reply rather than leading it. The channel\n * driver ends a post at `text-end`, so Slack shows the link as its own short\n * message after the reply.\n *\n * \"End of the reply\" is not `text-end`: a reply with citations is several\n * text blocks (`text … source … text`), each with its own `text-end`. The\n * reply ends at the first `tool-call` (the opener before tools run) or at\n * `step-finish` (a reply with no tools), whichever comes first after some\n * text. A processor can only return one part, so on that chunk this returns\n * a `text-delta` carrying the link and stashes the chunk itself under\n * `REPROCESS_PART_KEY`, which the runner re-drives through the chain right\n * after — the link lands before it and downstream processors see both.\n * Factory-emitted rather than left to the model so a skipped opener can't\n * drop it. No-op without the new-session marker or a public origin.\n *\n * The streamed text is also what gets persisted, and the link is a Slack\n * display detail: in memory it would show the model its own `[↗](…)` on\n * later turns (inviting it to fabricate links) and render a self-link in\n * the web transcript. The link delta opens its own text part, so\n * `processOutputStep` drops that part from the assistant message before\n * `MessageHistory` saves it.\n */\nexport class FactoryChannelSessionLinkProcessor implements Processor {\n  readonly id = 'factory-channel-session-link';\n\n  async processOutputStream({ part, state, requestContext }: ProcessOutputStreamArgs): Promise<ChunkType> {\n    if (state.linked || !requestContext?.get(NEW_CHANNEL_SESSION_KEY)) return part;\n    if (part.type === 'text-delta') {\n      state.textStarted = true;\n      return part;\n    }\n    if ((part.type !== 'tool-call' && part.type !== 'step-finish') || !state.textStarted) return part;\n    state.linked = true;\n    const link = sessionLinkFromRequest(requestContext);\n    if (!link) return part;\n    state[REPROCESS_PART_KEY] = part;\n    return {\n      type: 'text-delta',\n      runId: part.runId,\n      from: part.from,\n      payload: { id: LINK_PART_ID, text: linkSuffix(link) },\n    };\n  }\n\n  processOutputStep({ messageList, requestContext }: ProcessOutputStepArgs) {\n    if (!requestContext?.get(NEW_CHANNEL_SESSION_KEY)) return messageList;\n    const link = sessionLinkFromRequest(requestContext);\n    if (!link) return messageList;\n    const suffix = linkSuffix(link);\n    for (const message of messageList.get.response.db()) {\n      if (message.role !== 'assistant') continue;\n      const index = message.content.parts.findIndex(part => part.type === 'text' && part.text === suffix);\n      if (index === -1) continue;\n      message.content.parts.splice(index, 1);\n      if (typeof message.content.content === 'string' && message.content.content.endsWith(suffix)) {\n        message.content.content = message.content.content.slice(0, -suffix.length);\n      }\n      return messageList;\n    }\n    return messageList;\n  }\n}\n\nfunction linkSuffix(link: string): string {\n  // Own paragraph: the link closes the message, it is not part of the last sentence.\n  return `\\n\\n[${SESSION_LINK_LABEL}](${link})`;\n}\n\nfunction sessionLinkFromRequest(requestContext: RequestContext): string | undefined {\n  const controller = requestContext.get('controller') as AgentControllerRequestContext | undefined;\n  if (!controller?.threadId) return undefined;\n  return sessionLink({\n    threadId: controller.threadId,\n    sessionId: controller.sessionId,\n    resourceId: controller.resourceId,\n    factoryProjectId: readFactorySessionScope(requestContext)?.factoryProjectId,\n  });\n}\n"],"mappings":";;;;;;;AAYA,MAAa,0BAA0B;AAEvC,SAAgB,sBAAsB,gBAAsC;CAC1E,eAAe,IAAI,yBAAyB,IAAI;AAClD;;;;;;;AAQA,MAAM,qBAAqB;;AAG3B,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;AA0BrB,IAAa,qCAAb,MAAqE;CACnE,KAAc;CAEd,MAAM,oBAAoB,EAAE,MAAM,OAAO,kBAA+D;EACtG,IAAI,MAAM,UAAU,CAAC,gBAAgB,IAAA,4BAA2B,GAAG,OAAO;EAC1E,IAAI,KAAK,SAAS,cAAc;GAC9B,MAAM,cAAc;GACpB,OAAO;EACT;EACA,IAAK,KAAK,SAAS,eAAe,KAAK,SAAS,iBAAkB,CAAC,MAAM,aAAa,OAAO;EAC7F,MAAM,SAAS;EACf,MAAM,OAAO,uBAAuB,cAAc;EAClD,IAAI,CAAC,MAAM,OAAO;EAClB,MAAM,sBAAsB;EAC5B,OAAO;GACL,MAAM;GACN,OAAO,KAAK;GACZ,MAAM,KAAK;GACX,SAAS;IAAE,IAAI;IAAc,MAAM,WAAW,IAAI;GAAE;EACtD;CACF;CAEA,kBAAkB,EAAE,aAAa,kBAAyC;EACxE,IAAI,CAAC,gBAAgB,IAAA,4BAA2B,GAAG,OAAO;EAC1D,MAAM,OAAO,uBAAuB,cAAc;EAClD,IAAI,CAAC,MAAM,OAAO;EAClB,MAAM,SAAS,WAAW,IAAI;EAC9B,KAAK,MAAM,WAAW,YAAY,IAAI,SAAS,GAAG,GAAG;GACnD,IAAI,QAAQ,SAAS,aAAa;GAClC,MAAM,QAAQ,QAAQ,QAAQ,MAAM,WAAU,SAAQ,KAAK,SAAS,UAAU,KAAK,SAAS,MAAM;GAClG,IAAI,UAAU,IAAI;GAClB,QAAQ,QAAQ,MAAM,OAAO,OAAO,CAAC;GACrC,IAAI,OAAO,QAAQ,QAAQ,YAAY,YAAY,QAAQ,QAAQ,QAAQ,SAAS,MAAM,GACxF,QAAQ,QAAQ,UAAU,QAAQ,QAAQ,QAAQ,MAAM,GAAG,CAAC,OAAO,MAAM;GAE3E,OAAO;EACT;EACA,OAAO;CACT;AACF;AAEA,SAAS,WAAW,MAAsB;CAExC,OAAO,QAAQ,mBAAmB,IAAI,KAAK;AAC7C;AAEA,SAAS,uBAAuB,gBAAoD;CAClF,MAAM,aAAa,eAAe,IAAI,YAAY;CAClD,IAAI,CAAC,YAAY,UAAU,OAAO,KAAA;CAClC,OAAO,YAAY;EACjB,UAAU,WAAW;EACrB,WAAW,WAAW;EACtB,YAAY,WAAW;EACvB,kBAAkB,wBAAwB,cAAc,CAAC,EAAE;CAC7D,CAAC;AACH"}

package/dist/session/credential-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credential-policy.d.ts","sourceRoot":"","sources":["../../src/session/credential-policy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAIvE,UAAU,8BAA8B;IACtC,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAClD,aAAa,EAAE,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;IAClE,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;CAC7D;AAED,uGAAuG;AACvG,wBAAsB,8BAA8B,CAClD,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,8BAA8B,GACnC,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAEvC;AAED,+FAA+F;AAC/F,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,8BAA8B,GACnC,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,SAAS,CAAC,CAsDrH"}
+{"version":3,"file":"credential-policy.d.ts","sourceRoot":"","sources":["../../src/session/credential-policy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAEpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAIvE,UAAU,8BAA8B;IACtC,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAClD,aAAa,EAAE,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;IAClE,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;CAC7D;AAED,uGAAuG;AACvG,wBAAsB,8BAA8B,CAClD,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,8BAA8B,GACnC,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAEvC;AAED,+FAA+F;AAC/F,wBAAsB,yBAAyB,CAC7C,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,8BAA8B,GACnC,OAAO,CAAC;IAAE,MAAM,EAAE,gBAAgB,CAAC;IAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAAC,qBAAqB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,SAAS,CAAC,CAwDrH"}

package/dist/session/credential-policy.js

@@ -12,18 +12,19 @@ async function resolveFactoryModelPolicy(requestContext, deps) {
 	const principal = resolveAuthenticatedCredentialTenant(requestContext);
 	if (!principal) return void 0;
 	const controller = requestContext.get("controller");
-	if (!controller?.resourceId) return { tenant: principal };
-	const sourceSession = await deps.sourceControl.getBySessionId(controller.resourceId);
+	if (!controller?.sessionId || !controller.resourceId) return { tenant: principal };
+	const { sessionId, resourceId } = controller;
+	const sourceSession = await deps.sourceControl.getBySessionId(sessionId);
 	const binding = principal.orgId && controller.threadId ? await deps.workItems.findRunBindingByThread({
 		orgId: principal.orgId,
-		resourceId: controller.resourceId,
-		sessionId: controller.resourceId,
+		resourceId,
+		sessionId,
 		threadId: controller.threadId,
 		rejectAmbiguous: true
 	}) : null;
 	if (!sourceSession) {
-		if (!binding && (controller.resourceId === principal.userId || controller.resourceId.startsWith("channel:"))) return { tenant: principal };
-		const factoryProject = !binding && FACTORY_PROJECT_ID.test(controller.resourceId) ? await deps.projects.getById({ id: controller.resourceId }) : null;
+		if (!binding && (resourceId === principal.userId || resourceId.startsWith("channel:"))) return { tenant: principal };
+		const factoryProject = !binding && sessionId === resourceId && FACTORY_PROJECT_ID.test(resourceId) ? await deps.projects.getById({ id: resourceId }) : null;
 		if (factoryProject && factoryProject.orgId === principal.orgId) return {
 			factoryProjectId: factoryProject.id,
 			factoryDefaultModelId: factoryProject.defaultModelId,

package/dist/session/credential-policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-policy.js","names":[],"sources":["../../src/session/credential-policy.ts"],"sourcesContent":["import { resolveAuthenticatedCredentialTenant } from '@mastra/code-sdk/agents/credential-resolver';\nimport type { CredentialTenant } from '@mastra/code-sdk/agents/credential-resolver';\nimport type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\n\nimport { UUID_PATTERN } from '../routes/contracts.js';\nimport { effectiveModelScope } from '../storage/domains/projects/base.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SourceControlSessionLookup } from './factory-session.js';\n\nconst FACTORY_PROJECT_ID = new RegExp(UUID_PATTERN);\n\ninterface FactoryModelPolicyDependencies {\n  projects: Pick<FactoryProjectsStorage, 'getById'>;\n  sourceControl: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n  workItems: Pick<WorkItemsStorage, 'findRunBindingByThread'>;\n}\n\n/** Resolve billing authority from authenticated identity and durable bindings, never session state. */\nexport async function resolveFactoryCredentialTenant(\n  requestContext: RequestContext,\n  deps: FactoryModelPolicyDependencies,\n): Promise<CredentialTenant | undefined> {\n  return (await resolveFactoryModelPolicy(requestContext, deps))?.tenant;\n}\n\n/** Shared invocation and model-picker policy; no client-supplied owner or scope is trusted. */\nexport async function resolveFactoryModelPolicy(\n  requestContext: RequestContext,\n  deps: FactoryModelPolicyDependencies,\n): Promise<{ tenant: CredentialTenant; factoryProjectId?: string; factoryDefaultModelId?: string | null } | undefined> {\n  const principal = resolveAuthenticatedCredentialTenant(requestContext);\n  if (!principal) return undefined;\n  const controller = requestContext.get('controller') as AgentControllerRequestContext | undefined;\n  if (!controller?.resourceId) return { tenant: principal };\n\n  const sourceSession = await deps.sourceControl.getBySessionId(controller.resourceId);\n  const binding =\n    principal.orgId && controller.threadId\n      ? await deps.workItems.findRunBindingByThread({\n          orgId: principal.orgId,\n          resourceId: controller.resourceId,\n          sessionId: controller.resourceId,\n          threadId: controller.threadId,\n          rejectAmbiguous: true,\n        })\n      : null;\n  if (!sourceSession) {\n    if (!binding && (controller.resourceId === principal.userId || controller.resourceId.startsWith('channel:')))\n      return { tenant: principal };\n    // Session-less Factory pages address the Factory itself: the resourceId is the project id.\n    const factoryProject =\n      !binding && FACTORY_PROJECT_ID.test(controller.resourceId)\n        ? await deps.projects.getById({ id: controller.resourceId })\n        : null;\n    if (factoryProject && factoryProject.orgId === principal.orgId) {\n      return {\n        factoryProjectId: factoryProject.id,\n        factoryDefaultModelId: factoryProject.defaultModelId,\n        tenant: { ...principal, credentialScope: effectiveModelScope(factoryProject.modelScope, 'session') },\n      };\n    }\n    throw new Error('Factory session ownership is unavailable.');\n  }\n  if (\n    sourceSession.orgId !== principal.orgId ||\n    (sourceSession.visibility === 'private' && sourceSession.userId !== principal.userId)\n  ) {\n    throw new Error('Factory session is not available to the current user.');\n  }\n  if (!sourceSession.factoryProjectId) throw new Error('Factory session ownership is unavailable.');\n  const projectId = binding?.factoryProjectId ?? sourceSession.factoryProjectId;\n  const project = await deps.projects.getById({ id: projectId });\n  if (!project || project.orgId !== sourceSession.orgId) throw new Error('Factory model policy is unavailable.');\n  // Work-item threads keep their billing scope after revocation; history never restores run authority.\n  return {\n    factoryProjectId: project.id,\n    factoryDefaultModelId: project.defaultModelId,\n    tenant: {\n      orgId: project.orgId,\n      userId: sourceSession.userId,\n      credentialScope: effectiveModelScope(project.modelScope, binding ? 'run' : 'session'),\n    },\n  };\n}\n"],"mappings":";;;;AAWA,MAAM,qBAAqB,IAAI,OAAO,YAAY;;AASlD,eAAsB,+BACpB,gBACA,MACuC;CACvC,QAAQ,MAAM,0BAA0B,gBAAgB,IAAI,EAAA,EAAI;AAClE;;AAGA,eAAsB,0BACpB,gBACA,MACqH;CACrH,MAAM,YAAY,qCAAqC,cAAc;CACrE,IAAI,CAAC,WAAW,OAAO,KAAA;CACvB,MAAM,aAAa,eAAe,IAAI,YAAY;CAClD,IAAI,CAAC,YAAY,YAAY,OAAO,EAAE,QAAQ,UAAU;CAExD,MAAM,gBAAgB,MAAM,KAAK,cAAc,eAAe,WAAW,UAAU;CACnF,MAAM,UACJ,UAAU,SAAS,WAAW,WAC1B,MAAM,KAAK,UAAU,uBAAuB;EAC1C,OAAO,UAAU;EACjB,YAAY,WAAW;EACvB,WAAW,WAAW;EACtB,UAAU,WAAW;EACrB,iBAAiB;CACnB,CAAC,IACD;CACN,IAAI,CAAC,eAAe;EAClB,IAAI,CAAC,YAAY,WAAW,eAAe,UAAU,UAAU,WAAW,WAAW,WAAW,UAAU,IACxG,OAAO,EAAE,QAAQ,UAAU;EAE7B,MAAM,iBACJ,CAAC,WAAW,mBAAmB,KAAK,WAAW,UAAU,IACrD,MAAM,KAAK,SAAS,QAAQ,EAAE,IAAI,WAAW,WAAW,CAAC,IACzD;EACN,IAAI,kBAAkB,eAAe,UAAU,UAAU,OACvD,OAAO;GACL,kBAAkB,eAAe;GACjC,uBAAuB,eAAe;GACtC,QAAQ;IAAE,GAAG;IAAW,iBAAiB,oBAAoB,eAAe,YAAY,SAAS;GAAE;EACrG;EAEF,MAAM,IAAI,MAAM,2CAA2C;CAC7D;CACA,IACE,cAAc,UAAU,UAAU,SACjC,cAAc,eAAe,aAAa,cAAc,WAAW,UAAU,QAE9E,MAAM,IAAI,MAAM,uDAAuD;CAEzE,IAAI,CAAC,cAAc,kBAAkB,MAAM,IAAI,MAAM,2CAA2C;CAChG,MAAM,YAAY,SAAS,oBAAoB,cAAc;CAC7D,MAAM,UAAU,MAAM,KAAK,SAAS,QAAQ,EAAE,IAAI,UAAU,CAAC;CAC7D,IAAI,CAAC,WAAW,QAAQ,UAAU,cAAc,OAAO,MAAM,IAAI,MAAM,sCAAsC;CAE7G,OAAO;EACL,kBAAkB,QAAQ;EAC1B,uBAAuB,QAAQ;EAC/B,QAAQ;GACN,OAAO,QAAQ;GACf,QAAQ,cAAc;GACtB,iBAAiB,oBAAoB,QAAQ,YAAY,UAAU,QAAQ,SAAS;EACtF;CACF;AACF"}
+{"version":3,"file":"credential-policy.js","names":[],"sources":["../../src/session/credential-policy.ts"],"sourcesContent":["import { resolveAuthenticatedCredentialTenant } from '@mastra/code-sdk/agents/credential-resolver';\nimport type { CredentialTenant } from '@mastra/code-sdk/agents/credential-resolver';\nimport type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\n\nimport { UUID_PATTERN } from '../routes/contracts.js';\nimport { effectiveModelScope } from '../storage/domains/projects/base.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SourceControlSessionLookup } from './factory-session.js';\n\nconst FACTORY_PROJECT_ID = new RegExp(UUID_PATTERN);\n\ninterface FactoryModelPolicyDependencies {\n  projects: Pick<FactoryProjectsStorage, 'getById'>;\n  sourceControl: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n  workItems: Pick<WorkItemsStorage, 'findRunBindingByThread'>;\n}\n\n/** Resolve billing authority from authenticated identity and durable bindings, never session state. */\nexport async function resolveFactoryCredentialTenant(\n  requestContext: RequestContext,\n  deps: FactoryModelPolicyDependencies,\n): Promise<CredentialTenant | undefined> {\n  return (await resolveFactoryModelPolicy(requestContext, deps))?.tenant;\n}\n\n/** Shared invocation and model-picker policy; no client-supplied owner or scope is trusted. */\nexport async function resolveFactoryModelPolicy(\n  requestContext: RequestContext,\n  deps: FactoryModelPolicyDependencies,\n): Promise<{ tenant: CredentialTenant; factoryProjectId?: string; factoryDefaultModelId?: string | null } | undefined> {\n  const principal = resolveAuthenticatedCredentialTenant(requestContext);\n  if (!principal) return undefined;\n  const controller = requestContext.get('controller') as AgentControllerRequestContext | undefined;\n  if (!controller?.sessionId || !controller.resourceId) return { tenant: principal };\n  const { sessionId, resourceId } = controller;\n\n  const sourceSession = await deps.sourceControl.getBySessionId(sessionId);\n  const binding =\n    principal.orgId && controller.threadId\n      ? await deps.workItems.findRunBindingByThread({\n          orgId: principal.orgId,\n          resourceId,\n          sessionId,\n          threadId: controller.threadId,\n          rejectAmbiguous: true,\n        })\n      : null;\n  if (!sourceSession) {\n    if (!binding && (resourceId === principal.userId || resourceId.startsWith('channel:')))\n      return { tenant: principal };\n    // Session-less Factory pages address the Factory itself: session and resource are both the\n    // project id. A run session under its Factory's resource whose row is gone is not a page.\n    const factoryProject =\n      !binding && sessionId === resourceId && FACTORY_PROJECT_ID.test(resourceId)\n        ? await deps.projects.getById({ id: resourceId })\n        : null;\n    if (factoryProject && factoryProject.orgId === principal.orgId) {\n      return {\n        factoryProjectId: factoryProject.id,\n        factoryDefaultModelId: factoryProject.defaultModelId,\n        tenant: { ...principal, credentialScope: effectiveModelScope(factoryProject.modelScope, 'session') },\n      };\n    }\n    throw new Error('Factory session ownership is unavailable.');\n  }\n  if (\n    sourceSession.orgId !== principal.orgId ||\n    (sourceSession.visibility === 'private' && sourceSession.userId !== principal.userId)\n  ) {\n    throw new Error('Factory session is not available to the current user.');\n  }\n  if (!sourceSession.factoryProjectId) throw new Error('Factory session ownership is unavailable.');\n  const projectId = binding?.factoryProjectId ?? sourceSession.factoryProjectId;\n  const project = await deps.projects.getById({ id: projectId });\n  if (!project || project.orgId !== sourceSession.orgId) throw new Error('Factory model policy is unavailable.');\n  // Work-item threads keep their billing scope after revocation; history never restores run authority.\n  return {\n    factoryProjectId: project.id,\n    factoryDefaultModelId: project.defaultModelId,\n    tenant: {\n      orgId: project.orgId,\n      userId: sourceSession.userId,\n      credentialScope: effectiveModelScope(project.modelScope, binding ? 'run' : 'session'),\n    },\n  };\n}\n"],"mappings":";;;;AAWA,MAAM,qBAAqB,IAAI,OAAO,YAAY;;AASlD,eAAsB,+BACpB,gBACA,MACuC;CACvC,QAAQ,MAAM,0BAA0B,gBAAgB,IAAI,EAAA,EAAI;AAClE;;AAGA,eAAsB,0BACpB,gBACA,MACqH;CACrH,MAAM,YAAY,qCAAqC,cAAc;CACrE,IAAI,CAAC,WAAW,OAAO,KAAA;CACvB,MAAM,aAAa,eAAe,IAAI,YAAY;CAClD,IAAI,CAAC,YAAY,aAAa,CAAC,WAAW,YAAY,OAAO,EAAE,QAAQ,UAAU;CACjF,MAAM,EAAE,WAAW,eAAe;CAElC,MAAM,gBAAgB,MAAM,KAAK,cAAc,eAAe,SAAS;CACvE,MAAM,UACJ,UAAU,SAAS,WAAW,WAC1B,MAAM,KAAK,UAAU,uBAAuB;EAC1C,OAAO,UAAU;EACjB;EACA;EACA,UAAU,WAAW;EACrB,iBAAiB;CACnB,CAAC,IACD;CACN,IAAI,CAAC,eAAe;EAClB,IAAI,CAAC,YAAY,eAAe,UAAU,UAAU,WAAW,WAAW,UAAU,IAClF,OAAO,EAAE,QAAQ,UAAU;EAG7B,MAAM,iBACJ,CAAC,WAAW,cAAc,cAAc,mBAAmB,KAAK,UAAU,IACtE,MAAM,KAAK,SAAS,QAAQ,EAAE,IAAI,WAAW,CAAC,IAC9C;EACN,IAAI,kBAAkB,eAAe,UAAU,UAAU,OACvD,OAAO;GACL,kBAAkB,eAAe;GACjC,uBAAuB,eAAe;GACtC,QAAQ;IAAE,GAAG;IAAW,iBAAiB,oBAAoB,eAAe,YAAY,SAAS;GAAE;EACrG;EAEF,MAAM,IAAI,MAAM,2CAA2C;CAC7D;CACA,IACE,cAAc,UAAU,UAAU,SACjC,cAAc,eAAe,aAAa,cAAc,WAAW,UAAU,QAE9E,MAAM,IAAI,MAAM,uDAAuD;CAEzE,IAAI,CAAC,cAAc,kBAAkB,MAAM,IAAI,MAAM,2CAA2C;CAChG,MAAM,YAAY,SAAS,oBAAoB,cAAc;CAC7D,MAAM,UAAU,MAAM,KAAK,SAAS,QAAQ,EAAE,IAAI,UAAU,CAAC;CAC7D,IAAI,CAAC,WAAW,QAAQ,UAAU,cAAc,OAAO,MAAM,IAAI,MAAM,sCAAsC;CAE7G,OAAO;EACL,kBAAkB,QAAQ;EAC1B,uBAAuB,QAAQ;EAC/B,QAAQ;GACN,OAAO,QAAQ;GACf,QAAQ,cAAc;GACtB,iBAAiB,oBAAoB,QAAQ,YAAY,UAAU,QAAQ,SAAS;EACtF;CACF;AACF"}

package/dist/session/default-model-hydration.d.ts

@@ -17,6 +17,7 @@ export interface DefaultModelApplicableSession {
 }
 export interface DefaultModelHydrationSession extends DefaultModelApplicableSession {
     readonly identity: {
+        getId(): string;
         getResourceId(): string;
     };
     model: DefaultModelApplicableSession['model'] & {

package/dist/session/default-model-hydration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-model-hydration.d.ts","sourceRoot":"","sources":["../../src/session/default-model-hydration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEtF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE;QAAE,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;IACrD,SAAS,EAAE;QAAE,KAAK,EAAE;YAAE,GAAG,CAAC,IAAI,EAAE;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;CAC/F;AAED,MAAM,WAAW,4BAA6B,SAAQ,6BAA6B;IACjF,QAAQ,CAAC,QAAQ,EAAE;QAAE,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAC/C,KAAK,EAAE,6BAA6B,CAAC,OAAO,CAAC,GAAG;QAAE,GAAG,IAAI,MAAM,CAAC;QAAC,UAAU,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;KAAE,CAAC;IAC/G,KAAK,EAAE;QACL,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;QAC3C,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;IACF,MAAM,EAAE;QACN,KAAK,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QACnC,gBAAgB,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAChE,CAAC;CACH;AAUD,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;IAClE,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAClD,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAC5D,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;CAClD;AAED,0FAA0F;AAC1F,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,4BAA4B,EACrC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,iCAAiC,GACvF,OAAO,CAAC,IAAI,CAAC,CA8Ef"}
+{"version":3,"file":"default-model-hydration.d.ts","sourceRoot":"","sources":["../../src/session/default-model-hydration.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AAEtF,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAEvE,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE;QAAE,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE,CAAC;IACrD,SAAS,EAAE;QAAE,KAAK,EAAE;YAAE,GAAG,CAAC,IAAI,EAAE;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,SAAS,EAAE,MAAM,CAAA;aAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CAAC;CAC/F;AAED,MAAM,WAAW,4BAA6B,SAAQ,6BAA6B;IACjF,QAAQ,CAAC,QAAQ,EAAE;QAAE,KAAK,IAAI,MAAM,CAAC;QAAC,aAAa,IAAI,MAAM,CAAA;KAAE,CAAC;IAChE,KAAK,EAAE,6BAA6B,CAAC,OAAO,CAAC,GAAG;QAAE,GAAG,IAAI,MAAM,CAAC;QAAC,UAAU,CAAC,IAAI,EAAE;YAAE,OAAO,EAAE,MAAM,CAAA;SAAE,GAAG,IAAI,CAAA;KAAE,CAAC;IAC/G,KAAK,EAAE;QACL,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CAAC;QAC3C,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KACzD,CAAC;IACF,MAAM,EAAE;QACN,KAAK,IAAI,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;QACnC,gBAAgB,CAAC,IAAI,EAAE;YAAE,QAAQ,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;KAChE,CAAC;CACH;AAUD,MAAM,WAAW,iCAAiC;IAChD,aAAa,EAAE,IAAI,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;IAClE,QAAQ,EAAE,IAAI,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAClD,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,wBAAwB,CAAC,CAAC;IAC5D,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;CAClD;AAED,0FAA0F;AAC1F,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,4BAA4B,EACrC,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,EAAE,iCAAiC,GACvF,OAAO,CAAC,IAAI,CAAC,CA+Ef"}

package/dist/session/default-model-hydration.js

@@ -14,6 +14,7 @@ async function applyDefaultModel(session, modelId) {
 }
 /** Seed a new chat's scoped default model; a chat with a user message keeps its model. */
 async function hydrateSessionDefaultModel(session, { sourceControl, projects, workItems, modelDefaults }) {
+	const sessionId = session.identity.getId();
 	const resourceId = session.identity.getResourceId();
 	const initialState = session.state.get() ?? {};
 	if (initialState.factoryProjectId || typeof session.thread.firstUserMessage !== "function") return;
@@ -29,7 +30,7 @@ async function hydrateSessionDefaultModel(session, { sourceControl, projects, wo
 	});
 	let identityResolved = false;
 	try {
-		const sourceSession = await sourceControl.getBySessionId(resourceId);
+		const sourceSession = await sourceControl.getBySessionId(sessionId);
 		if (!sourceSession) {
 			await clearFactoryIdentity();
 			return;
@@ -43,7 +44,7 @@ async function hydrateSessionDefaultModel(session, { sourceControl, projects, wo
 			orgId: sourceSession.orgId,
 			threadId,
 			resourceId,
-			sessionId: resourceId,
+			sessionId,
 			rejectAmbiguous: true
 		}) : null;
 		const project = await projects.getById({ id: binding?.factoryProjectId ?? sourceSession.factoryProjectId });

package/dist/session/default-model-hydration.js.map

@@ -1 +1 @@
-{"version":3,"file":"default-model-hydration.js","names":[],"sources":["../../src/session/default-model-hydration.ts"],"sourcesContent":["import { primeTenantCredentialsForTenant, resolveTenantProviderDefaultModel } from '../routes/tenant-credentials.js';\nimport type { ModelDefaultsStorage } from '../storage/domains/model-defaults/base.js';\nimport { effectiveModelScope } from '../storage/domains/projects/base.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SourceControlSessionLookup } from './factory-session.js';\n\nexport interface DefaultModelApplicableSession {\n  model: { switch(modelId: string): Promise<unknown> };\n  subagents: { model: { set(args: { modelId: string; agentType: string }): Promise<unknown> } };\n}\n\nexport interface DefaultModelHydrationSession extends DefaultModelApplicableSession {\n  readonly identity: { getResourceId(): string };\n  model: DefaultModelApplicableSession['model'] & { get(): string; setDefault(args: { modelId: string }): void };\n  state: {\n    get(): Record<string, unknown> | undefined;\n    set(updates: Record<string, unknown>): Promise<unknown>;\n  };\n  thread: {\n    getId(): string | null | undefined;\n    firstUserMessage(args: { threadId: string }): Promise<unknown>;\n  };\n}\n\nasync function applyDefaultModel(session: DefaultModelApplicableSession, modelId: string): Promise<void> {\n  await session.model.switch(modelId);\n\n  for (const agentType of ['explore', 'plan', 'execute']) {\n    await session.subagents.model.set({ modelId, agentType });\n  }\n}\n\nexport interface DefaultModelHydrationDependencies {\n  sourceControl: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n  projects: Pick<FactoryProjectsStorage, 'getById'>;\n  workItems: Pick<WorkItemsStorage, 'findRunBindingByThread'>;\n  modelDefaults: Pick<ModelDefaultsStorage, 'get'>;\n}\n\n/** Seed a new chat's scoped default model; a chat with a user message keeps its model. */\nexport async function hydrateSessionDefaultModel(\n  session: DefaultModelHydrationSession,\n  { sourceControl, projects, workItems, modelDefaults }: DefaultModelHydrationDependencies,\n): Promise<void> {\n  const resourceId = session.identity.getResourceId();\n  const initialState = session.state.get() ?? {};\n  if (initialState.factoryProjectId || typeof session.thread.firstUserMessage !== 'function') return;\n  const hadFactoryIdentity = initialState.factoryModelScope === 'factory' || initialState.factoryModelScope === 'user';\n  const clearFactoryIdentity = () =>\n    session.state.set({ factoryOrgId: undefined, factoryModelScope: undefined, factoryOwnerUserId: undefined });\n  const failClosedWithoutIdentity = () =>\n    session.state.set({ factoryModelScope: 'user', factoryOwnerUserId: undefined });\n  let identityResolved = false;\n  try {\n    const sourceSession = await sourceControl.getBySessionId(resourceId);\n    if (!sourceSession) {\n      await clearFactoryIdentity();\n      return;\n    }\n    if (!sourceSession.factoryProjectId) {\n      await clearFactoryIdentity();\n      return;\n    }\n    // Historical thread membership keeps completed work items on Factory billing in hybrid scope.\n    const threadId = session.thread.getId();\n    const binding = threadId\n      ? await workItems.findRunBindingByThread({\n          orgId: sourceSession.orgId,\n          threadId,\n          resourceId,\n          sessionId: resourceId,\n          rejectAmbiguous: true,\n        })\n      : null;\n    const project = await projects.getById({ id: binding?.factoryProjectId ?? sourceSession.factoryProjectId });\n    if (!project || project.orgId !== sourceSession.orgId) {\n      await clearFactoryIdentity();\n      return;\n    }\n    const modelScope = effectiveModelScope(project.modelScope, binding ? 'run' : 'session');\n    await session.state.set({\n      factoryOrgId: sourceSession.orgId,\n      factoryModelScope: modelScope,\n      factoryOwnerUserId: sourceSession.userId,\n    });\n    identityResolved = true;\n    await primeTenantCredentialsForTenant({\n      orgId: sourceSession.orgId,\n      userId: sourceSession.userId,\n      credentialScope: modelScope,\n    });\n\n    if (binding) return;\n    if (threadId && (await session.thread.firstUserMessage({ threadId }))) return;\n\n    const scopedModelId =\n      (modelScope === 'factory'\n        ? project.defaultModelId\n        : (await modelDefaults.get({ orgId: sourceSession.orgId, userId: sourceSession.userId }))?.modelId) ??\n      // No chosen default: a connected provider's default, unless the current model is usable.\n      (await resolveTenantProviderDefaultModel(\n        { orgId: sourceSession.orgId, userId: sourceSession.userId, credentialScope: modelScope },\n        session.model.get() || undefined,\n      ).catch(error => {\n        console.warn('[Factory default-model hydration] Unable to resolve a provider default model.', error);\n        return undefined;\n      }));\n    if (!scopedModelId) return;\n    // A thread the session creates later (the UI binding its conventional\n    // thread after a thread-agnostic request opened the session) starts from\n    // the session default, not from the thread hydrated here.\n    session.model.setDefault({ modelId: scopedModelId });\n    await applyDefaultModel(session, scopedModelId);\n  } catch (error) {\n    if (!identityResolved && !hadFactoryIdentity) {\n      try {\n        await failClosedWithoutIdentity();\n      } catch {}\n    }\n    console.warn('[Factory default-model hydration] Unable to apply the scoped default model.', error);\n  }\n}\n"],"mappings":";;;AAyBA,eAAe,kBAAkB,SAAwC,SAAgC;CACvG,MAAM,QAAQ,MAAM,OAAO,OAAO;CAElC,KAAK,MAAM,aAAa;EAAC;EAAW;EAAQ;CAAS,GACnD,MAAM,QAAQ,UAAU,MAAM,IAAI;EAAE;EAAS;CAAU,CAAC;AAE5D;;AAUA,eAAsB,2BACpB,SACA,EAAE,eAAe,UAAU,WAAW,iBACvB;CACf,MAAM,aAAa,QAAQ,SAAS,cAAc;CAClD,MAAM,eAAe,QAAQ,MAAM,IAAI,KAAK,CAAC;CAC7C,IAAI,aAAa,oBAAoB,OAAO,QAAQ,OAAO,qBAAqB,YAAY;CAC5F,MAAM,qBAAqB,aAAa,sBAAsB,aAAa,aAAa,sBAAsB;CAC9G,MAAM,6BACJ,QAAQ,MAAM,IAAI;EAAE,cAAc,KAAA;EAAW,mBAAmB,KAAA;EAAW,oBAAoB,KAAA;CAAU,CAAC;CAC5G,MAAM,kCACJ,QAAQ,MAAM,IAAI;EAAE,mBAAmB;EAAQ,oBAAoB,KAAA;CAAU,CAAC;CAChF,IAAI,mBAAmB;CACvB,IAAI;EACF,MAAM,gBAAgB,MAAM,cAAc,eAAe,UAAU;EACnE,IAAI,CAAC,eAAe;GAClB,MAAM,qBAAqB;GAC3B;EACF;EACA,IAAI,CAAC,cAAc,kBAAkB;GACnC,MAAM,qBAAqB;GAC3B;EACF;EAEA,MAAM,WAAW,QAAQ,OAAO,MAAM;EACtC,MAAM,UAAU,WACZ,MAAM,UAAU,uBAAuB;GACrC,OAAO,cAAc;GACrB;GACA;GACA,WAAW;GACX,iBAAiB;EACnB,CAAC,IACD;EACJ,MAAM,UAAU,MAAM,SAAS,QAAQ,EAAE,IAAI,SAAS,oBAAoB,cAAc,iBAAiB,CAAC;EAC1G,IAAI,CAAC,WAAW,QAAQ,UAAU,cAAc,OAAO;GACrD,MAAM,qBAAqB;GAC3B;EACF;EACA,MAAM,aAAa,oBAAoB,QAAQ,YAAY,UAAU,QAAQ,SAAS;EACtF,MAAM,QAAQ,MAAM,IAAI;GACtB,cAAc,cAAc;GAC5B,mBAAmB;GACnB,oBAAoB,cAAc;EACpC,CAAC;EACD,mBAAmB;EACnB,MAAM,gCAAgC;GACpC,OAAO,cAAc;GACrB,QAAQ,cAAc;GACtB,iBAAiB;EACnB,CAAC;EAED,IAAI,SAAS;EACb,IAAI,YAAa,MAAM,QAAQ,OAAO,iBAAiB,EAAE,SAAS,CAAC,GAAI;EAEvE,MAAM,iBACH,eAAe,YACZ,QAAQ,kBACP,MAAM,cAAc,IAAI;GAAE,OAAO,cAAc;GAAO,QAAQ,cAAc;EAAO,CAAC,EAAA,EAAI,YAE5F,MAAM,kCACL;GAAE,OAAO,cAAc;GAAO,QAAQ,cAAc;GAAQ,iBAAiB;EAAW,GACxF,QAAQ,MAAM,IAAI,KAAK,KAAA,CACzB,CAAC,CAAC,OAAM,UAAS;GACf,QAAQ,KAAK,iFAAiF,KAAK;EAErG,CAAC;EACH,IAAI,CAAC,eAAe;EAIpB,QAAQ,MAAM,WAAW,EAAE,SAAS,cAAc,CAAC;EACnD,MAAM,kBAAkB,SAAS,aAAa;CAChD,SAAS,OAAO;EACd,IAAI,CAAC,oBAAoB,CAAC,oBACxB,IAAI;GACF,MAAM,0BAA0B;EAClC,QAAQ,CAAC;EAEX,QAAQ,KAAK,+EAA+E,KAAK;CACnG;AACF"}
+{"version":3,"file":"default-model-hydration.js","names":[],"sources":["../../src/session/default-model-hydration.ts"],"sourcesContent":["import { primeTenantCredentialsForTenant, resolveTenantProviderDefaultModel } from '../routes/tenant-credentials.js';\nimport type { ModelDefaultsStorage } from '../storage/domains/model-defaults/base.js';\nimport { effectiveModelScope } from '../storage/domains/projects/base.js';\nimport type { FactoryProjectsStorage } from '../storage/domains/projects/base.js';\nimport type { WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SourceControlSessionLookup } from './factory-session.js';\n\nexport interface DefaultModelApplicableSession {\n  model: { switch(modelId: string): Promise<unknown> };\n  subagents: { model: { set(args: { modelId: string; agentType: string }): Promise<unknown> } };\n}\n\nexport interface DefaultModelHydrationSession extends DefaultModelApplicableSession {\n  readonly identity: { getId(): string; getResourceId(): string };\n  model: DefaultModelApplicableSession['model'] & { get(): string; setDefault(args: { modelId: string }): void };\n  state: {\n    get(): Record<string, unknown> | undefined;\n    set(updates: Record<string, unknown>): Promise<unknown>;\n  };\n  thread: {\n    getId(): string | null | undefined;\n    firstUserMessage(args: { threadId: string }): Promise<unknown>;\n  };\n}\n\nasync function applyDefaultModel(session: DefaultModelApplicableSession, modelId: string): Promise<void> {\n  await session.model.switch(modelId);\n\n  for (const agentType of ['explore', 'plan', 'execute']) {\n    await session.subagents.model.set({ modelId, agentType });\n  }\n}\n\nexport interface DefaultModelHydrationDependencies {\n  sourceControl: Pick<SourceControlSessionLookup, 'getBySessionId'>;\n  projects: Pick<FactoryProjectsStorage, 'getById'>;\n  workItems: Pick<WorkItemsStorage, 'findRunBindingByThread'>;\n  modelDefaults: Pick<ModelDefaultsStorage, 'get'>;\n}\n\n/** Seed a new chat's scoped default model; a chat with a user message keeps its model. */\nexport async function hydrateSessionDefaultModel(\n  session: DefaultModelHydrationSession,\n  { sourceControl, projects, workItems, modelDefaults }: DefaultModelHydrationDependencies,\n): Promise<void> {\n  const sessionId = session.identity.getId();\n  const resourceId = session.identity.getResourceId();\n  const initialState = session.state.get() ?? {};\n  if (initialState.factoryProjectId || typeof session.thread.firstUserMessage !== 'function') return;\n  const hadFactoryIdentity = initialState.factoryModelScope === 'factory' || initialState.factoryModelScope === 'user';\n  const clearFactoryIdentity = () =>\n    session.state.set({ factoryOrgId: undefined, factoryModelScope: undefined, factoryOwnerUserId: undefined });\n  const failClosedWithoutIdentity = () =>\n    session.state.set({ factoryModelScope: 'user', factoryOwnerUserId: undefined });\n  let identityResolved = false;\n  try {\n    const sourceSession = await sourceControl.getBySessionId(sessionId);\n    if (!sourceSession) {\n      await clearFactoryIdentity();\n      return;\n    }\n    if (!sourceSession.factoryProjectId) {\n      await clearFactoryIdentity();\n      return;\n    }\n    // Historical thread membership keeps completed work items on Factory billing in hybrid scope.\n    const threadId = session.thread.getId();\n    const binding = threadId\n      ? await workItems.findRunBindingByThread({\n          orgId: sourceSession.orgId,\n          threadId,\n          resourceId,\n          sessionId,\n          rejectAmbiguous: true,\n        })\n      : null;\n    const project = await projects.getById({ id: binding?.factoryProjectId ?? sourceSession.factoryProjectId });\n    if (!project || project.orgId !== sourceSession.orgId) {\n      await clearFactoryIdentity();\n      return;\n    }\n    const modelScope = effectiveModelScope(project.modelScope, binding ? 'run' : 'session');\n    await session.state.set({\n      factoryOrgId: sourceSession.orgId,\n      factoryModelScope: modelScope,\n      factoryOwnerUserId: sourceSession.userId,\n    });\n    identityResolved = true;\n    await primeTenantCredentialsForTenant({\n      orgId: sourceSession.orgId,\n      userId: sourceSession.userId,\n      credentialScope: modelScope,\n    });\n\n    if (binding) return;\n    if (threadId && (await session.thread.firstUserMessage({ threadId }))) return;\n\n    const scopedModelId =\n      (modelScope === 'factory'\n        ? project.defaultModelId\n        : (await modelDefaults.get({ orgId: sourceSession.orgId, userId: sourceSession.userId }))?.modelId) ??\n      // No chosen default: a connected provider's default, unless the current model is usable.\n      (await resolveTenantProviderDefaultModel(\n        { orgId: sourceSession.orgId, userId: sourceSession.userId, credentialScope: modelScope },\n        session.model.get() || undefined,\n      ).catch(error => {\n        console.warn('[Factory default-model hydration] Unable to resolve a provider default model.', error);\n        return undefined;\n      }));\n    if (!scopedModelId) return;\n    // A thread the session creates later (the UI binding its conventional\n    // thread after a thread-agnostic request opened the session) starts from\n    // the session default, not from the thread hydrated here.\n    session.model.setDefault({ modelId: scopedModelId });\n    await applyDefaultModel(session, scopedModelId);\n  } catch (error) {\n    if (!identityResolved && !hadFactoryIdentity) {\n      try {\n        await failClosedWithoutIdentity();\n      } catch {}\n    }\n    console.warn('[Factory default-model hydration] Unable to apply the scoped default model.', error);\n  }\n}\n"],"mappings":";;;AAyBA,eAAe,kBAAkB,SAAwC,SAAgC;CACvG,MAAM,QAAQ,MAAM,OAAO,OAAO;CAElC,KAAK,MAAM,aAAa;EAAC;EAAW;EAAQ;CAAS,GACnD,MAAM,QAAQ,UAAU,MAAM,IAAI;EAAE;EAAS;CAAU,CAAC;AAE5D;;AAUA,eAAsB,2BACpB,SACA,EAAE,eAAe,UAAU,WAAW,iBACvB;CACf,MAAM,YAAY,QAAQ,SAAS,MAAM;CACzC,MAAM,aAAa,QAAQ,SAAS,cAAc;CAClD,MAAM,eAAe,QAAQ,MAAM,IAAI,KAAK,CAAC;CAC7C,IAAI,aAAa,oBAAoB,OAAO,QAAQ,OAAO,qBAAqB,YAAY;CAC5F,MAAM,qBAAqB,aAAa,sBAAsB,aAAa,aAAa,sBAAsB;CAC9G,MAAM,6BACJ,QAAQ,MAAM,IAAI;EAAE,cAAc,KAAA;EAAW,mBAAmB,KAAA;EAAW,oBAAoB,KAAA;CAAU,CAAC;CAC5G,MAAM,kCACJ,QAAQ,MAAM,IAAI;EAAE,mBAAmB;EAAQ,oBAAoB,KAAA;CAAU,CAAC;CAChF,IAAI,mBAAmB;CACvB,IAAI;EACF,MAAM,gBAAgB,MAAM,cAAc,eAAe,SAAS;EAClE,IAAI,CAAC,eAAe;GAClB,MAAM,qBAAqB;GAC3B;EACF;EACA,IAAI,CAAC,cAAc,kBAAkB;GACnC,MAAM,qBAAqB;GAC3B;EACF;EAEA,MAAM,WAAW,QAAQ,OAAO,MAAM;EACtC,MAAM,UAAU,WACZ,MAAM,UAAU,uBAAuB;GACrC,OAAO,cAAc;GACrB;GACA;GACA;GACA,iBAAiB;EACnB,CAAC,IACD;EACJ,MAAM,UAAU,MAAM,SAAS,QAAQ,EAAE,IAAI,SAAS,oBAAoB,cAAc,iBAAiB,CAAC;EAC1G,IAAI,CAAC,WAAW,QAAQ,UAAU,cAAc,OAAO;GACrD,MAAM,qBAAqB;GAC3B;EACF;EACA,MAAM,aAAa,oBAAoB,QAAQ,YAAY,UAAU,QAAQ,SAAS;EACtF,MAAM,QAAQ,MAAM,IAAI;GACtB,cAAc,cAAc;GAC5B,mBAAmB;GACnB,oBAAoB,cAAc;EACpC,CAAC;EACD,mBAAmB;EACnB,MAAM,gCAAgC;GACpC,OAAO,cAAc;GACrB,QAAQ,cAAc;GACtB,iBAAiB;EACnB,CAAC;EAED,IAAI,SAAS;EACb,IAAI,YAAa,MAAM,QAAQ,OAAO,iBAAiB,EAAE,SAAS,CAAC,GAAI;EAEvE,MAAM,iBACH,eAAe,YACZ,QAAQ,kBACP,MAAM,cAAc,IAAI;GAAE,OAAO,cAAc;GAAO,QAAQ,cAAc;EAAO,CAAC,EAAA,EAAI,YAE5F,MAAM,kCACL;GAAE,OAAO,cAAc;GAAO,QAAQ,cAAc;GAAQ,iBAAiB;EAAW,GACxF,QAAQ,MAAM,IAAI,KAAK,KAAA,CACzB,CAAC,CAAC,OAAM,UAAS;GACf,QAAQ,KAAK,iFAAiF,KAAK;EAErG,CAAC;EACH,IAAI,CAAC,eAAe;EAIpB,QAAQ,MAAM,WAAW,EAAE,SAAS,cAAc,CAAC;EACnD,MAAM,kBAAkB,SAAS,aAAa;CAChD,SAAS,OAAO;EACd,IAAI,CAAC,oBAAoB,CAAC,oBACxB,IAAI;GACF,MAAM,0BAA0B;EAClC,QAAQ,CAAC;EAEX,QAAQ,KAAK,+EAA+E,KAAK;CACnG;AACF"}

package/dist/session/environment-state-processor.js

@@ -60,7 +60,7 @@ function escapeText(value) {
 function sessionIdFromContext(requestContext) {
 	if (!requestContext || typeof requestContext.get !== "function") return null;
 	const controller = requestContext.get("controller");
-	return typeof controller?.resourceId === "string" && controller.resourceId ? controller.resourceId : null;
+	return typeof controller?.sessionId === "string" && controller.sessionId ? controller.sessionId : null;
 }
 function environmentCacheKey(state) {
 	return `environment:${createHash("sha256").update(JSON.stringify(state)).digest("hex").slice(0, 16)}`;