flightdesk 0.2.0 → 0.2.2

package/main.js

@@ -3579,6 +3579,86 @@ 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");
+var STORAGE_STATE_FILE = path2.join(os2.homedir(), ".flightdesk", "auth-state.json");
+var PersistentBrowser = class {
+  constructor(headless = true) {
+    this.browser = null;
+    this.context = null;
+    this.page = null;
+    this.headless = headless;
+  }
+  /**
+   * Initialize the browser context (if not already initialized)
+   */
+  async init() {
+    if (this.context) return;
+    if (!await isPlaywrightAvailable()) {
+      throw new Error("Playwright not available");
+    }
+    ensureUserDataDir();
+    this.browser = await playwright.chromium.launch({
+      headless: this.headless
+    });
+    const hasAuthState = fs2.existsSync(STORAGE_STATE_FILE);
+    const contextOptions = {
+      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"
+    };
+    if (hasAuthState) {
+      contextOptions.storageState = STORAGE_STATE_FILE;
+    }
+    this.context = await this.browser.newContext(contextOptions);
+    this.page = await this.context.newPage();
+    this.page.setDefaultTimeout(3e4);
+  }
+  /**
+   * Check if user is logged into Claude
+   */
+  async checkAuth() {
+    await this.init();
+    try {
+      await this.page.goto("https://claude.ai/", { waitUntil: "networkidle", timeout: 3e4 });
+      await this.page.waitForTimeout(2e3);
+      const url = this.page.url();
+      console.log("  Final URL:", url);
+      return !url.includes("/login") && !url.includes("/oauth") && !url.includes("accounts.google") && url.includes("claude.ai");
+    } catch (error) {
+      console.error("Auth check failed:", error.message);
+      return false;
+    }
+  }
+  /**
+   * Monitor a Claude Code session URL
+   * Uses shared scrapeSession helper for consistent behavior with one-shot mode.
+   */
+  async monitorSession(sessionUrl, options = {}) {
+    await this.init();
+    if (!this.page) {
+      return { status: "error", error: "Browser page not initialized" };
+    }
+    return scrapeSession(this.page, sessionUrl, options);
+  }
+  /**
+   * Close the browser context and browser
+   */
+  async close() {
+    if (this.context) {
+      try {
+        await this.context.close();
+      } catch {
+      }
+      this.context = null;
+      this.page = null;
+    }
+    if (this.browser) {
+      try {
+        await this.browser.close();
+      } catch {
+      }
+      this.browser = null;
+    }
+  }
+};
 async function isPlaywrightAvailable() {
   try {
     playwright = await import("playwright");
@@ -3589,7 +3669,23 @@ async function isPlaywrightAvailable() {
 }
 function ensureUserDataDir() {
   if (!fs2.existsSync(USER_DATA_DIR)) {
-    fs2.mkdirSync(USER_DATA_DIR, { recursive: true });
+    fs2.mkdirSync(USER_DATA_DIR, { recursive: true, mode: 448 });
+  }
+}
+async function ensureStorageDir() {
+  const storageDir = path2.dirname(STORAGE_STATE_FILE);
+  try {
+    await fs2.promises.mkdir(storageDir, { recursive: true, mode: 448 });
+  } catch (err) {
+    if (err?.code !== "EEXIST") {
+      throw err;
+    }
+  }
+}
+async function setStorageFilePermissions() {
+  try {
+    await fs2.promises.chmod(STORAGE_STATE_FILE, 384);
+  } catch {
   }
 }
 async function launchBrowser(headless) {
@@ -3597,24 +3693,28 @@ async function launchBrowser(headless) {
     throw new Error("Playwright not available");
   }
   ensureUserDataDir();
-  const context = await playwright.chromium.launchPersistentContext(USER_DATA_DIR, {
-    headless,
+  const browser = await playwright.chromium.launch({ headless });
+  const hasAuthState = fs2.existsSync(STORAGE_STATE_FILE);
+  const contextOptions = {
     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();
+  };
+  if (hasAuthState) {
+    contextOptions.storageState = STORAGE_STATE_FILE;
+  }
+  const context = await browser.newContext(contextOptions);
   return { browser, context };
 }
 async function checkAuth() {
   if (!await isPlaywrightAvailable()) {
     throw new Error("Playwright not installed");
   }
-  const { context } = await launchBrowser(true);
+  const { browser, 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);
+    await page.goto("https://claude.ai/", { waitUntil: "networkidle", 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");
@@ -3624,6 +3724,7 @@ async function checkAuth() {
     return false;
   } finally {
     await context.close();
+    await browser.close();
   }
 }
 async function openForLogin() {
@@ -3643,6 +3744,13 @@ async function openForLogin() {
     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");
+    if (isLoggedIn) {
+      await ensureStorageDir();
+      console.log("Saving session state...");
+      await context.storageState({ path: STORAGE_STATE_FILE });
+      await setStorageFilePermissions();
+      console.log(`  Saved to: ${STORAGE_STATE_FILE}`);
+    }
     console.log("Closing browser...");
     return isLoggedIn;
   } finally {
@@ -3664,17 +3772,15 @@ function waitForEnter() {
     });
   });
 }
-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);
+async function scrapeSession(page, sessionUrl, options = {}) {
+  const { timeout = 3e4, autoPr = false } = options;
   try {
-    const page = await context.newPage();
     page.setDefaultTimeout(timeout);
-    await page.goto(sessionUrl, { waitUntil: "domcontentloaded" });
-    await page.waitForTimeout(2e3);
+    await page.goto(sessionUrl, { waitUntil: "networkidle" });
+    await page.waitForSelector('[data-testid="conversation-turn"], .code-spinner-animate, button:has-text("Create PR")', {
+      timeout: 1e4
+    }).catch(() => {
+    });
     const result = { status: "active" };
     const archiveIndicator = await page.$("text=This session has been archived");
     if (archiveIndicator) {
@@ -3687,15 +3793,18 @@ async function monitorSession(sessionUrl, options = {}) {
         error: "Not logged in to Claude. Run: flightdesk auth"
       };
     }
+    const isActive = await detectActiveSpinner(page);
+    result.isActive = isActive;
     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) {
+    const createPrButton = await page.$('button:has-text("Create PR"):not([aria-haspopup])');
+    const viewPrButton = await page.$('button:has-text("View PR")');
+    result.hasPrButton = !!createPrButton && !viewPrButton;
+    if (autoPr && createPrButton && !viewPrButton) {
       console.log('   Clicking "Create PR" button...');
-      await prButton.click();
+      await createPrButton.click();
       await page.waitForTimeout(5e3);
       const prUrl = await extractPrUrl(page);
       if (prUrl) {
@@ -3708,29 +3817,54 @@ async function monitorSession(sessionUrl, options = {}) {
       status: "error",
       error: error instanceof Error ? error.message : String(error)
     };
-  } finally {
-    await context.close();
+  }
+}
+function isValidBranchName(text) {
+  if (!text) return false;
+  const cleaned = text.trim();
+  return cleaned.length > 2 && !cleaned.includes(" ");
+}
+function matchesBranchPattern(text) {
+  return /^[a-zA-Z0-9_-]+\/[a-zA-Z0-9_-]+/.test(text) && !text.includes(" ");
+}
+async function tryExtractFromElement(page, selector) {
+  try {
+    const element = await page.$(selector);
+    if (!element) return null;
+    const text = await element.textContent();
+    const cleaned = text?.trim() ?? null;
+    return isValidBranchName(cleaned) ? cleaned : null;
+  } catch {
+    return null;
   }
 }
 async function extractBranchName(page) {
+  if (!page) return null;
   const primarySelectors = [
-    String.raw`button.group\/copy span.truncate`
+    String.raw`button.group\/copy span.truncate`,
     // New branch name (verified)
+    'button[class*="group/copy"] span.truncate',
+    // Alternative escaping
+    String.raw`button[class*="group\/copy"] span.truncate`
+    // CSS escape
   ];
   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 tryExtractFromElement(page, selector);
+    if (result) return result;
+  }
+  return await tryExtractBranchFromSpans(page);
+}
+async function tryExtractBranchFromSpans(page) {
+  try {
+    const allSpans = await page.$$("span.truncate");
+    for (const span of allSpans) {
+      const text = await span.textContent();
+      const cleaned = text?.trim();
+      if (cleaned && matchesBranchPattern(cleaned)) {
+        return cleaned;
       }
-    } catch {
     }
+  } catch {
   }
   return null;
 }
@@ -3768,6 +3902,36 @@ async function extractPrUrl(page) {
   }
   return null;
 }
+async function detectActiveSpinner(page) {
+  try {
+    const spinner = await page.$(".code-spinner-animate");
+    if (spinner) {
+      return true;
+    }
+    const spinnerByContent = await page.$('span:has-text("\u273D")');
+    if (spinnerByContent) {
+      const hasAnimation = await spinnerByContent.evaluate((el) => {
+        let current = el;
+        while (current) {
+          const classList = current.classList;
+          if (classList?.contains("code-spinner-animate")) {
+            return true;
+          }
+          const style = globalThis.getComputedStyle(current);
+          if (style.animationName && style.animationName !== "none") {
+            return true;
+          }
+          current = current.parentElement;
+        }
+        return false;
+      });
+      return hasAnimation;
+    }
+    return false;
+  } catch {
+    return false;
+  }
+}
 
 // apps/cli/src/commands/auth.ts
 async function authCommand() {
@@ -3800,11 +3964,54 @@ async function authCommand() {
   }
 }
 
+// apps/cli/src/lib/git.ts
+var import_node_child_process = require("node:child_process");
+function detectGitRepo() {
+  try {
+    const remoteUrl = (0, import_node_child_process.execSync)("git remote get-url origin", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    const repoFullName = parseGitRemoteUrl(remoteUrl);
+    if (!repoFullName) {
+      return null;
+    }
+    const branch = (0, import_node_child_process.execSync)("git rev-parse --abbrev-ref HEAD", {
+      encoding: "utf-8",
+      stdio: ["pipe", "pipe", "pipe"]
+    }).trim();
+    return {
+      remote: repoFullName,
+      branch,
+      remoteUrl
+    };
+  } catch {
+    return null;
+  }
+}
+function parseGitRemoteUrl(remoteUrl) {
+  const sshPattern = /git@github\.com:([^/]+\/[^/]+?)(?:\.git)?$/;
+  const sshMatch = sshPattern.exec(remoteUrl);
+  if (sshMatch) {
+    return sshMatch[1];
+  }
+  const httpsPattern = /https:\/\/github\.com\/([^/]+\/[^/]+?)(?:\.git)?$/;
+  const httpsMatch = httpsPattern.exec(remoteUrl);
+  if (httpsMatch) {
+    return httpsMatch[1];
+  }
+  return null;
+}
+
 // apps/cli/src/commands/register.ts
-async function registerCommand(projectId, taskId, options) {
+async function registerCommand(taskId, options) {
   const { config, org: org2 } = requireActiveOrg();
   const api = FlightDeskAPI.fromConfig(config, org2);
   try {
+    let projectId = options.project;
+    if (!projectId) {
+      projectId = await autoDetectProject(api, org2);
+    }
     let viewUrl = options.viewUrl;
     let teleportId = options.teleportId;
     if (!process.stdin.isTTY) {
@@ -3875,6 +4082,53 @@ function parseClaudeOutput(output) {
   }
   return result;
 }
+async function autoDetectProject(api, activeOrg) {
+  const repoInfo = detectGitRepo();
+  if (!repoInfo) {
+    console.error("\u274C Not in a git repository. Please provide a project ID.");
+    console.error("   Usage: flightdesk register --project <project-id> [task-id]");
+    process.exit(1);
+  }
+  console.log(`\u{1F50D} Detecting project from repository: ${repoInfo.remote}`);
+  const mappedOrg = getOrganizationByRepo(repoInfo.remote);
+  if (!mappedOrg) {
+    console.error(`\u274C Repository "${repoInfo.remote}" is not mapped to any organization.`);
+    console.error("   Run: flightdesk sync");
+    console.error("   Or provide a project ID: flightdesk register --project <project-id> [task-id]");
+    process.exit(1);
+  }
+  if (mappedOrg.id !== activeOrg.id) {
+    console.error(`\u274C Repository "${repoInfo.remote}" is mapped to organization "${mappedOrg.name}",`);
+    console.error(`   but your active organization is "${activeOrg.name}".`);
+    console.error("   Switch with: flightdesk org switch " + mappedOrg.name);
+    console.error("   Or provide a project ID: flightdesk register --project <project-id> [task-id]");
+    process.exit(1);
+  }
+  const projects = await api.listProjects();
+  const matchingProjects = projects.filter(
+    (p) => p.githubRepo?.toLowerCase() === repoInfo.remote.toLowerCase()
+  );
+  if (matchingProjects.length === 0) {
+    console.error(`\u274C No FlightDesk project found for repository "${repoInfo.remote}".`);
+    console.error("   Available projects in this organization:");
+    for (const p of projects) {
+      console.error(`     - ${p.name} (${p.githubRepo || "no repo"}) [${p.id}]`);
+    }
+    console.error("\n   Create a project or provide a project ID explicitly.");
+    process.exit(1);
+  }
+  if (matchingProjects.length > 1) {
+    console.error(`\u274C Multiple projects found for repository "${repoInfo.remote}":`);
+    for (const p of matchingProjects) {
+      console.error(`     - ${p.name} [${p.id}]`);
+    }
+    console.error("\n   Please specify the project ID explicitly.");
+    process.exit(1);
+  }
+  const project2 = matchingProjects[0];
+  console.log(`\u2705 Found project: ${project2.name} (${project2.id})`);
+  return project2.id;
+}
 
 // apps/cli/src/commands/status.ts
 async function statusCommand(options) {
@@ -3976,17 +4230,23 @@ async function watchCommand(options) {
   console.log(`   Auto-PR: ${options.autoPr ? "enabled" : "disabled"}`);
   console.log("");
   const playwrightAvailable = await isPlaywrightAvailable();
+  let browser = null;
   if (!playwrightAvailable) {
     console.log("\u26A0\uFE0F  Playwright not installed. Session monitoring disabled.");
     console.log("   Install with: pnpm add playwright && npx playwright install chromium");
     console.log("");
   } else {
-    const isAuthenticated = await checkAuth();
+    browser = new PersistentBrowser(options.headless !== false);
+    console.log("Checking Claude authentication...");
+    const isAuthenticated = await browser.checkAuth();
     if (!isAuthenticated) {
       console.log("\u26A0\uFE0F  Not logged into Claude. Run: flightdesk auth");
       console.log("");
+      await browser.close();
+      browser = null;
     } else {
       console.log("\u2705 Playwright ready, Claude authenticated");
+      console.log("   (Browser session kept alive for monitoring)");
       console.log("");
     }
   }
@@ -4021,38 +4281,49 @@ async function watchCommand(options) {
         if (reconciled) {
           continue;
         }
-        if (task2.sessionViewUrl && playwrightAvailable) {
+        if (task2.sessionViewUrl && browser) {
           console.log(`      Checking session...`);
-          const sessionInfo = await monitorSession(task2.sessionViewUrl, {
-            headless: options.headless !== false,
+          const sessionInfo = await browser.monitorSession(task2.sessionViewUrl, {
             autoPr: options.autoPr && !task2.prUrl
             // Only auto-PR if no PR exists
           });
           await processSessionInfo(api, task2, sessionInfo);
         } else if (!task2.sessionViewUrl) {
           console.log("      No session URL registered");
+        } else if (!browser) {
+          console.log("      Browser not available - cannot monitor session");
         }
       }
     } catch (error) {
       console.error(`   Error: ${error}`);
     }
   }
-  await runCheck();
-  if (options.once) {
-    console.log("\nDone (--once flag specified)");
-    return;
-  }
-  console.log(`
+  try {
+    await runCheck();
+    if (options.once) {
+      console.log("\nDone (--once flag specified)");
+      return;
+    }
+    console.log(`
 Watching... (Ctrl+C to stop)
 `);
-  const intervalId = setInterval(runCheck, intervalMinutes * 60 * 1e3);
-  process.on("SIGINT", () => {
-    console.log("\nShutting down...");
-    clearInterval(intervalId);
-    process.exit(0);
-  });
-  await new Promise((_resolve) => {
-  });
+    const intervalId = setInterval(runCheck, intervalMinutes * 60 * 1e3);
+    process.on("SIGINT", async () => {
+      console.log("\nShutting down...");
+      clearInterval(intervalId);
+      if (browser) {
+        console.log("Closing browser...");
+        await browser.close();
+      }
+      process.exit(0);
+    });
+    await new Promise((_resolve) => {
+    });
+  } finally {
+    if (browser) {
+      await browser.close();
+    }
+  }
 }
 async function reconcileTaskStatus(api, task2) {
   let expectedStatus = null;
@@ -4096,7 +4367,25 @@ async function processSessionInfo(api, task2, info) {
     console.log("      \u{1F4E6} Session archived");
     return;
   }
-  const updates = {};
+  let activityIcon;
+  let activityLabel;
+  if (info.isActive === true) {
+    activityIcon = "\u26A1";
+    activityLabel = "Claude is working";
+  } else if (info.isActive === false) {
+    activityIcon = "\u{1F4A4}";
+    activityLabel = "Waiting for input";
+  } else {
+    activityIcon = "\u2754";
+    activityLabel = "Activity unknown";
+  }
+  console.log(`      ${activityIcon} ${activityLabel}`);
+  const updates = {
+    // Update session activity state and timestamp
+    // Preserve null when activity detection fails (info.isActive is undefined)
+    sessionActive: info.isActive ?? null,
+    sessionCheckedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
   if (info.branchName && info.branchName !== task2.branchName) {
     console.log(`      \u{1F33F} Branch detected: ${info.branchName}`);
     updates.branchName = info.branchName;
@@ -4116,15 +4405,14 @@ async function processSessionInfo(api, task2, info) {
   if (info.hasPrButton && !info.prUrl && !task2.prUrl) {
     console.log('      \u{1F4DD} "Create PR" button available');
   }
-  if (Object.keys(updates).length > 0) {
-    try {
-      await api.updateTask(task2.id, updates);
+  const hasNonActivityUpdates = Object.keys(updates).some((k) => !["sessionActive", "sessionCheckedAt"].includes(k));
+  try {
+    await api.updateTask(task2.id, updates);
+    if (hasNonActivityUpdates) {
       console.log("      \u2705 Task updated");
-    } catch (error) {
-      console.log(`      \u274C Failed to update task: ${error}`);
     }
-  } else {
-    console.log("      No changes detected");
+  } catch (error) {
+    console.log(`      \u274C Failed to update task: ${error}`);
   }
 }
 
@@ -4941,10 +5229,27 @@ ${projects.length} project(s)`);
 }
 
 // apps/cli/src/commands/preview.ts
-var import_child_process2 = require("child_process");
-var path3 = __toESM(require("path"));
-var os3 = __toESM(require("os"));
-var fs4 = __toESM(require("fs"));
+var import_node_child_process2 = require("node:child_process");
+var path3 = __toESM(require("node:path"));
+var os3 = __toESM(require("node:os"));
+var fs4 = __toESM(require("node:fs"));
+function isValidContainerId(id) {
+  return /^[a-fA-F0-9]+$/.test(id) && id.length >= 12 && id.length <= 64;
+}
+function validateSSHParams(instance) {
+  if (instance.containerId && !isValidContainerId(instance.containerId)) {
+    throw new Error(`Invalid container ID format: ${instance.containerId}`);
+  }
+  if (!/^[a-zA-Z0-9_-]+$/.test(instance.sshUser)) {
+    throw new Error(`Invalid SSH user format: ${instance.sshUser}`);
+  }
+  if (!/^[a-zA-Z0-9.-]+$/.test(instance.sshHost)) {
+    throw new Error(`Invalid SSH host format: ${instance.sshHost}`);
+  }
+  if (!Number.isInteger(instance.sshPort) || instance.sshPort < 1 || instance.sshPort > 65535) {
+    throw new Error(`Invalid SSH port: ${instance.sshPort}`);
+  }
+}
 async function previewCommand(action, options) {
   const { config, org: org2 } = requireActiveOrg();
   const api = FlightDeskAPI.fromConfig(config, org2);
@@ -5028,8 +5333,9 @@ async function handleLogs(api, options) {
 `);
     console.log(`(Press Ctrl+C to stop)
 `);
+    validateSSHParams(instance);
     const sshCommand = `docker logs -f ${instance.containerId}`;
-    const ssh = (0, import_child_process2.spawn)("ssh", [
+    const ssh = (0, import_node_child_process2.spawn)("ssh", [
       "-o",
       "StrictHostKeyChecking=no",
       "-o",
@@ -5069,7 +5375,7 @@ async function handleMount(api, options) {
     await new Promise((resolve) => setTimeout(resolve, 3e3));
   }
   try {
-    (0, import_child_process2.execSync)("which sshfs", { stdio: "ignore" });
+    (0, import_node_child_process2.execSync)("which sshfs", { stdio: "ignore" });
   } catch {
     console.error("\u274C sshfs is not installed.");
     console.error("");
@@ -5083,12 +5389,14 @@ async function handleMount(api, options) {
     }
     process.exit(1);
   }
-  const mountDir = options.directory || path3.join(os3.homedir(), "flightdesk-mounts", options.taskId.substring(0, 8));
+  const rawTaskIdPrefix = options.taskId.substring(0, 8);
+  const safeTaskId = path3.basename(rawTaskIdPrefix).replaceAll(/[^a-zA-Z0-9_-]/g, "") || "task";
+  const mountDir = options.directory || path3.join(os3.homedir(), "flightdesk-mounts", safeTaskId);
   if (!fs4.existsSync(mountDir)) {
     fs4.mkdirSync(mountDir, { recursive: true });
   }
   try {
-    const mounted = (0, import_child_process2.execSync)("mount", { encoding: "utf8" });
+    const mounted = (0, import_node_child_process2.execSync)("mount", { encoding: "utf8" });
     if (mounted.includes(mountDir)) {
       console.log(`\u{1F4C1} Already mounted at ${mountDir}`);
       return;
@@ -5096,8 +5404,8 @@ async function handleMount(api, options) {
   } catch {
   }
   console.log(`\u{1F4C1} Mounting preview environment to ${mountDir}...`);
-  const sshfsCmd = [
-    "sshfs",
+  validateSSHParams(instance);
+  const sshfsArgs = [
     "-o",
     "StrictHostKeyChecking=no",
     "-o",
@@ -5114,7 +5422,10 @@ async function handleMount(api, options) {
     mountDir
   ];
   try {
-    (0, import_child_process2.execSync)(sshfsCmd.join(" "), { stdio: "inherit" });
+    const result = (0, import_node_child_process2.spawnSync)("sshfs", sshfsArgs, { stdio: "inherit" });
+    if (result.status !== 0) {
+      throw new Error(`sshfs exited with code ${result.status}`);
+    }
     console.log("");
     console.log("\u2705 Mounted successfully!");
     console.log(`   Location: ${mountDir}`);
@@ -5134,21 +5445,27 @@ async function handleMount(api, options) {
   }
 }
 async function handleUnmount(_api, options) {
-  const mountDir = path3.join(os3.homedir(), "flightdesk-mounts", options.taskId.substring(0, 8));
+  const rawTaskIdPrefix = options.taskId.substring(0, 8);
+  const safeTaskId = path3.basename(rawTaskIdPrefix).replaceAll(/[^a-zA-Z0-9_-]/g, "") || "task";
+  const mountDir = path3.join(os3.homedir(), "flightdesk-mounts", safeTaskId);
   if (!fs4.existsSync(mountDir)) {
     console.log("Mount directory does not exist");
     return;
   }
   console.log(`\u{1F4C1} Unmounting ${mountDir}...`);
   try {
+    let result;
     if (process.platform === "darwin") {
-      (0, import_child_process2.execSync)(`umount ${mountDir}`, { stdio: "inherit" });
+      result = (0, import_node_child_process2.spawnSync)("umount", [mountDir], { stdio: "inherit" });
     } else {
-      (0, import_child_process2.execSync)(`fusermount -u ${mountDir}`, { stdio: "inherit" });
+      result = (0, import_node_child_process2.spawnSync)("fusermount", ["-u", mountDir], { stdio: "inherit" });
+    }
+    if (result.status !== 0) {
+      throw new Error(`Unmount exited with code ${result.status}`);
     }
     console.log("\u2705 Unmounted successfully");
     try {
-      fs4.rmdirSync(mountDir);
+      fs4.rmSync(mountDir, { recursive: true, force: true });
     } catch {
     }
   } catch (error) {
@@ -5181,7 +5498,7 @@ async function handleTeardown(api, 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.2.0").option("--dev", "Use local development API (localhost:3000)").option("--api <url>", "Use custom API URL");
+program2.name("flightdesk").description("FlightDesk CLI - AI task management for Claude Code sessions").version("0.2.2").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) {
@@ -5195,7 +5512,7 @@ program2.hook("preAction", () => {
 });
 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);
+program2.command("register [task-id]").description("Register a Claude Code session with a FlightDesk task (auto-detects project from git repo)").option("-p, --project <id>", "Project ID (auto-detected from git repo if not provided)").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);
 var project = program2.command("project").description("Project management commands");
 project.command("list").description("List projects in the active organization").action(() => projectCommand("list", {}));
 var task = program2.command("task").description("Task management commands");
@@ -5215,7 +5532,10 @@ program2.command("context").description("Show current repository context and map
 program2.command("sync").description("Refresh project-to-repository mappings from all organizations").action(syncCommand);
 var preview = program2.command("preview").description("Preview environment management");
 preview.command("status <task-id>").description("Show preview environment status").action((taskId) => previewCommand("status", { taskId }));
-preview.command("logs <task-id>").description("Get logs from preview environment").option("-n, --lines <lines>", "Number of log lines", "100").option("-f, --follow", "Follow log output").action((taskId, options) => previewCommand("logs", { taskId, lines: parseInt(options.lines || "100"), follow: options.follow }));
+preview.command("logs <task-id>").description("Get logs from preview environment").option("-n, --lines <lines>", "Number of log lines (1-10000)", "100").option("-f, --follow", "Follow log output").action((taskId, options) => {
+  const lines = Math.min(Math.max(Number.parseInt(options.lines || "100"), 1), 1e4);
+  previewCommand("logs", { taskId, lines, follow: options.follow });
+});
 preview.command("mount <task-id>").description("Mount preview environment filesystem via SSHFS").option("-d, --directory <path>", "Custom mount directory").action((taskId, options) => previewCommand("mount", { taskId, directory: options.directory }));
 preview.command("unmount <task-id>").description("Unmount preview environment filesystem").action((taskId) => previewCommand("unmount", { taskId }));
 preview.command("restart <task-id>").description("Restart preview environment processes").action((taskId) => previewCommand("restart", { taskId }));
@@ -5223,6 +5543,9 @@ preview.command("resume <task-id>").description("Resume a suspended preview envi
 preview.command("teardown <task-id>").description("Tear down preview environment").action((taskId) => previewCommand("teardown", { taskId }));
 program2.command("mount <task-id>").description('Mount preview environment filesystem (shorthand for "preview mount")').option("-d, --directory <path>", "Custom mount directory").action((taskId, options) => previewCommand("mount", { taskId, directory: options.directory }));
 program2.command("unmount <task-id>").description('Unmount preview environment filesystem (shorthand for "preview unmount")').action((taskId) => previewCommand("unmount", { taskId }));
-program2.command("logs <task-id>").description('Get logs from preview environment (shorthand for "preview logs")').option("-n, --lines <lines>", "Number of log lines", "100").option("-f, --follow", "Follow log output").action((taskId, options) => previewCommand("logs", { taskId, lines: parseInt(options.lines || "100"), follow: options.follow }));
+program2.command("logs <task-id>").description('Get logs from preview environment (equivalent to "preview logs")').option("-n, --lines <lines>", "Number of log lines (1-10000)", "100").option("-f, --follow", "Follow log output").action((taskId, options) => {
+  const lines = Math.min(Math.max(Number.parseInt(options.lines || "100"), 1), 1e4);
+  previewCommand("logs", { taskId, lines, follow: options.follow });
+});
 program2.parse();
 //# sourceMappingURL=main.js.map