diff --git a/package-lock.json b/package-lock.json
index 53a0f2a..3698cef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,15 +28,18 @@
         "@types/node": "^20.19.35",
         "@types/react": "^18.3.28",
         "@types/react-dom": "^18.3.7",
+        "@types/supertest": "^7.2.0",
         "@types/uuid": "^9.0.8",
         "@vitejs/plugin-react": "^4.7.0",
         "concurrently": "^8.2.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "socket.io-client": "^4.8.3",
+        "supertest": "^7.2.2",
         "tsx": "^4.21.0",
         "typescript": "^5.9.3",
-        "vite": "^5.4.21"
+        "vite": "^5.4.21",
+        "vitest": "^4.1.2"
       }
     },
     "node_modules/@anthropic-ai/sdk": {
@@ -350,6 +353,43 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@emnapi/core": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.9.1.tgz",
+      "integrity": "sha512-mukuNALVsoix/w1BJwFzwXBN/dHeejQtuVzcDsfOEsdpCumXb/E9j8w11h5S54tT1xhifGfbbSm/ICrObRb3KA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@emnapi/wasi-threads": "1.2.0",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/runtime": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.9.1.tgz",
+      "integrity": "sha512-VYi5+ZVLhpgK4hQ0TAjiQiZ6ol0oe4mBx7mVv7IflsiEp0OWoVsp/+f9Vc1hOhE0TtkORVrI1GvzyreqpgWtkA==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@emnapi/wasi-threads": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.0.tgz",
+      "integrity": "sha512-N10dEJNSsUx41Z6pZsXU8FjPjpBEplgH24sfkmITrBED1/U2Esum9F3lfLrMjKHHjmi557zQn7kR9R+XWXu5Rg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.27.3",
       "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz",
@@ -1156,6 +1196,331 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/@napi-rs/wasm-runtime": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.2.tgz",
+      "integrity": "sha512-sNXv5oLJ7ob93xkZ1XnxisYhGYXfaG9f65/ZgYuAu3qt7b3NadcOEhLvx28hv31PgX8SZJRYrAIPQilQmFpLVw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@tybys/wasm-util": "^0.10.1"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/Brooooooklyn"
+      },
+      "peerDependencies": {
+        "@emnapi/core": "^1.7.1",
+        "@emnapi/runtime": "^1.7.1"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@oxc-project/types": {
+      "version": "0.122.0",
+      "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.122.0.tgz",
+      "integrity": "sha512-oLAl5kBpV4w69UtFZ9xqcmTi+GENWOcPF7FCrczTiBbmC0ibXxCwyvZGbO39rCVEuLGAZM84DH0pUIyyv/YJzA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/Boshen"
+      }
+    },
+    "node_modules/@paralleldrive/cuid2": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz",
+      "integrity": "sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "^1.1.5"
+      }
+    },
+    "node_modules/@rolldown/binding-android-arm64": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.0-rc.12.tgz",
+      "integrity": "sha512-pv1y2Fv0JybcykuiiD3qBOBdz6RteYojRFY1d+b95WVuzx211CRh+ytI/+9iVyWQ6koTh5dawe4S/yRfOFjgaA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-darwin-arm64": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.0-rc.12.tgz",
+      "integrity": "sha512-cFYr6zTG/3PXXF3pUO+umXxt1wkRK/0AYT8lDwuqvRC+LuKYWSAQAQZjCWDQpAH172ZV6ieYrNnFzVVcnSflAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-darwin-x64": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.0-rc.12.tgz",
+      "integrity": "sha512-ZCsYknnHzeXYps0lGBz8JrF37GpE9bFVefrlmDrAQhOEi4IOIlcoU1+FwHEtyXGx2VkYAvhu7dyBf75EJQffBw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-freebsd-x64": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.0-rc.12.tgz",
+      "integrity": "sha512-dMLeprcVsyJsKolRXyoTH3NL6qtsT0Y2xeuEA8WQJquWFXkEC4bcu1rLZZSnZRMtAqwtrF/Ib9Ddtpa/Gkge9Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm-gnueabihf": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.0-rc.12.tgz",
+      "integrity": "sha512-YqWjAgGC/9M1lz3GR1r1rP79nMgo3mQiiA+Hfo+pvKFK1fAJ1bCi0ZQVh8noOqNacuY1qIcfyVfP6HoyBRZ85Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm64-gnu": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.0-rc.12.tgz",
+      "integrity": "sha512-/I5AS4cIroLpslsmzXfwbe5OmWvSsrFuEw3mwvbQ1kDxJ822hFHIx+vsN/TAzNVyepI/j/GSzrtCIwQPeKCLIg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-arm64-musl": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.0-rc.12.tgz",
+      "integrity": "sha512-V6/wZztnBqlx5hJQqNWwFdxIKN0m38p8Jas+VoSfgH54HSj9tKTt1dZvG6JRHcjh6D7TvrJPWFGaY9UBVOaWPw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-ppc64-gnu": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.0-rc.12.tgz",
+      "integrity": "sha512-AP3E9BpcUYliZCxa3w5Kwj9OtEVDYK6sVoUzy4vTOJsjPOgdaJZKFmN4oOlX0Wp0RPV2ETfmIra9x1xuayFB7g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-s390x-gnu": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.0-rc.12.tgz",
+      "integrity": "sha512-nWwpvUSPkoFmZo0kQazZYOrT7J5DGOJ/+QHHzjvNlooDZED8oH82Yg67HvehPPLAg5fUff7TfWFHQS8IV1n3og==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-x64-gnu": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.0-rc.12.tgz",
+      "integrity": "sha512-RNrafz5bcwRy+O9e6P8Z/OCAJW/A+qtBczIqVYwTs14pf4iV1/+eKEjdOUta93q2TsT/FI0XYDP3TCky38LMAg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-linux-x64-musl": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.0-rc.12.tgz",
+      "integrity": "sha512-Jpw/0iwoKWx3LJ2rc1yjFrj+T7iHZn2JDg1Yny1ma0luviFS4mhAIcd1LFNxK3EYu3DHWCps0ydXQ5i/rrJ2ig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-openharmony-arm64": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.0-rc.12.tgz",
+      "integrity": "sha512-vRugONE4yMfVn0+7lUKdKvN4D5YusEiPilaoO2sgUWpCvrncvWgPMzK00ZFFJuiPgLwgFNP5eSiUlv2tfc+lpA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-wasm32-wasi": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.0-rc.12.tgz",
+      "integrity": "sha512-ykGiLr/6kkiHc0XnBfmFJuCjr5ZYKKofkx+chJWDjitX+KsJuAmrzWhwyOMSHzPhzOHOy7u9HlFoa5MoAOJ/Zg==",
+      "cpu": [
+        "wasm32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "@napi-rs/wasm-runtime": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
+    "node_modules/@rolldown/binding-win32-arm64-msvc": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.0-rc.12.tgz",
+      "integrity": "sha512-5eOND4duWkwx1AzCxadcOrNeighiLwMInEADT0YM7xeEOOFcovWZCq8dadXgcRHSf3Ulh1kFo/qvzoFiCLOL1Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
+    "node_modules/@rolldown/binding-win32-x64-msvc": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.0-rc.12.tgz",
+      "integrity": "sha512-PyqoipaswDLAZtot351MLhrlrh6lcZPo2LSYE+VDxbVk24LVKAGOuE4hb8xZQmrPAuEtTZW8E6D2zc5EUZX4Lw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      }
+    },
     "node_modules/@rolldown/pluginutils": {
       "version": "1.0.0-beta.27",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
@@ -1519,6 +1884,24 @@
       "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
       "license": "MIT"
     },
+    "node_modules/@standard-schema/spec": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz",
+      "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@tybys/wasm-util": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+      "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "tslib": "^2.4.0"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.20.5",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
@@ -1574,6 +1957,17 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/chai": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz",
+      "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/deep-eql": "*",
+        "assertion-error": "^2.0.1"
+      }
+    },
     "node_modules/@types/compression": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@types/compression/-/compression-1.8.1.tgz",
@@ -1593,6 +1987,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/cookiejar": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
+      "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/cors": {
       "version": "2.8.19",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
@@ -1602,6 +2003,13 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/deep-eql": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz",
+      "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
@@ -1639,6 +2047,13 @@
       "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==",
       "license": "MIT"
     },
+    "node_modules/@types/methods": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@types/methods/-/methods-1.1.4.tgz",
+      "integrity": "sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/mime": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
@@ -1724,6 +2139,30 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@types/superagent": {
+      "version": "8.1.9",
+      "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-8.1.9.tgz",
+      "integrity": "sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/cookiejar": "^2.1.5",
+        "@types/methods": "^1.1.4",
+        "@types/node": "*",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/@types/supertest": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-7.2.0.tgz",
+      "integrity": "sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/methods": "^1.1.4",
+        "@types/superagent": "^8.1.0"
+      }
+    },
     "node_modules/@types/uuid": {
       "version": "9.0.8",
       "resolved": "https://registry.npmjs.org/@types/uuid/-/uuid-9.0.8.tgz",
@@ -1752,6 +2191,92 @@
         "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
       }
     },
+    "node_modules/@vitest/expect": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.2.tgz",
+      "integrity": "sha512-gbu+7B0YgUJ2nkdsRJrFFW6X7NTP44WlhiclHniUhxADQJH5Szt9mZ9hWnJPJ8YwOK5zUOSSlSvyzRf0u1DSBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@standard-schema/spec": "^1.1.0",
+        "@types/chai": "^5.2.2",
+        "@vitest/spy": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "chai": "^6.2.2",
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/pretty-format": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.2.tgz",
+      "integrity": "sha512-dwQga8aejqeuB+TvXCMzSQemvV9hNEtDDpgUKDzOmNQayl2OG241PSWeJwKRH3CiC+sESrmoFd49rfnq7T4RnA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/runner": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.2.tgz",
+      "integrity": "sha512-Gr+FQan34CdiYAwpGJmQG8PgkyFVmARK8/xSijia3eTFgVfpcpztWLuP6FttGNfPLJhaZVP/euvujeNYar36OQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/utils": "4.1.2",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/snapshot": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.2.tgz",
+      "integrity": "sha512-g7yfUmxYS4mNxk31qbOYsSt2F4m1E02LFqO53Xpzg3zKMhLAPZAjjfyl9e6z7HrW6LvUdTwAQR3HHfLjpko16A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "magic-string": "^0.30.21",
+        "pathe": "^2.0.3"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/spy": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.2.tgz",
+      "integrity": "sha512-DU4fBnbVCJGNBwVA6xSToNXrkZNSiw59H8tcuUspVMsBDBST4nfvsPsEHDHGtWRRnqBERBQu7TrTKskmjqTXKA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
+    "node_modules/@vitest/utils": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.2.tgz",
+      "integrity": "sha512-xw2/TiX82lQHA06cgbqRKFb5lCAy3axQ4H4SoUFhUsg+wztiet+co86IAMDtF6Vm1hc7J6j09oh/rgDn+JdKIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/pretty-format": "4.1.2",
+        "convert-source-map": "^2.0.0",
+        "tinyrainbow": "^3.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      }
+    },
     "node_modules/@xterm/addon-fit": {
       "version": "0.10.0",
       "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz",
@@ -1845,6 +2370,30 @@
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "license": "MIT"
     },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/assertion-error": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/base64id": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
@@ -2014,6 +2563,16 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/chai": {
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz",
+      "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -2079,6 +2638,29 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/compressible": {
       "version": "2.0.18",
       "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
@@ -2204,6 +2786,13 @@
       "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==",
       "license": "MIT"
     },
+    "node_modules/cookiejar": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/cors": {
       "version": "2.8.6",
       "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.6.tgz",
@@ -2276,6 +2865,16 @@
         }
       }
     },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/depd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -2295,6 +2894,27 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+      "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
     "node_modules/dunder-proto": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@@ -2399,6 +3019,13 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-module-lexer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.0.0.tgz",
+      "integrity": "sha512-5POEcUuZybH7IdmGsD8wlf0AI55wMecM9rVBTI/qEAy2c1kTOm3DjFYjrBdI2K3BaJjJYfYFeRtM0t9ssnRuxw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/es-object-atoms": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
@@ -2411,6 +3038,22 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.27.3",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz",
@@ -2469,6 +3112,16 @@
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "license": "MIT"
     },
+    "node_modules/estree-walker": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
+      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/estree": "^1.0.0"
+      }
+    },
     "node_modules/etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -2499,6 +3152,16 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/expect-type": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz",
+      "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=12.0.0"
+      }
+    },
     "node_modules/express": {
       "version": "4.22.1",
       "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz",
@@ -2584,6 +3247,13 @@
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
       "license": "MIT"
     },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/fast-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
@@ -2600,6 +3270,24 @@
       ],
       "license": "BSD-3-Clause"
     },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/finalhandler": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz",
@@ -2633,6 +3321,41 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/form-data": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/formidable": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
+      "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@paralleldrive/cuid2": "^2.2.2",
+        "dezalgo": "^1.0.4",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -2779,6 +3502,22 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -2917,32 +3656,305 @@
         "ts-algebra": "^2.0.0"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=16"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
+    },
+    "node_modules/json-schema-typed": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
+      "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lightningcss": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz",
+      "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==",
+      "dev": true,
+      "license": "MPL-2.0",
+      "dependencies": {
+        "detect-libc": "^2.0.3"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-android-arm64": "1.32.0",
+        "lightningcss-darwin-arm64": "1.32.0",
+        "lightningcss-darwin-x64": "1.32.0",
+        "lightningcss-freebsd-x64": "1.32.0",
+        "lightningcss-linux-arm-gnueabihf": "1.32.0",
+        "lightningcss-linux-arm64-gnu": "1.32.0",
+        "lightningcss-linux-arm64-musl": "1.32.0",
+        "lightningcss-linux-x64-gnu": "1.32.0",
+        "lightningcss-linux-x64-musl": "1.32.0",
+        "lightningcss-win32-arm64-msvc": "1.32.0",
+        "lightningcss-win32-x64-msvc": "1.32.0"
+      }
+    },
+    "node_modules/lightningcss-android-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz",
+      "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz",
+      "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz",
+      "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz",
+      "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz",
+      "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz",
+      "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz",
+      "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz",
+      "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz",
+      "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz",
+      "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "license": "MIT"
-    },
-    "node_modules/json-schema-typed": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-8.0.2.tgz",
-      "integrity": "sha512-fQhoXdcvc3V28x7C7BMs4P5+kNlgUURe2jmUT1T//oBRMDrqy1QPelJimwZGo7Hg9VPV3EQV5Bnq4hbFy2vetA==",
-      "license": "BSD-2-Clause"
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.32.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz",
+      "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==",
+      "cpu": [
+        "x64"
+      ],
       "dev": true,
-      "license": "MIT",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
+      "license": "MPL-2.0",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">=6"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
     "node_modules/lodash": {
@@ -2975,6 +3987,16 @@
         "yallist": "^3.0.2"
       }
     },
+    "node_modules/magic-string": {
+      "version": "0.30.21",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+      "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.5"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -3122,6 +4144,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/obug": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.1.tgz",
+      "integrity": "sha512-uTqF9MuPraAQ+IsnPf366RG4cP9RtUi7MLO1N3KEc+wb0a6yKpeL0lmk2IB1jY5KHPAlTc6T/JRdC/YqxHNwkQ==",
+      "dev": true,
+      "funding": [
+        "https://github.com/sponsors/sxzz",
+        "https://opencollective.com/debug"
+      ],
+      "license": "MIT"
+    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -3176,6 +4209,13 @@
       "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==",
       "license": "MIT"
     },
+    "node_modules/pathe": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
+      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -3183,6 +4223,19 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/picomatch": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz",
+      "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/pkce-challenge": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/pkce-challenge/-/pkce-challenge-5.0.1.tgz",
@@ -3193,9 +4246,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.6",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
-      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
+      "version": "8.5.8",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz",
+      "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==",
       "dev": true,
       "funding": [
         {
@@ -3355,6 +4408,47 @@
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
     },
+    "node_modules/rolldown": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.0-rc.12.tgz",
+      "integrity": "sha512-yP4USLIMYrwpPHEFB5JGH1uxhcslv6/hL0OyvTuY+3qlOSJvZ7ntYnoWpehBxufkgN0cvXxppuTu5hHa/zPh+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@oxc-project/types": "=0.122.0",
+        "@rolldown/pluginutils": "1.0.0-rc.12"
+      },
+      "bin": {
+        "rolldown": "bin/cli.mjs"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "optionalDependencies": {
+        "@rolldown/binding-android-arm64": "1.0.0-rc.12",
+        "@rolldown/binding-darwin-arm64": "1.0.0-rc.12",
+        "@rolldown/binding-darwin-x64": "1.0.0-rc.12",
+        "@rolldown/binding-freebsd-x64": "1.0.0-rc.12",
+        "@rolldown/binding-linux-arm-gnueabihf": "1.0.0-rc.12",
+        "@rolldown/binding-linux-arm64-gnu": "1.0.0-rc.12",
+        "@rolldown/binding-linux-arm64-musl": "1.0.0-rc.12",
+        "@rolldown/binding-linux-ppc64-gnu": "1.0.0-rc.12",
+        "@rolldown/binding-linux-s390x-gnu": "1.0.0-rc.12",
+        "@rolldown/binding-linux-x64-gnu": "1.0.0-rc.12",
+        "@rolldown/binding-linux-x64-musl": "1.0.0-rc.12",
+        "@rolldown/binding-openharmony-arm64": "1.0.0-rc.12",
+        "@rolldown/binding-wasm32-wasi": "1.0.0-rc.12",
+        "@rolldown/binding-win32-arm64-msvc": "1.0.0-rc.12",
+        "@rolldown/binding-win32-x64-msvc": "1.0.0-rc.12"
+      }
+    },
+    "node_modules/rolldown/node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-rc.12",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.12.tgz",
+      "integrity": "sha512-HHMwmarRKvoFsJorqYlFeFRzXZqCt2ETQlEDOb9aqssrnVBB1/+xgTGtuTrIk5vzLNX1MjMtTf7W9z3tsSbrxw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/rollup": {
       "version": "4.57.1",
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.57.1.tgz",
@@ -3648,6 +4742,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/siginfo": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/socket.io": {
       "version": "4.8.3",
       "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.3.tgz",
@@ -3721,6 +4822,13 @@
       "integrity": "sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==",
       "dev": true
     },
+    "node_modules/stackback": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/statuses": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
@@ -3730,6 +4838,13 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/std-env": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.0.0.tgz",
+      "integrity": "sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/string-width": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
@@ -3758,6 +4873,65 @@
         "node": ">=8"
       }
     },
+    "node_modules/superagent": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.3.0.tgz",
+      "integrity": "sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "^1.3.1",
+        "cookiejar": "^2.1.4",
+        "debug": "^4.3.7",
+        "fast-safe-stringify": "^2.1.1",
+        "form-data": "^4.0.5",
+        "formidable": "^3.5.4",
+        "methods": "^1.1.2",
+        "mime": "2.6.0",
+        "qs": "^6.14.1"
+      },
+      "engines": {
+        "node": ">=14.18.0"
+      }
+    },
+    "node_modules/superagent/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/supertest": {
+      "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.2.2.tgz",
+      "integrity": "sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cookie-signature": "^1.2.2",
+        "methods": "^1.1.2",
+        "superagent": "^10.3.0"
+      },
+      "engines": {
+        "node": ">=14.18.0"
+      }
+    },
+    "node_modules/supertest/node_modules/cookie-signature": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
+      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.6.0"
+      }
+    },
     "node_modules/supports-color": {
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
@@ -3774,6 +4948,50 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/tinybench": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
+      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tinyexec": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.4.tgz",
+      "integrity": "sha512-u9r3uZC0bdpGOXtlxUIdwf9pkmvhqJdrVCH9fapQtgy/OeTTMZ1nqH7agtvEfmGui6e1XxjcdrlxvxJvc3sMqw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
+    "node_modules/tinyrainbow": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz",
+      "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/toidentifier": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
@@ -4420,6 +5638,193 @@
         "@esbuild/win32-x64": "0.21.5"
       }
     },
+    "node_modules/vitest": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.2.tgz",
+      "integrity": "sha512-xjR1dMTVHlFLh98JE3i/f/WePqJsah4A0FK9cc8Ehp9Udk0AZk6ccpIZhh1qJ/yxVWRZ+Q54ocnD8TXmkhspGg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/expect": "4.1.2",
+        "@vitest/mocker": "4.1.2",
+        "@vitest/pretty-format": "4.1.2",
+        "@vitest/runner": "4.1.2",
+        "@vitest/snapshot": "4.1.2",
+        "@vitest/spy": "4.1.2",
+        "@vitest/utils": "4.1.2",
+        "es-module-lexer": "^2.0.0",
+        "expect-type": "^1.3.0",
+        "magic-string": "^0.30.21",
+        "obug": "^2.1.1",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.3",
+        "std-env": "^4.0.0-rc.1",
+        "tinybench": "^2.9.0",
+        "tinyexec": "^1.0.2",
+        "tinyglobby": "^0.2.15",
+        "tinyrainbow": "^3.1.0",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0",
+        "why-is-node-running": "^2.3.0"
+      },
+      "bin": {
+        "vitest": "vitest.mjs"
+      },
+      "engines": {
+        "node": "^20.0.0 || ^22.0.0 || >=24.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "@edge-runtime/vm": "*",
+        "@opentelemetry/api": "^1.9.0",
+        "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0",
+        "@vitest/browser-playwright": "4.1.2",
+        "@vitest/browser-preview": "4.1.2",
+        "@vitest/browser-webdriverio": "4.1.2",
+        "@vitest/ui": "4.1.2",
+        "happy-dom": "*",
+        "jsdom": "*",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@edge-runtime/vm": {
+          "optional": true
+        },
+        "@opentelemetry/api": {
+          "optional": true
+        },
+        "@types/node": {
+          "optional": true
+        },
+        "@vitest/browser-playwright": {
+          "optional": true
+        },
+        "@vitest/browser-preview": {
+          "optional": true
+        },
+        "@vitest/browser-webdriverio": {
+          "optional": true
+        },
+        "@vitest/ui": {
+          "optional": true
+        },
+        "happy-dom": {
+          "optional": true
+        },
+        "jsdom": {
+          "optional": true
+        },
+        "vite": {
+          "optional": false
+        }
+      }
+    },
+    "node_modules/vitest/node_modules/@vitest/mocker": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.2.tgz",
+      "integrity": "sha512-Ize4iQtEALHDttPRCmN+FKqOl2vxTiNUhzobQFFt/BM1lRUTG7zRCLOykG/6Vo4E4hnUdfVLo5/eqKPukcWW7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vitest/spy": "4.1.2",
+        "estree-walker": "^3.0.3",
+        "magic-string": "^0.30.21"
+      },
+      "funding": {
+        "url": "https://opencollective.com/vitest"
+      },
+      "peerDependencies": {
+        "msw": "^2.4.9",
+        "vite": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      },
+      "peerDependenciesMeta": {
+        "msw": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitest/node_modules/vite": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.3.tgz",
+      "integrity": "sha512-B9ifbFudT1TFhfltfaIPgjo9Z3mDynBTJSUYxTjOQruf/zHH+ezCQKcoqO+h7a9Pw9Nm/OtlXAiGT1axBgwqrQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lightningcss": "^1.32.0",
+        "picomatch": "^4.0.4",
+        "postcss": "^8.5.8",
+        "rolldown": "1.0.0-rc.12",
+        "tinyglobby": "^0.2.15"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "funding": {
+        "url": "https://github.com/vitejs/vite?sponsor=1"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      },
+      "peerDependencies": {
+        "@types/node": "^20.19.0 || >=22.12.0",
+        "@vitejs/devtools": "^0.1.0",
+        "esbuild": "^0.27.0",
+        "jiti": ">=1.21.0",
+        "less": "^4.0.0",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "@vitejs/devtools": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "jiti": {
+          "optional": true
+        },
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "sass-embedded": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/which": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4435,6 +5840,23 @@
         "node": ">= 8"
       }
     },
+    "node_modules/why-is-node-running": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "siginfo": "^2.0.0",
+        "stackback": "0.0.2"
+      },
+      "bin": {
+        "why-is-node-running": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
diff --git a/package.json b/package.json
index 12a80da..8bbf43d 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,9 @@
     "server:dev": "NODE_OPTIONS='--experimental-sqlite' tsx watch --ignore './data/**' src/server/index.ts",
     "client:dev": "vite",
     "build": "tsc -p tsconfig.server.json && vite build",
-    "server:start": "node dist/server/index.js"
+    "server:start": "node dist/server/index.js",
+    "test": "vitest run",
+    "test:watch": "vitest"
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.78.0",
@@ -31,14 +33,17 @@
     "@types/node": "^20.19.35",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
+    "@types/supertest": "^7.2.0",
     "@types/uuid": "^9.0.8",
     "@vitejs/plugin-react": "^4.7.0",
     "concurrently": "^8.2.2",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "socket.io-client": "^4.8.3",
+    "supertest": "^7.2.2",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "vite": "^5.4.21"
+    "vite": "^5.4.21",
+    "vitest": "^4.1.2"
   }
 }
diff --git a/src/client/App.tsx b/src/client/App.tsx
index a90f61a..cb3b99d 100644
--- a/src/client/App.tsx
+++ b/src/client/App.tsx
@@ -20,6 +20,8 @@ const ProjectSelector = lazy(() => import('./components/ProjectSelector').then(m
 const SettingsModal = lazy(() => import('./components/SettingsModal').then(m => ({ default: m.SettingsModal })));
 const DebateForm = lazy(() => import('./components/DebateForm').then(m => ({ default: m.DebateForm })));
 const DebateDetailModal = lazy(() => import('./components/DebateDetailModal').then(m => ({ default: m.DebateDetailModal })));
+const WorkflowForm = lazy(() => import('./components/WorkflowForm').then(m => ({ default: m.WorkflowForm })));
+const WorkflowDetailModal = lazy(() => import('./components/WorkflowDetailModal').then(m => ({ default: m.WorkflowDetailModal })));
 const KnowledgeBaseModal = lazy(() => import('./components/KnowledgeBaseModal').then(m => ({ default: m.KnowledgeBaseModal })));
 import { useSocket } from './hooks/useSocket';
 import { useAgents } from './hooks/useAgents';
@@ -27,10 +29,11 @@ import { useJobs } from './hooks/useJobs';
 import { useLocks } from './hooks/useLocks';
 import { useProjects } from './hooks/useProjects';
 import { useDebates } from './hooks/useDebates';
+import { useWorkflows } from './hooks/useWorkflows';
 import { useToasts } from './hooks/useToasts';
 import { ToastFeed } from './components/ToastFeed';
 import socket from './socket';
-import type { AgentWithJob, AgentOutput, CreateJobRequest, CreateDebateRequest, Debate, Job, Template, BatchTemplate, Discussion, Proposal } from '@shared/types';
+import type { AgentWithJob, AgentOutput, CreateJobRequest, CreateDebateRequest, CreateWorkflowRequest, Debate, Workflow, Job, Template, BatchTemplate, Discussion, Proposal } from '@shared/types';
 
 export default function App() {
   const { agents, setInitial: setInitialAgents, addAgent, updateAgent } = useAgents();
@@ -38,6 +41,7 @@ export default function App() {
   const { locks, setInitial: setInitialLocks, addLock, removeLock } = useLocks();
   const { projects, setInitial: setInitialProjects, addProject, updateProject, removeProject } = useProjects();
   const { debates, setInitial: setInitialDebates, addDebate, updateDebate: updateDebateState } = useDebates();
+  const { workflows, setInitial: setInitialWorkflows, addWorkflow, updateWorkflow: updateWorkflowState } = useWorkflows();
   const { toasts, dismiss: dismissToast } = useToasts();
   const [templates, setTemplates] = useState<Template[]>([]);
 
@@ -54,6 +58,8 @@ export default function App() {
   const [showDebateForm, setShowDebateForm] = useState(false);
   const [debateFormInitial, setDebateFormInitial] = useState<Partial<CreateDebateRequest> | undefined>();
   const [selectedDebate, setSelectedDebate] = useState<Debate | null>(null);
+  const [showWorkflowForm, setShowWorkflowForm] = useState(false);
+  const [selectedWorkflow, setSelectedWorkflow] = useState<Workflow | null>(null);
   const [showKnowledgeBase, setShowKnowledgeBase] = useState(false);
   const [activeProjectId, setActiveProjectId] = useState<string | null>(null);
   const [archivedJobs, setArchivedJobs] = useState<Job[]>([]);
@@ -153,6 +159,7 @@ export default function App() {
       setTemplates(snapshot.templates ?? []);
       setInitialProjects(snapshot.projects ?? []);
       setInitialDebates(snapshot.debates ?? []);
+      setInitialWorkflows(snapshot.workflows ?? []);
       setDiscussions(snapshot.discussions ?? []);
       setProposals(snapshot.proposals ?? []);
     },
@@ -174,6 +181,8 @@ export default function App() {
     onProjectNew: addProject,
     onDebateNew: addDebate,
     onDebateUpdate: updateDebateState,
+    onWorkflowNew: addWorkflow,
+    onWorkflowUpdate: updateWorkflowState,
     onDiscussionNew: (discussion: Discussion) => setDiscussions(prev => [discussion, ...prev.filter(d => d.id !== discussion.id)]),
     onDiscussionUpdate: (discussion: Discussion) => setDiscussions(prev => prev.map(d => d.id === discussion.id ? discussion : d)),
     onProposalNew: (proposal: Proposal) => setProposals(prev => [proposal, ...prev.filter(p => p.id !== proposal.id)]),
@@ -328,6 +337,21 @@ export default function App() {
     }
   }, [activeProjectId]);
 
+  const handleSubmitWorkflow = useCallback(async (req: CreateWorkflowRequest) => {
+    const res = await fetch('/api/workflows', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(req),
+    });
+    if (!res.ok) {
+      const err = await res.json().catch(() => ({}));
+      throw new Error(err.error ?? 'Failed to create workflow');
+    }
+    const data = await res.json();
+    addProject(data.project);
+    setActiveProjectId(data.project.id);
+  }, [addProject]);
+
   const handleSubmitDebate = useCallback(async (req: CreateDebateRequest) => {
     const res = await fetch('/api/debates', {
       method: 'POST',
@@ -381,7 +405,7 @@ export default function App() {
 
   return (
     <div className="app">
-      <Header onNewJob={() => setShowJobForm(true)} onTemplates={() => setShowTemplates(true)} onBatchTemplates={() => setShowBatchTemplates(true)} onUsage={() => setShowUsage(true)} onSearch={() => setShowSearch(true)} onTimeline={() => setShowGantt(true)} onDag={() => setShowDag(true)} onProjects={() => setShowProjects(true)} onSettings={() => setShowSettings(true)} onDebate={() => { setDebateFormInitial(undefined); setShowDebateForm(true); }} onDebates={debates.length > 0 ? debates : undefined} onSelectDebate={(d) => setSelectedDebate(d)} onKnowledgeBase={() => setShowKnowledgeBase(true)} onEye={() => setShowEye(v => !v)} eyeEnabled={eyeEnabled} eyeActive={showEye} eyeBadgeCount={showEye ? 0 : discussions.filter(d => d.needs_reply).length + proposals.filter(p => p.needs_reply).length} onHome={() => { setSelectedAgent(null); setActiveProjectId(null); setShowJobForm(false); setShowTemplates(false); setShowBatchTemplates(false); setShowUsage(false); setShowSearch(false); setShowGantt(false); setShowDag(false); setShowProjects(false); setShowSettings(false); setShowDebateForm(false); setShowKnowledgeBase(false); setShowEye(false); }} currentProjectName={activeProjectName} onClearProject={() => setActiveProjectId(null)} todayClaudeCost={todayClaudeCost ?? undefined} todayCodexCost={todayCodexCost ?? undefined} costAutoUpdate={costAutoUpdate} onToggleCostAutoUpdate={() => setCostAutoUpdate(v => !v)} />
+      <Header onNewJob={() => setShowJobForm(true)} onTemplates={() => setShowTemplates(true)} onBatchTemplates={() => setShowBatchTemplates(true)} onUsage={() => setShowUsage(true)} onSearch={() => setShowSearch(true)} onTimeline={() => setShowGantt(true)} onDag={() => setShowDag(true)} onProjects={() => setShowProjects(true)} onSettings={() => setShowSettings(true)} onDebate={() => { setDebateFormInitial(undefined); setShowDebateForm(true); }} onDebates={debates.length > 0 ? debates : undefined} onSelectDebate={(d) => setSelectedDebate(d)} onWorkflow={() => setShowWorkflowForm(true)} onWorkflows={workflows.length > 0 ? workflows : undefined} onSelectWorkflow={(w) => setSelectedWorkflow(w)} onKnowledgeBase={() => setShowKnowledgeBase(true)} onEye={() => setShowEye(v => !v)} eyeEnabled={eyeEnabled} eyeActive={showEye} eyeBadgeCount={showEye ? 0 : discussions.filter(d => d.needs_reply).length + proposals.filter(p => p.needs_reply).length} onHome={() => { setSelectedAgent(null); setActiveProjectId(null); setShowJobForm(false); setShowTemplates(false); setShowBatchTemplates(false); setShowUsage(false); setShowSearch(false); setShowGantt(false); setShowDag(false); setShowProjects(false); setShowSettings(false); setShowDebateForm(false); setShowWorkflowForm(false); setShowKnowledgeBase(false); setShowEye(false); }} currentProjectName={activeProjectName} onClearProject={() => setActiveProjectId(null)} todayClaudeCost={todayClaudeCost ?? undefined} todayCodexCost={todayCodexCost ?? undefined} costAutoUpdate={costAutoUpdate} onToggleCostAutoUpdate={() => setCostAutoUpdate(v => !v)} />
 
       <div className="main-layout">
         <div className={`left-sidebar-stack ${leftTab === 'lineage' && selectedAgent ? '' : 'left-sidebar-stack--narrow'}`}>
@@ -504,6 +528,22 @@ export default function App() {
         <SettingsModal onClose={() => setShowSettings(false)} eyeEnabled={eyeEnabled} onEyeEnabledChange={setEyeEnabled} />
       )}
 
+      {showWorkflowForm && (
+        <WorkflowForm
+          onSubmit={handleSubmitWorkflow}
+          onClose={() => setShowWorkflowForm(false)}
+        />
+      )}
+
+      {selectedWorkflow && (
+        <WorkflowDetailModal
+          workflow={workflows.find(w => w.id === selectedWorkflow.id) ?? selectedWorkflow}
+          agents={agents}
+          onClose={() => setSelectedWorkflow(null)}
+          onWorkflowUpdate={updateWorkflowState}
+        />
+      )}
+
       {showDebateForm && (
         <DebateForm
           onSubmit={handleSubmitDebate}
diff --git a/src/client/components/Header.tsx b/src/client/components/Header.tsx
index b3e82f9..5372006 100644
--- a/src/client/components/Header.tsx
+++ b/src/client/components/Header.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
-import type { Debate } from '@shared/types';
+import type { Debate, Workflow } from '@shared/types';
 
 interface HeaderProps {
   onNewJob: () => void;
@@ -14,6 +14,9 @@ interface HeaderProps {
   onDebate: () => void;
   onDebates?: Debate[];
   onSelectDebate?: (debate: Debate) => void;
+  onWorkflow: () => void;
+  onWorkflows?: Workflow[];
+  onSelectWorkflow?: (workflow: Workflow) => void;
   onKnowledgeBase: () => void;
   onEye: () => void;
   eyeActive?: boolean;
@@ -53,12 +56,14 @@ function HurlicaLogo() {
   );
 }
 
-export function Header({ onNewJob, onTemplates, onBatchTemplates, onUsage, onSearch, onTimeline, onDag, onProjects, onSettings, onDebate, onDebates, onSelectDebate, onKnowledgeBase, onEye, eyeActive, eyeBadgeCount, eyeEnabled, onHome, currentProjectName, onClearProject, todayClaudeCost, todayCodexCost, costAutoUpdate, onToggleCostAutoUpdate }: HeaderProps) {
+export function Header({ onNewJob, onTemplates, onBatchTemplates, onUsage, onSearch, onTimeline, onDag, onProjects, onSettings, onDebate, onDebates, onSelectDebate, onWorkflow, onWorkflows, onSelectWorkflow, onKnowledgeBase, onEye, eyeActive, eyeBadgeCount, eyeEnabled, onHome, currentProjectName, onClearProject, todayClaudeCost, todayCodexCost, costAutoUpdate, onToggleCostAutoUpdate }: HeaderProps) {
   const hasCost = (todayClaudeCost != null && todayClaudeCost > 0) || (todayCodexCost != null && todayCodexCost > 0);
   const [moreOpen, setMoreOpen] = useState(false);
   const moreRef = useRef<HTMLDivElement>(null);
   const [debateMenuOpen, setDebateMenuOpen] = useState(false);
   const debateMenuRef = useRef<HTMLDivElement>(null);
+  const [workflowMenuOpen, setWorkflowMenuOpen] = useState(false);
+  const workflowMenuRef = useRef<HTMLDivElement>(null);
   useEffect(() => {
     if (!moreOpen) return;
     const handler = (e: MouseEvent) => { if (!moreRef.current?.contains(e.target as Node)) setMoreOpen(false); };
@@ -124,6 +129,31 @@ export function Header({ onNewJob, onTemplates, onBatchTemplates, onUsage, onSea
             )}
           </button>
         )}
+        <div style={{ display: 'flex', alignItems: 'center', gap: 1, background: 'var(--border)', borderRadius: 6, overflow: 'visible' }}>
+          <button className="header-btn" onClick={onWorkflow} style={{ borderRadius: onWorkflows && onWorkflows.length > 0 ? '6px 0 0 6px' : '6px' }}>Autonomous Agents</button>
+          {onWorkflows && onWorkflows.length > 0 && (
+            <div ref={workflowMenuRef} style={{ position: 'relative' }}>
+              <button className="header-btn" style={{ padding: '5px 6px', borderRadius: '0 6px 6px 0' }} onClick={() => setWorkflowMenuOpen(v => !v)} title="View workflows">&#x25be;</button>
+              {workflowMenuOpen && (
+                <div style={{ position: 'absolute', top: '100%', right: 0, zIndex: 200, marginTop: 4, background: 'var(--bg-elevated)', border: '1px solid var(--border)', borderRadius: 8, boxShadow: '0 8px 24px rgba(0,0,0,0.4)', minWidth: 280, maxWidth: 400, maxHeight: 360, overflowY: 'auto' }}>
+                  <div style={{ padding: '8px 12px', fontSize: 11, fontWeight: 600, color: 'var(--text-dim)', textTransform: 'uppercase', letterSpacing: '0.08em', borderBottom: '1px solid var(--border)' }}>Autonomous Agents</div>
+                  {[...onWorkflows].sort((a, b) => b.updated_at - a.updated_at).map(w => {
+                    const statusColor = w.status === 'running' ? 'var(--status-running)' : w.status === 'complete' ? 'var(--status-done)' : w.status === 'blocked' ? '#f59e0b' : 'var(--status-failed)';
+                    return (
+                      <button key={w.id} onClick={() => { setWorkflowMenuOpen(false); onSelectWorkflow?.(w); }}
+                        style={{ display: 'flex', alignItems: 'center', gap: 8, width: '100%', padding: '8px 12px', background: 'none', border: 'none', cursor: 'pointer', color: 'inherit', textAlign: 'left', borderBottom: '1px solid var(--border)' }}
+                        onMouseEnter={e => (e.currentTarget.style.background = 'var(--border)')} onMouseLeave={e => (e.currentTarget.style.background = 'none')}>
+                        <span style={{ width: 7, height: 7, borderRadius: '50%', background: statusColor, flexShrink: 0, display: 'inline-block' }} />
+                        <span style={{ flex: 1, fontSize: 13, overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{w.title}</span>
+                        <span style={{ fontSize: 11, color: 'var(--text-dim)', flexShrink: 0 }}>C{w.current_cycle}/{w.max_cycles}</span>
+                      </button>
+                    );
+                  })}
+                </div>
+              )}
+            </div>
+          )}
+        </div>
         <div style={{ display: 'flex', alignItems: 'center', gap: 1, background: 'var(--border)', borderRadius: 6, overflow: 'visible' }}>
           <button className="header-btn" onClick={onDebate} style={{ borderRadius: '6px 0 0 6px' }}>Debate</button>
           {onDebates && onDebates.length > 0 && (
diff --git a/src/client/components/JobForm.tsx b/src/client/components/JobForm.tsx
index 26bd3c2..5a3b53a 100644
--- a/src/client/components/JobForm.tsx
+++ b/src/client/components/JobForm.tsx
@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import type { CreateJobRequest, Job, Template, RetryPolicy, ReviewConfig } from '@shared/types';
+import type { CreateJobRequest, Job, Template, RetryPolicy, ReviewConfig, StopMode } from '@shared/types';
 import { TemplateModelStats } from './TemplateModelStats';
+import { StopModePicker } from './StopModePicker';
 import { useModels } from '../hooks/useModels';
 
 interface JobFormProps {
@@ -21,6 +22,8 @@ export function JobForm({ onSubmit, onClose, availableJobs = [] }: JobFormProps)
   const [dependsOn, setDependsOn] = useState<string[]>([]);
   const [interactive, setInteractive] = useState(true);
   const [useWorktree, setUseWorktree] = useState(false);
+  const [stopMode, setStopMode] = useState<StopMode>('completion');
+  const [stopValue, setStopValue] = useState<number | null>(null);
   const [repeatSeconds, setRepeatSeconds] = useState<number | ''>('');
   const [retryPolicy, setRetryPolicy] = useState<RetryPolicy>('none');
   const [maxRetries, setMaxRetries] = useState(3);
@@ -87,6 +90,8 @@ export function JobForm({ onSubmit, onClose, availableJobs = [] }: JobFormProps)
         dependsOn: dependsOn.length > 0 ? dependsOn : undefined,
         interactive: interactive || undefined,
         useWorktree: useWorktree || undefined,
+        stopMode,
+        stopValue: stopValue ?? undefined,
         repeatIntervalMs: repeatSeconds ? (repeatSeconds as number) * 1000 : undefined,
         retryPolicy: retryPolicy !== 'none' ? retryPolicy : undefined,
         maxRetries: retryPolicy !== 'none' ? maxRetries : undefined,
@@ -251,6 +256,14 @@ export function JobForm({ onSubmit, onClose, availableJobs = [] }: JobFormProps)
             </label>
           </div>
 
+          <StopModePicker
+            label="Stopping condition"
+            mode={stopMode}
+            value={stopValue}
+            onModeChange={setStopMode}
+            onValueChange={setStopValue}
+          />
+
           <div className="form-group">
             <label htmlFor="repeatSeconds">
               Repeat every
diff --git a/src/client/components/StopModePicker.tsx b/src/client/components/StopModePicker.tsx
new file mode 100644
index 0000000..2a67a0f
--- /dev/null
+++ b/src/client/components/StopModePicker.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import type { StopMode } from '@shared/types';
+
+interface StopModePickerProps {
+  mode: StopMode;
+  value: number | null;
+  onModeChange: (mode: StopMode) => void;
+  onValueChange: (value: number | null) => void;
+  label?: string;
+}
+
+const MODES: { key: StopMode; label: string }[] = [
+  { key: 'turns', label: 'Turns' },
+  { key: 'budget', label: 'Budget' },
+  { key: 'time', label: 'Time' },
+  { key: 'completion', label: 'Run to Completion' },
+];
+
+export function StopModePicker({ mode, value, onModeChange, onValueChange, label }: StopModePickerProps) {
+  return (
+    <div className="form-group">
+      {label && <label>{label}</label>}
+      <div className="stop-mode-buttons">
+        {MODES.map(m => (
+          <button
+            key={m.key}
+            type="button"
+            className={`stop-mode-btn${mode === m.key ? ' active' : ''}`}
+            onClick={() => {
+              onModeChange(m.key);
+              if (m.key === 'completion') onValueChange(null);
+            }}
+          >
+            {m.label}
+          </button>
+        ))}
+      </div>
+      <div className="stop-mode-input">
+        {mode === 'turns' && (
+          <input
+            type="number"
+            min={10}
+            max={500}
+            value={value ?? ''}
+            onChange={e => onValueChange(Number(e.target.value))}
+            placeholder="50"
+          />
+        )}
+        {mode === 'budget' && (
+          <div className="stop-mode-prefixed-input">
+            <span className="stop-mode-prefix">$</span>
+            <input
+              type="number"
+              min={0.5}
+              max={100}
+              step={0.5}
+              value={value ?? ''}
+              onChange={e => onValueChange(Number(e.target.value))}
+              placeholder="5.00"
+            />
+          </div>
+        )}
+        {mode === 'time' && (
+          <div className="stop-mode-prefixed-input">
+            <input
+              type="number"
+              min={5}
+              max={480}
+              value={value ?? ''}
+              onChange={e => onValueChange(Number(e.target.value))}
+              placeholder="60"
+            />
+            <span className="stop-mode-suffix">min</span>
+          </div>
+        )}
+        {mode === 'completion' && (
+          <span className="stop-mode-hint">Runs until done (safety cap: 1000 turns)</span>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/src/client/components/WorkflowDetailModal.tsx b/src/client/components/WorkflowDetailModal.tsx
new file mode 100644
index 0000000..ee6eff1
--- /dev/null
+++ b/src/client/components/WorkflowDetailModal.tsx
@@ -0,0 +1,256 @@
+import React, { useState, useEffect, useCallback } from 'react';
+import type { Workflow, Job, AgentWithJob } from '@shared/types';
+
+interface WorkflowDetail extends Workflow {
+  plan: string | null;
+  contract: string | null;
+  worklogs: Array<{ key: string; value: string; updated_at: number }>;
+}
+
+interface WorkflowDetailModalProps {
+  workflow: Workflow;
+  agents: AgentWithJob[];
+  onClose: () => void;
+  onWorkflowUpdate: (workflow: Workflow) => void;
+}
+
+const STATUS_COLORS: Record<string, string> = {
+  running: '#22c55e',
+  complete: '#3b82f6',
+  blocked: '#f59e0b',
+  failed: '#ef4444',
+  cancelled: '#6b7280',
+};
+
+const PHASE_LABELS: Record<string, string> = {
+  idle: 'Idle',
+  assess: 'Assess',
+  review: 'Review',
+  implement: 'Implement',
+};
+
+export function WorkflowDetailModal({ workflow, agents, onClose, onWorkflowUpdate }: WorkflowDetailModalProps) {
+  const [detail, setDetail] = useState<WorkflowDetail | null>(null);
+  const [jobs, setJobs] = useState<Job[]>([]);
+  const [activeTab, setActiveTab] = useState<'progress' | 'plan' | 'worklog' | 'jobs'>('progress');
+  const [loading, setLoading] = useState(true);
+  const [acting, setActing] = useState(false);
+
+  const fetchDetail = useCallback(async () => {
+    try {
+      const [detailRes, jobsRes] = await Promise.all([
+        fetch(`/api/workflows/${workflow.id}`),
+        fetch(`/api/workflows/${workflow.id}/jobs`),
+      ]);
+      if (detailRes.ok) setDetail(await detailRes.json());
+      if (jobsRes.ok) setJobs(await jobsRes.json());
+    } catch { /* ignore */ } finally {
+      setLoading(false);
+    }
+  }, [workflow.id]);
+
+  useEffect(() => { fetchDetail(); }, [fetchDetail]);
+
+  const handleCancel = async () => {
+    if (!confirm('Cancel this workflow?')) return;
+    setActing(true);
+    try {
+      const res = await fetch(`/api/workflows/${workflow.id}/cancel`, { method: 'POST' });
+      if (res.ok) {
+        const updated = await res.json();
+        onWorkflowUpdate(updated);
+        onClose();
+      }
+    } finally { setActing(false); }
+  };
+
+  const handleResume = async () => {
+    setActing(true);
+    try {
+      const res = await fetch(`/api/workflows/${workflow.id}/resume`, { method: 'POST' });
+      if (res.ok) {
+        const data = await res.json();
+        onWorkflowUpdate(data.workflow);
+        await fetchDetail();
+      }
+    } finally { setActing(false); }
+  };
+
+  const milestonePercent = workflow.milestones_total > 0
+    ? Math.round((workflow.milestones_done / workflow.milestones_total) * 100)
+    : 0;
+
+  const statusColor = STATUS_COLORS[workflow.status] ?? '#6b7280';
+
+  return (
+    <div className="modal-overlay" onClick={onClose}>
+      <div className="modal" style={{ width: '80vw', maxWidth: 900, maxHeight: '85vh', display: 'flex', flexDirection: 'column' }} onClick={e => e.stopPropagation()}>
+        <div className="modal-header">
+          <div style={{ flex: 1 }}>
+            <h2 style={{ margin: 0 }}>{workflow.title}</h2>
+            <div style={{ display: 'flex', gap: 12, alignItems: 'center', marginTop: 6, fontSize: 13, color: '#aaa' }}>
+              <span style={{ color: statusColor, fontWeight: 600 }}>{workflow.status.toUpperCase()}</span>
+              <span>Cycle {workflow.current_cycle}/{workflow.max_cycles}</span>
+              <span style={{ color: '#888' }}>Phase: {PHASE_LABELS[workflow.current_phase] ?? workflow.current_phase}</span>
+              <span style={{ color: '#888' }}>{workflow.implementer_model} + {workflow.reviewer_model}</span>
+            </div>
+          </div>
+          <div style={{ display: 'flex', gap: 8, alignItems: 'center' }}>
+            {workflow.pr_url && (
+              <a href={workflow.pr_url} target="_blank" rel="noopener noreferrer" className="btn btn-primary" style={{ textDecoration: 'none' }}>
+                View PR ↗
+              </a>
+            )}
+            {workflow.status === 'blocked' && (
+              <button className="btn btn-primary" onClick={handleResume} disabled={acting}>
+                Resume
+              </button>
+            )}
+            {(workflow.status === 'running' || workflow.status === 'blocked') && (
+              <button className="btn btn-secondary" onClick={handleCancel} disabled={acting}>
+                Cancel
+              </button>
+            )}
+            <button className="btn-icon" onClick={onClose}>&#x2715;</button>
+          </div>
+        </div>
+
+        {/* Milestone progress bar */}
+        <div style={{ padding: '12px 20px', borderBottom: '1px solid #333' }}>
+          <div style={{ display: 'flex', justifyContent: 'space-between', fontSize: 12, color: '#aaa', marginBottom: 6 }}>
+            <span>Milestones: {workflow.milestones_done}/{workflow.milestones_total}</span>
+            <span>{milestonePercent}%</span>
+          </div>
+          <div style={{ height: 6, background: '#333', borderRadius: 3, overflow: 'hidden' }}>
+            <div style={{ height: '100%', width: `${milestonePercent}%`, background: statusColor, borderRadius: 3, transition: 'width 0.3s ease' }} />
+          </div>
+        </div>
+
+        {/* Tabs */}
+        <div style={{ display: 'flex', gap: 0, borderBottom: '1px solid #333' }}>
+          {(['progress', 'plan', 'worklog', 'jobs'] as const).map(tab => (
+            <button
+              key={tab}
+              onClick={() => setActiveTab(tab)}
+              style={{
+                padding: '8px 16px', border: 'none', background: 'none', cursor: 'pointer',
+                color: activeTab === tab ? '#fff' : '#888',
+                borderBottom: activeTab === tab ? '2px solid #3b82f6' : '2px solid transparent',
+                fontSize: 13, fontWeight: activeTab === tab ? 600 : 400,
+                textTransform: 'capitalize',
+              }}
+            >
+              {tab}
+            </button>
+          ))}
+        </div>
+
+        <div style={{ flex: 1, overflowY: 'auto', padding: 20 }}>
+          {loading ? (
+            <div style={{ color: '#888', textAlign: 'center', padding: 40 }}>Loading...</div>
+          ) : (
+            <>
+              {activeTab === 'progress' && (
+                <div>
+                  <div style={{ marginBottom: 16 }}>
+                    <h3 style={{ margin: '0 0 8px', fontSize: 14, color: '#aaa' }}>Task</h3>
+                    <div style={{ background: '#1a1a1a', border: '1px solid #333', borderRadius: 6, padding: 12, fontSize: 13, whiteSpace: 'pre-wrap' }}>
+                      {workflow.task}
+                    </div>
+                  </div>
+
+                  <h3 style={{ margin: '0 0 8px', fontSize: 14, color: '#aaa' }}>Phase Timeline</h3>
+                  <div style={{ display: 'flex', flexDirection: 'column', gap: 4 }}>
+                    {jobs.map(job => {
+                      const agent = agents.find(a => a.job_id === job.id);
+                      const statusDot: Record<string, string> = { done: '#22c55e', failed: '#ef4444', running: '#3b82f6', queued: '#6b7280', assigned: '#f59e0b', cancelled: '#6b7280' };
+                      return (
+                        <div key={job.id} style={{ display: 'flex', gap: 12, alignItems: 'center', padding: '6px 10px', background: '#1a1a1a', border: '1px solid #2a2a2a', borderRadius: 4, fontSize: 12 }}>
+                          <span style={{ width: 8, height: 8, borderRadius: '50%', background: statusDot[job.status] ?? '#6b7280', flexShrink: 0 }} />
+                          <span style={{ fontWeight: 600, minWidth: 180 }}>{job.title}</span>
+                          <span style={{ color: '#888' }}>{job.status}</span>
+                          {agent?.cost_usd != null && <span style={{ color: '#888', marginLeft: 'auto' }}>${agent.cost_usd.toFixed(4)}</span>}
+                        </div>
+                      );
+                    })}
+                    {jobs.length === 0 && <div style={{ color: '#888', fontSize: 13 }}>No jobs yet.</div>}
+                  </div>
+                </div>
+              )}
+
+              {activeTab === 'plan' && (
+                <div>
+                  {detail?.plan ? (
+                    <pre style={{ margin: 0, fontFamily: 'monospace', fontSize: 13, whiteSpace: 'pre-wrap', color: '#ddd' }}>
+                      {detail.plan}
+                    </pre>
+                  ) : (
+                    <div style={{ color: '#888', fontSize: 13 }}>
+                      No plan written yet. The assess phase will create it.
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {activeTab === 'worklog' && (
+                <div>
+                  {detail?.worklogs && detail.worklogs.length > 0 ? (
+                    detail.worklogs.map(entry => (
+                      <div key={entry.key} style={{ marginBottom: 20 }}>
+                        <div style={{ fontSize: 11, color: '#666', marginBottom: 4 }}>
+                          {entry.key.split('/').pop()} — {new Date(entry.updated_at).toLocaleString()}
+                        </div>
+                        <pre style={{ margin: 0, fontFamily: 'monospace', fontSize: 12, whiteSpace: 'pre-wrap', color: '#ccc', background: '#1a1a1a', border: '1px solid #333', borderRadius: 6, padding: 12 }}>
+                          {entry.value}
+                        </pre>
+                      </div>
+                    ))
+                  ) : (
+                    <div style={{ color: '#888', fontSize: 13 }}>
+                      No worklog entries yet. The implement phase will write them.
+                    </div>
+                  )}
+                </div>
+              )}
+
+              {activeTab === 'jobs' && (
+                <div>
+                  <table style={{ width: '100%', borderCollapse: 'collapse', fontSize: 12 }}>
+                    <thead>
+                      <tr style={{ color: '#888', textAlign: 'left' }}>
+                        <th style={{ padding: '4px 8px' }}>Job</th>
+                        <th style={{ padding: '4px 8px' }}>Phase</th>
+                        <th style={{ padding: '4px 8px' }}>Cycle</th>
+                        <th style={{ padding: '4px 8px' }}>Status</th>
+                        <th style={{ padding: '4px 8px' }}>Model</th>
+                        <th style={{ padding: '4px 8px' }}>Cost</th>
+                      </tr>
+                    </thead>
+                    <tbody>
+                      {jobs.map(job => {
+                        const agent = agents.find(a => a.job_id === job.id);
+                        return (
+                          <tr key={job.id} style={{ borderTop: '1px solid #2a2a2a' }}>
+                            <td style={{ padding: '6px 8px' }}>{job.title}</td>
+                            <td style={{ padding: '6px 8px', color: '#aaa' }}>{job.workflow_phase ?? '-'}</td>
+                            <td style={{ padding: '6px 8px', color: '#aaa' }}>{job.workflow_cycle ?? '-'}</td>
+                            <td style={{ padding: '6px 8px', color: STATUS_COLORS[job.status] ?? '#aaa' }}>{job.status}</td>
+                            <td style={{ padding: '6px 8px', color: '#888' }}>{job.model ?? 'auto'}</td>
+                            <td style={{ padding: '6px 8px', color: '#888' }}>{agent?.cost_usd != null ? `$${agent.cost_usd.toFixed(4)}` : '-'}</td>
+                          </tr>
+                        );
+                      })}
+                      {jobs.length === 0 && (
+                        <tr><td colSpan={6} style={{ padding: 20, color: '#888', textAlign: 'center' }}>No jobs yet</td></tr>
+                      )}
+                    </tbody>
+                  </table>
+                </div>
+              )}
+            </>
+          )}
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/src/client/components/WorkflowForm.tsx b/src/client/components/WorkflowForm.tsx
new file mode 100644
index 0000000..083624d
--- /dev/null
+++ b/src/client/components/WorkflowForm.tsx
@@ -0,0 +1,211 @@
+import React, { useState, useEffect } from 'react';
+import type { CreateWorkflowRequest, Template, StopMode } from '@shared/types';
+import { useModels } from '../hooks/useModels';
+import { StopModePicker } from './StopModePicker';
+
+interface WorkflowFormProps {
+  onSubmit: (req: CreateWorkflowRequest) => Promise<void>;
+  onClose: () => void;
+}
+
+export function WorkflowForm({ onSubmit, onClose }: WorkflowFormProps) {
+  const { claude: claudeModels, codex: codexModels } = useModels();
+  const [title, setTitle] = useState('');
+  const [task, setTask] = useState('');
+  const [workDir, setWorkDir] = useState('');
+  const [implementerModel, setImplementerModel] = useState('claude-sonnet-4-6[1m]');
+  const [reviewerModel, setReviewerModel] = useState('codex');
+  const [maxCycles, setMaxCycles] = useState(10);
+  const [templateId, setTemplateId] = useState('');
+  const [useWorktree, setUseWorktree] = useState(true);
+  const [showAdvanced, setShowAdvanced] = useState(false);
+  const [stopModeAssess, setStopModeAssess] = useState<StopMode>('turns');
+  const [stopValueAssess, setStopValueAssess] = useState<number | null>(50);
+  const [stopModeReview, setStopModeReview] = useState<StopMode>('turns');
+  const [stopValueReview, setStopValueReview] = useState<number | null>(30);
+  const [stopModeImplement, setStopModeImplement] = useState<StopMode>('turns');
+  const [stopValueImplement, setStopValueImplement] = useState<number | null>(100);
+  const [templates, setTemplates] = useState<Template[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState('');
+
+  useEffect(() => {
+    fetch('/api/templates').then(r => r.json()).then(setTemplates).catch(console.error);
+  }, []);
+
+  const handleTemplateChange = (newTemplateId: string) => {
+    setTemplateId(newTemplateId);
+    const tpl = templates.find(t => t.id === newTemplateId);
+    if (tpl?.work_dir) setWorkDir(tpl.work_dir);
+    if (tpl?.model) setImplementerModel(tpl.model);
+  };
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!task.trim()) return;
+    setLoading(true);
+    setError('');
+    try {
+      await onSubmit({
+        title: title.trim() || undefined,
+        task: task.trim(),
+        workDir: workDir.trim() || undefined,
+        implementerModel,
+        reviewerModel,
+        maxCycles,
+        templateId: templateId || undefined,
+        useWorktree,
+        stopModeAssess,
+        stopValueAssess: stopValueAssess ?? undefined,
+        stopModeReview,
+        stopValueReview: stopValueReview ?? undefined,
+        stopModeImplement,
+        stopValueImplement: stopValueImplement ?? undefined,
+      });
+      onClose();
+    } catch (err: any) {
+      setError(err.message ?? 'Failed to create workflow');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <div className="modal-overlay" onClick={onClose}>
+      <div className="modal" onClick={e => e.stopPropagation()}>
+        <div className="modal-header">
+          <h2>New Autonomous Agent Run</h2>
+          <button className="btn-icon" onClick={onClose}>&#x2715;</button>
+        </div>
+        <form onSubmit={handleSubmit} className="job-form">
+          <div className="form-group">
+            <label htmlFor="wf-title">Title <span className="form-label-hint">(optional)</span></label>
+            <input
+              id="wf-title"
+              type="text"
+              value={title}
+              onChange={e => setTitle(e.target.value)}
+              placeholder="Auto-generated from task if blank"
+              autoFocus
+            />
+          </div>
+
+          <div className="form-group">
+            <label htmlFor="wf-task">Task <span className="form-label-hint">(required)</span></label>
+            <textarea
+              id="wf-task"
+              value={task}
+              onChange={e => setTask(e.target.value)}
+              placeholder="Describe what the agents should accomplish across multiple cycles..."
+              rows={5}
+              required
+            />
+          </div>
+
+          <div className="form-group">
+            <label htmlFor="wf-workdir">Working Directory</label>
+            <input
+              id="wf-workdir"
+              type="text"
+              value={workDir}
+              onChange={e => setWorkDir(e.target.value)}
+              placeholder="/path/to/repo"
+            />
+          </div>
+
+          <div className="form-row">
+            <div className="form-group">
+              <label htmlFor="wf-implementer">Implementer Model</label>
+              <select id="wf-implementer" value={implementerModel} onChange={e => setImplementerModel(e.target.value)}>
+                {claudeModels.map(m => <option key={m.value} value={m.value}>{m.label}</option>)}
+              </select>
+            </div>
+            <div className="form-group">
+              <label htmlFor="wf-reviewer">Reviewer Model</label>
+              <select id="wf-reviewer" value={reviewerModel} onChange={e => setReviewerModel(e.target.value)}>
+                {codexModels.map(m => <option key={m.value} value={m.value}>{m.label}</option>)}
+                {claudeModels.map(m => <option key={`c-${m.value}`} value={m.value}>{m.label}</option>)}
+              </select>
+            </div>
+          </div>
+
+          <div className="form-row">
+            <div className="form-group">
+              <label htmlFor="wf-maxcycles">Max Cycles</label>
+              <input
+                id="wf-maxcycles"
+                type="number"
+                min={1}
+                max={50}
+                value={maxCycles}
+                onChange={e => setMaxCycles(Number(e.target.value))}
+              />
+            </div>
+            <div className="form-group">
+              <label htmlFor="wf-template">Template <span className="form-label-hint">(optional)</span></label>
+              <select id="wf-template" value={templateId} onChange={e => handleTemplateChange(e.target.value)}>
+                <option value="">No template</option>
+                {templates.map(t => <option key={t.id} value={t.id}>{t.name}</option>)}
+              </select>
+            </div>
+          </div>
+
+          <div className="form-group">
+            <label className="checkbox-label">
+              <input
+                type="checkbox"
+                checked={useWorktree}
+                onChange={e => setUseWorktree(e.target.checked)}
+              />
+              Use git worktree (recommended — all phases share one branch, changes accumulate linearly)
+            </label>
+          </div>
+
+          <button
+            type="button"
+            className="btn btn-ghost"
+            style={{ fontSize: 12, padding: '4px 0', marginBottom: 8 }}
+            onClick={() => setShowAdvanced(v => !v)}
+          >
+            {showAdvanced ? '▾' : '▸'} Advanced settings
+          </button>
+
+          {showAdvanced && (
+            <div style={{ display: 'flex', flexDirection: 'column', gap: 12 }}>
+              <StopModePicker
+                label="Assess stopping condition"
+                mode={stopModeAssess}
+                value={stopValueAssess}
+                onModeChange={setStopModeAssess}
+                onValueChange={setStopValueAssess}
+              />
+              <StopModePicker
+                label="Review stopping condition"
+                mode={stopModeReview}
+                value={stopValueReview}
+                onModeChange={setStopModeReview}
+                onValueChange={setStopValueReview}
+              />
+              <StopModePicker
+                label="Implement stopping condition"
+                mode={stopModeImplement}
+                value={stopValueImplement}
+                onModeChange={setStopModeImplement}
+                onValueChange={setStopValueImplement}
+              />
+            </div>
+          )}
+
+          {error && <div className="form-error">{error}</div>}
+
+          <div className="form-actions">
+            <button type="button" className="btn btn-secondary" onClick={onClose}>Cancel</button>
+            <button type="submit" className="btn btn-primary" disabled={loading || !task.trim()}>
+              {loading ? 'Starting...' : 'Start Workflow'}
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}
diff --git a/src/client/hooks/useSocket.ts b/src/client/hooks/useSocket.ts
index d40693b..ef4c7ad 100644
--- a/src/client/hooks/useSocket.ts
+++ b/src/client/hooks/useSocket.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react';
 import socket from '../socket';
-import type { AgentWithJob, Job, Project, Question, FileLock, AgentOutput, QueueSnapshot, Debate, Discussion, Proposal } from '@shared/types';
+import type { AgentWithJob, Job, Project, Question, FileLock, AgentOutput, QueueSnapshot, Debate, Workflow, Discussion, Proposal } from '@shared/types';
 
 interface SocketHandlers {
   onSnapshot: (snapshot: QueueSnapshot) => void;
@@ -16,6 +16,8 @@ interface SocketHandlers {
   onProjectNew?: (project: Project) => void;
   onDebateNew?: (debate: Debate) => void;
   onDebateUpdate?: (debate: Debate) => void;
+  onWorkflowNew?: (workflow: Workflow) => void;
+  onWorkflowUpdate?: (workflow: Workflow) => void;
   onDiscussionNew?: (discussion: Discussion) => void;
   onDiscussionUpdate?: (discussion: Discussion) => void;
   onProposalNew?: (proposal: Proposal) => void;
@@ -47,6 +49,8 @@ export function useSocket(handlers: SocketHandlers): void {
       h('project:new', ({ project }: { project: Project }) => ref.current.onProjectNew?.(project)),
       h('debate:new', ({ debate }: { debate: Debate }) => ref.current.onDebateNew?.(debate)),
       h('debate:update', ({ debate }: { debate: Debate }) => ref.current.onDebateUpdate?.(debate)),
+      h('workflow:new', ({ workflow }: { workflow: Workflow }) => ref.current.onWorkflowNew?.(workflow)),
+      h('workflow:update', ({ workflow }: { workflow: Workflow }) => ref.current.onWorkflowUpdate?.(workflow)),
       h('warning:new', (payload: any) => (ref.current as any).onWarningNew?.(payload)),
       h('eye:discussion:new', ({ discussion }: { discussion: Discussion }) => ref.current.onDiscussionNew?.(discussion)),
       h('eye:discussion:update', ({ discussion }: { discussion: Discussion }) => ref.current.onDiscussionUpdate?.(discussion)),
diff --git a/src/client/hooks/useWorkflows.ts b/src/client/hooks/useWorkflows.ts
new file mode 100644
index 0000000..ef97566
--- /dev/null
+++ b/src/client/hooks/useWorkflows.ts
@@ -0,0 +1,20 @@
+import { useState, useCallback } from 'react';
+import type { Workflow } from '@shared/types';
+
+export function useWorkflows() {
+  const [workflows, setWorkflows] = useState<Workflow[]>([]);
+
+  const setInitial = useCallback((initial: Workflow[]) => {
+    setWorkflows(initial);
+  }, []);
+
+  const addWorkflow = useCallback((workflow: Workflow) => {
+    setWorkflows(prev => [workflow, ...prev]);
+  }, []);
+
+  const updateWorkflow = useCallback((workflow: Workflow) => {
+    setWorkflows(prev => prev.map(w => w.id === workflow.id ? workflow : w));
+  }, []);
+
+  return { workflows, setInitial, addWorkflow, updateWorkflow };
+}
diff --git a/src/client/styles/globals.css b/src/client/styles/globals.css
index c5db0ce..2877bf8 100644
--- a/src/client/styles/globals.css
+++ b/src/client/styles/globals.css
@@ -2803,3 +2803,51 @@ body {
 .eye-btn-approve:hover { background: var(--btn-primary-hover) !important; }
 .eye-btn-reject { background: none !important; color: var(--danger) !important; border: 1px solid var(--danger) !important; }
 .eye-btn-reject:hover { background: var(--danger-bg) !important; }
+
+/* ─── StopModePicker ──────────────────────────────────────────────────── */
+.stop-mode-buttons {
+  display: flex;
+  gap: 0;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  overflow: hidden;
+  margin-bottom: 8px;
+}
+.stop-mode-btn {
+  flex: 1;
+  padding: 6px 10px;
+  font-size: 12px;
+  background: var(--bg-secondary);
+  color: var(--text-body);
+  border: none;
+  border-right: 1px solid var(--border);
+  cursor: pointer;
+  transition: background 0.15s, color 0.15s;
+}
+.stop-mode-btn:last-child { border-right: none; }
+.stop-mode-btn:hover { background: var(--bg-hover); }
+.stop-mode-btn.active {
+  background: var(--btn-primary-bg);
+  color: white;
+  font-weight: 600;
+}
+.stop-mode-input { min-height: 32px; }
+.stop-mode-input input[type="number"] { width: 100%; }
+.stop-mode-prefixed-input {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+.stop-mode-prefix,
+.stop-mode-suffix {
+  font-size: 13px;
+  color: var(--text-muted);
+  font-weight: 500;
+  flex-shrink: 0;
+}
+.stop-mode-prefixed-input input { flex: 1; }
+.stop-mode-hint {
+  font-size: 12px;
+  color: var(--text-muted);
+  font-style: italic;
+}
diff --git a/src/server/api/jobs.ts b/src/server/api/jobs.ts
index e0642db..ece21bd 100644
--- a/src/server/api/jobs.ts
+++ b/src/server/api/jobs.ts
@@ -124,6 +124,8 @@ router.post('/', (req, res) => {
     priority: body.priority ?? 0,
     work_dir: body.workDir ?? null,
     max_turns: body.maxTurns ?? 50,
+    stop_mode: body.stopMode ?? 'turns',
+    stop_value: body.stopValue ?? (body.maxTurns ?? 50),
     model: body.model ?? null,
     template_id: body.templateId ?? null,
     depends_on: body.dependsOn?.length ? JSON.stringify(body.dependsOn) : null,
@@ -157,19 +159,7 @@ router.post('/', (req, res) => {
   }
 });
 
-// Short-TTL cache — when CPU is contended, prevents duplicate heavy work
-const jobsCache = new Map<string, { data: any; expires: number }>();
-const JOBS_CACHE_TTL = 1500; // 1.5s
-
 router.get('/', (req, res) => {
-  const now = Date.now();
-  const cacheKey = req.originalUrl;
-  const cached = jobsCache.get(cacheKey);
-  if (cached && now < cached.expires) {
-    res.json(cached.data);
-    return;
-  }
-
   let data: any;
   if (req.query.archived === '1' || req.query.archived === 'true') {
     const limit = req.query.limit ? parseInt(req.query.limit as string, 10) : undefined;
@@ -182,14 +172,6 @@ router.get('/', (req, res) => {
     const status = req.query.status as string | undefined;
     data = queries.listJobsSlim(status as any);
   }
-
-  jobsCache.set(cacheKey, { data, expires: now + JOBS_CACHE_TTL });
-  // Evict stale entries to prevent unbounded growth
-  if (jobsCache.size > 20) {
-    for (const [k, v] of jobsCache) {
-      if (now >= v.expires) jobsCache.delete(k);
-    }
-  }
   res.json(data);
 });
 
diff --git a/src/server/api/router.ts b/src/server/api/router.ts
index ef8baca..76881be 100644
--- a/src/server/api/router.ts
+++ b/src/server/api/router.ts
@@ -10,6 +10,7 @@ import searchRouter from './search.js';
 import batchTemplatesRouter from './batchTemplates.js';
 import settingsRouter from './settings.js';
 import debatesRouter from './debates.js';
+import workflowsRouter from './workflows.js';
 import worktreesRouter from './worktrees.js';
 import statsRouter from './stats.js';
 import knowledgeBaseRouter from './knowledgeBase.js';
@@ -30,6 +31,7 @@ router.use('/search', searchRouter);
 router.use('/batch-templates', batchTemplatesRouter);
 router.use('/settings', settingsRouter);
 router.use('/debates', debatesRouter);
+router.use('/workflows', workflowsRouter);
 router.use('/worktrees', worktreesRouter);
 router.use('/stats', statsRouter);
 router.use('/knowledge-base', knowledgeBaseRouter);
diff --git a/src/server/api/workflows.ts b/src/server/api/workflows.ts
new file mode 100644
index 0000000..10fac0b
--- /dev/null
+++ b/src/server/api/workflows.ts
@@ -0,0 +1,149 @@
+import { Router } from 'express';
+import { randomUUID } from 'crypto';
+import * as queries from '../db/queries.js';
+import * as socket from '../socket/SocketManager.js';
+import { startWorkflow, resumeWorkflow, cleanupWorktree } from '../orchestrator/WorkflowManager.js';
+import type { CreateWorkflowRequest, Workflow } from '../../shared/types.js';
+
+const router = Router();
+
+// GET /api/workflows — list all workflows
+router.get('/', (_req, res) => {
+  res.json(queries.listWorkflows());
+});
+
+// GET /api/workflows/:id — get single workflow with plan/worklog content
+router.get('/:id', (req, res) => {
+  const workflow = queries.getWorkflowById(req.params.id);
+  if (!workflow) { res.status(404).json({ error: 'not found' }); return; }
+
+  // Include plan and worklog notes in the response
+  const planNote = queries.getNote(`workflow/${workflow.id}/plan`);
+  const contractNote = queries.getNote(`workflow/${workflow.id}/contract`);
+  const worklogNotes = queries.listNotes(`workflow/${workflow.id}/worklog/`);
+  const worklogs: Array<{ key: string; value: string; updated_at: number }> = [];
+  for (const n of worklogNotes) {
+    const full = queries.getNote(n.key);
+    if (full) worklogs.push({ key: n.key, value: full.value, updated_at: full.updated_at });
+  }
+
+  res.json({
+    ...workflow,
+    plan: planNote?.value ?? null,
+    contract: contractNote?.value ?? null,
+    worklogs,
+  });
+});
+
+// GET /api/workflows/:id/jobs — list all jobs for a workflow
+router.get('/:id/jobs', (req, res) => {
+  const workflow = queries.getWorkflowById(req.params.id);
+  if (!workflow) { res.status(404).json({ error: 'not found' }); return; }
+  res.json(queries.getJobsForWorkflow(req.params.id));
+});
+
+// POST /api/workflows — create + start a new workflow
+router.post('/', (req, res) => {
+  const body = req.body as CreateWorkflowRequest;
+  if (!body.task?.trim()) {
+    res.status(400).json({ error: 'task is required' });
+    return;
+  }
+
+  const workflowId = randomUUID();
+  const now = Date.now();
+  const title = body.title?.trim() || `Workflow: ${body.task.trim().slice(0, 50)}`;
+  const maxCycles = Math.min(Math.max(body.maxCycles ?? 10, 1), 50);
+
+  // Create a project for this workflow
+  const project = queries.insertProject({
+    id: randomUUID(),
+    name: title,
+    description: `Plan/review/implement workflow`,
+    created_at: now,
+    updated_at: now,
+  });
+
+  const workflow: Workflow = {
+    id: workflowId,
+    title,
+    task: body.task.trim(),
+    work_dir: body.workDir?.trim() || null,
+    implementer_model: body.implementerModel?.trim() || 'claude-sonnet-4-6',
+    reviewer_model: body.reviewerModel?.trim() || 'codex',
+    max_cycles: maxCycles,
+    current_cycle: 0,
+    current_phase: 'idle',
+    status: 'running',
+    milestones_total: 0,
+    milestones_done: 0,
+    project_id: project.id,
+    max_turns_assess: body.maxTurnsAssess ?? 50,
+    max_turns_review: body.maxTurnsReview ?? 30,
+    max_turns_implement: body.maxTurnsImplement ?? 100,
+    stop_mode_assess: body.stopModeAssess ?? 'turns',
+    stop_value_assess: body.stopValueAssess ?? (body.maxTurnsAssess ?? 50),
+    stop_mode_review: body.stopModeReview ?? 'turns',
+    stop_value_review: body.stopValueReview ?? (body.maxTurnsReview ?? 30),
+    stop_mode_implement: body.stopModeImplement ?? 'turns',
+    stop_value_implement: body.stopValueImplement ?? (body.maxTurnsImplement ?? 100),
+    template_id: body.templateId?.trim() || null,
+    use_worktree: body.useWorktree === false ? 0 : 1,
+    worktree_path: null,
+    worktree_branch: null,
+    pr_url: null,
+    created_at: now,
+    updated_at: now,
+  };
+  queries.insertWorkflow(workflow);
+
+  const assessJob = startWorkflow(workflow);
+
+  socket.emitWorkflowNew(workflow);
+
+  res.status(201).json({ workflow, project, jobs: [assessJob] });
+});
+
+// POST /api/workflows/:id/cancel — cancel a running workflow
+router.post('/:id/cancel', (req, res) => {
+  const workflow = queries.getWorkflowById(req.params.id);
+  if (!workflow) { res.status(404).json({ error: 'not found' }); return; }
+  if (workflow.status !== 'running' && workflow.status !== 'blocked') {
+    res.status(400).json({ error: `Workflow is ${workflow.status}, cannot cancel` });
+    return;
+  }
+
+  const updated = queries.updateWorkflow(workflow.id, { status: 'cancelled' });
+  if (updated) socket.emitWorkflowUpdate(updated);
+
+  // Cancel any queued/running workflow jobs
+  const jobs = queries.getJobsForWorkflow(workflow.id);
+  for (const job of jobs) {
+    if (job.status === 'queued' || job.status === 'assigned') {
+      queries.updateJobStatus(job.id, 'cancelled');
+      const updatedJob = queries.getJobById(job.id);
+      if (updatedJob) socket.emitJobUpdate(updatedJob);
+    }
+  }
+
+  // Clean up the worktree (no PR for cancellations)
+  if (updated) cleanupWorktree(updated);
+
+  res.json(updated);
+});
+
+// POST /api/workflows/:id/resume — resume a blocked workflow
+router.post('/:id/resume', (req, res) => {
+  const workflow = queries.getWorkflowById(req.params.id);
+  if (!workflow) { res.status(404).json({ error: 'not found' }); return; }
+  if (workflow.status !== 'blocked') {
+    res.status(400).json({ error: `Workflow is ${workflow.status}, can only resume blocked workflows` });
+    return;
+  }
+
+  const job = resumeWorkflow(workflow);
+  const updated = queries.getWorkflowById(workflow.id);
+  res.json({ workflow: updated, jobs: [job] });
+});
+
+export default router;
diff --git a/src/server/db/database.ts b/src/server/db/database.ts
index 999e9ca..b5b55ca 100644
--- a/src/server/db/database.ts
+++ b/src/server/db/database.ts
@@ -64,7 +64,6 @@ export function initDb(dbPath: string): DatabaseSync {
     db.exec('ALTER TABLE jobs ADD COLUMN project_id TEXT REFERENCES projects(id)');
   }
   db.exec('CREATE INDEX IF NOT EXISTS idx_jobs_project ON jobs(project_id)');
-  db.exec('CREATE INDEX IF NOT EXISTS idx_jobs_archived ON jobs(archived_at)');
 
   const agentCols: string[] = (db.prepare('PRAGMA table_info(agents)').all() as any[]).map((r: any) => r.name);
   if (!agentCols.includes('parent_agent_id')) {
@@ -88,6 +87,12 @@ export function initDb(dbPath: string): DatabaseSync {
   if (!agentCols.includes('pending_wait_ids')) {
     db.exec('ALTER TABLE agents ADD COLUMN pending_wait_ids TEXT');
   }
+  if (!agentCols.includes('estimated_input_tokens')) {
+    db.exec('ALTER TABLE agents ADD COLUMN estimated_input_tokens INTEGER');
+  }
+  if (!agentCols.includes('estimated_output_tokens')) {
+    db.exec('ALTER TABLE agents ADD COLUMN estimated_output_tokens INTEGER');
+  }
 
   // FTS5 virtual table for full-text search across agent output
   db.exec(`
@@ -312,6 +317,7 @@ export function initDb(dbPath: string): DatabaseSync {
   if (!jobCols.includes('archived_at')) {
     db.exec('ALTER TABLE jobs ADD COLUMN archived_at INTEGER');
   }
+  db.exec('CREATE INDEX IF NOT EXISTS idx_jobs_archived ON jobs(archived_at)');
   if (!jobCols.includes('created_by_agent_id')) {
     db.exec('ALTER TABLE jobs ADD COLUMN created_by_agent_id TEXT');
   }
@@ -321,6 +327,14 @@ export function initDb(dbPath: string): DatabaseSync {
   if (!jobCols.includes('pre_debate_summary')) {
     db.exec('ALTER TABLE jobs ADD COLUMN pre_debate_summary TEXT');
   }
+  if (!jobCols.includes('stop_mode')) {
+    db.exec("ALTER TABLE jobs ADD COLUMN stop_mode TEXT NOT NULL DEFAULT 'turns'");
+  }
+  if (!jobCols.includes('stop_value')) {
+    db.exec('ALTER TABLE jobs ADD COLUMN stop_value REAL');
+    // Backfill: existing rows get stop_value = max_turns
+    db.exec("UPDATE jobs SET stop_value = max_turns WHERE stop_mode = 'turns' AND stop_value IS NULL");
+  }
 
   // ── Eye: Discussions ───────────────────────────────────────────────────────
   db.exec(`CREATE TABLE IF NOT EXISTS discussions (
@@ -387,6 +401,68 @@ export function initDb(dbPath: string): DatabaseSync {
   )`);
   db.exec('CREATE INDEX IF NOT EXISTS idx_pr_review_msgs_review ON pr_review_messages(review_id)');
 
+  // ── Workflows (structured plan/review/implement cycles) ─────────────────────
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS workflows (
+      id                  TEXT PRIMARY KEY,
+      title               TEXT NOT NULL,
+      task                TEXT NOT NULL,
+      work_dir            TEXT,
+      implementer_model   TEXT NOT NULL DEFAULT 'claude-sonnet-4-6',
+      reviewer_model      TEXT NOT NULL DEFAULT 'codex',
+      max_cycles          INTEGER NOT NULL DEFAULT 10,
+      current_cycle       INTEGER NOT NULL DEFAULT 0,
+      current_phase       TEXT NOT NULL DEFAULT 'idle',
+      status              TEXT NOT NULL DEFAULT 'running',
+      milestones_total    INTEGER NOT NULL DEFAULT 0,
+      milestones_done     INTEGER NOT NULL DEFAULT 0,
+      project_id          TEXT REFERENCES projects(id),
+      max_turns_assess    INTEGER NOT NULL DEFAULT 50,
+      max_turns_review    INTEGER NOT NULL DEFAULT 30,
+      max_turns_implement INTEGER NOT NULL DEFAULT 100,
+      template_id         TEXT REFERENCES templates(id),
+      use_worktree        INTEGER NOT NULL DEFAULT 1,
+      created_at          INTEGER NOT NULL,
+      updated_at          INTEGER NOT NULL
+    )
+  `);
+  db.exec('CREATE INDEX IF NOT EXISTS idx_workflows_status ON workflows(status)');
+
+  if (!jobCols.includes('workflow_id')) {
+    db.exec('ALTER TABLE jobs ADD COLUMN workflow_id TEXT REFERENCES workflows(id)');
+  }
+  if (!jobCols.includes('workflow_cycle')) {
+    db.exec('ALTER TABLE jobs ADD COLUMN workflow_cycle INTEGER');
+  }
+  if (!jobCols.includes('workflow_phase')) {
+    db.exec('ALTER TABLE jobs ADD COLUMN workflow_phase TEXT');
+  }
+  db.exec('CREATE INDEX IF NOT EXISTS idx_jobs_workflow ON jobs(workflow_id, workflow_cycle)');
+
+  // Workflow-level worktree columns (single worktree shared across all phases)
+  const workflowCols = db.prepare('PRAGMA table_info(workflows)').all().map((c: any) => c.name);
+  if (!workflowCols.includes('stop_mode_assess')) {
+    db.exec("ALTER TABLE workflows ADD COLUMN stop_mode_assess TEXT NOT NULL DEFAULT 'turns'");
+    db.exec('ALTER TABLE workflows ADD COLUMN stop_value_assess REAL');
+    db.exec("ALTER TABLE workflows ADD COLUMN stop_mode_review TEXT NOT NULL DEFAULT 'turns'");
+    db.exec('ALTER TABLE workflows ADD COLUMN stop_value_review REAL');
+    db.exec("ALTER TABLE workflows ADD COLUMN stop_mode_implement TEXT NOT NULL DEFAULT 'turns'");
+    db.exec('ALTER TABLE workflows ADD COLUMN stop_value_implement REAL');
+    // Backfill: existing rows get stop_value = max_turns per phase
+    db.exec("UPDATE workflows SET stop_value_assess = max_turns_assess WHERE stop_mode_assess = 'turns' AND stop_value_assess IS NULL");
+    db.exec("UPDATE workflows SET stop_value_review = max_turns_review WHERE stop_mode_review = 'turns' AND stop_value_review IS NULL");
+    db.exec("UPDATE workflows SET stop_value_implement = max_turns_implement WHERE stop_mode_implement = 'turns' AND stop_value_implement IS NULL");
+  }
+  if (!workflowCols.includes('worktree_path')) {
+    db.exec('ALTER TABLE workflows ADD COLUMN worktree_path TEXT');
+  }
+  if (!workflowCols.includes('worktree_branch')) {
+    db.exec('ALTER TABLE workflows ADD COLUMN worktree_branch TEXT');
+  }
+  if (!workflowCols.includes('pr_url')) {
+    db.exec('ALTER TABLE workflows ADD COLUMN pr_url TEXT');
+  }
+
   // ── Performance indexes ────────────────────────────────────────────────────
   db.exec('CREATE INDEX IF NOT EXISTS idx_agents_job_id ON agents(job_id)');
   db.exec("CREATE INDEX IF NOT EXISTS idx_jobs_context_eye ON jobs(status) WHERE json_extract(context, '$.eye') = 1");
diff --git a/src/server/db/queries.ts b/src/server/db/queries.ts
index 09bb1e2..e0f21a1 100644
--- a/src/server/db/queries.ts
+++ b/src/server/db/queries.ts
@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto';
 import { getDb } from './database.js';
-import type { Job, Agent, AgentWithJob, ChildAgentSummary, Question, FileLock, AgentOutput, AgentOutputSegment, Template, Note, Project, BatchTemplate, Debate, DebateStatus, DebateRole, RetryPolicy, JobStatus, AgentStatus, SearchResult, AgentWarning, Worktree, Nudge, KBEntry, Review, TemplateModelStat, ReviewStatus, Discussion, DiscussionMessage, DiscussionStatus, DiscussionCategory, DiscussionPriority, Proposal, ProposalMessage, ProposalStatus, ProposalCategory, ProposalComplexity } from '../../shared/types.js';
+import type { Job, Agent, AgentWithJob, ChildAgentSummary, Question, FileLock, AgentOutput, AgentOutputSegment, Template, Note, Project, BatchTemplate, Debate, DebateStatus, DebateRole, RetryPolicy, JobStatus, AgentStatus, SearchResult, AgentWarning, Worktree, Nudge, KBEntry, Review, TemplateModelStat, ReviewStatus, Discussion, DiscussionMessage, DiscussionStatus, DiscussionCategory, DiscussionPriority, Proposal, ProposalMessage, ProposalStatus, ProposalCategory, ProposalComplexity, Workflow, WorkflowStatus, WorkflowPhase, StopMode } from '../../shared/types.js';
 
 // node:sqlite returns null-prototype objects; shallow-copy to a regular object.
 // SQLite rows are always flat scalars so a shallow copy is sufficient and far
@@ -20,6 +20,8 @@ export function insertJob(job: {
   status?: JobStatus;
   work_dir?: string | null;
   max_turns?: number;
+  stop_mode?: StopMode;
+  stop_value?: number | null;
   model?: string | null;
   template_id?: string | null;
   depends_on?: string | null;
@@ -43,16 +45,21 @@ export function insertJob(job: {
   created_by_agent_id?: string | null;
   pre_debate_id?: string | null;
   pre_debate_summary?: string | null;
+  workflow_id?: string | null;
+  workflow_cycle?: number | null;
+  workflow_phase?: WorkflowPhase | null;
 }): Job {
   const db = getDb();
   const now = Date.now();
   db.prepare(`
-    INSERT INTO jobs (id, title, description, context, status, priority, work_dir, max_turns, model, template_id, depends_on, is_interactive, use_worktree, project_id, debate_id, debate_loop, debate_round, debate_role, scheduled_at, repeat_interval_ms, retry_policy, max_retries, retry_count, original_job_id, completion_checks, review_config, review_status, review_parent_job_id, created_by_agent_id, pre_debate_id, pre_debate_summary, created_at, updated_at)
-    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+    INSERT INTO jobs (id, title, description, context, status, priority, work_dir, max_turns, stop_mode, stop_value, model, template_id, depends_on, is_interactive, use_worktree, project_id, debate_id, debate_loop, debate_round, debate_role, scheduled_at, repeat_interval_ms, retry_policy, max_retries, retry_count, original_job_id, completion_checks, review_config, review_status, review_parent_job_id, created_by_agent_id, pre_debate_id, pre_debate_summary, workflow_id, workflow_cycle, workflow_phase, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
   `).run(
     job.id, job.title, job.description, job.context,
     job.status ?? 'queued', job.priority,
     job.work_dir ?? null, job.max_turns ?? 50,
+    job.stop_mode ?? 'turns',
+    job.stop_value ?? null,
     job.model ?? null,
     job.template_id ?? null,
     job.depends_on ?? null,
@@ -76,6 +83,9 @@ export function insertJob(job: {
     job.created_by_agent_id ?? null,
     job.pre_debate_id ?? null,
     job.pre_debate_summary ?? null,
+    job.workflow_id ?? null,
+    job.workflow_cycle ?? null,
+    job.workflow_phase ?? null,
     now, now
   );
   return getJobById(job.id)!;
@@ -122,7 +132,7 @@ export function listArchivedJobs(limit?: number, offset?: number): Job[] {
     }
   }
   const rows = db.prepare(sql).all(...args);
-  return rows.map(r => cast<Job>(r));
+  return rows.map((r: any) => cast<Job>(r));
 }
 
 export function listArchivedJobsSlim(limit?: number, offset?: number): Job[] {
@@ -170,7 +180,7 @@ export function listEyeJobs(): Job[] {
     ORDER BY created_at DESC
     LIMIT 200
   `).all();
-  return rows.map(r => cast<Job>(r));
+  return rows.map((r: any) => cast<Job>(r));
 }
 
 /**
@@ -399,7 +409,7 @@ export function listAgents(status?: AgentStatus): Agent[] {
   return rows.map((r: any) => cast<Agent>(r));
 }
 
-export function updateAgent(id: string, fields: Partial<Pick<Agent, 'status' | 'pid' | 'session_id' | 'exit_code' | 'error_message' | 'status_message' | 'output_read' | 'base_sha' | 'diff' | 'cost_usd' | 'duration_ms' | 'num_turns' | 'finished_at' | 'pending_wait_ids'>>): void {
+export function updateAgent(id: string, fields: Partial<Pick<Agent, 'status' | 'pid' | 'session_id' | 'exit_code' | 'error_message' | 'status_message' | 'output_read' | 'base_sha' | 'diff' | 'cost_usd' | 'duration_ms' | 'num_turns' | 'estimated_input_tokens' | 'estimated_output_tokens' | 'finished_at' | 'pending_wait_ids'>>): void {
   const db = getDb();
   const sets: string[] = ['updated_at = ?'];
   const values: unknown[] = [Date.now()];
@@ -411,6 +421,18 @@ export function updateAgent(id: string, fields: Partial<Pick<Agent, 'status' | '
   db.prepare(`UPDATE agents SET ${sets.join(', ')} WHERE id = ?`).run(...values);
 }
 
+/** Atomically add token counts to an agent's running totals. */
+export function accumulateAgentTokens(agentId: string, inputTokens: number, outputTokens: number): void {
+  const db = getDb();
+  db.prepare(`
+    UPDATE agents SET
+      estimated_input_tokens = COALESCE(estimated_input_tokens, 0) + ?,
+      estimated_output_tokens = COALESCE(estimated_output_tokens, 0) + ?,
+      updated_at = ?
+    WHERE id = ?
+  `).run(inputTokens, outputTokens, Date.now(), agentId);
+}
+
 export function listBatchAgents(status?: AgentStatus): Agent[] {
   const db = getDb();
   let rows: unknown[];
@@ -497,7 +519,7 @@ export function getAgentsWithJobForSnapshot(): AgentWithJob[] {
 
   // Jobs — one query
   const jobRows = db.prepare(`SELECT * FROM jobs WHERE id IN (${ph(jobIds.length)})`).all(...jobIds);
-  const jobMap = new Map(jobRows.map(r => { const j = cast<Job>(r); return [j.id, j]; }));
+  const jobMap = new Map<string, Job>(jobRows.map((r: any) => { const j = cast<Job>(r); return [j.id, j]; }));
 
   // Pending questions — one query
   const qRows = db.prepare(`SELECT * FROM questions WHERE agent_id IN (${ph(agentIds.length)}) AND status = 'pending'`).all(...agentIds);
@@ -550,7 +572,7 @@ export function getAgentsWithJobForSnapshot(): AgentWithJob[] {
   return agents.map(agent => {
     const job = jobMap.get(agent.job_id);
     if (!job) {
-      const stub: Job = { id: agent.job_id, title: '(deleted job)', description: '', context: null, status: 'failed', priority: 0, work_dir: null, max_turns: 0, model: null, template_id: null, depends_on: null, is_interactive: 0, use_worktree: 0, project_id: null, flagged: 0, debate_id: null, debate_round: null, debate_role: null, scheduled_at: null, repeat_interval_ms: null, retry_policy: 'none', max_retries: 0, retry_count: 0, original_job_id: null, completion_checks: null, review_config: null, review_status: null, review_parent_job_id: null, archived_at: null, created_at: 0, updated_at: 0 };
+      const stub: Job = { id: agent.job_id, title: '(deleted job)', description: '', context: null, status: 'failed', priority: 0, work_dir: null, max_turns: 0, stop_mode: 'turns', stop_value: null, model: null, template_id: null, depends_on: null, is_interactive: 0, use_worktree: 0, project_id: null, flagged: 0, debate_id: null, debate_loop: null, debate_round: null, debate_role: null, scheduled_at: null, repeat_interval_ms: null, retry_policy: 'none', max_retries: 0, retry_count: 0, original_job_id: null, completion_checks: null, review_config: null, review_status: null, review_parent_job_id: null, created_by_agent_id: null, pre_debate_id: null, pre_debate_summary: null, workflow_id: null, workflow_cycle: null, workflow_phase: null, archived_at: null, created_at: 0, updated_at: 0 };
       return { ...agent, diff: null, job: stub, template_name: null, pending_question: null, active_locks: [], child_agents: [], warnings: [] } as AgentWithJob;
     }
     return {
@@ -593,7 +615,7 @@ export function getAgentsForJobIds(jobIds: string[]): AgentWithJob[] {
   // Enrich with job data (same pattern as getAgentsWithJobForSnapshot)
   const agentJobIds = [...new Set(agents.map(a => a.job_id))];
   const jobRows = db.prepare(`SELECT * FROM jobs WHERE id IN (${ph(agentJobIds.length)})`).all(...agentJobIds);
-  const jobMap = new Map(jobRows.map(r => { const j = cast<Job>(r); return [j.id, j]; }));
+  const jobMap = new Map<string, Job>(jobRows.map((r: any) => { const j = cast<Job>(r); return [j.id, j]; }));
 
   const templateIds = [...new Set(jobRows.map((r: any) => r.template_id).filter(Boolean))];
   const templateMap = new Map<string, string>();
@@ -647,7 +669,7 @@ function enrichAgent(agent: Agent): AgentWithJob {
   const jobRow = db.prepare('SELECT * FROM jobs WHERE id = ?').get(agent.job_id);
   if (!jobRow) {
     // Job was deleted while agent still references it — return a stub
-    const stub: Job = { id: agent.job_id, title: '(deleted job)', description: '', context: null, status: 'failed', priority: 0, model: null, template_id: null, depends_on: null, is_interactive: 0, use_worktree: 0, project_id: null, flagged: 0, debate_id: null, debate_loop: null, debate_round: null, debate_role: null, scheduled_at: null, repeat_interval_ms: null, retry_policy: 'none', max_retries: 0, retry_count: 0, original_job_id: null, completion_checks: null, review_config: null, review_status: null, review_parent_job_id: null, created_by_agent_id: null, pre_debate_id: null, pre_debate_summary: null, archived_at: null, created_at: 0, updated_at: 0 };
+    const stub: Job = { id: agent.job_id, title: '(deleted job)', description: '', context: null, status: 'failed', priority: 0, work_dir: null, max_turns: 0, stop_mode: 'turns', stop_value: null, model: null, template_id: null, depends_on: null, is_interactive: 0, use_worktree: 0, project_id: null, flagged: 0, debate_id: null, debate_loop: null, debate_round: null, debate_role: null, scheduled_at: null, repeat_interval_ms: null, retry_policy: 'none', max_retries: 0, retry_count: 0, original_job_id: null, completion_checks: null, review_config: null, review_status: null, review_parent_job_id: null, created_by_agent_id: null, pre_debate_id: null, pre_debate_summary: null, workflow_id: null, workflow_cycle: null, workflow_phase: null, archived_at: null, created_at: 0, updated_at: 0 };
     return { ...agent, job: stub, template_name: null, pending_question: null, active_locks: [], child_agents: [], warnings: [] };
   }
   const job = cast<Job>(jobRow);
@@ -1396,7 +1418,7 @@ export function updateDebate(id: string, fields: Partial<Pick<Debate, 'current_r
 export function getJobsForDebate(debateId: string): Job[] {
   const db = getDb();
   const rows = db.prepare('SELECT * FROM jobs WHERE debate_id = ? ORDER BY debate_loop ASC, debate_round ASC, created_at ASC').all(debateId);
-  return rows.map(r => cast<Job>(r));
+  return rows.map((r: any) => cast<Job>(r));
 }
 
 export function getJobsForDebateRound(debateId: string, loop: number, round: number): Job[] {
@@ -2070,3 +2092,58 @@ export function getPrReviewsWithNewUserReplies(): any[] {
     ) ORDER BY pr.updated_at DESC
   `).all().map((r: any) => cast<any>(r));
 }
+
+// ─── Workflows ────────────────────────────────────────────────────────────────
+
+export function insertWorkflow(workflow: Workflow): Workflow {
+  const db = getDb();
+  db.prepare(`
+    INSERT INTO workflows (id, title, task, work_dir, implementer_model, reviewer_model, max_cycles, current_cycle, current_phase, status, milestones_total, milestones_done, project_id, max_turns_assess, max_turns_review, max_turns_implement, stop_mode_assess, stop_value_assess, stop_mode_review, stop_value_review, stop_mode_implement, stop_value_implement, template_id, use_worktree, worktree_path, worktree_branch, pr_url, created_at, updated_at)
+    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+  `).run(
+    workflow.id, workflow.title, workflow.task, workflow.work_dir,
+    workflow.implementer_model, workflow.reviewer_model,
+    workflow.max_cycles, workflow.current_cycle, workflow.current_phase, workflow.status,
+    workflow.milestones_total, workflow.milestones_done,
+    workflow.project_id,
+    workflow.max_turns_assess, workflow.max_turns_review, workflow.max_turns_implement,
+    workflow.stop_mode_assess, workflow.stop_value_assess ?? null,
+    workflow.stop_mode_review, workflow.stop_value_review ?? null,
+    workflow.stop_mode_implement, workflow.stop_value_implement ?? null,
+    workflow.template_id, workflow.use_worktree,
+    workflow.worktree_path ?? null, workflow.worktree_branch ?? null, workflow.pr_url ?? null,
+    workflow.created_at, workflow.updated_at
+  );
+  return getWorkflowById(workflow.id)!;
+}
+
+export function getWorkflowById(id: string): Workflow | null {
+  const db = getDb();
+  const row = db.prepare('SELECT * FROM workflows WHERE id = ?').get(id);
+  return row ? cast<Workflow>(row) : null;
+}
+
+export function listWorkflows(): Workflow[] {
+  const db = getDb();
+  const rows = db.prepare('SELECT * FROM workflows ORDER BY created_at DESC').all();
+  return rows.map((r: any) => cast<Workflow>(r));
+}
+
+export function updateWorkflow(id: string, fields: Partial<Pick<Workflow, 'current_cycle' | 'current_phase' | 'status' | 'milestones_total' | 'milestones_done' | 'worktree_path' | 'worktree_branch' | 'pr_url' | 'stop_mode_assess' | 'stop_value_assess' | 'stop_mode_review' | 'stop_value_review' | 'stop_mode_implement' | 'stop_value_implement'>>): Workflow | null {
+  const db = getDb();
+  const sets: string[] = ['updated_at = ?'];
+  const values: unknown[] = [Date.now()];
+  for (const [k, v] of Object.entries(fields)) {
+    sets.push(`${k} = ?`);
+    values.push(v);
+  }
+  values.push(id);
+  db.prepare(`UPDATE workflows SET ${sets.join(', ')} WHERE id = ?`).run(...values);
+  return getWorkflowById(id);
+}
+
+export function getJobsForWorkflow(workflowId: string): Job[] {
+  const db = getDb();
+  const rows = db.prepare('SELECT * FROM jobs WHERE workflow_id = ? ORDER BY workflow_cycle ASC, created_at ASC').all(workflowId);
+  return rows.map((r: any) => cast<Job>(r));
+}
diff --git a/src/server/index.ts b/src/server/index.ts
index 1dfe13a..62cae1f 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -14,7 +14,7 @@ import { startHealthMonitor, stopHealthMonitor } from './orchestrator/HealthMoni
 import { startWorktreeCleanup, stopWorktreeCleanup } from './orchestrator/WorktreeCleanup.js';
 import { startKBConsolidator, stopKBConsolidator } from './orchestrator/KBConsolidator.js';
 import { startGitHubPoller, stopGitHubPoller } from './integrations/GitHubPoller.js';
-import { runRecovery } from './orchestrator/recovery.js';
+import { runRecovery, startWorkflowGapDetector, stopWorkflowGapDetector } from './orchestrator/recovery.js';
 import { writeInput, resizePty, resizeAndSnapshot } from './orchestrator/PtyManager.js';
 import * as queries from './db/queries.js';
 
@@ -86,6 +86,7 @@ async function main() {
       projects: queries.listProjects(),
       batchTemplates: queries.listBatchTemplates(),
       debates: queries.listDebates(),
+      workflows: queries.listWorkflows(),
       discussions: queries.listDiscussions(),
       proposals: queries.listProposals(),
     };
@@ -136,6 +137,7 @@ async function main() {
   startWatchdog();
   startHealthMonitor();
   startWorktreeCleanup();
+  startWorkflowGapDetector();
   startKBConsolidator();
   startGitHubPoller();
 
@@ -168,6 +170,7 @@ async function main() {
     stopWatchdog();
     stopHealthMonitor();
     stopWorktreeCleanup();
+    stopWorkflowGapDetector();
     stopKBConsolidator();
     stopGitHubPoller();
 
diff --git a/src/server/mcp/McpServer.ts b/src/server/mcp/McpServer.ts
index 6825b47..66343fa 100644
--- a/src/server/mcp/McpServer.ts
+++ b/src/server/mcp/McpServer.ts
@@ -29,6 +29,15 @@ const agentTransports: Map<string, Map<string, StreamableHTTPServerTransport>> =
  */
 export const orphanedWaits = new Map<string, { job_ids: string[]; disconnected_at: number }>();
 
+/**
+ * Agents whose MCP connection dropped while NOT in wait_for_jobs.
+ * agentId → timestamp of disconnect.
+ * Consumed by StuckJobWatchdog: if an agent stays disconnected for more than
+ * a grace period and is still "running", it's stuck (e.g. sleeping in a retry
+ * loop) and should be killed + restarted.
+ */
+export const disconnectedAgents = new Map<string, number>();
+
 export function hasActiveTransport(agentId: string): boolean {
   return agentTransports.has(agentId);
 }
@@ -46,6 +55,7 @@ export async function closeAllMcpSessions(): Promise<void> {
   }
   await Promise.all(promises);
   agentTransports.clear();
+  disconnectedAgents.clear();
 }
 
 function makeOnClose(agentId: string, transportMap: Map<string, StreamableHTTPServerTransport>, transport: { sessionId?: string }) {
@@ -60,7 +70,8 @@ function makeOnClose(agentId: string, transportMap: Map<string, StreamableHTTPSe
       abortAgentWait(agentId);
       orphanedWaits.set(agentId, { job_ids: [...waitingOn], disconnected_at: Date.now() });
     } else {
-      console.log(`[mcp] session closed: agent ${agentId}`);
+      console.warn(`[mcp] session closed: agent ${agentId} — registering as disconnected`);
+      disconnectedAgents.set(agentId, Date.now());
     }
   };
 }
@@ -112,8 +123,9 @@ export function createMcpApp(): express.Application {
         transport = transportMap.get(sessionId)!;
       } else if (!sessionId && isInitializeRequest(req.body)) {
         console.log(`[mcp] new session: agent ${agentId}`);
-        // Clear any orphaned wait — agent has reconnected
+        // Clear any orphaned wait / disconnect — agent has reconnected
         orphanedWaits.delete(agentId);
+        disconnectedAgents.delete(agentId);
         transport = new StreamableHTTPServerTransport({
           sessionIdGenerator: () => randomUUID(),
           enableJsonResponse: true,
@@ -129,8 +141,9 @@ export function createMcpApp(): express.Application {
       } else if (isInitializeRequest(req.body)) {
         // Re-initialization with a stale session ID (e.g. after server restart) — create fresh session
         console.log(`[mcp] re-initialize: agent ${agentId} (stale session)`);
-        // Clear any orphaned wait — agent has reconnected
+        // Clear any orphaned wait / disconnect — agent has reconnected
         orphanedWaits.delete(agentId);
+        disconnectedAgents.delete(agentId);
         transport = new StreamableHTTPServerTransport({
           sessionIdGenerator: () => randomUUID(),
           enableJsonResponse: true,
@@ -157,6 +170,7 @@ export function createMcpApp(): express.Application {
 
         console.warn(`[mcp] unknown session: agent ${agentId} session ${sessionId} — auto-recovering transport (server restart?)`);
         orphanedWaits.delete(agentId);
+        disconnectedAgents.delete(agentId);
 
         transport = new StreamableHTTPServerTransport({
           sessionIdGenerator: () => sessionId!,
diff --git a/src/server/mcp/tools/createJob.ts b/src/server/mcp/tools/createJob.ts
index e5233b5..094dcb0 100644
--- a/src/server/mcp/tools/createJob.ts
+++ b/src/server/mcp/tools/createJob.ts
@@ -9,7 +9,9 @@ export const createJobSchema = z.object({
   title: z.string().optional().describe('Short title (auto-generated from first line if omitted)'),
   priority: z.number().optional().describe('Priority 0–10; higher runs sooner (default: 0)'),
   work_dir: z.string().optional().describe("Working directory (defaults to this agent's working directory)"),
-  max_turns: z.number().optional().describe('Max agent turns (default: 50)'),
+  max_turns: z.number().optional().describe('Max agent turns (default: 50). Ignored when stop_mode is not "turns".'),
+  stop_mode: z.enum(['turns', 'budget', 'time', 'completion']).optional().describe('How to stop the agent: "turns" (default), "budget" (dollar limit), "time" (minute limit), or "completion" (run to natural finish)'),
+  stop_value: z.number().optional().describe('Limit value for the stop mode: turn count, dollar amount, or minutes. Not used for "completion".'),
   model: z.string().optional().describe('Model override, e.g. "claude-opus-4-6" (default: auto-classify)'),
   depends_on: z.array(z.string()).optional().describe('Job IDs that must complete before this job runs'),
   use_worktree: z.boolean().optional().describe('Create a git worktree so the agent works in an isolated checkout'),
@@ -17,7 +19,7 @@ export const createJobSchema = z.object({
 });
 
 export async function createJobHandler(agentId: string, input: z.infer<typeof createJobSchema>): Promise<string> {
-  const { description, title, priority, work_dir, max_turns, model, depends_on, use_worktree, repeat_interval_ms } = input;
+  const { description, title, priority, work_dir, max_turns, stop_mode, stop_value, model, depends_on, use_worktree, repeat_interval_ms } = input;
 
   // Inherit work_dir, project_id, and model from calling agent's job if not specified
   let resolvedWorkDir = work_dir ?? null;
@@ -73,6 +75,8 @@ export async function createJobHandler(agentId: string, input: z.infer<typeof cr
     priority: priority ?? 0,
     work_dir: resolvedWorkDir,
     max_turns: max_turns ?? 50,
+    stop_mode: stop_mode ?? 'turns',
+    stop_value: stop_value ?? (max_turns ?? 50),
     model: model ?? inheritedModel,
     template_id: null,
     depends_on: depends_on?.length ? JSON.stringify(depends_on) : null,
diff --git a/src/server/mcp/tools/eye.ts b/src/server/mcp/tools/eye.ts
index 24c9873..31ae8a7 100644
--- a/src/server/mcp/tools/eye.ts
+++ b/src/server/mcp/tools/eye.ts
@@ -235,7 +235,7 @@ export async function reportPrHandler(agentId: string, input: z.infer<typeof rep
   const { url, title, description, proposal_id } = input;
 
   const id = randomUUID();
-  const pr = { id, url, title, description: description ?? null, proposal_id: proposal_id ?? null, status: 'draft', created_at: Date.now() };
+  const pr: import('../../../shared/types.js').Pr = { id, url, title, description: description ?? null, proposal_id: proposal_id ?? null, status: 'draft', created_at: Date.now() };
   queries.upsertNote(`pr:${id}`, JSON.stringify(pr), agentId);
   socket.emitPrNew(pr);
 
diff --git a/src/server/orchestrator/AgentRunner.ts b/src/server/orchestrator/AgentRunner.ts
index 2efd962..555e38d 100644
--- a/src/server/orchestrator/AgentRunner.ts
+++ b/src/server/orchestrator/AgentRunner.ts
@@ -6,11 +6,12 @@ import * as queries from '../db/queries.js';
 import * as socket from '../socket/SocketManager.js';
 import { getFileLockRegistry } from './FileLockRegistry.js';
 import { onJobCompleted as debateOnJobCompleted } from './DebateManager.js';
+import { onJobCompleted as workflowOnJobCompleted } from './WorkflowManager.js';
 import { runCompletionChecks } from './CompletionChecks.js';
 import { handleRetry } from './RetryManager.js';
 import { triageLearnings } from './MemoryTriager.js';
 import type { Job, ClaudeStreamEvent, CodexStreamEvent } from '../../shared/types.js';
-import { isCodexModel, codexModelName } from '../../shared/types.js';
+import { isCodexModel, codexModelName, effectiveMaxTurns } from '../../shared/types.js';
 import { buildEyePrompt, isEyeJob } from './EyeConfig.js';
 import { ensureCodexTrusted } from './PtyManager.js';
 
@@ -181,7 +182,9 @@ export function runAgent(options: RunOptions): void {
   const errFd = fs.openSync(errPath, 'w');
 
   const workDir = (job as any).work_dir ?? process.cwd();
-  const maxTurns = (job as any).max_turns ?? 50;
+  const stopMode = (job as any).stop_mode ?? 'turns';
+  const stopValue = (job as any).stop_value ?? null;
+  const maxTurns = effectiveMaxTurns(stopMode, stopValue);
   const model: string | null = (job as any).model ?? null;
   const useCodex = isCodexModel(model);
   if (useCodex) ensureCodexTrusted(workDir);
@@ -523,6 +526,7 @@ export async function handleJobCompletion(
     try { socket.emitJobUpdate(updatedJob); } catch (err) { console.error(`[agent ${agentId}] emitJobUpdate error:`, err); }
     // If this job is part of a debate, check if the round is complete
     try { debateOnJobCompleted(updatedJob); } catch (err) { console.error(`[agent ${agentId}] debateOnJobCompleted error:`, err); }
+    try { workflowOnJobCompleted(updatedJob); } catch (err) { console.error(`[agent ${agentId}] workflowOnJobCompleted error:`, err); }
     // If the job has a repeat interval, queue the next run regardless of success/failure
     if (updatedJob.repeat_interval_ms) {
       try {
@@ -728,10 +732,47 @@ function handleStreamEvent(agentId: string, event: ClaudeStreamEvent | CodexStre
     queries.updateAgent(agentId, { session_id: (event as CodexStreamEvent).thread_id });
   }
 
+  // Token accumulation for cost estimation (budget stop mode)
+  extractAndAccumulateTokens(agentId, event, raw);
+
   const latestRow = queries.getLatestAgentOutput(agentId);
   if (latestRow) socket.emitAgentOutput(agentId, latestRow);
 }
 
+/**
+ * Extract token usage from Claude assistant events and Codex usage events,
+ * then accumulate on the agent row for cost estimation.
+ */
+function extractAndAccumulateTokens(agentId: string, event: ClaudeStreamEvent | CodexStreamEvent, raw: string): void {
+  let inputTokens = 0;
+  let outputTokens = 0;
+
+  if (event.type === 'assistant') {
+    // Claude assistant events carry usage in the raw JSON (not on the typed interface)
+    try {
+      const parsed = JSON.parse(raw);
+      const usage = parsed.usage;
+      if (usage) {
+        inputTokens = (usage.input_tokens ?? 0)
+          + (usage.cache_creation_input_tokens ?? 0)
+          + (usage.cache_read_input_tokens ?? 0);
+        outputTokens = usage.output_tokens ?? 0;
+      }
+    } catch { /* malformed JSON — skip */ }
+  }
+
+  // Codex emits a top-level usage object on certain events
+  const codexUsage = (event as CodexStreamEvent).usage;
+  if (codexUsage) {
+    inputTokens = (codexUsage.input_tokens ?? 0) + (codexUsage.cached_input_tokens ?? 0);
+    outputTokens = codexUsage.output_tokens ?? 0;
+  }
+
+  if (inputTokens > 0 || outputTokens > 0) {
+    queries.accumulateAgentTokens(agentId, inputTokens, outputTokens);
+  }
+}
+
 function storeOutput(agentId: string, seq: number, eventType: string, content: string): void {
   queries.insertAgentOutput({
     agent_id: agentId,
diff --git a/src/server/orchestrator/CostEstimator.ts b/src/server/orchestrator/CostEstimator.ts
new file mode 100644
index 0000000..9a9fae0
--- /dev/null
+++ b/src/server/orchestrator/CostEstimator.ts
@@ -0,0 +1,42 @@
+/**
+ * Estimate USD cost from model + token counts.
+ *
+ * Pricing is per million tokens. We use regular (non-cached) input pricing
+ * which slightly overestimates when cache reads are involved — safe direction
+ * for budget enforcement.
+ */
+
+interface ModelPricing {
+  inputPerMillion: number;
+  outputPerMillion: number;
+}
+
+// Pricing as of May 2025 — update when Anthropic changes rates.
+const PRICING: Record<string, ModelPricing> = {
+  'claude-opus-4-6':         { inputPerMillion: 15,  outputPerMillion: 75 },
+  'claude-opus-4-6[1m]':     { inputPerMillion: 15,  outputPerMillion: 75 },
+  'claude-sonnet-4-6':       { inputPerMillion: 3,   outputPerMillion: 15 },
+  'claude-sonnet-4-6[1m]':   { inputPerMillion: 3,   outputPerMillion: 15 },
+  'claude-haiku-4-5-20251001': { inputPerMillion: 0.80, outputPerMillion: 4 },
+};
+
+// Default fallback — Sonnet pricing
+const DEFAULT_PRICING: ModelPricing = { inputPerMillion: 3, outputPerMillion: 15 };
+
+function getPricing(model: string | null): ModelPricing {
+  if (!model) return DEFAULT_PRICING;
+  return PRICING[model] ?? DEFAULT_PRICING;
+}
+
+/**
+ * Estimate cost in USD given a model and accumulated token counts.
+ */
+export function estimateCostUsd(
+  model: string | null,
+  inputTokens: number,
+  outputTokens: number,
+): number {
+  const p = getPricing(model);
+  return (inputTokens / 1_000_000) * p.inputPerMillion
+       + (outputTokens / 1_000_000) * p.outputPerMillion;
+}
diff --git a/src/server/orchestrator/DebateManager.ts b/src/server/orchestrator/DebateManager.ts
index 99ddd48..0c4ca78 100644
--- a/src/server/orchestrator/DebateManager.ts
+++ b/src/server/orchestrator/DebateManager.ts
@@ -25,6 +25,11 @@ export function onJobCompleted(job: Job): void {
 // since all calls happen in the same Node.js process (single-threaded).
 const _processedJobs = new Set<string>();
 
+/** Clear module-level dedup state. Test-only — call in beforeEach to ensure per-test independence. */
+export function _resetForTest(): void {
+  _processedJobs.clear();
+}
+
 function _onJobCompleted(job: Job): void {
   // Guard against double-call from PID poll + PTY onExit race
   if (_processedJobs.has(job.id)) return;
diff --git a/src/server/orchestrator/HealthMonitor.ts b/src/server/orchestrator/HealthMonitor.ts
index 0599841..1bbb5da 100644
--- a/src/server/orchestrator/HealthMonitor.ts
+++ b/src/server/orchestrator/HealthMonitor.ts
@@ -3,6 +3,11 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as queries from '../db/queries.js';
 import * as socket from '../socket/SocketManager.js';
+import { estimateCostUsd } from './CostEstimator.js';
+import { getFileLockRegistry } from './FileLockRegistry.js';
+import { onJobCompleted as debateOnJobCompleted } from './DebateManager.js';
+import { onJobCompleted as workflowOnJobCompleted } from './WorkflowManager.js';
+import type { StopMode } from '../../shared/types.js';
 
 const PTY_LOG_DIR = path.join(process.cwd(), 'data', 'agent-logs');
 
@@ -10,6 +15,7 @@ const TICK_INTERVAL_MS = 30_000;
 const STALL_THRESHOLD_MS = 10 * 60 * 1000;  // 10 minutes
 const LONG_RUNNING_THRESHOLD_MS = 60 * 60 * 1000;  // 60 minutes
 const TURN_WARNING_RATIO = 0.8;  // warn at 80% of max_turns
+const LIMIT_WARNING_RATIO = 0.8;  // warn at 80% of budget/time limit
 
 let _timer: NodeJS.Timeout | null = null;
 
@@ -89,7 +95,86 @@ function tick(): void {
         emitWarning(agent.id, 'long_running', `Running for ${mins} minutes`);
       }
     }
+
+    // ── Budget enforcement (stop_mode === 'budget') ──────────────────────
+    const stopMode: StopMode = (job as any).stop_mode ?? 'turns';
+    const stopValue: number | null = (job as any).stop_value ?? null;
+
+    if (stopMode === 'budget' && stopValue != null) {
+      const inputTokens = agent.estimated_input_tokens ?? 0;
+      const outputTokens = agent.estimated_output_tokens ?? 0;
+      const model: string | null = (job as any).model ?? null;
+      const estimated = estimateCostUsd(model, inputTokens, outputTokens);
+      const ratio = estimated / stopValue;
+
+      if (ratio >= 1.0) {
+        console.log(`[health] agent ${agent.id.slice(0, 6)} hit budget limit ($${estimated.toFixed(2)} >= $${stopValue.toFixed(2)}) — stopping gracefully`);
+        killAgentGracefully(agent.id, `Budget limit reached ($${estimated.toFixed(2)}/$${stopValue.toFixed(2)})`);
+      } else if (ratio >= LIMIT_WARNING_RATIO && !queries.hasUndismissedWarning(agent.id, 'budget_warning')) {
+        emitWarning(agent.id, 'budget_warning', `Estimated cost $${estimated.toFixed(2)} (${Math.round(ratio * 100)}% of $${stopValue.toFixed(2)} limit)`);
+      }
+    }
+
+    // ── Time enforcement (stop_mode === 'time') ──────────────────────────
+    if (stopMode === 'time' && stopValue != null && agent.started_at) {
+      const limitMs = stopValue * 60 * 1000; // stopValue is in minutes
+      const elapsed = now - agent.started_at;
+      const ratio = elapsed / limitMs;
+
+      if (ratio >= 1.0) {
+        const mins = Math.round(elapsed / 60_000);
+        console.log(`[health] agent ${agent.id.slice(0, 6)} hit time limit (${mins}min >= ${stopValue}min) — stopping gracefully`);
+        killAgentGracefully(agent.id, `Time limit reached (${mins}/${stopValue} minutes)`);
+      } else if (ratio >= LIMIT_WARNING_RATIO && !queries.hasUndismissedWarning(agent.id, 'time_warning')) {
+        const mins = Math.round(elapsed / 60_000);
+        emitWarning(agent.id, 'time_warning', `Running ${mins} minutes (${Math.round(ratio * 100)}% of ${stopValue}min limit)`);
+      }
+    }
+  }
+}
+
+/**
+ * Gracefully stop an agent that has hit a budget or time limit.
+ * Marks as done (not failed) — the limit was expected, not an error.
+ */
+function killAgentGracefully(agentId: string, reason: string): void {
+  const agent = queries.getAgentById(agentId);
+  if (!agent) return;
+
+  // Kill the process
+  if (agent.pid != null) {
+    try {
+      process.kill(-agent.pid, 'SIGTERM');
+    } catch { /* already gone */ }
+  }
+
+  // Mark agent as done with a status message explaining the stop
+  queries.updateAgent(agentId, {
+    status: 'done',
+    status_message: reason,
+    finished_at: Date.now(),
+  });
+
+  // Mark job as done (limit reached is a successful stop, not a failure)
+  queries.updateJobStatus(agent.job_id, 'done');
+
+  // Release all file locks held by this agent
+  getFileLockRegistry().releaseAll(agentId);
+
+  // Emit updates
+  const agentWithJob = queries.getAgentWithJob(agentId);
+  if (agentWithJob) {
+    try { socket.emitAgentUpdate(agentWithJob); } catch { /* ignore */ }
+  }
+  const updatedJob = queries.getJobById(agent.job_id);
+  if (updatedJob) {
+    try { socket.emitJobUpdate(updatedJob); } catch { /* ignore */ }
+    // Trigger workflow/debate handlers so phases advance immediately
+    try { debateOnJobCompleted(updatedJob); } catch { /* ignore */ }
+    try { workflowOnJobCompleted(updatedJob); } catch { /* ignore */ }
   }
+
+  console.log(`[health] agent ${agentId.slice(0, 6)} stopped: ${reason}`);
 }
 
 function emitWarning(agentId: string, type: string, message: string): void {
diff --git a/src/server/orchestrator/PtyManager.ts b/src/server/orchestrator/PtyManager.ts
index 8dec190..a8be0c0 100644
--- a/src/server/orchestrator/PtyManager.ts
+++ b/src/server/orchestrator/PtyManager.ts
@@ -7,7 +7,7 @@ import * as queries from '../db/queries.js';
 import * as socket from '../socket/SocketManager.js';
 import { SYSTEM_PROMPT, HOOK_SETTINGS, handleJobCompletion, cancelledAgents, startTailing, stopTailing, readClaudeMd, buildMemorySection } from './AgentRunner.js';
 import type { Job } from '../../shared/types.js';
-import { isCodexModel, codexModelName } from '../../shared/types.js';
+import { isCodexModel, codexModelName, isAutoExitJob } from '../../shared/types.js';
 
 const CLAUDE = process.env.CLAUDE_BIN ?? 'claude';
 const CODEX = process.env.CODEX_BIN ?? 'codex';
@@ -187,9 +187,9 @@ export function startInteractiveAgent({ agentId, job, cols = 100, rows = 50, res
   const useCodex = isCodexModel(model);
   if (useCodex) ensureCodexTrusted(workDir);
 
-  // Debate-stage jobs (post_action, verification_*) run Claude with --print so the process
-  // exits automatically when the task is done, triggering the next verification stage.
-  const isDebateStage = !!(job as any).debate_role;
+  // Debate-stage and workflow-phase jobs run Claude with --print so the process
+  // exits automatically when the task is done, triggering the next stage.
+  const isDebateStage = isAutoExitJob(job as any);
 
   let execLine: string;
   if (useCodex) {
@@ -365,7 +365,7 @@ export function attachPty(agentId: string, job: Job, cols = 100, rows = 50): voi
 
   // For debate-stage agents running --print, start tailing the tee'd .ndjson file so
   // agent_output is populated live and the UI streams output as it arrives.
-  if (!!(job as any).debate_role) {
+  if (isAutoExitJob(job as any)) {
     const ndjsonPath = path.join(PTY_LOG_DIR, `${agentId}.ndjson`);
     startTailing(agentId, job, ndjsonPath, 0, null);
   }
@@ -404,6 +404,13 @@ export function attachPty(agentId: string, job: Job, cols = 100, rows = 50): voi
       })(),
     });
   } catch (err: any) {
+    // For auto-exit jobs (workflow/debate phases), tailing is already running above —
+    // the job will complete naturally when Claude finishes and calls finish_job.
+    // PTY attachment is visual-only for these jobs, so log a warning and carry on.
+    if (isAutoExitJob(job as any)) {
+      console.warn(`[pty ${agentId}] PTY attach failed (tailing continues):`, err.message);
+      return;
+    }
     console.error(`[pty ${agentId}] failed to spawn PTY:`, err.message);
     queries.updateAgent(agentId, { status: 'failed', error_message: err.message, finished_at: Date.now() });
     queries.updateJobStatus(job.id, 'failed');
@@ -455,11 +462,11 @@ export function attachPty(agentId: string, job: Job, cols = 100, rows = 50): voi
         // For interactive agents: user ended the session = done
         // For debate-stage jobs: --print mode exits naturally = done
         // For other non-interactive agents: tmux exit without finish_job = failed
-        const isDebateStage = !!(job as any).debate_role;
+        const isDebateStage = isAutoExitJob(job as any);
         const status = (job.is_interactive || isDebateStage) ? 'done' : 'failed';
         const errorMsg = (job.is_interactive || isDebateStage) ? null : 'Agent session ended without calling finish_job.';
 
-        // For debate-stage agents, stop the live tailer then flush any lines it missed
+        // For auto-exit agents, stop the live tailer then flush any lines it missed
         // in the small race window between the last poll and the PTY exit.
         if (isDebateStage) {
           stopTailing(agentId);
diff --git a/src/server/orchestrator/StuckJobWatchdog.ts b/src/server/orchestrator/StuckJobWatchdog.ts
index e789ccd..b19b0c7 100644
--- a/src/server/orchestrator/StuckJobWatchdog.ts
+++ b/src/server/orchestrator/StuckJobWatchdog.ts
@@ -1,7 +1,7 @@
 /**
  * StuckJobWatchdog — periodic runtime monitor for stuck/inconsistent agent state.
  *
- * Runs every 30 seconds and handles three failure modes:
+ * Runs every 30 seconds and handles four failure modes:
  *
  * 1. Dead agents: an agent's tmux session (or legacy PID) has died but the DB
  *    still shows it as running. Mark done/failed and release locks.
@@ -9,7 +9,10 @@
  * 2. Orphaned waits: agent MCP connection dropped while wait_for_jobs was active,
  *    and all waited jobs have since finished. Kill session and re-queue.
  *
- * 3. Job/agent inconsistency: a job is marked terminal but an agent row still
+ * 3. MCP-disconnected agents: agent lost MCP connection outside of wait_for_jobs
+ *    and hasn't reconnected within the grace period. Kill and re-queue.
+ *
+ * 4. Job/agent inconsistency: a job is marked terminal but an agent row still
  *    shows 'running'. Clean up the stale row.
  */
 
@@ -20,11 +23,12 @@ import * as queries from '../db/queries.js';
 import * as socket from '../socket/SocketManager.js';
 import { runAgent, getLogPath } from './AgentRunner.js';
 import { onJobCompleted as debateOnJobCompleted } from './DebateManager.js';
+import { onJobCompleted as workflowOnJobCompleted } from './WorkflowManager.js';
 import { getFileLockRegistry } from './FileLockRegistry.js';
 import { isTmuxSessionAlive, startInteractiveAgent, saveSnapshot } from './PtyManager.js';
 import { handleRetry } from './RetryManager.js';
-import { orphanedWaits, hasActiveTransport } from '../mcp/McpServer.js';
-import { isCodexModel } from '../../shared/types.js';
+import { orphanedWaits, disconnectedAgents, hasActiveTransport } from '../mcp/McpServer.js';
+import { isCodexModel, isAutoExitJob } from '../../shared/types.js';
 
 const WATCHDOG_INTERVAL_MS = 30_000;
 
@@ -99,33 +103,35 @@ function check(): void {
     const pidAlive = agent.pid != null && isPidAlive(agent.pid);
 
     if (tmuxAlive || pidAlive) {
-      // Idle timeout: non-interactive tmux agents (Eye, worker agents) should be making
-      // MCP calls regularly. If updated_at hasn't changed in IDLE_THRESHOLD_MS and there's
-      // no active wait_for_jobs, the agent is likely stuck at Claude's ❯ prompt and will
-      // never call finish_job — kill and restart.
-      const IDLE_THRESHOLD_MS = 90 * 60 * 1000; // 90 minutes
-      if (tmuxAlive && agent.pid == null && !agent.pending_wait_ids) {
+      // Idle timeout: non-interactive agents should be making MCP calls regularly.
+      // If updated_at hasn't changed in IDLE_THRESHOLD_MS and there's no active
+      // wait_for_jobs, the agent is likely stuck (e.g. at Claude's ❯ prompt, or in
+      // a sleep-retry loop after MCP disconnect) — kill and restart.
+      const IDLE_THRESHOLD_MS = 20 * 60 * 1000; // 20 minutes
+      if ((tmuxAlive || pidAlive) && !agent.pending_wait_ids) {
         const idleJob = queries.getJobById(agent.job_id);
-        const isStuckCandidate = idleJob && !idleJob.is_interactive && !(idleJob as any).debate_role;
+        const isStuckCandidate = idleJob && !idleJob.is_interactive && !isAutoExitJob(idleJob as any);
         const idleMs = Date.now() - agent.updated_at;
         if (isStuckCandidate && idleMs > IDLE_THRESHOLD_MS) {
-          console.warn(`[watchdog] non-interactive tmux agent ${agent.id} idle ${Math.round(idleMs / 60000)}min without MCP activity — killing stale session`);
-          saveSnapshot(agent.id);
-          try {
-            execFileSync('tmux', ['kill-session', '-t', `orchestrator-${agent.id}`], { stdio: 'pipe' });
-          } catch { /* already gone */ }
+          console.warn(`[watchdog] non-interactive agent ${agent.id} idle ${Math.round(idleMs / 60000)}min without MCP activity — killing`);
+          if (tmuxAlive) {
+            saveSnapshot(agent.id);
+            try { execFileSync('tmux', ['kill-session', '-t', `orchestrator-${agent.id}`], { stdio: 'pipe' }); } catch { /* already gone */ }
+          }
+          if (agent.pid != null) killProcess(agent.pid);
           queries.updateAgent(agent.id, {
             status: 'failed',
-            error_message: `Agent idle ${Math.round(idleMs / 60000)}min without MCP activity; watchdog killed stale session.`,
+            error_message: `Agent idle ${Math.round(idleMs / 60000)}min without MCP activity; watchdog killed.`,
             finished_at: Date.now(),
           });
           queries.updateJobStatus(agent.job_id, 'failed');
           getFileLockRegistry().releaseAll(agent.id);
+          disconnectedAgents.delete(agent.id);
           const pendingQ = queries.getPendingQuestion(agent.id);
           if (pendingQ) {
             queries.updateQuestion(pendingQ.id, {
               status: 'timeout',
-              answer: '[TIMEOUT] Agent went idle; watchdog killed stale session.',
+              answer: '[TIMEOUT] Agent went idle; watchdog killed.',
               answered_at: Date.now(),
             });
           }
@@ -134,6 +140,7 @@ function check(): void {
           const idleJobFresh = queries.getJobById(agent.job_id);
           if (idleJobFresh) {
             try { socket.emitJobUpdate(idleJobFresh); } catch { /* ignore */ }
+            try { workflowOnJobCompleted(idleJobFresh); } catch { /* ignore */ }
             if (idleJobFresh.repeat_interval_ms) {
               try {
                 const nextJob = queries.scheduleRepeatJob(idleJobFresh);
@@ -215,7 +222,7 @@ function check(): void {
     } else {
       // Tmux-based agent: session ended without finish_job being called.
       // Interactive or debate-stage → done; other non-interactive → failed.
-      const isDebateStage = !!(job as any)?.debate_role;
+      const isDebateStage = job ? isAutoExitJob(job as any) : false;
       const finalStatus = (job?.is_interactive || isDebateStage) ? 'done' : 'failed';
       console.log(
         `[watchdog] agent ${agent.id} (tmux-based) — session gone, marking ${finalStatus}`
@@ -243,11 +250,12 @@ function check(): void {
     const updatedAgent = queries.getAgentWithJob(agent.id);
     if (updatedAgent) socket.emitAgentUpdate(updatedAgent);
 
-    // If this job belongs to a debate, trigger the debate state machine
+    // Trigger debate/workflow state machines for the completed job
     const updatedJob = queries.getJobById(agent.job_id);
     if (updatedJob) {
       try { socket.emitJobUpdate(updatedJob); } catch (err) { console.error(`[watchdog] emitJobUpdate error:`, err); }
       try { debateOnJobCompleted(updatedJob); } catch (err) { console.error(`[watchdog] debateOnJobCompleted error:`, err); }
+      try { workflowOnJobCompleted(updatedJob); } catch (err) { console.error(`[watchdog] workflowOnJobCompleted error:`, err); }
       // For repeat jobs (e.g. Eye cycles), schedule the next run so the cycle continues
       if (updatedJob.repeat_interval_ms) {
         try {
@@ -350,7 +358,83 @@ function check(): void {
     console.log(`[watchdog] re-spawned agent ${newAgentId} for job ${job.id}`);
   }
 
-  // ── Check 3: Job/agent inconsistency ───────────────────────────────────────
+  // ── Check 3: MCP-disconnected agents (not in wait_for_jobs) ────────────────
+  // When an MCP session closes and the agent was NOT in wait_for_jobs, it's
+  // tracked in disconnectedAgents. If the agent hasn't reconnected within the
+  // grace period, it's stuck in a sleep-retry loop and should be killed + restarted.
+  const MCP_DISCONNECT_GRACE_MS = 120_000; // 2 minutes
+  for (const [agentId, disconnectedAt] of disconnectedAgents) {
+    if (Date.now() - disconnectedAt < MCP_DISCONNECT_GRACE_MS) continue;
+
+    // Agent reconnected? Clear and skip
+    if (hasActiveTransport(agentId)) {
+      disconnectedAgents.delete(agentId);
+      continue;
+    }
+
+    const agent = queries.getAgentById(agentId);
+    if (!agent || agent.status !== 'running') {
+      disconnectedAgents.delete(agentId);
+      continue;
+    }
+
+    const job = queries.getJobById(agent.job_id);
+    if (!job || TERMINAL.includes(job.status)) {
+      disconnectedAgents.delete(agentId);
+      continue;
+    }
+
+    const stuckMs = Date.now() - disconnectedAt;
+    console.warn(`[watchdog] agent ${agentId} MCP-disconnected ${Math.round(stuckMs / 1000)}s without reconnecting — killing and restarting job ${job.id}`);
+    disconnectedAgents.delete(agentId);
+
+    // Kill the session/process
+    if (isTmuxSessionAlive(agentId)) {
+      saveSnapshot(agentId);
+      try { execFileSync('tmux', ['kill-session', '-t', `orchestrator-${agentId}`], { stdio: 'pipe' }); } catch { /* already gone */ }
+    }
+    if (agent.pid != null) killProcess(agent.pid);
+
+    // Mark old agent failed
+    queries.updateAgent(agent.id, {
+      status: 'failed',
+      error_message: `MCP connection lost (not in wait_for_jobs); watchdog restarted after ${Math.round(stuckMs / 1000)}s.`,
+      finished_at: Date.now(),
+    });
+    queries.updateJobStatus(agent.job_id, 'failed');
+    getFileLockRegistry().releaseAll(agent.id);
+
+    const pendingQ = queries.getPendingQuestion(agent.id);
+    if (pendingQ) {
+      queries.updateQuestion(pendingQ.id, {
+        status: 'timeout',
+        answer: '[TIMEOUT] MCP connection lost; watchdog restarted agent.',
+        answered_at: Date.now(),
+      });
+    }
+
+    const updatedAgent = queries.getAgentWithJob(agent.id);
+    if (updatedAgent) socket.emitAgentUpdate(updatedAgent);
+
+    // Re-queue with a new agent
+    const newAgentId = randomUUID();
+    queries.insertAgent({ id: newAgentId, job_id: job.id, status: 'starting' });
+    queries.updateJobStatus(job.id, 'assigned');
+
+    const newAgentWithJob = queries.getAgentWithJob(newAgentId);
+    if (newAgentWithJob) socket.emitAgentNew(newAgentWithJob);
+    const updatedJob = queries.getJobById(job.id);
+    if (updatedJob) socket.emitJobUpdate(updatedJob);
+
+    if (job.is_interactive) {
+      startInteractiveAgent({ agentId: newAgentId, job });
+    } else {
+      runAgent({ agentId: newAgentId, job, resumeSessionId: agent.session_id ?? undefined });
+    }
+    console.log(`[watchdog] re-spawned agent ${newAgentId} for job ${job.id} (MCP disconnect recovery)`);
+  }
+
+  // ── Check 4: Job/agent inconsistency ───────────────────────────────────────
   // A job is in a terminal state but an agent row still shows 'running'.
   for (const agent of queries.listAllRunningAgents()) {
     const job = queries.getJobById(agent.job_id);
@@ -373,7 +457,7 @@ function check(): void {
     if (updatedAgent) socket.emitAgentUpdate(updatedAgent);
   }
 
-  // ── Check 5: Debates stuck in 'running' with no active jobs ─────────────────
+  // ── Check 6: Debates stuck in 'running' with no active jobs ─────────────────
   // Can happen when the server restarts after debate jobs finish but before the
   // state machine fires — recovery skips agents already in a terminal state so
   // the debate record is never advanced.
diff --git a/src/server/orchestrator/WorkQueueManager.ts b/src/server/orchestrator/WorkQueueManager.ts
index 0eddd4f..c8af319 100644
--- a/src/server/orchestrator/WorkQueueManager.ts
+++ b/src/server/orchestrator/WorkQueueManager.ts
@@ -7,7 +7,7 @@ import { runAgent } from './AgentRunner.js';
 import { startInteractiveAgent } from './PtyManager.js';
 import { resolveModel } from './ModelClassifier.js';
 import type { Job } from '../../shared/types.js';
-import { isCodexModel } from '../../shared/types.js';
+import { isCodexModel, isAutoExitJob } from '../../shared/types.js';
 
 let _maxConcurrent = Number(process.env.MAX_CONCURRENT_AGENTS ?? 20);
 const POLL_INTERVAL_MS = 2000;
@@ -83,9 +83,9 @@ async function tick(): Promise<void> {
     // Debate-stage jobs use --print inside tmux (piped through tee to .ndjson for UI display)
     // and exit naturally — no finish_job needed.
     const useCodexBatch = isCodexModel((dispatchJob as any).model ?? null) && !dispatchJob.is_interactive;
-    const isDebateStage = !!(dispatchJob as any).debate_role;
+    const isDebateStage = isAutoExitJob(dispatchJob as any);
     const autoFinish = !dispatchJob.is_interactive && !isDebateStage;
-    console.log(`[queue] dispatching "${job.title}" → agent ${agentId} (model: ${model}, interactive: ${!!readyJob.is_interactive}${readyJob.use_worktree ? ', worktree' : ''}${useCodexBatch ? ', codex-batch' : ''}${isDebateStage ? ', debate-stage' : ''})`);
+    console.log(`[queue] dispatching "${job.title}" → agent ${agentId} (model: ${model}, interactive: ${!!readyJob.is_interactive}${readyJob.use_worktree ? ', worktree' : ''}${useCodexBatch ? ', codex-batch' : ''}${isDebateStage ? ', auto-exit' : ''})`);
     if (useCodexBatch) {
       runAgent({ agentId, job: dispatchJob });
     } else {
diff --git a/src/server/orchestrator/WorkflowManager.ts b/src/server/orchestrator/WorkflowManager.ts
new file mode 100644
index 0000000..6a16442
--- /dev/null
+++ b/src/server/orchestrator/WorkflowManager.ts
@@ -0,0 +1,447 @@
+import { randomUUID } from 'crypto';
+import { execSync } from 'child_process';
+import { mkdirSync } from 'fs';
+import path from 'path';
+import * as queries from '../db/queries.js';
+import * as socket from '../socket/SocketManager.js';
+import type { Job, Workflow, WorkflowPhase, StopMode } from '../../shared/types.js';
+import { effectiveMaxTurns } from '../../shared/types.js';
+import { buildAssessPrompt, buildReviewPrompt, buildImplementPrompt } from './WorkflowPrompts.js';
+
+// Track jobs we've already processed to prevent double-exit race from triggering
+// duplicate spawns. Same pattern as DebateManager.
+const _processedJobs = new Set<string>();
+
+/**
+ * Called from AgentRunner.handleJobCompletion after a job's status is finalized.
+ * If the job belongs to a workflow, advances to the next phase or completes the workflow.
+ */
+export function onJobCompleted(job: Job, { force = false }: { force?: boolean } = {}): void {
+  if (!job.workflow_id) return;
+  if (!force && _processedJobs.has(job.id)) return;
+  _processedJobs.add(job.id);
+  // Prevent unbounded growth
+  if (_processedJobs.size > 500) {
+    const iter = _processedJobs.values();
+    for (let i = 0; i < 250; i++) iter.next();
+    // Keep the newer half
+    const keep = new Set<string>();
+    for (const v of iter) keep.add(v);
+    _processedJobs.clear();
+    for (const v of keep) _processedJobs.add(v);
+  }
+
+  try {
+    _onJobCompleted(job);
+  } catch (err) {
+    console.error(`[workflow] error handling job completion for job ${job.id}:`, err);
+  }
+}
+
+function _onJobCompleted(job: Job): void {
+  const workflow = queries.getWorkflowById(job.workflow_id!);
+  if (!workflow || workflow.status !== 'running') return;
+
+  // If the phase job failed or was cancelled, mark workflow as blocked
+  if (job.status === 'failed' || job.status === 'cancelled') {
+    console.log(`[workflow ${workflow.id}] phase '${job.workflow_phase}' job ${job.id} ${job.status} — marking workflow blocked`);
+    updateAndEmit(workflow.id, {
+      status: 'blocked',
+      current_phase: job.workflow_phase ?? 'idle',
+    });
+    return;
+  }
+
+  // Parse milestones from the plan note
+  const planNote = queries.getNote(`workflow/${workflow.id}/plan`);
+  const milestones = parseMilestones(planNote?.value ?? '');
+
+  // Phase-specific transitions
+  switch (job.workflow_phase) {
+    case 'assess': {
+      // After assess: validate plan was written, then move to review
+      if (!planNote?.value) {
+        console.log(`[workflow ${workflow.id}] assess phase completed but no plan note found — marking blocked`);
+        updateAndEmit(workflow.id, { status: 'blocked', current_phase: 'assess' as WorkflowPhase });
+        return;
+      }
+      updateAndEmit(workflow.id, {
+        milestones_total: milestones.total,
+        milestones_done: milestones.done,
+        current_cycle: 1,
+      });
+      spawnPhaseJob(queries.getWorkflowById(workflow.id)!, 'review', 1);
+      break;
+    }
+
+    case 'review': {
+      // After review: update milestones (reviewer may have added/removed), then implement
+      updateAndEmit(workflow.id, {
+        milestones_total: milestones.total,
+        milestones_done: milestones.done,
+      });
+      const updated = queries.getWorkflowById(workflow.id)!;
+      if (milestones.total > 0 && milestones.done >= milestones.total) {
+        console.log(`[workflow ${workflow.id}] all milestones complete after review — marking complete`);
+        updateAndEmit(workflow.id, { status: 'complete', current_phase: 'idle' as WorkflowPhase });
+        finalizeWorkflow(queries.getWorkflowById(workflow.id)!);
+      } else {
+        spawnPhaseJob(updated, 'implement', updated.current_cycle);
+      }
+      break;
+    }
+
+    case 'implement': {
+      // After implement: update milestones, check if done or advance to next cycle
+      updateAndEmit(workflow.id, {
+        milestones_total: milestones.total,
+        milestones_done: milestones.done,
+      });
+      const updated = queries.getWorkflowById(workflow.id)!;
+
+      if (milestones.total > 0 && milestones.done >= milestones.total) {
+        console.log(`[workflow ${workflow.id}] all ${milestones.total} milestones complete — marking complete`);
+        updateAndEmit(workflow.id, { status: 'complete', current_phase: 'idle' as WorkflowPhase });
+        finalizeWorkflow(queries.getWorkflowById(workflow.id)!);
+      } else if (updated.current_cycle >= updated.max_cycles) {
+        console.log(`[workflow ${workflow.id}] reached max cycles (${updated.max_cycles}) — marking complete`);
+        updateAndEmit(workflow.id, { status: 'complete', current_phase: 'idle' as WorkflowPhase });
+        finalizeWorkflow(queries.getWorkflowById(workflow.id)!);
+      } else {
+        // Advance to next cycle's review phase
+        const nextCycle = updated.current_cycle + 1;
+        updateAndEmit(workflow.id, { current_cycle: nextCycle });
+        spawnPhaseJob(queries.getWorkflowById(workflow.id)!, 'review', nextCycle);
+      }
+      break;
+    }
+
+    default:
+      console.warn(`[workflow ${workflow.id}] unknown phase '${job.workflow_phase}' on job ${job.id}`);
+  }
+}
+
+// ─── Milestone Parsing ────────────────────────────────────────────────────────
+
+const CHECKBOX_CHECKED = /^[\t ]*[-*][\t ]+\[[xX]\]/;
+const CHECKBOX_UNCHECKED = /^[\t ]*[-*][\t ]+\[\s?\]/;
+
+export function parseMilestones(planText: string): { total: number; done: number } {
+  let done = 0;
+  let unchecked = 0;
+  for (const line of planText.split('\n')) {
+    if (CHECKBOX_CHECKED.test(line)) done++;
+    else if (CHECKBOX_UNCHECKED.test(line)) unchecked++;
+  }
+  return { total: done + unchecked, done };
+}
+
+// ─── Phase Job Spawning ─────────────────────────────────────────────────────
+
+function spawnPhaseJob(workflow: Workflow, phase: WorkflowPhase, cycle: number): void {
+  const phaseLabels: Record<string, string> = { assess: 'Assess', review: 'Review', implement: 'Implement' };
+  const label = phaseLabels[phase] ?? phase;
+
+  // Choose model, max_turns, and stop config based on phase
+  let model: string;
+  let maxTurns: number;
+  let stopMode: StopMode;
+  let stopValue: number | null;
+  let prompt: string;
+
+  switch (phase) {
+    case 'assess':
+      model = workflow.implementer_model;
+      maxTurns = workflow.max_turns_assess;
+      stopMode = workflow.stop_mode_assess;
+      stopValue = workflow.stop_value_assess;
+      prompt = buildAssessPrompt(workflow);
+      break;
+    case 'review':
+      model = workflow.reviewer_model;
+      maxTurns = workflow.max_turns_review;
+      stopMode = workflow.stop_mode_review;
+      stopValue = workflow.stop_value_review;
+      prompt = buildReviewPrompt(workflow, cycle);
+      break;
+    case 'implement':
+      model = workflow.implementer_model;
+      maxTurns = workflow.max_turns_implement;
+      stopMode = workflow.stop_mode_implement;
+      stopValue = workflow.stop_value_implement;
+      prompt = buildImplementPrompt(workflow, cycle);
+      break;
+    default:
+      throw new Error(`Invalid phase: ${phase}`);
+  }
+
+  const job = queries.insertJob({
+    id: randomUUID(),
+    title: `[Workflow C${cycle}] ${label}`,
+    description: prompt,
+    context: null,
+    priority: 0,
+    model,
+    template_id: workflow.template_id,
+    // All phases share the single workflow-level worktree (created at startWorkflow).
+    // use_worktree=0 tells WorkQueueManager not to create another one.
+    work_dir: workflow.worktree_path ?? workflow.work_dir,
+    max_turns: effectiveMaxTurns(stopMode, stopValue),
+    stop_mode: stopMode,
+    stop_value: stopValue,
+    project_id: workflow.project_id,
+    use_worktree: 0,
+    workflow_id: workflow.id,
+    workflow_cycle: cycle,
+    workflow_phase: phase,
+  });
+
+  socket.emitJobNew(job);
+
+  // Update workflow state
+  updateAndEmit(workflow.id, {
+    current_phase: phase,
+    current_cycle: cycle,
+  });
+
+  console.log(`[workflow ${workflow.id}] spawned ${phase} job ${job.id.slice(0, 8)} (cycle ${cycle}, model: ${model})`);
+}
+
+// ─── Public API ─────────────────────────────────────────────────────────────
+
+/**
+ * Start a workflow by spawning the assess phase job.
+ * Called from the API route when a workflow is created.
+ */
+export function startWorkflow(workflow: Workflow): Job {
+  // Create a single worktree for the entire workflow so all phases share one branch.
+  // Changes accumulate linearly: assess → review → implement → review → ...
+  let activeWorkflow = workflow;
+  if (workflow.use_worktree && workflow.work_dir) {
+    try {
+      const shortId = workflow.id.slice(0, 8);
+      const slug = workflow.title
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, '-')
+        .replace(/^-|-$/g, '')
+        .slice(0, 40);
+      const branchName = `workflow/${slug}-${shortId}`;
+      const worktreePath = path.resolve(workflow.work_dir, '..', '.orchestrator-worktrees', `wf-${shortId}`);
+      mkdirSync(path.dirname(worktreePath), { recursive: true });
+      execSync(`git worktree add ${JSON.stringify(worktreePath)} -b ${JSON.stringify(branchName)}`, {
+        cwd: workflow.work_dir,
+        timeout: 30000,
+        stdio: 'pipe',
+      });
+      activeWorkflow = queries.updateWorkflow(workflow.id, {
+        worktree_path: worktreePath,
+        worktree_branch: branchName,
+      }) ?? workflow;
+      console.log(`[workflow ${workflow.id}] created worktree at ${worktreePath} (branch: ${branchName})`);
+    } catch (err: any) {
+      console.warn(`[workflow ${workflow.id}] worktree creation failed, using work_dir directly:`, err.message);
+    }
+  }
+
+  const prompt = buildAssessPrompt(activeWorkflow);
+  const job = queries.insertJob({
+    id: randomUUID(),
+    title: `[Workflow C0] Assess`,
+    description: prompt,
+    context: null,
+    priority: 0,
+    model: activeWorkflow.implementer_model,
+    template_id: activeWorkflow.template_id,
+    work_dir: activeWorkflow.worktree_path ?? activeWorkflow.work_dir,
+    max_turns: effectiveMaxTurns(activeWorkflow.stop_mode_assess, activeWorkflow.stop_value_assess),
+    stop_mode: activeWorkflow.stop_mode_assess,
+    stop_value: activeWorkflow.stop_value_assess,
+    project_id: activeWorkflow.project_id,
+    use_worktree: 0,
+    workflow_id: activeWorkflow.id,
+    workflow_cycle: 0,
+    workflow_phase: 'assess',
+  });
+
+  socket.emitJobNew(job);
+  updateAndEmit(activeWorkflow.id, { current_phase: 'assess' as WorkflowPhase, current_cycle: 0 });
+  console.log(`[workflow ${activeWorkflow.id}] started — assess job ${job.id.slice(0, 8)}`);
+  return job;
+}
+
+/**
+ * Resume a blocked workflow by re-spawning the phase that failed.
+ */
+export function resumeWorkflow(workflow: Workflow): Job {
+  if (workflow.status !== 'blocked') {
+    throw new Error(`Cannot resume workflow in status '${workflow.status}'`);
+  }
+
+  updateAndEmit(workflow.id, { status: 'running' });
+  const updated = queries.getWorkflowById(workflow.id)!;
+
+  // Re-spawn the phase that was blocked
+  const phase = updated.current_phase === 'idle' ? 'assess' : updated.current_phase;
+  const cycle = updated.current_cycle;
+
+  let model: string;
+  let maxTurns: number;
+  let stopMode: StopMode;
+  let stopValue: number | null;
+  let prompt: string;
+
+  switch (phase) {
+    case 'assess':
+      model = updated.implementer_model;
+      maxTurns = updated.max_turns_assess;
+      stopMode = updated.stop_mode_assess;
+      stopValue = updated.stop_value_assess;
+      prompt = buildAssessPrompt(updated);
+      break;
+    case 'review':
+      model = updated.reviewer_model;
+      maxTurns = updated.max_turns_review;
+      stopMode = updated.stop_mode_review;
+      stopValue = updated.stop_value_review;
+      prompt = buildReviewPrompt(updated, cycle);
+      break;
+    case 'implement':
+      model = updated.implementer_model;
+      maxTurns = updated.max_turns_implement;
+      stopMode = updated.stop_mode_implement;
+      stopValue = updated.stop_value_implement;
+      prompt = buildImplementPrompt(updated, cycle);
+      break;
+    default:
+      throw new Error(`Cannot resume from phase '${phase}'`);
+  }
+
+  const job = queries.insertJob({
+    id: randomUUID(),
+    title: `[Workflow C${cycle}] ${phase.charAt(0).toUpperCase() + phase.slice(1)} (resumed)`,
+    description: prompt,
+    context: null,
+    priority: 0,
+    model,
+    template_id: updated.template_id,
+    work_dir: updated.worktree_path ?? updated.work_dir,
+    max_turns: effectiveMaxTurns(stopMode, stopValue),
+    stop_mode: stopMode,
+    stop_value: stopValue,
+    project_id: updated.project_id,
+    use_worktree: 0,
+    workflow_id: updated.id,
+    workflow_cycle: cycle,
+    workflow_phase: phase as WorkflowPhase,
+  });
+
+  socket.emitJobNew(job);
+  console.log(`[workflow ${workflow.id}] resumed — ${phase} job ${job.id.slice(0, 8)} (cycle ${cycle})`);
+  return job;
+}
+
+// ─── Finalization & Cleanup ──────────────────────────────────────────────────
+
+/**
+ * Called when a workflow completes successfully.
+ * Pushes the worktree branch, opens a GitHub PR, then removes the local worktree.
+ */
+export function finalizeWorkflow(workflow: Workflow): void {
+  const { worktree_path, worktree_branch, work_dir } = workflow;
+  if (!worktree_path || !work_dir) return;
+
+  try {
+    // Count commits on the branch that aren't on the remote default branch
+    let hasCommits = false;
+    try {
+      const n = execSync(
+        'git rev-list --count HEAD ^origin/HEAD 2>/dev/null || git rev-list --count HEAD',
+        { cwd: worktree_path, stdio: 'pipe', timeout: 10000 }
+      ).toString().trim();
+      hasCommits = parseInt(n, 10) > 0;
+    } catch { /* not a git repo or no remote — skip PR */ }
+
+    if (hasCommits && worktree_branch) {
+      try {
+        // Push branch to remote
+        execSync(`git push -u origin ${JSON.stringify(worktree_branch)}`, {
+          cwd: worktree_path, stdio: 'pipe', timeout: 30000,
+        });
+
+        // Build PR body from plan note milestones
+        const planNote = queries.getNote(`workflow/${workflow.id}/plan`);
+        const body = _buildPrBody(workflow, planNote?.value ?? null);
+        const title = `[Workflow] ${workflow.title}`;
+
+        // Create PR via gh CLI
+        const prUrl = execSync(
+          `gh pr create --title ${JSON.stringify(title)} --body ${JSON.stringify(body)} --head ${JSON.stringify(worktree_branch)}`,
+          { cwd: worktree_path, stdio: 'pipe', timeout: 30000 }
+        ).toString().trim();
+
+        updateAndEmit(workflow.id, { pr_url: prUrl });
+        console.log(`[workflow ${workflow.id}] PR created: ${prUrl}`);
+      } catch (err: any) {
+        console.warn(`[workflow ${workflow.id}] push/PR failed (worktree branch preserved locally):`, err.message);
+      }
+    } else {
+      console.log(`[workflow ${workflow.id}] no commits on branch — skipping PR`);
+    }
+  } finally {
+    _removeWorktree(workflow);
+  }
+}
+
+/**
+ * Called when a workflow is cancelled — skip the PR, just clean up the worktree.
+ */
+export function cleanupWorktree(workflow: Workflow): void {
+  _removeWorktree(workflow);
+}
+
+function _removeWorktree(workflow: Workflow): void {
+  const { worktree_path, work_dir } = workflow;
+  if (!worktree_path || !work_dir) return;
+  try {
+    execSync(`git worktree remove --force ${JSON.stringify(worktree_path)}`, {
+      cwd: work_dir, stdio: 'pipe', timeout: 15000,
+    });
+    execSync('git worktree prune', { cwd: work_dir, stdio: 'pipe', timeout: 10000 });
+    console.log(`[workflow ${workflow.id}] worktree removed`);
+  } catch (err: any) {
+    console.warn(`[workflow ${workflow.id}] worktree removal failed:`, err.message);
+  }
+}
+
+function _buildPrBody(workflow: Workflow, planText: string | null): string {
+  const { total, done } = parseMilestones(planText ?? '');
+  const checkboxLines = planText
+    ? planText.split('\n').filter(l => /^\s*[-*]\s+\[/.test(l)).map(l => l.trim()).join('\n')
+    : '';
+  return [
+    `## ${workflow.title}`,
+    '',
+    `**Task:** ${workflow.task}`,
+    '',
+    `**Cycles:** ${workflow.current_cycle}/${workflow.max_cycles} · **Milestones:** ${done}/${total} complete`,
+    '',
+    '## Milestones',
+    checkboxLines || '_No plan available_',
+    '',
+    '---',
+    `🤖 Generated by Hurlicane autonomous agent workflow`,
+    `Implementer: \`${workflow.implementer_model}\` · Reviewer: \`${workflow.reviewer_model}\``,
+  ].join('\n');
+}
+
+// ─── Helpers ────────────────────────────────────────────────────────────────
+
+/** Clear module-level dedup state. Test-only — call in beforeEach to ensure per-test independence. */
+export function _resetForTest(): void {
+  _processedJobs.clear();
+}
+
+function updateAndEmit(id: string, fields: Parameters<typeof queries.updateWorkflow>[1]): void {
+  const updated = queries.updateWorkflow(id, fields);
+  if (updated) socket.emitWorkflowUpdate(updated);
+}
diff --git a/src/server/orchestrator/WorkflowPrompts.ts b/src/server/orchestrator/WorkflowPrompts.ts
new file mode 100644
index 0000000..0368464
--- /dev/null
+++ b/src/server/orchestrator/WorkflowPrompts.ts
@@ -0,0 +1,215 @@
+import type { Workflow } from '../../shared/types.js';
+
+/**
+ * Build the assess phase prompt (cycle 0 only).
+ * The agent scans the codebase, writes a plan with checkbox milestones, and stores it as a note.
+ */
+export function buildAssessPrompt(workflow: Workflow): string {
+  const planKey = `workflow/${workflow.id}/plan`;
+  const contractKey = `workflow/${workflow.id}/contract`;
+  return `# Workflow: Assess Phase (Cycle 0)
+
+You are the IMPLEMENTER agent in a structured plan/review/implement workflow.
+Your task in this phase is to **assess the codebase and propose a plan**.
+
+## Task
+${workflow.task}
+
+## Working Directory
+${workflow.work_dir ?? '(not specified)'}
+
+## Instructions
+
+1. **Read the codebase** — scan the project structure, key files, tests, dependencies, and configuration.
+2. **Assess quality** — note any issues, patterns, tech debt, missing tests, or areas for improvement relevant to the task.
+3. **Write a plan** with concrete milestones as markdown checkboxes. Each milestone should be achievable in a single implementation cycle.
+
+## Plan Format
+
+Write the plan to the shared scratchpad using \`write_note\` with key \`${planKey}\`. Use this exact format:
+
+\`\`\`markdown
+# Plan
+
+## Goal
+<one-line description of what this workflow aims to achieve>
+
+## Assessment
+<brief assessment of current state relevant to the task>
+
+## Milestones
+- [ ] **M1: <title>** — <description with clear acceptance criteria>
+- [ ] **M2: <title>** — <description with clear acceptance criteria>
+- [ ] **M3: <title>** — <description with clear acceptance criteria>
+(add as many as needed, but keep each achievable in one cycle)
+
+## Priority Order
+<which milestone to tackle first and why>
+
+## Risks
+<known risks, dependencies between milestones, or blockers>
+\`\`\`
+
+## Contract
+
+Also write the operating contract using \`write_note\` with key \`${contractKey}\`:
+
+\`\`\`markdown
+# Workflow Contract
+- One agent works at a time (no concurrent edits)
+- Plan milestones use checkbox format: \`- [ ]\` unchecked, \`- [x]\` checked
+- Worklog entries are append-only
+- If blocked, explain clearly so the next agent can resolve it
+- All existing tests must pass before marking a milestone complete
+- Changes must be committed with descriptive messages
+\`\`\`
+
+## Important
+- Use \`write_note("${planKey}", <plan content>)\` to store the plan.
+- Use \`write_note("${contractKey}", <contract content>)\` to store the contract.
+- Do NOT implement anything yet — this is assessment and planning only.
+- Call \`report_status\` to update your progress.`;
+}
+
+/**
+ * Build the review phase prompt.
+ * Cycle 1: plan quality review only (no code yet).
+ * Cycle 2+: code quality review of the last implementation + plan update.
+ */
+export function buildReviewPrompt(workflow: Workflow, cycle: number): string {
+  const planKey = `workflow/${workflow.id}/plan`;
+  const contractKey = `workflow/${workflow.id}/contract`;
+  const worklogKey = `workflow/${workflow.id}/worklog/cycle-${cycle - 1}`;
+  const worklogPrefix = `workflow/${workflow.id}/worklog/`;
+  const isFirstReview = cycle === 1;
+
+  const codeReviewSection = isFirstReview ? '' : `
+## Step 2: Code Review (MOST IMPORTANT)
+
+The implementer just completed cycle ${cycle - 1}. You must review the actual code changes before touching the plan.
+
+1. Read the worklog for what was changed: \`read_note("${worklogKey}")\`
+2. In the working directory (${workflow.work_dir ?? 'project root'}), inspect the implementation:
+   - Run \`git log --oneline -10\` to see recent commits
+   - Run \`git diff HEAD~1\` (or \`git diff HEAD~<n>\` to cover all commits from this cycle) to see exact code changes
+   - Read any new or heavily modified files in full
+   - Run the test suite to check for regressions
+3. **Assess code quality** — look for:
+   - Correctness: does it actually satisfy the milestone's acceptance criteria?
+   - Edge cases: null/undefined handling, empty arrays, concurrency, off-by-one errors
+   - Error handling: are failures surfaced properly or silently swallowed?
+   - Test coverage: are the new code paths tested? Are tests meaningful or just for coverage?
+   - Code style and consistency with the surrounding codebase
+   - Security: injection, unvalidated inputs, secrets in code
+   - Performance: N+1 queries, unnecessary re-renders, blocking operations
+4. **For every issue found**, add a new unchecked milestone to the plan:
+   \`- [ ] **Fix: <short title>** — <specific description of what needs to change and why>\`
+
+These fix milestones will be implemented in the next cycle. Be specific — vague feedback like "improve error handling" is not actionable.
+`;
+
+  return `# Workflow: Review Phase (Cycle ${cycle})
+
+You are the REVIEWER agent in a structured plan/review/implement workflow.
+${isFirstReview
+    ? 'This is the first review — no code has been written yet. Your job is to validate and improve the initial plan.'
+    : `Your primary job this cycle is to **review the code Claude just wrote** and add fix milestones for any issues. Then update the plan for the next cycle.`}
+
+## Task
+${workflow.task}
+
+## Working Directory
+${workflow.work_dir ?? '(not specified)'}
+
+## Step 1: Read Context
+
+1. Read the current plan: \`read_note("${planKey}")\`
+2. Read the operating contract: \`read_note("${contractKey}")\`
+3. Read all worklog entries: \`list_notes("${worklogPrefix}")\` then read each one.
+${codeReviewSection}
+## Step ${isFirstReview ? 2 : 3}: Update the Plan
+
+Rewrite the plan to reflect your review:
+- Keep all checked-off milestones (\`- [x]\`) exactly as-is
+- Reorder remaining unchecked milestones for maximum impact
+- Remove milestones made redundant by what's been implemented
+- Sharpen acceptance criteria where they were vague
+- Add any new fix or improvement milestones you identified in your code review (numbered sequentially)
+- Each milestone must be achievable in a single implementation cycle
+
+Write the updated plan back: \`write_note("${planKey}", <updated plan>)\`
+
+## Rules
+- Do NOT implement anything — review and planning only.
+- If the implementation was poor quality, add multiple specific fix milestones rather than vague notes.
+- The implementer reads your plan directly — be precise and actionable.
+- Call \`report_status\` to update your progress.`;
+}
+
+/**
+ * Build the implement phase prompt.
+ * The agent reads the plan, implements the top unchecked milestone, and writes a worklog entry.
+ */
+export function buildImplementPrompt(workflow: Workflow, cycle: number): string {
+  const planKey = `workflow/${workflow.id}/plan`;
+  const contractKey = `workflow/${workflow.id}/contract`;
+  const worklogKey = `workflow/${workflow.id}/worklog/cycle-${cycle}`;
+  const worklogPrefix = `workflow/${workflow.id}/worklog/`;
+  return `# Workflow: Implement Phase (Cycle ${cycle})
+
+You are the IMPLEMENTER agent in a structured plan/review/implement workflow.
+Your task is to **implement the top unchecked milestone** from the plan.
+
+## Task
+${workflow.task}
+
+## Working Directory
+${workflow.work_dir ?? '(not specified)'}
+
+## Instructions
+
+1. **Read the current plan**: \`read_note("${planKey}")\`
+2. **Read the operating contract**: \`read_note("${contractKey}")\`
+3. **Read previous worklog entries**: \`list_notes("${worklogPrefix}")\` then read each one to understand prior work.
+4. **Find the first unchecked milestone** (\`- [ ]\`) in the plan.
+5. **Implement it**:
+   - Make the necessary code changes
+   - Run tests and fix any issues you introduce
+   - Ensure all existing tests still pass
+   - Commit with descriptive messages
+6. **Check off the milestone** — update the plan, changing \`- [ ]\` to \`- [x]\` for the completed milestone:
+   \`write_note("${planKey}", <updated plan with milestone checked off>)\`
+7. **Write a worklog entry** using \`write_note("${worklogKey}", <worklog entry>)\`
+
+## Worklog Entry Format
+
+\`\`\`markdown
+## Cycle ${cycle} — <milestone name>
+**Owner:** Implementer
+**Timestamp:** <current UTC timestamp>
+
+### What changed
+- <file or area>: <description of change>
+
+### Commits
+- \`<short hash>\` <commit message>
+
+### Test results
+- <test suite>: <pass count> passed, <fail count> failed
+
+### Blockers
+- <blocker description> (or "None")
+
+### Next step
+<What should happen next, or "All milestones complete" if done>
+\`\`\`
+
+## Rules
+- Implement only ONE milestone per cycle.
+- Always lock files before editing (\`lock_files\`) and release when done (\`release_files\`).
+- Use \`git add <specific files>\` — never \`git add -A\` or \`git add .\`
+- If blocked, explain clearly in the worklog and set the "Next step" to describe what needs to happen.
+- Call \`report_status\` regularly to update your progress.
+- Call \`search_kb\` at the start for relevant prior knowledge.
+- Call \`report_learnings\` near the end with anything useful you discovered.`;
+}
diff --git a/src/server/orchestrator/WorktreeCleanup.ts b/src/server/orchestrator/WorktreeCleanup.ts
index d4e0241..2b930d3 100644
--- a/src/server/orchestrator/WorktreeCleanup.ts
+++ b/src/server/orchestrator/WorktreeCleanup.ts
@@ -80,7 +80,26 @@ function cleanupOrphanedWorktrees(): void {
 
   if (!fs.existsSync(worktreeBase)) return;
 
-  const tracked = new Set(queries.listActiveWorktrees().map(w => w.path));
+  // Only touch directories that are registered as worktrees of THIS repo.
+  // Workflow-level worktrees (wf-*) belong to other repos and must not be deleted here.
+  let ownedPaths: Set<string>;
+  try {
+    const lines = execSync('git worktree list --porcelain', { cwd: repoDir, timeout: 10000, stdio: 'pipe' })
+      .toString().split('\n');
+    ownedPaths = new Set(
+      lines.filter(l => l.startsWith('worktree ')).map(l => l.slice(9).trim())
+    );
+  } catch {
+    return; // can't determine ownership — skip cleanup entirely
+  }
+
+  // Protect both DB-tracked per-job worktrees AND workflow shared worktrees (wf-*)
+  const tracked = new Set([
+    ...queries.listActiveWorktrees().map(w => w.path),
+    ...queries.listWorkflows()
+      .filter(w => w.worktree_path && (w.status === 'running' || w.status === 'blocked'))
+      .map(w => w.worktree_path!),
+  ]);
   let cleaned = 0;
 
   try {
@@ -89,8 +108,9 @@ function cleanupOrphanedWorktrees(): void {
       const fullPath = path.join(worktreeBase, entry);
       if (!fs.statSync(fullPath).isDirectory()) continue;
       if (tracked.has(fullPath)) continue;
+      if (!ownedPaths.has(fullPath)) continue; // not our worktree — leave it alone
 
-      // Orphaned directory — remove it
+      // Orphaned directory owned by this repo — remove it
       try {
         execSync(`git worktree remove --force ${JSON.stringify(fullPath)}`, {
           cwd: repoDir,
diff --git a/src/server/orchestrator/recovery.ts b/src/server/orchestrator/recovery.ts
index f5c4e1a..98307b7 100644
--- a/src/server/orchestrator/recovery.ts
+++ b/src/server/orchestrator/recovery.ts
@@ -4,9 +4,10 @@ import { reattachAgent, getLogPath } from './AgentRunner.js';
 import { execFileSync } from 'child_process';
 import { isTmuxSessionAlive, attachPty } from './PtyManager.js';
 import { onJobCompleted as debateOnJobCompleted } from './DebateManager.js';
+import { onJobCompleted as workflowOnJobCompleted } from './WorkflowManager.js';
 import { orphanedWaits } from '../mcp/McpServer.js';
 import type { ClaudeStreamEvent } from '../../shared/types.js';
-import { isCodexModel } from '../../shared/types.js';
+import { isCodexModel, isAutoExitJob } from '../../shared/types.js';
 import { handleRetry } from './RetryManager.js';
 
 function isPidAlive(pid: number): boolean {
@@ -128,7 +129,7 @@ export function runRecovery(): void {
       } else {
         // Tmux-based path (all Claude agents, interactive or not)
         if (isTmuxSessionAlive(agent.id)) {
-          const isDebateStage = !!(job as any).debate_role;
+          const isDebateStage = isAutoExitJob(job as any);
 
           if (!job.is_interactive && !isDebateStage) {
             // Non-interactive automated agent (e.g. Eye, verification agents).
@@ -194,7 +195,7 @@ export function runRecovery(): void {
           }
         } else {
           // Interactive or debate-stage → done; other non-interactive → failed (no finish_job called)
-          const isDebateStage = !!(job as any).debate_role;
+          const isDebateStage = isAutoExitJob(job as any);
           const finalStatus = (job.is_interactive || isDebateStage) ? 'done' : 'failed';
           console.log(`[recovery] tmux agent ${agent.id} — session gone, marking ${finalStatus}`);
 
@@ -219,6 +220,7 @@ export function runRecovery(): void {
             const doneJob = queries.getJobById(agent.job_id);
             if (doneJob) {
               try { debateOnJobCompleted(doneJob); } catch (err) { console.error(`[recovery] debateOnJobCompleted error for agent ${agent.id}:`, err); }
+              try { workflowOnJobCompleted(doneJob); } catch (err) { console.error(`[recovery] workflowOnJobCompleted error for agent ${agent.id}:`, err); }
             }
             tmuxRecovered++;
           } else {
@@ -249,4 +251,54 @@ export function runRecovery(): void {
   if (tmuxReattached > 0) console.log(`[recovery] reattached ${tmuxReattached} tmux agents`);
   if (tmuxRecovered > 0) console.log(`[recovery] recovered ${tmuxRecovered} completed tmux agents`);
   if (tmuxFailed > 0) console.log(`[recovery] failed ${tmuxFailed} dead tmux agents`);
+
+  // Gap detector: find running workflows whose current-phase job is done but no next phase was spawned.
+  // This happens when the server restarts between finish_job and onJobCompleted.
+  _recoverStuckWorkflows();
+}
+
+let _gapDetectorTimer: NodeJS.Timeout | null = null;
+
+/** Start a periodic gap detector that re-fires onJobCompleted for any workflow stuck mid-transition. */
+export function startWorkflowGapDetector(): void {
+  if (_gapDetectorTimer) return;
+  // Run every 60 seconds so stuck workflows recover within a minute of getting stuck.
+  _gapDetectorTimer = setInterval(() => {
+    try { _recoverStuckWorkflows(); } catch (err) { console.error('[workflow-gap] tick error:', err); }
+  }, 60_000);
+}
+
+export function stopWorkflowGapDetector(): void {
+  if (_gapDetectorTimer) { clearInterval(_gapDetectorTimer); _gapDetectorTimer = null; }
+}
+
+function _recoverStuckWorkflows(): void {
+  const runningWorkflows = queries.listWorkflows().filter(w => w.status === 'running');
+  for (const workflow of runningWorkflows) {
+    if (workflow.current_phase === 'idle') continue;
+    const jobs = queries.getJobsForWorkflow(workflow.id);
+
+    // Assess always runs at cycle 0, but onJobCompleted bumps current_cycle to 1
+    // before calling spawnPhaseJob — so look for cycle 0 when stuck in assess.
+    const jobCycle = workflow.current_phase === 'assess' ? 0 : workflow.current_cycle;
+
+    // Find the most recent completed job for this phase
+    const phaseJob = jobs
+      .filter(j => j.workflow_phase === workflow.current_phase && j.workflow_cycle === jobCycle)
+      .sort((a, b) => (b.created_at ?? 0) - (a.created_at ?? 0))[0];
+    if (!phaseJob || phaseJob.status !== 'done') continue;
+
+    // Check if the expected next-phase job already exists.
+    // Progression: assess→review(C1), review→implement(Cn), implement→review(Cn+1)
+    const cycle = workflow.current_cycle;
+    const hasNext = workflow.current_phase === 'implement'
+      ? jobs.some(j => j.workflow_phase === 'review' && j.workflow_cycle === cycle + 1)
+      : workflow.current_phase === 'review'
+        ? jobs.some(j => j.workflow_phase === 'implement' && j.workflow_cycle === cycle)
+        : jobs.some(j => j.workflow_phase === 'review' && j.workflow_cycle === 1); // assess stuck
+
+    if (hasNext) continue;
+    console.log(`[recovery] workflow ${workflow.id} stuck — ${workflow.current_phase} C${jobCycle} done but no next phase; re-firing onJobCompleted`);
+    try { workflowOnJobCompleted(phaseJob, { force: true }); } catch (err) { console.error(`[recovery] stuck workflow re-fire error:`, err); }
+  }
 }
diff --git a/src/server/socket/SocketManager.ts b/src/server/socket/SocketManager.ts
index 6834492..2ae002f 100644
--- a/src/server/socket/SocketManager.ts
+++ b/src/server/socket/SocketManager.ts
@@ -1,6 +1,6 @@
 import { Server as HttpServer } from 'http';
 import { Server as SocketIoServer } from 'socket.io';
-import type { ServerToClientEvents, ClientToServerEvents, AgentWithJob, Job, Question, FileLock, AgentOutput, QueueSnapshot, Debate, AgentWarning, Discussion, DiscussionMessage, Proposal, ProposalMessage } from '../../shared/types.js';
+import type { ServerToClientEvents, ClientToServerEvents, AgentWithJob, Job, Question, FileLock, AgentOutput, QueueSnapshot, Debate, AgentWarning, Discussion, DiscussionMessage, Proposal, ProposalMessage, Workflow, Pr, PrReview, PrReviewMessage } from '../../shared/types.js';
 
 let _io: SocketIoServer<ClientToServerEvents, ServerToClientEvents> | null = null;
 
@@ -85,6 +85,14 @@ export function emitDebateUpdate(debate: Debate): void {
   getIo().emit('debate:update', { debate });
 }
 
+export function emitWorkflowNew(workflow: Workflow): void {
+  getIo().emit('workflow:new', { workflow });
+}
+
+export function emitWorkflowUpdate(workflow: Workflow): void {
+  getIo().emit('workflow:update', { workflow });
+}
+
 export function emitWarningNew(warning: AgentWarning): void {
   getIo().emit('warning:new', { warning });
 }
@@ -95,7 +103,7 @@ export function emitDiscussionUpdate(discussion: Discussion): void { getIo().emi
 export function emitProposalNew(proposal: Proposal): void { getIo().emit('eye:proposal:new', { proposal }); }
 export function emitProposalUpdate(proposal: Proposal): void { getIo().emit('eye:proposal:update', { proposal }); }
 export function emitProposalMessage(message: ProposalMessage): void { getIo().emit('eye:proposal:message', { message }); }
-export function emitPrNew(pr: Record<string, unknown>): void { getIo().emit('eye:pr:new', { pr }); }
-export function emitPrReviewNew(review: Record<string, unknown>): void { getIo().emit('eye:pr-review:new', { review }); }
-export function emitPrReviewUpdate(review: Record<string, unknown>): void { getIo().emit('eye:pr-review:update', { review }); }
-export function emitPrReviewMessage(message: Record<string, unknown>): void { getIo().emit('eye:pr-review:message', { message }); }
+export function emitPrNew(pr: Pr): void { getIo().emit('eye:pr:new', { pr }); }
+export function emitPrReviewNew(review: PrReview): void { getIo().emit('eye:pr-review:new', { review }); }
+export function emitPrReviewUpdate(review: PrReview): void { getIo().emit('eye:pr-review:update', { review }); }
+export function emitPrReviewMessage(message: PrReviewMessage): void { getIo().emit('eye:pr-review:message', { message }); }
diff --git a/src/shared/types.ts b/src/shared/types.ts
index 6544d3b..46d62db 100644
--- a/src/shared/types.ts
+++ b/src/shared/types.ts
@@ -6,8 +6,11 @@ export type QuestionStatus = 'pending' | 'answered' | 'timeout';
 export type DebateStatus = 'running' | 'consensus' | 'disagreement' | 'failed' | 'cancelled';
 export type DebateRole = 'claude' | 'codex' | 'post_action' | 'verification_review' | 'verification_response';
 export type RetryPolicy = 'none' | 'same' | 'analyze';
-export type WarningType = 'stalled' | 'high_turns' | 'long_running';
+export type WarningType = 'stalled' | 'high_turns' | 'long_running' | 'budget_warning' | 'time_warning';
+export type StopMode = 'turns' | 'budget' | 'time' | 'completion';
 export type ReviewStatus = 'pending_review' | 'approved' | 'needs_revision';
+export type WorkflowStatus = 'running' | 'complete' | 'blocked' | 'failed' | 'cancelled';
+export type WorkflowPhase = 'idle' | 'assess' | 'review' | 'implement';
 
 export interface Job {
   id: string;
@@ -16,6 +19,10 @@ export interface Job {
   context: string | null; // JSON string of extra k/v context
   status: JobStatus;
   priority: number;
+  work_dir: string | null;
+  max_turns: number;
+  stop_mode: StopMode;
+  stop_value: number | null;  // meaning depends on stop_mode: turns count, dollars, minutes, or null for completion
   model: string | null;       // e.g. "claude-opus-4-6", null = auto-classify
   template_id: string | null; // FK → templates.id
   depends_on: string | null;  // JSON array of job IDs this job must wait for
@@ -40,6 +47,9 @@ export interface Job {
   created_by_agent_id: string | null;   // agent that created this job via create_job MCP tool
   pre_debate_id: string | null;         // FK → debates.id — job blocked until this debate finishes
   pre_debate_summary: string | null;    // debate outcome stored separately; composed at dispatch
+  workflow_id: string | null;           // FK → workflows.id
+  workflow_cycle: number | null;        // which cycle this job belongs to (0-based)
+  workflow_phase: WorkflowPhase | null; // 'assess' | 'review' | 'implement'
   archived_at: number | null;
   created_at: number;
   updated_at: number;
@@ -72,6 +82,38 @@ export interface Debate {
   updated_at: number;
 }
 
+export interface Workflow {
+  id: string;
+  title: string;
+  task: string;
+  work_dir: string | null;
+  implementer_model: string;
+  reviewer_model: string;
+  max_cycles: number;
+  current_cycle: number;
+  current_phase: WorkflowPhase;
+  status: WorkflowStatus;
+  milestones_total: number;
+  milestones_done: number;
+  project_id: string | null;
+  max_turns_assess: number;
+  max_turns_review: number;
+  max_turns_implement: number;
+  stop_mode_assess: StopMode;
+  stop_value_assess: number | null;
+  stop_mode_review: StopMode;
+  stop_value_review: number | null;
+  stop_mode_implement: StopMode;
+  stop_value_implement: number | null;
+  template_id: string | null;
+  use_worktree: number;
+  worktree_path: string | null;
+  worktree_branch: string | null;
+  pr_url: string | null;
+  created_at: number;
+  updated_at: number;
+}
+
 export interface Agent {
   id: string;
   job_id: string;
@@ -88,6 +130,8 @@ export interface Agent {
   cost_usd: number | null;    // total_cost_usd from result event
   duration_ms: number | null; // duration_ms from result event
   num_turns: number | null;   // num_turns from result event
+  estimated_input_tokens: number | null;
+  estimated_output_tokens: number | null;
   pending_wait_ids: string | null; // JSON array of job IDs being waited on (cleared when done)
   started_at: number;
   updated_at: number;
@@ -158,6 +202,7 @@ export interface QueueSnapshot {
   projects: Project[];
   batchTemplates: BatchTemplate[];
   debates: Debate[];
+  workflows: Workflow[];
   discussions: Discussion[];
   proposals: Proposal[];
 }
@@ -178,6 +223,8 @@ export interface ServerToClientEvents {
   'pty:snapshot-refresh': (payload: { agent_id: string; snapshot: string }) => void;
   'debate:new': (payload: { debate: Debate }) => void;
   'debate:update': (payload: { debate: Debate }) => void;
+  'workflow:new': (payload: { workflow: Workflow }) => void;
+  'workflow:update': (payload: { workflow: Workflow }) => void;
   'warning:new': (payload: { warning: AgentWarning }) => void;
   'project:new': (payload: { project: Project }) => void;
   'eye:discussion:new': (payload: { discussion: Discussion; message: DiscussionMessage }) => void;
@@ -186,6 +233,10 @@ export interface ServerToClientEvents {
   'eye:proposal:new': (payload: { proposal: Proposal }) => void;
   'eye:proposal:update': (payload: { proposal: Proposal }) => void;
   'eye:proposal:message': (payload: { message: ProposalMessage }) => void;
+  'eye:pr:new': (payload: { pr: Pr }) => void;
+  'eye:pr-review:new': (payload: { review: PrReview }) => void;
+  'eye:pr-review:update': (payload: { review: PrReview }) => void;
+  'eye:pr-review:message': (payload: { message: PrReviewMessage }) => void;
 }
 
 export interface ClientToServerEvents {
@@ -250,6 +301,20 @@ export interface CodexStreamEvent {
   message?: string;
 }
 
+/** Safety cap for --max-turns when using budget/time/completion modes. */
+export const SAFETY_CAP_TURNS = 1000;
+
+/** Compute the effective --max-turns value for a given stop mode. */
+export function effectiveMaxTurns(mode: StopMode, value: number | null): number {
+  if (mode === 'turns' && value != null) return value;
+  return SAFETY_CAP_TURNS;
+}
+
+/** Returns true for jobs that run with --print and exit naturally (no finish_job needed). */
+export function isAutoExitJob(job: Pick<Job, 'debate_role' | 'workflow_phase'>): boolean {
+  return !!(job.debate_role || job.workflow_phase);
+}
+
 export function isCodexModel(model: string | null): boolean {
   return model === 'codex' || (model != null && model.startsWith('codex-'));
 }
@@ -269,6 +334,8 @@ export interface CreateJobRequest {
   priority?: number;
   workDir?: string;
   maxTurns?: number;
+  stopMode?: StopMode;
+  stopValue?: number;
   model?: string;
   templateId?: string;
   dependsOn?: string[]; // job IDs this job must wait for before running
@@ -417,6 +484,35 @@ export interface CreateDebateResponse {
   jobs: Job[];
 }
 
+// ─── Workflows ───────────────────────────────────────────────────────────────
+
+export interface CreateWorkflowRequest {
+  title?: string;
+  task: string;
+  workDir?: string;
+  implementerModel?: string;
+  reviewerModel?: string;
+  maxCycles?: number;
+  maxTurnsAssess?: number;
+  maxTurnsReview?: number;
+  maxTurnsImplement?: number;
+  stopModeAssess?: StopMode;
+  stopValueAssess?: number;
+  stopModeReview?: StopMode;
+  stopValueReview?: number;
+  stopModeImplement?: StopMode;
+  stopValueImplement?: number;
+  templateId?: string;
+  useWorktree?: boolean;
+  projectId?: string;
+}
+
+export interface CreateWorkflowResponse {
+  workflow: Workflow;
+  project: Project;
+  jobs: Job[];
+}
+
 // ─── Agent Warnings (Feature 6) ──────────────────────────────────────────────
 
 export interface AgentWarning {
@@ -561,6 +657,18 @@ export interface ProposalMessage {
   created_at: number;
 }
 
+// ─── PRs ────────────────────────────────────────────────────────────────────
+
+export interface Pr {
+  id: string;
+  url: string;
+  title: string;
+  description: string | null;
+  proposal_id: string | null;
+  status: 'draft' | 'open' | 'merged' | 'closed';
+  created_at: number;
+}
+
 // ─── PR Reviews ──────────────────────────────────────────────────────────────
 
 export interface PrReviewComment {
diff --git a/src/test/api-helpers.ts b/src/test/api-helpers.ts
new file mode 100644
index 0000000..f8b8ba8
--- /dev/null
+++ b/src/test/api-helpers.ts
@@ -0,0 +1,22 @@
+/**
+ * Shared helpers for API integration tests using supertest.
+ *
+ * Builds a minimal Express app with all API routes mounted at /api,
+ * backed by an in-memory SQLite database. All side-effect modules
+ * (SocketManager, WorkflowManager, DebateManager, AgentRunner, PtyManager,
+ *  FileLockRegistry, etc.) must be mocked by the consuming test file
+ *  BEFORE importing this helper.
+ */
+import express from 'express';
+import apiRouter from '../server/api/router.js';
+
+/**
+ * Create a fresh Express app with JSON parsing and the API router mounted.
+ * Call this in beforeEach AFTER setupTestDb() so the DB is ready.
+ */
+export function createTestApp(): express.Express {
+  const app = express();
+  app.use(express.json());
+  app.use('/api', apiRouter);
+  return app;
+}
diff --git a/src/test/api/agents.test.ts b/src/test/api/agents.test.ts
new file mode 100644
index 0000000..9861737
--- /dev/null
+++ b/src/test/api/agents.test.ts
@@ -0,0 +1,255 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestJob } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/AgentRunner.js', () => ({
+  runAgent: vi.fn(),
+  cancelledAgents: new Set(),
+}));
+vi.mock('../../server/orchestrator/PtyManager.js', () => ({
+  disconnectAgent: vi.fn(),
+  disconnectAll: vi.fn(() => []),
+  getPtyBuffer: vi.fn(() => []),
+  getSnapshot: vi.fn(() => null),
+  attachPty: vi.fn(),
+  isTmuxSessionAlive: vi.fn(() => false),
+  startInteractiveAgent: vi.fn(),
+}));
+vi.mock('../../server/orchestrator/FileLockRegistry.js', () => ({
+  CHECKOUT_PREFIX: 'checkout::',
+  getFileLockRegistry: vi.fn(() => ({
+    releaseAll: vi.fn(),
+  })),
+}));
+
+let app: express.Express;
+
+async function insertAgent(jobId: string, overrides: Record<string, any> = {}) {
+  const { insertAgent: dbInsert, getAgentWithJob } = await import('../../server/db/queries.js');
+  const { randomUUID } = await import('crypto');
+  const id = overrides.id ?? randomUUID();
+  dbInsert({ id, job_id: jobId, status: overrides.status ?? 'running', ...overrides });
+  return getAgentWithJob(id)!;
+}
+
+describe('GET /api/agents', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns agents array', async () => {
+    const res = await request(app).get('/api/agents');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+
+  it('returns an agent with its job via /:id', async () => {
+    const job = await insertTestJob({ title: 'Agent Job', status: 'running' });
+    const agent = await insertAgent(job.id, { status: 'running' });
+    // Use the uncached /:id endpoint to verify agent+job data
+    const res = await request(app).get(`/api/agents/${agent.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(agent.id);
+    expect(res.body.job).toBeTruthy();
+    expect(res.body.job.title).toBe('Agent Job');
+  });
+});
+
+describe('GET /api/agents/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns agent by id', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).get(`/api/agents/${agent.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(agent.id);
+    expect(res.body.job).toBeTruthy();
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).get('/api/agents/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/agents/:id/output', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns output for existing agent', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).get(`/api/agents/${agent.id}/output`);
+    expect(res.status).toBe(200);
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).get('/api/agents/nonexistent/output');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/agents/:id/result-text', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns result text', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).get(`/api/agents/${agent.id}/result-text`);
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('text');
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).get('/api/agents/nonexistent/result-text');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/agents/:id/diff', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns diff info', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).get(`/api/agents/${agent.id}/diff`);
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('diff');
+    expect(res.body).toHaveProperty('base_sha');
+  });
+});
+
+describe('POST /api/agents/:id/read', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('marks agent output as read', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).post(`/api/agents/${agent.id}/read`);
+    expect(res.status).toBe(200);
+    expect(res.body.output_read).toBe(1);
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).post('/api/agents/nonexistent/read');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/agents/read-all', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('marks multiple agents as read', async () => {
+    const job1 = await insertTestJob({ status: 'done' });
+    const job2 = await insertTestJob({ status: 'done' });
+    const a1 = await insertAgent(job1.id, { status: 'done' });
+    const a2 = await insertAgent(job2.id, { status: 'done' });
+    const res = await request(app)
+      .post('/api/agents/read-all')
+      .send({ ids: [a1.id, a2.id] });
+    expect(res.status).toBe(200);
+    expect(res.body.marked).toBe(2);
+  });
+
+  it('handles empty request body', async () => {
+    const res = await request(app).post('/api/agents/read-all').send({});
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('marked');
+  });
+});
+
+describe('POST /api/agents/:id/retry', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('retries a failed agent', async () => {
+    const job = await insertTestJob({ status: 'failed' });
+    const agent = await insertAgent(job.id, { status: 'failed' });
+    const res = await request(app).post(`/api/agents/${agent.id}/retry`);
+    expect(res.status).toBe(201);
+    expect(res.body.job.title).toContain('↺');
+  });
+
+  it('rejects retrying non-failed agent', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const agent = await insertAgent(job.id, { status: 'running' });
+    const res = await request(app).post(`/api/agents/${agent.id}/retry`);
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).post('/api/agents/nonexistent/retry');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/agents/:id/continue', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a continuation job', async () => {
+    const job = await insertTestJob({ status: 'done' });
+    const agent = await insertAgent(job.id, { status: 'done' });
+    const res = await request(app)
+      .post(`/api/agents/${agent.id}/continue`)
+      .send({ message: 'Continue with this' });
+    expect(res.status).toBe(201);
+    expect(res.body.job.title).toContain('↩');
+  });
+
+  it('rejects missing message', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app)
+      .post(`/api/agents/${agent.id}/continue`)
+      .send({});
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/message/i);
+  });
+
+  it('rejects empty message', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app)
+      .post(`/api/agents/${agent.id}/continue`)
+      .send({ message: '  ' });
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('POST /api/agents/:id/dismiss-warnings', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('dismisses warnings', async () => {
+    const job = await insertTestJob();
+    const agent = await insertAgent(job.id);
+    const res = await request(app).post(`/api/agents/${agent.id}/dismiss-warnings`);
+    expect(res.status).toBe(200);
+    expect(res.body.dismissed).toBe(true);
+  });
+
+  it('returns 404 for unknown agent', async () => {
+    const res = await request(app).post('/api/agents/nonexistent/dismiss-warnings');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('DELETE /api/agents/disconnect-all', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('disconnects all agents', async () => {
+    const res = await request(app).delete('/api/agents/disconnect-all');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('disconnected');
+  });
+});
diff --git a/src/test/api/batchTemplates.test.ts b/src/test/api/batchTemplates.test.ts
new file mode 100644
index 0000000..d1575d9
--- /dev/null
+++ b/src/test/api/batchTemplates.test.ts
@@ -0,0 +1,217 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/DebateManager.js', () => ({
+  spawnInitialRoundJobs: vi.fn(() => [
+    { id: 'claude-job', title: 'Claude', status: 'queued', debate_role: 'claude' },
+    { id: 'codex-job', title: 'Codex', status: 'queued', debate_role: 'codex' },
+  ]),
+  resolvePreDebateTerminal: vi.fn(),
+}));
+
+let app: express.Express;
+
+async function createBatchTemplate(overrides: Record<string, any> = {}) {
+  const res = await request(app).post('/api/batch-templates').send({
+    name: 'My Batch',
+    items: ['task 1', 'task 2', 'task 3'],
+    ...overrides,
+  });
+  return res.body;
+}
+
+describe('GET /api/batch-templates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/batch-templates');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all batch templates', async () => {
+    await createBatchTemplate({ name: 'A' });
+    await createBatchTemplate({ name: 'B' });
+    const res = await request(app).get('/api/batch-templates');
+    expect(res.body.length).toBe(2);
+  });
+});
+
+describe('GET /api/batch-templates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns a batch template by id', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app).get(`/api/batch-templates/${bt.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.name).toBe('My Batch');
+    expect(res.body.items).toEqual(['task 1', 'task 2', 'task 3']);
+  });
+
+  it('returns 404 for unknown id', async () => {
+    const res = await request(app).get('/api/batch-templates/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/batch-templates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a batch template', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ name: 'Test', items: ['a', 'b'] });
+    expect(res.status).toBe(201);
+    expect(res.body.name).toBe('Test');
+    expect(res.body.items).toEqual(['a', 'b']);
+  });
+
+  it('rejects missing name', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ items: ['a'] });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/name/i);
+  });
+
+  it('rejects missing items', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ name: 'X' });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/item/i);
+  });
+
+  it('rejects empty items array', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ name: 'X', items: [] });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects items with only whitespace', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ name: 'X', items: ['  ', ''] });
+    expect(res.status).toBe(400);
+  });
+
+  it('trims item whitespace', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates')
+      .send({ name: 'X', items: ['  hello  ', '  world  '] });
+    expect(res.status).toBe(201);
+    expect(res.body.items).toEqual(['hello', 'world']);
+  });
+});
+
+describe('PUT /api/batch-templates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates name', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .put(`/api/batch-templates/${bt.id}`)
+      .send({ name: 'Updated' });
+    expect(res.status).toBe(200);
+    expect(res.body.name).toBe('Updated');
+  });
+
+  it('updates items', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .put(`/api/batch-templates/${bt.id}`)
+      .send({ items: ['new item'] });
+    expect(res.body.items).toEqual(['new item']);
+  });
+
+  it('rejects empty items update', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .put(`/api/batch-templates/${bt.id}`)
+      .send({ items: ['', ' '] });
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 404 for unknown id', async () => {
+    const res = await request(app)
+      .put('/api/batch-templates/nonexistent')
+      .send({ name: 'X' });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('DELETE /api/batch-templates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('deletes a batch template', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app).delete(`/api/batch-templates/${bt.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.ok).toBe(true);
+  });
+
+  it('returns 404 for unknown id', async () => {
+    const res = await request(app).delete('/api/batch-templates/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/batch-templates/:id/run', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('runs a batch template creating jobs', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .post(`/api/batch-templates/${bt.id}/run`)
+      .send({});
+    expect(res.status).toBe(201);
+    expect(res.body.project).toBeTruthy();
+    expect(res.body.jobs.length).toBe(3); // one per item
+  });
+
+  it('runs in debate mode', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .post(`/api/batch-templates/${bt.id}/run`)
+      .send({ debate: true, claudeModel: 'claude-opus-4-6', codexModel: 'codex' });
+    expect(res.status).toBe(201);
+    expect(res.body.debates).toBeTruthy();
+    expect(res.body.debates.length).toBe(3);
+  });
+
+  it('rejects debate mode without models', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .post(`/api/batch-templates/${bt.id}/run`)
+      .send({ debate: true });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/Model/i);
+  });
+
+  it('returns 404 for unknown batch template', async () => {
+    const res = await request(app)
+      .post('/api/batch-templates/nonexistent/run')
+      .send({});
+    expect(res.status).toBe(404);
+  });
+
+  it('uses custom project name', async () => {
+    const bt = await createBatchTemplate();
+    const res = await request(app)
+      .post(`/api/batch-templates/${bt.id}/run`)
+      .send({ projectName: 'Custom Project' });
+    expect(res.status).toBe(201);
+    expect(res.body.project.name).toBe('Custom Project');
+  });
+});
diff --git a/src/test/api/debates.test.ts b/src/test/api/debates.test.ts
new file mode 100644
index 0000000..14753fc
--- /dev/null
+++ b/src/test/api/debates.test.ts
@@ -0,0 +1,170 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestProject } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/DebateManager.js', () => ({
+  spawnInitialRoundJobs: vi.fn(() => [
+    { id: 'claude-job', title: 'Claude R1', status: 'queued', debate_role: 'claude' },
+    { id: 'codex-job', title: 'Codex R1', status: 'queued', debate_role: 'codex' },
+  ]),
+  resolvePreDebateTerminal: vi.fn(),
+  _resetForTest: vi.fn(),
+}));
+
+let app: express.Express;
+
+async function insertDebateViaApi(overrides: Record<string, any> = {}) {
+  const res = await request(app).post('/api/debates').send({
+    task: 'Should we use React or Vue?',
+    claudeModel: 'claude-sonnet-4-6',
+    codexModel: 'codex',
+    ...overrides,
+  });
+  return res.body;
+}
+
+describe('GET /api/debates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/debates');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all debates', async () => {
+    await insertDebateViaApi();
+    await insertDebateViaApi({ task: 'Another debate' });
+    const res = await request(app).get('/api/debates');
+    expect(res.body.length).toBe(2);
+  });
+});
+
+describe('GET /api/debates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns a debate by id', async () => {
+    const { debate } = await insertDebateViaApi();
+    const res = await request(app).get(`/api/debates/${debate.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(debate.id);
+    expect(res.body.task).toBe('Should we use React or Vue?');
+  });
+
+  it('returns 404 for unknown debate', async () => {
+    const res = await request(app).get('/api/debates/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/debates/:id/jobs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns 404 for unknown debate', async () => {
+    const res = await request(app).get('/api/debates/nonexistent/jobs');
+    expect(res.status).toBe(404);
+  });
+
+  it('returns jobs for a debate', async () => {
+    const { debate } = await insertDebateViaApi();
+    const res = await request(app).get(`/api/debates/${debate.id}/jobs`);
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+});
+
+describe('POST /api/debates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a debate with all required fields', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ task: 'Debate topic', claudeModel: 'claude-opus-4-6', codexModel: 'codex' });
+    expect(res.status).toBe(201);
+    expect(res.body.debate).toBeTruthy();
+    expect(res.body.project).toBeTruthy();
+    expect(res.body.jobs).toHaveLength(2);
+    expect(res.body.debate.status).toBe('running');
+    expect(res.body.debate.claude_model).toBe('claude-opus-4-6');
+  });
+
+  it('sets custom title and max rounds', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ task: 'topic', claudeModel: 'c', codexModel: 'x', title: 'My Debate', maxRounds: 5 });
+    expect(res.status).toBe(201);
+    expect(res.body.debate.title).toBe('My Debate');
+    expect(res.body.debate.max_rounds).toBe(5);
+  });
+
+  it('clamps maxRounds to valid range', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ task: 'topic', claudeModel: 'c', codexModel: 'x', maxRounds: 100 });
+    expect(res.status).toBe(201);
+    expect(res.body.debate.max_rounds).toBeLessThanOrEqual(10);
+  });
+
+  it('rejects missing task', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ claudeModel: 'c', codexModel: 'x' });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/task/i);
+  });
+
+  it('rejects missing claudeModel', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ task: 'topic', codexModel: 'x' });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/claudeModel/i);
+  });
+
+  it('rejects missing codexModel', async () => {
+    const res = await request(app)
+      .post('/api/debates')
+      .send({ task: 'topic', claudeModel: 'c' });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/codexModel/i);
+  });
+
+  it('emits socket events', async () => {
+    const socket = await import('../../server/socket/SocketManager.js');
+    await insertDebateViaApi();
+    expect(socket.emitDebateNew).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('POST /api/debates/:id/cancel', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('cancels a running debate', async () => {
+    const { debate } = await insertDebateViaApi();
+    const res = await request(app).post(`/api/debates/${debate.id}/cancel`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('cancelled');
+  });
+
+  it('rejects cancelling a non-running debate', async () => {
+    const { debate } = await insertDebateViaApi();
+    // Cancel it first
+    await request(app).post(`/api/debates/${debate.id}/cancel`);
+    // Try to cancel again
+    const res = await request(app).post(`/api/debates/${debate.id}/cancel`);
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 404 for unknown debate', async () => {
+    const res = await request(app).post('/api/debates/nonexistent/cancel');
+    expect(res.status).toBe(404);
+  });
+});
diff --git a/src/test/api/eye.test.ts b/src/test/api/eye.test.ts
new file mode 100644
index 0000000..e396f5f
--- /dev/null
+++ b/src/test/api/eye.test.ts
@@ -0,0 +1,305 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestProject } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/AgentRunner.js', () => ({
+  runAgent: vi.fn(),
+  cancelledAgents: new Set(),
+}));
+vi.mock('../../server/orchestrator/PtyManager.js', () => ({
+  disconnectAgent: vi.fn(),
+  disconnectAll: vi.fn(() => []),
+  getPtyBuffer: vi.fn(() => []),
+  getSnapshot: vi.fn(() => null),
+  attachPty: vi.fn(),
+  isTmuxSessionAlive: vi.fn(() => false),
+  startInteractiveAgent: vi.fn(),
+}));
+vi.mock('../../server/orchestrator/FileLockRegistry.js', () => ({
+  CHECKOUT_PREFIX: 'checkout::',
+  getFileLockRegistry: vi.fn(() => ({
+    releaseAll: vi.fn(),
+  })),
+}));
+vi.mock('../../server/orchestrator/EyeConfig.js', () => ({
+  buildEyePrompt: vi.fn(() => 'mock eye prompt'),
+  getEyeTargets: vi.fn(() => []),
+  EYE_PROMPT: 'default eye prompt',
+}));
+vi.mock('../../server/integrations/GitHubPoller.js', () => ({
+  getGitHubPollerStatus: vi.fn(() => ({ running: false, lastPollAt: null })),
+  startGitHubPoller: vi.fn(),
+  stopGitHubPoller: vi.fn(),
+}));
+vi.mock('child_process', () => ({
+  execSync: vi.fn(() => '[]'),
+  execFile: vi.fn(),
+}));
+
+let app: express.Express;
+
+describe('GET /api/eye/status', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns eye status', async () => {
+    const res = await request(app).get('/api/eye/status');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('running');
+    expect(res.body).toHaveProperty('active');
+    expect(res.body).toHaveProperty('jobId');
+  });
+});
+
+describe('GET /api/eye/github-status', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns github poller status', async () => {
+    const res = await request(app).get('/api/eye/github-status');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('running');
+  });
+});
+
+describe('POST /api/eye/start', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('starts the eye agent', async () => {
+    const res = await request(app).post('/api/eye/start').send({});
+    expect(res.status).toBe(201);
+    expect(res.body.jobId).toBeTruthy();
+    expect(res.body.status).toBe('queued');
+  });
+
+  it('returns 409 if already running', async () => {
+    await request(app).post('/api/eye/start').send({});
+    const res = await request(app).post('/api/eye/start').send({});
+    expect(res.status).toBe(409);
+    expect(res.body.error).toMatch(/already running/i);
+  });
+});
+
+describe('POST /api/eye/stop', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns 404 if eye is not running', async () => {
+    const res = await request(app).post('/api/eye/stop');
+    expect(res.status).toBe(404);
+  });
+
+  it('stops a running eye', async () => {
+    await request(app).post('/api/eye/start').send({});
+    const res = await request(app).post('/api/eye/stop');
+    expect(res.status).toBe(200);
+    expect(res.body.stopped).toBe(true);
+  });
+});
+
+describe('GET /api/eye/config', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns eye config', async () => {
+    const res = await request(app).get('/api/eye/config');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('targets');
+    expect(res.body).toHaveProperty('prompt');
+    expect(res.body).toHaveProperty('defaultPrompt');
+  });
+});
+
+describe('PUT /api/eye/config', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates eye config targets', async () => {
+    const res = await request(app)
+      .put('/api/eye/config')
+      .send({ targets: [{ path: '/repo', context: 'main repo' }] });
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('targets');
+  });
+
+  it('rejects non-array targets', async () => {
+    const res = await request(app)
+      .put('/api/eye/config')
+      .send({ targets: 'invalid' });
+    expect(res.status).toBe(400);
+  });
+
+  it('updates linearApiKey', async () => {
+    const res = await request(app)
+      .put('/api/eye/config')
+      .send({ linearApiKey: 'secret-key' });
+    expect(res.status).toBe(200);
+    expect(res.body.linearApiKey).toBe('***configured***');
+  });
+});
+
+describe('GET /api/eye/jobs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns eye jobs list', async () => {
+    const res = await request(app).get('/api/eye/jobs');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+});
+
+describe('GET /api/eye/summaries', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns summaries list', async () => {
+    const res = await request(app).get('/api/eye/summaries');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+});
+
+describe('GET /api/eye/prs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns PRs list', async () => {
+    const res = await request(app).get('/api/eye/prs');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+});
+
+describe('Eye Discussions', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('GET /api/eye/discussions returns empty array', async () => {
+    const res = await request(app).get('/api/eye/discussions');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('POST /api/eye/discussions creates a discussion', async () => {
+    const res = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'What about the auth module?' });
+    expect(res.status).toBe(201);
+    expect(res.body.discussion).toBeTruthy();
+    expect(res.body.message).toBeTruthy();
+    expect(res.body.discussion.topic).toContain('auth module');
+  });
+
+  it('POST /api/eye/discussions rejects empty content', async () => {
+    const res = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: '  ' });
+    expect(res.status).toBe(400);
+  });
+
+  it('GET /api/eye/discussions/:id returns discussion with messages', async () => {
+    const create = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'Question here' });
+    const res = await request(app).get(`/api/eye/discussions/${create.body.discussion.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.messages).toBeTruthy();
+    expect(res.body.messages.length).toBe(1);
+  });
+
+  it('GET /api/eye/discussions/:id returns 404 for unknown', async () => {
+    const res = await request(app).get('/api/eye/discussions/nonexistent');
+    expect(res.status).toBe(404);
+  });
+
+  it('POST /api/eye/discussions/:id/messages adds a message', async () => {
+    const create = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'Initial' });
+    const res = await request(app)
+      .post(`/api/eye/discussions/${create.body.discussion.id}/messages`)
+      .send({ content: 'Follow up' });
+    expect(res.status).toBe(200);
+    expect(res.body.content).toBe('Follow up');
+    expect(res.body.role).toBe('user');
+  });
+
+  it('POST /api/eye/discussions/:id/messages rejects empty content', async () => {
+    const create = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'Initial' });
+    const res = await request(app)
+      .post(`/api/eye/discussions/${create.body.discussion.id}/messages`)
+      .send({ content: '' });
+    expect(res.status).toBe(400);
+  });
+
+  it('POST /api/eye/discussions/:id/resolve resolves a discussion', async () => {
+    const create = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'Question' });
+    const res = await request(app)
+      .post(`/api/eye/discussions/${create.body.discussion.id}/resolve`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('resolved');
+  });
+
+  it('POST /api/eye/discussions/:id/reopen reopens a discussion', async () => {
+    const create = await request(app)
+      .post('/api/eye/discussions')
+      .send({ content: 'Question' });
+    await request(app).post(`/api/eye/discussions/${create.body.discussion.id}/resolve`);
+    const res = await request(app)
+      .post(`/api/eye/discussions/${create.body.discussion.id}/reopen`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('open');
+  });
+});
+
+describe('Eye Proposals', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('GET /api/eye/proposals returns empty array', async () => {
+    const res = await request(app).get('/api/eye/proposals');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('GET /api/eye/proposals/:id returns 404 for unknown', async () => {
+    const res = await request(app).get('/api/eye/proposals/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('Eye PR Reviews', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('GET /api/eye/pr-reviews returns empty array', async () => {
+    const res = await request(app).get('/api/eye/pr-reviews');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+
+  it('GET /api/eye/pr-reviews/:id returns 404 for unknown', async () => {
+    const res = await request(app).get('/api/eye/pr-reviews/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/eye/agents', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns eye agents list', async () => {
+    const res = await request(app).get('/api/eye/agents');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+});
diff --git a/src/test/api/jobs.test.ts b/src/test/api/jobs.test.ts
new file mode 100644
index 0000000..32aac33
--- /dev/null
+++ b/src/test/api/jobs.test.ts
@@ -0,0 +1,328 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestJob, insertTestProject } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/DebateManager.js', () => ({
+  spawnInitialRoundJobs: vi.fn(() => []),
+  resolvePreDebateTerminal: vi.fn(),
+}));
+vi.mock('@anthropic-ai/sdk', () => ({
+  default: class {
+    messages = { create: vi.fn().mockResolvedValue({ content: [{ type: 'text', text: 'Smart Title' }] }) };
+  },
+}));
+
+let app: express.Express;
+
+describe('POST /api/jobs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a job with description', async () => {
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ description: 'Test job description' });
+    expect(res.status).toBe(201);
+    expect(res.body.id).toBeTruthy();
+    expect(res.body.description).toBe('Test job description');
+    expect(res.body.status).toBe('queued');
+  });
+
+  it('creates a job with explicit title', async () => {
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ title: 'My Title', description: 'desc' });
+    expect(res.status).toBe(201);
+    expect(res.body.title).toBe('My Title');
+  });
+
+  it('auto-generates title from description', async () => {
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ description: 'A short description' });
+    expect(res.status).toBe(201);
+    expect(res.body.title).toBe('A short description');
+  });
+
+  it('truncates long auto-titles', async () => {
+    const longDesc = 'A'.repeat(100);
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ description: longDesc });
+    expect(res.status).toBe(201);
+    expect(res.body.title.length).toBeLessThanOrEqual(45);
+  });
+
+  it('rejects missing description without template', async () => {
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({});
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/description/i);
+  });
+
+  it('sets priority and model', async () => {
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ description: 'test', priority: 5, model: 'claude-opus-4-6' });
+    expect(res.status).toBe(201);
+    expect(res.body.priority).toBe(5);
+    expect(res.body.model).toBe('claude-opus-4-6');
+  });
+
+  it('creates a job linked to a project', async () => {
+    // Create project via API to avoid import-order issues with Anthropic mock
+    const projectRes = await request(app)
+      .post('/api/projects')
+      .send({ name: 'Link Target' });
+    expect(projectRes.status).toBe(201);
+    const res = await request(app)
+      .post('/api/jobs')
+      .send({ description: 'test', projectId: projectRes.body.id });
+    expect(res.status).toBe(201);
+    expect(res.body.project_id).toBe(projectRes.body.id);
+  });
+
+  it('emits socket event on creation', async () => {
+    const socket = await import('../../server/socket/SocketManager.js');
+    await request(app).post('/api/jobs').send({ description: 'test' });
+    expect(socket.emitJobNew).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('GET /api/jobs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns an array of jobs', async () => {
+    await insertTestJob({ title: 'Job A' });
+    await insertTestJob({ title: 'Job B' });
+    const res = await request(app).get('/api/jobs');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+    expect(res.body.length).toBe(2);
+  });
+
+  it('filters by status', async () => {
+    await insertTestJob({ status: 'queued' });
+    await insertTestJob({ status: 'done' });
+    const res = await request(app).get('/api/jobs?status=done');
+    expect(res.status).toBe(200);
+    expect(res.body.every((j: any) => j.status === 'done')).toBe(true);
+  });
+
+  it('returns empty array when no jobs', async () => {
+    const res = await request(app).get('/api/jobs');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+    expect(res.body.length).toBe(0);
+  });
+
+  // Regression: a module-level cache seeded on the first request would return
+  // a stale empty list here even after a job was just created.
+  it('immediately reflects a newly created job in a subsequent list response', async () => {
+    const createRes = await request(app)
+      .post('/api/jobs')
+      .send({ title: 'Cache Probe Job', description: 'Verify no stale empty-list cache' });
+    expect(createRes.status).toBe(201);
+    const created = createRes.body;
+
+    const listRes = await request(app).get('/api/jobs');
+    expect(listRes.status).toBe(200);
+    expect(listRes.body).toHaveLength(1);
+    expect(listRes.body[0].id).toBe(created.id);
+    expect(listRes.body[0].title).toBe(created.title);
+    expect(listRes.body[0].status).toBe('queued');
+  });
+
+  // Regression: a module-level cache populated in one test run would bleed
+  // stale rows into a fresh DB opened in the next test run.
+  it('returns empty list from a fresh DB even after a prior DB instance had rows', async () => {
+    // Populate the current in-memory DB with a row
+    await insertTestJob({ title: 'Leftover Row' });
+    const before = await request(app).get('/api/jobs');
+    expect(before.status).toBe(200);
+    expect(before.body).toHaveLength(1);
+    expect(before.body[0].title).toBe('Leftover Row');
+
+    // Simulate a new test run: close the current DB and open a fresh empty one
+    const { closeDb, initDb } = await import('../../server/db/database.js');
+    closeDb();
+    await initDb(':memory:');
+
+    const freshApp = createTestApp();
+    // A stale module-level cache would return the old row; a fresh DB read must return []
+    const after = await request(freshApp).get('/api/jobs');
+    expect(after.status).toBe(200);
+    expect(after.body).toEqual([]);
+  });
+});
+
+describe('GET /api/jobs/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns a job by id', async () => {
+    const job = await insertTestJob({ title: 'Find Me' });
+    const res = await request(app).get(`/api/jobs/${job.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(job.id);
+    expect(res.body.title).toBe('Find Me');
+  });
+
+  it('returns 404 for unknown id', async () => {
+    const res = await request(app).get('/api/jobs/nonexistent');
+    expect(res.status).toBe(404);
+    expect(res.body.error).toBe('not found');
+  });
+});
+
+describe('POST /api/jobs/:id/flag', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('toggles flagged state', async () => {
+    const job = await insertTestJob();
+    const res1 = await request(app).post(`/api/jobs/${job.id}/flag`);
+    expect(res1.status).toBe(200);
+    expect(res1.body.flagged).toBe(1);
+
+    const res2 = await request(app).post(`/api/jobs/${job.id}/flag`);
+    expect(res2.body.flagged).toBe(0);
+  });
+
+  it('returns 404 for unknown job', async () => {
+    const res = await request(app).post('/api/jobs/nonexistent/flag');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('PATCH /api/jobs/:id/title', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates the title', async () => {
+    const job = await insertTestJob({ title: 'Old' });
+    const res = await request(app)
+      .patch(`/api/jobs/${job.id}/title`)
+      .send({ title: 'New Title' });
+    expect(res.status).toBe(200);
+    expect(res.body.title).toBe('New Title');
+  });
+
+  it('rejects empty title', async () => {
+    const job = await insertTestJob();
+    const res = await request(app)
+      .patch(`/api/jobs/${job.id}/title`)
+      .send({ title: '   ' });
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 404 for unknown job', async () => {
+    const res = await request(app)
+      .patch('/api/jobs/nonexistent/title')
+      .send({ title: 'X' });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/jobs/:id/run-now', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('clears scheduled_at for queued jobs', async () => {
+    const job = await insertTestJob({ status: 'queued' });
+    const res = await request(app).post(`/api/jobs/${job.id}/run-now`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(job.id);
+  });
+
+  it('rejects non-queued jobs', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const res = await request(app).post(`/api/jobs/${job.id}/run-now`);
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/queued/);
+  });
+});
+
+describe('PATCH /api/jobs/:id/interactive', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('sets interactive flag', async () => {
+    const job = await insertTestJob();
+    const res = await request(app)
+      .patch(`/api/jobs/${job.id}/interactive`)
+      .send({ interactive: true });
+    expect(res.status).toBe(200);
+    expect(res.body.is_interactive).toBe(1);
+  });
+
+  it('clears interactive flag', async () => {
+    const job = await insertTestJob();
+    // Set it first
+    await request(app).patch(`/api/jobs/${job.id}/interactive`).send({ interactive: true });
+    const res = await request(app)
+      .patch(`/api/jobs/${job.id}/interactive`)
+      .send({ interactive: false });
+    expect(res.body.is_interactive).toBe(0);
+  });
+});
+
+describe('POST /api/jobs/:id/archive', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('archives a done job', async () => {
+    const job = await insertTestJob({ status: 'done' });
+    const res = await request(app).post(`/api/jobs/${job.id}/archive`);
+    expect(res.status).toBe(200);
+    expect(res.body.archived_at).toBeTruthy();
+  });
+
+  it('archives a failed job', async () => {
+    const job = await insertTestJob({ status: 'failed' });
+    const res = await request(app).post(`/api/jobs/${job.id}/archive`);
+    expect(res.status).toBe(200);
+  });
+
+  it('rejects archiving running jobs', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const res = await request(app).post(`/api/jobs/${job.id}/archive`);
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/finished/i);
+  });
+
+  it('rejects archiving queued jobs', async () => {
+    const job = await insertTestJob({ status: 'queued' });
+    const res = await request(app).post(`/api/jobs/${job.id}/archive`);
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('DELETE /api/jobs/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('cancels a queued job', async () => {
+    const job = await insertTestJob({ status: 'queued' });
+    const res = await request(app).delete(`/api/jobs/${job.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('cancelled');
+  });
+
+  it('rejects cancelling non-queued jobs', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const res = await request(app).delete(`/api/jobs/${job.id}`);
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/queued/);
+  });
+
+  it('returns 404 for unknown job', async () => {
+    const res = await request(app).delete('/api/jobs/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
diff --git a/src/test/api/knowledgeBase.test.ts b/src/test/api/knowledgeBase.test.ts
new file mode 100644
index 0000000..eef0bbe
--- /dev/null
+++ b/src/test/api/knowledgeBase.test.ts
@@ -0,0 +1,160 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/KBConsolidator.js', () => ({
+  runConsolidation: vi.fn().mockResolvedValue({ merged: 0, removed: 0 }),
+  startKBConsolidator: vi.fn(),
+  stopKBConsolidator: vi.fn(),
+}));
+
+let app: express.Express;
+
+describe('GET /api/knowledge-base', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/knowledge-base');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all KB entries', async () => {
+    await request(app).post('/api/knowledge-base').send({ title: 'Entry 1', content: 'Content 1' });
+    await request(app).post('/api/knowledge-base').send({ title: 'Entry 2', content: 'Content 2' });
+    const res = await request(app).get('/api/knowledge-base');
+    expect(res.body.length).toBe(2);
+  });
+
+  it('filters by projectId', async () => {
+    await request(app).post('/api/knowledge-base').send({ title: 'A', content: 'c', projectId: 'proj1' });
+    await request(app).post('/api/knowledge-base').send({ title: 'B', content: 'c', projectId: 'proj2' });
+    const res = await request(app).get('/api/knowledge-base?projectId=proj1');
+    expect(res.body.length).toBe(1);
+    expect(res.body[0].title).toBe('A');
+  });
+});
+
+describe('GET /api/knowledge-base/search', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('searches entries by query', async () => {
+    await request(app).post('/api/knowledge-base').send({ title: 'Testing patterns', content: 'Use vitest for testing' });
+    await request(app).post('/api/knowledge-base').send({ title: 'Build guide', content: 'Use npm run build' });
+    const res = await request(app).get('/api/knowledge-base/search?q=testing');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+
+  it('returns 400 when q is missing', async () => {
+    const res = await request(app).get('/api/knowledge-base/search');
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/q/);
+  });
+});
+
+describe('POST /api/knowledge-base', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a KB entry', async () => {
+    const res = await request(app)
+      .post('/api/knowledge-base')
+      .send({ title: 'New Entry', content: 'Content here', tags: 'testing,build' });
+    expect(res.status).toBe(201);
+    expect(res.body.title).toBe('New Entry');
+    expect(res.body.content).toBe('Content here');
+    expect(res.body.tags).toBe('testing,build');
+    expect(res.body.id).toBeTruthy();
+  });
+
+  it('creates minimal entry', async () => {
+    const res = await request(app)
+      .post('/api/knowledge-base')
+      .send({ title: 'Min', content: 'c' });
+    expect(res.status).toBe(201);
+    expect(res.body.tags).toBeNull();
+    expect(res.body.source).toBeNull();
+  });
+
+  it('rejects missing title', async () => {
+    const res = await request(app)
+      .post('/api/knowledge-base')
+      .send({ content: 'c' });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects missing content', async () => {
+    const res = await request(app)
+      .post('/api/knowledge-base')
+      .send({ title: 't' });
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('PUT /api/knowledge-base/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates a KB entry', async () => {
+    const create = await request(app)
+      .post('/api/knowledge-base')
+      .send({ title: 'Old', content: 'old content' });
+    const res = await request(app)
+      .put(`/api/knowledge-base/${create.body.id}`)
+      .send({ title: 'Updated', content: 'new content' });
+    expect(res.status).toBe(200);
+    expect(res.body.title).toBe('Updated');
+    expect(res.body.content).toBe('new content');
+  });
+
+  it('returns 404 for unknown entry', async () => {
+    const res = await request(app)
+      .put('/api/knowledge-base/nonexistent')
+      .send({ title: 'X' });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('DELETE /api/knowledge-base/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('deletes a KB entry', async () => {
+    const create = await request(app)
+      .post('/api/knowledge-base')
+      .send({ title: 'ToDelete', content: 'c' });
+    const res = await request(app).delete(`/api/knowledge-base/${create.body.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.deleted).toBe(true);
+  });
+
+  it('returns 404 for unknown entry', async () => {
+    const res = await request(app).delete('/api/knowledge-base/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/knowledge-base/consolidate', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('runs consolidation', async () => {
+    const res = await request(app).post('/api/knowledge-base/consolidate');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('merged');
+  });
+
+  it('returns 500 on consolidation failure', async () => {
+    const { runConsolidation } = await import('../../server/orchestrator/KBConsolidator.js');
+    vi.mocked(runConsolidation).mockRejectedValueOnce(new Error('boom'));
+    const res = await request(app).post('/api/knowledge-base/consolidate');
+    expect(res.status).toBe(500);
+    expect(res.body.error).toMatch(/boom/);
+  });
+});
diff --git a/src/test/api/localConfig.test.ts b/src/test/api/localConfig.test.ts
new file mode 100644
index 0000000..571b56e
--- /dev/null
+++ b/src/test/api/localConfig.test.ts
@@ -0,0 +1,39 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+// Mock fs.readFileSync to return test config
+vi.mock('fs', async (importOriginal) => {
+  const original = await importOriginal() as any;
+  return {
+    ...original,
+    readFileSync: vi.fn((path: string, ...args: any[]) => {
+      if (typeof path === 'string' && path.includes('.local.config.json')) {
+        return JSON.stringify({ eyeEnabled: true });
+      }
+      return original.readFileSync(path, ...args);
+    }),
+  };
+});
+
+let app: express.Express;
+
+describe('GET /api/local-config', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns local config', async () => {
+    const res = await request(app).get('/api/local-config');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('eyeEnabled');
+  });
+
+  it('returns eyeEnabled field', async () => {
+    const res = await request(app).get('/api/local-config');
+    expect(res.status).toBe(200);
+    expect(typeof res.body.eyeEnabled).toBe('boolean');
+  });
+});
diff --git a/src/test/api/locks.test.ts b/src/test/api/locks.test.ts
new file mode 100644
index 0000000..c81dac3
--- /dev/null
+++ b/src/test/api/locks.test.ts
@@ -0,0 +1,151 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestJob } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+
+let app: express.Express;
+
+/** Create an agent+job so we have a valid agent_id for the FK constraint on file_locks */
+async function ensureAgent(agentId: string) {
+  const { insertAgent: dbInsert } = await import('../../server/db/queries.js');
+  const job = await insertTestJob();
+  try {
+    dbInsert({ id: agentId, job_id: job.id, status: 'running' });
+  } catch { /* already exists */ }
+}
+
+async function insertLock(agentId: string, filePath: string) {
+  const { insertFileLock } = await import('../../server/db/queries.js');
+  const { randomUUID } = await import('crypto');
+  await ensureAgent(agentId);
+  const id = randomUUID();
+  const now = Date.now();
+  insertFileLock({
+    id,
+    agent_id: agentId,
+    file_path: filePath,
+    reason: 'test',
+    acquired_at: now,
+    expires_at: now + 600000,
+    released_at: null,
+  });
+  return { id, agent_id: agentId, file_path: filePath };
+}
+
+describe('GET /api/locks', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/locks');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns active locks', async () => {
+    await insertLock('agent-1', '/path/to/file.ts');
+    const res = await request(app).get('/api/locks');
+    expect(res.status).toBe(200);
+    expect(res.body.length).toBe(1);
+    expect(res.body[0].file_path).toBe('/path/to/file.ts');
+  });
+});
+
+describe('GET /api/locks/check', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns locked:true when agent holds lock', async () => {
+    await insertLock('agent-1', '/file.ts');
+    const res = await request(app)
+      .get('/api/locks/check')
+      .query({ agent_id: 'agent-1', file: '/file.ts' });
+    expect(res.status).toBe(200);
+    expect(res.body.locked).toBe(true);
+  });
+
+  it('returns locked:false when agent does not hold lock', async () => {
+    await insertLock('agent-1', '/file.ts');
+    const res = await request(app)
+      .get('/api/locks/check')
+      .query({ agent_id: 'agent-2', file: '/file.ts' });
+    expect(res.status).toBe(200);
+    expect(res.body.locked).toBe(false);
+  });
+
+  it('returns locked:false for unlocked file', async () => {
+    const res = await request(app)
+      .get('/api/locks/check')
+      .query({ agent_id: 'agent-1', file: '/other.ts' });
+    expect(res.status).toBe(200);
+    expect(res.body.locked).toBe(false);
+  });
+
+  it('returns 400 when agent_id missing', async () => {
+    const res = await request(app)
+      .get('/api/locks/check')
+      .query({ file: '/file.ts' });
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 when file missing', async () => {
+    const res = await request(app)
+      .get('/api/locks/check')
+      .query({ agent_id: 'agent-1' });
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('GET /api/locks/check-checkout', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns locked:false when no checkout locks exist', async () => {
+    const res = await request(app)
+      .get('/api/locks/check-checkout')
+      .query({ agent_id: 'agent-1', dir: '/repo' });
+    expect(res.status).toBe(200);
+    expect(res.body.locked).toBe(false);
+  });
+
+  it('returns 400 when agent_id missing', async () => {
+    const res = await request(app)
+      .get('/api/locks/check-checkout')
+      .query({ dir: '/repo' });
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 400 when dir missing', async () => {
+    const res = await request(app)
+      .get('/api/locks/check-checkout')
+      .query({ agent_id: 'agent-1' });
+    expect(res.status).toBe(400);
+  });
+});
+
+describe('DELETE /api/locks/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('releases a lock', async () => {
+    const lock = await insertLock('agent-1', '/file.ts');
+    const res = await request(app).delete(`/api/locks/${lock.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.ok).toBe(true);
+  });
+
+  it('returns 404 for unknown lock', async () => {
+    const res = await request(app).delete('/api/locks/nonexistent');
+    expect(res.status).toBe(404);
+  });
+
+  it('emits socket event on release', async () => {
+    const socket = await import('../../server/socket/SocketManager.js');
+    const lock = await insertLock('agent-1', '/file.ts');
+    await request(app).delete(`/api/locks/${lock.id}`);
+    expect(socket.emitLockReleased).toHaveBeenCalledWith(lock.id, '/file.ts');
+  });
+});
diff --git a/src/test/api/models.test.ts b/src/test/api/models.test.ts
new file mode 100644
index 0000000..eec29c7
--- /dev/null
+++ b/src/test/api/models.test.ts
@@ -0,0 +1,49 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+// Mock fs.readFileSync to avoid reading real codex auth
+vi.mock('fs', async (importOriginal) => {
+  const original = await importOriginal() as any;
+  return {
+    ...original,
+    readFileSync: vi.fn((path: string, ...args: any[]) => {
+      if (typeof path === 'string' && path.includes('.codex/auth.json')) {
+        throw new Error('File not found');
+      }
+      return original.readFileSync(path, ...args);
+    }),
+  };
+});
+
+let app: express.Express;
+
+describe('GET /api/models', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns model options', async () => {
+    const res = await request(app).get('/api/models');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('claude');
+    expect(res.body).toHaveProperty('codex');
+    expect(Array.isArray(res.body.claude)).toBe(true);
+    expect(Array.isArray(res.body.codex)).toBe(true);
+  });
+
+  it('returns claude model options with value and label', async () => {
+    const res = await request(app).get('/api/models');
+    for (const model of res.body.claude) {
+      expect(model).toHaveProperty('value');
+      expect(model).toHaveProperty('label');
+    }
+  });
+
+  it('includes lastFetchedAt field', async () => {
+    const res = await request(app).get('/api/models');
+    expect(res.body).toHaveProperty('lastFetchedAt');
+  });
+});
diff --git a/src/test/api/projects.test.ts b/src/test/api/projects.test.ts
new file mode 100644
index 0000000..d82e9da
--- /dev/null
+++ b/src/test/api/projects.test.ts
@@ -0,0 +1,141 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestProject } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+
+let app: express.Express;
+
+describe('GET /api/projects', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array when no projects', async () => {
+    const res = await request(app).get('/api/projects');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all projects', async () => {
+    await insertTestProject({ name: 'P1' });
+    await insertTestProject({ name: 'P2' });
+    const res = await request(app).get('/api/projects');
+    expect(res.status).toBe(200);
+    expect(res.body.length).toBe(2);
+  });
+});
+
+describe('GET /api/projects/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns a project by id', async () => {
+    const project = await insertTestProject({ name: 'Test' });
+    const res = await request(app).get(`/api/projects/${project.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.name).toBe('Test');
+  });
+
+  it('returns 404 for unknown id', async () => {
+    const res = await request(app).get('/api/projects/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/projects', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a project', async () => {
+    const res = await request(app)
+      .post('/api/projects')
+      .send({ name: 'New Project', description: 'desc' });
+    expect(res.status).toBe(201);
+    expect(res.body.name).toBe('New Project');
+    expect(res.body.description).toBe('desc');
+    expect(res.body.id).toBeTruthy();
+  });
+
+  it('creates a project without description', async () => {
+    const res = await request(app)
+      .post('/api/projects')
+      .send({ name: 'Minimal' });
+    expect(res.status).toBe(201);
+    expect(res.body.description).toBeNull();
+  });
+
+  it('rejects empty name', async () => {
+    const res = await request(app)
+      .post('/api/projects')
+      .send({ name: '' });
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/name/i);
+  });
+
+  it('rejects missing name', async () => {
+    const res = await request(app)
+      .post('/api/projects')
+      .send({});
+    expect(res.status).toBe(400);
+  });
+
+  it('trims whitespace from name', async () => {
+    const res = await request(app)
+      .post('/api/projects')
+      .send({ name: '  Trimmed  ' });
+    expect(res.status).toBe(201);
+    expect(res.body.name).toBe('Trimmed');
+  });
+});
+
+describe('PUT /api/projects/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates project name', async () => {
+    const project = await insertTestProject({ name: 'Old' });
+    const res = await request(app)
+      .put(`/api/projects/${project.id}`)
+      .send({ name: 'Updated' });
+    expect(res.status).toBe(200);
+    expect(res.body.name).toBe('Updated');
+  });
+
+  it('updates project description', async () => {
+    const project = await insertTestProject();
+    const res = await request(app)
+      .put(`/api/projects/${project.id}`)
+      .send({ description: 'New desc' });
+    expect(res.status).toBe(200);
+    expect(res.body.description).toBe('New desc');
+  });
+
+  it('returns 404 for unknown project', async () => {
+    const res = await request(app)
+      .put('/api/projects/nonexistent')
+      .send({ name: 'X' });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('DELETE /api/projects/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('deletes a project', async () => {
+    const project = await insertTestProject();
+    const res = await request(app).delete(`/api/projects/${project.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.ok).toBe(true);
+
+    const check = await request(app).get(`/api/projects/${project.id}`);
+    expect(check.status).toBe(404);
+  });
+
+  it('returns 404 for unknown project', async () => {
+    const res = await request(app).delete('/api/projects/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
diff --git a/src/test/api/replies.test.ts b/src/test/api/replies.test.ts
new file mode 100644
index 0000000..1ea44af
--- /dev/null
+++ b/src/test/api/replies.test.ts
@@ -0,0 +1,79 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestJob } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/MessageRouter.js', () => ({
+  getMessageRouter: vi.fn(() => ({
+    resolveReply: vi.fn((questionId: string, answer: string) => true),
+  })),
+}));
+
+let app: express.Express;
+
+async function insertQuestion(agentId: string, status = 'pending') {
+  const { randomUUID } = await import('crypto');
+  const { getDb } = await import('../../server/db/database.js');
+  const db = getDb();
+  const id = randomUUID();
+  db.prepare(
+    `INSERT INTO questions (id, agent_id, question, answer, status, asked_at, answered_at, timeout_ms)
+     VALUES (?, ?, ?, NULL, ?, ?, NULL, 60000)`
+  ).run(id, agentId, 'What do you think?', status, Date.now());
+  return id;
+}
+
+async function insertAgent(jobId: string) {
+  const { insertAgent: dbInsert } = await import('../../server/db/queries.js');
+  const { randomUUID } = await import('crypto');
+  const id = randomUUID();
+  dbInsert({ id, job_id: jobId, status: 'waiting_user' });
+  return id;
+}
+
+describe('POST /api/replies/:questionId', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('submits a reply to a pending question', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const agentId = await insertAgent(job.id);
+    const questionId = await insertQuestion(agentId, 'pending');
+    const res = await request(app)
+      .post(`/api/replies/${questionId}`)
+      .send({ answer: 'Yes, do it' });
+    expect(res.status).toBe(200);
+    expect(res.body.ok).toBe(true);
+  });
+
+  it('rejects missing answer', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const agentId = await insertAgent(job.id);
+    const questionId = await insertQuestion(agentId);
+    const res = await request(app)
+      .post(`/api/replies/${questionId}`)
+      .send({});
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/answer/i);
+  });
+
+  it('returns 404 for unknown question', async () => {
+    const res = await request(app)
+      .post('/api/replies/nonexistent')
+      .send({ answer: 'test' });
+    expect(res.status).toBe(404);
+  });
+
+  it('returns 409 for already answered question', async () => {
+    const job = await insertTestJob({ status: 'running' });
+    const agentId = await insertAgent(job.id);
+    const questionId = await insertQuestion(agentId, 'answered');
+    const res = await request(app)
+      .post(`/api/replies/${questionId}`)
+      .send({ answer: 'test' });
+    expect(res.status).toBe(409);
+    expect(res.body.error).toMatch(/already answered/i);
+  });
+});
diff --git a/src/test/api/search.test.ts b/src/test/api/search.test.ts
new file mode 100644
index 0000000..dba38d6
--- /dev/null
+++ b/src/test/api/search.test.ts
@@ -0,0 +1,45 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+
+let app: express.Express;
+
+describe('GET /api/search', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty results when q is empty', async () => {
+    const res = await request(app).get('/api/search');
+    expect(res.status).toBe(200);
+    expect(res.body.results).toEqual([]);
+  });
+
+  it('returns empty results when q is whitespace', async () => {
+    const res = await request(app).get('/api/search?q=%20%20');
+    expect(res.status).toBe(200);
+    expect(res.body.results).toEqual([]);
+  });
+
+  it('returns results array for valid query', async () => {
+    const res = await request(app).get('/api/search?q=test');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('results');
+    expect(Array.isArray(res.body.results)).toBe(true);
+  });
+
+  it('respects limit parameter', async () => {
+    const res = await request(app).get('/api/search?q=test&limit=10');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body.results)).toBe(true);
+  });
+
+  it('caps limit at 200', async () => {
+    const res = await request(app).get('/api/search?q=test&limit=500');
+    expect(res.status).toBe(200);
+    // Still works, just capped server-side
+  });
+});
diff --git a/src/test/api/settings.test.ts b/src/test/api/settings.test.ts
new file mode 100644
index 0000000..adb381b
--- /dev/null
+++ b/src/test/api/settings.test.ts
@@ -0,0 +1,81 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/WorkQueueManager.js', () => {
+  let maxConcurrent = 5;
+  return {
+    getMaxConcurrent: vi.fn(() => maxConcurrent),
+    setMaxConcurrent: vi.fn((n: number) => { maxConcurrent = n; }),
+    startWorkQueue: vi.fn(),
+    stopWorkQueue: vi.fn(),
+  };
+});
+
+let app: express.Express;
+
+describe('GET /api/settings', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns settings', async () => {
+    const res = await request(app).get('/api/settings');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('maxConcurrentAgents');
+    expect(res.body).toHaveProperty('eyeEnabled');
+  });
+});
+
+describe('PUT /api/settings', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates maxConcurrentAgents', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ maxConcurrentAgents: 10 });
+    expect(res.status).toBe(200);
+    expect(res.body.maxConcurrentAgents).toBe(10);
+  });
+
+  it('rejects maxConcurrentAgents < 1', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ maxConcurrentAgents: 0 });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects maxConcurrentAgents > 100', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ maxConcurrentAgents: 200 });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects non-number maxConcurrentAgents', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ maxConcurrentAgents: 'five' });
+    expect(res.status).toBe(400);
+  });
+
+  it('updates eyeEnabled', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ eyeEnabled: true });
+    expect(res.status).toBe(200);
+    expect(res.body.eyeEnabled).toBe(true);
+  });
+
+  it('updates multiple settings at once', async () => {
+    const res = await request(app)
+      .put('/api/settings')
+      .send({ maxConcurrentAgents: 8, eyeEnabled: false });
+    expect(res.status).toBe(200);
+    expect(res.body.maxConcurrentAgents).toBe(8);
+    expect(res.body.eyeEnabled).toBe(false);
+  });
+});
diff --git a/src/test/api/stats.test.ts b/src/test/api/stats.test.ts
new file mode 100644
index 0000000..563ca6e
--- /dev/null
+++ b/src/test/api/stats.test.ts
@@ -0,0 +1,26 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+
+let app: express.Express;
+
+describe('GET /api/stats/template-model', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns template-model stats', async () => {
+    const res = await request(app).get('/api/stats/template-model');
+    expect(res.status).toBe(200);
+    expect(Array.isArray(res.body)).toBe(true);
+  });
+
+  it('returns empty array when no data', async () => {
+    const res = await request(app).get('/api/stats/template-model');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+});
diff --git a/src/test/api/templates.test.ts b/src/test/api/templates.test.ts
new file mode 100644
index 0000000..c5cb0bd
--- /dev/null
+++ b/src/test/api/templates.test.ts
@@ -0,0 +1,142 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+
+let app: express.Express;
+
+async function insertTemplate(name = 'Tpl', content = 'Do the thing') {
+  const res = await request(app).post('/api/templates').send({ name, content });
+  return res.body;
+}
+
+describe('GET /api/templates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/templates');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all templates', async () => {
+    await insertTemplate('A', 'content A');
+    await insertTemplate('B', 'content B');
+    const res = await request(app).get('/api/templates');
+    expect(res.body.length).toBe(2);
+  });
+});
+
+describe('POST /api/templates', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a template', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ name: 'Deploy', content: 'Deploy to prod', workDir: '/app', model: 'claude-opus-4-6' });
+    expect(res.status).toBe(201);
+    expect(res.body.name).toBe('Deploy');
+    expect(res.body.content).toBe('Deploy to prod');
+    expect(res.body.work_dir).toBe('/app');
+    expect(res.body.model).toBe('claude-opus-4-6');
+  });
+
+  it('creates a template with minimal fields', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ name: 'Min', content: 'content' });
+    expect(res.status).toBe(201);
+    expect(res.body.work_dir).toBeNull();
+    expect(res.body.model).toBeNull();
+  });
+
+  it('rejects missing name', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ content: 'x' });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects missing content', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ name: 'x' });
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects empty name', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ name: '  ', content: 'x' });
+    expect(res.status).toBe(400);
+  });
+
+  it('trims whitespace', async () => {
+    const res = await request(app)
+      .post('/api/templates')
+      .send({ name: '  Trimmed  ', content: '  trimmed content  ' });
+    expect(res.status).toBe(201);
+    expect(res.body.name).toBe('Trimmed');
+    expect(res.body.content).toBe('trimmed content');
+  });
+});
+
+describe('PUT /api/templates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('updates template name', async () => {
+    const tpl = await insertTemplate();
+    const res = await request(app)
+      .put(`/api/templates/${tpl.id}`)
+      .send({ name: 'Updated' });
+    expect(res.status).toBe(200);
+    expect(res.body.name).toBe('Updated');
+  });
+
+  it('updates template content', async () => {
+    const tpl = await insertTemplate();
+    const res = await request(app)
+      .put(`/api/templates/${tpl.id}`)
+      .send({ content: 'New content' });
+    expect(res.body.content).toBe('New content');
+  });
+
+  it('updates workDir and model', async () => {
+    const tpl = await insertTemplate();
+    const res = await request(app)
+      .put(`/api/templates/${tpl.id}`)
+      .send({ workDir: '/new', model: 'claude-haiku-4-5-20251001' });
+    expect(res.body.work_dir).toBe('/new');
+    expect(res.body.model).toBe('claude-haiku-4-5-20251001');
+  });
+
+  it('returns 404 for unknown template', async () => {
+    const res = await request(app)
+      .put('/api/templates/nonexistent')
+      .send({ name: 'X' });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('DELETE /api/templates/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('deletes a template', async () => {
+    const tpl = await insertTemplate();
+    const res = await request(app).delete(`/api/templates/${tpl.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.ok).toBe(true);
+  });
+
+  it('returns 404 for unknown template', async () => {
+    const res = await request(app).delete('/api/templates/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
diff --git a/src/test/api/usage.test.ts b/src/test/api/usage.test.ts
new file mode 100644
index 0000000..e3e852a
--- /dev/null
+++ b/src/test/api/usage.test.ts
@@ -0,0 +1,55 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+// Mock child_process to avoid real ccusage calls
+vi.mock('child_process', () => ({
+  execFile: vi.fn((_cmd: string, _args: string[], _opts: any, cb: any) => {
+    if (typeof cb === 'function') {
+      cb(null, JSON.stringify({ daily: [], totals: null }), '');
+    }
+    return { kill: vi.fn() };
+  }),
+  execSync: vi.fn(() => '[]'),
+}));
+vi.mock('util', async (importOriginal) => {
+  const original = await importOriginal() as any;
+  return {
+    ...original,
+    promisify: vi.fn(() =>
+      vi.fn().mockResolvedValue({ stdout: JSON.stringify({ daily: [], totals: null }), stderr: '' })
+    ),
+  };
+});
+
+let app: express.Express;
+
+describe('GET /api/usage', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns usage data for valid since parameter', async () => {
+    const res = await request(app).get('/api/usage?since=20260301');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('daily');
+  });
+
+  it('rejects invalid since parameter', async () => {
+    const res = await request(app).get('/api/usage?since=invalid');
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/Invalid since/i);
+  });
+
+  it('rejects since parameter with letters', async () => {
+    const res = await request(app).get('/api/usage?since=7d');
+    expect(res.status).toBe(400);
+  });
+
+  it('rejects since with wrong length', async () => {
+    const res = await request(app).get('/api/usage?since=2026');
+    expect(res.status).toBe(400);
+  });
+});
diff --git a/src/test/api/workflows.test.ts b/src/test/api/workflows.test.ts
new file mode 100644
index 0000000..d21ac9a
--- /dev/null
+++ b/src/test/api/workflows.test.ts
@@ -0,0 +1,210 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestProject, insertTestWorkflow, insertTestJob } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/WorkflowManager.js', () => ({
+  startWorkflow: vi.fn((wf: any) => ({
+    id: 'assess-job-id',
+    title: 'Assess',
+    status: 'queued',
+    workflow_id: wf.id,
+    workflow_phase: 'assess',
+    workflow_cycle: 0,
+  })),
+  resumeWorkflow: vi.fn((wf: any) => ({
+    id: 'resume-job-id',
+    title: 'Resume',
+    status: 'queued',
+    workflow_id: wf.id,
+  })),
+  cleanupWorktree: vi.fn(),
+  parseMilestones: vi.fn(() => ({ total: 0, done: 0 })),
+  _resetForTest: vi.fn(),
+}));
+vi.mock('../../server/orchestrator/WorkflowPrompts.js', () => ({
+  buildAssessPrompt: vi.fn(() => 'mock assess prompt'),
+  buildReviewPrompt: vi.fn(() => 'mock review prompt'),
+  buildImplementPrompt: vi.fn(() => 'mock implement prompt'),
+}));
+
+let app: express.Express;
+
+describe('GET /api/workflows', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns empty array initially', async () => {
+    const res = await request(app).get('/api/workflows');
+    expect(res.status).toBe(200);
+    expect(res.body).toEqual([]);
+  });
+
+  it('returns all workflows', async () => {
+    const project = await insertTestProject();
+    await insertTestWorkflow({ project_id: project.id, title: 'WF1' });
+    await insertTestWorkflow({ project_id: project.id, title: 'WF2' });
+    const res = await request(app).get('/api/workflows');
+    expect(res.body.length).toBe(2);
+  });
+});
+
+describe('GET /api/workflows/:id', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns a workflow with plan and worklogs', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id });
+    const res = await request(app).get(`/api/workflows/${wf.id}`);
+    expect(res.status).toBe(200);
+    expect(res.body.id).toBe(wf.id);
+    expect(res.body).toHaveProperty('plan');
+    expect(res.body).toHaveProperty('worklogs');
+  });
+
+  it('returns 404 for unknown workflow', async () => {
+    const res = await request(app).get('/api/workflows/nonexistent');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('GET /api/workflows/:id/jobs', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns jobs for a workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id });
+    await insertTestJob({ workflow_id: wf.id, workflow_phase: 'assess' });
+    await insertTestJob({ workflow_id: wf.id, workflow_phase: 'review' });
+    const res = await request(app).get(`/api/workflows/${wf.id}/jobs`);
+    expect(res.status).toBe(200);
+    expect(res.body.length).toBe(2);
+  });
+
+  it('returns 404 for unknown workflow', async () => {
+    const res = await request(app).get('/api/workflows/nonexistent/jobs');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/workflows', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('creates a workflow', async () => {
+    const res = await request(app)
+      .post('/api/workflows')
+      .send({ task: 'Build a feature' });
+    expect(res.status).toBe(201);
+    expect(res.body.workflow).toBeTruthy();
+    expect(res.body.project).toBeTruthy();
+    expect(res.body.jobs).toHaveLength(1);
+    expect(res.body.workflow.task).toBe('Build a feature');
+    expect(res.body.workflow.status).toBe('running');
+  });
+
+  it('sets custom title and models', async () => {
+    const res = await request(app)
+      .post('/api/workflows')
+      .send({
+        task: 'Refactor auth',
+        title: 'Auth Refactor',
+        implementerModel: 'claude-opus-4-6',
+        reviewerModel: 'claude-sonnet-4-6',
+        maxCycles: 5,
+      });
+    expect(res.status).toBe(201);
+    expect(res.body.workflow.title).toBe('Auth Refactor');
+    expect(res.body.workflow.implementer_model).toBe('claude-opus-4-6');
+    expect(res.body.workflow.max_cycles).toBe(5);
+  });
+
+  it('rejects missing task', async () => {
+    const res = await request(app).post('/api/workflows').send({});
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/task/i);
+  });
+
+  it('rejects empty task', async () => {
+    const res = await request(app).post('/api/workflows').send({ task: '  ' });
+    expect(res.status).toBe(400);
+  });
+
+  it('clamps maxCycles to valid range', async () => {
+    const res = await request(app)
+      .post('/api/workflows')
+      .send({ task: 'test', maxCycles: 100 });
+    expect(res.status).toBe(201);
+    expect(res.body.workflow.max_cycles).toBeLessThanOrEqual(50);
+  });
+
+  it('emits socket events', async () => {
+    const socket = await import('../../server/socket/SocketManager.js');
+    await request(app).post('/api/workflows').send({ task: 'test' });
+    expect(socket.emitWorkflowNew).toHaveBeenCalledTimes(1);
+  });
+});
+
+describe('POST /api/workflows/:id/cancel', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('cancels a running workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id, status: 'running' });
+    const res = await request(app).post(`/api/workflows/${wf.id}/cancel`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('cancelled');
+  });
+
+  it('cancels a blocked workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id, status: 'blocked' });
+    const res = await request(app).post(`/api/workflows/${wf.id}/cancel`);
+    expect(res.status).toBe(200);
+    expect(res.body.status).toBe('cancelled');
+  });
+
+  it('rejects cancelling a completed workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id, status: 'complete' });
+    const res = await request(app).post(`/api/workflows/${wf.id}/cancel`);
+    expect(res.status).toBe(400);
+  });
+
+  it('returns 404 for unknown workflow', async () => {
+    const res = await request(app).post('/api/workflows/nonexistent/cancel');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('POST /api/workflows/:id/resume', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('resumes a blocked workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id, status: 'blocked' });
+    const res = await request(app).post(`/api/workflows/${wf.id}/resume`);
+    expect(res.status).toBe(200);
+    expect(res.body.workflow).toBeTruthy();
+    expect(res.body.jobs).toHaveLength(1);
+  });
+
+  it('rejects resuming a running workflow', async () => {
+    const project = await insertTestProject();
+    const wf = await insertTestWorkflow({ project_id: project.id, status: 'running' });
+    const res = await request(app).post(`/api/workflows/${wf.id}/resume`);
+    expect(res.status).toBe(400);
+    expect(res.body.error).toMatch(/blocked/i);
+  });
+
+  it('returns 404 for unknown workflow', async () => {
+    const res = await request(app).post('/api/workflows/nonexistent/resume');
+    expect(res.status).toBe(404);
+  });
+});
diff --git a/src/test/api/worktrees.test.ts b/src/test/api/worktrees.test.ts
new file mode 100644
index 0000000..eabd80f
--- /dev/null
+++ b/src/test/api/worktrees.test.ts
@@ -0,0 +1,44 @@
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import request from 'supertest';
+import { setupTestDb, cleanupTestDb, createSocketMock } from '../helpers.js';
+import { createTestApp } from '../api-helpers.js';
+import type express from 'express';
+
+vi.mock('../../server/socket/SocketManager.js', () => createSocketMock());
+vi.mock('../../server/orchestrator/WorktreeCleanup.js', () => ({
+  runCleanupNow: vi.fn(() => 0),
+  startWorktreeCleanup: vi.fn(),
+  stopWorktreeCleanup: vi.fn(),
+}));
+
+let app: express.Express;
+
+describe('GET /api/worktrees/stats', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('returns worktree stats', async () => {
+    const res = await request(app).get('/api/worktrees/stats');
+    expect(res.status).toBe(200);
+    expect(res.body).toBeTruthy();
+  });
+});
+
+describe('POST /api/worktrees/cleanup', () => {
+  beforeEach(async () => { await setupTestDb(); vi.clearAllMocks(); app = createTestApp(); });
+  afterEach(async () => { await cleanupTestDb(); });
+
+  it('runs cleanup and returns count', async () => {
+    const res = await request(app).post('/api/worktrees/cleanup');
+    expect(res.status).toBe(200);
+    expect(res.body).toHaveProperty('cleaned');
+    expect(res.body.cleaned).toBe(0);
+  });
+
+  it('returns the number of cleaned worktrees', async () => {
+    const { runCleanupNow } = await import('../../server/orchestrator/WorktreeCleanup.js');
+    vi.mocked(runCleanupNow).mockReturnValueOnce(3);
+    const res = await request(app).post('/api/worktrees/cleanup');
+    expect(res.body.cleaned).toBe(3);
+  });
+});
diff --git a/src/test/helpers.ts b/src/test/helpers.ts
new file mode 100644
index 0000000..382d83b
--- /dev/null
+++ b/src/test/helpers.ts
@@ -0,0 +1,212 @@
+/**
+ * Shared test helpers for Hurlicane integration tests.
+ *
+ * Provides:
+ * - Fresh in-memory SQLite database per test via setupTestDb / cleanupTestDb
+ * - SocketManager mock that captures all emitted events
+ * - Factory helpers for inserting test fixtures
+ */
+import { vi } from 'vitest';
+import { randomUUID } from 'crypto';
+
+// ─── Database Helpers ─────────────────────────────────────────────────────────
+
+/**
+ * Initialize a fresh in-memory database with the full schema + migrations.
+ * This calls the real initDb() from database.ts with ':memory:' which works
+ * because path.dirname(':memory:') returns '.' and mkdirSync('.', {recursive:true})
+ * is a no-op.
+ *
+ * Call cleanupTestDb() in afterEach to tear it down.
+ */
+export async function setupTestDb() {
+  const { initDb } = await import('../server/db/database.js');
+  return initDb(':memory:');
+}
+
+/**
+ * Close and discard the current in-memory database.
+ */
+export async function cleanupTestDb() {
+  const { closeDb } = await import('../server/db/database.js');
+  closeDb();
+}
+
+// ─── Manager Reset ───────────────────────────────────────────────────────────
+
+/**
+ * Reset module-level dedup state in all managers that use a _processedJobs Set.
+ * Call in beforeEach so each test starts with a clean slate.
+ */
+export async function resetManagerState() {
+  const { _resetForTest: resetWorkflow } = await import('../server/orchestrator/WorkflowManager.js');
+  const { _resetForTest: resetDebate } = await import('../server/orchestrator/DebateManager.js');
+  resetWorkflow();
+  resetDebate();
+}
+
+// ─── Socket Mock ──────────────────────────────────────────────────────────────
+
+export interface SocketMockCalls {
+  emitJobNew: any[];
+  emitJobUpdate: any[];
+  emitWorkflowNew: any[];
+  emitWorkflowUpdate: any[];
+  emitDebateNew: any[];
+  emitDebateUpdate: any[];
+  emitSnapshot: any[];
+  emitAgentNew: any[];
+  emitAgentUpdate: any[];
+  emitProjectNew: any[];
+  [key: string]: any[];
+}
+
+/**
+ * Create a vi.mock factory for '../socket/SocketManager.js' (or the path you
+ * need). Returns an object whose keys are the emit function names and values
+ * are arrays of call arguments — so you can assert exactly what was emitted.
+ *
+ * Usage in a test file:
+ * ```ts
+ * vi.mock('../server/socket/SocketManager.js', () => createSocketMock());
+ * ```
+ *
+ * Access the mock's recorded calls via the returned object, or via
+ * `vi.mocked(socket.emitJobNew).mock.calls`.
+ */
+export function createSocketMock() {
+  return {
+    initSocketManager: vi.fn(),
+    getIo: vi.fn(() => ({ emit: vi.fn() })),
+    emitSnapshot: vi.fn(),
+    emitAgentNew: vi.fn(),
+    emitAgentUpdate: vi.fn(),
+    emitAgentOutput: vi.fn(),
+    emitQuestionNew: vi.fn(),
+    emitQuestionAnswered: vi.fn(),
+    emitLockAcquired: vi.fn(),
+    emitLockReleased: vi.fn(),
+    emitProjectNew: vi.fn(),
+    emitJobNew: vi.fn(),
+    emitJobUpdate: vi.fn(),
+    emitPtyData: vi.fn(),
+    emitPtyClosed: vi.fn(),
+    emitDebateNew: vi.fn(),
+    emitDebateUpdate: vi.fn(),
+    emitWorkflowNew: vi.fn(),
+    emitWorkflowUpdate: vi.fn(),
+    emitWarningNew: vi.fn(),
+    emitDiscussionNew: vi.fn(),
+    emitDiscussionMessage: vi.fn(),
+    emitDiscussionUpdate: vi.fn(),
+    emitProposalNew: vi.fn(),
+    emitProposalUpdate: vi.fn(),
+    emitProposalMessage: vi.fn(),
+    emitPrNew: vi.fn(),
+    emitPrReviewNew: vi.fn(),
+    emitPrReviewUpdate: vi.fn(),
+    emitPrReviewMessage: vi.fn(),
+  };
+}
+
+// ─── Fixture Factories ────────────────────────────────────────────────────────
+
+/**
+ * Insert a minimal project into the DB and return its id.
+ */
+export async function insertTestProject(overrides: { id?: string; name?: string } = {}) {
+  const { insertProject } = await import('../server/db/queries.js');
+  const id = overrides.id ?? randomUUID();
+  return insertProject({
+    id,
+    name: overrides.name ?? 'Test Project',
+    description: 'test project',
+    created_at: Date.now(),
+    updated_at: Date.now(),
+  });
+}
+
+/**
+ * Insert a minimal workflow into the DB and return it.
+ */
+export async function insertTestWorkflow(overrides: Partial<{
+  id: string;
+  title: string;
+  task: string;
+  work_dir: string | null;
+  implementer_model: string;
+  reviewer_model: string;
+  max_cycles: number;
+  current_cycle: number;
+  current_phase: string;
+  status: string;
+  milestones_total: number;
+  milestones_done: number;
+  project_id: string | null;
+  template_id: string | null;
+  use_worktree: number;
+}> = {}) {
+  const { insertWorkflow } = await import('../server/db/queries.js');
+  const id = overrides.id ?? randomUUID();
+  return insertWorkflow({
+    id,
+    title: overrides.title ?? 'Test Workflow',
+    task: overrides.task ?? 'Test task',
+    work_dir: overrides.work_dir ?? '/tmp/test',
+    implementer_model: overrides.implementer_model ?? 'claude-sonnet-4-6',
+    reviewer_model: overrides.reviewer_model ?? 'codex',
+    max_cycles: overrides.max_cycles ?? 10,
+    current_cycle: overrides.current_cycle ?? 0,
+    current_phase: (overrides.current_phase ?? 'idle') as any,
+    status: (overrides.status ?? 'running') as any,
+    milestones_total: overrides.milestones_total ?? 0,
+    milestones_done: overrides.milestones_done ?? 0,
+    project_id: overrides.project_id ?? null,
+    max_turns_assess: 50,
+    max_turns_review: 30,
+    max_turns_implement: 100,
+    stop_mode_assess: 'turns',
+    stop_value_assess: 50,
+    stop_mode_review: 'turns',
+    stop_value_review: 30,
+    stop_mode_implement: 'turns',
+    stop_value_implement: 100,
+    template_id: overrides.template_id ?? null,
+    use_worktree: overrides.use_worktree ?? 0,
+    created_at: Date.now(),
+    updated_at: Date.now(),
+  } as any);
+}
+
+/**
+ * Insert a minimal job into the DB and return it.
+ */
+export async function insertTestJob(overrides: Partial<{
+  id: string;
+  title: string;
+  description: string;
+  status: string;
+  priority: number;
+  workflow_id: string | null;
+  workflow_cycle: number | null;
+  workflow_phase: string | null;
+  project_id: string | null;
+  work_dir: string | null;
+  model: string | null;
+}> = {}) {
+  const { insertJob } = await import('../server/db/queries.js');
+  return insertJob({
+    id: overrides.id ?? randomUUID(),
+    title: overrides.title ?? 'Test Job',
+    description: overrides.description ?? 'Test job description',
+    context: null,
+    priority: overrides.priority ?? 0,
+    status: (overrides.status ?? 'queued') as any,
+    workflow_id: overrides.workflow_id ?? null,
+    workflow_cycle: overrides.workflow_cycle ?? null,
+    workflow_phase: (overrides.workflow_phase ?? null) as any,
+    project_id: overrides.project_id ?? null,
+    work_dir: overrides.work_dir ?? null,
+    model: overrides.model ?? null,
+  });
+}
diff --git a/src/test/smoke.test.ts b/src/test/smoke.test.ts
new file mode 100644
index 0000000..a8433d9
--- /dev/null
+++ b/src/test/smoke.test.ts
@@ -0,0 +1,187 @@
+/**
+ * Smoke tests proving the test harness works:
+ * - In-memory SQLite DB initializes with full schema
+ * - Queries work against the in-memory DB
+ * - Each test gets an isolated DB (no cross-test state leakage)
+ * - SocketManager mock captures emitted events
+ * - Module-level singleton state can be reset between tests
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import { setupTestDb, cleanupTestDb, createSocketMock, insertTestProject, insertTestWorkflow, insertTestJob } from './helpers.js';
+
+// Mock SocketManager before any module that imports it
+vi.mock('../server/socket/SocketManager.js', () => createSocketMock());
+
+describe('Test Harness: In-memory DB', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('initializes the full schema in :memory:', async () => {
+    const { getDb } = await import('../server/db/database.js');
+    const db = getDb();
+    // Verify key tables exist
+    const tables = db.prepare(
+      "SELECT name FROM sqlite_master WHERE type='table' ORDER BY name"
+    ).all() as { name: string }[];
+    const tableNames = tables.map((t) => t.name);
+    expect(tableNames).toContain('jobs');
+    expect(tableNames).toContain('agents');
+    expect(tableNames).toContain('workflows');
+    expect(tableNames).toContain('notes');
+    expect(tableNames).toContain('debates');
+    expect(tableNames).toContain('projects');
+  });
+
+  it('inserts and retrieves a job via queries module', async () => {
+    const { insertJob, getJobById } = await import('../server/db/queries.js');
+    const job = insertJob({
+      id: 'test-job-1',
+      title: 'Smoke Test Job',
+      description: 'A job for testing',
+      context: null,
+      priority: 5,
+    });
+    expect(job.id).toBe('test-job-1');
+    expect(job.title).toBe('Smoke Test Job');
+    expect(job.status).toBe('queued');
+    expect(job.priority).toBe(5);
+
+    const fetched = getJobById('test-job-1');
+    expect(fetched).not.toBeNull();
+    expect(fetched!.title).toBe('Smoke Test Job');
+  });
+
+  it('inserts and retrieves a workflow', async () => {
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({ project_id: project.id });
+    expect(workflow.id).toBeTruthy();
+    expect(workflow.status).toBe('running');
+    expect(workflow.current_phase).toBe('idle');
+
+    const { getWorkflowById } = await import('../server/db/queries.js');
+    const fetched = getWorkflowById(workflow.id);
+    expect(fetched).not.toBeNull();
+    expect(fetched!.title).toBe('Test Workflow');
+  });
+
+  it('provides isolation between tests (no leftover data)', async () => {
+    const { getJobById } = await import('../server/db/queries.js');
+    // This job was inserted in the previous test — it should not exist here
+    const ghost = getJobById('test-job-1');
+    expect(ghost).toBeNull();
+  });
+});
+
+describe('Test Harness: Socket Mock', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+    vi.clearAllMocks();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('captures emitJobNew calls', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { insertJob } = await import('../server/db/queries.js');
+
+    const job = insertJob({
+      id: 'mock-test-job',
+      title: 'Mock Test',
+      description: 'Testing socket mock',
+      context: null,
+      priority: 0,
+    });
+    socket.emitJobNew(job);
+
+    expect(socket.emitJobNew).toHaveBeenCalledTimes(1);
+    expect(vi.mocked(socket.emitJobNew).mock.calls[0][0].id).toBe('mock-test-job');
+  });
+
+  it('captures emitWorkflowUpdate calls', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({ project_id: project.id });
+
+    socket.emitWorkflowUpdate(workflow);
+
+    expect(socket.emitWorkflowUpdate).toHaveBeenCalledTimes(1);
+    expect(vi.mocked(socket.emitWorkflowUpdate).mock.calls[0][0].id).toBe(workflow.id);
+  });
+});
+
+describe('Test Harness: Fixture Factories', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('insertTestJob creates a job with overrides', async () => {
+    const job = await insertTestJob({
+      title: 'Custom Job',
+      status: 'running',
+      priority: 10,
+    });
+    expect(job.title).toBe('Custom Job');
+    expect(job.status).toBe('running');
+    expect(job.priority).toBe(10);
+  });
+
+  it('insertTestWorkflow creates a workflow linked to a project', async () => {
+    const project = await insertTestProject({ name: 'My Project' });
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      max_cycles: 5,
+      current_phase: 'assess',
+    });
+    expect(workflow.project_id).toBe(project.id);
+    expect(workflow.max_cycles).toBe(5);
+    expect(workflow.current_phase).toBe('assess');
+  });
+
+  it('insertTestJob supports workflow fields', async () => {
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({ project_id: project.id });
+    const job = await insertTestJob({
+      workflow_id: workflow.id,
+      workflow_cycle: 1,
+      workflow_phase: 'review',
+    });
+    expect(job.workflow_id).toBe(workflow.id);
+    expect(job.workflow_cycle).toBe(1);
+    expect(job.workflow_phase).toBe('review');
+  });
+});
+
+describe('Test Harness: Module state reset', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('parseMilestones is importable and works with test data', async () => {
+    const { parseMilestones } = await import('../server/orchestrator/WorkflowManager.js');
+    const result = parseMilestones('- [x] Done\n- [ ] Not done\n- [ ] Also not done');
+    expect(result.total).toBe(3);
+    expect(result.done).toBe(1);
+  });
+
+  it('parseMilestones returns zeros for empty input', async () => {
+    const { parseMilestones } = await import('../server/orchestrator/WorkflowManager.js');
+    const result = parseMilestones('');
+    expect(result.total).toBe(0);
+    expect(result.done).toBe(0);
+  });
+});
diff --git a/src/test/workflow-dedup.test.ts b/src/test/workflow-dedup.test.ts
new file mode 100644
index 0000000..5cd37cb
--- /dev/null
+++ b/src/test/workflow-dedup.test.ts
@@ -0,0 +1,250 @@
+/**
+ * WorkflowManager dedup and phase-transition tests.
+ *
+ * Proves:
+ * 1. _resetForTest() clears module-level dedup state between tests
+ * 2. Same job ID processed twice within one test is a no-op (dedup guard)
+ * 3. Same job ID works across separate tests (per-test independence via reset)
+ * 4. onJobCompleted() drives a real assess→review phase transition with DB + socket assertions
+ * 5. A failed phase job marks the workflow as blocked
+ */
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+import {
+  setupTestDb,
+  cleanupTestDb,
+  createSocketMock,
+  resetManagerState,
+  insertTestProject,
+  insertTestWorkflow,
+  insertTestJob,
+} from './helpers.js';
+
+// Mock SocketManager before any module that imports it
+vi.mock('../server/socket/SocketManager.js', () => createSocketMock());
+
+// Mock WorkflowPrompts so we don't need to exercise complex prompt generation
+vi.mock('../server/orchestrator/WorkflowPrompts.js', () => ({
+  buildAssessPrompt: vi.fn(() => 'mock assess prompt'),
+  buildReviewPrompt: vi.fn(() => 'mock review prompt'),
+  buildImplementPrompt: vi.fn(() => 'mock implement prompt'),
+}));
+
+// Shared job ID used to prove cross-test dedup independence
+const SHARED_JOB_ID = 'dedup-test-shared-job-id';
+
+describe('WorkflowManager: dedup guard', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+    await resetManagerState();
+    vi.clearAllMocks();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('processes a job the first time and ignores the second call (dedup within one test)', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+    const { upsertNote, getWorkflowById } = await import('../server/db/queries.js');
+
+    // Set up workflow + plan note + assess job
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      status: 'running',
+      current_phase: 'assess',
+      current_cycle: 0,
+    });
+    upsertNote(`workflow/${workflow.id}/plan`, '- [ ] M1\n- [ ] M2', null);
+
+    const job = await insertTestJob({
+      id: 'dedup-within-test',
+      workflow_id: workflow.id,
+      workflow_cycle: 0,
+      workflow_phase: 'assess',
+      status: 'done',
+    });
+
+    // First call: should trigger assess→review transition
+    onJobCompleted(job);
+    const callsAfterFirst = vi.mocked(socket.emitWorkflowUpdate).mock.calls.length;
+    expect(callsAfterFirst).toBeGreaterThan(0);
+
+    // Verify a review job was spawned
+    const emitJobNewCalls = vi.mocked(socket.emitJobNew).mock.calls;
+    expect(emitJobNewCalls.length).toBe(1);
+    expect(emitJobNewCalls[0][0].workflow_phase).toBe('review');
+
+    // Second call with same job: should be a complete no-op
+    vi.clearAllMocks();
+    onJobCompleted(job);
+    expect(vi.mocked(socket.emitWorkflowUpdate).mock.calls.length).toBe(0);
+    expect(vi.mocked(socket.emitJobNew).mock.calls.length).toBe(0);
+
+    // DB state unchanged from first call
+    const updated = getWorkflowById(workflow.id)!;
+    expect(updated.current_phase).toBe('review');
+    expect(updated.current_cycle).toBe(1);
+  });
+
+  it('processes the SHARED_JOB_ID (first test — proves reset clears dedup set)', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+    const { upsertNote, getWorkflowById } = await import('../server/db/queries.js');
+
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      status: 'running',
+      current_phase: 'assess',
+      current_cycle: 0,
+    });
+    upsertNote(`workflow/${workflow.id}/plan`, '- [ ] M1', null);
+
+    const job = await insertTestJob({
+      id: SHARED_JOB_ID,
+      workflow_id: workflow.id,
+      workflow_cycle: 0,
+      workflow_phase: 'assess',
+      status: 'done',
+    });
+
+    onJobCompleted(job);
+
+    // Should have processed the job (not dedup-blocked)
+    expect(vi.mocked(socket.emitWorkflowUpdate).mock.calls.length).toBeGreaterThan(0);
+    const updated = getWorkflowById(workflow.id)!;
+    expect(updated.current_phase).toBe('review');
+  });
+
+  it('processes the SHARED_JOB_ID again (second test — proves per-test independence)', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+    const { upsertNote, getWorkflowById } = await import('../server/db/queries.js');
+
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      status: 'running',
+      current_phase: 'assess',
+      current_cycle: 0,
+    });
+    upsertNote(`workflow/${workflow.id}/plan`, '- [ ] M1', null);
+
+    const job = await insertTestJob({
+      id: SHARED_JOB_ID,
+      workflow_id: workflow.id,
+      workflow_cycle: 0,
+      workflow_phase: 'assess',
+      status: 'done',
+    });
+
+    // If _resetForTest didn't clear the set, this would be silently deduped
+    onJobCompleted(job);
+
+    expect(vi.mocked(socket.emitWorkflowUpdate).mock.calls.length).toBeGreaterThan(0);
+    const updated = getWorkflowById(workflow.id)!;
+    expect(updated.current_phase).toBe('review');
+  });
+});
+
+describe('WorkflowManager: onJobCompleted phase transitions', () => {
+  beforeEach(async () => {
+    await setupTestDb();
+    await resetManagerState();
+    vi.clearAllMocks();
+  });
+
+  afterEach(async () => {
+    await cleanupTestDb();
+  });
+
+  it('assess completion spawns a review job and updates workflow phase', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+    const { upsertNote, getWorkflowById } = await import('../server/db/queries.js');
+
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      status: 'running',
+      current_phase: 'assess',
+      current_cycle: 0,
+    });
+    upsertNote(`workflow/${workflow.id}/plan`, '- [ ] M1\n- [ ] M2\n- [x] M3', null);
+
+    const job = await insertTestJob({
+      workflow_id: workflow.id,
+      workflow_cycle: 0,
+      workflow_phase: 'assess',
+      status: 'done',
+    });
+
+    onJobCompleted(job);
+
+    // Workflow state updated
+    const updated = getWorkflowById(workflow.id)!;
+    expect(updated.current_phase).toBe('review');
+    expect(updated.current_cycle).toBe(1);
+    expect(updated.milestones_total).toBe(3);
+    expect(updated.milestones_done).toBe(1);
+
+    // Review job was spawned
+    const emitJobNewCalls = vi.mocked(socket.emitJobNew).mock.calls;
+    expect(emitJobNewCalls.length).toBe(1);
+    const reviewJob = emitJobNewCalls[0][0];
+    expect(reviewJob.workflow_id).toBe(workflow.id);
+    expect(reviewJob.workflow_phase).toBe('review');
+    expect(reviewJob.workflow_cycle).toBe(1);
+  });
+
+  it('failed phase job marks workflow as blocked', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+    const { upsertNote, getWorkflowById } = await import('../server/db/queries.js');
+
+    const project = await insertTestProject();
+    const workflow = await insertTestWorkflow({
+      project_id: project.id,
+      status: 'running',
+      current_phase: 'implement',
+      current_cycle: 2,
+    });
+    upsertNote(`workflow/${workflow.id}/plan`, '- [x] M1\n- [ ] M2', null);
+
+    const job = await insertTestJob({
+      workflow_id: workflow.id,
+      workflow_cycle: 2,
+      workflow_phase: 'implement',
+      status: 'failed',
+    });
+
+    onJobCompleted(job);
+
+    const updated = getWorkflowById(workflow.id)!;
+    expect(updated.status).toBe('blocked');
+    expect(updated.current_phase).toBe('implement');
+
+    // Socket should have emitted the blocked state
+    const updateCalls = vi.mocked(socket.emitWorkflowUpdate).mock.calls;
+    expect(updateCalls.length).toBeGreaterThan(0);
+    const lastUpdate = updateCalls[updateCalls.length - 1][0];
+    expect(lastUpdate.status).toBe('blocked');
+  });
+
+  it('non-workflow job is silently ignored', async () => {
+    const socket = await import('../server/socket/SocketManager.js');
+    const { onJobCompleted } = await import('../server/orchestrator/WorkflowManager.js');
+
+    const job = await insertTestJob({
+      workflow_id: null,
+      status: 'done',
+    });
+
+    onJobCompleted(job);
+
+    expect(vi.mocked(socket.emitWorkflowUpdate).mock.calls.length).toBe(0);
+    expect(vi.mocked(socket.emitJobNew).mock.calls.length).toBe(0);
+  });
+});
diff --git a/vitest.config.ts b/vitest.config.ts
new file mode 100644
index 0000000..6803bd5
--- /dev/null
+++ b/vitest.config.ts
@@ -0,0 +1,19 @@
+import { defineConfig } from 'vitest/config';
+import path from 'path';
+
+export default defineConfig({
+  resolve: {
+    alias: {
+      '@shared': path.resolve(__dirname, 'src/shared'),
+    },
+  },
+  test: {
+    globals: true,
+    environment: 'node',
+    include: ['src/test/**/*.test.ts'],
+    // Each test file gets a fresh module graph so singleton state doesn't leak
+    isolate: true,
+    // node:sqlite requires this flag (vitest v4 top-level config)
+    execArgv: ['--experimental-sqlite'],
+  },
+});