@meyverick/omnicode 0.0.5 → 0.0.6

package/README.md

@@ -4,7 +4,7 @@ The cross-platform command-line entrypoint for running OpenCode through OmniRout
 
 ## What is omnicode?
 
-`omnicode` is a thin wrapper that launches OpenCode through OmniRoute. It expects you to install the underlying tools yourself, then handles optional GrayMatter and OpenSpec initialization, background OmniRoute lifecycle, and project-local OpenCode sessions. Developed and tested on Ubuntu Linux — cross-platform by design but untested on Windows, macOS, and other Linux distributions.
+`omnicode` is a thin wrapper that launches OpenCode through OmniRoute. It expects you to install the underlying tools yourself, then handles optional GrayMatter and OpenSpec initialization, background OmniRoute lifecycle, and project-local OpenCode sessions. Developed and tested on Ubuntu Linux; cross-platform by design but untested on Windows, macOS, and other Linux distributions.
 
 ## Why
 
@@ -17,7 +17,7 @@ So I wrote this wrapper. It starts OmniRoute, inits GrayMatter and OpenSpec quie
 ## Features
 
 - Thin npm global command written in Node.js (no bash needed).
-- Cross-platform by design — developed and tested on Ubuntu Linux; untested on Windows, macOS, and other Linux distributions.
+- Cross-platform by design: developed and tested on Ubuntu Linux; untested on Windows, macOS, and other Linux distributions.
 - Automatic session resume per project using the OpenCode database.
 - Background OmniRoute lifecycle with cleanup when OpenCode exits.
 - Quiet GrayMatter and OpenSpec initialization with captured logs.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meyverick/omnicode",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Ubuntu command-line entrypoint for OpenCode through OmniRoute",
   "type": "module",
   "bin": {

package/src/bin/omnicode-runtime.js

@@ -1,66 +1,45 @@
-import { spawn, execFileSync } from "node:child_process";
-import { existsSync, mkdirSync, openSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
+import { spawn } from "node:child_process";
+import { closeSync, existsSync, mkdirSync, openSync, readFileSync, writeFileSync, unlinkSync } from "node:fs";
 import { join } from "node:path";
-import os from "node:os";
 
-import { commandExists, getDataDir } from "../installer/lib.js";
+import { commandExists, getDataDir, isProcessRunning, isPidAlive } from "../installer/lib.js";
 
-const isWindows = process.platform === "win32";
 const MAX_OMNI_WAIT = 30;
 const OMNI_CHECK_DELAY = 1000;
 
-function isProcessRunning(name) {
-  try {
-    if (isWindows) {
-      const out = execFileSync("tasklist", ["/FI", `IMAGENAME eq ${name}.exe`, "/NH"], {
-        stdio: ["ignore", "pipe", "ignore"],
-        encoding: "utf8",
-      });
-      return out.includes(`${name}.exe`);
-    }
-    execFileSync("pgrep", ["-x", name], { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-function isPidAlive(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-function initTool(name, args, logPath) {
-  return new Promise((resolve) => {
-    if (!commandExists(name)) {
-      console.log(`[omnicode] ${name}: not installed, skipping`);
-      resolve();
-      return;
-    }
-    console.log(`[omnicode] ${name}: initializing`);
-    const log = openSync(logPath, "w");
+async function initTool(name, args, logPath) {
+  if (!commandExists(name)) {
+    console.log(`[omnicode] ${name}: not installed, skipping`);
+    return;
+  }
+  console.log(`[omnicode] ${name}: initializing`);
+  let log;
+  try {
+    log = openSync(logPath, "w");
     const child = spawn(name, args, { stdio: ["ignore", log, log] });
-    child.on("close", (code) => {
-      if (code === 0) {
-        console.log(`[omnicode] ${name}: ready`);
-      } else {
-        console.log(`[omnicode] WARNING: ${name} init failed; continuing. Log: ${logPath}`);
-      }
-      resolve();
-    });
-    child.on("error", () => {
+    const result = await Promise.race([
+      new Promise((resolve) => {
+        child.on("close", resolve);
+        child.on("error", () => resolve(null));
+      }),
+      new Promise((resolve) => {
+        setTimeout(() => { child.kill(); resolve(null); }, 30000);
+      }),
+    ]);
+    if (result === null) {
+      console.log(`[omnicode] WARNING: ${name} init timed out; continuing. Log: ${logPath}`);
+    } else if (result === 0) {
+      console.log(`[omnicode] ${name}: ready`);
+    } else {
       console.log(`[omnicode] WARNING: ${name} init failed; continuing. Log: ${logPath}`);
-      resolve();
-    });
-  });
+    }
+  } catch {
+    if (log !== undefined) try { closeSync(log); } catch {}
+  }
 }
 
 async function initTools(dataDir) {
@@ -137,9 +116,13 @@ function stopOmnirouteIfIdle(pidFile) {
     } catch {}
     if (pid && isPidAlive(pid)) {
       console.log(`[omnicode] no opencode left -> stopping omniroute (pid: ${pid})`);
-      try { process.kill(pid, "SIGTERM"); } catch {}
-      const deadline = Date.now() + 5000;
-      while (isPidAlive(pid) && Date.now() < deadline) {
+      if (process.platform === "win32") {
+        spawn("taskkill", ["/T", "/F", "/PID", String(pid)], { stdio: "ignore" });
+      } else {
+        try { process.kill(-pid, "SIGTERM"); } catch {}
+      }
+      for (let i = 0; i < 10; i++) {
+        if (!isPidAlive(pid)) break;
         try { process.kill(pid, 0); } catch { break; }
       }
     }
@@ -149,7 +132,7 @@ function stopOmnirouteIfIdle(pidFile) {
 
 export async function runRuntime(mode) {
   const dataDir = getDataDir();
-  mkdirSync(dataDir, { recursive: true });
+  mkdirSync(dataDir, { recursive: true, mode: 0o700 });
 
   const logFile = join(dataDir, "omniroute.log");
   const pidFile = join(dataDir, "omniroute.pid");
@@ -163,12 +146,12 @@ export async function runRuntime(mode) {
   process.on("SIGINT", () => { cleanup(); process.exit(0); });
   process.on("SIGTERM", () => { cleanup(); process.exit(0); });
 
-  await initTools(dataDir);
-
   const pid = startOmniroute(dataDir, logFile, pidFile);
-  if (pid !== null) {
-    await waitForOmniroute(pid, logFile);
-  }
+
+  await Promise.all([
+    pid !== null ? waitForOmniroute(pid, logFile) : Promise.resolve(),
+    initTools(dataDir),
+  ]);
 
   if (mode.flag === "-s" && mode.id) {
     console.log(`[omnicode] launching opencode (session: ${mode.id})`);

package/src/bin/omnicode.js

@@ -1,17 +1,15 @@
 #!/usr/bin/env node
-import { execFileSync } from "node:child_process";
 import { readFileSync, realpathSync } from "node:fs";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
 
-import { commandExists, getOpencodeDbPath } from "../installer/lib.js";
+import { commandExists, getOpencodeDbPath, isProcessRunning } from "../installer/lib.js";
 import { runRuntime } from "./omnicode-runtime.js";
 
 const __dirname = fileURLToPath(new URL(".", import.meta.url));
 const packageJsonPath = join(__dirname, "..", "..", "package.json");
 
-const SESSION_ID_RE = /^[a-zA-Z0-9_-]+$/;
-const isWindows = process.platform === "win32";
+const SESSION_ID_RE = /^(?=.{1,128}$)[a-zA-Z0-9_-]+$/;
 
 let DatabaseSync;
 try {
@@ -33,22 +31,6 @@ export function getVersion() {
   return _cachedVersion;
 }
 
-export function isProcessRunning(name) {
-  try {
-    if (isWindows) {
-      const out = execFileSync("tasklist", ["/FI", `IMAGENAME eq ${name}.exe`, "/NH"], {
-        stdio: ["ignore", "pipe", "ignore"],
-        encoding: "utf8",
-      });
-      return out.includes(`${name}.exe`);
-    }
-    execFileSync("pgrep", ["-x", name], { stdio: "ignore" });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
 export function getProcessStatus() {
   return {
     opencode: isProcessRunning("opencode"),

package/src/installer/lib.js

@@ -15,6 +15,35 @@ export function commandExists(command) {
   }
 }
 
+export function isProcessRunning(name) {
+  try {
+    if (isWindows) {
+      const extensions = [".exe", ".cmd", ".bat"];
+      for (const ext of extensions) {
+        const out = execFileSync("tasklist", ["/FI", `IMAGENAME eq ${name}${ext}`, "/NH"], {
+          stdio: ["ignore", "pipe", "ignore"],
+          encoding: "utf8",
+        });
+        if (out.includes(`${name}${ext}`)) return true;
+      }
+      return false;
+    }
+    execFileSync("pgrep", ["-x", name], { stdio: "ignore" });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 export function getDataDir() {
   return join(os.homedir(), ".local", "share", "omnicode");
 }