Packaged desktop showed no sessions in 1.12.4. Root cause: the sanitized session-list proxy path added in #1538 forwarded the renderer's "authorization" header (the OpenChamber UI client token) to the managed OpenCode upstream alongside the managed "Authorization" credential. OpenCode does not recognize UI client tokens, so every session-list request answered 401 — only in the packaged app, because only its renderer (openchamber-ui:// origin) attaches a bearer token; dev web and dev Electron run same-origin without one. The legacy http-proxy path overwrote the header correctly, which is why everything except session lists kept working. Proxy fix: - proxy-headers: filter the client "authorization" header out of forwarded request headers; the OpenCode upstream must only ever see its own managed credentials. Covered by tests. Desktop cwd: - electron: launch the managed OpenCode CLI from the user home instead of app userData, matching upstream desktop behavior. userData-as-cwd made OpenCode treat the app-data folder as a separate empty workspace. Home directory poisoning loop: - directoryPersistence: stop replaying localStorage homeDirectory through synchronizeHomeDirectory on boot/auth resync. The persisted value is only a boot-time cache; replaying it re-wrote stale values (e.g. a project path) into desktop settings on every start, overriding the authoritative /api/fs/home resolution. - persistence: never overwrite an injected window.__OPENCHAMBER_HOME__ with a persisted value. - useDirectoryStore: host switches happen in place (no reload), so re-resolve home from the new runtime's /api/fs/home on endpoint change instead of keeping the previous host's value. - opencode client: only short-circuit to the injected desktop home when the active runtime is local; remote runtimes ask /api/fs/home. Settings hygiene: - persistSettings: log field names only — change payloads can carry credentials (UI password, client tokens, tunnel tokens) that must not reach the log file; drop step-by-step log chatter. - validateProjectEntries: only stat project paths when the incoming update actually touches the projects list, not on every settings save. - remove the write-only approvedDirectories setting everywhere and add a migration that strips the stale key from persisted settings. Tests: - usePluginsStore.test: register an own runtime-fetch module mock so the suite is independent of process-global mock.module leakage from other files, and restore globalThis.fetch after the suite. - persistence.test: clean up the window global created for the suite.
455 lines
14 KiB
TypeScript
455 lines
14 KiB
TypeScript
import { create } from 'zustand';
|
|
import { devtools } from 'zustand/middleware';
|
|
import { opencodeClient } from '@/lib/opencode/client';
|
|
import { getDesktopHomeDirectory, isVSCodeRuntime } from '@/lib/desktop';
|
|
import { subscribeRuntimeEndpointChanged } from '@/lib/runtime-switch';
|
|
import { updateDesktopSettings } from '@/lib/persistence';
|
|
import { useFileSearchStore } from '@/stores/useFileSearchStore';
|
|
import { streamDebugEnabled } from '@/stores/utils/streamDebug';
|
|
import { getSafeStorage } from './utils/safeStorage';
|
|
|
|
interface DirectoryStore {
|
|
|
|
currentDirectory: string;
|
|
directoryHistory: string[];
|
|
historyIndex: number;
|
|
homeDirectory: string;
|
|
hasPersistedDirectory: boolean;
|
|
isHomeReady: boolean;
|
|
isSwitchingDirectory: boolean;
|
|
|
|
setDirectory: (path: string, options?: { showOverlay?: boolean }) => void;
|
|
goBack: () => void;
|
|
goForward: () => void;
|
|
goToParent: () => void;
|
|
goHome: () => Promise<void>;
|
|
synchronizeHomeDirectory: (path: string) => void;
|
|
}
|
|
|
|
let cachedHomeDirectory: string | null = null;
|
|
let homeResolveGeneration = 0;
|
|
const safeStorage = getSafeStorage();
|
|
const persistedLastDirectory = safeStorage.getItem('lastDirectory');
|
|
const initialHasPersistedDirectory =
|
|
typeof persistedLastDirectory === 'string' && persistedLastDirectory.length > 0;
|
|
|
|
|
|
const invalidateFileSearchCache = (scope?: string | null) => {
|
|
try {
|
|
useFileSearchStore.getState().invalidateDirectory(scope);
|
|
} catch (error) {
|
|
console.warn('Failed to invalidate file search cache:', error);
|
|
}
|
|
};
|
|
|
|
const normalizeDirectoryPath = (value: string): string => {
|
|
const trimmed = value.trim();
|
|
if (!trimmed) {
|
|
return trimmed;
|
|
}
|
|
const normalized = trimmed
|
|
.replace(/\\/g, '/')
|
|
.replace(/^([a-z]):/, (_, letter: string) => letter.toUpperCase() + ':');
|
|
if (normalized.length > 1) {
|
|
return normalized.replace(/\/+$/, '');
|
|
}
|
|
return normalized;
|
|
};
|
|
|
|
const resolveTildePath = (path: string, homeDir?: string | null): string => {
|
|
const trimmed = path.trim();
|
|
if (!trimmed.startsWith('~')) {
|
|
return trimmed;
|
|
}
|
|
if (trimmed === '~') {
|
|
return homeDir || trimmed;
|
|
}
|
|
if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
|
|
return homeDir ? `${homeDir}${trimmed.slice(1)}` : trimmed;
|
|
}
|
|
return trimmed;
|
|
};
|
|
|
|
const resolveDirectoryPath = (path: string, homeDir?: string | null): string => {
|
|
const expanded = resolveTildePath(path, homeDir);
|
|
return normalizeDirectoryPath(expanded);
|
|
};
|
|
|
|
const getStoredHomeDirectory = (): string | null => {
|
|
const raw = safeStorage.getItem('homeDirectory');
|
|
if (typeof raw !== 'string' || raw.trim().length === 0) {
|
|
return null;
|
|
}
|
|
const normalized = normalizeDirectoryPath(raw);
|
|
return normalized.length > 0 ? normalized : null;
|
|
};
|
|
|
|
const getStoredLastDirectory = (): string | null => {
|
|
const raw = safeStorage.getItem('lastDirectory');
|
|
if (typeof raw !== 'string' || raw.trim().length === 0) {
|
|
return null;
|
|
}
|
|
const normalized = normalizeDirectoryPath(raw);
|
|
return normalized.length > 0 ? normalized : null;
|
|
};
|
|
|
|
const getProcessHomeDirectory = (): string | null => {
|
|
if (typeof process === 'undefined') {
|
|
return null;
|
|
}
|
|
|
|
const env = process?.env;
|
|
const nodeHome = env?.HOME || env?.USERPROFILE || ((env?.HOMEDRIVE && env?.HOMEPATH) ? `${env.HOMEDRIVE}${env.HOMEPATH}` : undefined);
|
|
if (typeof nodeHome === 'string' && nodeHome.trim().length > 0) {
|
|
const normalized = normalizeDirectoryPath(nodeHome);
|
|
return normalized.length > 0 ? normalized : null;
|
|
}
|
|
|
|
const cwd = process?.cwd?.();
|
|
if (typeof cwd === 'string' && cwd.trim().length > 0) {
|
|
const normalized = normalizeDirectoryPath(cwd);
|
|
return normalized.length > 0 ? normalized : null;
|
|
}
|
|
|
|
return null;
|
|
};
|
|
|
|
const getHomeDirectory = () => {
|
|
|
|
if (typeof window !== 'undefined') {
|
|
if (cachedHomeDirectory) return cachedHomeDirectory;
|
|
|
|
const desktopHome =
|
|
(typeof window.__OPENCHAMBER_HOME__ === 'string' && window.__OPENCHAMBER_HOME__.length > 0
|
|
? window.__OPENCHAMBER_HOME__
|
|
: null);
|
|
|
|
if (desktopHome && desktopHome.length > 0) {
|
|
cachedHomeDirectory = desktopHome;
|
|
safeStorage.setItem('homeDirectory', desktopHome);
|
|
return desktopHome;
|
|
}
|
|
|
|
const storedHome = getStoredHomeDirectory();
|
|
if (storedHome && !isVSCodeRuntime()) {
|
|
cachedHomeDirectory = storedHome;
|
|
return storedHome;
|
|
}
|
|
}
|
|
|
|
const processHome = getProcessHomeDirectory();
|
|
if (processHome) {
|
|
return processHome;
|
|
}
|
|
return '/';
|
|
};
|
|
|
|
|
|
const normalizeHomeCandidate = (value?: string | null) => {
|
|
if (typeof value !== 'string') {
|
|
return null;
|
|
}
|
|
const trimmed = value.trim();
|
|
if (!trimmed) {
|
|
return null;
|
|
}
|
|
const normalized = trimmed.replace(/\\/g, '/');
|
|
if (normalized.length > 1) {
|
|
const withoutTrailingSlash = normalized.replace(/\/+$/, '');
|
|
if (withoutTrailingSlash && withoutTrailingSlash.length > 0) {
|
|
if (withoutTrailingSlash === '/') {
|
|
return null;
|
|
}
|
|
return withoutTrailingSlash;
|
|
}
|
|
}
|
|
if (normalized === '/' || normalized.length === 0) {
|
|
return null;
|
|
}
|
|
return normalized;
|
|
};
|
|
|
|
const persistResolvedHome = (resolved: string) => {
|
|
cachedHomeDirectory = resolved;
|
|
if (typeof window !== 'undefined') {
|
|
safeStorage.setItem('homeDirectory', resolved);
|
|
}
|
|
void updateDesktopSettings({ homeDirectory: resolved });
|
|
return resolved;
|
|
};
|
|
|
|
const initializeHomeDirectory = async () => {
|
|
const acceptCandidate = (candidate?: string | null) => {
|
|
const normalized = normalizeHomeCandidate(candidate);
|
|
return normalized ? persistResolvedHome(normalized) : null;
|
|
};
|
|
|
|
try {
|
|
const fsHome = await opencodeClient.getFilesystemHome();
|
|
const resolved = acceptCandidate(fsHome);
|
|
if (resolved) {
|
|
return resolved;
|
|
}
|
|
} catch (filesystemError) {
|
|
console.warn('Failed to obtain filesystem home directory:', filesystemError);
|
|
}
|
|
|
|
try {
|
|
const info = await opencodeClient.getSystemInfo();
|
|
const resolved = acceptCandidate(info?.homeDirectory);
|
|
if (resolved) {
|
|
return resolved;
|
|
}
|
|
} catch (error) {
|
|
console.warn('Failed to get home directory from system info:', error);
|
|
}
|
|
|
|
try {
|
|
const desktopHome = await getDesktopHomeDirectory();
|
|
const resolved = acceptCandidate(desktopHome);
|
|
if (resolved) {
|
|
return resolved;
|
|
}
|
|
} catch (desktopError) {
|
|
console.warn('Failed to obtain desktop-integrated home directory:', desktopError);
|
|
}
|
|
|
|
const fallback = getHomeDirectory();
|
|
const resolvedFallback = acceptCandidate(fallback);
|
|
if (resolvedFallback) {
|
|
return resolvedFallback;
|
|
}
|
|
|
|
return fallback;
|
|
};
|
|
|
|
const getVsCodeWorkspaceFolder = (): string | null => {
|
|
if (!isVSCodeRuntime()) {
|
|
return null;
|
|
}
|
|
const workspaceFolder = (window as unknown as { __VSCODE_CONFIG__?: { workspaceFolder?: unknown } }).__VSCODE_CONFIG__?.workspaceFolder;
|
|
if (typeof workspaceFolder !== 'string' || workspaceFolder.trim().length === 0) {
|
|
return null;
|
|
}
|
|
const normalized = normalizeDirectoryPath(workspaceFolder);
|
|
return normalized.length > 0 ? normalized : null;
|
|
};
|
|
|
|
const initialHomeDirectory = getVsCodeWorkspaceFolder() || getHomeDirectory();
|
|
const initialCurrentDirectory = (() => {
|
|
const persisted = getStoredLastDirectory();
|
|
if (persisted && !isVSCodeRuntime()) {
|
|
return resolveDirectoryPath(persisted, initialHomeDirectory);
|
|
}
|
|
return initialHomeDirectory;
|
|
})();
|
|
|
|
if (initialCurrentDirectory) {
|
|
opencodeClient.setDirectory(initialCurrentDirectory);
|
|
}
|
|
const initialIsHomeReady = Boolean(initialHomeDirectory && initialHomeDirectory !== '/');
|
|
|
|
export const useDirectoryStore = create<DirectoryStore>()(
|
|
devtools(
|
|
(set, get) => ({
|
|
|
|
currentDirectory: initialCurrentDirectory,
|
|
directoryHistory: [initialCurrentDirectory],
|
|
historyIndex: 0,
|
|
homeDirectory: initialHomeDirectory,
|
|
hasPersistedDirectory: initialHasPersistedDirectory,
|
|
isHomeReady: initialIsHomeReady,
|
|
isSwitchingDirectory: false,
|
|
|
|
setDirectory: (path: string, options?: { showOverlay?: boolean }) => {
|
|
void options;
|
|
const homeDir = cachedHomeDirectory || get().homeDirectory || safeStorage.getItem('homeDirectory');
|
|
const resolvedPath = resolveDirectoryPath(path, homeDir);
|
|
if (streamDebugEnabled()) {
|
|
console.log('[DirectoryStore] setDirectory called with path:', resolvedPath);
|
|
}
|
|
|
|
opencodeClient.setDirectory(resolvedPath);
|
|
invalidateFileSearchCache();
|
|
|
|
set((state) => {
|
|
const newHistory = [...state.directoryHistory.slice(0, state.historyIndex + 1), resolvedPath];
|
|
|
|
safeStorage.setItem('lastDirectory', resolvedPath);
|
|
void updateDesktopSettings({ lastDirectory: resolvedPath });
|
|
|
|
return {
|
|
currentDirectory: resolvedPath,
|
|
directoryHistory: newHistory,
|
|
historyIndex: newHistory.length - 1,
|
|
hasPersistedDirectory: true,
|
|
isHomeReady: true,
|
|
isSwitchingDirectory: false,
|
|
};
|
|
});
|
|
},
|
|
|
|
goBack: () => {
|
|
const state = get();
|
|
if (state.historyIndex > 0) {
|
|
const newIndex = state.historyIndex - 1;
|
|
const newDirectory = state.directoryHistory[newIndex];
|
|
|
|
opencodeClient.setDirectory(newDirectory);
|
|
invalidateFileSearchCache();
|
|
|
|
safeStorage.setItem('lastDirectory', newDirectory);
|
|
|
|
void updateDesktopSettings({ lastDirectory: newDirectory });
|
|
|
|
set({
|
|
currentDirectory: newDirectory,
|
|
historyIndex: newIndex,
|
|
hasPersistedDirectory: true,
|
|
isHomeReady: true,
|
|
isSwitchingDirectory: false,
|
|
});
|
|
}
|
|
},
|
|
|
|
goForward: () => {
|
|
const state = get();
|
|
if (state.historyIndex < state.directoryHistory.length - 1) {
|
|
const newIndex = state.historyIndex + 1;
|
|
const newDirectory = state.directoryHistory[newIndex];
|
|
|
|
opencodeClient.setDirectory(newDirectory);
|
|
invalidateFileSearchCache();
|
|
|
|
safeStorage.setItem('lastDirectory', newDirectory);
|
|
|
|
void updateDesktopSettings({ lastDirectory: newDirectory });
|
|
|
|
set({
|
|
currentDirectory: newDirectory,
|
|
historyIndex: newIndex,
|
|
hasPersistedDirectory: true,
|
|
isHomeReady: true,
|
|
isSwitchingDirectory: false,
|
|
});
|
|
}
|
|
},
|
|
|
|
goToParent: () => {
|
|
const { currentDirectory, setDirectory } = get();
|
|
const homeDir = cachedHomeDirectory || get().homeDirectory || getHomeDirectory();
|
|
|
|
if (currentDirectory === homeDir || currentDirectory === '/') {
|
|
return;
|
|
}
|
|
|
|
const cleanPath = currentDirectory.endsWith('/')
|
|
? currentDirectory.slice(0, -1)
|
|
: currentDirectory;
|
|
|
|
const lastSlash = cleanPath.lastIndexOf('/');
|
|
if (lastSlash === -1) {
|
|
const home = cachedHomeDirectory || getHomeDirectory();
|
|
setDirectory(home);
|
|
} else if (lastSlash === 0) {
|
|
setDirectory('/');
|
|
} else {
|
|
setDirectory(cleanPath.substring(0, lastSlash));
|
|
}
|
|
},
|
|
|
|
goHome: async () => {
|
|
const homeDir =
|
|
cachedHomeDirectory ||
|
|
get().homeDirectory ||
|
|
(await initializeHomeDirectory());
|
|
get().setDirectory(homeDir);
|
|
},
|
|
|
|
synchronizeHomeDirectory: (homePath: string) => {
|
|
const state = get();
|
|
const resolvedHome = homePath;
|
|
cachedHomeDirectory = resolvedHome;
|
|
const needsUpdate = state.homeDirectory !== resolvedHome;
|
|
const savedLastDirectory = safeStorage.getItem('lastDirectory');
|
|
const hasSavedLastDirectory = typeof savedLastDirectory === 'string' && savedLastDirectory.length > 0;
|
|
const shouldReplaceCurrent =
|
|
!hasSavedLastDirectory &&
|
|
(
|
|
state.currentDirectory === '/' ||
|
|
state.currentDirectory === state.homeDirectory ||
|
|
!state.currentDirectory
|
|
);
|
|
|
|
if (!needsUpdate && !shouldReplaceCurrent) {
|
|
if (!state.isHomeReady) {
|
|
set({ isHomeReady: true });
|
|
}
|
|
return;
|
|
}
|
|
|
|
const resolvedReady = typeof resolvedHome === 'string' && resolvedHome !== '' && resolvedHome !== '/';
|
|
|
|
const resolvedCurrent = state.currentDirectory
|
|
? resolveDirectoryPath(state.currentDirectory, resolvedHome)
|
|
: state.currentDirectory;
|
|
const resolvedHistory = state.directoryHistory.map((entry) => resolveDirectoryPath(entry, resolvedHome));
|
|
const historyChanged = resolvedHistory.some((entry, index) => entry !== state.directoryHistory[index]);
|
|
const currentChanged = Boolean(resolvedCurrent && resolvedCurrent !== state.currentDirectory);
|
|
|
|
const updates: Partial<DirectoryStore> = {
|
|
homeDirectory: resolvedHome,
|
|
hasPersistedDirectory: hasSavedLastDirectory,
|
|
isHomeReady: resolvedReady
|
|
};
|
|
|
|
if (shouldReplaceCurrent) {
|
|
updates.currentDirectory = resolvedHome;
|
|
updates.directoryHistory = [resolvedHome];
|
|
updates.historyIndex = 0;
|
|
updates.isSwitchingDirectory = false;
|
|
} else if (currentChanged || historyChanged) {
|
|
updates.currentDirectory = resolvedCurrent as string;
|
|
updates.directoryHistory = resolvedHistory;
|
|
updates.historyIndex = Math.min(state.historyIndex, resolvedHistory.length - 1);
|
|
updates.isSwitchingDirectory = false;
|
|
}
|
|
|
|
set(() => updates as Partial<DirectoryStore>);
|
|
|
|
if ((shouldReplaceCurrent || currentChanged) && resolvedReady) {
|
|
const nextDirectory = shouldReplaceCurrent ? resolvedHome : (resolvedCurrent as string);
|
|
opencodeClient.setDirectory(nextDirectory);
|
|
invalidateFileSearchCache();
|
|
safeStorage.setItem('lastDirectory', nextDirectory);
|
|
void updateDesktopSettings({ lastDirectory: nextDirectory });
|
|
|
|
}
|
|
|
|
void updateDesktopSettings({ homeDirectory: resolvedHome });
|
|
}
|
|
}),
|
|
{
|
|
name: 'directory-store'
|
|
}
|
|
)
|
|
);
|
|
|
|
if (typeof window !== 'undefined') {
|
|
initializeHomeDirectory().then((home) => {
|
|
useDirectoryStore.getState().synchronizeHomeDirectory(home);
|
|
});
|
|
|
|
// Host switches happen in place (no page reload), so the home directory
|
|
// must be re-resolved from the new runtime's authoritative source instead
|
|
// of keeping the previous host's value cached.
|
|
subscribeRuntimeEndpointChanged(() => {
|
|
cachedHomeDirectory = null;
|
|
const generation = ++homeResolveGeneration;
|
|
initializeHomeDirectory().then((home) => {
|
|
if (generation !== homeResolveGeneration) return;
|
|
useDirectoryStore.getState().synchronizeHomeDirectory(home);
|
|
});
|
|
});
|
|
}
|