@oh-my-pi/pi-coding-agent 13.12.7 → 13.12.8

package/CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## [Unreleased]
 
+## [13.12.8] - 2026-03-16
+
+### Breaking Changes
+
+- Changed `SessionManager.create()` to require explicit `sessionDir` parameter instead of optional—callers must now pass `SessionManager.getDefaultSessionDir(cwd)` to use default behavior
+- Changed `SessionManager.continueRecent()` to require explicit `sessionDir` parameter instead of optional—callers must now pass `SessionManager.getDefaultSessionDir(cwd)` to use default behavior
+- Changed `SessionManager.forkFrom()` to require explicit `sessionDir` parameter instead of optional—callers must now pass `SessionManager.getDefaultSessionDir(cwd)` to use default behavior
+- Changed `SessionManager.list()` signature to accept only `sessionDir` parameter instead of `cwd` and optional `sessionDir`—callers must now compute and pass the session directory explicitly
+
+### Added
+
+- Added `SessionManager.getDefaultSessionDir()` static method to explicitly resolve the canonical default session directory for a working directory
+- Added support for quoted paths in grep, ast_grep, and find tools to handle directory names with spaces
+- Added `normalizePathLikeInput` utility function to consistently handle quoted and whitespace-trimmed path inputs
+
+### Changed
+
+- Made `sessionDir` parameter optional in `SessionManager.create()`, `SessionManager.continueRecent()`, and `SessionManager.forkFrom()`—callers can now omit it to use the default session directory
+- Changed `SessionManager.list()` signature to accept `cwd` as the first parameter instead of requiring an explicit `sessionDir`—callers can now omit `sessionDir` to use the default for the given working directory
+- Updated `SessionManager.getDefaultSessionDir()` to accept optional `agentDir` parameter for computing session directories within a custom agent root
+- Improved status line path display to strip display roots using canonical path resolution, correctly handling symlink aliases to home and Projects directories
+- Improved error messaging in ast_grep when no matches are found with parse errors, now suggests narrowing `path`/`glob` or setting `lang` to resolve mis-scoped queries
+
+### Fixed
+
+- Fixed SDK-created default sessions to honor the configured `agentDir` for session storage, preventing tests from writing stray session directories into the real `~/.omp/agent/sessions` root
+- Fixed session directory resolution to correctly handle symlink-equivalent paths, ensuring aliased home and temp directories resolve to the same session storage location as their real targets
+
 ## [13.12.7] - 2026-03-16
 ### Changed
 

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "13.12.7",
+	"version": "13.12.8",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -41,12 +41,12 @@
 	},
 	"dependencies": {
 		"@mozilla/readability": "^0.6",
-		"@oh-my-pi/omp-stats": "13.12.7",
-		"@oh-my-pi/pi-agent-core": "13.12.7",
-		"@oh-my-pi/pi-ai": "13.12.7",
-		"@oh-my-pi/pi-natives": "13.12.7",
-		"@oh-my-pi/pi-tui": "13.12.7",
-		"@oh-my-pi/pi-utils": "13.12.7",
+		"@oh-my-pi/omp-stats": "13.12.8",
+		"@oh-my-pi/pi-agent-core": "13.12.8",
+		"@oh-my-pi/pi-ai": "13.12.8",
+		"@oh-my-pi/pi-natives": "13.12.8",
+		"@oh-my-pi/pi-tui": "13.12.8",
+		"@oh-my-pi/pi-utils": "13.12.8",
 		"@sinclair/typebox": "^0.34",
 		"@xterm/headless": "^6.0",
 		"ajv": "^8.18",

package/src/config/keybindings.ts

@@ -264,10 +264,7 @@ export class KeybindingsManager {
 	 * Get display string for an action.
 	 */
 	getDisplayString(action: AppAction): string {
-		const keys = this.getKeys(action);
-		if (keys.length === 0) return "";
-		if (keys.length === 1) return keys[0]!;
-		return keys.join("/");
+		return formatKeyHints(this.getKeys(action));
 	}
 
 	/**

package/src/modes/components/status-line/segments.ts

@@ -1,7 +1,8 @@
 import * as os from "node:os";
+import * as path from "node:path";
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { TERMINAL } from "@oh-my-pi/pi-tui";
-import { formatDuration, formatNumber, getProjectDir } from "@oh-my-pi/pi-utils";
+import { formatDuration, formatNumber, getProjectDir, relativePathWithinRoot } from "@oh-my-pi/pi-utils";
 import { theme } from "../../../modes/theme/theme";
 import { shortenPath } from "../../../tools/render-utils";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./context-thresholds";
@@ -17,6 +18,14 @@ function withIcon(icon: string, text: string): string {
 	return icon ? `${icon} ${text}` : text;
 }
 
+function stripDisplayRoot(pwd: string): string {
+	for (const root of ["/work", path.join(os.homedir(), "Projects")]) {
+		const relative = relativePathWithinRoot(root, pwd);
+		if (relative) return relative;
+	}
+	return pwd;
+}
+
 function normalizePremiumRequests(value: number): number {
 	return Math.round((value + Number.EPSILON) * 100) / 100;
 }
@@ -87,13 +96,12 @@ const pathSegment: StatusLineSegment = {
 
 		let pwd = getProjectDir();
 
+		if (opts.stripWorkPrefix !== false) {
+			pwd = stripDisplayRoot(pwd);
+		}
 		if (opts.abbreviate !== false) {
 			pwd = shortenPath(pwd);
 		}
-		if (opts.stripWorkPrefix !== false) {
-			if (pwd.startsWith("/work/")) pwd = pwd.slice(6);
-			else if (pwd.startsWith("~/Projects/")) pwd = pwd.slice(11);
-		}
 
 		const maxLen = opts.maxLength ?? 40;
 		if (pwd.length > maxLen) {

package/src/modes/controllers/command-controller.ts

@@ -24,6 +24,7 @@ import { DynamicBorder } from "../../modes/components/dynamic-border";
 import { PythonExecutionComponent } from "../../modes/components/python-execution";
 import { getMarkdownTheme, getSymbolTheme, theme } from "../../modes/theme/theme";
 import type { InteractiveModeContext } from "../../modes/types";
+import { buildHotkeysMarkdown } from "../../modes/utils/hotkeys-markdown";
 import type { AsyncJobSnapshotItem } from "../../session/agent-session";
 import type { AuthStorage } from "../../session/auth-storage";
 import { outputMeta } from "../../tools/output-meta";
@@ -509,52 +510,13 @@ export class CommandController {
 		const sttKey = this.ctx.keybindings.getDisplayString("toggleSTT") || "Alt+H";
 		const copyLineKey = this.ctx.keybindings.getDisplayString("copyLine") || "Alt+Shift+L";
 		const copyPromptKey = this.ctx.keybindings.getDisplayString("copyPrompt") || "Alt+Shift+C";
-		const hotkeys = `
-		**Navigation**
-		| Key | Action |
-		|-----|--------|
-		| \`Arrow keys\` | Move cursor / browse history (Up when empty) |
-		| \`Option+Left/Right\` | Move by word |
-		| \`Ctrl+A\` / \`Home\` / \`Cmd+Left\` | Start of line |
-		| \`Ctrl+E\` / \`End\` / \`Cmd+Right\` | End of line |
-		
-		**Editing**
-		| Key | Action |
-		|-----|--------|
-		| \`Enter\` | Send message |
-		| \`Shift+Enter\` / \`Alt+Enter\` | New line |
-		| \`Ctrl+W\` / \`Option+Backspace\` | Delete word backwards |
-		| \`Ctrl+U\` | Delete to start of line |
-		| \`Ctrl+K\` | Delete to end of line |
-		| \`${copyLineKey}\` | Copy current line |
-		| \`${copyPromptKey}\` | Copy whole prompt |
-		
-		**Other**
-		| Key | Action |
-		|-----|--------|
-		| \`Tab\` | Path completion / accept autocomplete |
-		| \`Escape\` | Cancel autocomplete / abort streaming |
-		| \`Ctrl+C\` | Clear editor (first) / exit (second) |
-		| \`Ctrl+D\` | Exit (when editor is empty) |
-		| \`Ctrl+Z\` | Suspend to background |
-		| \`Shift+Tab\` | Cycle thinking level |
-		| \`Ctrl+P\` | Cycle role models (slow/default/smol) |
-		| \`Shift+Ctrl+P\` | Cycle role models (temporary) |
-		| \`Alt+P\` | Select model (temporary) |
-		| \`Ctrl+L\` | Select model (set roles) |
-		| \`${planModeKey}\` | Toggle plan mode |
-		| \`Ctrl+R\` | Search prompt history |
-		| \`${expandToolsKey}\` | Toggle tool output expansion |
-		| \`Ctrl+T\` | Toggle todo list expansion |
-		| \`Ctrl+G\` | Edit message in external editor |
-		| \`${sttKey}\` | Toggle speech-to-text recording |
-		| \`#\` | Open prompt actions |
-		| \`/\` | Slash commands |
-		| \`!\` | Run bash command |
-		| \`!!\` | Run bash command (excluded from context) |
-		| \`$\` | Run Python in shared kernel |
-		| \`$$\` | Run Python (excluded from context) |
-		`;
+		const hotkeys = buildHotkeysMarkdown({
+			expandToolsKey,
+			planModeKey,
+			sttKey,
+			copyLineKey,
+			copyPromptKey,
+		});
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(new DynamicBorder());
 		this.ctx.chatContainer.addChild(new Text(theme.bold(theme.fg("accent", "Keyboard Shortcuts")), 1, 0));

package/src/modes/controllers/input-controller.ts

@@ -535,6 +535,7 @@ export class InputController {
 			keybindings: this.ctx.keybindings,
 			copyCurrentLine: () => this.handleCopyCurrentLine(),
 			copyPrompt: () => this.handleCopyPrompt(),
+			undo: prefix => this.ctx.editor.undoPastTransientText(prefix),
 			moveCursorToMessageEnd: () => this.ctx.editor.moveToMessageEnd(),
 			moveCursorToMessageStart: () => this.ctx.editor.moveToMessageStart(),
 			moveCursorToLineStart: () => this.ctx.editor.moveToLineStart(),

package/src/modes/prompt-action-autocomplete.ts

@@ -12,12 +12,12 @@ interface PromptActionDefinition {
 	label: string;
 	description: string;
 	keywords: string[];
-	execute: () => void;
+	execute: (prefix: string) => void;
 }
 
 interface PromptActionAutocompleteItem extends AutocompleteItem {
 	actionId: string;
-	execute: () => void;
+	execute: (prefix: string) => void;
 }
 
 interface PromptActionAutocompleteOptions {
@@ -26,6 +26,7 @@ interface PromptActionAutocompleteOptions {
 	keybindings: KeybindingsManager;
 	copyCurrentLine: () => void;
 	copyPrompt: () => void;
+	undo: (prefix: string) => void;
 	moveCursorToMessageEnd: () => void;
 	moveCursorToMessageStart: () => void;
 	moveCursorToLineStart: () => void;
@@ -141,6 +142,14 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 		onApplied?: () => void;
 	} {
 		if (prefix.startsWith("#") && isPromptActionItem(item)) {
+			if (item.actionId === "undo") {
+				return {
+					lines,
+					cursorLine,
+					cursorCol,
+					onApplied: () => item.execute(prefix),
+				};
+			}
 			const currentLine = lines[cursorLine] || "";
 			const beforePrefix = currentLine.slice(0, cursorCol - prefix.length);
 			const afterCursor = currentLine.slice(cursorCol);
@@ -150,7 +159,7 @@ export class PromptActionAutocompleteProvider implements AutocompleteProvider {
 				lines: newLines,
 				cursorLine,
 				cursorCol: beforePrefix.length,
-				onApplied: item.execute,
+				onApplied: () => item.execute(prefix),
 			};
 		}
 
@@ -181,6 +190,13 @@ export function createPromptActionAutocompleteProvider(
 			keywords: ["copy", "prompt", "clipboard", "message"],
 			execute: options.copyPrompt,
 		},
+		{
+			id: "undo",
+			label: "Undo",
+			description: formatKeyHints(editorKeybindings.getKeys("undo")),
+			keywords: ["undo", "revert", "edit", "history"],
+			execute: options.undo,
+		},
 		{
 			id: "cursor-message-end",
 			label: "Move cursor to end of message",

package/src/modes/utils/hotkeys-markdown.ts

@@ -0,0 +1,57 @@
+export interface HotkeysMarkdownBindings {
+	expandToolsKey: string;
+	planModeKey: string;
+	sttKey: string;
+	copyLineKey: string;
+	copyPromptKey: string;
+}
+
+export function buildHotkeysMarkdown(bindings: HotkeysMarkdownBindings): string {
+	const { expandToolsKey, planModeKey, sttKey, copyLineKey, copyPromptKey } = bindings;
+	return [
+		"**Navigation**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Arrow keys` | Move cursor / browse history (Up when empty) |",
+		"| `Option+Left/Right` | Move by word |",
+		"| `Ctrl+A` / `Home` / `Cmd+Left` | Start of line |",
+		"| `Ctrl+E` / `End` / `Cmd+Right` | End of line |",
+		"",
+		"**Editing**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Enter` | Send message |",
+		"| `Shift+Enter` / `Alt+Enter` | New line |",
+		"| `Ctrl+W` / `Option+Backspace` | Delete word backwards |",
+		"| `Ctrl+U` | Delete to start of line |",
+		"| `Ctrl+K` | Delete to end of line |",
+		`| \`${copyLineKey}\` | Copy current line |`,
+		`| \`${copyPromptKey}\` | Copy whole prompt |`,
+		"",
+		"**Other**",
+		"| Key | Action |",
+		"|-----|--------|",
+		"| `Tab` | Path completion / accept autocomplete |",
+		"| `Escape` | Cancel autocomplete / abort streaming |",
+		"| `Ctrl+C` | Clear editor (first) / exit (second) |",
+		"| `Ctrl+D` | Exit (when editor is empty) |",
+		"| `Ctrl+Z` | Suspend to background |",
+		"| `Shift+Tab` | Cycle thinking level |",
+		"| `Ctrl+P` | Cycle role models (slow/default/smol) |",
+		"| `Shift+Ctrl+P` | Cycle role models (temporary) |",
+		"| `Alt+P` | Select model (temporary) |",
+		"| `Ctrl+L` | Select model (set roles) |",
+		`| \`${planModeKey}\` | Toggle plan mode |`,
+		"| `Ctrl+R` | Search prompt history |",
+		`| \`${expandToolsKey}\` | Toggle tool output expansion |`,
+		"| `Ctrl+T` | Toggle todo list expansion |",
+		"| `Ctrl+G` | Edit message in external editor |",
+		`| \`${sttKey}\` | Toggle speech-to-text recording |`,
+		"| `#` | Open prompt actions |",
+		"| `/` | Slash commands |",
+		"| `!` | Run bash command |",
+		"| `!!` | Run bash command (excluded from context) |",
+		"| `$` | Run Python in shared kernel |",
+		"| `$$` | Run Python (excluded from context) |",
+	].join("\n");
+}

package/src/sdk.ts

@@ -191,7 +191,7 @@ export interface CreateAgentSessionOptions {
 	/** Parent task ID prefix for nested artifact naming (e.g., "6-Extensions") */
 	parentTaskPrefix?: string;
 
-	/** Session manager. Default: SessionManager.create(cwd) */
+	/** Session manager. Default: session stored under the configured agentDir sessions root */
 	sessionManager?: SessionManager;
 
 	/** Settings instance. Default: Settings.init({ cwd, agentDir }) */
@@ -656,7 +656,11 @@ export async function createAgentSession(options: CreateAgentSessionOptions = {}
 		setPreferredImageProvider(imageProvider);
 	}
 
-	const sessionManager = options.sessionManager ?? logger.time("sessionManager", SessionManager.create, cwd);
+	const sessionManager =
+		options.sessionManager ??
+		logger.time("sessionManager", () =>
+			SessionManager.create(cwd, SessionManager.getDefaultSessionDir(cwd, agentDir)),
+		);
 	const sessionId = sessionManager.getSessionId();
 	const modelApiKeyAvailability = new Map<string, boolean>();
 	const getModelAvailabilityKey = (candidate: Model): string =>

package/src/session/session-manager.ts

@@ -21,6 +21,8 @@ import {
 	isEnoent,
 	logger,
 	parseJsonlLenient,
+	pathIsWithin,
+	resolveEquivalentPath,
 	Snowflake,
 	toError,
 } from "@oh-my-pi/pi-utils";
@@ -345,7 +347,7 @@ export function migrateSessionEntries(entries: FileEntry[]): void {
 	migrateToCurrentVersion(entries);
 }
 
-let sessionDirsMigrated = false;
+const migratedSessionRoots = new Set<string>();
 
 /**
  * Merge or rename a legacy session directory into its canonical target.
@@ -375,29 +377,36 @@ function encodeLegacyAbsoluteSessionDirName(cwd: string): string {
 	return `--${resolvedCwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
 }
 
-function pathIsWithin(root: string, candidate: string): boolean {
-	const relative = path.relative(root, candidate);
-	return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
-}
-
 function encodeRelativeSessionDirName(prefix: string, root: string, cwd: string): string {
 	const relative = path.relative(root, cwd).replace(/[/\\:]/g, "-");
-	return relative ? `${prefix}-${relative}` : prefix;
+	return relative ? (prefix.endsWith("-") ? `${prefix}${relative}` : `${prefix}-${relative}`) : prefix;
+}
+
+function getDefaultSessionDirName(cwd: string): { encodedDirName: string; resolvedCwd: string } {
+	const resolvedCwd = path.resolve(cwd);
+	const canonicalCwd = resolveEquivalentPath(resolvedCwd);
+	const home = resolveEquivalentPath(os.homedir());
+	const tempRoot = resolveEquivalentPath(os.tmpdir());
+	const encodedDirName = pathIsWithin(home, canonicalCwd)
+		? encodeRelativeSessionDirName("-", home, canonicalCwd)
+		: pathIsWithin(tempRoot, canonicalCwd)
+			? encodeRelativeSessionDirName("-tmp", tempRoot, canonicalCwd)
+			: encodeLegacyAbsoluteSessionDirName(canonicalCwd);
+	return { encodedDirName, resolvedCwd };
 }
 
 /**
  * Migrate old `--<home-encoded>-*--` session dirs to the new `-*` format.
- * Runs once on first access, best-effort.
+ * Runs once per sessions root on first access, best-effort.
  */
-function migrateHomeSessionDirs(): void {
-	if (sessionDirsMigrated) return;
-	sessionDirsMigrated = true;
+function migrateHomeSessionDirs(sessionsRoot: string): void {
+	if (migratedSessionRoots.has(sessionsRoot)) return;
+	migratedSessionRoots.add(sessionsRoot);
 
 	const home = os.homedir();
 	const homeEncoded = home.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-");
 	const oldPrefix = `--${homeEncoded}-`;
 	const oldExact = `--${homeEncoded}--`;
-	const sessionsRoot = getSessionsDir();
 
 	let entries: string[];
 	try {
@@ -428,8 +437,8 @@ function migrateHomeSessionDirs(): void {
 	}
 }
 
-function migrateLegacyAbsoluteSessionDir(cwd: string, sessionDir: string): void {
-	const legacyDir = path.join(getSessionsDir(), encodeLegacyAbsoluteSessionDirName(cwd));
+function migrateLegacyAbsoluteSessionDir(cwd: string, sessionDir: string, sessionsRoot: string): void {
+	const legacyDir = path.join(sessionsRoot, encodeLegacyAbsoluteSessionDirName(cwd));
 	if (legacyDir === sessionDir || !fs.existsSync(legacyDir)) return;
 
 	try {
@@ -439,6 +448,15 @@ function migrateLegacyAbsoluteSessionDir(cwd: string, sessionDir: string): void
 	}
 }
 
+function resolveManagedSessionRoot(sessionDir: string, cwd: string): string | undefined {
+	const currentDirName = path.basename(sessionDir);
+	const { encodedDirName } = getDefaultSessionDirName(cwd);
+	if (currentDirName !== encodedDirName && currentDirName !== encodeLegacyAbsoluteSessionDirName(cwd)) {
+		return undefined;
+	}
+	return path.dirname(sessionDir);
+}
+
 /** Exported for compaction.test.ts */
 export function parseSessionEntries(content: string): FileEntry[] {
 	return parseJsonlLenient<FileEntry>(content);
@@ -633,34 +651,20 @@ export function buildSessionContext(
 	return { messages, thinkingLevel, serviceTier, models, injectedTtsrRules, mode, modeData };
 }
 
-/**
- * Encode a cwd into a safe directory name for session storage.
- * Home-relative paths use single-dash format: `/Users/x/Projects/pi` → `-Projects-pi`
- * Temp-root paths use `-tmp-` prefixes: `/tmp/foo` → `-tmp-foo`
- * Other absolute paths keep the legacy double-dash format for compatibility.
- */
-function encodeSessionDirName(cwd: string): string {
-	const resolvedCwd = path.resolve(cwd);
-	const home = path.resolve(os.homedir());
-	if (pathIsWithin(home, resolvedCwd)) {
-		return encodeRelativeSessionDirName("-", home, resolvedCwd);
-	}
-	const tempRoot = path.resolve(os.tmpdir());
-	if (pathIsWithin(tempRoot, resolvedCwd)) {
-		return encodeRelativeSessionDirName("-tmp", tempRoot, resolvedCwd);
-	}
-	return encodeLegacyAbsoluteSessionDirName(resolvedCwd);
-}
-
 /**
  * Compute the default session directory for a cwd.
- * Encodes cwd into a safe directory name under ~/.omp/agent/sessions/.
+ * Classifies cwd by canonical location so symlink/alias paths resolve to the
+ * same home-relative or temp-root directory names as their real targets.
  */
-function getDefaultSessionDir(cwd: string, storage: SessionStorage): string {
-	const resolvedCwd = path.resolve(cwd);
-	migrateHomeSessionDirs();
-	const sessionDir = path.join(getSessionsDir(), encodeSessionDirName(resolvedCwd));
-	migrateLegacyAbsoluteSessionDir(resolvedCwd, sessionDir);
+function computeDefaultSessionDir(
+	cwd: string,
+	storage: SessionStorage,
+	sessionsRoot: string = getSessionsDir(),
+): string {
+	const { encodedDirName, resolvedCwd } = getDefaultSessionDirName(cwd);
+	migrateHomeSessionDirs(sessionsRoot);
+	const sessionDir = path.join(sessionsRoot, encodedDirName);
+	migrateLegacyAbsoluteSessionDir(resolvedCwd, sessionDir, sessionsRoot);
 	storage.ensureDirSync(sessionDir);
 	return sessionDir;
 }
@@ -1322,7 +1326,8 @@ export async function resolveResumableSession(
 	sessionDir?: string,
 	storage: SessionStorage = new FileSessionStorage(),
 ): Promise<ResolvedSessionMatch | undefined> {
-	const localSessions = await SessionManager.list(cwd, sessionDir, storage);
+	const localSessionDir = sessionDir ?? SessionManager.getDefaultSessionDir(cwd, undefined, storage);
+	const localSessions = await SessionManager.list(cwd, localSessionDir, storage);
 	const localMatch = localSessions.find(session => sessionMatchesResumeArg(session, sessionArg));
 	if (localMatch) {
 		return { session: localMatch, scope: "local" };
@@ -1489,7 +1494,10 @@ export class SessionManager {
 		const resolvedCwd = path.resolve(newCwd);
 		if (resolvedCwd === this.cwd) return;
 
-		const newSessionDir = getDefaultSessionDir(resolvedCwd, this.storage);
+		const managedSessionsRoot = resolveManagedSessionRoot(this.sessionDir, this.cwd);
+		const newSessionDir = managedSessionsRoot
+			? computeDefaultSessionDir(resolvedCwd, this.storage, managedSessionsRoot)
+			: computeDefaultSessionDir(resolvedCwd, this.storage);
 		let hadSessionFile = false;
 
 		if (this.persist && this.#sessionFile) {
@@ -2446,13 +2454,24 @@ export class SessionManager {
 		return undefined;
 	}
 
+	/**
+	 * Resolve the canonical default session directory for a cwd.
+	 */
+	static getDefaultSessionDir(
+		cwd: string,
+		agentDir?: string,
+		storage: SessionStorage = new FileSessionStorage(),
+	): string {
+		return computeDefaultSessionDir(cwd, storage, getSessionsDir(agentDir));
+	}
+
 	/**
 	 * Create a new session.
 	 * @param cwd Working directory (stored in session header)
 	 * @param sessionDir Optional session directory. If omitted, uses default (~/.omp/agent/sessions/<encoded-cwd>/).
 	 */
 	static create(cwd: string, sessionDir?: string, storage: SessionStorage = new FileSessionStorage()): SessionManager {
-		const dir = sessionDir ?? getDefaultSessionDir(cwd, storage);
+		const dir = sessionDir ?? SessionManager.getDefaultSessionDir(cwd, undefined, storage);
 		const manager = new SessionManager(cwd, dir, true, storage);
 		manager.#initNewSession();
 		return manager;
@@ -2468,7 +2487,7 @@ export class SessionManager {
 		sessionDir?: string,
 		storage: SessionStorage = new FileSessionStorage(),
 	): Promise<SessionManager> {
-		const dir = sessionDir ?? getDefaultSessionDir(cwd, storage);
+		const dir = sessionDir ?? SessionManager.getDefaultSessionDir(cwd, undefined, storage);
 		const manager = new SessionManager(cwd, dir, true, storage);
 		const forkEntries = structuredClone(await loadEntriesFromFile(sourcePath, storage)) as FileEntry[];
 		migrateToCurrentVersion(forkEntries);
@@ -2516,7 +2535,7 @@ export class SessionManager {
 		sessionDir?: string,
 		storage: SessionStorage = new FileSessionStorage(),
 	): Promise<SessionManager> {
-		const dir = sessionDir ?? getDefaultSessionDir(cwd, storage);
+		const dir = sessionDir ?? SessionManager.getDefaultSessionDir(cwd, undefined, storage);
 		// Prefer terminal-scoped breadcrumb (handles concurrent sessions correctly)
 		const terminalSession = await readTerminalBreadcrumb(cwd);
 		const mostRecent = terminalSession ?? (await findMostRecentSession(dir, storage));
@@ -2549,7 +2568,7 @@ export class SessionManager {
 		sessionDir?: string,
 		storage: SessionStorage = new FileSessionStorage(),
 	): Promise<SessionInfo[]> {
-		const dir = sessionDir ?? getDefaultSessionDir(cwd, storage);
+		const dir = sessionDir ?? SessionManager.getDefaultSessionDir(cwd, undefined, storage);
 		try {
 			const files = storage.listFilesSync(dir, "*.jsonl");
 			return await collectSessionsFromFiles(files, storage);

package/src/tools/ast-edit.ts

@@ -17,6 +17,7 @@ import type { OutputMeta } from "./output-meta";
 import {
 	combineSearchGlobs,
 	hasGlobPathChars,
+	normalizePathLikeInput,
 	parseSearchPath,
 	resolveMultiSearchPath,
 	resolveToCwd,
@@ -110,8 +111,8 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			};
 			let searchPath: string | undefined;
 			let scopePath: string | undefined;
-			let globFilter = params.glob?.trim() || undefined;
-			const rawPath = params.path?.trim();
+			let globFilter = params.glob ? normalizePathLikeInput(params.glob) || undefined : undefined;
+			const rawPath = params.path ? normalizePathLikeInput(params.path) || undefined : undefined;
 			if (rawPath) {
 				const internalRouter = this.session.internalRouter;
 				if (internalRouter?.canHandle(rawPath)) {

package/src/tools/ast-grep.ts

@@ -17,6 +17,7 @@ import type { OutputMeta } from "./output-meta";
 import {
 	combineSearchGlobs,
 	hasGlobPathChars,
+	normalizePathLikeInput,
 	parseSearchPath,
 	resolveMultiSearchPath,
 	resolveToCwd,
@@ -98,8 +99,8 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 			};
 			let searchPath: string | undefined;
 			let scopePath: string | undefined;
-			let globFilter = params.glob?.trim() || undefined;
-			const rawPath = params.path?.trim();
+			let globFilter = params.glob ? normalizePathLikeInput(params.glob) || undefined : undefined;
+			const rawPath = params.path ? normalizePathLikeInput(params.path) || undefined : undefined;
 			if (rawPath) {
 				const internalRouter = this.session.internalRouter;
 				if (internalRouter?.canHandle(rawPath)) {
@@ -194,10 +195,13 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 			};
 
 			if (result.matches.length === 0) {
+				const noMatchMessage = dedupedParseErrors.length
+					? "No matches found. Parse issues mean the query may be mis-scoped; narrow `path`/`glob` or set `lang` before concluding absence."
+					: "No matches found";
 				const parseMessage = dedupedParseErrors.length
 					? `\n${formatParseErrors(dedupedParseErrors).join("\n")}`
 					: "";
-				return toolResult(baseDetails).text(`No matches found${parseMessage}`).done();
+				return toolResult(baseDetails).text(`${noMatchMessage}${parseMessage}`).done();
 			}
 
 			const useHashLines = resolveFileDisplayMode(this.session).hashLines;
@@ -343,6 +347,12 @@ export const astGrepToolRenderer = {
 			const header = renderStatusLine({ icon: "warning", title: "AST Grep", description, meta }, uiTheme);
 			const lines = [header, formatEmptyMessage("No matches found", uiTheme)];
 			if (details?.parseErrors?.length) {
+				lines.push(
+					uiTheme.fg(
+						"warning",
+						"Query may be mis-scoped; narrow `path`/`glob` or set `lang` before concluding absence",
+					),
+				);
 				const capped = details.parseErrors.slice(0, PARSE_ERRORS_LIMIT);
 				for (const err of capped) {
 					lines.push(uiTheme.fg("warning", `  - ${err}`));

package/src/tools/find.ts

@@ -24,7 +24,7 @@ import {
 import type { ToolSession } from ".";
 import { applyListLimit } from "./list-limit";
 import { formatFullOutputReference, type OutputMeta } from "./output-meta";
-import { parseFindPattern, resolveMultiFindPattern, resolveToCwd } from "./path-utils";
+import { normalizePathLikeInput, parseFindPattern, resolveMultiFindPattern, resolveToCwd } from "./path-utils";
 import { formatCount, formatEmptyMessage, formatErrorMessage, PREVIEW_LIMITS } from "./render-utils";
 import { ToolAbortError, ToolError, throwIfAborted } from "./tool-errors";
 import { toolResult } from "./tool-result";
@@ -103,7 +103,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 				const relative = path.relative(this.session.cwd, targetPath).replace(/\\/g, "/");
 				return relative.length === 0 ? "." : relative;
 			};
-			const normalizedPattern = pattern.trim().replace(/\\/g, "/");
+			const normalizedPattern = normalizePathLikeInput(pattern).replace(/\\/g, "/");
 			if (!normalizedPattern) {
 				throw new ToolError("Pattern must not be empty");
 			}

package/src/tools/grep.ts

@@ -19,6 +19,7 @@ import { formatFullOutputReference, type OutputMeta } from "./output-meta";
 import {
 	combineSearchGlobs,
 	hasGlobPathChars,
+	normalizePathLikeInput,
 	parseSearchPath,
 	resolveMultiSearchPath,
 	resolveToCwd,
@@ -119,10 +120,10 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 			};
 			let searchPath: string;
 			let scopePath: string;
-			let globFilter = glob?.trim() || undefined;
+			let globFilter = glob ? normalizePathLikeInput(glob) || undefined : undefined;
 			const internalRouter = this.session.internalRouter;
 			if (searchDir?.trim()) {
-				const rawPath = searchDir.trim();
+				const rawPath = normalizePathLikeInput(searchDir);
 				if (internalRouter?.canHandle(rawPath)) {
 					if (hasGlobPathChars(rawPath)) {
 						throw new ToolError(`Glob patterns are not supported for internal URLs: ${rawPath}`);

package/src/tools/path-utils.ts

@@ -122,6 +122,10 @@ export function stripOuterDoubleQuotes(input: string): string {
 	return input.startsWith('"') && input.endsWith('"') && input.length > 1 ? input.slice(1, -1) : input;
 }
 
+export function normalizePathLikeInput(input: string): string {
+	return stripOuterDoubleQuotes(input.trim());
+}
+
 const GLOB_PATH_CHARS = ["*", "?", "[", "{"] as const;
 
 export function hasGlobPathChars(filePath: string): boolean {