Clean up dialogs for easier testing

Author: savannahostrowski

src/cloud/commands/auth.ts

@@ -1,9 +1,9 @@
-import * as vscode from "vscode"
 import { trackCloudSignOut } from "../../utils/telemetry"
 import type { AuthProvider } from "../types"
+import { ui } from "../ui/dialogs"
 
 export async function signOut(authProvider: AuthProvider): Promise<boolean> {
-  const confirm = await vscode.window.showWarningMessage(
+  const confirm = await ui.showWarningMessage(
     "Sign out of FastAPI Cloud?",
     { modal: true },
     "Sign Out",

src/cloud/commands/deploy.ts

@@ -9,41 +9,47 @@ import type { ApiService } from "../api"
 import { AUTH_PROVIDER_ID } from "../auth"
 import type { ConfigService } from "../config"
 import {
+  type App,
   type Config,
   type Deployment,
   DeploymentStatus,
   failedStatuses,
   statusMessages,
 } from "../types"
-import { createOrLinkApp } from "../ui/pickers"
+import { ui } from "../ui/dialogs"
+import { createNewApp, pickExistingApp, pickTeam } from "../ui/pickers"
 
 // Exclusion patterns - aligned with fastapi-cloud-cli
 // See: https://github.com/fastapilabs/fastapi-cloud-cli/blob/main/src/fastapi_cloud_cli/commands/deploy.py
-const EXCLUDE_DIRS = new Set([
+const EXCLUDE_PARTS = [
   ".venv",
   "__pycache__",
   ".mypy_cache",
   ".pytest_cache",
   ".git",
-])
-const EXCLUDE_FILES = new Set([".gitignore", ".fastapicloudignore"])
+  ".gitignore",
+  ".fastapicloudignore",
+]
 
 // 300 attempts x 2 seconds = 10 minutes maximum
 const MAX_POLL_ATTEMPTS = 300
 const DEPLOYMENT_POLL_INTERVAL_MS = 2000
 
 export function shouldExclude(relativePath: string): boolean {
   const parts = relativePath.split("/")
-  const fileName = parts[parts.length - 1]
 
-  // Check if any path component is in exclude list
-  for (const part of parts) {
-    if (EXCLUDE_DIRS.has(part)) return true
+  if (parts.some((part) => EXCLUDE_PARTS.includes(part))) {
+    return true
+  }
+
+  if (relativePath.endsWith(".pyc")) {
+    return true
   }
 
-  // Check file-level exclusions
-  if (EXCLUDE_FILES.has(fileName)) return true
-  if (fileName.endsWith(".pyc")) return true
+  const fileName = parts[parts.length - 1]
+  if (fileName === ".env" || fileName.startsWith(".env.")) {
+    return true
+  }
 
   return false
 }
@@ -59,7 +65,7 @@ export async function deploy(context: DeployContext): Promise<boolean> {
   const { workspaceRoot, configService, apiService, statusBarItem } = context
 
   if (!workspaceRoot) {
-    vscode.window.showErrorMessage("No workspace folder open")
+    ui.showErrorMessage("No workspace folder open")
     return false
   }
 
@@ -71,7 +77,7 @@ export async function deploy(context: DeployContext): Promise<boolean> {
     silent: true,
   })
   if (!session) {
-    const result = await vscode.window.showErrorMessage(
+    const result = await ui.showErrorMessage(
       "Please sign in to FastAPI Cloud first.",
       "Sign In",
     )
@@ -84,11 +90,38 @@ export async function deploy(context: DeployContext): Promise<boolean> {
   const existingConfig = await configService.getConfig(workspaceRoot)
   const config: Config = existingConfig ?? { app_id: "", team_id: "" }
   if (!config.app_id) {
-    const app = await createOrLinkApp(apiService, workspaceRoot)
+    const team = await pickTeam(apiService)
+    if (!team) return false
+
+    const choice = await ui.showQuickPick(
+      [
+        {
+          label: "$(link) Link Existing App",
+          description: "Connect to an app on FastAPI Cloud",
+          id: "link",
+        },
+        {
+          label: "$(add) Create New App",
+          description: "Create a new app and link it",
+          id: "create",
+        },
+      ],
+      { placeHolder: "Set up FastAPI Cloud" },
+    )
+    if (!choice) return false
+
+    let app: App | null
+    if (choice.id === "create") {
+      const folderName = workspaceRoot.path.split("/").pop() || "my-app"
+      app = await createNewApp(apiService, team, folderName)
+    } else {
+      app = await pickExistingApp(apiService, team)
+    }
     if (!app) return false
-    config.app_id = app.app.id
-    config.team_id = app.team.id
-    config.app_slug = app.app.slug
+
+    config.app_id = app.id
+    config.team_id = team.id
+    config.app_slug = app.slug
     await configService.writeConfig(workspaceRoot, config)
   }
 
@@ -116,7 +149,7 @@ export async function deploy(context: DeployContext): Promise<boolean> {
     )
 
     if (result) {
-      const action = await vscode.window.showInformationMessage(
+      const action = await ui.showInformationMessage(
         "Deployed successfully!",
         "Open App",
         "View Dashboard",

src/cloud/ui/dialogs.ts

@@ -0,0 +1,36 @@
+import * as vscode from "vscode"
+
+/**
+ * UI dialog wrappers to avoid overload complexity in tests.
+ * These wrap VS Code's window methods with simpler signatures that are easier to stub.
+ */
+export const ui = {
+  showErrorMessage: async (
+    message: string,
+    ...items: string[]
+  ): Promise<string | undefined> => {
+    return vscode.window.showErrorMessage(message, ...items)
+  },
+
+  showInformationMessage: async (
+    message: string,
+    ...items: string[]
+  ): Promise<string | undefined> => {
+    return vscode.window.showInformationMessage(message, ...items)
+  },
+
+  showQuickPick: async <T extends vscode.QuickPickItem>(
+    items: readonly T[],
+    options?: vscode.QuickPickOptions,
+  ): Promise<T | undefined> => {
+    return vscode.window.showQuickPick(items, options)
+  },
+
+  showWarningMessage: async (
+    message: string,
+    options: vscode.MessageOptions,
+    ...items: string[]
+  ): Promise<string | undefined> => {
+    return vscode.window.showWarningMessage(message, options, ...items)
+  },
+}

src/cloud/ui/menus.ts

@@ -6,6 +6,7 @@ import {
 import { ApiService } from "../api"
 import { AUTH_PROVIDER_ID } from "../auth"
 import type { WorkspaceState } from "../types"
+import { ui } from "./dialogs"
 
 export interface MenuActions {
   signOut: () => Promise<void>
@@ -41,7 +42,7 @@ export class MenuHandler {
 
     const activeFolder = this.getActiveWorkspaceFolder()
     if (!activeFolder) {
-      vscode.window.showErrorMessage("No workspace folder open")
+      ui.showErrorMessage("No workspace folder open")
       return
     }
 
@@ -74,7 +75,7 @@ export class MenuHandler {
       },
     ]
 
-    const selected = await vscode.window.showQuickPick(items, {
+    const selected = await ui.showQuickPick(items, {
       placeHolder: "Set up FastAPI Cloud",
     })
 
@@ -110,7 +111,7 @@ export class MenuHandler {
       { label: "$(ellipsis) More", id: "more" },
     ]
 
-    const selected = await vscode.window.showQuickPick(items, {
+    const selected = await ui.showQuickPick(items, {
       placeHolder: app.slug,
     })
 
@@ -150,7 +151,7 @@ export class MenuHandler {
       },
     ]
 
-    const selected = await vscode.window.showQuickPick(items, {
+    const selected = await ui.showQuickPick(items, {
       placeHolder: "More options",
     })
 

src/cloud/ui/pickers.ts

@@ -1,6 +1,7 @@
 import * as vscode from "vscode"
 import type { ApiService } from "../api"
 import type { App, Team } from "../types"
+import { ui } from "./dialogs"
 
 /**
  * Shows a quick pick to select a team. Auto-selects if only one team.
@@ -14,12 +15,12 @@ export async function pickTeam(apiService: ApiService): Promise<Team | null> {
       error instanceof Error && error.message === "Not authenticated"
         ? "Please sign in to FastAPI Cloud first."
         : "Failed to fetch teams. Please check your connection."
-    vscode.window.showErrorMessage(message)
+    ui.showErrorMessage(message)
     return null
   }
 
   if (teams.length === 0) {
-    vscode.window.showErrorMessage(
+    ui.showErrorMessage(
       "No teams found. Please create a team on FastAPI Cloud first.",
     )
     return null
@@ -30,7 +31,7 @@ export async function pickTeam(apiService: ApiService): Promise<Team | null> {
   }
 
   const teamItems = teams.map((t) => ({ label: t.name, team: t }))
-  const picked = await vscode.window.showQuickPick(teamItems, {
+  const picked = await ui.showQuickPick(teamItems, {
     placeHolder: "Select a team",
   })
 
@@ -48,14 +49,12 @@ export async function pickExistingApp(
   try {
     apps = await apiService.getApps(team.id)
   } catch {
-    vscode.window.showErrorMessage(
-      "Failed to fetch apps. Please check your connection.",
-    )
+    ui.showErrorMessage("Failed to fetch apps. Please check your connection.")
     return null
   }
 
   if (apps.length === 0) {
-    vscode.window.showErrorMessage(
+    ui.showErrorMessage(
       "No apps found for this team. Please create an app on FastAPI Cloud first.",
     )
     return null
@@ -66,7 +65,7 @@ export async function pickExistingApp(
     description: a.url,
     app: a,
   }))
-  const picked = await vscode.window.showQuickPick(appItems, {
+  const picked = await ui.showQuickPick(appItems, {
     placeHolder: "Select an app",
   })
 
@@ -97,48 +96,12 @@ export async function createNewApp(
 
   try {
     const app = await apiService.createApp(team.id, appName)
-    vscode.window.showInformationMessage(`Created app: ${app.slug}`)
+    ui.showInformationMessage(`Created app: ${app.slug}`)
     return app
   } catch (error) {
-    vscode.window.showErrorMessage(
+    ui.showErrorMessage(
       `Failed to create app: ${error instanceof Error ? error.message : "Unknown error"}`,
     )
     return null
   }
 }
-
-/**
- * Shows picker to create or link an app for deployment.
- */
-export async function createOrLinkApp(
-  apiService: ApiService,
-  workspaceRoot: vscode.Uri,
-): Promise<{ app: App; team: Team } | null> {
-  const team = await pickTeam(apiService)
-  if (!team) return null
-
-  const choice = await vscode.window.showQuickPick([
-    {
-      label: "$(link) Link Existing App",
-      description: "Connect to an app on FastAPI Cloud",
-      id: "link",
-    },
-    {
-      label: "$(add) Create New App",
-      description: "Create a new app and link it",
-      id: "create",
-    },
-  ])
-
-  if (!choice) return null
-
-  let app: App | null = null
-  if (choice.id === "create") {
-    const folderName = workspaceRoot.path.split("/").pop() || "my-app"
-    app = await createNewApp(apiService, team, folderName)
-  } else if (choice.id === "link") {
-    app = await pickExistingApp(apiService, team)
-  }
-  if (!app) return null
-  return { app, team }
-}

src/test/cloud/commands/auth.test.ts

@@ -1,8 +1,8 @@
 import * as assert from "node:assert"
 import sinon from "sinon"
-import * as vscode from "vscode"
 import { signOut } from "../../../cloud/commands/auth"
 import type { AuthProvider } from "../../../cloud/types"
+import { ui } from "../../../cloud/ui/dialogs"
 
 suite("cloud/commands/auth", () => {
   teardown(() => sinon.restore())
@@ -13,9 +13,7 @@ suite("cloud/commands/auth", () => {
         signOut: sinon.stub().resolves(),
       } as unknown as AuthProvider
 
-      sinon
-        .stub(vscode.window, "showWarningMessage")
-        .resolves("Sign Out" as any)
+      sinon.stub(ui, "showWarningMessage").resolves("Sign Out")
 
       const result = await signOut(authProvider)
 
@@ -28,7 +26,7 @@ suite("cloud/commands/auth", () => {
         signOut: sinon.stub().resolves(),
       } as unknown as AuthProvider
 
-      sinon.stub(vscode.window, "showWarningMessage").resolves(undefined as any)
+      sinon.stub(ui, "showWarningMessage").resolves(undefined)
 
       const result = await signOut(authProvider)