@nocobase/cli 2.2.0-test.16 → 3.0.0-alpha.1

package/dist/lib/portal-source.js

@@ -14,9 +14,12 @@ import path from 'node:path';
 import * as tar from 'tar';
 import { executeApiRequest } from './api-client.js';
 import { translateCli } from './cli-locale.js';
+import { buildPortalConfig, buildPortalConfigFromOptions, DEFAULT_PORTAL_GIT_PATH, readPortalConfig, syncPortalConfigToRemote, writePortalConfig, } from './portal-config.js';
+import { buildPortalCommandEnv } from './portal-command-env.js';
 import { buildPortalBasePath, resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
 import { listPortalWorkspaces } from './portal-list.js';
 import { findPortalListItem } from './portal-info.js';
+import { run } from './run-npm.js';
 const execFileAsync = promisify(execFile);
 const portalSourceText = (key, values, fallback) => translateCli(`commands.portalSource.${key}`, values, { fallback });
 const PULL_SOURCE_OPERATION = {
@@ -85,8 +88,18 @@ async function pathExists(target) {
         return false;
     }
 }
+async function isFile(target) {
+    try {
+        return (await stat(target)).isFile();
+    }
+    catch {
+        return false;
+    }
+}
 function shouldPackPortalSourceEntry(entryName) {
-    return !entryName.split('/').some((segment) => ['.git', 'node_modules', 'dist', '.DS_Store'].includes(segment));
+    return !entryName
+        .split('/')
+        .some((segment) => segment.startsWith('._') || ['.git', 'node_modules', 'dist', '.DS_Store'].includes(segment));
 }
 function validatePortalSourceTarEntry(entryPath, entry) {
     if (path.isAbsolute(entryPath) || entryPath.split(/[\\/]+/).includes('..')) {
@@ -118,7 +131,7 @@ async function packPortalSource(portalDir) {
 async function replacePortalSourceFromArchive(params) {
     const targetExists = await pathExists(params.portalDir);
     if (targetExists && !params.force) {
-        throw new Error(portalSourceText('errors.workspaceExists', { portalDir: params.portalDir }, `Portal workspace already exists: ${params.portalDir}\nPass --force to delete it and pull again.`));
+        throw new Error(portalSourceText('errors.workspaceExists', { portalDir: params.portalDir }, `Portal already exists: ${params.portalDir}\nPass --force to delete it and pull again.`));
     }
     const parentDir = path.dirname(params.portalDir);
     const tempDir = await mkdtemp(path.join(parentDir, `.${path.basename(params.portalDir)}-pull-`));
@@ -142,7 +155,7 @@ async function replacePortalSourceFromArchive(params) {
 async function replacePortalSourceFromDirectory(params) {
     const targetExists = await pathExists(params.portalDir);
     if (targetExists && !params.force) {
-        throw new Error(portalSourceText('errors.workspaceExists', { portalDir: params.portalDir }, `Portal workspace already exists: ${params.portalDir}\nPass --force to delete it and pull again.`));
+        throw new Error(portalSourceText('errors.workspaceExists', { portalDir: params.portalDir }, `Portal already exists: ${params.portalDir}\nPass --force to delete it and pull again.`));
     }
     const parentDir = path.dirname(params.portalDir);
     const tempDir = await mkdtemp(path.join(parentDir, `.${path.basename(params.portalDir)}-pull-`));
@@ -167,6 +180,31 @@ async function runGit(args, cwd) {
         maxBuffer: 10 * 1024 * 1024,
     });
 }
+async function installPortalDependencies(params) {
+    if (params.installDependencies === false) {
+        return {
+            dependenciesInstalled: false,
+            installSkipped: true,
+        };
+    }
+    if (!(await isFile(path.join(params.portalDir, 'package.json')))) {
+        return {
+            dependenciesInstalled: false,
+            installSkipped: true,
+        };
+    }
+    const runCommand = params.runCommand ?? run;
+    await runCommand('pnpm', ['install'], {
+        cwd: params.portalDir,
+        env: buildPortalCommandEnv(),
+        envMode: 'replace',
+        errorName: 'pnpm install',
+    });
+    return {
+        dependenciesInstalled: true,
+        installSkipped: false,
+    };
+}
 function readSourceRevision(data) {
     if (!data || typeof data !== 'object' || Array.isArray(data)) {
         return undefined;
@@ -186,7 +224,7 @@ async function resolvePortalSourceContext(options) {
     const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
     const mode = options.env.kind;
     if (mode !== 'local' && mode !== 'docker' && mode !== 'http') {
-        throw new Error(portalSourceText('errors.unsupportedEnvKind', { kind: mode }, `Cannot sync Portal source for ${mode} envs in the first version.`));
+        throw new Error(portalSourceText('errors.unsupportedEnvKind', { kind: mode }, `Cannot sync portal source for ${mode} envs in the first version.`));
     }
     const list = await listPortalWorkspaces({
         env: options.env,
@@ -207,7 +245,30 @@ async function resolvePortalSourceContext(options) {
         sourceStorage: item.sourceStorage || 'nocobase',
         gitRepo: item.gitRepo,
         gitBranch: item.gitBranch || 'main',
-        gitPath: item.gitPath || portal,
+        gitPath: item.gitPath || DEFAULT_PORTAL_GIT_PATH,
+        options: item.options,
+    };
+}
+function buildPortalConfigFromContext(context) {
+    if (Object.keys(context.options).length > 0) {
+        return buildPortalConfigFromOptions(context.options, context.portal);
+    }
+    const sourceStorage = context.sourceStorage || 'nocobase';
+    return buildPortalConfig({
+        portal: context.portal,
+        sourceStorage,
+        gitRepo: sourceStorage === 'git' ? context.gitRepo : undefined,
+        gitBranch: sourceStorage === 'git' ? context.gitBranch : undefined,
+        gitPath: sourceStorage === 'git' ? context.gitPath : undefined,
+    });
+}
+function applyPortalConfigToContext(context, config) {
+    return {
+        ...context,
+        sourceStorage: config.sourceStorage,
+        gitRepo: config.git?.repo ?? '',
+        gitBranch: config.git?.branch ?? 'main',
+        gitPath: config.git?.path ?? DEFAULT_PORTAL_GIT_PATH,
     };
 }
 function assertGitSourceConfig(context) {
@@ -217,9 +278,33 @@ function assertGitSourceConfig(context) {
     return {
         repo: context.gitRepo,
         branch: context.gitBranch || 'main',
-        gitPath: context.gitPath || context.portal,
+        gitPath: context.gitPath || DEFAULT_PORTAL_GIT_PATH,
     };
 }
+function isGitRepositoryRootPath(gitPath) {
+    return gitPath === DEFAULT_PORTAL_GIT_PATH;
+}
+async function copyPortalSourceToGitPath(params) {
+    if (isGitRepositoryRootPath(params.gitPath)) {
+        const existingEntries = await readdir(params.repoDir);
+        await Promise.all(existingEntries
+            .filter((entry) => entry !== '.git')
+            .map((entry) => rm(path.join(params.repoDir, entry), { recursive: true, force: true })));
+        const sourceEntries = (await readdir(params.portalDir)).filter(shouldPackPortalSourceEntry);
+        await Promise.all(sourceEntries.map((entry) => cp(path.join(params.portalDir, entry), path.join(params.repoDir, entry), {
+            recursive: true,
+            filter: (source) => shouldPackPortalSourceEntry(path.relative(params.portalDir, source)),
+        })));
+        return;
+    }
+    const targetDir = path.join(params.repoDir, params.gitPath);
+    await rm(targetDir, { recursive: true, force: true });
+    await mkdir(path.dirname(targetDir), { recursive: true });
+    await cp(params.portalDir, targetDir, {
+        recursive: true,
+        filter: (source) => shouldPackPortalSourceEntry(path.relative(params.portalDir, source)),
+    });
+}
 async function cloneGitSource(params) {
     const repoDir = path.join(params.cwd, 'repo');
     try {
@@ -267,13 +352,12 @@ async function pushGitPortalSource(params) {
             repo: git.repo,
             branch: git.branch,
             cwd: tempDir,
+            createBranch: true,
         });
-        const targetDir = path.join(repoDir, git.gitPath);
-        await rm(targetDir, { recursive: true, force: true });
-        await mkdir(path.dirname(targetDir), { recursive: true });
-        await cp(params.context.portalDir, targetDir, {
-            recursive: true,
-            filter: (source) => shouldPackPortalSourceEntry(path.relative(params.context.portalDir, source)),
+        await copyPortalSourceToGitPath({
+            portalDir: params.context.portalDir,
+            repoDir,
+            gitPath: git.gitPath,
         });
         await runGit(['add', git.gitPath], repoDir);
         const status = await runGit(['status', '--porcelain', '--', git.gitPath], repoDir);
@@ -299,24 +383,33 @@ async function pushGitPortalSource(params) {
 }
 export async function pullPortalSource(options) {
     const context = await resolvePortalSourceContext(options);
-    if (context.sourceStorage === 'git') {
+    const portalConfig = buildPortalConfigFromContext(context);
+    const sourceContext = applyPortalConfigToContext(context, portalConfig);
+    if (sourceContext.sourceStorage === 'git') {
         await pullGitPortalSource({
-            context,
+            context: sourceContext,
             force: options.force,
         });
+        await writePortalConfig(sourceContext.portalDir, portalConfig);
+        const installResult = await installPortalDependencies({
+            portalDir: sourceContext.portalDir,
+            installDependencies: options.installDependencies,
+            runCommand: options.runCommand,
+        });
         return {
-            ...context,
+            ...sourceContext,
             changed: true,
+            ...installResult,
         };
     }
-    if (context.sourceStorage !== 'nocobase') {
-        throw new Error(portalSourceText('errors.unsupportedSourceStorage', { sourceStorage: context.sourceStorage }, `Unsupported Portal source storage: ${context.sourceStorage}`));
+    if (sourceContext.sourceStorage !== 'nocobase') {
+        throw new Error(portalSourceText('errors.unsupportedSourceStorage', { sourceStorage: sourceContext.sourceStorage }, `Unsupported portal source storage: ${sourceContext.sourceStorage}`));
     }
-    if (context.mode === 'local' || context.mode === 'docker') {
+    if (sourceContext.mode === 'local' || sourceContext.mode === 'docker') {
         return {
-            ...context,
+            ...sourceContext,
             changed: false,
-            noopReason: context.mode === 'local'
+            noopReason: sourceContext.mode === 'local'
                 ? portalSourceText('messages.localPullNoop', undefined, 'Portal source is already local.')
                 : portalSourceText('messages.dockerPullNoop', undefined, 'Portal source is already available through the Docker volume.'),
         };
@@ -329,8 +422,8 @@ export async function pullPortalSource(options) {
             cliVersion: options.cliVersion ?? '',
             envName: options.envName,
             flags: {
-                app: context.app,
-                portal: context.portal,
+                app: sourceContext.app,
+                portal: sourceContext.portal,
                 output: archivePath,
             },
             operation: PULL_SOURCE_OPERATION,
@@ -338,15 +431,22 @@ export async function pullPortalSource(options) {
         if (!response.ok) {
             throw new Error(portalSourceText('errors.pullFailed', { status: response.status, details: JSON.stringify(response.data, null, 2) }, `Portal source pull failed with status ${response.status}\n${JSON.stringify(response.data, null, 2)}`));
         }
-        await mkdir(path.dirname(context.portalDir), { recursive: true });
+        await mkdir(path.dirname(sourceContext.portalDir), { recursive: true });
         await replacePortalSourceFromArchive({
             archivePath,
-            portalDir: context.portalDir,
+            portalDir: sourceContext.portalDir,
             force: options.force,
         });
+        await writePortalConfig(sourceContext.portalDir, portalConfig);
+        const installResult = await installPortalDependencies({
+            portalDir: sourceContext.portalDir,
+            installDependencies: options.installDependencies,
+            runCommand: options.runCommand,
+        });
         return {
-            ...context,
+            ...sourceContext,
             changed: true,
+            ...installResult,
         };
     }
     finally {
@@ -355,16 +455,26 @@ export async function pullPortalSource(options) {
 }
 export async function pushPortalSource(options) {
     const context = await resolvePortalSourceContext(options);
-    if (context.sourceStorage === 'git') {
-        if (!(await pathExists(context.portalDir))) {
-            throw new Error(portalSourceText('errors.workspaceMissing', { portalDir: context.portalDir, portal: context.portal }, `Portal workspace does not exist: ${context.portalDir}\nRun \`nb portal create ${context.portal}\` first.`));
-        }
+    if (!(await pathExists(context.portalDir))) {
+        throw new Error(portalSourceText('errors.workspaceMissing', { portalDir: context.portalDir, portal: context.portal }, `Portal does not exist: ${context.portalDir}\nRun \`nb portal create ${context.portal}\` first.`));
+    }
+    const portalConfig = await readPortalConfig(context.portalDir);
+    await syncPortalConfigToRemote({
+        portal: context.portal,
+        config: portalConfig,
+        currentOptions: context.options,
+        envName: options.envName,
+        cliVersion: options.cliVersion,
+        apiRequest: options.apiRequest,
+    });
+    const sourceContext = applyPortalConfigToContext(context, portalConfig);
+    if (sourceContext.sourceStorage === 'git') {
         const revision = await pushGitPortalSource({
-            context,
+            context: sourceContext,
             message: options.message,
         });
         return {
-            ...context,
+            ...sourceContext,
             changed: Boolean(revision),
             sourceRevision: revision,
             noopReason: revision
@@ -372,22 +482,19 @@ export async function pushPortalSource(options) {
                 : portalSourceText('messages.gitPushNoop', undefined, 'No local source changes to push.'),
         };
     }
-    if (context.sourceStorage !== 'nocobase') {
-        throw new Error(portalSourceText('errors.unsupportedSourceStorage', { sourceStorage: context.sourceStorage }, `Unsupported Portal source storage: ${context.sourceStorage}`));
+    if (sourceContext.sourceStorage !== 'nocobase') {
+        throw new Error(portalSourceText('errors.unsupportedSourceStorage', { sourceStorage: sourceContext.sourceStorage }, `Unsupported portal source storage: ${sourceContext.sourceStorage}`));
     }
-    if (context.mode === 'local' || context.mode === 'docker') {
+    if (sourceContext.mode === 'local' || sourceContext.mode === 'docker') {
         return {
-            ...context,
+            ...sourceContext,
             changed: false,
-            noopReason: context.mode === 'local'
+            noopReason: sourceContext.mode === 'local'
                 ? portalSourceText('messages.localPushNoop', undefined, 'Portal source is already local.')
                 : portalSourceText('messages.dockerPushNoop', undefined, 'Portal source is already available through the Docker volume.'),
         };
     }
-    if (!(await pathExists(context.portalDir))) {
-        throw new Error(portalSourceText('errors.workspaceMissing', { portalDir: context.portalDir, portal: context.portal }, `Portal workspace does not exist: ${context.portalDir}\nRun \`nb portal create ${context.portal}\` first.`));
-    }
-    const archive = await packPortalSource(context.portalDir);
+    const archive = await packPortalSource(sourceContext.portalDir);
     const apiRequest = options.apiRequest ?? executeApiRequest;
     try {
         const response = await apiRequest({
@@ -395,8 +502,8 @@ export async function pushPortalSource(options) {
             envName: options.envName,
             flags: {
                 file: archive.archivePath,
-                app: context.app,
-                portal: context.portal,
+                app: sourceContext.app,
+                portal: sourceContext.portal,
                 message: options.message,
             },
             operation: PUSH_SOURCE_OPERATION,
@@ -405,7 +512,7 @@ export async function pushPortalSource(options) {
             throw new Error(portalSourceText('errors.pushFailed', { status: response.status, details: JSON.stringify(response.data, null, 2) }, `Portal source push failed with status ${response.status}\n${JSON.stringify(response.data, null, 2)}`));
         }
         return {
-            ...context,
+            ...sourceContext,
             changed: true,
             sourceRevision: readSourceRevision(response.data),
         };

package/dist/lib/proxy-caddy.js

@@ -79,6 +79,7 @@ export async function writeCaddyProxyBundle(runtime, appEntryOptions, runtimeCon
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
     ]);
     return {
@@ -100,6 +101,7 @@ export async function writeManualCaddyProxyBundle(input, appEntryOptions, runtim
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
     ]);
     return {

package/dist/lib/proxy-nginx.js

@@ -107,6 +107,7 @@ async function writeResolvedNginxProxyBundle(bundle, appEntryOptions, options) {
         writeFile(bundle.appConfigPath, nextAppConfigContent, 'utf8'),
         writeFile(bundle.indexV1Path, bundle.indexV1Content, 'utf8'),
         writeFile(bundle.indexV2Path, bundle.indexV2Content, 'utf8'),
+        writeFile(bundle.indexSettingsPath, bundle.indexSettingsContent, 'utf8'),
         writeFile(bundle.mainConfigPath, bundle.mainConfigContent, 'utf8'),
         syncEnvProxyNginxSnippets(),
     ]);

package/dist/locale/en-US.json

@@ -175,33 +175,57 @@
         "templateInvalidDirectory": "Portal template \"{{source}}\" is invalid: expected a directory.",
         "localTemplateMissing": "Portal template directory does not exist: {{source}}",
         "templateUnresolved": "Portal template \"{{source}}\" could not be resolved. {{details}}",
-        "templateDownloadFailed": "Failed to download Portal template \"{{source}}\" with npm pack. {{details}}",
-        "templateExtractFailed": "Failed to extract Portal template \"{{source}}\": {{details}}",
+        "templateDownloadFailed": "Failed to download portal template \"{{source}}\" with npm pack. {{details}}",
+        "templateExtractFailed": "Failed to extract portal template \"{{source}}\": {{details}}",
         "templateMissingPackageJson": "Portal template \"{{source}}\" is invalid: package.json is missing.",
         "npmPackNoTarball": "npm pack did not produce a local tarball for {{source}}.",
         "npmPackMultipleTarballs": "npm pack produced multiple tarballs for {{source}}.",
-        "invalidPortalName": "Invalid Portal name \"{{value}}\". Use lowercase letters, numbers, underscores, or hyphens, and start with a lowercase letter or number.",
-        "invalidPortalAppName": "Invalid Portal app name \"{{value}}\" from apiBaseUrl. Use letters, numbers, underscores, or hyphens, and start with a letter or number.",
-        "missingApiBaseUrl": "Cannot create a Portal workspace because the selected env has no apiBaseUrl.",
-        "outsideParent": "Refusing to modify a Portal workspace outside {{parentDir}}: {{portalDir}}",
-        "sshUnsupported": "Cannot create a Portal workspace for ssh envs in the first version.",
-        "workspaceExists": "Portal workspace already exists: {{portalDir}}\nPass --force to delete it and create a new workspace."
+        "invalidPortalName": "Invalid portal name \"{{value}}\". Use lowercase letters, numbers, underscores, or hyphens, and start with a lowercase letter or number.",
+        "invalidPortalAppName": "Invalid portal app name \"{{value}}\" from apiBaseUrl. Use letters, numbers, underscores, or hyphens, and start with a letter or number.",
+        "missingApiBaseUrl": "Cannot create a portal because the selected env has no apiBaseUrl.",
+        "outsideParent": "Refusing to modify a portal outside {{parentDir}}: {{portalDir}}",
+        "sshUnsupported": "Cannot create a portal for ssh envs in the first version.",
+        "workspaceExists": "Portal already exists: {{portalDir}}\nPass --force to delete it and create a new portal."
       },
       "messages": {
         "skipInstall": "Skipped pnpm install because package.json was not found in {{portalDir}}.",
         "created": "Portal \"{{portal}}\" created at {{portalDir}}.",
         "app": "App: {{app}}",
-        "base": "Base: {{base}}"
+        "base": "Base: {{base}}",
+        "sourceStorage": "Source storage: {{sourceStorage}}"
+      }
+    },
+    "portalConfig": {
+      "errors": {
+        "invalidSourceStorage": "Invalid source storage \"{{value}}\". Use \"nocobase\" or \"git\".",
+        "invalidGitPath": "--git-path must be a relative path inside the Git repository.",
+        "gitOptionsForNocobaseStorage": "--git-repo, --git-branch, and --git-path can only be used with --source-storage git.",
+        "gitRepoRequired": "--git-repo is required when --source-storage is git.",
+        "gitRepoInvalid": "--git-repo must be a full Git remote URL.",
+        "updateFailed": "Portal config update failed with status {{status}}\n{{details}}"
+      }
+    },
+    "portalConfigure": {
+      "errors": {
+        "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
+        "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
+        "noChanges": "No portal configuration changes were provided. Pass --source-storage or a --git-* flag.",
+        "workspaceMissing": "Portal does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` or `nb portal pull {{portal}}` first."
+      },
+      "messages": {
+        "updated": "Portal \"{{portal}}\" configuration updated at {{portalDir}}/portal.config.json.",
+        "remoteSynced": "Remote portal record: synced",
+        "remoteSkipped": "Remote portal record: not found; local config only"
       }
     },
     "portalDeploy": {
       "errors": {
         "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
-        "workspaceMissing": "Portal workspace does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` first.",
-        "packageJsonMissing": "Portal workspace is invalid: package.json is missing in {{portalDir}}.",
+        "workspaceMissing": "Portal does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` first.",
+        "packageJsonMissing": "Portal is invalid: package.json is missing in {{portalDir}}.",
         "distMissing": "Portal build did not produce {{distDir}}/index.html.",
-        "unsupportedEnvKind": "Cannot deploy a Portal workspace for {{kind}} envs in the first version.",
+        "unsupportedEnvKind": "Cannot deploy a portal for {{kind}} envs in the first version.",
         "uploadFailed": "Portal dist upload failed with status {{status}}\n{{details}}",
         "recordSyncFailed": "Portal record sync failed with status {{status}}\n{{details}}"
       },
@@ -220,16 +244,16 @@
       "errors": {
         "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
-        "unsupportedEnvKind": "Cannot list Portal workspaces for {{kind}} envs in the first version.",
+        "unsupportedEnvKind": "Cannot list portals for {{kind}} envs in the first version.",
         "listFailed": "Portal list failed with status {{status}}\n{{details}}"
       },
       "messages": {
-        "empty": "No Portal records found."
+        "empty": "No portal records found."
       },
       "table": {
         "name": "Name",
         "url": "URL",
-        "developmentMode": "Development mode",
+        "portalType": "Portal type",
         "path": "Local path",
         "enabled": "Enabled",
         "localSynced": "Local synced"
@@ -244,7 +268,7 @@
       "fields": {
         "name": "Name",
         "url": "URL",
-        "developmentMode": "Development mode",
+        "portalType": "Portal type",
         "path": "Local path",
         "enabled": "Enabled",
         "localSynced": "Local synced"
@@ -254,14 +278,14 @@
       "errors": {
         "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
-        "confirmationRequired": "Refusing to destroy a Portal in non-interactive mode without --yes.",
-        "outsideParent": "Refusing to delete a Portal workspace outside {{parentDir}}: {{portalDir}}",
-        "workspaceMissing": "Portal workspace does not exist: {{portalDir}}\nPass --force to ignore missing local files.",
-        "unsupportedEnvKind": "Cannot destroy a Portal workspace for {{kind}} envs in the first version.",
+        "confirmationRequired": "Refusing to destroy a portal in non-interactive mode without --yes.",
+        "outsideParent": "Refusing to delete a portal outside {{parentDir}}: {{portalDir}}",
+        "workspaceMissing": "Portal does not exist: {{portalDir}}\nPass --force to ignore missing local files.",
+        "unsupportedEnvKind": "Cannot destroy a portal for {{kind}} envs in the first version.",
         "recordDestroyFailed": "Portal record destroy failed with status {{status}}\n{{details}}"
       },
       "prompts": {
-        "confirm": "Destroy Portal \"{{portal}}\" and delete its storage directory?"
+        "confirm": "Destroy portal \"{{portal}}\" and delete its storage directory?"
       },
       "messages": {
         "destroyed": "Portal \"{{portal}}\" destroyed.",
@@ -269,19 +293,19 @@
         "app": "App: {{app}}",
         "base": "Base: {{base}}",
         "record": "Record: {{status}}",
-        "workspace": "Workspace: {{status}} ({{dir}})"
+        "workspace": "Portal files: {{status}} ({{dir}})"
       }
     },
     "portalDev": {
       "errors": {
         "envNotConfigured": "Env \"{{envName}}\" is not configured. Run `nb env add {{envName}} --api-base-url <url>` first.",
         "noEnvConfigured": "No NocoBase env is configured yet. Run `nb init --ui` to create one first.",
-        "workspaceMissing": "Portal workspace does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` first.",
-        "packageJsonMissing": "Portal workspace is invalid: package.json is missing in {{portalDir}}.",
-        "sshUnsupported": "Cannot start a Portal workspace in dev mode for ssh envs in the first version."
+        "workspaceMissing": "Portal does not exist: {{portalDir}}\nRun `nb portal create {{portal}}` first.",
+        "packageJsonMissing": "Portal is invalid: package.json is missing in {{portalDir}}.",
+        "sshUnsupported": "Cannot start a portal in dev mode for ssh envs in the first version."
       },
       "messages": {
-        "starting": "Starting Portal \"{{portal}}\"...",
+        "starting": "Starting portal \"{{portal}}\"...",
         "mode": "Mode: {{mode}}",
         "app": "App: {{app}}",
         "base": "Base: {{base}}",
@@ -461,15 +485,15 @@
           "message": "App subpath (for example, /nocobase/)",
           "placeholder": "/ or /nocobase/"
         },
-        "developmentMode": {
-          "message": "Who will lead development?",
-          "noCodeLabel": "Human-led development",
-          "noCodeHint": "Build your application using configuration and low-code tools, with AI as your assistant.",
-          "vibeCodingLabel": "AI-led development",
-          "vibeCodingHint": "You describe what you need, and AI writes the code and builds the application for you."
+        "portalType": {
+          "message": "Portal type",
+          "noCodeLabel": "No-code portal",
+          "noCodeHint": "Create with visual configuration. AI can help adjust the configuration. Path: /v/<name>",
+          "aiLabel": "AI portal",
+          "aiHint": "Create with AI Agent and code. Users can request changes in natural language. Path: /x/<name>"
         },
         "portalName": {
-          "message": "Initial portal name",
+          "message": "Portal name",
           "placeholder": "admin"
         },
         "portalTemplate": {
@@ -576,15 +600,15 @@
         "skipDownload": {
           "message": "Skip downloading NocoBase and reuse existing local app files or Docker images"
         },
-        "developmentMode": {
-          "message": "Who will lead development?",
-          "noCodeLabel": "Human-led development",
-          "noCodeHint": "Build your application using configuration and low-code tools, with AI as your assistant.",
-          "vibeCodingLabel": "AI-led development",
-          "vibeCodingHint": "You describe what you need, and AI writes the code and builds the application for you."
+        "portalType": {
+          "message": "Portal type",
+          "noCodeLabel": "No-code portal",
+          "noCodeHint": "Create with visual configuration. AI can help adjust the configuration. Path: /v/<name>",
+          "aiLabel": "AI portal",
+          "aiHint": "Create with AI Agent and code. Users can request changes in natural language. Path: /x/<name>"
         },
         "portalName": {
-          "message": "Initial portal name",
+          "message": "Portal name",
           "placeholder": "admin"
         },
         "portalTemplate": {
@@ -612,9 +636,9 @@
           "title": "App source and version",
           "description": "Choose how to get the app and which source and version to use."
         },
-        "developmentMode": {
-          "title": "Development approach",
-          "description": "Choose the development approach for your application."
+        "portalType": {
+          "title": "Configure portal",
+          "description": "Set the default portal name and type."
         },
         "configureDatabase": {
           "title": "Configure the database",