@silicaclaw/cli 1.0.0-beta.6 → 1.0.0-beta.8

package/INSTALL.md

@@ -22,6 +22,27 @@ CLI-style onboarding command (recommended, zero-config):
 npx @silicaclaw/cli@beta onboard
 ```
 
+Cross-network quick wizard (defaults to global-preview):
+
+```bash
+npx @silicaclaw/cli@beta connect
+```
+
+Check/update CLI version:
+
+```bash
+npx @silicaclaw/cli@beta update
+```
+
+Gateway background service commands:
+
+```bash
+npx @silicaclaw/cli@beta gateway start --mode=local
+npx @silicaclaw/cli@beta gateway status
+npx @silicaclaw/cli@beta gateway restart --mode=lan
+npx @silicaclaw/cli@beta gateway stop
+```
+
 For most home users, just press Enter on defaults and use `local` mode first.
 
 Optional global install (advanced users only):
@@ -29,6 +50,11 @@ Optional global install (advanced users only):
 ```bash
 npm i -g @silicaclaw/cli
 silicaclaw onboard
+silicaclaw connect
+silicaclaw update
+silicaclaw gateway start --mode=local
+silicaclaw gateway status
+silicaclaw gateway stop
 ```
 
 ## 3. Run

package/README.md

@@ -28,6 +28,27 @@ Without servers, accounts, or central control.
 npx @silicaclaw/cli@beta onboard
 ```
 
+Cross-network preview quick wizard:
+
+```bash
+npx @silicaclaw/cli@beta connect
+```
+
+Check and update CLI version:
+
+```bash
+npx @silicaclaw/cli@beta update
+```
+
+Background gateway service:
+
+```bash
+npx @silicaclaw/cli@beta gateway start --mode=local
+npx @silicaclaw/cli@beta gateway status
+npx @silicaclaw/cli@beta gateway restart --mode=lan
+npx @silicaclaw/cli@beta gateway stop
+```
+
 Or manual:
 
 ```bash
@@ -53,11 +74,22 @@ Zero-config (recommended, no global install / no PATH setup):
 npx @silicaclaw/cli@beta onboard
 ```
 
+Cross-network preview (global-preview first):
+
+```bash
+npx @silicaclaw/cli@beta connect
+```
+
 Optional global install:
 
 ```bash
 npm i -g @silicaclaw/cli
 silicaclaw onboard
+silicaclaw connect
+silicaclaw update
+silicaclaw gateway start --mode=local
+silicaclaw gateway status
+silicaclaw gateway stop
 ```
 
 ## Quick Start (OpenClaw-style)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@silicaclaw/cli",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.0-beta.8",
   "private": false,
   "publishConfig": {
     "access": "public"
@@ -53,6 +53,7 @@
     "dev": "npm run --workspace @silicaclaw/local-console dev",
     "onboard": "node scripts/silicaclaw-cli.mjs onboard",
     "quickstart": "bash scripts/quickstart.sh",
+    "gateway": "node scripts/silicaclaw-gateway.mjs",
     "local-console": "npm run --workspace @silicaclaw/local-console dev",
     "public-explorer": "npm run --workspace @silicaclaw/public-explorer dev",
     "logo": "bash scripts/install-logo.sh",

package/scripts/quickstart.sh

@@ -5,6 +5,13 @@ INVOKE_PWD="${INIT_CWD:-$PWD}"
 ROOT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
 WORK_DIR="$ROOT_DIR"
 IS_NPX_MODE=0
+DEFAULT_MODE_PICK="${QUICKSTART_DEFAULT_MODE:-1}"
+CONNECT_MODE="${QUICKSTART_CONNECT_MODE:-0}"
+
+case "$DEFAULT_MODE_PICK" in
+  1|2|3) ;;
+  *) DEFAULT_MODE_PICK="1" ;;
+esac
 
 case "$ROOT_DIR" in
   *"/.npm/_npx/"*)
@@ -170,8 +177,13 @@ echo "2) lan             局域网预览（A/B 双机）"
 echo "3) global-preview  非局域网预览（WebRTC）"
 echo "提示: 不确定就直接回车（默认 local）。"
 echo "提示: 只有在你已有可达 signaling 地址时，才选择 3。"
-read -r -p "请输入模式编号 [1/2/3] (默认 1): " MODE_PICK || true
-MODE_PICK="${MODE_PICK:-1}"
+if [ "$CONNECT_MODE" = "1" ]; then
+  MODE_PICK="3"
+  echo "connect 模式：已自动选择 global-preview。"
+else
+  read -r -p "请输入模式编号 [1/2/3] (默认 ${DEFAULT_MODE_PICK}): " MODE_PICK || true
+  MODE_PICK="${MODE_PICK:-$DEFAULT_MODE_PICK}"
+fi
 
 NETWORK_MODE="local"
 NETWORK_ADAPTER="local-event-bus"

package/scripts/silicaclaw-cli.mjs

@@ -23,18 +23,101 @@ function run(cmd, args, extra = {}) {
   process.exit(result.status ?? 0);
 }
 
+function runCapture(cmd, args, extra = {}) {
+  const result = spawnSync(cmd, args, {
+    cwd: ROOT_DIR,
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf8",
+    env: process.env,
+    ...extra,
+  });
+  if (result.error) {
+    throw result.error;
+  }
+  return result;
+}
+
 function readVersion() {
   const versionFile = resolve(ROOT_DIR, "VERSION");
   if (!existsSync(versionFile)) return "unknown";
   return readFileSync(versionFile, "utf8").trim() || "unknown";
 }
 
+function readPackageVersion() {
+  const pkgFile = resolve(ROOT_DIR, "package.json");
+  if (!existsSync(pkgFile)) return "unknown";
+  try {
+    const pkg = JSON.parse(readFileSync(pkgFile, "utf8"));
+    return String(pkg.version || "unknown");
+  } catch {
+    return "unknown";
+  }
+}
+
+function isNpxRun() {
+  return ROOT_DIR.includes("/.npm/_npx/");
+}
+
+function showUpdateGuide(current, latest, beta) {
+  console.log("SilicaClaw update check");
+  console.log(`current: ${current}`);
+  console.log(`latest : ${latest || "-"}`);
+  console.log(`beta   : ${beta || "-"}`);
+  console.log("");
+
+  const upToDate = Boolean(beta) && current === beta;
+  if (upToDate) {
+    console.log("You are already on the latest beta.");
+  } else {
+    console.log("Update available.");
+  }
+  console.log("");
+  console.log("Recommended commands:");
+  console.log("1) npx mode (no global install)");
+  console.log("   npx @silicaclaw/cli@beta onboard");
+  console.log("   npx @silicaclaw/cli@beta connect");
+  console.log("");
+  console.log("2) global install mode");
+  console.log("   npm i -g @silicaclaw/cli@beta");
+  console.log("   silicaclaw version");
+  console.log("");
+  if (isNpxRun()) {
+    console.log("Detected npx runtime: use npx commands above for immediate update.");
+  }
+}
+
+function update() {
+  const current = readPackageVersion();
+  try {
+    const result = runCapture("npm", ["view", "@silicaclaw/cli", "dist-tags", "--json"]);
+    if ((result.status ?? 1) !== 0) {
+      console.error("Failed to query npm dist-tags.");
+      if (result.stderr) console.error(result.stderr.trim());
+      process.exit(result.status ?? 1);
+    }
+    const text = String(result.stdout || "").trim();
+    const tags = text ? JSON.parse(text) : {};
+    const latest = tags.latest ? String(tags.latest) : "";
+    const beta = tags.beta ? String(tags.beta) : "";
+    showUpdateGuide(current, latest, beta);
+    process.exit(0);
+  } catch (error) {
+    console.error(`Update check failed: ${error.message}`);
+    console.log("Try manually:");
+    console.log("npm view @silicaclaw/cli dist-tags --json");
+    process.exit(1);
+  }
+}
+
 function help() {
   console.log(`
 SilicaClaw CLI
 
 Usage:
   silicaclaw onboard
+  silicaclaw connect
+  silicaclaw update
+  silicaclaw gateway <start|stop|restart|status|logs>
   silicaclaw local-console
   silicaclaw explorer
   silicaclaw signaling
@@ -44,6 +127,9 @@ Usage:
 
 Commands:
   onboard        Interactive step-by-step onboarding (recommended)
+  connect        Cross-network connect wizard (global-preview first)
+  update         Check latest npm version and show upgrade commands
+  gateway        Manage background services (start/stop/restart/status/logs)
   local-console  Start local console (http://localhost:4310)
   explorer       Start public explorer (http://localhost:4311)
   signaling      Start WebRTC signaling preview server
@@ -59,6 +145,23 @@ switch (cmd) {
   case "onboard":
     run("bash", [resolve(ROOT_DIR, "scripts", "quickstart.sh")]);
     break;
+  case "connect":
+    run("bash", [resolve(ROOT_DIR, "scripts", "quickstart.sh")], {
+      env: {
+        ...process.env,
+        QUICKSTART_DEFAULT_MODE: "3",
+        QUICKSTART_CONNECT_MODE: "1",
+      },
+    });
+    break;
+  case "update":
+    update();
+    break;
+  case "gateway":
+    run("node", [resolve(ROOT_DIR, "scripts", "silicaclaw-gateway.mjs"), ...process.argv.slice(3)], {
+      cwd: process.cwd(),
+    });
+    break;
   case "local-console":
   case "console":
     run("npm", ["run", "local-console"]);

package/scripts/silicaclaw-gateway.mjs

@@ -0,0 +1,321 @@
+#!/usr/bin/env node
+
+import { spawn } from "node:child_process";
+import { existsSync, mkdirSync, openSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const ROOT_DIR = resolve(__dirname, "..");
+
+const argv = process.argv.slice(2);
+const cmd = String(argv[0] || "help").toLowerCase();
+
+function parseFlag(name, fallback = "") {
+  const prefix = `--${name}=`;
+  for (const item of argv) {
+    if (item.startsWith(prefix)) return item.slice(prefix.length);
+  }
+  return fallback;
+}
+
+function hasFlag(name) {
+  return argv.includes(`--${name}`);
+}
+
+function detectAppDir() {
+  const envDir = process.env.SILICACLAW_APP_DIR;
+  if (envDir && existsSync(join(envDir, "package.json"))) {
+    return resolve(envDir);
+  }
+
+  const cwd = process.cwd();
+  if (existsSync(join(cwd, "package.json"))) {
+    return resolve(cwd);
+  }
+
+  const homeCandidate = join(homedir(), "silicaclaw");
+  if (existsSync(join(homeCandidate, "package.json"))) {
+    return resolve(homeCandidate);
+  }
+
+  return ROOT_DIR;
+}
+
+const APP_DIR = detectAppDir();
+const STATE_DIR = join(APP_DIR, ".silicaclaw", "gateway");
+const CONSOLE_PID_FILE = join(STATE_DIR, "local-console.pid");
+const CONSOLE_LOG_FILE = join(STATE_DIR, "local-console.log");
+const SIGNALING_PID_FILE = join(STATE_DIR, "signaling.pid");
+const SIGNALING_LOG_FILE = join(STATE_DIR, "signaling.log");
+const STATE_FILE = join(STATE_DIR, "state.json");
+
+function ensureStateDir() {
+  mkdirSync(STATE_DIR, { recursive: true });
+}
+
+function readPid(file) {
+  if (!existsSync(file)) return null;
+  const text = String(readFileSync(file, "utf8")).trim();
+  const pid = Number(text);
+  return Number.isFinite(pid) && pid > 0 ? pid : null;
+}
+
+function isRunning(pid) {
+  if (!pid) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function removeFileIfExists(path) {
+  if (existsSync(path)) rmSync(path, { force: true });
+}
+
+async function stopPid(pid, name) {
+  if (!pid || !isRunning(pid)) return;
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+    return;
+  }
+  const start = Date.now();
+  while (Date.now() - start < 5000) {
+    if (!isRunning(pid)) return;
+    await new Promise((r) => setTimeout(r, 200));
+  }
+  if (isRunning(pid)) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+      // ignore
+    }
+  }
+  if (isRunning(pid)) {
+    console.error(`failed to stop ${name} (pid=${pid})`);
+  }
+}
+
+function parseMode(raw) {
+  const mode = String(raw || "local").trim().toLowerCase();
+  if (mode === "lan" || mode === "global-preview" || mode === "local") return mode;
+  return "local";
+}
+
+function adapterForMode(mode) {
+  if (mode === "lan") return "real-preview";
+  if (mode === "global-preview") return "webrtc-preview";
+  return "local-event-bus";
+}
+
+function parseUrlHostPort(url) {
+  try {
+    const u = new URL(url);
+    return {
+      host: u.hostname || "",
+      port: Number(u.port || 4510),
+    };
+  } catch {
+    return { host: "", port: 4510 };
+  }
+}
+
+function spawnBackground(command, args, env, logFile, pidFile) {
+  const outFd = openSync(logFile, "a");
+  const child = spawn(command, args, {
+    cwd: APP_DIR,
+    env: { ...process.env, ...env },
+    detached: true,
+    stdio: ["ignore", outFd, outFd],
+  });
+  child.unref();
+  writeFileSync(pidFile, String(child.pid));
+  return child.pid;
+}
+
+function writeState(state) {
+  ensureStateDir();
+  writeFileSync(STATE_FILE, JSON.stringify(state, null, 2));
+}
+
+function readState() {
+  if (!existsSync(STATE_FILE)) return null;
+  try {
+    return JSON.parse(readFileSync(STATE_FILE, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+function printHelp() {
+  console.log(`
+SilicaClaw Gateway
+
+Usage:
+  silicaclaw gateway start [--mode=local|lan|global-preview] [--signaling-url=http://host:4510] [--room=silicaclaw-demo]
+  silicaclaw gateway stop
+  silicaclaw gateway restart [--mode=...]
+  silicaclaw gateway status
+  silicaclaw gateway logs [local-console|signaling]
+
+Notes:
+  - Default app dir: current directory; fallback: ~/silicaclaw
+  - State dir: .silicaclaw/gateway
+  - global-preview + localhost signaling URL will auto-start signaling server
+`.trim());
+}
+
+function showStatus() {
+  const localPid = readPid(CONSOLE_PID_FILE);
+  const sigPid = readPid(SIGNALING_PID_FILE);
+  const state = readState();
+  const payload = {
+    app_dir: APP_DIR,
+    mode: state?.mode || "unknown",
+    adapter: state?.adapter || "unknown",
+    local_console: {
+      pid: localPid,
+      running: isRunning(localPid),
+      log_file: CONSOLE_LOG_FILE,
+    },
+    signaling: {
+      pid: sigPid,
+      running: isRunning(sigPid),
+      log_file: SIGNALING_LOG_FILE,
+      url: state?.signaling_url || null,
+      room: state?.room || null,
+    },
+    updated_at: state?.updated_at || null,
+  };
+  console.log(JSON.stringify(payload, null, 2));
+}
+
+function tailFile(file, lines = 80) {
+  if (!existsSync(file)) {
+    console.log(`log file not found: ${file}`);
+    return;
+  }
+  const text = String(readFileSync(file, "utf8"));
+  const out = text.split(/\r?\n/).slice(-lines).join("\n");
+  console.log(out);
+}
+
+async function stopAll() {
+  const localPid = readPid(CONSOLE_PID_FILE);
+  const sigPid = readPid(SIGNALING_PID_FILE);
+  await stopPid(localPid, "local-console");
+  await stopPid(sigPid, "signaling");
+  removeFileIfExists(CONSOLE_PID_FILE);
+  removeFileIfExists(SIGNALING_PID_FILE);
+  writeState({
+    ...(readState() || {}),
+    updated_at: Date.now(),
+  });
+  console.log("gateway stopped");
+}
+
+function startAll() {
+  ensureStateDir();
+
+  const mode = parseMode(parseFlag("mode", process.env.NETWORK_MODE || "local"));
+  const adapter = adapterForMode(mode);
+  const signalingUrl = parseFlag("signaling-url", process.env.WEBRTC_SIGNALING_URL || "http://localhost:4510");
+  const room = parseFlag("room", process.env.WEBRTC_ROOM || "silicaclaw-demo");
+  const shouldDisableSignaling = hasFlag("no-signaling");
+
+  const currentLocalPid = readPid(CONSOLE_PID_FILE);
+  const currentSigPid = readPid(SIGNALING_PID_FILE);
+  if (isRunning(currentLocalPid)) {
+    console.log(`local-console already running (pid=${currentLocalPid})`);
+  } else {
+    removeFileIfExists(CONSOLE_PID_FILE);
+    const env = {
+      NETWORK_ADAPTER: adapter,
+      NETWORK_MODE: mode,
+      WEBRTC_SIGNALING_URL: signalingUrl,
+      WEBRTC_ROOM: room,
+    };
+    const pid = spawnBackground("npm", ["run", "local-console"], env, CONSOLE_LOG_FILE, CONSOLE_PID_FILE);
+    console.log(`local-console started (pid=${pid})`);
+  }
+
+  const { host, port } = parseUrlHostPort(signalingUrl);
+  const shouldAutoStartSignaling =
+    mode === "global-preview" &&
+    !shouldDisableSignaling &&
+    (host === "localhost" || host === "127.0.0.1");
+
+  if (shouldAutoStartSignaling) {
+    if (isRunning(currentSigPid)) {
+      console.log(`signaling already running (pid=${currentSigPid})`);
+    } else {
+      removeFileIfExists(SIGNALING_PID_FILE);
+      const pid = spawnBackground(
+        "npm",
+        ["run", "webrtc-signaling"],
+        { PORT: String(port) },
+        SIGNALING_LOG_FILE,
+        SIGNALING_PID_FILE,
+      );
+      console.log(`signaling started (pid=${pid}, port=${port})`);
+    }
+  }
+
+  writeState({
+    app_dir: APP_DIR,
+    mode,
+    adapter,
+    signaling_url: signalingUrl,
+    room,
+    updated_at: Date.now(),
+  });
+}
+
+async function main() {
+  if (cmd === "help" || cmd === "-h" || cmd === "--help") {
+    printHelp();
+    return;
+  }
+  if (cmd === "status") {
+    showStatus();
+    return;
+  }
+  if (cmd === "start") {
+    startAll();
+    showStatus();
+    return;
+  }
+  if (cmd === "stop") {
+    await stopAll();
+    showStatus();
+    return;
+  }
+  if (cmd === "restart") {
+    await stopAll();
+    startAll();
+    showStatus();
+    return;
+  }
+  if (cmd === "logs") {
+    const target = String(argv[1] || "local-console");
+    if (target === "signaling") {
+      tailFile(SIGNALING_LOG_FILE);
+      return;
+    }
+    tailFile(CONSOLE_LOG_FILE);
+    return;
+  }
+  printHelp();
+  process.exitCode = 1;
+}
+
+main().catch((error) => {
+  console.error(error?.message || String(error));
+  process.exit(1);
+});
+