supacloud 0.3.0 → 0.5.2

package/README.md

@@ -1,43 +1,43 @@
 # supacloud
 
-Unified entrypoint that bundles both SupaCloud CLIs behind a single `supacloud` command.
+Unified entrypoint that bundles both SupaCloud CLIs behind a single `supacloudctl` command.
 
 ```
-supacloud cli   → @supacloud/cli    (project-scoped developer tools)
-supacloud admin → @supacloud/admin  (platform operations: install / SSH / tenant management)
+supacloudctl cli   → @supacloud/cli    (project-scoped developer tools)
+supacloudctl admin → @supacloud/admin  (platform operations: install / SSH / tenant management)
 ```
 
 ## 安装
 
 ```bash
 npm install -g supacloud
-supacloud --help
+supacloudctl --help
 ```
 
 One-off execution:
 
 ```bash
-npx supacloud cli status
-npx supacloud admin status
+npx --package supacloud supacloudctl cli status
+npx --package supacloud supacloudctl admin status
 ```
 
 `supacloud` depends on both `@supacloud/cli` and `@supacloud/admin`, so installing
 it gives you the full toolset. You can still install either CLI on its own
 (`@supacloud/cli` exposes `supacloud-cli`, `@supacloud/admin` exposes `supacloud-admin`).
 
-## 自动更新
+## 更新提示
 
-`supacloud cli ...` and `supacloud admin ...` check the npm `latest` dist-tag before dispatch.
-When a newer `@supacloud/cli` or `@supacloud/admin` version exists, the dispatcher runs it with
-`npm exec --package <pkg>@<latest> -- <bin> ...args`. If the registry is unavailable, it falls
-back to the dependency version bundled with the installed `supacloud` package.
+`supacloudctl cli ...` and `supacloudctl admin ...` check the npm `latest` dist-tag before dispatch.
+When a newer package exists, the dispatcher prints an update notice but still runs the dependency
+version bundled with the installed `supacloud` package. It never downloads or executes a newer
+operator CLI implicitly.
 
 Disable the latest check when you need a pinned local version:
 
 ```bash
-SUPACLOUD_NO_AUTO_UPDATE=1 supacloud cli status
+SUPACLOUD_NO_AUTO_UPDATE=1 supacloudctl cli status
 # or
-SUPACLOUD_AUTO_UPDATE=0 supacloud admin status
+SUPACLOUD_AUTO_UPDATE=0 supacloudctl admin status
 ```
 
 Use `SUPACLOUD_NPM_REGISTRY` or `npm_config_registry` to point the check at a registry mirror.
@@ -45,35 +45,34 @@ Use `SUPACLOUD_NPM_REGISTRY` or `npm_config_registry` to point the check at a re
 ## 用法
 
 ```bash
-supacloud cli status
-supacloud cli project get
-supacloud cli gateway routes --ref <ref>
+supacloudctl cli status
+supacloudctl cli project get
+supacloudctl cli gateway routes --ref <ref>
 
-supacloud admin status
-supacloud admin project list
-supacloud admin ssh ping
+supacloudctl admin status
+supacloudctl admin project list
+supacloudctl admin ssh ping
 ```
 
 Each subcommand accepts its own `--help`:
 
 ```bash
-supacloud cli --help
-supacloud admin --help
+supacloudctl cli --help
+supacloudctl admin --help
 ```
 
 ## 上下文
 
-`supacloud cli` auto-links the current project from `.env`:
+`supacloudctl cli` auto-links the current project from `.env`:
 
 - `SUPABASE_URL` / `SUPACLOUD_API_URL`
 - `SUPABASE_SERVICE_ROLE_KEY` / `SUPACLOUD_API_TOKEN`
 
-`supacloud admin` expects platform context:
+`supacloudctl admin` expects platform context:
 
 - `SUPACLOUD_HOST` + `SUPACLOUD_SSH_KEY` / `SUPACLOUD_SSH_PASS`
 - `SUPACLOUD_API_URL` + `SUPACLOUD_API_TOKEN`
 
-> Note: on hosts where SupaCloud is installed as a server, `/usr/local/bin/supacloud`
-> is the compiled management-api binary (the server process). This npm package's
-> `supacloud` command targets developer/operator workflows and is meant for your
-> local machine, not the server's process namespace.
+> Note: `/usr/local/bin/supacloud` is the compiled management-api server binary.
+> This npm package exposes only `supacloudctl`; it does not install a `supacloud`
+> compatibility alias and should normally be used on an operator's local machine.

package/dist/index.js

@@ -2,14 +2,14 @@
 
 // src/index.ts
 import { spawn } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
 import { dirname, join, parse } from "node:path";
 import { fileURLToPath } from "node:url";
 var require2 = createRequire(import.meta.url);
 var SUBCOMMANDS = {
-  cli: { pkg: "@supacloud/cli", bin: "supacloud-cli", desc: "项目级 CLI（开发者工具）" },
-  admin: { pkg: "@supacloud/admin", bin: "supacloud-admin", desc: "平台运维 CLI（安装/SSH/租户管理）" }
+  cli: { pkg: "@supacloud/cli", bin: "supacloud-cli", desc: "@supacloud/cli 项目级开发工具" },
+  admin: { pkg: "@supacloud/admin", bin: "supacloud-admin", desc: "@supacloud/admin 平台运维工具" }
 };
 function resolveSubpackageEntry(pkgName) {
   try {
@@ -18,7 +18,7 @@ function resolveSubpackageEntry(pkgName) {
     return null;
   }
 }
-var COMMAND = "supacloud";
+var COMMAND = "supacloudctl";
 var DEFAULT_NPM_REGISTRY = "https://registry.npmjs.org/";
 var AUTO_UPDATE_TIMEOUT_MS = 2000;
 function isRecord(value) {
@@ -144,25 +144,22 @@ async function createLaunchPlan(target, forwardedArgs, options = {}) {
   const resolveInstalled = options.resolveInstalled ?? resolveInstalledPackage;
   const fetchLatest = options.fetchLatest ?? fetchLatestVersion;
   const installed = resolveInstalled(target.pkg);
+  let updateNotice;
   if (!isAutoUpdateDisabled(env)) {
     const latestVersion = await fetchLatest(target.pkg, env);
     if (latestVersion && isNewerVersion(latestVersion, installed?.version ?? null)) {
-      return {
-        mode: "latest",
-        command: options.npmCommand ?? "npm",
-        args: ["exec", "--yes", "--package", `${target.pkg}@${latestVersion}`, "--", target.bin, ...forwardedArgs],
-        shell: (options.platform ?? process.platform) === "win32"
-      };
+      updateNotice = installed?.version ? `${target.pkg} ${latestVersion} 可用；当前固定使用已安装版本 ${installed.version}。请显式运行包管理器更新。` : `${target.pkg} ${latestVersion} 可用；请先通过包管理器显式安装。`;
     }
   }
   if (!installed) {
-    throw new Error(`${target.pkg} 未安装，且无法从 npm registry 获取最新版。`);
+    throw new Error(`${target.pkg} 未安装。请先通过包管理器显式安装固定版本。`);
   }
   return {
     mode: "local",
     command: options.nodePath ?? process.execPath,
     args: [installed.entry, ...forwardedArgs],
-    shell: false
+    shell: false,
+    ...updateNotice ? { updateNotice } : {}
   };
 }
 function buildHelp() {
@@ -170,7 +167,7 @@ function buildHelp() {
 `);
   return `
 ╔═══════════════════════════════════════════════════════════╗
-║  supacloud                                               ║
+║  supacloudctl                                            ║
 ║  统一入口 · 路由到项目级 CLI 与平台运维 CLI              ║
 ╚═══════════════════════════════════════════════════════════╝
 
@@ -192,9 +189,8 @@ ${subs}
   ${COMMAND} admin project list
   ${COMMAND} admin ssh ping
 
-每次执行子命令时默认检查 npm latest；发现 @supacloud/cli 或
-@supacloud/admin 有新版本时会自动通过 npm exec 运行最新版。
-离线时回退到本地依赖。设置 SUPACLOUD_NO_AUTO_UPDATE=1 可禁用。
+每次执行子命令时默认检查 npm latest；发现新版本时只输出更新提示，
+始终运行已安装的固定版本。设置 SUPACLOUD_NO_AUTO_UPDATE=1 可禁用检查。
 `;
 }
 async function run(args) {
@@ -211,6 +207,9 @@ async function run(args) {
     process.exit(1);
   }
   const plan = await createLaunchPlan(target, args.slice(1));
+  if (plan.updateNotice) {
+    console.error(`ℹ️ ${plan.updateNotice}`);
+  }
   const child = spawn(plan.command, plan.args, {
     stdio: "inherit",
     shell: plan.shell
@@ -221,17 +220,19 @@ async function run(args) {
     process.exit(1);
   });
 }
-var isMainEntry = (() => {
+function isMainModule(moduleUrl, argvEntry = process.argv[1]) {
+  if (!argvEntry)
+    return false;
   try {
-    return fileURLToPath(import.meta.url) === process.argv[1];
+    return realpathSync(fileURLToPath(moduleUrl)) === realpathSync(argvEntry);
   } catch {
     return false;
   }
-})();
-if (isMainEntry) {
+}
+if (isMainModule(import.meta.url)) {
   run(process.argv.slice(2)).catch((err) => {
     const message = err instanceof Error ? err.message : String(err);
-    console.error(`❌ supacloud 启动失败: ${message}`);
+    console.error(`❌ supacloudctl 启动失败: ${message}`);
     process.exit(1);
   });
 }
@@ -239,6 +240,7 @@ export {
   resolveSubpackageEntry,
   resolveInstalledPackage,
   isNewerVersion,
+  isMainModule,
   isAutoUpdateDisabled,
   getNpmRegistry,
   fetchLatestVersion,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "supacloud",
-  "version": "0.3.0",
-  "description": "Unified entrypoint: `supacloud cli` and `supacloud admin` in one command",
+  "version": "0.5.2",
+  "description": "Unified entrypoint: `supacloudctl cli` and `supacloudctl admin` in one command",
   "type": "module",
   "main": "./dist/index.js",
   "bin": {
-    "supacloud": "dist/index.js"
+    "supacloudctl": "dist/index.js"
   },
   "files": [
     "dist",
@@ -31,11 +31,11 @@
     "directory": "packages/supacloud"
   },
   "dependencies": {
-    "@supacloud/cli": "^0.8.0",
-    "@supacloud/admin": "^0.2.0"
+    "@supacloud/cli": "^0.9.1",
+    "@supacloud/admin": "^0.3.1"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   }
 }