@gguf/claw 2026.2.9 → 2026.2.13

package/dist/{qmd-manager-CEwp3el1.js → qmd-manager-CQzWovq-.js}

@@ -1,86 +1,44 @@
 import { s as resolveStateDir } from "./paths-BZtyHNCi.js";
-import { g as parseAgentSessionKey } from "./session-key-nXYQSv-a.js";
-import "./utils-dp_OM900.js";
-import { l as createSubsystemLogger } from "./exec-CiH_vkWn.js";
-import { s as resolveAgentWorkspaceDir } from "./agent-scope-Dp8sREli.js";
-import { i as resolveSessionTranscriptsDirForAgent } from "./paths-MnZaxqPw.js";
-import { o as hashText, t as requireNodeSqlite } from "./sqlite-Bwo2rASR.js";
-import { t as redactSensitiveText } from "./redact-BRmQPYDR.js";
+import { s as resolveAgentWorkspaceDir, z as parseAgentSessionKey } from "./agent-scope-DASgjz2_.js";
+import { l as createSubsystemLogger } from "./exec-_PSUrMP8.js";
+import "./paths-SFzVNGbc.js";
+import { n as buildSessionEntry, r as listSessionFilesForAgent, t as requireNodeSqlite } from "./sqlite-CVWiMkGu.js";
+import "./redact-BrXLgslJ.js";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { spawn } from "node:child_process";
 
-//#region src/memory/session-files.ts
+//#region src/memory/qmd-query-parser.ts
 const log$1 = createSubsystemLogger("memory");
-async function listSessionFilesForAgent(agentId) {
-	const dir = resolveSessionTranscriptsDirForAgent(agentId);
-	try {
-		return (await fs.readdir(dir, { withFileTypes: true })).filter((entry) => entry.isFile()).map((entry) => entry.name).filter((name) => name.endsWith(".jsonl")).map((name) => path.join(dir, name));
-	} catch {
-		return [];
+function parseQmdQueryJson(stdout, stderr) {
+	const trimmedStdout = stdout.trim();
+	const trimmedStderr = stderr.trim();
+	const stdoutIsMarker = trimmedStdout.length > 0 && isQmdNoResultsOutput(trimmedStdout);
+	const stderrIsMarker = trimmedStderr.length > 0 && isQmdNoResultsOutput(trimmedStderr);
+	if (stdoutIsMarker || !trimmedStdout && stderrIsMarker) return [];
+	if (!trimmedStdout) {
+		const message = `stdout empty${trimmedStderr ? ` (stderr: ${summarizeQmdStderr(trimmedStderr)})` : ""}`;
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`);
 	}
-}
-function sessionPathForFile(absPath) {
-	return path.join("sessions", path.basename(absPath)).replace(/\\/g, "/");
-}
-function normalizeSessionText(value) {
-	return value.replace(/\s*\n+\s*/g, " ").replace(/\s+/g, " ").trim();
-}
-function extractSessionText(content) {
-	if (typeof content === "string") {
-		const normalized = normalizeSessionText(content);
-		return normalized ? normalized : null;
-	}
-	if (!Array.isArray(content)) return null;
-	const parts = [];
-	for (const block of content) {
-		if (!block || typeof block !== "object") continue;
-		const record = block;
-		if (record.type !== "text" || typeof record.text !== "string") continue;
-		const normalized = normalizeSessionText(record.text);
-		if (normalized) parts.push(normalized);
-	}
-	if (parts.length === 0) return null;
-	return parts.join(" ");
-}
-async function buildSessionEntry(absPath) {
 	try {
-		const stat = await fs.stat(absPath);
-		const lines = (await fs.readFile(absPath, "utf-8")).split("\n");
-		const collected = [];
-		for (const line of lines) {
-			if (!line.trim()) continue;
-			let record;
-			try {
-				record = JSON.parse(line);
-			} catch {
-				continue;
-			}
-			if (!record || typeof record !== "object" || record.type !== "message") continue;
-			const message = record.message;
-			if (!message || typeof message.role !== "string") continue;
-			if (message.role !== "user" && message.role !== "assistant") continue;
-			const text = extractSessionText(message.content);
-			if (!text) continue;
-			const safe = redactSensitiveText(text, { mode: "tools" });
-			const label = message.role === "user" ? "User" : "Assistant";
-			collected.push(`${label}: ${safe}`);
-		}
-		const content = collected.join("\n");
-		return {
-			path: sessionPathForFile(absPath),
-			absPath,
-			mtimeMs: stat.mtimeMs,
-			size: stat.size,
-			hash: hashText(content),
-			content
-		};
+		const parsed = JSON.parse(trimmedStdout);
+		if (!Array.isArray(parsed)) throw new Error("qmd query JSON response was not an array");
+		return parsed;
 	} catch (err) {
-		log$1.debug(`Failed reading session file ${absPath}: ${String(err)}`);
-		return null;
+		const message = err instanceof Error ? err.message : String(err);
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
 	}
 }
+function isQmdNoResultsOutput(raw) {
+	const normalized = raw.trim().toLowerCase().replace(/\s+/g, " ");
+	return normalized === "no results found" || normalized === "no results found.";
+}
+function summarizeQmdStderr(raw) {
+	return raw.length <= 120 ? raw : `${raw.slice(0, 117)}...`;
+}
 
 //#endregion
 //#region src/memory/qmd-manager.ts
@@ -224,29 +182,34 @@ var QmdMemoryManager = class QmdMemoryManager {
 			log.warn("qmd query skipped: no managed collections configured");
 			return [];
 		}
-		const args = [
-			"query",
-			trimmed,
-			"--json",
-			"-n",
-			String(limit),
-			...collectionFilterArgs
-		];
+		const qmdSearchCommand = this.qmd.searchMode;
+		const args = this.buildSearchArgs(qmdSearchCommand, trimmed, limit);
+		if (qmdSearchCommand === "query") args.push(...collectionFilterArgs);
 		let stdout;
+		let stderr;
 		try {
-			stdout = (await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs })).stdout;
-		} catch (err) {
-			log.warn(`qmd query failed: ${String(err)}`);
-			throw err instanceof Error ? err : new Error(String(err));
-		}
-		let parsed = [];
-		try {
-			parsed = JSON.parse(stdout);
+			const result = await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs });
+			stdout = result.stdout;
+			stderr = result.stderr;
 		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			log.warn(`qmd query returned invalid JSON: ${message}`);
-			throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
+			if (qmdSearchCommand !== "query" && this.isUnsupportedQmdOptionError(err)) {
+				log.warn(`qmd ${qmdSearchCommand} does not support configured flags; retrying search with qmd query`);
+				try {
+					const fallbackArgs = this.buildSearchArgs("query", trimmed, limit);
+					fallbackArgs.push(...collectionFilterArgs);
+					const fallback = await this.runQmd(fallbackArgs, { timeoutMs: this.qmd.limits.timeoutMs });
+					stdout = fallback.stdout;
+					stderr = fallback.stderr;
+				} catch (fallbackErr) {
+					log.warn(`qmd query fallback failed: ${String(fallbackErr)}`);
+					throw fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
+				}
+			} else {
+				log.warn(`qmd ${qmdSearchCommand} failed: ${String(err)}`);
+				throw err instanceof Error ? err : new Error(String(err));
+			}
 		}
+		const parsed = parseQmdQueryJson(stdout, stderr);
 		const results = [];
 		for (const entry of parsed) {
 			const doc = await this.resolveDocLocation(entry.docid);
@@ -709,6 +672,10 @@ var QmdMemoryManager = class QmdMemoryManager {
 		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
 		return normalized.includes("sqlite_busy") || normalized.includes("database is locked");
 	}
+	isUnsupportedQmdOptionError(err) {
+		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
+		return normalized.includes("unknown flag") || normalized.includes("unknown option") || normalized.includes("unrecognized option") || normalized.includes("flag provided but not defined") || normalized.includes("unexpected argument");
+	}
 	createQmdBusyError(err) {
 		const message = err instanceof Error ? err.message : String(err);
 		return /* @__PURE__ */ new Error(`qmd index busy while reading results: ${message}`);
@@ -723,6 +690,20 @@ var QmdMemoryManager = class QmdMemoryManager {
 		if (names.length === 0) return [];
 		return names.flatMap((name) => ["-c", name]);
 	}
+	buildSearchArgs(command, query, limit) {
+		if (command === "query") return [
+			"query",
+			query,
+			"--json",
+			"-n",
+			String(limit)
+		];
+		return [
+			command,
+			query,
+			"--json"
+		];
+	}
 };
 
 //#endregion

package/dist/{qmd-manager-D6N3qvQ5.js → qmd-manager-Cs8RJVQp.js}

@@ -1,86 +1,46 @@
-import { X as resolveStateDir, o as createSubsystemLogger } from "./entry.js";
+import { Z as resolveStateDir, o as createSubsystemLogger } from "./entry.js";
 import { y as parseAgentSessionKey } from "./session-key-DVvxnFKg.js";
-import "./utils-Dk86IbEs.js";
-import "./exec-B8JKbXKW.js";
-import { s as resolveAgentWorkspaceDir } from "./agent-scope-D3me2AZa.js";
-import { a as resolveSessionTranscriptsDirForAgent } from "./paths-IivnSNkP.js";
-import { o as hashText, t as requireNodeSqlite } from "./sqlite-DODNHWJb.js";
-import { n as redactSensitiveText } from "./redact-BHmk44DI.js";
+import "./utils-BLJAc3ZV.js";
+import "./exec-DqZFMawz.js";
+import { s as resolveAgentWorkspaceDir } from "./agent-scope-Bkr9fZtl.js";
+import "./paths-BZK4Ct0I.js";
+import { n as buildSessionEntry, r as listSessionFilesForAgent, t as requireNodeSqlite } from "./sqlite-2UsPaJz5.js";
+import "./redact-UvkXqguc.js";
 import { spawn } from "node:child_process";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";
 
-//#region src/memory/session-files.ts
+//#region src/memory/qmd-query-parser.ts
 const log$1 = createSubsystemLogger("memory");
-async function listSessionFilesForAgent(agentId) {
-	const dir = resolveSessionTranscriptsDirForAgent(agentId);
-	try {
-		return (await fs.readdir(dir, { withFileTypes: true })).filter((entry) => entry.isFile()).map((entry) => entry.name).filter((name) => name.endsWith(".jsonl")).map((name) => path.join(dir, name));
-	} catch {
-		return [];
+function parseQmdQueryJson(stdout, stderr) {
+	const trimmedStdout = stdout.trim();
+	const trimmedStderr = stderr.trim();
+	const stdoutIsMarker = trimmedStdout.length > 0 && isQmdNoResultsOutput(trimmedStdout);
+	const stderrIsMarker = trimmedStderr.length > 0 && isQmdNoResultsOutput(trimmedStderr);
+	if (stdoutIsMarker || !trimmedStdout && stderrIsMarker) return [];
+	if (!trimmedStdout) {
+		const message = `stdout empty${trimmedStderr ? ` (stderr: ${summarizeQmdStderr(trimmedStderr)})` : ""}`;
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`);
 	}
-}
-function sessionPathForFile(absPath) {
-	return path.join("sessions", path.basename(absPath)).replace(/\\/g, "/");
-}
-function normalizeSessionText(value) {
-	return value.replace(/\s*\n+\s*/g, " ").replace(/\s+/g, " ").trim();
-}
-function extractSessionText(content) {
-	if (typeof content === "string") {
-		const normalized = normalizeSessionText(content);
-		return normalized ? normalized : null;
-	}
-	if (!Array.isArray(content)) return null;
-	const parts = [];
-	for (const block of content) {
-		if (!block || typeof block !== "object") continue;
-		const record = block;
-		if (record.type !== "text" || typeof record.text !== "string") continue;
-		const normalized = normalizeSessionText(record.text);
-		if (normalized) parts.push(normalized);
-	}
-	if (parts.length === 0) return null;
-	return parts.join(" ");
-}
-async function buildSessionEntry(absPath) {
 	try {
-		const stat = await fs.stat(absPath);
-		const lines = (await fs.readFile(absPath, "utf-8")).split("\n");
-		const collected = [];
-		for (const line of lines) {
-			if (!line.trim()) continue;
-			let record;
-			try {
-				record = JSON.parse(line);
-			} catch {
-				continue;
-			}
-			if (!record || typeof record !== "object" || record.type !== "message") continue;
-			const message = record.message;
-			if (!message || typeof message.role !== "string") continue;
-			if (message.role !== "user" && message.role !== "assistant") continue;
-			const text = extractSessionText(message.content);
-			if (!text) continue;
-			const safe = redactSensitiveText(text, { mode: "tools" });
-			const label = message.role === "user" ? "User" : "Assistant";
-			collected.push(`${label}: ${safe}`);
-		}
-		const content = collected.join("\n");
-		return {
-			path: sessionPathForFile(absPath),
-			absPath,
-			mtimeMs: stat.mtimeMs,
-			size: stat.size,
-			hash: hashText(content),
-			content
-		};
+		const parsed = JSON.parse(trimmedStdout);
+		if (!Array.isArray(parsed)) throw new Error("qmd query JSON response was not an array");
+		return parsed;
 	} catch (err) {
-		log$1.debug(`Failed reading session file ${absPath}: ${String(err)}`);
-		return null;
+		const message = err instanceof Error ? err.message : String(err);
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
 	}
 }
+function isQmdNoResultsOutput(raw) {
+	const normalized = raw.trim().toLowerCase().replace(/\s+/g, " ");
+	return normalized === "no results found" || normalized === "no results found.";
+}
+function summarizeQmdStderr(raw) {
+	return raw.length <= 120 ? raw : `${raw.slice(0, 117)}...`;
+}
 
 //#endregion
 //#region src/memory/qmd-manager.ts
@@ -224,29 +184,34 @@ var QmdMemoryManager = class QmdMemoryManager {
 			log.warn("qmd query skipped: no managed collections configured");
 			return [];
 		}
-		const args = [
-			"query",
-			trimmed,
-			"--json",
-			"-n",
-			String(limit),
-			...collectionFilterArgs
-		];
+		const qmdSearchCommand = this.qmd.searchMode;
+		const args = this.buildSearchArgs(qmdSearchCommand, trimmed, limit);
+		if (qmdSearchCommand === "query") args.push(...collectionFilterArgs);
 		let stdout;
+		let stderr;
 		try {
-			stdout = (await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs })).stdout;
-		} catch (err) {
-			log.warn(`qmd query failed: ${String(err)}`);
-			throw err instanceof Error ? err : new Error(String(err));
-		}
-		let parsed = [];
-		try {
-			parsed = JSON.parse(stdout);
+			const result = await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs });
+			stdout = result.stdout;
+			stderr = result.stderr;
 		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			log.warn(`qmd query returned invalid JSON: ${message}`);
-			throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
+			if (qmdSearchCommand !== "query" && this.isUnsupportedQmdOptionError(err)) {
+				log.warn(`qmd ${qmdSearchCommand} does not support configured flags; retrying search with qmd query`);
+				try {
+					const fallbackArgs = this.buildSearchArgs("query", trimmed, limit);
+					fallbackArgs.push(...collectionFilterArgs);
+					const fallback = await this.runQmd(fallbackArgs, { timeoutMs: this.qmd.limits.timeoutMs });
+					stdout = fallback.stdout;
+					stderr = fallback.stderr;
+				} catch (fallbackErr) {
+					log.warn(`qmd query fallback failed: ${String(fallbackErr)}`);
+					throw fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
+				}
+			} else {
+				log.warn(`qmd ${qmdSearchCommand} failed: ${String(err)}`);
+				throw err instanceof Error ? err : new Error(String(err));
+			}
 		}
+		const parsed = parseQmdQueryJson(stdout, stderr);
 		const results = [];
 		for (const entry of parsed) {
 			const doc = await this.resolveDocLocation(entry.docid);
@@ -709,6 +674,10 @@ var QmdMemoryManager = class QmdMemoryManager {
 		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
 		return normalized.includes("sqlite_busy") || normalized.includes("database is locked");
 	}
+	isUnsupportedQmdOptionError(err) {
+		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
+		return normalized.includes("unknown flag") || normalized.includes("unknown option") || normalized.includes("unrecognized option") || normalized.includes("flag provided but not defined") || normalized.includes("unexpected argument");
+	}
 	createQmdBusyError(err) {
 		const message = err instanceof Error ? err.message : String(err);
 		return /* @__PURE__ */ new Error(`qmd index busy while reading results: ${message}`);
@@ -723,6 +692,20 @@ var QmdMemoryManager = class QmdMemoryManager {
 		if (names.length === 0) return [];
 		return names.flatMap((name) => ["-c", name]);
 	}
+	buildSearchArgs(command, query, limit) {
+		if (command === "query") return [
+			"query",
+			query,
+			"--json",
+			"-n",
+			String(limit)
+		];
+		return [
+			command,
+			query,
+			"--json"
+		];
+	}
 };
 
 //#endregion

package/dist/{qmd-manager-C48QzrRe.js → qmd-manager-DdgrQ2kc.js}

@@ -1,84 +1,44 @@
 import { s as resolveStateDir } from "./paths-rb94mUrR.js";
-import { s as resolveAgentWorkspaceDir, z as parseAgentSessionKey } from "./agent-scope-Dpav7C-i.js";
-import { l as createSubsystemLogger } from "./exec-Bas1hoSJ.js";
-import { i as resolveSessionTranscriptsDirForAgent } from "./paths-uoGO2aiO.js";
-import { o as hashText, t as requireNodeSqlite } from "./sqlite-CpqIbY4-.js";
-import { t as redactSensitiveText } from "./redact-BrXLgslJ.js";
+import { s as resolveAgentWorkspaceDir, z as parseAgentSessionKey } from "./agent-scope-okUOVjE5.js";
+import { l as createSubsystemLogger } from "./exec-EKUaAU91.js";
+import "./paths-DWYi0R_2.js";
+import { n as buildSessionEntry, r as listSessionFilesForAgent, t as requireNodeSqlite } from "./sqlite-CcIWkGaM.js";
+import "./redact-BIMJ3ntQ.js";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";
 import { spawn } from "node:child_process";
 
-//#region src/memory/session-files.ts
+//#region src/memory/qmd-query-parser.ts
 const log$1 = createSubsystemLogger("memory");
-async function listSessionFilesForAgent(agentId) {
-	const dir = resolveSessionTranscriptsDirForAgent(agentId);
-	try {
-		return (await fs.readdir(dir, { withFileTypes: true })).filter((entry) => entry.isFile()).map((entry) => entry.name).filter((name) => name.endsWith(".jsonl")).map((name) => path.join(dir, name));
-	} catch {
-		return [];
+function parseQmdQueryJson(stdout, stderr) {
+	const trimmedStdout = stdout.trim();
+	const trimmedStderr = stderr.trim();
+	const stdoutIsMarker = trimmedStdout.length > 0 && isQmdNoResultsOutput(trimmedStdout);
+	const stderrIsMarker = trimmedStderr.length > 0 && isQmdNoResultsOutput(trimmedStderr);
+	if (stdoutIsMarker || !trimmedStdout && stderrIsMarker) return [];
+	if (!trimmedStdout) {
+		const message = `stdout empty${trimmedStderr ? ` (stderr: ${summarizeQmdStderr(trimmedStderr)})` : ""}`;
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`);
 	}
-}
-function sessionPathForFile(absPath) {
-	return path.join("sessions", path.basename(absPath)).replace(/\\/g, "/");
-}
-function normalizeSessionText(value) {
-	return value.replace(/\s*\n+\s*/g, " ").replace(/\s+/g, " ").trim();
-}
-function extractSessionText(content) {
-	if (typeof content === "string") {
-		const normalized = normalizeSessionText(content);
-		return normalized ? normalized : null;
-	}
-	if (!Array.isArray(content)) return null;
-	const parts = [];
-	for (const block of content) {
-		if (!block || typeof block !== "object") continue;
-		const record = block;
-		if (record.type !== "text" || typeof record.text !== "string") continue;
-		const normalized = normalizeSessionText(record.text);
-		if (normalized) parts.push(normalized);
-	}
-	if (parts.length === 0) return null;
-	return parts.join(" ");
-}
-async function buildSessionEntry(absPath) {
 	try {
-		const stat = await fs.stat(absPath);
-		const lines = (await fs.readFile(absPath, "utf-8")).split("\n");
-		const collected = [];
-		for (const line of lines) {
-			if (!line.trim()) continue;
-			let record;
-			try {
-				record = JSON.parse(line);
-			} catch {
-				continue;
-			}
-			if (!record || typeof record !== "object" || record.type !== "message") continue;
-			const message = record.message;
-			if (!message || typeof message.role !== "string") continue;
-			if (message.role !== "user" && message.role !== "assistant") continue;
-			const text = extractSessionText(message.content);
-			if (!text) continue;
-			const safe = redactSensitiveText(text, { mode: "tools" });
-			const label = message.role === "user" ? "User" : "Assistant";
-			collected.push(`${label}: ${safe}`);
-		}
-		const content = collected.join("\n");
-		return {
-			path: sessionPathForFile(absPath),
-			absPath,
-			mtimeMs: stat.mtimeMs,
-			size: stat.size,
-			hash: hashText(content),
-			content
-		};
+		const parsed = JSON.parse(trimmedStdout);
+		if (!Array.isArray(parsed)) throw new Error("qmd query JSON response was not an array");
+		return parsed;
 	} catch (err) {
-		log$1.debug(`Failed reading session file ${absPath}: ${String(err)}`);
-		return null;
+		const message = err instanceof Error ? err.message : String(err);
+		log$1.warn(`qmd query returned invalid JSON: ${message}`);
+		throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
 	}
 }
+function isQmdNoResultsOutput(raw) {
+	const normalized = raw.trim().toLowerCase().replace(/\s+/g, " ");
+	return normalized === "no results found" || normalized === "no results found.";
+}
+function summarizeQmdStderr(raw) {
+	return raw.length <= 120 ? raw : `${raw.slice(0, 117)}...`;
+}
 
 //#endregion
 //#region src/memory/qmd-manager.ts
@@ -222,29 +182,34 @@ var QmdMemoryManager = class QmdMemoryManager {
 			log.warn("qmd query skipped: no managed collections configured");
 			return [];
 		}
-		const args = [
-			"query",
-			trimmed,
-			"--json",
-			"-n",
-			String(limit),
-			...collectionFilterArgs
-		];
+		const qmdSearchCommand = this.qmd.searchMode;
+		const args = this.buildSearchArgs(qmdSearchCommand, trimmed, limit);
+		if (qmdSearchCommand === "query") args.push(...collectionFilterArgs);
 		let stdout;
+		let stderr;
 		try {
-			stdout = (await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs })).stdout;
-		} catch (err) {
-			log.warn(`qmd query failed: ${String(err)}`);
-			throw err instanceof Error ? err : new Error(String(err));
-		}
-		let parsed = [];
-		try {
-			parsed = JSON.parse(stdout);
+			const result = await this.runQmd(args, { timeoutMs: this.qmd.limits.timeoutMs });
+			stdout = result.stdout;
+			stderr = result.stderr;
 		} catch (err) {
-			const message = err instanceof Error ? err.message : String(err);
-			log.warn(`qmd query returned invalid JSON: ${message}`);
-			throw new Error(`qmd query returned invalid JSON: ${message}`, { cause: err });
+			if (qmdSearchCommand !== "query" && this.isUnsupportedQmdOptionError(err)) {
+				log.warn(`qmd ${qmdSearchCommand} does not support configured flags; retrying search with qmd query`);
+				try {
+					const fallbackArgs = this.buildSearchArgs("query", trimmed, limit);
+					fallbackArgs.push(...collectionFilterArgs);
+					const fallback = await this.runQmd(fallbackArgs, { timeoutMs: this.qmd.limits.timeoutMs });
+					stdout = fallback.stdout;
+					stderr = fallback.stderr;
+				} catch (fallbackErr) {
+					log.warn(`qmd query fallback failed: ${String(fallbackErr)}`);
+					throw fallbackErr instanceof Error ? fallbackErr : new Error(String(fallbackErr));
+				}
+			} else {
+				log.warn(`qmd ${qmdSearchCommand} failed: ${String(err)}`);
+				throw err instanceof Error ? err : new Error(String(err));
+			}
 		}
+		const parsed = parseQmdQueryJson(stdout, stderr);
 		const results = [];
 		for (const entry of parsed) {
 			const doc = await this.resolveDocLocation(entry.docid);
@@ -707,6 +672,10 @@ var QmdMemoryManager = class QmdMemoryManager {
 		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
 		return normalized.includes("sqlite_busy") || normalized.includes("database is locked");
 	}
+	isUnsupportedQmdOptionError(err) {
+		const normalized = (err instanceof Error ? err.message : String(err)).toLowerCase();
+		return normalized.includes("unknown flag") || normalized.includes("unknown option") || normalized.includes("unrecognized option") || normalized.includes("flag provided but not defined") || normalized.includes("unexpected argument");
+	}
 	createQmdBusyError(err) {
 		const message = err instanceof Error ? err.message : String(err);
 		return /* @__PURE__ */ new Error(`qmd index busy while reading results: ${message}`);
@@ -721,6 +690,20 @@ var QmdMemoryManager = class QmdMemoryManager {
 		if (names.length === 0) return [];
 		return names.flatMap((name) => ["-c", name]);
 	}
+	buildSearchArgs(command, query, limit) {
+		if (command === "query") return [
+			"query",
+			query,
+			"--json",
+			"-n",
+			String(limit)
+		];
+		return [
+			command,
+			query,
+			"--json"
+		];
+	}
 };
 
 //#endregion