@subrouter/opencode 0.5.0 → 0.5.1

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,qBAAqB,CAAA;AAkD9D,eAAO,MAAM,eAAe,EAAE,MA2L7B,CAAA;AAoBD,eAAO,MAAM,mBAAmB,EAAE,MA0EjC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAe,MAAM,qBAAqB,CAAA;AAkD9D,eAAO,MAAM,eAAe,EAAE,MA0L7B,CAAA;AAoBD,eAAO,MAAM,mBAAmB,EAAE,MAsFjC,CAAA"}

package/dist/index.js

@@ -46,6 +46,13 @@ export const subrouterPlugin = async ({ client, directory }) => {
     const affinity = new RouteAffinity();
     const activeMessages = new Map();
     const deliveredNotices = new Map();
+    // Surface the fallback as a TUI toast, the same channel OpenCode plugins use for
+    // notifications (see kimaki's legacy anthropic/openai/xai auth plugins). A toast is
+    // not persisted into the transcript, so it never becomes a fake user/assistant
+    // message or enters model context. tui.toast.show is a global event with no session
+    // field, so append the OpenCode session id at the end: kimaki routes the toast to
+    // the matching Discord thread by that marker and strips it before display. Plain
+    // OpenCode TUI just shows the toast for the active session.
     const onCooldownFallback = async (notice) => {
         if (!notice.sessionID || !notice.agent || notice.agent === 'title')
             return;
@@ -57,21 +64,13 @@ export const subrouterPlugin = async ({ client, directory }) => {
             return;
         const current = { text, expiresAt: Date.now() + notice.preferred.retryAfterMs };
         deliveredNotices.set(notice.sessionID, current);
-        const body = {
-            noReply: true,
-            agent: notice.agent,
-            model: { providerID: PROVIDER_ID, modelID: notice.preset },
-            variant: notice.variant,
-            parts: [{ type: 'text', text, ignored: true }],
-        };
-        const result = await client.session
-            .prompt({
-            path: { id: notice.sessionID },
+        const result = await client.tui
+            .showToast({
             query: { directory },
-            body,
+            body: { message: `${text} ${notice.sessionID}`, variant: 'info' },
             throwOnError: true,
         })
-            .catch((cause) => new Error('failed to persist cooldown fallback notice', { cause }));
+            .catch((cause) => new Error('failed to show cooldown fallback toast', { cause }));
         if (!(result instanceof Error))
             return;
         if (deliveredNotices.get(notice.sessionID) === current) {
@@ -233,7 +232,8 @@ function toOpencodeCredentials(account) {
         accountId: account.accountId,
     };
 }
-export const subrouterAuthPlugin = async () => {
+export const subrouterAuthPlugin = async ({ client }) => {
+    const log = opencodeLog(client);
     return {
         auth: {
             provider: PROVIDER_ID,
@@ -280,8 +280,18 @@ export const subrouterAuthPlugin = async () => {
                             throw session;
                         const finish = async (input) => {
                             const account = await session.complete(input);
-                            if (account instanceof Error)
+                            if (account instanceof Error) {
+                                // opencode's AuthOAuthResult has no failure-with-message
+                                // variant, so the real reason cannot travel back through
+                                // oauth.callback and harnesses show a generic fallback. Log it
+                                // here so the cause is diagnosable instead of lost.
+                                void log?.({
+                                    level: 'error',
+                                    message: `login failed: ${account.message}`,
+                                    extra: { provider: providerId },
+                                });
                                 return { type: 'failed' };
+                            }
                             await addAccount({ provider: providerId, account });
                             return toOpencodeCredentials(account);
                         };

package/dist/opencode-e2e.test.js

@@ -371,8 +371,18 @@ describe('opencode + subrouter provider', () => {
         expect(anthropicMock.requests.length).toBeGreaterThan(0);
         expect(zenMock.requests.length).toBeGreaterThan(0);
     }, 120_000);
-    test('a pre-existing cooldown appends one ignored notice without another model turn', async () => {
+    test('a pre-existing cooldown shows one session toast without another model turn', async () => {
         const client = createOpencodeClient({ baseUrl: server.url });
+        const toasts = [];
+        const subscription = await client.event.subscribe({
+            query: { directory: projectDir },
+        });
+        void (async () => {
+            for await (const event of subscription.stream) {
+                if (event.type === 'tui.toast.show')
+                    toasts.push({ message: event.properties.message });
+            }
+        })();
         const session = await client.session.create({
             query: { directory: projectDir },
             body: { title: 'subrouter route notice' },
@@ -391,20 +401,16 @@ describe('opencode + subrouter provider', () => {
             .filter((part) => part.type === 'text')
             .map((part) => part.text)
             .join('\n')).toContain('hello from fallback');
+        // The toast is session-scoped through the trailing session-id marker and never
+        // enters the transcript, so no extra user/assistant message and no extra model turn.
         await expect
-            .poll(async () => {
-            const messages = await client.session.messages({
-                path: { id: session.data.id },
-                query: { directory: projectDir },
-            });
-            return (messages.data ?? []).filter(({ parts }) => parts.some((part) => part.type === 'text' && part.ignored === true)).length;
-        })
+            .poll(() => toasts.filter(({ message }) => message.startsWith('Subrouter: Using ') && message.endsWith(session.data.id)).length)
             .toBe(1);
         const messages = await client.session.messages({
             path: { id: session.data.id },
             query: { directory: projectDir },
         });
-        expect((messages.data ?? []).filter(({ info }) => info.role === 'user')).toHaveLength(2);
+        expect((messages.data ?? []).filter(({ info }) => info.role === 'user')).toHaveLength(1);
         expect((messages.data ?? []).filter(({ info }) => info.role === 'assistant')).toHaveLength(1);
         expect(zenMock.requests).toHaveLength(requestsBefore + 1);
     }, 120_000);

package/dist/plugin.test.js

@@ -147,7 +147,7 @@ test('provider log callback forwards only to client.app.log', async () => {
         extra: { provider: 'openai', modelId: 'gpt-5.5' },
     });
 });
-test('cooldown fallback persists one ignored notice during the active run', async () => {
+test('cooldown fallback shows one session-scoped toast during the active run', async () => {
     const requests = [];
     const server = createServer((req, res) => {
         const chunks = [];
@@ -175,7 +175,7 @@ test('cooldown fallback persists one ignored notice during the active run', asyn
     if (typeof onCooldownFallback !== 'function')
         throw new Error('expected cooldown callback');
     const notice = {
-        sessionID: 'session-1',
+        sessionID: 'ses_session1',
         agent: 'build',
         variant: 'high',
         preset: 'work',
@@ -186,19 +186,10 @@ test('cooldown fallback persists one ignored notice during the active run', asyn
     await onCooldownFallback(notice);
     expect(requests).toEqual([
         {
-            path: '/session/session-1/message?directory=%2Ftmp%2Fproject',
+            path: '/tui/show-toast?directory=%2Ftmp%2Fproject',
             body: {
-                noReply: true,
-                agent: 'build',
-                model: { providerID: 'subrouter', modelID: 'work' },
-                variant: 'high',
-                parts: [
-                    {
-                        type: 'text',
-                        text: 'Subrouter: Using openai/gpt-5.6-sol because xai/grok-4.6 is rate limited.',
-                        ignored: true,
-                    },
-                ],
+                message: 'Subrouter: Using openai/gpt-5.6-sol because xai/grok-4.6 is rate limited. ses_session1',
+                variant: 'info',
             },
         },
     ]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subrouter/opencode",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "type": "module",
   "description": "OpenCode plugin that registers the subrouter provider: cycle through your personal AI subscriptions when one hits rate limits.",
   "main": "./dist/index.js",
@@ -44,7 +44,7 @@
   },
   "dependencies": {
     "errore": "^0.14.1",
-    "@subrouter/cli": "^0.6.0"
+    "@subrouter/cli": "^0.6.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.18.23",

package/src/index.ts

@@ -76,6 +76,13 @@ export const subrouterPlugin: Plugin = async ({ client, directory }) => {
   const affinity = new RouteAffinity()
   const activeMessages = new Map<string, string>()
   const deliveredNotices = new Map<string, { text: string; expiresAt: number }>()
+  // Surface the fallback as a TUI toast, the same channel OpenCode plugins use for
+  // notifications (see kimaki's legacy anthropic/openai/xai auth plugins). A toast is
+  // not persisted into the transcript, so it never becomes a fake user/assistant
+  // message or enters model context. tui.toast.show is a global event with no session
+  // field, so append the OpenCode session id at the end: kimaki routes the toast to
+  // the matching Discord thread by that marker and strips it before display. Plain
+  // OpenCode TUI just shows the toast for the active session.
   const onCooldownFallback = async (notice: CooldownFallbackNotice) => {
     if (!notice.sessionID || !notice.agent || notice.agent === 'title') return
     const preferred = `${notice.preferred.provider}/${notice.preferred.modelId}`
@@ -85,21 +92,13 @@ export const subrouterPlugin: Plugin = async ({ client, directory }) => {
     if (delivered?.text === text && delivered.expiresAt > Date.now()) return
     const current = { text, expiresAt: Date.now() + notice.preferred.retryAfterMs }
     deliveredNotices.set(notice.sessionID, current)
-    const body = {
-      noReply: true,
-      agent: notice.agent,
-      model: { providerID: PROVIDER_ID, modelID: notice.preset },
-      variant: notice.variant,
-      parts: [{ type: 'text' as const, text, ignored: true }],
-    }
-    const result = await client.session
-      .prompt({
-        path: { id: notice.sessionID },
+    const result = await client.tui
+      .showToast({
         query: { directory },
-        body,
+        body: { message: `${text} ${notice.sessionID}`, variant: 'info' },
         throwOnError: true,
       })
-      .catch((cause) => new Error('failed to persist cooldown fallback notice', { cause }))
+      .catch((cause) => new Error('failed to show cooldown fallback toast', { cause }))
     if (!(result instanceof Error)) return
     if (deliveredNotices.get(notice.sessionID) === current) {
       deliveredNotices.delete(notice.sessionID)
@@ -278,7 +277,8 @@ function toOpencodeCredentials(account: StoredAccount) {
   }
 }
 
-export const subrouterAuthPlugin: Plugin = async () => {
+export const subrouterAuthPlugin: Plugin = async ({ client }) => {
+  const log = opencodeLog(client)
   return {
     auth: {
       provider: PROVIDER_ID,
@@ -328,7 +328,18 @@ export const subrouterAuthPlugin: Plugin = async () => {
 
             const finish = async (input?: string) => {
               const account = await session.complete(input)
-              if (account instanceof Error) return { type: 'failed' as const }
+              if (account instanceof Error) {
+                // opencode's AuthOAuthResult has no failure-with-message
+                // variant, so the real reason cannot travel back through
+                // oauth.callback and harnesses show a generic fallback. Log it
+                // here so the cause is diagnosable instead of lost.
+                void log?.({
+                  level: 'error',
+                  message: `login failed: ${account.message}`,
+                  extra: { provider: providerId },
+                })
+                return { type: 'failed' as const }
+              }
               await addAccount({ provider: providerId, account })
               return toOpencodeCredentials(account)
             }

package/src/opencode-e2e.test.ts

@@ -433,8 +433,18 @@ describe('opencode + subrouter provider', () => {
     expect(zenMock.requests.length).toBeGreaterThan(0)
   }, 120_000)
 
-  test('a pre-existing cooldown appends one ignored notice without another model turn', async () => {
+  test('a pre-existing cooldown shows one session toast without another model turn', async () => {
     const client = createOpencodeClient({ baseUrl: server.url })
+    const toasts: Array<{ message: string }> = []
+    const subscription = await client.event.subscribe({
+      query: { directory: projectDir },
+    })
+    void (async () => {
+      for await (const event of subscription.stream) {
+        if (event.type === 'tui.toast.show') toasts.push({ message: event.properties.message })
+      }
+    })()
+
     const session = await client.session.create({
       query: { directory: projectDir },
       body: { title: 'subrouter route notice' },
@@ -457,23 +467,22 @@ describe('opencode + subrouter provider', () => {
         .join('\n'),
     ).toContain('hello from fallback')
 
+    // The toast is session-scoped through the trailing session-id marker and never
+    // enters the transcript, so no extra user/assistant message and no extra model turn.
     await expect
-      .poll(async () => {
-        const messages = await client.session.messages({
-          path: { id: session.data!.id },
-          query: { directory: projectDir },
-        })
-        return (messages.data ?? []).filter(({ parts }) =>
-          parts.some((part) => part.type === 'text' && part.ignored === true),
-        ).length
-      })
+      .poll(() =>
+        toasts.filter(
+          ({ message }) =>
+            message.startsWith('Subrouter: Using ') && message.endsWith(session.data!.id),
+        ).length,
+      )
       .toBe(1)
 
     const messages = await client.session.messages({
       path: { id: session.data!.id },
       query: { directory: projectDir },
     })
-    expect((messages.data ?? []).filter(({ info }) => info.role === 'user')).toHaveLength(2)
+    expect((messages.data ?? []).filter(({ info }) => info.role === 'user')).toHaveLength(1)
     expect((messages.data ?? []).filter(({ info }) => info.role === 'assistant')).toHaveLength(1)
     expect(zenMock.requests).toHaveLength(requestsBefore + 1)
   }, 120_000)

package/src/plugin.test.ts

@@ -188,7 +188,7 @@ test('provider log callback forwards only to client.app.log', async () => {
   })
 })
 
-test('cooldown fallback persists one ignored notice during the active run', async () => {
+test('cooldown fallback shows one session-scoped toast during the active run', async () => {
   const requests: Array<{ path: string; body: Record<string, unknown> }> = []
   const server = createServer((req, res) => {
     const chunks: Buffer[] = []
@@ -214,7 +214,7 @@ test('cooldown fallback persists one ignored notice during the active run', asyn
   expect(onCooldownFallback).toBeTypeOf('function')
   if (typeof onCooldownFallback !== 'function') throw new Error('expected cooldown callback')
   const notice = {
-    sessionID: 'session-1',
+    sessionID: 'ses_session1',
     agent: 'build',
     variant: 'high',
     preset: 'work',
@@ -227,19 +227,11 @@ test('cooldown fallback persists one ignored notice during the active run', asyn
 
   expect(requests).toEqual([
     {
-      path: '/session/session-1/message?directory=%2Ftmp%2Fproject',
+      path: '/tui/show-toast?directory=%2Ftmp%2Fproject',
       body: {
-        noReply: true,
-        agent: 'build',
-        model: { providerID: 'subrouter', modelID: 'work' },
-        variant: 'high',
-        parts: [
-          {
-            type: 'text',
-            text: 'Subrouter: Using openai/gpt-5.6-sol because xai/grok-4.6 is rate limited.',
-            ignored: true,
-          },
-        ],
+        message:
+          'Subrouter: Using openai/gpt-5.6-sol because xai/grok-4.6 is rate limited. ses_session1',
+        variant: 'info',
       },
     },
   ])