@cartanova/qgrid-cli 2.4.0 → 2.4.2

package/bundle/src/application/qgrid/qgrid-run-lifecycle.ts

@@ -2,21 +2,20 @@ import { getLogger } from "@logtape/logtape";
 
 import { RequestLogModel } from "../request-log/request-log.model";
 import {
-  type QgridRunContext,
-  type QgridToolResultInput,
-  type QueryInput,
-  type QueryOutput,
-} from "./qgrid.types";
+  estimateImageGenerationCostMicroUsd,
+  imageGenerationCostMethod,
+} from "./qgrid-image-generation";
 import {
-  formatImagePartForLog,
+  buildImageGenerationToolSteps,
   formatResponseForLog,
   getImageParts,
-  imageGenerationToolArgs,
 } from "./qgrid-response-format";
 import {
-  estimateImageGenerationCostMicroUsd,
-  imageGenerationCostMethod,
-} from "./qgrid-image-generation";
+  type QgridRunContext,
+  type QgridToolResultInput,
+  type QueryInput,
+  type QueryOutput,
+} from "./qgrid.types";
 
 const logger = getLogger(["qgrid", "run-lifecycle"]);
 const STALE_RUN_THRESHOLD_MS = 30 * 60 * 1000;
@@ -105,17 +104,8 @@ export async function afterQuery(
     result,
     args.imageGenerationOptions,
   );
-  for (let i = 0; i < imageParts.length; i++) {
-    const image = imageParts[i]!;
-    await RequestLogModel.appendStep(requestLogId, {
-      step_index: stepIndex,
-      type: "tool_call",
-      tool_call_index: i,
-      tool_call_id: `image_generation:${stepIndex}:${i}`,
-      tool_name: "image_generation",
-      tool_args: imageGenerationToolArgs(args),
-      tool_result: formatImagePartForLog(image),
-    });
+  for (const step of buildImageGenerationToolSteps(args, imageParts, stepIndex)) {
+    await RequestLogModel.appendStep(requestLogId, step);
   }
 
   if (result.finishReason === "tool-calls") {

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

@@ -102,6 +102,7 @@ describe("QgridFrame.query auto logging", () => {
   beforeEach(() => {
     requestLogSaveMock.mockReset();
     requestLogSaveMock.mockResolvedValue([1]);
+    appendStepMock.mockReset();
     dispatcherQueryMock.mockReset();
   });
 
@@ -156,6 +157,10 @@ describe("QgridFrame.query auto logging", () => {
 
     await QgridFrame.query({
       prompt: "draw",
+      input: [
+        { type: "text", text: "draw", text_elements: [] },
+        { type: "image", url: "data:image/webp;base64,UklGRg==" },
+      ],
       model: "openai/gpt-5-codex",
       logMode: "auto",
       imageGeneration: true,
@@ -181,6 +186,7 @@ describe("QgridFrame.query auto logging", () => {
         tool_name: "image_generation",
         tool_args: JSON.stringify({
           prompt: "draw",
+          inputImages: [{ mediaType: "image/webp", data: "UklGRg==", byteSize: 4 }],
           driverModel: "openai/gpt-5-codex",
           tool: {
             type: "image_generation",
@@ -196,6 +202,36 @@ describe("QgridFrame.query auto logging", () => {
       }),
     );
   });
+
+  it("stores input images only on the first image-generation tool step", async () => {
+    dispatcherQueryMock.mockResolvedValueOnce({
+      ...queryOutput(39),
+      text: "images ready",
+      content: [
+        { type: "image", data: "first", revisedPrompt: "first image" },
+        { type: "image", data: "second", revisedPrompt: "second image" },
+      ],
+    });
+
+    await QgridFrame.query({
+      prompt: "draw two",
+      input: [
+        { type: "text", text: "draw two", text_elements: [] },
+        { type: "image", url: "data:image/webp;base64,UklGRg==" },
+      ],
+      model: "openai/gpt-5-codex",
+      logMode: "auto",
+      imageGeneration: true,
+    });
+
+    const firstToolArgs = JSON.parse(appendStepMock.mock.calls[0]![1].tool_args);
+    const secondToolArgs = JSON.parse(appendStepMock.mock.calls[1]![1].tool_args);
+
+    expect(firstToolArgs.inputImages).toEqual([
+      { mediaType: "image/webp", data: "UklGRg==", byteSize: 4 },
+    ]);
+    expect(secondToolArgs.inputImages).toBeUndefined();
+  });
 });
 
 describe("QgridFrame.prepareStream", () => {

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

@@ -28,21 +28,20 @@ import {
   refreshAccessToken,
 } from "./oauth";
 import {
-  afterQuery,
-  beforeQuery,
-  finishRunAborted,
-  finishRunWithError,
-} from "./qgrid-run-lifecycle";
+  estimateImageGenerationCostMicroUsd,
+  imageGenerationCostMethod,
+} from "./qgrid-image-generation";
 import {
-  formatImagePartForLog,
+  buildImageGenerationToolSteps,
   formatResponseForLog,
   getImageParts,
-  imageGenerationToolArgs,
 } from "./qgrid-response-format";
 import {
-  estimateImageGenerationCostMicroUsd,
-  imageGenerationCostMethod,
-} from "./qgrid-image-generation";
+  afterQuery,
+  beforeQuery,
+  finishRunAborted,
+  finishRunWithError,
+} from "./qgrid-run-lifecycle";
 import { QgridDispatcher } from "./qgrid.dispatcher";
 import {
   type QueryInput,
@@ -174,7 +173,9 @@ class QgridFrameClass extends BaseFrameClass {
         cost_usd: result.costUsd !== null ? Math.round(result.costUsd * MICRO_USD) : null,
         image_cost_usd: imageCostMicroUsd,
         image_cost_method:
-          imageCostMicroUsd !== null ? imageGenerationCostMethod(args.imageGenerationOptions) : null,
+          imageCostMicroUsd !== null
+            ? imageGenerationCostMethod(args.imageGenerationOptions)
+            : null,
         effort: args.effort ?? null,
         // malformed history가 와도 성공한 턴(특히 stream sse.end())을 깨지 않도록 방어.
         history: ((): { type: string }[] | null => {
@@ -193,17 +194,8 @@ class QgridFrameClass extends BaseFrameClass {
       .then(async (ids) => {
         const requestLogId = ids[0];
         if (!requestLogId || imageParts.length === 0) return;
-        for (let i = 0; i < imageParts.length; i++) {
-          const image = imageParts[i]!;
-          await RequestLogModel.appendStep(requestLogId, {
-            step_index: 0,
-            type: "tool_call",
-            tool_call_index: i,
-            tool_call_id: `image_generation:0:${i}`,
-            tool_name: "image_generation",
-            tool_args: imageGenerationToolArgs(args),
-            tool_result: formatImagePartForLog(image),
-          });
+        for (const step of buildImageGenerationToolSteps(args, imageParts, 0)) {
+          await RequestLogModel.appendStep(requestLogId, step);
         }
       })
       .catch((e) => logger.error(`requestLog save failed: ${(e as Error).message}`));

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

@@ -56,6 +56,19 @@ export const ImageGenerationOptions = z.object({
 });
 export type ImageGenerationOptions = z.infer<typeof ImageGenerationOptions>;
 
+export const QgridInputPart = z.discriminatedUnion("type", [
+  z.object({
+    type: z.literal("text"),
+    text: z.string(),
+    text_elements: z.array(z.never()).default([]),
+  }),
+  z.object({
+    type: z.literal("image"),
+    url: z.string(),
+  }),
+]);
+export type QgridInputPart = z.infer<typeof QgridInputPart>;
+
 // ─── Run Lifecycle Context (SDK ↔ Server contract) ───
 
 export const QgridLogMode = z.enum(["auto", "run", "none"]);
@@ -90,6 +103,7 @@ export type QgridToolResultInput = z.infer<typeof QgridToolResultInput>;
 export const QueryInput = z.object({
   system: z.string().optional(),
   prompt: z.string(),
+  input: z.array(QgridInputPart).optional(),
   model: z.string().optional(),
   timeout: z.number().optional(),
   jsonSchema: z.string().optional(),

package/bundle/src/application/request-log-step/request-log-step.entity.json

@@ -130,7 +130,8 @@
       "tool_name",
       "tool_duration_ms",
       "error"
-    ]
+    ],
+    "I": ["id", "tool_args"]
   },
   "enums": {
     "RequestLogStepType": { "generate": "LLM 생성", "tool_call": "Tool 호출" },

package/bundle/src/application/sonamu.generated.http

@@ -214,6 +214,15 @@ Content-Type: application/json
   "args": {
     "system": "SYSTEM",
     "prompt": "PROMPT",
+    "input": [
+      {
+        "type": "text",
+        "text": "TEXT",
+        "text_elements": [
+          "unknown-never"
+        ]
+      }
+    ],
     "model": "MODEL",
     "timeout": 0,
     "jsonSchema": "JSONSCHEMA",
@@ -266,6 +275,15 @@ Content-Type: application/json
   "args": {
     "system": "SYSTEM",
     "prompt": "PROMPT",
+    "input": [
+      {
+        "type": "text",
+        "text": "TEXT",
+        "text_elements": [
+          "unknown-never"
+        ]
+      }
+    ],
     "model": "MODEL",
     "timeout": 0,
     "jsonSchema": "JSONSCHEMA",

package/bundle/src/application/sonamu.generated.sso.ts

@@ -120,12 +120,19 @@ export const requestLogStepSubsetQueries = {
       error: "request_log_steps.error",
     });
   },
+  I: (qbWrapper: PuriWrapper<DatabaseSchemaExtend>) => {
+    return qbWrapper.from("request_log_steps").select({
+      id: "request_log_steps.id",
+      tool_args: "request_log_steps.tool_args",
+    });
+  },
 };
 
 // LoaderQuery: RequestLogStep
 export const requestLogStepLoaderQueries = {
   A: [],
   T: [],
+  I: [],
 } as const satisfies PuriLoaderQueries<RequestLogStepSubsetKey>;
 
 // SubsetQuery: Token

package/bundle/src/application/sonamu.generated.ts

@@ -349,11 +349,17 @@ export const RequestLogStepSubsetT = z.object({
   error: z.string().nullable(),
 });
 export type RequestLogStepSubsetT = z.infer<typeof RequestLogStepSubsetT>;
+export const RequestLogStepSubsetI = z.object({
+  id: z.int(),
+  tool_args: z.string().nullable(),
+});
+export type RequestLogStepSubsetI = z.infer<typeof RequestLogStepSubsetI>;
 export type RequestLogStepSubsetMapping = {
   A: RequestLogStepSubsetA;
   T: RequestLogStepSubsetT;
+  I: RequestLogStepSubsetI;
 };
-export const RequestLogStepSubsetKey = z.enum(["A", "T"]);
+export const RequestLogStepSubsetKey = z.enum(["A", "T", "I"]);
 export type RequestLogStepSubsetKey = z.infer<typeof RequestLogStepSubsetKey>;
 
 // Subsets: Token