@otto-assistant/bridge 0.4.93 → 0.4.96

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) => {

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;
         }

package/dist/system-prompt-drift-plugin.js

@@ -0,0 +1,251 @@
+// OpenCode plugin that detects per-session system prompt drift across turns.
+// When the effective system prompt changes after the first user message, it
+// writes a debug diff file and shows a toast because prompt-cache invalidation
+// increases rate-limit usage and usually means another plugin is mutating the
+// system prompt unexpectedly.
+import fs from 'node:fs';
+import path from 'node:path';
+import { createPatch, diffLines } from 'diff';
+import * as errore from 'errore';
+import { createPluginLogger, formatPluginErrorWithStack, setPluginLogFilePath } from './plugin-logger.js';
+import { initSentry, notifyError } from './sentry.js';
+import { abbreviatePath } from './utils.js';
+const logger = createPluginLogger('OPENCODE');
+const TOAST_SESSION_MARKER_SEPARATOR = ' ';
+function getSystemPromptDiffDir({ dataDir }) {
+    return path.join(dataDir, 'system-prompt-diffs');
+}
+function normalizeSystemPrompt({ system }) {
+    return system.join('\n');
+}
+function appendToastSessionMarker({ message, sessionId, }) {
+    return `${message}${TOAST_SESSION_MARKER_SEPARATOR}${sessionId}`;
+}
+function buildTurnContext({ input, directory, }) {
+    const model = input.model
+        ? `${input.model.providerID}/${input.model.modelID}${input.variant ? `:${input.variant}` : ''}`
+        : undefined;
+    return {
+        agent: input.agent,
+        model,
+        directory,
+    };
+}
+function shouldSuppressDiffNotice({ previousContext, currentContext, }) {
+    if (!previousContext || !currentContext) {
+        return false;
+    }
+    return (previousContext.agent !== currentContext.agent
+        || previousContext.model !== currentContext.model
+        || previousContext.directory !== currentContext.directory);
+}
+function buildPatch({ beforeText, afterText, beforeLabel, afterLabel, }) {
+    const changes = diffLines(beforeText, afterText);
+    const additions = changes.reduce((count, change) => {
+        if (!change.added) {
+            return count;
+        }
+        return count + change.count;
+    }, 0);
+    const deletions = changes.reduce((count, change) => {
+        if (!change.removed) {
+            return count;
+        }
+        return count + change.count;
+    }, 0);
+    const patch = createPatch(afterLabel, beforeText, afterText, beforeLabel, afterLabel);
+    return {
+        additions,
+        deletions,
+        patch,
+    };
+}
+function writeSystemPromptDiffFile({ dataDir, sessionId, beforePrompt, afterPrompt, }) {
+    const diff = buildPatch({
+        beforeText: beforePrompt,
+        afterText: afterPrompt,
+        beforeLabel: 'system-before.txt',
+        afterLabel: 'system-after.txt',
+    });
+    const timestamp = new Date().toISOString().replaceAll(':', '-');
+    const sessionDir = path.join(getSystemPromptDiffDir({ dataDir }), sessionId);
+    const filePath = path.join(sessionDir, `${timestamp}.diff`);
+    const latestPromptPath = path.join(sessionDir, `${timestamp}.md`);
+    const fileContent = [
+        `Session: ${sessionId}`,
+        `Created: ${new Date().toISOString()}`,
+        `Additions: ${diff.additions}`,
+        `Deletions: ${diff.deletions}`,
+        '',
+        diff.patch,
+    ].join('\n');
+    return errore.try({
+        try: () => {
+            fs.mkdirSync(sessionDir, { recursive: true });
+            fs.writeFileSync(filePath, fileContent);
+            // fs.writeFileSync(latestPromptPath, afterPrompt)
+            return {
+                additions: diff.additions,
+                deletions: diff.deletions,
+                filePath,
+                latestPromptPath,
+            };
+        },
+        catch: (error) => {
+            return new Error('Failed to write system prompt diff file', { cause: error });
+        },
+    });
+}
+function getOrCreateSessionState({ sessions, sessionId, }) {
+    const existing = sessions.get(sessionId);
+    if (existing) {
+        return existing;
+    }
+    const state = {
+        userTurnCount: 0,
+        previousTurnPrompt: undefined,
+        latestTurnPrompt: undefined,
+        latestTurnPromptTurn: 0,
+        comparedTurn: 0,
+        previousTurnContext: undefined,
+        currentTurnContext: undefined,
+    };
+    sessions.set(sessionId, state);
+    return state;
+}
+async function handleSystemTransform({ input, output, sessions, dataDir, client, }) {
+    const sessionId = input.sessionID;
+    if (!sessionId) {
+        return;
+    }
+    const currentPrompt = normalizeSystemPrompt({ system: output.system });
+    const state = getOrCreateSessionState({
+        sessions,
+        sessionId,
+    });
+    const currentTurn = state.userTurnCount;
+    state.latestTurnPrompt = currentPrompt;
+    state.latestTurnPromptTurn = currentTurn;
+    if (currentTurn <= 1) {
+        return;
+    }
+    if (state.comparedTurn === currentTurn) {
+        return;
+    }
+    const previousPrompt = state.previousTurnPrompt;
+    state.comparedTurn = currentTurn;
+    if (!previousPrompt || previousPrompt === currentPrompt) {
+        return;
+    }
+    if (shouldSuppressDiffNotice({
+        previousContext: state.previousTurnContext,
+        currentContext: state.currentTurnContext,
+    })) {
+        return;
+    }
+    if (!dataDir) {
+        return;
+    }
+    const diffFileResult = writeSystemPromptDiffFile({
+        dataDir,
+        sessionId,
+        beforePrompt: previousPrompt,
+        afterPrompt: currentPrompt,
+    });
+    if (diffFileResult instanceof Error) {
+        throw diffFileResult;
+    }
+    await client.tui.showToast({
+        body: {
+            variant: 'info',
+            title: 'Context cache discarded',
+            message: appendToastSessionMarker({
+                sessionId,
+                message: `system prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
+                    `Diff: \`${abbreviatePath(diffFileResult.filePath)}\`. ` +
+                    `Latest prompt: \`${abbreviatePath(diffFileResult.latestPromptPath)}\``,
+            }),
+        },
+    });
+}
+const systemPromptDriftPlugin = async ({ client, directory }) => {
+    initSentry();
+    const dataDir = process.env.KIMAKI_DATA_DIR;
+    if (dataDir) {
+        setPluginLogFilePath(dataDir);
+    }
+    const sessions = new Map();
+    return {
+        'chat.message': async (input) => {
+            const sessionId = input.sessionID;
+            if (!sessionId) {
+                return;
+            }
+            const state = getOrCreateSessionState({ sessions, sessionId });
+            if (state.userTurnCount > 0
+                && state.latestTurnPromptTurn === state.userTurnCount) {
+                state.previousTurnPrompt = state.latestTurnPrompt;
+                state.previousTurnContext = state.currentTurnContext;
+            }
+            state.currentTurnContext = buildTurnContext({ input, directory });
+            state.userTurnCount += 1;
+        },
+        'experimental.chat.system.transform': async (input, output) => {
+            const result = await errore.tryAsync({
+                try: async () => {
+                    await handleSystemTransform({
+                        input,
+                        output,
+                        sessions,
+                        dataDir,
+                        client,
+                    });
+                },
+                catch: (error) => {
+                    return new Error('system prompt drift transform hook failed', {
+                        cause: error,
+                    });
+                },
+            });
+            if (result instanceof Error) {
+                logger.warn(`[system-prompt-drift-plugin] ${formatPluginErrorWithStack(result)}`);
+                void notifyError(result, 'system prompt drift plugin transform hook failed');
+            }
+        },
+        event: async ({ event }) => {
+            const result = await errore.tryAsync({
+                try: async () => {
+                    if (event.type !== 'session.deleted') {
+                        return;
+                    }
+                    const deletedSessionId = getDeletedSessionId({ event });
+                    if (!deletedSessionId) {
+                        return;
+                    }
+                    sessions.delete(deletedSessionId);
+                },
+                catch: (error) => {
+                    return new Error('system prompt drift event hook failed', {
+                        cause: error,
+                    });
+                },
+            });
+            if (result instanceof Error) {
+                logger.warn(`[system-prompt-drift-plugin] ${formatPluginErrorWithStack(result)}`);
+                void notifyError(result, 'system prompt drift plugin event hook failed');
+            }
+        },
+    };
+};
+function getDeletedSessionId({ event }) {
+    if (event.type !== 'session.deleted') {
+        return undefined;
+    }
+    const sessionInfo = event.properties?.info;
+    if (!sessionInfo || typeof sessionInfo !== 'object') {
+        return undefined;
+    }
+    const id = 'id' in sessionInfo ? sessionInfo.id : undefined;
+    return typeof id === 'string' ? id : undefined;
+}
+export { systemPromptDriftPlugin };

package/dist/utils.js

@@ -2,7 +2,11 @@
 // Includes Discord OAuth URL generation, array deduplication,
 // abort error detection, and date/time formatting helpers.
 import os from 'node:os';
-import { PermissionsBitField } 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 { PermissionsBitField } = discord;
 import * as errore from 'errore';
 export function generateBotInstallUrl({ clientId, permissions = [
     PermissionsBitField.Flags.ViewChannel,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@otto-assistant/bridge",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.93",
+  "version": "0.4.96",
   "scripts": {
     "dev": "tsx src/bin.ts",
     "prepublishOnly": "pnpm generate && pnpm tsc",
@@ -66,6 +66,7 @@
     "@prisma/client": "7.4.2",
     "@purinton/resampler": "^1.0.4",
     "cron-parser": "^5.5.0",
+    "diff": "^8.0.4",
     "discord.js": "^14.25.1",
     "domhandler": "^6.0.1",
     "errore": "workspace:^",

package/src/anthropic-auth-plugin.ts

@@ -528,17 +528,26 @@ function toClaudeCodeToolName(name: string) {
   return OPENCODE_TO_CLAUDE_CODE_TOOL_NAME[name.toLowerCase()] ?? name
 }
 
-function sanitizeSystemText(text: string) {
-  return text.replaceAll(OPENCODE_IDENTITY, CLAUDE_CODE_IDENTITY)
+function sanitizeSystemText(text: string, onError?: (msg: string) => void) {
+  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: unknown) {
+function prependClaudeCodeIdentity(system: unknown, onError?: (msg: string) => void) {
   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 }]
   }
@@ -546,11 +555,11 @@ function prependClaudeCodeIdentity(system: unknown) {
   if (!Array.isArray(system)) return [identityBlock, system]
 
   const sanitized = system.map((item) => {
-    if (typeof item === 'string') return { type: 'text', text: sanitizeSystemText(item) }
+    if (typeof item === 'string') return { type: 'text', text: sanitizeSystemText(item, onError) }
     if (item && typeof item === 'object' && (item as { type?: unknown }).type === 'text') {
       const text = (item as { text?: unknown }).text
       if (typeof text === 'string') {
-        return { ...(item as Record<string, unknown>), text: sanitizeSystemText(text) }
+        return { ...(item as Record<string, unknown>), text: sanitizeSystemText(text, onError) }
       }
     }
     return item
@@ -568,7 +577,7 @@ function prependClaudeCodeIdentity(system: unknown) {
   return [identityBlock, ...sanitized]
 }
 
-function rewriteRequestPayload(body: string | undefined) {
+function rewriteRequestPayload(body: string | undefined, onError?: (msg: string) => void) {
   if (!body) return { body, modelId: undefined, reverseToolNameMap: new Map<string, string>() }
 
   try {
@@ -589,7 +598,7 @@ function rewriteRequestPayload(body: string | undefined) {
     }
 
     // Rename system prompt
-    payload.system = prependClaudeCodeIdentity(payload.system)
+    payload.system = prependClaudeCodeIdentity(payload.system, onError)
 
     // Rename tool_choice
     if (
@@ -779,7 +788,11 @@ const AnthropicAuthPlugin: Plugin = async ({ client }) => {
                       .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) => {

package/src/context-awareness-plugin.test.ts

@@ -46,7 +46,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.]",
       }
     `)
   })
@@ -62,7 +62,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/src/context-awareness-plugin.ts

@@ -126,7 +126,7 @@ export function shouldInjectPwd({
     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/src/discord-utils.ts

@@ -2,19 +2,21 @@
 // Handles markdown splitting for Discord's 2000-char limit, code block escaping,
 // thread message sending, and channel metadata extraction from topic tags.
 
-import {
-  type APIInteractionGuildMember,
-  type AutocompleteInteraction,
-  ChannelType,
-  GuildMember,
-  MessageFlags,
-  PermissionsBitField,
-  type Guild,
-  type Message,
-  type TextChannel,
-  type ThreadChannel,
+// 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'
+import type {
+  APIInteractionGuildMember,
+  AutocompleteInteraction,
+  GuildMember as GuildMemberType,
+  Guild,
+  Message,
+  REST as RESTType,
+  TextChannel,
+  ThreadChannel,
 } from 'discord.js'
-import { REST, Routes } from 'discord.js'
+const { ChannelType, GuildMember, MessageFlags, PermissionsBitField, REST, Routes } = discord
 import type { OpencodeClient } from '@opencode-ai/sdk/v2'
 import { discordApiUrl } from './discord-urls.js'
 import { Lexer } from 'marked'
@@ -37,7 +39,7 @@ const discordLogger = createLogger(LogPrefix.DISCORD)
  * Returns false if member is null or has the "no-kimaki" role (overrides all).
  */
 export function hasKimakiBotPermission(
-  member: GuildMember | APIInteractionGuildMember | null,
+  member: GuildMemberType | APIInteractionGuildMember | null,
   guild?: Guild | null,
 ): boolean {
   if (!member) {
@@ -61,7 +63,7 @@ export function hasKimakiBotPermission(
 }
 
 function hasRoleByName(
-  member: GuildMember | APIInteractionGuildMember,
+  member: GuildMemberType | APIInteractionGuildMember,
   roleName: string,
   guild?: Guild | null,
 ): boolean {
@@ -89,7 +91,7 @@ function hasRoleByName(
  * Check if the member has the "no-kimaki" role that blocks bot access.
  * Separate from hasKimakiBotPermission so callers can show a specific error message.
  */
-export function hasNoKimakiRole(member: GuildMember | null): boolean {
+export function hasNoKimakiRole(member: GuildMemberType | null): boolean {
   if (!member?.roles?.cache) {
     return false
   }
@@ -108,7 +110,7 @@ export async function reactToThread({
   channelId,
   emoji,
 }: {
-  rest: REST
+  rest: RESTType
   threadId: string
   /** Parent channel ID where the thread starter message lives.
    * If not provided, fetches the thread info from Discord API to resolve it. */
@@ -169,7 +171,7 @@ export async function archiveThread({
   client,
   archiveDelay = 0,
 }: {
-  rest: REST
+  rest: RESTType
   threadId: string
   parentChannelId?: string
   sessionId?: string

package/src/kimaki-opencode-plugin.ts

@@ -12,6 +12,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/src/logger.ts

@@ -95,12 +95,19 @@ export function getLogFilePath(): string | null {
   return logFilePath
 }
 
+const MAX_LOG_ARG_LENGTH = 1000
+
+function truncate(str: string, max: number): string {
+  if (str.length <= max) return str
+  return str.slice(0, max) + `… [truncated ${str.length - max} chars]`
+}
+
 function formatArg(arg: unknown): string {
   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: unknown): string {

package/src/session-handler/thread-session-runtime.ts

@@ -137,6 +137,17 @@ 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 }: { message: string }): string | undefined {
+  const match = message.match(TOAST_SESSION_ID_REGEX)
+  return match?.[1]
+}
+
+function stripToastSessionId({ message }: { message: string }): string {
+  return message.replace(TOAST_SESSION_ID_REGEX, '').trimEnd()
+}
+
 const shouldLogSessionEvents =
   process.env['KIMAKI_LOG_SESSION_EVENTS'] === '1' ||
   process.env['KIMAKI_VITEST'] === '1'
@@ -1381,6 +1392,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 = (() => {
@@ -1412,6 +1426,7 @@ export class ThreadSessionRuntime {
     }
 
     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.
@@ -1420,6 +1435,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({
@@ -2763,7 +2783,7 @@ export class ThreadSessionRuntime {
     if (properties.variant === 'warning') {
       return
     }
-    const toastMessage = properties.message.trim()
+    const toastMessage = stripToastSessionId({ message: properties.message }).trim()
     if (!toastMessage) {
       return
     }

package/src/system-prompt-drift-plugin.ts

@@ -0,0 +1,379 @@
+// OpenCode plugin that detects per-session system prompt drift across turns.
+// When the effective system prompt changes after the first user message, it
+// writes a debug diff file and shows a toast because prompt-cache invalidation
+// increases rate-limit usage and usually means another plugin is mutating the
+// system prompt unexpectedly.
+
+import fs from 'node:fs'
+import path from 'node:path'
+import type { Plugin } from '@opencode-ai/plugin'
+import { createPatch, diffLines } from 'diff'
+import * as errore from 'errore'
+import { createPluginLogger, formatPluginErrorWithStack, setPluginLogFilePath } from './plugin-logger.js'
+import { initSentry, notifyError } from './sentry.js'
+import { abbreviatePath } from './utils.js'
+
+const logger = createPluginLogger('OPENCODE')
+const TOAST_SESSION_MARKER_SEPARATOR = ' '
+
+type PluginHooks = Awaited<ReturnType<Plugin>>
+type SystemTransformHook = NonNullable<PluginHooks['experimental.chat.system.transform']>
+type SystemTransformInput = Parameters<SystemTransformHook>[0]
+type SystemTransformOutput = Parameters<SystemTransformHook>[1]
+type PluginEventHook = NonNullable<PluginHooks['event']>
+type PluginEvent = Parameters<PluginEventHook>[0]['event']
+type ChatMessageHook = NonNullable<PluginHooks['chat.message']>
+type ChatMessageInput = Parameters<ChatMessageHook>[0]
+
+type SessionState = {
+  userTurnCount: number
+  previousTurnPrompt: string | undefined
+  latestTurnPrompt: string | undefined
+  latestTurnPromptTurn: number
+  comparedTurn: number
+  previousTurnContext: TurnContext | undefined
+  currentTurnContext: TurnContext | undefined
+}
+
+type SystemPromptDiff = {
+  additions: number
+  deletions: number
+  patch: string
+}
+
+type TurnContext = {
+  agent: string | undefined
+  model: string | undefined
+  directory: string
+}
+
+function getSystemPromptDiffDir({ dataDir }: { dataDir: string }): string {
+  return path.join(dataDir, 'system-prompt-diffs')
+}
+
+function normalizeSystemPrompt({ system }: { system: string[] }): string {
+  return system.join('\n')
+}
+
+function appendToastSessionMarker({
+  message,
+  sessionId,
+}: {
+  message: string
+  sessionId: string
+}): string {
+  return `${message}${TOAST_SESSION_MARKER_SEPARATOR}${sessionId}`
+}
+
+function buildTurnContext({
+  input,
+  directory,
+}: {
+  input: ChatMessageInput
+  directory: string
+}): TurnContext {
+  const model = input.model
+    ? `${input.model.providerID}/${input.model.modelID}${input.variant ? `:${input.variant}` : ''}`
+    : undefined
+  return {
+    agent: input.agent,
+    model,
+    directory,
+  }
+}
+
+function shouldSuppressDiffNotice({
+  previousContext,
+  currentContext,
+}: {
+  previousContext: TurnContext | undefined
+  currentContext: TurnContext | undefined
+}): boolean {
+  if (!previousContext || !currentContext) {
+    return false
+  }
+  return (
+    previousContext.agent !== currentContext.agent
+    || previousContext.model !== currentContext.model
+    || previousContext.directory !== currentContext.directory
+  )
+}
+
+function buildPatch({
+  beforeText,
+  afterText,
+  beforeLabel,
+  afterLabel,
+}: {
+  beforeText: string
+  afterText: string
+  beforeLabel: string
+  afterLabel: string
+}): SystemPromptDiff {
+  const changes = diffLines(beforeText, afterText)
+  const additions = changes.reduce((count, change) => {
+    if (!change.added) {
+      return count
+    }
+    return count + change.count
+  }, 0)
+  const deletions = changes.reduce((count, change) => {
+    if (!change.removed) {
+      return count
+    }
+    return count + change.count
+  }, 0)
+  const patch = createPatch(afterLabel, beforeText, afterText, beforeLabel, afterLabel)
+
+  return {
+    additions,
+    deletions,
+    patch,
+  }
+}
+
+function writeSystemPromptDiffFile({
+  dataDir,
+  sessionId,
+  beforePrompt,
+  afterPrompt,
+}: {
+  dataDir: string
+  sessionId: string
+  beforePrompt: string
+  afterPrompt: string
+}): Error | {
+  additions: number
+  deletions: number
+  filePath: string
+  latestPromptPath: string
+} {
+  const diff = buildPatch({
+    beforeText: beforePrompt,
+    afterText: afterPrompt,
+    beforeLabel: 'system-before.txt',
+    afterLabel: 'system-after.txt',
+  })
+  const timestamp = new Date().toISOString().replaceAll(':', '-')
+  const sessionDir = path.join(getSystemPromptDiffDir({ dataDir }), sessionId)
+  const filePath = path.join(sessionDir, `${timestamp}.diff`)
+  const latestPromptPath = path.join(sessionDir, `${timestamp}.md`)
+  const fileContent = [
+    `Session: ${sessionId}`,
+    `Created: ${new Date().toISOString()}`,
+    `Additions: ${diff.additions}`,
+    `Deletions: ${diff.deletions}`,
+    '',
+    diff.patch,
+  ].join('\n')
+
+  return errore.try({
+    try: () => {
+      fs.mkdirSync(sessionDir, { recursive: true })
+      fs.writeFileSync(filePath, fileContent)
+      // fs.writeFileSync(latestPromptPath, afterPrompt)
+        return {
+          additions: diff.additions,
+          deletions: diff.deletions,
+          filePath,
+          latestPromptPath,
+        }
+    },
+    catch: (error) => {
+      return new Error('Failed to write system prompt diff file', { cause: error })
+    },
+  })
+}
+
+function getOrCreateSessionState({
+  sessions,
+  sessionId,
+}: {
+  sessions: Map<string, SessionState>
+  sessionId: string
+}): SessionState {
+  const existing = sessions.get(sessionId)
+  if (existing) {
+    return existing
+  }
+  const state = {
+    userTurnCount: 0,
+    previousTurnPrompt: undefined,
+    latestTurnPrompt: undefined,
+    latestTurnPromptTurn: 0,
+    comparedTurn: 0,
+    previousTurnContext: undefined,
+    currentTurnContext: undefined,
+  }
+  sessions.set(sessionId, state)
+  return state
+}
+
+async function handleSystemTransform({
+  input,
+  output,
+  sessions,
+  dataDir,
+  client,
+}: {
+  input: SystemTransformInput
+  output: SystemTransformOutput
+  sessions: Map<string, SessionState>
+  dataDir: string | undefined
+  client: Parameters<Plugin>[0]['client']
+}): Promise<void> {
+  const sessionId = input.sessionID
+  if (!sessionId) {
+    return
+  }
+
+  const currentPrompt = normalizeSystemPrompt({ system: output.system })
+  const state = getOrCreateSessionState({
+    sessions,
+    sessionId,
+  })
+  const currentTurn = state.userTurnCount
+  state.latestTurnPrompt = currentPrompt
+  state.latestTurnPromptTurn = currentTurn
+
+  if (currentTurn <= 1) {
+    return
+  }
+  if (state.comparedTurn === currentTurn) {
+    return
+  }
+  const previousPrompt = state.previousTurnPrompt
+  state.comparedTurn = currentTurn
+  if (!previousPrompt || previousPrompt === currentPrompt) {
+    return
+  }
+  if (
+    shouldSuppressDiffNotice({
+      previousContext: state.previousTurnContext,
+      currentContext: state.currentTurnContext,
+    })
+  ) {
+    return
+  }
+
+  if (!dataDir) {
+    return
+  }
+
+  const diffFileResult = writeSystemPromptDiffFile({
+    dataDir,
+    sessionId,
+    beforePrompt: previousPrompt,
+    afterPrompt: currentPrompt,
+  })
+  if (diffFileResult instanceof Error) {
+    throw diffFileResult
+  }
+
+  await client.tui.showToast({
+    body: {
+      variant: 'info',
+      title: 'Context cache discarded',
+      message: appendToastSessionMarker({
+        sessionId,
+        message:
+        `system prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
+        `Diff: \`${abbreviatePath(diffFileResult.filePath)}\`. ` +
+        `Latest prompt: \`${abbreviatePath(diffFileResult.latestPromptPath)}\``,
+      }),
+    },
+  })
+}
+
+const systemPromptDriftPlugin: Plugin = async ({ client, directory }) => {
+  initSentry()
+
+  const dataDir = process.env.KIMAKI_DATA_DIR
+  if (dataDir) {
+    setPluginLogFilePath(dataDir)
+  }
+
+  const sessions = new Map<string, SessionState>()
+
+  return {
+    'chat.message': async (input) => {
+      const sessionId = input.sessionID
+      if (!sessionId) {
+        return
+      }
+      const state = getOrCreateSessionState({ sessions, sessionId })
+      if (
+        state.userTurnCount > 0
+        && state.latestTurnPromptTurn === state.userTurnCount
+      ) {
+        state.previousTurnPrompt = state.latestTurnPrompt
+        state.previousTurnContext = state.currentTurnContext
+      }
+      state.currentTurnContext = buildTurnContext({ input, directory })
+      state.userTurnCount += 1
+    },
+    'experimental.chat.system.transform': async (input, output) => {
+      const result = await errore.tryAsync({
+        try: async () => {
+          await handleSystemTransform({
+            input,
+            output,
+            sessions,
+            dataDir,
+            client,
+          })
+        },
+        catch: (error) => {
+          return new Error('system prompt drift transform hook failed', {
+            cause: error,
+          })
+        },
+      })
+      if (result instanceof Error) {
+        logger.warn(
+          `[system-prompt-drift-plugin] ${formatPluginErrorWithStack(result)}`,
+        )
+        void notifyError(result, 'system prompt drift plugin transform hook failed')
+      }
+    },
+    event: async ({ event }) => {
+      const result = await errore.tryAsync({
+        try: async () => {
+          if (event.type !== 'session.deleted') {
+            return
+          }
+          const deletedSessionId = getDeletedSessionId({ event })
+          if (!deletedSessionId) {
+            return
+          }
+          sessions.delete(deletedSessionId)
+        },
+        catch: (error) => {
+          return new Error('system prompt drift event hook failed', {
+            cause: error,
+          })
+        },
+      })
+      if (result instanceof Error) {
+        logger.warn(
+          `[system-prompt-drift-plugin] ${formatPluginErrorWithStack(result)}`,
+        )
+        void notifyError(result, 'system prompt drift plugin event hook failed')
+      }
+    },
+  }
+}
+
+function getDeletedSessionId({ event }: { event: PluginEvent }): string | undefined {
+  if (event.type !== 'session.deleted') {
+    return undefined
+  }
+  const sessionInfo = event.properties?.info
+  if (!sessionInfo || typeof sessionInfo !== 'object') {
+    return undefined
+  }
+  const id = 'id' in sessionInfo ? sessionInfo.id : undefined
+  return typeof id === 'string' ? id : undefined
+}
+
+export { systemPromptDriftPlugin }

package/src/utils.ts

@@ -3,7 +3,11 @@
 // abort error detection, and date/time formatting helpers.
 
 import os from 'node:os'
-import { PermissionsBitField } 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 { PermissionsBitField } = discord
 import type { BotMode } from './database.js'
 import * as errore from 'errore'