diff --git a/packages/shared/src/agent-permissions-migration.ts b/packages/shared/src/agent-permissions-migration.ts
index cda447361c9..2066603cba8 100644
--- a/packages/shared/src/agent-permissions-migration.ts
+++ b/packages/shared/src/agent-permissions-migration.ts
@@ -41,7 +41,7 @@ export const LEGACY_BUILTIN_TERMINAL_AGENT_OVERRIDES: Readonly<
 	},
 	copilot: {
 		command: "copilot --allow-all",
-		promptCommand: "copilot -i --allow-all",
+		promptCommand: "copilot --allow-all -i",
 		promptCommandSuffix: "--yolo",
 	},
 	"cursor-agent": {
diff --git a/packages/shared/src/builtin-terminal-agents.ts b/packages/shared/src/builtin-terminal-agents.ts
index 294098270ae..2e748878355 100644
--- a/packages/shared/src/builtin-terminal-agents.ts
+++ b/packages/shared/src/builtin-terminal-agents.ts
@@ -100,6 +100,8 @@ export const BUILTIN_TERMINAL_AGENTS = [
 		description:
 			"Mastra's coding agent for building, debugging, and shipping code from the terminal.",
 		command: "mastracode",
+		promptCommand: "mastracode --prompt",
+		promptCommandSuffix: "; mastracode",
 	}),
 	createBuiltinTerminalAgent({
 		id: "opencode",
@@ -121,7 +123,7 @@ export const BUILTIN_TERMINAL_AGENTS = [
 		description:
 			"GitHub's coding agent for planning, editing, and building in your repo.",
 		command: "copilot --allow-tool=write",
-		promptCommand: "copilot -i --allow-tool=write",
+		promptCommand: "copilot --allow-tool=write -i",
 		includeInDefaultTerminalPresets: true,
 	}),
 	createBuiltinTerminalAgent({