@kendoo.agentdesk/agentdesk 0.9.8 → 0.9.9

package/cli/init.mjs

@@ -38,6 +38,44 @@ async function selectOption(rl, prompt, options) {
   }
 }
 
+function saveEnvVar(dir, key, value) {
+  const envPath = join(dir, ".env");
+  let content = existsSync(envPath) ? readFileSync(envPath, "utf-8") : "";
+  const re = new RegExp(`^${key}=.*$`, "m");
+  if (re.test(content)) {
+    content = content.replace(re, `${key}=${value}`);
+  } else {
+    content += `${content && !content.endsWith("\n") ? "\n" : ""}${key}=${value}\n`;
+  }
+  writeFileSync(envPath, content);
+}
+
+function loadDotEnv(dir) {
+  const envPath = join(dir, ".env");
+  const dotEnv = {};
+  if (existsSync(envPath)) {
+    for (const line of readFileSync(envPath, "utf-8").split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const eq = trimmed.indexOf("=");
+      if (eq !== -1) dotEnv[trimmed.slice(0, eq)] = trimmed.slice(eq + 1);
+    }
+  }
+  return dotEnv;
+}
+
+async function fetchServerCreds(apiKey, projectKey) {
+  if (!apiKey) return {};
+  try {
+    const res = await fetch(`${SERVER}/api/projects/${projectKey}/settings/credentials`, {
+      headers: { "x-api-key": apiKey },
+      signal: AbortSignal.timeout(5000),
+    });
+    if (res.ok) return await res.json();
+  } catch {}
+  return {};
+}
+
 export async function runInit(cwd) {
   const project = detectProject(cwd);
   const existingConfig = loadConfig(cwd);
@@ -63,13 +101,7 @@ export async function runInit(cwd) {
   if (project.lintCommand) console.log(`  Lint:         ${project.lintCommand}`);
   if (project.testCommand || project.buildCommand || project.lintCommand) console.log("");
 
-  // --- Project key ---
-  const defaultKey = existingConfig.projectKey || projectId;
-  const keyAnswer = await ask(rl, `  Project key (${defaultKey}): `);
-  const finalProjectKey = keyAnswer.trim() || defaultKey;
-  console.log("");
-
-  // --- Tracker selection ---
+  // --- Step 1: Tracker selection (platform first) ---
   const trackerOptions = [
     { label: "Linear", value: "linear" },
     { label: "Jira", value: "jira" },
@@ -81,17 +113,17 @@ export async function runInit(cwd) {
   const tracker = selected.value;
   console.log("");
 
-  // Build config
-  const config = { projectKey: finalProjectKey };
+  // --- Step 2: Tracker configuration (details + credentials) ---
+  const config = {};
   if (tracker) config.tracker = tracker;
 
   if (tracker === "linear") {
     const currentWs = existingConfig.linear?.workspace || "";
     const wsAnswer = await ask(rl, `  Linear workspace slug${currentWs ? ` (${currentWs})` : ""}: `);
     const ws = wsAnswer.trim() || currentWs;
-    const currentKey = existingConfig.linear?.teamKey || "";
-    const keyAnswer = await ask(rl, `  Linear team key${currentKey ? ` (${currentKey})` : ""} (e.g. KEN): `);
-    const teamKey = keyAnswer.trim() || currentKey;
+    const currentTeamKey = existingConfig.linear?.teamKey || "";
+    const tkAnswer = await ask(rl, `  Linear team key${currentTeamKey ? ` (${currentTeamKey})` : ""} (e.g. KEN): `);
+    const teamKey = tkAnswer.trim() || currentTeamKey;
     if (ws || teamKey) config.linear = { ...(ws && { workspace: ws }), ...(teamKey && { teamKey }) };
     console.log("");
   }
@@ -115,56 +147,189 @@ export async function runInit(cwd) {
     console.log("");
   }
 
-  // --- Verify tracker permissions ---
+  // --- Step 3: Verify tracker permissions (with re-prompt on failure) ---
   if (tracker) {
-    console.log("  Checking tracker permissions...");
-    const envPath = join(cwd, ".env");
-    let dotEnv = {};
-    if (existsSync(envPath)) {
-      for (const line of readFileSync(envPath, "utf-8").split("\n")) {
-        const trimmed = line.trim();
-        if (!trimmed || trimmed.startsWith("#")) continue;
-        const eq = trimmed.indexOf("=");
-        if (eq !== -1) dotEnv[trimmed.slice(0, eq)] = trimmed.slice(eq + 1);
-      }
-    }
+    let verified = false;
+    while (!verified) {
+      console.log("  Checking tracker permissions...");
+      const dotEnv = loadDotEnv(cwd);
+      const apiKey = loadApiKey(cwd);
+      const defaultKey = existingConfig.projectKey || projectId;
+      const serverCreds = await fetchServerCreds(apiKey, defaultKey);
+      const credentials = resolveCredentialsFromEnv({ ...dotEnv, ...serverCreds });
+      const check = await checkTrackerPermissions({ tracker, config, credentials });
 
-    // Also try fetching credentials from server
-    const apiKey = loadApiKey(cwd);
-    let serverCreds = {};
-    if (apiKey) {
-      try {
-        const res = await fetch(`${SERVER}/api/projects/${finalProjectKey}/settings/credentials`, {
-          headers: { "x-api-key": apiKey },
-          signal: AbortSignal.timeout(5000),
-        });
-        if (res.ok) serverCreds = await res.json();
-      } catch {}
-    }
+      if (check.ok) {
+        console.log("  ✓ Tracker permissions verified (read, create, update)");
+        console.log("");
+        verified = true;
+      } else {
+        console.log("");
+        console.log("  ⚠  Tracker permission issues:");
+        for (const err of check.errors) {
+          console.log(`     • ${err}`);
+        }
+        console.log("");
 
-    const credentials = resolveCredentialsFromEnv({ ...dotEnv, ...serverCreds });
-    const check = await checkTrackerPermissions({ tracker, config, credentials });
+        // Determine what's missing and offer to fix it
+        const missingCreds = check.errors.some(e =>
+          e.includes("Missing") && (e.includes("API_KEY") || e.includes("TOKEN") || e.includes("EMAIL"))
+        );
 
-    if (!check.ok) {
-      console.log("");
-      console.log("  ⚠  Tracker permission issues:");
-      for (const err of check.errors) {
-        console.log(`     • ${err}`);
-      }
-      console.log("");
-      const proceed = await ask(rl, "  Continue anyway? (y/N): ");
-      if (proceed.trim().toLowerCase() !== "y") {
-        console.log("  Setup cancelled. Fix the issues above and run 'agentdesk init' again.");
-        rl.close();
-        return;
+        if (missingCreds) {
+          console.log("  Let's fix this now. I'll walk you through it.");
+          console.log("");
+
+          if (tracker === "linear") {
+            console.log("  ┌─────────────────────────────────────────────┐");
+            console.log("  │  How to get your Linear API key:            │");
+            console.log("  │                                             │");
+            console.log("  │  1. Open https://linear.app/settings/api    │");
+            console.log("  │  2. Click \"Create new API key\"              │");
+            console.log("  │  3. Give it a label (e.g. \"AgentDesk\")      │");
+            console.log("  │  4. Copy the key                            │");
+            console.log("  │  5. Paste it below                          │");
+            console.log("  └─────────────────────────────────────────────┘");
+            console.log("");
+
+            while (true) {
+              const keyInput = await ask(rl, "  Linear API key: ");
+              const key = keyInput.trim();
+              if (!key) {
+                console.log("  The API key is required for the agents to read and update your Linear tasks.");
+                console.log("");
+                continue;
+              }
+              saveEnvVar(cwd, "LINEAR_API_KEY", key);
+              console.log("  ✓ Saved to .env");
+              console.log("");
+              break;
+            }
+            continue; // Re-check with the new key
+          }
+
+          if (tracker === "jira") {
+            console.log("  ┌──────────────────────────────────────────────────────────┐");
+            console.log("  │  How to get your Jira API token:                         │");
+            console.log("  │                                                          │");
+            console.log("  │  1. Open https://id.atlassian.com/manage-profile/        │");
+            console.log("  │         security/api-tokens                              │");
+            console.log("  │  2. Click \"Create API token\"                              │");
+            console.log("  │  3. Give it a label (e.g. \"AgentDesk\")                    │");
+            console.log("  │  4. Copy the token                                       │");
+            console.log("  │                                                          │");
+            console.log("  │  You'll also need the email address you use               │");
+            console.log("  │  to log into Jira (not your username).                    │");
+            console.log("  └──────────────────────────────────────────────────────────┘");
+            console.log("");
+
+            if (!credentials.JIRA_EMAIL) {
+              while (true) {
+                const emailInput = (await ask(rl, "  Your Jira email address: ")).trim();
+                if (!emailInput || !emailInput.includes("@")) {
+                  console.log("  Please enter a valid email address (the one you use to log into Jira).");
+                  continue;
+                }
+                saveEnvVar(cwd, "JIRA_EMAIL", emailInput);
+                console.log("  ✓ Email saved");
+                break;
+              }
+            }
+
+            while (true) {
+              const tokenInput = (await ask(rl, "  Jira API token: ")).trim();
+              if (!tokenInput) {
+                console.log("  The API token is required for the agents to read and update your Jira tasks.");
+                console.log("");
+                continue;
+              }
+              saveEnvVar(cwd, "JIRA_API_TOKEN", tokenInput);
+              console.log("  ✓ Token saved to .env");
+              console.log("");
+              break;
+            }
+            continue; // Re-check
+          }
+
+          if (tracker === "github") {
+            console.log("  ┌──────────────────────────────────────────────────────────┐");
+            console.log("  │  Two ways to authenticate with GitHub:                    │");
+            console.log("  │                                                          │");
+            console.log("  │  Option A — GitHub CLI (recommended):                     │");
+            console.log("  │    Run: gh auth login                                     │");
+            console.log("  │    Then press Enter below.                                │");
+            console.log("  │                                                          │");
+            console.log("  │  Option B — Personal Access Token:                        │");
+            console.log("  │    1. Open https://github.com/settings/tokens             │");
+            console.log("  │    2. Click \"Generate new token (classic)\"                 │");
+            console.log("  │    3. Select the \"repo\" scope                              │");
+            console.log("  │    4. Generate and copy the token                         │");
+            console.log("  │    5. Paste it below                                      │");
+            console.log("  └──────────────────────────────────────────────────────────┘");
+            console.log("");
+
+            const tokenInput = await ask(rl, "  GitHub token (or Enter if using gh CLI): ");
+            const token = tokenInput.trim();
+            if (token) {
+              saveEnvVar(cwd, "GITHUB_TOKEN", token);
+              console.log("  ✓ Token saved to .env");
+              console.log("");
+            } else {
+              console.log("  OK, will check gh CLI authentication...");
+              console.log("");
+            }
+            continue; // Re-check
+          }
+        }
+
+        // Non-credential error (wrong team key, wrong URL, network issue, etc.)
+        console.log("");
+        const choice = await selectOption(rl, "What would you like to do?", [
+          { label: "Fix it and try again", value: "retry" },
+          { label: "Continue without tracker verification (fix later in dashboard)", value: "skip" },
+          { label: "Choose a different tracker platform", value: "change" },
+        ]);
+
+        if (choice.value === "retry") {
+          // Re-prompt for the tracker details that might be wrong
+          if (tracker === "linear" && config.linear) {
+            const wsAnswer = await ask(rl, `  Linear workspace slug (${config.linear.workspace || ""}): `);
+            if (wsAnswer.trim()) config.linear.workspace = wsAnswer.trim();
+            const tkAnswer = await ask(rl, `  Linear team key (${config.linear.teamKey || ""}): `);
+            if (tkAnswer.trim()) config.linear.teamKey = tkAnswer.trim();
+          }
+          if (tracker === "jira" && config.jira) {
+            const urlAnswer = await ask(rl, `  Jira base URL (${config.jira.baseUrl || ""}): `);
+            if (urlAnswer.trim()) config.jira.baseUrl = urlAnswer.trim();
+            const projAnswer = await ask(rl, `  Jira project key (${config.jira.project || ""}): `);
+            if (projAnswer.trim()) config.jira.project = projAnswer.trim();
+          }
+          if (tracker === "github" && config.github) {
+            const repoAnswer = await ask(rl, `  GitHub repo (${config.github.repo || ""}): `);
+            if (repoAnswer.trim()) config.github.repo = repoAnswer.trim();
+          }
+          console.log("");
+          continue;
+        } else if (choice.value === "change") {
+          rl.close();
+          return runInit(cwd);
+        } else {
+          console.log("");
+          console.log("  Continuing without tracker verification.");
+          console.log("  You can configure credentials later at agentdesk.live or re-run 'agentdesk init'.");
+          console.log("");
+          verified = true;
+        }
       }
-      console.log("");
-    } else {
-      console.log("  ✓ Tracker permissions verified (read, create, update)");
-      console.log("");
     }
   }
 
+  // --- Step 4: Project key ---
+  const defaultKey = existingConfig.projectKey || projectId;
+  const keyAnswer = await ask(rl, `  Project key (${defaultKey}): `);
+  const finalProjectKey = keyAnswer.trim() || defaultKey;
+  console.log("");
+
   // --- Save .agentdesk.json ---
   let merged = {};
   if (hasConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kendoo.agentdesk/agentdesk",
-  "version": "0.9.8",
+  "version": "0.9.9",
   "description": "AI team orchestrator for Claude Code — run collaborative agent sessions from your terminal",
   "type": "module",
   "bin": {