kimaki 0.4.95 → 0.4.96

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

@@ -11,12 +11,16 @@ import { createPluginLogger, formatPluginErrorWithStack, setPluginLogFilePath }
 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}` : ''}`
@@ -66,7 +70,7 @@ function writeSystemPromptDiffFile({ dataDir, sessionId, beforePrompt, afterProm
     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, `${sessionId}.md`);
+    const latestPromptPath = path.join(sessionDir, `${timestamp}.md`);
     const fileContent = [
         `Session: ${sessionId}`,
         `Created: ${new Date().toISOString()}`,
@@ -84,6 +88,7 @@ function writeSystemPromptDiffFile({ dataDir, sessionId, beforePrompt, afterProm
                 additions: diff.additions,
                 deletions: diff.deletions,
                 filePath,
+                latestPromptPath,
             };
         },
         catch: (error) => {
@@ -154,9 +159,12 @@ async function handleSystemTransform({ input, output, sessions, dataDir, client,
         body: {
             variant: 'info',
             title: 'Context cache discarded',
-            message: `System prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
-                `This usually means a plugin mutated the prompt and increased rate-limit usage. ` +
-                `Diff: ${abbreviatePath(diffFileResult.filePath)}`,
+            message: appendToastSessionMarker({
+                sessionId,
+                message: `system prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
+                    `Diff: \`${abbreviatePath(diffFileResult.filePath)}\`. ` +
+                    `Latest prompt: \`${abbreviatePath(diffFileResult.latestPromptPath)}\``,
+            }),
         },
     });
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.95",
+  "version": "0.4.96",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -25,8 +25,8 @@
     "prisma": "7.4.2",
     "tsx": "^4.20.5",
     "undici": "^8.0.2",
-    "discord-digital-twin": "^0.1.0",
     "opencode-cached-provider": "^0.0.1",
+    "discord-digital-twin": "^0.1.0",
     "db": "^0.0.0",
     "opencode-deterministic-provider": "^0.0.1"
   },
@@ -65,9 +65,9 @@
     "zod": "^4.3.6",
     "zustand": "^5.0.11",
     "errore": "^0.14.1",
+    "traforo": "^0.2.4",
     "opencode-injection-guard": "^0.2.1",
-    "libsqlproxy": "^0.1.0",
-    "traforo": "^0.2.4"
+    "libsqlproxy": "^0.1.0"
   },
   "optionalDependencies": {
     "@snazzah/davey": "^0.1.10",

package/src/anthropic-auth-plugin.ts

@@ -842,6 +842,7 @@ const AnthropicAuthPlugin: Plugin = async ({ client }) => {
                       message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
                       variant: 'info',
                     },
+
                   }).catch(() => {})
                   const retryAuth = await getFreshOAuth(getAuth, client)
                   if (retryAuth) {

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

@@ -14,6 +14,7 @@ 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']>
@@ -54,6 +55,16 @@ 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,
@@ -131,7 +142,12 @@ function writeSystemPromptDiffFile({
   sessionId: string
   beforePrompt: string
   afterPrompt: string
-}): Error | { additions: number; deletions: number; filePath: string } {
+}): Error | {
+  additions: number
+  deletions: number
+  filePath: string
+  latestPromptPath: string
+} {
   const diff = buildPatch({
     beforeText: beforePrompt,
     afterText: afterPrompt,
@@ -141,7 +157,7 @@ function writeSystemPromptDiffFile({
   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, `${sessionId}.md`)
+  const latestPromptPath = path.join(sessionDir, `${timestamp}.md`)
   const fileContent = [
     `Session: ${sessionId}`,
     `Created: ${new Date().toISOString()}`,
@@ -156,11 +172,12 @@ function writeSystemPromptDiffFile({
       fs.mkdirSync(sessionDir, { recursive: true })
       fs.writeFileSync(filePath, fileContent)
       // fs.writeFileSync(latestPromptPath, afterPrompt)
-      return {
-        additions: diff.additions,
-        deletions: diff.deletions,
-        filePath,
-      }
+        return {
+          additions: diff.additions,
+          deletions: diff.deletions,
+          filePath,
+          latestPromptPath,
+        }
     },
     catch: (error) => {
       return new Error('Failed to write system prompt diff file', { cause: error })
@@ -257,10 +274,13 @@ async function handleSystemTransform({
     body: {
       variant: 'info',
       title: 'Context cache discarded',
-      message:
-        `System prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
-        `This usually means a plugin mutated the prompt and increased rate-limit usage. ` +
-        `Diff: ${abbreviatePath(diffFileResult.filePath)}`,
+      message: appendToastSessionMarker({
+        sessionId,
+        message:
+        `system prompt changed since the previous message (+${diffFileResult.additions} / -${diffFileResult.deletions}). ` +
+        `Diff: \`${abbreviatePath(diffFileResult.filePath)}\`. ` +
+        `Latest prompt: \`${abbreviatePath(diffFileResult.latestPromptPath)}\``,
+      }),
     },
   })
 }