@mastra/code-sdk 1.8.4-alpha.6 → 1.9.0-alpha.8

package/dist/acp/event-mapper.js

@@ -1,11 +1,4 @@
-import { mastraDBMessageToSignal } from "@mastra/core/signals";
 //#region src/acp/event-mapper.ts
-function getSignalText(message) {
-	const contents = mastraDBMessageToSignal(message).contents;
-	if (typeof contents === "string") return contents;
-	if (!Array.isArray(contents)) return "";
-	return contents.filter((part) => part.type === "text").map((part) => part.text).join("\n");
-}
 let autoApprove = false;
 /**
 * Enable or disable automatic tool approval (set via --dangerous-auto-approve CLI flag).
@@ -33,45 +26,29 @@ function mapToolKind(toolName) {
 * a session update.
 */
 function handleAgentControllerEvent(event, state, connection, session) {
-	if (!state) return;
+	if (!state || state.finished) return;
 	switch (event.type) {
 		case "agent_start":
-			state.lastTextLength = 0;
+			state.suspended = false;
+			if (state.cancelled && !state.cancelSuspensions?.size) session.completeDeferredAbort();
 			break;
-		case "message_start": {
+		case "message_start":
 			if (event.message.role === "assistant") {
 				state.activeAssistantMessageId = event.message.id;
-				state.lastTextLength = 0;
 				break;
 			}
-			if (event.message.role !== "signal") break;
-			const text = getSignalText(event.message);
-			if (text) sendUpdate(connection, state.sessionId, {
+			break;
+		case "message_update":
+			if (event.event.type === "text-delta" && event.id === state.activeAssistantMessageId && event.event.delta) sendUpdate(connection, state.sessionId, {
 				sessionUpdate: "agent_message_chunk",
 				content: {
 					type: "text",
-					text
+					text: event.event.delta
 				}
 			});
 			break;
-		}
-		case "message_update":
-			if (event.event.type === "text-delta" && event.id === state.activeAssistantMessageId && event.event.delta) {
-				state.lastTextLength += event.event.delta.length;
-				sendUpdate(connection, state.sessionId, {
-					sessionUpdate: "agent_message_chunk",
-					content: {
-						type: "text",
-						text: event.event.delta
-					}
-				});
-			}
-			break;
 		case "message_end":
-			if (event.id === state.activeAssistantMessageId) {
-				state.activeAssistantMessageId = void 0;
-				state.lastTextLength = 0;
-			}
+			if (event.id === state.activeAssistantMessageId) state.activeAssistantMessageId = void 0;
 			break;
 		case "tool_start":
 			sendUpdate(connection, state.sessionId, {
@@ -93,18 +70,32 @@ function handleAgentControllerEvent(event, state, connection, session) {
 			break;
 		case "tool_approval_required":
 			handleToolApproval(state, connection, session, event).catch((err) => {
-				process.stderr.write(`[acp] handleToolApproval error: ${err}\n`);
+				failTurn(state, session, err);
 			});
 			break;
 		case "tool_suspended":
 			handleToolSuspended(state, connection, session, event).catch((err) => {
-				process.stderr.write(`[acp] handleToolSuspended error: ${err}\n`);
+				failTurn(state, session, err);
 			});
 			break;
 		case "usage_update":
 			accumulateUsage(state.usage, event.usage);
 			break;
+		case "error":
+			state.error = event.error;
+			if (event.finishReason === "length") state.stopReason = "max_tokens";
+			else if (event.finishReason === "content-filter") state.stopReason = "refusal";
+			break;
 		case "agent_end":
+			if (event.reason === "suspended") {
+				state.suspended = true;
+				if (state.cancelled && !state.cancelSuspensions?.size) {
+					session.stream.detach();
+					state.resolve("aborted");
+				}
+				break;
+			}
+			state.finished = true;
 			state.resolve(event.reason ?? "complete");
 			break;
 		default: break;
@@ -119,8 +110,18 @@ function sendUpdate(connection, sessionId, update) {
 	});
 }
 async function handleToolApproval(state, connection, session, event) {
+	if (state.cancelled) {
+		session.respondToToolApproval({
+			decision: "decline",
+			toolCallId: event.toolCallId
+		});
+		return;
+	}
 	if (autoApprove) {
-		session.respondToToolApproval({ decision: "approve" });
+		session.respondToToolApproval({
+			decision: "approve",
+			toolCallId: event.toolCallId
+		});
 		return;
 	}
 	const req = {
@@ -142,21 +143,78 @@ async function handleToolApproval(state, connection, session, event) {
 	};
 	try {
 		const resp = await connection.requestPermission(req);
+		if (state.finished || state.cancelled) return;
 		if (resp.outcome.outcome === "selected") {
 			const decision = resp.outcome.optionId === "approve" ? "approve" : "decline";
-			session.respondToToolApproval({ decision });
-		} else session.respondToToolApproval({ decision: "decline" });
+			session.respondToToolApproval({
+				decision,
+				toolCallId: event.toolCallId
+			});
+		} else session.respondToToolApproval({
+			decision: "decline",
+			toolCallId: event.toolCallId
+		});
 	} catch (err) {
+		if (state.finished || state.cancelled) return;
 		process.stderr.write(`[acp] requestPermission error: ${err}\n`);
-		session.respondToToolApproval({ decision: "decline" });
+		session.respondToToolApproval({
+			decision: "decline",
+			toolCallId: event.toolCallId
+		});
 	}
 }
 async function handleToolSuspended(state, connection, session, event) {
 	const { toolCallId, toolName, args, suspendPayload } = event;
-	if (toolName === "request_access" || suspendPayload?.kind === "sandbox_access_request") {
-		session.respondToToolSuspension({
+	const isSandboxAccess = toolName === "request_access" || typeof suspendPayload === "object" && suspendPayload !== null && "kind" in suspendPayload && suspendPayload.kind === "sandbox_access_request";
+	if (isSandboxAccess || toolName === "submit_plan") {
+		state.cancelSuspensions ??= /* @__PURE__ */ new Map();
+		state.cancelSuspensions.set(toolCallId, () => session.resumeToolCall({
 			toolCallId,
-			resumeData: "Yes"
+			resumeData: isSandboxAccess ? "No" : { action: "rejected" },
+			resolveOnToolEnd: true
+		}));
+	}
+	if (state.cancelled) {
+		try {
+			await state.cancelSuspensions?.get(toolCallId)?.();
+		} finally {
+			state.cancelSuspensions?.delete(toolCallId);
+			if (!state.finished) {
+				session.completeDeferredAbort();
+				state.resolve("aborted");
+			}
+		}
+		return;
+	}
+	if (isSandboxAccess) {
+		let approved = autoApprove;
+		if (!autoApprove) try {
+			const response = await connection.requestPermission({
+				sessionId: state.sessionId,
+				toolCall: {
+					toolCallId,
+					title: toolName,
+					rawInput: JSON.stringify(args)
+				},
+				options: [{
+					optionId: "approve",
+					name: "Allow access",
+					kind: "allow_once"
+				}, {
+					optionId: "reject",
+					name: "Deny access",
+					kind: "reject_once"
+				}]
+			});
+			approved = response.outcome.outcome === "selected" && response.outcome.optionId === "approve";
+		} catch {
+			approved = false;
+		}
+		if (state.finished || state.cancelled) return;
+		state.cancelSuspensions?.delete(toolCallId);
+		await session.respondToToolSuspension({
+			toolCallId,
+			resumeData: approved ? "Yes" : "No"
 		});
 		return;
 	}
@@ -178,25 +236,27 @@ async function handleToolSuspended(state, connection, session, event) {
 				kind: "reject_once"
 			}]
 		};
+		let action = "rejected";
 		try {
 			const resp = await connection.requestPermission(req);
-			const action = resp.outcome.outcome === "selected" && resp.outcome.optionId === "approve" ? "approved" : "rejected";
-			session.respondToToolSuspension({
-				toolCallId,
-				resumeData: { action }
-			});
-		} catch {
-			session.respondToToolSuspension({
-				toolCallId,
-				resumeData: { action: "rejected" }
-			});
-		}
+			if (resp.outcome.outcome === "selected" && resp.outcome.optionId === "approve") action = "approved";
+		} catch {}
+		if (state.finished || state.cancelled) return;
+		state.cancelSuspensions?.delete(toolCallId);
+		await session.respondToToolSuspension({
+			toolCallId,
+			resumeData: { action }
+		});
 		return;
 	}
-	session.respondToToolSuspension({
-		toolCallId,
-		resumeData: "Proceed with your best judgment. Do not ask further questions."
-	});
+	throw new Error(`Tool "${toolName}" requires an interaction that this ACP server does not support`);
+}
+function failTurn(state, session, error) {
+	if (state.finished || state.cancelled) return;
+	state.error = error instanceof Error ? error : new Error(String(error));
+	state.finished = true;
+	state.resolve("error");
+	session.abort();
 }
 function accumulateUsage(target, usage) {
 	target.promptTokens += usage.promptTokens;

package/dist/acp/event-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"event-mapper.js","names":[],"sources":["../../src/acp/event-mapper.ts"],"sourcesContent":["import type { SessionNotification, RequestPermissionRequest, AgentSideConnection } from '@agentclientprotocol/sdk';\nimport type { AgentControllerEvent, MastraDBMessage, Session, TokenUsage } from '@mastra/core/agent-controller';\nimport { mastraDBMessageToSignal } from '@mastra/core/signals';\n\nfunction getSignalText(message: MastraDBMessage): string {\n  const contents = mastraDBMessageToSignal(message).contents;\n  if (typeof contents === 'string') return contents;\n  if (!Array.isArray(contents)) return '';\n  return contents\n    .filter((part): part is Extract<(typeof contents)[number], { type: 'text' }> => part.type === 'text')\n    .map(part => part.text)\n    .join('\\n');\n}\n\nlet autoApprove = false;\n\n/**\n * Enable or disable automatic tool approval (set via --dangerous-auto-approve CLI flag).\n */\nexport function setAutoApprove(value: boolean): void {\n  autoApprove = value;\n}\n\n/**\n * Map a mastracode tool name to an ACP ToolKind.\n */\nfunction mapToolKind(\n  toolName: string,\n): 'read' | 'edit' | 'delete' | 'move' | 'search' | 'execute' | 'think' | 'fetch' | 'other' {\n  const name = toolName.toLowerCase();\n  if (name.includes('edit') || name.includes('write') || name.includes('replace') || name.includes('patch'))\n    return 'edit';\n  if (name.includes('read') || name.includes('view') || name.includes('list') || name.includes('find')) return 'read';\n  if (name.includes('delete') || name.includes('remove')) return 'delete';\n  if (name.includes('search') || name.includes('grep') || name.includes('query')) return 'search';\n  if (name.includes('execute') || name.includes('run') || name.includes('command') || name.includes('shell'))\n    return 'execute';\n  if (\n    name.includes('fetch') ||\n    name.includes('curl') ||\n    name.includes('http') ||\n    name.includes('browse') ||\n    name.includes('navigate')\n  )\n    return 'fetch';\n  if (name.includes('think') || name.includes('reason')) return 'think';\n  return 'other';\n}\n\n/**\n * Accumulated state for an active prompt turn.\n */\nexport interface PromptState {\n  sessionId: string;\n  activeAssistantMessageId?: string;\n  lastTextLength: number;\n  usage: TokenUsage;\n  resolve: (reason: 'complete' | 'aborted' | 'error' | 'suspended') => void;\n}\n\n/**\n * Translate an AgentControllerEvent into an ACP SessionNotification and send it\n * via the provided connection. Returns null for events that don't produce\n * a session update.\n */\nexport function handleAgentControllerEvent(\n  event: AgentControllerEvent,\n  state: PromptState | null,\n  connection: AgentSideConnection,\n  session: Session,\n): void {\n  if (!state) return;\n\n  switch (event.type) {\n    case 'agent_start':\n      state.lastTextLength = 0;\n      break;\n\n    case 'message_start': {\n      if (event.message.role === 'assistant') {\n        state.activeAssistantMessageId = event.message.id;\n        state.lastTextLength = 0;\n        break;\n      }\n      if (event.message.role !== 'signal') break;\n      const text = getSignalText(event.message);\n      if (text) {\n        sendUpdate(connection, state.sessionId, {\n          sessionUpdate: 'agent_message_chunk',\n          content: { type: 'text', text },\n        });\n      }\n      break;\n    }\n\n    case 'message_update':\n      if (event.event.type === 'text-delta' && event.id === state.activeAssistantMessageId && event.event.delta) {\n        state.lastTextLength += event.event.delta.length;\n        sendUpdate(connection, state.sessionId, {\n          sessionUpdate: 'agent_message_chunk',\n          content: { type: 'text', text: event.event.delta },\n        });\n      }\n      break;\n\n    case 'message_end':\n      if (event.id === state.activeAssistantMessageId) {\n        state.activeAssistantMessageId = undefined;\n        state.lastTextLength = 0;\n      }\n      break;\n\n    case 'tool_start':\n      sendUpdate(connection, state.sessionId, {\n        sessionUpdate: 'tool_call',\n        toolCallId: event.toolCallId,\n        title: event.toolName,\n        kind: mapToolKind(event.toolName),\n        status: 'in_progress',\n        rawInput: JSON.stringify(event.args),\n      });\n      break;\n\n    case 'tool_end':\n      sendUpdate(connection, state.sessionId, {\n        sessionUpdate: 'tool_call_update',\n        toolCallId: event.toolCallId,\n        status: event.isError ? 'failed' : 'completed',\n        rawOutput: typeof event.result === 'string' ? event.result : JSON.stringify(event.result),\n      });\n      break;\n\n    case 'tool_approval_required':\n      void handleToolApproval(state, connection, session, event).catch(err => {\n        process.stderr.write(`[acp] handleToolApproval error: ${err}\\n`);\n      });\n      break;\n\n    case 'tool_suspended':\n      void handleToolSuspended(state, connection, session, event).catch(err => {\n        process.stderr.write(`[acp] handleToolSuspended error: ${err}\\n`);\n      });\n      break;\n\n    case 'usage_update':\n      accumulateUsage(state.usage, event.usage);\n      break;\n\n    case 'agent_end':\n      state.resolve(event.reason ?? 'complete');\n      break;\n\n    // Ignored in v1: om_*, subagent_*, workspace_*, task_updated, etc.\n    default:\n      break;\n  }\n}\n\nfunction sendUpdate(connection: AgentSideConnection, sessionId: string, update: SessionNotification['update']): void {\n  connection.sessionUpdate({ sessionId, update }).catch(err => {\n    process.stderr.write(`[acp] sessionUpdate error: ${err}\\n`);\n  });\n}\n\nasync function handleToolApproval(\n  state: PromptState,\n  connection: AgentSideConnection,\n  session: Session,\n  event: Extract<AgentControllerEvent, { type: 'tool_approval_required' }>,\n): Promise<void> {\n  // Auto-approve if --dangerous-auto-approve flag is set\n  if (autoApprove) {\n    session.respondToToolApproval({ decision: 'approve' });\n    return;\n  }\n\n  const req: RequestPermissionRequest = {\n    sessionId: state.sessionId,\n    toolCall: {\n      toolCallId: event.toolCallId,\n      title: event.toolName,\n      rawInput: JSON.stringify(event.args),\n    },\n    options: [\n      { optionId: 'approve', name: 'Allow', kind: 'allow_once' },\n      { optionId: 'reject', name: 'Reject', kind: 'reject_once' },\n    ],\n  };\n\n  try {\n    const resp = await connection.requestPermission(req);\n    if (resp.outcome.outcome === 'selected') {\n      const decision = resp.outcome.optionId === 'approve' ? 'approve' : 'decline';\n      session.respondToToolApproval({ decision });\n    } else {\n      session.respondToToolApproval({ decision: 'decline' });\n    }\n  } catch (err) {\n    process.stderr.write(`[acp] requestPermission error: ${err}\\n`);\n    session.respondToToolApproval({ decision: 'decline' });\n  }\n}\n\nasync function handleToolSuspended(\n  state: PromptState,\n  connection: AgentSideConnection,\n  session: Session,\n  event: Extract<AgentControllerEvent, { type: 'tool_suspended' }>,\n): Promise<void> {\n  const { toolCallId, toolName, args, suspendPayload } = event;\n\n  // Auto-resolve certain suspensions (mirrors headless.ts autoResolve)\n  if (toolName === 'request_access' || (suspendPayload as any)?.kind === 'sandbox_access_request') {\n    void session.respondToToolSuspension({ toolCallId, resumeData: 'Yes' });\n    return;\n  }\n\n  if (toolName === 'submit_plan') {\n    // Request permission for plan approval\n    const req: RequestPermissionRequest = {\n      sessionId: state.sessionId,\n      toolCall: {\n        toolCallId,\n        title: toolName,\n        rawInput: JSON.stringify(args),\n      },\n      options: [\n        { optionId: 'approve', name: 'Approve Plan', kind: 'allow_once' },\n        { optionId: 'reject', name: 'Reject Plan', kind: 'reject_once' },\n      ],\n    };\n\n    try {\n      const resp = await connection.requestPermission(req);\n      const action =\n        resp.outcome.outcome === 'selected' && resp.outcome.optionId === 'approve' ? 'approved' : 'rejected';\n      void session.respondToToolSuspension({ toolCallId, resumeData: { action } });\n    } catch {\n      void session.respondToToolSuspension({ toolCallId, resumeData: { action: 'rejected' } });\n    }\n    return;\n  }\n\n  // For ask_user and other suspensions, auto-resolve\n  void session.respondToToolSuspension({\n    toolCallId,\n    resumeData: 'Proceed with your best judgment. Do not ask further questions.',\n  });\n}\n\nfunction accumulateUsage(target: TokenUsage, usage: TokenUsage): void {\n  target.promptTokens += usage.promptTokens;\n  target.completionTokens += usage.completionTokens;\n  target.totalTokens += usage.totalTokens;\n  if (usage.reasoningTokens) target.reasoningTokens = (target.reasoningTokens ?? 0) + usage.reasoningTokens;\n  if (usage.cachedInputTokens) target.cachedInputTokens = (target.cachedInputTokens ?? 0) + usage.cachedInputTokens;\n  if (usage.cacheCreationInputTokens) {\n    target.cacheCreationInputTokens = (target.cacheCreationInputTokens ?? 0) + usage.cacheCreationInputTokens;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"event-mapper.js","names":[],"sources":["../../src/acp/event-mapper.ts"],"sourcesContent":["import type { SessionNotification, RequestPermissionRequest, AgentSideConnection } from '@agentclientprotocol/sdk';\nimport type { AgentControllerEvent, Session, TokenUsage } from '@mastra/core/agent-controller';\n\nlet autoApprove = false;\n\n/**\n * Enable or disable automatic tool approval (set via --dangerous-auto-approve CLI flag).\n */\nexport function setAutoApprove(value: boolean): void {\n  autoApprove = value;\n}\n\n/**\n * Map a mastracode tool name to an ACP ToolKind.\n */\nfunction mapToolKind(\n  toolName: string,\n): 'read' | 'edit' | 'delete' | 'move' | 'search' | 'execute' | 'think' | 'fetch' | 'other' {\n  const name = toolName.toLowerCase();\n  if (name.includes('edit') || name.includes('write') || name.includes('replace') || name.includes('patch'))\n    return 'edit';\n  if (name.includes('read') || name.includes('view') || name.includes('list') || name.includes('find')) return 'read';\n  if (name.includes('delete') || name.includes('remove')) return 'delete';\n  if (name.includes('search') || name.includes('grep') || name.includes('query')) return 'search';\n  if (name.includes('execute') || name.includes('run') || name.includes('command') || name.includes('shell'))\n    return 'execute';\n  if (\n    name.includes('fetch') ||\n    name.includes('curl') ||\n    name.includes('http') ||\n    name.includes('browse') ||\n    name.includes('navigate')\n  )\n    return 'fetch';\n  if (name.includes('think') || name.includes('reason')) return 'think';\n  return 'other';\n}\n\n/**\n * Accumulated state for an active prompt turn.\n */\nexport interface PromptState {\n  sessionId: string;\n  activeAssistantMessageId?: string;\n  usage: TokenUsage;\n  error?: Error;\n  stopReason?: 'max_tokens' | 'refusal';\n  finished?: boolean;\n  cancelled?: boolean;\n  suspended?: boolean;\n  cancelSuspensions?: Map<string, () => Promise<void>>;\n  resolve: (reason: 'complete' | 'aborted' | 'error' | 'suspended') => void;\n}\n\n/**\n * Translate an AgentControllerEvent into an ACP SessionNotification and send it\n * via the provided connection. Returns null for events that don't produce\n * a session update.\n */\nexport function handleAgentControllerEvent(\n  event: AgentControllerEvent,\n  state: PromptState | null,\n  connection: AgentSideConnection,\n  session: Session,\n): void {\n  if (!state || state.finished) return;\n\n  switch (event.type) {\n    case 'agent_start':\n      state.suspended = false;\n      // Startup can arm its controller after cancel first called abort().\n      if (state.cancelled && !state.cancelSuspensions?.size) session.completeDeferredAbort();\n      break;\n\n    case 'message_start': {\n      if (event.message.role === 'assistant') {\n        state.activeAssistantMessageId = event.message.id;\n        break;\n      }\n      break;\n    }\n\n    case 'message_update':\n      if (event.event.type === 'text-delta' && event.id === state.activeAssistantMessageId && event.event.delta) {\n        sendUpdate(connection, state.sessionId, {\n          sessionUpdate: 'agent_message_chunk',\n          content: { type: 'text', text: event.event.delta },\n        });\n      }\n      break;\n\n    case 'message_end':\n      if (event.id === state.activeAssistantMessageId) {\n        state.activeAssistantMessageId = undefined;\n      }\n      break;\n\n    case 'tool_start':\n      sendUpdate(connection, state.sessionId, {\n        sessionUpdate: 'tool_call',\n        toolCallId: event.toolCallId,\n        title: event.toolName,\n        kind: mapToolKind(event.toolName),\n        status: 'in_progress',\n        rawInput: JSON.stringify(event.args),\n      });\n      break;\n\n    case 'tool_end':\n      sendUpdate(connection, state.sessionId, {\n        sessionUpdate: 'tool_call_update',\n        toolCallId: event.toolCallId,\n        status: event.isError ? 'failed' : 'completed',\n        rawOutput: typeof event.result === 'string' ? event.result : JSON.stringify(event.result),\n      });\n      break;\n\n    case 'tool_approval_required':\n      void handleToolApproval(state, connection, session, event).catch(err => {\n        failTurn(state, session, err);\n      });\n      break;\n\n    case 'tool_suspended':\n      void handleToolSuspended(state, connection, session, event).catch(err => {\n        failTurn(state, session, err);\n      });\n      break;\n\n    case 'usage_update':\n      accumulateUsage(state.usage, event.usage);\n      break;\n\n    case 'error':\n      state.error = event.error;\n      if (event.finishReason === 'length') state.stopReason = 'max_tokens';\n      else if (event.finishReason === 'content-filter') state.stopReason = 'refusal';\n      break;\n\n    case 'agent_end':\n      // A suspended run continues after the client answers the permission request.\n      if (event.reason === 'suspended') {\n        state.suspended = true;\n        if (state.cancelled && !state.cancelSuspensions?.size) {\n          session.stream.detach();\n          state.resolve('aborted');\n        }\n        break;\n      }\n      state.finished = true;\n      state.resolve(event.reason ?? 'complete');\n      break;\n\n    // Ignored in v1: om_*, subagent_*, workspace_*, task_updated, etc.\n    default:\n      break;\n  }\n}\n\nfunction sendUpdate(connection: AgentSideConnection, sessionId: string, update: SessionNotification['update']): void {\n  connection.sessionUpdate({ sessionId, update }).catch(err => {\n    process.stderr.write(`[acp] sessionUpdate error: ${err}\\n`);\n  });\n}\n\nasync function handleToolApproval(\n  state: PromptState,\n  connection: AgentSideConnection,\n  session: Session,\n  event: Extract<AgentControllerEvent, { type: 'tool_approval_required' }>,\n): Promise<void> {\n  if (state.cancelled) {\n    session.respondToToolApproval({ decision: 'decline', toolCallId: event.toolCallId });\n    return;\n  }\n  // Auto-approve if --dangerous-auto-approve flag is set\n  if (autoApprove) {\n    session.respondToToolApproval({ decision: 'approve', toolCallId: event.toolCallId });\n    return;\n  }\n\n  const req: RequestPermissionRequest = {\n    sessionId: state.sessionId,\n    toolCall: {\n      toolCallId: event.toolCallId,\n      title: event.toolName,\n      rawInput: JSON.stringify(event.args),\n    },\n    options: [\n      { optionId: 'approve', name: 'Allow', kind: 'allow_once' },\n      { optionId: 'reject', name: 'Reject', kind: 'reject_once' },\n    ],\n  };\n\n  try {\n    const resp = await connection.requestPermission(req);\n    if (state.finished || state.cancelled) return;\n    if (resp.outcome.outcome === 'selected') {\n      const decision = resp.outcome.optionId === 'approve' ? 'approve' : 'decline';\n      session.respondToToolApproval({ decision, toolCallId: event.toolCallId });\n    } else {\n      session.respondToToolApproval({ decision: 'decline', toolCallId: event.toolCallId });\n    }\n  } catch (err) {\n    if (state.finished || state.cancelled) return;\n    process.stderr.write(`[acp] requestPermission error: ${err}\\n`);\n    session.respondToToolApproval({ decision: 'decline', toolCallId: event.toolCallId });\n  }\n}\n\nasync function handleToolSuspended(\n  state: PromptState,\n  connection: AgentSideConnection,\n  session: Session,\n  event: Extract<AgentControllerEvent, { type: 'tool_suspended' }>,\n): Promise<void> {\n  const { toolCallId, toolName, args, suspendPayload } = event;\n\n  const isSandboxAccess =\n    toolName === 'request_access' ||\n    (typeof suspendPayload === 'object' &&\n      suspendPayload !== null &&\n      'kind' in suspendPayload &&\n      suspendPayload.kind === 'sandbox_access_request');\n  if (isSandboxAccess || toolName === 'submit_plan') {\n    state.cancelSuspensions ??= new Map();\n    state.cancelSuspensions.set(toolCallId, () =>\n      session.resumeToolCall({\n        toolCallId,\n        resumeData: isSandboxAccess ? 'No' : { action: 'rejected' },\n        resolveOnToolEnd: true,\n      }),\n    );\n  }\n  if (state.cancelled) {\n    try {\n      await state.cancelSuspensions?.get(toolCallId)?.();\n    } finally {\n      state.cancelSuspensions?.delete(toolCallId);\n      if (!state.finished) {\n        session.completeDeferredAbort();\n        state.resolve('aborted');\n      }\n    }\n    return;\n  }\n  if (isSandboxAccess) {\n    let approved = autoApprove;\n    if (!autoApprove) {\n      try {\n        const response = await connection.requestPermission({\n          sessionId: state.sessionId,\n          toolCall: { toolCallId, title: toolName, rawInput: JSON.stringify(args) },\n          options: [\n            { optionId: 'approve', name: 'Allow access', kind: 'allow_once' },\n            { optionId: 'reject', name: 'Deny access', kind: 'reject_once' },\n          ],\n        });\n        approved = response.outcome.outcome === 'selected' && response.outcome.optionId === 'approve';\n      } catch {\n        approved = false;\n      }\n    }\n    if (state.finished || state.cancelled) return;\n    state.cancelSuspensions?.delete(toolCallId);\n    await session.respondToToolSuspension({ toolCallId, resumeData: approved ? 'Yes' : 'No' });\n    return;\n  }\n\n  if (toolName === 'submit_plan') {\n    // Request permission for plan approval\n    const req: RequestPermissionRequest = {\n      sessionId: state.sessionId,\n      toolCall: {\n        toolCallId,\n        title: toolName,\n        rawInput: JSON.stringify(args),\n      },\n      options: [\n        { optionId: 'approve', name: 'Approve Plan', kind: 'allow_once' },\n        { optionId: 'reject', name: 'Reject Plan', kind: 'reject_once' },\n      ],\n    };\n\n    let action: 'approved' | 'rejected' = 'rejected';\n    try {\n      const resp = await connection.requestPermission(req);\n      if (resp.outcome.outcome === 'selected' && resp.outcome.optionId === 'approve') action = 'approved';\n    } catch {\n      // A missing answer never grants permission.\n    }\n    if (state.finished || state.cancelled) return;\n    state.cancelSuspensions?.delete(toolCallId);\n    await session.respondToToolSuspension({ toolCallId, resumeData: { action } });\n    return;\n  }\n\n  throw new Error(`Tool \"${toolName}\" requires an interaction that this ACP server does not support`);\n}\n\nfunction failTurn(state: PromptState, session: Session, error: unknown): void {\n  if (state.finished || state.cancelled) return;\n  state.error = error instanceof Error ? error : new Error(String(error));\n  state.finished = true;\n  state.resolve('error');\n  session.abort();\n}\n\nfunction accumulateUsage(target: TokenUsage, usage: TokenUsage): void {\n  target.promptTokens += usage.promptTokens;\n  target.completionTokens += usage.completionTokens;\n  target.totalTokens += usage.totalTokens;\n  if (usage.reasoningTokens) target.reasoningTokens = (target.reasoningTokens ?? 0) + usage.reasoningTokens;\n  if (usage.cachedInputTokens) target.cachedInputTokens = (target.cachedInputTokens ?? 0) + usage.cachedInputTokens;\n  if (usage.cacheCreationInputTokens) {\n    target.cacheCreationInputTokens = (target.cacheCreationInputTokens ?? 0) + usage.cacheCreationInputTokens;\n  }\n}\n"],"mappings":"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"}

package/dist/acp/index.d.ts

@@ -1,7 +1,4 @@
-/**
- * Entry point for ACP server mode.
- * Initializes mastracode and runs the ACP protocol over stdio.
- */
+/** Entry point for Mastra Code's ACP server over stdio. */
 export declare function acpMain(options?: {
     dangerousAutoApprove?: boolean;
     coAuthor?: {

package/dist/acp/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/acp/index.ts"],"names":[],"mappings":"AAOA;;;GAGG;AACH,wBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C,GAAG,OAAO,CAAC,IAAI,CAAC,CA+DhB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/acp/index.ts"],"names":[],"mappings":"AAIA,2DAA2D;AAC3D,wBAAsB,OAAO,CAAC,OAAO,CAAC,EAAE;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBhB"}

package/dist/acp/index.js

@@ -1,63 +1,21 @@
 import { setAutoApprove } from "./event-mapper.js";
-import { releaseAllThreadLocks } from "../utils/thread-lock.js";
-import { createMastraCode } from "../index.js";
+import { createAcpSession } from "./runtime.js";
 import { runAcpServer } from "./server.js";
 //#region src/acp/index.ts
-/**
-* Entry point for ACP server mode.
-* Initializes mastracode and runs the ACP protocol over stdio.
-*/
+/** Entry point for Mastra Code's ACP server over stdio. */
 async function acpMain(options) {
-	if (options?.dangerousAutoApprove) setAutoApprove(true);
+	setAutoApprove(options?.dangerousAutoApprove === true);
 	const originalConsoleLog = console.log;
 	console.log = (...args) => {
 		process.stderr.write(args.map(String).join(" ") + "\n");
 	};
-	let result;
 	try {
-		result = await createMastraCode({
-			coAuthor: options?.coAuthor,
-			unixSocketPubSub: false,
-			disableMcp: false,
-			disableHooks: false
-		});
-		const { controller, mcpManager, signalsPubSub } = result;
-		const modes = [
-			{
-				id: "build",
-				name: "Build"
-			},
-			{
-				id: "plan",
-				name: "Plan"
-			},
-			{
-				id: "fast",
-				name: "Fast"
-			}
-		];
-		const cleanup = async () => {
-			releaseAllThreadLocks();
-			const closeSignalsPubSub = signalsPubSub?.close;
-			await Promise.allSettled([
-				mcpManager?.disconnect(),
-				controller?.getMastra()?.stopWorkers(),
-				controller?.stopIntervals(),
-				closeSignalsPubSub?.()
-			]);
-			console.log = originalConsoleLog;
-		};
-		const handleSignal = async () => {
-			await cleanup();
-			process.exit(0);
-		};
-		process.on("SIGINT", handleSignal);
-		process.on("SIGTERM", handleSignal);
-		await runAcpServer(controller, modes, cleanup);
+		await runAcpServer((request) => createAcpSession(request, { coAuthor: options?.coAuthor }));
 	} catch (error) {
 		process.stderr.write(`[acp] Fatal error: ${error}\n`);
-		console.log = originalConsoleLog;
 		process.exit(1);
+	} finally {
+		console.log = originalConsoleLog;
 	}
 }
 //#endregion

package/dist/acp/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/acp/index.ts"],"sourcesContent":["import type { AgentControllerMode } from '@mastra/core/agent-controller';\n\nimport { createMastraCode } from '../index.js';\nimport { releaseAllThreadLocks } from '../utils/thread-lock.js';\nimport { setAutoApprove } from './event-mapper.js';\nimport { runAcpServer } from './server.js';\n\n/**\n * Entry point for ACP server mode.\n * Initializes mastracode and runs the ACP protocol over stdio.\n */\nexport async function acpMain(options?: {\n  dangerousAutoApprove?: boolean;\n  coAuthor?: { name?: string; email?: string };\n}): Promise<void> {\n  if (options?.dangerousAutoApprove) {\n    setAutoApprove(true);\n  }\n  // Redirect console.log to stderr to avoid polluting the JSON-RPC stream on stdout.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n\n  let result: Awaited<ReturnType<typeof createMastraCode>> | undefined;\n\n  try {\n    result = await createMastraCode({\n      coAuthor: options?.coAuthor,\n      unixSocketPubSub: false,\n      disableMcp: false,\n      disableHooks: false,\n    });\n\n    const { controller, mcpManager, signalsPubSub } = result;\n\n    // Default modes (same as createMastraCode defaults)\n    const modes: AgentControllerMode[] = [\n      { id: 'build', name: 'Build' },\n      { id: 'plan', name: 'Plan' },\n      { id: 'fast', name: 'Fast' },\n    ];\n\n    // Cleanup function (mirrors main.ts asyncCleanup)\n    const cleanup = async () => {\n      releaseAllThreadLocks();\n      const closeSignalsPubSub = (signalsPubSub as { close?: () => Promise<void> | void } | undefined)?.close;\n      await Promise.allSettled([\n        mcpManager?.disconnect(),\n        controller?.getMastra()?.stopWorkers(),\n        controller?.stopIntervals(),\n        closeSignalsPubSub?.(),\n      ]);\n\n      // Restore console.log\n      // eslint-disable-next-line no-console\n      console.log = originalConsoleLog;\n    };\n\n    // Handle signals\n    const handleSignal = async () => {\n      await cleanup();\n      process.exit(0);\n    };\n\n    process.on('SIGINT', handleSignal);\n    process.on('SIGTERM', handleSignal);\n\n    await runAcpServer(controller, modes, cleanup);\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n    process.exit(1);\n  }\n}\n"],"mappings":";;;;;;;;;AAWA,eAAsB,QAAQ,SAGZ;CAChB,IAAI,SAAS,sBACX,eAAe,IAAI;CAIrB,MAAM,qBAAqB,QAAQ;CAEnC,QAAQ,OAAO,GAAG,SAAoB;EACpC,QAAQ,OAAO,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI;CACxD;CAEA,IAAI;CAEJ,IAAI;EACF,SAAS,MAAM,iBAAiB;GAC9B,UAAU,SAAS;GACnB,kBAAkB;GAClB,YAAY;GACZ,cAAc;EAChB,CAAC;EAED,MAAM,EAAE,YAAY,YAAY,kBAAkB;EAGlD,MAAM,QAA+B;GACnC;IAAE,IAAI;IAAS,MAAM;GAAQ;GAC7B;IAAE,IAAI;IAAQ,MAAM;GAAO;GAC3B;IAAE,IAAI;IAAQ,MAAM;GAAO;EAC7B;EAGA,MAAM,UAAU,YAAY;GAC1B,sBAAsB;GACtB,MAAM,qBAAsB,eAAsE;GAClG,MAAM,QAAQ,WAAW;IACvB,YAAY,WAAW;IACvB,YAAY,UAAU,CAAC,EAAE,YAAY;IACrC,YAAY,cAAc;IAC1B,qBAAqB;GACvB,CAAC;GAID,QAAQ,MAAM;EAChB;EAGA,MAAM,eAAe,YAAY;GAC/B,MAAM,QAAQ;GACd,QAAQ,KAAK,CAAC;EAChB;EAEA,QAAQ,GAAG,UAAU,YAAY;EACjC,QAAQ,GAAG,WAAW,YAAY;EAElC,MAAM,aAAa,YAAY,OAAO,OAAO;CAC/C,SAAS,OAAO;EACd,QAAQ,OAAO,MAAM,sBAAsB,MAAM,GAAG;EAEpD,QAAQ,MAAM;EACd,QAAQ,KAAK,CAAC;CAChB;AACF"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/acp/index.ts"],"sourcesContent":["import { setAutoApprove } from './event-mapper.js';\nimport { createAcpSession } from './runtime.js';\nimport { runAcpServer } from './server.js';\n\n/** Entry point for Mastra Code's ACP server over stdio. */\nexport async function acpMain(options?: {\n  dangerousAutoApprove?: boolean;\n  coAuthor?: { name?: string; email?: string };\n}): Promise<void> {\n  setAutoApprove(options?.dangerousAutoApprove === true);\n  // stdout is reserved for the JSON-RPC stream.\n  // eslint-disable-next-line no-console\n  const originalConsoleLog = console.log;\n  // eslint-disable-next-line no-console\n  console.log = (...args: unknown[]) => {\n    process.stderr.write(args.map(String).join(' ') + '\\n');\n  };\n  try {\n    await runAcpServer(request => createAcpSession(request, { coAuthor: options?.coAuthor }));\n  } catch (error) {\n    process.stderr.write(`[acp] Fatal error: ${error}\\n`);\n    process.exit(1);\n  } finally {\n    // eslint-disable-next-line no-console\n    console.log = originalConsoleLog;\n  }\n}\n"],"mappings":";;;;;AAKA,eAAsB,QAAQ,SAGZ;CAChB,eAAe,SAAS,yBAAyB,IAAI;CAGrD,MAAM,qBAAqB,QAAQ;CAEnC,QAAQ,OAAO,GAAG,SAAoB;EACpC,QAAQ,OAAO,MAAM,KAAK,IAAI,MAAM,CAAC,CAAC,KAAK,GAAG,IAAI,IAAI;CACxD;CACA,IAAI;EACF,MAAM,cAAa,YAAW,iBAAiB,SAAS,EAAE,UAAU,SAAS,SAAS,CAAC,CAAC;CAC1F,SAAS,OAAO;EACd,QAAQ,OAAO,MAAM,sBAAsB,MAAM,GAAG;EACpD,QAAQ,KAAK,CAAC;CAChB,UAAU;EAER,QAAQ,MAAM;CAChB;AACF"}

package/dist/acp/runtime.d.ts

@@ -0,0 +1,5 @@
+import type { NewSessionRequest } from '@agentclientprotocol/sdk';
+import type { MastraCodeConfig } from '../index.js';
+import type { AcpSessionRuntime } from './agent.js';
+export declare function createAcpSession(request: NewSessionRequest, options?: Pick<MastraCodeConfig, 'coAuthor'>): Promise<AcpSessionRuntime>;
+//# sourceMappingURL=runtime.d.ts.map

package/dist/acp/runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/acp/runtime.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGpD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,iBAAiB,EAC1B,OAAO,GAAE,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAM,GAC/C,OAAO,CAAC,iBAAiB,CAAC,CAgF5B"}

package/dist/acp/runtime.js

@@ -0,0 +1,80 @@
+import { withCleanupFailure } from "./errors.js";
+import { loadSettings, resolveDefaultThinkingLevel } from "../onboarding/settings.js";
+import { createMastraCode } from "../index.js";
+import { RequestError } from "@agentclientprotocol/sdk";
+//#region src/acp/runtime.ts
+async function createAcpSession(request, options = {}) {
+	const names = /* @__PURE__ */ new Set();
+	const servers = request.mcpServers.map((server) => {
+		if ("type" in server && server.type === "sse") throw RequestError.invalidParams(void 0, "Legacy SSE MCP servers are unsupported; use HTTP or stdio");
+		if (names.has(server.name)) throw RequestError.invalidParams(void 0, `Duplicate MCP server name: ${server.name}`);
+		names.add(server.name);
+		const config = "command" in server ? {
+			command: server.command,
+			args: server.args,
+			env: Object.fromEntries(server.env.map((item) => [item.name, item.value])),
+			cwd: request.cwd
+		} : {
+			url: server.url,
+			headers: Object.fromEntries(server.headers.map((item) => [item.name, item.value]))
+		};
+		return [server.name, config];
+	});
+	const result = await createMastraCode({
+		coAuthor: options.coAuthor,
+		cwd: request.cwd,
+		initialState: {
+			projectPath: request.cwd,
+			yolo: false,
+			permissionRules: {
+				categories: {},
+				tools: { ask_user: "deny" }
+			}
+		},
+		mcpServers: Object.fromEntries(servers),
+		disabledTools: ["ask_user"],
+		unixSocketPubSub: false,
+		disableMcp: false,
+		disableHooks: false,
+		disableEnvFile: true
+	});
+	const settings = loadSettings();
+	let cleanupPromise;
+	const runtime = {
+		controller: result.controller,
+		session: result.session,
+		modes: result.controller.listModes(),
+		getSkills: async () => (await result.controller.resolveWorkspace({ session: result.session }))?.skills,
+		getThinkingLevel: () => result.session.state.get().thinkingLevel ?? resolveDefaultThinkingLevel(settings, result.session.mode.get()).level,
+		cleanup: () => cleanupPromise ??= (async () => {
+			result.session.abort();
+			result.session.thread.detachFromCurrent();
+			result.stopPluginSignalProviders();
+			result.githubSignals?.stopAllPolling();
+			await Promise.allSettled([
+				result.session.thread.clearAndReleaseLock(),
+				result.mcpManager?.disconnect(),
+				result.controller.getMastra()?.stopWorkers(),
+				result.controller.stopIntervals(),
+				result.signalsPubSub?.close?.()
+			]);
+			await result.storage.close();
+		})()
+	};
+	try {
+		const failed = (await result.mcpManager?.initInBackground())?.failed.filter((server) => names.has(server.name)) ?? [];
+		if (failed.length) throw RequestError.internalError(void 0, failed.map((server) => `MCP server ${server.name}: ${server.error ?? "connection failed"}`).join("; "));
+		return runtime;
+	} catch (error) {
+		try {
+			await runtime.cleanup?.();
+		} catch (cleanupError) {
+			throw withCleanupFailure(error, cleanupError);
+		}
+		throw error;
+	}
+}
+//#endregion
+export { createAcpSession };
+
+//# sourceMappingURL=runtime.js.map

package/dist/acp/runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runtime.js","names":[],"sources":["../../src/acp/runtime.ts"],"sourcesContent":["import { RequestError } from '@agentclientprotocol/sdk';\nimport type { NewSessionRequest } from '@agentclientprotocol/sdk';\nimport { createMastraCode } from '../index.js';\nimport type { MastraCodeConfig } from '../index.js';\nimport type { McpServerConfig } from '../mcp/types.js';\nimport { loadSettings, resolveDefaultThinkingLevel } from '../onboarding/settings.js';\nimport type { AcpSessionRuntime } from './agent.js';\nimport { withCleanupFailure } from './errors.js';\n\nexport async function createAcpSession(\n  request: NewSessionRequest,\n  options: Pick<MastraCodeConfig, 'coAuthor'> = {},\n): Promise<AcpSessionRuntime> {\n  const names = new Set<string>();\n  const servers = request.mcpServers.map(server => {\n    if ('type' in server && server.type === 'sse')\n      throw RequestError.invalidParams(undefined, 'Legacy SSE MCP servers are unsupported; use HTTP or stdio');\n    if (names.has(server.name))\n      throw RequestError.invalidParams(undefined, `Duplicate MCP server name: ${server.name}`);\n    names.add(server.name);\n    const config: McpServerConfig =\n      'command' in server\n        ? {\n            command: server.command,\n            args: server.args,\n            env: Object.fromEntries(server.env.map(item => [item.name, item.value])),\n            cwd: request.cwd,\n          }\n        : { url: server.url, headers: Object.fromEntries(server.headers.map(item => [item.name, item.value])) };\n    return [server.name, config] as const;\n  });\n  const result = await createMastraCode({\n    coAuthor: options.coAuthor,\n    cwd: request.cwd,\n    initialState: {\n      projectPath: request.cwd,\n      yolo: false,\n      permissionRules: { categories: {}, tools: { ask_user: 'deny' } },\n    },\n    mcpServers: Object.fromEntries(servers),\n    // ACP clients can answer permission requests, but have no free-text tool response method.\n    disabledTools: ['ask_user'],\n    unixSocketPubSub: false,\n    disableMcp: false,\n    disableHooks: false,\n    // Project environment files must not mutate other ACP sessions.\n    disableEnvFile: true,\n  });\n  const settings = loadSettings();\n  let cleanupPromise: Promise<void> | undefined;\n  const runtime: AcpSessionRuntime = {\n    controller: result.controller,\n    session: result.session,\n    modes: result.controller.listModes(),\n    getSkills: async () => (await result.controller.resolveWorkspace({ session: result.session }))?.skills,\n    getThinkingLevel: () =>\n      result.session.state.get().thinkingLevel ??\n      resolveDefaultThinkingLevel(settings, result.session.mode.get()).level,\n    cleanup: () =>\n      (cleanupPromise ??= (async () => {\n        result.session.abort();\n        result.session.thread.detachFromCurrent();\n        result.stopPluginSignalProviders();\n        result.githubSignals?.stopAllPolling();\n        await Promise.allSettled([\n          result.session.thread.clearAndReleaseLock(),\n          result.mcpManager?.disconnect(),\n          result.controller.getMastra()?.stopWorkers(),\n          result.controller.stopIntervals(),\n          (result.signalsPubSub as { close?: () => void | Promise<void> } | undefined)?.close?.(),\n        ]);\n        await result.storage.close();\n      })()),\n  };\n  try {\n    const status = await result.mcpManager?.initInBackground();\n    const failed = status?.failed.filter(server => names.has(server.name)) ?? [];\n    if (failed.length)\n      throw RequestError.internalError(\n        undefined,\n        failed.map(server => `MCP server ${server.name}: ${server.error ?? 'connection failed'}`).join('; '),\n      );\n\n    return runtime;\n  } catch (error) {\n    try {\n      await runtime.cleanup?.();\n    } catch (cleanupError) {\n      throw withCleanupFailure(error, cleanupError);\n    }\n    throw error;\n  }\n}\n"],"mappings":";;;;;AASA,eAAsB,iBACpB,SACA,UAA8C,CAAC,GACnB;CAC5B,MAAM,wBAAQ,IAAI,IAAY;CAC9B,MAAM,UAAU,QAAQ,WAAW,KAAI,WAAU;EAC/C,IAAI,UAAU,UAAU,OAAO,SAAS,OACtC,MAAM,aAAa,cAAc,KAAA,GAAW,2DAA2D;EACzG,IAAI,MAAM,IAAI,OAAO,IAAI,GACvB,MAAM,aAAa,cAAc,KAAA,GAAW,8BAA8B,OAAO,MAAM;EACzF,MAAM,IAAI,OAAO,IAAI;EACrB,MAAM,SACJ,aAAa,SACT;GACE,SAAS,OAAO;GAChB,MAAM,OAAO;GACb,KAAK,OAAO,YAAY,OAAO,IAAI,KAAI,SAAQ,CAAC,KAAK,MAAM,KAAK,KAAK,CAAC,CAAC;GACvE,KAAK,QAAQ;EACf,IACA;GAAE,KAAK,OAAO;GAAK,SAAS,OAAO,YAAY,OAAO,QAAQ,KAAI,SAAQ,CAAC,KAAK,MAAM,KAAK,KAAK,CAAC,CAAC;EAAE;EAC1G,OAAO,CAAC,OAAO,MAAM,MAAM;CAC7B,CAAC;CACD,MAAM,SAAS,MAAM,iBAAiB;EACpC,UAAU,QAAQ;EAClB,KAAK,QAAQ;EACb,cAAc;GACZ,aAAa,QAAQ;GACrB,MAAM;GACN,iBAAiB;IAAE,YAAY,CAAC;IAAG,OAAO,EAAE,UAAU,OAAO;GAAE;EACjE;EACA,YAAY,OAAO,YAAY,OAAO;EAEtC,eAAe,CAAC,UAAU;EAC1B,kBAAkB;EAClB,YAAY;EACZ,cAAc;EAEd,gBAAgB;CAClB,CAAC;CACD,MAAM,WAAW,aAAa;CAC9B,IAAI;CACJ,MAAM,UAA6B;EACjC,YAAY,OAAO;EACnB,SAAS,OAAO;EAChB,OAAO,OAAO,WAAW,UAAU;EACnC,WAAW,aAAa,MAAM,OAAO,WAAW,iBAAiB,EAAE,SAAS,OAAO,QAAQ,CAAC,EAAA,EAAI;EAChG,wBACE,OAAO,QAAQ,MAAM,IAAI,CAAC,CAAC,iBAC3B,4BAA4B,UAAU,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC;EACnE,eACG,oBAAoB,YAAY;GAC/B,OAAO,QAAQ,MAAM;GACrB,OAAO,QAAQ,OAAO,kBAAkB;GACxC,OAAO,0BAA0B;GACjC,OAAO,eAAe,eAAe;GACrC,MAAM,QAAQ,WAAW;IACvB,OAAO,QAAQ,OAAO,oBAAoB;IAC1C,OAAO,YAAY,WAAW;IAC9B,OAAO,WAAW,UAAU,CAAC,EAAE,YAAY;IAC3C,OAAO,WAAW,cAAc;IAC/B,OAAO,eAAsE,QAAQ;GACxF,CAAC;GACD,MAAM,OAAO,QAAQ,MAAM;EAC7B,EAAA,CAAG;CACP;CACA,IAAI;EAEF,MAAM,UAAS,MADM,OAAO,YAAY,iBAAiB,EAAA,EAClC,OAAO,QAAO,WAAU,MAAM,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC;EAC3E,IAAI,OAAO,QACT,MAAM,aAAa,cACjB,KAAA,GACA,OAAO,KAAI,WAAU,cAAc,OAAO,KAAK,IAAI,OAAO,SAAS,qBAAqB,CAAC,CAAC,KAAK,IAAI,CACrG;EAEF,OAAO;CACT,SAAS,OAAO;EACd,IAAI;GACF,MAAM,QAAQ,UAAU;EAC1B,SAAS,cAAc;GACrB,MAAM,mBAAmB,OAAO,YAAY;EAC9C;EACA,MAAM;CACR;AACF"}

package/dist/acp/server.d.ts

@@ -1,7 +1,4 @@
-import type { AgentController, AgentControllerMode } from '@mastra/core/agent-controller';
-/**
- * Run the ACP server over stdio.
- * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.
- */
-export declare function runAcpServer(controller: AgentController, modes: AgentControllerMode[], cleanup?: () => Promise<void>): Promise<void>;
+import type { AcpSessionFactory } from './agent.js';
+/** Run the ACP server over stdio and release its sessions on disconnect. */
+export declare function runAcpServer(createSession: AcpSessionFactory): Promise<void>;
 //# sourceMappingURL=server.d.ts.map

package/dist/acp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/acp/server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAW,MAAM,+BAA+B,CAAC;AAGnG;;;GAGG;AACH,wBAAsB,YAAY,CAChC,UAAU,EAAE,eAAe,EAC3B,KAAK,EAAE,mBAAmB,EAAE,EAC5B,OAAO,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,GAC5B,OAAO,CAAC,IAAI,CAAC,CA+Bf"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/acp/server.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAEpD,4EAA4E;AAC5E,wBAAsB,YAAY,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmClF"}

package/dist/acp/server.js

@@ -1,32 +1,35 @@
 import { MastraCodeAcpAgent } from "./agent.js";
 import { AgentSideConnection, ndJsonStream } from "@agentclientprotocol/sdk";
-import { randomUUID } from "crypto";
 import { Readable, Writable } from "stream";
 //#region src/acp/server.ts
-/**
-* Run the ACP server over stdio.
-* This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.
-*/
-async function runAcpServer(controller, modes, cleanup) {
+/** Run the ACP server over stdio and release its sessions on disconnect. */
+async function runAcpServer(createSession) {
 	const input = Readable.toWeb(process.stdin);
-	const stream = ndJsonStream(Writable.toWeb(process.stdout), input);
-	let session;
+	const output = Writable.toWeb(process.stdout);
 	let agent;
-	try {
-		session = await controller.createSession({
-			id: `acp-${randomUUID()}`,
-			ownerId: `acp-owner-${randomUUID()}`
+	let cleanupPromise;
+	let shutdownPromise;
+	const dispose = () => cleanupPromise ??= Promise.resolve().then(() => agent?.dispose());
+	const handleSignal = () => {
+		shutdownPromise ??= dispose().then(() => process.exit(0), (error) => {
+			process.stderr.write(`[acp] Shutdown failed: ${error}\n`);
+			process.exit(1);
 		});
-		const activeSession = session;
+	};
+	process.on("SIGINT", handleSignal);
+	process.on("SIGTERM", handleSignal);
+	try {
 		await new AgentSideConnection((conn) => {
-			agent = new MastraCodeAcpAgent(conn, controller, activeSession, modes);
+			agent = new MastraCodeAcpAgent(conn, createSession);
 			return agent;
-		}, stream).closed;
+		}, ndJsonStream(output, input)).closed;
 	} finally {
-		agent?.dispose();
-		session?.thread.detachFromCurrent();
-		await session?.thread.clearAndReleaseLock();
-		if (cleanup) await cleanup();
+		try {
+			await dispose();
+		} finally {
+			process.off("SIGINT", handleSignal);
+			process.off("SIGTERM", handleSignal);
+		}
 	}
 }
 //#endregion

package/dist/acp/server.js.map

@@ -1 +1 @@
-{"version":3,"file":"server.js","names":[],"sources":["../../src/acp/server.ts"],"sourcesContent":["import { randomUUID } from 'node:crypto';\nimport { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport type { AgentController, AgentControllerMode, Session } from '@mastra/core/agent-controller';\nimport { MastraCodeAcpAgent } from './agent.js';\n\n/**\n * Run the ACP server over stdio.\n * This sets up the JSON-RPC stream and keeps the process alive until the client disconnects.\n */\nexport async function runAcpServer(\n  controller: AgentController,\n  modes: AgentControllerMode[],\n  cleanup?: () => Promise<void>,\n): Promise<void> {\n  // Create the ndJSON stream from stdin/stdout\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  const stream = ndJsonStream(output, input);\n  let session: Session | undefined;\n  let agent: MastraCodeAcpAgent | undefined;\n\n  // Handle cleanup on disconnect (success or error)\n  try {\n    session = await controller.createSession({\n      id: `acp-${randomUUID()}`,\n      ownerId: `acp-owner-${randomUUID()}`,\n    });\n    const activeSession = session;\n\n    // Create the agent-side connection\n    const connection = new AgentSideConnection(conn => {\n      agent = new MastraCodeAcpAgent(conn, controller, activeSession, modes);\n      return agent;\n    }, stream);\n\n    await connection.closed;\n  } finally {\n    agent?.dispose();\n    session?.thread.detachFromCurrent();\n    await session?.thread.clearAndReleaseLock();\n    if (cleanup) {\n      await cleanup();\n    }\n  }\n}\n"],"mappings":";;;;;;;;;AAUA,eAAsB,aACpB,YACA,OACA,SACe;CAEf,MAAM,QAAQ,SAAS,MAAM,QAAQ,KAAK;CAE1C,MAAM,SAAS,aADA,SAAS,MAAM,QAAQ,MACL,GAAG,KAAK;CACzC,IAAI;CACJ,IAAI;CAGJ,IAAI;EACF,UAAU,MAAM,WAAW,cAAc;GACvC,IAAI,OAAO,WAAW;GACtB,SAAS,aAAa,WAAW;EACnC,CAAC;EACD,MAAM,gBAAgB;EAQtB,MAAM,IALiB,qBAAoB,SAAQ;GACjD,QAAQ,IAAI,mBAAmB,MAAM,YAAY,eAAe,KAAK;GACrE,OAAO;EACT,GAAG,MAEY,CAAC,CAAC;CACnB,UAAU;EACR,OAAO,QAAQ;EACf,SAAS,OAAO,kBAAkB;EAClC,MAAM,SAAS,OAAO,oBAAoB;EAC1C,IAAI,SACF,MAAM,QAAQ;CAElB;AACF"}
+{"version":3,"file":"server.js","names":[],"sources":["../../src/acp/server.ts"],"sourcesContent":["import { Readable, Writable } from 'node:stream';\nimport { AgentSideConnection, ndJsonStream } from '@agentclientprotocol/sdk';\nimport { MastraCodeAcpAgent } from './agent.js';\nimport type { AcpSessionFactory } from './agent.js';\n\n/** Run the ACP server over stdio and release its sessions on disconnect. */\nexport async function runAcpServer(createSession: AcpSessionFactory): Promise<void> {\n  const input = Readable.toWeb(process.stdin) as ReadableStream<Uint8Array>;\n  const output = Writable.toWeb(process.stdout) as WritableStream<Uint8Array>;\n  let agent: MastraCodeAcpAgent | undefined;\n  let cleanupPromise: Promise<void> | undefined;\n  let shutdownPromise: Promise<void> | undefined;\n  const dispose = () => (cleanupPromise ??= Promise.resolve().then(() => agent?.dispose()));\n  const handleSignal = () => {\n    shutdownPromise ??= dispose().then(\n      () => process.exit(0),\n      error => {\n        process.stderr.write(`[acp] Shutdown failed: ${error}\\n`);\n        process.exit(1);\n      },\n    );\n  };\n  process.on('SIGINT', handleSignal);\n  process.on('SIGTERM', handleSignal);\n  try {\n    const connection = new AgentSideConnection(\n      conn => {\n        agent = new MastraCodeAcpAgent(conn, createSession);\n        return agent;\n      },\n      ndJsonStream(output, input),\n    );\n    await connection.closed;\n  } finally {\n    try {\n      await dispose();\n    } finally {\n      process.off('SIGINT', handleSignal);\n      process.off('SIGTERM', handleSignal);\n    }\n  }\n}\n"],"mappings":";;;;;AAMA,eAAsB,aAAa,eAAiD;CAClF,MAAM,QAAQ,SAAS,MAAM,QAAQ,KAAK;CAC1C,MAAM,SAAS,SAAS,MAAM,QAAQ,MAAM;CAC5C,IAAI;CACJ,IAAI;CACJ,IAAI;CACJ,MAAM,gBAAiB,mBAAmB,QAAQ,QAAQ,CAAC,CAAC,WAAW,OAAO,QAAQ,CAAC;CACvF,MAAM,qBAAqB;EACzB,oBAAoB,QAAQ,CAAC,CAAC,WACtB,QAAQ,KAAK,CAAC,IACpB,UAAS;GACP,QAAQ,OAAO,MAAM,0BAA0B,MAAM,GAAG;GACxD,QAAQ,KAAK,CAAC;EAChB,CACF;CACF;CACA,QAAQ,GAAG,UAAU,YAAY;CACjC,QAAQ,GAAG,WAAW,YAAY;CAClC,IAAI;EAQF,MAAM,IAPiB,qBACrB,SAAQ;GACN,QAAQ,IAAI,mBAAmB,MAAM,aAAa;GAClD,OAAO;EACT,GACA,aAAa,QAAQ,KAAK,CAEb,CAAC,CAAC;CACnB,UAAU;EACR,IAAI;GACF,MAAM,QAAQ;EAChB,UAAU;GACR,QAAQ,IAAI,UAAU,YAAY;GAClC,QAAQ,IAAI,WAAW,YAAY;EACrC;CACF;AACF"}

package/dist/acp/skills.d.ts

@@ -0,0 +1,6 @@
+import type { AvailableCommand } from '@agentclientprotocol/sdk';
+import type { WorkspaceSkills } from '@mastra/core/workspace';
+export type AcpSkills = Pick<WorkspaceSkills, 'list' | 'get' | 'maybeRefresh'>;
+export declare function listSkillCommands(skills?: AcpSkills): Promise<AvailableCommand[]>;
+export declare function expandSkillCommand(content: string, skills: AcpSkills | undefined, commands: AvailableCommand[]): Promise<string>;
+//# sourceMappingURL=skills.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"skills.d.ts","sourceRoot":"","sources":["../../src/acp/skills.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAEjE,OAAO,KAAK,EAAiB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7E,MAAM,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,EAAE,MAAM,GAAG,KAAK,GAAG,cAAc,CAAC,CAAC;AAU/E,wBAAsB,iBAAiB,CAAC,MAAM,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAQvF;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,SAAS,GAAG,SAAS,EAC7B,QAAQ,EAAE,gBAAgB,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,CAoBjB"}