flightdesk 0.2.0 → 0.2.1

package/main.js

@@ -3800,11 +3800,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 +3918,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) {
@@ -4941,10 +5031,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 +5135,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 +5177,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 +5191,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 +5206,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 +5224,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 +5247,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 +5300,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.1").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 +5314,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 +5334,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 +5345,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