@mastra/factory 0.15.1-alpha.0 → 0.16.0-alpha.11

package/dist/session/source-control-tools.js

@@ -0,0 +1,464 @@
+import { getFactoryAuthOrgId, getFactoryAuthUserFromContext, getFactoryAuthUserId } from "../auth.js";
+import { mergeRequestNumberFromBranch } from "../work-item-branch.js";
+import { resolveSessionWorkdir } from "../sandbox/session-sandbox.js";
+import { pushRepositoryBranch, refreshMergeRequestCheckout } from "../integrations/github/sandbox.js";
+import { createTool } from "@mastra/core/tools";
+import { z } from "zod";
+//#region src/session/source-control-tools.ts
+function authIdentity(requestContext) {
+	const user = getFactoryAuthUserFromContext(requestContext);
+	return {
+		orgId: getFactoryAuthOrgId(user),
+		userId: getFactoryAuthUserId(user)
+	};
+}
+async function resolveSessionTarget(requestContext, providers) {
+	const context = requestContext.get("controller");
+	const { orgId, userId } = authIdentity(requestContext);
+	if (!context?.resourceId || !orgId || !userId) throw new Error("Source-control tools require an authenticated repository session.");
+	const matches = (await Promise.all(providers.map(async (provider) => ({
+		provider,
+		session: await provider.storage.sessions.getBySessionId(context.resourceId)
+	})))).filter((match) => match.session !== null);
+	if (matches.length !== 1) throw new Error(matches.length === 0 ? "The active session is not backed by a source-control repository." : "The active session is ambiguous across source-control providers.");
+	const { provider, session } = matches[0];
+	if (session.orgId !== orgId || session.visibility === "private" && session.userId !== userId) throw new Error("The active source-control session is not available to the authenticated user.");
+	const projectRepository = await provider.storage.projectRepositories.get({
+		orgId,
+		id: session.projectRepositoryId
+	});
+	if (!projectRepository) throw new Error("The active project repository was not found.");
+	const state = context.getState();
+	if (state.projectRepositoryId && state.projectRepositoryId !== projectRepository.id) throw new Error("The active source-control session does not match its controller repository.");
+	const connection = await provider.storage.connections.get({
+		orgId,
+		id: projectRepository.connectionId
+	});
+	if (!connection) throw new Error("The active source-control connection was not found.");
+	if (state.factoryProjectId && state.factoryProjectId !== connection.factoryProjectId) throw new Error("The active source-control session does not match its Factory project.");
+	const repository = await provider.storage.repositories.get({
+		orgId,
+		id: projectRepository.repositoryId
+	});
+	if (!repository) throw new Error("The active source-control repository was not found.");
+	return {
+		context,
+		provider,
+		session,
+		projectRepository,
+		repository,
+		orgId,
+		userId
+	};
+}
+function changeRequestId(value) {
+	return String(value);
+}
+function executableSandbox(value) {
+	const sandbox = value;
+	if (!sandbox?.executeCommand) throw new Error("The active Factory workspace has no executable sandbox.");
+	return sandbox;
+}
+async function emitAgentAudit(audit, requestContext, input) {
+	try {
+		await audit.emitAgent({
+			requestContext,
+			input
+		});
+	} catch (error) {
+		console.warn("[Audit] Failed to record brokered source-control action", {
+			action: input.action,
+			error: error instanceof Error ? error.message : String(error)
+		});
+	}
+}
+const changeRequestSchema = z.object({ changeRequestId: z.union([z.string().trim().min(1), z.number().int().positive()]) });
+function createSourceControlTools({ requestContext, providers, audit }) {
+	if (!requestContext || typeof requestContext.get !== "function") return {};
+	const controller = requestContext.get("controller");
+	const identity = authIdentity(requestContext);
+	if (!controller?.resourceId || !identity.orgId || !identity.userId || providers.length === 0) return {};
+	const withTarget = () => resolveSessionTarget(requestContext, providers);
+	const reference = async (target) => ({
+		...await target.provider.versionControl.getRepositoryTarget({
+			orgId: target.orgId,
+			repositoryId: target.repository.id
+		}),
+		actingUserId: target.userId
+	});
+	return {
+		source_control_refresh_change_request_checkout: createTool({
+			id: "source_control_refresh_change_request_checkout",
+			description: "Refresh the active GitLab review session checkout to its current MR head. The MR, repository, branch, and credential are resolved server-side; no provider credentials enter the agent workspace.",
+			inputSchema: z.object({}),
+			execute: async (_input, { workspace }) => {
+				const target = await withTarget();
+				const mergeRequestNumber = mergeRequestNumberFromBranch(target.session.branch);
+				if (target.provider.id !== "gitlab" || mergeRequestNumber === void 0) throw new Error("Checkout refresh is only available in a bound GitLab merge-request review session.");
+				const ref = await reference(target);
+				const mergeRequest = await target.provider.versionControl.getPullRequest({
+					...ref,
+					pullRequestId: String(mergeRequestNumber)
+				});
+				if (!mergeRequest || mergeRequest.state !== "open" || mergeRequest.merged) throw new Error("The bound GitLab merge request is no longer open.");
+				const sandbox = executableSandbox(workspace?.sandbox);
+				const workdir = await resolveSessionWorkdir(target.session.id, sandbox, target.repository.slug);
+				const access = await target.provider.versionControl.getRepositoryAccess({
+					orgId: target.orgId,
+					repositoryId: target.repository.id
+				});
+				return await refreshMergeRequestCheckout(sandbox, workdir, {
+					branch: target.session.branch,
+					mergeRequestNumber,
+					expectedHeadSha: mergeRequest.headSha,
+					access
+				});
+			}
+		}),
+		source_control_push_branch: createTool({
+			id: "source_control_push_branch",
+			description: "Push the active Factory session branch to its connected source-control provider. Credentials are resolved and scrubbed server-side; this tool takes no token, repository, remote, or branch arguments.",
+			inputSchema: z.object({}),
+			execute: async (_input, { workspace }) => {
+				const target = await withTarget();
+				const sandbox = executableSandbox(workspace?.sandbox);
+				const workdir = await resolveSessionWorkdir(target.session.id, sandbox, target.repository.slug);
+				const access = await target.provider.versionControl.getRepositoryAccess({
+					orgId: target.orgId,
+					repositoryId: target.repository.id
+				});
+				await pushRepositoryBranch(sandbox, workdir, target.session.branch, access, target.repository.slug);
+				await emitAgentAudit(audit, requestContext, {
+					action: "factory.agent.push",
+					targets: [{
+						type: "repository",
+						id: target.repository.slug
+					}],
+					metadata: {
+						branch: target.session.branch,
+						provider: target.provider.id
+					}
+				});
+				return {
+					pushed: true,
+					branch: target.session.branch,
+					repository: target.repository.slug
+				};
+			}
+		}),
+		source_control_get_change_request: createTool({
+			id: "source_control_get_change_request",
+			description: "Read a pull request or merge request in the active Factory repository by its numeric repository-local ID.",
+			inputSchema: changeRequestSchema,
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.getPullRequest({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId)
+				});
+			}
+		}),
+		source_control_list_change_request_reviews: createTool({
+			id: "source_control_list_change_request_reviews",
+			description: "List submitted reviews and approvals on a pull request or merge request in the active repository.",
+			inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.listReviews({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.cursor !== void 0 ? { cursor: input.cursor } : {}
+				});
+			}
+		}),
+		source_control_create_change_request: createTool({
+			id: "source_control_create_change_request",
+			description: "Open a pull request or merge request from the active Factory session branch into its persisted base branch. Push the branch with source_control_push_branch first.",
+			inputSchema: z.object({
+				title: z.string().trim().min(1),
+				body: z.string().optional(),
+				draft: z.boolean().optional()
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				const created = await target.provider.versionControl.createPullRequest({
+					...await reference(target),
+					title: input.title,
+					...input.body !== void 0 ? { body: input.body } : {},
+					baseBranch: target.session.baseBranch,
+					headBranch: target.session.branch,
+					...input.draft !== void 0 ? { draft: input.draft } : {}
+				});
+				await emitAgentAudit(audit, requestContext, {
+					action: "factory.agent.pr_opened",
+					targets: [{
+						type: "pull_request",
+						id: created.url
+					}, {
+						type: "repository",
+						id: target.repository.slug
+					}],
+					metadata: {
+						url: created.url,
+						provider: target.provider.id
+					}
+				});
+				return created;
+			}
+		}),
+		source_control_update_change_request: createTool({
+			id: "source_control_update_change_request",
+			description: "Update the title, body, target branch, or open/closed state of a change request.",
+			inputSchema: changeRequestSchema.extend({
+				title: z.string().trim().min(1).optional(),
+				body: z.string().nullable().optional(),
+				baseBranch: z.string().trim().min(1).optional(),
+				state: z.enum(["open", "closed"]).optional()
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.updatePullRequest({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.title !== void 0 ? { title: input.title } : {},
+					...input.body !== void 0 ? { body: input.body } : {},
+					...input.baseBranch !== void 0 ? { baseBranch: input.baseBranch } : {},
+					...input.state !== void 0 ? { state: input.state } : {}
+				});
+			}
+		}),
+		source_control_comment_change_request: createTool({
+			id: "source_control_comment_change_request",
+			description: "Add a top-level comment to a pull request or merge request in the active repository.",
+			inputSchema: changeRequestSchema.extend({ body: z.string().trim().min(1) }),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.createComment({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					body: input.body
+				});
+			}
+		}),
+		source_control_list_change_request_comments: createTool({
+			id: "source_control_list_change_request_comments",
+			description: "List top-level comments on a pull request or merge request in the active repository.",
+			inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.listComments({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.cursor !== void 0 ? { cursor: input.cursor } : {}
+				});
+			}
+		}),
+		source_control_update_change_request_comment: createTool({
+			id: "source_control_update_change_request_comment",
+			description: "Edit a top-level pull-request or merge-request comment in the active repository.",
+			inputSchema: z.object({
+				commentId: z.string().trim().min(1),
+				body: z.string().trim().min(1)
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.updateComment({
+					...await reference(target),
+					commentId: input.commentId,
+					body: input.body
+				});
+			}
+		}),
+		source_control_delete_change_request_comment: createTool({
+			id: "source_control_delete_change_request_comment",
+			description: "Delete a top-level pull-request or merge-request comment in the active repository.",
+			inputSchema: z.object({ commentId: z.string().trim().min(1) }),
+			execute: async (input) => {
+				const target = await withTarget();
+				await target.provider.versionControl.deleteComment({
+					...await reference(target),
+					commentId: input.commentId
+				});
+				return { deleted: true };
+			}
+		}),
+		source_control_list_diff_comments: createTool({
+			id: "source_control_list_diff_comments",
+			description: "List line-anchored review comments and discussion replies on a pull request or merge request in the active repository.",
+			inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.listReviewComments({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.cursor !== void 0 ? { cursor: input.cursor } : {}
+				});
+			}
+		}),
+		source_control_create_diff_comment: createTool({
+			id: "source_control_create_diff_comment",
+			description: "Create a line-anchored review comment or reply to an existing diff discussion. Use replyToId alone for a reply; otherwise provide commitId, path, line, and side.",
+			inputSchema: z.union([changeRequestSchema.extend({
+				body: z.string().trim().min(1),
+				replyToId: z.string().trim().min(1)
+			}), changeRequestSchema.extend({
+				body: z.string().trim().min(1),
+				commitId: z.string().trim().min(1),
+				path: z.string().trim().min(1),
+				line: z.number().int().positive(),
+				side: z.enum(["left", "right"]),
+				startLine: z.number().int().positive().optional(),
+				startSide: z.enum(["left", "right"]).optional()
+			}).refine((input) => input.startLine === void 0 === (input.startSide === void 0), { message: "startLine and startSide must be provided together." })]),
+			execute: async (input) => {
+				const target = await withTarget();
+				const base = {
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					body: input.body
+				};
+				if ("replyToId" in input) return target.provider.versionControl.createReviewComment({
+					...base,
+					replyToId: input.replyToId
+				});
+				return target.provider.versionControl.createReviewComment({
+					...base,
+					commitId: input.commitId,
+					path: input.path,
+					line: input.line,
+					side: input.side,
+					...input.startLine !== void 0 && input.startSide !== void 0 ? {
+						startLine: input.startLine,
+						startSide: input.startSide
+					} : {}
+				});
+			}
+		}),
+		source_control_update_diff_comment: createTool({
+			id: "source_control_update_diff_comment",
+			description: "Edit a line-anchored review comment or discussion reply in the active repository.",
+			inputSchema: z.object({
+				commentId: z.string().trim().min(1),
+				body: z.string().trim().min(1)
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.updateReviewComment({
+					...await reference(target),
+					commentId: input.commentId,
+					body: input.body
+				});
+			}
+		}),
+		source_control_delete_diff_comment: createTool({
+			id: "source_control_delete_diff_comment",
+			description: "Delete a line-anchored review comment or discussion reply in the active repository.",
+			inputSchema: z.object({ commentId: z.string().trim().min(1) }),
+			execute: async (input) => {
+				const target = await withTarget();
+				await target.provider.versionControl.deleteReviewComment({
+					...await reference(target),
+					commentId: input.commentId
+				});
+				return { deleted: true };
+			}
+		}),
+		source_control_resolve_diff_thread: createTool({
+			id: "source_control_resolve_diff_thread",
+			description: "Resolve or reopen the review thread containing a diff comment. Providers without resolvable threads return an explicit limitation.",
+			inputSchema: z.object({
+				commentId: z.string().trim().min(1),
+				resolved: z.boolean().default(true)
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				const resolveReviewThread = target.provider.versionControl.resolveReviewThread;
+				if (!resolveReviewThread) throw new Error(`${target.provider.id} does not support resolving review threads.`);
+				await resolveReviewThread({
+					...await reference(target),
+					commentId: input.commentId,
+					resolved: input.resolved
+				});
+				return { resolved: input.resolved };
+			}
+		}),
+		source_control_review_change_request: createTool({
+			id: "source_control_review_change_request",
+			description: "Submit an approve, request-changes, or comment review to a change request. Provider limitations are returned explicitly.",
+			inputSchema: changeRequestSchema.extend({
+				event: z.enum([
+					"approve",
+					"request-changes",
+					"comment"
+				]),
+				body: z.string().optional(),
+				commitId: z.string().trim().min(1).optional()
+			}).refine((input) => input.event === "approve" || Boolean(input.body?.trim()), {
+				path: ["body"],
+				message: "request-changes and comment reviews require a body."
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				const base = {
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.commitId !== void 0 ? { commitId: input.commitId } : {}
+				};
+				if (input.event === "approve") return target.provider.versionControl.createReview({
+					...base,
+					event: "approve",
+					...input.body !== void 0 ? { body: input.body } : {}
+				});
+				return target.provider.versionControl.createReview({
+					...base,
+					event: input.event,
+					body: input.body
+				});
+			}
+		}),
+		source_control_request_reviewers: createTool({
+			id: "source_control_request_reviewers",
+			description: "Request individual or team reviewers on a pull request or merge request. Provider limitations are returned explicitly.",
+			inputSchema: changeRequestSchema.extend({
+				users: z.array(z.string().trim().min(1)).default([]),
+				teams: z.array(z.string().trim().min(1)).default([])
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.requestReviewers({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					users: input.users,
+					teams: input.teams
+				});
+			}
+		}),
+		source_control_merge_change_request: createTool({
+			id: "source_control_merge_change_request",
+			description: "Merge a pull request or merge request using the requested provider-supported merge method.",
+			inputSchema: changeRequestSchema.extend({
+				method: z.enum([
+					"merge",
+					"squash",
+					"rebase"
+				]).optional(),
+				commitTitle: z.string().optional(),
+				commitMessage: z.string().optional()
+			}),
+			execute: async (input) => {
+				const target = await withTarget();
+				return target.provider.versionControl.mergePullRequest({
+					...await reference(target),
+					pullRequestId: changeRequestId(input.changeRequestId),
+					...input.method !== void 0 ? { method: input.method } : {},
+					...input.commitTitle !== void 0 ? { commitTitle: input.commitTitle } : {},
+					...input.commitMessage !== void 0 ? { commitMessage: input.commitMessage } : {}
+				});
+			}
+		})
+	};
+}
+//#endregion
+export { createSourceControlTools };
+
+//# sourceMappingURL=source-control-tools.js.map

package/dist/session/source-control-tools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"source-control-tools.js","names":[],"sources":["../../src/session/source-control-tools.ts"],"sourcesContent":["import type { AgentControllerRequestContext } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport { createTool } from '@mastra/core/tools';\nimport type { WorkspaceSandbox } from '@mastra/core/workspace';\nimport { z } from 'zod';\n\nimport { getFactoryAuthOrgId, getFactoryAuthUserFromContext, getFactoryAuthUserId } from '../auth.js';\nimport type { VersionControl } from '../capabilities/version-control.js';\nimport type { IntegrationTools } from '../integrations/base.js';\nimport { pushRepositoryBranch, refreshMergeRequestCheckout } from '../integrations/github/sandbox.js';\nimport type { ExecutableSandbox } from '../sandbox/materialization.js';\nimport { resolveSessionWorkdir } from '../sandbox/session-sandbox.js';\nimport type { AuditAgentEmitter } from '../storage/domains/audit/domain.js';\nimport type {\n  ProjectRepository,\n  SourceControlRepository,\n  SourceControlSession,\n  SourceControlStorageHandle,\n} from '../storage/domains/source-control/base.js';\nimport { mergeRequestNumberFromBranch } from '../work-item-branch.js';\n\ntype RepositorySessionState = {\n  factoryProjectId?: string;\n  projectRepositoryId?: string;\n};\n\nexport interface SourceControlToolProvider {\n  id: string;\n  storage: SourceControlStorageHandle;\n  versionControl: VersionControl;\n}\n\ninterface SessionTarget {\n  context: AgentControllerRequestContext<RepositorySessionState>;\n  provider: SourceControlToolProvider;\n  session: SourceControlSession;\n  projectRepository: ProjectRepository;\n  repository: SourceControlRepository;\n  orgId: string;\n  userId: string;\n}\n\nfunction authIdentity(requestContext: RequestContext) {\n  const user = getFactoryAuthUserFromContext(requestContext);\n  return { orgId: getFactoryAuthOrgId(user), userId: getFactoryAuthUserId(user) };\n}\n\nasync function resolveSessionTarget(\n  requestContext: RequestContext,\n  providers: readonly SourceControlToolProvider[],\n): Promise<SessionTarget> {\n  const context = requestContext.get('controller') as AgentControllerRequestContext<RepositorySessionState> | undefined;\n  const { orgId, userId } = authIdentity(requestContext);\n  if (!context?.resourceId || !orgId || !userId) {\n    throw new Error('Source-control tools require an authenticated repository session.');\n  }\n\n  const matches = (\n    await Promise.all(\n      providers.map(async provider => ({\n        provider,\n        session: await provider.storage.sessions.getBySessionId(context.resourceId),\n      })),\n    )\n  ).filter(\n    (match): match is { provider: SourceControlToolProvider; session: SourceControlSession } => match.session !== null,\n  );\n  if (matches.length !== 1) {\n    throw new Error(\n      matches.length === 0\n        ? 'The active session is not backed by a source-control repository.'\n        : 'The active session is ambiguous across source-control providers.',\n    );\n  }\n\n  const { provider, session } = matches[0]!;\n  if (session.orgId !== orgId || (session.visibility === 'private' && session.userId !== userId)) {\n    throw new Error('The active source-control session is not available to the authenticated user.');\n  }\n  const projectRepository = await provider.storage.projectRepositories.get({\n    orgId,\n    id: session.projectRepositoryId,\n  });\n  if (!projectRepository) throw new Error('The active project repository was not found.');\n  const state = context.getState();\n  if (state.projectRepositoryId && state.projectRepositoryId !== projectRepository.id) {\n    throw new Error('The active source-control session does not match its controller repository.');\n  }\n  const connection = await provider.storage.connections.get({ orgId, id: projectRepository.connectionId });\n  if (!connection) throw new Error('The active source-control connection was not found.');\n  if (state.factoryProjectId && state.factoryProjectId !== connection.factoryProjectId) {\n    throw new Error('The active source-control session does not match its Factory project.');\n  }\n  const repository = await provider.storage.repositories.get({ orgId, id: projectRepository.repositoryId });\n  if (!repository) throw new Error('The active source-control repository was not found.');\n  return { context, provider, session, projectRepository, repository, orgId, userId };\n}\n\nfunction changeRequestId(value: string | number): string {\n  return String(value);\n}\n\nfunction executableSandbox(value: unknown): WorkspaceSandbox & ExecutableSandbox {\n  const sandbox = value as Partial<ExecutableSandbox> | undefined;\n  if (!sandbox?.executeCommand) throw new Error('The active Factory workspace has no executable sandbox.');\n  return sandbox as WorkspaceSandbox & ExecutableSandbox;\n}\n\nasync function emitAgentAudit(\n  audit: AuditAgentEmitter,\n  requestContext: RequestContext,\n  input: Parameters<AuditAgentEmitter['emitAgent']>[0]['input'],\n): Promise<void> {\n  try {\n    await audit.emitAgent({ requestContext, input });\n  } catch (error) {\n    console.warn('[Audit] Failed to record brokered source-control action', {\n      action: input.action,\n      error: error instanceof Error ? error.message : String(error),\n    });\n  }\n}\n\nconst changeRequestSchema = z.object({\n  changeRequestId: z.union([z.string().trim().min(1), z.number().int().positive()]),\n});\n\nexport function createSourceControlTools({\n  requestContext,\n  providers,\n  audit,\n}: {\n  requestContext: RequestContext;\n  providers: readonly SourceControlToolProvider[];\n  audit: AuditAgentEmitter;\n}): IntegrationTools {\n  if (!requestContext || typeof (requestContext as { get?: unknown }).get !== 'function') return {};\n  const controller = requestContext.get('controller') as\n    | AgentControllerRequestContext<RepositorySessionState>\n    | undefined;\n  const identity = authIdentity(requestContext);\n  if (!controller?.resourceId || !identity.orgId || !identity.userId || providers.length === 0) return {};\n\n  const withTarget = () => resolveSessionTarget(requestContext, providers);\n  const reference = async (target: SessionTarget) => ({\n    ...(await target.provider.versionControl.getRepositoryTarget({\n      orgId: target.orgId,\n      repositoryId: target.repository.id,\n    })),\n    actingUserId: target.userId,\n  });\n\n  return {\n    source_control_refresh_change_request_checkout: createTool({\n      id: 'source_control_refresh_change_request_checkout',\n      description:\n        'Refresh the active GitLab review session checkout to its current MR head. The MR, repository, branch, and credential are resolved server-side; no provider credentials enter the agent workspace.',\n      inputSchema: z.object({}),\n      execute: async (_input, { workspace }) => {\n        const target = await withTarget();\n        const mergeRequestNumber = mergeRequestNumberFromBranch(target.session.branch);\n        if (target.provider.id !== 'gitlab' || mergeRequestNumber === undefined) {\n          throw new Error('Checkout refresh is only available in a bound GitLab merge-request review session.');\n        }\n        const ref = await reference(target);\n        const mergeRequest = await target.provider.versionControl.getPullRequest({\n          ...ref,\n          pullRequestId: String(mergeRequestNumber),\n        });\n        if (!mergeRequest || mergeRequest.state !== 'open' || mergeRequest.merged) {\n          throw new Error('The bound GitLab merge request is no longer open.');\n        }\n        const sandbox = executableSandbox(workspace?.sandbox);\n        const workdir = await resolveSessionWorkdir(target.session.id, sandbox, target.repository.slug);\n        const access = await target.provider.versionControl.getRepositoryAccess({\n          orgId: target.orgId,\n          repositoryId: target.repository.id,\n        });\n        const result = await refreshMergeRequestCheckout(sandbox, workdir, {\n          branch: target.session.branch,\n          mergeRequestNumber,\n          expectedHeadSha: mergeRequest.headSha,\n          access,\n        });\n        return result;\n      },\n    }),\n    source_control_push_branch: createTool({\n      id: 'source_control_push_branch',\n      description:\n        'Push the active Factory session branch to its connected source-control provider. Credentials are resolved and scrubbed server-side; this tool takes no token, repository, remote, or branch arguments.',\n      inputSchema: z.object({}),\n      execute: async (_input, { workspace }) => {\n        const target = await withTarget();\n        const sandbox = executableSandbox(workspace?.sandbox);\n        const workdir = await resolveSessionWorkdir(target.session.id, sandbox, target.repository.slug);\n        const access = await target.provider.versionControl.getRepositoryAccess({\n          orgId: target.orgId,\n          repositoryId: target.repository.id,\n        });\n        await pushRepositoryBranch(sandbox, workdir, target.session.branch, access, target.repository.slug);\n        await emitAgentAudit(audit, requestContext, {\n          action: 'factory.agent.push',\n          targets: [{ type: 'repository', id: target.repository.slug }],\n          metadata: { branch: target.session.branch, provider: target.provider.id },\n        });\n        return { pushed: true, branch: target.session.branch, repository: target.repository.slug };\n      },\n    }),\n    source_control_get_change_request: createTool({\n      id: 'source_control_get_change_request',\n      description:\n        'Read a pull request or merge request in the active Factory repository by its numeric repository-local ID.',\n      inputSchema: changeRequestSchema,\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.getPullRequest({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n        });\n      },\n    }),\n    source_control_list_change_request_reviews: createTool({\n      id: 'source_control_list_change_request_reviews',\n      description: 'List submitted reviews and approvals on a pull request or merge request in the active repository.',\n      inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.listReviews({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.cursor !== undefined ? { cursor: input.cursor } : {}),\n        });\n      },\n    }),\n    source_control_create_change_request: createTool({\n      id: 'source_control_create_change_request',\n      description:\n        'Open a pull request or merge request from the active Factory session branch into its persisted base branch. Push the branch with source_control_push_branch first.',\n      inputSchema: z.object({\n        title: z.string().trim().min(1),\n        body: z.string().optional(),\n        draft: z.boolean().optional(),\n      }),\n      execute: async input => {\n        const target = await withTarget();\n        const created = await target.provider.versionControl.createPullRequest({\n          ...(await reference(target)),\n          title: input.title,\n          ...(input.body !== undefined ? { body: input.body } : {}),\n          baseBranch: target.session.baseBranch,\n          headBranch: target.session.branch,\n          ...(input.draft !== undefined ? { draft: input.draft } : {}),\n        });\n        await emitAgentAudit(audit, requestContext, {\n          action: 'factory.agent.pr_opened',\n          targets: [\n            { type: 'pull_request', id: created.url },\n            { type: 'repository', id: target.repository.slug },\n          ],\n          metadata: { url: created.url, provider: target.provider.id },\n        });\n        return created;\n      },\n    }),\n    source_control_update_change_request: createTool({\n      id: 'source_control_update_change_request',\n      description: 'Update the title, body, target branch, or open/closed state of a change request.',\n      inputSchema: changeRequestSchema.extend({\n        title: z.string().trim().min(1).optional(),\n        body: z.string().nullable().optional(),\n        baseBranch: z.string().trim().min(1).optional(),\n        state: z.enum(['open', 'closed']).optional(),\n      }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.updatePullRequest({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.title !== undefined ? { title: input.title } : {}),\n          ...(input.body !== undefined ? { body: input.body } : {}),\n          ...(input.baseBranch !== undefined ? { baseBranch: input.baseBranch } : {}),\n          ...(input.state !== undefined ? { state: input.state } : {}),\n        });\n      },\n    }),\n    source_control_comment_change_request: createTool({\n      id: 'source_control_comment_change_request',\n      description: 'Add a top-level comment to a pull request or merge request in the active repository.',\n      inputSchema: changeRequestSchema.extend({ body: z.string().trim().min(1) }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.createComment({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          body: input.body,\n        });\n      },\n    }),\n    source_control_list_change_request_comments: createTool({\n      id: 'source_control_list_change_request_comments',\n      description: 'List top-level comments on a pull request or merge request in the active repository.',\n      inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.listComments({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.cursor !== undefined ? { cursor: input.cursor } : {}),\n        });\n      },\n    }),\n    source_control_update_change_request_comment: createTool({\n      id: 'source_control_update_change_request_comment',\n      description: 'Edit a top-level pull-request or merge-request comment in the active repository.',\n      inputSchema: z.object({ commentId: z.string().trim().min(1), body: z.string().trim().min(1) }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.updateComment({\n          ...(await reference(target)),\n          commentId: input.commentId,\n          body: input.body,\n        });\n      },\n    }),\n    source_control_delete_change_request_comment: createTool({\n      id: 'source_control_delete_change_request_comment',\n      description: 'Delete a top-level pull-request or merge-request comment in the active repository.',\n      inputSchema: z.object({ commentId: z.string().trim().min(1) }),\n      execute: async input => {\n        const target = await withTarget();\n        await target.provider.versionControl.deleteComment({\n          ...(await reference(target)),\n          commentId: input.commentId,\n        });\n        return { deleted: true };\n      },\n    }),\n    source_control_list_diff_comments: createTool({\n      id: 'source_control_list_diff_comments',\n      description:\n        'List line-anchored review comments and discussion replies on a pull request or merge request in the active repository.',\n      inputSchema: changeRequestSchema.extend({ cursor: z.string().trim().min(1).optional() }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.listReviewComments({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.cursor !== undefined ? { cursor: input.cursor } : {}),\n        });\n      },\n    }),\n    source_control_create_diff_comment: createTool({\n      id: 'source_control_create_diff_comment',\n      description:\n        'Create a line-anchored review comment or reply to an existing diff discussion. Use replyToId alone for a reply; otherwise provide commitId, path, line, and side.',\n      inputSchema: z.union([\n        changeRequestSchema.extend({\n          body: z.string().trim().min(1),\n          replyToId: z.string().trim().min(1),\n        }),\n        changeRequestSchema\n          .extend({\n            body: z.string().trim().min(1),\n            commitId: z.string().trim().min(1),\n            path: z.string().trim().min(1),\n            line: z.number().int().positive(),\n            side: z.enum(['left', 'right']),\n            startLine: z.number().int().positive().optional(),\n            startSide: z.enum(['left', 'right']).optional(),\n          })\n          .refine(input => (input.startLine === undefined) === (input.startSide === undefined), {\n            message: 'startLine and startSide must be provided together.',\n          }),\n      ]),\n      execute: async input => {\n        const target = await withTarget();\n        const base = {\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          body: input.body,\n        };\n        if ('replyToId' in input) {\n          return target.provider.versionControl.createReviewComment({ ...base, replyToId: input.replyToId });\n        }\n        return target.provider.versionControl.createReviewComment({\n          ...base,\n          commitId: input.commitId,\n          path: input.path,\n          line: input.line,\n          side: input.side,\n          ...(input.startLine !== undefined && input.startSide !== undefined\n            ? { startLine: input.startLine, startSide: input.startSide }\n            : {}),\n        });\n      },\n    }),\n    source_control_update_diff_comment: createTool({\n      id: 'source_control_update_diff_comment',\n      description: 'Edit a line-anchored review comment or discussion reply in the active repository.',\n      inputSchema: z.object({ commentId: z.string().trim().min(1), body: z.string().trim().min(1) }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.updateReviewComment({\n          ...(await reference(target)),\n          commentId: input.commentId,\n          body: input.body,\n        });\n      },\n    }),\n    source_control_delete_diff_comment: createTool({\n      id: 'source_control_delete_diff_comment',\n      description: 'Delete a line-anchored review comment or discussion reply in the active repository.',\n      inputSchema: z.object({ commentId: z.string().trim().min(1) }),\n      execute: async input => {\n        const target = await withTarget();\n        await target.provider.versionControl.deleteReviewComment({\n          ...(await reference(target)),\n          commentId: input.commentId,\n        });\n        return { deleted: true };\n      },\n    }),\n    source_control_resolve_diff_thread: createTool({\n      id: 'source_control_resolve_diff_thread',\n      description:\n        'Resolve or reopen the review thread containing a diff comment. Providers without resolvable threads return an explicit limitation.',\n      inputSchema: z.object({\n        commentId: z.string().trim().min(1),\n        resolved: z.boolean().default(true),\n      }),\n      execute: async input => {\n        const target = await withTarget();\n        const resolveReviewThread = target.provider.versionControl.resolveReviewThread;\n        if (!resolveReviewThread) {\n          throw new Error(`${target.provider.id} does not support resolving review threads.`);\n        }\n        await resolveReviewThread({\n          ...(await reference(target)),\n          commentId: input.commentId,\n          resolved: input.resolved,\n        });\n        return { resolved: input.resolved };\n      },\n    }),\n    source_control_review_change_request: createTool({\n      id: 'source_control_review_change_request',\n      description:\n        'Submit an approve, request-changes, or comment review to a change request. Provider limitations are returned explicitly.',\n      inputSchema: changeRequestSchema\n        .extend({\n          event: z.enum(['approve', 'request-changes', 'comment']),\n          body: z.string().optional(),\n          commitId: z.string().trim().min(1).optional(),\n        })\n        .refine(input => input.event === 'approve' || Boolean(input.body?.trim()), {\n          path: ['body'],\n          message: 'request-changes and comment reviews require a body.',\n        }),\n      execute: async input => {\n        const target = await withTarget();\n        const base = {\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.commitId !== undefined ? { commitId: input.commitId } : {}),\n        };\n        if (input.event === 'approve') {\n          return target.provider.versionControl.createReview({\n            ...base,\n            event: 'approve',\n            ...(input.body !== undefined ? { body: input.body } : {}),\n          });\n        }\n        return target.provider.versionControl.createReview({ ...base, event: input.event, body: input.body! });\n      },\n    }),\n    source_control_request_reviewers: createTool({\n      id: 'source_control_request_reviewers',\n      description:\n        'Request individual or team reviewers on a pull request or merge request. Provider limitations are returned explicitly.',\n      inputSchema: changeRequestSchema.extend({\n        users: z.array(z.string().trim().min(1)).default([]),\n        teams: z.array(z.string().trim().min(1)).default([]),\n      }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.requestReviewers({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          users: input.users,\n          teams: input.teams,\n        });\n      },\n    }),\n    source_control_merge_change_request: createTool({\n      id: 'source_control_merge_change_request',\n      description: 'Merge a pull request or merge request using the requested provider-supported merge method.',\n      inputSchema: changeRequestSchema.extend({\n        method: z.enum(['merge', 'squash', 'rebase']).optional(),\n        commitTitle: z.string().optional(),\n        commitMessage: z.string().optional(),\n      }),\n      execute: async input => {\n        const target = await withTarget();\n        return target.provider.versionControl.mergePullRequest({\n          ...(await reference(target)),\n          pullRequestId: changeRequestId(input.changeRequestId),\n          ...(input.method !== undefined ? { method: input.method } : {}),\n          ...(input.commitTitle !== undefined ? { commitTitle: input.commitTitle } : {}),\n          ...(input.commitMessage !== undefined ? { commitMessage: input.commitMessage } : {}),\n        });\n      },\n    }),\n  };\n}\n"],"mappings":"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"}

package/dist/skills/service.d.ts

@@ -51,6 +51,18 @@ export declare function resolveSkillInvocation(controller: Pick<AgentController<
     skillName: string;
     message: string;
 }>;
+/**
+ * Same-stage re-entry: the skill is already active in the card's live session.
+ * Resolve a compact continuation that references the skill by name and carries
+ * only the fresh arguments, instead of re-pasting the whole skill document. If
+ * the skill body was compacted out of context, the agent can re-open it with the
+ * skill tool.
+ */
+export declare function resolveSkillResumeInvocation(controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>, input: SkillInvocationInput): Promise<{
+    session: SkillSession;
+    skillName: string;
+    message: string;
+}>;
 export declare function dispatchSkillInvocation(controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>, input: SkillInvocationInput, requestContext?: RequestContext): Promise<{
     skillName: string;
     message: string;

package/dist/skills/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/skills/service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,YAAY;IAC3B,YAAY,IAAI,SAAS,CAAC;IAC1B,WAAW,CAAC,KAAK,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,cAAc,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,sBAAsB,CACpB,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,QAAQ,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,CAAC;QAChD,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,EACD,OAAO,CAAC,EAAE;QACR,QAAQ,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;SAAE,CAAC;QAChD,MAAM,CAAC,EAAE;YAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;SAAE,CAAC;QAC3C,cAAc,CAAC,EAAE,cAAc,CAAC;KACjC,GACA,OAAO,CAAC,IAAI,CAAC,qBAAqB,EAAE,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC;CACnE;AAED,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,QAAQ,CAAC,IAAI,EAAE,mBAAmB,GAAG,iBAAiB,CAAC;gBAE3C,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM;CAKhE;AAMD,4EAA4E;AAC5E,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,sBAAsB,CAAC,EAC1E,KAAK,EAAE;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACnF,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAIrD;AAED,wBAAsB,sBAAsB,CAC1C,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,sBAAsB,CAAC,EAC1E,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC;IAAE,OAAO,EAAE,YAAY,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAkBxE;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,EAAE,sBAAsB,CAAC,EAC1E,KAAK,EAAE,oBAAoB,EAC3B,cAAc,CAAC,EAAE,cAAc,GAC9B,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC,CAIjD"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/skills/service.ts"],"names":[],"mappings":"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"}

package/dist/skills/service.js

@@ -35,6 +35,32 @@ async function resolveSkillInvocation(controller, input) {
 		message: `<skill name="${skill.name}">\n${escapeSkillBoundary(content)}\n</skill>`
 	};
 }
+/**
+* Same-stage re-entry: the skill is already active in the card's live session.
+* Resolve a compact continuation that references the skill by name and carries
+* only the fresh arguments, instead of re-pasting the whole skill document. If
+* the skill body was compacted out of context, the agent can re-open it with the
+* skill tool.
+*/
+async function resolveSkillResumeInvocation(controller, input) {
+	const session = await controller.getSessionByResource(input.resourceId, input.scope);
+	if (!session) throw new SkillInvocationError("session_not_found", "Agent controller session not found.");
+	const skills = session.getWorkspace().skills;
+	await skills?.maybeRefresh();
+	const skill = await skills?.get(input.name);
+	if (!skill || skill["user-invocable"] === false) throw new SkillInvocationError("skill_not_found", `Skill not found: ${input.name}.`);
+	const args = input.arguments?.trim();
+	const content = [
+		`Resume the active ${skill.name} session — it is already open in this thread; continue it rather than restarting.`,
+		`Re-open the ${skill.name} skill with the skill tool if its instructions are no longer in context.`,
+		...args ? [`ARGUMENTS: ${args}`] : []
+	].join("\n");
+	return {
+		session,
+		skillName: skill.name,
+		message: `<skill name="${skill.name}">\n${escapeSkillBoundary(content)}\n</skill>`
+	};
+}
 async function dispatchSkillInvocation(controller, input, requestContext) {
 	const resolved = await resolveSkillInvocation(controller, input);
 	await resolved.session.sendMessage({
@@ -47,6 +73,6 @@ async function dispatchSkillInvocation(controller, input, requestContext) {
 	};
 }
 //#endregion
-export { SkillInvocationError, dispatchSkillInvocation, resolvePromptInvocation, resolveSkillInvocation };
+export { SkillInvocationError, dispatchSkillInvocation, resolvePromptInvocation, resolveSkillInvocation, resolveSkillResumeInvocation };
 
 //# sourceMappingURL=service.js.map

package/dist/skills/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","names":[],"sources":["../../src/skills/service.ts"],"sourcesContent":["import type { MastraCodeState } from '@mastra/code-sdk/schema';\nimport type { SendAgentSignalResult } from '@mastra/core/agent';\nimport type { AgentController } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport { formatSkillActivation } from '@mastra/core/workspace';\nimport type { Workspace } from '@mastra/core/workspace';\n\nexport interface SkillInvocationInput {\n  resourceId: string;\n  scope?: string;\n  name: string;\n  arguments?: string;\n}\n\nexport interface SkillSession {\n  getWorkspace(): Workspace;\n  sendMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n  sendNotificationSignal(\n    input: {\n      source: string;\n      kind: string;\n      summary: string;\n      priority?: 'low' | 'medium' | 'high' | 'urgent';\n      payload?: unknown;\n      dedupeKey?: string;\n      sourceId?: string;\n    },\n    options?: {\n      ifActive?: { behavior?: 'deliver' | 'persist' };\n      ifIdle?: { behavior?: 'persist' | 'wake' };\n      requestContext?: RequestContext;\n    },\n  ): Promise<Pick<SendAgentSignalResult, 'persisted' | 'accepted'>>;\n}\n\nexport class SkillInvocationError extends Error {\n  readonly code: 'session_not_found' | 'skill_not_found';\n\n  constructor(code: SkillInvocationError['code'], message: string) {\n    super(message);\n    this.name = 'SkillInvocationError';\n    this.code = code;\n  }\n}\n\nfunction escapeSkillBoundary(value: string): string {\n  return value.replaceAll('</skill>', '&lt;/skill&gt;');\n}\n\n/** Kicks a run off from a plain prompt, for runs that activate no skill. */\nexport async function resolvePromptInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: { resourceId: string; scope?: SkillInvocationInput['scope']; prompt: string },\n): Promise<{ session: SkillSession; message: string }> {\n  const session = (await controller.getSessionByResource(input.resourceId, input.scope)) as SkillSession | undefined;\n  if (!session) throw new SkillInvocationError('session_not_found', 'Agent controller session not found.');\n  return { session, message: input.prompt };\n}\n\nexport async function resolveSkillInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: SkillInvocationInput,\n): Promise<{ session: SkillSession; skillName: string; message: string }> {\n  const session = (await controller.getSessionByResource(input.resourceId, input.scope)) as SkillSession | undefined;\n  if (!session) throw new SkillInvocationError('session_not_found', 'Agent controller session not found.');\n\n  const skills = session.getWorkspace().skills;\n  await skills?.maybeRefresh();\n  const skill = await skills?.get(input.name);\n  if (!skill || skill['user-invocable'] === false) {\n    throw new SkillInvocationError('skill_not_found', `Skill not found: ${input.name}.`);\n  }\n\n  const args = input.arguments?.trim();\n  const content = `${formatSkillActivation(skill)}${args ? `\\n\\nARGUMENTS: ${args}` : ''}`.trim();\n  return {\n    session,\n    skillName: skill.name,\n    message: `<skill name=\"${skill.name}\">\\n${escapeSkillBoundary(content)}\\n</skill>`,\n  };\n}\n\nexport async function dispatchSkillInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: SkillInvocationInput,\n  requestContext?: RequestContext,\n): Promise<{ skillName: string; message: string }> {\n  const resolved = await resolveSkillInvocation(controller, input);\n  await resolved.session.sendMessage({ content: resolved.message, ...(requestContext ? { requestContext } : {}) });\n  return { skillName: resolved.skillName, message: resolved.message };\n}\n"],"mappings":";;AAmCA,IAAa,uBAAb,cAA0C,MAAM;CAC9C;CAEA,YAAY,MAAoC,SAAiB;EAC/D,MAAM,OAAO;EACb,KAAK,OAAO;EACZ,KAAK,OAAO;CACd;AACF;AAEA,SAAS,oBAAoB,OAAuB;CAClD,OAAO,MAAM,WAAW,YAAY,gBAAgB;AACtD;;AAGA,eAAsB,wBACpB,YACA,OACqD;CACrD,MAAM,UAAW,MAAM,WAAW,qBAAqB,MAAM,YAAY,MAAM,KAAK;CACpF,IAAI,CAAC,SAAS,MAAM,IAAI,qBAAqB,qBAAqB,qCAAqC;CACvG,OAAO;EAAE;EAAS,SAAS,MAAM;CAAO;AAC1C;AAEA,eAAsB,uBACpB,YACA,OACwE;CACxE,MAAM,UAAW,MAAM,WAAW,qBAAqB,MAAM,YAAY,MAAM,KAAK;CACpF,IAAI,CAAC,SAAS,MAAM,IAAI,qBAAqB,qBAAqB,qCAAqC;CAEvG,MAAM,SAAS,QAAQ,aAAa,CAAC,CAAC;CACtC,MAAM,QAAQ,aAAa;CAC3B,MAAM,QAAQ,MAAM,QAAQ,IAAI,MAAM,IAAI;CAC1C,IAAI,CAAC,SAAS,MAAM,sBAAsB,OACxC,MAAM,IAAI,qBAAqB,mBAAmB,oBAAoB,MAAM,KAAK,EAAE;CAGrF,MAAM,OAAO,MAAM,WAAW,KAAK;CACnC,MAAM,UAAU,GAAG,sBAAsB,KAAK,IAAI,OAAO,kBAAkB,SAAS,KAAK,KAAK;CAC9F,OAAO;EACL;EACA,WAAW,MAAM;EACjB,SAAS,gBAAgB,MAAM,KAAK,MAAM,oBAAoB,OAAO,EAAE;CACzE;AACF;AAEA,eAAsB,wBACpB,YACA,OACA,gBACiD;CACjD,MAAM,WAAW,MAAM,uBAAuB,YAAY,KAAK;CAC/D,MAAM,SAAS,QAAQ,YAAY;EAAE,SAAS,SAAS;EAAS,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;CAAG,CAAC;CAC/G,OAAO;EAAE,WAAW,SAAS;EAAW,SAAS,SAAS;CAAQ;AACpE"}
+{"version":3,"file":"service.js","names":[],"sources":["../../src/skills/service.ts"],"sourcesContent":["import type { MastraCodeState } from '@mastra/code-sdk/schema';\nimport type { SendAgentSignalResult } from '@mastra/core/agent';\nimport type { AgentController } from '@mastra/core/agent-controller';\nimport type { RequestContext } from '@mastra/core/request-context';\nimport { formatSkillActivation } from '@mastra/core/workspace';\nimport type { Workspace } from '@mastra/core/workspace';\n\nexport interface SkillInvocationInput {\n  resourceId: string;\n  scope?: string;\n  name: string;\n  arguments?: string;\n}\n\nexport interface SkillSession {\n  getWorkspace(): Workspace;\n  sendMessage(input: { content: string; requestContext?: RequestContext }): Promise<unknown>;\n  sendNotificationSignal(\n    input: {\n      source: string;\n      kind: string;\n      summary: string;\n      priority?: 'low' | 'medium' | 'high' | 'urgent';\n      payload?: unknown;\n      dedupeKey?: string;\n      sourceId?: string;\n    },\n    options?: {\n      ifActive?: { behavior?: 'deliver' | 'persist' };\n      ifIdle?: { behavior?: 'persist' | 'wake' };\n      requestContext?: RequestContext;\n    },\n  ): Promise<Pick<SendAgentSignalResult, 'persisted' | 'accepted'>>;\n}\n\nexport class SkillInvocationError extends Error {\n  readonly code: 'session_not_found' | 'skill_not_found';\n\n  constructor(code: SkillInvocationError['code'], message: string) {\n    super(message);\n    this.name = 'SkillInvocationError';\n    this.code = code;\n  }\n}\n\nfunction escapeSkillBoundary(value: string): string {\n  return value.replaceAll('</skill>', '&lt;/skill&gt;');\n}\n\n/** Kicks a run off from a plain prompt, for runs that activate no skill. */\nexport async function resolvePromptInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: { resourceId: string; scope?: SkillInvocationInput['scope']; prompt: string },\n): Promise<{ session: SkillSession; message: string }> {\n  const session = (await controller.getSessionByResource(input.resourceId, input.scope)) as SkillSession | undefined;\n  if (!session) throw new SkillInvocationError('session_not_found', 'Agent controller session not found.');\n  return { session, message: input.prompt };\n}\n\nexport async function resolveSkillInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: SkillInvocationInput,\n): Promise<{ session: SkillSession; skillName: string; message: string }> {\n  const session = (await controller.getSessionByResource(input.resourceId, input.scope)) as SkillSession | undefined;\n  if (!session) throw new SkillInvocationError('session_not_found', 'Agent controller session not found.');\n\n  const skills = session.getWorkspace().skills;\n  await skills?.maybeRefresh();\n  const skill = await skills?.get(input.name);\n  if (!skill || skill['user-invocable'] === false) {\n    throw new SkillInvocationError('skill_not_found', `Skill not found: ${input.name}.`);\n  }\n\n  const args = input.arguments?.trim();\n  const content = `${formatSkillActivation(skill)}${args ? `\\n\\nARGUMENTS: ${args}` : ''}`.trim();\n  return {\n    session,\n    skillName: skill.name,\n    message: `<skill name=\"${skill.name}\">\\n${escapeSkillBoundary(content)}\\n</skill>`,\n  };\n}\n\n/**\n * Same-stage re-entry: the skill is already active in the card's live session.\n * Resolve a compact continuation that references the skill by name and carries\n * only the fresh arguments, instead of re-pasting the whole skill document. If\n * the skill body was compacted out of context, the agent can re-open it with the\n * skill tool.\n */\nexport async function resolveSkillResumeInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: SkillInvocationInput,\n): Promise<{ session: SkillSession; skillName: string; message: string }> {\n  const session = (await controller.getSessionByResource(input.resourceId, input.scope)) as SkillSession | undefined;\n  if (!session) throw new SkillInvocationError('session_not_found', 'Agent controller session not found.');\n\n  const skills = session.getWorkspace().skills;\n  await skills?.maybeRefresh();\n  const skill = await skills?.get(input.name);\n  if (!skill || skill['user-invocable'] === false) {\n    throw new SkillInvocationError('skill_not_found', `Skill not found: ${input.name}.`);\n  }\n\n  const args = input.arguments?.trim();\n  const content = [\n    `Resume the active ${skill.name} session — it is already open in this thread; continue it rather than restarting.`,\n    `Re-open the ${skill.name} skill with the skill tool if its instructions are no longer in context.`,\n    ...(args ? [`ARGUMENTS: ${args}`] : []),\n  ].join('\\n');\n  return {\n    session,\n    skillName: skill.name,\n    message: `<skill name=\"${skill.name}\">\\n${escapeSkillBoundary(content)}\\n</skill>`,\n  };\n}\n\nexport async function dispatchSkillInvocation(\n  controller: Pick<AgentController<MastraCodeState>, 'getSessionByResource'>,\n  input: SkillInvocationInput,\n  requestContext?: RequestContext,\n): Promise<{ skillName: string; message: string }> {\n  const resolved = await resolveSkillInvocation(controller, input);\n  await resolved.session.sendMessage({ content: resolved.message, ...(requestContext ? { requestContext } : {}) });\n  return { skillName: resolved.skillName, message: resolved.message };\n}\n"],"mappings":";;AAmCA,IAAa,uBAAb,cAA0C,MAAM;CAC9C;CAEA,YAAY,MAAoC,SAAiB;EAC/D,MAAM,OAAO;EACb,KAAK,OAAO;EACZ,KAAK,OAAO;CACd;AACF;AAEA,SAAS,oBAAoB,OAAuB;CAClD,OAAO,MAAM,WAAW,YAAY,gBAAgB;AACtD;;AAGA,eAAsB,wBACpB,YACA,OACqD;CACrD,MAAM,UAAW,MAAM,WAAW,qBAAqB,MAAM,YAAY,MAAM,KAAK;CACpF,IAAI,CAAC,SAAS,MAAM,IAAI,qBAAqB,qBAAqB,qCAAqC;CACvG,OAAO;EAAE;EAAS,SAAS,MAAM;CAAO;AAC1C;AAEA,eAAsB,uBACpB,YACA,OACwE;CACxE,MAAM,UAAW,MAAM,WAAW,qBAAqB,MAAM,YAAY,MAAM,KAAK;CACpF,IAAI,CAAC,SAAS,MAAM,IAAI,qBAAqB,qBAAqB,qCAAqC;CAEvG,MAAM,SAAS,QAAQ,aAAa,CAAC,CAAC;CACtC,MAAM,QAAQ,aAAa;CAC3B,MAAM,QAAQ,MAAM,QAAQ,IAAI,MAAM,IAAI;CAC1C,IAAI,CAAC,SAAS,MAAM,sBAAsB,OACxC,MAAM,IAAI,qBAAqB,mBAAmB,oBAAoB,MAAM,KAAK,EAAE;CAGrF,MAAM,OAAO,MAAM,WAAW,KAAK;CACnC,MAAM,UAAU,GAAG,sBAAsB,KAAK,IAAI,OAAO,kBAAkB,SAAS,KAAK,KAAK;CAC9F,OAAO;EACL;EACA,WAAW,MAAM;EACjB,SAAS,gBAAgB,MAAM,KAAK,MAAM,oBAAoB,OAAO,EAAE;CACzE;AACF;;;;;;;;AASA,eAAsB,6BACpB,YACA,OACwE;CACxE,MAAM,UAAW,MAAM,WAAW,qBAAqB,MAAM,YAAY,MAAM,KAAK;CACpF,IAAI,CAAC,SAAS,MAAM,IAAI,qBAAqB,qBAAqB,qCAAqC;CAEvG,MAAM,SAAS,QAAQ,aAAa,CAAC,CAAC;CACtC,MAAM,QAAQ,aAAa;CAC3B,MAAM,QAAQ,MAAM,QAAQ,IAAI,MAAM,IAAI;CAC1C,IAAI,CAAC,SAAS,MAAM,sBAAsB,OACxC,MAAM,IAAI,qBAAqB,mBAAmB,oBAAoB,MAAM,KAAK,EAAE;CAGrF,MAAM,OAAO,MAAM,WAAW,KAAK;CACnC,MAAM,UAAU;EACd,qBAAqB,MAAM,KAAK;EAChC,eAAe,MAAM,KAAK;EAC1B,GAAI,OAAO,CAAC,cAAc,MAAM,IAAI,CAAC;CACvC,CAAC,CAAC,KAAK,IAAI;CACX,OAAO;EACL;EACA,WAAW,MAAM;EACjB,SAAS,gBAAgB,MAAM,KAAK,MAAM,oBAAoB,OAAO,EAAE;CACzE;AACF;AAEA,eAAsB,wBACpB,YACA,OACA,gBACiD;CACjD,MAAM,WAAW,MAAM,uBAAuB,YAAY,KAAK;CAC/D,MAAM,SAAS,QAAQ,YAAY;EAAE,SAAS,SAAS;EAAS,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;CAAG,CAAC;CAC/G,OAAO;EAAE,WAAW,SAAS;EAAW,SAAS,SAAS;CAAQ;AACpE"}