@oh-my-pi/pi-coding-agent 17.2.10 → 17.2.12

package/src/tools/shell-tokenize.ts

@@ -87,7 +87,7 @@ export function tokenizeShellSegments(command: string): string[][] {
  *
  * @see extractFlatShellCommandSegments
  */
-export interface FlatShellCommandSegment {
+interface FlatShellCommandSegment {
 	/** Original segment text with quoting and escaping preserved. */
 	text: string;
 	/**
@@ -211,3 +211,101 @@ export function extractFlatShellCommandSegments(command: string): FlatShellComma
 	pushSegment(command.length);
 	return segments;
 }
+
+/**
+ * Shell metacharacters that end an unquoted `cd` target token. A redirect,
+ * extra argument, or any operator in this set means the leading construct is
+ * more than a bare `cd <path>`, so extraction must bail.
+ */
+const CD_TARGET_TERMINATORS: Record<string, true> = {
+	" ": true,
+	"\t": true,
+	"\n": true,
+	"\r": true,
+	"&": true,
+	"|": true,
+	";": true,
+	"<": true,
+	">": true,
+	"(": true,
+	")": true,
+};
+
+/**
+ * Parses a leading `cd <path> && ...` prefix so the bash tool can route the
+ * target through its structured `cwd` parameter when the model omits it.
+ *
+ * Returns the single path token (quotes and backslash escapes resolved to their
+ * literal value) and the command remainder after the top-level `&&`, or `null`
+ * when the command does not begin with exactly `cd`, one path token, and a
+ * top-level `&&`. The scanner deliberately bails on anything else in the prefix
+ * — redirects (`cd /tmp 2>/dev/null && ...`), extra arguments, or paths needing
+ * shell expansion (`$`, backticks, `(`) — leaving the whole command for the
+ * shell instead of absorbing shell syntax into `cwd`.
+ */
+export function extractLeadingCdTarget(command: string): { path: string; rest: string } | null {
+	const prefix = /^cd[ \t]+/.exec(command);
+	if (!prefix) return null;
+	let i = prefix[0].length;
+	let path = "";
+	let inSingle = false;
+	let inDouble = false;
+	for (; i < command.length; i++) {
+		const ch = command[i];
+		if (inSingle) {
+			if (ch === "'") {
+				inSingle = false;
+				continue;
+			}
+			path += ch;
+			continue;
+		}
+		if (inDouble) {
+			if (ch === "\\" && i + 1 < command.length) {
+				const next = command[i + 1];
+				// A line continuation crosses the first physical line. Leave it to
+				// the shell rather than turning the escaped newline into cwd text.
+				if (next === "\n" || next === "\r") return null;
+				if (next === '"' || next === "\\" || next === "$" || next === "`") {
+					path += next;
+					i++;
+					continue;
+				}
+			}
+			if (ch === '"') {
+				inDouble = false;
+				continue;
+			}
+			path += ch;
+			continue;
+		}
+		if (ch === "'") {
+			inSingle = true;
+			continue;
+		}
+		if (ch === '"') {
+			inDouble = true;
+			continue;
+		}
+		if (ch === "\\" && i + 1 < command.length) {
+			// Preserve shell line-continuation semantics by declining extraction.
+			if (command[i + 1] === "\n" || command[i + 1] === "\r") return null;
+			path += command[i + 1];
+			i++;
+			continue;
+		}
+		if (CD_TARGET_TERMINATORS[ch]) break;
+		path += ch;
+	}
+	// Unterminated quote or empty target: leave the command for the shell.
+	if (inSingle || inDouble || path.length === 0) return null;
+	// A path needing shell expansion can't be resolved literally through cwd.
+	if (/[$`(]/.test(path)) return null;
+	// Skip inter-token whitespace, then require a top-level `&&` (a single `&`,
+	// `||`, `;`, `|`, or a redirect all mean this is not a bare `cd <path>`).
+	while (command[i] === " " || command[i] === "\t") i++;
+	if (command[i] !== "&" || command[i + 1] !== "&") return null;
+	i += 2;
+	while (command[i] === " " || command[i] === "\t") i++;
+	return { path, rest: command.slice(i) };
+}

package/src/utils/changelog.ts

@@ -201,7 +201,7 @@ function parseChangelogContent(content: string): ChangelogEntry[] {
  * Compare changelog entries by their parsed version parts.
  * Returns: -1 if v1 < v2, 0 if v1 === v2, 1 if v1 > v2
  */
-export function compareChangelogEntries(v1: ChangelogEntry, v2: ChangelogEntry): number {
+function compareChangelogEntries(v1: ChangelogEntry, v2: ChangelogEntry): number {
 	if (v1.major !== v2.major) return v1.major - v2.major;
 	if (v1.minor !== v2.minor) return v1.minor - v2.minor;
 	return v1.patch - v2.patch;

package/src/utils/title-generator.ts

@@ -6,6 +6,7 @@ import * as path from "node:path";
 
 import { type Api, type AssistantMessage, completeSimple, type Model } from "@oh-my-pi/pi-ai";
 import { StreamMarkupHealing } from "@oh-my-pi/pi-ai/utils/stream-markup-healing";
+import { isConPTYHosted } from "@oh-my-pi/pi-tui";
 import { isTerminalHeadless, logger, prompt } from "@oh-my-pi/pi-utils";
 import type { ModelRegistry } from "../config/model-registry";
 
@@ -533,6 +534,7 @@ function emitTerminalTitle(): void {
 			terminalTitleRuntime.state,
 			terminalTitleRuntime.frame,
 			terminalTitleRuntime.enabled,
+			isConPTYHosted() ? "win32" : process.platform,
 		);
 	setTerminalTitle(next);
 }
@@ -543,7 +545,7 @@ function stopTerminalTitleSpinner(): void {
 }
 
 function startTerminalTitleSpinner(): void {
-	if (process.platform === "win32" || terminalTitleRuntime.timer || !process.stdout.isTTY) return;
+	if (isConPTYHosted() || terminalTitleRuntime.timer || !process.stdout.isTTY) return;
 	terminalTitleRuntime.timer = setInterval(() => {
 		terminalTitleRuntime.frame = (terminalTitleRuntime.frame + 1) % TITLE_SPINNER_FRAMES.length;
 		emitTerminalTitle();

package/src/web/search/providers/exa.ts

@@ -464,7 +464,7 @@ export class ExaProvider extends SearchProvider {
 
 	#settingsAllowSearch(): boolean {
 		try {
-			if (settings.get("exa.enabled") === false || settings.get("exa.enableSearch") === false) {
+			if (settings.get("exa.enabled") === false) {
 				return false;
 			}
 		} catch {

package/src/web/search/providers/zai.ts

@@ -353,11 +353,20 @@ function parseSearchPayload(rawResult: unknown): {
 			for (const part of content) {
 				const text = isRecord(part) ? asString(part.text) : null;
 				if (!text) continue;
-				textParts.push(text);
 				try {
-					candidates.push(JSON.parse(text));
+					let parsed: unknown = JSON.parse(text);
+					if (typeof parsed === "string") {
+						try {
+							parsed = JSON.parse(parsed);
+						} catch {
+							// The decoded string is answer text rather than another JSON payload.
+						}
+					}
+					candidates.push(parsed);
+					if (getSearchResults(parsed).length === 0) textParts.push(text);
 				} catch {
-					// Not JSON payload; keep as fallback answer text.
+					// Non-JSON content is preserved as answer text.
+					textParts.push(text);
 				}
 			}
 		}