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

package/dist/locale/zh-CN.json

@@ -182,26 +182,50 @@
         "npmPackMultipleTarballs": "npm pack 为 {{source}} 生成了多个 tarball。",
         "invalidPortalName": "Portal 名称 \"{{value}}\" 无效。请使用小写字母、数字、下划线或连字符，并以小写字母或数字开头。",
         "invalidPortalAppName": "从 apiBaseUrl 解析出的 Portal app 名称 \"{{value}}\" 无效。请使用字母、数字、下划线或连字符，并以字母或数字开头。",
-        "missingApiBaseUrl": "无法创建 Portal workspace，因为当前 env 没有 apiBaseUrl。",
-        "outsideParent": "拒绝修改 {{parentDir}} 之外的 Portal workspace：{{portalDir}}",
-        "sshUnsupported": "第一版暂不支持为 ssh env 创建 Portal workspace。",
-        "workspaceExists": "Portal workspace 已存在：{{portalDir}}\n如需删除并重新创建，请追加 --force。"
+        "missingApiBaseUrl": "无法创建 Portal，因为当前 env 没有 apiBaseUrl。",
+        "outsideParent": "拒绝修改 {{parentDir}} 之外的 Portal：{{portalDir}}",
+        "sshUnsupported": "第一版暂不支持为 ssh env 创建 Portal。",
+        "workspaceExists": "Portal 已存在：{{portalDir}}\n如需删除并重新创建，请追加 --force。"
       },
       "messages": {
         "skipInstall": "未找到 {{portalDir}}/package.json，已跳过 pnpm install。",
         "created": "Portal \"{{portal}}\" 已创建：{{portalDir}}。",
         "app": "App：{{app}}",
-        "base": "Base：{{base}}"
+        "base": "Base：{{base}}",
+        "sourceStorage": "源码存储：{{sourceStorage}}"
+      }
+    },
+    "portalConfig": {
+      "errors": {
+        "invalidSourceStorage": "源码存储 \"{{value}}\" 无效。请使用 \"nocobase\" 或 \"git\"。",
+        "invalidGitPath": "--git-path 必须是 Git 仓库内的相对路径。",
+        "gitOptionsForNocobaseStorage": "--git-repo、--git-branch 和 --git-path 只能与 --source-storage git 一起使用。",
+        "gitRepoRequired": "--source-storage 为 git 时必须提供 --git-repo。",
+        "gitRepoInvalid": "--git-repo 必须是完整的 Git remote URL。",
+        "updateFailed": "Portal 配置更新失败，状态码 {{status}}\n{{details}}"
+      }
+    },
+    "portalConfigure": {
+      "errors": {
+        "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
+        "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
+        "noChanges": "没有提供 Portal 配置变更。请传入 --source-storage 或 --git-* 参数。",
+        "workspaceMissing": "Portal 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}` 或 `nb portal pull {{portal}}`。"
+      },
+      "messages": {
+        "updated": "Portal \"{{portal}}\" 配置已更新：{{portalDir}}/portal.config.json。",
+        "remoteSynced": "远端 Portal 记录：已同步",
+        "remoteSkipped": "远端 Portal 记录：未找到，仅更新本地配置"
       }
     },
     "portalDeploy": {
       "errors": {
         "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
-        "workspaceMissing": "Portal workspace 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}`。",
-        "packageJsonMissing": "Portal workspace 无效：{{portalDir}} 中缺少 package.json。",
+        "workspaceMissing": "Portal 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}`。",
+        "packageJsonMissing": "Portal 无效：{{portalDir}} 中缺少 package.json。",
         "distMissing": "Portal build 没有生成 {{distDir}}/index.html。",
-        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 部署 Portal workspace。",
+        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 部署 Portal。",
         "uploadFailed": "Portal dist 上传失败，状态码 {{status}}\n{{details}}",
         "recordSyncFailed": "Portal 记录同步失败，状态码 {{status}}\n{{details}}"
       },
@@ -220,7 +244,7 @@
       "errors": {
         "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
-        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 列出 Portal workspace。",
+        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 列出 Portal。",
         "listFailed": "Portal 列表获取失败，状态码 {{status}}\n{{details}}"
       },
       "messages": {
@@ -229,7 +253,7 @@
       "table": {
         "name": "名称",
         "url": "访问 URL",
-        "developmentMode": "开发模式",
+        "portalType": "Portal 类型",
         "path": "本地路径",
         "enabled": "启用",
         "localSynced": "本地已同步"
@@ -244,7 +268,7 @@
       "fields": {
         "name": "名称",
         "url": "访问 URL",
-        "developmentMode": "开发模式",
+        "portalType": "Portal 类型",
         "path": "本地路径",
         "enabled": "启用",
         "localSynced": "本地已同步"
@@ -255,9 +279,9 @@
         "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
         "confirmationRequired": "非交互模式下拒绝删除 Portal。请追加 --yes 后重试。",
-        "outsideParent": "拒绝删除 {{parentDir}} 之外的 Portal workspace：{{portalDir}}",
-        "workspaceMissing": "Portal workspace 不存在：{{portalDir}}\n如需忽略本地文件缺失，请追加 --force。",
-        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 删除 Portal workspace。",
+        "outsideParent": "拒绝删除 {{parentDir}} 之外的 Portal：{{portalDir}}",
+        "workspaceMissing": "Portal 不存在：{{portalDir}}\n如需忽略本地文件缺失，请追加 --force。",
+        "unsupportedEnvKind": "第一版暂不支持为 {{kind}} env 删除 Portal。",
         "recordDestroyFailed": "Portal 记录删除失败，状态码 {{status}}\n{{details}}"
       },
       "prompts": {
@@ -269,16 +293,16 @@
         "app": "App：{{app}}",
         "base": "Base：{{base}}",
         "record": "记录：{{status}}",
-        "workspace": "Workspace：{{status}}（{{dir}}）"
+        "workspace": "Portal：{{status}}（{{dir}}）"
       }
     },
     "portalDev": {
       "errors": {
         "envNotConfigured": "env \"{{envName}}\" 尚未配置。请先运行 `nb env add {{envName}} --api-base-url <url>`。",
         "noEnvConfigured": "还没有配置 NocoBase env。请先运行 `nb init --ui` 创建一个。",
-        "workspaceMissing": "Portal workspace 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}`。",
-        "packageJsonMissing": "Portal workspace 无效：{{portalDir}} 中缺少 package.json。",
-        "sshUnsupported": "第一版暂不支持为 ssh env 启动 Portal workspace 开发服务。"
+        "workspaceMissing": "Portal 不存在：{{portalDir}}\n请先运行 `nb portal create {{portal}}`。",
+        "packageJsonMissing": "Portal 无效：{{portalDir}} 中缺少 package.json。",
+        "sshUnsupported": "第一版暂不支持为 ssh env 启动 Portal 开发服务。"
       },
       "messages": {
         "starting": "正在启动 Portal \"{{portal}}\"...",
@@ -461,15 +485,15 @@
           "message": "应用子路径（例如 /nocobase/）",
           "placeholder": "/ 或 /nocobase/"
         },
-        "developmentMode": {
-          "message": "谁来主导开发？",
-          "noCodeLabel": "人主导开发",
-          "noCodeHint": "通过配置和低代码的方式构建应用，AI 作为你的助手提供支持。",
-          "vibeCodingLabel": "AI 主导开发",
-          "vibeCodingHint": "你描述自己的需求，AI 将为你编写代码并构建应用。"
+        "portalType": {
+          "message": "Portal 类型",
+          "noCodeLabel": "无代码 Portal",
+          "noCodeHint": "通过可视化配置创建，AI 可以协助调整配置。访问路径：/v/<name>",
+          "aiLabel": "AI Portal",
+          "aiHint": "通过 AI Agent 和代码创建，可用自然语言提出修改要求。访问路径：/x/<name>"
         },
         "portalName": {
-          "message": "初始化 Portal 名称",
+          "message": "Portal 名称",
           "placeholder": "admin"
         },
         "portalTemplate": {
@@ -576,15 +600,15 @@
         "skipDownload": {
           "message": "跳过下载 NocoBase，直接复用已有的本地应用文件或 Docker 镜像"
         },
-        "developmentMode": {
-          "message": "谁来主导开发？",
-          "noCodeLabel": "人主导开发",
-          "noCodeHint": "通过配置和低代码的方式构建应用，AI 作为你的助手提供支持。",
-          "vibeCodingLabel": "AI 主导开发",
-          "vibeCodingHint": "你描述自己的需求，AI 将为你编写代码并构建应用。"
+        "portalType": {
+          "message": "Portal 类型",
+          "noCodeLabel": "无代码 Portal",
+          "noCodeHint": "通过可视化配置创建，AI 可以协助调整配置。访问路径：/v/<name>",
+          "aiLabel": "AI Portal",
+          "aiHint": "通过 AI Agent 和代码创建，可用自然语言提出修改要求。访问路径：/x/<name>"
         },
         "portalName": {
-          "message": "初始化 Portal 名称",
+          "message": "Portal 名称",
           "placeholder": "admin"
         },
         "portalTemplate": {
@@ -612,9 +636,9 @@
           "title": "应用来源和版本",
           "description": "选择应用的获取方式，以及要使用的来源和版本。"
         },
-        "developmentMode": {
-          "title": "开发方式",
-          "description": "选择适合你的应用开发方式。"
+        "portalType": {
+          "title": "配置 Portal",
+          "description": "设置默认 Portal 的标识和类型。"
         },
         "configureDatabase": {
           "title": "配置数据库",

package/nocobase-ctl.config.json

@@ -202,6 +202,117 @@
         }
       }
     },
+    "ai": {
+      "name": "ai",
+      "description": "Discover LLM providers and manage LLM services and AI employees.",
+      "include": true,
+      "resources": {
+        "includes": ["ai", "llmServices", "aiEmployees"],
+        "excludes": [],
+        "overrides": {
+          "ai": {
+            "name": "llm-providers",
+            "description": "Discover providers and models and test unsaved LLM settings.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "ai:listLLMProviders",
+                "ai:listProviderModels",
+                "ai:testFlight",
+                "ai:listModels",
+                "ai:listLLMServices"
+              ]
+            }
+          },
+          "llmServices": {
+            "name": "llm-services",
+            "description": "Manage saved LLM service configurations.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "llmServices:list",
+                "llmServices:get",
+                "llmServices:create",
+                "llmServices:update",
+                "llmServices:destroy"
+              ]
+            }
+          },
+          "aiEmployees": {
+            "name": "employees",
+            "description": "Manage AI employees.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiEmployees:list",
+                "aiEmployees:get",
+                "aiEmployees:create",
+                "aiEmployees:update",
+                "aiEmployees:destroy"
+              ]
+            }
+          }
+        }
+      }
+    },
+    "kb": {
+      "name": "kb",
+      "description": "Manage vector databases, knowledge bases, documents, vectorization, and retrieval tests.",
+      "include": true,
+      "resources": {
+        "includes": ["aiVectorDatabases", "aiKnowledgeBase", "aiKnowledgeBaseDocs"],
+        "excludes": [],
+        "overrides": {
+          "aiVectorDatabases": {
+            "name": "vector-databases",
+            "description": "Manage vector database connections.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiVectorDatabases:listProviders",
+                "aiVectorDatabases:testConnection",
+                "aiVectorDatabases:list",
+                "aiVectorDatabases:get",
+                "aiVectorDatabases:create",
+                "aiVectorDatabases:update",
+                "aiVectorDatabases:destroy"
+              ]
+            }
+          },
+          "aiKnowledgeBase": {
+            "name": "kb",
+            "segments": ["kb"],
+            "description": "Manage knowledge bases and retrieval tests.",
+            "topLevel": true,
+            "operations": {
+              "includes": [
+                "aiKnowledgeBase:list",
+                "aiKnowledgeBase:get",
+                "aiKnowledgeBase:create",
+                "aiKnowledgeBase:update",
+                "aiKnowledgeBase:destroy",
+                "aiKnowledgeBase:runHitTest",
+                "aiKnowledgeBase:listExternalVectorStoreProviders"
+              ]
+            }
+          },
+          "aiKnowledgeBaseDocs": {
+            "name": "documents",
+            "description": "Manage knowledge base documents and vectorization.",
+            "topLevel": false,
+            "operations": {
+              "includes": [
+                "aiKnowledgeBaseDocs:list",
+                "aiKnowledgeBaseDocs:get",
+                "aiKnowledgeBaseDocs:upload",
+                "aiKnowledgeBaseDocs:vectorization",
+                "aiKnowledgeBaseDocs:destroy"
+              ]
+            }
+          }
+        }
+      }
+    },
     "flow-engine": {
       "name": "flow-engine",
       "description": "Manage flow surface composition, configuration, layout, and mutation APIs.",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "2.2.0-test.16",
+  "version": "3.0.0-alpha.1",
   "description": "NocoBase Command Line Tool",
   "type": "module",
   "main": "dist/generated/command-registry.js",
@@ -72,7 +72,7 @@
         "description": "Create and restore NocoBase backups."
       },
       "portal": {
-        "description": "Manage Portal workspaces."
+        "description": "Manage portals."
       },
       "skills": {
         "description": "Inspect or synchronize NocoBase AI coding skills for the current workspace."
@@ -146,5 +146,6 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git"
-  }
+  },
+  "gitHead": "22d8be8ece179cfa5c8a4ebb2c896c92bd418e03"
 }

package/dist/lib/portal-template.js

@@ -1,190 +0,0 @@
-/**
- * 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 { cp, mkdir, mkdtemp, rm, stat } from 'node:fs/promises';
-import os from 'node:os';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { buildPortalCommandEnv } from './portal-command-env.js';
-import { resolvePortalTemplate } from './portal-create.js';
-import { run } from './run-npm.js';
-const DEFAULT_PORTAL_APP_NAME = 'main';
-const DEFAULT_PORTAL_NAME = 'admin';
-const PORTAL_CLIENT_PREFIX = 'x';
-function trimValue(value) {
-    return String(value ?? '').trim();
-}
-function normalizePortalName(value) {
-    const segment = String(value || '')
-        .trim()
-        .replace(/^\/+|\/+$/g, '');
-    return segment || DEFAULT_PORTAL_NAME;
-}
-function normalizePortalAppName(value) {
-    const segment = String(value || '')
-        .trim()
-        .replace(/^\/+|\/+$/g, '');
-    return segment || DEFAULT_PORTAL_APP_NAME;
-}
-function validatePortalSegment(kind, value) {
-    if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]*$/.test(value)) {
-        throw new Error(`Invalid ${kind} "${value}". Use letters, numbers, underscores, or hyphens, and start with a letter or number.`);
-    }
-}
-async function pathExists(filePath) {
-    try {
-        await stat(filePath);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
-function resolveLocalTemplatePath(templateSource) {
-    if (templateSource.startsWith('file://')) {
-        return fileURLToPath(templateSource);
-    }
-    return templateSource;
-}
-function isGitTemplateSource(templateSource) {
-    return (templateSource.startsWith('git@') ||
-        templateSource.startsWith('git+') ||
-        /^https?:\/\//i.test(templateSource) ||
-        templateSource.endsWith('.git'));
-}
-async function getLocalTemplateDir(templateSource) {
-    let localPath;
-    try {
-        localPath = resolveLocalTemplatePath(templateSource);
-    }
-    catch {
-        return undefined;
-    }
-    let result;
-    try {
-        result = await stat(localPath);
-    }
-    catch {
-        return undefined;
-    }
-    if (!result.isDirectory()) {
-        throw new Error(`Portal template "${templateSource}" is invalid: expected a directory.`);
-    }
-    return localPath;
-}
-async function resolveInitialPortalTemplate(params) {
-    const localTemplateDir = await getLocalTemplateDir(params.templateSource);
-    if (localTemplateDir) {
-        return {
-            dir: localTemplateDir,
-            source: params.templateSource,
-            type: 'local',
-        };
-    }
-    if (!isGitTemplateSource(params.templateSource)) {
-        return resolvePortalTemplate(params.templateSource, {
-            npmRegistry: params.npmRegistry,
-            runCommand: params.runCommand,
-        });
-    }
-    await params.runCommand('git', ['clone', '--depth', '1', params.templateSource, params.tempDir], {
-        errorName: 'git clone',
-        stdio: params.verbose ? 'inherit' : 'ignore',
-    });
-    return {
-        dir: params.tempDir,
-        source: params.templateSource,
-        type: 'local',
-    };
-}
-async function copyTemplate(sourceDir, targetDir) {
-    await mkdir(path.dirname(targetDir), { recursive: true });
-    await cp(sourceDir, targetDir, {
-        recursive: true,
-        filter: (source) => !source.split(path.sep).includes('.git'),
-    });
-}
-async function buildPortalHtml(params) {
-    const stdio = params.verbose ? 'inherit' : 'ignore';
-    await params.runCommand('yarn', ['build:html'], {
-        cwd: params.portalDir,
-        env: buildPortalCommandEnv({
-            NOCOBASE_API_URL: '/api',
-            NOCOBASE_PORTAL_BASE: `/${PORTAL_CLIENT_PREFIX}/${params.portalName}/`,
-        }),
-        envMode: 'replace',
-        errorName: 'yarn build:html',
-        stdio,
-    });
-}
-export async function prepareInitialPortalTemplate(options) {
-    const developmentMode = trimValue(options.developmentMode);
-    if (developmentMode !== 'vibe-coding') {
-        return { prepared: false, skippedReason: 'no-code' };
-    }
-    const storagePath = trimValue(options.storagePath);
-    if (!storagePath) {
-        throw new Error('Cannot prepare an initial Portal template without a storage path.');
-    }
-    const templateUrl = trimValue(options.portalTemplate);
-    if (!templateUrl) {
-        throw new Error('Initial Portal template is required when development mode is "vibe-coding".');
-    }
-    const appName = normalizePortalAppName(options.appName);
-    const portalName = normalizePortalName(options.portalName);
-    validatePortalSegment('portal app name', appName);
-    validatePortalSegment('Portal name', portalName);
-    const portalDir = path.join(storagePath, 'portals', appName, portalName);
-    if (await pathExists(portalDir)) {
-        if (await pathExists(path.join(portalDir, 'dist', 'index.html'))) {
-            return { prepared: false, skippedReason: 'already-prepared' };
-        }
-        await rm(portalDir, { recursive: true, force: true });
-    }
-    options.onStartTask?.(`Preparing Portal "${portalName}" from template...`);
-    const runCommand = options.runCommand ?? run;
-    const tempDir = await mkdtemp(path.join(os.tmpdir(), 'nocobase-portal-template-'));
-    let cleanupPortalDir = false;
-    let template;
-    try {
-        template = await resolveInitialPortalTemplate({
-            templateSource: templateUrl,
-            tempDir,
-            npmRegistry: options.npmRegistry,
-            verbose: options.verbose,
-            runCommand,
-        });
-        const templateDir = template.dir;
-        if (!(await pathExists(path.join(templateDir, 'package.json')))) {
-            throw new Error(`Portal template "${templateUrl}" is invalid: package.json is missing.`);
-        }
-        cleanupPortalDir = true;
-        await copyTemplate(templateDir, portalDir);
-        await rm(path.join(portalDir, 'node_modules'), { recursive: true, force: true });
-        await buildPortalHtml({
-            portalDir,
-            portalName,
-            verbose: options.verbose,
-            runCommand,
-        });
-        cleanupPortalDir = false;
-        options.onSucceedTask?.(`Portal "${portalName}" is ready.`);
-        return { prepared: true };
-    }
-    catch (error) {
-        if (cleanupPortalDir) {
-            await rm(portalDir, { recursive: true, force: true });
-        }
-        options.onFailTask?.(`Failed to prepare Portal "${portalName}".`);
-        throw error;
-    }
-    finally {
-        await rm(tempDir, { recursive: true, force: true });
-        await template?.cleanup?.();
-    }
-}