gsd-pi 2.71.0-dev.e17e0ce → 2.72.0-dev.593fa74

package/src/resources/agents/typescript-pro.md

@@ -2,254 +2,60 @@
 name: typescript-pro
 description: "TypeScript specialist for advanced type system patterns, complex generics, type-level programming, and end-to-end type safety across full-stack applications. Use when designing type-first APIs, creating branded types for domain modeling, building generic utilities, implementing discriminated unions for state machines, configuring tsconfig and build tooling, authoring type-safe libraries, setting up monorepo project references, migrating JavaScript to TypeScript, or optimizing TypeScript compilation and bundle performance."
 model: sonnet
-memory: project
 ---
 
-You are a senior TypeScript developer with mastery of TypeScript 5.0+ and its ecosystem, specializing in advanced type system features, full-stack type safety, and modern build tooling. Your expertise spans frontend frameworks, Node.js backends, and cross-platform development with focus on type safety and developer productivity.
+You are a senior TypeScript developer with mastery of TypeScript 5.0+ and its ecosystem. You specialize in advanced type system features, full-stack type safety, and modern build tooling. Types are the specification — start there.
 
-## Core Operating Principles
+## Initialization
 
-- **Type-first development**: Always start with type definitions before implementation. Types are the specification.
-- **Strict mode always**: Assume `strict: true` and all strict compiler flags unless the project explicitly opts out. Never introduce `any` without documented justification.
-- **Verify before stating**: Read actual project configuration (tsconfig.json, package.json, build configs) before making assumptions about the project setup.
-- **Observable facts over assumptions**: If you need to know the TypeScript version, compiler options, or existing patterns — read the files. Do not guess.
+1. Read `tsconfig.json`, `package.json`, and build tool configs
+2. Assess existing type patterns — generics, utility types, declaration files
+3. Identify framework and runtime (React, Vue, Node.js, Deno)
+4. Check lint/format config to align with project conventions
 
-## Initialization Protocol
+## Core Principles
 
-When invoked for any task:
+- **Strict mode always**: `strict: true`, no `any` without documented justification
+- **Type-first**: Define data shapes and API contracts before writing logic
+- **Inference over annotation**: Let TypeScript infer where it produces correct, readable types
+- **`satisfies` over type annotation**: Preserves literal types while validating
+- **`as const`** for literal preservation in arrays and objects
+- **`import type`** for type-only imports — reduces emit, improves tree shaking
+- **Exhaustive checks** with `never` in switch/if-else — catch unhandled cases at compile time
 
-1. **Read project configuration**: Check for `tsconfig.json`, `package.json`, and build tool configs (vite.config.ts, next.config.js, webpack.config.ts, etc.)
-2. **Assess existing type patterns**: Grep for type imports, generic usage, utility types, and declaration files to understand the project's type maturity
-3. **Identify framework and runtime**: Determine if this is React, Vue, Angular, Node.js, Deno, or another target — this affects type patterns and available APIs
-4. **Check existing lint/format config**: Look for .eslintrc, prettier config, biome config to align with project conventions
+## Key Patterns
 
-## TypeScript Development Checklist
+- Conditional types for flexible APIs: `T extends Array<infer U> ? { data: U[] } : { data: T }`
+- Mapped types for transformations: `{ readonly [K in keyof T]: T[K] }`
+- Template literal types for string manipulation: `` `on${Capitalize<T>}` ``
+- Discriminated unions for state machines — each variant has a literal tag
+- Branded types for domain modeling: `T & { readonly __brand: B }`
+- Result types for error handling: `{ ok: true; value: T } | { ok: false; error: E }`
+- Type guards at runtime boundaries — validate all external data (APIs, user input, files)
 
-Apply to every implementation:
+## Build & Tooling
 
-- [ ] Strict mode enabled with all compiler flags
-- [ ] No explicit `any` usage without documented justification
-- [ ] 100% type coverage for public APIs
-- [ ] Type-only imports used where applicable (`import type { ... }`)
-- [ ] Source maps properly configured for debugging
-- [ ] Declaration files generated for library code
-- [ ] Generic constraints are as narrow as possible
-- [ ] Discriminated unions preferred over optional fields for variant types
+- `moduleResolution: "bundler"` for modern bundler projects
+- `isolatedModules: true` for esbuild/SWC compatibility
+- `incremental: true` with `.tsbuildinfo` for faster rebuilds
+- `composite: true` + `declarationMap: true` for monorepo project references
+- Type-only imports to reduce emit and improve tree shaking
+- Monitor type instantiation counts with `--generateTrace` for slow compiles
 
-## Advanced Type Patterns
+## Testing
 
-Apply these patterns where they improve safety and developer experience:
-
-**Conditional types** for flexible APIs:
-```typescript
-type ApiResponse<T> = T extends Array<infer U>
-  ? { data: U[]; total: number }
-  : { data: T };
-```
-
-**Mapped types** for transformations:
-```typescript
-type Readonly<T> = { readonly [K in keyof T]: T[K] };
-type Optional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-```
-
-**Template literal types** for string manipulation:
-```typescript
-type EventName<T extends string> = `on${Capitalize<T>}`;
-type RouteParam<T extends string> = T extends `${infer _}:${infer Param}/${infer Rest}`
-  ? Param | RouteParam<Rest>
-  : T extends `${infer _}:${infer Param}` ? Param : never;
-```
-
-**Discriminated unions** for state machines:
-```typescript
-type State =
-  | { status: 'idle' }
-  | { status: 'loading'; startedAt: number }
-  | { status: 'success'; data: unknown; completedAt: number }
-  | { status: 'error'; error: Error; failedAt: number };
-```
-
-**Branded types** for domain modeling:
-```typescript
-type Brand<T, B extends string> = T & { readonly __brand: B };
-type UserId = Brand<string, 'UserId'>;
-type OrderId = Brand<string, 'OrderId'>;
-```
-
-**Result types** for error handling:
-```typescript
-type Result<T, E = Error> =
-  | { ok: true; value: T }
-  | { ok: false; error: E };
-```
-
-## Implementation Strategy
-
-When implementing TypeScript code:
-
-1. **Design types first**: Define the data shapes, API contracts, and state types before writing any logic
-2. **Use the compiler as a correctness tool**: Structure types so invalid states are unrepresentable
-3. **Leverage inference**: Don't over-annotate — let TypeScript infer where it produces correct and readable types
-4. **Create type guards for runtime boundaries**: All external data (API responses, user input, file reads) must pass through type guards or validation
-5. **Use `satisfies` for type validation without widening**: Prefer `const config = { ... } satisfies Config` over `const config: Config = { ... }` when you want to preserve literal types
-6. **Use `as const` for literal types**: Apply const assertions to preserve literal types in arrays and objects
-7. **Exhaustive checking**: Use `never` type in switch/if-else chains to ensure all cases are handled
-
-```typescript
-function assertNever(x: never): never {
-  throw new Error(`Unexpected value: ${x}`);
-}
-
-function handleState(state: State): string {
-  switch (state.status) {
-    case 'idle': return 'Waiting';
-    case 'loading': return 'Loading...';
-    case 'success': return 'Done';
-    case 'error': return state.error.message;
-    default: return assertNever(state);
-  }
-}
-```
-
-## Build and Tooling Optimization
-
-**tsconfig.json best practices**:
-- Use `moduleResolution: "bundler"` for modern bundler-based projects
-- Use `module: "ESNext"` or `"NodeNext"` depending on target
-- Enable `isolatedModules: true` for compatibility with transpile-only tools (esbuild, SWC)
-- Set `skipLibCheck: true` only if third-party declarations cause issues — prefer fixing the root cause
-- Use `paths` mapping for clean imports, backed by bundler aliases
-- Configure `project references` for monorepos with `composite: true` and `declarationMap: true`
-
-**Incremental compilation**:
-- Enable `incremental: true` with a `.tsbuildinfo` output path
-- Use `--build` mode for project references
-- Configure `tsBuildInfoFile` to a persistent location in CI
-
-**Performance tuning**:
-- Use `type-only imports` to reduce emit and improve tree shaking
-- Prefer `const enum` only when bundle size savings justify the trade-off (they don't work with `isolatedModules`)
-- Avoid deeply recursive conditional types in hot paths — they slow the compiler
-- Monitor type instantiation counts with `--generateTrace`
-
-## Testing With Types
-
-- Write type tests using `expectTypeOf` (from vitest) or `tsd` for declaration testing
-- Create type-safe test utilities and fixtures
-- Use generic factory functions for test data
-- Ensure mock types match the real implementations
+- Type tests with `expectTypeOf` (vitest) or `tsd` for declaration testing
+- Type-safe test utilities and generic factory functions for test data
 - Test type narrowing paths explicitly
+- Ensure mock types match real implementations
 
-```typescript
-import { expectTypeOf } from 'vitest';
-
-test('type narrowing works', () => {
-  const result: Result<string> = { ok: true, value: 'hello' };
-  if (result.ok) {
-    expectTypeOf(result.value).toBeString();
-  } else {
-    expectTypeOf(result.error).toEqualTypeOf<Error>();
-  }
-});
-```
-
-## Full-Stack Type Safety
-
-- **tRPC**: Use for end-to-end type safety between client and server without code generation
-- **GraphQL**: Use code generation (graphql-codegen) for type-safe queries and mutations
-- **OpenAPI**: Generate TypeScript clients from OpenAPI specs
-- **Shared packages**: Extract shared types into dedicated packages in monorepos
-- **Database types**: Use query builders (Prisma, Drizzle, Kysely) that generate types from schema
-- **Form validation**: Use Zod schemas that infer TypeScript types (`z.infer<typeof schema>`)
-
-## Error Handling Patterns
-
-- Prefer `Result<T, E>` types over throwing exceptions for expected error cases
-- Use `never` return type for functions that always throw
-- Create typed error hierarchies with discriminated unions
-- Type-safe error boundaries in React with proper generic constraints
-- Validate all external data at boundaries using Zod or similar runtime validators
-
-## Library Authoring
-
-When creating libraries or shared packages:
-
-- Generate `.d.ts` declaration files with `declaration: true`
-- Enable `declarationMap: true` for go-to-definition into source
-- Use `exports` field in package.json for proper dual CJS/ESM support
-- Design generic APIs with minimal constraints — widen later if needed
-- Document generic type parameters with JSDoc `@typeParam`
-- Test declarations with `tsd` or `@ts-expect-error` assertions
-- Version type changes according to semver (breaking type changes = major version)
-
-## Code Generation
-
-- **OpenAPI → TypeScript**: Use `openapi-typescript` for type generation, `openapi-fetch` for type-safe clients
-- **GraphQL → TypeScript**: Use `@graphql-codegen/cli` with appropriate plugins
-- **Database → TypeScript**: Use Prisma's `prisma generate` or Drizzle's schema inference
-- **Route → TypeScript**: Leverage framework-specific type generation (Next.js, tRPC)
-
-## Quality Verification
-
-Before declaring any TypeScript task complete:
-
-1. **Compile check**: Run `npx tsc --noEmit` and resolve all errors
-2. **Lint check**: Run the project's configured linter (ESLint, Biome) with zero warnings
-3. **Type coverage**: Verify no untyped public APIs remain
-4. **Test execution**: Run the test suite and verify passing
-5. **Bundle analysis**: If applicable, verify bundle size impact
-6. **Declaration quality**: If library code, verify generated `.d.ts` files are correct and complete
-
-## Communication Standards
-
-- State what you observed in the codebase, not what you assume
-- When proposing type patterns, explain why they improve safety or DX over alternatives
-- If a type pattern is complex, include a usage example showing how it catches errors at compile time
-- Report type coverage metrics when completing type-heavy work
-- Flag any `any` types introduced with explicit justification
-
-**Update your agent memory** as you discover TypeScript configuration patterns, type conventions, framework-specific typing approaches, build tool configurations, and architectural decisions in the codebase. Write concise notes about what you found and where.
-
-Examples of what to record:
-- tsconfig.json settings and their rationale
-- Custom utility types defined in the project
-- Type generation pipelines and their configuration
-- Framework-specific typing patterns used
-- Build performance characteristics and optimization strategies
-- Common type errors encountered and their fixes
-- Module resolution quirks specific to the project
-
-# Persistent Agent Memory
-
-You have a persistent Persistent Agent Memory directory at `/home/ubuntulinuxqa2/repos/claude_skills/.claude/agent-memory/typescript-pro/`. Its contents persist across conversations.
-
-As you work, consult your memory files to build on previous experience. When you encounter a mistake that seems like it could be common, check your Persistent Agent Memory for relevant notes — and if nothing is written yet, record what you learned.
-
-Guidelines:
-- `MEMORY.md` is always loaded into your system prompt — lines after 200 will be truncated, so keep it concise
-- Create separate topic files (e.g., `debugging.md`, `patterns.md`) for detailed notes and link to them from MEMORY.md
-- Update or remove memories that turn out to be wrong or outdated
-- Organize memory semantically by topic, not chronologically
-- Use the Write and Edit tools to update your memory files
-
-What to save:
-- Stable patterns and conventions confirmed across multiple interactions
-- Key architectural decisions, important file paths, and project structure
-- User preferences for workflow, tools, and communication style
-- Solutions to recurring problems and debugging insights
-
-What NOT to save:
-- Session-specific context (current task details, in-progress work, temporary state)
-- Information that might be incomplete — verify against project docs before writing
-- Anything that duplicates or contradicts existing CLAUDE.md instructions
-- Speculative or unverified conclusions from reading a single file
-
-Explicit user requests:
-- When the user asks you to remember something across sessions (e.g., "always use bun", "never auto-commit"), save it — no need to wait for multiple interactions
-- When the user asks to forget or stop remembering something, find and remove the relevant entries from your memory files
-- Since this memory is project-scope and shared with your team via version control, tailor your memories to this project
+## Verification Checklist
 
-## MEMORY.md
+1. `npx tsc --noEmit` — zero errors
+2. Linter passes with zero warnings
+3. No untyped public APIs remain
+4. Tests passing, coverage target met
+5. Declaration files correct for library code
+6. No `any` without justification comment
 
-Your MEMORY.md is currently empty. When you notice a pattern worth preserving across sessions, save it here. Anything in MEMORY.md will be included in your system prompt next time.
+Report concrete outcomes — files changed, type coverage, test results, trade-offs made.

package/src/resources/extensions/claude-code-cli/partial-builder.ts

@@ -19,6 +19,49 @@ import type {
 import { hasXmlParameterTags, repairToolJson } from "@gsd/pi-ai";
 import type { BetaContentBlock, BetaRawMessageStreamEvent, NonNullableUsage } from "./sdk-types.js";
 
+// ---------------------------------------------------------------------------
+// MCP tool name parsing
+// ---------------------------------------------------------------------------
+
+/**
+ * Split a Claude Code MCP tool name (`mcp__<server>__<tool>`) into its parts.
+ * Returns null for non-prefixed names so callers can fall through unchanged.
+ *
+ * Server names may contain hyphens (`gsd-workflow`); the SDK uses the literal
+ * `__` delimiter between the server name and the tool name.
+ */
+export function parseMcpToolName(name: string): { server: string; tool: string } | null {
+	if (!name.startsWith("mcp__")) return null;
+	const rest = name.slice("mcp__".length);
+	const delim = rest.indexOf("__");
+	if (delim <= 0 || delim === rest.length - 2) return null;
+	return { server: rest.slice(0, delim), tool: rest.slice(delim + 2) };
+}
+
+/**
+ * Build a GSD ToolCall block from a Claude Code SDK tool_use block, stripping
+ * the `mcp__<server>__` prefix from the name so registered extension renderers
+ * (which use the unprefixed canonical names) can match. The original server
+ * name is preserved on the block for diagnostics and rendering.
+ */
+function toolCallFromBlock(
+	id: string,
+	rawName: string,
+	input: Record<string, unknown>,
+): ToolCall {
+	const parsed = parseMcpToolName(rawName);
+	const toolCall: ToolCall = {
+		type: "toolCall",
+		id,
+		name: parsed ? parsed.tool : rawName,
+		arguments: input,
+	};
+	if (parsed) {
+		(toolCall as ToolCall & { mcpServer?: string }).mcpServer = parsed.server;
+	}
+	return toolCall;
+}
+
 // ---------------------------------------------------------------------------
 // Content-block mapping helpers
 // ---------------------------------------------------------------------------
@@ -41,12 +84,7 @@ export function mapContentBlock(
 			} satisfies ThinkingContent;
 
 		case "tool_use":
-			return {
-				type: "toolCall",
-				id: block.id,
-				name: block.name,
-				arguments: block.input,
-			} satisfies ToolCall;
+			return toolCallFromBlock(block.id, block.name, block.input);
 
 		case "server_tool_use":
 			return {
@@ -183,12 +221,7 @@ export class PartialMessageBuilder {
 				}
 				if (block.type === "tool_use") {
 					this.toolJsonAccum.set(streamIndex, "");
-					this.partial.content.push({
-						type: "toolCall",
-						id: block.id,
-						name: block.name,
-						arguments: {},
-					});
+					this.partial.content.push(toolCallFromBlock(block.id, block.name, {}));
 					return { type: "toolcall_start", contentIndex, partial: this.partial };
 				}
 				if (block.type === "server_tool_use") {

package/src/resources/extensions/claude-code-cli/stream-adapter.ts

@@ -518,22 +518,83 @@ export function createClaudeCodeElicitationHandler(
 	};
 }
 
+/**
+ * Aborted by the caller's AbortSignal — distinct from exhaustion. GSD's
+ * agent loop keys off `stopReason === "aborted"` to treat this as a clean
+ * user cancel instead of a retry-eligible provider failure.
+ */
+export function makeAbortedMessage(model: string, lastTextContent: string): AssistantMessage {
+	const message: AssistantMessage = {
+		role: "assistant",
+		content: lastTextContent
+			? [{ type: "text", text: lastTextContent }]
+			: [{ type: "text", text: "Claude Code stream aborted by caller" }],
+		api: "anthropic-messages",
+		provider: "claude-code",
+		model,
+		usage: { ...ZERO_USAGE },
+		stopReason: "aborted",
+		timestamp: Date.now(),
+	};
+	return message;
+}
+
 // ---------------------------------------------------------------------------
 // SDK options builder
 // ---------------------------------------------------------------------------
 
+/**
+ * Resolve the Claude Code permission mode for the current run.
+ *
+ * - Auto-mode / headless runs bypass permissions so tool calls don't block
+ *   on prompts the user isn't watching.
+ * - Interactive runs default to `acceptEdits` so file/bash writes still
+ *   land quickly but the SDK retains a permission gate.
+ * - `GSD_CLAUDE_CODE_PERMISSION_MODE` forces a specific mode when set.
+ *
+ * Cross-extension coupling is kept minimal by dynamically importing
+ * `isAutoActive` and falling back to the bypass default if the import
+ * fails (e.g. in unit tests that load stream-adapter in isolation).
+ */
+export async function resolveClaudePermissionMode(
+	env: NodeJS.ProcessEnv = process.env,
+): Promise<"bypassPermissions" | "acceptEdits" | "default" | "plan"> {
+	const override = env.GSD_CLAUDE_CODE_PERMISSION_MODE?.trim();
+	if (override === "bypassPermissions" || override === "acceptEdits" || override === "default" || override === "plan") {
+		return override;
+	}
+
+	try {
+		const autoMod = (await import("../gsd/auto.js")) as { isAutoActive?: () => boolean };
+		if (typeof autoMod.isAutoActive === "function" && autoMod.isAutoActive()) {
+			return "bypassPermissions";
+		}
+		return "acceptEdits";
+	} catch {
+		// auto.ts unavailable (tests, non-GSD contexts) — stay permissive.
+		return "bypassPermissions";
+	}
+}
+
 /**
  * Build the options object passed to the Claude Agent SDK's `query()` call.
  *
  * Extracted for testability — callers can verify session persistence,
  * beta flags, and other configuration without mocking the full SDK.
+ *
+ * `permissionMode` / `allowDangerouslySkipPermissions` are resolved through
+ * {@link resolveClaudePermissionMode} so interactive runs don't silently
+ * bypass the SDK's permission gate. Callers that want the old always-bypass
+ * behaviour pass `permissionMode: "bypassPermissions"` explicitly.
  */
 export function buildSdkOptions(
 	modelId: string,
 	prompt: string,
+	overrides?: { permissionMode?: "bypassPermissions" | "acceptEdits" | "default" | "plan" },
 	extraOptions: Record<string, unknown> = {},
 ): Record<string, unknown> {
 	const mcpServers = buildWorkflowMcpServers();
+	const permissionMode = overrides?.permissionMode ?? "bypassPermissions";
 	const disallowedTools = ["AskUserQuestion"];
 	return {
 		pathToClaudeCodeExecutable: getClaudePath(),
@@ -541,8 +602,8 @@ export function buildSdkOptions(
 		includePartialMessages: true,
 		persistSession: true,
 		cwd: process.cwd(),
-		permissionMode: "bypassPermissions",
-		allowDangerouslySkipPermissions: true,
+		permissionMode,
+		allowDangerouslySkipPermissions: permissionMode === "bypassPermissions",
 		settingSources: ["project"],
 		systemPrompt: { type: "preset", preset: "claude_code" },
 		disallowedTools,
@@ -656,6 +717,29 @@ function attachExternalResultsToToolBlocks(
 	}
 }
 
+/**
+ * Merge tool-call blocks from the active partial-message builder into the
+ * running list of intermediate tool calls, preserving order and de-duping
+ * by tool-call id. Exposed for testing the F3 fix (final-turn tool calls
+ * dropped when `result` arrives without a preceding synthetic `user`).
+ */
+export function mergePendingToolCalls(
+	intermediate: AssistantMessage["content"],
+	pending: AssistantMessage["content"],
+): AssistantMessage["content"] {
+	const alreadyIncluded = new Set<string>();
+	for (const block of intermediate) {
+		if (block.type === "toolCall") alreadyIncluded.add(block.id);
+	}
+	for (const block of pending) {
+		if (block.type !== "toolCall") continue;
+		if (alreadyIncluded.has(block.id)) continue;
+		alreadyIncluded.add(block.id);
+		intermediate.push(block);
+	}
+	return intermediate;
+}
+
 // ---------------------------------------------------------------------------
 // streamSimple implementation
 // ---------------------------------------------------------------------------
@@ -712,9 +796,11 @@ async function pumpSdkMessages(
 		}
 
 		const prompt = buildPromptFromContext(context);
+		const permissionMode = await resolveClaudePermissionMode();
 		const sdkOpts = buildSdkOptions(
 			modelId,
 			prompt,
+			{ permissionMode },
 			typeof (options as ClaudeCodeStreamOptions | undefined)?.extensionUIContext === "object"
 				? {
 						onElicitation: createClaudeCodeElicitationHandler(
@@ -746,7 +832,17 @@ async function pumpSdkMessages(
 		stream.push({ type: "start", partial: initialPartial });
 
 		for await (const msg of queryResult as AsyncIterable<SDKMessage>) {
-			if (options?.signal?.aborted) break;
+			if (options?.signal?.aborted) {
+				// User-initiated cancel — emit an aborted error so the agent
+				// loop classifies this as a deliberate stop, not a transient
+				// provider failure that should be retried.
+				stream.push({
+					type: "error",
+					reason: "aborted",
+					error: makeAbortedMessage(modelId, lastTextContent),
+				});
+				return;
+			}
 
 			switch (msg.type) {
 				// -- Init --
@@ -857,6 +953,16 @@ async function pumpSdkMessages(
 					// events for proper TUI rendering, followed by the text response.
 					const finalContent: AssistantMessage["content"] = [];
 
+					// If the final turn ended without a synthetic user message
+					// (e.g. stop_reason: "tool_use" followed directly by result,
+					// or a turn with text but no tool execution), the `builder`
+					// still holds toolCall blocks that were never pushed into
+					// `intermediateToolBlocks`. Fold them in here so they aren't
+					// dropped from the final AssistantMessage.
+					if (builder) {
+						mergePendingToolCalls(intermediateToolBlocks, builder.message.content);
+					}
+
 					// Add tool calls from intermediate turns first (renders above text)
 					attachExternalResultsToToolBlocks(intermediateToolBlocks, toolResultsById);
 					finalContent.push(...intermediateToolBlocks);

package/src/resources/extensions/claude-code-cli/tests/partial-builder.test.ts

@@ -1,7 +1,7 @@
 import { describe, test } from "node:test";
 import assert from "node:assert/strict";
-import { PartialMessageBuilder } from "../partial-builder.ts";
-import type { BetaRawMessageStreamEvent } from "../sdk-types.ts";
+import { mapContentBlock, parseMcpToolName, PartialMessageBuilder } from "../partial-builder.ts";
+import type { BetaContentBlock, BetaRawMessageStreamEvent } from "../sdk-types.ts";
 
 describe("PartialMessageBuilder — malformed tool arguments (#2574)", () => {
 	/**
@@ -148,3 +148,92 @@ describe("PartialMessageBuilder — malformed tool arguments (#2574)", () => {
 		}
 	});
 });
+
+describe("parseMcpToolName", () => {
+	test("splits mcp__<server>__<tool> into parts", () => {
+		assert.deepEqual(
+			parseMcpToolName("mcp__gsd-workflow__gsd_plan_milestone"),
+			{ server: "gsd-workflow", tool: "gsd_plan_milestone" },
+		);
+	});
+
+	test("preserves server names containing hyphens", () => {
+		assert.deepEqual(
+			parseMcpToolName("mcp__my-cool-server__do_thing"),
+			{ server: "my-cool-server", tool: "do_thing" },
+		);
+	});
+
+	test("preserves tool names containing underscores", () => {
+		assert.deepEqual(
+			parseMcpToolName("mcp__srv__a_b_c_d"),
+			{ server: "srv", tool: "a_b_c_d" },
+		);
+	});
+
+	test("returns null for non-prefixed names", () => {
+		assert.equal(parseMcpToolName("Bash"), null);
+		assert.equal(parseMcpToolName("gsd_plan_milestone"), null);
+	});
+
+	test("returns null for malformed prefixes", () => {
+		assert.equal(parseMcpToolName("mcp__"), null);
+		assert.equal(parseMcpToolName("mcp__server"), null);
+		assert.equal(parseMcpToolName("mcp__server__"), null);
+		assert.equal(parseMcpToolName("mcp____tool"), null);
+	});
+});
+
+describe("PartialMessageBuilder — MCP tool name normalization", () => {
+	test("strips mcp__<server>__ prefix on content_block_start", () => {
+		const builder = new PartialMessageBuilder("claude-sonnet-4-20250514");
+		const event = builder.handleEvent({
+			type: "content_block_start",
+			index: 0,
+			content_block: {
+				type: "tool_use",
+				id: "tool_1",
+				name: "mcp__gsd-workflow__gsd_plan_milestone",
+				input: {},
+			},
+		} as BetaRawMessageStreamEvent);
+
+		assert.ok(event, "event should not be null");
+		assert.equal(event!.type, "toolcall_start");
+		if (event!.type === "toolcall_start") {
+			const toolCall = (event.partial.content[event.contentIndex] as any);
+			assert.equal(toolCall.name, "gsd_plan_milestone");
+			assert.equal(toolCall.mcpServer, "gsd-workflow");
+		}
+	});
+
+	test("leaves non-MCP tool names untouched", () => {
+		const builder = new PartialMessageBuilder("claude-sonnet-4-20250514");
+		const event = builder.handleEvent({
+			type: "content_block_start",
+			index: 0,
+			content_block: { type: "tool_use", id: "tool_1", name: "Bash", input: {} },
+		} as BetaRawMessageStreamEvent);
+
+		assert.ok(event);
+		if (event!.type === "toolcall_start") {
+			const toolCall = (event.partial.content[event.contentIndex] as any);
+			assert.equal(toolCall.name, "Bash");
+			assert.equal(toolCall.mcpServer, undefined);
+		}
+	});
+
+	test("mapContentBlock strips MCP prefix on full tool_use blocks", () => {
+		const block: BetaContentBlock = {
+			type: "tool_use",
+			id: "tool_2",
+			name: "mcp__gsd-workflow__gsd_task_complete",
+			input: { taskId: "T001" },
+		};
+		const mapped = mapContentBlock(block) as any;
+		assert.equal(mapped.type, "toolCall");
+		assert.equal(mapped.name, "gsd_task_complete");
+		assert.equal(mapped.mcpServer, "gsd-workflow");
+		assert.deepEqual(mapped.arguments, { taskId: "T001" });
+	});
+});