* fix: exclude file content from reverted prompt text Revert and fork now restore only the user's original prompt, not server-injected file content Uses existing isSyntheticPart helper for type-safe filtering * fix: keep scrollbar visible when hovering over thumb * fix: prevent ESC abort from triggering when terminal is focused * fix: pass directory to permission/question reply calls so approvals actually resolve * fix: default model selection not responding after Base UI migration * fix: prevent modal content from shifting and clipping footer buttons * fix: improve session switching performance and add sub-agent export with prompt collapse Defer viewport anchor saving to eliminate ~800ms UI freeze when switching sessions Add export dialog to include sub-agent tasks recursively in markdown export Add collapse chevron button for expanded user prompts in sticky header * fix: resolve sidebar scroll and TDZ crash in session sidebar * perf: reduce CPU overhead and re-renders across chat, layout, and settings * fix: position collapse button at top of message and prevent ESC abort in terminal * fix: position collapse button at top and add padding only when expanded * refactor: extract shared PATH utilities and mobile keyboard hook * refactor: import shared path-utils in electron, use module-level style constants - Electron now imports pathLooksUserConfigured/mergePathValues from shared path-utils.js instead of inline duplication - ToolPart collapsedCustomStyle moved from useMemo([]) to module const * fix: resolve remaining merge conflicts and type errors - Remove duplicate variable declarations in SessionNodeItem - Remove orphaned export callback body from conflict resolution - Fix HelpDialog description -> descriptionKey (i18n rename) * fix: resolve type-check and lint errors in session-actions.test.ts - Added missing bun:test type declarations (beforeEach, mock, mock.module) - Removed unused State import - Replaced 'as any' casts with proper OpencodeClient and ChildStoreManager types - Added eslint-disable for unused _ parameter in mock function * fix PR 1028 export and PATH edge cases * fix startup retry exhaustion state * remove opencode package lock change * fix sub-session rename cancellation --------- Co-authored-by: Bohdan Triapitsyn <artmore@protonmail.com>
124 lines
3.6 KiB
JavaScript
124 lines
3.6 KiB
JavaScript
import os from 'node:os';
|
|
import path from 'node:path';
|
|
import { afterEach, describe, expect, it } from 'vitest';
|
|
|
|
import { createServerUtilsRuntime } from './server-utils-runtime.js';
|
|
|
|
const originalPath = process.env.PATH;
|
|
|
|
afterEach(() => {
|
|
process.env.PATH = originalPath;
|
|
});
|
|
|
|
const createRuntime = (loginShellPath) => createServerUtilsRuntime({
|
|
fs: {},
|
|
os,
|
|
path,
|
|
process,
|
|
openCodeReadyGraceMs: 0,
|
|
longRequestTimeoutMs: 0,
|
|
getRuntime: () => ({}),
|
|
getOpenCodeAuthHeaders: () => ({}),
|
|
buildOpenCodeUrl: (route) => route,
|
|
ensureOpenCodeApiPrefix: () => {},
|
|
getUiNotificationClients: () => new Set(),
|
|
getOpenCodePort: () => null,
|
|
setOpenCodePortState: () => {},
|
|
syncToHmrState: () => {},
|
|
markOpenCodeNotReady: () => {},
|
|
setOpenCodeNotReadySince: () => {},
|
|
clearLastOpenCodeError: () => {},
|
|
getLoginShellPath: () => loginShellPath,
|
|
});
|
|
|
|
describe('server utils runtime', () => {
|
|
it('keeps managed OpenCode PATH literal when process PATH is user-configured', () => {
|
|
const home = os.homedir();
|
|
const currentPath = [
|
|
path.join(home, '.opencode', 'bin'),
|
|
path.join(home, '.bun', 'bin'),
|
|
path.join(home, 'Library', 'pnpm'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
].join(path.delimiter);
|
|
process.env.PATH = currentPath;
|
|
|
|
const runtime = createRuntime([
|
|
path.join(home, '.opencode', 'bin'),
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
path.join(home, '.cargo', 'bin'),
|
|
].join(path.delimiter));
|
|
|
|
expect(runtime.buildManagedOpenCodePath()).toBe(currentPath);
|
|
});
|
|
|
|
it('uses login shell PATH for managed OpenCode when process PATH is minimal', () => {
|
|
const home = os.homedir();
|
|
const loginShellPath = [
|
|
path.join(home, '.opencode', 'bin'),
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
].join(path.delimiter);
|
|
process.env.PATH = ['/usr/local/bin', '/usr/bin', '/bin'].join(path.delimiter);
|
|
|
|
const runtime = createRuntime(loginShellPath);
|
|
|
|
// Should prefer login shell PATH but merge in any process entries not already present.
|
|
expect(runtime.buildManagedOpenCodePath()).toBe([
|
|
path.join(home, '.opencode', 'bin'),
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
'/usr/local/bin',
|
|
'/bin',
|
|
].join(path.delimiter));
|
|
});
|
|
|
|
it('preserves user-configured process PATH order before appending shell-only entries', () => {
|
|
const home = os.homedir();
|
|
process.env.PATH = [
|
|
path.join(home, '.bun', 'bin'),
|
|
path.join(home, 'Library', 'pnpm'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
].join(path.delimiter);
|
|
|
|
const runtime = createRuntime([
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
path.join(home, '.cargo', 'bin'),
|
|
'/usr/bin',
|
|
].join(path.delimiter));
|
|
|
|
expect(runtime.buildAugmentedPath()).toBe([
|
|
path.join(home, '.bun', 'bin'),
|
|
path.join(home, 'Library', 'pnpm'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
path.join(home, '.cargo', 'bin'),
|
|
].join(path.delimiter));
|
|
});
|
|
|
|
it('prefers login shell PATH when current process PATH is minimal', () => {
|
|
const home = os.homedir();
|
|
process.env.PATH = ['/usr/local/bin', '/usr/bin', '/bin'].join(path.delimiter);
|
|
|
|
const runtime = createRuntime([
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
].join(path.delimiter));
|
|
|
|
expect(runtime.buildAugmentedPath()).toBe([
|
|
path.join(home, '.bun', 'bin'),
|
|
'/opt/homebrew/bin',
|
|
'/usr/bin',
|
|
'/usr/local/bin',
|
|
'/bin',
|
|
].join(path.delimiter));
|
|
});
|
|
});
|