@cartanova/qgrid-cli 2.10.9 → 2.11.0

package/bundle/src/application/request-log/request-log.types.ts

@@ -14,10 +14,24 @@ export const HistoryItems = z.array(
     output: z.string().optional(),
   }),
 );
+
 export type HistoryItems = z.infer<typeof HistoryItems>;
 
+// 현재 user turn의 입력 이미지. image_generation tool_args.inputImages와 같은 형태다.
+export const InputImages = z.array(
+  z.object({
+    mediaType: z.string().optional(),
+    data: z.string().optional(),
+    url: z.string().optional(),
+    byteSize: z.number().optional(),
+  }),
+);
+
+export type InputImages = z.infer<typeof InputImages>;
+
 // 요청에 장착된 tool 정의 목록 — 저장 형태는 QgridTool 계약을 그대로 따른다.
 export const ToolDefinitions = z.array(QgridTool);
+
 export type ToolDefinitions = z.infer<typeof ToolDefinitions>;
 
 // request-log detail 화면이 소비하는 tool 계약 projection. API 반환 타입은 Sonamu
@@ -29,6 +43,7 @@ export const ToolView = z.object({
   inputZod: z.string(),
   fullInputZod: z.string().optional(),
 });
+
 export type ToolView = z.infer<typeof ToolView>;
 
 // RequestLog - ListParams
@@ -37,6 +52,7 @@ export const RequestLogListParams = RequestLogBaseListParams.extend({
   project_name_is_null: z.boolean().optional(),
   project_name_is_not_null: z.boolean().optional(),
 });
+
 export type RequestLogListParams = z.infer<typeof RequestLogListParams>;
 
 // RequestLog - SaveParams
@@ -47,4 +63,5 @@ export const RequestLogSaveParams = RequestLogBaseSchema.partial({
   status: true,
   error_message: true,
 });
+
 export type RequestLogSaveParams = z.infer<typeof RequestLogSaveParams>;

package/bundle/src/application/request-log/zod-code-format.ts

@@ -30,44 +30,55 @@ export function formatZodCode(code: string): string {
   for (const ch of source) {
     if (inString) {
       out += ch;
+
       if (escaped) escaped = false;
       else if (ch === "\\") escaped = true;
       else if (ch === '"') inString = false;
       continue;
     }
+
     if (ch === '"') {
       inString = true;
       out += ch;
       skipSpaces = false;
       continue;
     }
+
     if (skipSpaces && (ch === " " || ch === "\t")) continue;
     skipSpaces = false;
 
     if (ch === "{" || ch === "(" || ch === "[") {
       stack.push(ch);
       out += ch;
+
       if (ch === "{") {
         depth++;
         newline();
       }
+
       continue;
     }
+
     if (ch === "}" || ch === ")" || ch === "]") {
       const opener = stack.pop();
+
       if (ch === "}" && opener === "{") {
         depth = Math.max(0, depth - 1);
         newline();
       }
+
       out += ch;
       continue;
     }
+
     if (ch === "," && stack.at(-1) === "{") {
       out += ch;
       newline();
       continue;
     }
+
     out += ch;
   }
+
   return out;
 }

package/bundle/src/application/request-log-step/request-log-step.model.ts

@@ -43,6 +43,7 @@ class RequestLogStepModelClass extends BaseModelClass<
       page: 1,
       queryMode: "list",
     });
+
     if (!rows[0]) {
       throw new NotFoundException(SD("error.entityNotFound")("RequestLogStep", id));
     }

package/bundle/src/application/request-log-step/request-log-step.types.ts

@@ -4,6 +4,7 @@ import { RequestLogStepBaseSchema, RequestLogStepBaseListParams } from "../sonam
 
 // RequestLogStep - ListParams
 export const RequestLogStepListParams = RequestLogStepBaseListParams;
+
 export type RequestLogStepListParams = z.infer<typeof RequestLogStepListParams>;
 
 // RequestLogStep - SaveParams
@@ -34,4 +35,5 @@ export const RequestLogStepSaveParams = RequestLogStepBaseSchema.partial({
   tool_duration_ms: true,
   error: true,
 });
+
 export type RequestLogStepSaveParams = z.infer<typeof RequestLogStepSaveParams>;

package/bundle/src/application/setting/setting.constant.ts

@@ -166,6 +166,7 @@ export function validateSettingValue(
 
   if (def.kind === "boolean") {
     if (!["true", "false"].includes(trimmed)) return { ok: false, error: "true 또는 false" };
+
     return { ok: true, value: trimmed };
   }
 
@@ -173,24 +174,31 @@ export function validateSettingValue(
     // 화면은 버튼만 주지만 API 는 아무 값이나 받을 수 있다. 목록 밖의 값이 들어오면
     // 화면에서 아무 버튼도 선택돼 보이지 않아 "왜 안 바뀌지"가 된다.
     const parsed = Number(trimmed);
+
     if (!def.presets?.includes(parsed)) {
       return { ok: false, error: `${def.presets?.join(", ") ?? ""} 중 하나여야 합니다` };
     }
+
     return { ok: true, value: String(parsed) };
   }
 
   if (def.kind === "integer" || def.kind === "number") {
     const parsed = Number(trimmed);
+
     if (!Number.isFinite(parsed)) return { ok: false, error: "숫자를 입력하세요" };
+
     if (def.kind === "integer" && !Number.isInteger(parsed)) {
       return { ok: false, error: "정수를 입력하세요" };
     }
+
     if (def.min !== undefined && parsed < def.min) {
       return { ok: false, error: `${def.min} 이상이어야 합니다` };
     }
+
     if (def.max !== undefined && parsed > def.max) {
       return { ok: false, error: `${def.max} 이하여야 합니다` };
     }
+
     return { ok: true, value: String(parsed) };
   }
 
@@ -200,5 +208,6 @@ export function validateSettingValue(
 /** 화면에 그대로 내려보내면 안 되는 값. 앞뒤만 남긴다. */
 export function maskSecret(value: string): string {
   if (value.length <= 12) return "***";
+
   return `${value.slice(0, 8)}...${value.slice(-4)}`;
 }

package/bundle/src/application/setting/setting.model.ts

@@ -8,7 +8,7 @@ import {
   exhaustive,
 } from "sonamu";
 
-import { SD, type LocalizedString } from "../../i18n/sd.generated";
+import { SD } from "../../i18n/sd.generated";
 import { SlackNotificationError } from "../../utils/slack-notify";
 import { type SettingSubsetKey, type SettingSubsetMapping } from "../sonamu.generated";
 import { settingSubsetQueries, settingLoaderQueries } from "../sonamu.generated.sso";
@@ -58,6 +58,7 @@ class SettingModelClass extends BaseModelClass<
       page: 1,
       queryMode: "list",
     });
+
     if (!rows[0]) {
       throw new NotFoundException(SD("error.entityNotFound")("Setting", id));
     }
@@ -162,6 +163,7 @@ class SettingModelClass extends BaseModelClass<
   /** 저장된 설정 전체를 key→value 로. 부팅 시 한 번 읽어 메모리에 올린다. */
   async findAllAsMap(): Promise<Map<string, string>> {
     const { rows } = await this.findMany("A", { num: 0, page: 1, queryMode: "list" });
+
     return new Map(rows.map((r) => [r.key, r.value]));
   }
 
@@ -219,6 +221,7 @@ class SettingModelClass extends BaseModelClass<
   runtimeInfo(): RuntimeInfoItem[] {
     const env = process.env;
     const password = env.QGRID_DB_PASSWORD ?? env.SONAMU_DB_PASSWORD ?? "";
+
     return [
       { label: "NODE_ENV", value: env.NODE_ENV ?? "-" },
       { label: "HOST", value: env.HOST ?? "localhost" },
@@ -234,14 +237,17 @@ class SettingModelClass extends BaseModelClass<
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async updateSetting(key: string, value: string): Promise<{ applies: SettingApplies }> {
     const def = findSettingDef(key);
+
     if (!def) throw new BadRequestException(SD("setting.unknownKey")(key));
 
     const validation = validateSettingValue(def, value);
+
     if (!validation.ok) {
       throw new BadRequestException(SD("setting.invalidValue")(validation.error));
     }
 
     await saveStoredSetting(key, validation.value);
+
     return { applies: def.applies };
   }
 
@@ -249,9 +255,11 @@ class SettingModelClass extends BaseModelClass<
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async resetSetting(key: string): Promise<{ applies: SettingApplies }> {
     const def = findSettingDef(key);
+
     if (!def) throw new BadRequestException(SD("setting.unknownKey")(key));
 
     await resetStoredSetting(key);
+
     return { applies: def.applies };
   }
 
@@ -265,12 +273,14 @@ class SettingModelClass extends BaseModelClass<
     // setting.model → expired-token-reminder → token.model 경로가 생겨,
     // token.model 을 mock 하는 테스트가 실제 모듈을 먼저 로드하게 된다.
     const { sendExpiredTokenReminderNow } = await import("../qgrid/expired-token-reminder");
+
     try {
       return { sent: await sendExpiredTokenReminderNow() };
     } catch (error) {
       if (error instanceof SlackNotificationError) {
-        throw new BadRequestException(error.message as LocalizedString);
+        throw new BadRequestException(SD("error.detail")(error.message));
       }
+
       throw error;
     }
   }

package/bundle/src/application/setting/setting.store.ts

@@ -18,10 +18,12 @@ const logger = getLogger(["qgrid", "setting"]);
 let cache: Map<string, string> | null = null;
 
 type SettingChangeHandler = (key: string) => void;
+
 export type SettingPersistence = Pick<
   typeof SettingModel,
   "clearByKey" | "findAllAsMap" | "setByKey"
 >;
+
 let settingChangeHandler: SettingChangeHandler | null = null;
 
 /**
@@ -48,7 +50,9 @@ export async function loadSettings(persistence: SettingPersistence = SettingMode
   } catch (e) {
     // 테이블이 아직 없는 배포(마이그레이션 전)에서도 서버는 떠야 한다.
     cache = new Map();
-    logger.warn(`settings load failed, using env only: ${(e as Error).message}`);
+    logger.warn(
+      `settings load failed, using env only: ${e instanceof Error ? e.message : String(e)}`,
+    );
   }
 }
 

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

@@ -4,21 +4,26 @@ import { SettingBaseSchema, SettingBaseListParams } from "../sonamu.generated";
 
 // Setting - ListParams
 export const SettingListParams = SettingBaseListParams;
+
 export type SettingListParams = z.infer<typeof SettingListParams>;
 
 // Setting - SaveParams
 export const SettingSaveParams = SettingBaseSchema.partial({ id: true, created_at: true });
+
 export type SettingSaveParams = z.infer<typeof SettingSaveParams>;
 
 // ── 설정 API 응답 스키마 ──
 
 export const SettingKind = z.enum(["boolean", "integer", "number", "string", "secret", "preset"]);
+
 export type SettingKind = z.infer<typeof SettingKind>;
 
 export const SettingApplies = z.enum(["immediate", "restart"]);
+
 export type SettingApplies = z.infer<typeof SettingApplies>;
 
 export const SettingSource = z.enum(["db", "env", "default"]);
+
 export type SettingSource = z.infer<typeof SettingSource>;
 
 export const SettingItem = z.object({
@@ -37,6 +42,7 @@ export const SettingItem = z.object({
   presets: z.number().array(),
   help: z.string().nullable(),
 });
+
 export type SettingItem = z.infer<typeof SettingItem>;
 
 /** 화면에서 바꿀 수 없는 기동 시점 값들 — 어떤 환경에 붙어 있는지 확인용. */
@@ -44,6 +50,7 @@ export const RuntimeInfoItem = z.object({
   label: z.string(),
   value: z.string(),
 });
+
 export type RuntimeInfoItem = z.infer<typeof RuntimeInfoItem>;
 
 export const SettingsResponse = z.object({
@@ -52,4 +59,5 @@ export const SettingsResponse = z.object({
   /** 이 인스턴스가 keepalive 스케줄러를 소유하도록 명시적으로 허용됐는지. */
   keepaliveRunnerEnabled: z.boolean(),
 });
+
 export type SettingsResponse = z.infer<typeof SettingsResponse>;

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

@@ -225,8 +225,10 @@ Content-Type: application/json
       "cost_source": null,
       "image_cost_usd": null,
       "image_cost_method": null,
+      "service_tier": null,
       "effort": null,
       "history": null,
+      "input_images": null,
       "tools": null,
       "json_schema": null,
       "status": "running",
@@ -323,6 +325,12 @@ Content-Type: application/json
       "size": "auto",
       "background": "auto",
       "outputFormat": "png"
+    },
+    "providerOptions": {
+      "xai": {
+        "serviceTier": "default",
+        "parallelToolCalls": false
+      }
     }
   }
 }
@@ -388,6 +396,12 @@ Content-Type: application/json
       "size": "auto",
       "background": "auto",
       "outputFormat": "png"
+    },
+    "providerOptions": {
+      "xai": {
+        "serviceTier": "default",
+        "parallelToolCalls": false
+      }
     }
   }
 }
@@ -593,6 +607,127 @@ Content-Type: application/json
 
 ###
 
+POST {{baseUrl}}/api/qgrid/oauthStartGrok
+Content-Type: application/json
+
+{
+  "name": "NAME"
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/oauthStartGrokDevice
+Content-Type: application/json
+
+{
+  "name": "NAME"
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/oauthPollGrokDevice
+Content-Type: application/json
+
+{
+  "deviceCode": "DEVICECODE"
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/generateImages
+Content-Type: application/json
+
+{
+  "params": {
+    "model": "MODEL",
+    "prompt": "PROMPT",
+    "n": 1,
+    "aspectRatio": "ASPECTRATIO",
+    "resolution": "RESOLUTION",
+    "quality": "QUALITY",
+    "outputFormat": "png",
+    "referenceImages": [
+      "REFERENCEIMAGES"
+    ],
+    "tokenName": "TOKENNAME",
+    "projectName": "PROJECTNAME",
+    "logger": false
+  }
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/videoStart
+Content-Type: application/json
+
+{
+  "params": {
+    "model": "MODEL",
+    "prompt": "PROMPT",
+    "duration": 1,
+    "aspectRatio": "ASPECTRATIO",
+    "resolution": "480p",
+    "image": "IMAGE",
+    "lastFrame": "LASTFRAME",
+    "referenceImages": [
+      "REFERENCEIMAGES"
+    ],
+    "mode": "reference-to-video",
+    "tokenName": "TOKENNAME",
+    "projectName": "PROJECTNAME",
+    "logger": false
+  }
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/videoStatus
+Content-Type: application/json
+
+{
+  "params": {
+    "jobHandle": "JOBHANDLE",
+    "projectName": "PROJECTNAME"
+  }
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/transcribe
+Content-Type: application/json
+
+{
+  "params": {
+    "model": "MODEL",
+    "audio": "AUDIO",
+    "mediaType": "MEDIATYPE",
+    "language": "LANGUAGE",
+    "tokenName": "TOKENNAME",
+    "projectName": "PROJECTNAME",
+    "logger": false
+  }
+}
+
+###
+
+POST {{baseUrl}}/api/qgrid/speak
+Content-Type: application/json
+
+{
+  "params": {
+    "model": "MODEL",
+    "text": "TEXT",
+    "voice": "VOICE",
+    "language": "LANGUAGE",
+    "format": "mp3",
+    "tokenName": "TOKENNAME",
+    "projectName": "PROJECTNAME",
+    "logger": false
+  }
+}
+
+###
+
 GET {{baseUrl}}/api/qgrid/usage
 	?tokenId=0
 Content-Type: application/json

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

@@ -2,6 +2,8 @@
  * @generated
  * 직접 수정하지 마세요.
  */
+// Sonamu 생성 코드의 타입 계약을 유지하기 위해 anti-slop 검사만 제외합니다.
+/* oxlint-disable anti-slop/no-chained-type-assertions, anti-slop/no-conditional-empty-object-spread, anti-slop/no-known-value-widening, anti-slop/no-module-mocking, anti-slop/no-object-parameters, anti-slop/no-reflect-apply, anti-slop/no-reflect-get, anti-slop/no-runtime-typeof, anti-slop/no-shape-in-symbol-names, anti-slop/no-unknown-parameters, anti-slop/no-unknown-returns, anti-slop/no-unknown-type-aliases, anti-slop/no-unsafe-dictionary-type, anti-slop/no-widen-then-assert, anti-slop/require-safety-comment-for-type-assertion */
 
 import { type PuriWrapper, type DatabaseSchemaExtend, type PuriLoaderQueries } from "sonamu";
 
@@ -45,6 +47,7 @@ export const requestLogSubsetQueries = {
       effort: "request_logs.effort",
       service_tier: "request_logs.service_tier",
       history: "request_logs.history",
+      input_images: "request_logs.input_images",
       tools: "request_logs.tools",
       status: "request_logs.status",
       response_json_ok: "request_logs.response_json_ok",

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

@@ -22,6 +22,17 @@ const HistoryItems = z.array(
 );
 type HistoryItems = z.infer<typeof HistoryItems>;
 
+// CustomScalar: InputImages
+const InputImages = z.array(
+  z.object({
+    mediaType: z.string().optional(),
+    data: z.string().optional(),
+    url: z.string().optional(),
+    byteSize: z.number().optional(),
+  }),
+);
+type InputImages = z.infer<typeof InputImages>;
+
 // CustomScalar: TokenCredentials
 const TokenCredentials = z.union([
   z.object({
@@ -39,6 +50,19 @@ const TokenCredentials = z.union([
     accountId: z.string(),
     planType: z.string().optional(),
   }),
+  z.object({
+    authMode: z.literal("oauth"),
+    accessToken: z.string(),
+    refreshToken: z.string(),
+    expiresAt: z.string(),
+    issuer: z.literal("https://auth.x.ai"),
+    clientId: z.string(),
+    scopes: z.array(z.string()),
+    userId: z.string(),
+    sessionId: z.string(),
+    agentId: z.string(),
+    subscriptionTier: z.string().optional(),
+  }),
 ]);
 type TokenCredentials = z.infer<typeof TokenCredentials>;
 
@@ -170,6 +194,7 @@ export const RequestLogBaseSchema = z.object({
   service_tier: z.string().max(20).nullable(),
   effort: z.string().max(10).nullable(),
   history: HistoryItems.nullable(),
+  input_images: InputImages.nullable(),
   tools: ToolDefinitions.nullable(),
   json_schema: z.string().nullable(),
   status: RequestLogStatus,
@@ -205,6 +230,7 @@ export type RequestLogBaseSchema = z.infer<typeof RequestLogBaseSchema> & {
     "service_tier",
     "effort",
     "history",
+    "input_images",
     "tools",
     "json_schema",
     "status",
@@ -215,6 +241,7 @@ export type RequestLogBaseSchema = z.infer<typeof RequestLogBaseSchema> & {
     "is_structured",
     "id",
   ];
+  readonly __json__: readonly ["history", "input_images", "tools"];
 };
 
 // BaseSchema: RequestLogStep
@@ -315,6 +342,7 @@ export type TokenBaseSchema = z.infer<typeof TokenBaseSchema> & {
     "keepalive_enabled",
     "id",
   ];
+  readonly __json__: readonly ["credentials"];
 };
 
 // BaseListParams: RequestLog
@@ -409,6 +437,7 @@ export const RequestLogSubsetA = z.object({
   effort: z.string().max(10).nullable(),
   service_tier: z.string().max(20).nullable(),
   history: HistoryItems.nullable(),
+  input_images: InputImages.nullable(),
   tools: ToolDefinitions.nullable(),
   status: RequestLogStatus,
   response_json_ok: z.boolean().nullable(),

package/bundle/src/application/token/token.identity.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from "vitest";
+
+import { tokenIdentityKey, UnknownTokenProviderError } from "./token.model";
+
+describe("tokenIdentityKey", () => {
+  it.each([
+    ["anthropic", "accountUuid"],
+    ["openai", "accountId"],
+    ["grok", "userId"],
+  ] as const)("%s accounts are identified by credentials.%s", (provider, key) => {
+    expect(tokenIdentityKey(provider)).toBe(key);
+  });
+
+  it.each(["", "mistral", "constructor", "__proto__", "Grok"])(
+    "rejects unknown provider %j with a typed error",
+    (provider) => {
+      expect(() => tokenIdentityKey(provider)).toThrow(UnknownTokenProviderError);
+    },
+  );
+});