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

package/bin/run.js

@@ -69,49 +69,20 @@ const { ensureRuntimeFromArgv } = await import(pathToFileURL(bootstrapPath).href
 const startupUpdatePath = isDev
   ? path.join(root, 'src/lib/startup-update.ts')
   : path.join(root, 'dist/lib/startup-update.js');
-const { maybeRunStartupUpdatePrompt } = await import(pathToFileURL(startupUpdatePath).href);
+const { maybeRunStartupUpdate } = await import(pathToFileURL(startupUpdatePath).href);
+const cliEntryErrorPath = isDev
+  ? path.join(root, 'src/lib/cli-entry-error.ts')
+  : path.join(root, 'dist/lib/cli-entry-error.js');
+const { formatCliEntryError } = await import(pathToFileURL(cliEntryErrorPath).href);
 const { flush, run, settings } = await import('@oclif/core');
 
 if (isDev) {
   settings.debug = true;
 }
 
-function getCommandToken(argv) {
-  const tokens = [];
-
-  for (const token of argv) {
-    if (!token || token.startsWith('-')) {
-      continue;
-    }
-
-    tokens.push(token);
-  }
-
-  if (tokens[0] === 'api') {
-    return tokens[1] ?? tokens[0];
-  }
-
-  return tokens[0];
-}
-
-function formatCliEntryError(error, argv) {
-  const message = error instanceof Error ? error.message : String(error);
-  const missingCommandMatch = message.match(/^Command (.+) not found\.$/);
-  if (missingCommandMatch) {
-    const commandToken = getCommandToken(argv) ?? missingCommandMatch[1];
-    return [
-      `Unknown command: \`${commandToken}\`.`,
-      'If this is a built-in command or a typo, run `nb --help` to inspect available commands.',
-      `If \`${commandToken}\` should be a runtime command from your NocoBase app, run \`nb env update\` and try again.`,
-    ].join('\n');
-  }
-
-  return message;
-}
-
 try {
   const argv = process.argv.slice(2);
-  const startupUpdate = await maybeRunStartupUpdatePrompt(argv);
+  const startupUpdate = await maybeRunStartupUpdate(argv);
   if (startupUpdate.kind === 'updated') {
     const result = spawnSync(process.execPath, process.argv.slice(1), {
       stdio: 'inherit',

package/dist/commands/app/restart.js

@@ -55,7 +55,11 @@ export default class AppRestart extends Command {
             default: false,
         }),
         quickstart: Flags.boolean({ description: 'Quickstart the application after stopping it', required: false }),
-        port: Flags.string({ description: 'Port (overrides appPort from env config when set)', char: 'p', required: false }),
+        port: Flags.string({
+            description: 'Port (overrides appPort from env config when set)',
+            char: 'p',
+            required: false,
+        }),
         daemon: Flags.boolean({
             description: 'Run the application as a daemon after stopping it (default: true; use --no-daemon to stay in the foreground)',
             char: 'd',
@@ -63,7 +67,11 @@ export default class AppRestart extends Command {
             default: true,
             allowNo: true,
         }),
-        instances: Flags.integer({ description: 'Number of instances to run after stopping it', char: 'i', required: false }),
+        instances: Flags.integer({
+            description: 'Number of instances to run after stopping it',
+            char: 'i',
+            required: false,
+        }),
         'launch-mode': Flags.string({ description: 'Launch Mode', required: false, options: ['pm2', 'node'] }),
         verbose: Flags.boolean({
             description: 'Show raw shutdown/startup output from the underlying local or Docker command',
@@ -121,14 +129,13 @@ export default class AppRestart extends Command {
                 failTask(`Failed to recreate NocoBase for "${runtime.envName}".`);
                 this.error(formatDockerRestartFailure(runtime.envName, message));
             }
-            const appUrl = formatAppUrl(runtime.env.appPort === undefined || runtime.env.appPort === null
-                ? undefined
-                : String(runtime.env.appPort));
+            const appUrl = formatAppUrl(runtime.env.appPort === undefined || runtime.env.appPort === null ? undefined : String(runtime.env.appPort));
             await waitForAppReady({
                 envName: runtime.envName,
                 apiBaseUrl: resolveManagedAppApiBaseUrl(runtime),
                 containerName: runtime.containerName,
                 logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
+                ...(flags.verbose ? { verbose: true } : {}),
             });
             succeedTask(`NocoBase is running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);
             return;

package/dist/commands/app/start.js

@@ -175,6 +175,7 @@ export default class AppStart extends Command {
                 apiBaseUrl,
                 containerName: runtime.containerName,
                 logHint: `You can inspect startup logs with \`nb app logs --env ${runtime.envName}\`.`,
+                ...(flags.verbose ? { verbose: true } : {}),
             });
             if (shouldPrintStartSuccess()) {
                 succeedTask(`NocoBase is running for "${runtime.envName}"${appUrl ? ` at ${appUrl}` : ''}.`);

package/dist/commands/app/upgrade.js

@@ -312,7 +312,7 @@ export default class AppUpgrade extends Command {
             throw new Error([
                 `Env "${runtime.envName}" does not have a saved \`downloadVersion\`.`,
                 'This env cannot be upgraded until a source version is explicit.',
-                'Re-run `nb init` or `nb env add` for this env, or pass `--version` to `nb app upgrade`.',
+                `Re-run \`nb init --ui --env ${runtime.envName}\` for this env, or pass \`--version\` to \`nb app upgrade\`.`,
             ].join('\n'));
         }
         return {
@@ -383,7 +383,7 @@ export default class AppUpgrade extends Command {
             this.error([
                 `Can't upgrade "${runtime.envName}" from this machine.`,
                 'This env only has an API connection, so there is no saved local app or Docker runtime to upgrade here.',
-                'If you want a local NocoBase AI environment that the CLI can upgrade, run `nb init` first.',
+                'If you want a local NocoBase AI environment that the CLI can upgrade, run `nb init --ui` first.',
             ].join('\n'));
         }
         if (runtime.kind === 'ssh') {

package/dist/commands/config/delete.js

@@ -8,10 +8,12 @@
  */
 import { Args, Command } from '@oclif/core';
 import { assertSupportedCliConfigKey, deleteCliConfigValue } from '../../lib/cli-config.js';
+import { clearLegacyStartupUpdatePolicyForCurrentInstall } from '../../lib/startup-update.js';
 export default class ConfigDelete extends Command {
     static summary = 'Delete an explicitly configured CLI setting';
     static examples = [
         '<%= config.bin %> <%= command.id %> locale',
+        '<%= config.bin %> <%= command.id %> update.policy',
         '<%= config.bin %> <%= command.id %> license.pkg-url',
         '<%= config.bin %> <%= command.id %> docker.network',
         '<%= config.bin %> <%= command.id %> docker.container-prefix',
@@ -29,6 +31,7 @@ export default class ConfigDelete extends Command {
         const { args } = await this.parse(ConfigDelete);
         const key = assertSupportedCliConfigKey(args.key);
         const removed = await deleteCliConfigValue(key);
-        this.log(removed ? `Deleted ${key}` : `${key} was not set`);
+        const clearedLegacy = key === 'update.policy' ? await clearLegacyStartupUpdatePolicyForCurrentInstall() : false;
+        this.log(removed || clearedLegacy ? `Deleted ${key}` : `${key} was not set`);
     }
 }

package/dist/commands/config/get.js

@@ -12,6 +12,7 @@ export default class ConfigGet extends Command {
     static summary = 'Get the effective CLI configuration value for a key';
     static examples = [
         '<%= config.bin %> <%= command.id %> locale',
+        '<%= config.bin %> <%= command.id %> update.policy',
         '<%= config.bin %> <%= command.id %> license.pkg-url',
         '<%= config.bin %> <%= command.id %> docker.network',
         '<%= config.bin %> <%= command.id %> docker.container-prefix',

package/dist/commands/config/set.js

@@ -8,11 +8,13 @@
  */
 import { Args, Command } from '@oclif/core';
 import { assertSupportedCliConfigKey, setCliConfigValue } from '../../lib/cli-config.js';
+import { clearLegacyStartupUpdatePolicyForCurrentInstall } from '../../lib/startup-update.js';
 export default class ConfigSet extends Command {
     static summary = 'Set a CLI configuration value';
-    static description = 'Set a supported CLI configuration key. Supported keys: locale, license.pkg-url, docker.network, docker.container-prefix, bin.docker, bin.git, bin.yarn.';
+    static description = 'Set a supported CLI configuration key. Supported keys: locale, update.policy, license.pkg-url, docker.network, docker.container-prefix, bin.docker, bin.git, bin.yarn.';
     static examples = [
         '<%= config.bin %> <%= command.id %> locale zh-CN',
+        '<%= config.bin %> <%= command.id %> update.policy prompt',
         '<%= config.bin %> <%= command.id %> license.pkg-url https://pkg.nocobase.com/',
         '<%= config.bin %> <%= command.id %> docker.network nocobase',
         '<%= config.bin %> <%= command.id %> docker.container-prefix nb',
@@ -34,6 +36,9 @@ export default class ConfigSet extends Command {
         const { args } = await this.parse(ConfigSet);
         const key = assertSupportedCliConfigKey(args.key);
         const value = await setCliConfigValue(key, args.value);
+        if (key === 'update.policy') {
+            await clearLegacyStartupUpdatePolicyForCurrentInstall();
+        }
         this.log(`${key}=${value}`);
     }
 }

package/dist/commands/db/ps.js

@@ -13,10 +13,7 @@ import { renderTable } from '../../lib/ui.js';
 import { builtinDbStatus, resolveDbRuntime } from './shared.js';
 export default class DbPs extends Command {
     static description = 'Show built-in database runtime status for configured envs without starting or stopping anything.';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-        '<%= config.bin %> <%= command.id %> --env app1',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>', '<%= config.bin %> <%= command.id %> --env app1'];
     static flags = {
         env: Flags.string({
             char: 'e',
@@ -26,11 +23,9 @@ export default class DbPs extends Command {
     async run() {
         const { flags } = await this.parse(DbPs);
         const requestedEnv = flags.env?.trim() || undefined;
-        const envNames = requestedEnv
-            ? [requestedEnv]
-            : Object.keys((await listEnvs()).envs).sort();
+        const envNames = requestedEnv ? [requestedEnv] : Object.keys((await listEnvs()).envs).sort();
         if (!envNames.length) {
-            this.log('No NocoBase env is configured yet. Run `nb init` to create one first.');
+            this.log('No NocoBase env is configured yet. Run `nb init --ui` to create one first.');
             return;
         }
         const rows = [];
@@ -44,16 +39,8 @@ export default class DbPs extends Command {
                 continue;
             }
             const type = runtime.kind === 'builtin' ? 'builtin' : runtime.status;
-            const status = runtime.kind === 'builtin'
-                ? await builtinDbStatus(runtime.containerName)
-                : runtime.status;
-            rows.push([
-                runtime.envName,
-                type,
-                runtime.dbDialect,
-                status,
-                runtime.address,
-            ]);
+            const status = runtime.kind === 'builtin' ? await builtinDbStatus(runtime.containerName) : runtime.status;
+            rows.push([runtime.envName, type, runtime.dbDialect, status, runtime.address]);
         }
         this.log(renderTable(['Env', 'Type', 'Dialect', 'Status', 'Address'], rows));
     }

package/dist/commands/env/auth.js

@@ -23,7 +23,7 @@ function resolveExplicitAuthType(value) {
     return value === 'basic' || value === 'token' || value === 'oauth' ? value : undefined;
 }
 function formatMissingEnvMessage(envName) {
-    return [`Env "${envName}" is not configured.`, `Run \`nb env add ${envName} --api-base-url <url>\` first.`].join('\n');
+    return [`Env "${envName}" is not configured.`, `Run \`nb init --ui --env ${envName}\` first.`].join('\n');
 }
 export default class EnvAuth extends Command {
     static summary = 'Authenticate a saved NocoBase environment with basic login, a token, or OAuth';

package/dist/commands/env/list.js

@@ -9,13 +9,12 @@
 import { Command } from '@oclif/core';
 import { getCurrentEnvName, listEnvs, resolveConfiguredAuthType } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { translateCli } from '../../lib/cli-locale.js';
 import { renderTable } from '../../lib/ui.js';
 import { resolveApiBaseUrl } from './shared.js';
 export default class EnvList extends Command {
     static summary = 'List configured environments';
-    static examples = [
-        '<%= config.bin %> <%= command.id %>',
-    ];
+    static examples = ['<%= config.bin %> <%= command.id %>'];
     async run() {
         await this.parse(EnvList);
         const scope = resolveDefaultConfigScope();
@@ -23,8 +22,8 @@ export default class EnvList extends Command {
         const currentEnv = await getCurrentEnvName({ scope });
         const names = Object.keys(envs).sort();
         if (!names.length) {
-            this.log('No envs configured.');
-            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
+            this.log(translateCli('commands.env.messages.noEnvsConfigured'));
+            this.log(translateCli('commands.env.messages.noEnvsConfiguredHelp'));
             return;
         }
         const rows = [];

package/dist/commands/env/status.js

@@ -10,6 +10,7 @@ import { Args, Command, Flags } from '@oclif/core';
 import { formatMissingManagedAppEnvMessage, resolveManagedAppRuntime } from '../../lib/app-runtime.js';
 import { getCurrentEnvName, listEnvs } from '../../lib/auth-store.js';
 import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
+import { translateCli } from '../../lib/cli-locale.js';
 import { renderTable } from '../../lib/ui.js';
 import { apiStatus, runtimeStatus } from './shared.js';
 export default class EnvStatus extends Command {
@@ -46,13 +47,11 @@ export default class EnvStatus extends Command {
         const { envs } = await listEnvs({ scope });
         const configuredEnvNames = Object.keys(envs).sort();
         if (!configuredEnvNames.length) {
-            this.log('No envs configured.');
-            this.log('Run `nb env add <name> --api-base-url <url>` to add one.');
+            this.log(translateCli('commands.env.messages.noEnvsConfigured'));
+            this.log(translateCli('commands.env.messages.noEnvsConfiguredHelp'));
             return;
         }
-        const envNames = flags.all
-            ? configuredEnvNames
-            : [requestedEnv || (await getCurrentEnvName({ scope }))];
+        const envNames = flags.all ? configuredEnvNames : [requestedEnv || (await getCurrentEnvName({ scope }))];
         const rows = [];
         for (const envName of envNames) {
             const runtime = await resolveManagedAppRuntime(envName);
@@ -76,8 +75,12 @@ export default class EnvStatus extends Command {
             rows.push({
                 env: runtime.envName,
                 status,
-                apiBaseUrl: runtime.env.apiBaseUrl
-                    || String(runtime.env.config.apiBaseUrl ?? runtime.env.config.baseUrl ?? envs[envName]?.apiBaseUrl ?? envs[envName]?.baseUrl ?? '').trim(),
+                apiBaseUrl: runtime.env.apiBaseUrl ||
+                    String(runtime.env.config.apiBaseUrl ??
+                        runtime.env.config.baseUrl ??
+                        envs[envName]?.apiBaseUrl ??
+                        envs[envName]?.baseUrl ??
+                        '').trim(),
             });
         }
         if (flags['json-output']) {

package/dist/commands/install.js

@@ -26,6 +26,7 @@ import { omitKeys, upperFirst } from "../lib/object-utils.js";
 import { getEnv, setCurrentEnv, upsertEnv } from '../lib/auth-store.js';
 import { buildStoredEnvConfig } from '../lib/env-config.js';
 import { resolveDockerEnvFileArg } from "../lib/docker-env-file.js";
+import { startDockerLogFollower } from '../lib/docker-log-stream.js';
 import Download, { defaultDockerRegistryForLang } from './download.js';
 import EnvAdd from "./env/add.js";
 const DEFAULT_INSTALL_ENV_NAME = 'local';
@@ -1112,7 +1113,7 @@ export default class Install extends Command {
                 throw new Error([
                     `Cannot continue setup for "${env.name}" in non-interactive resume mode yet.`,
                     `These setup-only flags are not saved in the env config: ${missingFlags.join(', ')}`,
-                    `Run \`nb init --env ${env.name} --resume\` without \`--yes\`, or pass those flags again.`,
+                    `Run \`nb init --ui --env ${env.name} --resume\` without \`--yes\`, or pass those flags again.`,
                 ].join('\n'));
             }
         }
@@ -2010,32 +2011,38 @@ export default class Install extends Command {
         let lastMessage = 'No response yet';
         let lastLoggedStatus = '';
         printInfo('Waiting for NocoBase to become ready...');
-        while (Date.now() - startedAt < timeoutMs) {
-            const result = await Install.requestAppHealthCheck({
-                healthCheckUrl,
-                fetchImpl,
-                requestTimeoutMs,
-            });
-            if (result.ok) {
-                return;
-            }
-            lastMessage = result.message;
-            const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
-            const statusLine = `Waiting for NocoBase to become ready... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`;
-            if (statusLine !== lastLoggedStatus) {
-                printInfo(statusLine);
-                lastLoggedStatus = statusLine;
-            }
-            const remainingMs = timeoutMs - (Date.now() - startedAt);
-            if (remainingMs <= 0) {
-                break;
+        const dockerLogFollower = options?.verbose && options.containerName ? startDockerLogFollower(options.containerName) : undefined;
+        try {
+            while (Date.now() - startedAt < timeoutMs) {
+                const result = await Install.requestAppHealthCheck({
+                    healthCheckUrl,
+                    fetchImpl,
+                    requestTimeoutMs,
+                });
+                if (result.ok) {
+                    return;
+                }
+                lastMessage = result.message;
+                const elapsedSeconds = Math.max(1, Math.floor((Date.now() - startedAt) / 1000));
+                const statusLine = `Waiting for NocoBase to become ready... (${elapsedSeconds}s elapsed, last status: ${Install.formatHealthCheckMessage(lastMessage)})`;
+                if (statusLine !== lastLoggedStatus) {
+                    printInfo(statusLine);
+                    lastLoggedStatus = statusLine;
+                }
+                const remainingMs = timeoutMs - (Date.now() - startedAt);
+                if (remainingMs <= 0) {
+                    break;
+                }
+                await Install.sleep(Math.min(intervalMs, remainingMs));
             }
-            await Install.sleep(Math.min(intervalMs, remainingMs));
+            const logHint = options?.containerName
+                ? ` You can inspect startup logs with: docker logs ${options.containerName}`
+                : '';
+            throw new Error(`The application did not become ready in time. Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${Install.formatHealthCheckMessage(lastMessage)}.${logHint}`);
+        }
+        finally {
+            await dockerLogFollower?.stop();
         }
-        const logHint = options?.containerName
-            ? ` You can inspect startup logs with: docker logs ${options.containerName}`
-            : '';
-        throw new Error(`The application did not become ready in time. Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${Install.formatHealthCheckMessage(lastMessage)}.${logHint}`);
     }
     async saveInstalledEnv(params) {
         await upsertEnv(params.envName, Install.buildSavedEnvConfig(params), { scope: resolveDefaultConfigScope() });
@@ -2392,6 +2399,7 @@ export default class Install extends Command {
                 envAddResults,
             }), {
                 containerName: dockerAppPlan?.containerName,
+                verbose: parsed.verbose,
             });
             printInfo(`NocoBase is ready at http://127.0.0.1:${dockerAppPlan?.appPort ?? localAppPlan?.appPort}`);
         }

package/dist/commands/self/update.js

@@ -8,14 +8,29 @@
  */
 import { Command, Flags } from '@oclif/core';
 import { confirm } from "../../lib/inquirer.js";
+import { updateNocoBaseSkills } from '../../lib/skills-manager.js';
 import { setVerboseMode } from '../../lib/ui.js';
 import { formatSelfUpdateUnavailableMessage, formatUnsupportedSelfUpdateMessage, inspectSelfStatus, updateSelf, } from '../../lib/self-manager.js';
+function formatSkillsUpdateMessage(result, verbose) {
+    if (result.action === 'noop') {
+        if (result.reason === 'not-installed') {
+            return verbose
+                ? 'NocoBase AI coding skills are not installed globally. Run `nb skills install` first.'
+                : 'Skipped skills update because NocoBase AI coding skills are not installed.';
+        }
+        return verbose
+            ? 'NocoBase AI coding skills are already up to date globally.'
+            : 'NocoBase AI coding skills are up to date.';
+    }
+    return verbose ? 'Updated the global NocoBase AI coding skills.' : 'Updated NocoBase AI coding skills globally.';
+}
 export default class SelfUpdate extends Command {
     static summary = 'Update the globally installed NocoBase CLI';
     static description = 'Update the current NocoBase CLI install when it is managed by a standard global npm install.';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> --yes',
+        '<%= config.bin %> <%= command.id %> --skills',
         '<%= config.bin %> <%= command.id %> --channel alpha --json',
     ];
     static flags = {
@@ -33,6 +48,10 @@ export default class SelfUpdate extends Command {
             description: 'Output the result as JSON',
             default: false,
         }),
+        skills: Flags.boolean({
+            description: 'Also update the globally installed NocoBase AI coding skills',
+            default: false,
+        }),
         verbose: Flags.boolean({
             description: 'Show detailed update output',
             default: false,
@@ -50,11 +69,14 @@ export default class SelfUpdate extends Command {
         if (!status.latestVersion && status.registryError) {
             this.error(formatSelfUpdateUnavailableMessage(status));
         }
+        let shouldUpdateSkills = flags.skills;
         if (!flags.yes && status.updateAvailable) {
             let confirmed = false;
             try {
                 confirmed = await confirm({
-                    message: `Update ${status.packageName} from ${status.currentVersion} to ${status.latestVersion}?`,
+                    message: flags.skills
+                        ? `Update ${status.packageName} from ${status.currentVersion} to ${status.latestVersion} and refresh the globally installed NocoBase AI coding skills?`
+                        : `Update ${status.packageName} from ${status.currentVersion} to ${status.latestVersion}?`,
                     default: false,
                 });
             }
@@ -69,6 +91,24 @@ export default class SelfUpdate extends Command {
             channel: flags.channel,
             verbose: flags.verbose,
         });
+        if (flags.skills && !flags.yes && !status.updateAvailable) {
+            let confirmed = false;
+            try {
+                confirmed = await confirm({
+                    message: 'Update the globally installed NocoBase AI coding skills?',
+                    default: true,
+                });
+            }
+            catch {
+                return;
+            }
+            shouldUpdateSkills = confirmed;
+        }
+        const skillsResult = shouldUpdateSkills
+            ? await updateNocoBaseSkills({
+                verbose: flags.verbose,
+            })
+            : undefined;
         if (flags.json) {
             this.log(JSON.stringify({
                 ok: true,
@@ -79,6 +119,17 @@ export default class SelfUpdate extends Command {
                 channel: result.status.channel,
                 fromVersion: result.status.currentVersion,
                 toVersion: result.targetVersion,
+                skills: skillsResult
+                    ? {
+                        action: skillsResult.action,
+                        reason: skillsResult.action === 'noop' ? skillsResult.reason : undefined,
+                        globalRoot: skillsResult.status.globalRoot,
+                        workspaceRoot: skillsResult.status.workspaceRoot,
+                        installedSkillNames: skillsResult.status.installedSkillNames,
+                        installedVersion: skillsResult.status.installedVersion,
+                        installedRef: skillsResult.status.installedRef,
+                    }
+                    : undefined,
             }, null, 2));
             return;
         }
@@ -86,10 +137,16 @@ export default class SelfUpdate extends Command {
             this.log(flags.verbose
                 ? `NocoBase CLI is already up to date at ${result.status.currentVersion}.`
                 : `NocoBase CLI is up to date: ${result.status.currentVersion}.`);
+            if (skillsResult) {
+                this.log(formatSkillsUpdateMessage(skillsResult, flags.verbose));
+            }
             return;
         }
         this.log(flags.verbose
             ? `Updated NocoBase CLI from ${result.status.currentVersion} using ${result.packageSpec}${result.targetVersion ? ` (latest ${result.status.channel} resolves to ${result.targetVersion})` : ''}.`
             : `Updated NocoBase CLI: ${result.status.currentVersion} -> ${result.targetVersion}.`);
+        if (skillsResult) {
+            this.log(formatSkillsUpdateMessage(skillsResult, flags.verbose));
+        }
     }
 }

package/dist/commands/source/dev.js

@@ -16,20 +16,20 @@ function formatUnsupportedRuntimeMessage(kind, envName) {
         return [
             `Can't run dev mode for "${envName}".`,
             'This env is managed by Docker, but `nb source dev` requires a local npm or Git source directory.',
-            `Use \`nb app logs --env ${envName}\` to inspect the Docker app, or create a source-based env with \`nb init --env ${envName} --source git\`.`,
+            `Use \`nb app logs --env ${envName}\` to inspect the Docker app, or create a source-based env with \`nb init --ui --env ${envName} --source git\`.`,
         ].join('\n');
     }
     if (kind === 'ssh') {
         return [
             `Can't run dev mode for "${envName}" yet.`,
             'SSH env support is reserved but not implemented yet.',
-            `Create a source-based env with \`nb init --env ${envName} --source git\` if you want local development mode right now.`,
+            `Create a source-based env with \`nb init --ui --env ${envName} --source git\` if you want local development mode right now.`,
         ].join('\n');
     }
     return [
         `Can't run dev mode for "${envName}".`,
         'This env only has an API connection, but `nb source dev` requires a local npm or Git source directory.',
-        `Create a source-based env with \`nb init --env ${envName} --source git\` if you want local development mode.`,
+        `Create a source-based env with \`nb init --ui --env ${envName} --source git\` if you want local development mode.`,
     ].join('\n');
 }
 function appUrlForPort(port) {
@@ -129,8 +129,8 @@ export default class SourceDev extends Command {
             this.error(formatUnsupportedRuntimeMessage(runtime.kind, runtime.envName));
         }
         announceTargetEnv(runtime.envName);
-        const devPort = flags.port
-            || (runtime.env.appPort !== undefined && runtime.env.appPort !== null
+        const devPort = flags.port ||
+            (runtime.env.appPort !== undefined && runtime.env.appPort !== null
                 ? String(runtime.env.appPort).trim()
                 : undefined);
         const appUrl = appUrlForPort(devPort);

package/dist/lib/app-health.js

@@ -6,6 +6,7 @@
  * 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 { startDockerLogFollower } from './docker-log-stream.js';
 import { printInfo } from './ui.js';
 const APP_HEALTH_CHECK_INTERVAL_MS = 2_000;
 const APP_HEALTH_CHECK_TIMEOUT_MS = 600_000;
@@ -99,34 +100,40 @@ export async function waitForAppReady(params) {
     let lastMessage = 'No response yet';
     let nextProgressLogAt = startedAt + progressLogIntervalMs;
     printInfo(`Waiting for NocoBase to become ready for "${params.envName}"...`);
-    while (Date.now() - startedAt < timeoutMs) {
-        const result = await requestAppHealthCheck({
-            healthCheckUrl,
-            fetchImpl: params.fetchImpl,
-            requestTimeoutMs: params.requestTimeoutMs,
-        });
-        if (result.ok) {
-            return;
-        }
-        lastMessage = result.message;
-        const now = Date.now();
-        if (now >= nextProgressLogAt) {
-            const elapsedSeconds = Math.max(1, Math.floor((now - startedAt) / 1000));
-            printInfo(`Still waiting for "${params.envName}"... (${elapsedSeconds}s elapsed)`);
-            while (nextProgressLogAt <= now) {
-                nextProgressLogAt += progressLogIntervalMs;
+    const dockerLogFollower = params.verbose && params.containerName ? startDockerLogFollower(params.containerName) : undefined;
+    try {
+        while (Date.now() - startedAt < timeoutMs) {
+            const result = await requestAppHealthCheck({
+                healthCheckUrl,
+                fetchImpl: params.fetchImpl,
+                requestTimeoutMs: params.requestTimeoutMs,
+            });
+            if (result.ok) {
+                return;
             }
+            lastMessage = result.message;
+            const now = Date.now();
+            if (now >= nextProgressLogAt) {
+                const elapsedSeconds = Math.max(1, Math.floor((now - startedAt) / 1000));
+                printInfo(`Still waiting for "${params.envName}"... (${elapsedSeconds}s elapsed)`);
+                while (nextProgressLogAt <= now) {
+                    nextProgressLogAt += progressLogIntervalMs;
+                }
+            }
+            const remainingMs = timeoutMs - (Date.now() - startedAt);
+            if (remainingMs <= 0) {
+                break;
+            }
+            await sleep(Math.min(intervalMs, remainingMs));
         }
-        const remainingMs = timeoutMs - (Date.now() - startedAt);
-        if (remainingMs <= 0) {
-            break;
-        }
-        await sleep(Math.min(intervalMs, remainingMs));
+        const hints = [
+            params.logHint,
+            params.containerName ? `docker logs ${params.containerName}` : undefined,
+        ].filter(Boolean);
+        const hintText = hints.length > 0 ? ` ${hints.join(' ')}` : '';
+        throw new AppHealthCheckError(`NocoBase did not become ready in time for "${params.envName}". Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${lastMessage}.${hintText}`);
+    }
+    finally {
+        await dockerLogFollower?.stop();
     }
-    const hints = [
-        params.logHint,
-        params.containerName ? `docker logs ${params.containerName}` : undefined,
-    ].filter(Boolean);
-    const hintText = hints.length > 0 ? ` ${hints.join(' ')}` : '';
-    throw new AppHealthCheckError(`NocoBase did not become ready in time for "${params.envName}". Expected \`${healthCheckUrl}\` to respond with \`ok\`, but the last status was: ${lastMessage}.${hintText}`);
 }

package/dist/lib/app-managed-resources.js

@@ -82,7 +82,7 @@ function formatSavedDockerSettingsIncomplete(envName, missing) {
     return [
         `Can't start NocoBase for "${envName}" yet.`,
         `The saved Docker settings for this env are incomplete. Missing: ${missing.join(', ')}.`,
-        'Re-run `nb init` or `nb env add` to refresh this env config, then try again.',
+        `Re-run \`nb init --ui --env ${envName}\` to refresh this env config, then try again.`,
     ].join('\n');
 }
 function formatDockerAppRecreateFailure(envName, message) {