cicy-code 2.1.47 → 2.1.49

package/bin/cicy-code.js

@@ -1,18 +1,24 @@
 #!/usr/bin/env node
-// Thin launcher: resolves the prebuilt binary that ships in the
-// platform-specific optionalDependency (cicy-code-<os>-<cpu>) and execs it.
-// No network, no postinstall download — npm installs only the sub-package
-// matching the current os/cpu (the others are skipped via their os/cpu
-// fields), so a CN user pulls just their ~30MB slice from npmmirror.
-const { spawn } = require('child_process');
+// Launcher for the npm distribution. Resolves the prebuilt binary that ships
+// in the platform-specific optionalDependency (cicy-code-<os>-<cpu>) and execs
+// it — no network, no postinstall download. ALL binary args/subcommands are
+// passed straight through (skill <...>, --dev, --hot, --helper=1, --agents=…,
+// --public, --cn, etc.), so `npx cicy-code <anything>` == the binary.
+//
+// Only when actually starting the server, it mirrors dev.py's startup: if PORT
+// (default 8008) is held by a *cicy-code* process it kills it and waits, so a
+// stale instance never blocks the new one. A non-cicy occupant is left alone
+// and we abort. Utility invocations (--help/--version, `skill …`) skip the
+// port dance entirely — `npx cicy-code --version` must never touch :8008.
+const { spawn, execSync } = require('child_process');
 const fs = require('fs');
 
-const platformPkg = `cicy-code-${process.platform}-${process.arch}`;
+const args = process.argv.slice(2);
+const PORT = process.env.PORT || '8008';
 
+const platformPkg = `cicy-code-${process.platform}-${process.arch}`;
 let binPath;
 try {
-  // require.resolve finds the binary inside the installed sub-package,
-  // wherever the package manager hoisted it.
   binPath = require.resolve(`${platformPkg}/cicy-code`);
 } catch {
   console.error(`cicy-code: no prebuilt binary for ${process.platform}-${process.arch}.`);
@@ -22,13 +28,88 @@ try {
     ` (in China add --registry=https://registry.npmmirror.com)`);
   process.exit(1);
 }
-
-// npm restores the 0755 mode from the tarball, but chmod defensively in case
-// a mirror or extraction stripped the exec bit.
 try { fs.chmodSync(binPath, 0o755); } catch {}
 
-const child = spawn(binPath, process.argv.slice(2), { stdio: 'inherit', env: process.env });
+// Utility invocations don't start the server, so they must NOT kill :8008.
+const isUtility =
+  args.some((a) => a === '-h' || a === '--help' || a === '-v' || a === '--version') ||
+  args[0] === 'skill';
+
+if (!isUtility) ensurePortFree(PORT);
+
+const child = spawn(binPath, args, {
+  stdio: 'inherit',
+  env: { ...process.env, PORT },
+});
 child.on('exit', (code, signal) => {
   if (signal) process.kill(process.pid, signal);
   else process.exit(code == null ? 0 : code);
 });
+
+// --- dev.py-style port hygiene --------------------------------------------
+
+function ensurePortFree(port) {
+  const existing = pidOnPort(port);
+  if (!existing) return;
+  const cmd = processCommand(existing);
+  if (/cicy-code/.test(cmd)) {
+    console.log(`cicy-code: stopping existing instance on :${port} (pid=${existing})`);
+    if (!killPid(existing) || pidOnPort(port)) {
+      console.error(`cicy-code: port ${port} still in use after kill — aborting`);
+      process.exit(1);
+    }
+  } else {
+    console.error(`cicy-code: port ${port} is held by a non-cicy process (pid=${existing}): ${cmd}`);
+    console.error(`cicy-code: free it or set PORT=<other> — aborting`);
+    process.exit(1);
+  }
+}
+
+function pidOnPort(port) {
+  // lsof first (macOS + Linux), then ss (Linux without lsof).
+  try {
+    const out = execSync(`lsof -ti TCP:${port} -sTCP:LISTEN`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+    if (out) return out.split('\n')[0].trim();
+  } catch {}
+  try {
+    const out = execSync(`ss -tlnp 'sport = :${port}'`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    });
+    const m = out.match(/pid=(\d+)/);
+    if (m) return m[1];
+  } catch {}
+  return null;
+}
+
+function processCommand(pid) {
+  try {
+    return execSync(`ps -p ${pid} -o command=`, {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim();
+  } catch { return ''; }
+}
+
+function isAlive(pid) {
+  try { process.kill(Number(pid), 0); return true; }
+  catch (e) { return e.code === 'EPERM'; }
+}
+
+function waitExit(pid, timeoutMs) {
+  const start = Date.now();
+  while (Date.now() - start < timeoutMs) {
+    if (!isAlive(pid)) return true;
+    try { execSync('sleep 0.2'); } catch {}
+  }
+  return !isAlive(pid);
+}
+
+function killPid(pid) {
+  try { process.kill(Number(pid), 'SIGTERM'); }
+  catch (e) { if (e.code === 'ESRCH') return true; }
+  if (waitExit(pid, 6000)) return true;
+  try { process.kill(Number(pid), 'SIGKILL'); }
+  catch (e) { if (e.code === 'ESRCH') return true; }
+  return waitExit(pid, 2000);
+}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.1.47",
+  "version": "2.1.49",
   "description": "CiCy Code - AI-powered development environment",
   "author": {
     "name": "cicybot",