Improve OpenChamber responsiveness under large session workloads while fixing cache, synchronization, and persistence correctness across runtimes, projects, directories, and worktrees. - prioritize selected and visible sessions during bootstrap and defer non-critical enrichment work - reduce redundant message loading, event processing, store publication, and hidden sidebar work - prevent stale session and message requests from overwriting newer authoritative state - preserve existing data when authoritative fetches fail instead of treating failures as successful empty responses - scope session materialization, messages, drafts, queues, todos, pins, permissions, folders, tabs, Git state, and pull request data by runtime and directory identity - harden runtime switching, reconnect, cleanup, mutation reconciliation, and persisted-state ordering - preserve live subagent Task linkage when metadata arrives after an older message request or while streaming parts are suspended - coalesce overlapping tail refreshes without losing newer refresh demand - improve cold-session loading by moving deferrable work out of the critical bootstrap path - isolate URL authentication, mobile credentials, native secrets, and other runtime-owned state across endpoint changes - bound long-lived caches and remove avoidable allocations from event and rendering hot paths - limit virtualization to archive collections where it improves rendering without disrupting active sidebar layout - stabilize session folders, pin ordering, expanded state, and persisted sidebar behavior - open skill files through the same secure editor and outside-workspace grant flow used by file navigation, including worktree sessions - expand regression coverage for stale completions, runtime collisions, reconnect behavior, persistence races, authoritative empty results, and subagent refresh ordering - document the updated synchronization, cache ownership, performance, and runtime-isolation invariants
175 lines
5.2 KiB
TypeScript
175 lines
5.2 KiB
TypeScript
import { create } from 'zustand';
|
|
import { devtools } from 'zustand/middleware';
|
|
import { opencodeClient, type ProjectFileSearchHit } from '@/lib/opencode/client';
|
|
import { getRuntimeKey } from '@/lib/runtime-switch';
|
|
|
|
const CACHE_TTL_MS = 30_000;
|
|
const MAX_CACHE_ENTRIES = 40;
|
|
const DEFAULT_SEARCH_LIMIT = 60;
|
|
|
|
interface FileSearchCacheEntry {
|
|
files: ProjectFileSearchHit[];
|
|
timestamp: number;
|
|
}
|
|
|
|
interface FileSearchStoreState {
|
|
cache: Record<string, FileSearchCacheEntry>;
|
|
cacheKeys: string[];
|
|
inFlight: Record<string, Promise<ProjectFileSearchHit[]>>;
|
|
searchFiles: (
|
|
directory: string,
|
|
query: string,
|
|
limit?: number,
|
|
options?: { includeHidden?: boolean; respectGitignore?: boolean; type?: 'file' | 'directory' }
|
|
) => Promise<ProjectFileSearchHit[]>;
|
|
invalidateDirectory: (directory?: string | null) => void;
|
|
resetForRuntimeSwitch: () => void;
|
|
}
|
|
|
|
const buildCacheKey = (
|
|
runtimeKey: string,
|
|
directory: string,
|
|
query: string,
|
|
limit: number,
|
|
includeHidden: boolean,
|
|
respectGitignore: boolean,
|
|
type: 'file' | 'directory'
|
|
) => {
|
|
const normalizedDirectory = directory.trim();
|
|
const normalizedQuery = query.trim().toLowerCase();
|
|
return JSON.stringify([runtimeKey, normalizedDirectory, normalizedQuery, limit, includeHidden, respectGitignore, type]);
|
|
};
|
|
|
|
const cacheKeyMatchesDirectory = (cacheKey: string, directory: string) => {
|
|
try {
|
|
const value: unknown = JSON.parse(cacheKey);
|
|
return Array.isArray(value) && value[1] === directory;
|
|
} catch {
|
|
return false;
|
|
}
|
|
};
|
|
|
|
export const useFileSearchStore = create<FileSearchStoreState>()(
|
|
devtools(
|
|
(set, get) => ({
|
|
cache: {},
|
|
cacheKeys: [],
|
|
inFlight: {},
|
|
async searchFiles(directory, query, limit = DEFAULT_SEARCH_LIMIT, options) {
|
|
if (!directory || directory.trim().length === 0) {
|
|
return [];
|
|
}
|
|
|
|
const normalizedDirectory = directory.trim();
|
|
const runtimeKey = getRuntimeKey();
|
|
const normalizedQuery = typeof query === 'string' ? query.trim() : '';
|
|
const includeHidden = Boolean(options?.includeHidden);
|
|
const respectGitignore = options?.respectGitignore ?? true;
|
|
const type = options?.type === 'directory' ? 'directory' : 'file';
|
|
const key = buildCacheKey(runtimeKey, normalizedDirectory, normalizedQuery, limit, includeHidden, respectGitignore, type);
|
|
const now = Date.now();
|
|
const cached = get().cache[key];
|
|
|
|
if (cached && now - cached.timestamp < CACHE_TTL_MS) {
|
|
return cached.files;
|
|
}
|
|
|
|
const inflight = get().inFlight[key];
|
|
if (inflight) {
|
|
return inflight;
|
|
}
|
|
|
|
const searchPromise = opencodeClient
|
|
.searchFiles(normalizedQuery, {
|
|
directory: normalizedDirectory,
|
|
limit,
|
|
includeHidden,
|
|
respectGitignore,
|
|
dirs: type !== 'file',
|
|
type,
|
|
})
|
|
.then((files) => {
|
|
set((state) => {
|
|
if (state.inFlight[key] !== searchPromise) {
|
|
return state;
|
|
}
|
|
|
|
const nextCache = { ...state.cache, [key]: { files, timestamp: Date.now() } };
|
|
const nextKeys = state.cacheKeys.filter((cacheKey) => cacheKey !== key);
|
|
nextKeys.push(key);
|
|
|
|
while (nextKeys.length > MAX_CACHE_ENTRIES) {
|
|
const oldestKey = nextKeys.shift();
|
|
if (oldestKey) {
|
|
delete nextCache[oldestKey];
|
|
}
|
|
}
|
|
|
|
return {
|
|
cache: nextCache,
|
|
cacheKeys: nextKeys,
|
|
};
|
|
});
|
|
return files;
|
|
})
|
|
.finally(() => {
|
|
set((state) => {
|
|
if (state.inFlight[key] !== searchPromise) {
|
|
return state;
|
|
}
|
|
|
|
const nextInFlight = { ...state.inFlight };
|
|
delete nextInFlight[key];
|
|
return { inFlight: nextInFlight };
|
|
});
|
|
});
|
|
|
|
set((state) => ({
|
|
inFlight: {
|
|
...state.inFlight,
|
|
[key]: searchPromise,
|
|
},
|
|
}));
|
|
|
|
return searchPromise;
|
|
},
|
|
invalidateDirectory(directory) {
|
|
if (!directory || directory.trim().length === 0) {
|
|
set({ cache: {}, cacheKeys: [], inFlight: {} });
|
|
return;
|
|
}
|
|
|
|
const normalizedDirectory = directory.trim();
|
|
|
|
set((state) => {
|
|
const nextCache = { ...state.cache };
|
|
const nextKeys = state.cacheKeys.filter((cacheKey) => {
|
|
if (cacheKeyMatchesDirectory(cacheKey, normalizedDirectory)) {
|
|
delete nextCache[cacheKey];
|
|
return false;
|
|
}
|
|
return true;
|
|
});
|
|
|
|
const nextInFlightEntries = Object.entries(state.inFlight).filter(
|
|
([key]) => !cacheKeyMatchesDirectory(key, normalizedDirectory)
|
|
);
|
|
const nextInFlight = Object.fromEntries(nextInFlightEntries);
|
|
|
|
return {
|
|
cache: nextCache,
|
|
cacheKeys: nextKeys,
|
|
inFlight: nextInFlight,
|
|
};
|
|
});
|
|
},
|
|
resetForRuntimeSwitch() {
|
|
set({ cache: {}, cacheKeys: [], inFlight: {} });
|
|
},
|
|
}),
|
|
{
|
|
name: 'file-search-store',
|
|
}
|
|
)
|
|
);
|