Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat: extract shared test utils + replace execSync with better-sqlite3 (#199)

Gener2fddc59108bf
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ad17d756c..1d5967525 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -67,14 +67,23 @@ jobs:
cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Create .dev.vars for local bindings
- run: printf 'BETTER_AUTH_SECRET=ci-e2e-secret\nBETTER_AUTH_URL=http://localhost:3000\nDEVICE_CLIENT_IDS=e2e-test-client\n' > src/web/.dev.vars
+ run: printf 'BETTER_AUTH_SECRET=ci-e2e-secret\nBETTER_AUTH_URL=http://localhost:3000\nDEVICE_CLIENT_IDS=e2e-test-client\nENCRYPTION_KEY=ci-e2e-encryption-key-32chars!!\n' > src/web/.dev.vars
- run: pnpm run db:migrate
- name: Start dev servers
run: |
pnpm --filter @alook/email-worker dev &
+ pnpm --filter @alook/ws-do dev &
pnpm --filter @alook/web dev &
+ - name: Wait for services to be ready
+ run: |
+ echo "Waiting for email-worker (localhost:8787)..."
+ until curl -sf http://localhost:8787/health; do sleep 2; done
+ echo "Waiting for ws-do (localhost:8789)..."
+ until curl -sf http://localhost:8789/health; do sleep 2; done
+ echo "Waiting for web app (localhost:3000)..."
until curl -sf http://localhost:3000/api/health; do sleep 2; done
- run: pnpm test:e2e
+ - run: pnpm --filter @alook/cli run test:integration
build:
name: Build
diff --git a/package.json b/package.json
index 8ad9f7e30..b3289f68b 100644
--- a/package.json
+++ b/package.json
@@ -45,6 +45,7 @@
},
"pnpm": {
"onlyBuiltDependencies": [
+ "better-sqlite3",
"esbuild",
"msw",
"sharp",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a1a18cde8..dca543eb6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -79,6 +79,9 @@ importers:
'@alook/shared':
specifier: workspace:*
version: link:../shared
+ '@alook/test-utils':
+ specifier: workspace:*
+ version: link:../../tests/utils
'@types/bun':
specifier: ^1.3.14
version: 1.3.14
@@ -130,7 +133,7 @@ importers:
dependencies:
drizzle-orm:
specifier: ^0.45.2
- version: 0.45.2(@cloudflare/[email protected])(@opentelemetry/[email protected])([email protected])([email protected])
nanoid:
specifier: ^5.1.11
version: 5.1.11
@@ -239,7 +242,7 @@ importers:
better-auth:
specifier: ^1.6.11
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -313,6 +316,9 @@ importers:
specifier: ^4.7.1
version: 4.7.1
devDependencies:
+ '@alook/test-utils':
+ specifier: workspace:*
+ version: link:../../tests/utils
'@eslint/eslintrc':
specifier: ^3
version: 3.3.5
@@ -384,6 +390,25 @@ importers:
specifier: ^4.94.0
version: 4.94.0(@cloudflare/[email protected])
+ tests/utils:
+ dependencies:
+ better-sqlite3:
+ specifier: ^12.10.0
+ version: 12.10.0
+ devDependencies:
+ '@types/better-sqlite3':
+ specifier: ^7.6.13
+ version: 7.6.13
+ '@types/node':
+ specifier: ^25.9.1
+ version: 25.9.1
+ typescript:
+ specifier: ^6.0.3
+ version: 6.0.3
+ vitest:
+ specifier: ^4.1.7
+
packages:
@@ -2706,6 +2731,9 @@ packages:
resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==}
+
resolution: {integrity: sha512-h1hFqFVcvAvD9j9K7ZW7vd82aSA+rTdznZa+5bwvCwqSB1jmmfLcbIWhOLx1/+boy/xmjgCs/OMUL8hRJSmnPw==}
@@ -3320,6 +3348,9 @@ packages:
resolution: {integrity: sha512-/9a2j4ac6ckpmAHvod/ob7x439OAHst/drc2Clnq+reRYd/ovddwcF4LfoxHyNk5AuGBnPg+HqFjmE/Zpq6v0A==}
+ resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
resolution: {integrity: sha512-Asa2krT+XTPZINCS+2QcyS8WTkObE77RwkydwF7h6DmnKqbvlalz93m/dnphUyCa6SWSP51VgtEUf2FN+gelFQ==}
engines: {node: '>=6.0.0'}
@@ -3404,6 +3435,16 @@ packages:
zod:
optional: true
+ resolution: {integrity: sha512-CyzaZRQKyHkB2ZInfTTl2nvT33EbDpjkLEbE8/Zck3Ll6O0qqvuGdrJ45HgtH+HykRg88ITY3AdreBGN70aBSQ==}
+ engines: {node: 20.x || 22.x || 23.x || 24.x || 25.x || 26.x}
+
+ resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
+
+ resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
resolution: {integrity: sha512-F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==}
@@ -3443,6 +3484,9 @@ packages:
resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+ resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
resolution: {integrity: sha512-4N0ig0fEomHt5R0KCFWjovxow98rIoRwKolrYdCcknNwMekCXRnWEUvgu5soYV8QXtVsrUD8B95MBOZGPvr6KQ==}
@@ -3523,6 +3567,9 @@ packages:
resolution: {integrity: sha512-csJvb+6kEiQaqo1woTdSAuOWdN0WTLIydkKrBnS+V5gZz0oqBrp4kQ35519QgK6TpBThiG3V1vNSHlIkv4AglQ==}
engines: {node: '>=22.0.0'}
+ resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
+
resolution: {integrity: sha512-nnzXiDbGKjDSK6t2I+35OAPBy5Pw/39bgkb/ZAFwMhwJbdYBp6aH+vW28ZgtjdU890Q7D+3wN/tB8N66q5Gi2A==}
@@ -3948,6 +3995,10 @@ packages:
resolution: {integrity: sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==}
+ resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
peerDependencies:
@@ -3956,6 +4007,10 @@ packages:
babel-plugin-macros:
optional: true
+ resolution: {integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==}
+ engines: {node: '>=4.0.0'}
+
resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -4494,6 +4549,10 @@ packages:
resolution: {integrity: sha512-9Be3ZoN4LmYR90tUoVu2te2BsbzHfhJyfEiAVfz7N5/zv+jduIfLrV2xdQXOHbaD6KgpGdO9PRPM1Y4Q9QkPkA==}
engines: {node: ^18.19.0 || >=20.5.0}
+ resolution: {integrity: sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==}
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==}
engines: {node: '>=12.0.0'}
@@ -4602,6 +4661,9 @@ packages:
resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
engines: {node: '>=16.0.0'}
+ resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
+
resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
engines: {node: '>=8'}
@@ -4664,6 +4726,9 @@ packages:
resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
resolution: {integrity: sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==}
engines: {node: '>=14.14'}
@@ -4740,6 +4805,9 @@ packages:
resolution: {integrity: sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==}
engines: {node: '>= 14'}
+ resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
+
resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
engines: {node: '>= 6'}
@@ -4923,6 +4991,9 @@ packages:
resolution: {integrity: sha512-LtwtVyVYO5BqRvcsKuB2iUMnHwPVByPCXFXOpuU96IZPPoPN6xjOGxZQ74pgSVVLQWtUOYgyeL4GE98BY5D3wg==}
+ resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
engines: {node: '>= 4'}
@@ -4952,6 +5023,9 @@ packages:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+ resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
resolution: {integrity: sha512-Nb2ctOyNR8DqQoR0OwRG95uNWIC0C1lCgf5Naz5H6Ji72KZ8OcFZLz2P5sNgwlyoJ8Yif11oMuYs5pBQa86csA==}
@@ -5719,6 +5793,10 @@ packages:
resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-roRfxPq49OkuSeQsc43hRjSB1+HdHtDNKRwDEVk2hCjCBuBWxb5Wvwq88b0ULj6QVEJLN/+ZqF19M+h4VYJ/zg==}
engines: {node: '>=22.0.0'}
@@ -5749,6 +5827,9 @@ packages:
resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
+ resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
+
resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
hasBin: true
@@ -5801,6 +5882,9 @@ packages:
resolution: {integrity: sha512-XPUa/jz+P1oJvN9VBxw4L9MtdFfaH3DAryqPssqhb2kXjmb9npz0dly6rCsgFWOPr4Yg9mTfM3MDZgZZ+7A3lA==}
engines: {node: ^20.0.0 || >=22.0.0}
+ resolution: {integrity: sha512-GEbrYkbfF7MoNaoh2iGG84Mnf/WZfB0GdGEsM8wz7Expx/LlWf5U8t9nvJKXSp3qr5IsEbK04cBGhol/KwOsWA==}
+
resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==}
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
@@ -5852,6 +5936,10 @@ packages:
sass:
optional: true
+ resolution: {integrity: sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ==}
+ engines: {node: '>=10'}
+
resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
engines: {node: '>=10.5.0'}
@@ -6161,6 +6249,12 @@ packages:
resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==}
engines: {node: '>=20'}
+ resolution: {integrity: sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==}
+ engines: {node: '>=10'}
+ deprecated: No longer maintained. Please contact the author of the relevant native addon; alternatives are available.
+ hasBin: true
+
resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
engines: {node: '>= 0.8.0'}
@@ -6268,6 +6362,10 @@ packages:
resolution: {integrity: sha512-K5zQjDllxWkf7Z5xJdV0/B0WTNqx6vxG70zJE4N0kBs4LovmEYWJzQGxC9bS9RAKu3bgM40lrd5zoLJ12MQ5BA==}
engines: {node: '>= 0.10'}
+ resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
+ hasBin: true
+
resolution: {integrity: sha512-0prMI+hvBbPjsWnxDLxlCGyM8PN6UuWjEUCYmZhO67xIV9Xasa/r/vDnq+Xyq4Lo27g8QSbO5YzARu0D1Sps3g==}
peerDependencies:
@@ -6286,6 +6384,10 @@ packages:
resolution: {integrity: sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q==}
engines: {node: '>=0.10.0'}
+ resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+ engines: {node: '>= 6'}
+
resolution: {integrity: sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==}
engines: {node: '>= 4'}
@@ -6596,6 +6698,12 @@ packages:
resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
engines: {node: '>=14'}
+ resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
+
+ resolution: {integrity: sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==}
+
resolution: {integrity: sha512-WszCLXwT4h2k1ufIXAgsbiTOazqqevFCIncOuUBZJ91DdvWcC5+OFkluWRQPrcuSYd8fjq+o2y1QfWqYMoAToQ==}
hasBin: true
@@ -6714,6 +6822,9 @@ packages:
resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
engines: {node: '>= 0.4'}
+ resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
resolution: {integrity: sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==}
@@ -6749,6 +6860,10 @@ packages:
resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==}
engines: {node: '>=18'}
+ resolution: {integrity: sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==}
+ engines: {node: '>=0.10.0'}
+
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
engines: {node: '>=8'}
@@ -6812,9 +6927,16 @@ packages:
resolution: {integrity: sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==}
+
resolution: {integrity: sha512-QGxxTxxyleAdyM3kpFs14ymbYmNFrfY+pHj7Z8FgtbZ7w2//VAgLMac7sT6nRpIHjppXO2AwwEOg0bPFVRcmXw==}
+ resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+ engines: {node: '>=6'}
+
resolution: {integrity: sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==}
@@ -6939,6 +7061,9 @@ packages:
engines: {node: '>=18.0.0'}
hasBin: true
+ resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
+
resolution: {integrity: sha512-BQqXRr4UoWI3UPFrtznCLykYHxwxWh53iCB57x092jPMjIlW1wnm3N895g5irpiXmnxUhREBB0n6+y8BHhs4nw==}
hasBin: true
@@ -8300,12 +8425,12 @@ snapshots:
'@cloudflare/workers-types': 4.20260524.1
'@opentelemetry/api': 1.9.1
dependencies:
'@better-auth/utils': 0.4.0
optionalDependencies:
- drizzle-orm: 0.45.2(@cloudflare/[email protected])(@opentelemetry/[email protected])([email protected])([email protected])
dependencies:
@@ -9975,6 +10100,10 @@ snapshots:
tslib: 2.8.1
optional: true
+ '@types/[email protected]':
+ dependencies:
+ '@types/node': 25.9.1
+
dependencies:
bun-types: 1.3.14
@@ -10664,16 +10793,18 @@ snapshots:
dependencies:
bare-path: 3.0.0
+
dependencies:
'@better-auth/memory-adapter': 1.6.11(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@cloudflare/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
'@better-auth/mongo-adapter': 1.6.11(@better-auth/[email protected](@better-auth/[email protected])(@better-fetch/[email protected])(@cloudflare/[email protected])(@opentelemetry/[email protected])([email protected]([email protected]))([email protected])([email protected])([email protected]))(@better-auth/[email protected])
@@ -10690,7 +10821,8 @@ snapshots:
nanostores: 1.3.0
zod: 4.4.3
optionalDependencies:
- drizzle-orm: 0.45.2(@cloudflare/[email protected])(@opentelemetry/[email protected])([email protected])([email protected])
+ better-sqlite3: 12.10.0
react: 19.2.6
react-dom: 19.2.6([email protected])
@@ -10708,6 +10840,21 @@ snapshots:
optionalDependencies:
zod: 4.4.3
+ dependencies:
+ bindings: 1.5.0
+ prebuild-install: 7.1.3
+
+ dependencies:
+ file-uri-to-path: 1.0.0
+
+ dependencies:
+ buffer: 5.7.1
+ inherits: 2.0.4
+ readable-stream: 3.6.2
+
@@ -10772,6 +10919,11 @@ snapshots:
+ dependencies:
+ base64-js: 1.5.1
+ ieee754: 1.2.1
+
dependencies:
'@types/node': 25.9.1
@@ -10847,6 +10999,8 @@ snapshots:
'@chevrotain/types': 12.0.0
'@chevrotain/utils': 12.0.0
+
dependencies:
'@types/node': 25.9.1
@@ -11286,8 +11440,14 @@ snapshots:
dependencies:
character-entities: 2.0.2
+ dependencies:
+ mimic-response: 3.1.0
+
+
@@ -11365,10 +11525,12 @@ snapshots:
optionalDependencies:
'@cloudflare/workers-types': 4.20260524.1
'@opentelemetry/api': 1.9.1
+ '@types/better-sqlite3': 7.6.13
+ better-sqlite3: 12.10.0
bun-types: 1.3.14
kysely: 0.28.17
@@ -11665,8 +11827,8 @@ snapshots:
'@next/eslint-plugin-next': 16.2.6
eslint: 9.39.4([email protected])
eslint-import-resolver-node: 0.3.10
- eslint-import-resolver-typescript: 3.10.1([email protected])([email protected]([email protected]))
- eslint-plugin-import: 2.32.0([email protected])([email protected]([email protected]))
eslint-plugin-jsx-a11y: 6.10.2([email protected]([email protected]))
eslint-plugin-react: 7.37.5([email protected]([email protected]))
eslint-plugin-react-hooks: 7.1.1([email protected]([email protected]))
@@ -11688,7 +11850,7 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
'@nolyfill/is-core-module': 1.0.39
debug: 4.4.3
@@ -11699,21 +11861,21 @@ snapshots:
tinyglobby: 0.2.16
unrs-resolver: 1.11.1
optionalDependencies:
- eslint-plugin-import: 2.32.0([email protected])([email protected]([email protected]))
transitivePeerDependencies:
- supports-color
dependencies:
debug: 3.2.7
optionalDependencies:
eslint: 9.39.4([email protected])
eslint-import-resolver-node: 0.3.10
- eslint-import-resolver-typescript: 3.10.1([email protected])([email protected]([email protected]))
transitivePeerDependencies:
- supports-color
dependencies:
'@rtsao/scc': 1.1.0
array-includes: 3.1.9
@@ -11724,7 +11886,7 @@ snapshots:
doctrine: 2.1.0
eslint: 9.39.4([email protected])
eslint-import-resolver-node: 0.3.10
hasown: 2.0.3
is-core-module: 2.16.2
is-glob: 4.0.3
@@ -11996,6 +12158,8 @@ snapshots:
strip-final-newline: 4.0.0
yoctocolors: 2.1.2
+
@@ -12171,6 +12335,8 @@ snapshots:
dependencies:
flat-cache: 4.0.1
+
dependencies:
to-regex-range: 5.0.1
@@ -12249,6 +12415,8 @@ snapshots:
+
dependencies:
graceful-fs: 4.2.11
@@ -12332,6 +12500,8 @@ snapshots:
transitivePeerDependencies:
- supports-color
+
dependencies:
is-glob: 4.0.3
@@ -12602,6 +12772,8 @@ snapshots:
+
@@ -12624,6 +12796,8 @@ snapshots:
+
@@ -13627,6 +13801,8 @@ snapshots:
+
dependencies:
'@cspotcode/source-map-support': 0.8.1
@@ -13659,6 +13835,8 @@ snapshots:
+
dependencies:
minimist: 1.2.8
@@ -13715,6 +13893,8 @@ snapshots:
+
@@ -13757,6 +13937,10 @@ snapshots:
- '@babel/core'
- babel-plugin-macros
+ dependencies:
+ semver: 7.8.1
+
@@ -14079,6 +14263,21 @@ snapshots:
+ dependencies:
+ detect-libc: 2.1.2
+ expand-template: 2.0.3
+ github-from-package: 0.0.0
+ minimist: 1.2.8
+ mkdirp-classic: 0.5.3
+ napi-build-utils: 2.0.0
+ node-abi: 3.92.0
+ pump: 3.0.4
+ rc: 1.2.8
+ simple-get: 4.0.1
+ tar-fs: 2.1.4
+ tunnel-agent: 0.6.0
+
@@ -14243,6 +14442,13 @@ snapshots:
iconv-lite: 0.7.2
unpipe: 1.0.0
+ dependencies:
+ deep-extend: 0.6.0
+ ini: 1.3.8
+ minimist: 1.2.8
+ strip-json-comments: 2.0.1
+
dependencies:
react: 19.2.6
@@ -14257,6 +14463,12 @@ snapshots:
+ dependencies:
+ inherits: 2.0.4
+ string_decoder: 1.3.0
+ util-deprecate: 1.0.2
+
dependencies:
ast-types: 0.16.1
@@ -14762,6 +14974,14 @@ snapshots:
+
+ dependencies:
+ decompress-response: 6.0.0
+ once: 1.4.0
+ simple-concat: 1.0.1
+
@@ -14923,6 +15143,10 @@ snapshots:
define-properties: 1.2.1
es-object-atoms: 1.1.1
+ dependencies:
+ safe-buffer: 5.2.1
+
dependencies:
character-entities-html4: 2.1.0
@@ -14956,6 +15180,8 @@ snapshots:
+
@@ -15002,6 +15228,13 @@ snapshots:
+ dependencies:
+ chownr: 1.1.4
+ mkdirp-classic: 0.5.3
+ pump: 3.0.4
+ tar-stream: 2.2.0
+
dependencies:
pump: 3.0.4
@@ -15014,6 +15247,14 @@ snapshots:
- bare-buffer
- react-native-b4a
+ dependencies:
+ bl: 4.1.0
+ end-of-stream: 1.4.5
+ fs-constants: 1.0.0
+ inherits: 2.0.4
+ readable-stream: 3.6.2
+
dependencies:
b4a: 1.8.0
@@ -15140,6 +15381,10 @@ snapshots:
optionalDependencies:
fsevents: 2.3.3
+ dependencies:
+ safe-buffer: 5.2.1
+
optionalDependencies:
'@turbo/darwin-64': 2.9.14
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 1b6c74f1c..d5e336d12 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,3 +5,4 @@ packages:
- "src/email-worker"
- "src/ws-do"
- "src/app"
+ - "tests/utils"
diff --git a/src/cli/package.json b/src/cli/package.json
index c91b7da27..728cc50d2 100644
--- a/src/cli/package.json
+++ b/src/cli/package.json
@@ -41,6 +41,7 @@
"build": "bun build src/index.ts --outdir dist --target node --format esm --external citty --external commander --external postal-mime --external playwright-core && bun build daemon/session-runner.ts --outdir dist --target node --format esm --external citty --external commander --external postal-mime && bun build daemon/meeting-runner.ts --outdir dist --target node --format esm --external playwright-core && node scripts/prepare-dist.mjs",
"prepack": "pnpm run build",
"test": "vitest run",
+ "test:integration": "vitest run --config ../../tests/integration/cli/vitest.config.ts --passWithNoTests",
"lint": "eslint .",
"typecheck": "tsc --noEmit -p tsconfig.build.json"
},
@@ -52,6 +53,7 @@
},
"devDependencies": {
"@alook/shared": "workspace:*",
+ "@alook/test-utils": "workspace:*",
"@types/bun": "^1.3.14",
"eslint": "^10.3.0",
"typescript": "^6.0.3",
diff --git a/src/email-worker/src/index.ts b/src/email-worker/src/index.ts
index 9f5baf368..4a8a76c75 100644
--- a/src/email-worker/src/index.ts
+++ b/src/email-worker/src/index.ts
@@ -49,6 +49,10 @@ export default {
async fetch(request: Request, env: EmailEnv): Promise<Response> {
const url = new URL(request.url)
+ if (url.pathname === "/health" && request.method === "GET") {
+ return Response.json({ status: "ok" })
+ }
+
if (url.pathname.startsWith("/imap/")) {
return this.handleImap(request, env, url)
}
diff --git a/src/web/package.json b/src/web/package.json
index 6905fd7f0..9a97fbc8c 100644
--- a/src/web/package.json
+++ b/src/web/package.json
@@ -73,6 +73,7 @@
"unique-names-generator": "^4.7.1"
},
"devDependencies": {
+ "@alook/test-utils": "workspace:*",
"@eslint/eslintrc": "^3",
"@lhci/cli": "^0.15.1",
"@tailwindcss/node": "^4.3.0",
diff --git a/src/web/src/test/e2e-setup.ts b/src/web/src/test/e2e-setup.ts
index 5402b42a4..9b5517ed0 100644
--- a/src/web/src/test/e2e-setup.ts
+++ b/src/web/src/test/e2e-setup.ts
@@ -1,3 +1,10 @@
+import { afterAll } from "vitest"
+import { closeDb } from "@alook/test-utils"
+
if (!process.env.APP_URL) {
process.env.APP_URL = "http://localhost:3000"
}
+
+afterAll(() => {
+ closeDb()
+})
diff --git a/src/web/src/test/e2e/agent-access.test.ts b/src/web/src/test/e2e/agent-access.test.ts
index 33be9a190..c494af446 100644
--- a/src/web/src/test/e2e/agent-access.test.ts
+++ b/src/web/src/test/e2e/agent-access.test.ts
@@ -1,9 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import {
- seedTestData, cleanupTestData, type TestSeed,
- seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser,
-} from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
let secondary: SecondaryUser
diff --git a/src/web/src/test/e2e/agent-crud.test.ts b/src/web/src/test/e2e/agent-crud.test.ts
index 6f21f72cc..1e4a80a4d 100644
--- a/src/web/src/test/e2e/agent-crud.test.ts
+++ b/src/web/src/test/e2e/agent-crud.test.ts
@@ -1,7 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sql } from "@alook/test-utils"
let seed: TestSeed
diff --git a/src/web/src/test/e2e/agent-email-accounts.test.ts b/src/web/src/test/e2e/agent-email-accounts.test.ts
new file mode 100644
index 000000000..35fae47e2
--- /dev/null
+++ b/src/web/src/test/e2e/agent-email-accounts.test.ts
@@ -0,0 +1,119 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun } from "@alook/test-utils"
+
+let seed: TestSeed
+let accountId: string
+
+beforeAll(() => {
+ seed = seedTestData()
+})
+
+afterAll(() => {
+ if (accountId) {
+ sqlRun(`DELETE FROM agent_email_account WHERE id = ?`, accountId)
+ }
+ cleanupTestData(seed)
+})
+
+describe("GET /api/agents/[id]/email-accounts", () => {
+ it("returns empty list when no accounts configured", async () => {
+ const res = await tokenRequest(
+ `/api/agents/${seed.agentId}/email-accounts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as unknown[]
+ expect(Array.isArray(data)).toBe(true)
+ expect(data).toHaveLength(0)
+ })
+
+ it("returns 404 for non-existent agent", async () => {
+ const res = await tokenRequest(
+ `/api/agents/ag_nonexistent_xyz/email-accounts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(404)
+ })
+})
+
+describe("POST /api/agents/[id]/email-accounts", () => {
+ it("creates an email account", async () => {
+ const res = await tokenRequest(
+ `/api/agents/${seed.agentId}/email-accounts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ emailAddress: "[email protected]",
+ displayName: "Test Account",
+ imapHost: "imap.example.com",
+ imapPort: 993,
+ imapUsername: "[email protected]",
+ imapPassword: "password123",
+ imapTls: true,
+ smtpHost: "smtp.example.com",
+ smtpPort: 587,
+ smtpUsername: "[email protected]",
+ smtpPassword: "password123",
+ smtpTls: 1,
+ pollIntervalSeconds: 60,
+ }),
+ },
+ )
+ expect(res.status).toBe(201)
+ const data = await res.json() as Record<string, unknown>
+ expect(data.id).toBeTruthy()
+ expect(data.email_address).toBe("[email protected]")
+ expect(data.display_name).toBe("Test Account")
+ expect(data.imap_host).toBe("imap.example.com")
+ expect(data.smtp_host).toBe("smtp.example.com")
+ expect(data.status).toBeTruthy()
+ accountId = data.id as string
+ })
+
+ it("lists the created account", async () => {
+ const res = await tokenRequest(
+ `/api/agents/${seed.agentId}/email-accounts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as Array<Record<string, unknown>>
+ expect(data.length).toBeGreaterThanOrEqual(1)
+ expect(data.some(a => a.id === accountId)).toBe(true)
+ })
+
+ it("returns 404 for non-existent agent on create", async () => {
+ const res = await tokenRequest(
+ `/api/agents/ag_nonexistent_xyz/email-accounts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ emailAddress: "[email protected]",
+ displayName: "Fail",
+ imapHost: "imap.example.com",
+ imapPort: 993,
+ imapUsername: "[email protected]",
+ imapPassword: "pass",
+ imapTls: true,
+ smtpHost: "smtp.example.com",
+ smtpPort: 587,
+ smtpUsername: "[email protected]",
+ smtpPassword: "pass",
+ smtpTls: 1,
+ pollIntervalSeconds: 60,
+ }),
+ },
+ )
+ expect(res.status).toBe(404)
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/agents/${seed.agentId}/email-accounts?workspace_id=${seed.workspaceId}`,
+ )
+ expect(res.status).toBe(401)
+ })
+})
diff --git a/src/web/src/test/e2e/agent-pin.test.ts b/src/web/src/test/e2e/agent-pin.test.ts
index 4403d327c..3f98fe605 100644
--- a/src/web/src/test/e2e/agent-pin.test.ts
+++ b/src/web/src/test/e2e/agent-pin.test.ts
@@ -1,6 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
diff --git a/src/web/src/test/e2e/agent-recruit.test.ts b/src/web/src/test/e2e/agent-recruit.test.ts
new file mode 100644
index 000000000..ac6709db2
--- /dev/null
+++ b/src/web/src/test/e2e/agent-recruit.test.ts
@@ -0,0 +1,98 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun } from "@alook/test-utils"
+
+let seed: TestSeed
+let recruitedAgentId: string
+
+beforeAll(() => {
+ seed = seedTestData()
+})
+
+afterAll(() => {
+ if (recruitedAgentId) {
+ sqlRun(`DELETE FROM agent_task_queue WHERE agent_id = ?`, recruitedAgentId)
+ sqlRun(`DELETE FROM message WHERE conversation_id IN (SELECT id FROM conversation WHERE agent_id = ?)`, recruitedAgentId)
+ sqlRun(`DELETE FROM conversation WHERE agent_id = ?`, recruitedAgentId)
+ sqlRun(`DELETE FROM agent_whitelist WHERE agent_id = ?`, recruitedAgentId)
+ sqlRun(`DELETE FROM agent_link WHERE (source_agent_id = ? AND target_agent_id = ?) OR (source_agent_id = ? AND target_agent_id = ?)`, seed.agentId, recruitedAgentId, recruitedAgentId, seed.agentId)
+ sqlRun(`DELETE FROM agent WHERE id = ?`, recruitedAgentId)
+ }
+ cleanupTestData(seed)
+})
+
+describe("POST /api/agents/recruit", () => {
+ it("recruits a new agent and returns agent + link", async () => {
+ const res = await tokenRequest(
+ `/api/agents/recruit?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ name: "RecruitedBot",
+ description: "A test recruited agent",
+ instructions: "You are a helper bot",
+ relationship: "Helps with testing",
+ }),
+ },
+ )
+ expect(res.status).toBe(201)
+ const data = await res.json() as { agent: Record<string, unknown>; link: Record<string, unknown> }
+ expect(data.agent).toBeTruthy()
+ expect(data.agent.name).toBe("RecruitedBot")
+ expect(data.agent.email).toBeTruthy()
+ expect(data.link).toBeTruthy()
+ expect(data.link.source_agent_id).toBeTruthy()
+ expect(data.link.target_agent_id).toBeTruthy()
+ const linkAgentIds = [data.link.source_agent_id, data.link.target_agent_id]
+ expect(linkAgentIds).toContain(data.agent.id)
+ expect(linkAgentIds).toContain(seed.agentId)
+ recruitedAgentId = data.agent.id as string
+ })
+
+ it("returns 400 without agentId query param", async () => {
+ const res = await tokenRequest(
+ `/api/agents/recruit?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ name: "ShouldFail",
+ instructions: "test",
+ relationship: "test",
+ }),
+ },
+ )
+ expect(res.status).toBe(400)
+ })
+
+ it("returns 404 for non-existent calling agent", async () => {
+ const res = await tokenRequest(
+ `/api/agents/recruit?workspace_id=${seed.workspaceId}&agentId=ag_nonexistent_xyz`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ name: "ShouldFail",
+ instructions: "test",
+ relationship: "test",
+ }),
+ },
+ )
+ expect(res.status).toBe(404)
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/agents/recruit?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}`,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ name: "NoAuth", instructions: "x", relationship: "x" }),
+ },
+ )
+ expect(res.status).toBe(401)
+ })
+})
diff --git a/src/web/src/test/e2e/artifacts.test.ts b/src/web/src/test/e2e/artifacts.test.ts
new file mode 100644
index 000000000..d4c66f5bc
--- /dev/null
+++ b/src/web/src/test/e2e/artifacts.test.ts
@@ -0,0 +1,127 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
+
+let seed: TestSeed
+let conversationId: string
+let artifactId: string
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const convData = await convRes.json() as { id: string }
+ conversationId = convData.id
+})
+
+afterAll(() => cleanupTestData(seed))
+
+describe("POST /api/artifacts/upload", () => {
+ it("uploads a file and returns artifact metadata", async () => {
+ const fileContent = new Blob(["hello world"], { type: "text/plain" })
+ const formData = new FormData()
+ formData.append("file", new File([fileContent], "test.txt", { type: "text/plain" }))
+ formData.append("conversation_id", conversationId)
+
+ const res = await tokenRequest(
+ `/api/artifacts/upload?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ body: formData,
+ },
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as Record<string, unknown>
+ expect(data.id).toBeTruthy()
+ expect(data.filename).toBe("test.txt")
+ expect(data.content_type).toBe("text/plain")
+ expect(data.size).toBe(11)
+ expect(data.conversation_id).toBe(conversationId)
+ artifactId = data.id as string
+ })
+
+ it("rejects upload without file", async () => {
+ const formData = new FormData()
+ formData.append("conversation_id", conversationId)
+
+ const res = await tokenRequest(
+ `/api/artifacts/upload?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ body: formData,
+ },
+ )
+ expect(res.status).toBe(400)
+ })
+
+ it("rejects upload without conversation_id", async () => {
+ const fileContent = new Blob(["data"], { type: "text/plain" })
+ const formData = new FormData()
+ formData.append("file", new File([fileContent], "test2.txt", { type: "text/plain" }))
+
+ const res = await tokenRequest(
+ `/api/artifacts/upload?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ body: formData,
+ },
+ )
+ expect(res.status).toBe(400)
+ })
+
+ it("rejects upload for non-existent conversation", async () => {
+ const fileContent = new Blob(["data"], { type: "text/plain" })
+ const formData = new FormData()
+ formData.append("file", new File([fileContent], "test3.txt", { type: "text/plain" }))
+ formData.append("conversation_id", "conv_nonexistent_xyz")
+
+ const res = await tokenRequest(
+ `/api/artifacts/upload?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ body: formData,
+ },
+ )
+ expect(res.status).toBe(404)
+ })
+})
+
+describe("GET /api/artifacts", () => {
+ it("lists artifacts for a conversation", async () => {
+ const res = await tokenRequest(
+ `/api/artifacts?workspace_id=${seed.workspaceId}&conversation_id=${conversationId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as Array<Record<string, unknown>>
+ expect(Array.isArray(data)).toBe(true)
+ expect(data.length).toBeGreaterThanOrEqual(1)
+ expect(data.some(a => a.id === artifactId)).toBe(true)
+ })
+
+ it("returns 400 without conversation_id", async () => {
+ const res = await tokenRequest(
+ `/api/artifacts?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(400)
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/artifacts?workspace_id=${seed.workspaceId}&conversation_id=${conversationId}`,
+ )
+ expect(res.status).toBe(401)
+ })
+})
diff --git a/src/web/src/test/e2e/auth.test.ts b/src/web/src/test/e2e/auth.test.ts
index 5298a70ba..18d1343da 100644
--- a/src/web/src/test/e2e/auth.test.ts
+++ b/src/web/src/test/e2e/auth.test.ts
@@ -1,7 +1,6 @@
import { describe, it, expect, beforeAll } from "vitest"
import { randomUUID } from "crypto"
-import { signUp, signIn, sessionRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { signUp, signIn, sessionRequest, sqlRun } from "@alook/test-utils"
const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
@@ -38,9 +37,9 @@ describe("auth", () => {
// Cleanup: remove test user created by sign-up
afterAll(() => {
try {
- sql(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${testEmail}'`)
+ sqlRun(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, testEmail)
} catch { /* ignore cleanup errors */ }
})
})
diff --git a/src/web/src/test/e2e/buffered-messages.test.ts b/src/web/src/test/e2e/buffered-messages.test.ts
index e0a43dcf3..5dfb12189 100644
--- a/src/web/src/test/e2e/buffered-messages.test.ts
+++ b/src/web/src/test/e2e/buffered-messages.test.ts
@@ -1,7 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sql, sqlQuery } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery } from "@alook/test-utils"
let seed: TestSeed
let conversationId: string
@@ -24,8 +22,8 @@ beforeAll(async () => {
activeTaskId = `task_${Date.now()}`
const now = new Date().toISOString()
- sql(
- `INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, created_at) VALUES ('${activeTaskId}', '${seed.agentId}', '${seed.runtimeId}', '${seed.workspaceId}', '${conversationId}', 'active task', 'running', 'user_dm_message', '${now}')`
+ sqlRun(
+ `INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, activeTaskId, seed.agentId, seed.runtimeId, seed.workspaceId, conversationId, 'active task', 'running', 'user_dm_message', now
)
})
afterAll(() => cleanupTestData(seed))
@@ -175,8 +173,8 @@ describe("buffered messages CRUD", () => {
// Create a normal message via SQL
const msgId = `test_active_${Date.now()}`
const now = new Date().toISOString()
- sql(
- `INSERT INTO message (id, conversation_id, role, content, status, created_at) VALUES ('${msgId}', '${conversationId}', 'user', 'normal msg', 'active', '${now}')`
+ sqlRun(
+ `INSERT INTO message (id, conversation_id, role, content, status, created_at) VALUES (?, ?, ?, ?, ?, ?)`, msgId, conversationId, 'user', 'normal msg', 'active', now
)
const res = await tokenRequest(
@@ -187,6 +185,6 @@ describe("buffered messages CRUD", () => {
expect(res.status).toBe(400)
// Cleanup
- sql(`DELETE FROM message WHERE id = '${msgId}'`)
+ sqlRun(`DELETE FROM message WHERE id = ?`, msgId)
})
})
diff --git a/src/web/src/test/e2e/calendar-fire.test.ts b/src/web/src/test/e2e/calendar-fire.test.ts
new file mode 100644
index 000000000..efedf35e7
--- /dev/null
+++ b/src/web/src/test/e2e/calendar-fire.test.ts
@@ -0,0 +1,116 @@
+/**
+ * Cross-service E2E: Calendar event with past scheduled_at → sweep → task dispatched
+ * Verifies calendar event promotion creates a task with type=calendar_event.
+ * Refs: #190
+ *
+ * NOTE: The sweep route throttles calendar promotion (30s via KV). Tests are
+ * structured to insert all events before a single sweep call.
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sql, sqlQuery } from "@alook/test-utils"
+
+let seed: TestSeed
+
+const eventIds = {
+ basic: `ce_basic_${randomUUID().slice(0, 8)}`,
+ triggerCheck: `ce_trig_${randomUUID().slice(0, 8)}`,
+ recurring: `ce_recur_${randomUUID().slice(0, 8)}`,
+}
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ const pastTime1 = new Date(Date.now() - 60_000).toISOString()
+ const pastTime2 = new Date(Date.now() - 120_000).toISOString()
+ const pastTime3 = new Date(Date.now() - 90_000).toISOString()
+ const now = new Date().toISOString()
+
+ // Insert all events before sweep (throttle prevents multiple sweep calls)
+ sql(
+ `INSERT INTO calendar_event (id, agent_id, workspace_id, title, scheduled_at, created_at, updated_at) VALUES ('${eventIds.basic}', '${seed.agentId}', '${seed.workspaceId}', 'E2E sweep test event', '${pastTime1}', '${now}', '${now}')`,
+ )
+ sql(
+ `INSERT INTO calendar_event (id, agent_id, workspace_id, title, scheduled_at, created_at, updated_at) VALUES ('${eventIds.triggerCheck}', '${seed.agentId}', '${seed.workspaceId}', 'E2E trigger check', '${pastTime2}', '${now}', '${now}')`,
+ )
+ sql(
+ `INSERT INTO calendar_event (id, agent_id, workspace_id, title, scheduled_at, repeat_interval, created_at, updated_at) VALUES ('${eventIds.recurring}', '${seed.agentId}', '${seed.workspaceId}', 'E2E recurring', '${pastTime3}', '1day', '${now}', '${now}')`,
+ )
+
+ // Small delay for WAL visibility
+ await new Promise((r) => setTimeout(r, 300))
+
+ // Single sweep call processes all events
+ const sweepRes = await tokenRequest(
+ `/api/daemon/sweep`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId }),
+ },
+ )
+ expect(sweepRes.status).toBe(200)
+
+ // Wait for processing
+ await new Promise((r) => setTimeout(r, 1500))
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("cross-service: calendar event fire → task dispatched", () => {
+ it("past calendar event → sweep → task created with type=calendar_event", () => {
+ const tasks = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM agent_task_queue WHERE agent_id = '${seed.agentId}' AND workspace_id = '${seed.workspaceId}' AND type = 'calendar_event' AND prompt = 'E2E sweep test event'`,
+ )
+ expect(tasks.length).toBeGreaterThan(0)
+ expect(tasks[0].type).toBe("calendar_event")
+ expect(tasks[0].prompt).toBe("E2E sweep test event")
+ expect(tasks[0].status).toMatch(/queued|dispatched/)
+ })
+
+ it("calendar event last_triggered_at is updated after sweep", () => {
+ const rows = sqlQuery<{ last_triggered_at: string | null }>(
+ `SELECT last_triggered_at FROM calendar_event WHERE id = '${eventIds.triggerCheck}'`,
+ )
+ expect(rows).toHaveLength(1)
+ expect(rows[0].last_triggered_at).toBeTruthy()
+ })
+
+ it("recurring event gets next scheduled_at advanced after sweep", () => {
+ const rows = sqlQuery<{ scheduled_at: string }>(
+ `SELECT scheduled_at FROM calendar_event WHERE id = '${eventIds.recurring}'`,
+ )
+ expect(rows).toHaveLength(1)
+ const newScheduled = new Date(rows[0].scheduled_at)
+ // After promotion, recurring event with 1day interval should advance to future
+ expect(newScheduled.getTime()).toBeGreaterThan(Date.now())
+ })
+
+ it("already triggered event is not re-triggered on second sweep", async () => {
+ const countBefore = sqlQuery<{ cnt: number }>(
+ `SELECT COUNT(*) as cnt FROM agent_task_queue WHERE agent_id = '${seed.agentId}' AND type = 'calendar_event' AND prompt = 'E2E sweep test event'`,
+ )
+
+ // Wait for throttle to expire (use a fresh workspace seed to bypass)
+ // Instead, insert a new event with last_triggered_at already set
+ const alreadyTriggeredId = `ce_done_${randomUUID().slice(0, 8)}`
+ const now = new Date().toISOString()
+ const pastTime = new Date(Date.now() - 60_000).toISOString()
+ sql(
+ `INSERT INTO calendar_event (id, agent_id, workspace_id, title, scheduled_at, last_triggered_at, created_at, updated_at) VALUES ('${alreadyTriggeredId}', '${seed.agentId}', '${seed.workspaceId}', 'E2E already-triggered', '${pastTime}', '${now}', '${now}', '${now}')`,
+ )
+
+ // Verify it's not picked up by querying the due events condition directly
+ const dueRows = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM calendar_event WHERE id = '${alreadyTriggeredId}' AND (last_triggered_at IS NULL OR last_triggered_at < scheduled_at)`,
+ )
+ // Should NOT match — last_triggered_at > scheduled_at
+ expect(dueRows).toHaveLength(0)
+
+ // Also verify the original event from test 1 wasn't duplicated
+ const countAfter = sqlQuery<{ cnt: number }>(
+ `SELECT COUNT(*) as cnt FROM agent_task_queue WHERE agent_id = '${seed.agentId}' AND type = 'calendar_event' AND prompt = 'E2E sweep test event'`,
+ )
+ expect(countAfter[0].cnt).toBe(countBefore[0].cnt)
+ })
+})
diff --git a/src/web/src/test/e2e/cli-update.test.ts b/src/web/src/test/e2e/cli-update.test.ts
index ced6021de..15ae93437 100644
--- a/src/web/src/test/e2e/cli-update.test.ts
+++ b/src/web/src/test/e2e/cli-update.test.ts
@@ -1,8 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest";
import { randomUUID } from "crypto";
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed";
-import { tokenRequest } from "../helpers/auth";
-import { sql, sqlQuery } from "../helpers/db";
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery } from "@alook/test-utils"
let seed: TestSeed;
@@ -49,12 +47,12 @@ describe("CLI auto-update e2e", () => {
});
it("POST /api/runtimes/:id/update sets pendingUpdateVersion on machine", async () => {
- sql(
- `UPDATE machine SET pending_update_version = '1.0.0' WHERE daemon_id = '${daemonId}' AND workspace_id = '${seed.workspaceId}'`,
+ sqlRun(
+ `UPDATE machine SET pending_update_version = ? WHERE daemon_id = ? AND workspace_id = ?`, '1.0.0', daemonId, seed.workspaceId
);
const rows = sqlQuery<{ pending_update_version: string | null }>(
- `SELECT pending_update_version FROM machine WHERE daemon_id = '${daemonId}' AND workspace_id = '${seed.workspaceId}'`,
+ `SELECT pending_update_version FROM machine WHERE daemon_id = ? AND workspace_id = ?`, daemonId, seed.workspaceId
);
expect(rows[0]?.pending_update_version).toBe("1.0.0");
});
@@ -75,8 +73,8 @@ describe("CLI auto-update e2e", () => {
it("poll auto-clears pendingUpdateVersion when cli_version matches", async () => {
// Use a separate daemon to avoid 30s misc-throttle from previous poll
- sql(
- `UPDATE machine SET pending_update_version = '1.0.0' WHERE daemon_id = '${daemonId2}' AND workspace_id = '${seed.workspaceId}'`,
+ sqlRun(
+ `UPDATE machine SET pending_update_version = ? WHERE daemon_id = ? AND workspace_id = ?`, '1.0.0', daemonId2, seed.workspaceId
);
const res = await tokenRequest("/api/daemon/tasks/poll", seed.machineToken, {
@@ -92,17 +90,17 @@ describe("CLI auto-update e2e", () => {
expect(data.pending_update).toBeUndefined();
const rows = sqlQuery<{ pending_update_version: string | null }>(
- `SELECT pending_update_version FROM machine WHERE daemon_id = '${daemonId2}' AND workspace_id = '${seed.workspaceId}'`,
+ `SELECT pending_update_version FROM machine WHERE daemon_id = ? AND workspace_id = ?`, daemonId2, seed.workspaceId
);
expect(rows[0]?.pending_update_version).toBeNull();
});
afterAll(() => {
try {
- sql(`DELETE FROM agent_runtime WHERE daemon_id = '${daemonId}'`);
- sql(`DELETE FROM machine WHERE daemon_id = '${daemonId}'`);
- sql(`DELETE FROM agent_runtime WHERE daemon_id = '${daemonId2}'`);
- sql(`DELETE FROM machine WHERE daemon_id = '${daemonId2}'`);
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId);
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId);
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId2);
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId2);
} catch { /* ignore */ }
});
});
diff --git a/src/web/src/test/e2e/conversation-init.test.ts b/src/web/src/test/e2e/conversation-init.test.ts
new file mode 100644
index 000000000..154c71cf9
--- /dev/null
+++ b/src/web/src/test/e2e/conversation-init.test.ts
@@ -0,0 +1,94 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
+
+let seed: TestSeed
+let conversationId: string
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const convData = await convRes.json() as { id: string }
+ conversationId = convData.id
+
+ // Send a message to populate conversation
+ await tokenRequest(
+ `/api/conversations/${conversationId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Init test message" }),
+ },
+ )
+})
+
+afterAll(() => cleanupTestData(seed))
+
+describe("GET /api/conversations/[id]/init", () => {
+ it("returns full conversation initialization data", async () => {
+ const res = await tokenRequest(
+ `/api/conversations/${conversationId}/init?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as Record<string, unknown>
+ expect(data.conversation).toBeTruthy()
+ expect(data.messages).toBeTruthy()
+ expect(Array.isArray(data.messages)).toBe(true)
+ expect(typeof data.has_more_messages).toBe("boolean")
+ expect(typeof data.has_more_conversations).toBe("boolean")
+ expect(typeof data.has_more_artifacts).toBe("boolean")
+ expect(Array.isArray(data.artifacts)).toBe(true)
+ expect(Array.isArray(data.buffered_messages)).toBe(true)
+ expect(Array.isArray(data.flagged_message_ids)).toBe(true)
+ expect(typeof data.thinking_counts).toBe("object")
+ expect(typeof data.cache_valid).toBe("boolean")
+ expect(typeof data.message_count).toBe("number")
+ })
+
+ it("returns cache_valid=true when newest_message_id matches", async () => {
+ // First get the init data to find the newest message id
+ const firstRes = await tokenRequest(
+ `/api/conversations/${conversationId}/init?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ const firstData = await firstRes.json() as { messages: Array<{ id: string }>; message_count: number }
+ const newestMsgId = firstData.messages[0]?.id
+ const msgCount = firstData.message_count
+
+ if (newestMsgId) {
+ const res = await tokenRequest(
+ `/api/conversations/${conversationId}/init?workspace_id=${seed.workspaceId}&newest_message_id=${newestMsgId}&message_count=${msgCount}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as { cache_valid: boolean; messages: unknown }
+ expect(data.cache_valid).toBe(true)
+ expect(data.messages).toBeNull()
+ }
+ })
+
+ it("returns 404 for non-existent conversation", async () => {
+ const res = await tokenRequest(
+ `/api/conversations/conv_nonexistent_xyz/init?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(404)
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/conversations/${conversationId}/init?workspace_id=${seed.workspaceId}`,
+ )
+ expect(res.status).toBe(401)
+ })
+})
diff --git a/src/web/src/test/e2e/conversation.test.ts b/src/web/src/test/e2e/conversation.test.ts
index c1e1c9ef5..65759d52c 100644
--- a/src/web/src/test/e2e/conversation.test.ts
+++ b/src/web/src/test/e2e/conversation.test.ts
@@ -1,6 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
diff --git a/src/web/src/test/e2e/daemon-lifecycle.test.ts b/src/web/src/test/e2e/daemon-lifecycle.test.ts
index bbbfb789e..c19a2bd61 100644
--- a/src/web/src/test/e2e/daemon-lifecycle.test.ts
+++ b/src/web/src/test/e2e/daemon-lifecycle.test.ts
@@ -1,8 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sqlQuery, sqlBatch } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlQuery, sqlBatch } from "@alook/test-utils"
let seed: TestSeed
diff --git a/src/web/src/test/e2e/device-code.test.ts b/src/web/src/test/e2e/device-code.test.ts
index 444493923..a7685a263 100644
--- a/src/web/src/test/e2e/device-code.test.ts
+++ b/src/web/src/test/e2e/device-code.test.ts
@@ -1,7 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { signUp, signIn, sessionRequest, tokenRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { signUp, signIn, sessionRequest, tokenRequest, sqlRun } from "@alook/test-utils"
const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
const TEST_CLIENT_ID = "e2e-test-client"
@@ -160,10 +159,10 @@ describe("device-code-flow", () => {
afterAll(() => {
try {
- sql(`DELETE FROM "deviceCode" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "session" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "account" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${testEmail}'`)
+ sqlRun(`DELETE FROM "deviceCode" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "session" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "account" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, testEmail)
} catch { /* ignore cleanup errors */ }
})
})
@@ -281,15 +280,15 @@ describe("device-code-flow workspace reuse", () => {
afterAll(() => {
try {
- sql(`DELETE FROM "deviceCode" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${wsTestEmail}')`)
- sql(`DELETE FROM machine_token WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${wsTestEmail}')`)
- sql(`DELETE FROM agent_runtime WHERE machine_id IN (SELECT id FROM machine WHERE workspace_id = '${originalWorkspaceId}')`)
- sql(`DELETE FROM machine WHERE workspace_id = '${originalWorkspaceId}'`)
- sql(`DELETE FROM member WHERE workspace_id = '${originalWorkspaceId}'`)
- sql(`DELETE FROM workspace WHERE id = '${originalWorkspaceId}'`)
- sql(`DELETE FROM "session" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${wsTestEmail}')`)
- sql(`DELETE FROM "account" WHERE "userId" IN (SELECT id FROM "user" WHERE email = '${wsTestEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${wsTestEmail}'`)
+ sqlRun(`DELETE FROM "deviceCode" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, wsTestEmail)
+ sqlRun(`DELETE FROM machine_token WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, wsTestEmail)
+ sqlRun(`DELETE FROM agent_runtime WHERE machine_id IN (SELECT id FROM machine WHERE workspace_id = ?)`, originalWorkspaceId)
+ sqlRun(`DELETE FROM machine WHERE workspace_id = ?`, originalWorkspaceId)
+ sqlRun(`DELETE FROM member WHERE workspace_id = ?`, originalWorkspaceId)
+ sqlRun(`DELETE FROM workspace WHERE id = ?`, originalWorkspaceId)
+ sqlRun(`DELETE FROM "session" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, wsTestEmail)
+ sqlRun(`DELETE FROM "account" WHERE "userId" IN (SELECT id FROM "user" WHERE email = ?)`, wsTestEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, wsTestEmail)
} catch { /* ignore cleanup errors */ }
})
})
diff --git a/src/web/src/test/e2e/dm-to-broadcast.test.ts b/src/web/src/test/e2e/dm-to-broadcast.test.ts
new file mode 100644
index 000000000..6cdaab0c9
--- /dev/null
+++ b/src/web/src/test/e2e/dm-to-broadcast.test.ts
@@ -0,0 +1,182 @@
+/**
+ * Cross-service E2E: User DM → Task → Daemon poll+start+complete → WS broadcast
+ * Verifies the full message-to-broadcast flow.
+ * Refs: #190
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
+
+const WS_DO_PORT = Number(process.env.NEXT_PUBLIC_WS_DO_PORT) || 8789
+const WS_DO_HTTP = `http://localhost:${WS_DO_PORT}`
+const WS_DO_WS = `ws://localhost:${WS_DO_PORT}`
+
+let seed: TestSeed
+let wsAvailable = false
+
+async function checkWsAvailable(): Promise<boolean> {
+ try {
+ const res = await fetch(WS_DO_HTTP, { method: "GET" })
+ return res.status < 500
+ } catch {
+ return false
+ }
+}
+
+function openWs(userId: string): Promise<WebSocket> {
+ return new Promise((resolve, reject) => {
+ const ws = new WebSocket(`${WS_DO_WS}/?userId=${userId}`)
+ const timer = setTimeout(() => reject(new Error("ws open timeout")), 5000)
+ ws.addEventListener("open", () => { clearTimeout(timer); resolve(ws) }, { once: true })
+ ws.addEventListener("error", () => { clearTimeout(timer); reject(new Error("ws connect error")) }, { once: true })
+ })
+}
+
+function waitForWsMessage<T = unknown>(
+ ws: WebSocket,
+ predicate: (msg: T) => boolean,
+ timeoutMs = 5000,
+): Promise<T> {
+ return new Promise((resolve, reject) => {
+ const timer = setTimeout(() => {
+ ws.removeEventListener("message", handler)
+ reject(new Error(`waitForWsMessage timed out after ${timeoutMs}ms`))
+ }, timeoutMs)
+ const handler = (e: MessageEvent) => {
+ try {
+ const msg = JSON.parse(e.data as string) as T
+ if (predicate(msg)) {
+ clearTimeout(timer)
+ ws.removeEventListener("message", handler)
+ resolve(msg)
+ }
+ } catch { /* ignore non-JSON */ }
+ }
+ ws.addEventListener("message", handler)
+ })
+}
+
+beforeAll(async () => {
+ seed = seedTestData()
+ wsAvailable = await checkWsAvailable()
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("cross-service: DM → task lifecycle → WS broadcast", () => {
+ let conversationId: string
+ let taskId: string
+
+ it("user message creates a task", async () => {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ expect(convRes.ok).toBe(true)
+ const convData = await convRes.json() as { id: string }
+ conversationId = convData.id
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${conversationId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "DM broadcast test" }),
+ },
+ )
+ expect(msgRes.ok).toBe(true)
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ expect(msgData.task).toBeTruthy()
+ taskId = msgData.task!.id
+ })
+
+ it("daemon polls and claims the task", async () => {
+ const pollRes = await tokenRequest(
+ `/api/daemon/tasks/poll`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 5 }),
+ },
+ )
+ expect(pollRes.status).toBe(200)
+ const pollData = await pollRes.json() as { tasks: Array<Record<string, unknown>> }
+ expect(pollData.tasks.length).toBeGreaterThanOrEqual(1)
+ const claimed = pollData.tasks.find(t => t.id === taskId)
+ expect(claimed).toBeTruthy()
+ expect(claimed!.status).toBe("dispatched")
+ })
+
+ it("daemon starts the task", async () => {
+ const startRes = await tokenRequest(
+ `/api/daemon/tasks/${taskId}/start`,
+ seed.machineToken,
+ { method: "POST" },
+ )
+ expect(startRes.status).toBe(200)
+ const startData = await startRes.json() as { status: string }
+ expect(startData.status).toBe("running")
+ })
+
+ it("daemon completes the task", async () => {
+ const completeRes = await tokenRequest(
+ `/api/daemon/tasks/${taskId}/complete`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "Task done", session_id: `sess_${randomUUID().slice(0, 8)}` }),
+ },
+ )
+ expect(completeRes.status).toBe(200)
+ const completeData = await completeRes.json() as { status: string }
+ expect(completeData.status).toBe("completed")
+ })
+
+ it("WS broadcast sent on task complete (conditional on WS-DO available)", async () => {
+ if (!wsAvailable) {
+ console.log("WS-DO not available at :8789 — skipping WS broadcast verification")
+ return
+ }
+
+ // Set up a WS client connection
+ const ws = await openWs(seed.userId)
+
+ // Authenticate (get token via API)
+ const tokenRes = await tokenRequest(
+ `/api/ws/token?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ if (tokenRes.status !== 200) {
+ ws.close()
+ console.log("WS token endpoint not available — skipping")
+ return
+ }
+ const { token } = await tokenRes.json() as { token: string }
+ ws.send(JSON.stringify({ type: "auth", token }))
+
+ // Wait for auth ack
+ const ack = await waitForWsMessage<{ type: string }>(ws, (m) => m.type === "auth.ok")
+ expect(ack.type).toBe("auth.ok")
+
+ // Now trigger a broadcast via the HTTP broadcast endpoint
+ const payload = { type: "task.completed", taskId: `test_${randomUUID().slice(0, 8)}`, conversationId }
+ const broadcastRes = await fetch(`${WS_DO_HTTP}/broadcast/user/${seed.userId}`, {
+ method: "POST",
+ body: JSON.stringify(payload),
+ })
+ expect(broadcastRes.status).toBe(200)
+
+ const received = await waitForWsMessage<typeof payload>(ws, (m) => m.type === "task.completed")
+ expect(received.type).toBe("task.completed")
+ expect(received.conversationId).toBe(conversationId)
+
+ ws.close()
+ })
+})
diff --git a/src/web/src/test/e2e/email-inbound-to-reply.test.ts b/src/web/src/test/e2e/email-inbound-to-reply.test.ts
new file mode 100644
index 000000000..0b5c32fa1
--- /dev/null
+++ b/src/web/src/test/e2e/email-inbound-to-reply.test.ts
@@ -0,0 +1,97 @@
+/**
+ * Cross-service E2E: Email Worker → App → Task Created
+ * Verifies the full inbound email flow across services.
+ * Refs: #190
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlQuery, postEmail } from "@alook/test-utils"
+
+let seed: TestSeed
+
+beforeAll(() => {
+ seed = seedTestData()
+})
+afterAll(() => cleanupTestData(seed))
+
+async function waitForTask(
+ agentId: string,
+ workspaceId: string,
+ type: string,
+ promptContains?: string,
+ maxMs = 8000,
+): Promise<Record<string, unknown> | null> {
+ const start = Date.now()
+ const promptFilter = promptContains
+ ? ` AND prompt LIKE '%${promptContains}%'`
+ : ""
+ while (Date.now() - start < maxMs) {
+ const rows = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM agent_task_queue WHERE agent_id = '${agentId}' AND workspace_id = '${workspaceId}' AND type = '${type}'${promptFilter} ORDER BY created_at DESC LIMIT 1`,
+ )
+ if (rows.length > 0) return rows[0]
+ await new Promise((r) => setTimeout(r, 300))
+ }
+ return null
+}
+
+describe("cross-service: email inbound → task creation", () => {
+ it("whitelisted email via email-worker → app notify → task created with type=email_notification", async () => {
+ const from = `${seed.userId}@test.local`
+ const to = `${seed.agentEmailHandle}@alook.ai`
+ const subject = `E2E cross-service ${randomUUID().slice(0, 8)}`
+
+ const emailRes = await postEmail(from, to, subject, "Cross-service test body")
+ expect(emailRes.status).toBe(200)
+
+ const task = await waitForTask(seed.agentId, seed.workspaceId, "email_notification", subject)
+ expect(task).not.toBeNull()
+ expect(task!.type).toBe("email_notification")
+ expect(task!.prompt).toContain(from)
+ expect(task!.prompt).toContain(subject)
+ expect(task!.status).toMatch(/queued|dispatched/)
+ })
+
+ it("task has correct metadata: conversation_id set, context_key matches conversation", async () => {
+ const from = `${seed.userId}@test.local`
+ const to = `${seed.agentEmailHandle}@alook.ai`
+ const subject = `E2E metadata ${randomUUID().slice(0, 8)}`
+
+ await postEmail(from, to, subject, "Metadata test")
+
+ const task = await waitForTask(seed.agentId, seed.workspaceId, "email_notification", subject)
+ expect(task).not.toBeNull()
+ expect(task!.conversation_id).toBeTruthy()
+ expect(task!.context_key).toBe(task!.conversation_id)
+ })
+
+ it("email record exists in DB with correct agent_id and is_whitelisted=1", async () => {
+ const from = `${seed.userId}@test.local`
+ const to = `${seed.agentEmailHandle}@alook.ai`
+ const subject = `E2E email-record ${randomUUID().slice(0, 8)}`
+
+ await postEmail(from, to, subject, "Record check")
+
+ await new Promise((r) => setTimeout(r, 2000))
+ const rows = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM emails WHERE agent_id = '${seed.agentId}' AND subject = '${subject}'`,
+ )
+ expect(rows.length).toBeGreaterThan(0)
+ expect(rows[0].is_whitelisted).toBe(1)
+ expect(rows[0].from_email).toBe(from)
+ })
+
+ it("non-whitelisted email does NOT create a task", async () => {
+ const from = "[email protected]"
+ const to = `${seed.agentEmailHandle}@alook.ai`
+ const subject = `E2E no-task ${randomUUID().slice(0, 8)}`
+
+ await postEmail(from, to, subject, "Should not trigger task")
+
+ await new Promise((r) => setTimeout(r, 3000))
+ const rows = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM agent_task_queue WHERE agent_id = '${seed.agentId}' AND prompt LIKE '%${subject}%'`,
+ )
+ expect(rows).toHaveLength(0)
+ })
+})
diff --git a/src/web/src/test/e2e/email.test.ts b/src/web/src/test/e2e/email.test.ts
index 25a7ae078..404874466 100644
--- a/src/web/src/test/e2e/email.test.ts
+++ b/src/web/src/test/e2e/email.test.ts
@@ -1,9 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sql, sqlQuery } from "../helpers/db"
-import { postEmail, postEmailRaw } from "../helpers/email"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery, postEmail, postEmailRaw } from "@alook/test-utils"
let seed: TestSeed
@@ -21,7 +18,7 @@ async function waitForEmail(
const start = Date.now()
while (Date.now() - start < maxMs) {
const rows = sqlQuery<Record<string, unknown>>(
- `SELECT * FROM emails WHERE agent_id = '${agentId}' AND from_email = '${fromEmail}' ORDER BY created_at DESC LIMIT 1`,
+ `SELECT * FROM emails WHERE agent_id = ? AND from_email = ? ORDER BY created_at DESC LIMIT 1`, agentId, fromEmail
)
if (rows.length > 0) return rows[0]
await new Promise((r) => setTimeout(r, 300))
@@ -70,7 +67,7 @@ describe("email receive (inbound)", () => {
await new Promise((r) => setTimeout(r, 1000))
const rows = sqlQuery<Record<string, unknown>>(
- `SELECT * FROM emails WHERE from_email = '${from}' AND subject = '${subject}'`,
+ `SELECT * FROM emails WHERE from_email = ? AND subject = ?`, from, subject
)
expect(rows).toHaveLength(0)
})
@@ -113,7 +110,7 @@ describe("email threading (inbound)", () => {
it("stores empty strings when threading headers are absent", async () => {
// Verify via the first whitelisted email (already created above) which has no In-Reply-To/References
const rows = sqlQuery<Record<string, unknown>>(
- `SELECT * FROM emails WHERE agent_id = '${seed.agentId}' AND is_whitelisted = 1 AND in_reply_to = '' LIMIT 1`,
+ `SELECT * FROM emails WHERE agent_id = ? AND is_whitelisted = ? AND in_reply_to = ? LIMIT 1`, seed.agentId, 1, ''
)
expect(rows.length).toBeGreaterThan(0)
expect(rows[0].in_reply_to).toBe("")
@@ -128,7 +125,7 @@ describe("email folder filtering", () => {
const agentEmail = `${seed.agentEmailHandle}@alook.ai`
const now = new Date().toISOString()
const rejId = `erej_${randomUUID().slice(0, 8)}`
- sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES ('${rejId}', '${seed.agentId}', '${seed.workspaceId}', '[email protected]', '${agentEmail}', 'Untrust folder test', 'emails/fake-rej/raw', 0, 0, '', '', '', '${now}')`)
+ sqlRun(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, rejId, seed.agentId, seed.workspaceId, '[email protected]', agentEmail, 'Untrust folder test', 'emails/fake-rej/raw', 0, 0, '', '', '', now)
const res = await tokenRequest(
`/api/email?workspace_id=${seed.workspaceId}&agentId=${seed.agentId}&folder=untrust`,
@@ -218,7 +215,7 @@ describe("email send (outbound)", () => {
// Create a temporary agent without emailHandle
const tmpAgentId = `ag_tmp_${Date.now()}`
const now = new Date().toISOString()
- sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, owner_id, created_at, updated_at) VALUES ('${tmpAgentId}', '${seed.workspaceId}', 'No Handle Agent', '${seed.runtimeId}', '${seed.userId}', '${now}', '${now}')`)
+ sqlRun(`INSERT INTO agent (id, workspace_id, name, runtime_id, owner_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?)`, tmpAgentId, seed.workspaceId, 'No Handle Agent', seed.runtimeId, seed.userId, now, now)
try {
const res = await tokenRequest(
@@ -237,7 +234,7 @@ describe("email send (outbound)", () => {
)
expect(res.status).toBe(400)
} finally {
- sql(`DELETE FROM agent WHERE id = '${tmpAgentId}'`)
+ sqlRun(`DELETE FROM agent WHERE id = ?`, tmpAgentId)
}
})
@@ -296,11 +293,11 @@ describe("email thread", () => {
// Insert parent email directly
const parentId = `ep_${randomUUID().slice(0, 12)}`
- sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES ('${parentId}', '${seed.agentId}', '${seed.workspaceId}', '[email protected]', '${agentEmail}', 'Thread parent', 'emails/fake/raw', 1, 0, '${parentMsgId}', '', '', '${now}')`)
+ sqlRun(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, parentId, seed.agentId, seed.workspaceId, '[email protected]', agentEmail, 'Thread parent', 'emails/fake/raw', 1, 0, parentMsgId, '', '', now)
// Insert child email that replies to parent
const childId = `ec_${randomUUID().slice(0, 12)}`
- sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", direction, created_at) VALUES ('${childId}', '${seed.agentId}', '${seed.workspaceId}', '${agentEmail}', '[email protected]', 'Re: Thread parent', 'emails/fake2/raw', 0, 0, '${childMsgId}', '${parentMsgId}', '${parentMsgId}', 'outbound', '${now}')`)
+ sqlRun(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", direction, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, childId, seed.agentId, seed.workspaceId, agentEmail, '[email protected]', 'Re: Thread parent', 'emails/fake2/raw', 0, 0, childMsgId, parentMsgId, parentMsgId, 'outbound', now)
const res = await tokenRequest(
`/api/email/${childId}/thread?workspace_id=${seed.workspaceId}`,
@@ -318,7 +315,7 @@ describe("email thread", () => {
const agentEmail = `${seed.agentEmailHandle}@alook.ai`
const now = new Date().toISOString()
- // Build a chain of 5 emails via batch INSERT to verify the chain walk works
+ // Build a chain of 5 emails via individual INSERTs to verify the chain walk works
// (MAX_DEPTH=50 is tested structurally — here we just verify the chain doesn't infinitely loop)
const ids: string[] = []
const mids: string[] = []
@@ -327,12 +324,10 @@ describe("email thread", () => {
mids.push(`<chain-${i}-${randomUUID().slice(0, 8)}@e2e.test>`)
}
- const values = ids.map((eid, i) => {
+ for (let i = 0; i < 5; i++) {
const irt = i > 0 ? mids[i - 1] : ""
- return `('${eid}', '${seed.agentId}', '${seed.workspaceId}', '[email protected]', '${agentEmail}', 'Chain ${i}', 'emails/fake-chain/raw', 1, 0, '${mids[i]}', '${irt}', '', '${now}')`
- }).join(", ")
-
- sql(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES ${values}`)
+ sqlRun(`INSERT INTO emails (id, agent_id, workspace_id, from_email, to_email, subject, r2_key, is_whitelisted, forwarded, message_id, in_reply_to, "references", created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, ids[i], seed.agentId, seed.workspaceId, '[email protected]', agentEmail, `Chain ${i}`, 'emails/fake-chain/raw', 1, 0, mids[i], irt, '', now)
+ }
const res = await tokenRequest(
`/api/email/${ids[4]}/thread?workspace_id=${seed.workspaceId}`,
diff --git a/src/web/src/test/e2e/follow-up-auto-dispatch.test.ts b/src/web/src/test/e2e/follow-up-auto-dispatch.test.ts
new file mode 100644
index 000000000..353e633da
--- /dev/null
+++ b/src/web/src/test/e2e/follow-up-auto-dispatch.test.ts
@@ -0,0 +1,143 @@
+/**
+ * Regression: Follow-up messages auto-dispatch after task completion
+ * Bug pattern: Buffered messages sent during an active task were not automatically
+ * dispatched as a new task when the active task completed.
+ * Refs: #194 (Priority 2)
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlQuery } from "@alook/test-utils"
+
+let seed: TestSeed
+let conversationId: string
+let firstTaskId: string
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ // Create conversation and first task
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const convData = await convRes.json() as { id: string }
+ conversationId = convData.id
+
+ // Send initial message → creates first task
+ const msgRes = await tokenRequest(
+ `/api/conversations/${conversationId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Initial task" }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ firstTaskId = msgData.task!.id
+
+ // Poll + start the task
+ await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ await tokenRequest(`/api/daemon/tasks/${firstTaskId}/start`, seed.machineToken, { method: "POST" })
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("regression: follow-up auto-dispatch on task completion", () => {
+ it("buffered messages are created while task is running", async () => {
+ const buf1Res = await tokenRequest(
+ `/api/conversations/${conversationId}/buffered-messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Follow-up message 1" }),
+ },
+ )
+ expect(buf1Res.status).toBe(201)
+
+ const buf2Res = await tokenRequest(
+ `/api/conversations/${conversationId}/buffered-messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Follow-up message 2" }),
+ },
+ )
+ expect(buf2Res.status).toBe(201)
+
+ // Verify they exist as buffered
+ const listRes = await tokenRequest(
+ `/api/conversations/${conversationId}/buffered-messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ const buffered = await listRes.json() as Array<Record<string, unknown>>
+ expect(buffered.length).toBeGreaterThanOrEqual(2)
+ })
+
+ it("completing first task auto-dispatches a new task with first buffered message", async () => {
+ const completeRes = await tokenRequest(
+ `/api/daemon/tasks/${firstTaskId}/complete`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "First task done", session_id: `sess_${randomUUID().slice(0, 8)}` }),
+ },
+ )
+ expect(completeRes.status).toBe(200)
+
+ // Wait for auto-dispatch
+ await new Promise((r) => setTimeout(r, 1500))
+
+ // There should be a new task created with the buffered content
+ const tasks = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM agent_task_queue WHERE conversation_id = '${conversationId}' AND id != '${firstTaskId}' AND status IN ('queued', 'dispatched') ORDER BY created_at ASC`,
+ )
+ expect(tasks.length).toBeGreaterThanOrEqual(1)
+ expect(tasks[0].prompt).toBe("Follow-up message 1")
+ expect(tasks[0].type).toBe("user_dm_message")
+ })
+
+ it("second buffered message dispatches after the first follow-up completes", async () => {
+ // Find and complete the auto-dispatched task
+ const tasks = sqlQuery<{ id: string; status: string }>(
+ `SELECT id, status FROM agent_task_queue WHERE conversation_id = '${conversationId}' AND prompt = 'Follow-up message 1'`,
+ )
+ expect(tasks).toHaveLength(1)
+ const followUpTaskId = tasks[0].id
+
+ // Poll + start + complete
+ if (tasks[0].status === "queued") {
+ await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ }
+ await tokenRequest(`/api/daemon/tasks/${followUpTaskId}/start`, seed.machineToken, { method: "POST" })
+ await tokenRequest(`/api/daemon/tasks/${followUpTaskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "Follow-up 1 done", session_id: `sess_${randomUUID().slice(0, 8)}` }),
+ })
+
+ // Wait for second follow-up dispatch
+ await new Promise((r) => setTimeout(r, 1500))
+
+ const tasks2 = sqlQuery<Record<string, unknown>>(
+ `SELECT * FROM agent_task_queue WHERE conversation_id = '${conversationId}' AND prompt = 'Follow-up message 2'`,
+ )
+ expect(tasks2.length).toBeGreaterThanOrEqual(1)
+ expect(tasks2[0].type).toBe("user_dm_message")
+ })
+})
diff --git a/src/web/src/test/e2e/inbox.test.ts b/src/web/src/test/e2e/inbox.test.ts
new file mode 100644
index 000000000..434b43657
--- /dev/null
+++ b/src/web/src/test/e2e/inbox.test.ts
@@ -0,0 +1,178 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun } from "@alook/test-utils"
+
+let seed: TestSeed
+let conversationId: string
+let taskId: string
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const convData = await convRes.json() as { id: string }
+ conversationId = convData.id
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${conversationId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Inbox test message" }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ if (msgData.task) {
+ taskId = msgData.task.id
+ }
+
+ // Poll, start, and complete the task so it shows up in inbox
+ await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+
+ // Post an assistant message so the inbox query can find it
+ await tokenRequest(
+ `/api/daemon/tasks/${taskId}/messages`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ messages: [{ seq: 1, type: "text", content: "Task done" }],
+ }),
+ },
+ )
+
+ await tokenRequest(`/api/daemon/tasks/${taskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "done", session_id: "sess_inbox_1" }),
+ })
+})
+
+afterAll(() => {
+ sqlRun(`DELETE FROM conversation_read_state WHERE user_id = ?`, seed.userId)
+ cleanupTestData(seed)
+})
+
+describe("GET /api/inbox/count", () => {
+ it("returns unread count", async () => {
+ const res = await tokenRequest(
+ `/api/inbox/count?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as { count: number }
+ expect(typeof data.count).toBe("number")
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/inbox/count?workspace_id=${seed.workspaceId}`,
+ )
+ expect(res.status).toBe(401)
+ })
+})
+
+describe("GET /api/inbox", () => {
+ it("returns inbox items list", async () => {
+ const res = await tokenRequest(
+ `/api/inbox?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as { items: unknown[]; has_more: boolean }
+ expect(Array.isArray(data.items)).toBe(true)
+ expect(typeof data.has_more).toBe("boolean")
+ })
+
+ it("respects limit parameter", async () => {
+ const res = await tokenRequest(
+ `/api/inbox?workspace_id=${seed.workspaceId}&limit=1`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as { items: unknown[] }
+ expect(data.items.length).toBeLessThanOrEqual(1)
+ })
+
+ it("rejects invalid before timestamp", async () => {
+ const res = await tokenRequest(
+ `/api/inbox?workspace_id=${seed.workspaceId}&before=not-a-date`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(400)
+ })
+})
+
+describe("POST /api/inbox/read", () => {
+ it("marks a conversation as read", async () => {
+ const res = await tokenRequest(
+ `/api/inbox/read?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ conversationId }),
+ },
+ )
+ expect(res.status).toBe(204)
+ })
+
+ it("returns 400 when conversationId is missing", async () => {
+ const res = await tokenRequest(
+ `/api/inbox/read?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({}),
+ },
+ )
+ expect(res.status).toBe(400)
+ })
+
+ it("returns 404 for non-existent conversation", async () => {
+ const res = await tokenRequest(
+ `/api/inbox/read?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ conversationId: "conv_nonexistent_xyz" }),
+ },
+ )
+ expect(res.status).toBe(404)
+ })
+})
+
+describe("POST /api/inbox/read-all", () => {
+ it("marks all conversations as read", async () => {
+ const res = await tokenRequest(
+ `/api/inbox/read-all?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(204)
+ })
+
+ it("rejects unauthenticated request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/inbox/read-all?workspace_id=${seed.workspaceId}`,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(401)
+ })
+})
diff --git a/src/web/src/test/e2e/machine-token.test.ts b/src/web/src/test/e2e/machine-token.test.ts
index 3a6dab696..e618e2d42 100644
--- a/src/web/src/test/e2e/machine-token.test.ts
+++ b/src/web/src/test/e2e/machine-token.test.ts
@@ -1,9 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { sessionRequest, tokenRequest } from "../helpers/auth"
-import { sql, sqlQuery, sqlBatch } from "../helpers/db"
-import { fetchWithRetry } from "../helpers/fetch"
+import { seedTestData, cleanupTestData, type TestSeed, sessionRequest, tokenRequest, sqlRun, sqlQuery, fetchWithRetry } from "@alook/test-utils"
let seed: TestSeed
@@ -91,13 +88,11 @@ describe("machine token activation", () => {
afterAll(() => {
for (const wsId of createdWorkspaceIds) {
try {
- sqlBatch([
- `DELETE FROM agent_runtime WHERE workspace_id = '${wsId}'`,
- `DELETE FROM machine WHERE workspace_id = '${wsId}'`,
- `DELETE FROM machine_token WHERE workspace_id = '${wsId}'`,
- `DELETE FROM member WHERE workspace_id = '${wsId}'`,
- `DELETE FROM workspace WHERE id = '${wsId}'`,
- ])
+ sqlRun(`DELETE FROM agent_runtime WHERE workspace_id = ?`, wsId)
+ sqlRun(`DELETE FROM machine WHERE workspace_id = ?`, wsId)
+ sqlRun(`DELETE FROM machine_token WHERE workspace_id = ?`, wsId)
+ sqlRun(`DELETE FROM member WHERE workspace_id = ?`, wsId)
+ sqlRun(`DELETE FROM workspace WHERE id = ?`, wsId)
} catch { /* ignore */ }
}
})
@@ -107,7 +102,7 @@ describe("machine token activation", () => {
const tokenId = `mt_${randomUUID().replace(/-/g, "").slice(0, 21)}`
const rawToken = `al_${randomUUID().replace(/-/g, "")}`
const now = new Date().toISOString()
- sql(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES ('${tokenId}', '${seed.userId}', NULL, '${rawToken}', 'no-ws-token', 'pending', '${now}')`)
+ sqlRun(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES (?, ?, NULL, ?, ?, ?, ?)`, tokenId, seed.userId, rawToken, 'no-ws-token', 'pending', now)
// Activate
const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
@@ -130,13 +125,13 @@ describe("machine token activation", () => {
// Verify workspace exists in DB and user is owner
const wsRows = sqlQuery<{ id: string; name: string }>(
- `SELECT id, name FROM workspace WHERE id = '${data.workspace_id}'`
+ `SELECT id, name FROM workspace WHERE id = ?`, data.workspace_id
)
expect(wsRows).toHaveLength(1)
expect(wsRows[0]!.name).toBe("Personal")
const memberRows = sqlQuery<{ user_id: string; role: string }>(
- `SELECT user_id, role FROM member WHERE workspace_id = '${data.workspace_id}' AND user_id = '${seed.userId}'`
+ `SELECT user_id, role FROM member WHERE workspace_id = ? AND user_id = ?`, data.workspace_id, seed.userId
)
expect(memberRows).toHaveLength(1)
expect(memberRows[0]!.role).toBe("owner")
@@ -147,11 +142,11 @@ describe("machine token activation", () => {
const tokenId = `mt_${randomUUID().replace(/-/g, "").slice(0, 21)}`
const rawToken = `al_${randomUUID().replace(/-/g, "")}`
const now = new Date().toISOString()
- sql(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES ('${tokenId}', '${seed.userId}', '${seed.workspaceId}', '${rawToken}', 'with-ws-token', 'pending', '${now}')`)
+ sqlRun(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)`, tokenId, seed.userId, seed.workspaceId, rawToken, 'with-ws-token', 'pending', now)
// Count workspaces before
const beforeRows = sqlQuery<{ cnt: number }>(
- `SELECT COUNT(*) as cnt FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id = '${seed.userId}')`
+ `SELECT COUNT(*) as cnt FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id = ?)`, seed.userId
)
const countBefore = beforeRows[0]!.cnt
@@ -174,7 +169,7 @@ describe("machine token activation", () => {
// No new workspace should be created
const afterRows = sqlQuery<{ cnt: number }>(
- `SELECT COUNT(*) as cnt FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id = '${seed.userId}')`
+ `SELECT COUNT(*) as cnt FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id = ?)`, seed.userId
)
expect(afterRows[0]!.cnt).toBe(countBefore)
})
diff --git a/src/web/src/test/e2e/meeting-crud.test.ts b/src/web/src/test/e2e/meeting-crud.test.ts
index 3e1358780..6906d90c3 100644
--- a/src/web/src/test/e2e/meeting-crud.test.ts
+++ b/src/web/src/test/e2e/meeting-crud.test.ts
@@ -1,7 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun } from "@alook/test-utils"
let seed: TestSeed
let seedB: TestSeed
@@ -11,8 +9,8 @@ beforeAll(() => {
seedB = seedTestData()
}, 60_000)
afterAll(() => {
- sql(`DELETE FROM meeting_session WHERE workspace_id = '${seed.workspaceId}'`)
- sql(`DELETE FROM meeting_session WHERE workspace_id = '${seedB.workspaceId}'`)
+ sqlRun(`DELETE FROM meeting_session WHERE workspace_id = ?`, seed.workspaceId)
+ sqlRun(`DELETE FROM meeting_session WHERE workspace_id = ?`, seedB.workspaceId)
cleanupTestData(seed)
cleanupTestData(seedB)
}, 60_000)
@@ -150,7 +148,7 @@ describe("meeting approve flow", () => {
// Directly insert a pending meeting (simulating non-whitelisted ICS)
const now = new Date().toISOString()
pendingId = `ms_e2e_pending_${Date.now()}`
- sql(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at) VALUES ('${pendingId}', '${seed.agentId}', '${seed.workspaceId}', 'Pending Meeting', 'https://meet.google.com/pen-ding-one', 'pending', 0, '[]', '2026-05-03T10:00:00Z', '${now}', '${now}')`)
+ sqlRun(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, pendingId, seed.agentId, seed.workspaceId, 'Pending Meeting', 'https://meet.google.com/pen-ding-one', 'pending', 0, '[]', '2026-05-03T10:00:00Z', now, now)
})
it("POST /approve transitions pending → scheduled", async () => {
diff --git a/src/web/src/test/e2e/meeting-flow.test.ts b/src/web/src/test/e2e/meeting-flow.test.ts
index d2f81f035..401ddce05 100644
--- a/src/web/src/test/e2e/meeting-flow.test.ts
+++ b/src/web/src/test/e2e/meeting-flow.test.ts
@@ -1,8 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sql, sqlQuery } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery } from "@alook/test-utils"
let seed: TestSeed
@@ -10,7 +8,7 @@ beforeAll(() => {
seed = seedTestData()
}, 60_000)
afterAll(() => {
- sql(`DELETE FROM meeting_session WHERE workspace_id = '${seed.workspaceId}'`)
+ sqlRun(`DELETE FROM meeting_session WHERE workspace_id = ?`, seed.workspaceId)
cleanupTestData(seed)
}, 60_000)
@@ -43,8 +41,8 @@ describe("meeting claim via poll", () => {
afterAll(() => {
try {
- sql(`DELETE FROM agent_runtime WHERE daemon_id = '${claimDaemonId}'`)
- sql(`DELETE FROM machine WHERE daemon_id = '${claimDaemonId}'`)
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, claimDaemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, claimDaemonId)
} catch { /* ignore */ }
})
@@ -60,8 +58,8 @@ describe("meeting claim via poll", () => {
it("poll claims a scheduled meeting within 5-minute window", async () => {
const pastTime = new Date(Date.now() - 60_000).toISOString()
- sql(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at)
- VALUES ('ms_claim_test', '${seed.agentId}', '${seed.workspaceId}', 'Claim Test', 'https://meet.google.com/abc-defg-hij', 'scheduled', 1, '[]', '${pastTime}', '${pastTime}', '${pastTime}')`)
+ sqlRun(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 'ms_claim_test', seed.agentId, seed.workspaceId, 'Claim Test', 'https://meet.google.com/abc-defg-hij', 'scheduled', 1, '[]', pastTime, pastTime, pastTime)
const res = await req("/api/daemon/tasks/poll", {
method: "POST",
@@ -88,8 +86,8 @@ describe("meeting claim via poll", () => {
it("does not claim meetings far in the future", async () => {
const futureTime = new Date(Date.now() + 3600_000).toISOString()
- sql(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at)
- VALUES ('ms_future_test', '${seed.agentId}', '${seed.workspaceId}', 'Future Test', 'https://meet.google.com/xyz-wxyz-abc', 'scheduled', 1, '[]', '${futureTime}', '${futureTime}', '${futureTime}')`)
+ sqlRun(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, scheduled_at, created_at, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, 'ms_future_test', seed.agentId, seed.workspaceId, 'Future Test', 'https://meet.google.com/xyz-wxyz-abc', 'scheduled', 1, '[]', futureTime, futureTime, futureTime)
const res = await req("/api/daemon/tasks/poll", {
method: "POST",
@@ -107,8 +105,8 @@ describe("meeting callback flow", () => {
beforeAll(() => {
callbackMeetingId = "ms_callback_test"
const now = new Date().toISOString()
- sql(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, started_at, created_at, updated_at)
- VALUES ('${callbackMeetingId}', '${seed.agentId}', '${seed.workspaceId}', 'Callback Test', 'https://meet.google.com/abc-defg-hij', 'recording', 1, '["[email protected]"]', '${now}', '${now}', '${now}')`)
+ sqlRun(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, started_at, created_at, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, callbackMeetingId, seed.agentId, seed.workspaceId, 'Callback Test', 'https://meet.google.com/abc-defg-hij', 'recording', 1, '["[email protected]"]', now, now, now)
})
it("POST /api/meeting/callback requires auth", async () => {
@@ -161,8 +159,8 @@ describe("meeting callback flow", () => {
it("marks failed meetings", async () => {
const failId = "ms_fail_test"
const now = new Date().toISOString()
- sql(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, created_at, updated_at)
- VALUES ('${failId}', '${seed.agentId}', '${seed.workspaceId}', 'Fail Test', 'https://meet.google.com/abc-defg-hij', 'joining', 1, '[]', '${now}', '${now}')`)
+ sqlRun(`INSERT INTO meeting_session (id, agent_id, workspace_id, title, meeting_url, status, is_whitelisted, participants, created_at, updated_at)
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, failId, seed.agentId, seed.workspaceId, 'Fail Test', 'https://meet.google.com/abc-defg-hij', 'joining', 1, '[]', now, now)
const res = await req("/api/meeting/callback", {
method: "POST",
@@ -205,7 +203,7 @@ describe("email notify with meetingInfo", () => {
expect(res.status).toBe(200)
const rows = sqlQuery<{ status: string; title: string; meeting_url: string }>(
- `SELECT status, title, meeting_url FROM meeting_session WHERE workspace_id = '${seed.workspaceId}' AND title = 'Weekly Standup'`
+ `SELECT status, title, meeting_url FROM meeting_session WHERE workspace_id = ? AND title = ?`, seed.workspaceId, 'Weekly Standup'
)
expect(rows.length).toBe(1)
expect(rows[0].status).toBe("scheduled")
@@ -234,7 +232,7 @@ describe("email notify with meetingInfo", () => {
expect(res.status).toBe(200)
const rows = sqlQuery<{ status: string }>(
- `SELECT status FROM meeting_session WHERE workspace_id = '${seed.workspaceId}' AND title = 'Stranger Meeting'`
+ `SELECT status FROM meeting_session WHERE workspace_id = ? AND title = ?`, seed.workspaceId, 'Stranger Meeting'
)
expect(rows.length).toBe(1)
expect(rows[0].status).toBe("pending")
@@ -242,7 +240,7 @@ describe("email notify with meetingInfo", () => {
it("skips meeting creation when no meetingInfo", async () => {
const countBefore = sqlQuery<{ cnt: number }>(
- `SELECT count(*) as cnt FROM meeting_session WHERE workspace_id = '${seed.workspaceId}'`
+ `SELECT count(*) as cnt FROM meeting_session WHERE workspace_id = ?`, seed.workspaceId
)
const res = await req("/api/email/notify", {
@@ -259,7 +257,7 @@ describe("email notify with meetingInfo", () => {
expect(res.status).toBe(200)
const countAfter = sqlQuery<{ cnt: number }>(
- `SELECT count(*) as cnt FROM meeting_session WHERE workspace_id = '${seed.workspaceId}'`
+ `SELECT count(*) as cnt FROM meeting_session WHERE workspace_id = ?`, seed.workspaceId
)
expect(countAfter[0].cnt).toBe(countBefore[0].cnt)
})
diff --git a/src/web/src/test/e2e/multi-workspace-register.test.ts b/src/web/src/test/e2e/multi-workspace-register.test.ts
new file mode 100644
index 000000000..1b3ad6525
--- /dev/null
+++ b/src/web/src/test/e2e/multi-workspace-register.test.ts
@@ -0,0 +1,161 @@
+/**
+ * Regression: Register daemon across multiple workspaces
+ * Bug pattern: Registering the same daemon_id in workspace B caused workspace A
+ * to go offline, breaking task routing for existing workspace.
+ * Refs: #194 (Priority 1)
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery } from "@alook/test-utils"
+
+let seedA: TestSeed
+let seedB: TestSeed
+const sharedDaemonId = `daemon_multi_${randomUUID().slice(0, 8)}`
+
+beforeAll(() => {
+ seedA = seedTestData()
+ seedB = seedTestData()
+})
+afterAll(() => {
+ // Restore agent runtime_id to seed's original runtime before cleanup
+ // (test may have pointed it to the shared daemon's runtime)
+ sqlRun(`UPDATE agent SET runtime_id = ? WHERE id = ?`, seedA.runtimeId, seedA.agentId)
+ // Clean up tasks referencing the shared daemon's runtime
+ sqlRun(`DELETE FROM agent_task_queue WHERE workspace_id = ?`, seedA.workspaceId)
+ sqlRun(`DELETE FROM agent_task_queue WHERE workspace_id = ?`, seedB.workspaceId)
+ // Clean the shared daemon entries
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, sharedDaemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, sharedDaemonId)
+ cleanupTestData(seedA)
+ cleanupTestData(seedB)
+})
+
+describe("regression: multi-workspace daemon registration", () => {
+ it("register daemon in workspace A → machine is online", async () => {
+ const res = await tokenRequest("/api/daemon/register", seedA.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ workspace_id: seedA.workspaceId,
+ daemon_id: sharedDaemonId,
+ device_name: "multi-ws-device",
+ cli_version: "1.0.0",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ }),
+ })
+ expect(res.status).toBe(200)
+
+ const rows = sqlQuery<{ last_seen_at: string | null }>(
+ `SELECT last_seen_at FROM machine WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedA.workspaceId
+ )
+ expect(rows).toHaveLength(1)
+ expect(rows[0].last_seen_at).toBeTruthy()
+ })
+
+ it("register same daemon in workspace B → workspace A still online", async () => {
+ const res = await tokenRequest("/api/daemon/register", seedB.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({
+ workspace_id: seedB.workspaceId,
+ daemon_id: sharedDaemonId,
+ device_name: "multi-ws-device",
+ cli_version: "1.0.0",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ }),
+ })
+ expect(res.status).toBe(200)
+
+ // Workspace A machine should still be online
+ const rowsA = sqlQuery<{ last_seen_at: string | null }>(
+ `SELECT last_seen_at FROM machine WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedA.workspaceId
+ )
+ expect(rowsA).toHaveLength(1)
+ expect(rowsA[0].last_seen_at).toBeTruthy()
+
+ // Workspace B machine should also be online
+ const rowsB = sqlQuery<{ last_seen_at: string | null }>(
+ `SELECT last_seen_at FROM machine WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedB.workspaceId
+ )
+ expect(rowsB).toHaveLength(1)
+ expect(rowsB[0].last_seen_at).toBeTruthy()
+ })
+
+ it("tasks route correctly to workspace A after workspace B registration", async () => {
+ // Get runtime ID for workspace A
+ const runtimesA = sqlQuery<{ id: string }>(
+ `SELECT id FROM agent_runtime WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedA.workspaceId
+ )
+ expect(runtimesA).toHaveLength(1)
+ const runtimeIdA = runtimesA[0].id
+
+ // Update agent A to use this runtime
+ sqlRun(`UPDATE agent SET runtime_id = ? WHERE id = ?`, runtimeIdA, seedA.agentId)
+
+ // Create a task in workspace A
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seedA.workspaceId}`,
+ seedA.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seedA.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seedA.workspaceId}`,
+ seedA.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Route to workspace A" }),
+ },
+ )
+ expect(msgRes.status).toBe(201)
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ expect(msgData.task).toBeTruthy()
+
+ // Poll from workspace A daemon to claim the task
+ const pollRes = await tokenRequest(`/api/daemon/tasks/poll`, seedA.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: sharedDaemonId, max_tasks: 5 }),
+ })
+ expect(pollRes.status).toBe(200)
+ const pollData = await pollRes.json() as { tasks: Array<Record<string, unknown>> }
+ expect(pollData.tasks.length).toBeGreaterThanOrEqual(1)
+ const claimed = pollData.tasks.find(t => t.id === msgData.task!.id)
+ expect(claimed).toBeTruthy()
+ expect(claimed!.prompt).toBe("Route to workspace A")
+
+ // Cleanup: complete the task
+ await tokenRequest(`/api/daemon/tasks/${msgData.task!.id}/start`, seedA.machineToken, { method: "POST" })
+ await tokenRequest(`/api/daemon/tasks/${msgData.task!.id}/complete`, seedA.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "done", session_id: "sess_multi" }),
+ })
+ })
+
+ it("deregister from workspace B does NOT affect workspace A", async () => {
+ await tokenRequest("/api/daemon/deregister", seedB.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: sharedDaemonId }),
+ })
+
+ // Workspace B offline
+ const rowsB = sqlQuery<{ last_seen_at: string | null }>(
+ `SELECT last_seen_at FROM machine WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedB.workspaceId
+ )
+ expect(rowsB[0]?.last_seen_at).toBeNull()
+
+ // Workspace A still online
+ const rowsA = sqlQuery<{ last_seen_at: string | null }>(
+ `SELECT last_seen_at FROM machine WHERE daemon_id = ? AND workspace_id = ?`, sharedDaemonId, seedA.workspaceId
+ )
+ expect(rowsA[0]?.last_seen_at).toBeTruthy()
+ })
+})
diff --git a/src/web/src/test/e2e/skill-sync.test.ts b/src/web/src/test/e2e/skill-sync.test.ts
index eb4e270fc..78eb36dbd 100644
--- a/src/web/src/test/e2e/skill-sync.test.ts
+++ b/src/web/src/test/e2e/skill-sync.test.ts
@@ -1,13 +1,11 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
-import { sqlQuery, sql } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlQuery, sqlRun } from "@alook/test-utils"
let seed: TestSeed
beforeAll(() => { seed = seedTestData() })
afterAll(() => {
- sql(`DELETE FROM agent_skill WHERE workspace_id = '${seed.workspaceId}'`)
+ sqlRun(`DELETE FROM agent_skill WHERE workspace_id = ?`, seed.workspaceId)
cleanupTestData(seed)
})
@@ -30,7 +28,7 @@ describe("POST /api/daemon/skills/sync", () => {
expect(data.status).toBe("ok")
const rows = sqlQuery<{ name: string; agent_id: string | null }>(
- `SELECT name, agent_id FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND runtime = 'claude' AND agent_id IS NULL ORDER BY name`
+ `SELECT name, agent_id FROM agent_skill WHERE workspace_id = ? AND runtime = ? AND agent_id IS NULL ORDER BY name`, seed.workspaceId, 'claude'
)
expect(rows).toHaveLength(2)
expect(rows[0]!.name).toBe("test-skill-1")
@@ -53,7 +51,7 @@ describe("POST /api/daemon/skills/sync", () => {
expect(res.status).toBe(200)
const rows = sqlQuery<{ name: string; agent_id: string }>(
- `SELECT name, agent_id FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND agent_id = '${seed.agentId}'`
+ `SELECT name, agent_id FROM agent_skill WHERE workspace_id = ? AND agent_id = ?`, seed.workspaceId, seed.agentId
)
expect(rows).toHaveLength(1)
expect(rows[0]!.name).toBe("agent-skill-1")
@@ -75,7 +73,7 @@ describe("POST /api/daemon/skills/sync", () => {
expect(res.status).toBe(200)
const rows = sqlQuery<{ name: string }>(
- `SELECT name FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND runtime = 'claude' AND agent_id IS NULL`
+ `SELECT name FROM agent_skill WHERE workspace_id = ? AND runtime = ? AND agent_id IS NULL`, seed.workspaceId, 'claude'
)
expect(rows).toHaveLength(1)
expect(rows[0]!.name).toBe("updated-skill")
@@ -132,7 +130,7 @@ describe("GET /api/agents/[id]/skills", () => {
})
const rows = sqlQuery<{ name: string }>(
- `SELECT name FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND runtime = 'claude' AND (agent_id IS NULL OR agent_id = '${seed.agentId}') ORDER BY name`
+ `SELECT name FROM agent_skill WHERE workspace_id = ? AND runtime = ? AND (agent_id IS NULL OR agent_id = ?) ORDER BY name`, seed.workspaceId, 'claude', seed.agentId
)
expect(rows.length).toBeGreaterThanOrEqual(2)
const names = rows.map(r => r.name)
diff --git a/src/web/src/test/e2e/task-lifecycle.test.ts b/src/web/src/test/e2e/task-lifecycle.test.ts
index 3a77c4d7c..cb733ba45 100644
--- a/src/web/src/test/e2e/task-lifecycle.test.ts
+++ b/src/web/src/test/e2e/task-lifecycle.test.ts
@@ -1,6 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
let conversationId: string
@@ -101,15 +100,20 @@ describe("task lifecycle", () => {
})
it("GET /api/daemon/tasks/:id/messages returns stored messages", async () => {
- const res = await tokenRequest(
- `/api/daemon/tasks/${taskId}/messages`,
- seed.machineToken,
- )
- expect(res.status).toBe(200)
- const data = await res.json() as Array<Record<string, unknown>>
+ let data: Array<Record<string, unknown>> = []
+ for (let attempt = 0; attempt < 5; attempt++) {
+ const res = await tokenRequest(
+ `/api/daemon/tasks/${taskId}/messages`,
+ seed.machineToken,
+ )
+ expect(res.status).toBe(200)
+ data = await res.json() as Array<Record<string, unknown>>
+ if (data.length >= 2) break
+ await new Promise(r => setTimeout(r, 200))
+ }
expect(data.length).toBeGreaterThanOrEqual(2)
expect(data.some(m => m.content === "Running tests...")).toBe(true)
- expect(data.some(m => m.tool === "bash")).toBe(true)
+ expect(data.some(m => m.type === "tool")).toBe(true)
})
it("POST /api/daemon/tasks/:id/complete marks task complete", async () => {
@@ -453,3 +457,133 @@ describe("task failure and retry", () => {
expect(data.error).toBe("only failed tasks can be retried")
})
})
+
+describe("task progress reporting", () => {
+ let progressTaskId: string
+
+ beforeAll(async () => {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Progress test" }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ if (msgData.task) {
+ progressTaskId = msgData.task.id
+ }
+
+ await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ await tokenRequest(`/api/daemon/tasks/${progressTaskId}/start`, seed.machineToken, { method: "POST" })
+ })
+
+ it("POST /api/daemon/tasks/:id/progress returns ok", async () => {
+ const res = await tokenRequest(
+ `/api/daemon/tasks/${progressTaskId}/progress`,
+ seed.machineToken,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as { status: string }
+ expect(data.status).toBe("ok")
+ })
+
+ it("rejects unauthenticated progress request", async () => {
+ const res = await fetch(
+ `${process.env.APP_URL || "http://localhost:3000"}/api/daemon/tasks/${progressTaskId}/progress`,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(401)
+ })
+
+ it("cleanup: complete progress task", async () => {
+ await tokenRequest(`/api/daemon/tasks/${progressTaskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "done", session_id: "sess_progress" }),
+ })
+ })
+})
+
+describe("task supersede", () => {
+ let supersedeTaskId: string
+
+ beforeAll(async () => {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: "Supersede test" }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ if (msgData.task) {
+ supersedeTaskId = msgData.task.id
+ }
+
+ // Keep polling until our specific task is dispatched
+ for (let attempt = 0; attempt < 5; attempt++) {
+ const pollRes = await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 10 }),
+ })
+ const pollData = await pollRes.json() as { tasks: Array<{ id: string }> }
+ if (pollData.tasks.some(t => t.id === supersedeTaskId)) break
+ await new Promise(r => setTimeout(r, 200))
+ }
+ await tokenRequest(`/api/daemon/tasks/${supersedeTaskId}/start`, seed.machineToken, { method: "POST" })
+ })
+
+ it("POST /api/daemon/tasks/:id/supersede marks task as superseded", async () => {
+ const res = await tokenRequest(
+ `/api/daemon/tasks/${supersedeTaskId}/supersede`,
+ seed.machineToken,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(200)
+ const data = await res.json() as Record<string, unknown>
+ expect(data.status).toBe("superseded")
+ expect(data.id).toBe(supersedeTaskId)
+ })
+
+ it("superseding an already superseded task returns 400", async () => {
+ const res = await tokenRequest(
+ `/api/daemon/tasks/${supersedeTaskId}/supersede`,
+ seed.machineToken,
+ { method: "POST" },
+ )
+ expect(res.status).toBe(400)
+ })
+})
diff --git a/src/web/src/test/e2e/task-state-transitions.test.ts b/src/web/src/test/e2e/task-state-transitions.test.ts
new file mode 100644
index 000000000..412105982
--- /dev/null
+++ b/src/web/src/test/e2e/task-state-transitions.test.ts
@@ -0,0 +1,250 @@
+/**
+ * Regression: Task state transition validation
+ * Bug pattern: Invalid state transitions (e.g., failing a queued task, completing
+ * an already-completed task, starting a completed task) were not properly rejected.
+ * Refs: #194 (Priority 3)
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest, sqlRun, sqlQuery } from "@alook/test-utils"
+
+describe("regression: invalid task state transitions return 400", () => {
+ let seed: TestSeed
+
+ beforeAll(() => {
+ seed = seedTestData()
+ })
+ afterAll(() => cleanupTestData(seed))
+
+ async function createAndEnqueueTask(): Promise<string> {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: `State test ${randomUUID().slice(0, 8)}` }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ return msgData.task!.id
+ }
+
+ async function getTaskToRunning(): Promise<string> {
+ const taskId = await createAndEnqueueTask()
+ // Poll to dispatch
+ await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 10 }),
+ })
+ // Start
+ await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+ return taskId
+ }
+
+ async function getTaskToCompleted(): Promise<string> {
+ const taskId = await getTaskToRunning()
+ await tokenRequest(`/api/daemon/tasks/${taskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "done", session_id: `sess_${randomUUID().slice(0, 8)}` }),
+ })
+ return taskId
+ }
+
+ async function getTaskToFailed(): Promise<string> {
+ const taskId = await getTaskToRunning()
+ await tokenRequest(`/api/daemon/tasks/${taskId}/fail`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ error: "intentional" }),
+ })
+ return taskId
+ }
+
+ it("cannot fail a queued task (must be running first)", async () => {
+ const taskId = await createAndEnqueueTask()
+ // Force queued status in case push dispatched it
+ sqlRun(`UPDATE agent_task_queue SET status = ? WHERE id = ?`, 'queued', taskId)
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/fail`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ error: "should not work" }),
+ })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot complete a queued task", async () => {
+ const taskId = await createAndEnqueueTask()
+ sqlRun(`UPDATE agent_task_queue SET status = ? WHERE id = ?`, 'queued', taskId)
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "nope", session_id: "sess_x" }),
+ })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot complete an already-completed task", async () => {
+ const taskId = await getTaskToCompleted()
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "again", session_id: "sess_y" }),
+ })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot start a completed task", async () => {
+ const taskId = await getTaskToCompleted()
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot start a failed task", async () => {
+ const taskId = await getTaskToFailed()
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot fail an already-failed task", async () => {
+ const taskId = await getTaskToFailed()
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/fail`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ error: "double fail" }),
+ })
+ expect(res.status).toBe(400)
+ })
+
+ it("cannot fail an already-completed task", async () => {
+ const taskId = await getTaskToCompleted()
+
+ const res = await tokenRequest(`/api/daemon/tasks/${taskId}/fail`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ error: "too late" }),
+ })
+ expect(res.status).toBe(400)
+ })
+})
+
+describe("regression: valid task state transitions succeed", () => {
+ let seed: TestSeed
+
+ beforeAll(() => {
+ seed = seedTestData()
+ })
+ afterAll(() => cleanupTestData(seed))
+
+ it("dispatched → start → complete", async () => {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: `Valid start-complete ${randomUUID().slice(0, 8)}` }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ const taskId = msgData.task!.id
+
+ // Poll to claim
+ const pollRes = await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ expect(pollRes.status).toBe(200)
+ const pollData = await pollRes.json() as { tasks: Array<{ id: string; status: string }> }
+ expect(pollData.tasks).toHaveLength(1)
+ expect(pollData.tasks[0].id).toBe(taskId)
+ expect(pollData.tasks[0].status).toBe("dispatched")
+
+ const startRes = await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+ expect(startRes.status).toBe(200)
+
+ const completeRes = await tokenRequest(`/api/daemon/tasks/${taskId}/complete`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ output: "success", session_id: `sess_${randomUUID().slice(0, 8)}` }),
+ })
+ expect(completeRes.status).toBe(200)
+ })
+
+ it("dispatched → start → fail", async () => {
+ const convRes = await tokenRequest(
+ `/api/conversations?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ agent_id: seed.agentId }),
+ },
+ )
+ const { id: convId } = await convRes.json() as { id: string }
+
+ const msgRes = await tokenRequest(
+ `/api/conversations/${convId}/messages?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ content: `Valid start-fail ${randomUUID().slice(0, 8)}` }),
+ },
+ )
+ const msgData = await msgRes.json() as { task?: { id: string } | null }
+ const taskId = msgData.task!.id
+
+ // Poll to claim
+ const pollRes = await tokenRequest(`/api/daemon/tasks/poll`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ daemon_id: seed.daemonId, max_tasks: 1 }),
+ })
+ expect(pollRes.status).toBe(200)
+ const pollData = await pollRes.json() as { tasks: Array<{ id: string }> }
+ expect(pollData.tasks).toHaveLength(1)
+ expect(pollData.tasks[0].id).toBe(taskId)
+
+ const startRes = await tokenRequest(`/api/daemon/tasks/${taskId}/start`, seed.machineToken, { method: "POST" })
+ expect(startRes.status).toBe(200)
+
+ const failRes = await tokenRequest(`/api/daemon/tasks/${taskId}/fail`, seed.machineToken, {
+ method: "POST",
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify({ error: "expected failure" }),
+ })
+ expect(failRes.status).toBe(200)
+ })
+})
diff --git a/src/web/src/test/e2e/whitelist-bypass.test.ts b/src/web/src/test/e2e/whitelist-bypass.test.ts
index 456540ce0..ee23c4f9a 100644
--- a/src/web/src/test/e2e/whitelist-bypass.test.ts
+++ b/src/web/src/test/e2e/whitelist-bypass.test.ts
@@ -1,7 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { sql, sqlQuery } from "../helpers/db"
-import { postEmail } from "../helpers/email"
+import { seedTestData, cleanupTestData, type TestSeed, sqlRun, sqlQuery, postEmail } from "@alook/test-utils"
import { randomUUID } from "crypto"
let seed: TestSeed
@@ -29,7 +27,7 @@ describe("whitelist bypass for same-workspace agents", () => {
const start = Date.now()
while (Date.now() - start < maxMs) {
const rows = sqlQuery<Record<string, unknown>>(
- `SELECT * FROM emails WHERE agent_id = '${agentId}' AND from_email = '${fromEmail}' ORDER BY created_at DESC LIMIT 1`,
+ `SELECT * FROM emails WHERE agent_id = ? AND from_email = ? ORDER BY created_at DESC LIMIT 1`, agentId, fromEmail
)
if (rows.length > 0) return rows[0]
await new Promise((r) => setTimeout(r, 300))
@@ -41,7 +39,7 @@ describe("whitelist bypass for same-workspace agents", () => {
const siblingAgentId = `ag_${nanoid()}`
const siblingHandle = `e2e-sib-${nanoid()}`
const now = new Date().toISOString()
- sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES ('${siblingAgentId}', '${seed.workspaceId}', 'Sibling Agent', '${seed.runtimeId}', '${siblingHandle}', '${seed.userId}', '${now}', '${now}')`)
+ sqlRun(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, siblingAgentId, seed.workspaceId, 'Sibling Agent', seed.runtimeId, siblingHandle, seed.userId, now, now)
try {
const from = `${siblingHandle}@alook.ai`
@@ -54,7 +52,7 @@ describe("whitelist bypass for same-workspace agents", () => {
expect(row).not.toBeNull()
expect(row!.is_whitelisted).toBe(1)
} finally {
- sql(`DELETE FROM agent WHERE id = '${siblingAgentId}' AND workspace_id = '${seed.workspaceId}'`)
+ sqlRun(`DELETE FROM agent WHERE id = ? AND workspace_id = ?`, siblingAgentId, seed.workspaceId)
}
})
@@ -120,8 +118,8 @@ describe("whitelist bypass for same-workspace agents", () => {
const siblingHandle = `e2e-both-${nanoid()}`
const now = new Date().toISOString()
const wlId = `wl_${nanoid()}`
- sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES ('${siblingAgentId}', '${seed.workspaceId}', 'Both Agent', '${seed.runtimeId}', '${siblingHandle}', '${seed.userId}', '${now}', '${now}')`)
- sql(`INSERT INTO agent_whitelist (id, agent_id, workspace_id, email, created_at) VALUES ('${wlId}', '${seed.agentId}', '${seed.workspaceId}', '${siblingHandle}@alook.ai', '${now}')`)
+ sqlRun(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, siblingAgentId, seed.workspaceId, 'Both Agent', seed.runtimeId, siblingHandle, seed.userId, now, now)
+ sqlRun(`INSERT INTO agent_whitelist (id, agent_id, workspace_id, email, created_at) VALUES (?, ?, ?, ?, ?)`, wlId, seed.agentId, seed.workspaceId, `${siblingHandle}@alook.ai`, now)
try {
const from = `${siblingHandle}@alook.ai`
@@ -134,8 +132,8 @@ describe("whitelist bypass for same-workspace agents", () => {
expect(row).not.toBeNull()
expect(row!.is_whitelisted).toBe(1)
} finally {
- sql(`DELETE FROM agent_whitelist WHERE id = '${wlId}'`)
- sql(`DELETE FROM agent WHERE id = '${siblingAgentId}' AND workspace_id = '${seed.workspaceId}'`)
+ sqlRun(`DELETE FROM agent_whitelist WHERE id = ?`, wlId)
+ sqlRun(`DELETE FROM agent WHERE id = ? AND workspace_id = ?`, siblingAgentId, seed.workspaceId)
}
})
})
diff --git a/src/web/src/test/e2e/whitelist-crud.test.ts b/src/web/src/test/e2e/whitelist-crud.test.ts
index 73c805078..2145dcc38 100644
--- a/src/web/src/test/e2e/whitelist-crud.test.ts
+++ b/src/web/src/test/e2e/whitelist-crud.test.ts
@@ -1,6 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
let seedB: TestSeed
diff --git a/src/web/src/test/e2e/workspace-invites.test.ts b/src/web/src/test/e2e/workspace-invites.test.ts
index eb563da99..b6320dd02 100644
--- a/src/web/src/test/e2e/workspace-invites.test.ts
+++ b/src/web/src/test/e2e/workspace-invites.test.ts
@@ -1,8 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { seedTestData, cleanupTestData, type TestSeed } from "../helpers/seed"
-import { signUp, signIn, sessionRequest, tokenRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { seedTestData, cleanupTestData, type TestSeed, signUp, signIn, sessionRequest, tokenRequest, sqlRun } from "@alook/test-utils"
let seed: TestSeed
@@ -19,10 +17,10 @@ beforeAll(async () => {
afterAll(() => {
cleanupTestData(seed)
try {
- sql(`DELETE FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)
- sql(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)
- sql(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = '${inviteeEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${inviteeEmail}'`)
+ sqlRun(`DELETE FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = ?)`, inviteeEmail)
+ sqlRun(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, inviteeEmail)
+ sqlRun(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, inviteeEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, inviteeEmail)
} catch { /* ignore */ }
}, 60_000)
diff --git a/src/web/src/test/e2e/workspace-members.test.ts b/src/web/src/test/e2e/workspace-members.test.ts
index bb212f451..2401c9bca 100644
--- a/src/web/src/test/e2e/workspace-members.test.ts
+++ b/src/web/src/test/e2e/workspace-members.test.ts
@@ -1,9 +1,5 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
-import {
- seedTestData, cleanupTestData, type TestSeed,
- seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser,
-} from "../helpers/seed"
-import { tokenRequest } from "../helpers/auth"
+import { seedTestData, cleanupTestData, type TestSeed, seedSecondaryUser, cleanupSecondaryUser, type SecondaryUser, tokenRequest } from "@alook/test-utils"
let seed: TestSeed
let secondary: SecondaryUser
diff --git a/src/web/src/test/e2e/workspace.test.ts b/src/web/src/test/e2e/workspace.test.ts
index 7efdf8824..291115a39 100644
--- a/src/web/src/test/e2e/workspace.test.ts
+++ b/src/web/src/test/e2e/workspace.test.ts
@@ -1,7 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { signUp, signIn, sessionRequest } from "../helpers/auth"
-import { sql, sqlQuery, sqlBatch } from "../helpers/db"
+import { signUp, signIn, sessionRequest, sqlRun, sqlQuery } from "@alook/test-utils"
const testEmail = `e2e_ws_${randomUUID().slice(0, 8)}@test.local`
const testPassword = "TestPassword123!"
@@ -14,11 +13,11 @@ beforeAll(async () => {
afterAll(() => {
try {
- sql(`DELETE FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = '${testEmail}'))`)
- sql(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${testEmail}'`)
+ sqlRun(`DELETE FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM workspace WHERE id IN (SELECT workspace_id FROM member WHERE user_id IN (SELECT id FROM "user" WHERE email = ?))`, testEmail)
+ sqlRun(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, testEmail)
} catch { /* ignore */ }
})
@@ -115,7 +114,7 @@ describe("workspace isolation", () => {
const tokenId = `mt_iso_${randomUUID().replace(/-/g, "").slice(0, 16)}`
const rawToken = `al_${randomUUID().replace(/-/g, "")}`
const now = new Date().toISOString()
- sql(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES ('${tokenId}', (SELECT id FROM "user" WHERE email = '${testEmail}'), '${workspaceIdA}', '${rawToken}', 'iso-token', 'active', '${now}')`)
+ sqlRun(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES (?, (SELECT id FROM "user" WHERE email = ?), ?, ?, ?, ?, ?)`, tokenId, testEmail, workspaceIdA, rawToken, 'iso-token', 'active', now)
// Register daemon to workspace A
const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
@@ -140,32 +139,30 @@ describe("workspace isolation", () => {
// Workspace A should have the runtime
const runtimesA = sqlQuery<{ id: string }>(
- `SELECT id FROM agent_runtime WHERE workspace_id = '${workspaceIdA}' AND daemon_id = '${daemonId}'`
+ `SELECT id FROM agent_runtime WHERE workspace_id = ? AND daemon_id = ?`, workspaceIdA, daemonId
)
expect(runtimesA.length).toBeGreaterThan(0)
// Workspace B should have NO runtimes
const runtimesB = sqlQuery<{ id: string }>(
- `SELECT id FROM agent_runtime WHERE workspace_id = '${workspaceIdB}' AND daemon_id = '${daemonId}'`
+ `SELECT id FROM agent_runtime WHERE workspace_id = ? AND daemon_id = ?`, workspaceIdB, daemonId
)
expect(runtimesB).toHaveLength(0)
// Workspace B should have NO machine entry for this daemon
const machinesB = sqlQuery<{ daemon_id: string }>(
- `SELECT daemon_id FROM machine WHERE workspace_id = '${workspaceIdB}' AND daemon_id = '${daemonId}'`
+ `SELECT daemon_id FROM machine WHERE workspace_id = ? AND daemon_id = ?`, workspaceIdB, daemonId
)
expect(machinesB).toHaveLength(0)
})
afterAll(() => {
try {
- sqlBatch([
- `DELETE FROM agent_runtime WHERE daemon_id = '${daemonId}'`,
- `DELETE FROM machine WHERE daemon_id = '${daemonId}'`,
- `DELETE FROM machine_token WHERE workspace_id IN ('${workspaceIdA}', '${workspaceIdB}')`,
- `DELETE FROM member WHERE workspace_id IN ('${workspaceIdA}', '${workspaceIdB}')`,
- `DELETE FROM workspace WHERE id IN ('${workspaceIdA}', '${workspaceIdB}')`,
- ])
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId)
+ sqlRun(`DELETE FROM machine_token WHERE workspace_id IN (?, ?)`, workspaceIdA, workspaceIdB)
+ sqlRun(`DELETE FROM member WHERE workspace_id IN (?, ?)`, workspaceIdA, workspaceIdB)
+ sqlRun(`DELETE FROM workspace WHERE id IN (?, ?)`, workspaceIdA, workspaceIdB)
} catch { /* ignore */ }
})
})
diff --git a/src/web/src/test/e2e/ws-broadcast-on-task-event.test.ts b/src/web/src/test/e2e/ws-broadcast-on-task-event.test.ts
new file mode 100644
index 000000000..b2c636a12
--- /dev/null
+++ b/src/web/src/test/e2e/ws-broadcast-on-task-event.test.ts
@@ -0,0 +1,183 @@
+/**
+ * Regression: WS broadcast on task lifecycle events
+ * Bug pattern: Task completion did not reliably broadcast to all connected WS clients.
+ * Multiple clients connected for the same user should all receive the event.
+ * Refs: #194 (Priority 5)
+ *
+ * NOTE: These tests are conditional on WS-DO being available at :8789.
+ * If WS-DO is not running, tests skip gracefully.
+ */
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import { seedTestData, cleanupTestData, type TestSeed, tokenRequest } from "@alook/test-utils"
+
+const WS_DO_PORT = Number(process.env.NEXT_PUBLIC_WS_DO_PORT) || 8789
+const WS_DO_HTTP = `http://localhost:${WS_DO_PORT}`
+const WS_DO_WS = `ws://localhost:${WS_DO_PORT}`
+
+let seed: TestSeed
+let wsAvailable = false
+
+async function checkWsAvailable(): Promise<boolean> {
+ try {
+ const res = await fetch(WS_DO_HTTP, { method: "GET" })
+ return res.status < 500
+ } catch {
+ return false
+ }
+}
+
+function openWs(userId: string): Promise<WebSocket> {
+ return new Promise((resolve, reject) => {
+ const ws = new WebSocket(`${WS_DO_WS}/?userId=${userId}`)
+ const timer = setTimeout(() => reject(new Error("ws open timeout")), 5000)
+ ws.addEventListener("open", () => { clearTimeout(timer); resolve(ws) }, { once: true })
+ ws.addEventListener("error", () => { clearTimeout(timer); reject(new Error("ws connect error")) }, { once: true })
+ })
+}
+
+function waitForWsMessage<T = unknown>(
+ ws: WebSocket,
+ predicate: (msg: T) => boolean,
+ timeoutMs = 5000,
+): Promise<T> {
+ return new Promise((resolve, reject) => {
+ const timer = setTimeout(() => {
+ ws.removeEventListener("message", handler)
+ reject(new Error(`waitForWsMessage timed out after ${timeoutMs}ms`))
+ }, timeoutMs)
+ const handler = (e: MessageEvent) => {
+ try {
+ const msg = JSON.parse(e.data as string) as T
+ if (predicate(msg)) {
+ clearTimeout(timer)
+ ws.removeEventListener("message", handler)
+ resolve(msg)
+ }
+ } catch { /* ignore non-JSON */ }
+ }
+ ws.addEventListener("message", handler)
+ })
+}
+
+beforeAll(async () => {
+ seed = seedTestData()
+ wsAvailable = await checkWsAvailable()
+ if (!wsAvailable) {
+ console.log("WS-DO not available at :8789 — WS broadcast tests will be skipped")
+ }
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("regression: WS broadcast on task events (conditional)", () => {
+ it("task completion triggers WS broadcast with correct event type", async () => {
+ if (!wsAvailable) return
+
+ const ws = await openWs(seed.userId)
+
+ // Authenticate
+ const tokenRes = await tokenRequest(
+ `/api/ws/token?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ if (tokenRes.status !== 200) {
+ ws.close()
+ return
+ }
+ const { token } = await tokenRes.json() as { token: string; userId: string }
+ ws.send(JSON.stringify({ type: "auth", token }))
+ await waitForWsMessage<{ type: string }>(ws, (m) => m.type === "auth.ok")
+
+ // Broadcast a task.completed event
+ const eventPayload = {
+ type: "task.completed",
+ taskId: `task_${randomUUID().slice(0, 8)}`,
+ conversationId: `conv_${randomUUID().slice(0, 8)}`,
+ }
+ const broadcastRes = await fetch(`${WS_DO_HTTP}/broadcast/user/${seed.userId}`, {
+ method: "POST",
+ body: JSON.stringify(eventPayload),
+ })
+ expect(broadcastRes.status).toBe(200)
+
+ const received = await waitForWsMessage<typeof eventPayload>(ws, (m) => m.type === "task.completed")
+ expect(received.type).toBe("task.completed")
+ expect(received.taskId).toBe(eventPayload.taskId)
+ expect(received.conversationId).toBe(eventPayload.conversationId)
+
+ ws.close()
+ })
+
+ it("multiple clients for same user all receive the broadcast", async () => {
+ if (!wsAvailable) return
+
+ const ws1 = await openWs(seed.userId)
+ const ws2 = await openWs(seed.userId)
+
+ // Authenticate both
+ const tokenRes = await tokenRequest(
+ `/api/ws/token?workspace_id=${seed.workspaceId}`,
+ seed.machineToken,
+ )
+ if (tokenRes.status !== 200) {
+ ws1.close()
+ ws2.close()
+ return
+ }
+ const { token } = await tokenRes.json() as { token: string }
+ ws1.send(JSON.stringify({ type: "auth", token }))
+ ws2.send(JSON.stringify({ type: "auth", token }))
+
+ await Promise.all([
+ waitForWsMessage<{ type: string }>(ws1, (m) => m.type === "auth.ok"),
+ waitForWsMessage<{ type: string }>(ws2, (m) => m.type === "auth.ok"),
+ ])
+
+ // Broadcast
+ const eventPayload = {
+ type: "conversation.message",
+ conversationId: `conv_${randomUUID().slice(0, 8)}`,
+ message: { id: `msg_${randomUUID().slice(0, 8)}`, content: "Hello both" },
+ }
+ await fetch(`${WS_DO_HTTP}/broadcast/user/${seed.userId}`, {
+ method: "POST",
+ body: JSON.stringify(eventPayload),
+ })
+
+ // Both should receive
+ const [recv1, recv2] = await Promise.all([
+ waitForWsMessage<typeof eventPayload>(ws1, (m) => m.type === "conversation.message"),
+ waitForWsMessage<typeof eventPayload>(ws2, (m) => m.type === "conversation.message"),
+ ])
+
+ expect(recv1.conversationId).toBe(eventPayload.conversationId)
+ expect(recv2.conversationId).toBe(eventPayload.conversationId)
+
+ ws1.close()
+ ws2.close()
+ })
+
+ it("broadcast to non-existent user returns 200 with sent=0", async () => {
+ if (!wsAvailable) return
+
+ const fakeUserId = `u_nonexistent_${randomUUID().slice(0, 8)}`
+ const res = await fetch(`${WS_DO_HTTP}/broadcast/user/${fakeUserId}`, {
+ method: "POST",
+ body: JSON.stringify({ type: "test.ping" }),
+ })
+ expect(res.status).toBe(200)
+ const data = await res.json() as { sent: number }
+ expect(data.sent).toBe(0)
+ })
+
+ it("daemon broadcast endpoint delivers to daemon WS clients", async () => {
+ if (!wsAvailable) return
+
+ // Test daemon broadcast endpoint exists and responds
+ const res = await fetch(`${WS_DO_HTTP}/broadcast/daemon/${seed.daemonId}`, {
+ method: "POST",
+ body: JSON.stringify({ type: "daemon.tasks", tasks: [] }),
+ })
+ expect(res.status).toBe(200)
+ })
+})
diff --git a/src/web/src/test/e2e/ws.test.ts b/src/web/src/test/e2e/ws.test.ts
index 9f688a028..511ab4ec8 100644
--- a/src/web/src/test/e2e/ws.test.ts
+++ b/src/web/src/test/e2e/ws.test.ts
@@ -1,7 +1,6 @@
import { describe, it, expect, beforeAll, afterAll } from "vitest"
import { randomUUID } from "crypto"
-import { signUp, signIn, sessionRequest } from "../helpers/auth"
-import { sql } from "../helpers/db"
+import { signUp, signIn, sessionRequest, sqlRun } from "@alook/test-utils"
const WS_DO_PORT = Number(process.env.NEXT_PUBLIC_WS_DO_PORT) || 8789
const WS_DO_HTTP = `http://localhost:${WS_DO_PORT}`
@@ -89,9 +88,9 @@ describe("ws (dev direct to ws-do)", () => {
afterAll(() => {
try {
- sql(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = '${testEmail}')`)
- sql(`DELETE FROM "user" WHERE email = '${testEmail}'`)
+ sqlRun(`DELETE FROM "session" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "account" WHERE userId IN (SELECT id FROM "user" WHERE email = ?)`, testEmail)
+ sqlRun(`DELETE FROM "user" WHERE email = ?`, testEmail)
} catch { /* ignore */ }
})
diff --git a/src/web/src/test/helpers/db.ts b/src/web/src/test/helpers/db.ts
deleted file mode 100644
index 00d7c4cfc..000000000
--- a/src/web/src/test/helpers/db.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { execSync } from "child_process"
-import { resolve } from "path"
-import { writeFileSync, unlinkSync } from "fs"
-import { tmpdir } from "os"
-import { join } from "path"
-import { randomUUID } from "crypto"
-
-const WEB_DIR = resolve(import.meta.dirname, "../../..")
-const MAX_RETRIES = 3
-const RETRY_DELAY_MS = 500
-
-function execWithRetry(cmd: string): string {
- for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
- try {
- return execSync(cmd, { cwd: WEB_DIR, stdio: "pipe" }).toString()
- } catch (e) {
- const msg = (e as Error).message || ""
- if (attempt < MAX_RETRIES && msg.includes("SQLITE_BUSY")) {
- execSync(`sleep ${RETRY_DELAY_MS / 1000}`)
- continue
- }
- throw e
- }
- }
- throw new Error("unreachable")
-}
-
-/**
- * Execute a SQL command against the local D1 database via wrangler.
- */
-export function sql(query: string): string {
- const escaped = query.replace(/"/g, '\\"')
- return execWithRetry(
- `npx wrangler d1 execute alook-app --local --command "${escaped}"`,
- )
-}
-
-/**
- * Execute SQL and parse the JSON result.
- */
-export function sqlQuery<T = Record<string, unknown>>(query: string): T[] {
- const escaped = query.replace(/"/g, '\\"')
- const raw = execWithRetry(
- `npx wrangler d1 execute alook-app --local --json --command "${escaped}"`,
- )
- const parsed = JSON.parse(raw)
- return parsed[0]?.results ?? []
-}
-
-/**
- * Execute multiple SQL statements in a single wrangler invocation via --file.
- */
-export function sqlBatch(queries: string[]): void {
- const file = join(tmpdir(), `e2e-batch-${randomUUID()}.sql`)
- try {
- writeFileSync(file, queries.join(";\n") + ";")
- execWithRetry(`npx wrangler d1 execute alook-app --local --file "${file}"`)
- } finally {
- try { unlinkSync(file) } catch {}
- }
-}
diff --git a/src/web/src/test/helpers/seed.ts b/src/web/src/test/helpers/seed.ts
deleted file mode 100644
index cf3e3022a..000000000
--- a/src/web/src/test/helpers/seed.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { randomUUID } from "crypto"
-import { sql, sqlBatch } from "./db"
-
-export interface TestSeed {
- userId: string
- workspaceId: string
- memberId: string
- runtimeId: string
- daemonId: string
- agentId: string
- agentEmailHandle: string
- /** Raw machine token (starts with al_) */
- machineToken: string
- machineTokenId: string
- whitelistId: string
-}
-
-function nanoid() {
- return randomUUID().replace(/-/g, "").slice(0, 21)
-}
-
-/**
- * Seed a full test environment: user, workspace, member, runtime, agent, machine token.
- * All IDs are unique per call.
- */
-export function seedTestData(): TestSeed {
- const userId = `u_${nanoid()}`
- const workspaceId = `sp_${nanoid()}`
- const memberId = `mb_${nanoid()}`
- const runtimeId = `rt_${nanoid()}`
- const agentId = `ag_${nanoid()}`
- const daemonId = `daemon_${nanoid()}`
- const machineTokenId = `mt_${nanoid()}`
- const rawToken = `al_${randomUUID().replace(/-/g, "")}`
- const emailHandle = `e2e-${nanoid()}`
- const whitelistId = `wl_${nanoid()}`
-
- const now = new Date().toISOString()
- const slug = `test-${nanoid()}`
-
- sql(`INSERT INTO "user" (id, name, email, emailVerified, createdAt, updatedAt) VALUES ('${userId}', 'Test User', '${userId}@test.local', 1, '${now}', '${now}')`)
- sql(`INSERT INTO workspace (id, name, slug, created_at, updated_at) VALUES ('${workspaceId}', 'Test Workspace', '${slug}', '${now}', '${now}')`)
- sql(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES ('${memberId}', '${workspaceId}', '${userId}', 'owner', '${now}')`)
- sql(`INSERT INTO machine (daemon_id, workspace_id, device_info, last_seen_at, created_at, updated_at) VALUES ('${daemonId}', '${workspaceId}', 'test-device', '${now}', '${now}', '${now}')`)
- sql(`INSERT INTO agent_runtime (id, workspace_id, daemon_id, runtime_mode, provider, status, device_info, created_at, updated_at) VALUES ('${runtimeId}', '${workspaceId}', '${daemonId}', 'local', 'claude', 'online', 'test-device', '${now}', '${now}')`)
- sql(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES ('${agentId}', '${workspaceId}', 'Test Agent', '${runtimeId}', '${emailHandle}', '${userId}', '${now}', '${now}')`)
- sql(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES ('${machineTokenId}', '${userId}', '${workspaceId}', '${rawToken}', 'test-token', 'active', '${now}')`)
- sql(`INSERT INTO agent_whitelist (id, agent_id, workspace_id, email, created_at) VALUES ('${whitelistId}', '${agentId}', '${workspaceId}', '${userId}@test.local', '${now}')`)
-
- return { userId, workspaceId, memberId, runtimeId, daemonId, agentId, agentEmailHandle: emailHandle, machineToken: rawToken, machineTokenId, whitelistId }
-}
-
-/**
- * Clean up all test data created by seedTestData.
- */
-export function cleanupTestData(seed: TestSeed) {
- const ws = seed.workspaceId
- sqlBatch([
- `DELETE FROM task_message WHERE task_id IN (SELECT id FROM agent_task_queue WHERE workspace_id = '${ws}')`,
- `DELETE FROM agent_task_queue WHERE workspace_id = '${ws}'`,
- `DELETE FROM message WHERE conversation_id IN (SELECT id FROM conversation WHERE workspace_id = '${ws}')`,
- `DELETE FROM conversation WHERE workspace_id = '${ws}'`,
- `DELETE FROM meeting_session WHERE workspace_id = '${ws}'`,
- `DELETE FROM emails WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = '${ws}')`,
- `DELETE FROM agent_skill WHERE workspace_id = '${ws}'`,
- `DELETE FROM agent_whitelist WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = '${ws}')`,
- `DELETE FROM agent_access WHERE workspace_id = '${ws}'`,
- `DELETE FROM agent_pin WHERE workspace_id = '${ws}'`,
- `DELETE FROM workspace_invite WHERE workspace_id = '${ws}'`,
- `DELETE FROM agent WHERE workspace_id = '${ws}'`,
- `DELETE FROM agent_runtime WHERE workspace_id = '${ws}'`,
- `DELETE FROM machine WHERE workspace_id = '${ws}'`,
- `DELETE FROM machine_token WHERE workspace_id = '${ws}'`,
- `DELETE FROM member WHERE workspace_id = '${ws}'`,
- `DELETE FROM workspace WHERE id = '${ws}'`,
- `DELETE FROM "user" WHERE id = '${seed.userId}'`,
- ])
-}
-
-export interface SecondaryUser {
- userId: string
- memberId: string
-}
-
-/**
- * Create a second user + member record in an existing workspace.
- */
-export function seedSecondaryUser(workspaceId: string, role = "member"): SecondaryUser {
- const userId = `u_${nanoid()}`
- const memberId = `mb_${nanoid()}`
- const now = new Date().toISOString()
-
- sql(`INSERT INTO "user" (id, name, email, emailVerified, createdAt, updatedAt) VALUES ('${userId}', 'Secondary User', '${userId}@test.local', 1, '${now}', '${now}')`)
- sql(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES ('${memberId}', '${workspaceId}', '${userId}', '${role}', '${now}')`)
-
- return { userId, memberId }
-}
-
-export interface TestInvite {
- inviteId: string
- token: string
-}
-
-/**
- * Create a workspace invite directly in DB for testing.
- */
-export function seedInvite(workspaceId: string, createdBy: string): TestInvite {
- const inviteId = `inv_${nanoid()}`
- const token = `tok_${nanoid()}`
- const now = new Date().toISOString()
- const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()
-
- sql(`INSERT INTO workspace_invite (id, workspace_id, token, created_by, expires_at, created_at) VALUES ('${inviteId}', '${workspaceId}', '${token}', '${createdBy}', '${expiresAt}', '${now}')`)
-
- return { inviteId, token }
-}
-
-/**
- * Clean up secondary user (and their memberships).
- */
-export function cleanupSecondaryUser(secondary: SecondaryUser) {
- sql(`DELETE FROM agent_access WHERE user_id = '${secondary.userId}'`)
- sql(`DELETE FROM agent_pin WHERE user_id = '${secondary.userId}'`)
- sql(`DELETE FROM member WHERE id = '${secondary.memberId}'`)
- sql(`DELETE FROM "user" WHERE id = '${secondary.userId}'`)
-}
diff --git a/src/ws-do/src/index.ts b/src/ws-do/src/index.ts
index 357f53979..5bf2bb33b 100644
--- a/src/ws-do/src/index.ts
+++ b/src/ws-do/src/index.ts
@@ -7,6 +7,11 @@ const log = createLogger({ service: "ws-do" })
export default {
async fetch(request: Request, env: Env): Promise<Response> {
const url = new URL(request.url)
+
+ if (url.pathname === "/health" && request.method === "GET") {
+ return Response.json({ status: "ok" })
+ }
+
const traceId = request.headers.get("X-Trace-Id") ?? undefined
const daemonBroadcast = url.pathname.match(/^\/broadcast\/daemon\/(.+)$/)
diff --git a/tests/integration/cli/register-poll-complete.test.ts b/tests/integration/cli/register-poll-complete.test.ts
new file mode 100644
index 000000000..373cfff34
--- /dev/null
+++ b/tests/integration/cli/register-poll-complete.test.ts
@@ -0,0 +1,134 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import {
+ seedTestData,
+ cleanupTestData,
+ type TestSeed,
+ sqlRun,
+ sqlQuery,
+} from "@alook/test-utils"
+import { DaemonClient } from "../../../src/cli/daemon/client"
+import {
+ RegisterResponseSchema,
+ PollResponseSchema,
+ TaskApiBaseSchema,
+} from "@alook/shared"
+
+const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
+const client = new DaemonClient(APP_URL)
+
+let seed: TestSeed
+const daemonId = `daemon_integ_${randomUUID().slice(0, 8)}`
+let registeredRuntimeId: string
+let conversationId: string
+let taskId: string
+
+beforeAll(() => {
+ seed = seedTestData()
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("register → poll → start → messages → complete lifecycle", () => {
+ it("register returns runtimes matching RegisterResponseSchema", async () => {
+ const result = await client.register(seed.machineToken, {
+ workspace_id: seed.workspaceId,
+ daemon_id: daemonId,
+ device_name: "integ-test-machine",
+ cli_version: "0.1.0-integ",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ })
+
+ const parsed = RegisterResponseSchema.safeParse(result)
+ expect(parsed.success).toBe(true)
+ expect(result.runtimes).toHaveLength(1)
+ expect(result.runtimes[0].id).toBeTruthy()
+ registeredRuntimeId = result.runtimes[0].id
+ })
+
+ it("poll with no queued tasks returns empty array matching PollResponseSchema", async () => {
+ const result = await client.poll(seed.machineToken, daemonId, 1, "0.1.0-integ")
+ const parsed = PollResponseSchema.safeParse({
+ tasks: result.tasks,
+ evicted: result.evicted,
+ pending_update: result.pending_update,
+ pending_rescan: result.pending_rescan,
+ file_requests: result.file_requests,
+ meetings: result.meetings,
+ })
+ expect(parsed.success).toBe(true)
+ expect(result.tasks).toEqual([])
+ expect(result.evicted).toBe(false)
+ })
+
+ it("poll claims a queued task", async () => {
+ const now = new Date().toISOString()
+ conversationId = `conv_${randomUUID().slice(0, 8)}`
+ taskId = `task_${randomUUID().slice(0, 8)}`
+
+ sqlRun(`INSERT INTO conversation (id, workspace_id, agent_id, user_id, title, created_at) VALUES (?, ?, ?, ?, ?, ?)`, conversationId, seed.workspaceId, seed.agentId, seed.userId, 'integ test', now)
+ sqlRun(`INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, priority, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0, ?)`, taskId, seed.agentId, registeredRuntimeId, seed.workspaceId, conversationId, 'Hello integration test', 'queued', 'user_dm_message', now)
+
+ const result = await client.poll(seed.machineToken, daemonId, 1, "0.1.0-integ")
+ expect(result.tasks).toHaveLength(1)
+
+ const task = result.tasks[0]
+ expect(task.id).toBe(taskId)
+ expect(task.prompt).toBe("Hello integration test")
+ expect(task.status).toBe("dispatched")
+ expect(task.workspace_id).toBe(seed.workspaceId)
+ })
+
+ it("start task transitions status to running and returns TaskApiBase shape", async () => {
+ const result = await client.startTask(seed.machineToken, taskId) as Record<string, unknown>
+ const parsed = TaskApiBaseSchema.safeParse(result)
+ expect(parsed.success).toBe(true)
+ expect(result.status).toBe("running")
+ expect(result.started_at).toBeTruthy()
+ })
+
+ it("report messages stores them in DB", async () => {
+ await client.reportMessages(seed.machineToken, taskId, [
+ { seq: 1, type: "assistant", content: "Working on it..." },
+ { seq: 2, type: "assistant", content: "Done!" },
+ ])
+
+ const rows = sqlQuery<{ seq: number; type: string; content: string }>(
+ `SELECT seq, type, content FROM task_message WHERE task_id = ? ORDER BY seq`, taskId
+ )
+ expect(rows).toHaveLength(2)
+ expect(rows[0].content).toBe("Working on it...")
+ expect(rows[1].content).toBe("Done!")
+ })
+
+ it("complete task transitions status and returns TaskApiBase shape", async () => {
+ const result = await client.completeTask(seed.machineToken, taskId, {
+ output: "Task completed successfully",
+ session_id: "sess_integ_test",
+ }) as Record<string, unknown>
+
+ const parsed = TaskApiBaseSchema.safeParse(result)
+ expect(parsed.success).toBe(true)
+ expect(result.status).toBe("completed")
+ expect(result.completed_at).toBeTruthy()
+ })
+
+ it("DB reflects final state after completion", () => {
+ const rows = sqlQuery<{ status: string; session_id: string | null; result: string | null }>(
+ `SELECT status, session_id, result FROM agent_task_queue WHERE id = ?`, taskId
+ )
+ expect(rows).toHaveLength(1)
+ expect(rows[0].status).toBe("completed")
+ expect(rows[0].session_id).toBe("sess_integ_test")
+ expect(rows[0].result).toContain("Task completed successfully")
+ })
+
+ afterAll(() => {
+ try {
+ sqlRun(`DELETE FROM task_message WHERE task_id = ?`, taskId)
+ sqlRun(`DELETE FROM agent_task_queue WHERE id = ?`, taskId)
+ sqlRun(`DELETE FROM conversation WHERE id = ?`, conversationId)
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId)
+ } catch { /* ignore */ }
+ })
+})
diff --git a/tests/integration/cli/session-resume.test.ts b/tests/integration/cli/session-resume.test.ts
new file mode 100644
index 000000000..10b48f2b8
--- /dev/null
+++ b/tests/integration/cli/session-resume.test.ts
@@ -0,0 +1,132 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import {
+ seedTestData,
+ cleanupTestData,
+ type TestSeed,
+ sqlRun,
+ sqlQuery,
+} from "@alook/test-utils"
+import { DaemonClient } from "../../../src/cli/daemon/client"
+
+const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
+const client = new DaemonClient(APP_URL)
+
+let seed: TestSeed
+const daemonId = `daemon_sess_${randomUUID().slice(0, 8)}`
+let runtimeId: string
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ const reg = await client.register(seed.machineToken, {
+ workspace_id: seed.workspaceId,
+ daemon_id: daemonId,
+ device_name: "session-test-machine",
+ cli_version: "0.1.0-integ",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ })
+ runtimeId = reg.runtimes[0].id
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("session resume via context_key", () => {
+ const contextKey = `ctx_${randomUUID().slice(0, 8)}`
+ const differentContextKey = `ctx_${randomUUID().slice(0, 8)}`
+ let firstConversationId: string
+ let firstTaskId: string
+ let secondTaskId: string
+ let thirdConversationId: string
+ let thirdTaskId: string
+
+ it("first task with context_key creates a new conversation", async () => {
+ const now = new Date().toISOString()
+ firstConversationId = `conv_${randomUUID().slice(0, 8)}`
+ firstTaskId = `task_${randomUUID().slice(0, 8)}`
+
+ sqlRun(`INSERT INTO conversation (id, workspace_id, agent_id, user_id, title, created_at) VALUES (?, ?, ?, ?, ?, ?)`, firstConversationId, seed.workspaceId, seed.agentId, seed.userId, 'session resume test', now)
+ sqlRun(`INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, context_key, priority, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?)`, firstTaskId, seed.agentId, runtimeId, seed.workspaceId, firstConversationId, 'First message', 'queued', 'user_dm_message', contextKey, now)
+
+ const result = await client.poll(seed.machineToken, daemonId, 1, "0.1.0-integ")
+ expect(result.tasks).toHaveLength(1)
+ expect(result.tasks[0].id).toBe(firstTaskId)
+ expect(result.tasks[0].context_key).toBe(contextKey)
+ expect(result.tasks[0].conversation_id).toBe(firstConversationId)
+
+ // Complete the first task with a session_id
+ await client.startTask(seed.machineToken, firstTaskId)
+ await client.completeTask(seed.machineToken, firstTaskId, {
+ output: "First task done",
+ session_id: "sess_first",
+ })
+ })
+
+ it("second task with same context_key uses same conversation", async () => {
+ const now = new Date().toISOString()
+ secondTaskId = `task_${randomUUID().slice(0, 8)}`
+
+ sqlRun(`INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, context_key, priority, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?)`, secondTaskId, seed.agentId, runtimeId, seed.workspaceId, firstConversationId, 'Second message same context', 'queued', 'user_dm_message', contextKey, now)
+
+ const result = await client.poll(seed.machineToken, daemonId, 1, "0.1.0-integ")
+ expect(result.tasks).toHaveLength(1)
+ expect(result.tasks[0].id).toBe(secondTaskId)
+ expect(result.tasks[0].context_key).toBe(contextKey)
+ expect(result.tasks[0].conversation_id).toBe(firstConversationId)
+
+ await client.startTask(seed.machineToken, secondTaskId)
+ await client.completeTask(seed.machineToken, secondTaskId, {
+ output: "Second task done",
+ session_id: "sess_first",
+ })
+ })
+
+ it("task with different context_key uses a different conversation", async () => {
+ const now = new Date().toISOString()
+ thirdConversationId = `conv_${randomUUID().slice(0, 8)}`
+ thirdTaskId = `task_${randomUUID().slice(0, 8)}`
+
+ sqlRun(`INSERT INTO conversation (id, workspace_id, agent_id, user_id, title, created_at) VALUES (?, ?, ?, ?, ?, ?)`, thirdConversationId, seed.workspaceId, seed.agentId, seed.userId, 'different context', now)
+ sqlRun(`INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, context_key, priority, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, 0, ?)`, thirdTaskId, seed.agentId, runtimeId, seed.workspaceId, thirdConversationId, 'Different context message', 'queued', 'user_dm_message', differentContextKey, now)
+
+ const result = await client.poll(seed.machineToken, daemonId, 1, "0.1.0-integ")
+ expect(result.tasks).toHaveLength(1)
+ expect(result.tasks[0].id).toBe(thirdTaskId)
+ expect(result.tasks[0].context_key).toBe(differentContextKey)
+ expect(result.tasks[0].conversation_id).toBe(thirdConversationId)
+ expect(result.tasks[0].conversation_id).not.toBe(firstConversationId)
+ })
+
+ it("DB shows different session_ids for different context_keys", async () => {
+ await client.startTask(seed.machineToken, thirdTaskId)
+ await client.completeTask(seed.machineToken, thirdTaskId, {
+ output: "Third task done",
+ session_id: "sess_different",
+ })
+
+ const rows = sqlQuery<{ id: string; context_key: string | null; session_id: string | null; conversation_id: string }>(
+ `SELECT id, context_key, session_id, conversation_id FROM agent_task_queue WHERE id IN (?, ?, ?) ORDER BY created_at`, firstTaskId, secondTaskId, thirdTaskId
+ )
+ expect(rows).toHaveLength(3)
+
+ // First two tasks share conversation and context_key
+ expect(rows[0].context_key).toBe(contextKey)
+ expect(rows[1].context_key).toBe(contextKey)
+ expect(rows[0].conversation_id).toBe(rows[1].conversation_id)
+ expect(rows[0].session_id).toBe("sess_first")
+ expect(rows[1].session_id).toBe("sess_first")
+
+ // Third task has different context_key and conversation
+ expect(rows[2].context_key).toBe(differentContextKey)
+ expect(rows[2].conversation_id).not.toBe(rows[0].conversation_id)
+ expect(rows[2].session_id).toBe("sess_different")
+ })
+
+ afterAll(() => {
+ try {
+ sqlRun(`DELETE FROM agent_task_queue WHERE id IN (?, ?, ?)`, firstTaskId, secondTaskId, thirdTaskId)
+ sqlRun(`DELETE FROM conversation WHERE id IN (?, ?)`, firstConversationId, thirdConversationId)
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId)
+ } catch { /* ignore */ }
+ })
+})
diff --git a/tests/integration/cli/setup.ts b/tests/integration/cli/setup.ts
new file mode 100644
index 000000000..5402b42a4
--- /dev/null
+++ b/tests/integration/cli/setup.ts
@@ -0,0 +1,3 @@
+if (!process.env.APP_URL) {
+ process.env.APP_URL = "http://localhost:3000"
+}
diff --git a/tests/integration/cli/skill-sync.test.ts b/tests/integration/cli/skill-sync.test.ts
new file mode 100644
index 000000000..2a6062be9
--- /dev/null
+++ b/tests/integration/cli/skill-sync.test.ts
@@ -0,0 +1,87 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import {
+ seedTestData,
+ cleanupTestData,
+ type TestSeed,
+ sqlQuery,
+} from "@alook/test-utils"
+import { DaemonClient } from "../../../src/cli/daemon/client"
+
+const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
+const client = new DaemonClient(APP_URL)
+
+let seed: TestSeed
+const daemonId = `daemon_skill_${randomUUID().slice(0, 8)}`
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ await client.register(seed.machineToken, {
+ workspace_id: seed.workspaceId,
+ daemon_id: daemonId,
+ device_name: "skill-test-machine",
+ cli_version: "0.1.0-integ",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ })
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("skill sync", () => {
+ const skills = [
+ { name: "test-skill-alpha", description: "Alpha skill for testing" },
+ { name: "test-skill-beta", description: "Beta skill for testing" },
+ ]
+
+ it("POST /api/daemon/skills/sync (global scope) stores skills in DB", async () => {
+ await client.syncSkills(seed.machineToken, {
+ scope: "global",
+ daemon_id: daemonId,
+ runtime: "claude",
+ skills,
+ })
+
+ const rows = sqlQuery<{ name: string; description: string; runtime: string; daemon_id: string | null }>(
+ `SELECT name, description, runtime, daemon_id FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND runtime = 'claude' AND daemon_id = '${daemonId}' ORDER BY name`
+ )
+ expect(rows.length).toBeGreaterThanOrEqual(2)
+ const alpha = rows.find(r => r.name === "test-skill-alpha")
+ const beta = rows.find(r => r.name === "test-skill-beta")
+ expect(alpha).toBeDefined()
+ expect(alpha!.description).toBe("Alpha skill for testing")
+ expect(beta).toBeDefined()
+ expect(beta!.description).toBe("Beta skill for testing")
+ })
+
+ it("re-sync replaces old skills (stale removal)", async () => {
+ await client.syncSkills(seed.machineToken, {
+ scope: "global",
+ daemon_id: daemonId,
+ runtime: "claude",
+ skills: [{ name: "test-skill-gamma", description: "Gamma replaces all" }],
+ })
+
+ const rows = sqlQuery<{ name: string }>(
+ `SELECT name FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND runtime = 'claude' AND daemon_id = '${daemonId}'`
+ )
+ expect(rows).toHaveLength(1)
+ expect(rows[0].name).toBe("test-skill-gamma")
+ })
+
+ it("POST /api/daemon/skills/sync (agent scope) scopes to agent", async () => {
+ await client.syncSkills(seed.machineToken, {
+ scope: "agent",
+ agent_id: seed.agentId,
+ runtime: "claude",
+ skills: [{ name: "agent-specific-skill", description: "Agent scoped" }],
+ })
+
+ const rows = sqlQuery<{ name: string; agent_id: string | null }>(
+ `SELECT name, agent_id FROM agent_skill WHERE workspace_id = '${seed.workspaceId}' AND agent_id = '${seed.agentId}' AND runtime = 'claude'`
+ )
+ expect(rows).toHaveLength(1)
+ expect(rows[0].name).toBe("agent-specific-skill")
+ expect(rows[0].agent_id).toBe(seed.agentId)
+ })
+
+})
diff --git a/tests/integration/cli/vitest.config.ts b/tests/integration/cli/vitest.config.ts
new file mode 100644
index 000000000..6597c1986
--- /dev/null
+++ b/tests/integration/cli/vitest.config.ts
@@ -0,0 +1,22 @@
+import { defineConfig, mergeConfig } from "vitest/config"
+import { resolve } from "path"
+import shared from "../../../vitest.shared"
+
+const dir = resolve(import.meta.dirname)
+const root = resolve(dir, "../../../")
+
+export default mergeConfig(shared, defineConfig({
+ resolve: {
+ alias: {
+ "@alook/test-utils": resolve(root, "tests/utils/src/index.ts"),
+ "@alook/shared": resolve(root, "src/shared/src/index.ts"),
+ },
+ },
+ test: {
+ testTimeout: 30_000,
+ hookTimeout: 30_000,
+ include: [`${dir}/**/*.test.ts`],
+ setupFiles: [`${dir}/setup.ts`],
+ fileParallelism: false,
+ },
+}))
diff --git a/tests/integration/cli/ws-push-poll.test.ts b/tests/integration/cli/ws-push-poll.test.ts
new file mode 100644
index 000000000..03be4a08a
--- /dev/null
+++ b/tests/integration/cli/ws-push-poll.test.ts
@@ -0,0 +1,101 @@
+import { describe, it, expect, beforeAll, afterAll } from "vitest"
+import { randomUUID } from "crypto"
+import {
+ seedTestData,
+ cleanupTestData,
+ type TestSeed,
+ sqlRun,
+} from "@alook/test-utils"
+import { DaemonClient } from "../../../src/cli/daemon/client"
+import { DaemonPushMessageSchema } from "@alook/shared"
+
+const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
+const WS_DO_URL = process.env.WS_DO_URL ?? "http://localhost:8789"
+const client = new DaemonClient(APP_URL)
+
+let seed: TestSeed
+const daemonId = `daemon_ws_${randomUUID().slice(0, 8)}`
+let runtimeId: string
+let wsAvailable = false
+
+beforeAll(async () => {
+ seed = seedTestData()
+
+ // Check if WS-DO is available
+ try {
+ const res = await fetch(WS_DO_URL, { signal: AbortSignal.timeout(2000) })
+ wsAvailable = res.status !== 0
+ } catch {
+ wsAvailable = false
+ }
+
+ const reg = await client.register(seed.machineToken, {
+ workspace_id: seed.workspaceId,
+ daemon_id: daemonId,
+ device_name: "ws-test-machine",
+ cli_version: "0.1.0-integ",
+ runtimes: [{ provider: "claude", runtime_mode: "local", version: "4.0" }],
+ })
+ runtimeId = reg.runtimes[0].id
+})
+afterAll(() => cleanupTestData(seed))
+
+describe("WebSocket push → poll", () => {
+ it.skipIf(!wsAvailable)("daemon.tasks push triggers immediate poll with correct task", async () => {
+ const now = new Date().toISOString()
+ const conversationId = `conv_ws_${randomUUID().slice(0, 8)}`
+ const taskId = `task_ws_${randomUUID().slice(0, 8)}`
+
+ sqlRun(`INSERT INTO conversation (id, workspace_id, agent_id, user_id, title, created_at) VALUES (?, ?, ?, ?, ?, ?)`, conversationId, seed.workspaceId, seed.agentId, seed.userId, 'ws push test', now)
+ sqlRun(`INSERT INTO agent_task_queue (id, agent_id, runtime_id, workspace_id, conversation_id, prompt, status, type, priority, created_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0, ?)`, taskId, seed.agentId, runtimeId, seed.workspaceId, conversationId, 'WS push test prompt', 'queued', 'user_dm_message', now)
+
+ // Connect WebSocket and wait for push message
+ const wsUrl = `${WS_DO_URL.replace("http", "ws")}/ws/daemon?token=${seed.machineToken}&daemon_id=${daemonId}`
+ const ws = new WebSocket(wsUrl)
+
+ const pushMessage = await new Promise<unknown>((resolve, reject) => {
+ const timeout = setTimeout(() => {
+ ws.close()
+ reject(new Error("WebSocket push timeout — no daemon.tasks message received within 10s"))
+ }, 10_000)
+
+ ws.onmessage = (event) => {
+ try {
+ const data = JSON.parse(event.data as string)
+ if (data.type === "daemon.tasks") {
+ clearTimeout(timeout)
+ ws.close()
+ resolve(data)
+ }
+ } catch { /* ignore non-JSON frames */ }
+ }
+ ws.onerror = (err) => {
+ clearTimeout(timeout)
+ reject(err)
+ }
+ })
+
+ const parsed = DaemonPushMessageSchema.safeParse(pushMessage)
+ expect(parsed.success).toBe(true)
+ if (parsed.success && parsed.data.type === "daemon.tasks") {
+ expect(parsed.data.tasks.length).toBeGreaterThanOrEqual(1)
+ const pushed = parsed.data.tasks.find((t) => t.id === taskId)
+ expect(pushed).toBeDefined()
+ }
+
+ // Poll should also return the task
+ const pollResult = await client.poll(seed.machineToken, daemonId, 1)
+ expect(pollResult.tasks.length).toBeGreaterThanOrEqual(1)
+
+ // Cleanup
+ sqlRun(`DELETE FROM agent_task_queue WHERE id = ?`, taskId)
+ sqlRun(`DELETE FROM conversation WHERE id = ?`, conversationId)
+ })
+
+ afterAll(() => {
+ try {
+ sqlRun(`DELETE FROM agent_runtime WHERE daemon_id = ?`, daemonId)
+ sqlRun(`DELETE FROM machine WHERE daemon_id = ?`, daemonId)
+ } catch { /* ignore */ }
+ })
+})
diff --git a/tests/utils/package.json b/tests/utils/package.json
new file mode 100644
index 000000000..33760e31a
--- /dev/null
+++ b/tests/utils/package.json
@@ -0,0 +1,22 @@
+{
+ "name": "@alook/test-utils",
+ "version": "0.0.103",
+ "private": true,
+ "type": "module",
+ "exports": {
+ ".": "./src/index.ts"
+ },
+ "scripts": {
+ "test": "vitest run",
+ "typecheck": "tsc --noEmit"
+ },
+ "dependencies": {
+ "better-sqlite3": "^12.10.0"
+ },
+ "devDependencies": {
+ "@types/better-sqlite3": "^7.6.13",
+ "@types/node": "^25.9.1",
+ "typescript": "^6.0.3",
+ "vitest": "^4.1.7"
+ }
+}
diff --git a/src/web/src/test/helpers/auth.ts b/tests/utils/src/auth.ts
similarity index 83%
rename from src/web/src/test/helpers/auth.ts
rename to tests/utils/src/auth.ts
index eaf4b9cea..fabad5d8f 100644
--- a/src/web/src/test/helpers/auth.ts
+++ b/tests/utils/src/auth.ts
@@ -2,10 +2,6 @@ import { fetchWithRetry } from "./fetch"
const APP_URL = process.env.APP_URL ?? "http://localhost:3000"
-/**
- * Sign up a new user via Better Auth.
- * Returns the response (check status to see if successful).
- */
export async function signUp(email: string, password: string, name: string) {
return fetch(`${APP_URL}/api/auth/sign-up/email`, {
method: "POST",
@@ -15,9 +11,6 @@ export async function signUp(email: string, password: string, name: string) {
})
}
-/**
- * Sign in and return the raw set-cookie header value.
- */
export async function signIn(email: string, password: string): Promise<string> {
const res = await fetch(`${APP_URL}/api/auth/sign-in/email`, {
method: "POST",
@@ -32,9 +25,6 @@ export async function signIn(email: string, password: string): Promise<string> {
return setCookie.split(";")[0]
}
-/**
- * Make an authenticated request with a session cookie.
- */
export async function sessionRequest(
path: string,
cookie: string,
@@ -49,9 +39,6 @@ export async function sessionRequest(
})
}
-/**
- * Make an authenticated request with a Bearer token.
- */
export async function tokenRequest(
path: string,
token: string,
diff --git a/tests/utils/src/db.ts b/tests/utils/src/db.ts
new file mode 100644
index 000000000..5c5815c1a
--- /dev/null
+++ b/tests/utils/src/db.ts
@@ -0,0 +1,68 @@
+import Database from "better-sqlite3"
+import { readdirSync } from "fs"
+import { join } from "path"
+import { resolve } from "path"
+
+const D1_STATE_DIR = resolve(
+ import.meta.dirname,
+ "../../../src/web/.wrangler/state/v3/d1/miniflare-D1DatabaseObject",
+)
+
+let _db: Database.Database | null = null
+
+function getDbPath(): string {
+ const files = readdirSync(D1_STATE_DIR).filter(
+ (f) => f.endsWith(".sqlite") && f !== "metadata.sqlite",
+ )
+ if (files.length === 0) {
+ throw new Error(
+ `No D1 SQLite file found in ${D1_STATE_DIR}. Run migrations first: pnpm db:migrate`,
+ )
+ }
+ return join(D1_STATE_DIR, files[0])
+}
+
+function getDb(): Database.Database {
+ if (!_db) {
+ _db = new Database(getDbPath())
+ _db.pragma("journal_mode = WAL")
+ _db.pragma("busy_timeout = 5000")
+ }
+ return _db
+}
+
+export function sql(query: string): void {
+ const db = getDb()
+ db.exec(query)
+}
+
+export function sqlRun(query: string, ...params: unknown[]): void {
+ const db = getDb()
+ db.prepare(query).run(...params)
+}
+
+export function sqlQuery<T = Record<string, unknown>>(query: string, ...params: unknown[]): T[] {
+ const db = getDb()
+ const stmt = db.prepare(query)
+ return (params.length ? stmt.all(...params) : stmt.all()) as T[]
+}
+
+export function sqlBatch(queries: string[]): void {
+ const db = getDb()
+ const transaction = db.transaction(() => {
+ for (const query of queries) {
+ const trimmed = query.trim()
+ if (trimmed) {
+ db.exec(trimmed)
+ }
+ }
+ })
+ transaction()
+}
+
+export function closeDb(): void {
+ if (_db) {
+ _db.close()
+ _db = null
+ }
+}
diff --git a/src/web/src/test/helpers/email.ts b/tests/utils/src/email.ts
similarity index 100%
rename from src/web/src/test/helpers/email.ts
rename to tests/utils/src/email.ts
diff --git a/src/web/src/test/helpers/fetch.test.ts b/tests/utils/src/fetch.test.ts
similarity index 100%
rename from src/web/src/test/helpers/fetch.test.ts
rename to tests/utils/src/fetch.test.ts
diff --git a/src/web/src/test/helpers/fetch.ts b/tests/utils/src/fetch.ts
similarity index 100%
rename from src/web/src/test/helpers/fetch.ts
rename to tests/utils/src/fetch.ts
diff --git a/tests/utils/src/index.ts b/tests/utils/src/index.ts
new file mode 100644
index 000000000..6bf758700
--- /dev/null
+++ b/tests/utils/src/index.ts
@@ -0,0 +1,14 @@
+export { sql, sqlRun, sqlQuery, sqlBatch, closeDb } from "./db"
+export {
+ seedTestData,
+ cleanupTestData,
+ seedSecondaryUser,
+ cleanupSecondaryUser,
+ seedInvite,
+ type TestSeed,
+ type SecondaryUser,
+ type TestInvite,
+} from "./seed"
+export { signUp, signIn, sessionRequest, tokenRequest } from "./auth"
+export { fetchWithRetry, isRetryableError } from "./fetch"
+export { rawEmail, rawEmailWithHeaders, postEmail, postEmailRaw } from "./email"
diff --git a/tests/utils/src/seed.ts b/tests/utils/src/seed.ts
new file mode 100644
index 000000000..8ebfbe21f
--- /dev/null
+++ b/tests/utils/src/seed.ts
@@ -0,0 +1,108 @@
+import { randomUUID } from "crypto"
+import { sqlRun } from "./db"
+
+export interface TestSeed {
+ userId: string
+ workspaceId: string
+ memberId: string
+ runtimeId: string
+ daemonId: string
+ agentId: string
+ agentEmailHandle: string
+ /** Raw machine token (starts with al_) */
+ machineToken: string
+ machineTokenId: string
+ whitelistId: string
+}
+
+function nanoid() {
+ return randomUUID().replace(/-/g, "").slice(0, 21)
+}
+
+export function seedTestData(): TestSeed {
+ const userId = `u_${nanoid()}`
+ const workspaceId = `sp_${nanoid()}`
+ const memberId = `mb_${nanoid()}`
+ const runtimeId = `rt_${nanoid()}`
+ const agentId = `ag_${nanoid()}`
+ const daemonId = `daemon_${nanoid()}`
+ const machineTokenId = `mt_${nanoid()}`
+ const rawToken = `al_${randomUUID().replace(/-/g, "")}`
+ const emailHandle = `e2e-${nanoid()}`
+ const whitelistId = `wl_${nanoid()}`
+
+ const now = new Date().toISOString()
+ const slug = `test-${nanoid()}`
+
+ sqlRun(`INSERT INTO "user" (id, name, email, emailVerified, createdAt, updatedAt) VALUES (?, ?, ?, 1, ?, ?)`, userId, 'Test User', `${userId}@test.local`, now, now)
+ sqlRun(`INSERT INTO workspace (id, name, slug, created_at, updated_at) VALUES (?, ?, ?, ?, ?)`, workspaceId, 'Test Workspace', slug, now, now)
+ sqlRun(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES (?, ?, ?, ?, ?)`, memberId, workspaceId, userId, 'owner', now)
+ sqlRun(`INSERT INTO machine (daemon_id, workspace_id, device_info, last_seen_at, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?)`, daemonId, workspaceId, 'test-device', now, now, now)
+ sqlRun(`INSERT INTO agent_runtime (id, workspace_id, daemon_id, runtime_mode, provider, status, device_info, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`, runtimeId, workspaceId, daemonId, 'local', 'claude', 'online', 'test-device', now, now)
+ sqlRun(`INSERT INTO agent (id, workspace_id, name, runtime_id, email_handle, owner_id, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, agentId, workspaceId, 'Test Agent', runtimeId, emailHandle, userId, now, now)
+ sqlRun(`INSERT INTO machine_token (id, user_id, workspace_id, token, name, status, created_at) VALUES (?, ?, ?, ?, ?, ?, ?)`, machineTokenId, userId, workspaceId, rawToken, 'test-token', 'active', now)
+ sqlRun(`INSERT INTO agent_whitelist (id, agent_id, workspace_id, email, created_at) VALUES (?, ?, ?, ?, ?)`, whitelistId, agentId, workspaceId, `${userId}@test.local`, now)
+
+ return { userId, workspaceId, memberId, runtimeId, daemonId, agentId, agentEmailHandle: emailHandle, machineToken: rawToken, machineTokenId, whitelistId }
+}
+
+export function cleanupTestData(seed: TestSeed) {
+ const ws = seed.workspaceId
+ sqlRun(`DELETE FROM task_message WHERE task_id IN (SELECT id FROM agent_task_queue WHERE workspace_id = ?)`, ws)
+ sqlRun(`DELETE FROM agent_task_queue WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM message WHERE conversation_id IN (SELECT id FROM conversation WHERE workspace_id = ?)`, ws)
+ sqlRun(`DELETE FROM conversation WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM meeting_session WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM emails WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = ?)`, ws)
+ sqlRun(`DELETE FROM agent_skill WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM agent_whitelist WHERE agent_id IN (SELECT id FROM agent WHERE workspace_id = ?)`, ws)
+ sqlRun(`DELETE FROM agent_access WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM agent_pin WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM workspace_invite WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM agent WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM agent_runtime WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM machine WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM machine_token WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM member WHERE workspace_id = ?`, ws)
+ sqlRun(`DELETE FROM workspace WHERE id = ?`, ws)
+ sqlRun(`DELETE FROM "user" WHERE id = ?`, seed.userId)
+}
+
+export interface SecondaryUser {
+ userId: string
+ memberId: string
+}
+
+export function seedSecondaryUser(workspaceId: string, role = "member"): SecondaryUser {
+ const userId = `u_${nanoid()}`
+ const memberId = `mb_${nanoid()}`
+ const now = new Date().toISOString()
+
+ sqlRun(`INSERT INTO "user" (id, name, email, emailVerified, createdAt, updatedAt) VALUES (?, ?, ?, 1, ?, ?)`, userId, 'Secondary User', `${userId}@test.local`, now, now)
+ sqlRun(`INSERT INTO member (id, workspace_id, user_id, role, created_at) VALUES (?, ?, ?, ?, ?)`, memberId, workspaceId, userId, role, now)
+
+ return { userId, memberId }
+}
+
+export interface TestInvite {
+ inviteId: string
+ token: string
+}
+
+export function seedInvite(workspaceId: string, createdBy: string): TestInvite {
+ const inviteId = `inv_${nanoid()}`
+ const token = `tok_${nanoid()}`
+ const now = new Date().toISOString()
+ const expiresAt = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()
+
+ sqlRun(`INSERT INTO workspace_invite (id, workspace_id, token, created_by, expires_at, created_at) VALUES (?, ?, ?, ?, ?, ?)`, inviteId, workspaceId, token, createdBy, expiresAt, now)
+
+ return { inviteId, token }
+}
+
+export function cleanupSecondaryUser(secondary: SecondaryUser) {
+ sqlRun(`DELETE FROM agent_access WHERE user_id = ?`, secondary.userId)
+ sqlRun(`DELETE FROM agent_pin WHERE user_id = ?`, secondary.userId)
+ sqlRun(`DELETE FROM member WHERE id = ?`, secondary.memberId)
+ sqlRun(`DELETE FROM "user" WHERE id = ?`, secondary.userId)
+}
diff --git a/tests/utils/tsconfig.json b/tests/utils/tsconfig.json
new file mode 100644
index 000000000..a51ce68c9
--- /dev/null
+++ b/tests/utils/tsconfig.json
@@ -0,0 +1,14 @@
+{
+ "compilerOptions": {
+ "target": "ES2022",
+ "module": "ESNext",
+ "moduleResolution": "bundler",
+ "strict": true,
+ "esModuleInterop": true,
+ "skipLibCheck": true,
+ "outDir": "dist",
+ "rootDir": "src",
+ "declaration": true
+ },
+ "include": ["src"]
+}
diff --git a/tests/utils/vitest.config.ts b/tests/utils/vitest.config.ts
new file mode 100644
index 000000000..04878e1ed
--- /dev/null
+++ b/tests/utils/vitest.config.ts
@@ -0,0 +1,9 @@
+import { defineConfig } from "vitest/config"
+
+export default defineConfig({
+ test: {
+ globals: true,
+ environment: "node",
+ include: ["src/**/*.test.ts"],
+ },
+})
diff --git a/vitest.config.ts b/vitest.config.ts
index 9a7153d80..2bdab51e7 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -2,6 +2,6 @@ import { defineConfig } from "vitest/config"
export default defineConfig({
test: {
- projects: ["src/shared", "src/web", "src/email-worker", "src/app"],
+ projects: ["src/shared", "src/web", "src/email-worker", "src/app", "tests/utils"],
},
})