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

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.5";
 
 // src/debug/logger.ts
 import {
@@ -4744,10 +4744,11 @@ function checkForSkillUpdates() {
     const isStale = !cache || Date.now() - cache.lastCheck > CHECK_INTERVAL_MS;
     if (isStale) {
       fetchLatestSha().then((latest) => {
+        const fresh = readSkillCache();
         writeSkillCache({
           lastCheck: Date.now(),
-          latestSha: latest ?? cache?.latestSha ?? "",
-          installedSha: cache?.installedSha ?? ""
+          latestSha: latest ?? fresh?.latestSha ?? "",
+          installedSha: fresh?.installedSha ?? ""
         });
         if (latest) {
           logger.debug("skill-update-check", `Cached latest SHA: ${latest}`);
@@ -6378,6 +6379,28 @@ var init_default_deployment_config = __esm(() => {
   };
 });
 
+// src/setup/prompt-symbols.ts
+function symbol(unicodeValue, asciiValue) {
+  return unicode ? unicodeValue : asciiValue;
+}
+function supportsUnicode() {
+  if (process.platform !== "win32") {
+    return process.env.TERM !== "linux";
+  }
+  return !!(process.env.CI || process.env.WT_SESSION || process.env.TERMINUS_SUBLIME || process.env.ConEmuTask === "{cmd::Cmder}" || process.env.TERM_PROGRAM === "Terminus-Sublime" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm");
+}
+var unicode, ACTIVE_SYMBOL, SUBMIT_SYMBOL, CANCEL_SYMBOL, BAR, FOOTER, CHECKBOX_OFF, CHECKBOX_ON, ELLIPSIS = "...";
+var init_prompt_symbols = __esm(() => {
+  unicode = supportsUnicode();
+  ACTIVE_SYMBOL = symbol("◆", "*");
+  SUBMIT_SYMBOL = symbol("◇", "o");
+  CANCEL_SYMBOL = symbol("■", "x");
+  BAR = symbol("│", "|");
+  FOOTER = symbol("└", "-");
+  CHECKBOX_OFF = symbol("◻", "[ ]");
+  CHECKBOX_ON = symbol("◼", "[+]");
+});
+
 // src/setup/github-repo-prompt.ts
 async function promptGitHubRepositories({
   message,
@@ -6416,27 +6439,11 @@ function visibleOptions(cursor, options, maxItems) {
     return { kind: "option", index: start + index };
   });
 }
-function supportsUnicode() {
-  if (process.platform !== "win32") {
-    return process.env.TERM !== "linux";
-  }
-  return !!(process.env.CI || process.env.WT_SESSION || process.env.TERMINUS_SUBLIME || process.env.ConEmuTask === "{cmd::Cmder}" || process.env.TERM_PROGRAM === "Terminus-Sublime" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm");
-}
-function symbol(unicodeValue, asciiValue) {
-  return unicode ? unicodeValue : asciiValue;
-}
-var import_picocolors22, unicode, ACTIVE_SYMBOL, SUBMIT_SYMBOL, CANCEL_SYMBOL, BAR, FOOTER, CHECKBOX_OFF, CHECKBOX_ON, ACTION_ARROW, ELLIPSIS = "...", ADD_REPOSITORIES_VALUE = "__add_repositories__", GitHubRepoPrompt;
+var import_picocolors22, ACTION_ARROW, ADD_REPOSITORIES_VALUE = "__add_repositories__", GitHubRepoPrompt;
 var init_github_repo_prompt = __esm(() => {
   init_dist5();
+  init_prompt_symbols();
   import_picocolors22 = __toESM(require_picocolors(), 1);
-  unicode = supportsUnicode();
-  ACTIVE_SYMBOL = symbol("◆", "*");
-  SUBMIT_SYMBOL = symbol("◇", "o");
-  CANCEL_SYMBOL = symbol("■", "x");
-  BAR = symbol("│", "|");
-  FOOTER = symbol("└", "-");
-  CHECKBOX_OFF = symbol("◻", "[ ]");
-  CHECKBOX_ON = symbol("◼", "[+]");
   ACTION_ARROW = symbol("→", ">");
   GitHubRepoPrompt = class GitHubRepoPrompt extends x {
     options;
@@ -7148,6 +7155,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 +7183,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) {
@@ -7289,7 +7305,8 @@ async function createDeploymentForRepo(trpc, orgID, spaceID, repo) {
     });
     if (!dataSource?.data_source_id) {
       logger.warn("setup", `dataSource.create returned no data_source for ${repo.slug}`);
-      return { deployment_id: deployment.deployment_id };
+      await deleteOrphanDeployment(trpc, deployment.deployment_id, repo.slug);
+      return null;
     }
     await trpc.dataSource.syncDataSource.mutate(dataSource.data_source_id);
     const spaceDeployments = await trpc.workspaces.listForSpace.query(spaceID);
@@ -7297,14 +7314,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 +7389,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 +7423,54 @@ ${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
+        });
       }
     }
-    if (created.length === 0) {
+    const expectedDsIds = created.map((c) => c.data_source_id);
+    const survivors = await verifyDataSourcesPersist(trpc, orgID, expectedDsIds, opts.verify);
+    const reverted = [];
+    if (survivors.dropped.size > 0) {
+      const droppedEntries = created.filter((c) => 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 });
+      }
+    }
+    const survived = created.filter((c) => 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];
     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: survived.map((c) => c.data_source_id)
     };
   }
 }
-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();
@@ -7439,28 +7527,12 @@ function wrapIndex(index, length) {
 function isPrintableKey(key) {
   return key.length === 1 && key >= " " && key !== "";
 }
-function supportsUnicode2() {
-  if (process.platform !== "win32") {
-    return process.env.TERM !== "linux";
-  }
-  return !!(process.env.CI || process.env.WT_SESSION || process.env.TERMINUS_SUBLIME || process.env.ConEmuTask === "{cmd::Cmder}" || process.env.TERM_PROGRAM === "Terminus-Sublime" || process.env.TERM_PROGRAM === "vscode" || process.env.TERM === "xterm-256color" || process.env.TERM === "alacritty" || process.env.TERMINAL_EMULATOR === "JetBrains-JediTerm");
-}
-function symbol2(unicodeValue, asciiValue) {
-  return unicode2 ? unicodeValue : asciiValue;
-}
-var import_picocolors23, unicode2, ACTIVE_SYMBOL2, SUBMIT_SYMBOL2, CANCEL_SYMBOL2, BAR2, FOOTER2, CHECKBOX_OFF2, CHECKBOX_ON2, CHECKBOX_PARTIAL, ELLIPSIS2 = "...", MAX_VISIBLE_FILE_ITEMS = 15, GitHubDocsImportPrompt;
+var import_picocolors23, CHECKBOX_PARTIAL, MAX_VISIBLE_FILE_ITEMS = 15, GitHubDocsImportPrompt;
 var init_github_doc_import_prompt = __esm(() => {
   init_dist5();
+  init_prompt_symbols();
   import_picocolors23 = __toESM(require_picocolors(), 1);
-  unicode2 = supportsUnicode2();
-  ACTIVE_SYMBOL2 = symbol2("◆", "*");
-  SUBMIT_SYMBOL2 = symbol2("◇", "o");
-  CANCEL_SYMBOL2 = symbol2("■", "x");
-  BAR2 = symbol2("│", "|");
-  FOOTER2 = symbol2("└", "-");
-  CHECKBOX_OFF2 = symbol2("◻", "[ ]");
-  CHECKBOX_ON2 = symbol2("◼", "[+]");
-  CHECKBOX_PARTIAL = symbol2("◧", "[-]");
+  CHECKBOX_PARTIAL = symbol("◧", "[-]");
   GitHubDocsImportPrompt = class GitHubDocsImportPrompt extends x {
     repositories;
     mode = "repos";
@@ -7676,24 +7748,24 @@ var init_github_doc_import_prompt = __esm(() => {
       return "partial";
     }
     renderPrompt() {
-      const promptSymbol = this.state === "submit" ? import_picocolors23.default.green(SUBMIT_SYMBOL2) : this.state === "cancel" ? import_picocolors23.default.red(CANCEL_SYMBOL2) : import_picocolors23.default.cyan(ACTIVE_SYMBOL2);
+      const promptSymbol = this.state === "submit" ? import_picocolors23.default.green(SUBMIT_SYMBOL) : this.state === "cancel" ? import_picocolors23.default.red(CANCEL_SYMBOL) : import_picocolors23.default.cyan(ACTIVE_SYMBOL);
       const title = this.mode === "repos" ? "Select docs to import" : this.currentRepository?.slug ?? "Files";
-      const header = `${import_picocolors23.default.gray(BAR2)}
+      const header = `${import_picocolors23.default.gray(BAR)}
 ${promptSymbol}  ${title}
 `;
       if (this.state === "submit") {
-        return `${header}${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim(this.submitLabel())}`;
+        return `${header}${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim(this.submitLabel())}`;
       }
       if (this.state === "cancel") {
-        return `${header}${import_picocolors23.default.gray(BAR2)}`;
+        return `${header}${import_picocolors23.default.gray(BAR)}`;
       }
       return this.mode === "repos" ? this.renderRepositoryMode(header) : this.renderFileMode(header);
     }
     renderRepositoryMode(header) {
-      const help = `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim("space: import all docs in a repo   →: browse repo docs   Enter: confirm")}`;
+      const help = `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim("space: import all docs in a repo   →: browse repo docs   Enter: confirm")}`;
       const body = visibleOptions2(this.repoCursor, this.repositories.length).map((option) => {
         if (option.kind === "ellipsis") {
-          return `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim(ELLIPSIS2)}`;
+          return `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim(ELLIPSIS)}`;
         }
         const repo = this.repositories[option.index];
         const isActive = option.index === this.repoCursor;
@@ -7701,53 +7773,53 @@ ${promptSymbol}  ${title}
         const marker = this.renderRepositoryMarker(state, isActive);
         const label = isActive ? import_picocolors23.default.cyan(repo.slug) : repo.slug;
         const hint = state === "locked" ? ` ${import_picocolors23.default.dim("(All docs already imported)")}` : "";
-        return `${import_picocolors23.default.gray(BAR2)}  ${marker} ${label}${hint}`;
+        return `${import_picocolors23.default.gray(BAR)}  ${marker} ${label}${hint}`;
       });
       return `${header}${help}
-${import_picocolors23.default.gray(BAR2)}
+${import_picocolors23.default.gray(BAR)}
 ${body.join(`
 `)}
-${import_picocolors23.default.cyan(FOOTER2)}`;
+${import_picocolors23.default.cyan(FOOTER)}`;
     }
     renderFileMode(header) {
-      const back = `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim("←: back / Enter")}`;
+      const back = `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim("←: back / Enter")}`;
       const searchValue = this.searchQuery || import_picocolors23.default.dim(this.searchActive ? "" : "type to filter");
-      const search = `${import_picocolors23.default.gray(BAR2)}  Search: ${searchValue}`;
-      const help = `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim("space: toggle doc   type: search   a: select all visible   ←: back / Enter")}`;
+      const search = `${import_picocolors23.default.gray(BAR)}  Search: ${searchValue}`;
+      const help = `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim("space: toggle doc   type: search   a: select all visible   ←: back / Enter")}`;
       const body = visibleOptions2(this.fileCursor, this.filteredFiles.length, MAX_VISIBLE_FILE_ITEMS).map((option) => {
         if (option.kind === "ellipsis") {
-          return `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim(ELLIPSIS2)}`;
+          return `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim(ELLIPSIS)}`;
         }
         const file = this.filteredFiles[option.index];
         const isActive = option.index === this.fileCursor;
         const isSelected = this.selectedIds.has(file.id);
-        const marker = file.is_synced ? isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF2) : import_picocolors23.default.dim(CHECKBOX_OFF2) : isSelected ? isActive ? import_picocolors23.default.cyan(CHECKBOX_ON2) : CHECKBOX_ON2 : isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF2) : CHECKBOX_OFF2;
+        const marker = file.is_synced ? isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF) : import_picocolors23.default.dim(CHECKBOX_OFF) : isSelected ? isActive ? import_picocolors23.default.cyan(CHECKBOX_ON) : CHECKBOX_ON : isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF) : CHECKBOX_OFF;
         const label = file.is_synced ? isActive ? import_picocolors23.default.cyan(file.path) : import_picocolors23.default.dim(file.path) : isActive ? import_picocolors23.default.cyan(file.path) : file.path;
         const hint = file.is_synced ? ` ${import_picocolors23.default.dim("(Already imported)")}` : "";
-        return `${import_picocolors23.default.gray(BAR2)}  ${marker} ${label}${hint}`;
+        return `${import_picocolors23.default.gray(BAR)}  ${marker} ${label}${hint}`;
       });
       const content = body.length > 0 ? body.join(`
-`) : `${import_picocolors23.default.gray(BAR2)}  ${import_picocolors23.default.dim("No docs match your search.")}`;
+`) : `${import_picocolors23.default.gray(BAR)}  ${import_picocolors23.default.dim("No docs match your search.")}`;
       return `${header}${back}
-${import_picocolors23.default.gray(BAR2)}
+${import_picocolors23.default.gray(BAR)}
 ${search}
-${import_picocolors23.default.gray(BAR2)}
+${import_picocolors23.default.gray(BAR)}
 ${content}
-${import_picocolors23.default.gray(BAR2)}
+${import_picocolors23.default.gray(BAR)}
 ${help}
-${import_picocolors23.default.cyan(FOOTER2)}`;
+${import_picocolors23.default.cyan(FOOTER)}`;
     }
     renderRepositoryMarker(state, isActive) {
       if (state === "all") {
-        return isActive ? import_picocolors23.default.cyan(CHECKBOX_ON2) : CHECKBOX_ON2;
+        return isActive ? import_picocolors23.default.cyan(CHECKBOX_ON) : CHECKBOX_ON;
       }
       if (state === "partial") {
         return isActive ? import_picocolors23.default.cyan(CHECKBOX_PARTIAL) : CHECKBOX_PARTIAL;
       }
       if (state === "locked") {
-        return isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF2) : import_picocolors23.default.dim(CHECKBOX_OFF2);
+        return isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF) : import_picocolors23.default.dim(CHECKBOX_OFF);
       }
-      return isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF2) : CHECKBOX_OFF2;
+      return isActive ? import_picocolors23.default.cyan(CHECKBOX_OFF) : CHECKBOX_OFF;
     }
     submitLabel() {
       const count = this.selectedIds.size;
@@ -7771,7 +7843,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 +7963,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 +7977,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 +8000,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 +8365,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 +8415,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;
@@ -8351,6 +8447,12 @@ async function runSetup(opts = {}) {
     Se("\uD83C\uDF89 Setup complete!");
   }
 }
+function applyDeployment(cfg, d3) {
+  cfg.deployment_id = d3.deployment_id;
+  cfg.deployment_name = d3.name;
+  cfg.org_id = d3.org_id;
+  cfg.space_id = d3.space_id;
+}
 function applyModeOverride(cfg, opts) {
   if (!opts.mode)
     return;
@@ -8532,11 +8634,10 @@ async function bindOnboardingDeployment(apiClient, cfg, targetOrg) {
     return false;
   }
   cfg.mode = undefined;
-  cfg.deployment_id = deployment.deployment_id;
-  cfg.deployment_name = deployment.name;
-  cfg.org_id = deployment.org_id;
-  cfg.space_id = deployment.space_id;
+  applyDeployment(cfg, deployment);
   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) {
@@ -8550,19 +8651,13 @@ async function resolveDeployment(apiClient, cfg, opts) {
     if (!d4)
       return false;
     cfg.mode = undefined;
-    cfg.deployment_id = d4.deployment_id;
-    cfg.deployment_name = d4.name;
-    cfg.org_id = d4.org_id;
-    cfg.space_id = d4.space_id;
+    applyDeployment(cfg, d4);
     return true;
   }
   if (cfg.mode === MODE_OSS) {
     const deployments = await fetchDeployments(apiClient);
     if (deployments.length > 0) {
-      cfg.deployment_id = deployments[0].deployment_id;
-      cfg.deployment_name = deployments[0].name;
-      cfg.org_id = deployments[0].org_id;
-      cfg.space_id = deployments[0].space_id;
+      applyDeployment(cfg, deployments[0]);
     }
     return true;
   }
@@ -8573,10 +8668,7 @@ async function resolveDeployment(apiClient, cfg, opts) {
   if (!d3)
     return false;
   cfg.mode = undefined;
-  cfg.deployment_id = d3.deployment_id;
-  cfg.deployment_name = d3.name;
-  cfg.org_id = d3.org_id;
-  cfg.space_id = d3.space_id;
+  applyDeployment(cfg, d3);
   return true;
 }
 async function fetchDeployments(apiClient) {

package/package.json

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