@cortexkit/opencode-anthropic-auth 2.3.0 → 2.4.1

package/src/sidebar-state.ts

@@ -1053,20 +1053,36 @@ export function fitQuotaRow(input: {
 /**
  * The pacing subline for a window that is off pace: `deficit 12% · out in
  * 1d23h` for a deficit that runs out before the reset, otherwise the delta
- * and `lasts to reset` (`reserve 4% · lasts to reset`). When it is wider than
- * `width` cells it is cut to fit and ends in `…` rather than wrapping. Null
- * when there is no pacing or the window is on pace.
+ * and `lasts to reset` (`reserve 4% · lasts to reset`). A window already at
+ * 0% left is used up until its reset (`used up · resets in 2h10m`, with no
+ * deficit percentage and no `out in` clause). A runout under a minute away
+ * reads `out in <1m`, never `out in now`. When the line is wider than `width`
+ * cells it is cut to fit and ends in `…` rather than wrapping. Null when
+ * there is no pacing or the window is on pace.
  */
 export function fitPaceLine(
   pacing: QuotaPacing | null,
   width: number | undefined,
   runsOutIn: string | undefined,
+  resetIn?: string | undefined,
+  remainingPercent?: number | undefined,
 ): string | null {
   if (!pacing || pacing.state === 'on-pace') return null
+  // An exhausted window reports its deficit as a large percentage with a
+  // runout of `now`, which reads as broken wording. The percentage no longer
+  // means anything once nothing is left, so the line names the state instead.
+  const exhausted = remainingPercent !== undefined && remainingPercent <= 0
+  // A projected runout under a minute away is not `now` while quota remains.
+  const normalizedRunsOutIn =
+    runsOutIn === 'now' || runsOutIn === '0m' ? '<1m' : runsOutIn
   const head = `${pacing.state} ${Math.round(Math.abs(pacing.deltaPercent))}%`
-  const line = runsOutIn
-    ? `${head} \u00b7 out in ${runsOutIn}`
-    : `${head} \u00b7 lasts to reset`
+  const line = exhausted
+    ? resetIn
+      ? `used up \u00b7 resets in ${resetIn}`
+      : 'used up'
+    : normalizedRunsOutIn
+      ? `${head} \u00b7 out in ${normalizedRunsOutIn}`
+      : `${head} \u00b7 lasts to reset`
   if (width === undefined || Bun.stringWidth(line) <= width) return line
   if (width <= 0) return ''
   let cut = ''

package/src/tui/claude-sidebar.tsx

@@ -172,7 +172,9 @@ function quotaBarSegments(
 function formatResetIn(resetsAt: string | undefined, now: number): string {
   if (!resetsAt) return ''
   const ms = new Date(resetsAt).getTime() - now
-  if (ms <= 0) return 'now'
+  // A pacing runout under a minute away is not `now` while quota remains;
+  // the exhausted window never reaches this formatter with an `out in` line.
+  if (ms < 60_000) return '<1m'
   const mins = Math.floor(ms / 60_000)
   if (mins < 60) return `${mins}m`
   const hrs = Math.floor(mins / 60)
@@ -318,7 +320,8 @@ function Cell(props: { fg: SidebarColor; text: string }) {
 // instead of letting it wrap. When pacing data is present, the bar gains a
 // pace segment and an off-pace window adds a one-line subline under the bar
 // with the reserve/deficit delta and either the projected runout or
-// `lasts to reset`.
+// `lasts to reset`; a window already at 0% left names itself used up until
+// its reset instead.
 function QuotaRow(props: {
   theme: SidebarTheme
   appearance: AppearancePrefs
@@ -354,6 +357,8 @@ function QuotaRow(props: {
       props.pacing?.runsOutAt
         ? formatResetIn(props.pacing.runsOutAt, props.now)
         : undefined,
+      props.part?.resetIn,
+      props.part?.remainingPercent,
     )
   return (
     <Show

package/src/tui-compiled/rpc/port-file.ts

@@ -7,12 +7,18 @@ import {
   writeFile,
 } from 'node:fs/promises'
 import { join } from 'node:path'
+import { type WriterStamp, writerStamp } from '@cortexkit/anthropic-auth-core'
 
 export interface PortFileEntry {
   port: number
   token: string
   pid: number
   startedAt: number
+  /**
+   * Present in files written by 2.3.0 and later, so a later version can tell
+   * them from files of older versions. Older readers ignore it.
+   */
+  writer?: WriterStamp
 }
 
 function pidAlive(pid: number): boolean {
@@ -29,7 +35,11 @@ export async function writePortFile(
   entry: { port: number; token: string; pid: number },
 ): Promise<string> {
   await mkdir(dir, { recursive: true })
-  const full: PortFileEntry = { ...entry, startedAt: Date.now() }
+  const full: PortFileEntry = {
+    ...entry,
+    startedAt: Date.now(),
+    writer: writerStamp(),
+  }
   const target = join(dir, `port-${entry.pid}.json`)
   const tmp = `${target}.${process.pid}.tmp`
   await writeFile(tmp, JSON.stringify(full), { encoding: 'utf8', mode: 0o600 })

package/src/tui-compiled/rpc/rpc-dir.ts

@@ -1,6 +1,7 @@
 import { createHash } from 'node:crypto'
 import { homedir, tmpdir } from 'node:os'
 import { join, resolve } from 'node:path'
+import { anthropicAuthStateRoot } from '@cortexkit/anthropic-auth-core'
 
 const RPC_DIR_ENV = 'OPENCODE_ANTHROPIC_AUTH_RPC_DIR'
 
@@ -12,8 +13,12 @@ export function getRpcDir(projectDirectory: string): string {
     .update(projectDirectory)
     .digest('hex')
     .slice(0, 16)
-  const base = process.env.XDG_STATE_HOME || join(homedir(), '.local', 'state')
-  return join(base, 'cortexkit', 'anthropic-auth', 'rpc', hash)
+  const root = anthropicAuthStateRoot({
+    xdgStateHome: process.env.XDG_STATE_HOME,
+    home: homedir(),
+    acceptRelative: true,
+  })
+  return join(root, 'rpc', hash)
 }
 
 export { tmpdir }

package/src/tui-compiled/sidebar-state.ts

@@ -1053,20 +1053,36 @@ export function fitQuotaRow(input: {
 /**
  * The pacing subline for a window that is off pace: `deficit 12% · out in
  * 1d23h` for a deficit that runs out before the reset, otherwise the delta
- * and `lasts to reset` (`reserve 4% · lasts to reset`). When it is wider than
- * `width` cells it is cut to fit and ends in `…` rather than wrapping. Null
- * when there is no pacing or the window is on pace.
+ * and `lasts to reset` (`reserve 4% · lasts to reset`). A window already at
+ * 0% left is used up until its reset (`used up · resets in 2h10m`, with no
+ * deficit percentage and no `out in` clause). A runout under a minute away
+ * reads `out in <1m`, never `out in now`. When the line is wider than `width`
+ * cells it is cut to fit and ends in `…` rather than wrapping. Null when
+ * there is no pacing or the window is on pace.
  */
 export function fitPaceLine(
   pacing: QuotaPacing | null,
   width: number | undefined,
   runsOutIn: string | undefined,
+  resetIn?: string | undefined,
+  remainingPercent?: number | undefined,
 ): string | null {
   if (!pacing || pacing.state === 'on-pace') return null
+  // An exhausted window reports its deficit as a large percentage with a
+  // runout of `now`, which reads as broken wording. The percentage no longer
+  // means anything once nothing is left, so the line names the state instead.
+  const exhausted = remainingPercent !== undefined && remainingPercent <= 0
+  // A projected runout under a minute away is not `now` while quota remains.
+  const normalizedRunsOutIn =
+    runsOutIn === 'now' || runsOutIn === '0m' ? '<1m' : runsOutIn
   const head = `${pacing.state} ${Math.round(Math.abs(pacing.deltaPercent))}%`
-  const line = runsOutIn
-    ? `${head} \u00b7 out in ${runsOutIn}`
-    : `${head} \u00b7 lasts to reset`
+  const line = exhausted
+    ? resetIn
+      ? `used up \u00b7 resets in ${resetIn}`
+      : 'used up'
+    : normalizedRunsOutIn
+      ? `${head} \u00b7 out in ${normalizedRunsOutIn}`
+      : `${head} \u00b7 lasts to reset`
   if (width === undefined || Bun.stringWidth(line) <= width) return line
   if (width <= 0) return ''
   let cut = ''

package/src/tui-compiled/tui/claude-sidebar.tsx

@@ -110,7 +110,9 @@ function quotaBarSegments(usedPct, appearance, pacing, width) {
 function formatResetIn(resetsAt, now) {
   if (!resetsAt) return '';
   const ms = new Date(resetsAt).getTime() - now;
-  if (ms <= 0) return 'now';
+  // A pacing runout under a minute away is not `now` while quota remains;
+  // the exhausted window never reaches this formatter with an `out in` line.
+  if (ms < 60_000) return '<1m';
   const mins = Math.floor(ms / 60_000);
   if (mins < 60) return `${mins}m`;
   const hrs = Math.floor(mins / 60);
@@ -303,7 +305,8 @@ function Cell(props) {
 // instead of letting it wrap. When pacing data is present, the bar gains a
 // pace segment and an off-pace window adds a one-line subline under the bar
 // with the reserve/deficit delta and either the projected runout or
-// `lasts to reset`.
+// `lasts to reset`; a window already at 0% left names itself used up until
+// its reset instead.
 function QuotaRow(props) {
   const used = () => props.usedPercent ?? 0;
   const labelCell = () => `${props.label}${' '.repeat(Math.max(0, props.labelWidth - Bun.stringWidth(props.label)))} `;
@@ -315,7 +318,7 @@ function QuotaRow(props) {
     figure: figure(),
     reset: props.part?.resetIn
   });
-  const paceLine = () => fitPaceLine(props.pacing, props.width === undefined ? undefined : props.width - props.labelWidth - 1, props.pacing?.runsOutAt ? formatResetIn(props.pacing.runsOutAt, props.now) : undefined);
+  const paceLine = () => fitPaceLine(props.pacing, props.width === undefined ? undefined : props.width - props.labelWidth - 1, props.pacing?.runsOutAt ? formatResetIn(props.pacing.runsOutAt, props.now) : undefined, props.part?.resetIn, props.part?.remainingPercent);
   return _$createComponent(Show, {
     get when() {
       return props.part;