kimaki 0.26.0 → 0.28.0

package/dist/runtime-lifecycle.e2e.test.js

@@ -19,7 +19,7 @@ import { getRuntime } from './session-handler/thread-session-runtime.js';
 import { setBotToken, initDatabase, closeDatabase, setChannelDirectory, setChannelVerbosity, } from './database.js';
 import { startHranaServer, stopHranaServer } from './hrana-server.js';
 import { initializeOpencodeForDirectory, restartOpencodeServer, stopOpencodeServer, } from './opencode.js';
-import { chooseLockPort, cleanupTestSessions, initTestGitRepo, waitForBotMessageContaining, waitForBotReplyAfterUserMessage, } from './test-utils.js';
+import { chooseLockPort, cleanupTestSessions, initTestGitRepo, isFooterMessage, waitForBotMessageContaining, waitForBotReplyAfterUserMessage, } from './test-utils.js';
 const TEST_USER_ID = '200000000000000888';
 const TEXT_CHANNEL_ID = '200000000000000889';
 function createRunDirectories() {
@@ -202,10 +202,10 @@ describe('runtime lifecycle', () => {
             fs.rmSync(directories.dataDir, { recursive: true, force: true });
         }
     }, 5_000);
-    test('three sequential completions reuse same runtime and listener', async () => {
-        // Sends A, waits for full completion (footer), sends B, waits for
-        // footer, sends C, waits for footer. Proves the listener stays alive
-        // across full run cycles without any interrupt/queue involvement.
+    test('two sequential completions reuse same runtime and listener', async () => {
+        // Sends A, waits for full completion (footer), then sends B and waits
+        // for its footer. Proves the listener stays alive across full run cycles
+        // without any interrupt/queue involvement.
         // This is the "calm" path — no abort, no queue, just sequential use.
         // 1. Send first message → thread created, session established
         await discord.channel(TEXT_CHANNEL_ID).user(TEST_USER_ID).sendMessage({
@@ -251,47 +251,20 @@ describe('runtime lifecycle', () => {
         });
         // Same runtime instance — listener was not recreated
         const runtimeAfterB = getRuntime(thread.id);
-        expect(runtimeAfterB).toBe(runtimeAfterA);
-        // 3. Send C after B fully completed
-        await th.user(TEST_USER_ID).sendMessage({
-            content: 'Reply with exactly: seq-gamma',
-        });
-        await waitForBotReplyAfterUserMessage({
-            discord,
-            threadId: thread.id,
-            userId: TEST_USER_ID,
-            userMessageIncludes: 'seq-gamma',
-            timeout: 4_000,
-        });
-        await waitForBotMessageContaining({
-            discord,
-            threadId: thread.id,
-            userId: TEST_USER_ID,
-            text: '*project',
-            afterUserMessageIncludes: 'seq-gamma',
-            timeout: 4_000,
-        });
-        // Still the same runtime — three full cycles, one runtime, one listener
-        const runtimeAfterC = getRuntime(thread.id);
         expect(await th.text()).toMatchInlineSnapshot(`
         "--- from: user (lifecycle-tester)
         Reply with exactly: seq-alpha
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000888>
         --- from: user (lifecycle-tester)
         Reply with exactly: seq-beta
         --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
-        --- from: user (lifecycle-tester)
-        Reply with exactly: seq-gamma
-        --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000888>"
       `);
-        expect(runtimeAfterC).toBe(runtimeAfterA);
+        expect(runtimeAfterB).toBe(runtimeAfterA);
     }, 15_000);
     test('footer includes context percentage and model id', async () => {
         const prompt = 'Reply with exactly: footer-check';
@@ -313,10 +286,7 @@ describe('runtime lifecycle', () => {
         });
         const messages = await discord.thread(thread.id).getMessages();
         const footerMessage = messages.find((message) => {
-            if (message.author.id !== discord.botUserId) {
-                return false;
-            }
-            if (!message.content.startsWith('*')) {
+            if (!isFooterMessage({ message, botUserId: discord.botUserId })) {
                 return false;
             }
             return message.content.includes('deterministic-v2') && message.content.includes('%');
@@ -325,9 +295,9 @@ describe('runtime lifecycle', () => {
         "--- from: user (lifecycle-tester)
         Reply with exactly: footer-check
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000888>"
       `);
         expect(footerMessage).toBeDefined();
         if (!footerMessage) {
@@ -383,14 +353,14 @@ describe('runtime lifecycle', () => {
         "--- from: user (lifecycle-tester)
         Reply with exactly: reconnect-alpha
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+        > *using deterministic-provider/deterministic-v2*
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000888>
         --- from: user (lifecycle-tester)
         Reply with exactly: reconnect-beta
         --- from: assistant (TestBot)
-        ⬥ ok
-        *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
+        > ok
+        > *project ⋅ main ⋅ <1s ⋅ 0% ⋅ deterministic-v2* <@200000000000000888>"
       `);
         const runtimeAfterRestart = getRuntime(thread.id);
         expect(runtimeAfterRestart).toBe(runtimeBeforeRestart);
@@ -420,7 +390,7 @@ describe('runtime lifecycle', () => {
         "--- from: user (lifecycle-tester)
         Reply with exactly: footer-high-usage
         --- from: assistant (TestBot)
-        *using deterministic-provider/deterministic-v2*"
+        > *using deterministic-provider/deterministic-v2*"
       `);
         const threadText = await discord.thread(thread.id).text();
         expect(threadText).not.toContain('⬦ context usage');

package/dist/schema.js

@@ -27,6 +27,10 @@ export const thread_sessions = sqliteCore.sqliteTable('thread_sessions', {
     // Survives bot restarts so child multi-turn system prompts keep the parent ID.
     parent_session_id: sqliteCore.text('parent_session_id'),
     created_at: datetime('created_at').default(orm.sql `CURRENT_TIMESTAMP`),
+    // Bumped on every (re)binding of a session to this thread. /resume can map one
+    // session to several threads, so session_id -> thread_id needs a tiebreaker.
+    // Without it the reverse lookup is arbitrary and tools can target a dead thread.
+    updated_at: datetime('updated_at').default(orm.sql `CURRENT_TIMESTAMP`).$onUpdate(() => new Date()),
 });
 export const session_events = sqliteCore.sqliteTable('session_events', {
     id: sqliteCore.integer('id', { mode: 'number' }).primaryKey({ autoIncrement: true }).notNull(),
@@ -42,7 +46,7 @@ export const session_events = sqliteCore.sqliteTable('session_events', {
 export const part_messages = sqliteCore.sqliteTable('part_messages', {
     part_id: sqliteCore.text('part_id').primaryKey().notNull(),
     message_id: sqliteCore.text('message_id').notNull(),
-    thread_id: sqliteCore.text('thread_id').notNull().references(() => thread_sessions.thread_id, { onUpdate: 'cascade' }),
+    thread_id: sqliteCore.text('thread_id').notNull().references(() => thread_sessions.thread_id, { onDelete: 'cascade', onUpdate: 'cascade' }),
     created_at: datetime('created_at').default(orm.sql `CURRENT_TIMESTAMP`),
 });
 export const bot_tokens = sqliteCore.sqliteTable('bot_tokens', {
@@ -198,6 +202,35 @@ export const forum_sync_configs = sqliteCore.sqliteTable('forum_sync_configs', {
 }, (table) => [
     sqliteCore.uniqueIndex('forum_sync_configs_app_id_forum_channel_id_key').on(table.app_id, table.forum_channel_id),
 ]);
+// Durable "wake this session later" rows for the kimaki_sleep tool.
+//
+// Delivery is at-least-once, and ingress makes it at-most-once-per-turn:
+//
+//   planned ──► consumed          cancelled / failed are terminal
+//      ▲   │
+//      └───┘ retried until ingress consumes it
+//
+// A row stays `planned` until ingress turns the wake into a turn, so ANY loss
+// (crash before posting, crash after posting, missed gateway event) is covered
+// by the same retry. `delivery_id` is the Discord message nonce, so a retry
+// returns the existing message instead of waking the session twice.
+//
+// There is no thread_id: the owning thread is resolved from session_id at wake
+// time, so a session rebound by /resume wakes in its current thread.
+export const session_sleeps = sqliteCore.sqliteTable('session_sleeps', {
+    session_id: sqliteCore.text('session_id').primaryKey().notNull(),
+    wake_at: datetime('wake_at').notNull(),
+    reason: sqliteCore.text('reason'),
+    status: sqliteCore.text('status', { enum: ['planned', 'consumed', 'cancelled', 'failed'] }).notNull().default('planned'),
+    // Regenerated per sleep occurrence. Doubles as the Discord nonce and as a
+    // generation guard so a stale in-flight wake cannot mutate a newer sleep.
+    delivery_id: sqliteCore.text('delivery_id').notNull().$defaultFn(() => crypto.randomUUID()),
+    attempts: sqliteCore.integer('attempts', { mode: 'number' }).notNull().default(0),
+    last_attempt_at: datetime('last_attempt_at'),
+    created_at: datetime('created_at').default(orm.sql `CURRENT_TIMESTAMP`),
+}, (table) => [
+    sqliteCore.index('session_sleeps_status_wake_at_idx').on(table.status, table.wake_at),
+]);
 export const ipc_requests = sqliteCore.sqliteTable('ipc_requests', {
     id: sqliteCore.text('id').primaryKey().notNull().$defaultFn(() => crypto.randomUUID()),
     type: sqliteCore.text('type', { enum: ['file_upload', 'action_buttons'] }).notNull(),
@@ -232,6 +265,7 @@ export const relations = defineRelations({
     scheduled_task_runs,
     session_start_sources,
     forum_sync_configs,
+    session_sleeps,
     ipc_requests,
 }, (r) => ({
     thread_sessions: {