@nocobase/cli 2.1.0-beta.42 → 2.1.0-beta.42-test.1

package/dist/lib/app-runtime.js

@@ -110,10 +110,10 @@ export function formatMissingManagedAppEnvMessage(envName) {
     if (requested) {
         return [
             `Env "${requested}" is not configured in this workspace.`,
-            `If you want to create a new NocoBase AI environment, run \`nb init --env ${requested}\` first.`,
+            `If you want to create a new NocoBase AI environment, run \`nb init --ui --env ${requested}\` first.`,
         ].join('\n');
     }
-    return 'No NocoBase env is configured yet. Run `nb init` to create one first.';
+    return 'No NocoBase env is configured yet. Run `nb init --ui` to create one first.';
 }
 export async function runLocalNocoBaseCommand(runtime, args, options) {
     const envVars = await buildRuntimeEnvVars(runtime);

package/dist/lib/auth-store.js

@@ -32,6 +32,13 @@ function normalizeOptionalCliLocale(value) {
     }
     return normalizeCliLocale(normalized);
 }
+function normalizeOptionalCliUpdatePolicy(value) {
+    const normalized = normalizeOptionalString(value);
+    if (normalized === 'prompt' || normalized === 'auto' || normalized === 'off') {
+        return normalized;
+    }
+    return undefined;
+}
 export function readEnvApiBaseUrl(config) {
     if (!config) {
         return undefined;
@@ -79,10 +86,12 @@ function normalizeEnvConfigEntry(entry) {
 function normalizeAuthConfig(config) {
     const settings = config.settings ?? {};
     const locale = normalizeOptionalCliLocale(settings.locale);
+    const updatePolicy = normalizeOptionalCliUpdatePolicy(settings.update?.policy);
     return {
         name: config.name || config.dockerResourcePrefix,
         settings: {
             ...(locale ? { locale } : {}),
+            ...(updatePolicy ? { update: { policy: updatePolicy } } : {}),
             ...(settings.license?.pkgUrl ? { license: { pkgUrl: normalizeOptionalString(settings.license.pkgUrl) } } : {}),
             ...(settings.docker?.network || settings.docker?.containerPrefix
                 ? {

package/dist/lib/backup.js

@@ -62,14 +62,14 @@ export async function resolveBackupTargetEnv(requestedEnv) {
     const { envs } = await listEnvs({ scope });
     const configuredEnvNames = Object.keys(envs);
     if (!configuredEnvNames.length) {
-        throw new Error('No env is configured. Run `nb env add <name> --api-base-url <url>` first.');
+        throw new Error('No env is configured. Run `nb init --ui` first.');
     }
     if (requestedEnv?.trim()) {
-        throw new Error(`Env "${envName}" is not configured. Run \`nb env add ${envName} --api-base-url <url>\` first.`);
+        throw new Error(`Env "${envName}" is not configured. Run \`nb init --ui --env ${envName}\` first.`);
     }
     throw new Error([
         `Current env "${envName}" is not configured.`,
-        'Switch to an existing env with `nb env use <name>`, or add one with `nb env add <name> --api-base-url <url>`.',
+        `Switch to an existing env with \`nb env use <name>\`, or run \`nb init --ui --env ${envName}\` to create or connect it.`,
     ].join('\n'));
 }
 export async function ensureBackupRuntimeCommands(params) {

package/dist/lib/bootstrap.js

@@ -254,25 +254,31 @@ export function formatSwaggerSchemaError(response, context) {
         })
             .join('\n');
         const envLabel = context.envName ? ` for env "${context.envName}"` : '';
+        const tokenHint = context.envName
+            ? `Update the API key with \`nb env update ${context.envName} --token <api-key>\`, log in with \`nb env auth ${context.envName}\`, or rerun the command with \`--access-token <api-key>\`.`
+            : 'Update the API key with `nb env update <name> --token <api-key>`, log in with `nb env auth <name>`, or rerun the command with `--access-token <api-key>`.';
         const commandHint = context.commandToken
-            ? `If \`${context.commandToken}\` is a runtime command, refresh the runtime after updating the token with \`nb env update\`. If it is a typo, run \`nb --help\` to inspect available commands.`
-            : 'Run `nb --help` to inspect built-in commands, then refresh runtime commands with `nb env update` after updating the token.';
+            ? `If \`${context.commandToken}\` is a runtime command, retry it after updating the token. If it is a typo, run \`nb --help\` to inspect available commands.`
+            : 'Run `nb --help` to inspect built-in commands, then retry the original command after updating the token.';
         return [
             `Authentication failed while loading the command runtime from \`swagger:get\`${envLabel}.`,
             `Base URL: ${context.baseUrl}`,
             details,
-            'Update the API key with `nb env add <name> --api-base-url <url> --auth-type token --access-token <api-key>`, log in with `nb env auth <name>`, or rerun the command with `--access-token <api-key>`.',
+            tokenHint,
             commandHint,
         ].join('\n');
     }
     if (isNetworkFetchFailure(response)) {
         const rawMessage = response.data?.error?.message || 'fetch failed';
+        const updateConnectionHint = context.envName
+            ? `If you recently changed the server address, update env "${context.envName}" with \`nb env update ${context.envName} --api-base-url <url>\` and retry the original command.`
+            : 'If you recently changed the server address, update the saved env connection with `nb env update <name> --api-base-url <url>` and retry the original command.';
         return [
             'Failed to reach the NocoBase server while loading the command runtime from `swagger:get`.',
             `Base URL: ${context.baseUrl}`,
             `Network error: ${rawMessage}`,
             'Check that the NocoBase app is running, the base URL is correct, and the server is reachable from this machine.',
-            'If you recently changed the server address, update it with `nb env add <name> --api-base-url <url>` and retry `nb env update`.',
+            updateConnectionHint,
             'Use `nb env list` to inspect the current env configuration.',
         ].join('\n');
     }
@@ -282,7 +288,7 @@ export function formatMissingRuntimeEnvError(commandToken) {
     if (!commandToken) {
         return [
             'No env is configured for runtime commands.',
-            'Run `nb env add <name> --api-base-url <url>` first.',
+            'Run `nb init --ui` first.',
             'If you configure multiple environments later, switch with `nb env use <name>`.',
         ].join('\n');
     }
@@ -290,7 +296,7 @@ export function formatMissingRuntimeEnvError(commandToken) {
         `Unable to resolve runtime command \`${commandToken}\`.`,
         'No env is configured, so the CLI cannot load runtime commands from `swagger:get`.',
         'If this is a built-in command or a typo, run `nb --help` to inspect available commands.',
-        'If this should be an application runtime command, run `nb env add <name> --api-base-url <url>` and then `nb env update`.',
+        'If this should be an application runtime command, run `nb init --ui` to create or connect a NocoBase app first.',
     ].join('\n');
 }
 export async function ensureRuntimeFromArgv(argv, options) {
@@ -366,8 +372,8 @@ export async function updateEnvRuntime(options) {
         throw new Error([
             env
                 ? `Env "${envName}" is missing a base URL.`
-                : `Env "${envName}" is not configured. Run \`nb env add ${envName}\` first.`,
-            env ? 'Update it with `nb env add <name> --api-base-url <url>` first.' : '',
+                : `Env "${envName}" is not configured. Run \`nb init --ui --env ${envName}\` first.`,
+            env ? `Update env "${envName}" with \`nb env update ${envName} --api-base-url <url>\` first.` : '',
         ]
             .filter(Boolean)
             .join('\n'));

package/dist/lib/cli-config.js

@@ -15,8 +15,11 @@ export const DEFAULT_DOCKER_CONTAINER_PREFIX = 'nb';
 export const DEFAULT_DOCKER_BIN = 'docker';
 export const DEFAULT_GIT_BIN = 'git';
 export const DEFAULT_YARN_BIN = 'yarn';
+export const CLI_UPDATE_POLICY_OPTIONS = ['prompt', 'auto', 'off'];
+export const DEFAULT_UPDATE_POLICY = 'prompt';
 export const SUPPORTED_CLI_CONFIG_KEYS = [
     'locale',
+    'update.policy',
     'license.pkg-url',
     'docker.network',
     'docker.container-prefix',
@@ -42,9 +45,17 @@ export function assertSupportedCliConfigKey(value) {
     }
     return value;
 }
+export function normalizeCliUpdatePolicy(value) {
+    const normalized = trimValue(value);
+    if (!normalized) {
+        return undefined;
+    }
+    return CLI_UPDATE_POLICY_OPTIONS.includes(normalized) ? normalized : undefined;
+}
 function cloneSettings(config) {
     return {
         ...(config.settings?.locale ? { locale: trimValue(config.settings.locale) } : {}),
+        update: config.settings?.update ? { ...config.settings.update } : undefined,
         license: config.settings?.license ? { ...config.settings.license } : undefined,
         docker: config.settings?.docker ? { ...config.settings.docker } : undefined,
         bin: config.settings?.bin ? { ...config.settings.bin } : undefined,
@@ -54,6 +65,10 @@ function pruneSettings(config) {
     if (config.settings && !trimValue(config.settings.locale)) {
         delete config.settings.locale;
     }
+    const update = config.settings?.update;
+    if (update && !normalizeCliUpdatePolicy(update.policy)) {
+        delete config.settings?.update;
+    }
     const license = config.settings?.license;
     if (license && !trimValue(license.pkgUrl)) {
         delete config.settings?.license;
@@ -68,6 +83,7 @@ function pruneSettings(config) {
     }
     if (config.settings &&
         !config.settings.locale &&
+        !config.settings.update &&
         !config.settings.license &&
         !config.settings.docker &&
         !config.settings.bin) {
@@ -78,6 +94,8 @@ export function getExplicitCliConfigValue(config, key) {
     switch (key) {
         case 'locale':
             return trimValue(config.settings?.locale);
+        case 'update.policy':
+            return normalizeCliUpdatePolicy(config.settings?.update?.policy);
         case 'license.pkg-url':
             return trimValue(config.settings?.license?.pkgUrl);
         case 'docker.network':
@@ -100,6 +118,8 @@ export function getEffectiveCliConfigValue(config, key) {
     switch (key) {
         case 'locale':
             return resolveCliLocale(undefined, { configuredLocale: trimValue(config.settings?.locale) });
+        case 'update.policy':
+            return explicit ?? DEFAULT_UPDATE_POLICY;
         case 'license.pkg-url':
             return DEFAULT_LICENSE_PKG_URL;
         case 'docker.network':
@@ -129,6 +149,13 @@ export function normalizeCliConfigValue(key, value) {
         }
         return locale;
     }
+    if (key === 'update.policy') {
+        const policy = normalizeCliUpdatePolicy(normalized);
+        if (!policy) {
+            throw new Error(`Config key "${key}" must be one of: ${CLI_UPDATE_POLICY_OPTIONS.join(', ')}`);
+        }
+        return policy;
+    }
     return normalized;
 }
 export async function loadCliConfig(options = {}) {
@@ -158,6 +185,12 @@ export async function setCliConfigValue(key, value, options = {}) {
         case 'locale':
             config.settings.locale = normalized;
             break;
+        case 'update.policy':
+            config.settings.update = {
+                ...(config.settings.update ?? {}),
+                policy: normalized,
+            };
+            break;
         case 'license.pkg-url':
             config.settings.license = {
                 ...(config.settings.license ?? {}),
@@ -211,6 +244,11 @@ export async function deleteCliConfigValue(key, options = {}) {
         case 'locale':
             delete config.settings.locale;
             break;
+        case 'update.policy':
+            if (config.settings.update) {
+                delete config.settings.update.policy;
+            }
+            break;
         case 'license.pkg-url':
             if (config.settings.license) {
                 delete config.settings.license.pkgUrl;

package/dist/lib/cli-entry-error.js

@@ -0,0 +1,44 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export function getCommandPathTokens(argv) {
+    const tokens = [];
+    for (const token of argv) {
+        if (!token) {
+            continue;
+        }
+        if (token.startsWith('-')) {
+            break;
+        }
+        tokens.push(token);
+    }
+    return tokens;
+}
+export function formatCliEntryError(error, argv) {
+    const message = error instanceof Error ? error.message : String(error);
+    const missingCommandMatch = message.match(/^Command (.+) not found\.$/);
+    if (!missingCommandMatch) {
+        return message;
+    }
+    const commandPathTokens = getCommandPathTokens(argv);
+    const attemptedCommand = commandPathTokens.join(' ') || missingCommandMatch[1];
+    const isApiCommand = commandPathTokens[0] === 'api';
+    if (isApiCommand) {
+        const helpCommandTokens = commandPathTokens.length > 2 ? commandPathTokens.slice(0, -1) : ['api'];
+        const helpCommand = `nb ${helpCommandTokens.join(' ')} --help`;
+        return [
+            `Unknown command: \`${attemptedCommand}\`.`,
+            `If this is a built-in command or a typo, run \`${helpCommand}\` to inspect the commands available under that API group.`,
+        ].join('\n');
+    }
+    return [
+        `Unknown command: \`${attemptedCommand}\`.`,
+        'If this is a built-in command or a typo, run `nb --help` to inspect available commands.',
+        `If \`${attemptedCommand}\` should be a runtime command from your NocoBase app, check whether the connected app exposes it, then retry the command.`,
+    ].join('\n');
+}

package/dist/lib/docker-log-stream.js

@@ -0,0 +1,45 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { spawn } from 'node:child_process';
+const DEFAULT_DOCKER_LOG_TAIL = 50;
+export function startDockerLogFollower(containerName, options) {
+    const tail = Math.max(0, options?.tail ?? DEFAULT_DOCKER_LOG_TAIL);
+    const child = spawn('docker', ['logs', '--tail', String(tail), '--follow', containerName], {
+        stdio: 'inherit',
+    });
+    let settled = false;
+    let resolveClosed;
+    const closed = new Promise((resolve) => {
+        resolveClosed = resolve;
+    });
+    const settle = () => {
+        if (!settled) {
+            settled = true;
+            resolveClosed();
+        }
+    };
+    child.once('error', settle);
+    child.once('close', settle);
+    return {
+        stop: async () => {
+            if (settled) {
+                return;
+            }
+            try {
+                if (!child.kill()) {
+                    settle();
+                }
+            }
+            catch {
+                settle();
+            }
+            await closed;
+        },
+    };
+}

package/dist/lib/env-auth.js

@@ -629,19 +629,19 @@ async function createLoopbackServer(state) {
         });
         let resolveWaiter;
         let rejectWaiter;
-        const waitForCode = () => new Promise((resolveCode, rejectCode) => {
+        const waitForCode = () => new Promise((resolve, reject) => {
             resolveWaiter = (code) => {
                 void close();
-                resolveCode(code);
+                resolve(code);
             };
             rejectWaiter = (error) => {
                 void close();
-                rejectCode(error);
+                reject(error);
             };
         });
         const close = async () => {
-            await new Promise((resolveClose) => {
-                server.close(() => resolveClose());
+            await new Promise((resolve) => {
+                server.close(() => resolve());
             });
         };
         server.on('error', (error) => {
@@ -772,7 +772,7 @@ export async function resolveAccessToken(options) {
     }
     const baseUrl = options.baseUrl ?? env.baseUrl;
     if (!baseUrl) {
-        throw new Error(`Env "${envName}" is missing a base URL. Run \`nb env add ${envName} --api-base-url <url>\`.`);
+        throw new Error(`Env "${envName}" is missing a base URL. Update it with \`nb env update ${envName} --api-base-url <url>\` first.`);
     }
     printVerbose(`Refreshing OAuth session for env "${envName}"`);
     return refreshOauthAccessToken({
@@ -793,7 +793,12 @@ export async function resolveServerRequestTarget(options) {
         scope: options.scope,
     });
     if (!baseUrl) {
-        throw new Error('Missing base URL. Use --api-base-url or configure one with `nb env add`.');
+        throw new Error([
+            env ? `Env "${envName}" is missing a base URL.` : `Env "${envName}" is not configured.`,
+            env
+                ? `Use --api-base-url or update env "${envName}" with \`nb env update ${envName} --api-base-url <url>\`.`
+                : `Use --api-base-url or run \`nb init --ui --env ${envName}\` first.`,
+        ].join('\n'));
     }
     return { baseUrl, token };
 }
@@ -807,8 +812,8 @@ export async function authenticateEnvWithBasic(options) {
                 ? `Environment "${envName}" does not have an API base URL yet.`
                 : `Environment "${envName}" has not been set up yet.`,
             env
-                ? `Run \`nb env add ${envName} --api-base-url <url>\` to finish setting it up.`
-                : `Run \`nb env add ${envName}\` first.`,
+                ? `Run \`nb env update ${envName} --api-base-url <url>\` to finish setting it up.`
+                : `Run \`nb init --ui --env ${envName}\` first.`,
         ]
             .filter(Boolean)
             .join('\n'));
@@ -864,8 +869,8 @@ export async function authenticateEnvWithOauth(options) {
                 ? `Environment "${envName}" does not have an API base URL yet.`
                 : `Environment "${envName}" has not been set up yet.`,
             env
-                ? `Run \`nb env add ${envName} --api-base-url <url>\` to finish setting it up.`
-                : `Run \`nb env add ${envName}\` first.`,
+                ? `Run \`nb env update ${envName} --api-base-url <url>\` to finish setting it up.`
+                : `Run \`nb init --ui --env ${envName}\` first.`,
         ]
             .filter(Boolean)
             .join('\n'));
@@ -912,10 +917,13 @@ export async function authenticateEnvWithOauth(options) {
         const code = await new Promise((resolve, reject) => {
             const timeout = setTimeout(() => reject(new Error(`OAuth sign-in timed out after 5 minutes. Run \`nb env auth ${envName}\` to try again.`)), OAUTH_LOGIN_TIMEOUT_MS);
             timeout.unref?.();
-            callback.waitForCode().then((value) => {
+            callback
+                .waitForCode()
+                .then((value) => {
                 clearTimeout(timeout);
                 resolve(value);
-            }, (error) => {
+            })
+                .catch((error) => {
                 clearTimeout(timeout);
                 reject(error);
             });

package/dist/lib/source-publish.js

@@ -292,6 +292,9 @@ export async function publishSourceSnapshot(params) {
     if (publishError) {
         throw publishError;
     }
+    if (!result) {
+        throw new Error('Source snapshot publishing finished without a result.');
+    }
     return result;
 }
 export function buildSuggestedInitCommand(result) {
@@ -299,7 +302,7 @@ export function buildSuggestedInitCommand(result) {
     const normalizedRegistry = result.npmRegistry || `http://${host}:${port || DEFAULT_SOURCE_REGISTRY_PORT}`;
     const suggestedEnv = ['snapshot', sanitizeEnvSegment(result.gitSha)].filter(Boolean).join('');
     return [
-        `nb init --env ${suggestedEnv} --yes --source npm`,
+        `nb init --ui --env ${suggestedEnv} --yes --source npm`,
         `--version ${result.version}`,
         `--npm-registry=${normalizedRegistry}`,
     ].join(' ');

package/dist/lib/startup-update.js

@@ -10,6 +10,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { confirm } from "./inquirer.js";
+import { DEFAULT_UPDATE_POLICY, getExplicitCliConfigValue, loadCliConfig, } from './cli-config.js';
 import { inspectSelfInstall, inspectSelfStatus, } from './self-manager.js';
 import { inspectSkillsStatus } from './skills-manager.js';
 import { resolveCliHomeDir } from './cli-home.js';
@@ -83,39 +84,53 @@ async function writeCurrentInstallEntry(updater) {
     const state = await readState();
     const installBinPath = getCurrentInstallBinPath();
     const nextEntry = updater(getCurrentInstallEntry(state), state);
+    const entries = {
+        ...(state.entries ?? {}),
+    };
+    if (nextEntry?.policy || nextEntry?.lastCheckedDate) {
+        entries[installBinPath] = nextEntry;
+    }
+    else {
+        delete entries[installBinPath];
+    }
     await writeState({
         ...state,
-        entries: {
-            ...(state.entries ?? {}),
-            [installBinPath]: nextEntry,
-        },
+        entries: Object.keys(entries).length ? entries : undefined,
     });
 }
 async function markChecked(now = new Date()) {
-    await writeCurrentInstallEntry((current, state) => {
+    await writeCurrentInstallEntry((current) => {
         return {
-            policy: current?.policy ?? 'daily',
+            ...current,
             lastCheckedDate: todayStamp(now),
         };
     });
 }
-async function disableStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'disabled',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+function resolveLegacyStartupUpdatePolicy(state) {
+    const policy = getCurrentInstallEntry(state)?.policy;
+    if (policy === 'disabled') {
+        return 'off';
+    }
+    if (policy === 'daily') {
+        return 'prompt';
+    }
+    return undefined;
 }
-async function enableDailyStartupUpdateForCurrentInstall() {
-    await writeCurrentInstallEntry((current, state) => {
-        return {
-            policy: 'daily',
-            lastCheckedDate: current?.lastCheckedDate
-                ?? state.lastCheckedDate,
-        };
-    });
+async function resolveStartupUpdatePolicy(state) {
+    const config = await loadCliConfig({ scope: 'global' });
+    const explicit = getExplicitCliConfigValue(config, 'update.policy');
+    return explicit ?? resolveLegacyStartupUpdatePolicy(state) ?? DEFAULT_UPDATE_POLICY;
+}
+export async function clearLegacyStartupUpdatePolicyForCurrentInstall() {
+    const state = await readState();
+    const current = getCurrentInstallEntry(state);
+    if (!current?.policy) {
+        return false;
+    }
+    await writeCurrentInstallEntry(() => ({
+        lastCheckedDate: current.lastCheckedDate,
+    }));
+    return true;
 }
 export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     if (process.env[NB_SKIP_STARTUP_UPDATE_ENV] === '1') {
@@ -125,19 +140,14 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
         return false;
     }
     const state = await readState();
-    const currentEntry = getCurrentInstallEntry(state);
-    if (currentEntry?.policy === 'disabled') {
+    const policy = await resolveStartupUpdatePolicy(state);
+    if (policy === 'off') {
         return false;
     }
-    if (currentEntry?.policy === 'daily') {
-        return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
-    }
     const selfInstall = await inspectSelfInstall();
     if (!shouldEnableStartupUpdateForInstallMethod(selfInstall.installMethod)) {
-        await disableStartupUpdateForCurrentInstall();
         return false;
     }
-    await enableDailyStartupUpdateForCurrentInstall();
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
@@ -189,14 +199,13 @@ function buildPromptMessage(selfStatus, skillsStatus) {
     return lines.join('\n');
 }
 function buildUpdateCommands(selfStatus, skillsStatus) {
-    const commands = [];
     if (selfStatus.updateAvailable && selfStatus.updatable) {
-        commands.push('nb self update --yes');
+        return [skillsStatus.updateAvailable === true ? 'nb self update --yes --skills' : 'nb self update --yes'];
     }
     if (skillsStatus.updateAvailable === true) {
-        commands.push('nb skills update --yes');
+        return ['nb skills update --yes'];
     }
-    return commands;
+    return [];
 }
 function buildNonInteractiveWarning(selfStatus, skillsStatus) {
     const commands = buildUpdateCommands(selfStatus, skillsStatus);
@@ -233,26 +242,36 @@ function buildDeclinedWarning(selfStatus, skillsStatus) {
         'You may run into compatibility issues until you update.',
     ].join(' ');
 }
-async function runStartupUpdates() {
-    await run('nb', ['self', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb self update',
-    });
-    await run('nb', ['skills', 'update', '--yes'], {
-        stdio: 'inherit',
-        env: {
-            [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
-        },
-        errorName: 'nb skills update',
-    });
+async function runStartupUpdates(selfStatus, skillsStatus) {
+    if (selfStatus.updateAvailable && selfStatus.updatable) {
+        const args = ['self', 'update', '--yes'];
+        if (skillsStatus.updateAvailable === true) {
+            args.push('--skills');
+        }
+        await run('nb', args, {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb self update',
+        });
+        return;
+    }
+    if (skillsStatus.updateAvailable === true) {
+        await run('nb', ['skills', 'update', '--yes'], {
+            stdio: 'inherit',
+            env: {
+                [NB_SKIP_STARTUP_UPDATE_ENV]: '1',
+            },
+            errorName: 'nb skills update',
+        });
+    }
 }
-export async function maybeRunStartupUpdatePrompt(argv) {
+export async function maybeRunStartupUpdate(argv) {
     if (!(await shouldRunStartupUpdateCheck(argv))) {
         return { kind: 'skipped' };
     }
+    const policy = await resolveStartupUpdatePolicy(await readState());
     const selfStatus = await inspectSelfStatus();
     const skillsStatus = await inspectSkillsStatus();
     if (!hasPendingUpdates(selfStatus, skillsStatus)) {
@@ -264,6 +283,11 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'warned' };
     }
+    if (policy === 'auto') {
+        await runStartupUpdates(selfStatus, skillsStatus);
+        await markChecked();
+        return { kind: 'updated' };
+    }
     let answer = false;
     try {
         answer = await confirm({
@@ -279,7 +303,7 @@ export async function maybeRunStartupUpdatePrompt(argv) {
         await markChecked();
         return { kind: 'declined' };
     }
-    await runStartupUpdates();
+    await runStartupUpdates(selfStatus, skillsStatus);
     await markChecked();
     return { kind: 'updated' };
 }

package/dist/locale/en-US.json

@@ -370,6 +370,12 @@
           "description": "Set up the first admin."
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "No envs configured.",
+        "noEnvsConfiguredHelp": "Run `nb init --ui` to create one first."
+      }
     }
   },
   "apiCommandCompat": {

package/dist/locale/zh-CN.json

@@ -370,6 +370,12 @@
           "description": "设置第一个管理员账号。"
         }
       }
+    },
+    "env": {
+      "messages": {
+        "noEnvsConfigured": "尚未配置任何 env。",
+        "noEnvsConfiguredHelp": "请先运行 `nb init --ui` 创建一个。"
+      }
     }
   },
   "apiCommandCompat": {