Merge pull request #320 from Latitudes-Dev/shuvcode-dev

Author: shuv1337

.github/workflows/test.yml

@@ -27,7 +27,7 @@ jobs:
             host: windows-latest
             playwright: bunx playwright install
             workdir: packages/app
-            command: bun test:e2e
+            command: bun test:e2e:local
     runs-on: ${{ matrix.settings.host }}
     defaults:
       run:
@@ -46,26 +46,18 @@ jobs:
         run: ${{ matrix.settings.playwright }}
 
       - name: Set OS-specific paths
+        if: runner.os != 'Windows'
         run: |
-          if [ "${{ runner.os }}" = "Windows" ]; then
-            printf '%s\n' "OPENCODE_E2E_ROOT=${{ runner.temp }}\\opencode-e2e" >> "$GITHUB_ENV"
-            printf '%s\n' "OPENCODE_TEST_HOME=${{ runner.temp }}\\opencode-e2e\\home" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_DATA_HOME=${{ runner.temp }}\\opencode-e2e\\share" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_CACHE_HOME=${{ runner.temp }}\\opencode-e2e\\cache" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_CONFIG_HOME=${{ runner.temp }}\\opencode-e2e\\config" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_STATE_HOME=${{ runner.temp }}\\opencode-e2e\\state" >> "$GITHUB_ENV"
-            printf '%s\n' "MODELS_DEV_API_JSON=${{ github.workspace }}\\packages\\opencode\\test\\tool\\fixtures\\models-api.json" >> "$GITHUB_ENV"
-          else
-            printf '%s\n' "OPENCODE_E2E_ROOT=${{ runner.temp }}/opencode-e2e" >> "$GITHUB_ENV"
-            printf '%s\n' "OPENCODE_TEST_HOME=${{ runner.temp }}/opencode-e2e/home" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_DATA_HOME=${{ runner.temp }}/opencode-e2e/share" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_CACHE_HOME=${{ runner.temp }}/opencode-e2e/cache" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_CONFIG_HOME=${{ runner.temp }}/opencode-e2e/config" >> "$GITHUB_ENV"
-            printf '%s\n' "XDG_STATE_HOME=${{ runner.temp }}/opencode-e2e/state" >> "$GITHUB_ENV"
-            printf '%s\n' "MODELS_DEV_API_JSON=${{ github.workspace }}/packages/opencode/test/tool/fixtures/models-api.json" >> "$GITHUB_ENV"
-          fi
+          printf '%s\n' "OPENCODE_E2E_ROOT=${{ runner.temp }}/opencode-e2e" >> "$GITHUB_ENV"
+          printf '%s\n' "OPENCODE_TEST_HOME=${{ runner.temp }}/opencode-e2e/home" >> "$GITHUB_ENV"
+          printf '%s\n' "XDG_DATA_HOME=${{ runner.temp }}/opencode-e2e/share" >> "$GITHUB_ENV"
+          printf '%s\n' "XDG_CACHE_HOME=${{ runner.temp }}/opencode-e2e/cache" >> "$GITHUB_ENV"
+          printf '%s\n' "XDG_CONFIG_HOME=${{ runner.temp }}/opencode-e2e/config" >> "$GITHUB_ENV"
+          printf '%s\n' "XDG_STATE_HOME=${{ runner.temp }}/opencode-e2e/state" >> "$GITHUB_ENV"
+          printf '%s\n' "MODELS_DEV_API_JSON=${{ github.workspace }}/packages/opencode/test/tool/fixtures/models-api.json" >> "$GITHUB_ENV"
 
       - name: Seed opencode data
+        if: runner.os != 'Windows'
         working-directory: packages/opencode
         run: bun script/seed-e2e.ts
         env:
@@ -86,6 +78,7 @@ jobs:
           OPENCODE_E2E_MODEL: "opencode/gpt-5-nano"
 
       - name: Run opencode server
+        if: runner.os != 'Windows'
         working-directory: packages/opencode
         run: bun dev -- --print-logs --log-level WARN serve --port 4096 --hostname 0.0.0.0 &
         env:
@@ -103,6 +96,7 @@ jobs:
           OPENCODE_CLIENT: "app"
 
       - name: Wait for opencode server
+        if: runner.os != 'Windows'
         run: |
           for i in {1..60}; do
             curl -fsS "http://localhost:4096/global/health" > /dev/null && exit 0

packages/app/script/e2e-local.ts

@@ -24,16 +24,28 @@ async function freePort() {
   })
 }
 
-async function waitForHealth(url: string) {
-  const timeout = Date.now() + 60_000
+async function waitForHealth(url: string, server: Bun.Subprocess) {
+  const timeoutMs = process.env.CI ? 180_000 : 60_000
+  const timeout = Date.now() + timeoutMs
+
   while (Date.now() < timeout) {
     const ok = await fetch(url)
       .then((r) => r.ok)
       .catch(() => false)
     if (ok) return
+
+    const exited = await Promise.race([
+      server.exited.then(() => true).catch(() => true),
+      new Promise<boolean>((resolve) => setTimeout(() => resolve(false), 0)),
+    ])
+
+    if (exited) {
+      throw new Error(`Server exited before health check: ${url}`)
+    }
+
     await new Promise((r) => setTimeout(r, 250))
   }
-  throw new Error(`Timed out waiting for server health: ${url}`)
+  throw new Error(`Timed out waiting for server health after ${timeoutMs / 1000}s: ${url}`)
 }
 
 const appDir = process.cwd()
@@ -115,7 +127,7 @@ const server = Bun.spawn(
 )
 
 try {
-  await waitForHealth(`http://localhost:${serverPort}/global/health`)
+  await waitForHealth(`http://localhost:${serverPort}/global/health`, server)
 
   const runner = Bun.spawn(["bun", "test:e2e", ...extraArgs], {
     cwd: appDir,

packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx

@@ -12,7 +12,7 @@ import { useDirectory } from "../../context/directory"
 import { useKV } from "../../context/kv"
 import { TodoItem } from "../../component/todo-item"
 
-export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
+export function Sidebar(props: { sessionID: string; overlay?: boolean; width?: number }) {
   const sync = useSync()
   const { theme } = useTheme()
   const session = createMemo(() => sync.session.get(props.sessionID)!)
@@ -72,7 +72,7 @@ export function Sidebar(props: { sessionID: string; overlay?: boolean }) {
     <Show when={session()}>
       <box
         backgroundColor={theme.backgroundPanel}
-        width={42}
+        width={props.width ?? 42}
         paddingTop={1}
         paddingBottom={1}
         paddingLeft={2}