diff --git a/apps/desktop/src/main/bootstrap/bootstrap-desktop.ts b/apps/desktop/src/main/bootstrap/bootstrap-desktop.ts index 8d3b80c..636f4c1 100644 --- a/apps/desktop/src/main/bootstrap/bootstrap-desktop.ts +++ b/apps/desktop/src/main/bootstrap/bootstrap-desktop.ts @@ -8,7 +8,6 @@ import type { SettingsSnapshot, } from "@pi-desktop/shared"; import { IPC_CHANNELS } from "@pi-desktop/shared"; -import { Effect } from "effect"; import { app, BrowserWindow, @@ -37,7 +36,6 @@ import { type ThreadCatalogEntry, } from "../catalogs/thread-catalog"; import { WorkspaceSessionCatalog } from "../catalogs/workspace-session-catalog"; -import { PiError } from "../effect/errors"; import { installDesktopMainRuntime, runEffectVoid } from "../effect/runtime"; import { createGitService, type GitService } from "../git/git-service"; import { createSanitizingHandle } from "../ipc/sanitize-ipc-error"; @@ -522,19 +520,6 @@ export async function bootstrapDesktop() { removeWorkspaceSession: (worktreeId) => { workspaceSessionCatalog.remove(worktreeId); }, - runBestEffortRemoveWorktree: ({ worktreePath, repositoryRoot }) => { - runEffectVoid( - Effect.try({ - try: () => - gitService.removeWorktree({ - worktreePath, - repositoryRoot, - }), - catch: () => - PiError.of("EGIT_FAILED", "Best-effort worktree removal failed"), - }).pipe(Effect.catchAll(() => Effect.void)), - ); - }, removeRepository: (repositoryId) => { repositoryCatalog.remove(repositoryId); }, diff --git a/apps/desktop/src/main/bootstrap/workspace-removal-actions.spec.ts b/apps/desktop/src/main/bootstrap/workspace-removal-actions.spec.ts index 75cf6ab..9bc2ec1 100644 --- a/apps/desktop/src/main/bootstrap/workspace-removal-actions.spec.ts +++ b/apps/desktop/src/main/bootstrap/workspace-removal-actions.spec.ts @@ -28,12 +28,7 @@ describe("createWorkspaceRemovalActions", () => { }); const deleteThread = vi.fn(); const removeWorkspaceSession = vi.fn(); - const removeWorktree = vi.fn(); - const runBestEffortRemoveWorktree = vi.fn( - (input: { worktreePath: string; repositoryRoot: string }) => { - removeWorktree(input); - }, - ); + const removeWorktreeFromGit = vi.fn(); const removeRepository = vi.fn(); const removeRepositoryPreferences = vi.fn(); const clearSelection = vi.fn(); @@ -51,7 +46,6 @@ describe("createWorkspaceRemovalActions", () => { listThreadsByWorktree: listByWorktree, deleteThread, removeWorkspaceSession, - runBestEffortRemoveWorktree, removeRepository, removeRepositoryPreferences, getSelectedRepositoryId: () => "repo-1", @@ -63,7 +57,7 @@ describe("createWorkspaceRemovalActions", () => { resolveDefaultThreadContext: vi.fn(), switchContextInBackground: vi.fn(), getSelectedWorktreeId: () => null, - removeWorktreeFromGit: vi.fn(), + removeWorktreeFromGit, }); await actions.removeRepository("repo-1"); @@ -81,10 +75,7 @@ describe("createWorkspaceRemovalActions", () => { ["/repos/alpha/worktrees/feature"], ["/repos/alpha"], ]); - expect(runBestEffortRemoveWorktree).toHaveBeenCalledWith({ - worktreePath: "/repos/alpha/worktrees/feature", - repositoryRoot: "/repos/alpha", - }); + expect(removeWorktreeFromGit).not.toHaveBeenCalled(); expect(removeRepository).toHaveBeenCalledWith("repo-1"); expect(removeRepositoryPreferences).toHaveBeenCalledWith("repo-1"); expect(activateWorkspacePath).toHaveBeenCalledWith( @@ -122,7 +113,6 @@ describe("createWorkspaceRemovalActions", () => { listThreadsByWorktree: () => [{ id: "thread-1" }, { id: "thread-2" }], deleteThread, removeWorkspaceSession: vi.fn(), - runBestEffortRemoveWorktree: vi.fn(), removeRepository: vi.fn(), removeRepositoryPreferences: vi.fn(), getSelectedRepositoryId: () => null, @@ -154,5 +144,14 @@ describe("createWorkspaceRemovalActions", () => { ); expect(switchContextInBackground).toHaveBeenCalledWith(threadContext); expect(notifySessionChanged).not.toHaveBeenCalled(); + + deleteThread.mockClear(); + removeWorktreeFromGit.mockImplementationOnce(() => { + throw new Error("dirty worktree"); + }); + await expect( + actions.removeWorktree("/repos/alpha/worktrees/feature"), + ).rejects.toThrow("dirty worktree"); + expect(deleteThread).not.toHaveBeenCalled(); }); }); diff --git a/apps/desktop/src/main/bootstrap/workspace-removal-actions.ts b/apps/desktop/src/main/bootstrap/workspace-removal-actions.ts index f72f0c9..7673148 100644 --- a/apps/desktop/src/main/bootstrap/workspace-removal-actions.ts +++ b/apps/desktop/src/main/bootstrap/workspace-removal-actions.ts @@ -22,10 +22,6 @@ type CreateWorkspaceRemovalActionsDependencies = { listThreadsByWorktree: (worktreeId: string) => ThreadEntry[]; deleteThread: (threadId: string) => void; removeWorkspaceSession: (worktreeId: string) => void; - runBestEffortRemoveWorktree: (input: { - worktreePath: string; - repositoryRoot: string; - }) => void; removeRepository: (repositoryId: string) => void; removeRepositoryPreferences: (repositoryId: string) => void; getSelectedRepositoryId: () => string | null; @@ -61,7 +57,6 @@ export function createWorkspaceRemovalActions( listThreadsByWorktree, deleteThread, removeWorkspaceSession, - runBestEffortRemoveWorktree, removeRepository, removeRepositoryPreferences, getSelectedRepositoryId, @@ -96,10 +91,6 @@ export function createWorkspaceRemovalActions( } removeWorkspaceSession(worktree.path); - runBestEffortRemoveWorktree({ - worktreePath: worktree.path, - repositoryRoot: repository.rootPath, - }); } const mainThreads = listThreadsByWorktree(repository.rootPath); @@ -146,16 +137,17 @@ export function createWorkspaceRemovalActions( } const isActiveWorktree = getSelectedWorktreeId() === normalizedWorktreeId; - const threadsInWorktree = listThreadsByWorktree(normalizedWorktreeId); - for (const thread of threadsInWorktree) { - deleteThread(thread.id); - } - removeWorktreeFromGit({ worktreePath: normalizedWorktreeId, repositoryRoot: repository.rootPath, }); + const threadsInWorktree = listThreadsByWorktree(normalizedWorktreeId); + for (const thread of threadsInWorktree) { + deleteThread(thread.id); + } + removeWorkspaceSession(normalizedWorktreeId); + if (isActiveWorktree) { const remainingWorktrees = inspectRemainingWorktrees(repository.rootPath); const nextWorktree = remainingWorktrees.find( diff --git a/apps/desktop/src/main/git/git-service-impl.ts b/apps/desktop/src/main/git/git-service-impl.ts index cd734a6..ec39ccd 100644 --- a/apps/desktop/src/main/git/git-service-impl.ts +++ b/apps/desktop/src/main/git/git-service-impl.ts @@ -229,7 +229,7 @@ export class GitServiceImpl { this.runCheckedGit( repositoryRoot, - ["worktree", "remove", "--force", worktreePath], + ["worktree", "remove", worktreePath], "remove worktree", ); this.runGit(repositoryRoot, ["worktree", "prune"]); diff --git a/apps/desktop/src/main/git/worktree-creation.spec.ts b/apps/desktop/src/main/git/worktree-creation.spec.ts index 8bd76f4..d093d1f 100644 --- a/apps/desktop/src/main/git/worktree-creation.spec.ts +++ b/apps/desktop/src/main/git/worktree-creation.spec.ts @@ -105,15 +105,23 @@ describe("worktree-creation", () => { ]); }); - it("creates a new branch without a start ref when no base branch resolves", () => { - const runGit: RunGit = () => createResult({ status: 1 }); + it("rejects a missing explicitly requested base", () => { + expect(() => + buildCreateWorktreeCommand(() => createResult({ status: 1 }), { + repositoryRoot: "/repo/main", + branchName: "feature/new", + worktreePath: "/repo/worktrees/feature-new", + baseBranch: "missing", + }), + ).toThrow("Requested base branch does not exist: missing"); + }); + it("uses HEAD only when no base was requested", () => { expect( - buildCreateWorktreeCommand(runGit, { + buildCreateWorktreeCommand(() => createResult({ status: 1 }), { repositoryRoot: "/repo/main", branchName: "feature/new", worktreePath: "/repo/worktrees/feature-new", - baseBranch: "main", }), ).toEqual([ "worktree", diff --git a/apps/desktop/src/main/git/worktree-creation.ts b/apps/desktop/src/main/git/worktree-creation.ts index ce7918b..871ba91 100644 --- a/apps/desktop/src/main/git/worktree-creation.ts +++ b/apps/desktop/src/main/git/worktree-creation.ts @@ -64,5 +64,7 @@ function resolveCreateWorktreeStartRef( return `origin/${options.baseBranch}`; } - return undefined; + throw new Error( + `Requested base branch does not exist: ${options.baseBranch}`, + ); } diff --git a/apps/desktop/src/main/workspace-search-service.ts b/apps/desktop/src/main/workspace-search-service.ts index 12428bc..a0e4368 100644 --- a/apps/desktop/src/main/workspace-search-service.ts +++ b/apps/desktop/src/main/workspace-search-service.ts @@ -11,15 +11,16 @@ import { Duration, Effect } from "effect"; const DEFAULT_TIMEOUT_MS = 10_000; function globToRegExp(pattern: string): RegExp { - const esc = pattern.replace(/[.+^${}()|\\]/g, "\\$&"); - const withGlob = esc - .replace(/\\\\\*\\\\\*/g, "__DOUBLE_STAR__") - .replace(/\\\*\*/g, "__DOUBLE_STAR__") - .replace(/\*\*/g, ".*") - .replace(/\*/g, "[^/]*") - .replace(/__DOUBLE_STAR__/g, ".*"); - - return new RegExp(`^(?:${withGlob})$`); + const expression = pattern + .split(/(\*\*\/|\*\*|\*)/) + .map((part) => { + if (part === "**/") return "(?:.*/)?"; + if (part === "**") return ".*"; + if (part === "*") return "[^/]*"; + return part.replace(/[.+^${}()|[\]\\]/g, "\\$&"); + }) + .join(""); + return new RegExp(`^(?:${expression})$`); } function matchesAnyPattern(relativePath: string, patterns?: string[]): boolean { @@ -208,6 +209,7 @@ export class WorkspaceSearchService { const results: SearchMatch[] = []; const root = path.resolve(request.rootPath); const max = request.maxResults ?? Infinity; + const query = request.query.trim().toLowerCase(); async function walker(dir: string) { if (results.length >= max) return; @@ -226,12 +228,24 @@ export class WorkspaceSearchService { const full = path.join(dir, ent.name); const rel = path.relative(root, full).replace(/\\\\/g, "/"); - // simple dotfile/node_modules ignore - if (rel.split("/").includes("node_modules")) continue; + // Ignore dependency and Git metadata trees before descending. + if (ent.name === "node_modules" || ent.name === ".git") continue; + if ( + request.excludePatterns?.some((pattern) => { + const matcher = globToRegExp(pattern); + return ( + matcher.test(rel) || + (ent.isDirectory() && matcher.test(`${rel}/`)) + ); + }) + ) + continue; + const matchesQuery = rel.toLowerCase().includes(query); if (ent.isDirectory()) { // check include/exclude before descending if ( + matchesQuery && matchesAnyPattern(`${rel}/`, request.includePatterns) && !request.excludePatterns?.some((p) => globToRegExp(p).test(`${rel}/`), @@ -242,7 +256,8 @@ export class WorkspaceSearchService { } await walker(full); } else if (ent.isFile()) { - if (!matchesAnyPattern(rel, request.includePatterns)) continue; + if (!matchesQuery || !matchesAnyPattern(rel, request.includePatterns)) + continue; if (request.excludePatterns?.some((p) => globToRegExp(p).test(rel))) continue; results.push(toSearchMatch(root, rel, 0)); diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.spec.tsx b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.spec.tsx index b764bf5..826bd31 100644 --- a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.spec.tsx +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.spec.tsx @@ -391,17 +391,6 @@ describe("PromptDock", () => { expect(onPromptModeChange).toHaveBeenCalledWith("plan"); }); - it("persists the draft per thread in localStorage", () => { - renderPromptDock({ - draft: "work in progress", - activeThreadId: "thread-42", - }); - - expect(window.localStorage.getItem("pi:prompt-draft:thread-42")).toBe( - "work in progress", - ); - }); - it("cycles prompt history with ArrowUp / ArrowDown", () => { window.localStorage.setItem( "pi:prompt-history:thread-1", diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.tsx b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.tsx index 0688766..ccc54e9 100644 --- a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.tsx +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock.tsx @@ -19,7 +19,6 @@ import { Attachments, useAttachments } from "./prompt-dock/attachments"; import { CharacterCounter } from "./prompt-dock/character-counter"; import { ContextGauge } from "./prompt-dock/context-gauge"; import { ModelPicker } from "./prompt-dock/model-picker"; -import { usePersistDraft } from "./prompt-dock/prompt-draft"; import { SendButton } from "./prompt-dock/send-button"; import { usePromptDockDisplay } from "./prompt-dock/use-prompt-dock-display"; import { usePromptDockInput } from "./prompt-dock/use-prompt-dock-input"; @@ -95,9 +94,7 @@ export function PromptDock({ const hasActiveThread = activeThreadId !== null; const { uploadedFiles, imageFiles, handlePickFiles, handleRemoveFile } = - useAttachments(draft, onDraftChange); - - usePersistDraft(activeThreadId, draft); + useAttachments(draft, onDraftChange, activeThreadId); const { mergedSuggestions, diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.spec.tsx b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.spec.tsx index 784eaa0..0f2076a 100644 --- a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.spec.tsx +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.spec.tsx @@ -1,5 +1,5 @@ // @vitest-environment jsdom -import { act, cleanup, renderHook, waitFor } from "@testing-library/react"; +import { act, cleanup, renderHook } from "@testing-library/react"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { useAttachments } from "./attachments"; @@ -19,22 +19,86 @@ describe("useAttachments", () => { }); }); - it("clears attachment chips when pi:prompt-sent fires", async () => { + it("derives previews from the retained thread draft, not a sent event", () => { const onDraftChange = vi.fn(); - const { result } = renderHook(() => useAttachments("", onDraftChange)); + const { result, rerender } = renderHook( + ({ draft }) => useAttachments(draft, onDraftChange), + { + initialProps: { draft: "Keep this @file:%2Ftmp%2Fnote.md " }, + }, + ); + expect(result.current.uploadedFiles).toHaveLength(1); + act(() => window.dispatchEvent(new CustomEvent("pi:prompt-sent"))); + expect(result.current.uploadedFiles).toHaveLength(1); + rerender({ draft: "" }); + expect(result.current.uploadedFiles).toHaveLength(0); + rerender({ draft: "@file:%2Ftmp%2Fphoto.png " }); + expect(result.current.imageFiles[0]?.path).toBe("/tmp/photo.png"); + }); - await act(async () => { - await result.current.handlePickFiles(); - }); + it("preserves formatting and other mentions when removing a file", () => { + const onDraftChange = vi.fn(); + const text = "Code:\n run()\n@file:%2Ftmp%2Fa @file:%2Ftmp%2Fab"; + const { result } = renderHook(() => useAttachments(text, onDraftChange)); + act(() => result.current.handleRemoveFile("/tmp/a")); + expect(onDraftChange).toHaveBeenCalledWith( + "Code:\n run()\n @file:%2Ftmp%2Fab", + ); + }); - await waitFor(() => { - expect(result.current.uploadedFiles).toHaveLength(1); + it("does not attach dialog results to a different thread", async () => { + let resolvePaths = (_paths: string[]) => {}; + const pending = new Promise((resolve) => { + resolvePaths = resolve; }); - + vi.mocked(window.piDesktop.dialog.showOpenDialog).mockReturnValueOnce( + pending, + ); + const onDraftChange = vi.fn(); + const { result, rerender } = renderHook( + ({ threadId }) => useAttachments("", onDraftChange, threadId), + { + initialProps: { threadId: "a" }, + }, + ); + let picking: Promise; act(() => { - window.dispatchEvent(new CustomEvent("pi:prompt-sent")); + picking = result.current.handlePickFiles(); }); + rerender({ threadId: "b" }); + await act(async () => { + resolvePaths(["/tmp/note.md"]); + await picking; + }); + expect(onDraftChange).not.toHaveBeenCalled(); + }); + it("removes equivalent raw and percent-encoded paths", () => { + const onDraftChange = vi.fn(); + const { result } = renderHook(() => + useAttachments("@file:/tmp/a @file:%2ftmp%2fa", onDraftChange), + ); + act(() => result.current.handleRemoveFile("/tmp/a")); + expect(onDraftChange).toHaveBeenCalledWith(" "); + }); - expect(result.current.uploadedFiles).toHaveLength(0); + it("ignores file-dialog results after unmount", async () => { + let resolvePaths = (_paths: string[]) => {}; + const pending = new Promise((resolve) => { + resolvePaths = resolve; + }); + vi.mocked(window.piDesktop.dialog.showOpenDialog).mockReturnValueOnce( + pending, + ); + const onDraftChange = vi.fn(); + const { result, unmount } = renderHook(() => + useAttachments("", onDraftChange, "a"), + ); + const picking = result.current.handlePickFiles(); + unmount(); + await act(async () => { + resolvePaths(["/tmp/note.md"]); + await picking; + }); + expect(onDraftChange).not.toHaveBeenCalled(); }); }); diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.tsx b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.tsx index be165b2..d35a1b0 100644 --- a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.tsx +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/attachments.tsx @@ -1,7 +1,11 @@ import * as React from "react"; import { FileUpload, type UploadedFile } from "@/components/ui/file-upload"; import { Image } from "@/components/ui/image"; -import { buildFileMention } from "@/features/workspace/prompt-routing"; +import { + buildFileMention, + decodeMentionValue, + getFileMentionPaths, +} from "@/features/workspace/prompt-routing"; function isImagePath(filePath: string): boolean { return /\.(png|jpe?g|gif|webp|svg)$/i.test(filePath); @@ -17,82 +21,73 @@ export interface AttachmentsState { export function useAttachments( draft: string, onDraftChange: (draft: string) => void, + threadId: string | null = null, ): AttachmentsState { - const [uploadedFiles, setUploadedFiles] = React.useState([]); + const context = React.useRef<{ + threadId: string | null; + draft: string; + } | null>(null); + React.useLayoutEffect(() => { + context.current = { threadId, draft }; + return () => { + context.current = null; + }; + }, [threadId, draft]); + const uploadedFiles = React.useMemo( + () => + getFileMentionPaths(draft).map((filePath) => ({ + id: filePath, + name: filePath.split(/[/\\]/).pop() ?? filePath, + path: filePath, + kind: isImagePath(filePath) ? "image" : "file", + })), + [draft], + ); const imageFiles = React.useMemo( () => uploadedFiles.filter((file) => file.kind === "image"), [uploadedFiles], ); const handlePickFiles = React.useCallback(async () => { + const requestedThread = threadId; const selectedPaths = await window.piDesktop.dialog.showOpenDialog({ properties: ["openFile", "multiSelections"], title: "Attach files to prompt", }); - - if (!selectedPaths || selectedPaths.length === 0) { + if (!selectedPaths?.length || context.current?.threadId !== requestedThread) return; - } - - setUploadedFiles((currentFiles) => { - const nextFiles = [...currentFiles]; - for (const filePath of selectedPaths) { - if (nextFiles.some((file) => file.path === filePath)) { - continue; - } - nextFiles.push({ - id: `${Date.now()}-${filePath}`, - name: filePath.split(/[/\\]/).pop() ?? filePath, - path: filePath, - kind: isImagePath(filePath) ? "image" : "file", - }); - } - return nextFiles; - }); - const nextMentions = selectedPaths - .map((filePath) => buildFileMention(filePath)) - .filter((mention) => !draft.includes(mention)) + const currentDraft = context.current.draft; + const existingPaths = new Set(getFileMentionPaths(currentDraft)); + const nextMentions = [...new Set(selectedPaths)] + .filter((filePath) => !existingPaths.has(filePath)) + .map(buildFileMention) .join(""); - - if (nextMentions.length > 0) { + if (nextMentions) { onDraftChange( - `${draft}${draft.endsWith(" ") || draft.length === 0 ? "" : " "}${nextMentions}`, + `${currentDraft}${/\s$/.test(currentDraft) || !currentDraft ? "" : " "}${nextMentions}`, ); } - }, [draft, onDraftChange]); + }, [threadId, onDraftChange]); const handleRemoveFile = React.useCallback( (fileId: string) => { - setUploadedFiles((currentFiles) => { - const removedFile = currentFiles.find((file) => file.id === fileId); - if (removedFile) { - const nextDraft = draft - .split(buildFileMention(removedFile.path)) - .join("") - .replace(/\s{2,}/g, " ") - .trimStart(); - if (nextDraft !== draft) { - onDraftChange(nextDraft); + const nextDraft = draft.replace( + /@file:([^\s]+)/g, + (mention, encodedPath: string) => { + try { + return decodeMentionValue(encodedPath) === fileId ? "" : mention; + } catch { + return mention; } - } - return currentFiles.filter((file) => file.id !== fileId); - }); + }, + ); + if (nextDraft !== draft) onDraftChange(nextDraft); }, [draft, onDraftChange], ); - React.useEffect(() => { - const handlePromptSent = () => { - setUploadedFiles([]); - }; - window.addEventListener("pi:prompt-sent", handlePromptSent); - return () => { - window.removeEventListener("pi:prompt-sent", handlePromptSent); - }; - }, []); - return { uploadedFiles, imageFiles, handlePickFiles, handleRemoveFile }; } diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.spec.tsx b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.spec.tsx new file mode 100644 index 0000000..b174812 --- /dev/null +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.spec.tsx @@ -0,0 +1,33 @@ +import { act, cleanup, renderHook } from "@testing-library/react"; +import { useState } from "react"; +import { afterEach, beforeEach, describe, expect, it } from "vitest"; +import { readDraft, usePersistDraft, writeDraft } from "./prompt-draft"; + +beforeEach(() => localStorage.clear()); +afterEach(cleanup); + +describe("thread draft persistence", () => { + it("restores before writing and keeps drafts separate across switches and remounts", () => { + writeDraft("a", "saved A"); + writeDraft("b", "saved B"); + function useDraft({ threadId }: { threadId: string }) { + const [draft, setDraft] = useState(""); + usePersistDraft(threadId, draft, setDraft); + return { draft, setDraft }; + } + const { result, rerender, unmount } = renderHook(useDraft, { + initialProps: { threadId: "a" }, + }); + expect(result.current.draft).toBe("saved A"); + act(() => result.current.setDraft("new A")); + rerender({ threadId: "b" }); + expect(result.current.draft).toBe("saved B"); + expect(readDraft("a")).toBe("new A"); + act(() => result.current.setDraft("new B")); + rerender({ threadId: "a" }); + expect(result.current.draft).toBe("new A"); + unmount(); + const remounted = renderHook(useDraft, { initialProps: { threadId: "b" } }); + expect(remounted.result.current.draft).toBe("new B"); + }); +}); diff --git a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.ts b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.ts index be1b523..a995fda 100644 --- a/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.ts +++ b/apps/desktop/src/renderer/src/features/workspace/components/prompt-dock/prompt-draft.ts @@ -52,14 +52,37 @@ export function clearDraft(threadId: string | null): void { writeDraft(threadId, ""); } -/** - * Persist the current draft whenever it changes for the active thread. - * - * Note: reading the stored draft on thread change is intentionally left to - * the caller so they can decide whether to override an in-memory draft. - */ -export function usePersistDraft(threadId: string | null, draft: string): void { +/** Restore the selected thread before persisting its next draft. */ +export function usePersistDraft( + threadId: string | null, + draft: string, + onDraftChange: (draft: string) => void, +): void { + const restored = React.useRef<{ + threadId: string | null; + value: string; + } | null>(null); + const selectedThread = React.useRef(undefined); + + React.useLayoutEffect(() => { + if (selectedThread.current === threadId) return; + const initialSelection = selectedThread.current === undefined; + selectedThread.current = threadId; + const savedDraft = readDraft(threadId); + const value = initialSelection && !savedDraft ? draft : savedDraft; + restored.current = { threadId, value }; + if (draft !== value) onDraftChange(value); + }, [threadId, draft, onDraftChange]); + React.useEffect(() => { + if (restored.current) { + if ( + restored.current.threadId !== threadId || + restored.current.value !== draft + ) + return; + restored.current = null; + } writeDraft(threadId, draft); }, [threadId, draft]); } diff --git a/apps/desktop/src/renderer/src/features/workspace/prompt-routing.spec.ts b/apps/desktop/src/renderer/src/features/workspace/prompt-routing.spec.ts new file mode 100644 index 0000000..1d435d1 --- /dev/null +++ b/apps/desktop/src/renderer/src/features/workspace/prompt-routing.spec.ts @@ -0,0 +1,19 @@ +import { describe, expect, it } from "vitest"; +import { + buildFileMention, + expandFileMentions, + planPromptDispatch, +} from "./prompt-routing"; + +describe("prompt formatting", () => { + it("preserves code and whitespace while expanding only file mentions", () => { + const code = "Review:\n```python\nif ready:\n run()\n```\n\n"; + expect(expandFileMentions(code)).toBe(code); + expect( + expandFileMentions(`${code}${buildFileMention("/tmp/my file.py")}\nDone`), + ).toBe(`${code}/tmp/my file.py \nDone`); + expect( + planPromptDispatch({ draft: code, canSend: true, activeThreadId: "a" }), + ).toEqual({ action: "send", threadId: "a", nextDraft: code }); + }); +}); diff --git a/apps/desktop/src/renderer/src/features/workspace/prompt-routing.ts b/apps/desktop/src/renderer/src/features/workspace/prompt-routing.ts index 6c48bd7..a14cac6 100644 --- a/apps/desktop/src/renderer/src/features/workspace/prompt-routing.ts +++ b/apps/desktop/src/renderer/src/features/workspace/prompt-routing.ts @@ -32,7 +32,7 @@ export type OAuthChatCommand = const AUTOCOMPLETE_PATTERN = /(^|\s)([@/])([^\s]*)$/; const TERMINAL_MENTION_PATTERN = /@terminal:([^\s]+)/g; // capture optional trailing whitespace so expansion normalizes spacing -const FILE_MENTION_PATTERN = /@file:([^\s]+)(\s*)/g; +const FILE_MENTION_PATTERN = /@file:([^\s]+)/g; export function getPromptAutocompleteMatch( text: string, @@ -98,17 +98,24 @@ export function extractTerminalRoute(text: string): { }; } +export function getFileMentionPaths(text: string): string[] { + return [ + ...new Set( + [...text.matchAll(FILE_MENTION_PATTERN)].flatMap((match) => { + try { + return [decodeMentionValue(match[1] ?? "")]; + } catch { + return []; + } + }), + ), + ]; +} + export function expandFileMentions(text: string): string { - const replaced = text.replace( - FILE_MENTION_PATTERN, - (_match: string, encodedPath?: string, trailing?: string) => - decodeMentionValue(encodedPath ?? "") + (trailing ? " " : ""), + return text.replace(FILE_MENTION_PATTERN, (_match, encodedPath: string) => + decodeMentionValue(encodedPath), ); - - // Collapse any runs of whitespace into a single space and trim edges. This - // ensures predictable spacing when mentions are adjacent to template - // spaces or when multiple mentions are present. - return replaced.replace(/\s+/g, " ").trim(); } export type PlanPromptDispatchArgs = { diff --git a/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.spec.tsx b/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.spec.tsx index 1119a64..51b3828 100644 --- a/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.spec.tsx +++ b/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.spec.tsx @@ -1,6 +1,7 @@ // @vitest-environment jsdom import type { MentionSuggestion, SlashSuggestion } from "@pi-desktop/shared"; import { act, renderHook, waitFor } from "@testing-library/react"; +import { useState } from "react"; import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import { createUiInteractionStore } from "@/stores/ui-interaction-store"; import type { ThreadConversationState } from "@/stores/workspace-session-store"; @@ -53,6 +54,7 @@ const contextWindows = [ describe("useWorkspacePrompt", () => { beforeEach(() => { vi.clearAllMocks(); + localStorage.clear(); }); afterEach(() => { @@ -290,3 +292,35 @@ describe("useWorkspacePrompt", () => { }); }); }); + +describe("workspace-owned draft persistence", () => { + it("persists completion when the prompt UI is not mounted and sends indented text unchanged", async () => { + installMockPiDesktop(); + const sent = vi.fn(async () => undefined); + const uiStore = createUiInteractionStore(); + const { result } = renderHook(() => { + const [draft, setDraft] = useState(" run()\n\n"); + const controller = useWorkspacePrompt({ + draft, + setDraft, + sendPrompt: sent, + cancelPrompt: async () => {}, + activeThreadId: "hidden-dock", + activeThreadConversation: createConversation(), + agentStatus: "idle", + activeWorktreePath: "/tmp/repo", + contextWindows: [], + uiStore, + openOAuthDialog: async () => {}, + }); + return { controller, setDraft }; + }); + await act(async () => { + await result.current.controller.handleSend(); + }); + expect(sent).toHaveBeenCalledWith(" run()\n\n"); + act(() => result.current.setDraft("")); + expect(localStorage.getItem("pi:prompt-draft:hidden-dock")).toBeNull(); + uninstallMockPiDesktop(); + }); +}); diff --git a/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.ts b/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.ts index ac7f05d..9b870ef 100644 --- a/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.ts +++ b/apps/desktop/src/renderer/src/features/workspace/use-workspace-prompt.ts @@ -3,6 +3,7 @@ import * as React from "react"; import { useStore } from "zustand"; import type { UiInteractionStore } from "@/stores/ui-interaction-store"; import type { ThreadConversationState } from "@/stores/workspace-session-store"; +import { usePersistDraft } from "./components/prompt-dock/prompt-draft"; import { dispatchPiCommand, findBuiltInBySlash, @@ -107,6 +108,7 @@ export function useWorkspacePrompt({ uiStore, openOAuthDialog, }: UseWorkspacePromptOptions): WorkspacePromptController { + usePersistDraft(activeThreadId, draft, setDraft); const autocompleteSuggestions = useStore( uiStore, (storeState) => @@ -362,7 +364,7 @@ export function useWorkspacePrompt({ } const plan = planPromptDispatch({ - draft: trimmed, + draft, canSend: true, activeThreadId, }); @@ -385,8 +387,7 @@ export function useWorkspacePrompt({ setPendingPromptThreadId(activeThreadId); clearAutocomplete(); - // Expand @file: mentions before sending; clear chips via custom event. - window.dispatchEvent(new CustomEvent("pi:prompt-sent")); + // Expand @file: mentions before sending; chips follow the retained draft. await sendPrompt(plan.nextDraft); }, [ activeThreadId, @@ -440,9 +441,7 @@ export function useWorkspacePrompt({ setPromptMode(nextMode); const normalizedDraft = stripPromptModePrefix(draft).trimStart(); const prefix = PROMPT_MODE_TO_PREFIX[nextMode]; - setDraft( - `${prefix}${normalizedDraft}`.trimEnd() + (normalizedDraft ? "" : ""), - ); + setDraft(`${prefix}${normalizedDraft}`.trimEnd()); }, [draft, setDraft], ); diff --git a/docs/IMPROVEMENTS.md b/docs/IMPROVEMENTS.md new file mode 100644 index 0000000..af59e72 --- /dev/null +++ b/docs/IMPROVEMENTS.md @@ -0,0 +1,25 @@ +# Improvement roadmap + +The first delivery preserves user input and makes workspace removal safe. The remaining work has separate GitHub issues so each change can ship with its own failure-case tests. + +| Priority | Task | Issue | Delivery | +| --- | --- | --- | --- | +| P1 | Prompt formatting, per-thread drafts, completion races, attachment retention | [#6](https://github.com/tanRdev/pi-desktop/issues/6) | Implemented in the foundations change | +| P1 | Safe worktree removal, repository detachment, explicit base branches | [#7](https://github.com/tanRdev/pi-desktop/issues/7) | Implemented in the foundations change | +| P1 | File watching, fallback search, Git palette actions | [#8](https://github.com/tanRdev/pi-desktop/issues/8) | Fallback search implemented; watcher and palette remain | +| P1 | Agent acceptance, startup diagnostics, disconnect recovery, bounded transport | [#9](https://github.com/tanRdev/pi-desktop/issues/9) | Next | +| P2 | Follow-up queue and typed image attachments | [#10](https://github.com/tanRdev/pi-desktop/issues/10) | After delivery states are explicit | +| P2 | Stable turn identities, virtualized history, scroll restoration | [#11](https://github.com/tanRdev/pi-desktop/issues/11) | Measure with a large-history fixture | +| P2 | Accurate file changes, diff-line feedback, staged worktree setup | [#12](https://github.com/tanRdev/pi-desktop/issues/12) | Reuse existing Git and task controllers | + +## Delivery rules + +- Preserve prompt text and attachment context until the submission outcome is known. +- A newer draft or another thread must not change when an earlier turn completes. +- Ordinary removal must refuse dirty files. Repository detachment must preserve checkout files. +- Keep metadata until the corresponding Git operation succeeds. +- Reject an explicit starting branch that does not exist. +- Resolve an uncertain delivery before retrying a command that may already have executed. +- Reuse the isolated agent host, typed Electron contracts, worktree services, and versioned persistence. + +The roadmap came from Pi source review and REA inspection of Codex package 26.1007.30912. Codex observations informed the behavior goals. Implementations use Pi's own code and architecture. diff --git a/packages/shell-model/src/agent-snapshot-merge.ts b/packages/shell-model/src/agent-snapshot-merge.ts new file mode 100644 index 0000000..033bf89 --- /dev/null +++ b/packages/shell-model/src/agent-snapshot-merge.ts @@ -0,0 +1,105 @@ +import type { AgentMessageSnapshot, AgentSnapshot } from "@pi-desktop/shared"; + +const MESSAGE_STATUS_PRIORITY = { + error: 3, + complete: 2, + streaming: 1, +} satisfies Record; + +function pickPreferredMessage( + current: AgentMessageSnapshot, + incoming: AgentMessageSnapshot, +): AgentMessageSnapshot { + if (incoming.timestamp > current.timestamp) { + return incoming; + } + + if (incoming.timestamp < current.timestamp) { + return current; + } + + const currentPriority = MESSAGE_STATUS_PRIORITY[current.status]; + const incomingPriority = MESSAGE_STATUS_PRIORITY[incoming.status]; + + if (incomingPriority > currentPriority) { + return incoming; + } + + if (incomingPriority < currentPriority) { + return current; + } + + return incoming.text.length >= current.text.length ? incoming : current; +} + +function determineAgentStatus( + current: AgentSnapshot, + incoming: AgentSnapshot, + preserveLiveState: boolean, + hasStreamingMessages: boolean, +): AgentSnapshot["status"] { + if (incoming.status === "error") { + return incoming.status; + } + + if (hasStreamingMessages) { + return "streaming"; + } + + if (preserveLiveState) { + if (current.status === "starting") { + return incoming.status; + } + return current.status; + } + + return incoming.status; +} + +export function mergeAgentSnapshots( + current: AgentSnapshot, + incoming: AgentSnapshot, + preserveLiveState: boolean, + promptError: unknown, +): AgentSnapshot { + const messagesById = new Map(); + + for (const message of current.messages) { + messagesById.set(message.id, message); + } + + for (const message of incoming.messages) { + const existing = messagesById.get(message.id); + messagesById.set( + message.id, + existing ? pickPreferredMessage(existing, message) : message, + ); + } + + const messages = [...messagesById.values()].sort( + (left, right) => left.timestamp - right.timestamp, + ); + const hasStreamingMessages = messages.some( + (message) => message.status === "streaming", + ); + const status = determineAgentStatus( + current, + incoming, + preserveLiveState, + hasStreamingMessages, + ); + + return { + sessionId: incoming.sessionId || current.sessionId, + status, + messages, + lastError: + incoming.lastError ?? + (promptError instanceof Error + ? promptError.message + : status === "error" + ? current.lastError + : null), + contextUsage: incoming.contextUsage ?? current.contextUsage, + }; +} diff --git a/packages/shell-model/src/shell-model.ts b/packages/shell-model/src/shell-model.ts index 2ea1cf0..d587ed4 100644 --- a/packages/shell-model/src/shell-model.ts +++ b/packages/shell-model/src/shell-model.ts @@ -13,6 +13,8 @@ import { createInitialAgentLiveFeed, } from "./agent-feed"; +import { mergeAgentSnapshots } from "./agent-snapshot-merge"; + export interface ShellModelState { shell: ShellSnapshot; agent: AgentSnapshot; @@ -55,12 +57,6 @@ const INITIAL_STATE: ShellModelState = { contextSwitchPhase: "idle", }; -const MESSAGE_STATUS_PRIORITY = { - error: 3, - complete: 2, - streaming: 1, -} satisfies Record; - function getErrorMessage(error: unknown, fallback: string): string { return error instanceof Error ? error.message : fallback; } @@ -94,109 +90,13 @@ function normalizeEvent( return event; } -function pickPreferredMessage( - current: AgentMessageSnapshot, - incoming: AgentMessageSnapshot, -): AgentMessageSnapshot { - if (incoming.timestamp > current.timestamp) { - return incoming; - } - - if (incoming.timestamp < current.timestamp) { - return current; - } - - const currentPriority = MESSAGE_STATUS_PRIORITY[current.status]; - const incomingPriority = MESSAGE_STATUS_PRIORITY[incoming.status]; - - if (incomingPriority > currentPriority) { - return incoming; - } - - if (incomingPriority < currentPriority) { - return current; - } - - return incoming.text.length >= current.text.length ? incoming : current; -} - -function determineAgentStatus( - current: AgentSnapshot, - incoming: AgentSnapshot, - preserveLiveState: boolean, - hasStreamingMessages: boolean, -): AgentSnapshot["status"] { - if (incoming.status === "error") { - return incoming.status; - } - - if (hasStreamingMessages) { - return "streaming"; - } - - if (preserveLiveState) { - if (current.status === "starting") { - return incoming.status; - } - return current.status; - } - - return incoming.status; -} - -function mergeAgentSnapshots( - current: AgentSnapshot, - incoming: AgentSnapshot, - preserveLiveState: boolean, - promptError: unknown, -): AgentSnapshot { - const messagesById = new Map(); - - for (const message of current.messages) { - messagesById.set(message.id, message); - } - - for (const message of incoming.messages) { - const existing = messagesById.get(message.id); - messagesById.set( - message.id, - existing ? pickPreferredMessage(existing, message) : message, - ); - } - - const messages = [...messagesById.values()].sort( - (left, right) => left.timestamp - right.timestamp, - ); - const hasStreamingMessages = messages.some( - (message) => message.status === "streaming", - ); - const status = determineAgentStatus( - current, - incoming, - preserveLiveState, - hasStreamingMessages, - ); - - return { - sessionId: incoming.sessionId || current.sessionId, - status, - messages, - lastError: - incoming.lastError ?? - (promptError instanceof Error - ? promptError.message - : status === "error" - ? current.lastError - : null), - contextUsage: incoming.contextUsage ?? current.contextUsage, - }; -} - export function createShellModel(api: PiDesktopApi) { let state: ShellModelState = INITIAL_STATE; let unsubscribe: (() => void) | undefined; const listeners = new Set<(state: ShellModelState) => void>(); let refreshVersion = 0; + let draftRevision = 0; + let contextRevision = 0; function notify(): void { for (const listener of listeners) { @@ -216,10 +116,19 @@ export function createShellModel(api: PiDesktopApi) { return; } + const contextChanged = + shell.catalog.selection.threadId !== + state.shell.catalog.selection.threadId; + if (contextChanged) { + contextRevision += 1; + draftRevision += 1; + } + state = { ...state, shell, agent, + draft: contextChanged ? "" : state.draft, live: { ...createAgentLiveFeedFromSnapshot(agent), snapshotLoadedAt: Date.now(), @@ -240,6 +149,7 @@ export function createShellModel(api: PiDesktopApi) { } if (normalized.type === "context_switch") { + if (normalized.phase === "started") contextRevision += 1; state = { ...state, contextSwitchPhase: @@ -284,18 +194,21 @@ export function createShellModel(api: PiDesktopApi) { }, setDraft(draft: string): void { + draftRevision += 1; state = { ...state, draft }; notify(); }, async sendPrompt(text?: string): Promise { - const prompt = (text ?? state.draft).trim(); + const prompt = text ?? state.draft; - if (!prompt) { + if (!prompt.trim()) { return; } const draftBeforeSend = state.draft; + const submittedDraftRevision = draftRevision; + const submittedContextRevision = contextRevision; state = { ...state, @@ -317,12 +230,15 @@ export function createShellModel(api: PiDesktopApi) { // Refreshing the snapshot below gives us the authoritative runtime state. } + if (contextRevision !== submittedContextRevision) return; + void promptError; let agent = state.agent; try { const refreshedSnapshot = await api.agent.getSnapshot(); + if (contextRevision !== submittedContextRevision) return; const currentState = state; agent = mergeAgentSnapshots( @@ -349,13 +265,21 @@ export function createShellModel(api: PiDesktopApi) { }; } + if (contextRevision !== submittedContextRevision) return; const failed = promptError != null || agent.status === "error"; + const nextDraft = + draftRevision === submittedDraftRevision + ? failed + ? draftBeforeSend + : "" + : state.draft; + state = { ...state, agent, // Keep the user's draft on failure so they can edit and retry. - draft: failed ? draftBeforeSend : "", + draft: nextDraft, live: { ...state.live, snapshotLoadedAt: Date.now(), diff --git a/tests/integration/apps-desktop/git-worktree-service.spec.ts b/tests/integration/apps-desktop/git-worktree-service.spec.ts index 39609ee..13e7696 100644 --- a/tests/integration/apps-desktop/git-worktree-service.spec.ts +++ b/tests/integration/apps-desktop/git-worktree-service.spec.ts @@ -1,5 +1,11 @@ import { execFileSync } from "node:child_process"; -import { mkdtempSync, renameSync, rmSync, writeFileSync } from "node:fs"; +import { + existsSync, + mkdtempSync, + renameSync, + rmSync, + writeFileSync, +} from "node:fs"; import { readFile } from "node:fs/promises"; import os from "node:os"; import path from "node:path"; @@ -342,3 +348,27 @@ describe("createGitService diffFile", () => { ); }); }); + +describe("worktree removal preserves files", () => { + it("refuses dirty and untracked work instead of forcing removal", async () => { + const repositoryPath = createGitRepository(); + const worktreePath = `${repositoryPath}-feature`; + tempDirs.push(worktreePath); + execFileSync("git", ["worktree", "add", "-b", "feature", worktreePath], { + cwd: repositoryPath, + }); + writeFileSync(path.join(worktreePath, "old-name.txt"), "unsaved edit\n"); + writeFileSync(path.join(worktreePath, "untracked.txt"), "new work\n"); + const service = createGitService(); + expect(() => + service.removeWorktree({ worktreePath, repositoryRoot: repositoryPath }), + ).toThrow(); + expect(existsSync(worktreePath)).toBe(true); + expect( + await readFile(path.join(worktreePath, "old-name.txt"), "utf8"), + ).toBe("unsaved edit\n"); + expect( + await readFile(path.join(worktreePath, "untracked.txt"), "utf8"), + ).toBe("new work\n"); + }); +}); diff --git a/tests/integration/apps-desktop/shell-model.spec.ts b/tests/integration/apps-desktop/shell-model.spec.ts index 753ee99..d5c8fb2 100644 --- a/tests/integration/apps-desktop/shell-model.spec.ts +++ b/tests/integration/apps-desktop/shell-model.spec.ts @@ -353,7 +353,7 @@ describe("createShellModel", () => { model.dispose(); }); - test("sends trimmed prompts and clears the draft after sending", async () => { + test("preserves prompt whitespace and clears the draft after sending", async () => { const prompt = vi.fn(async () => {}); const api = { shell: { @@ -372,7 +372,7 @@ describe("createShellModel", () => { model.setDraft(" Summarize the workspace "); await model.sendPrompt(); - expect(prompt).toHaveBeenCalledWith("Summarize the workspace"); + expect(prompt).toHaveBeenCalledWith(" Summarize the workspace "); expect(model.getState().draft).toBe(""); }); @@ -873,3 +873,56 @@ describe("createShellModel", () => { }); }); }); + +describe("prompt completion draft ownership", () => { + test.each([ + false, + true, + ])("preserves newer typing when submission fails=%s", async (failed) => { + const pending = Promise.withResolvers(); + const api = { + shell: { getSnapshot: vi.fn(async () => createShellSnapshotFixture()) }, + agent: { + getSnapshot: vi.fn(async () => createAgentSnapshotFixture()), + prompt: vi.fn(() => pending.promise), + subscribe: vi.fn(() => () => {}), + }, + } as unknown as ShellModelApi; + const model = createShellModel(api); + model.setDraft("submitted A"); + const sending = model.sendPrompt(); + model.setDraft("new B"); + if (failed) pending.reject(new Error("delivery failed")); + else pending.resolve(); + await sending; + expect(model.getState().draft).toBe("new B"); + }); + + test("ignores a completion after switching context", async () => { + const pending = Promise.withResolvers(); + let receive: (event: PiDesktopAgentEvent) => void = () => {}; + const api = { + shell: { getSnapshot: vi.fn(async () => createShellSnapshotFixture()) }, + agent: { + getSnapshot: vi.fn(async () => createAgentSnapshotFixture()), + prompt: vi.fn(() => pending.promise), + subscribe: vi.fn((listener) => { + receive = listener; + return () => {}; + }), + }, + } as unknown as ShellModelApi; + const model = createShellModel(api); + await model.load(); + model.setDraft("submitted A"); + const sending = model.sendPrompt(); + receive({ type: "context_switch", phase: "started" }); + model.setDraft("thread B draft"); + const snapshotCalls = vi.mocked(api.agent.getSnapshot).mock.calls.length; + pending.resolve(); + await sending; + expect(model.getState().draft).toBe("thread B draft"); + expect(api.agent.getSnapshot).toHaveBeenCalledTimes(snapshotCalls); + model.dispose(); + }); +}); diff --git a/tests/integration/apps-desktop/workspace-search-service.spec.ts b/tests/integration/apps-desktop/workspace-search-service.spec.ts new file mode 100644 index 0000000..d089449 --- /dev/null +++ b/tests/integration/apps-desktop/workspace-search-service.spec.ts @@ -0,0 +1,76 @@ +import fs from "node:fs"; +import os from "node:os"; +import path from "node:path"; +import { afterEach, describe, expect, it, vi } from "vitest"; +import { WorkspaceSearchService } from "../../../apps/desktop/src/main/workspace-search-service"; + +vi.mock("node:child_process", async () => { + const { EventEmitter } = await import("node:events"); + return { + spawn: () => { + const child = Object.assign(new EventEmitter(), { + stdout: null, + stderr: null, + killed: false, + kill: vi.fn(), + }); + queueMicrotask(() => + child.emit( + "error", + Object.assign(new Error("fff missing"), { code: "ENOENT" }), + ), + ); + return child; + }, + }; +}); + +const roots: string[] = []; +afterEach(() => { + vi.restoreAllMocks(); + for (const root of roots.splice(0)) + fs.rmSync(root, { recursive: true, force: true }); +}); + +describe("fallback workspace search", () => { + it("matches the query before limiting results and prunes excluded trees", async () => { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-search-")); + roots.push(root); + fs.mkdirSync(path.join(root, "src")); + fs.mkdirSync(path.join(root, "build")); + fs.writeFileSync(path.join(root, "a-unrelated.txt"), ""); + fs.writeFileSync(path.join(root, "src", "Auth.ts"), ""); + fs.writeFileSync(path.join(root, "build", "auth.ts"), ""); + const readdir = vi.spyOn(fs.promises, "readdir"); + const response = await new WorkspaceSearchService().search({ + rootPath: root, + query: "AUTH.TS", + maxResults: 1, + excludePatterns: ["build/**"], + }); + expect(response.results.map((match) => match.path)).toEqual([ + path.join(root, "src", "Auth.ts"), + ]); + expect(readdir.mock.calls.map(([directory]) => directory)).not.toContain( + path.join(root, "build"), + ); + }); + + it("preserves glob include filters on nested paths", async () => { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "pi-search-")); + roots.push(root); + fs.mkdirSync(path.join(root, "src")); + fs.writeFileSync(path.join(root, "src", "auth.ts"), ""); + fs.writeFileSync(path.join(root, "auth.ts"), ""); + fs.writeFileSync(path.join(root, "src", "auth.txt"), ""); + const response = await new WorkspaceSearchService().search({ + rootPath: root, + query: "auth", + includePatterns: ["**/*.ts"], + }); + expect(response.results.map((match) => match.name)).toEqual([ + "auth.ts", + "auth.ts", + ]); + }); +});