kimaki 0.7.0 → 0.7.1

package/dist/anthropic-auth-plugin.js

@@ -65,6 +65,9 @@ const CLAUDE_CODE_VERSION = "2.1.75";
 const CLAUDE_CODE_IDENTITY = "You are Claude Code, Anthropic's official CLI for Claude.";
 const OPENCODE_IDENTITY = "You are OpenCode, the best coding agent on the planet.";
 const ANTHROPIC_PROMPT_MARKER = "Skills provide specialized instructions";
+// Subagent prompts don't contain OPENCODE_IDENTITY; opencode appends this
+// line + an <env> block instead. We strip from here to </env> inclusive.
+const SUBAGENT_MODEL_IDENTITY = "You are powered by the model named";
 const CLAUDE_CODE_BETA = "claude-code-20250219";
 const OAUTH_BETA = "oauth-2025-04-20";
 const FINE_GRAINED_TOOL_STREAMING_BETA = "fine-grained-tool-streaming-2025-05-14";
@@ -477,28 +480,59 @@ function toClaudeCodeToolName(name) {
  */
 function sanitizeAnthropicSystemText(text, onError) {
     const startIdx = text.indexOf(OPENCODE_IDENTITY);
-    if (startIdx === -1)
-        return text;
-    // Keep the marker aligned with the current OpenCode Anthropic prompt.
-    const endIdx = text.indexOf(ANTHROPIC_PROMPT_MARKER, startIdx);
-    if (endIdx === -1) {
-        onError?.("sanitizeAnthropicSystemText: could not find Anthropic prompt marker after OpenCode identity");
-        return text;
+    if (startIdx !== -1) {
+        // Main session path: strip from OpenCode identity to the Anthropic prompt marker.
+        // Keep the marker aligned with the current OpenCode Anthropic prompt.
+        const endIdx = text.indexOf(ANTHROPIC_PROMPT_MARKER, startIdx);
+        if (endIdx === -1) {
+            onError?.("sanitizeAnthropicSystemText: could not find Anthropic prompt marker after OpenCode identity");
+            return text;
+        }
+        return replaceBlockWithCompactEnv(text, startIdx, endIdx);
+    }
+    // Subagent path: opencode appends "You are powered by the model named ..."
+    // followed by an <env> block. Strip from that line through </env>.
+    const subagentIdx = text.indexOf(SUBAGENT_MODEL_IDENTITY);
+    if (subagentIdx !== -1) {
+        const envCloseTag = "</env>";
+        const envCloseIdx = text.indexOf(envCloseTag, subagentIdx);
+        if (envCloseIdx === -1) {
+            onError?.("sanitizeAnthropicSystemText: could not find </env> after subagent model identity");
+            return text;
+        }
+        const endIdx = envCloseIdx + envCloseTag.length;
+        // Skip trailing newline so the join is clean
+        const afterEnd = text[endIdx] === "\n" ? endIdx + 1 : endIdx;
+        return replaceBlockWithCompactEnv(text, subagentIdx, afterEnd);
     }
-    // Extract the cwd from the block we're about to strip. OpenCode's system
-    // prompt embeds <environment><cwd>/path</cwd></environment> in the identity
-    // block. We preserve the per-session cwd instead of falling back to
-    // process.cwd() which is the opencode server's cwd and wrong for
-    // multi-session/worktree setups where each session has a different directory.
+    return text;
+}
+// Extract cwd from the block being stripped and replace it with a compact
+// <environment> tag. Shared by both main-session and subagent paths.
+// Source: anomalyco/opencode packages/opencode/src/session/system.ts
+// OpenCode's system prompt format (as of 2025):
+//   <env>
+//     Working directory: ${Instance.directory}
+//     Workspace root folder: ${Instance.worktree}
+//     Is directory a git repo: yes/no
+//     Platform: ${process.platform}
+//     Today's date: ${new Date().toDateString()}
+//   </env>
+// Older format used <environment><cwd>/path</cwd></environment>.
+// We try both patterns to stay compatible across opencode versions.
+// We preserve the per-session directory instead of falling back to
+// process.cwd() which is the opencode server's cwd and wrong for
+// multi-session/worktree setups where each session has a different directory.
+function replaceBlockWithCompactEnv(text, startIdx, endIdx) {
     const strippedBlock = text.slice(startIdx, endIdx);
-    const cwdMatch = strippedBlock.match(/<cwd>([^<]+)<\/cwd>/);
-    const cwd = cwdMatch?.[1] || process.cwd();
+    const cwdMatch = strippedBlock.match(/Working directory:\s*(.+)/)?.[1]?.trim() ||
+        strippedBlock.match(/<cwd>([^<]+)<\/cwd>/)?.[1];
+    const cwd = cwdMatch || process.cwd();
     const envContext = `\n<environment>\n<cwd>${cwd}</cwd>\n</environment>\n` +
-        `Read, write, and edit files under <cwd>.\n\n`;
-    const result = text.slice(0, startIdx) +
+        `Read, write, and edit files under ${cwd}.\n\n`;
+    return (text.slice(0, startIdx) +
         envContext +
-        text.slice(endIdx);
-    return result;
+        text.slice(endIdx));
 }
 function mapSystemTextPart(part, onError) {
     if (typeof part === "string") {

package/dist/format-tables.test.js

@@ -439,6 +439,25 @@ Read this first.
       ]
     `);
     });
+    test('renders callout that was prefixed with ⬥ as plain text (regression)', () => {
+        // Before the fix, formatPart would add ⬥ prefix to callout lines,
+        // breaking the callout parser. Now formatPart skips the prefix for callouts.
+        const result = splitTablesFromMarkdown(`⬥ <callout accent="#ef4444">
+## Top priority
+- **Stripe dispute** deadline
+</callout>`);
+        expect(result).toMatchInlineSnapshot(`
+      [
+        {
+          "text": "⬥ <callout accent="#ef4444">
+      ## Top priority
+      - **Stripe dispute** deadline
+      </callout>",
+          "type": "text",
+        },
+      ]
+    `);
+    });
     test('falls back to plain text when a callout is not closed', () => {
         const result = splitTablesFromMarkdown(`<callout accent="#2b7fff">
 ## Important

package/dist/message-formatting.js

@@ -307,7 +307,9 @@ export function formatPart(part, prefix) {
         }
         const firstChar = text[0] || '';
         const markdownStarters = ['#', '*', '_', '-', '>', '`', '[', '|'];
-        const startsWithMarkdown = markdownStarters.includes(firstChar) || /^\d+\./.test(text);
+        const startsWithMarkdown = markdownStarters.includes(firstChar) ||
+            /^\d+\./.test(text) ||
+            /^<callout[\s>]/i.test(text);
         if (startsWithMarkdown) {
             return `\n${text}`;
         }

package/dist/message-formatting.test.js

@@ -1,5 +1,47 @@
 import { describe, test, expect } from 'vitest';
-import { formatTodoList } from './message-formatting.js';
+import { formatPart, formatTodoList } from './message-formatting.js';
+describe('formatPart', () => {
+    test('callout text does not get ⬥ prefix', () => {
+        const part = {
+            id: 'test',
+            type: 'text',
+            sessionID: 'ses_test',
+            messageID: 'msg_test',
+            text: `<callout accent="#ef4444">\n## Top priority\n- **Stripe dispute** deadline\n</callout>`,
+        };
+        expect(formatPart(part)).toMatchInlineSnapshot(`
+      "
+      <callout accent="#ef4444">
+      ## Top priority
+      - **Stripe dispute** deadline
+      </callout>"
+    `);
+    });
+    test('regular text gets ⬥ prefix', () => {
+        const part = {
+            id: 'test',
+            type: 'text',
+            sessionID: 'ses_test',
+            messageID: 'msg_test',
+            text: 'hello world',
+        };
+        expect(formatPart(part)).toMatchInlineSnapshot(`"⬥ hello world"`);
+    });
+    test('text starting with heading does not get ⬥ prefix', () => {
+        const part = {
+            id: 'test',
+            type: 'text',
+            sessionID: 'ses_test',
+            messageID: 'msg_test',
+            text: '## Summary\nDone.',
+        };
+        expect(formatPart(part)).toMatchInlineSnapshot(`
+      "
+      ## Summary
+      Done."
+    `);
+    });
+});
 describe('formatTodoList', () => {
     test('formats active todo with monospace numbers', () => {
         const part = {

package/dist/proxy-ws-preload.cjs

@@ -0,0 +1,85 @@
+// WebSocket proxy preload for environments behind a firewall or VPN (e.g. GFW).
+// Loaded via --require when HTTPS_PROXY / https_proxy / HTTP_PROXY / http_proxy is set.
+//
+// Monkey-patches Module.prototype.require to intercept `ws` module loads and
+// inject an https-proxy-agent into every client-side WebSocket connection.
+// This is needed because:
+//   1. Node.js --use-env-proxy breaks ws WebSocket upgrades (nodejs/node#62054)
+//   2. discord.js doesn't expose an agent option for WebSocket connections
+//   3. @discordjs/ws imports ws via ESM, so require.cache patches don't work
+//   4. The ws library supports agent in options but discord.js doesn't pass it
+//
+// Tracking issues:
+//   - nodejs/node#57872 (proxy env var support in Node.js)
+//   - nodejs/node#62054 (--use-env-proxy breaks ws)
+//   - discordjs/discord.js#10716 (proxy support for WebSocket, closed won't fix)
+'use strict';
+const proxyUrl = process.env.https_proxy ||
+    process.env.HTTPS_PROXY ||
+    process.env.http_proxy ||
+    process.env.HTTP_PROXY;
+if (!proxyUrl) {
+    return;
+}
+let HttpsProxyAgent;
+try {
+    HttpsProxyAgent = require('https-proxy-agent').HttpsProxyAgent;
+}
+catch {
+    // https-proxy-agent not installed; skip patching
+    return;
+}
+const agent = new HttpsProxyAgent(proxyUrl);
+const Module = require('module');
+const origRequire = Module.prototype.require;
+Module.prototype.require = function patchedRequire(id) {
+    const mod = origRequire.apply(this, arguments);
+    // Only intercept the ws module, and only once
+    if (id === 'ws' && mod && !mod.__kimakiProxyPatched) {
+        const OrigWS = mod.WebSocket || mod;
+        if (typeof OrigWS === 'function' && !OrigWS.__kimakiProxyPatched) {
+            const PatchedWS = function ProxiedWebSocket(url, protocols, options) {
+                // ws allows protocols to be an options object when omitted
+                if (typeof protocols === 'object' &&
+                    protocols !== null &&
+                    !Array.isArray(protocols)) {
+                    options = protocols;
+                    protocols = undefined;
+                }
+                // Inject agent for client connections only (url !== null).
+                // Don't override if caller already provided an agent.
+                if (url !== null && (!options || !options.agent)) {
+                    options = Object.assign({}, options, { agent });
+                }
+                if (new.target) {
+                    return Reflect.construct(OrigWS, [url, protocols, options], new.target);
+                }
+                return new OrigWS(url, protocols, options);
+            };
+            // Inherit prototype so instanceof checks work
+            Object.setPrototypeOf(PatchedWS.prototype, OrigWS.prototype);
+            Object.setPrototypeOf(PatchedWS, OrigWS);
+            PatchedWS.prototype.constructor = PatchedWS;
+            // Copy static constants (CONNECTING, OPEN, CLOSING, CLOSED) and statics
+            for (const key of Object.getOwnPropertyNames(OrigWS)) {
+                if (key !== 'length' && key !== 'prototype' && key !== 'name') {
+                    try {
+                        Object.defineProperty(PatchedWS, key, Object.getOwnPropertyDescriptor(OrigWS, key));
+                    }
+                    catch {
+                        // some properties may not be configurable
+                    }
+                }
+            }
+            PatchedWS.__kimakiProxyPatched = true;
+            mod.WebSocket = PatchedWS;
+            // ws/index.js sets module.exports = WebSocket, so patch the default too
+            if (typeof mod === 'function') {
+                // Can't replace module.exports from here, but the WebSocket property
+                // is what @discordjs/ws uses via `import { WebSocket } from "ws"`
+            }
+        }
+        mod.__kimakiProxyPatched = true;
+    }
+    return mod;
+};

package/package.json

@@ -2,7 +2,7 @@
   "name": "kimaki",
   "module": "index.ts",
   "type": "module",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "repository": "https://github.com/remorses/kimaki",
   "bin": "bin.js",
   "files": [
@@ -26,8 +26,8 @@
     "tsx": "^4.20.5",
     "undici": "^8.0.2",
     "discord-digital-twin": "^0.1.0",
-    "opencode-deterministic-provider": "^0.0.1",
     "opencode-cached-provider": "^0.0.1",
+    "opencode-deterministic-provider": "^0.0.1",
     "db": "^0.0.0"
   },
   "dependencies": {
@@ -64,10 +64,10 @@
     "yaml": "^2.8.3",
     "zod": "^4.3.6",
     "zustand": "^5.0.11",
-    "errore": "^0.14.1",
     "libsqlproxy": "^0.1.0",
+    "opencode-injection-guard": "^0.2.1",
     "traforo": "^0.5.0",
-    "opencode-injection-guard": "^0.2.1"
+    "errore": "^0.14.1"
   },
   "optionalDependencies": {
     "@snazzah/davey": "^0.1.10",

package/src/anthropic-auth-plugin.ts

@@ -93,6 +93,9 @@ const CLAUDE_CODE_IDENTITY =
 const OPENCODE_IDENTITY =
   "You are OpenCode, the best coding agent on the planet.";
 const ANTHROPIC_PROMPT_MARKER = "Skills provide specialized instructions";
+// Subagent prompts don't contain OPENCODE_IDENTITY; opencode appends this
+// line + an <env> block instead. We strip from here to </env> inclusive.
+const SUBAGENT_MODEL_IDENTITY = "You are powered by the model named";
 const CLAUDE_CODE_BETA = "claude-code-20250219";
 const OAUTH_BETA = "oauth-2025-04-20";
 const FINE_GRAINED_TOOL_STREAMING_BETA =
@@ -613,36 +616,77 @@ function sanitizeAnthropicSystemText(
   onError?: (msg: string) => void,
 ) {
   const startIdx = text.indexOf(OPENCODE_IDENTITY);
-  if (startIdx === -1) return text;
+  if (startIdx !== -1) {
+    // Main session path: strip from OpenCode identity to the Anthropic prompt marker.
+    // Keep the marker aligned with the current OpenCode Anthropic prompt.
+    const endIdx = text.indexOf(ANTHROPIC_PROMPT_MARKER, startIdx);
+    if (endIdx === -1) {
+      onError?.(
+        "sanitizeAnthropicSystemText: could not find Anthropic prompt marker after OpenCode identity",
+      );
+      return text;
+    }
+    return replaceBlockWithCompactEnv(text, startIdx, endIdx);
+  }
 
-  // Keep the marker aligned with the current OpenCode Anthropic prompt.
-  const endIdx = text.indexOf(ANTHROPIC_PROMPT_MARKER, startIdx);
-  if (endIdx === -1) {
-    onError?.(
-      "sanitizeAnthropicSystemText: could not find Anthropic prompt marker after OpenCode identity",
-    );
-    return text;
+  // Subagent path: opencode appends "You are powered by the model named ..."
+  // followed by an <env> block. Strip from that line through </env>.
+  const subagentIdx = text.indexOf(SUBAGENT_MODEL_IDENTITY);
+  if (subagentIdx !== -1) {
+    const envCloseTag = "</env>";
+    const envCloseIdx = text.indexOf(envCloseTag, subagentIdx);
+    if (envCloseIdx === -1) {
+      onError?.(
+        "sanitizeAnthropicSystemText: could not find </env> after subagent model identity",
+      );
+      return text;
+    }
+    const endIdx = envCloseIdx + envCloseTag.length;
+    // Skip trailing newline so the join is clean
+    const afterEnd =
+      text[endIdx] === "\n" ? endIdx + 1 : endIdx;
+    return replaceBlockWithCompactEnv(text, subagentIdx, afterEnd);
   }
 
-  // Extract the cwd from the block we're about to strip. OpenCode's system
-  // prompt embeds <environment><cwd>/path</cwd></environment> in the identity
-  // block. We preserve the per-session cwd instead of falling back to
-  // process.cwd() which is the opencode server's cwd and wrong for
-  // multi-session/worktree setups where each session has a different directory.
+  return text;
+}
+
+// Extract cwd from the block being stripped and replace it with a compact
+// <environment> tag. Shared by both main-session and subagent paths.
+// Source: anomalyco/opencode packages/opencode/src/session/system.ts
+// OpenCode's system prompt format (as of 2025):
+//   <env>
+//     Working directory: ${Instance.directory}
+//     Workspace root folder: ${Instance.worktree}
+//     Is directory a git repo: yes/no
+//     Platform: ${process.platform}
+//     Today's date: ${new Date().toDateString()}
+//   </env>
+// Older format used <environment><cwd>/path</cwd></environment>.
+// We try both patterns to stay compatible across opencode versions.
+// We preserve the per-session directory instead of falling back to
+// process.cwd() which is the opencode server's cwd and wrong for
+// multi-session/worktree setups where each session has a different directory.
+function replaceBlockWithCompactEnv(
+  text: string,
+  startIdx: number,
+  endIdx: number,
+) {
   const strippedBlock = text.slice(startIdx, endIdx);
-  const cwdMatch = strippedBlock.match(/<cwd>([^<]+)<\/cwd>/);
-  const cwd = cwdMatch?.[1] || process.cwd();
+  const cwdMatch =
+    strippedBlock.match(/Working directory:\s*(.+)/)?.[1]?.trim() ||
+    strippedBlock.match(/<cwd>([^<]+)<\/cwd>/)?.[1];
+  const cwd = cwdMatch || process.cwd();
 
   const envContext =
     `\n<environment>\n<cwd>${cwd}</cwd>\n</environment>\n` +
-    `Read, write, and edit files under <cwd>.\n\n`;
+    `Read, write, and edit files under ${cwd}.\n\n`;
 
-  const result =
+  return (
     text.slice(0, startIdx) +
     envContext +
-    text.slice(endIdx);
-
-  return result;
+    text.slice(endIdx)
+  );
 }
 
 function mapSystemTextPart(

package/src/format-tables.test.ts

@@ -475,6 +475,26 @@ Read this first.
     `)
   })
 
+  test('renders callout that was prefixed with ⬥ as plain text (regression)', () => {
+    // Before the fix, formatPart would add ⬥ prefix to callout lines,
+    // breaking the callout parser. Now formatPart skips the prefix for callouts.
+    const result = splitTablesFromMarkdown(`⬥ <callout accent="#ef4444">
+## Top priority
+- **Stripe dispute** deadline
+</callout>`)
+    expect(result).toMatchInlineSnapshot(`
+      [
+        {
+          "text": "⬥ <callout accent="#ef4444">
+      ## Top priority
+      - **Stripe dispute** deadline
+      </callout>",
+          "type": "text",
+        },
+      ]
+    `)
+  })
+
   test('falls back to plain text when a callout is not closed', () => {
     const result = splitTablesFromMarkdown(`<callout accent="#2b7fff">
 ## Important

package/src/message-formatting.test.ts

@@ -1,7 +1,52 @@
 import { describe, test, expect } from 'vitest'
-import { formatTodoList } from './message-formatting.js'
+import { formatPart, formatTodoList } from './message-formatting.js'
 import type { Part } from '@opencode-ai/sdk/v2'
 
+describe('formatPart', () => {
+  test('callout text does not get ⬥ prefix', () => {
+    const part: Part = {
+      id: 'test',
+      type: 'text',
+      sessionID: 'ses_test',
+      messageID: 'msg_test',
+      text: `<callout accent="#ef4444">\n## Top priority\n- **Stripe dispute** deadline\n</callout>`,
+    }
+    expect(formatPart(part)).toMatchInlineSnapshot(`
+      "
+      <callout accent="#ef4444">
+      ## Top priority
+      - **Stripe dispute** deadline
+      </callout>"
+    `)
+  })
+
+  test('regular text gets ⬥ prefix', () => {
+    const part: Part = {
+      id: 'test',
+      type: 'text',
+      sessionID: 'ses_test',
+      messageID: 'msg_test',
+      text: 'hello world',
+    }
+    expect(formatPart(part)).toMatchInlineSnapshot(`"⬥ hello world"`)
+  })
+
+  test('text starting with heading does not get ⬥ prefix', () => {
+    const part: Part = {
+      id: 'test',
+      type: 'text',
+      sessionID: 'ses_test',
+      messageID: 'msg_test',
+      text: '## Summary\nDone.',
+    }
+    expect(formatPart(part)).toMatchInlineSnapshot(`
+      "
+      ## Summary
+      Done."
+    `)
+  })
+})
+
 describe('formatTodoList', () => {
   test('formats active todo with monospace numbers', () => {
     const part: Part = {

package/src/message-formatting.ts

@@ -412,7 +412,9 @@ export function formatPart(part: Part, prefix?: string): string {
     const firstChar = text[0] || ''
     const markdownStarters = ['#', '*', '_', '-', '>', '`', '[', '|']
     const startsWithMarkdown =
-      markdownStarters.includes(firstChar) || /^\d+\./.test(text)
+      markdownStarters.includes(firstChar) ||
+      /^\d+\./.test(text) ||
+      /^<callout[\s>]/i.test(text)
     if (startsWithMarkdown) {
       return `\n${text}`
     }