@driftless-sh/cli 0.1.37 → 0.1.39

package/dist/index.js

@@ -39,8 +39,38 @@ __export(api_client_exports, {
   api: () => api,
   formatError: () => formatError,
   getApiKey: () => getApiKey,
-  getApiUrl: () => getApiUrl
+  getApiUrl: () => getApiUrl,
+  getCachedWorkspace: () => getCachedWorkspace,
+  saveWorkspaceToConfig: () => saveWorkspaceToConfig
 });
+function readConfig() {
+  try {
+    if ((0, import_node_fs.existsSync)(CONFIG_PATH)) {
+      return JSON.parse((0, import_node_fs.readFileSync)(CONFIG_PATH, "utf8"));
+    }
+  } catch {
+  }
+  return {};
+}
+function getCachedWorkspace() {
+  const c = readConfig();
+  return { slug: c.workspace_slug, workspaceId: c.workspace_id };
+}
+function saveWorkspaceToConfig(slug, workspaceId) {
+  if (!slug) return;
+  try {
+    const c = readConfig();
+    if (c.workspace_slug === slug && (workspaceId === void 0 || c.workspace_id === workspaceId)) {
+      return;
+    }
+    c.workspace_slug = slug;
+    if (workspaceId !== void 0) c.workspace_id = workspaceId;
+    const dir = (0, import_node_path.dirname)(CONFIG_PATH);
+    if (!(0, import_node_fs.existsSync)(dir)) (0, import_node_fs.mkdirSync)(dir, { recursive: true });
+    (0, import_node_fs.writeFileSync)(CONFIG_PATH, JSON.stringify(c, null, 2) + "\n");
+  } catch {
+  }
+}
 function loadApiKey() {
   const envKey = process.env["DRIFTLESS_API_KEY"];
   if (envKey) return envKey;
@@ -94,7 +124,7 @@ function parseError(e) {
   }
   return msg;
 }
-function request(method, path, body) {
+function singleRequest(method, path, body, timeoutMs) {
   return new Promise((resolve8, reject) => {
     const baseUrl = getBaseUrl();
     const fullUrl = `${baseUrl}${path}`;
@@ -128,11 +158,33 @@ function request(method, path, body) {
         });
       }
     );
+    if (timeoutMs && timeoutMs > 0) {
+      req.setTimeout(timeoutMs, () => {
+        req.destroy(new Error(`Request timed out after ${timeoutMs}ms`));
+      });
+    }
     req.on("error", (e) => reject(new Error(`Connection failed: ${e.message}`)));
     if (body) req.write(JSON.stringify(body));
     req.end();
   });
 }
+function isTransient(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return !/HTTP 4\d\d:/.test(msg);
+}
+async function request(method, path, body, opts) {
+  const retries = opts?.retries ?? 0;
+  let lastErr;
+  for (let attempt = 0; attempt <= retries; attempt++) {
+    try {
+      return await singleRequest(method, path, body, opts?.timeoutMs);
+    } catch (e) {
+      lastErr = e;
+      if (attempt === retries || !isTransient(e)) break;
+    }
+  }
+  throw lastErr;
+}
 function getApiUrl() {
   return getBaseUrl();
 }
@@ -154,11 +206,11 @@ var init_api_client = __esm({
     CONFIG_PATH = (0, import_node_path.resolve)((0, import_node_os.homedir)(), ".driftless", "config.json");
     DEFAULT_URL = "http://localhost:3000/api/v1";
     api = {
-      get: (path) => request("GET", path),
-      post: (path, body) => request("POST", path, body),
-      put: (path, body) => request("PUT", path, body),
-      patch: (path, body) => request("PATCH", path, body),
-      delete: (path) => request("DELETE", path)
+      get: (path, opts) => request("GET", path, void 0, opts),
+      post: (path, body, opts) => request("POST", path, body, opts),
+      put: (path, body, opts) => request("PUT", path, body, opts),
+      patch: (path, body, opts) => request("PATCH", path, body, opts),
+      delete: (path, opts) => request("DELETE", path, void 0, opts)
     };
   }
 });
@@ -3184,7 +3236,7 @@ var require_typescript = __commonJS({
         forEachYieldExpression: () => forEachYieldExpression,
         formatColorAndReset: () => formatColorAndReset,
         formatDiagnostic: () => formatDiagnostic,
-        formatDiagnostics: () => formatDiagnostics,
+        formatDiagnostics: () => formatDiagnostics2,
         formatDiagnosticsWithColorAndContext: () => formatDiagnosticsWithColorAndContext,
         formatGeneratedName: () => formatGeneratedName,
         formatGeneratedNamePart: () => formatGeneratedNamePart,
@@ -138049,7 +138101,7 @@ ${lanes.join("\n")}
         }
         return sortAndDeduplicateDiagnostics(diagnostics || emptyArray);
       }
-      function formatDiagnostics(diagnostics, host) {
+      function formatDiagnostics2(diagnostics, host) {
         let output = "";
         for (const diagnostic of diagnostics) {
           output += formatDiagnostic(diagnostic, host);
@@ -198687,7 +198739,7 @@ ${options.prefix}` : "\n" : options.prefix
         forEachYieldExpression: () => forEachYieldExpression,
         formatColorAndReset: () => formatColorAndReset,
         formatDiagnostic: () => formatDiagnostic,
-        formatDiagnostics: () => formatDiagnostics,
+        formatDiagnostics: () => formatDiagnostics2,
         formatDiagnosticsWithColorAndContext: () => formatDiagnosticsWithColorAndContext,
         formatGeneratedName: () => formatGeneratedName,
         formatGeneratedNamePart: () => formatGeneratedNamePart,
@@ -214581,7 +214633,7 @@ async function installSkillCommand() {
 // src/commands/init.ts
 function getVersion() {
   try {
-    return "0.1.37";
+    return "0.1.39";
   } catch {
     return "0.0.0";
   }
@@ -214922,6 +214974,7 @@ async function initCommand(args) {
     process.exit(1);
   }
   const workspaceSlug = workspace.slug;
+  if (workspaceSlug) saveWorkspaceToConfig(workspaceSlug, workspace.workspace_id);
   console.log(`Repository: ${remote.org}/${remote.repo}`);
   console.log(`Workspace:  ${workspaceSlug} \u2713`);
   if (srcOverride) console.log(`Scan root:  ${srcOverride}`);
@@ -215103,16 +215156,27 @@ async function scanCommand(args) {
     process.exit(1);
   }
   const isJSON = args.includes("--json");
-  let workspace;
+  let workspaceSlug;
+  let workspaceId;
   try {
-    workspace = await api.get("/me");
+    const me = await api.get("/me", { timeoutMs: 8e3, retries: 1 });
+    workspaceSlug = me?.slug;
+    workspaceId = me?.workspace_id;
+    if (workspaceSlug) saveWorkspaceToConfig(workspaceSlug, workspaceId);
   } catch {
+  }
+  if (!workspaceSlug) {
+    const cached = getCachedWorkspace();
+    workspaceSlug = cached.slug;
+    workspaceId = workspaceId ?? cached.workspaceId;
+  }
+  if (!workspaceSlug) {
     console.error("Could not resolve workspace. Run driftless login first.");
     process.exit(1);
   }
-  const repos = await api.get(`/workspaces/${workspace.slug}/repos`);
+  const repos = await api.get(`/workspaces/${workspaceSlug}/repos`);
   if (!Array.isArray(repos)) {
-    console.error(`Error: Could not fetch repos for workspace '${workspace.slug}'.`);
+    console.error(`Error: Could not fetch repos for workspace '${workspaceSlug}'.`);
     console.error(`Response:`, JSON.stringify(repos).slice(0, 200));
     console.error("\nTip: Make sure your API key belongs to this workspace.");
     console.error("Run: driftless login --key <key>");
@@ -215156,7 +215220,7 @@ async function scanCommand(args) {
     }
   }
   const result = await api.post("/scan", {
-    workspace_id: workspace.workspace_id,
+    workspace_id: workspaceId,
     repo_id: repo.id,
     diff,
     commit_hash: commitHash,
@@ -215164,7 +215228,7 @@ async function scanCommand(args) {
   });
   const rulesEvaluated = result.rules_evaluated || 0;
   if (result.status === "clean") {
-    analyticsEvent("cli_scan_run", workspace.slug, { violations_found: false, count: 0 });
+    analyticsEvent("cli_scan_run", workspaceSlug, { violations_found: false, count: 0 });
     if (isJSON) {
       emitJSON({ status: "clean", files: changedFiles, rules_evaluated: rulesEvaluated, violations: [] });
     } else {
@@ -215173,7 +215237,7 @@ async function scanCommand(args) {
     process.exit(0);
   }
   if (!result.violations || result.violations.length === 0) {
-    analyticsEvent("cli_scan_run", workspace.slug, { violations_found: false, count: 0 });
+    analyticsEvent("cli_scan_run", workspaceSlug, { violations_found: false, count: 0 });
     if (isJSON) {
       emitJSON({ status: "clean", files: changedFiles, rules_evaluated: rulesEvaluated, violations: [] });
     } else {
@@ -215181,7 +215245,7 @@ async function scanCommand(args) {
     }
     process.exit(0);
   }
-  analyticsEvent("cli_scan_run", workspace.slug, { violations_found: true, count: result.violations.length });
+  analyticsEvent("cli_scan_run", workspaceSlug, { violations_found: true, count: result.violations.length });
   if (isJSON) {
     emitJSON({ status: "violated", files: changedFiles, rules_evaluated: rulesEvaluated, violations: result.violations });
   } else {
@@ -215379,10 +215443,15 @@ function countLocalFilesMatching(pattern) {
 }
 async function resolveWorkspaceSlug() {
   try {
-    const me = await api.get("/me");
-    if (me?.slug) return me.slug;
+    const me = await api.get("/me", { timeoutMs: 8e3, retries: 1 });
+    if (me?.slug) {
+      saveWorkspaceToConfig(me.slug, me.workspace_id);
+      return me.slug;
+    }
   } catch {
   }
+  const cached = getCachedWorkspace().slug;
+  if (cached) return cached;
   const remote = getGitRemote();
   if (!remote) {
     console.error("Error: no git remote found.");
@@ -216045,30 +216114,89 @@ init_api_client();
 function notLinkedMessage(remote, workspaceSlug) {
   return `Repo '${remote.org}/${remote.repo}' is not registered in workspace '${workspaceSlug}'. Run \`driftless init\` to register it.`;
 }
+function formatDiagnostics(d) {
+  const lines = [];
+  if (d.remote) lines.push(`  repo:        ${d.remote.org}/${d.remote.repo}`);
+  lines.push(`  tried slugs: ${d.triedSlugs.length ? d.triedSlugs.join(", ") : "(none)"}`);
+  lines.push(`  config slug: ${d.configSlug ?? "(not cached \u2014 run `driftless login` or `driftless init`)"}`);
+  if (!d.meAttempted) {
+    lines.push("  /me:         not attempted");
+  } else if (d.meReturned) {
+    lines.push(`  /me:         returned slug=${d.meSlug ?? "(none)"} workspace_id=${d.meWorkspaceId ?? "(none)"}`);
+  } else {
+    lines.push(`  /me:         FAILED \u2014 ${d.meError ?? "unknown error"}`);
+  }
+  if (d.failedEndpoint) lines.push(`  last endpoint: ${d.failedEndpoint} (rejected)`);
+  return lines.join("\n");
+}
+async function fetchRepos(slug) {
+  try {
+    const raw = await api.get(`/workspaces/${slug}/repos`);
+    if (Array.isArray(raw)) return { repos: raw };
+    return { error: "unexpected response shape" };
+  } catch (e) {
+    return { error: e instanceof Error ? e.message : String(e) };
+  }
+}
 async function resolveRepo() {
   const remote = getGitRemote();
   if (!remote) return { ok: false, reason: "no_remote" };
-  let workspaceSlug;
+  const configSlug = getCachedWorkspace().slug;
+  let meSlug;
+  let meWorkspaceId;
+  let meReturned = false;
+  let meError;
   try {
-    const me = await api.get("/me");
-    workspaceSlug = me?.slug;
-  } catch {
+    const me = await api.get("/me", { timeoutMs: 8e3, retries: 1 });
+    meReturned = true;
+    meSlug = me?.slug;
+    meWorkspaceId = me?.workspace_id;
+    if (meSlug) saveWorkspaceToConfig(meSlug, meWorkspaceId);
+  } catch (e) {
+    meError = e instanceof Error ? e.message : String(e);
   }
-  const slug = workspaceSlug ?? remote.org;
-  let repos = null;
-  try {
-    repos = await api.get(`/workspaces/${slug}/repos`);
-  } catch {
+  const candidates = [...new Set([configSlug, meSlug, remote.org].filter(Boolean))];
+  let lastLinkedSlug;
+  let failedEndpoint;
+  for (const slug of candidates) {
+    const result = await fetchRepos(slug);
+    if ("error" in result) {
+      failedEndpoint = `/workspaces/${slug}/repos`;
+      continue;
+    }
+    const repo = result.repos.find((r) => r.github_org === remote.org && r.github_repo === remote.repo);
+    if (repo) {
+      saveWorkspaceToConfig(slug, meWorkspaceId);
+      return {
+        ok: true,
+        workspaceSlug: slug,
+        repoId: repo.id,
+        remote,
+        hasScanBaseline: !!repo.scan_summary
+      };
+    }
+    lastLinkedSlug = slug;
+  }
+  const diagnostics = {
+    remote,
+    triedSlugs: candidates,
+    configSlug,
+    meAttempted: true,
+    meReturned,
+    meSlug,
+    meWorkspaceId,
+    meError,
+    failedEndpoint
+  };
+  if (lastLinkedSlug) {
+    return { ok: false, reason: "not_linked", workspaceSlug: lastLinkedSlug, remote, diagnostics };
   }
-  if (!repos) return { ok: false, reason: "no_workspace", remote };
-  const repo = repos.find((r) => r.github_org === remote.org && r.github_repo === remote.repo);
-  if (!repo) return { ok: false, reason: "not_linked", workspaceSlug: slug, remote };
   return {
-    ok: true,
-    workspaceSlug: slug,
-    repoId: repo.id,
+    ok: false,
+    reason: "no_workspace",
     remote,
-    hasScanBaseline: !!repo.scan_summary
+    detail: formatDiagnostics(diagnostics),
+    diagnostics
   };
 }
 
@@ -216099,12 +216227,31 @@ async function syncCommand(args) {
   const isJSON = !!flags["json"];
   const resolution = await resolveRepo();
   if (!resolution.ok) {
-    const msg = resolution.reason === "no_remote" ? "Error: no git remote configured." : resolution.reason === "no_workspace" ? "Error: could not resolve workspace. Run `driftless doctor` to diagnose." : notLinkedMessage(resolution.remote, resolution.workspaceSlug);
+    if (resolution.reason === "no_remote") {
+      if (!isJSON) console.log("\u26A0 Error: no git remote configured.");
+      else emitJSON3({ error: "no_remote", message: "no git remote configured" });
+      process.exit(1);
+    }
+    if (resolution.reason === "not_linked") {
+      const msg = notLinkedMessage(resolution.remote, resolution.workspaceSlug);
+      if (!isJSON) {
+        console.log(`\u26A0 ${msg}`);
+        console.log("  Run `driftless doctor` to diagnose.");
+      } else {
+        emitJSON3({ error: "not_linked", message: msg, diagnostics: resolution.diagnostics });
+      }
+      process.exit(1);
+    }
     if (!isJSON) {
-      console.log(`\u26A0 ${msg}`);
-      if (resolution.reason !== "no_remote") console.log("  Run `driftless doctor` to diagnose.");
+      console.log("\u26A0 Error: could not resolve workspace.");
+      if (resolution.detail) console.log(resolution.detail);
+      console.log("  Run `driftless doctor` to diagnose.");
     } else {
-      emitJSON3({ error: resolution.reason, message: msg });
+      emitJSON3({
+        error: "no_workspace",
+        message: "could not resolve workspace",
+        diagnostics: resolution.diagnostics
+      });
     }
     process.exit(1);
   }
@@ -216187,6 +216334,7 @@ var import_node_path6 = require("node:path");
 var import_node_readline = require("node:readline");
 var import_node_child_process2 = require("node:child_process");
 var import_node_os2 = require("node:os");
+init_api_client();
 var CONFIG_DIR = (0, import_node_path6.resolve)((0, import_node_os2.homedir)(), ".driftless");
 var CONFIG_PATH2 = (0, import_node_path6.resolve)(CONFIG_DIR, "config.json");
 function openBrowser(url) {
@@ -216198,7 +216346,7 @@ async function loginCommand(args) {
   const keyIndex = args.indexOf("--key");
   if (keyIndex !== -1 && args[keyIndex + 1]) {
     const apiKey2 = args[keyIndex + 1];
-    saveConfig(apiKey2);
+    await saveConfig(apiKey2);
     return;
   }
   const apiUrl = process.env["DRIFTLESS_API_URL"] || "https://api.driftless.icu/api/v1";
@@ -216229,9 +216377,9 @@ async function loginCommand(args) {
     console.error("Get a valid key from your Driftless Dashboard \u2192 Settings \u2192 API Keys.");
     process.exit(1);
   }
-  saveConfig(apiKey, apiUrl);
+  await saveConfig(apiKey, apiUrl);
 }
-function saveConfig(apiKey, apiUrl) {
+async function saveConfig(apiKey, apiUrl) {
   const url = apiUrl || "https://api.driftless.icu/api/v1";
   try {
     if (!(0, import_node_fs6.existsSync)(CONFIG_DIR)) {
@@ -216241,16 +216389,24 @@ function saveConfig(apiKey, apiUrl) {
       CONFIG_PATH2,
       JSON.stringify({ api_key: apiKey, api_url: url }, null, 2) + "\n"
     );
-    console.log();
-    console.log("Logged in successfully.");
-    console.log(`  Config: ${CONFIG_PATH2}`);
-    console.log();
-    console.log("Try: driftless scan --diff");
-    process.exit(0);
   } catch (err) {
     console.error("Failed to save config:", err);
     process.exit(1);
   }
+  console.log();
+  console.log("Logged in successfully.");
+  console.log(`  Config: ${CONFIG_PATH2}`);
+  try {
+    const me = await api.get("/me", { timeoutMs: 8e3, retries: 1 });
+    if (me?.slug) {
+      saveWorkspaceToConfig(me.slug, me.workspace_id);
+      console.log(`  Workspace: ${me.slug}`);
+    }
+  } catch {
+  }
+  console.log();
+  console.log("Try: driftless scan --diff");
+  process.exit(0);
 }
 
 // src/commands/doctor.ts
@@ -216282,33 +216438,27 @@ async function doctorCommand() {
   async function getMe() {
     if (meCache) return meCache;
     try {
-      meCache = await api.get("/me");
+      meCache = await api.get("/me", { timeoutMs: 8e3, retries: 1 });
     } catch {
       meCache = null;
     }
     return meCache;
   }
-  let reposCache = null;
-  async function getRepos(slug) {
-    if (reposCache) return reposCache;
-    try {
-      reposCache = await api.get(`/workspaces/${slug}/repos`);
-    } catch {
-      reposCache = null;
-    }
-    return reposCache;
-  }
-  if (apiKey && apiUrl !== "http://localhost:3000/api/v1") {
-    const me = await getMe();
-    if (me?.slug) {
-      checks.push({ name: "Workspace", status: "ok", detail: me.slug });
-    } else {
-      checks.push({ name: "Workspace", status: "warn", detail: "API returned no workspace. Run `driftless init`" });
-    }
-  } else {
+  const resolution = await resolveRepo();
+  const localOrNoKey = !apiKey || apiUrl === "http://localhost:3000/api/v1";
+  if (localOrNoKey) {
     checks.push({ name: "Workspace", status: "warn", detail: "Skipped (local API or no key)" });
+  } else if (resolution.ok) {
+    checks.push({ name: "Workspace", status: "ok", detail: resolution.workspaceSlug });
+  } else if (resolution.reason === "not_linked" && resolution.workspaceSlug) {
+    checks.push({ name: "Workspace", status: "ok", detail: resolution.workspaceSlug });
+  } else if (resolution.reason === "no_workspace" && resolution.diagnostics) {
+    const d = resolution.diagnostics;
+    const detail = !d.meReturned && d.meError ? `/me failed (${d.meError}); cached=${d.configSlug ?? "none"}` : "Could not resolve. Run `driftless init`";
+    checks.push({ name: "Workspace", status: "warn", detail });
+  } else {
+    checks.push({ name: "Workspace", status: "warn", detail: "Could not resolve (no git remote)" });
   }
-  const resolution = await resolveRepo();
   if (resolution.ok) {
     checks.push({ name: "Repo linked", status: "ok", detail: `${resolution.remote.org}/${resolution.remote.repo}` });
     checks.push({
@@ -216377,6 +216527,10 @@ async function doctorCommand() {
   }
   console.log(`
 ${okCount} ok, ${warnCount} warnings, ${failCount} failures`);
+  if (!resolution.ok && resolution.reason === "no_workspace" && resolution.diagnostics) {
+    console.log("\nWorkspace resolution diagnostics:");
+    console.log(formatDiagnostics(resolution.diagnostics));
+  }
   if (failCount > 0) {
     console.log("\nFix failures before running `driftless init` or `driftless scan`.");
     process.exit(1);
@@ -216389,7 +216543,7 @@ function pad2(s, n) {
 }
 
 // src/index.ts
-var VERSION = "0.1.37";
+var VERSION = "0.1.39";
 var HELP_TEXT = `Driftless CLI v${VERSION} \u2014 Living repo context for humans and coding agents
 
 Install:  npm install -g @driftless-sh/cli