@nocobase/cli 2.2.0-alpha.1 → 2.2.0-alpha.10

package/dist/lib/source-publish.js

@@ -232,7 +232,7 @@ export async function publishSourceSnapshot(params) {
             version,
             stdio,
         });
-        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--git-head', gitSha], {
+        await run('yarn', ['lerna', 'publish', 'from-package', '--registry', npmRegistry, '--dist-tag', 'local', '--yes', '--no-verify-access', '--no-git-reset', '--git-head', gitSha], {
             cwd: projectRoot,
             errorName: 'lerna publish',
             stdio,
@@ -319,7 +319,7 @@ export function buildSuggestedInitCommand(result) {
     const normalizedRegistry = result.npmRegistry || `http://${host}:${port || DEFAULT_SOURCE_REGISTRY_PORT}`;
     const suggestedEnv = ['snapshot', sanitizeEnvSegment(result.gitSha)].filter(Boolean).join('');
     return [
-        `nb init --ui --env ${suggestedEnv} --yes --source npm`,
+        `nb init --env ${suggestedEnv} --yes --source npm`,
         `--version ${result.version}`,
         `--npm-registry=${normalizedRegistry}`,
     ].join(' ');

package/dist/lib/startup-update.js

@@ -151,7 +151,7 @@ export async function shouldRunStartupUpdateCheck(argv, now = new Date()) {
     return readCurrentInstallLastCheckedDate(state) !== todayStamp(now);
 }
 export function shouldEnableStartupUpdateForInstallMethod(installMethod) {
-    return installMethod === 'npm-global';
+    return installMethod === 'npm-global' || installMethod === 'pnpm-global' || installMethod === 'yarn-global';
 }
 function hasPendingUpdates(selfStatus, skillsStatus) {
     return Boolean(selfStatus.updateAvailable || skillsStatus.updateAvailable === true);

package/dist/lib/ui.js

@@ -15,8 +15,35 @@ let verboseMode = false;
 let lastStaticTaskMessage;
 let lastStaticTaskAt = 0;
 const STATIC_TASK_UPDATE_THROTTLE_MS = 3_000;
+function isCombiningCodePoint(codePoint) {
+    return ((codePoint >= 0x0300 && codePoint <= 0x036f) ||
+        (codePoint >= 0x1ab0 && codePoint <= 0x1aff) ||
+        (codePoint >= 0x1dc0 && codePoint <= 0x1dff) ||
+        (codePoint >= 0x20d0 && codePoint <= 0x20ff) ||
+        (codePoint >= 0xfe20 && codePoint <= 0xfe2f));
+}
+function isFullWidthCodePoint(codePoint) {
+    return (codePoint >= 0x1100 &&
+        (codePoint <= 0x115f ||
+            codePoint === 0x2329 ||
+            codePoint === 0x232a ||
+            (codePoint >= 0x2e80 && codePoint <= 0xa4cf && codePoint !== 0x303f) ||
+            (codePoint >= 0xac00 && codePoint <= 0xd7a3) ||
+            (codePoint >= 0xf900 && codePoint <= 0xfaff) ||
+            (codePoint >= 0xfe10 && codePoint <= 0xfe19) ||
+            (codePoint >= 0xfe30 && codePoint <= 0xfe6f) ||
+            (codePoint >= 0xff00 && codePoint <= 0xff60) ||
+            (codePoint >= 0xffe0 && codePoint <= 0xffe6) ||
+            (codePoint >= 0x20000 && codePoint <= 0x3fffd)));
+}
 function stringWidth(value) {
-    return Array.from(value).length;
+    return Array.from(value).reduce((width, character) => {
+        const codePoint = character.codePointAt(0);
+        if (!codePoint || codePoint === 0 || codePoint < 32 || isCombiningCodePoint(codePoint)) {
+            return width;
+        }
+        return width + (isFullWidthCodePoint(codePoint) ? 2 : 1);
+    }, 0);
 }
 function pad(value, width) {
     const padding = Math.max(0, width - stringWidth(value));

package/dist/locale/en-US.json

@@ -1,4 +1,10 @@
 {
+  "entry": {
+    "windowsAdministratorRequired": {
+      "message": "NocoBase CLI must be run as Administrator on Windows.",
+      "hint": "Open your terminal as Administrator, then run the command again."
+    }
+  },
   "promptCatalog": {
     "common": {
       "cancelled": "Cancelled.",
@@ -62,7 +68,7 @@
       "unreachable": "Unable to connect to the API base URL. Check the address and make sure the server is reachable. Details: {{details}}"
     },
     "envKey": {
-      "invalid": "Use letters and numbers only."
+      "invalid": "Use letters, numbers, hyphens, and underscores only."
     },
     "appPublicPath": {
       "invalid": "Use / or a slash-separated path like /nocobase/ or /foo-bar/baz_2/. Each path segment may contain letters, numbers, hyphens, and underscores only."
@@ -87,20 +93,20 @@
     "envAdd": {
       "prompts": {
         "name": {
-          "message": "What would you like to call this environment?",
+          "message": "App environment identifier",
           "placeholder": "default"
         },
         "scope": {
-          "message": "Where should this connection be saved?",
+          "message": "Connection save location",
           "globalLabel": "Global",
           "globalHint": "user-level config"
         },
         "apiBaseUrl": {
-          "message": "What is the API base URL?",
+          "message": "API base URL",
           "placeholder": "https://demo.example.com/api or https://demo.example.com/api/__app/<subapp>"
         },
         "authType": {
-          "message": "Which authentication method would you like to use?",
+          "message": "Authentication method",
           "basicLabel": "Basic authentication (username + password)",
           "basicHint": "uses your credentials to fetch a token after save",
           "oauthLabel": "OAuth (browser authentication)",
@@ -108,14 +114,14 @@
           "tokenLabel": "API token / API key"
         },
         "username": {
-          "message": "Enter the username for basic login",
+          "message": "Basic login username",
           "placeholder": "admin"
         },
         "password": {
-          "message": "Enter the password for basic login"
+          "message": "Basic login password"
         },
         "accessToken": {
-          "message": "Enter an API token or API key",
+          "message": "API token or API key",
           "placeholder": "Enter your API token / API key"
         }
       }
@@ -162,6 +168,150 @@
         "refusal": "Refusing to run against env \"{{requestedEnv}}\" because the current env is \"{{currentEnv}}\" and interactive confirmation is unavailable in the current agent session.\n\nFor safety, the agent will not switch envs automatically and will not add --yes on your behalf.\n\nTo continue:\n- run `nb env use {{requestedEnv}}` yourself and then re-run the command, or\n- re-run the same command with `--env {{requestedEnv}} --yes` to confirm this one-off cross-env operation."
       }
     },
+    "portalCreate": {
+      "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.",
+        "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}}",
+        "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 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}}",
+        "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 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 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}}"
+      },
+      "messages": {
+        "deployed": "Portal \"{{portal}}\" deployed.",
+        "mode": "Mode: {{mode}}",
+        "app": "App: {{app}}",
+        "base": "Base: {{base}}",
+        "record": "Record: synced",
+        "dist": "Dist: {{dist}}",
+        "localDist": "Local dist: {{dist}}",
+        "serverDist": "Server dist: {{dist}}"
+      }
+    },
+    "portalList": {
+      "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 portals for {{kind}} envs in the first version.",
+        "listFailed": "Portal list failed with status {{status}}\n{{details}}"
+      },
+      "messages": {
+        "empty": "No portal records found."
+      },
+      "table": {
+        "name": "Name",
+        "url": "URL",
+        "portalType": "Portal type",
+        "path": "Local path",
+        "enabled": "Enabled",
+        "localSynced": "Local synced"
+      }
+    },
+    "portalInfo": {
+      "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.",
+        "notFound": "Portal \"{{portal}}\" was not found."
+      },
+      "fields": {
+        "name": "Name",
+        "url": "URL",
+        "portalType": "Portal type",
+        "path": "Local path",
+        "enabled": "Enabled",
+        "localSynced": "Local synced"
+      }
+    },
+    "portalDestroy": {
+      "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 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?"
+      },
+      "messages": {
+        "destroyed": "Portal \"{{portal}}\" destroyed.",
+        "mode": "Mode: {{mode}}",
+        "app": "App: {{app}}",
+        "base": "Base: {{base}}",
+        "record": "Record: {{status}}",
+        "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 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}}\"...",
+        "mode": "Mode: {{mode}}",
+        "app": "App: {{app}}",
+        "base": "Base: {{base}}",
+        "dir": "Dir: {{dir}}"
+      }
+    },
     "license": {
       "activate": {
         "interactive": {
@@ -173,7 +323,7 @@
           },
           "prompts": {
             "provideMethod": {
-              "message": "How do you want to provide the license key?",
+              "message": "License key input method",
               "keyOption": "Paste the license key",
               "fileOption": "Read the key from a file"
             },
@@ -246,7 +396,7 @@
       },
       "prompts": {
         "source": {
-          "message": "How would you like to get NocoBase?",
+          "message": "NocoBase install source",
           "dockerLabel": "Docker install (Recommended)",
           "dockerHint": "Best for no-code and low-maintenance setups. You can upgrade later by pulling a newer image and restarting the app.",
           "npmLabel": "create-nocobase-app install",
@@ -255,9 +405,9 @@
           "gitHint": "Best when you want to try the latest unreleased changes, contribute code, or debug and modify NocoBase source directly. This option is more developer-oriented."
         },
         "version": {
-          "message": "Which version would you like to use?",
+          "message": "NocoBase version",
           "latestLabel": "latest",
-          "latestHint": "Stable release. Best for production use and the most predictable experience. Currently unavailable.",
+          "latestHint": "Stable release. Best for production use and the most predictable experience.",
           "betaLabel": "beta",
           "betaHint": "Preview release. Good for trying upcoming features before general release.",
           "alphaLabel": "alpha",
@@ -266,15 +416,15 @@
           "otherHint": "Enter another package version, Docker tag, or Git ref manually, such as a branch name."
         },
         "otherVersion": {
-          "message": "Enter the version, Docker tag, or Git ref you want to use.",
+          "message": "Custom version, Docker tag, or Git ref",
           "placeholder": "For example: fix/cli-v2"
         },
         "dockerRegistry": {
-          "message": "Which Docker registry would you like to use? The image tag is set separately in Version.",
+          "message": "Docker registry (image tag is set in Version)",
           "placeholder": "nocobase/nocobase"
         },
         "dockerPlatform": {
-          "message": "Which Docker image platform should be used?",
+          "message": "Architecture",
           "autoLabel": "Auto",
           "autoHint": "Use Docker default for this machine"
         },
@@ -317,79 +467,94 @@
       },
       "prompts": {
         "env": {
-          "message": "What would you like to call this app?",
+          "message": "App environment identifier",
           "placeholder": "local"
         },
         "lang": {
-          "message": "Which language would you like to use for the app?"
+          "message": "App language"
         },
         "appPath": {
-          "message": "Where should this app be stored? (relative to {{root}})",
+          "message": "App directory (relative to {{root}})",
           "placeholder": "./<env>/"
         },
         "appPort": {
-          "message": "Which port should this app use?",
+          "message": "App port",
           "placeholder": "13000"
         },
         "appPublicPath": {
-          "message": "What is the app subpath? (for example, /nocobase/)",
+          "message": "App subpath (for example, /nocobase/)",
           "placeholder": "/ or /nocobase/"
         },
+        "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": "Portal name",
+          "placeholder": "admin"
+        },
+        "portalTemplate": {
+          "message": "Starter template (copied to ./storage/portals/)",
+          "placeholder": "git@github.com:nocobase/admin-starter.git"
+        },
         "storagePath": {
-          "message": "Where should uploads and local files be stored?",
+          "message": "Uploads and local files directory",
           "placeholder": "./<env>/storage/"
         },
         "dbDialect": {
-          "message": "Which database would you like to use?"
+          "message": "Database type"
         },
         "builtinDb": {
-          "message": "Would you like to use the built-in database?"
+          "message": "Use built-in database"
         },
         "builtinDbImage": {
-          "message": "Which Docker image should be used for the built-in database?",
+          "message": "Built-in database Docker image",
           "placeholder": "postgres:16"
         },
         "dbHost": {
-          "message": "What is the database host?",
+          "message": "Database host",
           "placeholder": "127.0.0.1"
         },
         "dbPort": {
-          "message": "What is the database port?",
+          "message": "Database port",
           "placeholder": "5432"
         },
         "dbDatabase": {
-          "message": "What is the database name?"
+          "message": "Database name"
         },
         "dbUser": {
-          "message": "What is the database username?"
+          "message": "Database username"
         },
         "dbPassword": {
-          "message": "What is the database password?"
+          "message": "Database password"
         },
         "dbSchema": {
-          "message": "What is the database schema? (PostgreSQL only, optional)",
+          "message": "Database schema (PostgreSQL/KingbaseES only, optional)",
           "placeholder": "Leave empty to use the default schema"
         },
         "dbTablePrefix": {
-          "message": "What table prefix should be used? (optional)",
+          "message": "Database table prefix (optional)",
           "placeholder": "For example: nb_"
         },
         "dbUnderscored": {
-          "message": "Use underscored names for database tables and columns?"
+          "message": "Use underscored names for database tables and columns"
         },
         "rootUsername": {
-          "message": "Choose the initial admin username",
+          "message": "Initial admin username",
           "placeholder": "nocobase"
         },
         "rootEmail": {
-          "message": "What is the initial admin email?",
+          "message": "Initial admin email",
           "placeholder": "admin@nocobase.com"
         },
         "rootPassword": {
-          "message": "Choose the initial admin password"
+          "message": "Initial admin password"
         },
         "rootNickname": {
-          "message": "What display name should the initial admin use?",
+          "message": "Initial admin display name",
           "placeholder": "Super Admin"
         }
       }
@@ -399,7 +564,7 @@
         "envExists": "Env \"{{envName}}\" already exists. Choose another env name."
       },
       "messages": {
-        "title": "Set up NocoBase for coding agents",
+        "title": "Set up NocoBase",
         "appNameRequiredWhenSkipped": "Env name is required when prompts are skipped.",
         "appNameEnvHelp": "Use `nb init --yes --env <envName>` to continue.",
         "resumeEnvRequired": "Env name is required when resuming setup.",
@@ -413,11 +578,11 @@
       },
       "prompts": {
         "appName": {
-          "message": "What should this environment use for `--env`?",
+          "message": "Unique app environment identifier (used by the CLI to locate and manage this environment)",
           "placeholder": "local"
         },
         "setupMode": {
-          "message": "How would you like to set up this environment?",
+          "message": "App environment setup method",
           "installNewLabel": "Install a new app",
           "installNewHint": "Install a brand-new app from scratch. Best for first-time setup, evaluation, or a fresh local environment.",
           "manageLocalLabel": "Manage an app already on this machine",
@@ -426,7 +591,7 @@
           "connectRemoteHint": "Save only the remote app connection. Nothing will be installed or taken over on this machine."
         },
         "installSkills": {
-          "message": "Install NocoBase AI coding skills (nocobase/skills)?"
+          "message": "Install NocoBase AI coding skills (nocobase/skills)"
         },
         "apiBaseUrl": {
           "message": "API base URL",
@@ -434,12 +599,27 @@
         },
         "skipDownload": {
           "message": "Skip downloading NocoBase and reuse existing local app files or Docker images"
+        },
+        "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": "Portal name",
+          "placeholder": "admin"
+        },
+        "portalTemplate": {
+          "message": "Starter template (copied to ./storage/portals/)",
+          "placeholder": "git@github.com:nocobase/admin-starter.git"
         }
       },
       "webUi": {
-        "pageTitle": "Set up NocoBase for coding agents",
-        "documentHeading": "Set up NocoBase for coding agents",
-        "documentHint": "Install a new app, manage one that already exists on this machine, or connect a remote app so coding agents can access and work with NocoBase.",
+        "pageTitle": "Set up NocoBase",
+        "documentHeading": "Set up NocoBase",
+        "documentHint": "Install a new app, manage an existing one, or connect a remote app. You can use it directly or let a coding agent access it later.",
         "gettingStarted": {
           "title": "Getting started",
           "description": "Choose whether to install a new app, manage a local app, or connect a remote app."
@@ -456,6 +636,10 @@
           "title": "App source and version",
           "description": "Choose how to get the app and which source and version to use."
         },
+        "portalType": {
+          "title": "Configure portal",
+          "description": "Set the default portal name and type."
+        },
         "configureDatabase": {
           "title": "Configure the database",
           "description": "Use built-in or custom."