@phi-code-admin/phi-code 0.74.3 → 0.75.0

package/dist/core/tools/file-mutation-queue.js

@@ -0,0 +1,37 @@
+import { realpathSync } from "node:fs";
+import { resolve } from "node:path";
+const fileMutationQueues = new Map();
+function getMutationQueueKey(filePath) {
+    const resolvedPath = resolve(filePath);
+    try {
+        return realpathSync.native(resolvedPath);
+    }
+    catch {
+        return resolvedPath;
+    }
+}
+/**
+ * Serialize file mutation operations targeting the same file.
+ * Operations for different files still run in parallel.
+ */
+export async function withFileMutationQueue(filePath, fn) {
+    const key = getMutationQueueKey(filePath);
+    const currentQueue = fileMutationQueues.get(key) ?? Promise.resolve();
+    let releaseNext;
+    const nextQueue = new Promise((resolveQueue) => {
+        releaseNext = resolveQueue;
+    });
+    const chainedQueue = currentQueue.then(() => nextQueue);
+    fileMutationQueues.set(key, chainedQueue);
+    await currentQueue;
+    try {
+        return await fn();
+    }
+    finally {
+        releaseNext();
+        if (fileMutationQueues.get(key) === chainedQueue) {
+            fileMutationQueues.delete(key);
+        }
+    }
+}
+//# sourceMappingURL=file-mutation-queue.js.map

package/dist/core/tools/file-mutation-queue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-mutation-queue.js","sourceRoot":"","sources":["../../../src/core/tools/file-mutation-queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAyB,CAAC;AAE5D,SAAS,mBAAmB,CAAC,QAAgB,EAAU;IACtD,MAAM,YAAY,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC;QACJ,OAAO,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1C,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,YAAY,CAAC;IACrB,CAAC;AAAA,CACD;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAI,QAAgB,EAAE,EAAoB,EAAc;IAClG,MAAM,GAAG,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,YAAY,GAAG,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;IAEtE,IAAI,WAAwB,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,OAAO,CAAO,CAAC,YAAY,EAAE,EAAE,CAAC;QACrD,WAAW,GAAG,YAAY,CAAC;IAAA,CAC3B,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACxD,kBAAkB,CAAC,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAE1C,MAAM,YAAY,CAAC;IACnB,IAAI,CAAC;QACJ,OAAO,MAAM,EAAE,EAAE,CAAC;IACnB,CAAC;YAAS,CAAC;QACV,WAAW,EAAE,CAAC;QACd,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,YAAY,EAAE,CAAC;YAClD,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;AAAA,CACD","sourcesContent":["import { realpathSync } from \"node:fs\";\nimport { resolve } from \"node:path\";\n\nconst fileMutationQueues = new Map<string, Promise<void>>();\n\nfunction getMutationQueueKey(filePath: string): string {\n\tconst resolvedPath = resolve(filePath);\n\ttry {\n\t\treturn realpathSync.native(resolvedPath);\n\t} catch {\n\t\treturn resolvedPath;\n\t}\n}\n\n/**\n * Serialize file mutation operations targeting the same file.\n * Operations for different files still run in parallel.\n */\nexport async function withFileMutationQueue<T>(filePath: string, fn: () => Promise<T>): Promise<T> {\n\tconst key = getMutationQueueKey(filePath);\n\tconst currentQueue = fileMutationQueues.get(key) ?? Promise.resolve();\n\n\tlet releaseNext!: () => void;\n\tconst nextQueue = new Promise<void>((resolveQueue) => {\n\t\treleaseNext = resolveQueue;\n\t});\n\tconst chainedQueue = currentQueue.then(() => nextQueue);\n\tfileMutationQueues.set(key, chainedQueue);\n\n\tawait currentQueue;\n\ttry {\n\t\treturn await fn();\n\t} finally {\n\t\treleaseNext();\n\t\tif (fileMutationQueues.get(key) === chainedQueue) {\n\t\t\tfileMutationQueues.delete(key);\n\t\t}\n\t}\n}\n"]}

package/dist/core/tools/find.d.ts

@@ -1,10 +1,11 @@
 import type { AgentTool } from "phi-code-agent";
-import { type Static } from "@sinclair/typebox";
+import { type Static, Type } from "typebox";
+import type { ToolDefinition } from "../extensions/types.js";
 import { type TruncationResult } from "./truncate.js";
-declare const findSchema: import("@sinclair/typebox").TObject<{
-    pattern: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
+declare const findSchema: Type.TObject<{
+    pattern: Type.TString;
+    path: Type.TOptional<Type.TString>;
+    limit: Type.TOptional<Type.TNumber>;
 }>;
 export type FindToolInput = Static<typeof findSchema>;
 export interface FindToolDetails {
@@ -13,27 +14,22 @@ export interface FindToolDetails {
 }
 /**
  * Pluggable operations for the find tool.
- * Override these to delegate file search to remote systems (e.g., SSH).
+ * Override these to delegate file search to remote systems (for example SSH).
  */
 export interface FindOperations {
     /** Check if path exists */
     exists: (absolutePath: string) => Promise<boolean> | boolean;
-    /** Find files matching glob pattern. Returns relative paths. */
+    /** Find files matching glob pattern. Returns relative or absolute paths. */
     glob: (pattern: string, cwd: string, options: {
         ignore: string[];
         limit: number;
     }) => Promise<string[]> | string[];
 }
 export interface FindToolOptions {
-    /** Custom operations for find. Default: local filesystem + fd */
+    /** Custom operations for find. Default: local filesystem plus fd */
     operations?: FindOperations;
 }
+export declare function createFindToolDefinition(cwd: string, options?: FindToolOptions): ToolDefinition<typeof findSchema, FindToolDetails | undefined>;
 export declare function createFindTool(cwd: string, options?: FindToolOptions): AgentTool<typeof findSchema>;
-/** Default find tool using process.cwd() - for backwards compatibility */
-export declare const findTool: AgentTool<import("@sinclair/typebox").TObject<{
-    pattern: import("@sinclair/typebox").TString;
-    path: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TString>;
-    limit: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TNumber>;
-}>, any>;
 export {};
 //# sourceMappingURL=find.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/core/tools/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,KAAK,MAAM,EAAQ,MAAM,mBAAmB,CAAC;AAOtD,OAAO,EAAiC,KAAK,gBAAgB,EAAgB,MAAM,eAAe,CAAC;AAEnG,QAAA,MAAM,UAAU;;;;EAMd,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAItD,MAAM,WAAW,eAAe;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,2BAA2B;IAC3B,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC7D,gEAAgE;IAChE,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC;CACnH;AAUD,MAAM,WAAW,eAAe;IAC/B,iEAAiE;IACjE,UAAU,CAAC,EAAE,cAAc,CAAC;CAC5B;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,OAAO,UAAU,CAAC,CA0NnG;AAED,0EAA0E;AAC1E,eAAO,MAAM,QAAQ;;;;QAAgC,CAAC"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../src/core/tools/find.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAE,KAAK,MAAM,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG5C,OAAO,KAAK,EAAE,cAAc,EAA2B,MAAM,wBAAwB,CAAC;AAItF,OAAO,EAAiC,KAAK,gBAAgB,EAAgB,MAAM,eAAe,CAAC;AAMnG,QAAA,MAAM,UAAU;;;;EAMd,CAAC;AAEH,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,CAAC;AAItD,MAAM,WAAW,eAAe;IAC/B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;GAGG;AACH,MAAM,WAAW,cAAc;IAC9B,2BAA2B;IAC3B,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;IAC7D,4EAA4E;IAC5E,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE;QAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GAAG,MAAM,EAAE,CAAC;CACnH;AAQD,MAAM,WAAW,eAAe;IAC/B,oEAAoE;IACpE,UAAU,CAAC,EAAE,cAAc,CAAC;CAC5B;AAuDD,wBAAgB,wBAAwB,CACvC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,eAAe,GACvB,cAAc,CAAC,OAAO,UAAU,EAAE,eAAe,GAAG,SAAS,CAAC,CA2PhE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,SAAS,CAAC,OAAO,UAAU,CAAC,CAEnG","sourcesContent":["import { createInterface } from \"node:readline\";\nimport { spawn } from \"child_process\";\nimport { existsSync } from \"fs\";\nimport path from \"path\";\nimport type { AgentTool } from \"phi-code-agent\";\nimport { Text } from \"phi-code-tui\";\nimport { type Static, Type } from \"typebox\";\nimport { keyHint } from \"../../modes/interactive/components/keybinding-hints.js\";\nimport { ensureTool } from \"../../utils/tools-manager.js\";\nimport type { ToolDefinition, ToolRenderResultOptions } from \"../extensions/types.js\";\nimport { resolveToCwd } from \"./path-utils.js\";\nimport { getTextOutput, invalidArgText, shortenPath, str } from \"./render-utils.js\";\nimport { wrapToolDefinition } from \"./tool-definition-wrapper.js\";\nimport { DEFAULT_MAX_BYTES, formatSize, type TruncationResult, truncateHead } from \"./truncate.js\";\n\nfunction toPosixPath(value: string): string {\n\treturn value.split(path.sep).join(\"/\");\n}\n\nconst findSchema = Type.Object({\n\tpattern: Type.String({\n\t\tdescription: \"Glob pattern to match files, e.g. '*.ts', '**/*.json', or 'src/**/*.spec.ts'\",\n\t}),\n\tpath: Type.Optional(Type.String({ description: \"Directory to search in (default: current directory)\" })),\n\tlimit: Type.Optional(Type.Number({ description: \"Maximum number of results (default: 1000)\" })),\n});\n\nexport type FindToolInput = Static<typeof findSchema>;\n\nconst DEFAULT_LIMIT = 1000;\n\nexport interface FindToolDetails {\n\ttruncation?: TruncationResult;\n\tresultLimitReached?: number;\n}\n\n/**\n * Pluggable operations for the find tool.\n * Override these to delegate file search to remote systems (for example SSH).\n */\nexport interface FindOperations {\n\t/** Check if path exists */\n\texists: (absolutePath: string) => Promise<boolean> | boolean;\n\t/** Find files matching glob pattern. Returns relative or absolute paths. */\n\tglob: (pattern: string, cwd: string, options: { ignore: string[]; limit: number }) => Promise<string[]> | string[];\n}\n\nconst defaultFindOperations: FindOperations = {\n\texists: existsSync,\n\t// This is a placeholder. Actual fd execution happens in execute() when no custom glob is provided.\n\tglob: () => [],\n};\n\nexport interface FindToolOptions {\n\t/** Custom operations for find. Default: local filesystem plus fd */\n\toperations?: FindOperations;\n}\n\nfunction formatFindCall(\n\targs: { pattern: string; path?: string; limit?: number } | undefined,\n\ttheme: typeof import(\"../../modes/interactive/theme/theme.js\").theme,\n): string {\n\tconst pattern = str(args?.pattern);\n\tconst rawPath = str(args?.path);\n\tconst path = rawPath !== null ? shortenPath(rawPath || \".\") : null;\n\tconst limit = args?.limit;\n\tconst invalidArg = invalidArgText(theme);\n\tlet text =\n\t\ttheme.fg(\"toolTitle\", theme.bold(\"find\")) +\n\t\t\" \" +\n\t\t(pattern === null ? invalidArg : theme.fg(\"accent\", pattern || \"\")) +\n\t\ttheme.fg(\"toolOutput\", ` in ${path === null ? invalidArg : path}`);\n\tif (limit !== undefined) {\n\t\ttext += theme.fg(\"toolOutput\", ` (limit ${limit})`);\n\t}\n\treturn text;\n}\n\nfunction formatFindResult(\n\tresult: {\n\t\tcontent: Array<{ type: string; text?: string; data?: string; mimeType?: string }>;\n\t\tdetails?: FindToolDetails;\n\t},\n\toptions: ToolRenderResultOptions,\n\ttheme: typeof import(\"../../modes/interactive/theme/theme.js\").theme,\n\tshowImages: boolean,\n): string {\n\tconst output = getTextOutput(result, showImages).trim();\n\tlet text = \"\";\n\tif (output) {\n\t\tconst lines = output.split(\"\\n\");\n\t\tconst maxLines = options.expanded ? lines.length : 20;\n\t\tconst displayLines = lines.slice(0, maxLines);\n\t\tconst remaining = lines.length - maxLines;\n\t\ttext += `\\n${displayLines.map((line) => theme.fg(\"toolOutput\", line)).join(\"\\n\")}`;\n\t\tif (remaining > 0) {\n\t\t\ttext += `${theme.fg(\"muted\", `\\n... (${remaining} more lines,`)} ${keyHint(\"app.tools.expand\", \"to expand\")})`;\n\t\t}\n\t}\n\n\tconst resultLimit = result.details?.resultLimitReached;\n\tconst truncation = result.details?.truncation;\n\tif (resultLimit || truncation?.truncated) {\n\t\tconst warnings: string[] = [];\n\t\tif (resultLimit) warnings.push(`${resultLimit} results limit`);\n\t\tif (truncation?.truncated) warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);\n\t\ttext += `\\n${theme.fg(\"warning\", `[Truncated: ${warnings.join(\", \")}]`)}`;\n\t}\n\treturn text;\n}\n\nexport function createFindToolDefinition(\n\tcwd: string,\n\toptions?: FindToolOptions,\n): ToolDefinition<typeof findSchema, FindToolDetails | undefined> {\n\tconst customOps = options?.operations;\n\treturn {\n\t\tname: \"find\",\n\t\tlabel: \"find\",\n\t\tdescription: `Search for files by glob pattern. Returns matching file paths relative to the search directory. Respects .gitignore. Output is truncated to ${DEFAULT_LIMIT} results or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first).`,\n\t\tpromptSnippet: \"Find files by glob pattern (respects .gitignore)\",\n\t\tparameters: findSchema,\n\t\tasync execute(\n\t\t\t_toolCallId,\n\t\t\t{ pattern, path: searchDir, limit }: { pattern: string; path?: string; limit?: number },\n\t\t\tsignal?: AbortSignal,\n\t\t\t_onUpdate?,\n\t\t\t_ctx?,\n\t\t) {\n\t\t\treturn new Promise((resolve, reject) => {\n\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\treject(new Error(\"Operation aborted\"));\n\t\t\t\t\treturn;\n\t\t\t\t}\n\n\t\t\t\tlet settled = false;\n\t\t\t\tlet stopChild: (() => void) | undefined;\n\t\t\t\tconst settle = (fn: () => void) => {\n\t\t\t\t\tif (settled) return;\n\t\t\t\t\tsettled = true;\n\t\t\t\t\tsignal?.removeEventListener(\"abort\", onAbort);\n\t\t\t\t\tstopChild = undefined;\n\t\t\t\t\tfn();\n\t\t\t\t};\n\t\t\t\tconst onAbort = () => {\n\t\t\t\t\tstopChild?.();\n\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t};\n\t\t\t\tsignal?.addEventListener(\"abort\", onAbort, { once: true });\n\n\t\t\t\t(async () => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst searchPath = resolveToCwd(searchDir || \".\", cwd);\n\t\t\t\t\t\tconst effectiveLimit = limit ?? DEFAULT_LIMIT;\n\t\t\t\t\t\tconst ops = customOps ?? defaultFindOperations;\n\n\t\t\t\t\t\t// If custom operations provide glob(), use that instead of fd.\n\t\t\t\t\t\tif (customOps?.glob) {\n\t\t\t\t\t\t\tif (!(await ops.exists(searchPath))) {\n\t\t\t\t\t\t\t\tsettle(() => reject(new Error(`Path not found: ${searchPath}`)));\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tconst results = await ops.glob(pattern, searchPath, {\n\t\t\t\t\t\t\t\tignore: [\"**/node_modules/**\", \"**/.git/**\"],\n\t\t\t\t\t\t\t\tlimit: effectiveLimit,\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (results.length === 0) {\n\t\t\t\t\t\t\t\tsettle(() =>\n\t\t\t\t\t\t\t\t\tresolve({\n\t\t\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: \"No files found matching pattern\" }],\n\t\t\t\t\t\t\t\t\t\tdetails: undefined,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t// Relativize paths against the search root for stable output.\n\t\t\t\t\t\t\tconst relativized = results.map((p) => {\n\t\t\t\t\t\t\t\tif (p.startsWith(searchPath)) return toPosixPath(p.slice(searchPath.length + 1));\n\t\t\t\t\t\t\t\treturn toPosixPath(path.relative(searchPath, p));\n\t\t\t\t\t\t\t});\n\t\t\t\t\t\t\tconst resultLimitReached = relativized.length >= effectiveLimit;\n\t\t\t\t\t\t\tconst rawOutput = relativized.join(\"\\n\");\n\t\t\t\t\t\t\tconst truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });\n\t\t\t\t\t\t\tlet resultOutput = truncation.content;\n\t\t\t\t\t\t\tconst details: FindToolDetails = {};\n\t\t\t\t\t\t\tconst notices: string[] = [];\n\t\t\t\t\t\t\tif (resultLimitReached) {\n\t\t\t\t\t\t\t\tnotices.push(`${effectiveLimit} results limit reached`);\n\t\t\t\t\t\t\t\tdetails.resultLimitReached = effectiveLimit;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (truncation.truncated) {\n\t\t\t\t\t\t\t\tnotices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);\n\t\t\t\t\t\t\t\tdetails.truncation = truncation;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (notices.length > 0) {\n\t\t\t\t\t\t\t\tresultOutput += `\\n\\n[${notices.join(\". \")}]`;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tsettle(() =>\n\t\t\t\t\t\t\t\tresolve({\n\t\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: resultOutput }],\n\t\t\t\t\t\t\t\t\tdetails: Object.keys(details).length > 0 ? details : undefined,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t// Default implementation uses fd.\n\t\t\t\t\t\tconst fdPath = await ensureTool(\"fd\", true);\n\t\t\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tif (!fdPath) {\n\t\t\t\t\t\t\tsettle(() => reject(new Error(\"fd is not available and could not be downloaded\")));\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\n\t\t\t\t\t\t// Build fd arguments. --no-require-git makes fd apply hierarchical .gitignore\n\t\t\t\t\t\t// semantics whether or not the search path is inside a git repository, without\n\t\t\t\t\t\t// leaking sibling-directory rules the way --ignore-file (a global source) would.\n\t\t\t\t\t\tconst args: string[] = [\n\t\t\t\t\t\t\t\"--glob\",\n\t\t\t\t\t\t\t\"--color=never\",\n\t\t\t\t\t\t\t\"--hidden\",\n\t\t\t\t\t\t\t\"--no-require-git\",\n\t\t\t\t\t\t\t\"--max-results\",\n\t\t\t\t\t\t\tString(effectiveLimit),\n\t\t\t\t\t\t];\n\n\t\t\t\t\t\t// fd --glob matches against the basename unless --full-path is set; in --full-path\n\t\t\t\t\t\t// mode it matches against the absolute candidate path, so a path-containing\n\t\t\t\t\t\t// pattern like 'src/**/*.spec.ts' needs a leading '**/' to match anything.\n\t\t\t\t\t\tlet effectivePattern = pattern;\n\t\t\t\t\t\tif (pattern.includes(\"/\")) {\n\t\t\t\t\t\t\targs.push(\"--full-path\");\n\t\t\t\t\t\t\tif (!pattern.startsWith(\"/\") && !pattern.startsWith(\"**/\") && pattern !== \"**\") {\n\t\t\t\t\t\t\t\teffectivePattern = `**/${pattern}`;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\targs.push(\"--\", effectivePattern, searchPath);\n\n\t\t\t\t\t\tconst child = spawn(fdPath, args, { stdio: [\"ignore\", \"pipe\", \"pipe\"] });\n\t\t\t\t\t\tconst rl = createInterface({ input: child.stdout });\n\t\t\t\t\t\tlet stderr = \"\";\n\t\t\t\t\t\tconst lines: string[] = [];\n\n\t\t\t\t\t\tstopChild = () => {\n\t\t\t\t\t\t\tif (!child.killed) {\n\t\t\t\t\t\t\t\tchild.kill();\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t};\n\n\t\t\t\t\t\tconst cleanup = () => {\n\t\t\t\t\t\t\trl.close();\n\t\t\t\t\t\t};\n\n\t\t\t\t\t\tchild.stderr?.on(\"data\", (chunk) => {\n\t\t\t\t\t\t\tstderr += chunk.toString();\n\t\t\t\t\t\t});\n\n\t\t\t\t\t\trl.on(\"line\", (line) => {\n\t\t\t\t\t\t\tlines.push(line);\n\t\t\t\t\t\t});\n\n\t\t\t\t\t\tchild.on(\"error\", (error) => {\n\t\t\t\t\t\t\tcleanup();\n\t\t\t\t\t\t\tsettle(() => reject(new Error(`Failed to run fd: ${error.message}`)));\n\t\t\t\t\t\t});\n\n\t\t\t\t\t\tchild.on(\"close\", (code) => {\n\t\t\t\t\t\t\tcleanup();\n\t\t\t\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tconst output = lines.join(\"\\n\");\n\t\t\t\t\t\t\tif (code !== 0) {\n\t\t\t\t\t\t\t\tconst errorMsg = stderr.trim() || `fd exited with code ${code}`;\n\t\t\t\t\t\t\t\tif (!output) {\n\t\t\t\t\t\t\t\t\tsettle(() => reject(new Error(errorMsg)));\n\t\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (!output) {\n\t\t\t\t\t\t\t\tsettle(() =>\n\t\t\t\t\t\t\t\t\tresolve({\n\t\t\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: \"No files found matching pattern\" }],\n\t\t\t\t\t\t\t\t\t\tdetails: undefined,\n\t\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tconst relativized: string[] = [];\n\t\t\t\t\t\t\tfor (const rawLine of lines) {\n\t\t\t\t\t\t\t\tconst line = rawLine.replace(/\\r$/, \"\").trim();\n\t\t\t\t\t\t\t\tif (!line) continue;\n\t\t\t\t\t\t\t\tconst hadTrailingSlash = line.endsWith(\"/\") || line.endsWith(\"\\\\\");\n\t\t\t\t\t\t\t\tlet relativePath = line;\n\t\t\t\t\t\t\t\tif (line.startsWith(searchPath)) {\n\t\t\t\t\t\t\t\t\trelativePath = line.slice(searchPath.length + 1);\n\t\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\t\trelativePath = path.relative(searchPath, line);\n\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\tif (hadTrailingSlash && !relativePath.endsWith(\"/\")) relativePath += \"/\";\n\t\t\t\t\t\t\t\trelativized.push(toPosixPath(relativePath));\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\tconst resultLimitReached = relativized.length >= effectiveLimit;\n\t\t\t\t\t\t\tconst rawOutput = relativized.join(\"\\n\");\n\t\t\t\t\t\t\tconst truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });\n\t\t\t\t\t\t\tlet resultOutput = truncation.content;\n\t\t\t\t\t\t\tconst details: FindToolDetails = {};\n\t\t\t\t\t\t\tconst notices: string[] = [];\n\t\t\t\t\t\t\tif (resultLimitReached) {\n\t\t\t\t\t\t\t\tnotices.push(\n\t\t\t\t\t\t\t\t\t`${effectiveLimit} results limit reached. Use limit=${effectiveLimit * 2} for more, or refine pattern`,\n\t\t\t\t\t\t\t\t);\n\t\t\t\t\t\t\t\tdetails.resultLimitReached = effectiveLimit;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (truncation.truncated) {\n\t\t\t\t\t\t\t\tnotices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);\n\t\t\t\t\t\t\t\tdetails.truncation = truncation;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tif (notices.length > 0) {\n\t\t\t\t\t\t\t\tresultOutput += `\\n\\n[${notices.join(\". \")}]`;\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\tsettle(() =>\n\t\t\t\t\t\t\t\tresolve({\n\t\t\t\t\t\t\t\t\tcontent: [{ type: \"text\", text: resultOutput }],\n\t\t\t\t\t\t\t\t\tdetails: Object.keys(details).length > 0 ? details : undefined,\n\t\t\t\t\t\t\t\t}),\n\t\t\t\t\t\t\t);\n\t\t\t\t\t\t});\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tif (signal?.aborted) {\n\t\t\t\t\t\t\tsettle(() => reject(new Error(\"Operation aborted\")));\n\t\t\t\t\t\t\treturn;\n\t\t\t\t\t\t}\n\t\t\t\t\t\tconst error = e instanceof Error ? e : new Error(String(e));\n\t\t\t\t\t\tsettle(() => reject(error));\n\t\t\t\t\t}\n\t\t\t\t})();\n\t\t\t});\n\t\t},\n\t\trenderCall(args, theme, context) {\n\t\t\tconst text = (context.lastComponent as Text | undefined) ?? new Text(\"\", 0, 0);\n\t\t\ttext.setText(formatFindCall(args, theme));\n\t\t\treturn text;\n\t\t},\n\t\trenderResult(result, options, theme, context) {\n\t\t\tconst text = (context.lastComponent as Text | undefined) ?? new Text(\"\", 0, 0);\n\t\t\ttext.setText(formatFindResult(result as any, options, theme, context.showImages));\n\t\t\treturn text;\n\t\t},\n\t};\n}\n\nexport function createFindTool(cwd: string, options?: FindToolOptions): AgentTool<typeof findSchema> {\n\treturn wrapToolDefinition(createFindToolDefinition(cwd, options));\n}\n"]}

package/dist/core/tools/find.js

@@ -1,11 +1,18 @@
-import { Type } from "@sinclair/typebox";
-import { spawnSync } from "child_process";
+import { createInterface } from "node:readline";
+import { spawn } from "child_process";
 import { existsSync } from "fs";
-import { globSync } from "glob";
 import path from "path";
+import { Text } from "phi-code-tui";
+import { Type } from "typebox";
+import { keyHint } from "../../modes/interactive/components/keybinding-hints.js";
 import { ensureTool } from "../../utils/tools-manager.js";
 import { resolveToCwd } from "./path-utils.js";
+import { getTextOutput, invalidArgText, shortenPath, str } from "./render-utils.js";
+import { wrapToolDefinition } from "./tool-definition-wrapper.js";
 import { DEFAULT_MAX_BYTES, formatSize, truncateHead } from "./truncate.js";
+function toPosixPath(value) {
+    return value.split(path.sep).join("/");
+}
 const findSchema = Type.Object({
     pattern: Type.String({
         description: "Glob pattern to match files, e.g. '*.ts', '**/*.json', or 'src/**/*.spec.ts'",
@@ -16,55 +23,113 @@ const findSchema = Type.Object({
 const DEFAULT_LIMIT = 1000;
 const defaultFindOperations = {
     exists: existsSync,
-    glob: (_pattern, _searchCwd, _options) => {
-        // This is a placeholder - actual fd execution happens in execute
-        return [];
-    },
+    // This is a placeholder. Actual fd execution happens in execute() when no custom glob is provided.
+    glob: () => [],
 };
-export function createFindTool(cwd, options) {
+function formatFindCall(args, theme) {
+    const pattern = str(args?.pattern);
+    const rawPath = str(args?.path);
+    const path = rawPath !== null ? shortenPath(rawPath || ".") : null;
+    const limit = args?.limit;
+    const invalidArg = invalidArgText(theme);
+    let text = theme.fg("toolTitle", theme.bold("find")) +
+        " " +
+        (pattern === null ? invalidArg : theme.fg("accent", pattern || "")) +
+        theme.fg("toolOutput", ` in ${path === null ? invalidArg : path}`);
+    if (limit !== undefined) {
+        text += theme.fg("toolOutput", ` (limit ${limit})`);
+    }
+    return text;
+}
+function formatFindResult(result, options, theme, showImages) {
+    const output = getTextOutput(result, showImages).trim();
+    let text = "";
+    if (output) {
+        const lines = output.split("\n");
+        const maxLines = options.expanded ? lines.length : 20;
+        const displayLines = lines.slice(0, maxLines);
+        const remaining = lines.length - maxLines;
+        text += `\n${displayLines.map((line) => theme.fg("toolOutput", line)).join("\n")}`;
+        if (remaining > 0) {
+            text += `${theme.fg("muted", `\n... (${remaining} more lines,`)} ${keyHint("app.tools.expand", "to expand")})`;
+        }
+    }
+    const resultLimit = result.details?.resultLimitReached;
+    const truncation = result.details?.truncation;
+    if (resultLimit || truncation?.truncated) {
+        const warnings = [];
+        if (resultLimit)
+            warnings.push(`${resultLimit} results limit`);
+        if (truncation?.truncated)
+            warnings.push(`${formatSize(truncation.maxBytes ?? DEFAULT_MAX_BYTES)} limit`);
+        text += `\n${theme.fg("warning", `[Truncated: ${warnings.join(", ")}]`)}`;
+    }
+    return text;
+}
+export function createFindToolDefinition(cwd, options) {
     const customOps = options?.operations;
     return {
         name: "find",
         label: "find",
         description: `Search for files by glob pattern. Returns matching file paths relative to the search directory. Respects .gitignore. Output is truncated to ${DEFAULT_LIMIT} results or ${DEFAULT_MAX_BYTES / 1024}KB (whichever is hit first).`,
+        promptSnippet: "Find files by glob pattern (respects .gitignore)",
         parameters: findSchema,
-        execute: async (_toolCallId, { pattern, path: searchDir, limit }, signal) => {
+        async execute(_toolCallId, { pattern, path: searchDir, limit }, signal, _onUpdate, _ctx) {
             return new Promise((resolve, reject) => {
                 if (signal?.aborted) {
                     reject(new Error("Operation aborted"));
                     return;
                 }
-                const onAbort = () => reject(new Error("Operation aborted"));
+                let settled = false;
+                let stopChild;
+                const settle = (fn) => {
+                    if (settled)
+                        return;
+                    settled = true;
+                    signal?.removeEventListener("abort", onAbort);
+                    stopChild = undefined;
+                    fn();
+                };
+                const onAbort = () => {
+                    stopChild?.();
+                    settle(() => reject(new Error("Operation aborted")));
+                };
                 signal?.addEventListener("abort", onAbort, { once: true });
                 (async () => {
                     try {
                         const searchPath = resolveToCwd(searchDir || ".", cwd);
                         const effectiveLimit = limit ?? DEFAULT_LIMIT;
                         const ops = customOps ?? defaultFindOperations;
-                        // If custom operations provided with glob, use that
+                        // If custom operations provide glob(), use that instead of fd.
                         if (customOps?.glob) {
                             if (!(await ops.exists(searchPath))) {
-                                reject(new Error(`Path not found: ${searchPath}`));
+                                settle(() => reject(new Error(`Path not found: ${searchPath}`)));
+                                return;
+                            }
+                            if (signal?.aborted) {
+                                settle(() => reject(new Error("Operation aborted")));
                                 return;
                             }
                             const results = await ops.glob(pattern, searchPath, {
                                 ignore: ["**/node_modules/**", "**/.git/**"],
                                 limit: effectiveLimit,
                             });
-                            signal?.removeEventListener("abort", onAbort);
+                            if (signal?.aborted) {
+                                settle(() => reject(new Error("Operation aborted")));
+                                return;
+                            }
                             if (results.length === 0) {
-                                resolve({
+                                settle(() => resolve({
                                     content: [{ type: "text", text: "No files found matching pattern" }],
                                     details: undefined,
-                                });
+                                }));
                                 return;
                             }
-                            // Relativize paths
+                            // Relativize paths against the search root for stable output.
                             const relativized = results.map((p) => {
-                                if (p.startsWith(searchPath)) {
-                                    return p.slice(searchPath.length + 1);
-                                }
-                                return path.relative(searchPath, p);
+                                if (p.startsWith(searchPath))
+                                    return toPosixPath(p.slice(searchPath.length + 1));
+                                return toPosixPath(path.relative(searchPath, p));
                             });
                             const resultLimitReached = relativized.length >= effectiveLimit;
                             const rawOutput = relativized.join("\n");
@@ -83,124 +148,151 @@ export function createFindTool(cwd, options) {
                             if (notices.length > 0) {
                                 resultOutput += `\n\n[${notices.join(". ")}]`;
                             }
-                            resolve({
+                            settle(() => resolve({
                                 content: [{ type: "text", text: resultOutput }],
                                 details: Object.keys(details).length > 0 ? details : undefined,
-                            });
+                            }));
                             return;
                         }
-                        // Default: use fd
+                        // Default implementation uses fd.
                         const fdPath = await ensureTool("fd", true);
+                        if (signal?.aborted) {
+                            settle(() => reject(new Error("Operation aborted")));
+                            return;
+                        }
                         if (!fdPath) {
-                            reject(new Error("fd is not available and could not be downloaded"));
+                            settle(() => reject(new Error("fd is not available and could not be downloaded")));
                             return;
                         }
-                        // Build fd arguments
+                        // Build fd arguments. --no-require-git makes fd apply hierarchical .gitignore
+                        // semantics whether or not the search path is inside a git repository, without
+                        // leaking sibling-directory rules the way --ignore-file (a global source) would.
                         const args = [
                             "--glob",
                             "--color=never",
                             "--hidden",
+                            "--no-require-git",
                             "--max-results",
                             String(effectiveLimit),
                         ];
-                        // Include .gitignore files
-                        const gitignoreFiles = new Set();
-                        const rootGitignore = path.join(searchPath, ".gitignore");
-                        if (existsSync(rootGitignore)) {
-                            gitignoreFiles.add(rootGitignore);
-                        }
-                        try {
-                            const nestedGitignores = globSync("**/.gitignore", {
-                                cwd: searchPath,
-                                dot: true,
-                                absolute: true,
-                                ignore: ["**/node_modules/**", "**/.git/**"],
-                            });
-                            for (const file of nestedGitignores) {
-                                gitignoreFiles.add(file);
+                        // fd --glob matches against the basename unless --full-path is set; in --full-path
+                        // mode it matches against the absolute candidate path, so a path-containing
+                        // pattern like 'src/**/*.spec.ts' needs a leading '**/' to match anything.
+                        let effectivePattern = pattern;
+                        if (pattern.includes("/")) {
+                            args.push("--full-path");
+                            if (!pattern.startsWith("/") && !pattern.startsWith("**/") && pattern !== "**") {
+                                effectivePattern = `**/${pattern}`;
                             }
                         }
-                        catch {
-                            // Ignore glob errors
-                        }
-                        for (const gitignorePath of gitignoreFiles) {
-                            args.push("--ignore-file", gitignorePath);
-                        }
-                        args.push(pattern, searchPath);
-                        const result = spawnSync(fdPath, args, {
-                            encoding: "utf-8",
-                            maxBuffer: 10 * 1024 * 1024,
+                        args.push("--", effectivePattern, searchPath);
+                        const child = spawn(fdPath, args, { stdio: ["ignore", "pipe", "pipe"] });
+                        const rl = createInterface({ input: child.stdout });
+                        let stderr = "";
+                        const lines = [];
+                        stopChild = () => {
+                            if (!child.killed) {
+                                child.kill();
+                            }
+                        };
+                        const cleanup = () => {
+                            rl.close();
+                        };
+                        child.stderr?.on("data", (chunk) => {
+                            stderr += chunk.toString();
                         });
-                        signal?.removeEventListener("abort", onAbort);
-                        if (result.error) {
-                            reject(new Error(`Failed to run fd: ${result.error.message}`));
-                            return;
-                        }
-                        const output = result.stdout?.trim() || "";
-                        if (result.status !== 0) {
-                            const errorMsg = result.stderr?.trim() || `fd exited with code ${result.status}`;
+                        rl.on("line", (line) => {
+                            lines.push(line);
+                        });
+                        child.on("error", (error) => {
+                            cleanup();
+                            settle(() => reject(new Error(`Failed to run fd: ${error.message}`)));
+                        });
+                        child.on("close", (code) => {
+                            cleanup();
+                            if (signal?.aborted) {
+                                settle(() => reject(new Error("Operation aborted")));
+                                return;
+                            }
+                            const output = lines.join("\n");
+                            if (code !== 0) {
+                                const errorMsg = stderr.trim() || `fd exited with code ${code}`;
+                                if (!output) {
+                                    settle(() => reject(new Error(errorMsg)));
+                                    return;
+                                }
+                            }
                             if (!output) {
-                                reject(new Error(errorMsg));
+                                settle(() => resolve({
+                                    content: [{ type: "text", text: "No files found matching pattern" }],
+                                    details: undefined,
+                                }));
                                 return;
                             }
-                        }
-                        if (!output) {
-                            resolve({
-                                content: [{ type: "text", text: "No files found matching pattern" }],
-                                details: undefined,
-                            });
-                            return;
-                        }
-                        const lines = output.split("\n");
-                        const relativized = [];
-                        for (const rawLine of lines) {
-                            const line = rawLine.replace(/\r$/, "").trim();
-                            if (!line)
-                                continue;
-                            const hadTrailingSlash = line.endsWith("/") || line.endsWith("\\");
-                            let relativePath = line;
-                            if (line.startsWith(searchPath)) {
-                                relativePath = line.slice(searchPath.length + 1);
-                            }
-                            else {
-                                relativePath = path.relative(searchPath, line);
-                            }
-                            if (hadTrailingSlash && !relativePath.endsWith("/")) {
-                                relativePath += "/";
-                            }
-                            relativized.push(relativePath);
-                        }
-                        const resultLimitReached = relativized.length >= effectiveLimit;
-                        const rawOutput = relativized.join("\n");
-                        const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
-                        let resultOutput = truncation.content;
-                        const details = {};
-                        const notices = [];
-                        if (resultLimitReached) {
-                            notices.push(`${effectiveLimit} results limit reached. Use limit=${effectiveLimit * 2} for more, or refine pattern`);
-                            details.resultLimitReached = effectiveLimit;
-                        }
-                        if (truncation.truncated) {
-                            notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
-                            details.truncation = truncation;
-                        }
-                        if (notices.length > 0) {
-                            resultOutput += `\n\n[${notices.join(". ")}]`;
-                        }
-                        resolve({
-                            content: [{ type: "text", text: resultOutput }],
-                            details: Object.keys(details).length > 0 ? details : undefined,
+                            const relativized = [];
+                            for (const rawLine of lines) {
+                                const line = rawLine.replace(/\r$/, "").trim();
+                                if (!line)
+                                    continue;
+                                const hadTrailingSlash = line.endsWith("/") || line.endsWith("\\");
+                                let relativePath = line;
+                                if (line.startsWith(searchPath)) {
+                                    relativePath = line.slice(searchPath.length + 1);
+                                }
+                                else {
+                                    relativePath = path.relative(searchPath, line);
+                                }
+                                if (hadTrailingSlash && !relativePath.endsWith("/"))
+                                    relativePath += "/";
+                                relativized.push(toPosixPath(relativePath));
+                            }
+                            const resultLimitReached = relativized.length >= effectiveLimit;
+                            const rawOutput = relativized.join("\n");
+                            const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
+                            let resultOutput = truncation.content;
+                            const details = {};
+                            const notices = [];
+                            if (resultLimitReached) {
+                                notices.push(`${effectiveLimit} results limit reached. Use limit=${effectiveLimit * 2} for more, or refine pattern`);
+                                details.resultLimitReached = effectiveLimit;
+                            }
+                            if (truncation.truncated) {
+                                notices.push(`${formatSize(DEFAULT_MAX_BYTES)} limit reached`);
+                                details.truncation = truncation;
+                            }
+                            if (notices.length > 0) {
+                                resultOutput += `\n\n[${notices.join(". ")}]`;
+                            }
+                            settle(() => resolve({
+                                content: [{ type: "text", text: resultOutput }],
+                                details: Object.keys(details).length > 0 ? details : undefined,
+                            }));
                         });
                     }
                     catch (e) {
-                        signal?.removeEventListener("abort", onAbort);
-                        reject(e);
+                        if (signal?.aborted) {
+                            settle(() => reject(new Error("Operation aborted")));
+                            return;
+                        }
+                        const error = e instanceof Error ? e : new Error(String(e));
+                        settle(() => reject(error));
                     }
                 })();
             });
         },
+        renderCall(args, theme, context) {
+            const text = context.lastComponent ?? new Text("", 0, 0);
+            text.setText(formatFindCall(args, theme));
+            return text;
+        },
+        renderResult(result, options, theme, context) {
+            const text = context.lastComponent ?? new Text("", 0, 0);
+            text.setText(formatFindResult(result, options, theme, context.showImages));
+            return text;
+        },
     };
 }
-/** Default find tool using process.cwd() - for backwards compatibility */
-export const findTool = createFindTool(process.cwd());
+export function createFindTool(cwd, options) {
+    return wrapToolDefinition(createFindToolDefinition(cwd, options));
+}
 //# sourceMappingURL=find.js.map