cybercode-cli 1.0.0 → 1.0.1

package/bin/cli.mjs

@@ -2,7 +2,7 @@
 // cybercode CLI launcher — bootstraps a Python env and starts the web UI.
 // Designed for `npx cybercode` one-click usage.
 
-import { spawn, spawnSync, execSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { existsSync, mkdirSync, copyFileSync, readdirSync, statSync, writeFileSync, readFileSync } from "node:fs";
 import { join, dirname, resolve } from "node:path";
 import { homedir, platform } from "node:os";
@@ -20,10 +20,15 @@ const COLORS = {
 };
 const c = (color, text) => `${COLORS[color] || ""}${text}${COLORS.reset}`;
 
+function splitCommand(argv) {
+  if (argv[0] === "webui") return { command: "webui", args: argv.slice(1) };
+  return { command: "webui", args: argv };
+}
+
 // ---- Parse CLI args ----
-function parseArgs() {
+function parseArgs(rawArgv) {
   const args = { port: null, host: "127.0.0.1", dir: null, noBrowser: false, llm: 0, help: false, version: false };
-  const argv = process.argv.slice(2);
+  const argv = rawArgv.slice();
   for (let i = 0; i < argv.length; i++) {
     const a = argv[i];
     if (a === "-h" || a === "--help") args.help = true;
@@ -43,12 +48,12 @@ function showHelp() {
 ${c("bold", "cybercode")} ${c("dim", `v${pkg.version}`)} — Codex-dark web UI with a built-in self-evolving agent
 
 ${c("bold", "USAGE")}
-  npx cybercode                                # start with defaults
-  npx cybercode --port 8080                    # custom port
-  npx cybercode --host 0.0.0.0                 # listen on all interfaces
-  npx cybercode --no-browser                   # don't auto-open browser
-  npx cybercode --dir ~/my-agent               # custom working directory
-  npx cybercode --llm 1                        # start on 2nd configured LLM
+  npx cybercode webui                          # start the web UI
+  npx cybercode webui --port 8080              # custom port
+  npx cybercode webui --host 0.0.0.0           # listen on all interfaces
+  npx cybercode webui --no-browser             # don't auto-open browser
+  npx cybercode webui --dir ~/my-agent         # custom working directory
+  npx cybercode webui --llm 1                  # start on 2nd configured LLM
 
 ${c("bold", "OPTIONS")}
   -p, --port <num>     Port (default: auto-find free port near 18600)
@@ -84,9 +89,7 @@ function findPython() {
       if (match) {
         const major = parseInt(match[1], 10);
         const minor = parseInt(match[2], 10);
-        if (major > 3 || (major === 3 && minor >= 11)) {
-          return cmd;
-        }
+        if (major > 3 || (major === 3 && minor >= 11)) return cmd;
       }
     } catch {}
   }
@@ -109,40 +112,30 @@ function findFreePort(preferred) {
   return start;
 }
 
-// ---- Copy directory recursively ----
 function copyDir(src, dest) {
   if (!existsSync(dest)) mkdirSync(dest, { recursive: true });
   for (const entry of readdirSync(src)) {
     const srcPath = join(src, entry);
     const destPath = join(dest, entry);
     const stat = statSync(srcPath);
-    if (stat.isDirectory()) {
-      copyDir(srcPath, destPath);
-    } else {
-      copyFileSync(srcPath, destPath);
-    }
+    if (stat.isDirectory()) copyDir(srcPath, destPath);
+    else copyFileSync(srcPath, destPath);
   }
 }
 
-// ---- Ensure requests is installed ----
 function ensureRequests(python) {
   try {
     const result = spawnSync(python, ["-c", "import requests; print(requests.__version__)"], { encoding: "utf-8", timeout: 5000 });
-    if (result.status === 0 && result.stdout.trim()) {
-      return; // already installed
-    }
+    if (result.status === 0 && result.stdout.trim()) return;
   } catch {}
-
   console.log(c("yellow", "→ installing requests..."));
-  try {
-    spawnSync(python, ["-m", "pip", "install", "requests", "--quiet", "--disable-pip-version-check"], { stdio: "inherit", timeout: 60000 });
-  } catch {
+  const install = spawnSync(python, ["-m", "pip", "install", "requests", "--quiet", "--disable-pip-version-check"], { stdio: "inherit", timeout: 60000 });
+  if (install.status !== 0) {
     console.error(c("red", "✗ Failed to install requests. Please run: pip install requests"));
     process.exit(1);
   }
 }
 
-// ---- Wait for server ----
 function waitForServer(url, maxRetries = 30) {
   return new Promise((resolve, reject) => {
     let retries = 0;
@@ -165,7 +158,6 @@ function waitForServer(url, maxRetries = 30) {
   });
 }
 
-// ---- Open browser ----
 function openBrowser(url) {
   const cmds = {
     darwin: ["open", [url]],
@@ -174,25 +166,18 @@ function openBrowser(url) {
   };
   const plat = platform();
   const entry = cmds[plat] || cmds.linux;
-  try {
-    spawn(entry[0], entry[1], { detached: true, stdio: "ignore" }).unref();
-  } catch {}
+  try { spawn(entry[0], entry[1], { detached: true, stdio: "ignore" }).unref(); } catch {}
 }
 
-// ---- Main ----
-async function main() {
-  const args = parseArgs();
-
+async function launchWebUI(rawArgv) {
+  const args = parseArgs(rawArgv);
   if (args.help) { showHelp(); process.exit(0); }
   if (args.version) { console.log(pkg.version); process.exit(0); }
 
   const python = findPython();
   const workDir = resolve(args.dir || join(homedir(), ".cybercode"));
-
-  // Create working directory
   if (!existsSync(workDir)) mkdirSync(workDir, { recursive: true });
 
-  // Version stamp — re-copy files if package version changed
   const stampPath = join(workDir, ".version");
   const currentVersion = pkg.version;
   let needsCopy = true;
@@ -201,52 +186,36 @@ async function main() {
     if (stamped === currentVersion) needsCopy = false;
   }
 
-  // Copy bundled files
   const bundledPython = join(__dirname, "..", "python");
   const bundledSkills = join(__dirname, "..", "skills");
-
   if (needsCopy) {
     if (existsSync(bundledPython)) copyDir(bundledPython, workDir);
     if (existsSync(bundledSkills)) copyDir(bundledSkills, join(workDir, "skills"));
     writeFileSync(stampPath, currentVersion, "utf-8");
   }
 
-  // Create mykey.json from template if not exists
   const mykeyPath = join(workDir, "mykey.json");
   if (!existsSync(mykeyPath)) {
     const templatePath = join(__dirname, "..", "templates", "mykey_template.json");
-    if (existsSync(templatePath)) {
-      copyFileSync(templatePath, mykeyPath);
-    } else {
-      writeFileSync(mykeyPath, JSON.stringify({
-        llm1: { apikey: "sk-YOUR-KEY", apibase: "https://api.openai.com", model: "gpt-4o", name: "GPT-4o" }
-      }, null, 2));
-    }
+    if (existsSync(templatePath)) copyFileSync(templatePath, mykeyPath);
   }
 
-  // Check if mykey.json has been configured
   let configured = false;
   try {
     const mykey = JSON.parse(readFileSync(mykeyPath, "utf-8"));
-    configured = Object.values(mykey).some(v => v.apikey && !v.apikey.includes("YOUR-"));
+    configured = Object.values(mykey).some(v => v.apikey && !String(v.apikey).includes("YOUR-"));
   } catch {}
 
-  // Ensure requests
   ensureRequests(python);
-
-  // Find port
   const port = args.port || findFreePort(18600);
   const url = `http://${args.host}:${port}`;
 
-  // Banner
   console.log();
   console.log(`  ${c("bold", c("blue", "╭─────────────────────────────────────────────────╮"))}`);
   console.log(`  ${c("bold", c("blue", "│"))}  ${c("bold", "cybercode")} ${c("dim", `v${currentVersion}`)}                              ${c("bold", c("blue", "│"))}`);
   console.log(`  ${c("bold", c("blue", "│"))}  ${c("dim", "working dir:")} ${workDir.padEnd(34).slice(0, 34)} ${c("bold", c("blue", "│"))}`);
   console.log(`  ${c("bold", c("blue", "│"))}  ${c("green", `▶ ${url}`)}${" ".repeat(Math.max(0, 33 - url.length))} ${c("bold", c("blue", "│"))}`);
-  if (!configured) {
-    console.log(`  ${c("bold", c("blue", "│"))}  ${c("yellow", "⚠ edit mykey.json to add your API key")}       ${c("bold", c("blue", "│"))}`);
-  }
+  if (!configured) console.log(`  ${c("bold", c("blue", "│"))}  ${c("yellow", "⚠ edit mykey.json to add your API key")}       ${c("bold", c("blue", "│"))}`);
   console.log(`  ${c("bold", c("blue", "╰─────────────────────────────────────────────────╯"))}`);
   console.log();
 
@@ -254,61 +223,30 @@ async function main() {
     console.log(c("yellow", `  ⚠ mykey.json not configured yet.`));
     console.log(c("dim", `    Edit: ${mykeyPath}`));
     console.log(c("dim", `    Add your OpenAI-compatible API key, then restart.`));
-    console.log(c("dim", `    Or run: nano ${mykeyPath}`));
     console.log(c("dim", `    The UI will still load and show a setup banner.`));
     console.log();
   }
 
-  // Launch Python server
-  const pyArgs = [
-    join(workDir, "webui_codex.py"),
-    "--port", String(port),
-    "--host", args.host,
-    "--llm_no", String(args.llm),
-  ];
-
-  const child = spawn(python, pyArgs, {
-    cwd: workDir,
-    stdio: ["ignore", "pipe", "pipe"],
-    env: { ...process.env, PYTHONUNBUFFERED: "1" },
-  });
-
-  // Pipe server output
+  const pyArgs = [join(workDir, "webui_codex.py"), "--port", String(port), "--host", args.host, "--llm_no", String(args.llm)];
+  const child = spawn(python, pyArgs, { cwd: workDir, stdio: ["ignore", "pipe", "pipe"], env: { ...process.env, PYTHONUNBUFFERED: "1" } });
   child.stdout.on("data", (data) => process.stdout.write(data));
   child.stderr.on("data", (data) => process.stderr.write(c("dim", data.toString())));
+  child.on("error", (err) => { console.error(c("red", `✗ Failed to start: ${err.message}`)); process.exit(1); });
+  child.on("exit", (code) => process.exit(code || 0));
 
-  child.on("error", (err) => {
-    console.error(c("red", `✗ Failed to start: ${err.message}`));
-    process.exit(1);
-  });
-
-  child.on("exit", (code) => {
-    process.exit(code || 0);
-  });
-
-  // Wait for server, then open browser
   if (!args.noBrowser) {
-    try {
-      await waitForServer(`${url}/api/status`, 40);
-      openBrowser(url);
-    } catch {
-      // Server might still be starting; the user can open manually
-      console.log(c("dim", `  (browser auto-open skipped — open ${url} manually)`));
-    }
+    try { await waitForServer(`${url}/api/status`, 40); openBrowser(url); }
+    catch { console.log(c("dim", `  (browser auto-open skipped — open ${url} manually)`)); }
   }
 
-  // Handle Ctrl+C
-  process.on("SIGINT", () => {
-    child.kill("SIGINT");
-    process.exit(0);
-  });
-  process.on("SIGTERM", () => {
-    child.kill("SIGTERM");
-    process.exit(0);
-  });
+  process.on("SIGINT", () => { child.kill("SIGINT"); process.exit(0); });
+  process.on("SIGTERM", () => { child.kill("SIGTERM"); process.exit(0); });
 }
 
-main().catch((err) => {
-  console.error(c("red", `✗ ${err.message}`));
-  process.exit(1);
-});
+const argv = process.argv.slice(2);
+const { command, args } = splitCommand(argv);
+if (command === "webui") {
+  launchWebUI(args).catch((err) => { console.error(c("red", `✗ ${err.message}`)); process.exit(1); });
+} else {
+  showHelp();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cybercode-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Codex-dark web UI with a built-in self-evolving agent + HyperFrames video skills",
   "publishConfig": {
     "access": "public"

package/python/webui_codex.py

@@ -567,7 +567,7 @@ def main():
 
     url = f"http://{args.host}:{args.port}"
     print(f"\n  ╭───────────────────────────────────────────╮")
-    print(f"  │  webui_codex  ·  self-contained agent     │")
+    print(f"  │  cybercode    ·  self-contained agent     │")
     print(f"  │  open  {url:<33}│")
     print(f"  │  Ctrl+C to stop                           │")
     print(f"  ╰───────────────────────────────────────────╯\n")