ework-aio 0.2.10 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ework-aio",
-  "version": "0.2.10",
+  "version": "0.3.0",
   "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",
@@ -46,7 +46,7 @@
     "postinstall": "echo '\\n  ework-aio installed. Run \\033[1mework-aio install\\033[0m to set up services.\\n  Help: ework-aio --help\\n'"
   },
   "dependencies": {
-    "ework-web": "^0.1.0",
+    "ework-web": "^0.3.0",
     "ework-daemon": "^0.1.0",
     "opencode-ework": "^0.1.0",
     "zod": "^3.23.0"

package/scripts/e2e-browser.sh

@@ -132,7 +132,7 @@ pass "both services responding"
 
 info "configure opencode to use fake LLM"
 # Overwrite ~/.config/opencode/opencode.json with fake provider + plugin.
-# install.ts only registers the plugin; we add the fake provider here so
+# install.ts only registers opencode-ework; we add the fake provider here so
 # the test stays isolated from any real API credentials.
 OPENCODE_CONFIG_DIR="$HOME/.config/opencode"
 mkdir -p "$OPENCODE_CONFIG_DIR"
@@ -150,6 +150,9 @@ cat > "$OPENCODE_CONFIG_DIR/opencode.json" <<OCJSON
       "models": {
         "fake-model": {
           "name": "Fake Model"
+        },
+        "e2e-daemon-override": {
+          "name": "E2E Daemon Override"
         }
       }
     }
@@ -198,6 +201,28 @@ COOKIE_SIG=$(printf '%s' "$WORK_TOKEN" \
   | base64 | tr '+/' '-_' | tr -d '=')
 AUTH_COOKIE="ework_auth=${WORK_TOKEN}.${COOKIE_SIG}"
 
+info "configure global defaultModel via /settings (model config E2E)"
+# Set defaultModel to a UNIQUE model name (different from the smoke test's
+# fake/fake-model) so we can distinguish daemon-driven spawn from smoke test.
+# If ework-daemon honors the new --model flag, fake-llm will see
+# `model=e2e-daemon-override` in the request body. If it doesn't, fake-llm
+# keeps seeing `model=fake-model` (opencode falls back to opencode.json).
+E2E_MODEL_ID="fake/e2e-daemon-override"
+SETTINGS_RESP=$(curl -sS -o /dev/null -w '%{http_code}' -X POST \
+  "http://127.0.0.1:$WORK_PORT/settings" \
+  -H "Cookie: $AUTH_COOKIE" \
+  --data-urlencode "defaultModel=$E2E_MODEL_ID")
+[[ "$SETTINGS_RESP" == "303" ]] \
+  || fail "POST /settings defaultModel=$E2E_MODEL_ID failed (status=$SETTINGS_RESP)"
+pass "global defaultModel configured: $E2E_MODEL_ID"
+# Pre-populate the model_cache so the settings UI's select shows our entry
+# (also exercises the refresh endpoint added in ework-web 0.2.0).
+curl -sS -o /dev/null -X POST \
+  "http://127.0.0.1:$WORK_PORT/settings/models/refresh" \
+  -H "Cookie: $AUTH_COOKIE" || true
+# Mark timestamp so we can scope fake-llm log analysis to AFTER this point.
+E2E_MODEL_CONFIG_TS=$(date +%s)
+
 # Create project (idempotent — if it exists, 303 is still returned).
 curl -sS -o /dev/null -w 'project: %{http_code}\n' -X POST \
   "http://127.0.0.1:$WORK_PORT/projects" \
@@ -273,6 +298,24 @@ for i in $(seq 1 30); do
   [[ $i -eq 30 ]] && fail "session never got assistant reply (msgs=$MSG_COUNT)";
 done
 
+info "verify daemon honored --model override from ework-web defaultModel"
+# fake-llm logs `model=<X>` for each /v1/chat/completions request. The smoke
+# test ran with fake/fake-model. The daemon-driven spawn (after we set
+# defaultModel=fake/e2e-daemon-override in /settings) MUST show
+# model=e2e-daemon-override in subsequent requests. If we still see only
+# model=fake-model → daemon didn't pass --model through (regression).
+if grep -q "model=e2e-daemon-override" /tmp/fake-llm.log; then
+  pass "daemon spawn honored ework-web defaultModel (fake-llm saw model=e2e-daemon-override)"
+else
+  echo "  --- fake-llm log (model= lines only) ---"
+  grep -E 'model=' /tmp/fake-llm.log | tail -10 || echo "(no model= entries)"
+  echo "  --- daemon.log (last 30) ---"
+  tail -30 "$DATA_DIR/run/daemon.log" 2>/dev/null || echo "(no daemon.log)"
+  echo "  --- ework-web + ework-daemon installed versions ---"
+  npm ls -g ework-web ework-daemon 2>&1 | grep -E 'ework-' | head -5
+  fail "daemon did NOT pass --model through (fake-llm never saw model=e2e-daemon-override)"
+fi
+
 info "verify session is browsable via awork-web"
 # awork-web's OpencodeClient reads opencode.db and calls `opencode export`.
 # Hit the /sessions list and the specific session page. Both require the
@@ -293,6 +336,20 @@ if ! echo "$SESSIONS_HTML" | grep -q "$SESSION_ID"; then
 fi
 pass "/sessions lists the new session"
 
+# Diagnostic: capture raw `opencode export <id>` stdout to see whether plugins
+# emit banners into the JSON stream in this test environment. Production hit a
+# bug where ework-web's JSON.parse choked on these preamble lines; if they
+# appear here, the test must catch the failure rather than silently passing.
+EXPORT_RAW=$(opencode export "$SESSION_ID" 2>/dev/null </dev/null || true)
+EXPORT_LINE_COUNT=$(printf '%s\n' "$EXPORT_RAW" | wc -l)
+JSON_START_LINE=$(printf '%s\n' "$EXPORT_RAW" | grep -nE '^\s*[{]' | head -1 | cut -d: -f1 || echo 0)
+echo "  opencode export raw stdout: $EXPORT_LINE_COUNT lines, JSON object opens at line $JSON_START_LINE"
+if [[ "$EXPORT_LINE_COUNT" -gt 1 && "$JSON_START_LINE" -gt 1 ]]; then
+  echo "  --- first 5 lines (non-JSON preamble) ---"
+  printf '%s\n' "$EXPORT_RAW" | head -5 | sed 's/^/    /'
+  echo "  WARNING: stdout has non-JSON preamble — ework-web's old JSON.parse would fail here"
+fi
+
 SESSION_PAGE_HTML=$(curl -sS -H "Cookie: $AUTH_COOKIE" "http://127.0.0.1:$WORK_PORT/sessions/$SESSION_ID")
 # Look for any marker that the fake LLM reply rendered. The reply body always
 # starts with "E2E fake-LLM reply" so we grep for that substring.

package/scripts/e2e-install.sh

@@ -54,6 +54,39 @@ DAEMON_PORT="14101"
 # readonly so the container preflight sees it on PATH. Override via env.
 OPENCODE_HOST_BIN="${OPENCODE_HOST_BIN:-/home/dog/.local/bin/opencode}"
 
+# Optional MySQL backend: E2E_DB=mysql starts a throwaway MySQL 8.0 sidecar
+# reachable via the host network and passes WORK_DB_* through to ework-web.
+# Default sqlite (no sidecar). Needs a published ework-web with MySQL support.
+E2E_DB="${E2E_DB:-sqlite}"
+MYSQL_FLAGS=()
+MYSQL_CONTAINER=""
+cleanup_mysql() { [[ -n "$MYSQL_CONTAINER" ]] && docker rm -f "$MYSQL_CONTAINER" >/dev/null 2>&1 || true; }
+trap cleanup_mysql EXIT
+if [[ "$E2E_DB" == "mysql" ]]; then
+  MYSQL_PORT="${E2E_MYSQL_PORT:-3312}"
+  MYSQL_CONTAINER="ework-e2e-mysql-$$"
+  info "E2E_DB=mysql: starting MySQL 8.0 sidecar (container $MYSQL_CONTAINER, host port $MYSQL_PORT)"
+  docker run -d --rm --name "$MYSQL_CONTAINER" -p "$MYSQL_PORT:3306" \
+    -e MYSQL_ROOT_PASSWORD=testpw -e MYSQL_DATABASE=ework_e2e mysql:8.0 >/dev/null
+  info "waiting for MySQL readiness (TCP+query gate, up to 60s)"
+  ready=0
+  for _ in $(seq 1 60); do
+    if docker exec "$MYSQL_CONTAINER" mysql -h 127.0.0.1 -ptestpw -e "SELECT 1" --silent 2>/dev/null; then
+      ready=1; break
+    fi
+    sleep 1
+  done
+  [[ "$ready" -eq 1 ]] || fail "MySQL sidecar did not become ready in 60s"
+  MYSQL_FLAGS=(
+    -e WORK_DB_DRIVER=mysql
+    -e WORK_DB_HOST=127.0.0.1
+    -e WORK_DB_PORT="$MYSQL_PORT"
+    -e WORK_DB_USER=root
+    -e WORK_DB_PASSWORD=testpw
+    -e WORK_DB_NAME=ework_e2e
+  )
+fi
+
 "$RUNTIME" run --rm -i --network host \
   -v "$OPENCODE_HOST_BIN:/usr/local/bin/opencode:ro" \
   -e WORK_PORT="$WORK_PORT" \
@@ -64,6 +97,7 @@ OPENCODE_HOST_BIN="${OPENCODE_HOST_BIN:-/home/dog/.local/bin/opencode}"
   -e http_proxy="${HTTP_PROXY:-}" \
   -e https_proxy="${HTTPS_PROXY:-}" \
   -e NO_PROXY="127.0.0.1,localhost" \
+  "${MYSQL_FLAGS[@]}" \
   "$IMAGE" bash -euo pipefail <<'EOSCRIPT'
 set -euo pipefail
 

package/src/commands/install.ts

@@ -24,7 +24,7 @@ import { resolvePaths, type PathConfig } from "../paths.ts";
 import { type InstallContext } from "../config.ts";
 import { ensureEnvFile, parseEnvFile, patchEnvKey } from "../env.ts";
 import { startProcess, isProcessRunning, readPidFile } from "../pidfile.ts";
-import { checkPreflight, resolveCommand, REQUIRED_COMMANDS } from "../preflight.ts";
+import { checkPreflight, resolveCommand, resolveBundledBin, REQUIRED_COMMANDS } from "../preflight.ts";
 import {
   generateUnitFile,
   writeUnitFile,
@@ -96,31 +96,45 @@ export async function runInstall(
   const opencodeBin = preflight.found.get("opencode")!;
   logger.ok(`preflight: bun, npm, opencode all on PATH`);
 
-  // 2. Resolve ework-web / ework-daemon binaries (npm-installed global bins).
+  // 2. Resolve ework-web / ework-daemon binaries.
   //
   // ework-daemon ships TWO bins: `ework-daemon` (client CLI: status/issues/...)
   // and `ework-daemon-server` (actual HTTP server). We start the SERVER, not
   // the client — pre-v0.2.5 we spawned the client, which prints help and
   // exits, leaving the daemon "looking dead" with a help-text log.
-  const webBin = resolveCommand("ework-web");
-  const daemonClientBin = resolveCommand("ework-daemon");
-  const daemonServerBin = resolveCommand("ework-daemon-server");
+  //
+  // B-1: ework-web / ework-daemon are declared dependencies of ework-aio, so
+  // they are always bundled in our own node_modules. Resolve from there first
+  // (self-contained), falling back to PATH for dev/standalone installs.
+  // Relying on PATH alone broke after uninstall+reinstall: npm does not
+  // reliably recreate global bin symlinks for reinstalled deps even though
+  // the package is present in node_modules — so install wrongly demanded
+  // "install ework-web first" for a package that is ework-aio's own job to
+  // provide.
+  const webBin = resolveBundledBin("ework-web", "bin/ework-web.js")
+    ?? resolveCommand("ework-web");
+  const daemonClientBin = resolveBundledBin("ework-daemon", "src/cli.ts")
+    ?? resolveCommand("ework-daemon");
+  const daemonServerBin = resolveBundledBin("ework-daemon", "bin/ework-daemon-server.js")
+    ?? resolveCommand("ework-daemon-server");
   if (!webBin) {
     throw new InstallError(
-      `ework-web binary not found on PATH. Install with: npm install -g ework-web`,
+      `ework-web not found. It ships as part of ework-aio; your ework-aio install is incomplete. ` +
+      `Reinstall with: npm install -g ework-aio@latest`,
     );
   }
   if (!daemonClientBin && !daemonServerBin) {
     throw new InstallError(
-      `ework-daemon not installed. Install with: npm install -g ework-daemon`,
+      `ework-daemon not found. It ships as part of ework-aio; your ework-aio install is incomplete. ` +
+      `Reinstall with: npm install -g ework-aio@latest`,
     );
   }
   if (!daemonServerBin) {
     // Client CLI present but server bin missing — old / partial install.
     throw new InstallError(
-      `ework-daemon-server binary not found on PATH, but ework-daemon (client) is present. ` +
-        `Your ework-daemon npm install is incomplete or outdated. Reinstall with: ` +
-        `npm install -g ework-daemon@latest`,
+      `ework-daemon-server binary not found, but ework-daemon (client) is present. ` +
+        `Your ework-aio install is incomplete or outdated. Reinstall with: ` +
+        `npm install -g ework-aio@latest`,
     );
   }
   logger.ok(`web bin         : ${webBin}`);

package/src/preflight.ts

@@ -1,4 +1,13 @@
 import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+
+// Root of the ework-aio package itself. Derived from this file's location
+// (<root>/src/preflight.ts). Used to resolve bins that ework-aio ships as
+// declared dependencies (ework-web, ework-daemon) from our own node_modules,
+// so install does not depend on npm having created a global bin symlink.
+// Overridable via AIO_PACKAGE_ROOT (for tests / non-standard install prefix).
+const DEFAULT_PACKAGE_ROOT = path.join(import.meta.dir, "..");
 
 export interface PreflightResult {
   missing: string[];
@@ -23,6 +32,19 @@ export function resolveCommand(cmd: string): string | null {
   return path === "" ? null : path;
 }
 
+// Resolve a bin that ework-aio ships as a declared dependency, from our own
+// node_modules. ework-web / ework-daemon are listed as deps in package.json,
+// so they are always bundled. We must use them instead of requiring a global
+// PATH bin: npm does not reliably recreate global bin symlinks after
+// uninstall+reinstall, which previously made `ework-aio install` wrongly tell
+// 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 {
+  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;
+}
+
 export function checkPreflight(
   required: string[],
   opts: PreflightOptions = {},