@otto-assistant/bridge 0.4.92 → 0.4.93

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

@@ -735,7 +735,8 @@ describe('agent model resolution', () => {
         --- from: assistant (TestBot)
         ⬥ ok
         *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***
-        Switched to **plan** agent for this session next messages (was **test-agent**)
+        Switched to **plan** agent for this session (was **test-agent**)
+        The agent will change on the next message.
         --- from: user (agent-model-tester)
         Reply with exactly: after-switch-msg
         --- from: assistant (TestBot)

package/dist/anthropic-auth-plugin.js

@@ -694,6 +694,13 @@ const AnthropicAuthPlugin = async ({ client }) => {
                             if (shouldRotateAuth(response.status, bodyText)) {
                                 const rotated = await rotateAnthropicAccount(freshAuth, client);
                                 if (rotated) {
+                                    // Show toast notification so Discord thread shows the rotation
+                                    client.tui.showToast({
+                                        body: {
+                                            message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                                            variant: 'info',
+                                        },
+                                    }).catch(() => { });
                                     const retryAuth = await getFreshOAuth(getAuth, client);
                                     if (retryAuth) {
                                         response = await runRequest(retryAuth);

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

@@ -67,7 +67,13 @@ describe('rotateAnthropicAccount', () => {
         const rotated = await rotateAnthropicAccount(firstAccount, client);
         const store = await loadAccountStore();
         const authJson = JSON.parse(await readFile(authFilePath(), 'utf8'));
-        expect(rotated).toMatchObject({ refresh: 'refresh-second' });
+        expect(rotated).toMatchObject({
+            auth: { refresh: 'refresh-second' },
+            fromLabel: '#1 (refresh-...irst)',
+            toLabel: '#2 (refresh-...cond)',
+            fromIndex: 0,
+            toIndex: 1,
+        });
         expect(store.activeIndex).toBe(1);
         expect(authJson.anthropic?.refresh).toBe('refresh-second');
         expect(authSetCalls).toEqual([

package/dist/anthropic-auth-state.js

@@ -94,6 +94,12 @@ 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 r = account.refresh;
+    const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r;
+    return index !== undefined ? `#${index + 1} (${short})` : short;
+}
 function findCurrentAccountIndex(store, auth) {
     if (!store.accounts.length)
         return 0;
@@ -165,10 +171,14 @@ export async function rotateAnthropicAccount(auth, client) {
         if (store.accounts.length < 2)
             return undefined;
         const currentIndex = findCurrentAccountIndex(store, auth);
+        const currentAccount = store.accounts[currentIndex];
         const nextIndex = (currentIndex + 1) % store.accounts.length;
         const nextAccount = store.accounts[nextIndex];
         if (!nextAccount)
             return undefined;
+        const fromLabel = currentAccount
+            ? accountLabel(currentAccount, currentIndex)
+            : accountLabel(auth, currentIndex);
         nextAccount.lastUsed = Date.now();
         store.activeIndex = nextIndex;
         await saveAccountStore(store);
@@ -179,7 +189,13 @@ export async function rotateAnthropicAccount(auth, client) {
             expires: nextAccount.expires,
         };
         await setAnthropicAuth(nextAuth, client);
-        return nextAuth;
+        return {
+            auth: nextAuth,
+            fromLabel,
+            toLabel: accountLabel(nextAccount, nextIndex),
+            fromIndex: currentIndex,
+            toIndex: nextIndex,
+        };
     });
 }
 export async function removeAccount(index) {

package/dist/cli.js

@@ -32,7 +32,7 @@ import { backgroundUpgradeKimaki, upgrade, getCurrentVersion, } from './upgrade.
 import { startHranaServer } from './hrana-server.js';
 import { startIpcPolling, stopIpcPolling } from './ipc-polling.js';
 import { getPromptPreview, parseSendAtValue, parseScheduledTaskPayload, serializeScheduledTaskPayload, } from './task-schedule.js';
-import { accountsFilePath, loadAccountStore, removeAccount, } from './anthropic-auth-state.js';
+import { accountLabel, accountsFilePath, loadAccountStore, removeAccount, } from './anthropic-auth-state.js';
 const cliLogger = createLogger(LogPrefix.CLI);
 // Gateway bot mode constants.
 // KIMAKI_GATEWAY_APP_ID is the Discord Application ID of the gateway bot.
@@ -2234,8 +2234,7 @@ cli
     }
     store.accounts.forEach((account, index) => {
         const active = index === store.activeIndex ? '*' : ' ';
-        const label = `${account.refresh.slice(0, 8)}...${account.refresh.slice(-4)}`;
-        console.log(`${active} ${index + 1}. ${label}`);
+        console.log(`${active} ${index + 1}. ${accountLabel(account)}`);
     });
     process.exit(0);
 });

package/dist/commands/agent.js

@@ -255,7 +255,7 @@ export async function handleAgentSelectMenu(interaction) {
         await setAgentForContext({ context, agentName: selectedAgent });
         if (context.isThread && context.sessionId) {
             await interaction.editReply({
-                content: `Agent preference set for this session next messages: **${selectedAgent}**`,
+                content: `Agent preference set for this session: **${selectedAgent}**\nThe agent will change on the next message.`,
                 components: [],
             });
         }
@@ -317,7 +317,7 @@ export async function handleQuickAgentCommand({ command, appId, }) {
             : '';
         if (context.isThread && context.sessionId) {
             await command.editReply({
-                content: `Switched to **${resolvedAgentName}** agent for this session next messages${previousText}`,
+                content: `Switched to **${resolvedAgentName}** agent for this session${previousText}\nThe agent will change on the next message.`,
             });
         }
         else {

package/dist/commands/merge-worktree.js

@@ -103,15 +103,18 @@ export async function handleMergeWorktreeCommand({ command, appId, }) {
             await command.editReply('Rebase conflict detected. Asking the model to resolve...');
             await sendPromptToModel({
                 prompt: [
-                    'A rebase conflict occurred while merging this worktree into the default branch.',
+                    `A rebase conflict occurred while merging this worktree into \`${result.target}\`.`,
                     'Rebasing multiple commits can pause on each commit that conflicts, so you may need to repeat the resolve/continue loop several times.',
-                    'Please resolve the rebase conflicts:',
-                    '1. Check `git status` to see which files have conflicts',
-                    '2. Edit the conflicted files to resolve the merge markers',
-                    '3. Stage resolved files with `git add`',
-                    '4. Continue the rebase with `git rebase --continue`',
-                    '5. If git reports more conflicts, repeat steps 1-4 until the rebase finishes (no more MERGE markers, `git status` shows no rebase in progress)',
-                    '6. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
+                    'Before editing anything, first understand both sides so you preserve both intentions and do not drop features or fixes.',
+                    '1. Check `git status` to see which files have conflicts and confirm the rebase is paused',
+                    `2. Find the merge base between this worktree and \`${result.target}\`, then read the commit messages from both sides since that merge base so you understand the goal of each change`,
+                    `3. Read the diffs from that merge base to both sides so you understand exactly what changed on this branch and on \`${result.target}\` before resolving conflicts`,
+                    '4. Read the commit currently being replayed in the rebase so you know the intent of the specific conflicting patch',
+                    '5. Edit the conflicted files to preserve both intended changes where possible instead of choosing one side wholesale',
+                    '6. Stage resolved files with `git add`',
+                    '7. Continue the rebase with `git rebase --continue`',
+                    '8. If git reports more conflicts, repeat steps 1-7 until the rebase finishes (no more rebase in progress, `git status` is clean)',
+                    '9. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
                 ].join('\n'),
                 thread,
                 projectDirectory: worktreeInfo.project_directory,

package/dist/session-handler/thread-session-runtime.js

@@ -3132,8 +3132,8 @@ export class ThreadSessionRuntime {
         const truncate = (s, max) => {
             return s.length > max ? s.slice(0, max - 1) + '\u2026' : s;
         };
-        const truncatedFolder = truncate(folderName, 15);
-        const truncatedBranch = truncate(branchName, 15);
+        const truncatedFolder = truncate(folderName, 30);
+        const truncatedBranch = truncate(branchName, 30);
         const projectInfo = truncatedBranch
             ? `${truncatedFolder} ⋅ ${truncatedBranch} ⋅ `
             : `${truncatedFolder} ⋅ `;

package/dist/system-message.js

@@ -368,10 +368,23 @@ Use --agent to specify which agent to use for the session:
 kimaki send --channel ${channelId} --prompt "Plan the refactor of the auth module" --agent plan${userArg}
 ${availableAgentsContext}
 
+## running opencode commands via kimaki send
+
+You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+kimaki send --channel ${channelId} --prompt "/build-cmd update dependencies"${userArg}
+
+The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
 ## switching agents in the current session
 
 The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+You can also switch agents via \`kimaki send\`:
+
+kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
 ## scheduled sends and task management
 
 Use \`--send-at\` to schedule a one-time or recurring task:

package/dist/system-message.test.js

@@ -135,10 +135,23 @@ describe('system-message', () => {
       - \`plan\`: planning only
       - \`build\`: edits files
 
+      ## running opencode commands via kimaki send
+
+      You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+      kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+      kimaki send --channel chan_123 --prompt "/build-cmd update dependencies" --user "Tommy"
+
+      The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
       ## switching agents in the current session
 
       The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+      You can also switch agents via \`kimaki send\`:
+
+      kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
       ## scheduled sends and task management
 
       Use \`--send-at\` to schedule a one-time or recurring task:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@otto-assistant/bridge",
   "module": "index.ts",
   "type": "module",
-  "version": "0.4.92",
+  "version": "0.4.93",
   "scripts": {
     "dev": "tsx src/bin.ts",
     "prepublishOnly": "pnpm generate && pnpm tsc",

package/skills/npm-package/SKILL.md

@@ -39,15 +39,20 @@ Use this skill when scaffolding or fixing npm packages.
    - any runtime-required extra files (for example `schema.prisma`)
    - docs like `README.md` and `CHANGELOG.md`
    - if tests are inside src and gets included in dist, it's fine. don't try to exclude them
-10. `scripts.build` should be `rimraf dist "*.tsbuildinfo" && tsc && chmod +x dist/cli.js` (skip the chmod
-     if the package has no bin). No bundling. We remove dist to cleanup old transpiled files. Use `rimraf` here instead of bare shell globs so the script behaves the same in zsh, bash, and Windows shells even when no `.tsbuildinfo` file exists. This also removes the tsc incremental compilation state. Without that tsc would not generate again files to dist.
-     Optionally include running scripts with tsx if needed to generate build artifacts.
-11. `prepublishOnly` must always run `build` (optionally run generation before
-     build when required). Always add this script:
+10. `scripts.build` should be `tsc && chmod +x dist/cli.js` (skip the chmod if
+     the package has no bin). No bundling. Do not delete `dist/` in `build` by
+     default because forcing a clean build on every local build can cause
+     issues. Optionally include running scripts with `tsx` if needed to
+     generate build artifacts.
+11. `prepublishOnly` must always do the cleanup before `build` (optionally run
+     generation before build when required). Always add this script:
      ```json
-     { "prepublishOnly": "pnpm build" }
+     { "prepublishOnly": "rimraf dist \"*.tsbuildinfo\" && pnpm build" }
      ```
-     This ensures `dist/` is fresh before every `npm publish`.
+     This ensures `dist/` is fresh before every `npm publish`, so deleted files
+     do not accidentally stay in the published package. Use `rimraf` here
+     instead of bare shell globs so the script behaves the same in zsh, bash,
+     and Windows shells even when no `.tsbuildinfo` file exists.
 
 ## bin field
 
@@ -71,8 +76,8 @@ Add the shebang as the first line of the source file (`src/cli.ts`):
 ```
 
 `tsc` preserves the shebang in the emitted `.js` file. The `chmod +x` is
-already part of the `build` script, so `prepublishOnly: "pnpm build"` handles
-it automatically.
+already part of the `build` script, so `prepublishOnly` still gets it through
+`pnpm build` after the cleanup step.
 
 ## Reading package version at runtime
 

package/src/agent-model.e2e.test.ts

@@ -950,7 +950,8 @@ describe('agent model resolution', () => {
         --- from: assistant (TestBot)
         ⬥ ok
         *project ⋅ main ⋅ Ns ⋅ N% ⋅ agent-model-v2 ⋅ **test-agent***
-        Switched to **plan** agent for this session next messages (was **test-agent**)
+        Switched to **plan** agent for this session (was **test-agent**)
+        The agent will change on the next message.
         --- from: user (agent-model-tester)
         Reply with exactly: after-switch-msg
         --- from: assistant (TestBot)

package/src/anthropic-auth-plugin.test.ts

@@ -88,7 +88,13 @@ describe('rotateAnthropicAccount', () => {
       anthropic?: { refresh?: string }
     }
 
-    expect(rotated).toMatchObject({ refresh: 'refresh-second' })
+    expect(rotated).toMatchObject({
+      auth: { refresh: 'refresh-second' },
+      fromLabel: '#1 (refresh-...irst)',
+      toLabel: '#2 (refresh-...cond)',
+      fromIndex: 0,
+      toIndex: 1,
+    })
     expect(store.activeIndex).toBe(1)
     expect(authJson.anthropic?.refresh).toBe('refresh-second')
     expect(authSetCalls).toEqual([

package/src/anthropic-auth-plugin.ts

@@ -823,6 +823,13 @@ const AnthropicAuthPlugin: Plugin = async ({ client }) => {
               if (shouldRotateAuth(response.status, bodyText)) {
                 const rotated = await rotateAnthropicAccount(freshAuth, client)
                 if (rotated) {
+                  // Show toast notification so Discord thread shows the rotation
+                  client.tui.showToast({
+                    body: {
+                      message: `Switching from account ${rotated.fromLabel} to account ${rotated.toLabel}`,
+                      variant: 'info',
+                    },
+                  }).catch(() => {})
                   const retryAuth = await getFreshOAuth(getAuth, client)
                   if (retryAuth) {
                     response = await runRequest(retryAuth)

package/src/anthropic-auth-state.ts

@@ -133,6 +133,21 @@ export async function saveAccountStore(store: AccountStore) {
   await writeJson(accountsFilePath(), normalizeAccountStore(store))
 }
 
+/** Short label for an account: first 8 + last 4 chars of refresh token. */
+export function accountLabel(account: OAuthStored, index?: number): string {
+  const r = account.refresh
+  const short = r.length > 12 ? `${r.slice(0, 8)}...${r.slice(-4)}` : r
+  return index !== undefined ? `#${index + 1} (${short})` : short
+}
+
+export type RotationResult = {
+  auth: OAuthStored
+  fromLabel: string
+  toLabel: string
+  fromIndex: number
+  toIndex: number
+}
+
 function findCurrentAccountIndex(store: AccountStore, auth: OAuthStored) {
   if (!store.accounts.length) return 0
   const byRefresh = store.accounts.findIndex((account) => {
@@ -206,16 +221,21 @@ export async function setAnthropicAuth(
 export async function rotateAnthropicAccount(
   auth: OAuthStored,
   client: Parameters<Plugin>[0]['client'],
-) {
+): Promise<RotationResult | undefined> {
   return withAuthStateLock(async () => {
     const store = await loadAccountStore()
     if (store.accounts.length < 2) return undefined
 
     const currentIndex = findCurrentAccountIndex(store, auth)
+    const currentAccount = store.accounts[currentIndex]
     const nextIndex = (currentIndex + 1) % store.accounts.length
     const nextAccount = store.accounts[nextIndex]
     if (!nextAccount) return undefined
 
+    const fromLabel = currentAccount
+      ? accountLabel(currentAccount, currentIndex)
+      : accountLabel(auth, currentIndex)
+
     nextAccount.lastUsed = Date.now()
     store.activeIndex = nextIndex
     await saveAccountStore(store)
@@ -227,7 +247,13 @@ export async function rotateAnthropicAccount(
       expires: nextAccount.expires,
     }
     await setAnthropicAuth(nextAuth, client)
-    return nextAuth
+    return {
+      auth: nextAuth,
+      fromLabel,
+      toLabel: accountLabel(nextAccount, nextIndex),
+      fromIndex: currentIndex,
+      toIndex: nextIndex,
+    }
   })
 }
 

package/src/cli.ts

@@ -125,6 +125,7 @@ import {
   type ScheduledTaskPayload,
 } from './task-schedule.js'
 import {
+  accountLabel,
   accountsFilePath,
   loadAccountStore,
   removeAccount,
@@ -3178,8 +3179,7 @@ cli
 
     store.accounts.forEach((account, index) => {
       const active = index === store.activeIndex ? '*' : ' '
-      const label = `${account.refresh.slice(0, 8)}...${account.refresh.slice(-4)}`
-      console.log(`${active} ${index + 1}. ${label}`)
+      console.log(`${active} ${index + 1}. ${accountLabel(account)}`)
     })
 
     process.exit(0)

package/src/commands/agent.ts

@@ -379,7 +379,7 @@ export async function handleAgentSelectMenu(
 
     if (context.isThread && context.sessionId) {
       await interaction.editReply({
-        content: `Agent preference set for this session next messages: **${selectedAgent}**`,
+        content: `Agent preference set for this session: **${selectedAgent}**\nThe agent will change on the next message.`,
         components: [],
       })
     } else {
@@ -457,7 +457,7 @@ export async function handleQuickAgentCommand({
 
     if (context.isThread && context.sessionId) {
       await command.editReply({
-        content: `Switched to **${resolvedAgentName}** agent for this session next messages${previousText}`,
+        content: `Switched to **${resolvedAgentName}** agent for this session${previousText}\nThe agent will change on the next message.`,
       })
     } else {
       await command.editReply({

package/src/commands/merge-worktree.ts

@@ -155,15 +155,18 @@ export async function handleMergeWorktreeCommand({
       )
       await sendPromptToModel({
         prompt: [
-          'A rebase conflict occurred while merging this worktree into the default branch.',
+          `A rebase conflict occurred while merging this worktree into \`${result.target}\`.`,
           'Rebasing multiple commits can pause on each commit that conflicts, so you may need to repeat the resolve/continue loop several times.',
-          'Please resolve the rebase conflicts:',
-          '1. Check `git status` to see which files have conflicts',
-          '2. Edit the conflicted files to resolve the merge markers',
-          '3. Stage resolved files with `git add`',
-          '4. Continue the rebase with `git rebase --continue`',
-          '5. If git reports more conflicts, repeat steps 1-4 until the rebase finishes (no more MERGE markers, `git status` shows no rebase in progress)',
-          '6. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
+          'Before editing anything, first understand both sides so you preserve both intentions and do not drop features or fixes.',
+          '1. Check `git status` to see which files have conflicts and confirm the rebase is paused',
+          `2. Find the merge base between this worktree and \`${result.target}\`, then read the commit messages from both sides since that merge base so you understand the goal of each change`,
+          `3. Read the diffs from that merge base to both sides so you understand exactly what changed on this branch and on \`${result.target}\` before resolving conflicts`,
+          '4. Read the commit currently being replayed in the rebase so you know the intent of the specific conflicting patch',
+          '5. Edit the conflicted files to preserve both intended changes where possible instead of choosing one side wholesale',
+          '6. Stage resolved files with `git add`',
+          '7. Continue the rebase with `git rebase --continue`',
+          '8. If git reports more conflicts, repeat steps 1-7 until the rebase finishes (no more rebase in progress, `git status` is clean)',
+          '9. Once the rebase is fully complete, tell me so I can run `/merge-worktree` again',
         ].join('\n'),
         thread,
         projectDirectory: worktreeInfo.project_directory,

package/src/session-handler/thread-session-runtime.ts

@@ -4111,8 +4111,8 @@ export class ThreadSessionRuntime {
     const truncate = (s: string, max: number) => {
       return s.length > max ? s.slice(0, max - 1) + '\u2026' : s
     }
-    const truncatedFolder = truncate(folderName, 15)
-    const truncatedBranch = truncate(branchName, 15)
+    const truncatedFolder = truncate(folderName, 30)
+    const truncatedBranch = truncate(branchName, 30)
     const projectInfo = truncatedBranch
       ? `${truncatedFolder} ⋅ ${truncatedBranch} ⋅ `
       : `${truncatedFolder} ⋅ `

package/src/system-message.test.ts

@@ -142,10 +142,23 @@ describe('system-message', () => {
       - \`plan\`: planning only
       - \`build\`: edits files
 
+      ## running opencode commands via kimaki send
+
+      You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+      kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+      kimaki send --channel chan_123 --prompt "/build-cmd update dependencies" --user "Tommy"
+
+      The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
       ## switching agents in the current session
 
       The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+      You can also switch agents via \`kimaki send\`:
+
+      kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
       ## scheduled sends and task management
 
       Use \`--send-at\` to schedule a one-time or recurring task:

package/src/system-message.ts

@@ -477,10 +477,23 @@ Use --agent to specify which agent to use for the session:
 kimaki send --channel ${channelId} --prompt "Plan the refactor of the auth module" --agent plan${userArg}
 ${availableAgentsContext}
 
+## running opencode commands via kimaki send
+
+You can trigger registered opencode commands (slash commands, skills, MCP prompts) by starting the \`--prompt\` with \`/commandname\`:
+
+kimaki send --thread <thread_id> --prompt "/review fix the auth module"
+kimaki send --channel ${channelId} --prompt "/build-cmd update dependencies"${userArg}
+
+The command name must match a registered opencode command. If the command is not recognized, the prompt is sent as plain text to the model. This works for both new threads (\`--channel\`) and existing threads (\`--thread\`/\`--session\`).
+
 ## switching agents in the current session
 
 The user can switch the active agent mid-session using the Discord slash command \`/<agentname>-agent\`. For example if you are in plan mode and the user asks you to edit files, tell them to run \`/build-agent\` to switch to the build agent first.
 
+You can also switch agents via \`kimaki send\`:
+
+kimaki send --thread <thread_id> --prompt "/<agentname>-agent"
+
 ## scheduled sends and task management
 
 Use \`--send-at\` to schedule a one-time or recurring task: