@oar-sh/oar 0.9.18 → 0.9.20

package/server/migrations/0009-subagent-timeline.mjs

@@ -16,13 +16,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0009-subagent-timeline.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0009-subagent-timeline.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -104,11 +105,6 @@ export function migrateSubagentTimeline(db) {
   };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -120,8 +116,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0009 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0010-subagent-timeline-pruning.mjs

@@ -11,13 +11,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0010-subagent-timeline-pruning.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0010-subagent-timeline-pruning.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const PRUNABLE_INDEX_NAME = 'idx_subagent_timeline_prunable';
 
@@ -58,11 +59,6 @@ export function migrateSubagentTimelinePruning(db) {
   return { applied: columnsAdded + indexesAdded > 0, columnsAdded, indexesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -74,8 +70,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0010 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0011-relay-event-subscriptions.mjs

@@ -18,13 +18,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0011-relay-event-subscriptions.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0011-relay-event-subscriptions.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -94,11 +95,6 @@ export function migrateRelayEventSubscriptions(db) {
   return { applied: tablesAdded > 0, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -110,8 +106,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0011 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0012-cross-relay-event-subscriptions.mjs

@@ -21,13 +21,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0012-cross-relay-event-subscriptions.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0012-cross-relay-event-subscriptions.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 const SUBSCRIPTION_COLUMNS = Object.freeze([
   ['remote_subscription_id', 'TEXT'],
@@ -85,11 +86,6 @@ export function migrateCrossRelayEventSubscriptions(db) {
   return { applied: columnsAdded > 0 || tablesAdded > 0, columnsAdded, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -101,8 +97,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0012 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0013-previews.mjs

@@ -27,7 +27,7 @@
  * alone and reported as not compatible; the relay then keeps previews in
  * memory only, it never refuses to start over it.
  *
- * Usage: node server/migrations/0013-previews.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0013-previews.mjs [path/to/oar.db]
  * The file must exist: a wrong path is refused rather than creating an empty
  * database.
  */
@@ -37,6 +37,7 @@ import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -94,11 +95,6 @@ export function migratePreviews(db) {
   return { applied: tablesAdded > 0, tablesAdded, compatible: true };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   if (!fs.existsSync(dbPath)) throw new Error(`no database at ${dbPath}`);
   const db = new Database(dbPath, { fileMustExist: true, ...options });
@@ -111,8 +107,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0013 on ${dbPath}`);
     if (!result.compatible) {

package/server/migrations/0014-conversation-groups.mjs

@@ -13,13 +13,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0014-conversation-groups.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0014-conversation-groups.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -58,11 +59,6 @@ export function migrateConversationGroups(db) {
   return { applied: columnsAdded > 0 || tablesAdded > 0, columnsAdded, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -74,8 +70,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0014 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0015-conversation-group-position.mjs

@@ -13,13 +13,14 @@
  * data change: older code ignores the column; a row it moves out of a group
  * keeps a stale place, which the next run here clears.
  *
- * Usage: node server/migrations/0015-conversation-group-position.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0015-conversation-group-position.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -45,11 +46,6 @@ export function migrateConversationGroupPosition(db) {
   return { applied: columnsAdded > 0 || placesCleared > 0, columnsAdded, placesCleared };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -61,8 +57,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0015 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0016-share-access-log.mjs

@@ -25,13 +25,14 @@
  * reads the new table, and a share it creates has no lineage, which this build
  * reads as the share's own token.
  *
- * Usage: node server/migrations/0016-share-access-log.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0016-share-access-log.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -79,11 +80,6 @@ export function migrateShareAccessLog(db) {
   return { applied: columnsAdded > 0 || tablesAdded > 0 || lineagesSet > 0, columnsAdded, tablesAdded, lineagesSet };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -95,8 +91,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0016 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0017-conversation-history-indexes.mjs

@@ -15,13 +15,14 @@
  * Additive and idempotent. Safe to run on every boot. An older build ignores
  * both indexes.
  *
- * Usage: node server/migrations/0017-conversation-history-indexes.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0017-conversation-history-indexes.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -58,11 +59,6 @@ export function migrateConversationHistoryIndexes(db) {
   return { applied: indexesAdded > 0, indexesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -74,8 +70,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0017 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0018-background-task-rows.mjs

@@ -23,13 +23,14 @@
  * Additive and idempotent. Safe to run on every boot. An older build never
  * reads the table; its consoles start empty after a restart as before.
  *
- * Usage: node server/migrations/0018-background-task-rows.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0018-background-task-rows.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const BACKGROUND_TASK_ROWS_COLUMNS = Object.freeze(['store_key', 'task_id', 'state', 'row_json', 'ended_at', 'updated_at']);
 
@@ -70,11 +71,6 @@ export function migrateBackgroundTaskRows(db) {
   return { applied: tablesAdded > 0, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -86,8 +82,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0018 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0019-relay-event-subscription-options.mjs

@@ -22,13 +22,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0019-relay-event-subscription-options.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0019-relay-event-subscription-options.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const RELAY_EVENT_OPTION_COLUMNS = Object.freeze([
   ['digest_minutes', 'INTEGER'],
@@ -75,11 +76,6 @@ export function migrateRelayEventSubscriptionOptions(db) {
   return { applied: columnsAdded > 0 || tablesAdded > 0, columnsAdded, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -91,8 +87,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0019 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0020-conversation-may-create-sessions.mjs

@@ -12,13 +12,14 @@
  * Additive and idempotent. Safe to run on every boot. Rolling back needs no
  * data change: older code ignores the column and keeps the one-level rule.
  *
- * Usage: node server/migrations/0020-conversation-may-create-sessions.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0020-conversation-may-create-sessions.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -36,11 +37,6 @@ export function migrateConversationMayCreateSessions(db) {
   return { applied: true, columnsAdded: 1 };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -52,8 +48,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0020 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0021-conversation-group-agent-marks.mjs

@@ -15,13 +15,14 @@
  * data change: older code ignores both columns (its boot repair removes an
  * empty group, as it always did).
  *
- * Usage: node server/migrations/0021-conversation-group-agent-marks.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0021-conversation-group-agent-marks.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 function tableExists(db, name) {
   return !!db
@@ -46,11 +47,6 @@ export function migrateConversationGroupAgentMarks(db) {
   return { applied: columnsAdded > 0, columnsAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -62,8 +58,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0021 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0022-relay-schedules.mjs

@@ -26,13 +26,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0022-relay-schedules.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0022-relay-schedules.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const RELAY_SCHEDULE_COLUMNS = Object.freeze([
   'id',
@@ -113,11 +114,6 @@ export function migrateRelaySchedules(db) {
   return { applied: tablesAdded > 0 || columnsAdded > 0, tablesAdded, columnsAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -129,8 +125,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0022 on ${dbPath}`);
     console.log(result.applied ? `  relay schedules: tables added ${result.tablesAdded}, columns added ${result.columnsAdded}` : '  skipped: nothing to change');

package/server/migrations/0023-relay-asks.mjs

@@ -29,13 +29,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0023-relay-asks.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0023-relay-asks.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const RELAY_ASK_COLUMNS = Object.freeze([
   'id',
@@ -112,11 +113,6 @@ export function migrateRelayAsks(db) {
   return { applied: tablesAdded > 0, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -128,8 +124,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0023 on ${dbPath}`);
     console.log(result.applied ? `  relay asks: tables added ${result.tablesAdded}` : '  skipped: nothing to change');

package/server/migrations/0024-deepseek-usage-totals.mjs

@@ -32,13 +32,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0024-deepseek-usage-totals.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0024-deepseek-usage-totals.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
 import path from 'path';
 import process from 'process';
 import Database from 'better-sqlite3';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const DEEPSEEK_USAGE_TOTALS_TABLE = 'deepseek_usage_totals';
 export const DEEPSEEK_USAGE_CHECKPOINTS_TABLE = 'deepseek_usage_checkpoints';
@@ -122,11 +123,6 @@ export function migrateDeepSeekUsageTotals(db) {
   return { applied: true, tablesAdded };
 }
 
-function defaultDbPath() {
-  const here = path.dirname(fileURLToPath(import.meta.url));
-  return path.resolve(here, '..', 'data', 'copilot.db');
-}
-
 export function migrate(dbPath, options = {}) {
   const db = new Database(dbPath, options);
   try {
@@ -138,8 +134,10 @@ export function migrate(dbPath, options = {}) {
 
 const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
 if (isMain) {
-  const dbPath = process.argv[2] ? path.resolve(process.argv[2]) : defaultDbPath();
   try {
+    // The given path, else the database in server/data (oar.db, else the
+    // name before 0.9.20); never a new one.
+    const dbPath = cliDbPath(process.argv[2], new URL('..', import.meta.url));
     const result = migrate(dbPath);
     console.log(`Migration 0024 on ${dbPath}`);
     console.log(result.applied ? `  deepseek usage totals: tables added ${result.tablesAdded}` : '  skipped: nothing to change');