@cortexkit/opencode-anthropic-auth 1.22.0 → 2.0.0

package/src/tui-compiled/tui.tsx

@@ -16,7 +16,7 @@ import { createEffect, createSignal, For, onCleanup, Show } from "opentui:runtim
 import { createRpcClient } from "./rpc/rpc-client.js";
 import { getRpcDir } from "./rpc/rpc-dir.js";
 import { computeQuotaPacing, DEFAULT_SIDEBAR_STATE, FIVE_HOUR_MS, formatPrimeAccountValue, formatScopedQuotaLabel, getCollapsedQuotaSummary, getFableRecoverySummary, getSidebarState, resolveActiveAccount, SEVEN_DAY_MS } from "./sidebar-state.js";
-import { openCommandDialog } from "./tui/command-dialogs.js";
+import { openCommandDialog, openNativeMenuDialog } from "./tui/command-dialogs.js";
 import { computeEffectiveOrder, DEFAULT_SLOT_ORDER, PLUGIN_KEY, queueTuiPreferenceUpdate, readTuiPreferencesFile, resolveAnthropicAuthPrefs, watchTuiPreferences } from "./tui-preferences.js";
 const RPC_POLL_MS = 500;
 let rpcPollStarted = false;
@@ -1153,17 +1153,35 @@ const tui = async api => {
   if (!rpcPollStarted) {
     rpcPollStarted = true;
     const rpcClient = createRpcClient(getRpcDir(api.state.path.directory ?? ''), process.pid);
-    let lastNotificationId = 0;
+    const lastNotificationIdBySession = new Map();
     let rpcInFlight = false;
-    setInterval(() => {
-      if (rpcInFlight) return;
+    const currentSessionId = () => {
       const current = api.route.current;
       const resolved = typeof current === 'function' ? current() : current;
-      const sessionId = resolved?.params?.sessionID;
+      return resolved?.params?.sessionID;
+    };
+    setInterval(() => {
+      if (rpcInFlight) return;
+      const sessionId = currentSessionId();
+      if (!sessionId) return;
       rpcInFlight = true;
-      void rpcClient.pending(lastNotificationId, sessionId).then(messages => {
+      void rpcClient.pending(lastNotificationIdBySession.get(sessionId) ?? 0, sessionId).then(messages => {
+        // A route change while draining must not open a different session's
+        // dialog or acknowledge notices that were never displayed.
+        if (currentSessionId() !== sessionId) return;
         for (const message of [...messages].sort((a, b) => a.id - b.id)) {
-          lastNotificationId = Math.max(lastNotificationId, message.id);
+          if (message.sessionId !== sessionId) continue;
+          lastNotificationIdBySession.set(sessionId, Math.max(lastNotificationIdBySession.get(sessionId) ?? 0, message.id));
+          if (message.type === 'open-menu') {
+            openNativeMenuDialog(api, message.payload, request => {
+              if (currentSessionId() !== sessionId) return Promise.reject(new Error('Menu session changed'));
+              return rpcClient.applyMenu({
+                ...request,
+                sessionId
+              });
+            }, () => currentSessionId() === sessionId);
+            continue;
+          }
           if (message.payload.command === 'claude-quota') {
             api.ui.dialog.setSize('xlarge');
             api.ui.dialog.replace(() => _$createComponent(QuotaDialogContent, {

package/src/tui.tsx

@@ -34,7 +34,10 @@ import {
   SEVEN_DAY_MS,
   type SidebarState,
 } from './sidebar-state.js'
-import { openCommandDialog } from './tui/command-dialogs.js'
+import {
+  openCommandDialog,
+  openNativeMenuDialog,
+} from './tui/command-dialogs.js'
 import {
   type AnthropicAuthTuiPrefs,
   type AppearancePrefs,
@@ -920,22 +923,48 @@ const tui: TuiPlugin = async (api) => {
       getRpcDir(api.state.path.directory ?? ''),
       process.pid,
     )
-    let lastNotificationId = 0
+    const lastNotificationIdBySession = new Map<string, number>()
     let rpcInFlight = false
-    setInterval(() => {
-      if (rpcInFlight) return
+    const currentSessionId = () => {
       const current = (api.route as { current?: unknown }).current
       const resolved =
         typeof current === 'function' ? (current as () => unknown)() : current
-      const sessionId = (
-        resolved as { params?: { sessionID?: string } } | undefined
-      )?.params?.sessionID
+      return (resolved as { params?: { sessionID?: string } } | undefined)
+        ?.params?.sessionID
+    }
+    setInterval(() => {
+      if (rpcInFlight) return
+      const sessionId = currentSessionId()
+      if (!sessionId) return
       rpcInFlight = true
       void rpcClient
-        .pending(lastNotificationId, sessionId)
+        .pending(lastNotificationIdBySession.get(sessionId) ?? 0, sessionId)
         .then((messages) => {
+          // A route change while draining must not open a different session's
+          // dialog or acknowledge notices that were never displayed.
+          if (currentSessionId() !== sessionId) return
           for (const message of [...messages].sort((a, b) => a.id - b.id)) {
-            lastNotificationId = Math.max(lastNotificationId, message.id)
+            if (message.sessionId !== sessionId) continue
+            lastNotificationIdBySession.set(
+              sessionId,
+              Math.max(
+                lastNotificationIdBySession.get(sessionId) ?? 0,
+                message.id,
+              ),
+            )
+            if (message.type === 'open-menu') {
+              openNativeMenuDialog(
+                api,
+                message.payload,
+                (request) => {
+                  if (currentSessionId() !== sessionId)
+                    return Promise.reject(new Error('Menu session changed'))
+                  return rpcClient.applyMenu({ ...request, sessionId })
+                },
+                () => currentSessionId() === sessionId,
+              )
+              continue
+            }
             if (message.payload.command === 'claude-quota') {
               api.ui.dialog.setSize('xlarge')
               api.ui.dialog.replace(() => (

package/dist/index-8aga2zwv.js

@@ -1,4 +0,0 @@
-import*as j from"node:fs";import*as P from"node:os";import*as V from"node:path";var U={error:0,warn:1,info:2,debug:3,trace:4},O=new Set(Object.keys(U));function F(q){if(!q)return null;let Q=q.trim().toLowerCase();return O.has(Q)?Q:null}var S=F(process.env.OPENCODE_ANTHROPIC_AUTH_LOG_LEVEL),M=S??"info";function L(q){M=q}function i(){return M}function X(q){return U[q]<=U[M]}var J=process.env.OPENCODE_ANTHROPIC_AUTH_LOG_FILE??V.join(P.tmpdir(),"opencode-anthropic-auth.log");function h(){return J}var R=5242880,N=3;function I(){try{if(!j.existsSync(J))return;if(j.statSync(J).size<R)return}catch{return}try{for(let q=N;q>=1;q--){let Q=q===1?J:`${J}.${q-1}`,W=`${J}.${q}`;try{if(q===N)try{j.unlinkSync(W)}catch{}if(j.existsSync(Q))j.renameSync(Q,W)}catch{}}}catch{}}var T=/^(authorization|x-api-key|cookie|set-cookie|refresh|access|token)$/i;function k(q){if(T.test(q))return!0;let Q=q.toLowerCase().replace(/[-_]/g,"");if(Q.includes("apikey"))return!0;if(Q.endsWith("secret")||Q.endsWith("password"))return!0;if(Q.endsWith("token")&&!Q.endsWith("tokens"))return!0;return!1}var f=[/Bearer\s+\S+/,/sk-[A-Za-z0-9-]+/,/eyJ[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+\.[A-Za-z0-9_-]+/];function _(q){if(typeof q!=="string")return!1;return f.some((Q)=>Q.test(q))}function G(q){if(q==null||Object.keys(q).length===0)return;let Q=new WeakSet;function W($){if($==null||typeof $!=="object"){if(_($))return"***REDACTED***";return $}if(Q.has($))return"[Circular]";Q.add($);try{if(Array.isArray($))return $.map(W);let x=$,B={};for(let[H,C]of Object.entries(x)){if(k(H)){B[H]="***REDACTED***";continue}B[H]=W(C)}return B}finally{Q.delete($)}}return W(q)}function g(q,Q,W,$){let x=new Date().toISOString(),B=q.toUpperCase().padEnd(5),H=Q?` [${Q}]`:"",C=(()=>{try{let w=G($),A=w?{...w,pid:process.pid}:{pid:process.pid};return` ${JSON.stringify(A)}`}catch{return` {"pid":${process.pid},"payload":"[unserializable]"}`}})();return`[${x}] ${B}${H} ${W}${C}`}var D=null;function E(q){D=q}function Y(q,Q,W,$){if(!X(q))return;if(D)try{D({level:q,channel:Q,message:W,payload:G($)})}catch{}if(Z)return;try{let x=`${g(q,Q,W,$)}
-`;if(K.push(x),K.length>=p)b();else r()}catch{}}var m={error(q,Q,W){Y("error",q,Q,W)},warn(q,Q,W){Y("warn",q,Q,W)},info(q,Q,W){Y("info",q,Q,W)},debug(q,Q,W){Y("debug",q,Q,W)},trace(q,Q,W){Y("trace",q,Q,W)}},Z=!1,c=500,p=50,K=[],z=null;function b(){if(z)clearTimeout(z),z=null;if(K.length===0)return;let q=K.join("");K=[];try{I(),j.appendFileSync(J,q)}catch{}}function r(){if(z)return;z=setTimeout(()=>{z=null,b()},c)}var y=/^\[([\w-]+)\]\s*/;function o(q,Q){if(!X("debug"))return;if(Z)return;try{let W="",$=q,x=q.match(y);if(x)W=x[1]??"",$=q.slice(x[0].length);let B;if(Q!=null){if(Q instanceof Error)B={error:`${Q.message}${Q.stack?`
-${Q.stack}`:""}`};else if(typeof Q==="object")B=Q}Y("debug",W,$,B)}catch{}}function v(q,Q){if(!X("debug"))return;if(Z)return;try{let W;if(Q!=null){if(typeof Q==="object"&&!(Q instanceof Error))W=Q}Y("debug","relay",q,W)}catch{}}if(!Z)process.on("exit",b);
-export{F as ad,L as bd,i as cd,X as dd,h as ed,T as fd,k as gd,G as hd,g as id,E as jd,m as kd,o as ld,v as md};