ework-aio 0.5.8 → 0.5.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-aio",
-  "version": "0.5.8",
+  "version": "0.5.10",
   "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",
@@ -47,6 +47,7 @@
   },
   "dependencies": {
     "ework-daemon": "^0.4.1",
+    "ework-router": "^0.1.0",
     "ework-web": "^0.10.1",
     "opencode-ework": "^0.1.0",
     "zod": "^3.23.0"

package/src/cli.ts

@@ -62,12 +62,12 @@ Commands:
     config get <KEY>              Print current value of one key
     config set <KEY> <VALUE>      Set a key, then restart affected service
                                   (unless --no-restart is given)
-    config restart <web|daemon|both>
-                                  Restart one or both services
+    config restart <web|daemon|router|both>
+                                  Restart one or all services
 
-  start [web|daemon|both]         Start services in PID-file mode (default both)
-  stop [web|daemon|both]          Stop services (SIGTERM, 5s grace, then SIGKILL)
-  restart [web|daemon|both]       Stop + start
+  start [web|daemon|router|both]  Start services in PID-file mode (default both)
+  stop [web|daemon|router|both]   Stop services (SIGTERM, 5s grace, then SIGKILL)
+  restart [web|daemon|router|both] Stop + start
   add-daemon [port]               Start an additional daemon instance
   ps                              Show PID-file mode status (alias for 'status')
 
@@ -306,9 +306,9 @@ export function parseArgs(argv: string[]): ParsedArgs {
 
 function parseServiceTarget(arg: string | undefined): ServiceTarget {
   if (arg === undefined || arg === "") return "both";
-  if (arg === "web" || arg === "daemon" || arg === "both") return arg;
+  if (arg === "web" || arg === "daemon" || arg === "router" || arg === "both") return arg;
   throw new InstallError(
-    `Invalid service target '${arg}'. Expected: web | daemon | both`,
+    `Invalid service target '${arg}'. Expected: web | daemon | router | both`,
   );
 }
 

package/src/commands/lifecycle.ts

@@ -36,7 +36,7 @@ export interface ServicePaths {
   portKey: string | null;
 }
 
-function servicePaths(paths: PathConfig, svc: "web" | "daemon"): ServicePaths {
+function servicePaths(paths: PathConfig, svc: "web" | "daemon" | "router"): ServicePaths {
   if (svc === "web") {
     return {
       bin: "ework-web",
@@ -49,6 +49,18 @@ function servicePaths(paths: PathConfig, svc: "web" | "daemon"): ServicePaths {
       portKey: "WORK_PORT",
     };
   }
+  if (svc === "router") {
+    return {
+      bin: "ework-router",
+      pkg: "ework-router",
+      binRelPath: "bin/ework-router.js",
+      dataDir: paths.routerDataDir,
+      envFile: paths.routerEnvFile,
+      pidFile: paths.routerPidFile,
+      logFile: paths.routerLogFile,
+      portKey: "ROUTER_PORT",
+    };
+  }
   return {
     bin: "ework-daemon-server",
     pkg: "ework-daemon",
@@ -95,7 +107,7 @@ async function readLogTail(logFile: string, maxLines: number): Promise<string |
 }
 
 async function startOne(
-  svc: "web" | "daemon",
+  svc: "web" | "daemon" | "router",
   paths: PathConfig,
   logger: Logger,
 ): Promise<boolean> {
@@ -140,7 +152,7 @@ export async function startFromSp(
   return true;
 }
 
-async function stopOne(svc: "web" | "daemon", paths: PathConfig, logger: Logger): Promise<boolean> {
+async function stopOne(svc: "web" | "daemon" | "router", paths: PathConfig, logger: Logger): Promise<boolean> {
   const sp = servicePaths(paths, svc);
   return stopFromSp(sp, svc, logger);
 }
@@ -194,8 +206,9 @@ function iterDaemonInstances(
   }));
 }
 
-function targets(target: ServiceTarget): Array<"web" | "daemon"> {
-  return target === "both" ? ["web", "daemon"] : [target];
+function targets(target: ServiceTarget): Array<"web" | "daemon" | "router"> {
+  if (target === "both") return ["web", "daemon", "router"];
+  return [target];
 }
 
 function iterTargets(
@@ -206,6 +219,8 @@ function iterTargets(
   for (const svc of targets(target)) {
     if (svc === "web") {
       out.push({ sp: servicePaths(paths, "web"), label: "web" });
+    } else if (svc === "router") {
+      out.push({ sp: servicePaths(paths, "router"), label: "router" });
     } else {
       const insts = iterDaemonInstances(paths);
       if (insts.length === 0) {
@@ -269,6 +284,7 @@ export async function runStatus(opts: GlobalOptions, logger: Logger): Promise<St
 
   const probeTargets: Array<{ sp: ServicePaths; label: string }> = [
     { sp: servicePaths(paths, "web"), label: "web" },
+    { sp: servicePaths(paths, "router"), label: "router" },
   ];
   const daemonInsts = iterDaemonInstances(paths);
   if (daemonInsts.length === 0) {

package/src/commands/upgrade.ts

@@ -6,7 +6,7 @@ import type { GlobalOptions } from "../types.ts";
 function readInstalledVersion(): string {
   try {
     const pkg = JSON.parse(
-      readFileSync(new URL("../package.json", import.meta.url), "utf8")
+      readFileSync(new URL("../../package.json", import.meta.url), "utf8")
     );
     return pkg.version ?? "unknown";
   } catch {

package/src/config.ts

@@ -81,6 +81,7 @@ export const DAEMON_ENV_KEYS: readonly EnvKeySpec[] = [
   { envVar: "DAEMON_ENV",             file: "daemon", generate: () => "production" },
   { envVar: "DAEMON_PORT",            file: "daemon", generate: (c) => String(c.daemonPort) },
   { envVar: "DAEMON_HOST",            file: "daemon", generate: () => "127.0.0.1" },
+  { envVar: "DAEMON_ENDPOINT",        file: "daemon", generate: (c) => `127.0.0.1:${c.daemonPort}` },
   { envVar: "DAEMON_DB_PATH",         file: "daemon", generate: (c) => c.paths.daemonDbPath },
   { envVar: "GITEA_URL",              file: "daemon", generate: (c) => `http://127.0.0.1:${c.workPort}` },
   // These tokens come from the bot bootstrap flow — empty placeholder here,

package/src/paths.ts

@@ -24,8 +24,10 @@ export interface PathConfig {
   dataDir: string;
   webDataDir: string;
   daemonDataDir: string;
+  routerDataDir: string;
   webEnvFile: string;
   daemonEnvFile: string;
+  routerEnvFile: string;
   runDir: string;
   botTokenFile: string;
   opencodeWorkdir: string;
@@ -35,10 +37,13 @@ export interface PathConfig {
   webAttachmentRoot: string;
   webPidFile: string;
   daemonPidFile: string;
+  routerPidFile: string;
   webLogFile: string;
   daemonLogFile: string;
-  webUnitFile: string | null;    // null when not using systemd
+  routerLogFile: string;
+  webUnitFile: string | null;
   daemonUnitFile: string | null;
+  routerUnitFile: string | null;
 }
 
 export interface ResolvePathsOptions {
@@ -63,6 +68,7 @@ export function resolvePaths(opts: ResolvePathsOptions): PathConfig {
   const dataDir = opts.dataDir || path.join(xdgDataHome, "ework-aio");
   const webDataDir = path.join(dataDir, "ework-web");
   const daemonDataDir = path.join(dataDir, "ework-daemon");
+  const routerDataDir = path.join(dataDir, "ework-router");
   const runDir = path.join(dataDir, "run");
 
   // Unit file location depends on scope and whether systemd is opted-in
@@ -77,8 +83,10 @@ export function resolvePaths(opts: ResolvePathsOptions): PathConfig {
     dataDir,
     webDataDir,
     daemonDataDir,
+    routerDataDir,
     webEnvFile: path.join(webDataDir, ".env"),
     daemonEnvFile: path.join(daemonDataDir, ".env"),
+    routerEnvFile: path.join(routerDataDir, ".env"),
     runDir,
     botTokenFile: path.join(dataDir, "bot-token"),
     opencodeWorkdir: path.join(dataDir, "opencode-workdir"),
@@ -88,10 +96,13 @@ export function resolvePaths(opts: ResolvePathsOptions): PathConfig {
     webAttachmentRoot: path.join(webDataDir, "attachments"),
     webPidFile: path.join(runDir, "web.pid"),
     daemonPidFile: path.join(runDir, "daemon.pid"),
+    routerPidFile: path.join(runDir, "router.pid"),
     webLogFile: path.join(runDir, "web.log"),
     daemonLogFile: path.join(runDir, "daemon.log"),
+    routerLogFile: path.join(runDir, "router.log"),
     webUnitFile: unitDir ? path.join(unitDir, "ework-web.service") : null,
     daemonUnitFile: unitDir ? path.join(unitDir, "ework-daemon.service") : null,
+    routerUnitFile: unitDir ? path.join(unitDir, "ework-router.service") : null,
   };
 }
 

package/src/preflight.ts

@@ -41,7 +41,15 @@ export function resolveCommand(cmd: string): string | null {
 // the user to "install ework-web first" even though it was already bundled
 // (B-1). Returns the absolute bin path, or null if not bundled.
 export function resolveBundledBin(pkgName: string, binRelPath: string): string | null {
-  if (isDevRepo()) return null;
+  if (isDevRepo()) {
+    const r = spawnSync("npm", ["root", "-g"], { encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], env: process.env });
+    const npmRoot = (r.stdout ?? "").trim();
+    if (npmRoot) {
+      const candidate = path.join(npmRoot, "ework-aio", "node_modules", pkgName, binRelPath);
+      if (fs.existsSync(candidate)) return candidate;
+    }
+    return null;
+  }
   const root = process.env.AIO_PACKAGE_ROOT || DEFAULT_PACKAGE_ROOT;
   const candidate = path.join(root, "node_modules", pkgName, binRelPath);
   return fs.existsSync(candidate) ? candidate : null;

package/src/types.ts

@@ -10,7 +10,7 @@ export type Scope = "user" | "system";
 
 // Which service(s) a command targets. `ps` and `status` use "both";
 // `start web`/`stop daemon` use a single target.
-export type ServiceTarget = "web" | "daemon" | "both";
+export type ServiceTarget = "web" | "daemon" | "router" | "both";
 
 export interface GlobalOptions {
   // Install-time knobs (defaults live in src/types.ts DEFAULTS).