@cartanova/qgrid-cli 2.4.2 → 2.4.3

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

@@ -43,6 +43,37 @@ const LONG_CONTEXT_272K: NonNullable<ModelCosts["longContext"]> = {
 };
 
 const OPENAI_COSTS: Record<string, ModelCosts> = {
+  // GPT-5.6 Sol, Terra, Luna. OpenAI native API 는 1.05M context / 128K max output 이지만,
+  // qgrid 의 codex app-server 경로는 context_window=372K (max_context_window 도 372K,
+  // effective 95% ≈ 353K) 로 제한된다 — codex 0.144.1 models_cache 실측 (2026-07-10).
+  // cache write 는 uncached input 의 1.25x 로 과금되지만, codex app-server usage
+  // (TokenUsageBreakdown) 에 cache write 토큰 필드가 없어 현재 OpenAI 실행 경로의
+  // cost 계산에서는 항상 0 으로 잡힌다 → 그만큼 과소집계. 단가는 외부 logger/manual
+  // usage 입력과 향후 프로토콜 확장을 위해 유지한다.
+  // @see https://developers.openai.com/api/docs/models/gpt-5.6-sol
+  // @see https://developers.openai.com/api/docs/models/gpt-5.6-terra
+  // @see https://developers.openai.com/api/docs/models/gpt-5.6-luna
+  "gpt-5.6-sol": {
+    inputTokens: 5,
+    outputTokens: 30,
+    cachedInputTokens: 0.5,
+    cacheCreationInputTokens: 6.25,
+    longContext: LONG_CONTEXT_272K,
+  },
+  "gpt-5.6-terra": {
+    inputTokens: 2.5,
+    outputTokens: 15,
+    cachedInputTokens: 0.25,
+    cacheCreationInputTokens: 3.125,
+    longContext: LONG_CONTEXT_272K,
+  },
+  "gpt-5.6-luna": {
+    inputTokens: 1,
+    outputTokens: 6,
+    cachedInputTokens: 0.1,
+    cacheCreationInputTokens: 1.25,
+    longContext: LONG_CONTEXT_272K,
+  },
   // https://openai.com/index/introducing-gpt-5-5/ (2026-04 출시)
   "gpt-5.5": {
     inputTokens: 5,

package/bundle/src/utils/providers/openai/codex-worker.test.ts

@@ -1,6 +1,10 @@
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+
 import { describe, expect, it, vi } from "vitest";
 
-import { CodexAppServerWorker, type StreamCallbacks } from "./codex-worker";
+import { CODEX_CONFIG_TOML, CodexAppServerWorker, type StreamCallbacks } from "./codex-worker";
 
 function createWorkerWithFakeRpc() {
   const worker = new CodexAppServerWorker({
@@ -349,6 +353,40 @@ describe("CodexAppServerWorker image generation capture", () => {
     expect(result.imageAttempted).toBe(true);
   });
 
+  it("removes generated image artifacts after a successful image turn", async () => {
+    const { worker } = createWorkerWithNotificationRpc(async (method, _params, handlers) => {
+      if (method === "thread/start") return { thread: { id: "t1" }, model: "gpt-test" };
+      if (method === "turn/start") {
+        handlers.get("item/completed")?.({
+          threadId: "t1",
+          item: imageItem("img-a", IMAGE_B64, "a red circle"),
+        } as never);
+        handlers.get("turn/completed")?.({
+          threadId: "t1",
+          turn: { status: "completed", durationMs: 100 },
+        } as never);
+        return { turn: { id: "turn-1" } };
+      }
+      throw new Error(`unexpected request: ${method}`);
+    });
+    const codexHome = mkdtempSync(join(tmpdir(), "qgrid-codex-worker-test-"));
+    const generatedImages = join(codexHome, "generated_images", "session");
+    mkdirSync(generatedImages, { recursive: true });
+    writeFileSync(join(generatedImages, "img-a.png"), "image");
+    (worker as unknown as { codexHome: string }).codexHome = codexHome;
+
+    try {
+      await worker.executeTurn({
+        input: [{ type: "text", text: "two images", text_elements: [] }],
+        imageGeneration: true,
+      });
+
+      expect(existsSync(join(codexHome, "generated_images"))).toBe(false);
+    } finally {
+      rmSync(codexHome, { recursive: true, force: true });
+    }
+  });
+
   it("treats status='generating' completed item with valid base64 as a finished image", async () => {
     const { worker } = createWorkerWithNotificationRpc(async (method, _params, handlers) => {
       if (method === "thread/start") return { thread: { id: "t1" }, model: "gpt-test" };
@@ -488,6 +526,37 @@ describe("CodexAppServerWorker image generation capture", () => {
   });
 });
 
+describe("CodexAppServerWorker CODEX_HOME artifacts", () => {
+  it("disables bundled system skills in the generated Codex config", () => {
+    expect(CODEX_CONFIG_TOML).toContain("[skills.bundled]");
+    expect(CODEX_CONFIG_TOML).toContain("enabled = false");
+  });
+
+  it("removes the generated_images directory without touching other worker files", () => {
+    const worker = new CodexAppServerWorker({
+      tokenId: 1,
+      tokenName: "token",
+      accessToken: "access",
+      accountId: "account",
+    });
+    const codexHome = mkdtempSync(join(tmpdir(), "qgrid-codex-worker-test-"));
+    const generatedImages = join(codexHome, "generated_images", "session");
+    mkdirSync(generatedImages, { recursive: true });
+    writeFileSync(join(generatedImages, "img-a.png"), "image");
+    writeFileSync(join(codexHome, "state_5.sqlite"), "state");
+    (worker as unknown as { codexHome: string }).codexHome = codexHome;
+
+    try {
+      (worker as unknown as { cleanupGeneratedImages(): void }).cleanupGeneratedImages();
+
+      expect(existsSync(join(codexHome, "generated_images"))).toBe(false);
+      expect(existsSync(join(codexHome, "state_5.sqlite"))).toBe(true);
+    } finally {
+      rmSync(codexHome, { recursive: true, force: true });
+    }
+  });
+});
+
 describe("CodexAppServerWorker image generation thread", () => {
   type WorkerInternals = {
     createThread(req: unknown): Promise<{ threadId: string; model: string }>;

package/bundle/src/utils/providers/openai/codex-worker.ts

@@ -3,6 +3,11 @@ import { mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 
 import { getLogger } from "@logtape/logtape";
 
+import {
+  CODEX_IMAGE_GENERATION_MODEL,
+  resolveImageGenerationOptions,
+} from "../../../application/qgrid/qgrid-image-generation";
+import { type ImageGenerationOptions } from "../../../application/qgrid/qgrid.types";
 import { type Model } from "../../../codex-protocol/v2/Model";
 import { type ModelListResponse } from "../../../codex-protocol/v2/ModelListResponse";
 import { type ModelProviderCapabilitiesReadResponse } from "../../../codex-protocol/v2/ModelProviderCapabilitiesReadResponse";
@@ -12,11 +17,6 @@ import { type ThreadStartResponse } from "../../../codex-protocol/v2/ThreadStart
 import { type TokenUsageBreakdown } from "../../../codex-protocol/v2/TokenUsageBreakdown";
 import { type TurnStartParams } from "../../../codex-protocol/v2/TurnStartParams";
 import { type TurnStartResponse } from "../../../codex-protocol/v2/TurnStartResponse";
-import {
-  CODEX_IMAGE_GENERATION_MODEL,
-  resolveImageGenerationOptions,
-} from "../../../application/qgrid/qgrid-image-generation";
-import { type ImageGenerationOptions } from "../../../application/qgrid/qgrid.types";
 import { type StreamCallbacks as CommonStreamCallbacks } from "../common/provider-dispatcher";
 import { createTtftTracker } from "../common/ttft";
 import { CodexRpcClient } from "./codex-rpc";
@@ -115,7 +115,7 @@ function isCompletedImageResult(result: unknown): result is string {
 // instruction 블록(permissions/environment_context/skills, ~10KB)을 비활성화
 // $CODEX_HOME/config.toml 로 써넣으면 codex 부팅 시 scan
 // 통제불가: update_plan/request_user_input
-const CODEX_CONFIG_TOML = `web_search = "disabled"
+export const CODEX_CONFIG_TOML = `web_search = "disabled"
 include_permissions_instructions = false
 include_apps_instructions = false
 include_environment_context = false
@@ -134,6 +134,9 @@ view_image = false
 
 [skills]
 include_instructions = false
+
+[skills.bundled]
+enabled = false
 `;
 
 // ── Worker ──────────────────────────────────────────────────────────
@@ -179,6 +182,7 @@ export class CodexAppServerWorker {
     this.cachedCapabilities = undefined;
     this.cachedModels = undefined;
     const cwd = `${this.codexHome}/cwd`;
+    rmSync(this.codexHome, { recursive: true, force: true });
     mkdirSync(cwd, { recursive: true });
     // codex 내장 tool/web_search/instruction 블록 비활성화
     writeFileSync(`${this.codexHome}/config.toml`, CODEX_CONFIG_TOML);
@@ -583,6 +587,12 @@ export class CodexAppServerWorker {
     abort?.(error);
   }
 
+  private cleanupGeneratedImages(): void {
+    try {
+      rmSync(`${this.codexHome}/generated_images`, { recursive: true, force: true });
+    } catch {}
+  }
+
   private consumeTurnNotifications(
     threadId: string,
     model: string,
@@ -633,6 +643,7 @@ export class CodexAppServerWorker {
         if (settled) return;
         settled = true;
         cleanup();
+        if (result.imageAttempted) this.cleanupGeneratedImages();
         resolve(result);
       };
 
@@ -751,6 +762,7 @@ export class CodexAppServerWorker {
         if (settled) return;
         settled = true;
         cleanup();
+        if (result.imageAttempted) this.cleanupGeneratedImages();
         cb.onComplete(result);
         resolve();
       };