@otto-assistant/bridge 0.4.92 → 0.4.96

package/dist/agent-model.e2e.test.js

@@ -735,7 +735,8 @@ describe('agent model resolution', () => {
         --- from: assistant (TestBot)
         ⬥ ok
         *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***
-        Switched to **plan** agent for this session next messages (was **test-agent**)
+        Switched to **plan** agent for this session (was **test-agent**)
+        The agent will change on the next message.
         --- from: user (agent-model-tester)
         Reply with exactly: after-switch-msg
         --- from: assistant (TestBot)

package/dist/anthropic-auth-plugin.js

@@ -430,15 +430,25 @@ function buildAuthorizeHandler(mode) {
 function toClaudeCodeToolName(name) {
     return OPENCODE_TO_CLAUDE_CODE_TOOL_NAME[name.toLowerCase()] ?? name;
 }
-function sanitizeSystemText(text) {
-    return text.replaceAll(OPENCODE_IDENTITY, CLAUDE_CODE_IDENTITY);
+function sanitizeSystemText(text, onError) {
+    const startIdx = text.indexOf(OPENCODE_IDENTITY);
+    if (startIdx === -1)
+        return text;
+    const codeRefsMarker = '# Code References';
+    const endIdx = text.indexOf(codeRefsMarker, startIdx);
+    if (endIdx === -1) {
+        onError?.(`sanitizeSystemText: could not find '# Code References' after OpenCode identity`);
+        return text;
+    }
+    // Remove everything from the OpenCode identity up to (but not including) '# Code References'
+    return text.slice(0, startIdx) + text.slice(endIdx);
 }
-function prependClaudeCodeIdentity(system) {
+function prependClaudeCodeIdentity(system, onError) {
     const identityBlock = { type: 'text', text: CLAUDE_CODE_IDENTITY };
     if (typeof system === 'undefined')
         return [identityBlock];
     if (typeof system === 'string') {
-        const sanitized = sanitizeSystemText(system);
+        const sanitized = sanitizeSystemText(system, onError);
         if (sanitized === CLAUDE_CODE_IDENTITY)
             return [identityBlock];
         return [identityBlock, { type: 'text', text: sanitized }];
@@ -447,11 +457,11 @@ function prependClaudeCodeIdentity(system) {
         return [identityBlock, system];
     const sanitized = system.map((item) => {
         if (typeof item === 'string')
-            return { type: 'text', text: sanitizeSystemText(item) };
+            return { type: 'text', text: sanitizeSystemText(item, onError) };
         if (item && typeof item === 'object' && item.type === 'text') {
             const text = item.text;
             if (typeof text === 'string') {
-                return { ...item, text: sanitizeSystemText(text) };
+                return { ...item, text: sanitizeSystemText(text, onError) };
             }
         }
         return item;
@@ -465,7 +475,7 @@ function prependClaudeCodeIdentity(system) {
     }
     return [identityBlock, ...sanitized];
 }
-function rewriteRequestPayload(body) {
+function rewriteRequestPayload(body, onError) {
     if (!body)
         return { body, modelId: undefined, reverseToolNameMap: new Map() };
     try {
@@ -486,7 +496,7 @@ function rewriteRequestPayload(body) {
             });
         }
         // Rename system prompt
-        payload.system = prependClaudeCodeIdentity(payload.system);
+        payload.system = prependClaudeCodeIdentity(payload.system, onError);
         // Rename tool_choice
         if (payload.tool_choice &&
             typeof payload.tool_choice === 'object' &&
@@ -658,7 +668,11 @@ const AnthropicAuthPlugin = async ({ client }) => {
                                     .text()
                                     .catch(() => undefined)
                                 : undefined;
-                        const rewritten = rewriteRequestPayload(originalBody);
+                        const rewritten = rewriteRequestPayload(originalBody, (msg) => {
+                            client.tui.showToast({
+                                body: { message: msg, variant: 'error' },
+                            }).catch(() => { });
+                        });
                         const headers = new Headers(init?.headers);
                         if (input instanceof Request) {
                             input.headers.forEach((v, k) => {
@@ -694,6 +708,13 @@ const AnthropicAuthPlugin = async ({ client }) => {
                             if (shouldRotateAuth(response.status, bodyText)) {
                                 const rotated = await rotateAnthropicAccount(freshAuth, client);
                                 if (rotated) {
+                                    // Show toast notification so Discord thread shows the rotation
+                                    client.tui.showToast({
+                                        body: {
+                                            message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                                            variant: 'info',
+                                        },
+                                    }).catch(() => { });
                                     const retryAuth = await getFreshOAuth(getAuth, client);
                                     if (retryAuth) {
                                         response = await runRequest(retryAuth);

package/dist/anthropic-auth-plugin.test.js

@@ -67,7 +67,13 @@ describe('rotateAnthropicAccount', () => {
         const rotated = await rotateAnthropicAccount(firstAccount, client);
         const store = await loadAccountStore();
         const authJson = JSON.parse(await readFile(authFilePath(), 'utf8'));
-        expect(rotated).toMatchObject({ refresh: 'refresh-second' });
+        expect(rotated).toMatchObject({
+            auth: { refresh: 'refresh-second' },
+            fromLabel: '#1 (refresh-...irst)',
+            toLabel: '#2 (refresh-...cond)',
+            fromIndex: 0,
+            toIndex: 1,
+        });
         expect(store.activeIndex).toBe(1);
         expect(authJson.anthropic?.refresh).toBe('refresh-second');
         expect(authSetCalls).toEqual([

package/dist/anthropic-auth-state.js

@@ -94,6 +94,12 @@ export async function loadAccountStore() {
 export async function saveAccountStore(store) {
     await writeJson(accountsFilePath(), normalizeAccountStore(store));
 }
+/** Short label for an account: first 8 + last 4 chars of refresh token. */
+export function accountLabel(account, index) {
+    const r = account.refresh;
+    const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r;
+    return index !== undefined ? `#${index + 1} (${short})` : short;
+}
 function findCurrentAccountIndex(store, auth) {
     if (!store.accounts.length)
         return 0;
@@ -165,10 +171,14 @@ export async function rotateAnthropicAccount(auth, client) {
         if (store.accounts.length < 2)
             return undefined;
         const currentIndex = findCurrentAccountIndex(store, auth);
+        const currentAccount = store.accounts[currentIndex];
         const nextIndex = (currentIndex + 1) % store.accounts.length;
         const nextAccount = store.accounts[nextIndex];
         if (!nextAccount)
             return undefined;
+        const fromLabel = currentAccount
+            ? accountLabel(currentAccount, currentIndex)
+            : accountLabel(auth, currentIndex);
         nextAccount.lastUsed = Date.now();
         store.activeIndex = nextIndex;
         await saveAccountStore(store);
@@ -179,7 +189,13 @@ export async function rotateAnthropicAccount(auth, client) {
             expires: nextAccount.expires,
         };
         await setAnthropicAuth(nextAuth, client);
-        return nextAuth;
+        return {
+            auth: nextAuth,
+            fromLabel,
+            toLabel: accountLabel(nextAccount, nextIndex),
+            fromIndex: currentIndex,
+            toIndex: nextIndex,
+        };
     });
 }
 export async function removeAccount(index) {

package/dist/cli.js

@@ -32,7 +32,7 @@ import { backgroundUpgradeKimaki, upgrade, getCurrentVersion, } from './upgrade.
 import { startHranaServer } from './hrana-server.js';
 import { startIpcPolling, stopIpcPolling } from './ipc-polling.js';
 import { getPromptPreview, parseSendAtValue, parseScheduledTaskPayload, serializeScheduledTaskPayload, } from './task-schedule.js';
-import { accountsFilePath, loadAccountStore, removeAccount, } from './anthropic-auth-state.js';
+import { accountLabel, accountsFilePath, loadAccountStore, removeAccount, } from './anthropic-auth-state.js';
 const cliLogger = createLogger(LogPrefix.CLI);
 // Gateway bot mode constants.
 // KIMAKI_GATEWAY_APP_ID is the Discord Application ID of the gateway bot.
@@ -2234,8 +2234,7 @@ cli
     }
     store.accounts.forEach((account, index) => {
         const active = index === store.activeIndex ? '*' : ' ';
-        const label = `${account.refresh.slice(0, 8)}...${account.refresh.slice(-4)}`;
-        console.log(`${active} ${index + 1}. ${label}`);
+        console.log(`${active} ${index + 1}. ${accountLabel(account)}`);
     });
     process.exit(0);
 });

package/dist/commands/agent.js

@@ -255,7 +255,7 @@ export async function handleAgentSelectMenu(interaction) {
         await setAgentForContext({ context, agentName: selectedAgent });
         if (context.isThread && context.sessionId) {
             await interaction.editReply({
-                content: `Agent preference set for this session next messages: **${selectedAgent}**`,
+                content: `Agent preference set for this session: **${selectedAgent}**\nThe agent will change on the next message.`,
                 components: [],
             });
         }
@@ -317,7 +317,7 @@ export async function handleQuickAgentCommand({ command, appId, }) {
             : '';
         if (context.isThread && context.sessionId) {
             await command.editReply({
-                content: `Switched to **${resolvedAgentName}** agent for this session next messages${previousText}`,
+                content: `Switched to **${resolvedAgentName}** agent for this session${previousText}\nThe agent will change on the next message.`,
             });
         }
         else {

package/dist/commands/merge-worktree.js

@@ -103,15 +103,18 @@ export async function handleMergeWorktreeCommand({ command, appId, }) {
             await command.editReply('Rebase conflict detected. Asking the model to resolve...');
             await sendPromptToModel({
                 prompt: [
-                    'A rebase conflict occurred while merging this worktree into the default branch.',
+                    `A rebase conflict occurred while merging this worktree into \`${result.target}\`.`,
                     'Rebasing multiple commits can pause on each commit that conflicts, so you may need to repeat the resolve/continue loop several times.',
-                    'Please resolve the rebase conflicts:',
-                    '1. Check `git status` to see which files have conflicts',
-                    '2. Edit the conflicted files to resolve the merge markers',
-                    '3. Stage resolved files with `git add`',
-                    '4. Continue the rebase with `git rebase --continue`',
-                    '5. If git reports more conflicts, repeat steps 1-4 until the rebase finishes (no more MERGE markers, `git status` shows no rebase in progress)',
-                    '6. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
+                    'Before editing anything, first understand both sides so you preserve both intentions and do not drop features or fixes.',
+                    '1. Check `git status` to see which files have conflicts and confirm the rebase is paused',
+                    `2. Find the merge base between this worktree and \`${result.target}\`, then read the commit messages from both sides since that merge base so you understand the goal of each change`,
+                    `3. Read the diffs from that merge base to both sides so you understand exactly what changed on this branch and on \`${result.target}\` before resolving conflicts`,
+                    '4. Read the commit currently being replayed in the rebase so you know the intent of the specific conflicting patch',
+                    '5. Edit the conflicted files to preserve both intended changes where possible instead of choosing one side wholesale',
+                    '6. Stage resolved files with `git add`',
+                    '7. Continue the rebase with `git rebase --continue`',
+                    '8. If git reports more conflicts, repeat steps 1-7 until the rebase finishes (no more rebase in progress, `git status` is clean)',
+                    '9. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
                 ].join('\n'),
                 thread,
                 projectDirectory: worktreeInfo.project_directory,

package/dist/context-awareness-plugin.js

@@ -61,7 +61,7 @@ export function shouldInjectPwd({ currentDir, previousDir, announcedDir, }) {
         inject: true,
         text: `\n[working directory changed. Previous working directory: ${priorDirectory}. ` +
             `Current working directory: ${currentDir}. ` +
-            `You MUST read, write, and edit files only under ${currentDir}. ` +
+            `You should read, write, and edit files under ${currentDir}. ` +
             `Do NOT read, write, or edit files under ${priorDirectory}.]`,
     };
 }

package/dist/context-awareness-plugin.test.js

@@ -36,7 +36,7 @@ describe('shouldInjectPwd', () => {
       {
         "inject": true,
         "text": "
-      [working directory changed. Previous working directory: /repo/main. Current working directory: /repo/worktree. You MUST read, write, and edit files only under /repo/worktree. Do NOT read, write, or edit files under /repo/main.]",
+      [working directory changed. Previous working directory: /repo/main. Current working directory: /repo/worktree. You should read, write, and edit files under /repo/worktree. Do NOT read, write, or edit files under /repo/main.]",
       }
     `);
     });
@@ -50,7 +50,7 @@ describe('shouldInjectPwd', () => {
       {
         "inject": true,
         "text": "
-      [working directory changed. Previous working directory: /repo/worktree-a. Current working directory: /repo/worktree-b. You MUST read, write, and edit files only under /repo/worktree-b. Do NOT read, write, or edit files under /repo/worktree-a.]",
+      [working directory changed. Previous working directory: /repo/worktree-a. Current working directory: /repo/worktree-b. You should read, write, and edit files under /repo/worktree-b. Do NOT read, write, or edit files under /repo/worktree-a.]",
       }
     `);
     });

package/dist/discord-utils.js

@@ -1,8 +1,11 @@
 // Discord-specific utility functions.
 // Handles markdown splitting for Discord's 2000-char limit, code block escaping,
 // thread message sending, and channel metadata extraction from topic tags.
-import { ChannelType, GuildMember, MessageFlags, PermissionsBitField, } from 'discord.js';
-import { REST, Routes } from 'discord.js';
+// Use namespace import for CJS interop — discord.js is CJS and its named
+// exports aren't detectable by all ESM loaders (e.g. tsx/esbuild) because
+// discord.js uses tslib's __exportStar which is opaque to static analysis.
+import * as discord from 'discord.js';
+const { ChannelType, GuildMember, MessageFlags, PermissionsBitField, REST, Routes } = discord;
 import { discordApiUrl } from './discord-urls.js';
 import { Lexer } from 'marked';
 import { splitTablesFromMarkdown } from './format-tables.js';

package/dist/kimaki-opencode-plugin.js

@@ -11,6 +11,7 @@
 export { ipcToolsPlugin } from './ipc-tools-plugin.js';
 export { contextAwarenessPlugin } from './context-awareness-plugin.js';
 export { interruptOpencodeSessionOnUserMessage } from './opencode-interrupt-plugin.js';
+export { systemPromptDriftPlugin } from './system-prompt-drift-plugin.js';
 export { anthropicAuthPlugin } from './anthropic-auth-plugin.js';
 export { imageOptimizerPlugin } from './image-optimizer-plugin.js';
 export { kittyGraphicsPlugin } from 'kitty-graphics-agent';

package/dist/logger.js

@@ -80,12 +80,18 @@ export function setLogFilePath(dataDir) {
 export function getLogFilePath() {
     return logFilePath;
 }
+const MAX_LOG_ARG_LENGTH = 1000;
+function truncate(str, max) {
+    if (str.length <= max)
+        return str;
+    return str.slice(0, max) + `… [truncated ${str.length - max} chars]`;
+}
 function formatArg(arg) {
     if (typeof arg === 'string') {
-        return sanitizeSensitiveText(arg, { redactPaths: false });
+        return truncate(sanitizeSensitiveText(arg, { redactPaths: false }), MAX_LOG_ARG_LENGTH);
     }
     const safeArg = sanitizeUnknownValue(arg, { redactPaths: false });
-    return util.inspect(safeArg, { colors: true, depth: 4 });
+    return truncate(util.inspect(safeArg, { colors: true, depth: 4 }), MAX_LOG_ARG_LENGTH);
 }
 export function formatErrorWithStack(error) {
     if (error instanceof Error) {

package/dist/session-handler/thread-session-runtime.js

@@ -40,6 +40,14 @@ import { extractLeadingOpencodeCommand } from '../opencode-command-detection.js'
 const logger = createLogger(LogPrefix.SESSION);
 const discordLogger = createLogger(LogPrefix.DISCORD);
 const DETERMINISTIC_CONTEXT_LIMIT = 100_000;
+const TOAST_SESSION_ID_REGEX = /\b(ses_[A-Za-z0-9]+)\b\s*$/u;
+function extractToastSessionId({ message }) {
+    const match = message.match(TOAST_SESSION_ID_REGEX);
+    return match?.[1];
+}
+function stripToastSessionId({ message }) {
+    return message.replace(TOAST_SESSION_ID_REGEX, '').trimEnd();
+}
 const shouldLogSessionEvents = process.env['KIMAKI_LOG_SESSION_EVENTS'] === '1' ||
     process.env['KIMAKI_VITEST'] === '1';
 // ── Registry ─────────────────────────────────────────────────────
@@ -943,6 +951,9 @@ export class ThreadSessionRuntime {
         }
         const sessionId = this.state?.sessionId;
         const eventSessionId = getOpencodeEventSessionId(event);
+        const toastSessionId = event.type === 'tui.toast.show'
+            ? extractToastSessionId({ message: event.properties.message })
+            : undefined;
         if (shouldLogSessionEvents) {
             const eventDetails = (() => {
                 if (event.type === 'session.error') {
@@ -970,6 +981,7 @@ export class ThreadSessionRuntime {
             logger.log(`[EVENT] type=${event.type} eventSessionId=${eventSessionId || 'none'} activeSessionId=${sessionId || 'none'} ${this.formatRunStateForLog()}${eventDetails}`);
         }
         const isGlobalEvent = event.type === 'tui.toast.show';
+        const isScopedToastEvent = Boolean(toastSessionId);
         // Drop events that don't match current session (stale events from
         // previous sessions), unless it's a global event or a subtask session.
         if (!isGlobalEvent && eventSessionId && eventSessionId !== sessionId) {
@@ -977,6 +989,11 @@ export class ThreadSessionRuntime {
                 return; // stale event from previous session
             }
         }
+        if (isScopedToastEvent && toastSessionId !== sessionId) {
+            if (!this.getSubtaskInfoForSession(toastSessionId)) {
+                return;
+            }
+        }
         if (isOpencodeSessionEventLogEnabled()) {
             const eventLogResult = await appendOpencodeSessionEventLog({
                 threadId: this.threadId,
@@ -2023,7 +2040,7 @@ export class ThreadSessionRuntime {
         if (properties.variant === 'warning') {
             return;
         }
-        const toastMessage = properties.message.trim();
+        const toastMessage = stripToastSessionId({ message: properties.message }).trim();
         if (!toastMessage) {
             return;
         }
@@ -3132,8 +3149,8 @@ export class ThreadSessionRuntime {
         const truncate = (s, max) => {
             return s.length > max ? s.slice(0, max - 1) + '\u2026' : s;
         };
-        const truncatedFolder = truncate(folderName, 15);
-        const truncatedBranch = truncate(branchName, 15);
+        const truncatedFolder = truncate(folderName, 30);
+        const truncatedBranch = truncate(branchName, 30);
         const projectInfo = truncatedBranch
             ? `${truncatedFolder} ⋅ ${truncatedBranch} ⋅ `
             : `${truncatedFolder} ⋅ `;

package/dist/system-message.js

@@ -368,10 +368,23 @@ Use --agent to specify which agent to use for the session:
 kimaki send --channel ${channelId} --prompt "Plan the refactor of the auth module" --agent plan${userArg}
 ${availableAgentsContext}
 
+## running opencode commands via kimaki send
+
+You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+kimaki send --channel ${channelId} --prompt "/build-cmd update dependencies"${userArg}
+
+The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
 ## switching agents in the current session
 
 The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+You can also switch agents via \`kimaki send\`:
+
+kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
 ## scheduled sends and task management
 
 Use \`--send-at\` to schedule a one-time or recurring task:

package/dist/system-message.test.js

@@ -135,10 +135,23 @@ describe('system-message', () => {
       - \`plan\`: planning only
       - \`build\`: edits files
 
+      ## running opencode commands via kimaki send
+
+      You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+      kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+      kimaki send --channel chan_123 --prompt "/build-cmd update dependencies" --user "Tommy"
+
+      The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
       ## switching agents in the current session
 
       The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+      You can also switch agents via \`kimaki send\`:
+
+      kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
       ## scheduled sends and task management
 
       Use \`--send-at\` to schedule a one-time or recurring task: