kimaki 1.3.0 → 1.5.0

package/dist/session-ops.e2e.test.js

@@ -3,7 +3,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { afterAll, beforeAll, expect, test } from 'vitest';
-import { TEST_USER_ID, scriptedTurn, seedProjectChannel, startOpencodeTestServer, startTestBot, startTwin, tempDataDir, textParts, waitForBotMessageContaining, waitForFooter, warmUp, } from "./test/harness.js";
+import { TEST_USER_ID, scriptedTurn, seedProjectChannel, startOpencodeTestServer, startTestBot, startTwin, tempDataDir, textParts, waitFor, waitForBotMessageContaining, waitForFooter, warmUp, } from "./test/harness.js";
 const matchers = [
     // OpenCode rejects a summary without the template headings.
     {
@@ -13,6 +13,21 @@ const matchers = [
         then: { parts: textParts('## Objective\n- Test compaction') },
     },
     { id: 'usage', priority: 500, when: { latestUserTextIncludes: 'usage-marker' }, then: { parts: textParts('counted') } },
+    // A reasoning block that stays open long enough to run /context-usage inside it.
+    {
+        id: 'slow-thinking',
+        priority: 500,
+        when: { latestUserTextIncludes: 'thinking-marker' },
+        then: {
+            parts: [
+                { type: 'reasoning-start', id: 'r1' },
+                { type: 'reasoning-delta', id: 'r1', delta: 'pondering' },
+                { type: 'reasoning-end', id: 'r1' },
+                ...textParts('thought it through'),
+            ],
+            partDelaysMs: [0, 0, 2_500, 0, 0, 0, 0],
+        },
+    },
     ...scriptedTurn({
         marker: 'write-marker',
         steps: [{ id: 'call-write-1', tool: 'write', input: { path: 'undo.txt', content: 'written by the agent\n' } }],
@@ -50,39 +65,75 @@ async function command(threadId, name, text) {
     await twin.discord.thread(threadId).waitForInteractionAck({ interactionId: id });
     return waitForBotMessageContaining({ discord: twin.discord, threadId, text });
 }
+// /context-usage status durations depend on timing.
+function stableDurations(text) {
+    return text.replace(/<1s|\b\d+m \d+s\b|\b\d+s\b/g, 'Ns');
+}
 test('/diff with a clean working tree and /context-usage after a turn', async () => {
     const thread = await newThread('Hello usage-marker');
     await command(thread.id, 'diff', 'No changes');
     await command(thread.id, 'context-usage', 'Context usage');
-    expect(await twin.discord.thread(thread.id).text()).toMatchInlineSnapshot(`
+    expect(stableDurations(await twin.discord.thread(thread.id).text())).toMatchInlineSnapshot(`
     "--- from: user (tommy)
     Hello usage-marker
     --- from: assistant (TestBot)
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     counted
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
     No changes to show
     **Context usage:** 0%, 2 / 200,000 tokens
-    **Model:** deterministic-provider/deterministic-v2"
+    **Model:** deterministic-provider/deterministic-v2
+    **Status:** idle for Ns"
+  `);
+});
+test('/context-usage while the model thinks shows the run and what it does', async () => {
+    const { discord, channelId } = twin;
+    const before = new Set((await discord.channel(channelId).getThreads()).map((thread) => thread.id));
+    await discord.channel(channelId).user(TEST_USER_ID).sendMessage({ content: 'Ponder this thinking-marker' });
+    const thread = await discord.channel(channelId).waitForThread({ timeout: 8_000, predicate: (candidate) => !before.has(candidate.id) });
+    const client = await server.client();
+    await waitFor({
+        label: 'open reasoning block',
+        check: async () => {
+            const sessionId = bot.store.getState().roots[thread.id];
+            if (!sessionId)
+                return null;
+            const messages = await client.message.list({ sessionID: sessionId, type: 'assistant', order: 'desc', limit: 1 });
+            return messages.data.some((message) => message.type === 'assistant' && message.content.some((part) => part.type === 'reasoning')) || null;
+        },
+    });
+    await command(thread.id, 'context-usage', 'Status:');
+    await waitForFooter({ discord, threadId: thread.id });
+    expect(stableDurations(await discord.thread(thread.id).text())).toMatchInlineSnapshot(`
+    "--- from: user (tommy)
+    Ponder this thinking-marker
+    --- from: assistant (TestBot)
+    -# *using deterministic-provider/deterministic-v2 ⋅ build*
+    Token usage not available for this session yet
+    **Status:** running for Ns, thinking for Ns
+    **Last activity:** Ns ago, thinking
+    thought it through
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*"
   `);
 });
 test('/compact summarizes the history without a footer', async () => {
     const thread = await newThread('Something to compact');
     await command(thread.id, 'compact', 'Compacting');
-    await waitForBotMessageContaining({ discord: twin.discord, threadId: thread.id, text: 'context compacted' });
+    const sessionId = bot.store.getState().roots[thread.id];
+    const client = await server.client();
+    await waitFor({
+        label: 'compaction message',
+        check: async () => (await client.message.list({ sessionID: sessionId, order: 'asc' })).data.some((message) => message.type === 'compaction') || null,
+    });
     expect(await twin.discord.thread(thread.id).text()).toMatchInlineSnapshot(`
     "--- from: user (tommy)
     Something to compact
     --- from: assistant (TestBot)
     -# *using deterministic-provider/deterministic-v2 ⋅ build*
     ok
-    -# *project ⋅ main ⋅ Ns ⋅ deterministic-v2*
-    Compacting the session context
-    -# ⬦ context compacted"
+    -# *main ⋅ Ns ⋅ deterministic-v2*
+    Compacting the session context"
   `);
-    const sessionId = bot.store.getState().roots[thread.id];
-    const messages = await (await server.client()).message.list({ sessionID: sessionId, order: 'asc' });
-    expect(messages.data.map((message) => message.type)).toContain('compaction');
 });
 test('/undo hides the last turn but keeps its files, /redo restores the turn', async () => {
     const file = path.join(server.projectDirectory, 'undo.txt');
@@ -105,7 +156,7 @@ test('/undo hides the last turn but keeps its files, /redo restores the turn', a
     -# ◼︎ write *undo.txt* (2 lines)
 
     wrote undo.txt
-    -# *project ⋅ main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
+    -# *main ⋅ Ns ⋅ N% ⋅ deterministic-v2*
     Undone - removed the last turn from the session. File changes were kept
     Restored - session fully back to its previous state
     Nothing to redo - no previous undo found"

package/dist/session-ops.e2e.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-ops.e2e.test.js","sourceRoot":"","sources":["../src/session-ops.e2e.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-ops.e2e.test.js","sourceRoot":"","sources":["../src/session-ops.e2e.test.ts"],"names":[],"mappings":"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"}

package/dist/sessions.d.ts

@@ -1,7 +1,8 @@
-import type { ThreadChannel } from 'discord.js';
-import { type Author, type Bot, type ModelChoice, type PromptFile } from './bot.ts';
+import type { TextChannel } from 'discord.js';
+import { type Author, type Bot, type Conversation, type ModelChoice, type PromptFile } from './bot.ts';
 import { ConfigError, DbError, DiscordError, OpenCodeError, OpenCodeUnavailableError } from './errors.ts';
 import type { OpenCodeClient } from './opencode-server.ts';
+import { type Sender } from './prompt.ts';
 import type { Route } from './routes.ts';
 import { type ScheduledRun } from './system-prompt.ts';
 type PermissionRules = NonNullable<NonNullable<Parameters<OpenCodeClient['session']['create']>[0]>['permissions']>;
@@ -12,15 +13,15 @@ export declare function btwPrompt({ text, parentSessionId, sourceThreadId, sessi
     sessionId: string;
     threadId: string;
 }): string;
-export declare function threadProject(bot: Bot, thread: ThreadChannel): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | {
+export declare function conversationProject(bot: Bot, conversation: Conversation): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | {
     channelId: string;
     projectDirectory: string;
     directory: string;
 }>;
-export declare function sessionCwd(bot: Bot, { thread, directory }: {
-    thread: ThreadChannel;
+export declare function sessionCwd(bot: Bot, { conversation, directory }: {
+    conversation: Conversation;
     directory?: string;
-}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
+}): Promise<ConfigError | DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | import("./worktrees.ts").GitError | {
     directory: string;
     requestedDirectory?: undefined;
 } | {
@@ -28,40 +29,46 @@ export declare function sessionCwd(bot: Bot, { thread, directory }: {
     directory?: undefined;
 }>;
 export declare function catalogReady(bot: Pick<Bot, 'opencode'>, directory: string): Promise<OpenCodeError | OpenCodeUnavailableError | undefined>;
-export declare function primaryAgents(bot: Bot, directory: string): Promise<OpenCodeError | OpenCodeUnavailableError | import("@opencode/client").AgentInfo[]>;
+export declare function primaryAgents(bot: Pick<Bot, 'opencode'>, directory: string): Promise<OpenCodeError | OpenCodeUnavailableError | import("@opencode/client").AgentInfo[]>;
+export declare function channelDefaults(bot: Pick<Bot, 'db' | 'opencode'>, channelId: string): Promise<DbError | OpenCodeError | OpenCodeUnavailableError | {
+    projectDirectory: string;
+    defaultAgent: string | null;
+} | null>;
 export declare function agentSelection(bot: Bot, { directory, agent }: {
     directory: string;
     agent: string;
-}): Promise<OpenCodeError | OpenCodeUnavailableError | ConfigError | {
+}): Promise<ConfigError | OpenCodeError | OpenCodeUnavailableError | {
     agent: string;
     model: ModelChoice | null;
 }>;
-export declare function switchAgent(bot: Bot, { sessionId, directory, agent, model }: {
+export declare function switchAgent(bot: Bot, { sessionId, directory, agent, model, reselect, }: {
     sessionId: string;
     directory: string;
     agent: string;
     model?: ModelChoice | null;
-}): Promise<OpenCodeError | OpenCodeUnavailableError | ConfigError | {
+    reselect?: boolean;
+}): Promise<ConfigError | OpenCodeError | OpenCodeUnavailableError | {
     model: ModelChoice | null;
     agent: string;
 }>;
 export type PluginWait = (directory: string) => Promise<ConfigError | OpenCodeUnavailableError | OpenCodeError | void>;
 export declare function createPluginWait(bot: Pick<Bot, 'opencode'>): PluginWait;
-export declare function ensureSessionMarker(bot: Bot, { sessionId, thread, channelId, directory, userId, }: {
+export declare function ensureSessionMarker(bot: Bot, { sessionId, conversation, channelId, directory, userId, }: {
     sessionId: string;
-    thread: ThreadChannel;
+    conversation: Conversation;
     channelId: string;
     directory: string;
     userId: string;
 }): Promise<ConfigError | OpenCodeUnavailableError | OpenCodeError | DiscordError | void>;
 export declare function refreshCliContext(bot: Bot): Promise<OpenCodeError | OpenCodeUnavailableError | undefined>;
-export declare function startSession(bot: Bot, { channelId, directory: requestedDirectory, route, author, messageId, startMessageId, showInput, threadName: explicitName, files, model: explicitModel, permissions, parentSessionId, task, worktree, baseBranch, run, }: {
+export declare function startSession(bot: Bot, { channelId, directory: requestedDirectory, route, author, members, messageId, startMessageId, showInput, threadName: explicitName, files, model: explicitModel, permissions, parentSessionId, sender, task, worktree, baseBranch, run, }: {
     channelId: string;
     directory: string;
     route: Exclude<Route, {
         kind: 'btw' | 'new-session' | 'queue';
     }>;
     author: Author;
+    members?: readonly string[];
     messageId: string;
     startMessageId?: string | null;
     showInput?: boolean;
@@ -70,6 +77,7 @@ export declare function startSession(bot: Bot, { channelId, directory: requested
     model?: ModelChoice;
     permissions?: PermissionRules;
     parentSessionId?: string;
+    sender?: Sender;
     task?: ScheduledRun;
     worktree?: string | false;
     baseBranch?: string;
@@ -78,19 +86,32 @@ export declare function startSession(bot: Bot, { channelId, directory: requested
     threadId: string;
     sessionId: string;
 }>;
-export declare function channelForSession(bot: Bot, sessionId: string): Promise<string | DbError | OpenCodeError | OpenCodeUnavailableError | ConfigError>;
-export declare function channelForDirectory(bot: Bot, directory: string): Promise<string | DbError | ConfigError>;
+export declare function startCoordinator(bot: Bot, { channel, route, author, messageId, files, }: {
+    channel: TextChannel;
+    route: Exclude<Route, {
+        kind: 'btw' | 'new-session' | 'queue';
+    }>;
+    author: Author;
+    messageId: string;
+    files?: readonly PromptFile[];
+}): Promise<Error | {
+    threadId: string;
+    sessionId: string;
+}>;
+export declare function endCoordinator(bot: Bot, channelId: string): Promise<DbError | void>;
+export declare function channelForSession(bot: Bot, sessionId: string): Promise<string | ConfigError | DbError | OpenCodeError | OpenCodeUnavailableError>;
+export declare function channelForDirectory(bot: Bot, directory: string): Promise<string | ConfigError | DbError>;
 export declare function resume(bot: Bot, { channelId, sessionId, author }: {
     channelId: string;
     sessionId: string;
     author: Author;
-}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | {
+}): Promise<ConfigError | DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | {
     title: string;
     threadId: string;
     sessionId: string;
 }>;
-export declare function fork(bot: Bot, { sourceThread, sessionId, before, subagent, name, author, worktree, }: {
-    sourceThread: ThreadChannel;
+export declare function fork(bot: Bot, { source, sessionId, before, subagent, name, author, worktree, }: {
+    source: Conversation;
     sessionId: string;
     before?: string;
     name?: string;
@@ -103,17 +124,19 @@ export declare function fork(bot: Bot, { sourceThread, sessionId, before, subage
         name: string;
         baseBranch?: string;
     };
-}): Promise<DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | ConfigError | import("./worktrees.ts").GitError | {
+}): Promise<ConfigError | DbError | OpenCodeError | DiscordError | OpenCodeUnavailableError | import("./worktrees.ts").GitError | {
     threadId: string;
     sessionId: string;
 }>;
-export declare function forkBtw(bot: Bot, { sourceThread, text, author, messageId, files, agent, }: {
-    sourceThread: ThreadChannel;
+export declare function forkBtw(bot: Bot, { source, text, author, messageId, files, agent, parentSessionId, sender, }: {
+    source: Conversation;
     text: string;
     author: Author;
     messageId: string;
     files?: readonly PromptFile[];
     agent?: string;
+    parentSessionId?: string;
+    sender?: Sender;
 }): Promise<ConfigError | OpenCodeUnavailableError | OpenCodeError | DiscordError | DbError | {
     threadId: string;
     sessionId: string;