@dosu/cli 0.11.0-alpha.3 → 0.11.0-alpha.4

package/bin/dosu.js

@@ -4341,7 +4341,7 @@ function getSupabaseAnonKey() {
 function getVersionString() {
   return `v${VERSION}`;
 }
-var VERSION = "0.11.0-alpha.3";
+var VERSION = "0.11.0-alpha.4";
 
 // src/debug/logger.ts
 import {
@@ -7148,6 +7148,7 @@ var init_open = __esm(() => {
 // src/setup/github-step.ts
 var exports_github_step = {};
 __export(exports_github_step, {
+  verifyDataSourcesPersist: () => verifyDataSourcesPersist,
   stepConnectGitHubRepo: () => stepConnectGitHubRepo,
   detectGitRepo: () => detectGitRepo
 });
@@ -7175,24 +7176,32 @@ function detectGitRepo(cwd = process.cwd()) {
 }
 async function fetchListForOrg(trpc, orgID) {
   try {
-    return await trpc.githubRepository.listForOrg.query({
+    const repos = await trpc.githubRepository.listForOrg.query({
       org_id: orgID
     });
+    return sortReposByRecency(repos);
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     logger.warn("setup", `listForOrg failed: ${msg}`);
     return [];
   }
 }
+function sortReposByRecency(repos) {
+  return [...repos].sort((a, b3) => {
+    const ta = Date.parse(a.created_at ?? "") || 0;
+    const tb = Date.parse(b3.created_at ?? "") || 0;
+    return tb - ta;
+  });
+}
 function buildPromptOptions(repos) {
   return [
-    ...repos.map((r) => ({ kind: "repo", label: r.slug, value: r.slug })),
     {
       kind: "action",
       label: "Add repositories...",
       value: ADD_REPOSITORIES_VALUE,
       hint: "Open GitHub and refresh this list"
-    }
+    },
+    ...repos.map((r) => ({ kind: "repo", label: r.slug, value: r.slug }))
   ];
 }
 function hasNewVisibleRepository(previousRepos, nextRepos) {
@@ -7297,14 +7306,59 @@ async function createDeploymentForRepo(trpc, orgID, spaceID, repo) {
       deployment_id: d3.deployment_id,
       data_source_id: dataSource.data_source_id
     })));
-    return { deployment_id: deployment.deployment_id };
+    return {
+      deployment_id: deployment.deployment_id,
+      data_source_id: dataSource.data_source_id
+    };
   } catch (err) {
     const msg = err instanceof Error ? err.message : String(err);
     logger.error("setup", `Failed to wire up ${repo.slug}: ${msg}`);
     return null;
   }
 }
-async function stepConnectGitHubRepo(cfg, detected = detectGitRepo()) {
+async function verifyDataSourcesPersist(trpc, orgID, expectedDataSourceIds, opts = {}) {
+  const expected = new Set(expectedDataSourceIds);
+  if (expected.size === 0) {
+    return { alive: new Set, dropped: new Set };
+  }
+  const timeoutMs = opts.timeoutMs ?? DATA_SOURCE_VERIFY_POLL_TIMEOUT_MS;
+  const intervalMs = opts.intervalMs ?? DATA_SOURCE_VERIFY_POLL_INTERVAL_MS;
+  const startedAt = Date.now();
+  let alive = new Set;
+  let dropped = new Set;
+  let firstIteration = true;
+  while (firstIteration || Date.now() - startedAt < timeoutMs) {
+    firstIteration = false;
+    let listed = [];
+    try {
+      listed = await trpc.dataSource.list.query({
+        org_id: orgID,
+        excluded_provider_slugs: []
+      });
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      logger.warn("setup", `dataSource.list during verify failed: ${msg}`);
+    }
+    const presentNow = new Set(listed.map((d3) => d3.data_source_id).filter((id) => Boolean(id)));
+    alive = new Set([...expected].filter((id) => presentNow.has(id)));
+    dropped = new Set([...expected].filter((id) => !presentNow.has(id)));
+    if (dropped.size > 0)
+      return { alive, dropped };
+    if (timeoutMs === 0)
+      break;
+    await sleep2(intervalMs);
+  }
+  return { alive, dropped };
+}
+async function deleteOrphanDeployment(trpc, deploymentID, slug) {
+  try {
+    await trpc.workspaces.delete.mutate(deploymentID);
+  } catch (err) {
+    const msg = err instanceof Error ? err.message : String(err);
+    logger.warn("setup", `Failed to revert orphan deployment for ${slug}: ${msg}`);
+  }
+}
+async function stepConnectGitHubRepo(cfg, detected = detectGitRepo(), opts = {}) {
   logger.info("setup", "Step: connect GitHub repo(s)");
   if (!cfg.org_id || !cfg.space_id) {
     M2.warn("Cannot connect GitHub: your Dosu workspace is missing org/space context. Re-run `dosu setup` from a fresh state.");
@@ -7327,9 +7381,10 @@ async function stepConnectGitHubRepo(cfg, detected = detectGitRepo()) {
 ${lines}`);
     }
     const selected = await promptGitHubRepositories({
-      message: "Select repositories to connect",
+      message: `Select repositories to connect ${dim(`(${undeployed.length} available)`)}`,
       options: buildPromptOptions(undeployed),
-      initialValues: []
+      initialValues: [],
+      maxItems: REPO_MULTISELECT_MAX_ITEMS
     });
     if (pD(selected)) {
       logger.info("setup", "Repository selection cancelled");
@@ -7360,29 +7415,55 @@ ${lines}`);
         continue;
       const result = await createDeploymentForRepo(trpc, orgID, spaceID, repo);
       if (result) {
-        created.push({ deployment_id: result.deployment_id, slug });
+        created.push({
+          deployment_id: result.deployment_id,
+          data_source_id: result.data_source_id,
+          slug
+        });
+      }
+    }
+    const expectedDsIds = created.map((c) => c.data_source_id).filter((id) => Boolean(id));
+    const survivors = await verifyDataSourcesPersist(trpc, orgID, expectedDsIds, opts.verify);
+    const reverted = [];
+    if (survivors.dropped.size > 0) {
+      const droppedEntries = created.filter((c) => c.data_source_id && survivors.dropped.has(c.data_source_id));
+      for (const entry of droppedEntries) {
+        await deleteOrphanDeployment(trpc, entry.deployment_id, entry.slug);
+        reverted.push({ slug: entry.slug, deployment_id: entry.deployment_id });
       }
     }
-    if (created.length === 0) {
+    const survived = created.filter((c) => !c.data_source_id || survivors.alive.has(c.data_source_id));
+    if (survived.length === 0) {
       s.stop("Failed");
-      M2.error("Could not connect any repos. Check `dosu logs --tail 50` for details.");
+      if (reverted.length > 0) {
+        M2.error(`Couldn't sync any repos — Dosu doesn't have GitHub access to: ${reverted.map((r) => r.slug).join(", ")}.`);
+      } else {
+        M2.error("Could not connect any repos. Check `dosu logs --tail 50` for details.");
+      }
       return { advance: false, has_connected_repo: deployed.length > 0 };
     }
-    s.stop(`Connected ${created.length} repo${created.length === 1 ? "" : "s"}`);
-    for (const { slug, deployment_id } of created) {
+    if (reverted.length > 0) {
+      s.stop(`Connected ${survived.length} repo${survived.length === 1 ? "" : "s"} · ${reverted.length} skipped`);
+      M2.warn(`Dosu couldn't sync ${reverted.length} repo${reverted.length === 1 ? "" : "s"} (GitHub App has no access): ${reverted.map((r) => r.slug).join(", ")}`);
+    } else {
+      s.stop(`Connected ${survived.length} repo${survived.length === 1 ? "" : "s"}`);
+    }
+    for (const { slug, deployment_id } of survived) {
       M2.success(`${slug}
 ${dim(`deployment ${deployment_id}`)}`);
     }
-    const primary = (detected && created.find((c) => c.slug === detected.slug)) ?? created[0];
+    const primary = (detected && survived.find((c) => c.slug === detected.slug)) ?? survived[0];
+    const survivingDataSourceIds = survived.map((c) => c.data_source_id).filter((id) => Boolean(id));
     return {
       advance: true,
       has_connected_repo: true,
       deployment_id: primary.deployment_id,
-      space_id: cfg.space_id
+      space_id: cfg.space_id,
+      created_data_source_ids: survivingDataSourceIds
     };
   }
 }
-var INSTALLATION_TIMEOUT_MS, REPO_REFRESH_POLL_INTERVAL_MS = 500, REPO_REFRESH_POLL_TIMEOUT_MS = 1e4;
+var INSTALLATION_TIMEOUT_MS, REPO_REFRESH_POLL_INTERVAL_MS = 500, REPO_REFRESH_POLL_TIMEOUT_MS = 1e4, REPO_MULTISELECT_MAX_ITEMS = 10, DATA_SOURCE_VERIFY_POLL_INTERVAL_MS = 1000, DATA_SOURCE_VERIFY_POLL_TIMEOUT_MS = 1e4;
 var init_github_step = __esm(() => {
   init_dist6();
   init_trpc();
@@ -7771,7 +7852,7 @@ async function stepImportGitHubDocs(cfg, opts = {}) {
     return { advance: false };
   }
   const trpc = createTypedClient(cfg);
-  const files = opts.waitForFreshDocs ? await waitForImportableGithubFiles(trpc, cfg.org_id, cfg.space_id) : await fetchImportableGithubFiles(trpc, cfg.space_id);
+  const files = opts.waitForFreshDocs ? await waitForImportableGithubFiles(trpc, cfg.org_id, cfg.space_id, opts.expectedDataSourceIds) : await fetchImportableGithubFiles(trpc, cfg.space_id);
   if (files === null) {
     return { advance: false };
   }
@@ -7891,7 +7972,7 @@ Your GitHub docs are ready, and onboarding is complete.`);
   M2.warn(`Imported ${processed - failed} of ${total} doc${total === 1 ? "" : "s"}; ${failed} failed.
 You can review the failed docs later, but onboarding is complete.`);
 }
-async function waitForImportableGithubFiles(trpc, orgID, spaceID) {
+async function waitForImportableGithubFiles(trpc, orgID, spaceID, expectedDataSourceIds) {
   while (true) {
     const spinner = Y2();
     spinner.start("Scanning repositories for markdown documents...");
@@ -7905,7 +7986,7 @@ async function waitForImportableGithubFiles(trpc, orgID, spaceID) {
         return latestFiles;
       }
       const dataSources = await fetchGitHubDataSources(trpc, orgID);
-      if (dataSources.length > 0 && dataSources.every((ds) => ds.is_indexed === true)) {
+      if (isScanComplete(dataSources, expectedDataSourceIds)) {
         spinner.stop("No markdown docs found");
         return [];
       }
@@ -7928,6 +8009,24 @@ async function waitForImportableGithubFiles(trpc, orgID, spaceID) {
     }
   }
 }
+function isScanComplete(dataSources, expectedDataSourceIds) {
+  if (expectedDataSourceIds && expectedDataSourceIds.length > 0) {
+    const byId = new Map;
+    for (const ds of dataSources) {
+      if (ds.data_source_id)
+        byId.set(ds.data_source_id, ds);
+    }
+    for (const id of expectedDataSourceIds) {
+      const ds = byId.get(id);
+      if (!ds)
+        continue;
+      if (ds.is_indexed !== true)
+        return false;
+    }
+    return true;
+  }
+  return dataSources.length > 0 && dataSources.every((ds) => ds.is_indexed === true);
+}
 async function fetchGitHubDataSources(trpc, orgID) {
   try {
     const dataSources = await trpc.dataSource.list.query({
@@ -8275,9 +8374,14 @@ async function runSetup(opts = {}) {
   const apiClient = new Client(cfg);
   let cloudSetupContext = null;
   if (cfg.mode !== MODE_OSS) {
+    const s = Y2();
+    s.start("Loading your workspace...");
     cloudSetupContext = await resolveCloudSetupContext(cfg);
-    if (!cloudSetupContext)
+    if (!cloudSetupContext) {
+      s.stop("Workspace load failed");
       return;
+    }
+    s.stop("Workspace loaded");
   }
   if (cfg.mode !== MODE_OSS && cloudSetupContext?.kind === "onboarding") {
     const ok = await bindOnboardingDeployment(apiClient, cfg, cloudSetupContext.targetOrg ?? null);
@@ -8320,7 +8424,8 @@ async function runSetup(opts = {}) {
     }
     const { stepImportGitHubDocs: stepImportGitHubDocs2 } = await Promise.resolve().then(() => (init_github_doc_import_step(), exports_github_doc_import_step));
     const importResult = await stepImportGitHubDocs2(cfg, {
-      waitForFreshDocs: Boolean(connectResult.deployment_id)
+      waitForFreshDocs: Boolean(connectResult.deployment_id),
+      expectedDataSourceIds: connectResult.created_data_source_ids
     });
     if (!importResult.advance)
       return;
@@ -8537,6 +8642,8 @@ async function bindOnboardingDeployment(apiClient, cfg, targetOrg) {
   cfg.org_id = deployment.org_id;
   cfg.space_id = deployment.space_id;
   logger.info("setup", `Bound onboarding context org=${targetOrg.org_id} deployment=${deployment.deployment_id}`);
+  M2.success(`Organization
+${dim(targetOrg.name)}`);
   return true;
 }
 async function resolveOnboardingDeployment(apiClient, targetOrg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dosu/cli",
-  "version": "0.11.0-alpha.3",
+  "version": "0.11.0-alpha.4",
   "type": "module",
   "description": "Dosu CLI - Manage MCP servers for AI tools",
   "license": "MIT",