@oar-sh/oar 0.9.18 → 0.9.20

package/server/migrations/0025-deepseek-usage-requests-daily.mjs

@@ -28,7 +28,7 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0025-deepseek-usage-requests-daily.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0025-deepseek-usage-requests-daily.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
@@ -37,6 +37,7 @@ import process from 'process';
 import Database from 'better-sqlite3';
 
 import { DEEPSEEK_USAGE_TOTALS_TABLE, migrateDeepSeekUsageTotals } from './0024-deepseek-usage-totals.mjs';
+import { cliDbPath } from '../services/database-file.mjs';
 
 export const DEEPSEEK_USAGE_DAYS_TABLE = 'deepseek_usage_days';
 export const DEEPSEEK_BALANCE_REFERENCE_TABLE = 'deepseek_balance_reference';
@@ -148,11 +149,6 @@ export function migrateDeepSeekUsageRequestsDaily(db) {
   return { applied: columnsAdded + 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 {
@@ -164,8 +160,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 0025 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0026-deepseek-usage-served-models.mjs

@@ -29,7 +29,7 @@
  * Idempotent: a database without such rows is left as it is. Safe to run on
  * every boot.
  *
- * Usage: node server/migrations/0026-deepseek-usage-served-models.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0026-deepseek-usage-served-models.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
@@ -40,6 +40,7 @@ import { DEEPSEEK_USAGE_CHECKPOINTS_TABLE, DEEPSEEK_USAGE_TOTALS_TABLE } from '.
 import { DEEPSEEK_USAGE_DAYS_TABLE, migrateDeepSeekUsageRequestsDaily } from './0025-deepseek-usage-requests-daily.mjs';
 import { deepseekServedModel } from '../../shared/deepseek-models.mjs';
 import { estimateCost, estimateSearchCost } from '../../shared/deepseek-pricing.mjs';
+import { cliDbPath } from '../services/database-file.mjs';
 
 /** The DeepSeek model a stored model name is folded into, or '' when the row stays. */
 export function deepseekFoldedModel(model) {
@@ -191,11 +192,6 @@ export function migrateDeepSeekUsageServedModels(db) {
   return { applied: result.totalsFolded + result.daysFolded + result.checkpointsFolded > 0, ...result };
 }
 
-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 {
@@ -207,8 +203,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 0026 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0027-deepseek-usage-checkpoint-runs.mjs

@@ -21,7 +21,7 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0027-deepseek-usage-checkpoint-runs.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0027-deepseek-usage-checkpoint-runs.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
@@ -30,6 +30,7 @@ import process from 'process';
 import Database from 'better-sqlite3';
 
 import { DEEPSEEK_USAGE_CHECKPOINTS_TABLE, migrateDeepSeekUsageTotals } from './0024-deepseek-usage-totals.mjs';
+import { cliDbPath } from '../services/database-file.mjs';
 
 // Added to deepseek_usage_checkpoints, with their DDL.
 export const DEEPSEEK_USAGE_CHECKPOINT_RUN_COLUMNS = Object.freeze([
@@ -70,11 +71,6 @@ export function migrateDeepSeekUsageCheckpointRuns(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 {
@@ -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 0027 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0028-deepseek-usage-checkpoint-request-runs.mjs

@@ -20,7 +20,7 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0028-deepseek-usage-checkpoint-request-runs.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0028-deepseek-usage-checkpoint-request-runs.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
@@ -30,6 +30,7 @@ import Database from 'better-sqlite3';
 
 import { DEEPSEEK_USAGE_CHECKPOINTS_TABLE } from './0024-deepseek-usage-totals.mjs';
 import { migrateDeepSeekUsageCheckpointRuns } from './0027-deepseek-usage-checkpoint-runs.mjs';
+import { cliDbPath } from '../services/database-file.mjs';
 
 // Added to deepseek_usage_checkpoints, with their DDL.
 export const DEEPSEEK_USAGE_CHECKPOINT_REQUEST_RUN_COLUMNS = Object.freeze([
@@ -68,11 +69,6 @@ export function migrateDeepSeekUsageCheckpointRequestRuns(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 {
@@ -84,8 +80,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 0028 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0029-deepseek-balance-rises.mjs

@@ -19,7 +19,7 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0029-deepseek-balance-rises.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0029-deepseek-balance-rises.mjs [path/to/oar.db]
  */
 
 import { fileURLToPath } from 'url';
@@ -28,6 +28,7 @@ import process from 'process';
 import Database from 'better-sqlite3';
 
 import { DEEPSEEK_BALANCE_REFERENCE_TABLE, migrateDeepSeekUsageRequestsDaily } from './0025-deepseek-usage-requests-daily.mjs';
+import { cliDbPath } from '../services/database-file.mjs';
 
 // Added to deepseek_balance_reference, with their DDL.
 export const DEEPSEEK_BALANCE_RISE_COLUMNS = Object.freeze([
@@ -68,11 +69,6 @@ export function migrateDeepSeekBalanceRises(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 {
@@ -84,8 +80,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 0029 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0030-deepseek-usage-actuals.mjs

@@ -20,13 +20,14 @@
  * The relay's own usage tables are not touched. Additive and idempotent.
  * Safe to run on every boot.
  *
- * Usage: node server/migrations/0030-deepseek-usage-actuals.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0030-deepseek-usage-actuals.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_ACTUALS_TABLE = 'deepseek_usage_actuals';
 
@@ -92,11 +93,6 @@ export function migrateDeepSeekUsageActuals(db) {
   return { applied: !existed, tableCreated: !existed };
 }
 
-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 {
@@ -108,8 +104,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 0030 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0031-queue-provider.mjs

@@ -28,13 +28,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0031-queue-provider.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0031-queue-provider.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 QUEUE_PROVIDER_COLUMN = 'provider';
 export const QUEUE_PROVIDER_TRIGGERS = Object.freeze(['queue_provider_after_insert', 'queue_provider_after_requeue']);
@@ -112,11 +113,6 @@ export function migrateQueueProvider(db) {
   return { applied: columnsAdded > 0 || triggersAdded > 0 || rowsFilled > 0, columnsAdded, triggersAdded, rowsFilled };
 }
 
-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 0031 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0032-runtime-session-billing-switch.mjs

@@ -18,13 +18,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0032-runtime-session-billing-switch.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0032-runtime-session-billing-switch.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';
 
 // Added to runtime_sessions, with their DDL.
 export const RUNTIME_SESSION_BILLING_SWITCH_COLUMNS = Object.freeze([
@@ -63,11 +64,6 @@ export function migrateRuntimeSessionBillingSwitch(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 {
@@ -79,8 +75,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 0032 on ${dbPath}`);
     console.log(result.applied

package/server/migrations/0033-claude-api-usage-checkpoints.mjs

@@ -33,13 +33,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0033-claude-api-usage-checkpoints.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0033-claude-api-usage-checkpoints.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 CLAUDE_API_USAGE_CHECKPOINTS_TABLE = 'claude_api_usage_checkpoints';
 
@@ -109,11 +110,6 @@ export function migrateClaudeApiUsageCheckpoints(db) {
   return { applied: true, tablesAdded: 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 {
@@ -125,8 +121,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 0033 on ${dbPath}`);
     console.log(result.applied ? `  claude api usage checkpoints: tables added ${result.tablesAdded}` : '  skipped: nothing to change');

package/server/migrations/0034-claude-api-usage-totals.mjs

@@ -23,13 +23,14 @@
  *
  * Additive and idempotent. Safe to run on every boot.
  *
- * Usage: node server/migrations/0034-claude-api-usage-totals.mjs [path/to/copilot.db]
+ * Usage: node server/migrations/0034-claude-api-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 CLAUDE_API_USAGE_TOTALS_TABLE = 'claude_api_usage_totals';
 
@@ -83,11 +84,6 @@ export function migrateClaudeApiUsageTotals(db) {
   return { applied: true, tablesAdded: 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 {
@@ -99,8 +95,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 0034 on ${dbPath}`);
     console.log(result.applied ? `  claude api usage totals: tables added ${result.tablesAdded}` : '  skipped: nothing to change');

package/server/migrations/0035-conversation-plan-only.mjs

@@ -0,0 +1,87 @@
+'use strict';
+
+/**
+ * Migration: a conversation that is plan-only.
+ *
+ * `plan_only` is 1 when the session is locked in plan mode: agents cannot
+ * switch it to another mode (a relay_tool send or update_session naming one
+ * is refused), while the owner still can. NULL or 0 means not plan-only. It
+ * is set only when asked: relay_tool create_session or update_session with
+ * `planOnly`, or the owner's toggle. Plan mode alone never sets it.
+ *
+ * Also the index `idx_queue_conversation_status` on queue(conversation_id,
+ * status, timestamp), which the queue claim's plan-boundary hold reads.
+ *
+ * Additive and idempotent. Safe to run on every boot. Rolling back needs no
+ * data change: older code ignores the column and the lock with it.
+ *
+ * Usage: node server/migrations/0035-conversation-plan-only.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 QUEUE_CONVERSATION_STATUS_INDEX = 'idx_queue_conversation_status';
+
+function indexExists(db, name) {
+  return !!db
+    .prepare(`SELECT name FROM sqlite_master WHERE type = 'index' AND name = ?`)
+    .get(name);
+}
+
+function tableExists(db, name) {
+  return !!db
+    .prepare(`SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?`)
+    .get(name);
+}
+
+export function migrateConversationPlanOnly(db) {
+  if (!tableExists(db, 'conversations')) {
+    throw new Error('conversations is missing (the base schema has not run)');
+  }
+  const present = new Set(db.prepare(`PRAGMA table_info(conversations)`).all().map((column) => column.name));
+  let columnsAdded = 0;
+  if (!present.has('plan_only')) {
+    db.exec(`ALTER TABLE conversations ADD COLUMN plan_only INTEGER`);
+    columnsAdded = 1;
+  }
+  // The queue claim's plan-boundary hold looks up one conversation's pending
+  // and processing rows in send order (message-repository.mjs,
+  // planBoundaryHoldSql); without this index it walked every conversation's.
+  let indexesAdded = 0;
+  if (tableExists(db, 'queue') && !indexExists(db, QUEUE_CONVERSATION_STATUS_INDEX)) {
+    db.exec(`CREATE INDEX IF NOT EXISTS ${QUEUE_CONVERSATION_STATUS_INDEX} ON queue(conversation_id, status, timestamp)`);
+    indexesAdded = 1;
+  }
+  return { applied: columnsAdded + indexesAdded > 0, columnsAdded, indexesAdded };
+}
+
+export function migrate(dbPath, options = {}) {
+  const db = new Database(dbPath, options);
+  try {
+    return migrateConversationPlanOnly(db);
+  } finally {
+    db.close();
+  }
+}
+
+const isMain = process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
+if (isMain) {
+  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 0035 on ${dbPath}`);
+    console.log(result.applied
+      ? `  plan only: columns added ${result.columnsAdded}, indexes added ${result.indexesAdded}`
+      : '  skipped: nothing to change');
+    process.exit(0);
+  } catch (err) {
+    console.error(`Migration 0035 failed: ${err?.message || err}`);
+    process.exit(1);
+  }
+}