flightdesk 0.1.6 → 0.1.9

package/main.js

@@ -3035,416 +3035,147 @@ var {
   Help
 } = import_index.default;
 
-// apps/cli/src/commands/init.ts
-var readline = __toESM(require("readline"));
-
 // apps/cli/src/lib/config.ts
 var fs = __toESM(require("fs"));
 var path = __toESM(require("path"));
 var os = __toESM(require("os"));
 var CONFIG_FILE = path.join(os.homedir(), ".flightdeskrc");
-var DEFAULT_API_URL = "https://flightdesk.dev/api";
+var DEFAULT_API_URL = "https://api.flightdesk.dev";
+var DEV_API_URL = "http://localhost:3000";
+var apiUrlOverride = null;
+function setDevMode(enabled) {
+  if (enabled) {
+    apiUrlOverride = DEV_API_URL;
+  }
+}
+function setApiUrl(url) {
+  apiUrlOverride = url;
+}
+function getApiUrl() {
+  const config = loadConfig();
+  return apiUrlOverride ?? config.apiUrl ?? DEFAULT_API_URL;
+}
 function loadConfig() {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
       const content = fs.readFileSync(CONFIG_FILE, "utf-8");
-      return JSON.parse(content);
+      const parsed = JSON.parse(content);
+      if (parsed.organizations?.[0]?.apiKey) {
+        return migrateOldConfig(parsed);
+      }
+      return {
+        apiUrl: DEFAULT_API_URL,
+        organizations: [],
+        repoMapping: {},
+        ...parsed
+      };
     }
   } catch (error) {
     console.error("Warning: Failed to load config file:", error);
   }
   return {
+    apiUrl: DEFAULT_API_URL,
     organizations: [],
     repoMapping: {}
   };
 }
+function migrateOldConfig(oldConfig) {
+  console.log("\u{1F4E6} Migrating config to new format...");
+  const defaultOrg = oldConfig.defaultOrganization ? oldConfig.organizations.find((o) => o.id === oldConfig.defaultOrganization) : oldConfig.organizations[0];
+  const newConfig = {
+    apiKey: defaultOrg?.apiKey,
+    apiUrl: defaultOrg?.apiUrl || DEFAULT_API_URL,
+    activeOrganization: defaultOrg?.id,
+    organizations: oldConfig.organizations.map((o) => ({
+      id: o.id,
+      name: o.name
+    })),
+    repoMapping: oldConfig.repoMapping || {}
+  };
+  saveConfig(newConfig);
+  console.log("\u2705 Config migrated successfully");
+  return newConfig;
+}
 function saveConfig(config) {
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
 }
-function getDefaultOrganization() {
-  const config = loadConfig();
-  if (config.defaultOrganization) {
-    return config.organizations.find((o) => o.id === config.defaultOrganization) || null;
-  }
-  if (config.organizations.length === 1) {
-    return config.organizations[0];
-  }
-  return null;
-}
-function getOrganizationByRepo(repoFullName) {
+function getActiveOrganization() {
   const config = loadConfig();
-  const orgId = config.repoMapping[repoFullName];
-  if (orgId) {
-    return config.organizations.find((o) => o.id === orgId) || null;
+  if (!config.activeOrganization) {
+    if (config.organizations.length === 1) {
+      return config.organizations[0];
+    }
+    return null;
   }
-  return null;
+  return config.organizations.find((o) => o.id === config.activeOrganization) || null;
 }
-function addOrganization(org2) {
+function setActiveOrganization(orgId) {
   const config = loadConfig();
-  const existingIndex = config.organizations.findIndex((o) => o.id === org2.id);
-  if (existingIndex >= 0) {
-    config.organizations[existingIndex] = org2;
-  } else {
-    config.organizations.push(org2);
-  }
-  if (config.organizations.length === 1) {
-    config.defaultOrganization = org2.id;
+  const org2 = config.organizations.find((o) => o.id === orgId || o.name.toLowerCase() === orgId.toLowerCase());
+  if (!org2) {
+    throw new Error(`Organization not found: ${orgId}`);
   }
+  config.activeOrganization = org2.id;
   saveConfig(config);
 }
-function removeOrganization(orgId) {
+function updateOrganizations(orgs) {
   const config = loadConfig();
-  config.organizations = config.organizations.filter((o) => o.id !== orgId);
-  for (const [repo, mappedOrgId] of Object.entries(config.repoMapping)) {
-    if (mappedOrgId === orgId) {
-      delete config.repoMapping[repo];
-    }
-  }
-  if (config.defaultOrganization === orgId) {
-    config.defaultOrganization = config.organizations[0]?.id;
+  config.organizations = orgs;
+  if (config.activeOrganization && !orgs.find((o) => o.id === config.activeOrganization)) {
+    config.activeOrganization = orgs[0]?.id;
   }
   saveConfig(config);
 }
-function isConfigured() {
-  const config = loadConfig();
-  return config.organizations.length > 0;
-}
-
-// apps/cli/src/commands/init.ts
-function question(rl, prompt) {
-  return new Promise((resolve) => {
-    rl.question(prompt, (answer) => {
-      resolve(answer.trim());
-    });
-  });
-}
-async function initCommand() {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  console.log("\n\u{1F6EB} FlightDesk CLI Setup\n");
-  try {
-    const config = loadConfig();
-    if (config.organizations.length > 0) {
-      console.log("Existing organizations configured:");
-      config.organizations.forEach((org3, i) => {
-        console.log(`  ${i + 1}. ${org3.name} (${org3.id})`);
-      });
-      console.log("");
-      const addMore = await question(rl, "Add another organization? (y/N): ");
-      if (addMore.toLowerCase() !== "y") {
-        console.log("\nConfiguration unchanged.");
-        rl.close();
-        return;
-      }
-    }
-    const orgName = await question(rl, "Organization name: ");
-    if (!orgName) {
-      console.error("Organization name is required");
-      rl.close();
-      return;
-    }
-    const apiKey = await question(rl, "API Key: ");
-    if (!apiKey) {
-      console.error("API Key is required");
-      rl.close();
-      return;
-    }
-    const apiUrlInput = await question(rl, `API URL (${DEFAULT_API_URL}): `);
-    const apiUrl = apiUrlInput || DEFAULT_API_URL;
-    let orgId;
-    const keyMatch = apiKey.match(/^fd_key_([^_]+)_/);
-    if (keyMatch) {
-      orgId = keyMatch[1];
-    } else {
-      orgId = `org_${Date.now()}`;
-    }
-    const org2 = {
-      id: orgId,
-      name: orgName,
-      apiKey,
-      apiUrl
-    };
-    console.log("\nTesting connection...");
-    try {
-      const response = await fetch(`${apiUrl}/graphql`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          "Authorization": `Bearer ${apiKey}`
-        },
-        body: JSON.stringify({
-          query: "{ __typename }"
-        })
-      });
-      if (!response.ok) {
-        throw new Error(`API returned ${response.status}`);
-      }
-      console.log("\u2705 Connection successful!");
-    } catch (error) {
-      console.error(`\u274C Connection failed: ${error}`);
-      const proceed = await question(rl, "Save configuration anyway? (y/N): ");
-      if (proceed.toLowerCase() !== "y") {
-        rl.close();
-        return;
-      }
-    }
-    addOrganization(org2);
-    if (config.organizations.length > 0) {
-      const setDefault = await question(rl, "Set as default organization? (y/N): ");
-      if (setDefault.toLowerCase() === "y") {
-        const updatedConfig = loadConfig();
-        updatedConfig.defaultOrganization = orgId;
-        saveConfig(updatedConfig);
-      }
-    }
-    console.log(`
-\u2705 Configuration saved to ${CONFIG_FILE}`);
-    console.log("\nYou can now use:");
-    console.log('  flightdesk task create -p <project-id> -t "Task title"');
-    console.log("  flightdesk status");
-    console.log("  flightdesk watch");
-  } finally {
-    rl.close();
-  }
-}
-
-// apps/cli/src/lib/session-monitor.ts
-var path2 = __toESM(require("path"));
-var os2 = __toESM(require("os"));
-var fs2 = __toESM(require("fs"));
-var playwright = null;
-var USER_DATA_DIR = path2.join(os2.homedir(), ".flightdesk", "chromium-profile");
-async function isPlaywrightAvailable() {
-  try {
-    playwright = await import("playwright");
-    return true;
-  } catch {
-    return false;
-  }
-}
-function ensureUserDataDir() {
-  if (!fs2.existsSync(USER_DATA_DIR)) {
-    fs2.mkdirSync(USER_DATA_DIR, { recursive: true });
-  }
-}
-async function launchBrowser(headless) {
-  if (!playwright) {
-    throw new Error("Playwright not available");
-  }
-  ensureUserDataDir();
-  const context = await playwright.chromium.launchPersistentContext(USER_DATA_DIR, {
-    headless,
-    viewport: { width: 1280, height: 720 },
-    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-  });
-  const browser = context.browser();
-  return { browser, context };
-}
-async function checkAuth() {
-  if (!await isPlaywrightAvailable()) {
-    throw new Error("Playwright not installed");
-  }
-  const { context } = await launchBrowser(true);
-  try {
-    const page = await context.newPage();
-    page.setDefaultTimeout(3e4);
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 3e4 });
-    await page.waitForTimeout(3e3);
-    const url = page.url();
-    console.log("  Final URL:", url);
-    const isLoggedIn = !url.includes("/login") && !url.includes("/oauth") && !url.includes("accounts.google") && url.includes("claude.ai");
-    return isLoggedIn;
-  } catch (error) {
-    console.error("Auth check failed:", error.message);
-    return false;
-  } finally {
-    await context.close();
-  }
-}
-async function openForLogin() {
-  if (!await isPlaywrightAvailable()) {
-    throw new Error("Playwright not installed");
-  }
-  console.log("Opening browser for Claude login...");
-  const { context } = await launchBrowser(false);
-  try {
-    const page = await context.newPage();
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 6e4 });
-    console.log("\n\u{1F449} Press ENTER here when you have logged in...\n");
-    await waitForEnter();
-    console.log("Verifying login in current session...");
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 3e4 });
-    await page.waitForTimeout(2e3);
-    const url = page.url();
-    console.log("  Final URL:", url);
-    const isLoggedIn = !url.includes("/login") && !url.includes("/oauth") && !url.includes("accounts.google") && url.includes("claude.ai");
-    console.log("Closing browser...");
-    return isLoggedIn;
-  } finally {
-    try {
-      await context.close();
-    } catch {
-    }
-  }
-}
-function waitForEnter() {
-  return new Promise((resolve) => {
-    const readline3 = require("readline");
-    const rl = readline3.createInterface({
-      input: process.stdin,
-      output: process.stdout
-    });
-    rl.question("", () => {
-      rl.close();
-      resolve();
-    });
-  });
-}
-async function monitorSession(sessionUrl, options = {}) {
-  if (!await isPlaywrightAvailable()) {
-    return { status: "error", error: "Playwright not installed" };
-  }
-  const { headless = true, timeout = 3e4, autoPr = false } = options;
-  const { context } = await launchBrowser(headless);
-  try {
-    const page = await context.newPage();
-    page.setDefaultTimeout(timeout);
-    await page.goto(sessionUrl, { waitUntil: "domcontentloaded" });
-    await page.waitForTimeout(2e3);
-    const result = { status: "active" };
-    const archiveIndicator = await page.$("text=This session has been archived");
-    if (archiveIndicator) {
-      return { status: "archived" };
-    }
-    const url = page.url();
-    if (url.includes("/login") || url.includes("/oauth")) {
-      return {
-        status: "error",
-        error: "Not logged in to Claude. Run: flightdesk auth"
-      };
-    }
-    const branchName = await extractBranchName(page);
-    if (branchName) {
-      result.branchName = branchName;
-    }
-    const prButton = await page.$('button:has-text("Create PR"):not([aria-haspopup])');
-    result.hasPrButton = !!prButton;
-    if (autoPr && prButton) {
-      console.log('   Clicking "Create PR" button...');
-      await prButton.click();
-      await page.waitForTimeout(5e3);
-      const prUrl = await extractPrUrl(page);
-      if (prUrl) {
-        result.prUrl = prUrl;
-      }
-    }
-    return result;
-  } catch (error) {
-    return {
-      status: "error",
-      error: error instanceof Error ? error.message : String(error)
-    };
-  } finally {
-    await context.close();
-  }
-}
-async function extractBranchName(page) {
-  const primarySelectors = [
-    "button.group\\/copy span.truncate"
-    // New branch name (verified)
-  ];
-  for (const selector of primarySelectors) {
-    try {
-      const element = await page.$(selector);
-      if (element) {
-        const text = await element.textContent();
-        if (text) {
-          const cleaned = text.trim();
-          if (cleaned && cleaned.length > 2 && !cleaned.includes(" ")) {
-            return cleaned;
-          }
-        }
-      }
-    } catch {
-    }
-  }
-  return null;
-}
-async function extractPrUrl(page) {
-  const selectors = [
-    'a[href*="github.com"][href*="/pull/"]',
-    'a[href*="gitlab.com"][href*="/merge_requests/"]',
-    'a[href*="bitbucket.org"][href*="/pull-requests/"]'
-  ];
-  for (const selector of selectors) {
-    try {
-      const element = await page.$(selector);
-      if (element) {
-        const href = await element.getAttribute("href");
-        if (href) {
-          return href;
-        }
-      }
-    } catch {
-    }
-  }
-  try {
-    const pageContent = await page.content();
-    const prPatterns = [
-      /(https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+)/,
-      /(https:\/\/gitlab\.com\/[^/]+\/[^/]+\/-\/merge_requests\/\d+)/
-    ];
-    for (const pattern of prPatterns) {
-      const match = pageContent.match(pattern);
-      if (match && match[1]) {
-        return match[1];
-      }
-    }
-  } catch {
-  }
-  return null;
-}
-
-// apps/cli/src/commands/auth.ts
-async function authCommand() {
-  console.log("\u{1F510} FlightDesk Authentication\n");
-  const playwrightAvailable = await isPlaywrightAvailable();
-  if (!playwrightAvailable) {
-    console.error("Playwright is not installed.");
-    console.error("Install with: pnpm add playwright && npx playwright install chromium");
+function getOrganizationByRepo(repoFullName) {
+  const config = loadConfig();
+  const orgId = config.repoMapping[repoFullName];
+  if (!orgId) return null;
+  return config.organizations.find((o) => o.id === orgId) || null;
+}
+function isConfigured() {
+  const config = loadConfig();
+  return !!config.apiKey && config.organizations.length > 0;
+}
+function requireConfig() {
+  const config = loadConfig();
+  if (!config.apiKey) {
+    console.error("\u274C FlightDesk is not configured. Run: flightdesk init");
     process.exit(1);
   }
-  console.log(`Profile directory: ${USER_DATA_DIR}
-`);
-  console.log("Checking current authentication status...");
-  const isAuthenticated = await checkAuth();
-  if (isAuthenticated) {
-    console.log("\u2705 Already logged in to Claude!");
-    console.log("\nThe watch daemon will be able to monitor your sessions.");
-    return;
+  if (config.organizations.length === 0) {
+    console.error("\u274C No organizations found. Run: flightdesk init");
+    process.exit(1);
   }
-  console.log("\u274C Not logged in to Claude.\n");
-  console.log("Opening browser for login...");
-  console.log("Please log in to your Claude account.\n");
-  const loginSuccessful = await openForLogin();
-  if (loginSuccessful) {
-    console.log("\n\u2705 Successfully logged in!");
-    console.log("The watch daemon can now monitor your Claude Code sessions.");
-  } else {
-    console.log("\n\u274C Login was not detected.");
-    console.log("Please try again with: flightdesk auth");
+  return config;
+}
+function requireActiveOrg() {
+  const config = requireConfig();
+  const org2 = getActiveOrganization();
+  if (!org2) {
+    console.error("\u274C No active organization. Run: flightdesk org switch <org-name>");
+    console.log("\nAvailable organizations:");
+    config.organizations.forEach((o) => console.log(`  - ${o.name}`));
+    process.exit(1);
   }
+  return { config, org: org2 };
 }
 
+// apps/cli/src/commands/init.ts
+var readline = __toESM(require("readline"));
+
 // apps/cli/src/lib/api.ts
-var FlightDeskAPI = class {
-  constructor(org2) {
-    this.apiUrl = org2.apiUrl;
-    this.apiKey = org2.apiKey;
+var FlightDeskAPI = class _FlightDeskAPI {
+  constructor(config, org2) {
+    this.apiUrl = getApiUrl();
+    this.apiKey = config.apiKey;
     this.organizationId = org2.id;
   }
+  /**
+   * Create an API client from config, using the active organization
+   */
+  static fromConfig(config, org2) {
+    return new _FlightDeskAPI(config, org2);
+  }
   async graphql(query, variables) {
     const response = await fetch(`${this.apiUrl}/graphql`, {
       method: "POST",
@@ -3589,71 +3320,424 @@ var FlightDeskAPI = class {
           tokenTtlHours
         }
       }
-    `;
-    const result = await this.graphql(query, { projectId });
-    return result.userProject;
+    `;
+    const result = await this.graphql(query, { projectId });
+    return result.userProject;
+  }
+  async createProject(input) {
+    const query = `
+      mutation CreateProject($input: UserCreateProjectInput!) {
+        userCreateProject(input: $input) {
+          id
+          name
+          githubRepo
+          organizationId
+          createdAt
+        }
+      }
+    `;
+    const result = await this.graphql(query, { input });
+    return result.userCreateProject;
+  }
+  // ============================================================================
+  // Task Token Operations (for agent authentication)
+  // ============================================================================
+  async createTaskToken(taskId) {
+    const query = `
+      mutation CreateTaskToken($taskId: String!) {
+        userCreateTaskToken(taskId: $taskId) {
+          token
+          expiresAt
+        }
+      }
+    `;
+    const result = await this.graphql(query, { taskId });
+    return result.userCreateTaskToken;
+  }
+  // ============================================================================
+  // Prompt Operations
+  // ============================================================================
+  async getTaskPrompts(taskId) {
+    const query = `
+      query GetTaskPrompts($taskId: String!) {
+        userTaskPrompts(taskId: $taskId) {
+          type
+          content
+          available
+          reason
+        }
+      }
+    `;
+    const result = await this.graphql(query, { taskId });
+    return result.userTaskPrompts;
+  }
+};
+async function fetchUserInfo(apiKey, apiUrl) {
+  const url = apiUrl || "https://api.flightdesk.dev";
+  const response = await fetch(`${url}/graphql`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      "Authorization": `Bearer ${apiKey}`
+    },
+    body: JSON.stringify({
+      query: `{
+        me {
+          id
+          email
+          organizations {
+            organization {
+              id
+              name
+            }
+          }
+        }
+      }`
+    })
+  });
+  if (!response.ok) {
+    throw new Error(`API returned ${response.status}`);
+  }
+  const result = await response.json();
+  if (result.errors?.length) {
+    throw new Error(result.errors.map((e) => e.message).join(", "));
+  }
+  if (!result.data?.me) {
+    throw new Error("Invalid API response");
+  }
+  return result.data.me;
+}
+
+// apps/cli/src/commands/init.ts
+function question(rl, prompt) {
+  return new Promise((resolve) => {
+    rl.question(prompt, (answer) => {
+      resolve(answer.trim());
+    });
+  });
+}
+async function initCommand() {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout
+  });
+  console.log("\n\u{1F6EB} FlightDesk CLI Setup\n");
+  try {
+    if (isConfigured()) {
+      const config = loadConfig();
+      console.log("FlightDesk is already configured.");
+      console.log(`  API Key: ${config.apiKey?.substring(0, 20)}...`);
+      console.log(`  Organizations: ${config.organizations.map((o) => o.name).join(", ")}`);
+      console.log("");
+      const reconfigure = await question(rl, "Reconfigure? (y/N): ");
+      if (reconfigure.toLowerCase() !== "y") {
+        console.log("\nConfiguration unchanged.");
+        console.log('Use "flightdesk org refresh" to update organizations.');
+        console.log('Use "flightdesk org switch <name>" to change active organization.');
+        return;
+      }
+    }
+    console.log("Enter your FlightDesk API key.");
+    console.log("You can find this at https://flightdesk.dev/settings/api-keys\n");
+    const apiKey = await question(rl, "API Key: ");
+    if (!apiKey) {
+      console.error("API Key is required");
+      return;
+    }
+    const apiUrl = getApiUrl();
+    console.log("\nConnecting to FlightDesk...");
+    try {
+      const userInfo = await fetchUserInfo(apiKey, apiUrl);
+      if (userInfo.organizations.length === 0) {
+        console.error("\u274C No organizations found for this user");
+        console.log("Please make sure you are a member of at least one organization.");
+        return;
+      }
+      console.log("\u2705 Connection successful!");
+      console.log(`   Logged in as: ${userInfo.email}`);
+      console.log(`   Organizations: ${userInfo.organizations.length}`);
+      const organizations = userInfo.organizations.map((m) => ({
+        id: m.organization.id,
+        name: m.organization.name
+      }));
+      let activeOrganization;
+      if (organizations.length === 1) {
+        activeOrganization = organizations[0].id;
+        console.log(`
+   Active organization: ${organizations[0].name}`);
+      } else {
+        console.log("\nYour organizations:");
+        organizations.forEach((org2, i) => {
+          console.log(`  ${i + 1}. ${org2.name}`);
+        });
+        const choice = await question(rl, `
+Select active organization (1-${organizations.length}): `);
+        const choiceIndex = parseInt(choice, 10) - 1;
+        if (choiceIndex < 0 || choiceIndex >= organizations.length) {
+          console.error("Invalid selection, using first organization");
+          activeOrganization = organizations[0].id;
+        } else {
+          activeOrganization = organizations[choiceIndex].id;
+        }
+      }
+      const config = loadConfig();
+      config.apiKey = apiKey;
+      config.apiUrl = apiUrl;
+      config.organizations = organizations;
+      config.activeOrganization = activeOrganization;
+      saveConfig(config);
+      console.log(`
+\u2705 Configuration saved to ${CONFIG_FILE}`);
+      console.log("\nYou can now use:");
+      console.log("  flightdesk project list        - List projects");
+      console.log("  flightdesk task create         - Create a task");
+      console.log("  flightdesk org list            - Show organizations");
+      console.log("  flightdesk org switch <name>   - Switch active organization");
+    } catch (error) {
+      console.error(`
+\u274C Connection failed: ${error}`);
+      console.log("\nPlease check:");
+      console.log("  - Your API key is correct");
+      console.log("  - You have network connectivity");
+      console.log("  - The FlightDesk API is reachable");
+    }
+  } finally {
+    rl.close();
+  }
+}
+
+// apps/cli/src/lib/session-monitor.ts
+var path2 = __toESM(require("node:path"));
+var os2 = __toESM(require("node:os"));
+var fs2 = __toESM(require("node:fs"));
+var readline2 = __toESM(require("node:readline"));
+var playwright = null;
+var USER_DATA_DIR = path2.join(os2.homedir(), ".flightdesk", "chromium-profile");
+async function isPlaywrightAvailable() {
+  try {
+    playwright = await import("playwright");
+    return true;
+  } catch {
+    return false;
+  }
+}
+function ensureUserDataDir() {
+  if (!fs2.existsSync(USER_DATA_DIR)) {
+    fs2.mkdirSync(USER_DATA_DIR, { recursive: true });
+  }
+}
+async function launchBrowser(headless) {
+  if (!playwright) {
+    throw new Error("Playwright not available");
+  }
+  ensureUserDataDir();
+  const context = await playwright.chromium.launchPersistentContext(USER_DATA_DIR, {
+    headless,
+    viewport: { width: 1280, height: 720 },
+    userAgent: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
+  });
+  const browser = context.browser();
+  return { browser, context };
+}
+async function checkAuth() {
+  if (!await isPlaywrightAvailable()) {
+    throw new Error("Playwright not installed");
+  }
+  const { context } = await launchBrowser(true);
+  try {
+    const page = await context.newPage();
+    page.setDefaultTimeout(3e4);
+    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 3e4 });
+    await page.waitForTimeout(3e3);
+    const url = page.url();
+    console.log("  Final URL:", url);
+    const isLoggedIn = !url.includes("/login") && !url.includes("/oauth") && !url.includes("accounts.google") && url.includes("claude.ai");
+    return isLoggedIn;
+  } catch (error) {
+    console.error("Auth check failed:", error.message);
+    return false;
+  } finally {
+    await context.close();
+  }
+}
+async function openForLogin() {
+  if (!await isPlaywrightAvailable()) {
+    throw new Error("Playwright not installed");
+  }
+  console.log("Opening browser for Claude login...");
+  const { context } = await launchBrowser(false);
+  try {
+    const page = await context.newPage();
+    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 6e4 });
+    console.log("\n\u{1F449} Press ENTER here when you have logged in...\n");
+    await waitForEnter();
+    console.log("Verifying login in current session...");
+    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 3e4 });
+    await page.waitForTimeout(2e3);
+    const url = page.url();
+    console.log("  Final URL:", url);
+    const isLoggedIn = !url.includes("/login") && !url.includes("/oauth") && !url.includes("accounts.google") && url.includes("claude.ai");
+    console.log("Closing browser...");
+    return isLoggedIn;
+  } finally {
+    try {
+      await context.close();
+    } catch {
+    }
+  }
+}
+function waitForEnter() {
+  return new Promise((resolve) => {
+    const rl = readline2.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    rl.question("", () => {
+      rl.close();
+      resolve();
+    });
+  });
+}
+async function monitorSession(sessionUrl, options = {}) {
+  if (!await isPlaywrightAvailable()) {
+    return { status: "error", error: "Playwright not installed" };
+  }
+  const { headless = true, timeout = 3e4, autoPr = false } = options;
+  const { context } = await launchBrowser(headless);
+  try {
+    const page = await context.newPage();
+    page.setDefaultTimeout(timeout);
+    await page.goto(sessionUrl, { waitUntil: "domcontentloaded" });
+    await page.waitForTimeout(2e3);
+    const result = { status: "active" };
+    const archiveIndicator = await page.$("text=This session has been archived");
+    if (archiveIndicator) {
+      return { status: "archived" };
+    }
+    const url = page.url();
+    if (url.includes("/login") || url.includes("/oauth")) {
+      return {
+        status: "error",
+        error: "Not logged in to Claude. Run: flightdesk auth"
+      };
+    }
+    const branchName = await extractBranchName(page);
+    if (branchName) {
+      result.branchName = branchName;
+    }
+    const prButton = await page.$('button:has-text("Create PR"):not([aria-haspopup])');
+    result.hasPrButton = !!prButton;
+    if (autoPr && prButton) {
+      console.log('   Clicking "Create PR" button...');
+      await prButton.click();
+      await page.waitForTimeout(5e3);
+      const prUrl = await extractPrUrl(page);
+      if (prUrl) {
+        result.prUrl = prUrl;
+      }
+    }
+    return result;
+  } catch (error) {
+    return {
+      status: "error",
+      error: error instanceof Error ? error.message : String(error)
+    };
+  } finally {
+    await context.close();
   }
-  async createProject(input) {
-    const query = `
-      mutation CreateProject($input: UserCreateProjectInput!) {
-        userCreateProject(input: $input) {
-          id
-          name
-          githubRepo
-          organizationId
-          createdAt
+}
+async function extractBranchName(page) {
+  const primarySelectors = [
+    String.raw`button.group\/copy span.truncate`
+    // New branch name (verified)
+  ];
+  for (const selector of primarySelectors) {
+    try {
+      const element = await page.$(selector);
+      if (element) {
+        const text = await element.textContent();
+        if (text) {
+          const cleaned = text.trim();
+          if (cleaned && cleaned.length > 2 && !cleaned.includes(" ")) {
+            return cleaned;
+          }
         }
       }
-    `;
-    const result = await this.graphql(query, { input });
-    return result.userCreateProject;
+    } catch {
+    }
   }
-  // ============================================================================
-  // Task Token Operations (for agent authentication)
-  // ============================================================================
-  async createTaskToken(taskId) {
-    const query = `
-      mutation CreateTaskToken($taskId: String!) {
-        userCreateTaskToken(taskId: $taskId) {
-          token
-          expiresAt
+  return null;
+}
+async function extractPrUrl(page) {
+  const selectors = [
+    'a[href*="github.com"][href*="/pull/"]',
+    'a[href*="gitlab.com"][href*="/merge_requests/"]',
+    'a[href*="bitbucket.org"][href*="/pull-requests/"]'
+  ];
+  for (const selector of selectors) {
+    try {
+      const element = await page.$(selector);
+      if (element) {
+        const href = await element.getAttribute("href");
+        if (href) {
+          return href;
         }
       }
-    `;
-    const result = await this.graphql(query, { taskId });
-    return result.userCreateTaskToken;
+    } catch {
+    }
   }
-  // ============================================================================
-  // Prompt Operations
-  // ============================================================================
-  async getTaskPrompts(taskId) {
-    const query = `
-      query GetTaskPrompts($taskId: String!) {
-        userTaskPrompts(taskId: $taskId) {
-          type
-          content
-          available
-          reason
-        }
+  try {
+    const pageContent = await page.content();
+    const prPatterns = [
+      /(https:\/\/github\.com\/[^/]+\/[^/]+\/pull\/\d+)/,
+      /(https:\/\/gitlab\.com\/[^/]+\/[^/]+\/-\/merge_requests\/\d+)/
+    ];
+    for (const pattern of prPatterns) {
+      const match = pageContent.match(pattern);
+      if (match && match[1]) {
+        return match[1];
       }
-    `;
-    const result = await this.graphql(query, { taskId });
-    return result.userTaskPrompts;
+    }
+  } catch {
   }
-};
+  return null;
+}
 
-// apps/cli/src/commands/register.ts
-async function registerCommand(projectId, taskId, options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
+// apps/cli/src/commands/auth.ts
+async function authCommand() {
+  console.log("\u{1F510} FlightDesk Authentication\n");
+  const playwrightAvailable = await isPlaywrightAvailable();
+  if (!playwrightAvailable) {
+    console.error("Playwright is not installed.");
+    console.error("Install with: pnpm add playwright && npx playwright install chromium");
     process.exit(1);
   }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
+  console.log(`Profile directory: ${USER_DATA_DIR}
+`);
+  console.log("Checking current authentication status...");
+  const isAuthenticated = await checkAuth();
+  if (isAuthenticated) {
+    console.log("\u2705 Already logged in to Claude!");
+    console.log("\nThe watch daemon will be able to monitor your sessions.");
+    return;
+  }
+  console.log("\u274C Not logged in to Claude.\n");
+  console.log("Opening browser for login...");
+  console.log("Please log in to your Claude account.\n");
+  const loginSuccessful = await openForLogin();
+  if (loginSuccessful) {
+    console.log("\n\u2705 Successfully logged in!");
+    console.log("The watch daemon can now monitor your Claude Code sessions.");
+  } else {
+    console.log("\n\u274C Login was not detected.");
+    console.log("Please try again with: flightdesk auth");
   }
-  const api = new FlightDeskAPI(org2);
+}
+
+// apps/cli/src/commands/register.ts
+async function registerCommand(projectId, taskId, options) {
+  const { config, org: org2 } = requireActiveOrg();
+  const api = FlightDeskAPI.fromConfig(config, org2);
   try {
     let viewUrl = options.viewUrl;
     let teleportId = options.teleportId;
@@ -3728,16 +3812,8 @@ function parseClaudeOutput(output) {
 
 // apps/cli/src/commands/status.ts
 async function statusCommand(options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const api = new FlightDeskAPI(org2);
+  const { config, org: org2 } = requireActiveOrg();
+  const api = FlightDeskAPI.fromConfig(config, org2);
   try {
     const tasks = await api.listTasks({ projectId: options.project });
     if (tasks.length === 0) {
@@ -3822,15 +3898,7 @@ function getStatusEmoji(status) {
 
 // apps/cli/src/commands/watch.ts
 async function watchCommand(options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
-  }
+  const { config, org: org2 } = requireActiveOrg();
   const intervalMinutes = parseInt(options.interval, 10);
   if (isNaN(intervalMinutes) || intervalMinutes < 1) {
     console.error("Invalid interval. Must be a positive number of minutes.");
@@ -3856,7 +3924,7 @@ async function watchCommand(options) {
       console.log("");
     }
   }
-  const api = new FlightDeskAPI(org2);
+  const api = FlightDeskAPI.fromConfig(config, org2);
   async function runCheck() {
     const timestamp = (/* @__PURE__ */ new Date()).toLocaleTimeString();
     console.log(`[${timestamp}] Checking tasks...`);
@@ -3950,16 +4018,8 @@ async function processSessionInfo(api, task2, info) {
 
 // apps/cli/src/commands/task.ts
 async function taskCommand(action, options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const api = new FlightDeskAPI(org2);
+  const { config, org: org2 } = requireActiveOrg();
+  const api = FlightDeskAPI.fromConfig(config, org2);
   try {
     switch (action) {
       case "create":
@@ -4095,16 +4155,8 @@ function getStatusEmoji2(status) {
 
 // apps/cli/src/commands/prompt.ts
 async function promptCommand(taskId, options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const api = new FlightDeskAPI(org2);
+  const { config, org: org2 } = requireActiveOrg();
+  const api = FlightDeskAPI.fromConfig(config, org2);
   const validTypes = ["review", "test_plan", "summary", "handoff"];
   if (!validTypes.includes(options.type)) {
     console.error(`Invalid prompt type: ${options.type}`);
@@ -4130,148 +4182,107 @@ async function promptCommand(taskId, options) {
 }
 
 // apps/cli/src/commands/org.ts
-var readline2 = __toESM(require("readline"));
-function question2(rl, prompt) {
-  return new Promise((resolve) => {
-    rl.question(prompt, (answer) => {
-      resolve(answer.trim());
-    });
-  });
-}
 async function orgListCommand() {
+  if (!isConfigured()) {
+    console.log("FlightDesk is not configured.");
+    console.log("Run: flightdesk init");
+    return;
+  }
   const config = loadConfig();
+  const activeOrg = getActiveOrganization();
+  console.log("\n\u{1F4CB} Organizations\n");
   if (config.organizations.length === 0) {
-    console.log("No organizations configured.");
-    console.log("Run: flightdesk init");
+    console.log("No organizations found.");
+    console.log("Run: flightdesk org refresh");
     return;
   }
-  console.log("\n\u{1F4CB} Connected Organizations\n");
   for (const org2 of config.organizations) {
-    const isDefault = org2.id === config.defaultOrganization;
-    const defaultTag = isDefault ? " (default)" : "";
-    console.log(`  ${org2.name}${defaultTag}`);
-    console.log(`     ID: ${org2.id}`);
-    console.log(`     API: ${org2.apiUrl}`);
-    console.log("");
-  }
-  const mappings = Object.entries(config.repoMapping);
-  if (mappings.length > 0) {
-    console.log("\u{1F4C1} Repository Mappings\n");
-    for (const [repo, orgId] of mappings) {
-      const org2 = config.organizations.find((o) => o.id === orgId);
-      console.log(`  ${repo} \u2192 ${org2?.name || orgId}`);
-    }
-    console.log("");
+    const isActive = org2.id === activeOrg?.id;
+    const activeTag = isActive ? " \u2190 active" : "";
+    console.log(`  ${isActive ? "\u25CF" : "\u25CB"} ${org2.name}${activeTag}`);
   }
+  console.log("");
+  console.log("Commands:");
+  console.log("  flightdesk org switch <name>   Switch active organization");
+  console.log("  flightdesk org refresh         Refresh organizations from API");
+  console.log("");
 }
-async function orgAddCommand() {
-  const rl = readline2.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  console.log("\n\u{1F517} Add Organization\n");
-  try {
-    const orgName = await question2(rl, "Organization name: ");
-    if (!orgName) {
-      console.error("Organization name is required");
-      return;
-    }
-    const apiKey = await question2(rl, "API Key: ");
-    if (!apiKey) {
-      console.error("API Key is required");
-      return;
-    }
-    const apiUrlInput = await question2(rl, `API URL (${DEFAULT_API_URL}): `);
-    const apiUrl = apiUrlInput || DEFAULT_API_URL;
-    let orgId;
-    const keyMatch = apiKey.match(/^fd_key_([^_]+)_/);
-    if (keyMatch) {
-      orgId = keyMatch[1];
-    } else {
-      orgId = `org_${Date.now()}`;
-    }
-    const org2 = {
-      id: orgId,
-      name: orgName,
-      apiKey,
-      apiUrl
-    };
-    console.log("\nTesting connection...");
-    try {
-      const response = await fetch(`${apiUrl}/graphql`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          "Authorization": `Bearer ${apiKey}`
-        },
-        body: JSON.stringify({
-          query: "{ __typename }"
-        })
-      });
-      if (!response.ok) {
-        throw new Error(`API returned ${response.status}`);
-      }
-      console.log("\u2705 Connection successful!");
-    } catch (error) {
-      console.error(`\u274C Connection failed: ${error}`);
-      const proceed = await question2(rl, "Save anyway? (y/N): ");
-      if (proceed.toLowerCase() !== "y") {
-        return;
-      }
-    }
-    addOrganization(org2);
-    console.log(`
-\u2705 Added organization: ${orgName}`);
-    const config = loadConfig();
-    if (config.organizations.length > 1) {
-      const setDefault = await question2(rl, "Set as default? (y/N): ");
-      if (setDefault.toLowerCase() === "y") {
-        config.defaultOrganization = orgId;
-        saveConfig(config);
-        console.log("Set as default organization");
-      }
-    }
-  } finally {
-    rl.close();
+async function orgSwitchCommand(orgIdentifier) {
+  if (!isConfigured()) {
+    console.log("FlightDesk is not configured.");
+    console.log("Run: flightdesk init");
+    return;
   }
-}
-async function orgRemoveCommand(orgId) {
   const config = loadConfig();
-  const org2 = config.organizations.find((o) => o.id === orgId || o.name.toLowerCase() === orgId.toLowerCase());
+  const org2 = config.organizations.find(
+    (o) => o.id === orgIdentifier || o.name.toLowerCase() === orgIdentifier.toLowerCase()
+  );
   if (!org2) {
-    console.error(`Organization not found: ${orgId}`);
+    console.error(`Organization not found: ${orgIdentifier}`);
     console.log("\nAvailable organizations:");
     for (const o of config.organizations) {
-      console.log(`  - ${o.name} (${o.id})`);
+      console.log(`  - ${o.name}`);
     }
     process.exit(1);
   }
-  const rl = readline2.createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  try {
-    const confirm = await question2(rl, `Remove "${org2.name}"? (y/N): `);
-    if (confirm.toLowerCase() !== "y") {
-      console.log("Cancelled");
-      return;
-    }
-    removeOrganization(org2.id);
-    console.log(`\u2705 Removed organization: ${org2.name}`);
-  } finally {
-    rl.close();
+  const currentOrg = getActiveOrganization();
+  if (currentOrg?.id === org2.id) {
+    console.log(`Already using organization: ${org2.name}`);
+    return;
   }
+  setActiveOrganization(org2.id);
+  console.log(`\u2705 Switched to organization: ${org2.name}`);
 }
-async function orgSetDefaultCommand(orgId) {
+async function orgRefreshCommand() {
+  if (!isConfigured()) {
+    console.log("FlightDesk is not configured.");
+    console.log("Run: flightdesk init");
+    return;
+  }
   const config = loadConfig();
-  const org2 = config.organizations.find((o) => o.id === orgId || o.name.toLowerCase() === orgId.toLowerCase());
-  if (!org2) {
-    console.error(`Organization not found: ${orgId}`);
-    process.exit(1);
+  if (!config.apiKey) {
+    console.error("No API key configured.");
+    console.log("Run: flightdesk init");
+    return;
+  }
+  console.log("Refreshing organizations...");
+  try {
+    const apiUrl = getApiUrl();
+    const userInfo = await fetchUserInfo(config.apiKey, apiUrl);
+    if (userInfo.organizations.length === 0) {
+      console.log("No organizations found for this user.");
+      return;
+    }
+    const organizations = userInfo.organizations.map((m) => ({
+      id: m.organization.id,
+      name: m.organization.name
+    }));
+    const currentIds = new Set(config.organizations.map((o) => o.id));
+    const newOrgs = organizations.filter((o) => !currentIds.has(o.id));
+    const newIds = new Set(organizations.map((o) => o.id));
+    const removedOrgs = config.organizations.filter((o) => !newIds.has(o.id));
+    updateOrganizations(organizations);
+    console.log(`\u2705 Found ${organizations.length} organization(s)`);
+    if (newOrgs.length > 0) {
+      console.log("\n  New organizations:");
+      for (const org2 of newOrgs) {
+        console.log(`    + ${org2.name}`);
+      }
+    }
+    if (removedOrgs.length > 0) {
+      console.log("\n  Removed organizations:");
+      for (const org2 of removedOrgs) {
+        console.log(`    - ${org2.name}`);
+      }
+    }
+    const activeOrg = getActiveOrganization();
+    if (activeOrg) {
+      console.log(`
+  Active: ${activeOrg.name}`);
+    }
+  } catch (error) {
+    console.error(`\u274C Failed to refresh: ${error}`);
   }
-  config.defaultOrganization = org2.id;
-  saveConfig(config);
-  console.log(`\u2705 Default organization set to: ${org2.name}`);
 }
 
 // apps/cli/src/commands/context.ts
@@ -4307,11 +4318,12 @@ async function contextCommand() {
     console.log("\u{1F4C1} Not in a git repository (or no remote configured)");
     console.log("");
     const config = loadConfig();
+    const activeOrg2 = getActiveOrganization();
     if (config.organizations.length > 0) {
-      console.log("Connected organizations:");
-      for (const org3 of config.organizations) {
-        const isDefault = org3.id === config.defaultOrganization;
-        console.log(`  - ${org3.name}${isDefault ? " (default)" : ""}`);
+      console.log("Organizations:");
+      for (const org2 of config.organizations) {
+        const isActive = org2.id === activeOrg2?.id;
+        console.log(`  ${isActive ? "\u25CF" : "\u25CB"} ${org2.name}${isActive ? " (active)" : ""}`);
       }
     } else {
       console.log("No organizations configured. Run: flightdesk init");
@@ -4321,10 +4333,11 @@ async function contextCommand() {
   console.log(`\u{1F4C1} Repository: ${repoInfo.remote}`);
   console.log(`\u{1F33F} Branch: ${repoInfo.branch}`);
   console.log("");
-  const org2 = getOrganizationByRepo(repoInfo.remote);
-  if (org2) {
-    console.log(`\u{1F3E2} Organization: ${org2.name}`);
-    console.log(`   API: ${org2.apiUrl}`);
+  const mappedOrg = getOrganizationByRepo(repoInfo.remote);
+  const activeOrg = getActiveOrganization();
+  if (mappedOrg) {
+    console.log(`\u{1F3E2} Organization: ${mappedOrg.name}`);
+    console.log(`   API: ${getApiUrl()}`);
     console.log("");
     console.log("This repository is mapped to the above organization.");
     console.log("Commands will use this organization automatically.");
@@ -4333,10 +4346,10 @@ async function contextCommand() {
     console.log("");
     const config = loadConfig();
     if (config.organizations.length > 0) {
-      console.log("Connected organizations:");
-      for (const org3 of config.organizations) {
-        const isDefault = org3.id === config.defaultOrganization;
-        console.log(`  - ${org3.name}${isDefault ? " (default)" : ""}`);
+      console.log("Organizations:");
+      for (const org2 of config.organizations) {
+        const isActive = org2.id === activeOrg?.id;
+        console.log(`  ${isActive ? "\u25CF" : "\u25CB"} ${org2.name}${isActive ? " (active)" : ""}`);
       }
       console.log("");
       console.log("Run: flightdesk sync  to refresh repository mappings");
@@ -4348,7 +4361,7 @@ async function contextCommand() {
 
 // apps/cli/src/commands/sync.ts
 async function syncCommand() {
-  const config = loadConfig();
+  const config = requireConfig();
   if (config.organizations.length === 0) {
     console.error("No organizations configured. Run: flightdesk init");
     process.exit(1);
@@ -4359,7 +4372,7 @@ async function syncCommand() {
   for (const org2 of config.organizations) {
     console.log(`  ${org2.name}...`);
     try {
-      const api = new FlightDeskAPI(org2);
+      const api = FlightDeskAPI.fromConfig(config, org2);
       const projects = await api.listProjects();
       console.log(`    Found ${projects.length} project(s)`);
       for (const project of projects) {
@@ -4395,13 +4408,13 @@ var ClaudeSelectors = {
     /** New task input (textarea in sidebar) */
     newTaskInput: 'textarea[placeholder="Ask Claude to write code..."]',
     /** Session list container */
-    sessionList: ".flex.flex-col.gap-0\\.5.px-1",
+    sessionList: String.raw`.flex.flex-col.gap-0\.5.px-1`,
     /** Individual session items - use :has-text() with title */
     sessionItem: (title) => `.cursor-pointer:has-text("${title}")`,
     /** All session items (div elements with cursor-pointer class) */
-    allSessions: ".flex.flex-col.gap-0\\.5.px-1 .cursor-pointer",
+    allSessions: String.raw`.flex.flex-col.gap-0\.5.px-1 .cursor-pointer`,
     /** Session by index (0-indexed) */
-    sessionByIndex: (index) => `.flex.flex-col.gap-0\\.5.px-1 > div:nth-child(${index + 1}) .cursor-pointer`,
+    sessionByIndex: (index) => String.raw`.flex.flex-col.gap-0\.5.px-1` + ` > div:nth-child(${index + 1}) .cursor-pointer`,
     /** Active/selected session (has bg-bg-300 class) */
     activeSession: ".cursor-pointer.bg-bg-300",
     /** Session title within a session item */
@@ -4426,7 +4439,7 @@ var ClaudeSelectors = {
     /** Copy branch button (click to copy branch name) */
     copyBranchButton: "button.group\\/copy",
     /** Diff stats button (+N -M) */
-    diffStatsButton: ".flex.items-center.gap-2.w-full.p-2 button.border-0\\.5"
+    diffStatsButton: String.raw`.flex.items-center.gap-2.w-full.p-2 button.border-0\.5`
   },
   // ============================================================================
   // Pull Request Controls - Verified 2026-02-23
@@ -4543,15 +4556,7 @@ var ClaudeSelectors = {
 var fs3 = __toESM(require("fs"));
 var playwright2 = null;
 async function importCommand(options) {
-  if (!isConfigured()) {
-    console.error("FlightDesk is not configured. Run: flightdesk init");
-    process.exit(1);
-  }
-  const org2 = getDefaultOrganization();
-  if (!org2) {
-    console.error("No organization configured. Run: flightdesk init");
-    process.exit(1);
-  }
+  const { config, org: org2 } = requireActiveOrg();
   if (!await isPlaywrightAvailable()) {
     console.error("Playwright is required for import. Install it with:");
     console.error("  npm install -g playwright");
@@ -4559,7 +4564,7 @@ async function importCommand(options) {
     process.exit(1);
   }
   playwright2 = await import("playwright");
-  const api = new FlightDeskAPI(org2);
+  const api = FlightDeskAPI.fromConfig(config, org2);
   console.log("\n\u{1F50D} FlightDesk Import - Scanning Claude Sessions\n");
   if (options.dryRun) {
     console.log("\u{1F4CB} DRY RUN - No changes will be made\n");
@@ -4599,7 +4604,7 @@ Found ${sessions.length} sessions:
   }
   for (const [repoName, repoSessions] of sessionsByRepo) {
     const matchingProject = existingProjects.find(
-      (p) => p.githubRepo && p.githubRepo.endsWith(`/${repoName}`)
+      (p) => p.githubRepo?.endsWith(`/${repoName}`)
     );
     if (matchingProject) {
       console.log(`\u{1F4C1} ${repoName} \u2192 Project: ${matchingProject.name} (${matchingProject.id.slice(0, 8)})`);
@@ -4641,7 +4646,7 @@ Summary:`);
   const importableSessions = [];
   for (const [repoName, repoSessions] of sessionsByRepo) {
     const matchingProject = existingProjects.find(
-      (p) => p.githubRepo && p.githubRepo.endsWith(`/${repoName}`)
+      (p) => p.githubRepo?.endsWith(`/${repoName}`)
     );
     if (matchingProject) {
       for (const session of repoSessions) {
@@ -4786,7 +4791,18 @@ async function scanClaudeSessions(options) {
 
 // apps/cli/src/main.ts
 var program2 = new Command();
-program2.name("flightdesk").description("FlightDesk CLI - AI task management for Claude Code sessions").version("0.1.5");
+program2.name("flightdesk").description("FlightDesk CLI - AI task management for Claude Code sessions").version("0.1.9").option("--dev", "Use local development API (localhost:3000)").option("--api <url>", "Use custom API URL");
+program2.hook("preAction", () => {
+  const opts = program2.opts();
+  if (opts.api) {
+    setApiUrl(opts.api);
+    console.log(`\u{1F527} Using custom API: ${opts.api}
+`);
+  } else if (opts.dev) {
+    setDevMode(true);
+    console.log("\u{1F527} Development mode: using http://localhost:3000\n");
+  }
+});
 program2.command("init").description("Configure FlightDesk CLI with your API credentials").action(initCommand);
 program2.command("auth").description("Log in to Claude for session monitoring").action(authCommand);
 program2.command("register <project-id> [task-id]").description("Register a Claude Code session with a FlightDesk task").option("--view-url <url>", "Claude Code session view URL").option("--teleport-id <id>", "Claude Code teleport ID").option("--title <title>", "Task title (creates new task if task-id not provided)").option("--description <description>", "Task description").action(registerCommand);
@@ -4800,10 +4816,9 @@ program2.command("import").description("Scan Claude.ai for existing sessions and
 program2.command("status").description("Show status of all active tasks").option("-p, --project <id>", "Filter by project").action(statusCommand);
 program2.command("prompt <task-id>").description("Get a prompt for a task (ready to paste into Claude)").option("--type <type>", "Prompt type: review, test_plan, summary, handoff", "review").action(promptCommand);
 var org = program2.command("org").description("Organization management");
-org.command("list").description("List connected organizations").action(orgListCommand);
-org.command("add").description("Connect to a new organization").action(orgAddCommand);
-org.command("remove <org-id>").description("Disconnect from an organization").action(orgRemoveCommand);
-org.command("default <org-id>").description("Set default organization").action(orgSetDefaultCommand);
+org.command("list").description("List your organizations").action(orgListCommand);
+org.command("switch <name>").description("Switch active organization").action(orgSwitchCommand);
+org.command("refresh").description("Refresh organizations from API").action(orgRefreshCommand);
 program2.command("context").description("Show current repository context and mapped organization").action(contextCommand);
 program2.command("sync").description("Refresh project-to-repository mappings from all organizations").action(syncCommand);
 program2.command("mount <task-id>").description("Mount preview environment filesystem via SSHFS").option("--vscode", "Open in VS Code after mounting").action((taskId) => {