fix: preserve user PATH for managed opencode

2026-04-25 20:44:07 +03:00
parent d40041fccd
commit 836d1b1b3b
7 changed files with 318 additions and 49 deletions
@@ -0,0 +1,115 @@
+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);
+
+    expect(runtime.buildManagedOpenCodePath()).toBe(loginShellPath);
+  });
+
+  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));
+  });
+});