ework-aio 0.5.19 → 0.5.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-aio",
-  "version": "0.5.19",
+  "version": "0.5.21",
   "description": "All-in-one installer for ework (issue tracker) + ework-daemon (AI bridge) + opencode-ework (plugin). One command: npm i -g ework-aio && ework-aio install.",
   "type": "module",
   "license": "MIT",

package/src/commands/install.ts

@@ -178,8 +178,9 @@ export async function runInstall(
   // 5. Write (or forward-fill) web .env.
   const ctx: InstallContext = {
     paths,
-    workPort: opts.workPort,
-    daemonPort: opts.daemonPort,
+  workPort: opts.workPort,
+  daemonPort: opts.daemonPort,
+  routerPort: DEFAULTS.routerPort,
     botName: opts.botName,
     operatorLogin,
     opencodeBin,
@@ -463,6 +464,44 @@ export async function runInstall(
     }
   }
 
+  // 12.5 Write router .env + start ework-router (webhook routing layer).
+  const routerEnvResult = await ensureEnvFile({ file: "router", filePath: paths.routerEnvFile, ctx });
+  if (routerEnvResult.created) {
+    logger.ok(`wrote ${paths.routerEnvFile}`);
+  } else if (routerEnvResult.added.length > 0) {
+    logger.ok(`forward-filled ${paths.routerEnvFile}: +${routerEnvResult.added.length} keys`);
+  }
+
+  let routerStarted = false;
+  if (opts.noStart) {
+    logger.warn(`--no-start: skipping ework-router startup`);
+  } else {
+    const routerPid = await readPidFile(paths.routerPidFile);
+    if (routerPid !== null && isProcessRunning(routerPid)) {
+      routerStarted = true;
+      logger.log(`ework-router already running (pid ${routerPid})`);
+    }
+    if (!routerStarted) {
+      const routerBin = resolveBundledBin("ework-router", "bin/ework-router.js");
+      if (routerBin) {
+        logger.log(`starting ework-router (PID-file mode)...`);
+        const env = await loadEnvIntoProcess(paths.routerEnvFile);
+        const { pid } = await startProcess({
+          cmd: "bun",
+          args: [routerBin],
+          cwd: paths.routerDataDir,
+          env,
+          logFile: paths.routerLogFile,
+          pidFile: paths.routerPidFile,
+        });
+        logger.ok(`ework-router started (pid ${pid}, log ${paths.routerLogFile})`);
+        routerStarted = true;
+      } else {
+        logger.warn(`ework-router binary not found — router skipped (install with: npm install -g ework-router)`);
+      }
+    }
+  }
+
   // 13. Register opencode-ework plugin in opencode.json (idempotent).
   const { added: pluginAdded } = await ensurePluginInFile(paths.opencodeConfigFile, PLUGIN_NAME);
   if (pluginAdded) {

package/src/commands/lifecycle.ts

@@ -130,9 +130,10 @@ export async function startFromSp(
     return false;
   }
   const env = await loadEnv(sp.envFile);
+  const useBun = binPath.endsWith(".js");
   const { pid } = await startProcess({
-    cmd: binPath,
-    args: [],
+    cmd: useBun ? "bun" : binPath,
+    args: useBun ? [binPath] : [],
     cwd: sp.dataDir,
     env,
     logFile: sp.logFile,
@@ -240,14 +241,6 @@ export async function runStart(
 ): Promise<void> {
   const paths = resolvePaths({ dataDir: opts.dataDir, scope: opts.scope, useSystemd: false });
   for (const { sp, label } of iterTargets(paths, target)) {
-    if (label === "router") {
-      try {
-        await startFromSp(sp, label, logger);
-      } catch (e) {
-        logger.log(`ework-router skipped (${(e as Error).message})`);
-      }
-      continue;
-    }
     await startFromSp(sp, label, logger);
   }
 }
@@ -271,14 +264,6 @@ export async function runRestart(
   const paths = resolvePaths({ dataDir: opts.dataDir, scope: opts.scope, useSystemd: false });
   for (const { sp, label } of iterTargets(paths, target)) {
     await stopFromSp(sp, label, logger);
-    if (label === "router") {
-      try {
-        await startFromSp(sp, label, logger);
-      } catch (e) {
-        logger.log(`ework-router skipped (${(e as Error).message})`);
-      }
-      continue;
-    }
     await startFromSp(sp, label, logger);
   }
 }

package/src/config.ts

@@ -17,12 +17,13 @@
 import { randomBytes } from "node:crypto";
 import type { PathConfig } from "./paths.ts";
 
-export type EnvFile = "web" | "daemon";
+export type EnvFile = "web" | "daemon" | "router";
 
 export interface InstallContext {
   paths: PathConfig;
   workPort: number;
   daemonPort: number;
+  routerPort: number;
   botName: string;
   operatorLogin: string;
   // opencode binary path (looked up via preflight)
@@ -73,7 +74,7 @@ export const WEB_ENV_KEYS: readonly EnvKeySpec[] = [
   // user can't append → "EACCES: permission denied" on every request.
   { envVar: "WORK_ACCESS_LOG",             file: "web", generate: (c) => `${c.paths.runDir}/web-access.log` },
   { envVar: "WORK_DAEMON_BOT_LOGIN",       file: "web", generate: (c) => c.botName },
-  { envVar: "WORK_DAEMON_WEBHOOK_URL",     file: "web", generate: (c) => `http://127.0.0.1:${c.daemonPort}` },
+  { envVar: "WORK_DAEMON_WEBHOOK_URL",     file: "web", generate: (c) => `http://127.0.0.1:${c.routerPort}` },
   { envVar: "WORK_DAEMON_WEBHOOK_SECRET",  file: "web", secret: true, generate: sharedWebhookSecret },
 ] as const;
 
@@ -94,20 +95,34 @@ export const DAEMON_ENV_KEYS: readonly EnvKeySpec[] = [
   { envVar: "OPENCODE_BASE_WORKDIR",  file: "daemon", generate: (c) => c.paths.opencodeWorkdir },
 ] as const;
 
+export const ROUTER_ENV_KEYS: readonly EnvKeySpec[] = [
+  { envVar: "ROUTER_ENV",           file: "router", generate: () => "production" },
+  { envVar: "ROUTER_PORT",          file: "router", generate: (c) => String(c.routerPort) },
+  { envVar: "ROUTER_HOST",          file: "router", generate: () => "127.0.0.1" },
+  { envVar: "ROUTER_STRATEGY",      file: "router", generate: () => "least-loaded" },
+  { envVar: "WORK_DB_DRIVER",       file: "router", generate: () => "sqlite" },
+  { envVar: "WORK_DB_PATH",         file: "router", generate: (c) => c.paths.webDbPath },
+  { envVar: "WORK_DB_PREFIX",       file: "router", generate: () => "" },
+  { envVar: "DAEMON_TABLE_PREFIX",  file: "router", generate: () => "d_" },
+] as const;
+
 export function keysForFile(file: EnvFile): readonly EnvKeySpec[] {
-  return file === "web" ? WEB_ENV_KEYS : DAEMON_ENV_KEYS;
+  if (file === "web") return WEB_ENV_KEYS;
+  if (file === "router") return ROUTER_ENV_KEYS;
+  return DAEMON_ENV_KEYS;
 }
 
-// Set of env vars that, if missing, would crash ework-web or ework-daemon
-// at startup (Zod schema rejects). Used by env.ts forward-fill to log
-// which keys were injected.
+// Set of env vars that, if missing, would crash ework-web, ework-daemon, or
+// ework-router at startup (Zod schema rejects). Used by env.ts forward-fill.
 export const REQUIRED_KEYS: ReadonlySet<string> = new Set([
   ...WEB_ENV_KEYS.map((k) => k.envVar),
   ...DAEMON_ENV_KEYS.map((k) => k.envVar),
+  ...ROUTER_ENV_KEYS.map((k) => k.envVar),
 ]);
 
 // Keys whose value should be redacted in `config list` output.
 export const SECRET_ENV_VARS: ReadonlySet<string> = new Set([
   ...WEB_ENV_KEYS.filter((k) => k.secret).map((k) => k.envVar),
   ...DAEMON_ENV_KEYS.filter((k) => k.secret).map((k) => k.envVar),
+  ...ROUTER_ENV_KEYS.filter((k) => k.secret).map((k) => k.envVar),
 ]);

package/src/types.ts

@@ -31,6 +31,7 @@ export interface GlobalOptions {
 export const DEFAULTS = {
   workPort: 3002,
   daemonPort: 3101,
+  routerPort: 3104,
   botName: "ework-daemon",
   scope: "user" as Scope,
 } as const;