@nocobase/cli 3.0.0-alpha.4 → 3.0.0-alpha.5

package/dist/commands/portal/create.js

@@ -12,7 +12,7 @@ import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { translateCli } from '../../lib/cli-locale.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { createPortalWorkspace } from '../../lib/portal-create.js';
-import { printInfo, printSuccess } from '../../lib/ui.js';
+import { printInfo, printSuccess, printWarning } from '../../lib/ui.js';
 const DEFAULT_PORTAL_TEMPLATE = '@nocobase/portal-template-default';
 const portalCreateText = (key, values, fallback) => translateCli(`commands.portalCreate.${key}`, values, { fallback });
 export default class PortalCreate extends Command {
@@ -101,5 +101,8 @@ export default class PortalCreate extends Command {
         printInfo(portalCreateText('messages.app', { app: result.app }, `App: ${result.app}`));
         printInfo(portalCreateText('messages.base', { base: result.portalBase }, `Base: ${result.portalBase}`));
         printInfo(portalCreateText('messages.sourceStorage', { sourceStorage: result.sourceStorage }, `Source storage: ${result.sourceStorage}`));
+        if (result.installFailed) {
+            printWarning(portalCreateText('messages.installFailed', { portalDir: result.portalDir }, `Dependency installation did not finish successfully. Run \`pnpm install\` manually in ${result.portalDir}.`));
+        }
     }
 }

package/dist/commands/portal/dev.js

@@ -59,6 +59,8 @@ export default class PortalDev extends Command {
         await devPortalWorkspace({
             portal: args.portal,
             env,
+            envName,
+            cliVersion: String(this.config?.pjson?.version ?? '').trim(),
             onStart: (result) => {
                 printInfo(portalDevText('messages.starting', { portal: result.portal }, `Starting portal "${result.portal}"...`));
                 printInfo(portalDevText('messages.mode', { mode: result.mode }, `Mode: ${result.mode}`));

package/dist/commands/portal/pull.js

@@ -12,7 +12,7 @@ import { resolveDefaultConfigScope } from '../../lib/cli-home.js';
 import { translateCli } from '../../lib/cli-locale.js';
 import { ensureCrossEnvConfirmed, hasExplicitEnvSelection } from '../../lib/env-guard.js';
 import { pullPortalSource } from '../../lib/portal-source.js';
-import { printInfo, printSuccess } from '../../lib/ui.js';
+import { printInfo, printSuccess, printWarning } from '../../lib/ui.js';
 const portalPullText = (key, values, fallback) => translateCli(`commands.portalPull.${key}`, values, { fallback });
 export default class PortalPull extends Command {
     static summary = 'Pull portal source into local files';
@@ -80,5 +80,8 @@ export default class PortalPull extends Command {
             return;
         }
         printSuccess(portalPullText('messages.pulled', { portal: result.portal, portalDir: result.portalDir }, `Pulled portal source "${result.portal}" into ${result.portalDir}.`));
+        if (result.installFailed) {
+            printWarning(portalPullText('messages.installFailed', { portalDir: result.portalDir }, `Dependency installation did not finish successfully. Run \`pnpm install\` manually in ${result.portalDir}.`));
+        }
     }
 }

package/dist/lib/portal-build-html.js

@@ -0,0 +1,27 @@
+/**
+ * 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 { readFile, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+const BUILD_HTML_SCRIPT_PATH = path.join('scripts', 'build-html.mjs');
+const BUILD_HTML_ENV_FILES_PATTERN = /return\s+\[\s*["']\.env["']\s*,\s*["']\.env\.local["']\s*,\s*`\.env\.\$\{mode\}`\s*,\s*`\.env\.\$\{mode\}\.local`\s*\]\.map\(\s*\(?file\)?\s*=>\s*path\.join\(rootDir,\s*file\)\s*\);/m;
+const BUILD_HTML_ENV_ONLY_REPLACEMENT = 'return [".env"].map((file) => path.join(rootDir, file));';
+export async function ensurePortalBuildHtmlReadsEnvOnly(portalDir) {
+    const scriptPath = path.join(portalDir, BUILD_HTML_SCRIPT_PATH);
+    let content;
+    try {
+        content = await readFile(scriptPath, 'utf-8');
+    }
+    catch {
+        return;
+    }
+    const nextContent = content.replace(BUILD_HTML_ENV_FILES_PATTERN, BUILD_HTML_ENV_ONLY_REPLACEMENT);
+    if (nextContent !== content) {
+        await writeFile(scriptPath, nextContent, 'utf-8');
+    }
+}

package/dist/lib/portal-config.js

@@ -19,9 +19,10 @@ const UPDATE_PORTAL_OPERATION = {
     bodyRequired: true,
     parameters: [
         {
-            name: 'filterByTk',
-            flagName: 'filterByTk',
+            name: 'filter',
+            flagName: 'filter',
             in: 'query',
+            type: 'object',
             required: true,
         },
     ],
@@ -120,7 +121,9 @@ export async function syncPortalConfigToRemote(options) {
         cliVersion: options.cliVersion ?? '',
         envName: options.envName,
         flags: {
-            filterByTk: options.portal,
+            filter: {
+                portalName: options.portal,
+            },
             body: JSON.stringify({
                 options: mergePortalConfigIntoOptions(options.config, options.currentOptions),
             }),

package/dist/lib/portal-configure.js

@@ -9,7 +9,7 @@
 import { mkdir, stat } from 'node:fs/promises';
 import path from 'node:path';
 import { translateCli } from './cli-locale.js';
-import { resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
+import { resolvePortalAppContext, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
 import { buildPortalConfig, buildPortalConfigFromOptions, readPortalConfig, syncPortalConfigToRemote, writePortalConfig, } from './portal-config.js';
 import { findPortalListItem } from './portal-info.js';
 import { listPortalWorkspaces } from './portal-list.js';
@@ -64,9 +64,9 @@ export async function configurePortalWorkspace(options) {
         throw new Error(portalConfigureText('errors.noChanges', undefined, 'No portal configuration changes were provided. Pass --source-storage or a --git-* flag.'));
     }
     const portal = validatePortalSlug(options.portal);
-    const apiBaseUrl = trimValue(options.env.apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
+    const appContext = await resolvePortalAppContext(options);
+    const { app } = appContext;
     const portalDir = path.join(storagePath, 'portals', app, portal);
     if (!(await pathExists(portalDir))) {
         throw new Error(portalConfigureText('errors.workspaceMissing', { portalDir, portal }, `Portal does not exist: ${portalDir}\nRun \`nb portal create ${portal}\` or \`nb portal pull ${portal}\` first.`));
@@ -76,6 +76,7 @@ export async function configurePortalWorkspace(options) {
         envName: options.envName,
         cliVersion: options.cliVersion,
         apiRequest: options.apiRequest,
+        appContext,
     });
     const remoteItem = findPortalListItem(list.items, portal);
     const existingConfig = (await readExistingConfig(portalDir)) ??

package/dist/lib/portal-create.js

@@ -19,9 +19,10 @@ import { appendAppPublicPath, resolveAppPublicPath } from './app-public-path.js'
 import { executeApiRequest } from './api-client.js';
 import { resolveEnvRelativePath } from './cli-home.js';
 import { translateCli } from './cli-locale.js';
+import { ensurePortalBuildHtmlReadsEnvOnly } from './portal-build-html.js';
 import { buildPortalCommandEnv } from './portal-command-env.js';
 import { buildPortalConfig, mergePortalConfigIntoOptions, writePortalConfig, } from './portal-config.js';
-import { run, runPnpmCommand } from './run-npm.js';
+import { resolvePnpmInstallCommand, run, runPnpmInstallCommand } from './run-npm.js';
 const DEFAULT_PORTAL_TEMPLATE = '@nocobase/portal-template-default';
 const DEFAULT_PORTAL_APP_NAME = 'main';
 const TEMPLATE_COPY_EXCLUDED_NAMES = new Set(['.git', 'node_modules', '.DS_Store']);
@@ -42,6 +43,11 @@ const FIRST_OR_CREATE_PORTAL_OPERATION = {
         },
     ],
 };
+const APP_INFO_OPERATION = {
+    method: 'GET',
+    pathTemplate: '/app:getInfo',
+    parameters: [],
+};
 function trimValue(value) {
     return String(value ?? '').trim();
 }
@@ -319,6 +325,54 @@ export function resolvePortalAppFromApiBaseUrl(apiBaseUrl, appPublicPath) {
         appPublicPath: resolveAppPublicPath(configuredPublicPath || inferredPublicPath),
     };
 }
+function readAppNameFromInfo(data) {
+    if (!data || typeof data !== 'object' || Array.isArray(data)) {
+        return undefined;
+    }
+    const direct = data.name;
+    if (typeof direct === 'string' && direct.trim()) {
+        return direct.trim();
+    }
+    return readAppNameFromInfo(data.data);
+}
+function isValidPortalAppName(value) {
+    return /^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(value);
+}
+async function resolvePortalAppFromServer(options) {
+    const apiRequest = options.apiRequest ?? executeApiRequest;
+    try {
+        const response = await apiRequest({
+            cliVersion: options.cliVersion ?? '',
+            envName: options.envName,
+            flags: {},
+            operation: APP_INFO_OPERATION,
+        });
+        if (!response.ok) {
+            return undefined;
+        }
+        const appName = readAppNameFromInfo(response.data);
+        return appName && isValidPortalAppName(appName) ? appName : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export async function resolvePortalAppContext(options) {
+    const apiBaseUrl = trimValue(options.env.apiBaseUrl);
+    const resolvedApp = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
+    if (options.env.kind !== 'http') {
+        return {
+            ...resolvedApp,
+            portalBaseApp: resolvedApp.app,
+        };
+    }
+    const serverApp = await resolvePortalAppFromServer(options);
+    return {
+        app: serverApp ?? resolvedApp.app,
+        appPublicPath: resolvedApp.appPublicPath,
+        portalBaseApp: resolvedApp.app,
+    };
+}
 export function buildPortalBasePath(params) {
     const segment = params.app === DEFAULT_PORTAL_APP_NAME
         ? `x/${params.portal}`
@@ -363,8 +417,8 @@ export async function createPortalWorkspace(options) {
     const apiBaseUrl = trimValue(options.env.apiBaseUrl);
     const envApiUrl = resolvePortalEnvApiUrl(apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
-    const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
+    const { app, appPublicPath, portalBaseApp } = await resolvePortalAppContext(options);
+    const portalBase = buildPortalBasePath({ app: portalBaseApp ?? app, appPublicPath, portal });
     const portalParentDir = path.join(storagePath, 'portals', app);
     const portalDir = path.join(portalParentDir, portal);
     assertPortalDirIsInsideParent(portalParentDir, portalDir);
@@ -381,6 +435,7 @@ export async function createPortalWorkspace(options) {
     let shouldCleanupTempDir = true;
     try {
         await copyTemplate(template.dir, tempDir);
+        await ensurePortalBuildHtmlReadsEnvOnly(tempDir);
         await writeFile(path.join(tempDir, '.env'), [`NOCOBASE_API_URL=${envApiUrl}`, `NOCOBASE_PORTAL_BASE=${portalBase}`].join('\n') + '\n', 'utf-8');
         await writeFile(path.join(tempDir, '.env.local'), [`NOCOBASE_API_URL=${apiBaseUrl}`, `NOCOBASE_PORTAL_BASE=${portalBase}`].join('\n') + '\n', 'utf-8');
         await writePortalConfig(tempDir, portalConfig);
@@ -390,14 +445,23 @@ export async function createPortalWorkspace(options) {
         await rename(tempDir, portalDir);
         shouldCleanupTempDir = false;
         const hasPackageJson = await pathExists(path.join(portalDir, 'package.json'));
+        let dependenciesInstalled = false;
+        let installFailed = false;
         if (hasPackageJson) {
             const runCommand = options.runCommand ?? run;
-            await runPnpmCommand(runCommand, ['install'], {
-                cwd: portalDir,
-                env: buildPortalCommandEnv(),
-                envMode: 'replace',
-                errorName: 'pnpm install',
-            });
+            const installCommand = await resolvePnpmInstallCommand(portalDir);
+            try {
+                await runPnpmInstallCommand(runCommand, installCommand.args, {
+                    cwd: portalDir,
+                    env: buildPortalCommandEnv(),
+                    envMode: 'replace',
+                    errorName: installCommand.errorName,
+                });
+                dependenciesInstalled = true;
+            }
+            catch {
+                installFailed = true;
+            }
         }
         else {
             options.onSkipInstall?.(portalCreateText('messages.skipInstall', { portalDir }, `Skipped pnpm install because package.json was not found in ${portalDir}.`));
@@ -421,6 +485,8 @@ export async function createPortalWorkspace(options) {
             portalBase,
             template,
             installSkipped: !hasPackageJson,
+            dependenciesInstalled,
+            installFailed,
             sourceStorage: portalConfig.sourceStorage,
         };
     }

package/dist/lib/portal-deploy.js

@@ -12,11 +12,12 @@ import path from 'node:path';
 import * as tar from 'tar';
 import { executeApiRequest } from './api-client.js';
 import { translateCli } from './cli-locale.js';
-import { buildPortalBasePath, resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, titleFromPortalSlug, validatePortalSlug, } from './portal-create.js';
+import { ensurePortalBuildHtmlReadsEnvOnly } from './portal-build-html.js';
+import { buildPortalBasePath, resolvePortalAppContext, resolvePortalEnvApiUrl, resolvePortalStoragePath, titleFromPortalSlug, validatePortalSlug, } from './portal-create.js';
 import { buildPortalCommandEnv } from './portal-command-env.js';
 import { updatePortalEnvFiles } from './portal-env-files.js';
 import { mergePortalConfigIntoOptions, readPortalConfig } from './portal-config.js';
-import { run, runPnpmCommand } from './run-npm.js';
+import { resolvePnpmInstallCommand, run, runPnpmCommand, runPnpmInstallCommand } from './run-npm.js';
 const portalDeployText = (key, values, fallback) => translateCli(`commands.portalDeploy.${key}`, values, { fallback });
 const DEPLOY_OPERATION = {
     method: 'POST',
@@ -192,9 +193,11 @@ async function syncMultiPortalRecord(params) {
 export async function deployPortalWorkspace(options) {
     const portal = validatePortalSlug(options.portal);
     const apiBaseUrl = trimValue(options.env.apiBaseUrl);
+    const envApiUrl = resolvePortalEnvApiUrl(apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
-    const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
+    const { app, appPublicPath, portalBaseApp } = await resolvePortalAppContext(options);
+    const portalBase = buildPortalBasePath({ app: portalBaseApp ?? app, appPublicPath, portal });
+    const deployBase = buildPortalBasePath({ app, appPublicPath, portal });
     const portalDir = path.join(storagePath, 'portals', app, portal);
     const distDir = path.join(portalDir, 'dist');
     if (!(await pathExists(portalDir))) {
@@ -207,12 +210,14 @@ export async function deployPortalWorkspace(options) {
         apiBaseUrl,
         portalBase,
     });
+    await ensurePortalBuildHtmlReadsEnvOnly(portalDir);
     const runCommand = options.runCommand ?? run;
-    await runPnpmCommand(runCommand, ['install'], {
+    const installCommand = await resolvePnpmInstallCommand(portalDir);
+    await runPnpmInstallCommand(runCommand, installCommand.args, {
         cwd: portalDir,
         env: buildPortalCommandEnv(),
         envMode: 'replace',
-        errorName: 'pnpm install',
+        errorName: installCommand.errorName,
     });
     await runPnpmCommand(runCommand, ['build'], {
         cwd: portalDir,
@@ -226,7 +231,7 @@ export async function deployPortalWorkspace(options) {
     await runPnpmCommand(runCommand, ['build:html'], {
         cwd: portalDir,
         env: buildPortalCommandEnv({
-            NOCOBASE_API_URL: apiBaseUrl,
+            NOCOBASE_API_URL: envApiUrl,
             NOCOBASE_PORTAL_BASE: portalBase,
         }),
         envMode: 'replace',
@@ -268,7 +273,7 @@ export async function deployPortalWorkspace(options) {
             archivePath: archive.archivePath,
             app,
             portal,
-            portalBase,
+            portalBase: deployBase,
             envName: options.envName,
             cliVersion: options.cliVersion,
             apiRequest: options.apiRequest,

package/dist/lib/portal-destroy.js

@@ -10,23 +10,21 @@ import { rm, stat } from 'node:fs/promises';
 import path from 'node:path';
 import { executeApiRequest } from './api-client.js';
 import { translateCli } from './cli-locale.js';
-import { buildPortalBasePath, resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
+import { buildPortalBasePath, resolvePortalAppContext, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
 const portalDestroyText = (key, values, fallback) => translateCli(`commands.portalDestroy.${key}`, values, { fallback });
 const DESTROY_PORTAL_OPERATION = {
     method: 'POST',
     pathTemplate: '/multiPortals:destroy',
     parameters: [
         {
-            name: 'filterByTk',
-            flagName: 'filterByTk',
+            name: 'filter',
+            flagName: 'filter',
             in: 'query',
+            type: 'object',
             required: true,
         },
     ],
 };
-function trimValue(value) {
-    return String(value ?? '').trim();
-}
 async function pathExists(target) {
     try {
         await stat(target);
@@ -48,7 +46,9 @@ async function destroyMultiPortalRecord(params) {
         cliVersion: params.cliVersion ?? '',
         envName: params.envName,
         flags: {
-            filterByTk: params.portal,
+            filter: {
+                portalName: params.portal,
+            },
         },
         operation: DESTROY_PORTAL_OPERATION,
     });
@@ -62,10 +62,9 @@ async function destroyMultiPortalRecord(params) {
 }
 export async function destroyPortalWorkspace(options) {
     const portal = validatePortalSlug(options.portal);
-    const apiBaseUrl = trimValue(options.env.apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
-    const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
+    const { app, appPublicPath, portalBaseApp } = await resolvePortalAppContext(options);
+    const portalBase = buildPortalBasePath({ app: portalBaseApp ?? app, appPublicPath, portal });
     const portalParentDir = path.join(storagePath, 'portals', app);
     const portalDir = path.join(portalParentDir, portal);
     const mode = options.env.kind;
@@ -75,9 +74,6 @@ export async function destroyPortalWorkspace(options) {
     const destroyMode = mode;
     assertPortalDirIsInsideParent(portalParentDir, portalDir);
     const workspaceExists = await pathExists(portalDir);
-    if (!workspaceExists && !options.force) {
-        throw new Error(portalDestroyText('errors.workspaceMissing', { portalDir, portal }, `Portal does not exist: ${portalDir}\nPass --force to ignore missing local files.`));
-    }
     const recordDeleted = await destroyMultiPortalRecord({
         portal,
         envName: options.envName,

package/dist/lib/portal-dev.js

@@ -9,7 +9,7 @@
 import { stat } from 'node:fs/promises';
 import path from 'node:path';
 import { translateCli } from './cli-locale.js';
-import { buildPortalBasePath, resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
+import { buildPortalBasePath, resolvePortalAppContext, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
 import { buildPortalCommandEnv } from './portal-command-env.js';
 import { updatePortalEnvFiles } from './portal-env-files.js';
 import { run, runPnpmCommand } from './run-npm.js';
@@ -45,8 +45,8 @@ export async function devPortalWorkspace(options) {
         throw new Error(portalDevText('errors.sshUnsupported', undefined, 'Cannot start a portal in dev mode for ssh envs in the first version.'));
     }
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
-    const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
+    const { app, appPublicPath, portalBaseApp } = await resolvePortalAppContext(options);
+    const portalBase = buildPortalBasePath({ app: portalBaseApp ?? app, appPublicPath, portal });
     const portalDir = path.join(storagePath, 'portals', app, portal);
     if (!(await pathExists(portalDir))) {
         throw new Error(portalDevText('errors.workspaceMissing', { portalDir, portal }, `Portal does not exist: ${portalDir}\nRun \`nb portal create ${portal}\` first.`));

package/dist/lib/portal-env-files.js

@@ -42,8 +42,9 @@ export async function upsertPortalEnvFile(filePath, values) {
     await writeFile(filePath, upsertEnvContent(content, values), 'utf-8');
 }
 export async function updatePortalEnvFiles(params) {
+    const envApiUrl = resolvePortalEnvApiUrl(params.apiBaseUrl);
     await upsertPortalEnvFile(path.join(params.portalDir, '.env'), {
-        NOCOBASE_API_URL: resolvePortalEnvApiUrl(params.apiBaseUrl),
+        NOCOBASE_API_URL: envApiUrl,
         NOCOBASE_PORTAL_BASE: params.portalBase,
     });
     await upsertPortalEnvFile(path.join(params.portalDir, '.env.local'), {

package/dist/lib/portal-list.js

@@ -11,7 +11,7 @@ import path from 'node:path';
 import { appendAppPublicPath } from './app-public-path.js';
 import { executeApiRequest } from './api-client.js';
 import { translateCli } from './cli-locale.js';
-import { buildPortalBasePath, resolvePortalAppFromApiBaseUrl, resolvePortalStoragePath, } from './portal-create.js';
+import { buildPortalBasePath, resolvePortalAppContext, resolvePortalStoragePath, } from './portal-create.js';
 const portalListText = (key, values, fallback) => translateCli(`commands.portalList.${key}`, values, { fallback });
 const LIST_PORTALS_OPERATION = {
     method: 'GET',
@@ -159,8 +159,9 @@ async function listMultiPortalRecords(params) {
 export async function listPortalWorkspaces(options) {
     const apiBaseUrl = trimValue(options.env.apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
+    const { app, appPublicPath, portalBaseApp } = options.appContext ?? (await resolvePortalAppContext(options));
     const mode = options.env.kind;
+    const baseApp = portalBaseApp ?? app;
     if (mode !== 'local' && mode !== 'docker' && mode !== 'http') {
         throw new Error(portalListText('errors.unsupportedEnvKind', { kind: mode }, `Cannot list portals for ${mode} envs in the first version.`));
     }
@@ -195,8 +196,8 @@ export async function listPortalWorkspaces(options) {
             options,
             portalUrl: enabled
                 ? buildPortalAccessUrl(apiBaseUrl, isAi
-                    ? buildPortalBasePath({ app, appPublicPath, portal: portalName })
-                    : buildNoCodePortalBasePath({ app, appPublicPath, routePath }))
+                    ? buildPortalBasePath({ app: baseApp, appPublicPath, portal: portalName })
+                    : buildNoCodePortalBasePath({ app: baseApp, appPublicPath, routePath }))
                 : '',
             portalDir,
             localSynced: isAi ? await pathExists(portalDir) : null,

package/dist/lib/portal-source.js

@@ -14,12 +14,13 @@ import path from 'node:path';
 import * as tar from 'tar';
 import { executeApiRequest } from './api-client.js';
 import { translateCli } from './cli-locale.js';
+import { ensurePortalBuildHtmlReadsEnvOnly } from './portal-build-html.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 { buildPortalBasePath, resolvePortalAppContext, resolvePortalStoragePath, validatePortalSlug, } from './portal-create.js';
 import { listPortalWorkspaces } from './portal-list.js';
 import { findPortalListItem } from './portal-info.js';
-import { run, runPnpmCommand } from './run-npm.js';
+import { resolvePnpmInstallCommand, run, runPnpmInstallCommand } from './run-npm.js';
 const execFileAsync = promisify(execFile);
 const portalSourceText = (key, values, fallback) => translateCli(`commands.portalSource.${key}`, values, { fallback });
 const PULL_SOURCE_OPERATION = {
@@ -128,6 +129,20 @@ async function packPortalSource(portalDir) {
         },
     };
 }
+async function replaceExistingPortalDirectory(params) {
+    if (!(await pathExists(path.join(params.portalDir, '.git')))) {
+        await rm(params.portalDir, { recursive: true, force: true });
+        await rename(params.sourceDir, params.portalDir);
+        return;
+    }
+    const existingEntries = await readdir(params.portalDir);
+    await Promise.all(existingEntries
+        .filter((entry) => entry !== '.git')
+        .map((entry) => rm(path.join(params.portalDir, entry), { recursive: true, force: true })));
+    const sourceEntries = await readdir(params.sourceDir);
+    await Promise.all(sourceEntries.map((entry) => rename(path.join(params.sourceDir, entry), path.join(params.portalDir, entry))));
+    await rm(params.sourceDir, { recursive: true, force: true });
+}
 async function replacePortalSourceFromArchive(params) {
     const targetExists = await pathExists(params.portalDir);
     if (targetExists && !params.force) {
@@ -143,7 +158,11 @@ async function replacePortalSourceFromArchive(params) {
             filter: validatePortalSourceTarEntry,
         });
         if (targetExists) {
-            await rm(params.portalDir, { recursive: true, force: true });
+            await replaceExistingPortalDirectory({
+                sourceDir: tempDir,
+                portalDir: params.portalDir,
+            });
+            return;
         }
         await rename(tempDir, params.portalDir);
     }
@@ -165,7 +184,11 @@ async function replacePortalSourceFromDirectory(params) {
             filter: (source) => shouldPackPortalSourceEntry(path.relative(params.sourceDir, source)),
         });
         if (targetExists) {
-            await rm(params.portalDir, { recursive: true, force: true });
+            await replaceExistingPortalDirectory({
+                sourceDir: tempDir,
+                portalDir: params.portalDir,
+            });
+            return;
         }
         await rename(tempDir, params.portalDir);
     }
@@ -174,6 +197,13 @@ async function replacePortalSourceFromDirectory(params) {
         throw error;
     }
 }
+async function assertPortalDirectoryCanBeReplaced(params) {
+    const targetExists = await pathExists(params.portalDir);
+    if (targetExists && !params.force) {
+        throw new Error(portalSourceText('errors.workspaceExists', { portalDir: params.portalDir }, `Portal already exists: ${params.portalDir}\nPass --force to delete it and pull again.`));
+    }
+    return targetExists;
+}
 async function runGit(args, cwd) {
     return await execFileAsync('git', args, {
         cwd,
@@ -185,24 +215,37 @@ async function installPortalDependencies(params) {
         return {
             dependenciesInstalled: false,
             installSkipped: true,
+            installFailed: false,
         };
     }
     if (!(await isFile(path.join(params.portalDir, 'package.json')))) {
         return {
             dependenciesInstalled: false,
             installSkipped: true,
+            installFailed: false,
         };
     }
     const runCommand = params.runCommand ?? run;
-    await runPnpmCommand(runCommand, ['install'], {
-        cwd: params.portalDir,
-        env: buildPortalCommandEnv(),
-        envMode: 'replace',
-        errorName: 'pnpm install',
-    });
+    const installCommand = await resolvePnpmInstallCommand(params.portalDir);
+    try {
+        await runPnpmInstallCommand(runCommand, installCommand.args, {
+            cwd: params.portalDir,
+            env: buildPortalCommandEnv(),
+            envMode: 'replace',
+            errorName: installCommand.errorName,
+        });
+    }
+    catch {
+        return {
+            dependenciesInstalled: false,
+            installSkipped: false,
+            installFailed: true,
+        };
+    }
     return {
         dependenciesInstalled: true,
         installSkipped: false,
+        installFailed: false,
     };
 }
 function readSourceRevision(data) {
@@ -219,10 +262,11 @@ async function resolvePortalSourceContext(options) {
     const portal = validatePortalSlug(options.portal);
     const apiBaseUrl = trimValue(options.env.apiBaseUrl);
     const storagePath = resolvePortalStoragePath(options.env);
-    const { app, appPublicPath } = resolvePortalAppFromApiBaseUrl(apiBaseUrl, options.env.config.appPublicPath);
-    const portalDir = path.join(storagePath, 'portals', app, portal);
-    const portalBase = buildPortalBasePath({ app, appPublicPath, portal });
     const mode = options.env.kind;
+    const appContext = await resolvePortalAppContext(options);
+    const { app, appPublicPath, portalBaseApp } = appContext;
+    const portalDir = path.join(storagePath, 'portals', app, portal);
+    const portalBase = buildPortalBasePath({ app: portalBaseApp ?? app, appPublicPath, portal });
     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.`));
     }
@@ -231,6 +275,7 @@ async function resolvePortalSourceContext(options) {
         envName: options.envName,
         cliVersion: options.cliVersion,
         apiRequest: options.apiRequest,
+        appContext,
     });
     const item = findPortalListItem(list.items, portal);
     if (!item) {
@@ -319,8 +364,76 @@ async function cloneGitSource(params) {
     }
     return repoDir;
 }
+async function setGitOriginRepository(params) {
+    try {
+        await runGit(['remote', 'get-url', 'origin'], params.repoDir);
+        await runGit(['remote', 'set-url', 'origin', params.repo], params.repoDir);
+    }
+    catch {
+        await runGit(['remote', 'add', 'origin', params.repo], params.repoDir);
+    }
+}
+async function checkoutExistingGitRepository(params) {
+    await setGitOriginRepository({
+        repoDir: params.repoDir,
+        repo: params.repo,
+    });
+    try {
+        await runGit(['fetch', 'origin', params.branch], params.repoDir);
+        await runGit(['checkout', '-f', '-B', params.branch, 'FETCH_HEAD'], params.repoDir);
+    }
+    catch (error) {
+        await runGit(['fetch', 'origin'], params.repoDir);
+        await runGit(['checkout', '-f', '-B', params.branch], params.repoDir);
+    }
+    await runGit(['clean', '-fdx'], params.repoDir);
+}
+async function pullGitRepositoryRootPortalSource(params) {
+    const targetExists = await assertPortalDirectoryCanBeReplaced({
+        portalDir: params.context.portalDir,
+        force: params.force,
+    });
+    await mkdir(path.dirname(params.context.portalDir), { recursive: true });
+    if (targetExists && (await pathExists(path.join(params.context.portalDir, '.git')))) {
+        await checkoutExistingGitRepository({
+            repoDir: params.context.portalDir,
+            repo: params.repo,
+            branch: params.branch,
+        });
+        return;
+    }
+    if (targetExists) {
+        await rm(params.context.portalDir, { recursive: true, force: true });
+    }
+    const tempDir = await mkdtemp(path.join(path.dirname(params.context.portalDir), `.${path.basename(params.context.portalDir)}-git-pull-`));
+    try {
+        const repoDir = await cloneGitSource({
+            repo: params.repo,
+            branch: params.branch,
+            cwd: tempDir,
+            createBranch: true,
+        });
+        await rename(repoDir, params.context.portalDir);
+    }
+    catch (error) {
+        await rm(params.context.portalDir, { recursive: true, force: true });
+        throw error;
+    }
+    finally {
+        await rm(tempDir, { recursive: true, force: true });
+    }
+}
 async function pullGitPortalSource(params) {
     const git = assertGitSourceConfig(params.context);
+    if (isGitRepositoryRootPath(git.gitPath)) {
+        await pullGitRepositoryRootPortalSource({
+            context: params.context,
+            repo: git.repo,
+            branch: git.branch,
+            force: params.force,
+        });
+        return;
+    }
     const tempDir = await mkdtemp(path.join(os.tmpdir(), 'nocobase-cli-portal-git-pull-'));
     try {
         const repoDir = await cloneGitSource({
@@ -390,6 +503,7 @@ export async function pullPortalSource(options) {
             context: sourceContext,
             force: options.force,
         });
+        await ensurePortalBuildHtmlReadsEnvOnly(sourceContext.portalDir);
         await writePortalConfig(sourceContext.portalDir, portalConfig);
         const installResult = await installPortalDependencies({
             portalDir: sourceContext.portalDir,
@@ -437,6 +551,7 @@ export async function pullPortalSource(options) {
             portalDir: sourceContext.portalDir,
             force: options.force,
         });
+        await ensurePortalBuildHtmlReadsEnvOnly(sourceContext.portalDir);
         await writePortalConfig(sourceContext.portalDir, portalConfig);
         const installResult = await installPortalDependencies({
             portalDir: sourceContext.portalDir,

package/dist/lib/run-npm.js

@@ -105,6 +105,52 @@ export async function runPnpmCommand(runCommand, args, options) {
         throw createMissingCommandError('pnpm', options.errorName ?? `pnpm ${args.join(' ')}`.trim(), error) ?? error;
     }
 }
+function createInstallArgsWithoutTrustLockfile(args) {
+    if (!args.includes('install') || !args.includes('--trust-lockfile')) {
+        return undefined;
+    }
+    return args.filter((arg) => arg !== '--trust-lockfile');
+}
+function isFriendlyMissingPnpmError(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return message.includes('because the pnpm executable could not be found');
+}
+function formatPnpmLabel(args) {
+    return `pnpm ${args.join(' ')}`.trim();
+}
+export async function resolvePnpmInstallCommand(cwd) {
+    const hasLockfile = await fsp
+        .stat(path.join(cwd, 'pnpm-lock.yaml'))
+        .then((stats) => stats.isFile())
+        .catch(() => false);
+    if (hasLockfile) {
+        const args = ['install', '--frozen-lockfile', '--trust-lockfile'];
+        return {
+            args,
+            errorName: formatPnpmLabel(args),
+        };
+    }
+    const args = ['install'];
+    return {
+        args,
+        errorName: formatPnpmLabel(args),
+    };
+}
+export async function runPnpmInstallCommand(runCommand, args, options) {
+    try {
+        await runPnpmCommand(runCommand, args, options);
+    }
+    catch (error) {
+        const fallbackArgs = createInstallArgsWithoutTrustLockfile(args);
+        if (!fallbackArgs || isFriendlyMissingPnpmError(error)) {
+            throw error;
+        }
+        await runPnpmCommand(runCommand, fallbackArgs, {
+            ...options,
+            errorName: formatPnpmLabel(fallbackArgs),
+        });
+    }
+}
 function isDockerDaemonUnavailableError(error) {
     const message = error instanceof Error ? error.message : String(error);
     return DOCKER_DAEMON_UNAVAILABLE_PATTERNS.some((pattern) => pattern.test(message));

package/dist/locale/en-US.json

@@ -192,7 +192,8 @@
         "created": "Portal \"{{portal}}\" created at {{portalDir}}.",
         "app": "App: {{app}}",
         "base": "Base: {{base}}",
-        "sourceStorage": "Source storage: {{sourceStorage}}"
+        "sourceStorage": "Source storage: {{sourceStorage}}",
+        "installFailed": "Dependency installation did not finish successfully. Run `pnpm install` manually in {{portalDir}}."
       }
     },
     "portalConfig": {
@@ -259,6 +260,17 @@
         "localSynced": "Local synced"
       }
     },
+    "portalPull": {
+      "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."
+      },
+      "messages": {
+        "noop": "No pull is needed.",
+        "pulled": "Pulled portal source \"{{portal}}\" into {{portalDir}}.",
+        "installFailed": "Dependency installation did not finish successfully. Run `pnpm install` manually in {{portalDir}}."
+      }
+    },
     "swagger": {
       "errors": {
         "pluginDisabled": "The API documentation plugin is not enabled. Enable it before requesting Swagger documents.",

package/dist/locale/zh-CN.json

@@ -192,7 +192,8 @@
         "created": "Portal \"{{portal}}\" 已创建：{{portalDir}}。",
         "app": "App：{{app}}",
         "base": "Base：{{base}}",
-        "sourceStorage": "源码存储：{{sourceStorage}}"
+        "sourceStorage": "源码存储：{{sourceStorage}}",
+        "installFailed": "依赖安装没有成功完成。请在 {{portalDir}} 中手动运行 `pnpm install`。"
       }
     },
     "portalConfig": {
@@ -259,6 +260,17 @@
         "localSynced": "本地已同步"
       }
     },
+    "portalPull": {
+      "errors": {
+        "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
+        "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。"
+      },
+      "messages": {
+        "noop": "无需执行 pull。",
+        "pulled": "Portal 源码 \"{{portal}}\" 已拉取到 {{portalDir}}。",
+        "installFailed": "依赖安装没有成功完成。请在 {{portalDir}} 中手动运行 `pnpm install`。"
+      }
+    },
     "swagger": {
       "errors": {
         "pluginDisabled": "API 文档插件尚未启用。请先启用该插件，再获取 Swagger 文档。",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "3.0.0-alpha.4",
+  "version": "3.0.0-alpha.5",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -147,5 +147,5 @@
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
   },
-  "gitHead": "6658768567378382de758c4e814ac510d688400c"
+  "gitHead": "82c7ed1cdb2f247c190582e34ee37f154cac0968"
 }