adhdev 0.9.76-rc.3 → 0.9.76-rc.5

package/dist/cli/index.js

@@ -90303,7 +90303,7 @@ var init_adhdev_daemon = __esm({
     init_version();
     init_src();
     init_runtime_defaults();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.3" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.9.76-rc.5" });
     AdhdevDaemon = class _AdhdevDaemon {
       localHttpServer = null;
       localWss = null;
@@ -91524,8 +91524,54 @@ ${err?.stack || ""}`);
 // src/wizard.ts
 var wizard_exports = {};
 __export(wizard_exports, {
+  buildSetupReleaseContext: () => buildSetupReleaseContext,
+  readLatestPublishedCliVersion: () => readLatestPublishedCliVersion,
   runWizard: () => runWizard
 });
+function normalizeSetupReleaseChannel(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "stable" || normalized === "latest") return "stable";
+  if (normalized === "preview" || normalized === "next") return "preview";
+  return null;
+}
+function inferReleaseChannelFromServerUrl(serverUrl) {
+  if (typeof serverUrl !== "string") return null;
+  const normalized = serverUrl.trim().toLowerCase();
+  if (!normalized) return null;
+  if (normalized.includes("api-preview.adhf.dev") || normalized.includes("dev.adhf.dev")) return "preview";
+  if (normalized.includes("api.adhf.dev") || normalized.includes("adhf.dev")) return "stable";
+  return null;
+}
+function buildDashboardUrl(serverUrl, channel) {
+  try {
+    const url2 = new URL(serverUrl);
+    if (url2.hostname === "api-preview.adhf.dev") return "https://dev.adhf.dev/dashboard";
+    if (url2.hostname === "api.adhf.dev") return "https://adhf.dev/dashboard";
+    if (url2.hostname === "127.0.0.1" || url2.hostname === "localhost") {
+      url2.port = url2.port === "3100" ? "3000" : url2.port;
+      url2.pathname = "/dashboard";
+      url2.search = "";
+      url2.hash = "";
+      return url2.toString();
+    }
+  } catch {
+  }
+  return channel === "preview" ? "https://dev.adhf.dev/dashboard" : "https://adhf.dev/dashboard";
+}
+function buildSetupReleaseContext(options = {}) {
+  const env3 = options.env || process.env;
+  const envServerUrl = typeof env3.ADHDEV_SERVER_URL === "string" && env3.ADHDEV_SERVER_URL.trim() ? env3.ADHDEV_SERVER_URL.trim() : null;
+  const config2 = options.config || {};
+  const channel = normalizeSetupReleaseChannel(config2.updateChannel) || inferReleaseChannelFromServerUrl(envServerUrl) || inferReleaseChannelFromServerUrl(config2.serverUrl) || "stable";
+  const serverUrl = envServerUrl || CHANNEL_SERVER_URL2[channel];
+  return {
+    channel,
+    npmTag: CHANNEL_NPM_TAG2[channel],
+    serverUrl,
+    dashboardUrl: buildDashboardUrl(serverUrl, channel)
+  };
+}
 async function openBrowser(url2) {
   const mod = await import("open");
   return mod.default(url2);
@@ -91534,10 +91580,10 @@ function hasCloudMachineAuth() {
   const config2 = loadConfig();
   return Boolean(config2.machineSecret && config2.machineSecret.trim());
 }
-function readLatestPublishedCliVersion(execFileSyncLocal) {
+function readLatestPublishedCliVersion(execFileSyncLocal, npmTag = "latest") {
   const surface = resolveCurrentGlobalInstallSurface({ packageName: "adhdev" });
   try {
-    return execFileSyncLocal(surface.npmExecutable, [...surface.npmArgsPrefix || [], "view", "adhdev", "version"], {
+    return execFileSyncLocal(surface.npmExecutable, [...surface.npmArgsPrefix || [], "view", `adhdev@${npmTag}`, "version"], {
       encoding: "utf-8",
       timeout: 5e3,
       stdio: ["pipe", "pipe", "pipe"],
@@ -91568,38 +91614,41 @@ function readInstalledGlobalCliVersion(execFileSyncLocal) {
 }
 async function runWizard(options = {}) {
   console.log(LOGO);
+  const config2 = loadConfig();
+  const releaseContext = buildSetupReleaseContext({ config: config2 });
   if (isSetupComplete() && hasCloudMachineAuth() && !options.force) {
-    const config2 = loadConfig();
     console.log(source_default.green("\u2713") + " ADHDev is already configured.");
     console.log(source_default.gray(`  Account: ${config2.userEmail || "not logged in"}`));
+    console.log(source_default.gray(`  Server:  ${releaseContext.serverUrl}`));
     console.log();
-    await checkForUpdate();
-    await startDaemonFlow();
+    await checkForUpdate(releaseContext);
+    await startDaemonFlow(releaseContext);
     return;
   }
-  await quickSetup();
+  await quickSetup(releaseContext);
 }
-async function checkForUpdate() {
+async function checkForUpdate(releaseContext) {
   try {
     const { execFileSync: execFileSync6 } = await import("child_process");
     const currentVersion = resolvePackageVersion();
-    const latestVersion = readLatestPublishedCliVersion(execFileSync6);
+    const latestVersion = readLatestPublishedCliVersion(execFileSync6, releaseContext.npmTag);
     if (!latestVersion) return;
     if (!currentVersion || !latestVersion || currentVersion === latestVersion) return;
-    console.log(source_default.yellow(`  Update available: ${currentVersion} \u2192 ${latestVersion}`));
+    console.log(source_default.yellow(`  Update available (${releaseContext.channel}/${releaseContext.npmTag}): ${currentVersion} \u2192 ${latestVersion}`));
     const { doUpdate } = await (await Promise.resolve().then(() => (init_lib(), lib_exports))).default.prompt([{
       type: "confirm",
       name: "doUpdate",
-      message: `Update adhdev CLI to v${latestVersion}?`,
+      message: `Update adhdev CLI to v${latestVersion} from ${releaseContext.npmTag}?`,
       default: true
     }]);
     if (!doUpdate) {
-      console.log(source_default.gray("  Skipping update. Run: npm install -g adhdev@latest\n"));
+      console.log(source_default.gray(`  Skipping update. Run: npm install -g adhdev@${releaseContext.npmTag}
+`));
       return;
     }
     const spinner = (await Promise.resolve().then(() => (init_ora(), ora_exports))).default("Updating adhdev CLI...").start();
     try {
-      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+      const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: releaseContext.npmTag });
       execFileSync6(installCommand.command, installCommand.args, {
         encoding: "utf-8",
         timeout: 6e4,
@@ -91610,14 +91659,17 @@ async function checkForUpdate() {
       console.log();
     } catch (e) {
       spinner.fail("Update failed");
-      console.log(source_default.gray("  Manual: npm install -g adhdev@latest\n"));
+      console.log(source_default.gray(`  Manual: npm install -g adhdev@${releaseContext.npmTag}
+`));
     }
   } catch {
   }
 }
-async function quickSetup() {
+async function quickSetup(releaseContext) {
   console.log(source_default.bold("\n\u{1F680} Quick Setup\n"));
-  const loginResult = await loginFlow();
+  console.log(source_default.gray(`  Channel: ${releaseContext.channel} (${releaseContext.npmTag})`));
+  console.log(source_default.gray(`  Server:  ${releaseContext.serverUrl}`));
+  const loginResult = await loginFlow(releaseContext);
   const setupDate = (/* @__PURE__ */ new Date()).toISOString();
   if (!loginResult) {
     updateConfig({
@@ -91628,7 +91680,9 @@ async function quickSetup() {
       setupDate,
       userEmail: null,
       userName: null,
-      machineSecret: null
+      machineSecret: null,
+      updateChannel: releaseContext.channel,
+      serverUrl: releaseContext.serverUrl
     });
     console.log(source_default.yellow("\u26A0 Setup is not complete without login. Run `adhdev setup` after signing in."));
   }
@@ -91639,14 +91693,16 @@ async function quickSetup() {
       userEmail: loginResult.email,
       userName: loginResult.name,
       setupDate,
+      updateChannel: releaseContext.channel,
+      serverUrl: releaseContext.serverUrl,
       ...loginResult.registeredMachineId ? { registeredMachineId: loginResult.registeredMachineId } : {}
     };
     updateConfig(configUpdate);
     console.log(source_default.green(`  \u2713 Machine registered`));
   }
-  await installCliOnly();
+  await installCliOnly(releaseContext);
   if (loginResult) {
-    await startDaemonFlow();
+    await startDaemonFlow(releaseContext);
   } else {
     console.log(source_default.gray("  Start daemon after login: adhdev setup"));
     console.log();
@@ -91655,6 +91711,7 @@ async function quickSetup() {
   console.log(source_default.bold("\n\u{1F389} Setup Complete!\n"));
   console.log(`  ${source_default.bold("User:")}    ${loginResult?.email || "not logged in"}`);
   console.log(`  ${source_default.bold("Status:")}  ${loginResult ? source_default.green("Ready to connect") : source_default.yellow("Login required")}`);
+  console.log(`  ${source_default.bold("Server:")}  ${releaseContext.serverUrl}`);
   console.log();
   console.log(source_default.gray("  Next steps:"));
   console.log(source_default.gray(`    ${loginResult ? "adhdev daemon              \u2014 Start the main daemon (IDE / remote features)" : "adhdev setup               \u2014 Sign in to finish setup and enable the daemon"}`));
@@ -91665,11 +91722,12 @@ async function quickSetup() {
   console.log(source_default.gray("    adhdev launch claude       \u2014 Start Claude Code agent"));
   console.log(source_default.gray("    adhdev status              \u2014 Check setup status"));
   console.log();
-  console.log(source_default.cyan("  Dashboard: https://adhf.dev/dashboard"));
+  console.log(source_default.cyan(`  Dashboard: ${releaseContext.dashboardUrl}`));
   console.log();
 }
-async function loginFlow() {
+async function loginFlow(releaseContext) {
   console.log(source_default.bold("\n\u{1F510} Login to ADHDev\n"));
+  console.log(source_default.gray(`  Auth server: ${releaseContext.serverUrl}`));
   const { wantLogin } = await lib_default.prompt([
     {
       type: "confirm",
@@ -91686,7 +91744,7 @@ async function loginFlow() {
   try {
     const config2 = loadConfig();
     const os31 = await import("os");
-    const res = await fetch(`${SERVER_URL}/auth/cli/init`, {
+    const res = await fetch(`${releaseContext.serverUrl}/auth/cli/init`, {
       method: "POST",
       headers: { "Content-Type": "application/json" },
       body: JSON.stringify({
@@ -91728,7 +91786,7 @@ async function loginFlow() {
   while (Date.now() - startTime < timeout) {
     await new Promise((r) => setTimeout(r, 3e3));
     try {
-      const res = await fetch(`${SERVER_URL}/auth/cli/poll`, {
+      const res = await fetch(`${releaseContext.serverUrl}/auth/cli/poll`, {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ deviceCode })
@@ -91758,9 +91816,9 @@ async function loginFlow() {
         console.log();
         console.log(source_default.yellow("  To fix this, do one of the following:"));
         console.log(source_default.gray("    1. Remove an unused machine from the dashboard:"));
-        console.log(source_default.gray("       https://adhf.dev/account \u2192 Registered Machines \u2192 \u2715 Remove"));
+        console.log(source_default.gray(`       ${releaseContext.dashboardUrl.replace(/\/dashboard$/, "/account")} \u2192 Registered Machines \u2192 \u2715 Remove`));
         console.log(source_default.gray("    2. Upgrade your plan:"));
-        console.log(source_default.gray("       https://adhf.dev/account?tab=billing"));
+        console.log(source_default.gray(`       ${releaseContext.dashboardUrl.replace(/\/dashboard$/, "/account?tab=billing")}`));
         console.log();
         console.log(source_default.gray("  Then run `adhdev setup` again."));
         console.log();
@@ -91772,11 +91830,12 @@ async function loginFlow() {
   pollSpinner.fail("Authentication timed out");
   return null;
 }
-async function startDaemonFlow() {
+async function startDaemonFlow(releaseContext) {
   const { isDaemonRunning: isDaemonRunning2 } = await Promise.resolve().then(() => (init_adhdev_daemon(), adhdev_daemon_exports));
   if (isDaemonRunning2()) {
     console.log(source_default.green("  \u2713 Daemon is already running"));
-    console.log(source_default.gray("  Dashboard: https://adhf.dev/dashboard\n"));
+    console.log(source_default.gray(`  Dashboard: ${releaseContext.dashboardUrl}
+`));
     return;
   }
   const { startDaemon } = await lib_default.prompt([
@@ -91830,7 +91889,7 @@ async function startDaemonFlow() {
     } else {
       daemonSpinner.warn("Daemon starting in background (may take a few seconds)");
     }
-    console.log(source_default.gray("  Dashboard: https://adhf.dev/dashboard"));
+    console.log(source_default.gray(`  Dashboard: ${releaseContext.dashboardUrl}`));
     console.log(source_default.gray(`  Logs:      ${logPath}`));
     console.log();
   } catch (e) {
@@ -91838,7 +91897,7 @@ async function startDaemonFlow() {
     console.log(source_default.gray("  Manual: adhdev daemon\n"));
   }
 }
-async function installCliOnly() {
+async function installCliOnly(releaseContext) {
   const { execFileSync: execFileSyncLocal } = await import("child_process");
   const currentVersion = readInstalledGlobalCliVersion(execFileSyncLocal);
   const isNpx = process.env.npm_execpath?.includes("npx") || process.argv[1]?.includes("npx") || process.argv[1]?.includes("_npx");
@@ -91851,7 +91910,7 @@ async function installCliOnly() {
   console.log();
   if (currentVersion) {
     console.log(source_default.green(`  \u2713 Currently installed: v${currentVersion}`));
-    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal);
+    const latestVersion = readLatestPublishedCliVersion(execFileSyncLocal, releaseContext.npmTag);
     if (latestVersion && currentVersion === latestVersion) {
       console.log(source_default.gray("  (Already up to date)"));
       return;
@@ -91860,12 +91919,12 @@ async function installCliOnly() {
       const { doUpdate } = await lib_default.prompt([{
         type: "confirm",
         name: "doUpdate",
-        message: `Update to latest version${latestVersion ? ` (v${latestVersion})` : ""}?`,
+        message: `Update to ${releaseContext.npmTag} version${latestVersion ? ` (v${latestVersion})` : ""}?`,
         default: true
       }]);
       if (!doUpdate) return;
     } else {
-      console.log(source_default.gray("  Updating to latest..."));
+      console.log(source_default.gray(`  Updating to ${releaseContext.npmTag}...`));
     }
   } else {
     console.log(source_default.yellow("  \u2717 Not installed globally"));
@@ -91873,7 +91932,7 @@ async function installCliOnly() {
       const { doInstall } = await lib_default.prompt([{
         type: "confirm",
         name: "doInstall",
-        message: "Install adhdev CLI globally? (npm install -g adhdev)",
+        message: `Install adhdev CLI globally? (npm install -g adhdev@${releaseContext.npmTag})`,
         default: true
       }]);
       if (!doInstall) {
@@ -91886,14 +91945,14 @@ async function installCliOnly() {
   }
   const installSpinner = ora2("Installing adhdev CLI...").start();
   try {
-    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: "latest" });
+    const installCommand = buildPinnedGlobalInstallCommand({ packageName: "adhdev", targetVersion: releaseContext.npmTag });
     execFileSyncLocal(installCommand.command, installCommand.args, {
       encoding: "utf-8",
       timeout: 6e4,
       stdio: ["pipe", "pipe", "pipe"],
       ...installCommand.execOptions
     });
-    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || "latest";
+    const newVersion = readInstalledGlobalCliVersion(execFileSyncLocal) || releaseContext.npmTag;
     installSpinner.succeed(`adhdev CLI ${currentVersion ? "updated" : "installed"} \u2713 (v${newVersion})`);
     console.log(source_default.gray("  Try: adhdev daemon"));
     console.log();
@@ -91904,11 +91963,11 @@ async function installCliOnly() {
     if (osModule.platform() === "win32") {
       console.log(source_default.gray("  On Windows, run PowerShell as Administrator"));
     }
-    console.log(source_default.gray("  Manual: npm install -g adhdev@latest"));
+    console.log(source_default.gray(`  Manual: npm install -g adhdev@${releaseContext.npmTag}`));
     console.log();
   }
 }
-var SERVER_URL, LOGO, DIVIDER;
+var CHANNEL_NPM_TAG2, CHANNEL_SERVER_URL2, LOGO, DIVIDER;
 var init_wizard = __esm({
   "src/wizard.ts"() {
     "use strict";
@@ -91917,7 +91976,14 @@ var init_wizard = __esm({
     init_ora();
     init_src();
     init_version();
-    SERVER_URL = process.env.ADHDEV_SERVER_URL || "https://api.adhf.dev";
+    CHANNEL_NPM_TAG2 = {
+      stable: "latest",
+      preview: "next"
+    };
+    CHANNEL_SERVER_URL2 = {
+      stable: "https://api.adhf.dev",
+      preview: "https://api-preview.adhf.dev"
+    };
     LOGO = `
 ${source_default.cyan("\u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557")}
 ${source_default.cyan("\u2551")}  ${source_default.bold.white("\u{1F9A6} ADHDev Setup Wizard")}               ${source_default.cyan("\u2551")}
@@ -93941,8 +94007,8 @@ var DEFAULT_TRACE_FOLLOW_INTERVAL_MS = 1500;
 var DEFAULT_DAEMON_PORT_TEXT = String(DEFAULT_DAEMON_PORT);
 var DEV_SERVER_PORT2 = 19280;
 var DEV_SERVER_BASE_URL = `http://127.0.0.1:${DEV_SERVER_PORT2}`;
-var CHANNEL_NPM_TAG2 = { stable: "latest", preview: "next" };
-var CHANNEL_SERVER_URL2 = {
+var CHANNEL_NPM_TAG3 = { stable: "latest", preview: "next" };
+var CHANNEL_SERVER_URL3 = {
   stable: "https://api.adhf.dev",
   preview: "https://api-preview.adhf.dev"
 };
@@ -93962,11 +94028,11 @@ async function resolveConfiguredUpdateChannel() {
   }
 }
 function releaseChannelLabel(channel) {
-  return `${channel} (${CHANNEL_NPM_TAG2[channel]})`;
+  return `${channel} (${CHANNEL_NPM_TAG3[channel]})`;
 }
 async function persistReleaseChannel(channel) {
   const { updateConfig: updateConfig2 } = await Promise.resolve().then(() => (init_src(), src_exports));
-  updateConfig2({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL2[channel] });
+  updateConfig2({ updateChannel: channel, serverUrl: CHANNEL_SERVER_URL3[channel] });
 }
 function hideCommand(command) {
   command._hidden = true;
@@ -94291,7 +94357,7 @@ async function runDaemonUpgrade(options, pkgVersion3) {
     return;
   }
   const configuredChannel = requestedChannel || await resolveConfiguredUpdateChannel();
-  const npmTag = CHANNEL_NPM_TAG2[configuredChannel];
+  const npmTag = CHANNEL_NPM_TAG3[configuredChannel];
   if (requestedChannel) {
     await persistReleaseChannel(configuredChannel);
   }
@@ -94962,7 +95028,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     const current = normalizeReleaseChannel2(config2.updateChannel) || "stable";
     console.log(source_default.bold("\n  ADHDev Channel\n"));
     console.log(`  ${source_default.bold("Channel:")}  ${releaseChannelLabel(current)}`);
-    console.log(`  ${source_default.bold("Server:")}   ${config2.serverUrl || CHANNEL_SERVER_URL2[current]}`);
+    console.log(`  ${source_default.bold("Server:")}   ${config2.serverUrl || CHANNEL_SERVER_URL3[current]}`);
     console.log();
   });
   channel.command("set <channel>").description("Set the ADHDev channel: stable/latest or preview/next").action(async (channelName) => {
@@ -94977,7 +95043,7 @@ function registerDaemonCommands(program2, pkgVersion3) {
     await persistReleaseChannel(selected);
     console.log(source_default.green(`
   \u2713 Channel set to ${releaseChannelLabel(selected)}`));
-    console.log(source_default.gray(`  Server: ${CHANNEL_SERVER_URL2[selected]}`));
+    console.log(source_default.gray(`  Server: ${CHANNEL_SERVER_URL3[selected]}`));
     console.log(source_default.gray(`  Update: adhdev update --channel ${selected}
 `));
   });