--- a/src/main/assistant/assistant-database.test.ts
+++ b/src/main/assistant/assistant-database.test.ts
@@ -174,7 +174,10 @@
     ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
     DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
     DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
-    DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
+    DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
+      DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
     PRAGMA user_version = 35;`)
   legacy.close()
   try {
@@ -325,7 +328,10 @@
     DROP VIEW supervision_review_current;
     DROP TABLE supervision_review_navigation; DROP TABLE supervision_review_batches;
     DROP TABLE supervision_review_sources; DROP TABLE supervision_review_runs;
-    DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
+    DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
+      DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
     PRAGMA user_version = 41;`)
   legacy.close()
   try {
@@ -1088,6 +1094,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 3;
     `)
@@ -1251,6 +1260,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 26;
     `)
@@ -1367,6 +1379,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 30;
     `)
@@ -1445,6 +1460,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 30;
     `)
@@ -1542,6 +1560,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 24;
     `)
@@ -1589,6 +1610,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 24;
     `)
@@ -1637,6 +1661,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 24;
     `)
@@ -1681,6 +1708,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 24;
     `)
@@ -1714,6 +1744,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 24;
     `)
@@ -1744,6 +1777,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 5;
     `)
@@ -1871,6 +1907,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 21;
       COMMIT;
@@ -1967,6 +2006,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 9;
     `)
@@ -2025,6 +2067,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 16`)
     legacy.close()
@@ -2977,6 +3022,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 23`)
     legacy.close()
@@ -3141,6 +3189,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 18;
     `)
@@ -3654,6 +3705,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 31;
     `)
--- a/src/main/assistant/activity-history-io.test.ts
+++ b/src/main/assistant/activity-history-io.test.ts
@@ -27,6 +27,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version=43`)
     const legacySave = raw.prepare('UPDATE activity_history SET records_json = ?, legacy_history_may_be_incomplete = 1')
--- a/src/main/assistant/assistant-storage-upgrade.test.ts
+++ b/src/main/assistant/assistant-storage-upgrade.test.ts
@@ -101,7 +101,10 @@
         ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
         DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
         DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
-        DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
+        DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
+      DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
         PRAGMA user_version = 37`)
     } finally { legacy.close() }
     expect(hasPendingAssistantStorageUpgrade(path)).toBe(true)
@@ -419,7 +422,10 @@
         ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
         DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
         DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
-        DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
+        DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
+      DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
         PRAGMA user_version = ${sourceVersion}; BEGIN`)
       const insert = legacy.prepare(
         `INSERT INTO task_events(
--- a/src/main/assistant/heartbeat-database.test.ts
+++ b/src/main/assistant/heartbeat-database.test.ts
@@ -82,6 +82,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 2`)
     raw.close()
@@ -141,6 +144,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 20`)
     raw.close()
--- a/src/main/magic-notes/magic-note-storage.test.ts
+++ b/src/main/magic-notes/magic-note-storage.test.ts
@@ -223,6 +223,9 @@
       ALTER TABLE activity_history RENAME COLUMN record_order_json TO records_json;
       DROP TRIGGER messages_review_insert; DROP TRIGGER messages_review_update;
       DROP TRIGGER messages_review_delete; DROP TRIGGER tasks_review_delete;
+      DROP VIEW IF EXISTS supervision_review_current;
+      DROP TABLE IF EXISTS supervision_review_navigation; DROP TABLE IF EXISTS supervision_review_batches;
+      DROP TABLE IF EXISTS supervision_review_sources; DROP TABLE IF EXISTS supervision_review_runs;
       DROP TABLE review_checkpoints; ALTER TABLE messages DROP COLUMN review_revision;
       PRAGMA user_version = 37`)
     rmSync(join(directory, 'notes'), { recursive: true })