-
Notifications
You must be signed in to change notification settings - Fork 449
fix(pi): New database files are not created #780
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import type { FileFinderApi, InitOptions, Result } from "@ff-labs/fff-node"; | ||
| import { type FileFinderStatic, loadSdk, SCAN_TIMEOUT_MS } from "./sdk"; | ||
|
|
||
| export interface PickerOptions { | ||
| basePath: string; | ||
| enableHomeDirScanning?: boolean; | ||
| enableFsRootScanning?: boolean; | ||
| } | ||
|
|
||
| /** Opens every picker in this pi process — the cwd picker and the aux pickers — | ||
| * on the same frecency/history databases. */ | ||
| export class FilePickerFactory { | ||
| private dbDisabled = false; | ||
| private readonly frecencyDbPath: string; | ||
| private readonly historyDbPath: string; | ||
| private readonly onDbFailure?: (error: string) => void; | ||
|
|
||
| constructor(opts: { | ||
| frecencyDbPath: string; | ||
| historyDbPath: string; | ||
| onDbFailure?: (error: string) => void; | ||
| }) { | ||
| this.frecencyDbPath = opts.frecencyDbPath; | ||
| this.historyDbPath = opts.historyDbPath; | ||
| this.onDbFailure = opts.onDbFailure; | ||
| } | ||
|
|
||
| /** True once the databases were given up on, so pickers open without them. */ | ||
| get databasesDisabled(): boolean { | ||
| return this.dbDisabled; | ||
| } | ||
|
|
||
| /** Opens a scanned, ready-to-use picker. Throws if it cannot be created. */ | ||
| async create(options: PickerOptions): Promise<FileFinderApi> { | ||
| const { FileFinder } = await loadSdk(); | ||
| const result = this.openWithDbFallback(FileFinder, options); | ||
|
|
||
| if (!result.ok) { | ||
| throw new Error( | ||
| `Failed to create FFF file picker for ${options.basePath}: ${result.error}`, | ||
| ); | ||
| } | ||
|
|
||
| // waitForScan() also resolves on timeout, so this bounds startup rather | ||
| // than guaranteeing a complete index. | ||
| await result.value.waitForScan(SCAN_TIMEOUT_MS); | ||
| return result.value; | ||
| } | ||
|
|
||
| private openWithDbFallback( | ||
| FileFinder: FileFinderStatic, | ||
| options: PickerOptions, | ||
| ): Result<FileFinderApi> { | ||
| const init: InitOptions = { ...options, aiMode: true }; | ||
| if (this.dbDisabled) return FileFinder.create(init); | ||
|
|
||
| const result = FileFinder.create({ | ||
| ...init, | ||
| frecencyDbPath: this.frecencyDbPath, | ||
| historyDbPath: this.historyDbPath, | ||
| }); | ||
| if (result.ok) return result; | ||
|
|
||
| // A failure here is usually transient (broken lock, corruption) and self-heals | ||
| // on restart, so drop the databases instead of leaving pi without a picker | ||
| const dbLess = FileFinder.create(init); | ||
| if (!dbLess.ok) return result; // db error is the more useful one to report | ||
|
|
||
| this.dbDisabled = true; | ||
| this.onDbFailure?.(result.error); | ||
| return dbLess; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,67 @@ | ||
| import fs from "node:fs"; | ||
| import os from "node:os"; | ||
| import path from "node:path"; | ||
|
|
||
| // Resolved once per process: os.homedir() hits the env/passwd on every call. | ||
| export const HOME_DIR = path.resolve(os.homedir()); | ||
|
|
||
| // fff.nvim db dir names (`frecency.db_path` / `history.db_path` in lua/fff/conf.lua). | ||
| const NVIM_FRECENCY_DIR = "fff_nvim"; | ||
| const NVIM_HISTORY_DIR = "fff_queries"; | ||
|
|
||
| export interface DbPaths { | ||
| frecency: string; | ||
| history: string; | ||
| } | ||
|
|
||
| export function isHomeDir(dir: string): boolean { | ||
| return path.resolve(dir) === HOME_DIR; | ||
| } | ||
|
|
||
| // Resolution order: explicit override > existing fff.nvim db > pi-local data dir. | ||
| // Reusing the nvim db lets pi rank files by the frecency the user built in their editor. | ||
| export function resolveDbPaths(overrides: { | ||
| frecency?: string; | ||
| history?: string; | ||
| }): DbPaths { | ||
| return { | ||
| frecency: | ||
| overrides.frecency ?? | ||
| existingDir(nvimCacheDir(), NVIM_FRECENCY_DIR) ?? | ||
| path.join(piDataDir(), "fff", "frecency"), | ||
| history: | ||
| overrides.history ?? | ||
| existingDir(nvimDataDir(), NVIM_HISTORY_DIR) ?? | ||
| path.join(piDataDir(), "fff", "history"), | ||
| }; | ||
| } | ||
|
|
||
| function nvimCacheDir(): string { | ||
| const xdg = process.env.XDG_CACHE_HOME; | ||
| if (xdg) return path.join(xdg, "nvim"); | ||
| if (process.platform === "win32" && process.env.LOCALAPPDATA) | ||
| return path.join(process.env.LOCALAPPDATA, "nvim-data", "cache"); | ||
| return path.join(HOME_DIR, ".cache", "nvim"); | ||
| } | ||
|
|
||
| function nvimDataDir(): string { | ||
| const xdg = process.env.XDG_DATA_HOME; | ||
| if (xdg) return path.join(xdg, "nvim"); | ||
| if (process.platform === "win32" && process.env.LOCALAPPDATA) | ||
| return path.join(process.env.LOCALAPPDATA, "nvim-data"); | ||
| return path.join(HOME_DIR, ".local", "share", "nvim"); | ||
| } | ||
|
|
||
| function piDataDir(): string { | ||
| return process.env.PI_CODING_AGENT_DIR ?? path.join(HOME_DIR, ".pi", "agent"); | ||
| } | ||
|
|
||
| // LMDB environments are directories, so a stray file at the same path is not a db. | ||
| function existingDir(parent: string, name: string): string | undefined { | ||
| const candidate = path.join(parent, name); | ||
| try { | ||
| return fs.statSync(candidate).isDirectory() ? candidate : undefined; | ||
| } catch { | ||
| return undefined; | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.