fix(v2): cancel/pause/resume recurring tasks via series_id
Recurring tasks spawn a new messages_in row per occurrence. Cancel only matched the completed row the agent remembered, leaving the live next occurrence running. Tag every row in a recurrence chain with the originating task's id (series_id) so cancel/pause/resume can reach any live row in the series. Cancel also clears recurrence to prevent the sweep from cloning a cancelled task. Kind-aware id prefix on recurrences (task- instead of msg-) keeps list_tasks output consistent across occurrences. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
201
src/db/session-db.test.ts
Normal file
201
src/db/session-db.test.ts
Normal file
@@ -0,0 +1,201 @@
|
||||
/**
|
||||
* Tests for per-session messages_in operations — focused on the series_id
|
||||
* invariant that lets cancel/pause/resume reach the live next occurrence of
|
||||
* a recurring task, even after the row the agent remembers has completed
|
||||
* and been replaced by a follow-up.
|
||||
*/
|
||||
import Database from 'better-sqlite3';
|
||||
import fs from 'fs';
|
||||
import path from 'path';
|
||||
import { describe, it, expect, afterEach } from 'vitest';
|
||||
|
||||
import {
|
||||
ensureSchema,
|
||||
openInboundDb,
|
||||
insertTask,
|
||||
insertRecurrence,
|
||||
cancelTask,
|
||||
pauseTask,
|
||||
resumeTask,
|
||||
getCompletedRecurring,
|
||||
migrateMessagesInTable,
|
||||
type RecurringMessage,
|
||||
} from './session-db.js';
|
||||
|
||||
const TEST_DIR = '/tmp/nanoclaw-session-db-test';
|
||||
const DB_PATH = path.join(TEST_DIR, 'inbound.db');
|
||||
|
||||
function freshDb() {
|
||||
if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
|
||||
fs.mkdirSync(TEST_DIR, { recursive: true });
|
||||
ensureSchema(DB_PATH, 'inbound');
|
||||
return openInboundDb(DB_PATH);
|
||||
}
|
||||
|
||||
function insertBasicTask(db: ReturnType<typeof openInboundDb>, id: string, recurrence: string | null) {
|
||||
insertTask(db, {
|
||||
id,
|
||||
processAfter: new Date().toISOString(),
|
||||
recurrence,
|
||||
platformId: null,
|
||||
channelType: null,
|
||||
threadId: null,
|
||||
content: JSON.stringify({ prompt: 'noop' }),
|
||||
});
|
||||
}
|
||||
|
||||
afterEach(() => {
|
||||
if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
|
||||
});
|
||||
|
||||
describe('insertTask', () => {
|
||||
it('stamps series_id = id on insert', () => {
|
||||
const db = freshDb();
|
||||
insertBasicTask(db, 'task-1', null);
|
||||
const row = db.prepare('SELECT series_id FROM messages_in WHERE id = ?').get('task-1') as { series_id: string };
|
||||
expect(row.series_id).toBe('task-1');
|
||||
db.close();
|
||||
});
|
||||
});
|
||||
|
||||
describe('cancelTask / pauseTask / resumeTask series matching', () => {
|
||||
// Simulates the recurrence chain that used to survive cancellation:
|
||||
// the original task completes → handleRecurrence spawns a follow-up
|
||||
// row → agent calls cancel_task(originalId) → historically only hit
|
||||
// the completed row, leaving the live one running.
|
||||
function seedRecurringChain(db: ReturnType<typeof openInboundDb>) {
|
||||
insertBasicTask(db, 'task-orig', '0 9 * * *');
|
||||
// Mark the original as completed (as syncProcessingAcks would do).
|
||||
db.prepare("UPDATE messages_in SET status = 'completed' WHERE id = 'task-orig'").run();
|
||||
|
||||
const msg: RecurringMessage = {
|
||||
id: 'task-orig',
|
||||
kind: 'task',
|
||||
content: JSON.stringify({ prompt: 'noop' }),
|
||||
recurrence: '0 9 * * *',
|
||||
process_after: null,
|
||||
platform_id: null,
|
||||
channel_type: null,
|
||||
thread_id: null,
|
||||
series_id: 'task-orig',
|
||||
};
|
||||
insertRecurrence(db, msg, 'task-next', new Date(Date.now() + 86400000).toISOString());
|
||||
}
|
||||
|
||||
it('cancel by original id reaches the live follow-up via series_id', () => {
|
||||
const db = freshDb();
|
||||
seedRecurringChain(db);
|
||||
|
||||
cancelTask(db, 'task-orig');
|
||||
|
||||
const live = db.prepare("SELECT id, status, recurrence FROM messages_in WHERE status = 'pending'").all();
|
||||
expect(live).toHaveLength(0);
|
||||
|
||||
const followUp = db.prepare("SELECT status, recurrence FROM messages_in WHERE id = 'task-next'").get() as {
|
||||
status: string;
|
||||
recurrence: string | null;
|
||||
};
|
||||
expect(followUp.status).toBe('completed');
|
||||
// Recurrence cleared so the sweep doesn't spawn another clone.
|
||||
expect(followUp.recurrence).toBeNull();
|
||||
db.close();
|
||||
});
|
||||
|
||||
it('cancelled task is not picked up by getCompletedRecurring', () => {
|
||||
const db = freshDb();
|
||||
insertBasicTask(db, 'task-1', '0 9 * * *');
|
||||
cancelTask(db, 'task-1');
|
||||
|
||||
const recurring = getCompletedRecurring(db);
|
||||
expect(recurring).toHaveLength(0);
|
||||
db.close();
|
||||
});
|
||||
|
||||
it('pause by original id pauses the live follow-up', () => {
|
||||
const db = freshDb();
|
||||
seedRecurringChain(db);
|
||||
|
||||
pauseTask(db, 'task-orig');
|
||||
|
||||
const followUp = db.prepare("SELECT status FROM messages_in WHERE id = 'task-next'").get() as { status: string };
|
||||
expect(followUp.status).toBe('paused');
|
||||
db.close();
|
||||
});
|
||||
|
||||
it('resume by original id resumes the live follow-up', () => {
|
||||
const db = freshDb();
|
||||
seedRecurringChain(db);
|
||||
|
||||
db.prepare("UPDATE messages_in SET status = 'paused' WHERE id = 'task-next'").run();
|
||||
resumeTask(db, 'task-orig');
|
||||
|
||||
const followUp = db.prepare("SELECT status FROM messages_in WHERE id = 'task-next'").get() as { status: string };
|
||||
expect(followUp.status).toBe('pending');
|
||||
db.close();
|
||||
});
|
||||
});
|
||||
|
||||
describe('insertRecurrence', () => {
|
||||
it('copies series_id forward', () => {
|
||||
const db = freshDb();
|
||||
insertBasicTask(db, 'task-orig', '0 9 * * *');
|
||||
db.prepare("UPDATE messages_in SET status = 'completed' WHERE id = 'task-orig'").run();
|
||||
|
||||
const msg: RecurringMessage = {
|
||||
id: 'task-orig',
|
||||
kind: 'task',
|
||||
content: '{}',
|
||||
recurrence: '0 9 * * *',
|
||||
process_after: null,
|
||||
platform_id: null,
|
||||
channel_type: null,
|
||||
thread_id: null,
|
||||
series_id: 'task-orig',
|
||||
};
|
||||
insertRecurrence(db, msg, 'task-next', new Date().toISOString());
|
||||
|
||||
const row = db.prepare('SELECT series_id FROM messages_in WHERE id = ?').get('task-next') as {
|
||||
series_id: string;
|
||||
};
|
||||
expect(row.series_id).toBe('task-orig');
|
||||
db.close();
|
||||
});
|
||||
});
|
||||
|
||||
describe('migrateMessagesInTable', () => {
|
||||
it('backfills series_id = id on legacy rows and is idempotent', () => {
|
||||
if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
|
||||
fs.mkdirSync(TEST_DIR, { recursive: true });
|
||||
|
||||
// Build a legacy inbound.db WITHOUT series_id to simulate a pre-fix install.
|
||||
const db = new Database(DB_PATH);
|
||||
db.exec(`
|
||||
CREATE TABLE messages_in (
|
||||
id TEXT PRIMARY KEY,
|
||||
seq INTEGER UNIQUE,
|
||||
kind TEXT NOT NULL,
|
||||
timestamp TEXT NOT NULL,
|
||||
status TEXT DEFAULT 'pending',
|
||||
process_after TEXT,
|
||||
recurrence TEXT,
|
||||
tries INTEGER DEFAULT 0,
|
||||
platform_id TEXT,
|
||||
channel_type TEXT,
|
||||
thread_id TEXT,
|
||||
content TEXT NOT NULL
|
||||
);
|
||||
`);
|
||||
db.prepare(
|
||||
"INSERT INTO messages_in (id, seq, kind, timestamp, status, content) VALUES (?, ?, 'task', datetime('now'), 'pending', '{}')",
|
||||
).run('legacy-1', 2);
|
||||
|
||||
migrateMessagesInTable(db);
|
||||
migrateMessagesInTable(db); // idempotent
|
||||
|
||||
const row = db.prepare('SELECT series_id FROM messages_in WHERE id = ?').get('legacy-1') as {
|
||||
series_id: string;
|
||||
};
|
||||
expect(row.series_id).toBe('legacy-1');
|
||||
db.close();
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user