Simplify multi-root for now

Author: savannahostrowski

.vscode-test.mjs

@@ -28,7 +28,7 @@ export default defineConfig({
       "**/appDiscovery.js",
       "**/vscodeFileSystem.js",
       "**/telemetry/vscode.js",
-      "**/webview/logs/webview.js",
+      "**/cloud/ui/panel/webview.js",
     ],
     reporter: ["text", "html", "json-summary"],
     output: "./coverage",

esbuild.js

@@ -50,9 +50,7 @@ async function main() {
 
   const testEntryPoints = !production ? globSync("src/test/**/*.test.ts") : []
   const sourceEntryPoints = noBundleForCoverage
-    ? globSync("src/**/*.ts").filter(
-        (f) => f !== "src/cloud/ui/panel/webview.ts",
-      )
+    ? globSync("src/**/*.ts")
     : ["src/extension.ts"]
 
   // Shared esbuild options

src/cloud/commands/logs.ts

@@ -3,7 +3,6 @@ import { log } from "../../utils/logger"
 import { trackCloudLogsOpened } from "../../utils/telemetry"
 import { type ApiService, type AppLogEntry, StreamLogError } from "../api"
 import type { ConfigService } from "../config"
-import { pickWorkspaceFolder } from "../ui/pickers"
 
 const DEFAULT_TAIL = 100
 export const LOGS_VIEW_ID = "fastapi-cloud-logs"
@@ -87,7 +86,7 @@ export function formatLogEntry(entry: AppLogEntry): string {
 function getLevelChipsHtml(): string {
   return FILTER_CHIPS.map(
     ({ level, label }) =>
-      `                    <div class="level-item" data-level="${level}"><span>${label}</span><span class="check">✓</span></div>`,
+      `<div class="level-item" data-level="${level}"><span>${label}</span><span class="check">✓</span></div>`,
   ).join("\n")
 }
 
@@ -125,7 +124,7 @@ export function getWebviewHtml(
             <div class="filter-row">
                 <label for="level-list">Log Level</label>
                 <div class="level-list" id="level-list">
-${getLevelChipsHtml()}
+                  ${getLevelChipsHtml()}
                 </div>
             </div>
             <div class="filter-row">
@@ -146,8 +145,6 @@ ${getLevelChipsHtml()}
 </html>`
 }
 
-// --- Provider ---
-
 export class LogsViewProvider implements vscode.WebviewViewProvider {
   private view: vscode.WebviewView | undefined
   private activeAbortController: AbortController | undefined
@@ -211,20 +208,13 @@ export class LogsViewProvider implements vscode.WebviewViewProvider {
       if (config?.app_id) return activeFolder
     }
 
-    // Check which folders have linked configs
-    const configuredUris: vscode.Uri[] = []
+    // Active folder not linked — use the first configured folder
     for (const folder of workspaceFolders) {
       const config = await this.configService.getConfig(folder.uri)
-      if (config?.app_id) configuredUris.push(folder.uri)
+      if (config?.app_id) return folder.uri
     }
 
-    if (configuredUris.length === 0) return activeFolder
-    if (configuredUris.length === 1) return configuredUris[0]
-
-    // Multiple linked folders — let the user pick
-    return pickWorkspaceFolder("Select workspace to stream logs from", (uri) =>
-      configuredUris.some((u) => u.toString() === uri.toString()),
-    )
+    return activeFolder
   }
 
   async streamLogs(options?: { since?: string; tail?: number }): Promise<void> {

src/test/cloud/commands/logs.test.ts

@@ -82,20 +82,6 @@ suite("cloud/commands/logs", () => {
     })
   })
 
-  suite("stopStreaming", () => {
-    test("sends streamingState false", () => {
-      const { provider } = createProvider()
-      const { view, messages } = createWebviewView()
-
-      provider.resolveWebviewView(view)
-      provider.stopStreaming()
-
-      const stateMsg = messages.find((m) => m.type === "streamingState")
-      assert.ok(stateMsg)
-      assert.strictEqual(stateMsg.streaming, false)
-    })
-  })
-
   suite("streamLogs", () => {
     test("shows error when no workspace folder", async () => {
       const { provider } = createProvider(() => null)
@@ -153,7 +139,6 @@ suite("cloud/commands/logs", () => {
       assert.ok(logMessages[0].html.includes("line 1"))
       assert.ok(logMessages[1].html.includes("line 2"))
 
-      // Verify stream ended message
       const statusMessages = messages.filter((m) => m.type === "status")
       assert.ok(statusMessages.some((m) => m.text === "Stream ended."))
     })
@@ -346,7 +331,7 @@ suite("cloud/commands/logs", () => {
       assert.strictEqual(opts.appId, "a2")
     })
 
-    test("shows picker when multiple folders are configured", async () => {
+    test("uses first configured folder when active folder is not linked", async () => {
       Object.defineProperty(vscode.workspace, "workspaceFolders", {
         value: [folder1, folder2, folder3],
         configurable: true,
@@ -358,7 +343,6 @@ suite("cloud/commands/logs", () => {
       const { view } = createWebviewView()
       provider.resolveWebviewView(view)
 
-      // Active folder has no config, workspace2 and workspace3 do
       configService.getConfig.withArgs(workspace1).resolves(null)
       configService.getConfig.withArgs(workspace2).resolves({
         app_id: "a2",
@@ -369,37 +353,23 @@ suite("cloud/commands/logs", () => {
         team_id: "t1",
       })
 
-      // User picks workspace3
-      const quickPickStub = sinon
-        .stub(vscode.window, "showQuickPick")
-        .resolves({ label: "workspace3", uri: workspace3 } as any)
-
-      // After picker, configService.getConfig is called again for the selected folder
-      configService.getConfig.withArgs(workspace3).resolves({
-        app_id: "a3",
-        team_id: "t1",
-      })
-
       async function* emptyStream() {}
       apiService.streamAppLogs.returns(emptyStream())
       sinon.stub(vscode.commands, "executeCommand").resolves()
 
       await provider.streamLogs()
 
-      assert.ok(quickPickStub.calledOnce)
       const opts = apiService.streamAppLogs.firstCall.args[0]
-      assert.strictEqual(opts.appId, "a3")
+      assert.strictEqual(opts.appId, "a2")
     })
 
-    test("does not stream when user cancels picker", async () => {
+    test("uses first configured folder when no active folder", async () => {
       Object.defineProperty(vscode.workspace, "workspaceFolders", {
-        value: [folder1, folder2, folder3],
+        value: [folder1, folder2],
         configurable: true,
       })
 
-      const { provider, configService, apiService } = createProvider(
-        () => workspace1,
-      )
+      const { provider, configService, apiService } = createProvider(() => null)
       const { view } = createWebviewView()
       provider.resolveWebviewView(view)
 
@@ -408,17 +378,15 @@ suite("cloud/commands/logs", () => {
         app_id: "a2",
         team_id: "t1",
       })
-      configService.getConfig.withArgs(workspace3).resolves({
-        app_id: "a3",
-        team_id: "t1",
-      })
 
-      sinon.stub(vscode.window, "showQuickPick").resolves(undefined)
+      async function* emptyStream() {}
+      apiService.streamAppLogs.returns(emptyStream())
       sinon.stub(vscode.commands, "executeCommand").resolves()
 
       await provider.streamLogs()
 
-      assert.ok(!apiService.streamAppLogs.called)
+      const opts = apiService.streamAppLogs.firstCall.args[0]
+      assert.strictEqual(opts.appId, "a2")
     })
 
     test("shows error when no folders have configs in multi-root", async () => {
@@ -453,7 +421,6 @@ suite("cloud/commands/logs", () => {
       provider.resolveWebviewView(view)
       configService.getConfig.resolves({ app_id: "a1", team_id: "t1" })
 
-      // Create a stream that blocks forever
       let abortSignal: AbortSignal | undefined
       async function* blockingStream() {
         abortSignal = apiService.streamAppLogs.firstCall.args[0].signal
@@ -462,17 +429,14 @@ suite("cloud/commands/logs", () => {
           message: "first",
           level: "info",
         }
-        // Would block here, but dispose should abort
         await new Promise(() => {})
       }
       apiService.streamAppLogs.returns(blockingStream())
 
       sinon.stub(vscode.commands, "executeCommand").resolves()
 
-      // Start streaming (don't await - it will block)
       void provider.streamLogs()
 
-      // Give the stream time to start
       await new Promise((r) => setTimeout(r, 10))
 
       provider.dispose()