@otto-assistant/bridge 0.4.93 → 0.4.97

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-message.test.ts

@@ -224,7 +224,7 @@ describe('system-message', () => {
 
       This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-      By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+      By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
       Critical recursion guard:
       - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

package/src/system-message.ts

@@ -559,7 +559,7 @@ kimaki send --channel ${channelId} --prompt "your task description" --worktree w
 
 This creates a new Discord thread with an isolated git worktree and starts a session in it. The worktree name should be kebab-case and descriptive of the task.
 
-By default, worktrees are created from \`origin/HEAD\` (the remote's default branch). To change the base branch for a project, the user can run \`git remote set-head origin <branch>\` in the project directory. For example, \`git remote set-head origin dev\` makes all new worktrees branch off \`origin/dev\` instead of \`origin/main\`.
+By default, worktrees are created from \`HEAD\`, which means whatever commit or branch the current checkout is on. If you want a different base, pass \`--base-branch\` or use the slash command option explicitly.
 
 Critical recursion guard:
 - If you already are in a worktree thread, do not create another worktree unless the user explicitly asks for a nested worktree.

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'
 

package/src/worktrees.test.ts

@@ -220,4 +220,5 @@ describe('worktrees', () => {
       fs.rmSync(sandbox, { recursive: true, force: true })
     }
   })
+
 })

package/src/worktrees.ts

@@ -527,52 +527,6 @@ type WorktreeResult = {
 async function resolveDefaultWorktreeTarget(
   directory: string,
 ): Promise<string> {
-  const remoteHead = await execAsync(
-    'git symbolic-ref refs/remotes/origin/HEAD',
-    {
-      cwd: directory,
-    },
-  ).catch(() => {
-    return null
-  })
-
-  const remoteRef = remoteHead?.stdout.trim()
-  if (remoteRef?.startsWith('refs/remotes/')) {
-    return remoteRef.replace('refs/remotes/', '')
-  }
-
-  const hasMain = await execAsync(
-    'git show-ref --verify --quiet refs/heads/main',
-    {
-      cwd: directory,
-    },
-  )
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-  if (hasMain) {
-    return 'main'
-  }
-
-  const hasMaster = await execAsync(
-    'git show-ref --verify --quiet refs/heads/master',
-    {
-      cwd: directory,
-    },
-  )
-    .then(() => {
-      return true
-    })
-    .catch(() => {
-      return false
-    })
-  if (hasMaster) {
-    return 'master'
-  }
-
   return 'HEAD'
 }
 
@@ -608,7 +562,7 @@ export async function createWorktreeWithSubmodules({
 }: {
   directory: string
   name: string
-  /** Override the base branch to create the worktree from. Defaults to origin/HEAD → main → master → HEAD. */
+  /** Override the base branch to create the worktree from. Defaults to HEAD. */
   baseBranch?: string
   /** Called with a short phase label so callers can update UI (e.g. Discord status message). */
   onProgress?: (phase: string) => void