@cartanova/qgrid-cli 2.9.9 → 2.10.0

package/bundle/src/application/qgrid/qgrid.frame.test.ts

@@ -271,6 +271,7 @@ describe("QgridFrame.query request logging", () => {
     expect(beforeQueryMock).toHaveBeenCalledWith(args);
     expect(afterQueryMock).toHaveBeenCalledWith(41, 0, args, expect.objectContaining({ text: "hello" }));
     expect(result.runContext).toEqual(queryOutput().runContext);
+    expect(result.requestLogId).toBe(41);
   });
 
   it("tokenName 을 활성 토큰 id 로 해석해 지정 요청으로 전달한다", async () => {
@@ -459,7 +460,7 @@ describe("QgridFrame.query request logging", () => {
     afterQueryMock.mockRejectedValueOnce(new Error("request log unavailable"));
     const args = { prompt: "hi", model: "openai/gpt-5-codex" };
 
-    await expect(QgridFrame.query(args)).resolves.toBe(output);
+    await expect(QgridFrame.query(args)).resolves.toEqual({ ...output, requestLogId: 41 });
 
     expect(finishRunWithErrorMock).toHaveBeenCalledWith(41, "request log unavailable", args);
   });
@@ -1065,7 +1066,7 @@ describe("QgridFrame.queryStream request logging", () => {
     expect(order).toEqual(["before", "dispatch", "after"]);
     expect(sse.publish).toHaveBeenCalledWith(
       "done",
-      expect.objectContaining({ runContext: streamOutput().runContext }),
+      expect.objectContaining({ requestLogId: 52, runContext: streamOutput().runContext }),
     );
   });
 

package/bundle/src/application/qgrid/qgrid.frame.ts

@@ -281,7 +281,7 @@ class QgridFrameClass extends BaseFrameClass {
           lifecycle.runContext || threadCoord
             ? { ...lifecycle.runContext, ...(threadCoord ? { threadCoord } : {}) }
             : undefined;
-        return { ...result, runContext };
+        return { ...result, requestLogId, runContext };
       } catch (e) {
         logger.error(`query afterQuery failed: ${(e as Error).message}`);
         if (disconnect.signal.aborted) {
@@ -290,7 +290,7 @@ class QgridFrameClass extends BaseFrameClass {
           await finishRunWithError(requestLogId, (e as Error).message, resolvedArgs);
         }
         // provider 응답은 성공했으므로 로깅 장애가 생성 결과를 덮어쓰지 않는다.
-        return result;
+        return { ...result, requestLogId };
       }
     } finally {
       disconnect.dispose();
@@ -407,7 +407,13 @@ class QgridFrameClass extends BaseFrameClass {
           }
         }
       }
-      if (!clientClosed && !sse.closed) sse.publish("done", { ...streamResult, runContext });
+      if (!clientClosed && !sse.closed) {
+        sse.publish("done", {
+          ...streamResult,
+          ...(runInfo ? { requestLogId: runInfo.requestLogId } : {}),
+          runContext,
+        });
+      }
     } else if (streamError) {
       if (runInfo) await finishRunWithError(runInfo.requestLogId, streamError.message, args);
       if (!clientClosed && !sse.closed) sse.publish("error", { message: streamError.message });

package/bundle/src/application/qgrid/qgrid.types.ts

@@ -187,6 +187,7 @@ export const CostSource = z.enum(["provider", "pricing_table", "mixed"]);
 export type CostSource = z.infer<typeof CostSource>;
 
 export const QueryOutput = z.object({
+  requestLogId: z.number().optional(),
   text: z.string(),
   content: z.array(QgridContent),
   finishReason: FinishReason,
@@ -221,6 +222,7 @@ export const StreamEvents = z.object({
     input: z.string(),
   }),
   done: z.object({
+    requestLogId: z.number().optional(),
     text: z.string(),
     model: z.string().optional(),
     requestedModel: z.string().optional(),

package/bundle/src/utils/providers/common/effort.test.ts

@@ -23,6 +23,7 @@ describe("resolveOpenAIEffort", () => {
     expect(resolveOpenAIEffort("gpt-5.6-terra", "max")).toBe("max");
     expect(resolveOpenAIEffort("gpt-5.6-terra", "ultra")).toBe("ultra");
     expect(resolveOpenAIEffort("gpt-5.6-luna", "max")).toBe("max");
+    expect(resolveOpenAIEffort("gpt-6.1-sol", "ultra")).toBe("ultra");
     expect(resolveOpenAIEffort("gpt-6-sol", "ultra")).toBe("ultra");
     expect(resolveOpenAIEffort("gpt-6-luna", "max")).toBe("max");
   });

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

@@ -13,6 +13,7 @@ describe("calculateCostUsd", () => {
   });
   it.each([
     ["gpt-6-astra", 10, 50, 1, 12.5],
+    ["gpt-6.1-sol", 2, 10, 0.1, 2.5],
     ["gpt-6-sol", 2, 10, 0.2, 2.5],
     ["gpt-6-luna", 0.1, 0.5, 0.01, 0.125],
     ["gpt-5.6-sol", 4, 20, 0.4, 5],
@@ -97,6 +98,7 @@ describe("calculateCostUsd", () => {
 
   it.each([
     ["gpt-6-astra", 10, 50, 1, 12.5, 5.6125],
+    ["gpt-6.1-sol", 2, 10, 0.1, 2.5, 1.1175],
     ["gpt-6-sol", 2, 10, 0.2, 2.5, 1.1225],
     ["gpt-6-luna", 0.1, 0.5, 0.01, 0.125, 0.056125],
     ["gpt-5.6-sol", 4, 20, 0.4, 5, 2.245],
@@ -125,6 +127,7 @@ describe("calculateCostUsd", () => {
 
   it.each([
     ["gpt-6-astra", 2.475],
+    ["gpt-6.1-sol", 0.455],
     ["gpt-6-sol", 0.495],
     ["gpt-6-luna", 0.02475],
     ["gpt-5.6-sol", 0.99],
@@ -142,6 +145,7 @@ describe("calculateCostUsd", () => {
 
   it.each([
     ["gpt-6-astra", 2.725],
+    ["gpt-6.1-sol", 0.505],
     ["gpt-6-sol", 0.545],
     ["gpt-6-luna", 0.02725],
     ["gpt-5.6-sol", 1.09],

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

@@ -65,6 +65,18 @@ const OPENAI_COSTS: Record<string, OpenAIModelSpec> = {
     cacheCreationInputTokens: 12.5,
     longContext: LONG_CONTEXT_272K,
   },
+  // GPT-6.1 Sol (2026-09-29 DevDay 출시): Standard API pricing verified 2026-09-30. GPT-6 Sol 과 같고 cached input 만 절반.
+  // Codex 카탈로그(2026-09-30)는 ultra 까지 허용하고 기본 effort 는 low 다(GPT-6 Sol 은 medium).
+  // qgrid 의 요청 형태 + codex_cli_rs/0.147.0 헤더로 2026-09-30 구독 경로 라이브 생성 성공.
+  // @see https://developers.openai.com/api/docs/models/gpt-6.1-sol
+  "gpt-6.1-sol": {
+    maxEffort: "ultra",
+    inputTokens: 2,
+    outputTokens: 10,
+    cachedInputTokens: 0.1,
+    cacheCreationInputTokens: 2.5,
+    longContext: LONG_CONTEXT_272K,
+  },
   // GPT-6 Sol, Luna (2026-09-22 출시): Standard API pricing verified 2026-09-23. GPT-5.6 Sol/Luna 의 절반 단가.
   // Codex 카탈로그(2026-09-23)는 Sol 에 ultra, Luna 에 max 까지 허용하고 기본 effort 는 둘 다 medium 이다.
   // @see https://developers.openai.com/api/docs/models/gpt-6-sol

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

@@ -698,6 +698,7 @@ describe("effort 어휘 해석 (Codex 카탈로그 기준)", () => {
 
   it("모델이 지원하는 값은 그대로 보내고, 상한 초과·공개 API 어휘는 reasoning 에서 빼 백엔드 기본값을 쓴다", async () => {
     await expect(mappedEffortFor("gpt-6-astra", "ultra")).resolves.toBe("ultra");
+    await expect(mappedEffortFor("gpt-6.1-sol", "ultra")).resolves.toBe("ultra");
     await expect(mappedEffortFor("gpt-6-sol", "ultra")).resolves.toBe("ultra");
     await expect(mappedEffortFor("gpt-6-luna", "max")).resolves.toBe("max");
     await expect(mappedEffortFor("gpt-6-luna", "ultra")).resolves.toBeUndefined();