@geravant/sinain 1.15.4 → 1.15.5

package/launcher.js

@@ -64,11 +64,22 @@ async function main() {
   console.log();
 
   // Run setup wizard on first launch (no ~/.sinain/.env) or when --setup flag is passed
+  //
+  // Delegates to onboard.js's clack-based runOnboard (Mitch's wizard from
+  // PR #43). Previously, launcher.js had its own readline-based setupWizard
+  // that diverged from `npx sinain onboard`'s flow — same package, two
+  // different setup experiences depending on entry point. This collapses
+  // both paths to a single source of truth in config-shared.js.
+  //
+  // skipLaunchPrompt: true tells runOnboard not to ask "start sinain now?"
+  // at the end — we're already inside the launcher and will continue
+  // start-up automatically once the wizard returns.
   const userEnvPath = path.join(SINAIN_DIR, ".env");
   const envExists = fs.existsSync(userEnvPath);
   if (forceSetup || !envExists) {
     log(envExists ? "Re-running setup wizard (--setup flag)..." : "First-time setup — running wizard...");
-    await setupWizard(userEnvPath);
+    const { runOnboard } = await import("./onboard.js");
+    await runOnboard({ skipLaunchPrompt: true });
   } else {
     log(`Existing config found at ${DIM}${userEnvPath}${RESET} — skipping wizard. (Use ${BOLD}--setup${RESET} to re-configure.)`);
   }

package/onboard.js

@@ -272,6 +272,15 @@ export async function runOnboard(args = {}) {
   printOutro();
 
   // ── Start? ────────────────────────────────────────────────────────────
+  //
+  // When called from launcher.js (via `sinain start --setup`), the launcher
+  // is about to start sinain itself — asking the user again is redundant.
+  // Caller passes { skipLaunchPrompt: true } in that case.
+
+  if (args.skipLaunchPrompt) {
+    p.outro("Setup complete — starting sinain...");
+    return;
+  }
 
   const startNow = guard(await p.confirm({
     message: "Start sinain now?",
@@ -309,6 +318,18 @@ function printOutro() {
 }
 
 // ── CLI entry point ─────────────────────────────────────────────────────────
+//
+// Guarded so `import { runOnboard } from "./onboard.js"` from launcher.js
+// (or anywhere else) doesn't trigger side effects. The CLI block runs only
+// when this file is the program's entry point — i.e. `node onboard.js ...`
+// or `npx @geravant/sinain onboard ...`.
+
+const isMainModule = import.meta.url === new URL(`file://${process.argv[1]}`).href
+  || (process.argv[1] && import.meta.url.endsWith(path.basename(process.argv[1])));
+
+if (!isMainModule) {
+  // Imported as a module — exports are available; do not parse argv.
+} else {
 
 const cliArgs = process.argv.slice(2);
 const flags = {};
@@ -359,3 +380,5 @@ if (flags.nonInteractive) {
     process.exit(1);
   });
 }
+
+}  // end isMainModule guard

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geravant/sinain",
-  "version": "1.15.4",
+  "version": "1.15.5",
   "description": "Ambient intelligence that sees what you see, hears what you hear, and acts on your behalf",
   "type": "module",
   "bin": {