kimaki 0.8.0 → 0.9.0

package/dist/agent-model.e2e.test.js

@@ -274,7 +274,7 @@ describe('agent model resolution', () => {
             });
         }
         if (botClient) {
-            botClient.destroy();
+            void botClient.destroy();
         }
         await stopOpencodeServer();
         await Promise.all([

package/dist/anthropic-auth-plugin.js

@@ -64,10 +64,10 @@ const OAUTH_TIMEOUT_MS = 5 * 60 * 1000;
 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 ENV_CLOSE_TAG = "</env>";
 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";
@@ -465,42 +465,41 @@ function toClaudeCodeToolName(name) {
     return OPENCODE_TO_CLAUDE_CODE_TOOL_NAME[name.toLowerCase()] ?? name;
 }
 /**
- * Strips the OpenCode identity block (from "You are OpenCode…" up to the
- * Anthropic prompt marker "Skills provide specialized instructions") and
- * re-injects essential environment context as a small XML tag.
+ * Strips the OpenCode identity and its adjacent <env> block, then re-injects
+ * essential environment context as a small XML tag.
  *
- * The original OpenCode prompt between those markers contains the current
- * working directory and other runtime context. Stripping it wholesale loses
- * that info, so we add back what the model needs (cwd) in a compact form.
+ * OpenCode can place project instructions before or after skills depending on
+ * version. Keep the rewrite scoped to the env block so configured instruction
+ * files remain visible to Anthropic.
  *
  * Original OpenCode Anthropic prompt structure (for reference):
  *   "You are OpenCode, the best coding agent on the planet."
  *   + environment block (cwd, OS, shell, date, etc.)
- *   + "Skills provide specialized instructions …"
+ *   + instructions and/or skills
  */
 function sanitizeAnthropicSystemText(text, onError) {
     const startIdx = text.indexOf(OPENCODE_IDENTITY);
     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");
+        // Main session path: strip from OpenCode identity through its env block.
+        const envCloseIdx = text.indexOf(ENV_CLOSE_TAG, startIdx);
+        if (envCloseIdx === -1) {
+            onError?.("sanitizeAnthropicSystemText: could not find </env> after OpenCode identity");
             return text;
         }
-        return replaceBlockWithCompactEnv(text, startIdx, endIdx);
+        const endIdx = envCloseIdx + ENV_CLOSE_TAG.length;
+        const afterEnd = text[endIdx] === "\n" ? endIdx + 1 : endIdx;
+        return replaceBlockWithCompactEnv(text, startIdx, afterEnd);
     }
     // 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);
+        const envCloseIdx = text.indexOf(ENV_CLOSE_TAG, subagentIdx);
         if (envCloseIdx === -1) {
             onError?.("sanitizeAnthropicSystemText: could not find </env> after subagent model identity");
             return text;
         }
-        const endIdx = envCloseIdx + envCloseTag.length;
+        const endIdx = envCloseIdx + ENV_CLOSE_TAG.length;
         // Skip trailing newline so the join is clean
         const afterEnd = text[endIdx] === "\n" ? endIdx + 1 : endIdx;
         return replaceBlockWithCompactEnv(text, subagentIdx, afterEnd);

package/dist/anthropic-auth-plugin.test.js

@@ -1,109 +1,70 @@
-// Tests Anthropic request-time prompt rewriting and transform fallback behavior.
+// Tests Anthropic system prompt rewriting so project instructions survive OpenCode prompt layout changes.
 import { describe, expect, test } from 'vitest';
-import { replacer, rewriteAnthropicRequestPayload, } from './anthropic-auth-plugin.js';
-function parseRewrittenBody(body) {
-    if (!body) {
-        throw new Error('Expected rewritten body');
-    }
-    return JSON.parse(body);
+import { replacer } from './anthropic-auth-plugin.js';
+async function transformSystem(systemText) {
+    const plugin = await replacer({});
+    const transform = plugin['experimental.chat.system.transform'];
+    if (!transform)
+        throw new Error('missing system transform hook');
+    const output = { system: [systemText] };
+    await transform({
+        model: { providerID: 'anthropic' },
+    }, output);
+    return output.system.join('\n');
 }
-describe('rewriteAnthropicRequestPayload', () => {
-    test('sanitizes raw opencode system text at request time', () => {
-        const rewritten = rewriteAnthropicRequestPayload(JSON.stringify({
-            model: 'claude-sonnet-4-5',
-            system: "You are OpenCode, the best coding agent on the planet.\nOS: macOS\nCWD: /repo\nSkills provide specialized instructions\nUse opencode tools carefully.",
-            tool_choice: { type: 'tool', name: 'read' },
-            tools: [{ name: 'read' }],
-        }));
-        const payload = parseRewrittenBody(rewritten.body);
-        expect(payload).toMatchInlineSnapshot(`
-      {
-        "model": "claude-sonnet-4-5",
-        "system": [
-          {
-            "text": "You are Claude Code, Anthropic's official CLI for Claude.",
-            "type": "text",
-          },
-          {
-            "text": "
+describe('Anthropic system prompt rewriting', () => {
+    test('preserves instructions when OpenCode places them before skills', async () => {
+        const transformed = await transformSystem(`You are OpenCode, the best coding agent on the planet.
+<env>
+  Working directory: /repo/site
+  Platform: darwin
+</env>
+Instructions from: /repo/site/SOUL.md
+I am Extra Chill Bot.
+Skills provide specialized instructions and workflows.
+Use skills wisely.`);
+        expect(transformed).toMatchInlineSnapshot(`
+      "
       <environment>
-      <cwd>/Users/morse/Documents/GitHub/kimakivoice/cli</cwd>
+      <cwd>/repo/site</cwd>
       </environment>
-      Skills provide specialized instructions
-      Use openc0de tools carefully.",
-            "type": "text",
-          },
-        ],
-        "tool_choice": {
-          "name": "Read",
-          "type": "tool",
-        },
-        "tools": [
-          {
-            "name": "Read",
-          },
-        ],
-      }
+      Read, write, and edit files under /repo/site.
+
+      Instructions from: /repo/site/SOUL.md
+      I am Extra Chill Bot.
+      Skills provide specialized instructions and workflows.
+      Use skills wisely."
     `);
     });
-    test('does not duplicate claude code identity when request was already sanitized', () => {
-        const rewritten = rewriteAnthropicRequestPayload(JSON.stringify({
-            model: 'claude-sonnet-4-5',
-            system: [
-                {
-                    type: 'text',
-                    text: "You are Claude Code, Anthropic's official CLI for Claude.",
-                },
-                {
-                    type: 'text',
-                    text: '<environment>\n<cwd>/repo</cwd>\n</environment>\nSkills provide specialized instructions',
-                },
-            ],
-        }));
-        const payload = parseRewrittenBody(rewritten.body);
-        expect(payload.system).toMatchInlineSnapshot(`
-      [
-        {
-          "text": "You are Claude Code, Anthropic's official CLI for Claude.",
-          "type": "text",
-        },
-        {
-          "text": "<environment>
-      <cwd>/repo</cwd>
-      </environment>
-      Skills provide specialized instructions",
-          "type": "text",
-        },
-      ]
-    `);
-    });
-});
-describe('replacer', () => {
-    test('sanitizes system text only for anthropic provider metadata', async () => {
-        const plugin = await replacer({});
-        const transform = plugin['experimental.chat.system.transform'];
-        if (!transform) {
-            throw new Error('Expected experimental.chat.system.transform hook');
-        }
-        const output = {
-            system: [
-                "You are OpenCode, the best coding agent on the planet.\nOS: macOS\nSkills provide specialized instructions\nUse opencode tools carefully.",
-            ],
-        };
-        await transform({
-            model: {
-                providerID: 'anthropic',
-            },
-        }, output);
-        expect(output.system).toMatchInlineSnapshot(`
-      [
-        "
+    test('preserves instructions when OpenCode places skills before them', async () => {
+        const transformed = await transformSystem(`You are OpenCode, the best coding agent on the planet.
+<env>
+  Working directory: /repo/site
+  Platform: darwin
+</env>
+Skills provide specialized instructions and workflows.
+Use skills wisely.
+Instructions from: /repo/site/SOUL.md
+I am Extra Chill Bot.`);
+        expect(transformed).toMatchInlineSnapshot(`
+      "
       <environment>
-      <cwd>/Users/morse/Documents/GitHub/kimakivoice/cli</cwd>
+      <cwd>/repo/site</cwd>
       </environment>
-      Skills provide specialized instructions
-      Use openc0de tools carefully.",
-      ]
+      Read, write, and edit files under /repo/site.
+
+      Skills provide specialized instructions and workflows.
+      Use skills wisely.
+      Instructions from: /repo/site/SOUL.md
+      I am Extra Chill Bot."
     `);
     });
+    test('leaves text unchanged when the OpenCode env block is incomplete', async () => {
+        const prompt = `You are OpenCode, the best coding agent on the planet.
+<env>
+  Working directory: /repo/site
+Instructions from: /repo/site/SOUL.md
+I am Extra Chill Bot.`;
+        await expect(transformSystem(prompt)).resolves.toBe(prompt);
+    });
 });

package/dist/anthropic-auth-state.js

@@ -1,95 +1,22 @@
-import * as fs from 'node:fs/promises';
+/**
+ * Anthropic OAuth account store and rotation.
+ * Uses shared utilities from oauth-rotation-shared.ts for file locking,
+ * store I/O, and account management. Anthropic-specific: store file path,
+ * identity normalization via AnthropicAccountIdentity.
+ */
 import { homedir } from 'node:os';
 import path from 'node:path';
 import { normalizeAnthropicAccountIdentity, } from './anthropic-account-identity.js';
-const AUTH_LOCK_STALE_MS = 30_000;
-const AUTH_LOCK_RETRY_MS = 100;
-async function readJson(filePath, fallback) {
-    try {
-        return JSON.parse(await fs.readFile(filePath, 'utf8'));
-    }
-    catch {
-        return fallback;
-    }
-}
-async function writeJson(filePath, value) {
-    await fs.mkdir(path.dirname(filePath), { recursive: true });
-    await fs.writeFile(filePath, JSON.stringify(value, null, 2), 'utf8');
-    await fs.chmod(filePath, 0o600);
-}
-function getErrorCode(error) {
-    if (!(error instanceof Error))
-        return undefined;
-    return error.code;
-}
-async function sleep(ms) {
-    await new Promise((resolve) => {
-        setTimeout(resolve, ms);
-    });
-}
-export function authFilePath() {
-    if (process.env.XDG_DATA_HOME) {
-        return path.join(process.env.XDG_DATA_HOME, 'opencode', 'auth.json');
-    }
-    return path.join(homedir(), '.local', 'share', 'opencode', 'auth.json');
-}
+import { accountLabel, authFilePath, findCurrentAccountIndex, isOAuthStored, normalizeAccountStore, readJson, upsertAccount as sharedUpsertAccount, withAuthStateLock, writeJson, shouldRotateAuth, } from './oauth-rotation-shared.js';
+export { accountLabel, authFilePath, withAuthStateLock, shouldRotateAuth };
+// --- Store file path ---
 export function accountsFilePath() {
     if (process.env.XDG_DATA_HOME) {
         return path.join(process.env.XDG_DATA_HOME, 'opencode', 'anthropic-oauth-accounts.json');
     }
     return path.join(homedir(), '.local', 'share', 'opencode', 'anthropic-oauth-accounts.json');
 }
-export async function withAuthStateLock(fn) {
-    const file = authFilePath();
-    const lockDir = `${file}.lock`;
-    const deadline = Date.now() + AUTH_LOCK_STALE_MS;
-    await fs.mkdir(path.dirname(file), { recursive: true });
-    while (true) {
-        try {
-            await fs.mkdir(lockDir);
-            break;
-        }
-        catch (error) {
-            const code = getErrorCode(error);
-            if (code !== 'EEXIST') {
-                throw error;
-            }
-            const stats = await fs.stat(lockDir).catch(() => {
-                return null;
-            });
-            if (stats && Date.now() - stats.mtimeMs > AUTH_LOCK_STALE_MS) {
-                await fs.rm(lockDir, { force: true, recursive: true }).catch(() => { });
-                continue;
-            }
-            if (Date.now() >= deadline) {
-                throw new Error(`Timed out waiting for auth lock: ${lockDir}`);
-            }
-            await sleep(AUTH_LOCK_RETRY_MS);
-        }
-    }
-    try {
-        return await fn();
-    }
-    finally {
-        await fs.rm(lockDir, { force: true, recursive: true }).catch(() => { });
-    }
-}
-export function normalizeAccountStore(input) {
-    const accounts = Array.isArray(input?.accounts)
-        ? input.accounts.filter((account) => !!account &&
-            account.type === 'oauth' &&
-            typeof account.refresh === 'string' &&
-            typeof account.access === 'string' &&
-            typeof account.expires === 'number' &&
-            (typeof account.email === 'undefined' || typeof account.email === 'string') &&
-            (typeof account.accountId === 'undefined' || typeof account.accountId === 'string') &&
-            typeof account.addedAt === 'number' &&
-            typeof account.lastUsed === 'number')
-        : [];
-    const rawIndex = typeof input?.activeIndex === 'number' ? Math.floor(input.activeIndex) : 0;
-    const activeIndex = accounts.length === 0 ? 0 : ((rawIndex % accounts.length) + accounts.length) % accounts.length;
-    return { version: 1, activeIndex, accounts };
-}
+// --- Store I/O ---
 export async function loadAccountStore() {
     const raw = await readJson(accountsFilePath(), null);
     return normalizeAccountStore(raw);
@@ -97,77 +24,16 @@ export async function loadAccountStore() {
 export async function saveAccountStore(store) {
     await writeJson(accountsFilePath(), normalizeAccountStore(store));
 }
-/** Short label for an account: first 8 + last 4 chars of refresh token. */
-export function accountLabel(account, index) {
-    const accountWithIdentity = account;
-    const identity = accountWithIdentity.email || accountWithIdentity.accountId;
-    const r = account.refresh;
-    const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r;
-    if (identity) {
-        return index !== undefined ? `#${index + 1} (${identity})` : identity;
-    }
-    return index !== undefined ? `#${index + 1} (${short})` : short;
-}
-function findCurrentAccountIndex(store, auth) {
-    if (!store.accounts.length)
-        return 0;
-    const byRefresh = store.accounts.findIndex((account) => {
-        return account.refresh === auth.refresh;
-    });
-    if (byRefresh >= 0)
-        return byRefresh;
-    const byAccess = store.accounts.findIndex((account) => {
-        return account.access === auth.access;
-    });
-    if (byAccess >= 0)
-        return byAccess;
-    return store.activeIndex;
-}
+// --- Upsert with Anthropic identity normalization ---
 export function upsertAccount(store, auth, now = Date.now()) {
     const authWithIdentity = auth;
     const identity = normalizeAnthropicAccountIdentity({
         email: authWithIdentity.email,
         accountId: authWithIdentity.accountId,
     });
-    const index = store.accounts.findIndex((account) => {
-        if (account.refresh === auth.refresh || account.access === auth.access) {
-            return true;
-        }
-        if (identity?.accountId && account.accountId === identity.accountId) {
-            return true;
-        }
-        if (identity?.email && account.email === identity.email) {
-            return true;
-        }
-        return false;
-    });
-    const nextAccount = {
-        type: 'oauth',
-        refresh: auth.refresh,
-        access: auth.access,
-        expires: auth.expires,
-        ...identity,
-        addedAt: now,
-        lastUsed: now,
-    };
-    if (index < 0) {
-        store.accounts.push(nextAccount);
-        store.activeIndex = store.accounts.length - 1;
-        return store.activeIndex;
-    }
-    const existing = store.accounts[index];
-    if (!existing)
-        return index;
-    store.accounts[index] = {
-        ...existing,
-        ...nextAccount,
-        addedAt: existing.addedAt,
-        email: nextAccount.email || existing.email,
-        accountId: nextAccount.accountId || existing.accountId,
-    };
-    store.activeIndex = index;
-    return index;
+    return sharedUpsertAccount(store, { ...auth, ...identity }, now);
 }
+// --- Remember new login ---
 export async function rememberAnthropicOAuth(auth, identity) {
     await withAuthStateLock(async () => {
         const store = await loadAccountStore();
@@ -175,6 +41,7 @@ export async function rememberAnthropicOAuth(auth, identity) {
         await saveAccountStore(store);
     });
 }
+// --- Auth file write + SDK sync ---
 async function writeAnthropicAuthFile(auth) {
     const file = authFilePath();
     const data = await readJson(file, {});
@@ -186,16 +53,11 @@ async function writeAnthropicAuthFile(auth) {
     }
     await writeJson(file, data);
 }
-function isOAuthStored(value) {
-    if (!value || typeof value !== 'object') {
-        return false;
-    }
-    const record = value;
-    return (record.type === 'oauth' &&
-        typeof record.refresh === 'string' &&
-        typeof record.access === 'string' &&
-        typeof record.expires === 'number');
+export async function setAnthropicAuth(auth, client) {
+    await writeAnthropicAuthFile(auth);
+    await client.auth.set({ path: { id: 'anthropic' }, body: auth });
 }
+// --- Current account ---
 export async function getCurrentAnthropicAccount() {
     const authJson = await readJson(authFilePath(), {});
     const auth = authJson.anthropic;
@@ -217,10 +79,7 @@ export async function getCurrentAnthropicAccount() {
         index,
     };
 }
-export async function setAnthropicAuth(auth, client) {
-    await writeAnthropicAuthFile(auth);
-    await client.auth.set({ path: { id: 'anthropic' }, body: auth });
-}
+// --- Rotation ---
 export async function rotateAnthropicAccount(auth, client) {
     return withAuthStateLock(async () => {
         const store = await loadAccountStore();
@@ -254,6 +113,7 @@ export async function rotateAnthropicAccount(auth, client) {
         };
     });
 }
+// --- Remove account ---
 export async function removeAccount(index) {
     return withAuthStateLock(async () => {
         const store = await loadAccountStore();
@@ -288,16 +148,3 @@ export async function removeAccount(index) {
         return { store, active: nextAuth };
     });
 }
-export function shouldRotateAuth(status, bodyText) {
-    const haystack = bodyText.toLowerCase();
-    if (status === 429)
-        return true;
-    if (status === 401 || status === 403)
-        return true;
-    return (haystack.includes('rate_limit') ||
-        haystack.includes('rate limit') ||
-        haystack.includes('invalid api key') ||
-        haystack.includes('authentication_error') ||
-        haystack.includes('permission_error') ||
-        haystack.includes('oauth'));
-}

package/dist/channel-management.js

@@ -86,15 +86,14 @@ export async function createProjectChannels({ guild, projectDirectory, botName,
 }
 export async function getChannelsWithDescriptions(guild) {
     const channels = [];
-    const textChannels = guild.channels.cache.filter((channel) => channel.isTextBased());
+    const textChannels = guild.channels.cache.filter((channel) => channel.type === ChannelType.GuildText);
     for (const channel of textChannels.values()) {
-        const textChannel = channel;
-        const description = textChannel.topic || null;
+        const description = channel.topic || null;
         // Get channel config from database instead of parsing XML from topic
-        const channelConfig = await getChannelDirectory(textChannel.id);
+        const channelConfig = await getChannelDirectory(channel.id);
         channels.push({
-            id: textChannel.id,
-            name: textChannel.name,
+            id: channel.id,
+            name: channel.name,
             description,
             kimakiDirectory: channelConfig?.directory,
         });