@algolia/wizard 0.38.0-rc.131.267 → 0.38.0-rc.131.269

package/dist/main.js

@@ -1432,9 +1432,9 @@ function reconcileWorkflowState(state, workflow) {
   }
   return state;
 }
-async function isResumableWorkflow(workflow) {
+async function loadResumableState(workflow) {
   const persisted = await loadWorkflowState(workflow.id);
-  return persisted != null && reconcileWorkflowState(persisted, workflow) != null;
+  return persisted ? reconcileWorkflowState(persisted, workflow) : null;
 }
 function initWorkflowState(workflow, now) {
   return {
@@ -1538,11 +1538,11 @@ async function runStep(state, index, step, appId) {
     durationMs: Date.now() - startedAt
   });
 }
-async function runWorkflow(workflow, appId) {
+async function runWorkflow(workflow, appId, resumableState) {
   const store = useWizard.getState();
   try {
-    const persisted = await loadWorkflowState(workflow.id);
-    const state = (persisted && reconcileWorkflowState(persisted, workflow)) ?? initWorkflowState(workflow, nowIso());
+    const resolved2 = resumableState !== void 0 ? resumableState : await loadResumableState(workflow);
+    const state = resolved2 ?? initWorkflowState(workflow, nowIso());
     ensureExecutedStepCount(state);
     store.startWorkflow(
       {
@@ -3330,7 +3330,7 @@ async function runAnalysis(mode, extraInstructions = []) {
 // package.json
 var package_default = {
   name: "@algolia/wizard",
-  version: "0.38.0-rc.131.267",
+  version: "0.38.0-rc.131.269",
   description: "Magically implement Algolia functionality in your codebase",
   type: "module",
   engines: {
@@ -5619,15 +5619,23 @@ function readValue(raw) {
 function blockReasonFor(app) {
   return app.status !== "active" ? "Paused" : "Missing permissions";
 }
-function secondaryFor(app) {
+function secondaryFor(app, highlightId) {
   if (!canSelectApplication(app)) {
     return { kind: "text", value: blockReasonFor(app) };
   }
+  if (app.id === highlightId) {
+    return { kind: "badge", value: "[DETECTED]" };
+  }
   return app.plan ? { kind: "badge", value: app.plan } : void 0;
 }
 function labelFor(app) {
   return app.name.trim() ? `${app.name} \u2014 ${app.id}` : app.id;
 }
+async function isEligible(app) {
+  const apps = await listApplications();
+  const full = apps.find((candidate) => candidate.id === app.id);
+  return full != null && canSelectApplication(full);
+}
 async function selectAndReport(app) {
   const store = useWizard.getState();
   store.setSettingUpApp(app.id);
@@ -5637,7 +5645,7 @@ async function selectAndReport(app) {
     store.setSettingUpApp(null);
   }
 }
-async function promptForApplication(leadIn = []) {
+async function promptForApplication(highlight) {
   const store = useWizard.getState();
   const unordered = await listApplications();
   if (unordered.length === 0) {
@@ -5654,14 +5662,22 @@ async function promptForApplication(leadIn = []) {
     ...unordered.filter(canSelectApplication),
     ...unordered.filter((app) => !canSelectApplication(app))
   ];
-  const messages = [...leadIn];
+  const envApp = highlight ? unordered.find((app) => app.id === highlight.id) : void 0;
+  const highlightIndex = envApp && canSelectApplication(envApp) ? apps.indexOf(envApp) : -1;
+  const messages = [];
+  if (highlight && highlightIndex < 0) {
+    messages.push(
+      envApp ? `Could not use ${highlight.id} from ${highlight.file} \u2014 it\u2019s ${blockReasonFor(envApp).toLowerCase()}. Pick another below.` : `Could not use ${highlight.id} from ${highlight.file} \u2014 it may have been removed, or this account may not have access to it.`
+    );
+  }
   for (; ; ) {
     const choice = await store.requestUserInput({
       prompt: "Which Algolia application should the wizard work in?",
       promptType: "multipleChoice",
       options: apps.map(labelFor),
-      secondary: apps.map(secondaryFor),
+      secondary: apps.map((app) => secondaryFor(app, highlight?.id)),
       disabled: apps.map((app) => !canSelectApplication(app)),
+      ...highlightIndex >= 0 ? { defaultSelectedIndex: highlightIndex } : {},
       messages
     });
     const chosen = apps.find((app) => labelFor(app) === choice);
@@ -5681,47 +5697,15 @@ async function promptForApplication(leadIn = []) {
     }
   }
 }
-async function confirmEnvApplication(env, current) {
-  const useEnv = `Use ${env.id} (from ${env.file})`;
-  const choice = await useWizard.getState().requestUserInput({
-    prompt: "Select an application",
-    promptType: "multipleChoice",
-    options: [
-      useEnv,
-      current ? `Use ${labelFor(current)} (already selected)` : "Pick a different application"
-    ],
-    messages: [
-      `${env.file} already sets ${env.name}=${env.id}.`,
-      "Which Algolia application would you like to use?"
-    ]
-  });
-  if (choice === useEnv) return selectEnvApplication(env);
-  return current ? selectAndReport(current) : null;
-}
-async function selectEnvApplication(env) {
-  try {
-    return await selectAndReport({ id: env.id, name: "" });
-  } catch (err) {
-    logger.warn(
-      { app: env.id, err: err.message },
-      "could not select the application named in env; falling back to the picker"
-    );
-    return promptForApplication([
-      `Could not select ${env.id} from ${env.file} \u2014 it may have been removed, or this account may not have access to it.`
-    ]);
-  }
-}
 async function ensureApplication(isResuming) {
   const current = await currentApplication();
   if (isResuming) {
-    return current ?? await promptForApplication();
+    if (current && await isEligible(current)) return current;
+    return promptForApplication();
   }
   const env = await findEnvApplicationId();
-  if (env && env.id !== current?.id) {
-    const chosen = await confirmEnvApplication(env, current);
-    if (chosen) return chosen;
-  }
-  return promptForApplication();
+  if (!env) return promptForApplication();
+  return promptForApplication({ id: env.id, file: env.file });
 }
 
 // src/lib/seed.ts
@@ -6085,15 +6069,15 @@ async function run(workflow) {
   }
   store.setUser(user);
   let app;
+  const resumableState = await loadResumableState(workflow);
   try {
-    const resuming = await isResumableWorkflow(workflow);
-    app = await ensureApplication(resuming);
+    app = await ensureApplication(resumableState != null);
   } catch (err) {
     store.setError(err instanceof Error ? err.message : String(err));
     await instance.waitUntilExit();
     process.exit(1);
   }
-  runWorkflow(workflow, app.id);
+  runWorkflow(workflow, app.id, resumableState);
 }
 await requestTerminalSize();
 var started = await startup();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algolia/wizard",
-  "version": "0.38.0-rc.131.267",
+  "version": "0.38.0-rc.131.269",
   "description": "Magically implement Algolia functionality in your codebase",
   "type": "module",
   "engines": {