kimaki 0.4.94 → 0.4.95

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' &&
@@ -627,15 +637,6 @@ async function getFreshOAuth(getAuth, client) {
 // --- Plugin export ---
 const AnthropicAuthPlugin = async ({ client }) => {
     return {
-        "experimental.chat.system.transform": async (input, output) => {
-            if (input.model.providerID !== ('anthropic'))
-                return;
-            const opencodePromptPart = output.system.findIndex(x => x?.includes('https://github.com/anomalyco/opencode'));
-            // Remove the OpenCode system prompt part if present
-            if (opencodePromptPart !== -1) {
-                output.system.splice(opencodePromptPart, 1);
-            }
-        },
         auth: {
             provider: 'anthropic',
             async loader(getAuth, provider) {
@@ -667,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/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/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": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.94",
+  "version": "0.4.95",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -25,9 +25,9 @@
     "prisma": "7.4.2",
     "tsx": "^4.20.5",
     "undici": "^8.0.2",
+    "discord-digital-twin": "^0.1.0",
     "opencode-cached-provider": "^0.0.1",
     "db": "^0.0.0",
-    "discord-digital-twin": "^0.1.0",
     "opencode-deterministic-provider": "^0.0.1"
   },
   "dependencies": {
@@ -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"
+    "libsqlproxy": "^0.1.0",
+    "traforo": "^0.2.4"
   },
   "optionalDependencies": {
     "@snazzah/davey": "^0.1.10",

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 (
@@ -743,14 +752,6 @@ async function getFreshOAuth(
 
 const AnthropicAuthPlugin: Plugin = async ({ client }) => {
   return {
-    "experimental.chat.system.transform": async (input, output) => {
-      if (input.model.providerID !== ('anthropic')) return
-      const opencodePromptPart = output.system.findIndex(x => x?.includes('https://github.com/anomalyco/opencode'))
-      // Remove the OpenCode system prompt part if present
-      if (opencodePromptPart !== -1) {
-        output.system.splice(opencodePromptPart, 1)
-      }
-    },
     auth: {
       provider: 'anthropic',
       async loader(
@@ -787,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/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/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'