@sys9/run9-cli 0.8.1 → 0.8.2-darwin-x64

package/README.md

@@ -1,25 +1,19 @@
 # @sys9/run9-cli
 
-Install:
+Prefer `@sys9/cli`. It runs run9 as `sys9 run`.
 
-```sh
-npm install -g @sys9/run9-cli
-```
+Install:
 
 ```sh
-bun install -g @sys9/run9-cli
+npm install -g @sys9/cli
+# or
+bun install -g @sys9/cli
 ```
 
-The published npm layout mirrors Codex: `@sys9/run9-cli` is a lightweight
-launcher package, and the actual native binary arrives through one
-platform-specific optional dependency. That keeps installs small because each
-machine only downloads its own Linux/macOS `x64` or `arm64` binary.
-
 Run:
 
 ```sh
-run9 auth login \
-  --endpoint https://api.run.sys9.ai \
-  --ak ak-... \
-  --sk sk-...
+sys9 run --help
 ```
+
+`@sys9/run9-cli` remains the run9 package used by `@sys9/cli`.

package/package.json

@@ -1,29 +1,23 @@
 {
   "name": "@sys9/run9-cli",
-  "version": "0.8.1",
-  "description": "run9 CLI with platform-native npm packages for Linux and macOS",
+  "version": "0.8.2-darwin-x64",
+  "description": "run9 CLI package used by @sys9/cli",
   "license": "MIT",
-  "bin": {
-    "run9": "bin/run9.js"
-  },
-  "engines": {
-    "node": ">=16"
-  },
+  "os": [
+    "darwin"
+  ],
+  "cpu": [
+    "x64"
+  ],
   "files": [
-    "bin/run9.js"
+    "vendor"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com/sys9-ai/run9.git",
     "directory": "run9cli/npm"
   },
-  "optionalDependencies": {
-    "@sys9/run9-cli-linux-x64": "npm:@sys9/run9-cli@0.8.1-linux-x64",
-    "@sys9/run9-cli-linux-arm64": "npm:@sys9/run9-cli@0.8.1-linux-arm64",
-    "@sys9/run9-cli-darwin-x64": "npm:@sys9/run9-cli@0.8.1-darwin-x64",
-    "@sys9/run9-cli-darwin-arm64": "npm:@sys9/run9-cli@0.8.1-darwin-arm64"
+  "engines": {
+    "node": ">=16"
   }
 }

package/bin/run9.js

@@ -1,130 +0,0 @@
-#!/usr/bin/env node
-
-const { spawn } = require("node:child_process");
-const { existsSync } = require("node:fs");
-const path = require("node:path");
-
-const PLATFORM_PACKAGE_BY_TARGET = {
-  "x86_64-unknown-linux-musl": "@sys9/run9-cli-linux-x64",
-  "aarch64-unknown-linux-musl": "@sys9/run9-cli-linux-arm64",
-  "x86_64-apple-darwin": "@sys9/run9-cli-darwin-x64",
-  "aarch64-apple-darwin": "@sys9/run9-cli-darwin-arm64",
-};
-
-function detectPackageManager() {
-  const userAgent = process.env.npm_config_user_agent || "";
-  if (/\bbun\//.test(userAgent)) {
-    return "bun";
-  }
-
-  const execPath = process.env.npm_execpath || "";
-  if (execPath.includes("bun")) {
-    return "bun";
-  }
-
-  if (
-    __dirname.includes(".bun/install/global") ||
-    __dirname.includes(".bun\\install\\global")
-  ) {
-    return "bun";
-  }
-
-  return userAgent ? "npm" : null;
-}
-
-function resolveTargetTriple(platformName, archName) {
-  switch (platformName) {
-    case "linux":
-    case "android":
-      switch (archName) {
-        case "x64":
-          return "x86_64-unknown-linux-musl";
-        case "arm64":
-          return "aarch64-unknown-linux-musl";
-        default:
-          return null;
-      }
-    case "darwin":
-      switch (archName) {
-        case "x64":
-          return "x86_64-apple-darwin";
-        case "arm64":
-          return "aarch64-apple-darwin";
-        default:
-          return null;
-      }
-    default:
-      return null;
-  }
-}
-
-function resolveBinaryPath(vendorRoot, targetTriple) {
-  const binaryName = process.platform === "win32" ? "run9.exe" : "run9";
-  const binaryPath = path.join(vendorRoot, targetTriple, "run9", binaryName);
-  return existsSync(binaryPath) ? binaryPath : null;
-}
-
-const targetTriple = resolveTargetTriple(process.platform, process.arch);
-if (!targetTriple) {
-  throw new Error(`Unsupported platform: ${process.platform} (${process.arch})`);
-}
-
-const platformPackage = PLATFORM_PACKAGE_BY_TARGET[targetTriple];
-if (!platformPackage) {
-  throw new Error(`Unsupported target triple: ${targetTriple}`);
-}
-
-let binaryPath = null;
-try {
-  const packageJsonPath = require.resolve(`${platformPackage}/package.json`);
-  binaryPath = resolveBinaryPath(
-    path.join(path.dirname(packageJsonPath), "vendor"),
-    targetTriple,
-  );
-} catch {
-  binaryPath = resolveBinaryPath(path.join(__dirname, "..", "vendor"), targetTriple);
-}
-
-if (!binaryPath) {
-  const packageManager = detectPackageManager();
-  const updateCommand =
-    packageManager === "bun"
-      ? "bun install -g @sys9/run9-cli@latest"
-      : "npm install -g @sys9/run9-cli@latest";
-  throw new Error(
-    `Missing optional dependency ${platformPackage}. Reinstall run9: ${updateCommand}`,
-  );
-}
-
-const child = spawn(binaryPath, process.argv.slice(2), {
-  stdio: "inherit",
-  env: process.env,
-});
-
-child.on("error", (err) => {
-  console.error(err);
-  process.exit(1);
-});
-
-const forwardSignal = (signal) => {
-  if (child.killed) {
-    return;
-  }
-  try {
-    child.kill(signal);
-  } catch {
-    // Ignore failures while the child is already exiting.
-  }
-};
-
-["SIGINT", "SIGTERM", "SIGHUP"].forEach((signal) => {
-  process.on(signal, () => forwardSignal(signal));
-});
-
-child.on("exit", (code, signal) => {
-  if (signal) {
-    process.kill(process.pid, signal);
-    return;
-  }
-  process.exit(code ?? 1);
-});