@bastani/atomic 0.9.11-alpha.8 → 0.9.11

package/dist/core/tools/search-native.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-native.js","sourceRoot":"","sources":["../../../src/core/tools/search-native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAmFpE,IAAI,gBAAgB,GAAiC,IAAI,CAAC;AAE1D,MAAM,UAAU,6BAA6B;IAC5C,gBAAgB,GAAG,IAAI,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,uBAAuB;IACtC,IAAI,gBAAgB,KAAK,IAAI;QAAE,OAAO,gBAAgB,IAAI,IAAI,CAAC;IAC/D,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,OAAO,CAAC,yBAAyB,CAA2B,CAAC;QAC7E,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9E,gBAAgB,GAAG,KAAK,CAAC;YACzB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,gBAAgB,GAAG,OAAwB,CAAC;QAC5C,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,gBAAgB,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAAa;IACxD,uBAAuB,EAAE,EAAE,qBAAqB,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAClE,CAAC","sourcesContent":["import { createModuleRequire } from \"../../utils/module-require.ts\";\n\ntype NativeBinding = {\n\tglob: (options: NativeGlobOptions) => Promise<NativeGlobResult>;\n\tgrep: (options: NativeGrepOptions) => Promise<NativeGrepResult>;\n\tsearch?: (content: string | Uint8Array, options: NativeTextSearchOptions) => NativeTextSearchResult;\n\thasMatch?: (content: string | Uint8Array, pattern: string | Uint8Array, ignoreCase?: boolean | null, multiline?: boolean | null) => boolean;\n\tinvalidateFsScanCache?: (path?: string | null) => void;\n\tblockRangeAt?: (options: { code: string; path: string; line: number }) => { startLine: number; endLine: number } | null;\n};\n\nexport type NativeGlobMatch = {\n\tpath: string;\n\tfileType: \"File\" | \"Dir\" | \"Symlink\" | number;\n\tmtime?: number;\n\tsize?: number;\n};\n\nexport type NativeGlobOptions = {\n\tpattern: string;\n\tpath: string;\n\tfileType?: \"File\" | \"Dir\" | \"Symlink\" | number;\n\trecursive?: boolean;\n\thidden?: boolean;\n\tmaxResults?: number;\n\tgitignore?: boolean;\n\tcache?: boolean;\n\tsortByMtime?: boolean;\n\tincludeNodeModules?: boolean;\n\tsignal?: AbortSignal;\n\ttimeoutMs?: number;\n};\n\nexport type NativeGlobResult = {\n\tmatches: NativeGlobMatch[];\n\ttotalMatches: number;\n};\n\nexport type NativeGrepMatch = {\n\tpath: string;\n\tlineNumber: number;\n\tline: string;\n\tcontextBefore?: Array<{ lineNumber: number; line: string }>;\n\tcontextAfter?: Array<{ lineNumber: number; line: string }>;\n\ttruncated?: boolean;\n\tmatchCount?: number;\n};\n\nexport type NativeGrepOptions = {\n\tpattern: string;\n\tpath: string;\n\tcwd?: string;\n\tglob?: string;\n\ttype?: string;\n\tignoreCase?: boolean;\n\tmultiline?: boolean;\n\thidden?: boolean;\n\tgitignore?: boolean;\n\tcache?: boolean;\n\tmaxCount?: number;\n\toffset?: number;\n\tcontextBefore?: number;\n\tcontextAfter?: number;\n\tcontext?: number;\n\tmaxColumns?: number;\n\tmode?: \"content\" | \"count\" | \"filesWithMatches\";\n\tmaxCountPerFile?: number;\n\tsignal?: AbortSignal;\n\ttimeoutMs?: number;\n};\n\nexport type NativeGrepResult = {\n\tmatches: NativeGrepMatch[];\n\ttotalMatches: number;\n\tfilesWithMatches: number;\n\tfilesSearched: number;\n\tlimitReached: boolean;\n\tskippedOversized?: number;\n\terror?: string;\n};\nexport type NativeTextSearchOptions = Omit<NativeGrepOptions, \"path\" | \"cwd\" | \"glob\" | \"type\" | \"hidden\" | \"gitignore\" | \"cache\" | \"maxCountPerFile\" | \"signal\" | \"timeoutMs\">;\nexport type NativeTextSearchResult = { matches: Array<Omit<NativeGrepMatch, \"path\">>; matchCount: number; limitReached: boolean; error?: string };\n\nlet cachedLoadResult: NativeBinding | null | false = null;\n\nexport function resetNativeSearchBindingCache(): void {\n\tcachedLoadResult = null;\n}\n\nexport function loadNativeSearchBinding(): NativeBinding | null {\n\tif (cachedLoadResult !== null) return cachedLoadResult || null;\n\ttry {\n\t\tconst require = createModuleRequire(import.meta.url);\n\t\tconst binding = require(\"@bastani/atomic-natives\") as Partial<NativeBinding>;\n\t\tif (typeof binding.glob !== \"function\" || typeof binding.grep !== \"function\") {\n\t\t\tcachedLoadResult = false;\n\t\t\treturn null;\n\t\t}\n\t\tcachedLoadResult = binding as NativeBinding;\n\t\treturn cachedLoadResult;\n\t} catch {\n\t\tcachedLoadResult = false;\n\t\treturn null;\n\t}\n}\n\nexport function invalidateNativeSearchCache(path?: string): void {\n\tloadNativeSearchBinding()?.invalidateFsScanCache?.(path ?? null);\n}\n"]}
+{"version":3,"file":"search-native.js","sourceRoot":"","sources":["../../../src/core/tools/search-native.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAoGpE,IAAI,gBAAgB,GAAiC,IAAI,CAAC;AAE1D,MAAM,UAAU,6BAA6B;IAC5C,gBAAgB,GAAG,IAAI,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,uBAAuB;IACtC,IAAI,gBAAgB,KAAK,IAAI;QAAE,OAAO,gBAAgB,IAAI,IAAI,CAAC;IAC/D,IAAI,CAAC;QACJ,MAAM,OAAO,GAAG,mBAAmB,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC;QACrD,MAAM,OAAO,GAAG,OAAO,CAAC,yBAAyB,CAA2B,CAAC;QAC7E,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,OAAO,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;YAC9E,gBAAgB,GAAG,KAAK,CAAC;YACzB,OAAO,IAAI,CAAC;QACb,CAAC;QACD,gBAAgB,GAAG,OAAwB,CAAC;QAC5C,OAAO,gBAAgB,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACR,gBAAgB,GAAG,KAAK,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;AACF,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,IAAa;IACxD,uBAAuB,EAAE,EAAE,qBAAqB,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;AAClE,CAAC","sourcesContent":["import { createModuleRequire } from \"../../utils/module-require.ts\";\n\ntype NativeBinding = {\n\tglob: (options: NativeGlobOptions) => Promise<NativeGlobResult>;\n\tgrep: (options: NativeGrepOptions) => Promise<NativeGrepResult>;\n\tsearch?: (content: string | Uint8Array, options: NativeTextSearchOptions) => NativeTextSearchResult;\n\thasMatch?: (\n\t\tcontent: string | Uint8Array,\n\t\tpattern: string | Uint8Array,\n\t\tignoreCase?: boolean | null,\n\t\tmultiline?: boolean | null,\n\t) => boolean;\n\tinvalidateFsScanCache?: (path?: string | null) => void;\n\tblockRangeAt?: (options: {\n\t\tcode: string;\n\t\tpath: string;\n\t\tline: number;\n\t}) => { startLine: number; endLine: number } | null;\n};\n\nexport type NativeGlobMatch = {\n\tpath: string;\n\tfileType: \"File\" | \"Dir\" | \"Symlink\" | number;\n\tmtime?: number;\n\tsize?: number;\n};\n\nexport type NativeGlobOptions = {\n\tpattern: string;\n\tpath: string;\n\tfileType?: \"File\" | \"Dir\" | \"Symlink\" | number;\n\trecursive?: boolean;\n\thidden?: boolean;\n\tmaxResults?: number;\n\tgitignore?: boolean;\n\tcache?: boolean;\n\tsortByMtime?: boolean;\n\tincludeNodeModules?: boolean;\n\tsignal?: AbortSignal;\n\ttimeoutMs?: number;\n};\n\nexport type NativeGlobResult = {\n\tmatches: NativeGlobMatch[];\n\ttotalMatches: number;\n};\n\nexport type NativeGrepMatch = {\n\tpath: string;\n\tlineNumber: number;\n\tline: string;\n\tcontextBefore?: Array<{ lineNumber: number; line: string }>;\n\tcontextAfter?: Array<{ lineNumber: number; line: string }>;\n\ttruncated?: boolean;\n\tmatchCount?: number;\n};\n\nexport type NativeGrepOptions = {\n\tpattern: string;\n\tpath: string;\n\tcwd?: string;\n\tglob?: string;\n\ttype?: string;\n\tignoreCase?: boolean;\n\tmultiline?: boolean;\n\thidden?: boolean;\n\tgitignore?: boolean;\n\tcache?: boolean;\n\tmaxCount?: number;\n\toffset?: number;\n\tcontextBefore?: number;\n\tcontextAfter?: number;\n\tcontext?: number;\n\tmaxColumns?: number;\n\tmode?: \"content\" | \"count\" | \"filesWithMatches\";\n\tmaxCountPerFile?: number;\n\tsignal?: AbortSignal;\n\ttimeoutMs?: number;\n};\n\nexport type NativeGrepResult = {\n\tmatches: NativeGrepMatch[];\n\ttotalMatches: number;\n\tfilesWithMatches: number;\n\tfilesSearched: number;\n\tlimitReached: boolean;\n\tskippedOversized?: number;\n\terror?: string;\n};\nexport type NativeTextSearchOptions = Omit<\n\tNativeGrepOptions,\n\t\"path\" | \"cwd\" | \"glob\" | \"type\" | \"hidden\" | \"gitignore\" | \"cache\" | \"maxCountPerFile\" | \"signal\" | \"timeoutMs\"\n>;\nexport type NativeTextSearchResult = {\n\tmatches: Array<Omit<NativeGrepMatch, \"path\">>;\n\tmatchCount: number;\n\tlimitReached: boolean;\n\terror?: string;\n};\n\nlet cachedLoadResult: NativeBinding | null | false = null;\n\nexport function resetNativeSearchBindingCache(): void {\n\tcachedLoadResult = null;\n}\n\nexport function loadNativeSearchBinding(): NativeBinding | null {\n\tif (cachedLoadResult !== null) return cachedLoadResult || null;\n\ttry {\n\t\tconst require = createModuleRequire(import.meta.url);\n\t\tconst binding = require(\"@bastani/atomic-natives\") as Partial<NativeBinding>;\n\t\tif (typeof binding.glob !== \"function\" || typeof binding.grep !== \"function\") {\n\t\t\tcachedLoadResult = false;\n\t\t\treturn null;\n\t\t}\n\t\tcachedLoadResult = binding as NativeBinding;\n\t\treturn cachedLoadResult;\n\t} catch {\n\t\tcachedLoadResult = false;\n\t\treturn null;\n\t}\n}\n\nexport function invalidateNativeSearchCache(path?: string): void {\n\tloadNativeSearchBinding()?.invalidateFsScanCache?.(path ?? null);\n}\n"]}

package/dist/core/tools/search.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/core/tools/search.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAC;AACtF,OAAO,EAEN,KAAK,eAAe,EACpB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAuD,KAAK,qBAAqB,EAAE,MAAM,eAAe,CAAC;AAKhH,OAAO,EAAsB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAGjF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,QAAA,MAAM,YAAY;;;;;;;EAYiB,CAAC;AACpC,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAC1D,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IAAE,aAAa,CAAC,EAAE,qBAAqB,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AA2N3I,wBAAgB,0BAA0B,CACzC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,iBAAiB,GACzB,cAAc,CAAC,OAAO,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAC,CAyMpE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC,OAAO,YAAY,CAAC,CAEzG"}
+{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../../src/core/tools/search.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE/D,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAC;AAEtF,OAAO,EAA4B,KAAK,eAAe,EAAE,MAAM,WAAW,CAAC;AAC3E,OAAO,EAA+B,KAAK,qBAAqB,EAA0B,MAAM,eAAe,CAAC;AAehH,OAAO,EAAsB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAKjF,YAAY,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,QAAA,MAAM,YAAY;;;;;;;EAmCjB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,YAAY,CAAC,CAAC;AAC1D,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG;IACjD,aAAa,CAAC,EAAE,qBAAqB,CAAC;IACtC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAoaF,wBAAgB,0BAA0B,CACzC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,iBAAiB,GACzB,cAAc,CAAC,OAAO,YAAY,EAAE,iBAAiB,GAAG,SAAS,CAAC,CAsXpE;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC,OAAO,YAAY,CAAC,CAEzG"}

package/dist/core/tools/search.js

@@ -3,42 +3,77 @@ import { readFile as fsReadFile, stat as fsStat } from "node:fs/promises";
 import { dirname, join, resolve as resolvePath } from "node:path";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
-import { createGrepToolDefinition, } from "./grep.js";
 import { normalizePathLikeInput, splitPathLikeGlob } from "./glob-path-utils.js";
+import { createGrepToolDefinition } from "./grep.js";
 import { createHashlineSnapshotStore, recordHashlineSnapshot } from "./hashline.js";
-import { invalidArgText, shortenPath, str } from "./render-utils.js";
 import { resolveToCwd } from "./path-utils.js";
-import { parseArchiveSelector, readArchiveSelector, resolveArchiveSelector, resolveInternalSelector, searchArchiveSelector, searchInternalSelector, searchSqliteSelector, sqliteSelectorForPath } from "./resource-selectors.js";
-import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
+import { invalidArgText, shortenPath, str } from "./render-utils.js";
+import { parseArchiveSelector, readArchiveSelector, resolveArchiveSelector, resolveInternalSelector, searchArchiveSelector, searchInternalSelector, searchSqliteSelector, sqliteSelectorForPath, } from "./resource-selectors.js";
 import { buildSearchDetails } from "./search-details.js";
 import { filterSearchOutputByLineRange, splitLineRangeSelector } from "./search-line-ranges.js";
 import { wrapToolDefinition } from "./tool-definition-wrapper.js";
+import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
 const searchSchema = Type.Object({
-    pattern: Type.String({ description: "Regex pattern. Whitespace-only patterns are rejected; otherwise the pattern is preserved verbatim." }),
+    pattern: Type.String({
+        description: "Regex pattern. Whitespace-only patterns are rejected; otherwise the pattern is preserved verbatim.",
+    }),
     paths: Type.Optional(Type.Union([
-        Type.String({ description: "File, directory, glob, internal URL, or <file>:<lines> selector to search. Omitted or empty searches the workspace root." }),
-        Type.Array(Type.String({ description: "File, directory, glob, internal URL, or <file>:<lines> selector to search." })),
+        Type.String({
+            description: "File, directory, glob, internal URL, or <file>:<lines> selector to search. Omitted or empty searches the workspace root.",
+        }),
+        Type.Array(Type.String({
+            description: "File, directory, glob, internal URL, or <file>:<lines> selector to search.",
+        })),
     ])),
     i: Type.Optional(Type.Boolean({ description: "Case-insensitive search." })),
     gitignore: Type.Optional(Type.Boolean({ description: "Respect gitignore." })),
     case: Type.Optional(Type.Boolean({ description: "Set false for case-insensitive search (oh-my-pi compatibility)." })),
-    skip: Type.Optional(Type.Union([Type.Number({ description: "Files to skip before collecting results; use to paginate when the previous call hit the file limit." }), Type.Null()])),
+    skip: Type.Optional(Type.Union([
+        Type.Number({
+            description: "Files to skip before collecting results; use to paginate when the previous call hit the file limit.",
+        }),
+        Type.Null(),
+    ])),
 }, { additionalProperties: false });
-function delimiterInExistingSearchGlobRoot(value, cwd) { const selector = splitLineRangeSelector(value); const parsed = splitPathLikeGlob(selector.path); return !!parsed.glob && /[;,\s]/.test(parsed.basePath) && existsSync(resolveToCwd(parsed.basePath, cwd)); }
-function archiveSelectorExists(value, cwd) { const archive = parseArchiveSelector(value); if (!archive)
-    return false; const resolved = resolveArchiveSelector(archive, cwd); if (!existsSync(resolved.archivePath))
-    return false; if (!resolved.memberPath)
-    return true; try {
-    readArchiveSelector(resolved);
-    return true;
+function delimiterInExistingSearchGlobRoot(value, cwd) {
+    const selector = splitLineRangeSelector(value);
+    const parsed = splitPathLikeGlob(selector.path);
+    return !!parsed.glob && /[;,\s]/.test(parsed.basePath) && existsSync(resolveToCwd(parsed.basePath, cwd));
+}
+function archiveSelectorExists(value, cwd) {
+    const archive = parseArchiveSelector(value);
+    if (!archive)
+        return false;
+    const resolved = resolveArchiveSelector(archive, cwd);
+    if (!existsSync(resolved.archivePath))
+        return false;
+    if (!resolved.memberPath)
+        return true;
+    try {
+        readArchiveSelector(resolved);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+function searchPathResolvable(value, cwd) {
+    const selector = splitLineRangeSelector(value), archive = parseArchiveSelector(selector.path);
+    if (archive)
+        return archiveSelectorExists(selector.path, cwd);
+    const sqlite = sqliteSelectorForPath(selector.path, cwd);
+    return (!!sqlite ||
+        /^(?:skill|agent|artifact|history|issue|local|memory|pr|conflict|omp|rule|mcp|vault):\/\//.test(selector.path) ||
+        existsSync(resolveToCwd(splitPathLikeGlob(selector.path).basePath, cwd)));
 }
-catch {
-    return false;
-} }
-function searchPathResolvable(value, cwd) { const selector = splitLineRangeSelector(value), archive = parseArchiveSelector(selector.path); if (archive)
-    return archiveSelectorExists(selector.path, cwd); const sqlite = sqliteSelectorForPath(selector.path, cwd); return !!sqlite || /^(?:skill|agent|artifact|history|issue|local|memory|pr|conflict|omp|rule|mcp|vault):\/\//.test(selector.path) || existsSync(resolveToCwd(splitPathLikeGlob(selector.path).basePath, cwd)); }
 function normalizePaths(pathsValue, cwd) {
-    const inputs = Array.isArray(pathsValue) ? (pathsValue.length > 0 ? pathsValue : ["."]) : pathsValue === undefined ? ["."] : [pathsValue];
+    const inputs = Array.isArray(pathsValue)
+        ? pathsValue.length > 0
+            ? pathsValue
+            : ["."]
+        : pathsValue === undefined
+            ? ["."]
+            : [pathsValue];
     const expanded = [];
     for (const input of inputs) {
         const raw = normalizePathLikeInput(input);
@@ -47,13 +82,20 @@ function normalizePaths(pathsValue, cwd) {
             continue;
         }
         const resourceLike = /^[a-z]+:\/\//i.test(raw) || /^[^:]+\.(?:zip|jar|tar|tgz|gz|sqlite|db):/i.test(raw);
-        if (existsSync(resolveToCwd(splitLineRangeSelector(raw).path, cwd)) || delimiterInExistingSearchGlobRoot(raw, cwd) || archiveSelectorExists(raw, cwd)) {
+        if (existsSync(resolveToCwd(splitLineRangeSelector(raw).path, cwd)) ||
+            delimiterInExistingSearchGlobRoot(raw, cwd) ||
+            archiveSelectorExists(raw, cwd)) {
             expanded.push(raw);
             continue;
         }
-        const chunks = raw.split(/[;\s]+/).map(normalizePathLikeInput).filter(Boolean);
+        const chunks = raw
+            .split(/[;\s]+/)
+            .map(normalizePathLikeInput)
+            .filter(Boolean);
         const parts = chunks.flatMap((chunk) => searchPathResolvable(chunk, cwd) ? [chunk] : chunk.split(",").map(normalizePathLikeInput).filter(Boolean));
-        const commaOrSemicolon = /[;,]/.test(raw), canSplit = commaOrSemicolon ? parts.some((part) => searchPathResolvable(part, cwd)) : parts.every((part) => searchPathResolvable(part, cwd));
+        const commaOrSemicolon = /[;,]/.test(raw), canSplit = commaOrSemicolon
+            ? parts.some((part) => searchPathResolvable(part, cwd))
+            : parts.every((part) => searchPathResolvable(part, cwd));
         if (parts.length > 1 && canSplit)
             expanded.push(...parts);
         else if (resourceLike)
@@ -75,12 +117,26 @@ function markFileLimit(details, limit) {
     details.fileLimitReached = true;
     details.meta = { ...(details.meta ?? {}), limits: { ...(details.meta?.limits ?? {}), fileLimit: limit } };
 }
-function fileLimitDetails(limit) { const details = {}; markFileLimit(details, limit); return details; }
-function continuationHint(limit, skip) { return `[${limit} matching files shown. Use skip=${skip + limit} to view more.]`; }
-function internalCapHint() { return `[Search collected the first ${INTERNAL_SKIP_LIMIT} matches before pagination; refine the pattern or path for later results.]`; }
-function hasFileLimit(details) { return typeof details === "object" && details !== null && details.fileLimitReached === true; }
+function fileLimitDetails(limit) {
+    const details = {};
+    markFileLimit(details, limit);
+    return details;
+}
+function continuationHint(limit, skip) {
+    return `[${limit} matching files shown. Use skip=${skip + limit} to view more.]`;
+}
+function internalCapHint() {
+    return `[Search collected the first ${INTERNAL_SKIP_LIMIT} matches before pagination; refine the pattern or path for later results.]`;
+}
+function hasFileLimit(details) {
+    return (typeof details === "object" &&
+        details !== null &&
+        details.fileLimitReached === true);
+}
 function isResourceSelector(value) {
-    return /^[^:]+\.(zip|jar|tar|tgz|gz|sqlite|db):/i.test(value) || /^[a-z]+:\/\//i.test(value) || value.startsWith("skill://");
+    return (/^[^:]+\.(zip|jar|tar|tgz|gz|sqlite|db):/i.test(value) ||
+        /^[a-z]+:\/\//i.test(value) ||
+        value.startsWith("skill://"));
 }
 function normalizeSearchTargets(pathsValue, cwd) {
     return normalizePaths(pathsValue, cwd).map((searchPath) => {
@@ -113,47 +169,61 @@ function normalizeSearchTargets(pathsValue, cwd) {
         return { path: parsed.basePath, glob: parsed.glob, lineRanges: selector.lineRanges };
     });
 }
-function stripExtendedRegexWhitespace(pattern) { let out = "", escaped = false, inClass = false, inComment = false; for (const ch of pattern) {
-    if (inComment) {
-        if (ch === "\n" || ch === "\r")
-            inComment = false;
-        continue;
-    }
-    if (escaped) {
-        out += ch;
-        escaped = false;
-        continue;
-    }
-    if (ch === "\\") {
+function stripExtendedRegexWhitespace(pattern) {
+    let out = "", escaped = false, inClass = false, inComment = false;
+    for (const ch of pattern) {
+        if (inComment) {
+            if (ch === "\n" || ch === "\r")
+                inComment = false;
+            continue;
+        }
+        if (escaped) {
+            out += ch;
+            escaped = false;
+            continue;
+        }
+        if (ch === "\\") {
+            out += ch;
+            escaped = true;
+            continue;
+        }
+        if (ch === "[")
+            inClass = true;
+        else if (ch === "]")
+            inClass = false;
+        if (!inClass && ch === "#") {
+            inComment = true;
+            continue;
+        }
+        if (!inClass && /\s/.test(ch))
+            continue;
         out += ch;
-        escaped = true;
-        continue;
     }
-    if (ch === "[")
-        inClass = true;
-    else if (ch === "]")
-        inClass = false;
-    if (!inClass && ch === "#") {
-        inComment = true;
-        continue;
+    return out;
+}
+function normalizeInlineSearchPattern(pattern, ignoreCase) {
+    const match = pattern.match(/^\(\?([imsUx-]+)\)([\s\S]*)$/), flags = new Set();
+    if (ignoreCase)
+        flags.add("i");
+    if (match) {
+        const inline = match[1] ?? "";
+        for (const flag of inline)
+            if (flag === "i" || flag === "m" || flag === "s")
+                flags.add(flag);
+        return {
+            pattern: inline.includes("x") ? stripExtendedRegexWhitespace(match[2] ?? "") : (match[2] ?? ""),
+            flags: [...flags].join(""),
+        };
     }
-    if (!inClass && /\s/.test(ch))
-        continue;
-    out += ch;
-} return out; }
-function normalizeInlineSearchPattern(pattern, ignoreCase) { const match = pattern.match(/^\(\?([imsUx-]+)\)([\s\S]*)$/), flags = new Set(); if (ignoreCase)
-    flags.add("i"); if (match) {
-    const inline = match[1] ?? "";
-    for (const flag of inline)
-        if (flag === "i" || flag === "m" || flag === "s")
-            flags.add(flag);
-    return { pattern: inline.includes("x") ? stripExtendedRegexWhitespace(match[2] ?? "") : match[2] ?? "", flags: [...flags].join("") };
-} return { pattern, flags: [...flags].join("") }; }
+    return { pattern, flags: [...flags].join("") };
+}
 async function searchFileLineRanges(target, cwd, pattern, ignoreCase, contextBefore = 1, contextAfter = 3) {
     if (!target.lineRanges?.length || target.glob || target.archive || target.sqlite || target.internal)
         return undefined;
     const absolutePath = resolveToCwd(target.path, cwd);
-    if (!await fsStat(absolutePath).then((stat) => stat.isFile()).catch(() => false))
+    if (!(await fsStat(absolutePath)
+        .then((stat) => stat.isFile())
+        .catch(() => false)))
         return undefined;
     const source = (await fsReadFile(absolutePath, "utf8")).split("\n");
     const normalized = normalizeInlineSearchPattern(pattern, ignoreCase);
@@ -165,13 +235,19 @@ async function searchFileLineRanges(target, cwd, pattern, ignoreCase, contextBef
         return undefined;
     }
     const matchLines = new Set();
-    source.forEach((line, index) => { regex.lastIndex = 0; if (regex.test(line))
-        matchLines.add(index + 1); });
+    source.forEach((line, index) => {
+        regex.lastIndex = 0;
+        if (regex.test(line))
+            matchLines.add(index + 1);
+    });
     const outputLines = new Set();
     for (const line of matchLines)
         for (let n = Math.max(1, line - contextBefore); n <= Math.min(source.length, line + contextAfter); n++)
             outputLines.add(n);
-    const text = [...outputLines].sort((a, b) => a - b).map((n) => `${target.path}${matchLines.has(n) ? ":" : "-"}${n}${matchLines.has(n) ? ":" : "-"} ${source[n - 1] ?? ""}`).join("\n") || "No matches found";
+    const text = [...outputLines]
+        .sort((a, b) => a - b)
+        .map((n) => `${target.path}${matchLines.has(n) ? ":" : "-"}${n}${matchLines.has(n) ? ":" : "-"} ${source[n - 1] ?? ""}`)
+        .join("\n") || "No matches found";
     return filterSearchOutputByLineRange(text, target.lineRanges, contextBefore, contextAfter);
 }
 function groupSearchOutput(text) {
@@ -193,13 +269,17 @@ function groupSearchOutput(text) {
     }
     return groups;
 }
-function isVirtualSearchTarget(target) { return !!(target?.archive || target?.sqlite || target?.internal); }
+function isVirtualSearchTarget(target) {
+    return !!(target?.archive || target?.sqlite || target?.internal);
+}
 async function addHashlineHeadersToSearchOutput(text, cwd, targetPath, hashlineStore) {
     const groups = groupSearchOutput(text);
     if (groups.length === 0)
         return text;
     const searchRoot = resolveToCwd(targetPath, cwd);
-    const targetIsFile = await fsStat(searchRoot).then((stat) => stat.isFile()).catch(() => false);
+    const targetIsFile = await fsStat(searchRoot)
+        .then((stat) => stat.isFile())
+        .catch(() => false);
     const rendered = [];
     let lastDir = "";
     for (const group of groups) {
@@ -248,15 +328,20 @@ function applyDefaultSearchContext(text, before = 1, after = 3) {
             if (!existing || (isMatch && !existing.isMatch))
                 byLine.set(number, { line, isMatch });
         }
-        const matchNumbers = [...byLine.values()].filter((item) => item.isMatch).map((item) => Number.parseInt(item.line.match(/(?::(\d+): |-(\d+)- )/)?.[1] ?? item.line.match(/-(\d+)- /)?.[1] ?? "0", 10));
+        const matchNumbers = [...byLine.values()]
+            .filter((item) => item.isMatch)
+            .map((item) => Number.parseInt(item.line.match(/(?::(\d+): |-(\d+)- )/)?.[1] ?? item.line.match(/-(\d+)- /)?.[1] ?? "0", 10));
         for (const [number, item] of [...byLine.entries()].sort((a, b) => a[0] - b[0])) {
-            if (item.isMatch || matchNumbers.some((lineNumber) => number >= lineNumber - before && number <= lineNumber + after))
+            if (item.isMatch ||
+                matchNumbers.some((lineNumber) => number >= lineNumber - before && number <= lineNumber + after))
                 output.push(item.line);
         }
     }
     return output.join("\n");
 }
-function isSearchMatchLine(line) { return /:\d+: /.test(line); }
+function isSearchMatchLine(line) {
+    return /:\d+: /.test(line);
+}
 function sliceGroupLinesByMatchCount(lines, matchLimit) {
     if (matchLimit <= 0)
         return [];
@@ -273,7 +358,10 @@ function sliceGroupLinesByMatchCount(lines, matchLimit) {
     return output;
 }
 function formatSearchGroups(groups, limit, perFileLimit = 20) {
-    return groups.slice(0, Math.max(0, limit)).flatMap((group) => sliceGroupLinesByMatchCount(group.lines, perFileLimit)).join("\n");
+    return groups
+        .slice(0, Math.max(0, limit))
+        .flatMap((group) => sliceGroupLinesByMatchCount(group.lines, perFileLimit))
+        .join("\n");
 }
 function dedupeRenderedSearchOutput(content) {
     const out = [], seen = new Set();
@@ -337,7 +425,10 @@ export function createSearchToolDefinition(cwd, options) {
             const targets = normalizeSearchTargets(params.paths, cwd);
             const ignoreCase = params.i === true || params.case === false;
             const contextBefore = options?.contextBefore ?? 1, contextAfter = options?.contextAfter ?? 3, searchContext = Math.max(contextBefore, contextAfter);
-            const isSingleFileSearch = targets.length === 1 && await fsStat(resolveToCwd(targets[0].path, cwd)).then((stat) => stat.isFile()).catch(() => false);
+            const isSingleFileSearch = targets.length === 1 &&
+                (await fsStat(resolveToCwd(targets[0].path, cwd))
+                    .then((stat) => stat.isFile())
+                    .catch(() => false));
             const limit = isSingleFileSearch ? SINGLE_FILE_MATCHES : DEFAULT_LIMIT;
             let skip = normalizeSkip(params.skip);
             const singleFileSkipIgnored = skip > 0 && isSingleFileSearch;
@@ -346,7 +437,10 @@ export function createSearchToolDefinition(cwd, options) {
             for (const target of targets) {
                 if (target.archive || target.sqlite || target.internal)
                     continue;
-                if (target.lineRanges && !await fsStat(resolveToCwd(target.path, cwd)).then((stat) => stat.isFile()).catch(() => false)) {
+                if (target.lineRanges &&
+                    !(await fsStat(resolveToCwd(target.path, cwd))
+                        .then((stat) => stat.isFile())
+                        .catch(() => false))) {
                     throw new Error("Line-range search selectors are only supported for single files");
                 }
             }
@@ -359,18 +453,38 @@ export function createSearchToolDefinition(cwd, options) {
             const targetHasMatch = async (target) => {
                 if (target.archive || target.sqlite || target.internal) {
                     const archive = target.archive ? resolveArchiveSelector(target.archive, cwd) : undefined;
-                    const text = archive ? searchArchiveSelector(archive, params.pattern, ignoreCase, false, contextBefore, contextAfter) : target.sqlite ? searchSqliteSelector(target.sqlite, params.pattern, ignoreCase, contextBefore, contextAfter) : await searchInternalSelector(target.internal, cwd, params.pattern, ignoreCase, false, resourceCtx, contextBefore, contextAfter);
-                    return groupSearchOutput(filterSearchOutputByLineRange(text, target.lineRanges, contextBefore, contextAfter)).length > 0;
+                    const text = archive
+                        ? searchArchiveSelector(archive, params.pattern, ignoreCase, false, contextBefore, contextAfter)
+                        : target.sqlite
+                            ? searchSqliteSelector(target.sqlite, params.pattern, ignoreCase, contextBefore, contextAfter)
+                            : await searchInternalSelector(target.internal, cwd, params.pattern, ignoreCase, false, resourceCtx, contextBefore, contextAfter);
+                    return (groupSearchOutput(filterSearchOutputByLineRange(text, target.lineRanges, contextBefore, contextAfter))
+                        .length > 0);
                 }
                 const ranged = await searchFileLineRanges(target, cwd, params.pattern, ignoreCase, contextBefore, contextAfter);
                 if (ranged !== undefined)
                     return groupSearchOutput(ranged).length > 0;
-                const probe = await grepDefinition.execute(toolCallId, { pattern: params.pattern, path: target.path, glob: target.glob, ignoreCase, literal: false, context: 0, limit: 1, gitignore: params.gitignore }, signal, undefined, ctx);
+                const probe = await grepDefinition.execute(toolCallId, {
+                    pattern: params.pattern,
+                    path: target.path,
+                    glob: target.glob,
+                    ignoreCase,
+                    literal: false,
+                    context: 0,
+                    limit: 1,
+                    gitignore: params.gitignore,
+                }, signal, undefined, ctx);
                 return probe.content.some((item) => item.type === "text" && item.text && item.text !== "No matches found");
             };
             for (const target of targets) {
                 if (skip === 0 && remaining <= 0) {
-                    if (!target.archive && !target.sqlite && !target.internal && targets.length > 1 && await fsStat(resolveToCwd(target.path, cwd)).then(() => false).catch(() => true)) {
+                    if (!target.archive &&
+                        !target.sqlite &&
+                        !target.internal &&
+                        targets.length > 1 &&
+                        (await fsStat(resolveToCwd(target.path, cwd))
+                            .then(() => false)
+                            .catch(() => true))) {
                         skippedMissingPaths.push(target.path);
                         continue;
                     }
@@ -382,16 +496,26 @@ export function createSearchToolDefinition(cwd, options) {
                 }
                 if (target.archive || target.sqlite || target.internal) {
                     const archive = target.archive ? resolveArchiveSelector(target.archive, cwd) : undefined;
-                    let text = archive ? searchArchiveSelector(archive, params.pattern, ignoreCase, false, contextBefore, contextAfter) : target.sqlite ? searchSqliteSelector(target.sqlite, params.pattern, ignoreCase, contextBefore, contextAfter) : await searchInternalSelector(target.internal, cwd, params.pattern, ignoreCase, false, resourceCtx, contextBefore, contextAfter);
+                    let text = archive
+                        ? searchArchiveSelector(archive, params.pattern, ignoreCase, false, contextBefore, contextAfter)
+                        : target.sqlite
+                            ? searchSqliteSelector(target.sqlite, params.pattern, ignoreCase, contextBefore, contextAfter)
+                            : await searchInternalSelector(target.internal, cwd, params.pattern, ignoreCase, false, resourceCtx, contextBefore, contextAfter);
                     if (archive && target.archive)
                         text = text.split(archive.archivePath).join(target.archive.archivePath);
                     if (target.sqlite)
-                        text = text.split(target.sqlite.databasePath).join(target.path.match(/^(.+?\.(?:sqlite3?|db3?))/i)?.[1] ?? target.sqlite.databasePath);
+                        text = text
+                            .split(target.sqlite.databasePath)
+                            .join(target.path.match(/^(.+?\.(?:sqlite3?|db3?))/i)?.[1] ?? target.sqlite.databasePath);
                     text = text || "No matches found";
                     text = filterSearchOutputByLineRange(text, target.lineRanges, contextBefore, contextAfter);
                     const outputGroups = groupSearchOutput(text);
                     if (skip > 0)
-                        groups.push(...outputGroups.map((group) => ({ targetPath: target.path, virtual: isVirtualSearchTarget(target), group })));
+                        groups.push(...outputGroups.map((group) => ({
+                            targetPath: target.path,
+                            virtual: isVirtualSearchTarget(target),
+                            group,
+                        })));
                     else if (outputGroups.length > 0) {
                         const hadMore = outputGroups.length > remaining;
                         text = formatSearchGroups(outputGroups, remaining);
@@ -410,7 +534,10 @@ export function createSearchToolDefinition(cwd, options) {
                         results.push({ content: [{ type: "text", text }], details: undefined });
                     continue;
                 }
-                if (targets.length > 1 && await fsStat(resolveToCwd(target.path, cwd)).then(() => false).catch(() => true)) {
+                if (targets.length > 1 &&
+                    (await fsStat(resolveToCwd(target.path, cwd))
+                        .then(() => false)
+                        .catch(() => true))) {
                     skippedMissingPaths.push(target.path);
                     results.push({ content: [{ type: "text", text: "No matches found" }], details: undefined });
                     continue;
@@ -418,7 +545,10 @@ export function createSearchToolDefinition(cwd, options) {
                 const rangedText = await searchFileLineRanges(target, cwd, params.pattern, ignoreCase, contextBefore, contextAfter);
                 if (rangedText !== undefined) {
                     let text = applyDefaultSearchContext(rangedText, contextBefore, contextAfter) || "No matches found";
-                    const result = { content: [{ type: "text", text }], details: undefined };
+                    const result = {
+                        content: [{ type: "text", text }],
+                        details: undefined,
+                    };
                     results.push(result);
                     const outputGroups = groupSearchOutput(text);
                     if (skip > 0)
@@ -490,7 +620,9 @@ export function createSearchToolDefinition(cwd, options) {
                     const raw = formatSearchGroups([item.group], 1);
                     remainingMatches--;
                     if (raw)
-                        renderedPages.push(item.virtual ? raw : await addHashlineHeadersToSearchOutput(raw, cwd, item.targetPath, hashlineStore));
+                        renderedPages.push(item.virtual
+                            ? raw
+                            : await addHashlineHeadersToSearchOutput(raw, cwd, item.targetPath, hashlineStore));
                 }
                 const hasMorePages = groups.slice(skip + limit).length > 0;
                 const cappedBeforeRequestedPage = internalSearchCapped && skip >= groups.length;
@@ -518,18 +650,38 @@ export function createSearchToolDefinition(cwd, options) {
                 text = filterSearchOutputByLineRange(text, targets[0]?.lineRanges, contextBefore, contextAfter);
                 if (!isVirtualSearchTarget(targets[0]) && text !== "No matches found")
                     text = applyDefaultSearchContext(text, contextBefore, contextAfter) || "No matches found";
-                const skipNotice = singleFileSkipIgnored ? "\n\n[skip is ignored for single-file search; refine the pattern/path or search a directory to page matching files.]" : "";
+                const skipNotice = singleFileSkipIgnored
+                    ? "\n\n[skip is ignored for single-file search; refine the pattern/path or search a directory to page matching files.]"
+                    : "";
                 if (isSingleFileSearch && text !== "No matches found")
                     text = formatSearchGroups(groupSearchOutput(text), limit, limit);
                 if (text && text !== "No matches found") {
-                    const renderedText = isVirtualSearchTarget(targets[0]) ? text : await addHashlineHeadersToSearchOutput(text, cwd, targets[0]?.path ?? ".", hashlineStore);
+                    const renderedText = isVirtualSearchTarget(targets[0])
+                        ? text
+                        : await addHashlineHeadersToSearchOutput(text, cwd, targets[0]?.path ?? ".", hashlineStore);
                     const pagedText = `${hasFileLimit(result.details) ? `${renderedText}\n\n${continuationHint(limit, skip)}` : renderedText}${skipNotice}`;
                     const truncation = truncateHead(pagedText, { maxLines: Number.MAX_SAFE_INTEGER });
                     if (truncation.truncated)
-                        return { ...result, content: [{ type: "text", text: `${truncation.content}\n\n[${formatSize(DEFAULT_MAX_BYTES)} combined output limit reached]` }], details: buildSearchDetails({ ...(result.details ?? {}), truncation }, truncation.content, cwd, scopePath, skippedMissingPaths) };
-                    return { ...result, content: [{ type: "text", text: pagedText }], details: buildSearchDetails(result.details, pagedText, cwd, scopePath, skippedMissingPaths) };
+                        return {
+                            ...result,
+                            content: [
+                                {
+                                    type: "text",
+                                    text: `${truncation.content}\n\n[${formatSize(DEFAULT_MAX_BYTES)} combined output limit reached]`,
+                                },
+                            ],
+                            details: buildSearchDetails({ ...(result.details ?? {}), truncation }, truncation.content, cwd, scopePath, skippedMissingPaths),
+                        };
+                    return {
+                        ...result,
+                        content: [{ type: "text", text: pagedText }],
+                        details: buildSearchDetails(result.details, pagedText, cwd, scopePath, skippedMissingPaths),
+                    };
                 }
-                return { ...result, details: buildSearchDetails(result.details, text || "No matches found", cwd, scopePath, skippedMissingPaths) };
+                return {
+                    ...result,
+                    details: buildSearchDetails(result.details, text || "No matches found", cwd, scopePath, skippedMissingPaths),
+                };
             }
             const renderedResults = await Promise.all(results.map(async (result, index) => {
                 let text = result.content
@@ -541,7 +693,9 @@ export function createSearchToolDefinition(cwd, options) {
                     text = applyDefaultSearchContext(text, contextBefore, contextAfter);
                 if (!text || text === "No matches found")
                     return `# ${targets[index]?.path ?? "."}\n${text}`;
-                return isVirtualSearchTarget(targets[index]) ? text : await addHashlineHeadersToSearchOutput(text, cwd, targets[index]?.path ?? ".", hashlineStore);
+                return isVirtualSearchTarget(targets[index])
+                    ? text
+                    : await addHashlineHeadersToSearchOutput(text, cwd, targets[index]?.path ?? ".", hashlineStore);
             }));
             const content = dedupeRenderedSearchOutput(`${renderedResults.join("\n\n")}${skippedMissingPaths.length > 0 ? `\n\n[Skipped missing paths: ${skippedMissingPaths.join(", ")}]` : ""}${pageFullWithMore ? `\n\n${continuationHint(limit, skip)}` : ""}${internalSearchCapped && !pageFullWithMore ? `\n\n${internalCapHint()}` : ""}`);
             if (pageFullWithMore || internalSearchCapped)