@cartanova/qgrid-cli 2.8.0 → 2.9.0

package/bundle/src/utils/providers/common/model-cost.test.ts

@@ -30,6 +30,8 @@ describe("calculateCostUsd", () => {
   );
 
   it.each([
+    // Fable 5.1 은 cache read 만 0.025x 특례($0.25), 나머지 배율은 표준과 같다.
+    ["claude-fable-5-1", 10, 50, 0.25, 20],
     ["claude-fable-5", 10, 50, 1, 20],
     ["claude-haiku-4-5", 1, 5, 0.1, 2],
     ["claude-sonnet-4", 3, 15, 0.3, 6],
@@ -43,6 +45,7 @@ describe("calculateCostUsd", () => {
     ["claude-opus-4-7", 5, 25, 0.5, 10],
     ["claude-opus-4-8", 5, 25, 0.5, 10],
     ["claude-opus-5", 5, 25, 0.5, 10],
+    ["claude-sonnet-5", 2, 10, 0.2, 4],
   ])(
     "%s official Anthropic rates for 5m/1h cache writes",
     (model, inputTokens, outputTokens, cachedInputTokens, cacheCreationInputTokens) => {
@@ -57,8 +60,8 @@ describe("calculateCostUsd", () => {
     },
   );
 
-  it("Claude Sonnet 5 introductory pricing switches to standard pricing on 2026-09-01", () => {
-    expect(getModelCosts("claude-sonnet-5", Date.UTC(2026, 7, 31))).toEqual({
+  it("Claude Sonnet 5 는 introductory $2/$10 이 정식 단가라 날짜 분기 없이 고정된다", () => {
+    expect(getModelCosts("claude-sonnet-5")).toEqual({
       inputTokens: 2,
       outputTokens: 10,
       cachedInputTokens: 0.2,
@@ -66,18 +69,11 @@ describe("calculateCostUsd", () => {
       cacheCreationInputTokens5m: 2.5,
       cacheCreationInputTokens1h: 4,
     });
-    expect(getModelCosts("claude-sonnet-5", Date.UTC(2026, 8, 1))).toEqual({
-      inputTokens: 3,
-      outputTokens: 15,
-      cachedInputTokens: 0.3,
-      cacheCreationInputTokens: 6,
-      cacheCreationInputTokens5m: 3.75,
-      cacheCreationInputTokens1h: 6,
-    });
   });
 
   it("provider prefix 와 [1m] suffix 를 제거한 canonical model 로 가격을 찾는다", () => {
     expect(getModelCosts("anthropic/claude-fable-5")).toBe(getModelCosts("claude-fable-5"));
+    expect(getModelCosts("anthropic/claude-fable-5-1[1m]")).toBe(getModelCosts("claude-fable-5-1"));
     expect(getModelCosts("anthropic/claude-sonnet-4-6[1m]")).toBe(
       getModelCosts("claude-sonnet-4-6"),
     );
@@ -184,6 +180,17 @@ describe("calculateCostUsd", () => {
     ).toBeCloseTo(5.8, 10);
   });
 
+  it("Fable 5.1 은 cache read 만 $0.25 로 계산하고 나머지 단가는 Fable 5 와 같다", () => {
+    const usage = {
+      inputTokens: 100_000,
+      outputTokens: 100_000,
+      cachedInputTokens: 50_000,
+      cacheCreationInputTokens: 25_000,
+    };
+    // Fable 5: 5.8. cache read 50K 가 $1 → $0.25 로 바뀌면 0.05 → 0.0125 만큼 줄어든다.
+    expect(calculateCostUsd("claude-fable-5-1", usage)).toBeCloseTo(5.7625, 10);
+  });
+
   it("Fable 의 5분/1시간 cache write 단가도 구분한다", () => {
     expect(
       calculateCostUsd("claude-fable-5", {
@@ -197,21 +204,14 @@ describe("calculateCostUsd", () => {
     ).toBeCloseTo(5.725, 10);
   });
 
-  it("Sonnet 5 introductory/standard 단가 전환을 cost 계산에도 적용한다", () => {
+  it("Sonnet 5 는 $2/$10 단가로 cost 를 계산한다", () => {
     const usage = {
       inputTokens: 100_000,
       outputTokens: 100_000,
       cachedInputTokens: 50_000,
       cacheCreationInputTokens: 25_000,
     };
-    expect(calculateCostUsd("claude-sonnet-5", usage, Date.UTC(2026, 7, 31))).toBeCloseTo(
-      1.16,
-      10,
-    );
-    expect(calculateCostUsd("claude-sonnet-5", usage, Date.UTC(2026, 8, 1))).toBeCloseTo(
-      1.74,
-      10,
-    );
+    expect(calculateCostUsd("claude-sonnet-5", usage)).toBeCloseTo(1.16, 10);
   });
 
   it("legacy/원시 Anthropic usage 처럼 cache 가 input 보다 커도 음수 비용을 만들지 않는다", () => {

package/bundle/src/utils/providers/common/model-cost.ts

@@ -79,6 +79,9 @@ const OPENAI_COSTS: Record<string, ModelCosts> = {
     cachedInputTokens: 0.5,
     longContext: LONG_CONTEXT_272K,
   },
+  // 아래 gpt-5.4 / gpt-5.4-mini / gpt-5.3-codex / gpt-5.2 는 qgrid 가 쓰는 ChatGPT 구독 Codex 경로에서
+  // 더 이상 제공되지 않는다(5.4 계열은 2026-08-31 retired, 대체 gpt-5.6-terra / gpt-5.6-luna).
+  // 과거 request log 재산정(cost_source 없는 legacy 행)에 필요하므로 단가 행은 유지한다.
   // https://openai.com/index/introducing-gpt-5-4/ (2026-03 출시)
   "gpt-5.4": {
     inputTokens: 2.5,
@@ -95,11 +98,16 @@ const OPENAI_COSTS: Record<string, ModelCosts> = {
 
 // ── Anthropic ───────────────────────────────────────────────────────
 
-function anthropicCosts(inputTokens: number, outputTokens: number): ModelCosts {
+function anthropicCosts(
+  inputTokens: number,
+  outputTokens: number,
+  overrides: Pick<Partial<ModelCosts>, "cachedInputTokens"> = {},
+): ModelCosts {
   return {
     inputTokens,
     outputTokens,
-    cachedInputTokens: inputTokens / 10,
+    // 표준 cache read 는 base input 의 0.1x. Fable 5.1 처럼 공식 특례 단가가 있으면 override 한다.
+    cachedInputTokens: overrides.cachedInputTokens ?? inputTokens / 10,
     // Claude Code subscription OAuth 는 1h TTL 을 자동 선택한다. 구버전처럼 응답에
     // TTL breakdown 이 없을 때만 이 1h 단가를 fallback 으로 사용한다.
     cacheCreationInputTokens: inputTokens * 2,
@@ -108,7 +116,11 @@ function anthropicCosts(inputTokens: number, outputTokens: number): ModelCosts {
   };
 }
 
+// 가격 출처: https://platform.claude.com/docs/en/about-claude/pricing (2026-09-02 확인)
 const ANTHROPIC_COSTS: Record<string, ModelCosts> = {
+  // Fable 5.1 (2026-09-01 출시): input/output 은 Fable 5 와 같고 cache read 만 0.025x($0.25) 특례.
+  // @see https://platform.claude.com/docs/en/models/fable-5-1/overview
+  "claude-fable-5-1": anthropicCosts(10, 50, { cachedInputTokens: 0.25 }),
   "claude-fable-5": anthropicCosts(10, 50),
   sonnet: anthropicCosts(3, 15),
   "claude-3-5-haiku": anthropicCosts(0.8, 4),
@@ -126,26 +138,18 @@ const ANTHROPIC_COSTS: Record<string, ModelCosts> = {
   "claude-opus-4-7": anthropicCosts(5, 25),
   "claude-opus-4-8": anthropicCosts(5, 25),
   "claude-opus-5": anthropicCosts(5, 25),
+  // Sonnet 5 의 introductory $2/$10 이 정식 단가로 확정됐다. 2026-09-01 에 예정됐던 $3/$15 인상은
+  // 취소됐으므로 날짜 분기 없이 고정 단가로 계산한다.
+  "claude-sonnet-5": anthropicCosts(2, 10),
 };
 
-// Anthropic 공식 introductory pricing: 2026-08-31까지 $2/$10, 이후 $3/$15.
-// qgrid 는 요청 시점에 계산하므로 배포를 다시 하지 않아도 2026-09-01 UTC부터 표준 단가로 전환한다.
-const CLAUDE_SONNET_5_INTRO_PRICING_END_MS = Date.UTC(2026, 8, 1);
-const CLAUDE_SONNET_5_INTRO_COSTS = anthropicCosts(2, 10);
-const CLAUDE_SONNET_5_STANDARD_COSTS = anthropicCosts(3, 15);
-
 // gpt-5.3-codex-spark 는 research preview 로 공식 token 단가가 아직 final 이 아니다.
 // 지원 타입은 유지하되, 공식 단가가 공개될 때까지 아래 generic estimate 로 계산한다.
 // @see https://help.openai.com/en/articles/20001106-codex-rate-card
 const DEFAULT_COSTS: ModelCosts = { inputTokens: 3, outputTokens: 15, cachedInputTokens: 0.3 };
 
-export function getModelCosts(model: string, atMs = Date.now()): ModelCosts {
+export function getModelCosts(model: string): ModelCosts {
   const normalizedModel = (model.split("/").pop() ?? model).replace(/\[1m\]$/i, "");
-  if (normalizedModel === "claude-sonnet-5") {
-    return atMs < CLAUDE_SONNET_5_INTRO_PRICING_END_MS
-      ? CLAUDE_SONNET_5_INTRO_COSTS
-      : CLAUDE_SONNET_5_STANDARD_COSTS;
-  }
   return OPENAI_COSTS[normalizedModel] ?? ANTHROPIC_COSTS[normalizedModel] ?? DEFAULT_COSTS;
 }
 
@@ -159,9 +163,8 @@ export function calculateCostUsd(
     cacheCreationInputTokens5m?: number;
     cacheCreationInputTokens1h?: number;
   },
-  atMs = Date.now(),
 ): number {
-  const costs = getModelCosts(model, atMs);
+  const costs = getModelCosts(model);
   const cachedInput = usage.cachedInputTokens ?? 0;
   const cacheCreationInput5m = Math.max(usage.cacheCreationInputTokens5m ?? 0, 0);
   const cacheCreationInput1h = Math.max(usage.cacheCreationInputTokens1h ?? 0, 0);

package/bundle/src/utils/providers/openai/openai-refresh.test.ts

@@ -1,10 +1,14 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
-const { findOneMock, saveMock, deactivateMock } = vi.hoisted(() => ({
-  findOneMock: vi.fn(),
-  saveMock: vi.fn(),
-  deactivateMock: vi.fn(),
-}));
+const { findOneMock, saveMock, deactivateMock } = vi.hoisted(() => {
+  // isolate:false 공유 레지스트리에 실제 TokenModel 이 먼저 올라와도 이 파일의 mock을 보장한다.
+  vi.resetModules();
+  return {
+    findOneMock: vi.fn(),
+    saveMock: vi.fn(),
+    deactivateMock: vi.fn(),
+  };
+});
 
 vi.mock("../../../application/token/token.model", () => ({
   TokenModel: { findOne: findOneMock, save: saveMock },
@@ -80,6 +84,7 @@ describe("OpenAI refresh", () => {
     expect(saveMock).toHaveBeenCalledWith([
       expect.objectContaining({
         id: 10,
+        reauth_required: false,
         credentials: expect.objectContaining({
           accessToken: "new-access",
           refreshToken: "new-refresh",
@@ -112,8 +117,12 @@ describe("OpenAI refresh", () => {
 
     await expect(handleChatgptAuthTokensRefresh(11)).rejects.toThrow("OpenAI refresh failed: 401");
     expect(deactivateMock).toHaveBeenCalledWith(
-      { id: 11, name: "token-11", provider: "openai" },
-      "old-refresh",
+      {
+        id: 11,
+        name: "token-11",
+        provider: "openai",
+        credentials: expect.objectContaining({ refreshToken: "old-refresh" }),
+      },
       "openai:refresh_token_reused",
     );
   });

package/bundle/src/utils/providers/openai/openai-refresh.ts

@@ -114,8 +114,7 @@ async function doRefresh(tokenId: number): Promise<RefreshResult> {
     // 상태코드를 바꿀 때 판정이 조용히 멎는다.
     if (errorCode && PERMANENT_FAILURE_CODES.has(errorCode)) {
       await deactivateAuthDeadToken(
-        { id: tokenId, name: token.name, provider: "openai" },
-        creds.refreshToken,
+        { id: tokenId, name: token.name, provider: "openai", credentials: creds },
         `openai:${errorCode}`,
       );
     }
@@ -158,6 +157,7 @@ async function doRefresh(tokenId: number): Promise<RefreshResult> {
         provider: "openai",
         credentials: updatedCreds,
         name: token.name,
+        reauth_required: false,
       },
     ]);
   } catch (e) {