@mastra/factory 0.17.3-alpha.5 → 0.18.0-alpha.10

package/dist/supervisor/session-messaging.d.ts

@@ -1,4 +1,7 @@
 import type { RequestContext } from '@mastra/core/request-context';
+export type WorkerMessageResult = void | {
+    status: 'interrupted';
+};
 type WorkerSession = {
     sendMessage(input: {
         content: string;
@@ -18,6 +21,6 @@ export declare function messageWorkerSession({ controller, sessionId, message, d
     message: string;
     delivery: 'send' | 'queue';
     requestContext?: RequestContext;
-}): Promise<void>;
+}): Promise<WorkerMessageResult>;
 export {};
 //# sourceMappingURL=session-messaging.d.ts.map

package/dist/supervisor/session-messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-messaging.d.ts","sourceRoot":"","sources":["../../src/supervisor/session-messaging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,KAAK,aAAa,GAAG;IACnB,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,YAAY,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7F,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC7E,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,EACR,cAAc,GACf,EAAE;IACD,UAAU,EAAE,uBAAuB,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,GAAG,OAAO,CAAC,IAAI,CAAC,CAUhB"}
+{"version":3,"file":"session-messaging.d.ts","sourceRoot":"","sources":["../../src/supervisor/session-messaging.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,MAAM,MAAM,mBAAmB,GAAG,IAAI,GAAG;IAAE,MAAM,EAAE,aAAa,CAAA;CAAE,CAAC;AAEnE,KAAK,aAAa,GAAG;IACnB,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,YAAY,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC7F,CAAC;AAEF,KAAK,uBAAuB,GAAG;IAC7B,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,SAAS,CAAC,CAAC;CAC7E,CAAC;AAEF,wBAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,SAAS,EACT,OAAO,EACP,QAAQ,EACR,cAAc,GACf,EAAE;IACD,UAAU,EAAE,uBAAuB,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAC;CACjC,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAe/B"}

package/dist/supervisor/session-messaging.js

@@ -1,3 +1,4 @@
+import { isSessionStartupCancelledError } from "@mastra/core/agent-controller";
 //#region src/supervisor/session-messaging.ts
 async function messageWorkerSession({ controller, sessionId, message, delivery, requestContext }) {
 	const session = await controller.getSessionByResource(sessionId);
@@ -6,8 +7,13 @@ async function messageWorkerSession({ controller, sessionId, message, delivery,
 		content: message,
 		...requestContext ? { requestContext } : {}
 	};
-	if (delivery === "queue") await session.queueMessage(input);
-	else await session.sendMessage(input);
+	try {
+		if (delivery === "queue") await session.queueMessage(input);
+		else await session.sendMessage(input);
+	} catch (error) {
+		if (isSessionStartupCancelledError(error)) return { status: "interrupted" };
+		throw error;
+	}
 }
 //#endregion
 export { messageWorkerSession };

package/dist/supervisor/session-messaging.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-messaging.js","names":[],"sources":["../../src/supervisor/session-messaging.ts"],"sourcesContent":["import type { RequestContext } from '@mastra/core/request-context';\n\ntype WorkerSession = {\n  sendMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n  queueMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n};\n\ntype WorkerSessionController = {\n  getSessionByResource(sessionId: string): Promise<WorkerSession | undefined>;\n};\n\nexport async function messageWorkerSession({\n  controller,\n  sessionId,\n  message,\n  delivery,\n  requestContext,\n}: {\n  controller: WorkerSessionController;\n  sessionId: string;\n  message: string;\n  delivery: 'send' | 'queue';\n  requestContext?: RequestContext;\n}): Promise<void> {\n  const session = await controller.getSessionByResource(sessionId);\n  if (!session) throw new Error('The worker session is not currently available.');\n\n  const input = { content: message, ...(requestContext ? { requestContext } : {}) };\n  if (delivery === 'queue') {\n    await session.queueMessage(input);\n  } else {\n    await session.sendMessage(input);\n  }\n}\n"],"mappings":";AAWA,eAAsB,qBAAqB,EACzC,YACA,WACA,SACA,UACA,kBAOgB;CAChB,MAAM,UAAU,MAAM,WAAW,qBAAqB,SAAS;CAC/D,IAAI,CAAC,SAAS,MAAM,IAAI,MAAM,gDAAgD;CAE9E,MAAM,QAAQ;EAAE,SAAS;EAAS,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;CAAG;CAChF,IAAI,aAAa,SACf,MAAM,QAAQ,aAAa,KAAK;MAEhC,MAAM,QAAQ,YAAY,KAAK;AAEnC"}
+{"version":3,"file":"session-messaging.js","names":[],"sources":["../../src/supervisor/session-messaging.ts"],"sourcesContent":["import { isSessionStartupCancelledError } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\n\nexport type WorkerMessageResult = void | { status: 'interrupted' };\n\ntype WorkerSession = {\n  sendMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n  queueMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n};\n\ntype WorkerSessionController = {\n  getSessionByResource(sessionId: string): Promise<WorkerSession | undefined>;\n};\n\nexport async function messageWorkerSession({\n  controller,\n  sessionId,\n  message,\n  delivery,\n  requestContext,\n}: {\n  controller: WorkerSessionController;\n  sessionId: string;\n  message: string;\n  delivery: 'send' | 'queue';\n  requestContext?: RequestContext;\n}): Promise<WorkerMessageResult> {\n  const session = await controller.getSessionByResource(sessionId);\n  if (!session) throw new Error('The worker session is not currently available.');\n\n  const input = { content: message, ...(requestContext ? { requestContext } : {}) };\n  try {\n    if (delivery === 'queue') {\n      await session.queueMessage(input);\n    } else {\n      await session.sendMessage(input);\n    }\n  } catch (error) {\n    if (isSessionStartupCancelledError(error)) return { status: 'interrupted' };\n    throw error;\n  }\n}\n"],"mappings":";;AAcA,eAAsB,qBAAqB,EACzC,YACA,WACA,SACA,UACA,kBAO+B;CAC/B,MAAM,UAAU,MAAM,WAAW,qBAAqB,SAAS;CAC/D,IAAI,CAAC,SAAS,MAAM,IAAI,MAAM,gDAAgD;CAE9E,MAAM,QAAQ;EAAE,SAAS;EAAS,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;CAAG;CAChF,IAAI;EACF,IAAI,aAAa,SACf,MAAM,QAAQ,aAAa,KAAK;OAEhC,MAAM,QAAQ,YAAY,KAAK;CAEnC,SAAS,OAAO;EACd,IAAI,+BAA+B,KAAK,GAAG,OAAO,EAAE,QAAQ,cAAc;EAC1E,MAAM;CACR;AACF"}

package/dist/supervisor/write-tools.d.ts

@@ -3,6 +3,7 @@ import type { FactoryTransitionService } from '../rules/transition-service.js';
 import type { AuditRecorder } from '../storage/domains/audit/domain.js';
 import type { WorkItemRow, WorkItemsStorage } from '../storage/domains/work-items/base.js';
 import type { SupervisorScope } from './read-tools.js';
+import type { WorkerMessageResult } from './session-messaging.js';
 interface SupervisorWriteDependencies {
     scope: SupervisorScope;
     userId: string;
@@ -19,7 +20,7 @@ interface SupervisorWriteDependencies {
         message: string;
         userId: string;
         delivery: 'send' | 'queue';
-    }) => Promise<unknown>;
+    }) => Promise<WorkerMessageResult>;
     now?: () => Date;
 }
 export declare function createFactorySupervisorWriteTools(deps: SupervisorWriteDependencies): IntegrationTools;

package/dist/supervisor/write-tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"write-tools.d.ts","sourceRoot":"","sources":["../../src/supervisor/write-tools.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,UAAU,2BAA2B;IACnC,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC;IACrB,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,yBAAyB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;KAC5B,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACvB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,2BAA2B,GAAG,gBAAgB,CAkMrG"}
+{"version":3,"file":"write-tools.d.ts","sourceRoot":"","sources":["../../src/supervisor/write-tools.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC3F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAElE,UAAU,2BAA2B;IACnC,KAAK,EAAE,eAAe,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,gBAAgB,CAAC;IAC5B,KAAK,EAAE,aAAa,CAAC;IACrB,iBAAiB,EAAE,wBAAwB,CAAC;IAC5C,yBAAyB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,WAAW,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrH,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE;QACvB,SAAS,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC;KAC5B,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IACnC,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,2BAA2B,GAAG,gBAAgB,CA4MrG"}

package/dist/supervisor/write-tools.js

@@ -186,12 +186,19 @@ function createFactorySupervisorWriteTools(deps) {
 				if (!deps.messageSession) throw new Error("Worker session messaging is unavailable.");
 				const binding = (await deps.workItems.listRunBindings(deps.scope.orgId, deps.scope.factoryProjectId)).find((row) => row.sessionId === sessionId);
 				if (!binding) throw new Error("The session does not belong to this factory.");
-				await deps.messageSession({
+				if ((await deps.messageSession({
 					sessionId,
 					message,
 					userId: deps.userId,
 					delivery
-				});
+				}))?.status === "interrupted") return {
+					sessionId,
+					delivered: false,
+					status: "interrupted",
+					delivery,
+					workItemId: binding.workItemId,
+					role: binding.role
+				};
 				await audit("factory.agent.signaled", {
 					type: "factory_session",
 					id: sessionId

package/dist/supervisor/write-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"write-tools.js","names":[],"sources":["../../src/supervisor/write-tools.ts"],"sourcesContent":["import { createTool } from '@mastra/core/tools';\nimport { z } from 'zod';\n\nimport { boardForWorkItem } from '../boards/index.js';\nimport type { IntegrationTools } from '../integrations/base.js';\nimport type { FactoryTransitionService } from '../rules/transition-service.js';\nimport { BOARD_IDENTIFIER_RE, MAX_BOARD_IDENTIFIER_LENGTH } from '../rules/validation.js';\nimport type { AuditAction } from '../storage/domains/audit/actions.js';\nimport type { AuditRecorder } from '../storage/domains/audit/domain.js';\nimport type { WorkItemRow, WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SupervisorScope } from './read-tools.js';\n\ninterface SupervisorWriteDependencies {\n  scope: SupervisorScope;\n  userId: string;\n  workItems: WorkItemsStorage;\n  audit: AuditRecorder;\n  transitionService: FactoryTransitionService;\n  reconcileAcceptanceLabels?: (input: { orgId: string; factoryProjectId: string; item: WorkItemRow }) => Promise<void>;\n  messageSession?: (input: {\n    sessionId: string;\n    message: string;\n    userId: string;\n    delivery: 'send' | 'queue';\n  }) => Promise<unknown>;\n  now?: () => Date;\n}\n\nexport function createFactorySupervisorWriteTools(deps: SupervisorWriteDependencies): IntegrationTools {\n  const now = deps.now ?? (() => new Date());\n  const audit = async (\n    action: AuditAction,\n    target: { type: string; id: string },\n    metadata: Record<string, unknown> = {},\n  ) =>\n    deps.audit.record({\n      orgId: deps.scope.orgId,\n      actorId: deps.userId,\n      actorType: 'human',\n      action,\n      targets: [target],\n      factoryProjectId: deps.scope.factoryProjectId,\n      metadata: { ...metadata, cause: 'supervisor' },\n      occurredAt: now(),\n    });\n\n  return {\n    factory_retry_decision: createTool({\n      id: 'factory_retry_decision',\n      description: 'Retry one failed Factory decision after the person confirms the repair.',\n      inputSchema: z.object({ decisionId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ decisionId }) => {\n        const decision = await deps.workItems.retryDeferredDecision(\n          deps.scope.orgId,\n          deps.scope.factoryProjectId,\n          decisionId,\n          now(),\n        );\n        if (!decision) throw new Error('The decision is not failed, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.run.retry',\n          { type: 'rule_decision', id: decisionId },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_dismiss_decision: createTool({\n      id: 'factory_dismiss_decision',\n      description: 'Dismiss one parked Factory proposal after the person confirms it is no longer wanted.',\n      inputSchema: z.object({ decisionId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ decisionId }) => {\n        const decision = await deps.workItems.dismissDeferredDecision(\n          deps.scope.orgId,\n          deps.scope.factoryProjectId,\n          decisionId,\n          now(),\n        );\n        if (!decision)\n          throw new Error('The decision is not proposed, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.run.dismissed',\n          { type: 'rule_decision', id: decisionId },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_resolve_proposal: createTool({\n      id: 'factory_resolve_proposal',\n      description: 'Approve or dismiss one proposed Factory decision after the person confirms the choice.',\n      inputSchema: z.object({ decisionId: z.string().min(1), resolution: z.enum(['approve', 'dismiss']) }),\n      requireApproval: true,\n      execute: async ({ decisionId, resolution }) => {\n        const decision =\n          resolution === 'approve'\n            ? await deps.workItems.approveDeferredDecision(\n                deps.scope.orgId,\n                deps.scope.factoryProjectId,\n                decisionId,\n                now(),\n                deps.userId,\n              )\n            : await deps.workItems.dismissDeferredDecision(\n                deps.scope.orgId,\n                deps.scope.factoryProjectId,\n                decisionId,\n                now(),\n              );\n        if (!decision) throw new Error('The proposal is no longer open or belongs to another factory.');\n        await audit(\n          resolution === 'approve' ? 'factory.run.approved' : 'factory.run.dismissed',\n          {\n            type: 'rule_decision',\n            id: decisionId,\n          },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, resolution, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_transition_work_item: createTool({\n      id: 'factory_transition_work_item',\n      description: 'Move or accept one Factory work item after the person confirms the destination stage.',\n      inputSchema: z.object({\n        workItemId: z.string().min(1),\n        stage: z.string().max(MAX_BOARD_IDENTIFIER_LENGTH).regex(BOARD_IDENTIFIER_RE),\n      }),\n      requireApproval: true,\n      execute: async ({ workItemId, stage }) => {\n        const item = await deps.workItems.get({ orgId: deps.scope.orgId, id: workItemId });\n        if (!item || item.factoryProjectId !== deps.scope.factoryProjectId) throw new Error('Work item not found.');\n        const from = item.stages.length === 1 ? item.stages[0] : undefined;\n        if (!from) throw new Error('The work item does not have one valid Factory stage.');\n        const result = await deps.transitionService.transition({\n          orgId: deps.scope.orgId,\n          factoryProjectId: deps.scope.factoryProjectId,\n          workItemId,\n          board: boardForWorkItem(item),\n          stage,\n          expectedRevision: item.revision,\n          actor: { type: 'human', id: deps.userId },\n          ingress: { type: 'human', identity: `supervisor:${deps.userId}:${workItemId}:${item.revision}:${stage}` },\n          cause: 'supervisor',\n        });\n        if (result.status !== 'accepted') {\n          throw new Error(`The transition was rejected (${result.code}): ${result.reason}`);\n        }\n        return result;\n      },\n    }),\n    factory_reconcile_labels: createTool({\n      id: 'factory_reconcile_labels',\n      description: 'Reconcile stale acceptance labels for one accepted work item after the person confirms the repair.',\n      inputSchema: z.object({ workItemId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ workItemId }) => {\n        if (!deps.reconcileAcceptanceLabels) throw new Error('Acceptance-label reconciliation is unavailable.');\n        const item = await deps.workItems.get({ orgId: deps.scope.orgId, id: workItemId });\n        if (!item || item.factoryProjectId !== deps.scope.factoryProjectId) throw new Error('Work item not found.');\n        if (!item.acceptedAt) throw new Error('The work item has not been accepted.');\n        await deps.reconcileAcceptanceLabels({ ...deps.scope, item });\n        await audit('factory.work_item.labels_reconciled', { type: 'work_item', id: workItemId });\n        return { workItemId, reconciled: true };\n      },\n    }),\n    factory_revoke_binding: createTool({\n      id: 'factory_revoke_binding',\n      description: 'Revoke an orphaned or stale run binding after a health finding and person confirmation.',\n      inputSchema: z.object({ bindingId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ bindingId }) => {\n        const binding = await deps.workItems.revokeRunBinding({\n          orgId: deps.scope.orgId,\n          factoryProjectId: deps.scope.factoryProjectId,\n          bindingId,\n          revokedAt: now(),\n        });\n        if (!binding) throw new Error('The binding is not active, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.intake.binding_updated',\n          { type: 'run_binding', id: bindingId },\n          {\n            workItemId: binding.workItemId,\n            role: binding.role,\n            status: 'revoked',\n          },\n        );\n        return { bindingId, status: binding.status, workItemId: binding.workItemId, role: binding.role };\n      },\n    }),\n    factory_signal_session: createTool({\n      id: 'factory_signal_session',\n      description:\n        'Send bounded guidance to a worker session after the person confirms the exact message. Use queue only when the guidance should wait for the current run to finish.',\n      inputSchema: z.object({\n        sessionId: z.string().min(1),\n        message: z.string().trim().min(1).max(2000),\n        delivery: z.enum(['send', 'queue']).default('send'),\n      }),\n      requireApproval: true,\n      execute: async ({ sessionId, message, delivery }) => {\n        if (!deps.messageSession) throw new Error('Worker session messaging is unavailable.');\n        const bindings = await deps.workItems.listRunBindings(deps.scope.orgId, deps.scope.factoryProjectId);\n        const binding = bindings.find(row => row.sessionId === sessionId);\n        if (!binding) throw new Error('The session does not belong to this factory.');\n        await deps.messageSession({ sessionId, message, userId: deps.userId, delivery });\n        await audit(\n          'factory.agent.signaled',\n          { type: 'factory_session', id: sessionId },\n          {\n            workItemId: binding.workItemId,\n            role: binding.role,\n            delivery,\n          },\n        );\n        return { sessionId, delivered: true, delivery, workItemId: binding.workItemId, role: binding.role };\n      },\n    }),\n  };\n}\n"],"mappings":"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"}
+{"version":3,"file":"write-tools.js","names":[],"sources":["../../src/supervisor/write-tools.ts"],"sourcesContent":["import { createTool } from '@mastra/core/tools';\nimport { z } from 'zod';\n\nimport { boardForWorkItem } from '../boards/index.js';\nimport type { IntegrationTools } from '../integrations/base.js';\nimport type { FactoryTransitionService } from '../rules/transition-service.js';\nimport { BOARD_IDENTIFIER_RE, MAX_BOARD_IDENTIFIER_LENGTH } from '../rules/validation.js';\nimport type { AuditAction } from '../storage/domains/audit/actions.js';\nimport type { AuditRecorder } from '../storage/domains/audit/domain.js';\nimport type { WorkItemRow, WorkItemsStorage } from '../storage/domains/work-items/base.js';\nimport type { SupervisorScope } from './read-tools.js';\nimport type { WorkerMessageResult } from './session-messaging.js';\n\ninterface SupervisorWriteDependencies {\n  scope: SupervisorScope;\n  userId: string;\n  workItems: WorkItemsStorage;\n  audit: AuditRecorder;\n  transitionService: FactoryTransitionService;\n  reconcileAcceptanceLabels?: (input: { orgId: string; factoryProjectId: string; item: WorkItemRow }) => Promise<void>;\n  messageSession?: (input: {\n    sessionId: string;\n    message: string;\n    userId: string;\n    delivery: 'send' | 'queue';\n  }) => Promise<WorkerMessageResult>;\n  now?: () => Date;\n}\n\nexport function createFactorySupervisorWriteTools(deps: SupervisorWriteDependencies): IntegrationTools {\n  const now = deps.now ?? (() => new Date());\n  const audit = async (\n    action: AuditAction,\n    target: { type: string; id: string },\n    metadata: Record<string, unknown> = {},\n  ) =>\n    deps.audit.record({\n      orgId: deps.scope.orgId,\n      actorId: deps.userId,\n      actorType: 'human',\n      action,\n      targets: [target],\n      factoryProjectId: deps.scope.factoryProjectId,\n      metadata: { ...metadata, cause: 'supervisor' },\n      occurredAt: now(),\n    });\n\n  return {\n    factory_retry_decision: createTool({\n      id: 'factory_retry_decision',\n      description: 'Retry one failed Factory decision after the person confirms the repair.',\n      inputSchema: z.object({ decisionId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ decisionId }) => {\n        const decision = await deps.workItems.retryDeferredDecision(\n          deps.scope.orgId,\n          deps.scope.factoryProjectId,\n          decisionId,\n          now(),\n        );\n        if (!decision) throw new Error('The decision is not failed, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.run.retry',\n          { type: 'rule_decision', id: decisionId },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_dismiss_decision: createTool({\n      id: 'factory_dismiss_decision',\n      description: 'Dismiss one parked Factory proposal after the person confirms it is no longer wanted.',\n      inputSchema: z.object({ decisionId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ decisionId }) => {\n        const decision = await deps.workItems.dismissDeferredDecision(\n          deps.scope.orgId,\n          deps.scope.factoryProjectId,\n          decisionId,\n          now(),\n        );\n        if (!decision)\n          throw new Error('The decision is not proposed, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.run.dismissed',\n          { type: 'rule_decision', id: decisionId },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_resolve_proposal: createTool({\n      id: 'factory_resolve_proposal',\n      description: 'Approve or dismiss one proposed Factory decision after the person confirms the choice.',\n      inputSchema: z.object({ decisionId: z.string().min(1), resolution: z.enum(['approve', 'dismiss']) }),\n      requireApproval: true,\n      execute: async ({ decisionId, resolution }) => {\n        const decision =\n          resolution === 'approve'\n            ? await deps.workItems.approveDeferredDecision(\n                deps.scope.orgId,\n                deps.scope.factoryProjectId,\n                decisionId,\n                now(),\n                deps.userId,\n              )\n            : await deps.workItems.dismissDeferredDecision(\n                deps.scope.orgId,\n                deps.scope.factoryProjectId,\n                decisionId,\n                now(),\n              );\n        if (!decision) throw new Error('The proposal is no longer open or belongs to another factory.');\n        await audit(\n          resolution === 'approve' ? 'factory.run.approved' : 'factory.run.dismissed',\n          {\n            type: 'rule_decision',\n            id: decisionId,\n          },\n          { workItemId: decision.workItemId },\n        );\n        return { decisionId, resolution, status: decision.status, workItemId: decision.workItemId };\n      },\n    }),\n    factory_transition_work_item: createTool({\n      id: 'factory_transition_work_item',\n      description: 'Move or accept one Factory work item after the person confirms the destination stage.',\n      inputSchema: z.object({\n        workItemId: z.string().min(1),\n        stage: z.string().max(MAX_BOARD_IDENTIFIER_LENGTH).regex(BOARD_IDENTIFIER_RE),\n      }),\n      requireApproval: true,\n      execute: async ({ workItemId, stage }) => {\n        const item = await deps.workItems.get({ orgId: deps.scope.orgId, id: workItemId });\n        if (!item || item.factoryProjectId !== deps.scope.factoryProjectId) throw new Error('Work item not found.');\n        const from = item.stages.length === 1 ? item.stages[0] : undefined;\n        if (!from) throw new Error('The work item does not have one valid Factory stage.');\n        const result = await deps.transitionService.transition({\n          orgId: deps.scope.orgId,\n          factoryProjectId: deps.scope.factoryProjectId,\n          workItemId,\n          board: boardForWorkItem(item),\n          stage,\n          expectedRevision: item.revision,\n          actor: { type: 'human', id: deps.userId },\n          ingress: { type: 'human', identity: `supervisor:${deps.userId}:${workItemId}:${item.revision}:${stage}` },\n          cause: 'supervisor',\n        });\n        if (result.status !== 'accepted') {\n          throw new Error(`The transition was rejected (${result.code}): ${result.reason}`);\n        }\n        return result;\n      },\n    }),\n    factory_reconcile_labels: createTool({\n      id: 'factory_reconcile_labels',\n      description: 'Reconcile stale acceptance labels for one accepted work item after the person confirms the repair.',\n      inputSchema: z.object({ workItemId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ workItemId }) => {\n        if (!deps.reconcileAcceptanceLabels) throw new Error('Acceptance-label reconciliation is unavailable.');\n        const item = await deps.workItems.get({ orgId: deps.scope.orgId, id: workItemId });\n        if (!item || item.factoryProjectId !== deps.scope.factoryProjectId) throw new Error('Work item not found.');\n        if (!item.acceptedAt) throw new Error('The work item has not been accepted.');\n        await deps.reconcileAcceptanceLabels({ ...deps.scope, item });\n        await audit('factory.work_item.labels_reconciled', { type: 'work_item', id: workItemId });\n        return { workItemId, reconciled: true };\n      },\n    }),\n    factory_revoke_binding: createTool({\n      id: 'factory_revoke_binding',\n      description: 'Revoke an orphaned or stale run binding after a health finding and person confirmation.',\n      inputSchema: z.object({ bindingId: z.string().min(1) }),\n      requireApproval: true,\n      execute: async ({ bindingId }) => {\n        const binding = await deps.workItems.revokeRunBinding({\n          orgId: deps.scope.orgId,\n          factoryProjectId: deps.scope.factoryProjectId,\n          bindingId,\n          revokedAt: now(),\n        });\n        if (!binding) throw new Error('The binding is not active, no longer exists, or belongs to another factory.');\n        await audit(\n          'factory.intake.binding_updated',\n          { type: 'run_binding', id: bindingId },\n          {\n            workItemId: binding.workItemId,\n            role: binding.role,\n            status: 'revoked',\n          },\n        );\n        return { bindingId, status: binding.status, workItemId: binding.workItemId, role: binding.role };\n      },\n    }),\n    factory_signal_session: createTool({\n      id: 'factory_signal_session',\n      description:\n        'Send bounded guidance to a worker session after the person confirms the exact message. Use queue only when the guidance should wait for the current run to finish.',\n      inputSchema: z.object({\n        sessionId: z.string().min(1),\n        message: z.string().trim().min(1).max(2000),\n        delivery: z.enum(['send', 'queue']).default('send'),\n      }),\n      requireApproval: true,\n      execute: async ({ sessionId, message, delivery }) => {\n        if (!deps.messageSession) throw new Error('Worker session messaging is unavailable.');\n        const bindings = await deps.workItems.listRunBindings(deps.scope.orgId, deps.scope.factoryProjectId);\n        const binding = bindings.find(row => row.sessionId === sessionId);\n        if (!binding) throw new Error('The session does not belong to this factory.');\n        const result = await deps.messageSession({ sessionId, message, userId: deps.userId, delivery });\n        if (result?.status === 'interrupted') {\n          return {\n            sessionId,\n            delivered: false,\n            status: 'interrupted',\n            delivery,\n            workItemId: binding.workItemId,\n            role: binding.role,\n          };\n        }\n        await audit(\n          'factory.agent.signaled',\n          { type: 'factory_session', id: sessionId },\n          {\n            workItemId: binding.workItemId,\n            role: binding.role,\n            delivery,\n          },\n        );\n        return { sessionId, delivered: true, delivery, workItemId: binding.workItemId, role: binding.role };\n      },\n    }),\n  };\n}\n"],"mappings":"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"}

package/dist/workspace.d.ts

@@ -20,6 +20,12 @@ export declare function resolveLocalFactorySkillsPath(cwd?: string): string | un
 export declare const FACTORY_SKILL_NAMES: Set<string>;
 /** Review skills only sessions with an active review run binding may discover or load. */
 export declare const REVIEW_ONLY_FACTORY_SKILLS: Set<string>;
+/**
+ * Rescan a session's skill cache so a role gained after the cache was built
+ * (a review binding minted after the session's workspace resolved) takes effect.
+ * The source still checks the live binding, so this never widens access.
+ */
+export declare function rescanFactorySkills(skills: NonNullable<Workspace['skills']>): Promise<void>;
 export declare class FactorySkillSource implements SkillSource {
     #private;
     readonly fallback: SkillSource;
@@ -63,7 +69,7 @@ export interface CreateWorkspaceFactoryOptions {
     /** Work-items storage used to resolve the session's run-binding role, so
      * review-board sessions get the reviewer PAT as `GH_TOKEN`. Optional —
      * without it every session uses the default (worker) PAT. */
-    workItems?: Pick<WorkItemsStorage, 'findRunBindingBySession'>;
+    workItems?: Pick<WorkItemsStorage, 'findActiveRunBindingForSession'>;
     /** Projects storage used to authorize workspace-free supervisor sessions. */
     projects?: Pick<FactoryProjectsStorage, 'get'>;
     /** Runtime workspace/token registrations invalidated when a session retires. */

package/dist/workspace.d.ts.map

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

package/dist/workspace.js

@@ -6,7 +6,6 @@ import { registerGithubPatKind, registerGithubTokenInjector } from "./integratio
 import { requireExec } from "./sandbox/materialization.js";
 import { createSessionSetupHook, evictSessionSandbox, getSessionSandbox, hasFailedSetupCommand, recordFailedSetupCommand, resolveSessionWorkdir } from "./sandbox/session-sandbox.js";
 import { DEFAULT_COMMAND_TIMEOUT_MS, SetupCommandError, checkoutSessionBranch, materializeRepo, runSetupCommand, runTeardownCommand } from "./integrations/github/sandbox.js";
-import { getFactorySessionAddress } from "./rules/binding-context.js";
 import { parseSupervisorResourceId } from "./supervisor/session.js";
 import path, { dirname, join } from "path";
 import { LocalSkillSource, Workspace } from "@mastra/core/workspace";
@@ -52,6 +51,22 @@ const REVIEW_ONLY_FACTORY_SKILLS = /* @__PURE__ */ new Set([
 	"factory-rereview",
 	"factory-review"
 ]);
+/**
+* Skill caches rescanned outside the workspace resolver. The resolver records
+* which role each cache was last scanned for; a rescan it did not perform makes
+* that record untrustworthy, so the next reuse must rescan again.
+*/
+const rescannedOutsideResolver = /* @__PURE__ */ new WeakMap();
+/**
+* Rescan a session's skill cache so a role gained after the cache was built
+* (a review binding minted after the session's workspace resolved) takes effect.
+* The source still checks the live binding, so this never widens access.
+*/
+async function rescanFactorySkills(skills) {
+	const pending = skills.refresh();
+	rescannedOutsideResolver.set(skills, pending.catch(() => {}));
+	await pending;
+}
 var FactorySkillSource = class {
 	fallback;
 	isReviewSession;
@@ -225,6 +240,7 @@ function createWorkspaceFactory(options = {}) {
 	const constructedWorkspaces = /* @__PURE__ */ new Map();
 	const skillCacheReviewState = /* @__PURE__ */ new Map();
 	const skillCacheRefreshes = /* @__PURE__ */ new Map();
+	const skillReviewChecks = /* @__PURE__ */ new Map();
 	return async ({ requestContext, mastra, skillExtension }) => {
 		const ctx = requestContext.get("controller");
 		const supervisorProjectId = parseSupervisorResourceId(ctx?.resourceId);
@@ -273,16 +289,16 @@ function createWorkspaceFactory(options = {}) {
 			await guardedSetup(args);
 			if (workspaceRegistry.generation(session.sessionId) !== workspaceGeneration) throw retiredError();
 			const target = requireExec(args.sandbox);
-			const publishStartSideEffects = () => {
-				storage.sessions.setSandbox({
+			const publishStartSideEffects = async () => {
+				await storage.sessions.setSandbox({
 					id: session.id,
-					sandboxId: target.id,
+					sandboxId: target.sandboxId ?? target.id,
 					sandboxWorkdir: sessionEntry.workdir ?? ""
-				}).catch(() => {});
+				});
 				constructedWorkspaces.get(workspaceId)?.skills?.refresh().catch(() => {});
 			};
 			if (!githubProvider) {
-				publishStartSideEffects();
+				await publishStartSideEffects();
 				return;
 			}
 			const existingRegistration = githubTokenInjectors.get(workspaceId);
@@ -296,7 +312,7 @@ function createWorkspaceFactory(options = {}) {
 					existingRegistration.ghToken = freshToken;
 				};
 				existingRegistration.inject(existingRegistration.ghToken);
-				publishStartSideEffects();
+				await publishStartSideEffects();
 				return;
 			}
 			const patKind = await resolveGithubPatKind("default");
@@ -321,11 +337,12 @@ function createWorkspaceFactory(options = {}) {
 			};
 			githubTokenInjectors.set(workspaceId, tokenRegistration);
 			registerGithubTokenContext(tokenRegistration);
-			publishStartSideEffects();
+			await publishStartSideEffects();
 		};
 		const constructSessionEntry = () => getSessionSandbox(session.id, repoFullName, () => {
 			const sandbox = createSessionSandboxInstance({
 				sessionId: session.id,
+				sandboxId: session.sandboxId ?? void 0,
 				repoFullName,
 				setupCommand: projectRepository.setupCommand ?? void 0,
 				getRepositoryAccess: () => sourceControl.versionControl.getRepositoryAccess({
@@ -357,19 +374,28 @@ function createWorkspaceFactory(options = {}) {
 			projectPath: workdir,
 			projectName: repoFullName
 		});
+		const findSessionBinding = async () => {
+			const binding = await workItems.findActiveRunBindingForSession({
+				orgId: session.orgId,
+				factoryProjectId: connection.factoryProjectId,
+				sessionId: session.sessionId
+			});
+			if (!binding || !ctx?.threadId) return binding;
+			return binding.threadId === ctx.threadId && binding.resourceId === ctx.resourceId ? binding : null;
+		};
 		const isReviewSession = async () => {
 			if (!workItems) return false;
 			try {
-				const address = getFactorySessionAddress(requestContext);
-				return isActiveReviewBinding(address ? await workItems.findRunBindingBySession(address) : null, session.orgId);
+				return isActiveReviewBinding(await findSessionBinding(), session.orgId);
 			} catch {
 				return false;
 			}
 		};
-		const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(isReviewSession);
+		const effectiveSkillExtension = skillExtension ?? createFactorySkillExtension(() => (skillReviewChecks.get(workspaceId) ?? isReviewSession)());
 		const extensionId = effectiveSkillExtension ? `-${effectiveSkillExtension.id}` : "";
 		const workspaceId = `${WORKSPACE_ID_PREFIX}-${projectRepository.id}-${session.id}${extensionId}`;
 		const workspaceGeneration = workspaceRegistry.generation(session.sessionId);
+		if (!skillExtension) skillReviewChecks.set(workspaceId, isReviewSession);
 		const configDir = DEFAULT_CONFIG_DIR;
 		const getRepositoryAccess = () => sourceControl.versionControl.getRepositoryAccess({
 			orgId: session.orgId,
@@ -383,8 +409,7 @@ function createWorkspaceFactory(options = {}) {
 		const resolveGithubPatKind = async (fallback) => {
 			if (!workItems) return "default";
 			try {
-				const address = getFactorySessionAddress(requestContext);
-				return isActiveReviewBinding(address ? await workItems.findRunBindingBySession(address) : null, session.orgId) ? "reviewer" : "default";
+				return isActiveReviewBinding(await findSessionBinding(), session.orgId) ? "reviewer" : "default";
 			} catch {
 				return fallback;
 			}
@@ -464,6 +489,15 @@ function createWorkspaceFactory(options = {}) {
 		if (existing) {
 			existing.setToolsConfig(MASTRACODE_WORKSPACE_TOOLS);
 			if (!skillExtension) {
+				const consumeOutsideRescan = async () => {
+					const outside = existing.skills && rescannedOutsideResolver.get(existing.skills);
+					if (!outside) return false;
+					await outside;
+					if (rescannedOutsideResolver.get(existing.skills) === outside) rescannedOutsideResolver.delete(existing.skills);
+					skillCacheReviewState.delete(workspaceId);
+					return true;
+				};
+				await consumeOutsideRescan();
 				let isReview = await isReviewSession();
 				for (;;) {
 					const inFlight = skillCacheRefreshes.get(workspaceId);
@@ -472,6 +506,10 @@ function createWorkspaceFactory(options = {}) {
 						isReview = await isReviewSession();
 						continue;
 					}
+					if (await consumeOutsideRescan()) {
+						isReview = await isReviewSession();
+						continue;
+					}
 					if (skillCacheReviewState.get(workspaceId) === isReview) break;
 					const target = isReview;
 					const pending = (async () => {
@@ -582,6 +620,7 @@ function createWorkspaceFactory(options = {}) {
 			githubTokenInjectors.delete(workspaceId);
 			constructedWorkspaces.delete(workspaceId);
 			skillCacheReviewState.delete(workspaceId);
+			skillReviewChecks.delete(workspaceId);
 			evictSessionSandbox(session.id);
 			await mastra?.removeWorkspace?.(workspaceId);
 		})) throw new Error(`Factory session ${session.sessionId} was retired during workspace materialization`);
@@ -590,6 +629,6 @@ function createWorkspaceFactory(options = {}) {
 	};
 }
 //#endregion
-export { BUNDLED_FACTORY_SKILLS_PATH, FACTORY_SKILL_NAMES, FactorySkillSource, FactoryWorkspaceRegistry, REVIEW_ONLY_FACTORY_SKILLS, createWorkspaceFactory, resolveLocalFactorySkillsPath };
+export { BUNDLED_FACTORY_SKILLS_PATH, FACTORY_SKILL_NAMES, FactorySkillSource, FactoryWorkspaceRegistry, REVIEW_ONLY_FACTORY_SKILLS, createWorkspaceFactory, rescanFactorySkills, resolveLocalFactorySkillsPath };
 
 //# sourceMappingURL=workspace.js.map