@mearl/cloud-server 3.0.0-beta.4 → 3.0.0-beta.7

package/README.md

@@ -7,14 +7,10 @@
 推荐通过 setup 安装完整的云端 Agent 环境（cloud-server、统一 client 与 Agent Skill）：
 
 ```bash
-npx --@mearl:registry=https://registry.npmjs.org @mearl/setup --cloud
+npx @mearl/setup --cloud
 ```
 
-Qoder Cloud Agent 使用同一套包和 server 命令，只在 setup 时选择配对模式：
-
-```bash
-npx --@mearl:registry=https://registry.npmjs.org @mearl/setup --qoder-cloud --yes
-```
+可选连接协议由已安装能力包提供。Qoder 配对见 [`@mearl/plugin-qoder`](../../plugin-qoder/README.md)；核心不内置其配对实现。
 
 在 Docker 或自定义进程托管等只需要 Server 包的场景，可单独安装 `@mearl/cloud-server`。
 
@@ -24,8 +20,7 @@ npx --@mearl:registry=https://registry.npmjs.org @mearl/setup --qoder-cloud --ye
 
 Server **默认以后台守护进程方式运行**，启动后立即返回，并打印本地机器需要执行的连接命令。
 POSIX 环境下后台进程会进入独立 session，可在启动命令结束后继续运行。
-Qoder 模式保持相同的 `start/status/restart/stop/logs` 交互；`start` 和 `restart` 生成新的
-pair/connector 信息后退出，不监听端口或创建守护进程。
+其他 cloud mode 通过已安装的 `cloud.server.<id>` 加载，未安装时明确失败。
 
 ```bash
 mearl-cloud-server [command] [options]
@@ -75,7 +70,7 @@ mearl-cloud-server --foreground
 [CloudServer] Logs: ~/.mearl/cloud-server.log
 
   Connect from your local machine:
-    npx --@mearl:registry=https://registry.npmjs.org @mearl/cloud-connector start "ws://10.0.1.100:8080/ws?token=xxx"
+    npx @mearl/cloud-connector start "ws://10.0.1.100:8080/ws?token=xxx"
 ```
 
 部署在反向代理或沙箱中时，由部署宿主或 preset 安装器通过 `MEARL_CLOUD_PUBLIC_URL` 提供外部入口，可使用 `{port}` 占位符。核心不探测组织专属沙箱变量或内部端口映射接口；相关自动发现由独立能力包处理。当前阶段尚未接通这些内部适配，内部产品仍保留原实现。
@@ -85,7 +80,7 @@ mearl-cloud-server --foreground
 运行时文件位于 `~/.mearl/`：
 
 - `cloud-server.json` - 连接配置（含 server URL、pid、端口等），统一 `@mearl/client` 自动读取
-- `cloud-server-mode.json` - setup 在 Qoder 模式下写入的标识；普通 `--cloud` 会删除它
+- `cloud-server-mode.json` - setup 为可选 cloud mode 写入的标识；普通 `--cloud` 会删除它
 - `cloud-server.log` - 后台进程日志（`logs` 子命令读取，或 `tail -f` 跟踪）；超过 5MB 会在下次启动时滚动为 `cloud-server.log.1`
 
 > 守护进程的启停、状态、日志滚动等生命周期逻辑由共享包 [`@mearl/daemon-core`](../../daemon-core) 提供（与 cloud-connector 复用同一套实现）。
@@ -126,9 +121,7 @@ console.log(stats);
 await server.stop();
 ```
 
-Qoder 模式只复用 cloud-server CLI 作为建联入口。配对完成后的 action 继续通过 Qoder
-Client-Side `mearl` 工具、Session API 和本地 connector 转发，不会连接一个本地
-cloud-server 端口。
+可选 mode 的握手和转发由对应能力包负责。
 
 ## 架构
 
@@ -233,7 +226,7 @@ WantedBy=multi-user.target
 
 ```dockerfile
 FROM node:20-alpine
-RUN npm --@mearl:registry=https://registry.npmjs.org install -g @mearl/cloud-server
+RUN npm install -g @mearl/cloud-server
 EXPOSE 8080
 CMD ["mearl-cloud-server", "--foreground", "--token", "your-token"]
 ```
@@ -241,7 +234,7 @@ CMD ["mearl-cloud-server", "--foreground", "--token", "your-token"]
 ### 使用 PM2
 
 ```bash
-pm2 start mearl-cloud-server --name mtop-cloud-server -- --foreground --port 8080 --token your-token
+pm2 start mearl-cloud-server --name mearl-cloud-server -- --foreground --port 8080 --token your-token
 ```
 
 ## 注意事项

package/dist/chunks/{chunk-67UWHFX6.js → chunk-LXICEBLN.js}

@@ -28,7 +28,7 @@ function resolveCloudPublicEndpoint(port, env = process.env) {
 }
 function formatConnectorCommand(url) {
   const argument = /[$`"\\\r\n]/.test(url) ? "'" + url.replaceAll("'", "'\\''") + "'" : `"${url}"`;
-  return `npx --@mearl:registry=https://registry.npmjs.org @mearl/cloud-connector start ${argument}`;
+  return `npx @mearl/cloud-connector start ${argument}`;
 }
 
 // src/index.ts

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 import type { CloudServerOptions } from './index.js';
-import { type CloudServerCommand } from './qoder.js';
+type CloudServerCommand = 'start' | 'stop' | 'restart' | 'status' | 'logs';
 export interface ParsedCloudServerArgs {
     command: CloudServerCommand;
     daemonArgs: string[];
@@ -10,3 +10,4 @@ export interface ParsedCloudServerArgs {
 }
 export declare function parseCloudServerArgs(argv: string[]): ParsedCloudServerArgs;
 export declare function main(argv?: string[]): Promise<number>;
+export {};

package/dist/cli.js

@@ -5,9 +5,10 @@ import {
   LOG_FILE,
   MODE_FILE,
   formatConnectorCommand
-} from "./chunks/chunk-67UWHFX6.js";
+} from "./chunks/chunk-LXICEBLN.js";
 
 // src/cli.ts
+import { capabilityDirectory } from "@mearl/daemon-core/page-runtimes";
 import { Command, CommanderError, InvalidArgumentError } from "commander";
 
 // src/daemon.ts
@@ -82,7 +83,7 @@ import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { dirname } from "node:path";
 var CLOUD_SERVER_MODE_ENV = "MEARL_CLOUD_MODE";
 function isCloudServerMode(value) {
-  return value === "websocket" || value === "qoder";
+  return typeof value === "string" && /^[a-z][a-z0-9-]{0,63}$/.test(value);
 }
 function readStoredMode(storage) {
   const modeFile = storage.modeFile ?? MODE_FILE;
@@ -112,72 +113,18 @@ function resolveCloudServerMode(env = process.env, storage = {}) {
   const requested = env[CLOUD_SERVER_MODE_ENV];
   if (requested !== void 0) {
     if (!isCloudServerMode(requested)) {
-      throw new Error(`${CLOUD_SERVER_MODE_ENV} must be "websocket" or "qoder"`);
+      throw new Error(`${CLOUD_SERVER_MODE_ENV} must be a valid installed cloud mode ID`);
     }
-    if (requested === "qoder") writeStoredMode(requested, storage);
+    if (requested !== "websocket") writeStoredMode(requested, storage);
     else clearStoredMode(storage);
     return requested;
   }
   return readStoredMode(storage) ?? "websocket";
 }
 
-// src/qoder.ts
-import { randomBytes } from "node:crypto";
-function createQoderPairingInfo(options = {}) {
-  const pairingCode = (options.createCode ?? (() => randomBytes(24).toString("base64url")))();
-  if (!/^[A-Za-z0-9_-]{16,128}$/.test(pairingCode)) {
-    throw new Error("Qoder pairing code must be 16-128 URL-safe characters");
-  }
-  const createdAt = (options.now ?? Date.now)();
-  if (!Number.isSafeInteger(createdAt) || createdAt < 1e12 || createdAt > 9999999999999) {
-    throw new Error("Qoder pairing timestamp must be a 13-digit epoch millisecond value");
-  }
-  return {
-    pairingCode,
-    createdAt,
-    connectorUrl: `qoder://pair/${pairingCode}?created=${createdAt}`,
-    toolInput: { action: "pair", payload: { code: pairingCode } }
-  };
-}
-function formatQoderPairingOutput(info) {
-  const connectorCommand = `npx --@mearl:registry=https://registry.npmjs.org @mearl/cloud-connector start "${info.connectorUrl}"`;
-  return `[CloudServer] Qoder pairing mode is ready.
-
-  Connect from your local machine:
-    ${connectorCommand}
-
-  Then immediately invoke the Qoder client-side custom tool named "mearl" with this input:
-    ${JSON.stringify(info.toolInput)}
-
-The connector resolves QODER_PERSONAL_ACCESS_TOKEN from the local environment, ~/.mearl/.env, or supported local credential storage. Never add the PAT to the pairing URL.`;
-}
-async function runQoderCloudServerCommand(command, dependencies) {
-  const writeLine = dependencies.writeLine ?? console.log;
-  switch (command) {
-    case "start":
-    case "restart":
-      if (dependencies.isServerRunning()) await dependencies.stopServer();
-      writeLine(
-        formatQoderPairingOutput(
-          (dependencies.createPairing ?? (() => createQoderPairingInfo()))()
-        )
-      );
-      break;
-    case "status":
-      dependencies.printStatus();
-      writeLine("[CloudServer] Mode: qoder pairing (no listening service)");
-      break;
-    case "stop":
-      await dependencies.stopServer();
-      break;
-    case "logs":
-      dependencies.printLogs();
-      break;
-  }
-}
-
 // src/cli.ts
-var CLOUD_SERVER_VERSION = true ? "3.0.0-beta.4" : "unknown";
+import { NodeCapabilityRegistry } from "@mearl/daemon-core/capabilities";
+var CLOUD_SERVER_VERSION = true ? "3.0.0-beta.7" : "unknown";
 var COMMANDS = ["start", "stop", "restart", "status", "logs"];
 var START_OPTION_NAMES = /* @__PURE__ */ new Set([
   "foreground",
@@ -322,8 +269,11 @@ async function main(argv = process.argv.slice(2)) {
     return 0;
   }
   const mode = resolveCloudServerMode();
-  if (mode === "qoder") {
-    await runQoderCloudServerCommand(parsed.command, {
+  if (mode !== "websocket") {
+    const hook = `cloud.server.${mode}`;
+    const registry = new NodeCapabilityRegistry({ version: CLOUD_SERVER_VERSION }, capabilityDirectory(), { hooks: [hook] });
+    await registry.refresh();
+    await registry.require(hook)(parsed.command, {
       isServerRunning: isDaemonRunning,
       stopServer: stopDaemon,
       printStatus: statusDaemon,

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   CloudServer
-} from "./chunks/chunk-67UWHFX6.js";
+} from "./chunks/chunk-LXICEBLN.js";
 export {
   CloudServer
 };

package/dist/mode.d.ts

@@ -1,4 +1,4 @@
-export type CloudServerMode = 'websocket' | 'qoder';
+export type CloudServerMode = string;
 export declare const CLOUD_SERVER_MODE_ENV = "MEARL_CLOUD_MODE";
 interface CloudServerModeStorage {
     modeFile?: string;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@mearl/cloud-server",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.7",
   "description": "Cloud WebSocket server for Mearl — bridges cloud agents to local connectors",
   "type": "module",
   "engines": {
-    "node": ">=22.12.0"
+    "node": ">=20.18.0"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,11 +33,11 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "commander": "^15.0.0",
+    "commander": "^14.0.3",
     "ws": "^8.18.0",
-    "@mearl/cloud-types": "3.0.0-beta.4",
-    "@mearl/daemon-core": "3.0.0-beta.4",
-    "@mearl/client": "3.0.0-beta.4"
+    "@mearl/client": "3.0.0-beta.7",
+    "@mearl/cloud-types": "3.0.0-beta.7",
+    "@mearl/daemon-core": "3.0.0-beta.7"
   },
   "devDependencies": {
     "@types/node": "^24.9.1",
@@ -47,7 +47,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/F-loat/mearl.git",
+    "url": "git+https://github.com/mearlhq/mearl.git",
     "directory": "packages/cloud/cloud-server"
   },
   "scripts": {

package/dist/qoder.d.ts

@@ -1,29 +0,0 @@
-export interface QoderPairingInfo {
-    pairingCode: string;
-    createdAt: number;
-    connectorUrl: string;
-    toolInput: {
-        action: 'pair';
-        payload: {
-            code: string;
-        };
-    };
-}
-export interface QoderPairingOptions {
-    now?: () => number;
-    createCode?: () => string;
-}
-export type CloudServerCommand = 'start' | 'stop' | 'restart' | 'status' | 'logs';
-interface QoderCloudServerDependencies {
-    createPairing?: () => QoderPairingInfo;
-    isServerRunning: () => boolean;
-    printLogs: () => void;
-    printStatus: () => void;
-    stopServer: () => Promise<void>;
-    writeLine?: (message: string) => void;
-}
-/** Create a short-lived correlation handle without embedding Qoder credentials in the URL. */
-export declare function createQoderPairingInfo(options?: QoderPairingOptions): QoderPairingInfo;
-export declare function formatQoderPairingOutput(info: QoderPairingInfo): string;
-export declare function runQoderCloudServerCommand(command: CloudServerCommand, dependencies: QoderCloudServerDependencies): Promise<void>;
-export {};