@oh-my-pi/pi-coding-agent 13.10.0 → 13.11.0

package/src/session/agent-session.ts

@@ -89,6 +89,7 @@ import { getCurrentThemeName, theme } from "../modes/theme/theme";
 import { normalizeDiff, normalizeToLF, ParseError, previewPatch, stripBom } from "../patch";
 import type { PlanModeState } from "../plan-mode/state";
 import autoHandoffThresholdFocusPrompt from "../prompts/system/auto-handoff-threshold-focus.md" with { type: "text" };
+import eagerTodoPrompt from "../prompts/system/eager-todo.md" with { type: "text" };
 import handoffDocumentPrompt from "../prompts/system/handoff-document.md" with { type: "text" };
 import planModeActivePrompt from "../prompts/system/plan-mode-active.md" with { type: "text" };
 import planModeReferencePrompt from "../prompts/system/plan-mode-reference.md" with { type: "text" };
@@ -106,6 +107,7 @@ import { getLatestTodoPhasesFromEntries, type TodoItem, type TodoPhase } from ".
 import { parseCommandArgs } from "../utils/command-args";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import { extractFileMentions, generateFileMentionMessages } from "../utils/file-mentions";
+import { buildNamedToolChoice } from "../utils/tool-choice";
 import {
 	type CompactionResult,
 	calculateContextTokens,
@@ -350,6 +352,7 @@ export class AgentSession {
 	// Todo completion reminder state
 	#todoReminderCount = 0;
 	#todoPhases: TodoPhase[] = [];
+	#nextToolChoiceOverride: ToolChoice | undefined = undefined;
 
 	// Bash execution state
 	#bashAbortController: AbortController | undefined = undefined;
@@ -457,6 +460,12 @@ export class AgentSession {
 		return this.#modelRegistry;
 	}
 
+	consumeNextToolChoiceOverride(): ToolChoice | undefined {
+		const toolChoice = this.#nextToolChoiceOverride;
+		this.#nextToolChoiceOverride = undefined;
+		return toolChoice;
+	}
+
 	/** Provider-scoped mutable state store for transport/session caches. */
 	get providerSessionState(): Map<string, ProviderSessionState> {
 		return this.#providerSessionState;
@@ -791,7 +800,11 @@ export class AgentSession {
 			const compactionTask = this.#checkCompaction(msg);
 			this.#trackPostPromptTask(compactionTask);
 			await compactionTask;
-			// Check for incomplete todos (unless there was an error or abort)
+			// Check for incomplete todos only after a final assistant stop, not intermediate tool-use turns.
+			const hasToolCalls = msg.content.some(content => content.type === "toolCall");
+			if (hasToolCalls) {
+				return;
+			}
 			if (msg.stopReason !== "error" && msg.stopReason !== "aborted") {
 				if (this.#enforceRewindBeforeYield()) {
 					return;
@@ -1349,6 +1362,7 @@ export class AgentSession {
 		if (!this.#extensionRunner) return;
 		if (event.type === "agent_start") {
 			this.#turnIndex = 0;
+			this.#nextToolChoiceOverride = undefined;
 			await this.#extensionRunner.emit({ type: "agent_start" });
 		} else if (event.type === "agent_end") {
 			await this.#extensionRunner.emit({ type: "agent_end", messages: event.messages });
@@ -1945,6 +1959,8 @@ export class AgentSession {
 			return;
 		}
 
+		const eagerTodoPrelude = !options?.synthetic ? this.#createEagerTodoPrelude() : undefined;
+
 		const userContent: (TextContent | ImageContent)[] = [{ type: "text", text: expandedText }];
 		if (options?.images) {
 			userContent.push(...options.images);
@@ -1954,7 +1970,20 @@ export class AgentSession {
 			? { role: "developer" as const, content: userContent, attribution: "agent" as const, timestamp: Date.now() }
 			: { role: "user" as const, content: userContent, attribution: "user" as const, timestamp: Date.now() };
 
-		await this.#promptWithMessage(message, expandedText, options);
+		if (eagerTodoPrelude) {
+			this.#nextToolChoiceOverride = eagerTodoPrelude.toolChoice;
+		}
+
+		try {
+			await this.#promptWithMessage(message, expandedText, {
+				...options,
+				prependMessages: eagerTodoPrelude ? [eagerTodoPrelude.message] : undefined,
+			});
+		} finally {
+			if (eagerTodoPrelude) {
+				this.#nextToolChoiceOverride = undefined;
+			}
+		}
 		if (!options?.synthetic) {
 			await this.#enforcePlanModeToolDecision();
 		}
@@ -1997,6 +2026,7 @@ export class AgentSession {
 		message: AgentMessage,
 		expandedText: string,
 		options?: Pick<PromptOptions, "toolChoice" | "images" | "skipCompactionCheck"> & {
+			prependMessages?: AgentMessage[];
 			skipPostPromptRecoveryWait?: boolean;
 		},
 	): Promise<void> {
@@ -2034,7 +2064,7 @@ export class AgentSession {
 				await this.#checkCompaction(lastAssistant, false);
 			}
 
-			// Build messages array (custom messages if any, then user message)
+			// Build messages array (session context, eager todo prelude, then active prompt message)
 			const messages: AgentMessage[] = [];
 			const planReferenceMessage = await this.#buildPlanReferenceMessage?.();
 			if (planReferenceMessage) {
@@ -2044,6 +2074,9 @@ export class AgentSession {
 			if (planModeMessage) {
 				messages.push(planModeMessage);
 			}
+			if (options?.prependMessages) {
+				messages.push(...options.prependMessages);
+			}
 
 			messages.push(message);
 
@@ -3481,6 +3514,51 @@ export class AgentSession {
 			this.agent.setTools(previousTools);
 		}
 	}
+
+	#createEagerTodoPrelude(): { message: AgentMessage; toolChoice: ToolChoice } | undefined {
+		const eagerTodosEnabled = this.settings.get("todo.eager");
+		const todosEnabled = this.settings.get("todo.enabled");
+		if (!eagerTodosEnabled || !todosEnabled) {
+			return undefined;
+		}
+
+		if (this.#planModeState?.enabled) {
+			return undefined;
+		}
+		if (this.getTodoPhases().length > 0) {
+			return undefined;
+		}
+
+		if (!this.#toolRegistry.has("todo_write")) {
+			logger.warn("Eager todo enforcement skipped because todo_write is unavailable", {
+				activeToolNames: this.agent.state.tools.map(tool => tool.name),
+			});
+			return undefined;
+		}
+
+		const todoWriteToolChoice = buildNamedToolChoice("todo_write", this.model);
+		if (!todoWriteToolChoice) {
+			logger.warn("Eager todo enforcement skipped because the current model does not support forcing todo_write", {
+				modelApi: this.model?.api,
+				modelId: this.model?.id,
+			});
+			return undefined;
+		}
+
+		const eagerTodoReminder = renderPromptTemplate(eagerTodoPrompt);
+
+		return {
+			message: {
+				role: "custom",
+				customType: "eager-todo-prelude",
+				content: eagerTodoReminder,
+				display: false,
+				attribution: "agent",
+				timestamp: Date.now(),
+			},
+			toolChoice: todoWriteToolChoice,
+		};
+	}
 	/**
 	 * Check if agent stopped with incomplete todos and prompt to continue.
 	 */
@@ -5191,8 +5269,8 @@ export class AgentSession {
 		}
 
 		for (const msg of this.messages) {
-			if (msg.role === "user") {
-				lines.push("## User\n");
+			if (msg.role === "user" || msg.role === "developer") {
+				lines.push(msg.role === "developer" ? "## Developer\n" : "## User\n");
 				if (typeof msg.content === "string") {
 					lines.push(msg.content);
 				} else {
@@ -5316,8 +5394,8 @@ export class AgentSession {
 		lines.push("");
 
 		for (const msg of this.messages) {
-			if (msg.role === "user") {
-				lines.push("## User");
+			if (msg.role === "user" || msg.role === "developer") {
+				lines.push(msg.role === "developer" ? "## Developer" : "## User");
 				lines.push("");
 				if (typeof msg.content === "string") {
 					lines.push(msg.content);

package/src/session/session-manager.ts

@@ -629,15 +629,11 @@ function writeTerminalBreadcrumb(cwd: string, sessionFile: string): void {
 	const terminalId = getTerminalId();
 	if (!terminalId) return;
 
-	try {
-		const breadcrumbDir = path.join(getDefaultAgentDir(), TERMINAL_SESSIONS_DIR);
-		const breadcrumbFile = path.join(breadcrumbDir, terminalId);
-		const content = `${cwd}\n${sessionFile}\n`;
-		// Bun.write auto-creates parent dirs
-		void Bun.write(breadcrumbFile, content);
-	} catch {
-		// Best-effort — don't break session creation if breadcrumb fails
-	}
+	const breadcrumbDir = path.join(getDefaultAgentDir(), TERMINAL_SESSIONS_DIR);
+	const breadcrumbFile = path.join(breadcrumbDir, terminalId);
+	const content = `${cwd}\n${sessionFile}\n`;
+	// Best-effort — don't break session creation if breadcrumb fails
+	Bun.write(breadcrumbFile, content).catch(() => {});
 }
 
 /**

package/src/slash-commands/builtin-registry.ts

@@ -214,8 +214,16 @@ const BUILTIN_SLASH_COMMAND_REGISTRY: ReadonlyArray<BuiltinSlashCommandSpec> = [
 	{
 		name: "copy",
 		description: "Copy last agent message to clipboard",
-		handle: async (_command, runtime) => {
-			await runtime.ctx.handleCopyCommand();
+		subcommands: [
+			{ name: "last", description: "Copy full last agent message" },
+			{ name: "code", description: "Copy last code block" },
+			{ name: "all", description: "Copy all code blocks from last message" },
+			{ name: "cmd", description: "Copy last bash/python command" },
+		],
+		allowArgs: true,
+		handle: async (command, runtime) => {
+			const sub = command.args.trim().toLowerCase() || undefined;
+			await runtime.ctx.handleCopyCommand(sub);
 			runtime.ctx.editor.setText("");
 		},
 	},

package/src/task/executor.ts

@@ -5,7 +5,6 @@
  */
 import path from "node:path";
 import type { AgentEvent, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
-import type { Api, Model, ToolChoice } from "@oh-my-pi/pi-ai";
 import { logger, untilAborted } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import Ajv, { type ValidateFunction } from "ajv";
@@ -28,6 +27,7 @@ import { type ContextFileEntry, truncateTail } from "../tools";
 import { jtdToJsonSchema } from "../tools/jtd-to-json-schema";
 import { ToolAbortError } from "../tools/tool-errors";
 import type { EventBus } from "../utils/event-bus";
+import { buildNamedToolChoice } from "../utils/tool-choice";
 import { subprocessToolRegistry } from "./subprocess-tool-registry";
 import {
 	type AgentDefinition,
@@ -117,28 +117,13 @@ function getReportFindingKey(value: unknown): string | null {
 	return `${filePath}:${lineStart}:${lineEnd}:${priority ?? ""}:${title}`;
 }
 
-function buildSubmitResultToolChoice(model?: Model<Api>): ToolChoice | undefined {
-	if (!model) return undefined;
-	if (
-		model.api === "openai-codex-responses" ||
-		model.api === "openai-responses" ||
-		model.api === "openai-completions" ||
-		model.api === "azure-openai-responses"
-	) {
-		return { type: "function", name: "submit_result" };
-	}
-	if (model.api === "anthropic-messages" || model.api === "bedrock-converse-stream") {
-		return { type: "tool", name: "submit_result" };
-	}
-	return undefined;
-}
-
 /** Options for subagent execution */
 export interface ExecutorOptions {
 	cwd: string;
 	worktree?: string;
 	agent: AgentDefinition;
 	task: string;
+	assignment?: string;
 	description?: string;
 	index: number;
 	id: string;
@@ -458,6 +443,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		cwd,
 		agent,
 		task,
+		assignment,
 		index,
 		id,
 		worktree,
@@ -478,6 +464,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		agentSource: agent.source,
 		status: "running",
 		task,
+		assignment,
 		description: options.description,
 		lastIntent: undefined,
 		recentTools: [],
@@ -496,6 +483,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			agent: agent.name,
 			agentSource: agent.source,
 			task,
+			assignment,
 			description: options.description,
 			exitCode: 1,
 			output: "",
@@ -638,6 +626,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				agent: agent.name,
 				agentSource: agent.source,
 				task,
+				assignment,
 				progress: { ...progress },
 			});
 		}
@@ -727,6 +716,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 				agent: agent.name,
 				agentSource: agent.source,
 				task,
+				assignment,
 				event,
 			});
 		}
@@ -1091,7 +1081,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			await session.prompt(task);
 			await session.waitForIdle();
 
-			const reminderToolChoice = buildSubmitResultToolChoice(session.model);
+			const reminderToolChoice = buildNamedToolChoice("submit_result", session.model);
 
 			let retryCount = 0;
 			while (!submitResultCalled && retryCount < MAX_SUBMIT_RESULT_RETRIES && !abortSignal.aborted) {
@@ -1247,6 +1237,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 		agent: agent.name,
 		agentSource: agent.source,
 		task,
+		assignment,
 		description: options.description,
 		lastIntent: progress.lastIntent,
 		exitCode,

package/src/task/index.ts

@@ -224,6 +224,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 				agentSource: fallbackAgentSource,
 				status: "pending",
 				task: renderedTask.task,
+				assignment: renderedTask.assignment,
 				description: renderedTask.description,
 				recentTools: [],
 				recentOutput: [],
@@ -732,6 +733,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 					agentSource: agent.source,
 					status: "pending",
 					task: t.task,
+					assignment: t.assignment,
 					recentTools: [],
 					recentOutput: [],
 					toolCount: 0,
@@ -749,6 +751,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 						cwd: this.session.cwd,
 						agent,
 						task: task.task,
+						assignment: task.assignment,
 						description: task.description,
 						index,
 						id: task.id,
@@ -801,6 +804,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 						worktree: isolationDir,
 						agent,
 						task: task.task,
+						assignment: task.assignment,
 						description: task.description,
 						index,
 						id: task.id,
@@ -834,11 +838,10 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 							const commitMsg =
 								commitStyle === "ai" && this.session.modelRegistry
 									? async (diff: string) => {
-											const smolModel = this.session.settings.getModelRole("smol");
 											return generateCommitMessage(
 												diff,
 												this.session.modelRegistry!,
-												smolModel,
+												this.session.settings,
 												this.session.getSessionId?.() ?? undefined,
 											);
 										}
@@ -887,6 +890,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 						agent: agent.name,
 						agentSource: agent.source,
 						task: task.task,
+						assignment: task.assignment,
 						description: task.description,
 						exitCode: 1,
 						output: "",
@@ -930,6 +934,7 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 					agent: agentName,
 					agentSource: agent.source,
 					task: task.task,
+					assignment: task.assignment,
 					description: task.description,
 					exitCode: 1,
 					output: "",
@@ -1081,11 +1086,10 @@ export class TaskTool implements AgentTool<TaskSchema, TaskToolDetails, Theme> {
 						const commitMsg =
 							commitStyle === "ai" && this.session.modelRegistry
 								? async (diff: string) => {
-										const smolModel = this.session.settings.getModelRole("smol");
 										return generateCommitMessage(
 											diff,
 											this.session.modelRegistry!,
-											smolModel,
+											this.session.settings,
 											this.session.getSessionId?.() ?? undefined,
 										);
 									}

package/src/task/render.ts

@@ -374,16 +374,11 @@ function renderTaskSection(
 	maxExpanded = 20,
 ): string[] {
 	const lines: string[] = [];
-	const trimmed = task.trimEnd();
+	const trimmed = task.trim();
 	if (!expanded || !trimmed) return lines;
 
-	// Strip the shared <context>...</context> block — it's the same
-	// across all tasks and just adds noise when expanded.
-	const stripped = trimmed.replace(/<context>[\s\S]*?<\/context>\s*/, "").trimStart();
-	if (!stripped) return lines;
-
 	lines.push(`${continuePrefix}${theme.fg("dim", "Task")}`);
-	const taskLines = stripped.split("\n");
+	const taskLines = trimmed.split("\n");
 	for (const line of taskLines.slice(0, maxExpanded)) {
 		lines.push(`${continuePrefix}  ${theme.fg("dim", truncateToWidth(replaceTabs(line), 70))}`);
 	}
@@ -526,7 +521,7 @@ function renderAgentProgress(
 
 	if (progress.status === "running") {
 		if (!description) {
-			const taskPreview = truncateToWidth(progress.task, 40);
+			const taskPreview = truncateToWidth(progress.assignment ?? progress.task, 40);
 			statusLine += ` ${theme.fg("muted", taskPreview)}`;
 		}
 		if (progress.toolCount > 0) {
@@ -546,7 +541,7 @@ function renderAgentProgress(
 
 	lines.push(statusLine);
 
-	lines.push(...renderTaskSection(progress.task, continuePrefix, expanded, theme));
+	lines.push(...renderTaskSection(progress.assignment ?? progress.task, continuePrefix, expanded, theme));
 
 	// Current tool (if running) or most recent completed tool
 	if (progress.status === "running") {
@@ -781,7 +776,7 @@ function renderAgentResult(result: SingleResult, isLast: boolean, expanded: bool
 
 	lines.push(statusLine);
 
-	lines.push(...renderTaskSection(result.task, continuePrefix, expanded, theme));
+	lines.push(...renderTaskSection(result.assignment ?? result.task, continuePrefix, expanded, theme));
 
 	if (aborted && result.abortReason) {
 		lines.push(

package/src/task/template.ts

@@ -5,6 +5,8 @@ import type { TaskItem } from "./types";
 interface RenderResult {
 	/** Full task text sent to the subagent */
 	task: string;
+	/** Raw per-task assignment text, without prompt template boilerplate */
+	assignment: string;
 	id: string;
 	description: string;
 }
@@ -20,10 +22,11 @@ export function renderTemplate(context: string | undefined, task: TaskItem): Ren
 	context = context?.trim();
 
 	if (!context || !assignment) {
-		return { task: assignment || context!, id, description };
+		return { task: assignment || context!, assignment: assignment || context!, id, description };
 	}
 	return {
 		task: renderPromptTemplate(subagentUserPromptTemplate, { context, assignment }),
+		assignment,
 		id,
 		description,
 	};

package/src/task/types.ts

@@ -136,6 +136,7 @@ export interface AgentProgress {
 	agentSource: AgentSource;
 	status: "pending" | "running" | "completed" | "failed" | "aborted";
 	task: string;
+	assignment?: string;
 	description?: string;
 	lastIntent?: string;
 	currentTool?: string;
@@ -158,6 +159,7 @@ export interface SingleResult {
 	agent: string;
 	agentSource: AgentSource;
 	task: string;
+	assignment?: string;
 	description?: string;
 	lastIntent?: string;
 	exitCode: number;

package/src/tools/ast-edit.ts

@@ -14,7 +14,13 @@ import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, t
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import type { OutputMeta } from "./output-meta";
-import { combineSearchGlobs, hasGlobPathChars, parseSearchPath, resolveToCwd } from "./path-utils";
+import {
+	combineSearchGlobs,
+	hasGlobPathChars,
+	parseSearchPath,
+	resolveMultiSearchPath,
+	resolveToCwd,
+} from "./path-utils";
 import {
 	dedupeParseErrors,
 	formatCount,
@@ -98,7 +104,12 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			}
 			const maxFiles = parseInt(process.env.PI_MAX_AST_FILES ?? "", 10) || 1000;
 
+			const formatScopePath = (targetPath: string): string => {
+				const relative = path.relative(this.session.cwd, targetPath).replace(/\\/g, "/");
+				return relative.length === 0 ? "." : relative;
+			};
 			let searchPath: string | undefined;
+			let scopePath: string | undefined;
 			let globFilter = params.glob?.trim() || undefined;
 			const rawPath = params.path?.trim();
 			if (rawPath) {
@@ -112,21 +123,29 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 						throw new ToolError(`Cannot rewrite internal URL without backing file: ${rawPath}`);
 					}
 					searchPath = resource.sourcePath;
+					scopePath = formatScopePath(searchPath);
 				} else {
-					const parsedPath = parseSearchPath(rawPath);
-					searchPath = resolveToCwd(parsedPath.basePath, this.session.cwd);
-					globFilter = combineSearchGlobs(parsedPath.glob, globFilter);
+					const multiSearchPath = await resolveMultiSearchPath(rawPath, this.session.cwd, globFilter);
+					if (multiSearchPath) {
+						searchPath = multiSearchPath.basePath;
+						globFilter = multiSearchPath.glob;
+						scopePath = multiSearchPath.scopePath;
+					} else {
+						const parsedPath = parseSearchPath(rawPath);
+						searchPath = resolveToCwd(parsedPath.basePath, this.session.cwd);
+						globFilter = combineSearchGlobs(parsedPath.glob, globFilter);
+						scopePath = formatScopePath(searchPath);
+					}
 				}
 			}
-
 			const resolvedSearchPath = searchPath ?? resolveToCwd(".", this.session.cwd);
-			const scopePath = path.relative(this.session.cwd, resolvedSearchPath).replace(/\\/g, "/") || ".";
+			scopePath = scopePath ?? formatScopePath(resolvedSearchPath);
 			let isDirectory: boolean;
 			try {
 				const stat = await Bun.file(resolvedSearchPath).stat();
 				isDirectory = stat.isDirectory();
 			} catch {
-				throw new ToolError(`Path not found: ${resolvedSearchPath}`);
+				throw new ToolError(`Path not found: ${scopePath}`);
 			}
 
 			const result = await astEdit({

package/src/tools/ast-grep.ts

@@ -14,7 +14,13 @@ import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, t
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import type { OutputMeta } from "./output-meta";
-import { combineSearchGlobs, hasGlobPathChars, parseSearchPath, resolveToCwd } from "./path-utils";
+import {
+	combineSearchGlobs,
+	hasGlobPathChars,
+	parseSearchPath,
+	resolveMultiSearchPath,
+	resolveToCwd,
+} from "./path-utils";
 import {
 	dedupeParseErrors,
 	formatCount,
@@ -86,7 +92,12 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 				throw new ToolError("Context must be a non-negative number");
 			}
 
+			const formatScopePath = (targetPath: string): string => {
+				const relative = path.relative(this.session.cwd, targetPath).replace(/\\/g, "/");
+				return relative.length === 0 ? "." : relative;
+			};
 			let searchPath: string | undefined;
+			let scopePath: string | undefined;
 			let globFilter = params.glob?.trim() || undefined;
 			const rawPath = params.path?.trim();
 			if (rawPath) {
@@ -100,24 +111,30 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 						throw new ToolError(`Cannot search internal URL without backing file: ${rawPath}`);
 					}
 					searchPath = resource.sourcePath;
+					scopePath = formatScopePath(searchPath);
 				} else {
-					const parsedPath = parseSearchPath(rawPath);
-					searchPath = resolveToCwd(parsedPath.basePath, this.session.cwd);
-					globFilter = combineSearchGlobs(parsedPath.glob, globFilter);
+					const multiSearchPath = await resolveMultiSearchPath(rawPath, this.session.cwd, globFilter);
+					if (multiSearchPath) {
+						searchPath = multiSearchPath.basePath;
+						globFilter = multiSearchPath.glob;
+						scopePath = multiSearchPath.scopePath;
+					} else {
+						const parsedPath = parseSearchPath(rawPath);
+						searchPath = resolveToCwd(parsedPath.basePath, this.session.cwd);
+						globFilter = combineSearchGlobs(parsedPath.glob, globFilter);
+						scopePath = formatScopePath(searchPath);
+					}
 				}
 			}
 
 			const resolvedSearchPath = searchPath ?? resolveToCwd(".", this.session.cwd);
-			const scopePath = (() => {
-				const relative = path.relative(this.session.cwd, resolvedSearchPath).replace(/\\/g, "/");
-				return relative.length === 0 ? "." : relative;
-			})();
+			scopePath = scopePath ?? formatScopePath(resolvedSearchPath);
 			let isDirectory: boolean;
 			try {
 				const stat = await Bun.file(resolvedSearchPath).stat();
 				isDirectory = stat.isDirectory();
 			} catch {
-				throw new ToolError(`Path not found: ${resolvedSearchPath}`);
+				throw new ToolError(`Path not found: ${scopePath}`);
 			}
 
 			const result = await astGrep({