@notis_ai/cli 0.2.22 → 0.2.24

package/src/runtime/profiles.js

@@ -10,14 +10,14 @@ import { dirname, join, parse, resolve } from 'node:path';
 import { CliError, EXIT_CODES } from './errors.js';
 import { withConfigFileWriteLock } from './config-lock.js';
 import { getAuthRecovery, quoteShellArgument } from './auth-recovery.js';
-import { channelFromProfile, cliCommandForChannel, isReleaseChannel } from './channel.js';
+import { channelFromProfile, cliCommandForChannel, pinnedReleaseChannel } from './channel.js';
 import { resolveRetryEnabled } from './retry.js';
 
 export const CONFIG_DIR = join(homedir(), '.notis');
 export const CONFIG_FILE = join(CONFIG_DIR, 'config.json');
 export const WORKSPACE_DIR = join(CONFIG_DIR, 'workspace');
 export const DEFAULT_API_BASE = 'https://api.notis.ai';
-export const BETA_API_BASE = 'https://api-beta.notis.ai';
+export const NIGHTLY_API_BASE = 'https://api-nightly.notis.ai';
 export const DEFAULT_PROFILE = 'default';
 const PROFILE_NAME_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/;
 const LEGACY_DESKTOP_PROFILE_KEYS = [
@@ -32,7 +32,7 @@ const LEGACY_DESKTOP_PROFILE_KEYS = [
 const WORKTREE_RUNTIME_FILENAME = join('.context', 'notis-runtime.json');
 const WORKTREE_ROUTING_FILENAME = join('.context', 'notis-routing.json');
 const LOCAL_API_HOSTS = new Set(['localhost', '127.0.0.1', '::1']);
-const LIVE_API_HOSTS = new Set(['api.notis.ai', 'api-beta.notis.ai']);
+const LIVE_API_HOSTS = new Set(['api.notis.ai', 'api-nightly.notis.ai', 'api-beta.notis.ai']);
 
 function clone(value) {
   return JSON.parse(JSON.stringify(value));
@@ -86,11 +86,10 @@ function normalizeProfile(rawProfile = {}) {
   const raw = rawProfile && typeof rawProfile === 'object' ? rawProfile : {};
   return {
     api_base: typeof raw.api_base === 'string' ? raw.api_base : undefined,
-    beta: typeof raw.beta === 'boolean' ? raw.beta : undefined,
-    // Which published CLI build this profile runs, as the deployment reported
-    // it at login. Unknown values are dropped rather than trusted: this key
-    // decides which code executes on the next run.
-    channel: isReleaseChannel(raw.channel) ? raw.channel : undefined,
+    // Which published CLI build this profile runs (`stable` | `nightly`), as
+    // the account reported it at login. Unknown values are dropped rather
+    // than trusted: this key decides which code executes on the next run.
+    release_channel: pinnedReleaseChannel(raw) || undefined,
     label: typeof raw.label === 'string' ? raw.label : undefined,
     dev_access_token:
       typeof raw.dev_access_token === 'string' ? raw.dev_access_token : undefined,
@@ -535,28 +534,15 @@ function isLiveApiBase(value) {
 /**
  * Pick the live Notis API for this profile.
  *
- * Beta users (`users.beta = true`, mirrored onto the profile when OAuth
- * authorizes against api-beta) hit api-beta.notis.ai; everyone else hits
- * api.notis.ai. Localhost is never a default — only a `./dev.sh` profile
- * backed by a live worktree lease may retarget the CLI at loopback.
+ * Nightly accounts (`users.release_channel = 'nightly'`, pinned on the profile
+ * at login) hit the nightly API; everyone else hits api.notis.ai. Localhost is
+ * never a default: only a `./dev.sh` profile backed by a live worktree lease
+ * may retarget the CLI at loopback.
  */
 export function resolveDefaultLiveApiBase(profile = {}) {
-  if (profile.beta === true) {
-    return BETA_API_BASE;
-  }
-  if (profile.beta === false) {
-    return DEFAULT_API_BASE;
-  }
-  if (isLiveApiBase(profile.api_base)) {
-    try {
-      if (new URL(profile.api_base).hostname === 'api-beta.notis.ai') {
-        return BETA_API_BASE;
-      }
-    } catch {
-      // fall through
-    }
-  }
-  return DEFAULT_API_BASE;
+  const channel = pinnedReleaseChannel(profile)
+    || (isLiveApiBase(profile.api_base) ? channelFromProfile({ api_base: profile.api_base }) : null);
+  return channel === 'nightly' ? NIGHTLY_API_BASE : DEFAULT_API_BASE;
 }
 
 export function getApiBase(config, profileName, override) {

package/src/runtime/release-channel.js

@@ -0,0 +1,184 @@
+/**
+ * Login follows the account's release channel.
+ *
+ * Every Notis account belongs to one release channel (`stable` | `nightly`),
+ * and each channel has its own API. After a login, the CLI asks the API it just
+ * authorized against which channel the account uses (`GET /release_channel`).
+ * When that API serves the other channel, the CLI signs the profile in again
+ * against the account's own API; the profile then pins `release_channel`, and
+ * the next run re-executes the matching npm build (resolveChannelSwitch).
+ *
+ * An explicit route always wins: `--api-base`, `NOTIS_API_BASE`, a `./dev.sh`
+ * worktree and any loopback API skip all of this, exactly as before.
+ */
+
+import { CliError, EXIT_CODES } from './errors.js';
+import { quoteShellArgument } from './auth-recovery.js';
+import { cliCommandForChannel, normalizeReleaseChannel } from './channel.js';
+import { updateConfig } from './profiles.js';
+
+const CHANNEL_LABELS = { stable: 'Stable', nightly: 'Nightly' };
+const LOOPBACK_HOSTS = new Set(['localhost', '127.0.0.1', '::1', '[::1]']);
+const RELEASE_CHANNEL_TIMEOUT_MS = 10_000;
+
+export function releaseChannelLabel(channel) {
+  return CHANNEL_LABELS[channel] || channel;
+}
+
+function isLoopbackApiBase(apiBase) {
+  try {
+    return LOOPBACK_HOSTS.has(new URL(apiBase).hostname);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * The API origin a channel answer may send the CLI to. Only an https Notis
+ * host qualifies: a login is about to hand this origin a fresh grant.
+ */
+export function trustedApiOrigin(value) {
+  if (typeof value !== 'string' || !value) return null;
+  try {
+    const url = new URL(value);
+    const notisHost = url.hostname === 'notis.ai' || url.hostname.endsWith('.notis.ai');
+    return url.protocol === 'https:' && notisHost && !url.username && !url.password ? url.origin : null;
+  } catch {
+    return null;
+  }
+}
+
+/** True when this invocation routes by the account rather than explicitly. */
+export function followsAccountReleaseChannel(runtime = {}, env = process.env) {
+  if (runtime.requestedApiBase || env.NOTIS_API_BASE) return false;
+  if (runtime.worktreeRuntime || runtime.credentialKind !== 'oauth' || !runtime.jwt) return false;
+  return Boolean(runtime.apiBase) && !isLoopbackApiBase(runtime.apiBase);
+}
+
+/**
+ * Normalizes a `/release_channel` answer, or a `release_channel_mismatch`
+ * error body, which carries the same fields.
+ */
+export function parseReleaseChannelAnswer(payload) {
+  if (!payload || typeof payload !== 'object') return null;
+  const releaseChannel = normalizeReleaseChannel(payload.release_channel);
+  if (!releaseChannel) return null;
+  const deploymentChannel = normalizeReleaseChannel(payload.deployment_channel);
+  const origins = payload.origins && typeof payload.origins === 'object' ? payload.origins : {};
+  return {
+    releaseChannel,
+    deploymentChannel,
+    match: !deploymentChannel || payload.match === true || deploymentChannel === releaseChannel,
+    apiOrigin: trustedApiOrigin(origins.api),
+  };
+}
+
+/**
+ * Asks the API which channel the signed-in account uses. Any failure (an API
+ * that predates the endpoint, a network error) answers null: the login that
+ * just succeeded stands, and the 403 a mismatched API returns later explains
+ * the way out.
+ */
+export async function fetchAccountReleaseChannel(runtime, fetchImpl = fetch) {
+  try {
+    const response = await fetchImpl(`${String(runtime.apiBase).replace(/\/+$/, '')}/release_channel`, {
+      method: 'GET',
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Bearer ${runtime.jwt}`,
+        ...(runtime.cliVersion ? { 'X-Notis-CLI-Version': runtime.cliVersion } : {}),
+      },
+      signal: AbortSignal.timeout(RELEASE_CHANNEL_TIMEOUT_MS),
+    });
+    if (!response.ok) return null;
+    return parseReleaseChannelAnswer(await response.json());
+  } catch {
+    return null;
+  }
+}
+
+function persistReleaseChannel(runtime, releaseChannel) {
+  const config = updateConfig((latest) => {
+    const profile = latest.profiles[runtime.profileName];
+    if (profile) profile.release_channel = releaseChannel;
+    return latest;
+  });
+  runtime.channel = releaseChannel;
+  return config.profiles[runtime.profileName];
+}
+
+/**
+ * Checks a finished login against the account's channel and, on a mismatch,
+ * signs in again against the account's API.
+ *
+ * `result` is what loginWithOAuth returned; anything without a profile (a
+ * pending browser hand-off) is returned untouched. `login` is loginWithOAuth,
+ * injected so this module does not import the OAuth machinery.
+ */
+export async function followAccountReleaseChannel(runtime, result, {
+  login,
+  options = {},
+  output,
+  fetchImpl = fetch,
+  env = process.env,
+  followed = false,
+} = {}) {
+  if (!result?.profile || !followsAccountReleaseChannel(runtime, env)) return result;
+  const answer = await fetchAccountReleaseChannel(runtime, fetchImpl);
+  // No answer, or a development API with no channel: nothing to follow.
+  if (!answer?.deploymentChannel) return result;
+  if (answer.match) {
+    return { ...result, profile: persistReleaseChannel(runtime, answer.releaseChannel) || result.profile };
+  }
+  const label = releaseChannelLabel(answer.releaseChannel);
+  if (followed || !answer.apiOrigin || answer.apiOrigin === runtime.apiBase) {
+    // Following once more would loop; say so instead of failing the login.
+    output?.notice?.(
+      `Your account uses the ${label} channel, but this sign-in could not move there. `
+      + `Run: ${releaseChannelLoginCommand(runtime, answer)}`,
+    );
+    return result;
+  }
+  output?.notice?.(`Your account uses the ${label} channel, signing you in there.`);
+  runtime.apiBase = answer.apiOrigin;
+  // A code or a stored credential belongs to the login that just finished.
+  const { code: _code, reusePersistedCredential: _reuse, ...nextOptions } = options;
+  const next = await login(runtime, nextOptions, output);
+  if (!next?.profile) return next;
+  return followAccountReleaseChannel(runtime, next, {
+    login, options: nextOptions, output, fetchImpl, env, followed: true,
+  });
+}
+
+/** The exact command that signs this profile in on the account's channel. */
+export function releaseChannelLoginCommand(runtime = {}, answer = {}) {
+  return [
+    cliCommandForChannel(answer.releaseChannel),
+    ...(runtime.profileName && runtime.profileName !== 'default'
+      ? [`--profile ${quoteShellArgument(runtime.profileName)}`]
+      : []),
+    ...(answer.apiOrigin ? [`--api-base ${quoteShellArgument(answer.apiOrigin)}`] : []),
+    'login',
+  ].join(' ');
+}
+
+/**
+ * The error for an API that refuses this account because it serves the other
+ * release channel (`403 {"error": "release_channel_mismatch", ...}`).
+ */
+export function releaseChannelMismatchError(payload, runtime = {}) {
+  const answer = parseReleaseChannelAnswer(payload) || {};
+  const label = releaseChannelLabel(answer.releaseChannel);
+  const message = (typeof payload?.message === 'string' && payload.message)
+    || (answer.releaseChannel
+      ? `Your account uses the ${label} channel, which this Notis API does not serve.`
+      : 'Your account uses another Notis release channel than this API serves.');
+  const command = releaseChannelLoginCommand(runtime, answer);
+  return new CliError({
+    code: 'release_channel_mismatch',
+    message: `${message} Sign in again with: ${command}`,
+    exitCode: EXIT_CODES.auth,
+    details: payload || {},
+    hints: [{ command, reason: `Sign this profile in on the ${label || 'right'} channel` }],
+  });
+}

package/src/runtime/skill-sync-service.js

@@ -7,6 +7,9 @@ import { fileURLToPath } from 'node:url';
 import { isValidProfileName, loadConfig } from './profiles.js';
 import { withSkillSyncLock } from './sync-skills.js';
 
+// Every live API, current names first, then the beta name nightly answered on.
+const LIVE_API_BASES = ['https://api.notis.ai', 'https://api-nightly.notis.ai', 'https://api-beta.notis.ai'];
+
 export const SKILL_SYNC_SERVICE_LABEL = 'ai.notis.skills-sync';
 const bundlePath = fileURLToPath(new URL('../../dist/skill-sync-worker.mjs', import.meta.url));
 
@@ -28,7 +31,7 @@ export async function maybeInstallSkillSyncService(runtime, {
 } = {}) {
   if (process.platform !== 'darwin' || runtime.credentialKind !== 'oauth'
     || config.current_profile !== runtime.profileName
-    || !['https://api.notis.ai', 'https://api-beta.notis.ai'].includes(runtime.apiBase)) return;
+    || !LIVE_API_BASES.includes(runtime.apiBase)) return;
   // Ordinary commands must not steal another explicitly bound account's job.
   const plist = join(homedir(), 'Library', 'LaunchAgents', `${SKILL_SYNC_SERVICE_LABEL}.plist`);
   if (existsSync(plist)) {
@@ -47,7 +50,7 @@ export async function maybeInstallSkillSyncService(runtime, {
 export async function installSkillSyncService(runtime, options = {}) {
   if ((options.platform || process.platform) !== 'darwin') return { status: 'unsupported_platform' };
   if (runtime.credentialKind !== 'oauth' || !runtime.oauthUserId
-    || !['https://api.notis.ai', 'https://api-beta.notis.ai'].includes(runtime.apiBase)) {
+    || !LIVE_API_BASES.includes(runtime.apiBase)) {
     return { status: 'skipped_non_personal_profile' };
   }
   // Registration upgrades must not kill a worker holding the filesystem lock,
@@ -65,7 +68,7 @@ async function installSkillSyncServiceLocked(runtime, {
   if (platform !== 'darwin') return { status: 'unsupported_platform' };
   if (runtime.credentialKind !== 'oauth' || runtime.envCredentialOverride
     || !isValidProfileName(runtime.profileName)
-    || !['https://api.notis.ai', 'https://api-beta.notis.ai'].includes(runtime.apiBase)) {
+    || !LIVE_API_BASES.includes(runtime.apiBase)) {
     return { status: 'skipped_non_personal_profile' };
   }
   const root = join(home, '.notis', 'skills', 'service');

package/src/runtime/transport.js

@@ -14,6 +14,7 @@ import {
 import { createExpiredAuthError, createInvalidAuthHints } from './auth-recovery.js';
 import { refreshOAuthCredential } from './oauth.js';
 import { findUpsell, renderUpsell } from './upsell.js';
+import { releaseChannelMismatchError } from './release-channel.js';
 import {
   callCarriesToolRequestId,
   canReplayRequest,
@@ -143,6 +144,12 @@ export function normalizeBackendError(status, payload, runtime) {
     });
   }
 
+  if (status === 403 && backendError === 'release_channel_mismatch') {
+    // The account belongs to the other release channel's API. Nothing here
+    // can be retried; signing the profile in on its own channel fixes it.
+    return releaseChannelMismatchError(payload, runtime);
+  }
+
   if (status === 403) {
     const upsellBody = findUpsell(payload);
     if (upsellBody) {

package/src/runtime/upsell.js

@@ -12,7 +12,8 @@ const NESTED_KEYS = ['error', 'details', 'data', 'result', 'response', 'entitlem
 
 const PORTAL_ORIGINS = {
   'api.notis.ai': 'https://app.notis.ai',
-  'api-beta.notis.ai': 'https://beta.notis.ai',
+  'api-nightly.notis.ai': 'https://app-nightly.notis.ai',
+  'api-beta.notis.ai': 'https://app-nightly.notis.ai',
 };
 
 function isUpsellBody(value) {