flightdesk 0.1.5 → 0.1.6

package/main.js

@@ -3249,10 +3249,16 @@ async function checkAuth() {
   const { context } = await launchBrowser(true);
   try {
     const page = await context.newPage();
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded" });
+    page.setDefaultTimeout(3e4);
+    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded", timeout: 3e4 });
+    await page.waitForTimeout(3e3);
     const url = page.url();
-    const isLoggedIn = !url.includes("/login") && !url.includes("/oauth");
+    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();
   }
@@ -3262,15 +3268,20 @@ async function openForLogin() {
     throw new Error("Playwright not installed");
   }
   console.log("Opening browser for Claude login...");
-  console.log("Please log in, then close the browser window.");
   const { context } = await launchBrowser(false);
   try {
     const page = await context.newPage();
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded" });
-    await new Promise((resolve) => {
-      context.on("close", () => resolve());
-    });
-    console.log("Browser closed. Checking login status...");
+    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();
@@ -3278,6 +3289,19 @@ async function openForLogin() {
     }
   }
 }
+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" };
@@ -3305,7 +3329,7 @@ async function monitorSession(sessionUrl, options = {}) {
     if (branchName) {
       result.branchName = branchName;
     }
-    const prButton = await page.$('button:has-text("Create PR"), button:has-text("Create Pull Request"), button:has-text("Open PR")');
+    const prButton = await page.$('button:has-text("Create PR"):not([aria-haspopup])');
     result.hasPrButton = !!prButton;
     if (autoPr && prButton) {
       console.log('   Clicking "Create PR" button...');
@@ -3327,21 +3351,18 @@ async function monitorSession(sessionUrl, options = {}) {
   }
 }
 async function extractBranchName(page) {
-  const selectors = [
-    // Look for git branch indicators
-    '[data-testid="branch-name"]',
-    ".branch-name",
-    // Look for text patterns
-    "text=/\\b(feature|fix|bugfix|hotfix|release|develop|main|master)\\/[\\w-]+/i"
+  const primarySelectors = [
+    "button.group\\/copy span.truncate"
+    // New branch name (verified)
   ];
-  for (const selector of selectors) {
+  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.includes(" ")) {
+          if (cleaned && cleaned.length > 2 && !cleaned.includes(" ")) {
             return cleaned;
           }
         }
@@ -3349,24 +3370,6 @@ async function extractBranchName(page) {
     } catch {
     }
   }
-  try {
-    const pageContent = await page.content();
-    const branchPatterns = [
-      /(?:branch|checkout|switched to)[:\s]+['"]?([a-zA-Z0-9/_-]+)['"]?/i,
-      /(?:On branch|HEAD -> )\s*([a-zA-Z0-9/_-]+)/i,
-      /\[([a-zA-Z0-9/_-]+)\]/
-    ];
-    for (const pattern of branchPatterns) {
-      const match = pageContent.match(pattern);
-      if (match && match[1]) {
-        const branch = match[1].trim();
-        if (branch.length > 2 && branch.length < 100 && !branch.includes("<")) {
-          return branch;
-        }
-      }
-    }
-  } catch {
-  }
   return null;
 }
 async function extractPrUrl(page) {
@@ -3424,15 +3427,13 @@ async function authCommand() {
   }
   console.log("\u274C Not logged in to Claude.\n");
   console.log("Opening browser for login...");
-  console.log("Please log in to your Claude account, then close the browser.\n");
-  await openForLogin();
-  console.log("\nVerifying login...");
-  const nowAuthenticated = await checkAuth();
-  if (nowAuthenticated) {
-    console.log("\u2705 Successfully logged in!");
-    console.log("\nThe watch daemon can now monitor your Claude Code sessions.");
+  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("\u274C Login was not detected.");
+    console.log("\n\u274C Login was not detected.");
     console.log("Please try again with: flightdesk auth");
   }
 }
@@ -3442,6 +3443,7 @@ var FlightDeskAPI = class {
   constructor(org2) {
     this.apiUrl = org2.apiUrl;
     this.apiKey = org2.apiKey;
+    this.organizationId = org2.id;
   }
   async graphql(query, variables) {
     const response = await fetch(`${this.apiUrl}/graphql`, {
@@ -3566,15 +3568,15 @@ var FlightDeskAPI = class {
   // ============================================================================
   async listProjects() {
     const query = `
-      query ListProjects {
-        userProjects {
+      query ListProjects($organizationId: String!) {
+        userProjects(organizationId: $organizationId) {
           id
           name
           githubRepo
         }
       }
     `;
-    const result = await this.graphql(query);
+    const result = await this.graphql(query, { organizationId: this.organizationId });
     return result.userProjects;
   }
   async getProject(projectId) {
@@ -3902,7 +3904,7 @@ Watching... (Ctrl+C to stop)
     clearInterval(intervalId);
     process.exit(0);
   });
-  await new Promise(() => {
+  await new Promise((_resolve) => {
   });
 }
 async function processSessionInfo(api, task2, info) {
@@ -4276,7 +4278,7 @@ async function orgSetDefaultCommand(orgId) {
 var import_child_process = require("child_process");
 async function contextCommand() {
   console.log("\n\u{1F50D} Current Context\n");
-  let repoInfo = {};
+  const repoInfo = {};
   try {
     const remoteUrl = (0, import_child_process.execSync)("git remote get-url origin", {
       encoding: "utf-8",
@@ -4387,52 +4389,60 @@ async function syncCommand() {
 // apps/cli/src/lib/claude-selectors.ts
 var ClaudeSelectors = {
   // ============================================================================
-  // Sidebar - Session List
+  // Sidebar - Session List (Verified 2026-02-23)
   // ============================================================================
   sidebar: {
     /** New task input (textarea in sidebar) */
-    newTaskInput: 'aside textarea[placeholder*="task"]',
+    newTaskInput: 'textarea[placeholder="Ask Claude to write code..."]',
     /** Session list container */
-    sessionList: "aside nav",
+    sessionList: ".flex.flex-col.gap-0\\.5.px-1",
     /** Individual session items - use :has-text() with title */
-    sessionItem: (title) => `aside a:has-text("${title}")`,
-    /** All session links */
-    allSessions: 'aside nav a[href*="/chat/"]',
-    /** Active/selected session */
-    activeSession: 'aside a[aria-current="page"]',
+    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",
+    /** Session by index (0-indexed) */
+    sessionByIndex: (index) => `.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 */
     sessionTitle: "button.text-sm.font-medium.truncate",
-    /** Session menu button (three dots) */
-    sessionMenuButton: 'button[aria-label*="menu"], button:has(svg[class*="dots"])'
+    /** Session archive button (icon-only, no aria-label) */
+    sessionArchiveButton: (title) => `.cursor-pointer:has-text("${title}") button`,
+    /** Search sessions button */
+    searchButton: 'button[aria-label="Search \u2318K"]',
+    /** User profile button */
+    userProfileButton: '[data-testid="code-user-menu-button"]'
   },
   // ============================================================================
-  // Branch Bar (top of chat when branch exists)
+  // Branch Bar (between chat messages and chat input) - Verified 2026-02-23
   // ============================================================================
   branchBar: {
-    /** Container for branch info */
-    container: 'div:has(button:has-text("Branch"))',
+    /** Container for branch bar */
+    container: ".flex.items-center.gap-2.w-full.p-2",
     /** Branch name display - the copyable span */
     branchName: "button.group\\/copy span.truncate",
-    /** Branch selector dropdown trigger */
-    branchSelector: 'button[aria-haspopup="listbox"]:has-text("Branch")',
-    /** Copy branch button */
-    copyBranchButton: "button.group\\/copy"
+    /** Base/target branch dropdown (e.g., "develop") */
+    baseBranchSelector: '.flex.items-center.gap-2.w-full.p-2 button[aria-haspopup="menu"]',
+    /** 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"
   },
   // ============================================================================
-  // Pull Request Controls
+  // Pull Request Controls - Verified 2026-02-23
   // ============================================================================
   pullRequest: {
     /** Create PR button (left half - immediate action) - CAREFUL: clicks immediately! */
     createPrButton: 'button:has-text("Create PR"):not([aria-haspopup])',
-    /** PR dropdown trigger (right half - shows options) */
-    prDropdown: 'button[aria-haspopup="menu"]:has(svg[class*="chevron"])',
+    /** PR dropdown trigger (right half - shows options) - SAFE to click */
+    prDropdown: 'button.rounded-r-md[aria-haspopup="menu"]',
     /** PR status indicator when PR exists */
     prStatus: 'a[href*="/pull/"], a[href*="/merge_requests/"]',
     /** View PR link */
     viewPrLink: 'a:has-text("View PR"), a:has-text("View Pull Request")'
   },
   // ============================================================================
-  // Chat Area
+  // Chat Area - Verified 2026-02-23
   // ============================================================================
   chat: {
     /** Main chat container */
@@ -4443,43 +4453,56 @@ var ClaudeSelectors = {
     userMessages: 'div[data-testid="user-message"]',
     /** Assistant messages */
     assistantMessages: 'div[data-testid="assistant-message"]',
-    /** Chat input (ProseMirror contenteditable) */
-    input: 'div.ProseMirror[contenteditable="true"]',
+    /** Chat input (ProseMirror contenteditable) - NOT a textarea */
+    input: '[aria-label="Enter your turn"]',
+    /** Chat input fallback */
+    inputFallback: 'div.tiptap.ProseMirror[contenteditable="true"]',
+    /** Toggle menu button (+) */
+    toggleMenuButton: 'button[aria-label="Toggle menu"]',
     /** Send button */
-    sendButton: 'button[aria-label*="Send"], button:has(svg[class*="arrow"])',
+    sendButton: 'form.w-full button[aria-label="Submit"]',
     /** Stop button (during generation) */
     stopButton: 'button:has-text("Stop")'
   },
   // ============================================================================
-  // Model Selector
+  // Model Selector - Verified 2026-02-23
   // ============================================================================
   model: {
-    /** Model selector dropdown */
-    selector: 'button[aria-haspopup="listbox"]:has-text("Claude")',
-    /** Model options in dropdown */
-    options: 'div[role="listbox"] div[role="option"]',
+    /** Model selector dropdown (sidebar) */
+    sidebarSelector: 'form:not(.w-full) [data-testid="model-selector-dropdown"]',
+    /** Model selector dropdown (main chat) */
+    chatSelector: 'form.w-full [data-testid="model-selector-dropdown"]',
+    /** Model options in dropdown (role="menuitem") */
+    options: '[role="menuitem"]',
     /** Specific model option */
-    option: (modelName) => `div[role="option"]:has-text("${modelName}")`
+    option: (modelName) => `[role="menuitem"]:has-text("${modelName}")`,
+    /** Quick model selectors */
+    opus: '[role="menuitem"]:has-text("Opus")',
+    sonnet: '[role="menuitem"]:has-text("Sonnet")',
+    haiku: '[role="menuitem"]:has-text("Haiku")'
   },
   // ============================================================================
-  // Mode Toggle (Chat/Code)
+  // Mode Toggle - Verified 2026-02-23
+  // Text alternates between "Auto accept edits" and "Plan mode"
   // ============================================================================
   mode: {
-    /** Mode toggle button - simple button, not dropdown */
-    toggle: 'button:has-text("Code"), button:has-text("Chat")',
-    /** Current mode indicator */
-    currentMode: 'button[aria-pressed="true"]'
+    /** Mode toggle button in sidebar - simple toggle, not dropdown */
+    sidebarToggle: 'form:not(.w-full) button:has-text("Auto accept edits"), form:not(.w-full) button:has-text("Plan mode")',
+    /** Mode toggle button in main chat */
+    chatToggle: 'form.w-full button:has-text("Auto accept edits"), form.w-full button:has-text("Plan mode")'
   },
   // ============================================================================
-  // Repository Connection
+  // Repository Connection - Verified 2026-02-23
   // ============================================================================
   repository: {
-    /** Connect repo button (when no repo connected) */
-    connectButton: 'button:has-text("Connect"), button:has-text("Repository")',
-    /** Repo name when connected */
-    repoName: 'a[href*="github.com"], span:has-text("/")',
-    /** Disconnect/change repo button */
-    changeRepoButton: 'button:has-text("Change"), button:has-text("Disconnect")'
+    /** Repo button in sidebar (shows current repo name) */
+    repoButton: "form:not(.w-full) button.flex.items-center.gap-1.min-w-0.rounded",
+    /** Repo button by name */
+    repoButtonByName: (repoName) => `form:not(.w-full) button:has-text("${repoName}")`,
+    /** Add repository button (hidden until hover) */
+    addRepoButton: 'button[aria-label="Add repository"]',
+    /** Select repository dropdown */
+    selectRepoDropdown: 'form:not(.w-full) button[aria-haspopup="menu"]:has-text("Select repository")'
   },
   // ============================================================================
   // Session Archive
@@ -4515,17 +4538,6 @@ var ClaudeSelectors = {
     listboxOptions: 'div[role="option"]'
   }
 };
-function parseRepoName(text) {
-  const slashMatch = text.match(/^([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_.-]+)$/);
-  if (slashMatch) {
-    return { owner: slashMatch[1], repo: slashMatch[2] };
-  }
-  const urlMatch = text.match(/github\.com\/([a-zA-Z0-9_-]+)\/([a-zA-Z0-9_.-]+)/);
-  if (urlMatch) {
-    return { owner: urlMatch[1], repo: urlMatch[2] };
-  }
-  return null;
-}
 
 // apps/cli/src/commands/import.ts
 var fs3 = __toESM(require("fs"));
@@ -4587,7 +4599,7 @@ Found ${sessions.length} sessions:
   }
   for (const [repoName, repoSessions] of sessionsByRepo) {
     const matchingProject = existingProjects.find(
-      (p) => p.githubRepo?.includes(repoName) || p.name === repoName
+      (p) => p.githubRepo && p.githubRepo.endsWith(`/${repoName}`)
     );
     if (matchingProject) {
       console.log(`\u{1F4C1} ${repoName} \u2192 Project: ${matchingProject.name} (${matchingProject.id.slice(0, 8)})`);
@@ -4626,12 +4638,52 @@ Summary:`);
     console.log("\u{1F4A1} Run without --dry-run to create tasks in FlightDesk");
     return;
   }
-  console.log("To import these sessions:");
-  console.log("");
-  console.log("1. Create projects in FlightDesk for each repository");
-  console.log('2. Use `flightdesk register <project-id> --title "<session-title>" --view-url "<url>"` for each session');
+  const importableSessions = [];
+  for (const [repoName, repoSessions] of sessionsByRepo) {
+    const matchingProject = existingProjects.find(
+      (p) => p.githubRepo && p.githubRepo.endsWith(`/${repoName}`)
+    );
+    if (matchingProject) {
+      for (const session of repoSessions) {
+        importableSessions.push({ session, project: matchingProject });
+      }
+    }
+  }
+  if (importableSessions.length === 0) {
+    console.log("No sessions can be imported (no matching projects).");
+    console.log("Create projects in FlightDesk first for the repositories you want to track.");
+    return;
+  }
+  console.log(`
+\u{1F680} Importing ${importableSessions.length} sessions...
+`);
+  let created = 0;
+  let failed = 0;
+  for (const { session, project } of importableSessions) {
+    try {
+      const task2 = await api.createTask({
+        projectId: project.id,
+        title: session.title,
+        description: `Imported from Claude Code session`
+      });
+      await api.updateTask(task2.id, {
+        branchName: session.branchName,
+        sessionViewUrl: session.url
+      });
+      console.log(`  \u2705 ${session.title.slice(0, 50)}`);
+      created++;
+    } catch (error) {
+      console.error(`  \u274C ${session.title.slice(0, 50)}: ${error.message}`);
+      failed++;
+    }
+  }
   console.log("");
-  console.log("Or use the web interface at your FlightDesk dashboard.");
+  console.log("\u2500".repeat(60));
+  console.log(`
+Import complete:`);
+  console.log(`  Created: ${created}`);
+  console.log(`  Failed: ${failed}`);
+  console.log(`  Skipped (no matching project): ${sessions.length - importableSessions.length}`);
 }
 async function scanClaudeSessions(options) {
   if (!playwright2) {
@@ -4647,36 +4699,59 @@ async function scanClaudeSessions(options) {
   });
   try {
     const page = await context.newPage();
-    page.setDefaultTimeout(3e4);
-    console.log("Navigating to Claude.ai...");
-    await page.goto("https://claude.ai/", { waitUntil: "domcontentloaded" });
-    await page.waitForTimeout(3e3);
+    page.setDefaultTimeout(6e4);
+    console.log("Navigating to Claude Code...");
+    await page.goto("https://claude.ai/code", { waitUntil: "domcontentloaded", timeout: 6e4 });
+    if (options.verbose) {
+      console.log("Waiting for page to load...");
+    }
+    await page.waitForTimeout(5e3);
     const url = page.url();
+    if (options.verbose) {
+      console.log("Current URL:", url);
+    }
     if (url.includes("/login") || url.includes("/oauth")) {
       console.log("\n\u26A0\uFE0F  Not logged into Claude. Run: flightdesk auth\n");
       return [];
     }
     console.log("Logged in. Scanning sessions...");
+    await page.waitForTimeout(3e3);
     const sessions = [];
-    const sessionLinks = await page.$$(ClaudeSelectors.sidebar.allSessions);
+    const sessionItems = await page.$$(ClaudeSelectors.sidebar.allSessions);
     if (options.verbose) {
-      console.log(`Found ${sessionLinks.length} session links in sidebar`);
+      console.log(`Found ${sessionItems.length} session items in sidebar`);
     }
-    const limit = Math.min(sessionLinks.length, options.limit);
+    const limit = Math.min(sessionItems.length, options.limit);
     for (let i = 0; i < limit; i++) {
-      const links = await page.$$(ClaudeSelectors.sidebar.allSessions);
-      if (i >= links.length) break;
-      const link = links[i];
+      const items = await page.$$(ClaudeSelectors.sidebar.allSessions);
+      if (i >= items.length) break;
+      const item = items[i];
       try {
-        const href = await link.getAttribute("href");
-        const title = await link.textContent() || "Untitled";
-        if (!href) continue;
-        const sessionUrl = `https://claude.ai${href}`;
+        const titleElement = await item.$("span.text-text-100");
+        const title = titleElement ? (await titleElement.textContent())?.trim() || "Untitled" : "Untitled";
+        let repoName;
+        try {
+          const repoElement = await item.$("span.text-text-500 span.truncate");
+          if (repoElement) {
+            const repoText = (await repoElement.textContent())?.trim();
+            if (repoText && repoText.length > 0) {
+              repoName = repoText;
+            }
+          }
+        } catch {
+        }
         if (options.verbose) {
-          process.stdout.write(`\r  Scanning ${i + 1}/${limit}: ${title.slice(0, 40)}...`);
+          const repoDisplay = repoName ? ` (${repoName})` : "";
+          process.stdout.write(`\r  Scanning ${i + 1}/${limit}: ${title.slice(0, 35)}${repoDisplay}...`);
         }
-        await link.click();
-        await page.waitForTimeout(1500);
+        try {
+          await page.keyboard.press("Escape");
+          await page.waitForTimeout(300);
+        } catch {
+        }
+        await item.click();
+        await page.waitForTimeout(2e3);
+        const sessionUrl = page.url();
         let branchName;
         try {
           const branchElement = await page.$(ClaudeSelectors.branchBar.branchName);
@@ -4685,20 +4760,6 @@ async function scanClaudeSessions(options) {
           }
         } catch {
         }
-        let repoName;
-        try {
-          const repoElement = await page.$(ClaudeSelectors.repository.repoName);
-          if (repoElement) {
-            const repoText = await repoElement.textContent();
-            if (repoText) {
-              const parsed = parseRepoName(repoText);
-              if (parsed) {
-                repoName = `${parsed.owner}/${parsed.repo}`;
-              }
-            }
-          }
-        } catch {
-        }
         const archived = !!await page.$(ClaudeSelectors.archive.indicator);
         sessions.push({
           url: sessionUrl,