@cartanova/qgrid-cli 2.10.3 → 2.10.5

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

@@ -1,10 +1,6 @@
-import { EventEmitter } from "node:events";
 
-import { Sonamu } from "sonamu";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, describe, expect, it, vi } from "vitest";
 
-import { resetNativeRunRegistryForTests } from "../qgrid/qgrid-run-lifecycle";
-import { resetServerRestartForTests } from "../../utils/server-restart";
 import { SettingModel } from "./setting.model";
 import * as reminders from "../qgrid/expired-token-reminder";
 import { SlackNotificationError } from "../../utils/slack-notify";
@@ -26,99 +22,3 @@ describe("SettingModel.triggerExpiryReminder", () => {
     });
   });
 });
-
-function installContext(headers: Record<string, string>) {
-  const raw = Object.assign(new EventEmitter(), {
-    destroyed: false,
-    writableEnded: false,
-  });
-  vi.spyOn(Sonamu, "getContext").mockReturnValue({
-    transport: "http",
-    headers,
-    request: { protocol: "http" },
-    reply: { raw },
-  } as never);
-  return raw;
-}
-
-describe("SettingModel.restartServer", () => {
-  beforeEach(() => {
-    vi.spyOn(process, "exit").mockImplementation((() => undefined) as never);
-  });
-
-  afterEach(() => {
-    resetServerRestartForTests();
-    resetNativeRunRegistryForTests();
-    vi.unstubAllEnvs();
-    vi.restoreAllMocks();
-  });
-
-  it("rejects restart when pm2 will not respawn the process", async () => {
-    const raw = installContext({ host: "localhost:44900" });
-    vi.stubEnv("pm_id", undefined);
-
-    await expect(SettingModel.restartServer()).rejects.toMatchObject({ statusCode: 400 });
-    expect(raw.listenerCount("finish")).toBe(0);
-    expect(process.exit).not.toHaveBeenCalled();
-  });
-
-  it("rejects a browser request whose Origin host does not match Host", async () => {
-    installContext({ origin: "https://evil.example", host: "qgrid.example.com" });
-    vi.stubEnv("pm_id", "0");
-
-    await expect(SettingModel.restartServer()).rejects.toMatchObject({ statusCode: 403 });
-    expect(process.exit).not.toHaveBeenCalled();
-  });
-
-  it("rejects a malformed present Origin instead of treating it as an operational client", async () => {
-    installContext({ origin: "null", host: "qgrid.example.com" });
-    vi.stubEnv("pm_id", "0");
-
-    await expect(SettingModel.restartServer()).rejects.toMatchObject({ statusCode: 403 });
-    expect(process.exit).not.toHaveBeenCalled();
-  });
-
-  it("accepts a matching Origin using the Caddy-forwarded host", async () => {
-    const raw = installContext({
-      origin: "https://qgrid.example.com",
-      host: "127.0.0.1:44900",
-      "x-forwarded-host": "qgrid.example.com",
-    });
-    vi.stubEnv("pm_id", "0");
-
-    await expect(SettingModel.restartServer()).resolves.toEqual({ supervisor: "pm2" });
-    expect(process.exit).not.toHaveBeenCalled();
-
-    raw.emit("finish");
-    expect(process.exit).toHaveBeenCalledOnce();
-    expect(process.exit).toHaveBeenCalledWith(0);
-  });
-
-  it("accepts an Origin-less operational request", async () => {
-    const raw = installContext({ host: "qgrid.example.com" });
-    vi.stubEnv("pm_id", "0");
-
-    await expect(SettingModel.restartServer()).resolves.toEqual({ supervisor: "pm2" });
-    expect(process.exit).not.toHaveBeenCalled();
-
-    raw.emit("finish");
-    expect(process.exit).toHaveBeenCalledWith(0);
-  });
-
-  it("coordinates simultaneous calls through one process exit", async () => {
-    const firstRaw = installContext({ host: "qgrid.example.com" });
-    vi.stubEnv("pm_id", "0");
-
-    const first = SettingModel.restartServer();
-    const second = SettingModel.restartServer();
-    await expect(Promise.all([first, second])).resolves.toEqual([
-      { supervisor: "pm2" },
-      { supervisor: "pm2" },
-    ]);
-
-    firstRaw.emit("finish");
-    firstRaw.emit("close");
-    expect(process.exit).toHaveBeenCalledOnce();
-    expect(process.exit).toHaveBeenCalledWith(0);
-  });
-});

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

@@ -1,19 +1,14 @@
-import { getLogger } from "@logtape/logtape";
 import {
   BaseModelClass,
   type ListResult,
   asArray,
   NotFoundException,
   BadRequestException,
-  SoException,
-  Sonamu,
   api,
   exhaustive,
 } from "sonamu";
 
 import { SD, type LocalizedString } from "../../i18n/sd.generated";
-import { detectSupervisor } from "../../utils/process-supervisor";
-import { armServerRestartExit, beginServerRestart } from "../../utils/server-restart";
 import { SlackNotificationError } from "../../utils/slack-notify";
 import { type SettingSubsetKey, type SettingSubsetMapping } from "../sonamu.generated";
 import { settingSubsetQueries, settingLoaderQueries } from "../sonamu.generated.sso";
@@ -37,37 +32,8 @@ import {
   type SettingListParams,
   type SettingSaveParams,
   type SettingsResponse,
-  type SupervisorKind,
 } from "./setting.types";
 
-const logger = getLogger(["qgrid", "setting"]);
-
-class ForbiddenException extends SoException {
-  constructor() {
-    super(403, SD("error.forbidden"));
-  }
-}
-
-function firstHeaderValue(value: string | string[] | undefined): string | undefined {
-  return (Array.isArray(value) ? value[0] : value)?.split(",")[0]?.trim();
-}
-
-/** Origin 없는 운영 CLI 요청은 통과시키되, 브라우저 교차 출처 POST 는 막는다. */
-function assertRestartOrigin(): void {
-  const { headers } = Sonamu.getContext();
-  const origin = firstHeaderValue(headers.origin);
-  if (headers.origin === undefined) return;
-  if (!origin) throw new ForbiddenException();
-
-  const host = firstHeaderValue(headers["x-forwarded-host"]) ?? firstHeaderValue(headers.host);
-  try {
-    if (!host || new URL(origin).host !== host) throw new ForbiddenException();
-  } catch (error) {
-    if (error instanceof ForbiddenException) throw error;
-    throw new ForbiddenException();
-  }
-}
-
 /*
   Setting Model
 */
@@ -246,7 +212,6 @@ class SettingModelClass extends BaseModelClass<
     return {
       settings,
       runtime: this.runtimeInfo(),
-      supervisor: detectSupervisor(),
       keepaliveRunnerEnabled: process.env[TOKEN_WINDOW_KEEPALIVE_RUNNER_ENV_KEY] === "true",
     };
   }
@@ -309,44 +274,6 @@ class SettingModelClass extends BaseModelClass<
       throw error;
     }
   }
-
-  /**
-   * 서버를 재시작한다 — 정확히는 스스로 종료하고, pm2 가 다시 띄우는 것에 맡긴다.
-   *
-   * `restart` 로 표시된 워커 설정은 dispatcher 생성자에서 한 번만 읽히므로 이 경로 말고는
-   * 반영할 방법이 없었다. 지금까지는 SSH 로 `pm2 restart` 를 쳐야 했다.
-   *
-   * 부수 효과가 하나 더 있다: pm2 는 `ecosystem.config.cjs` 의 원래 명령으로 다시 띄우고,
-   * 그 명령에 `--skip-update` 가 없으면 CLI 가 npm 최신 버전을 받아 올린다. 즉 재시작은
-   * 배포이기도 하다 — 화면 문구가 이 사실을 함께 알린다.
-   */
-  @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
-  async restartServer(): Promise<{ supervisor: SupervisorKind }> {
-    assertRestartOrigin();
-    const supervisor = detectSupervisor();
-    if (!supervisor) {
-      // 다시 띄워줄 주체가 없으면 종료가 곧 정지다. 살릴 수 없는데 죽이지 않는다.
-      throw new BadRequestException(SD("setting.noSupervisor")());
-    }
-
-    const { reply } = Sonamu.getContext();
-    const started = beginServerRestart();
-    if (started) {
-      logger.warn(`restart requested via dashboard, exiting for ${supervisor} to respawn`);
-
-      try {
-        // 정적 import로 qgrid.frame/token 그래프를 당겨오면 모듈 목 테스트가 오염된다.
-        // 재시작이 실제로 확정된 시점에 active native run 정합성 처리만 로드한다.
-        const { finishActiveNativeRunsForRestart } = await import("../qgrid/qgrid-run-lifecycle");
-        await finishActiveNativeRunsForRestart();
-      } finally {
-        // 정합성 처리가 실패해도 응답이 flush 된 뒤에는 재시작을 끝까지 진행한다.
-        armServerRestartExit(reply.raw);
-      }
-    }
-
-    return { supervisor };
-  }
 }
 
 export const SettingModel = new SettingModelClass();

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

@@ -1,9 +1,8 @@
 /**
  * 런타임 설정 조회 캐시.
  *
- * 값의 출처는 DB(`settings`) → env 순이다. env 를 남겨두는 이유는 전환 때문이다 — dev0 는
- * `ecosystem.config.json` 으로 값을 주입하는데, DB 만 보게 만들면 배포 직후 설정이 전부
- * 기본값으로 떨어진다.
+ * 값의 출처는 DB(`settings`) → env 순이다. 저장된 설정이 없으면 기동 시 전달된
+ * 환경변수를 사용하므로, 설정을 DB에 저장하기 전에도 기존 값이 유지된다.
  *
  * 설정은 요청 경로(permit 해석, 알림 전송)에서 읽히므로 매번 DB 를 때리지 않고 메모리에
  * 둔다. `immediate` 변경도 현재 API 프로세스에만 즉시 반영된다. 인스턴스가 여러 개면 다른

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

@@ -21,16 +21,6 @@ export type SettingApplies = z.infer<typeof SettingApplies>;
 export const SettingSource = z.enum(["db", "env", "default"]);
 export type SettingSource = z.infer<typeof SettingSource>;
 
-/**
- * 프로세스를 다시 띄워주는 도구. 재시작은 스스로 종료하고 이 도구에 맡기므로,
- * 없으면(null) 화면에서 재시작을 시도조차 하지 않는다.
- *
- * API 반환 타입에 쓰이므로 zod 로 둔다 — sonamu syncer 가 클라이언트 코드를 만들 때
- * 타입만 있는 선언은 모듈을 찾지 못한다.
- */
-export const SupervisorKind = z.enum(["pm2"]);
-export type SupervisorKind = z.infer<typeof SupervisorKind>;
-
 export const SettingItem = z.object({
   key: z.string(),
   group: z.string(),
@@ -59,8 +49,6 @@ export type RuntimeInfoItem = z.infer<typeof RuntimeInfoItem>;
 export const SettingsResponse = z.object({
   settings: SettingItem.array(),
   runtime: RuntimeInfoItem.array(),
-  /** null 이면 재시작 버튼을 쓸 수 없다 — 종료해도 되살릴 주체가 없다. */
-  supervisor: SupervisorKind.nullable(),
   /** 이 인스턴스가 keepalive 스케줄러를 소유하도록 명시적으로 허용됐는지. */
   keepaliveRunnerEnabled: z.boolean(),
 });

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

@@ -98,13 +98,6 @@ Content-Type: application/json
 
 ###
 
-POST {{baseUrl}}/api/setting/restartServer
-Content-Type: application/json
-
-{}
-
-###
-
 GET {{baseUrl}}/api/requestLogStep/findById
 	?subset=A
 	&id=0
@@ -297,6 +290,7 @@ Content-Type: application/json
         "inputSchema": "unknown"
       }
     ],
+    "thinking": true,
     "effort": "EFFORT",
     "verbosity": "low",
     "reasoningSummary": "auto",
@@ -361,6 +355,7 @@ Content-Type: application/json
         "inputSchema": "unknown"
       }
     ],
+    "thinking": true,
     "effort": "EFFORT",
     "verbosity": "low",
     "reasoningSummary": "auto",

package/bundle/src/i18n/en.ts

@@ -49,12 +49,9 @@ export default {
   "error.serviceUnavailable": "Service unavailable",
   "setting.invalidValue": (reason: string) => `Invalid setting value: ${reason}`,
   "setting.unknownKey": (key: string) => `Unknown setting key ${key}`,
-  "setting.noSupervisor": () =>
-    "Restart is unavailable when running locally — nothing would bring the server back up",
   "qgrid.dispatcherFailed": (provider: string) => `${provider} dispatcher failed to initialize`,
   "qgrid.dispatcherStarting": (provider: string) =>
     `${provider} dispatcher is starting up. Please retry shortly`,
-  "qgrid.restartPending": () => "Server restart is in progress. Please retry shortly",
   "error.unauthorized": "Unauthorized",
   notFound: (name: string, id: number) => `${name} ID ${id} not found`,
   "validation.email": "Invalid email format",

package/bundle/src/i18n/ko.ts

@@ -48,12 +48,9 @@ export default {
   "error.serviceUnavailable": "서비스를 사용할 수 없습니다",
   "setting.invalidValue": (reason: string) => `설정 값이 올바르지 않습니다: ${reason}`,
   "setting.unknownKey": (key: string) => `알 수 없는 설정 키 ${key}`,
-  "setting.noSupervisor": () =>
-    "로컬 실행 환경에서는 재시작할 수 없습니다 — 종료하면 다시 켜줄 모니터링 도구가 없습니다",
   "qgrid.dispatcherFailed": (provider: string) => `${provider} dispatcher 초기화에 실패했습니다`,
   "qgrid.dispatcherStarting": (provider: string) =>
     `${provider} dispatcher 기동 중입니다. 잠시 후 다시 시도해주세요`,
-  "qgrid.restartPending": () => "서버 재시작 중입니다. 잠시 후 다시 시도해주세요",
   "error.unauthorized": "인증이 필요합니다",
   "error.unknownSearchField": (field: string) => `구현되지 않은 검색 필드 ${field}`,
   notFound: (name: string, id: number) => `존재하지 않는 ${name} ID ${id}`,

package/bundle/src/utils/providers/openai/openai-backend-protocol.test.ts

@@ -8,6 +8,24 @@ import {
 } from "./openai-backend-protocol";
 
 describe("OpenAI Codex backend protocol", () => {
+  it.each(["png", "jpeg", "webp"])("preserves reported hosted %s generation settings", (output_format) => {
+    expect(normalizeOpenAIEvent({ type: "response.output_item.done", item: {
+      type: "image_generation_call", result: "aGVsbG8=", output_format,
+      size: "841x1870", quality: "low", background: "opaque",
+    } })).toMatchObject({ generation: {
+      route: "codex-responses", size: "841x1870", quality: "low", background: "opaque",
+    } });
+  });
+
+  it("reports PNG byte dimensions instead of a conflicting backend size", () => {
+    const bytes = Buffer.alloc(24);
+    Buffer.from("89504e470d0a1a0a", "hex").copy(bytes);
+    bytes.writeUInt32BE(841, 16);
+    bytes.writeUInt32BE(1870, 20);
+    expect(normalizeOpenAIEvent({ type: "response.output_item.done", item: {
+      type: "image_generation_call", result: bytes.toString("base64"), size: "1152x2560",
+    } })).toMatchObject({ generation: { route: "codex-responses", size: "841x1870" } });
+  });
   it("distinguishes partial function items from completed arguments", () => {
     const item = { type: "function_call", call_id: "call", name: "generate_transparent_image", arguments: "{}" };
     expect(normalizeOpenAIEvent({ type: "response.output_item.added", item })).toEqual({ type: "output-item", item, completed: false });
@@ -129,6 +147,6 @@ describe("OpenAI Codex backend protocol", () => {
         type: "response.output_item.done",
         item: { type: "image_generation_call", id: "img", result: "aGVsbG8=", revised_prompt: "better" },
       }),
-    ).toEqual({ type: "image", id: "img", base64: "aGVsbG8=", mimeType: "image/png", revisedPrompt: "better" });
+    ).toEqual({ type: "image", id: "img", base64: "aGVsbG8=", mimeType: "image/png", revisedPrompt: "better", generation: { route: "codex-responses" } });
   });
 });

package/bundle/src/utils/providers/openai/openai-backend-protocol.ts

@@ -248,11 +248,33 @@ export function normalizeOpenAIEvent(raw: unknown): OpenAINormalizedEvent | unde
   ) {
     const item = event.item as OpenAIResponseItem;
     if (item.type === "image_generation_call" && typeof item.result === "string") {
+      // PNG exposes dimensions in its fixed header. Other formats retain the
+      // backend's observed size; never substitute requested image controls.
+      const header = Buffer.from(item.result.slice(0, 32), "base64");
+      const pngSize =
+        header.length >= 24 &&
+        header.subarray(0, 8).equals(Buffer.from("89504e470d0a1a0a", "hex")) &&
+        header.readUInt32BE(16) > 0 &&
+        header.readUInt32BE(20) > 0
+          ? `${header.readUInt32BE(16)}x${header.readUInt32BE(20)}`
+          : undefined;
+      const size =
+        pngSize ??
+        (typeof item.size === "string" && /^[1-9]\d*x[1-9]\d*$/.test(item.size)
+          ? item.size
+          : undefined);
       return {
         type: "image",
         ...(typeof item.id === "string" ? { id: item.id } : {}),
         base64: item.result,
         mimeType: imageMimeType(item.result, item.output_format),
+        generation: {
+          route: "codex-responses",
+          ...(size ? { size } : {}),
+          ...(typeof item.model === "string" ? { model: item.model } : {}),
+          ...(typeof item.quality === "string" ? { quality: item.quality } : {}),
+          ...(typeof item.background === "string" ? { background: item.background } : {}),
+        },
         ...(typeof item.revised_prompt === "string"
           ? { revisedPrompt: item.revised_prompt }
           : typeof item.revisedPrompt === "string"

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

@@ -144,6 +144,18 @@ describe("OpenAIDispatcher direct runtime", () => {
     }
   });
 
+  it.each(["auto", "1152x2560"])("forwards %s size hints and preserves hosted observations", async (size) => {
+    const args = QueryInput.parse({ prompt: "draw in 9:20", imageGeneration: true, imageGenerationOptions: { size } });
+    const generation = { route: "codex-responses" as const, size: "841x1870", quality: "low" };
+    const d = dispatcher((options) => {
+      expect(buildOpenAIResponsesRequest(options).tools).toContainEqual({ type: "image_generation", size });
+      return events({ type: "image", base64: "data", mimeType: "image/png", generation }, { type: "completed", responseId: "r" });
+    });
+    await d.onTokenAdded(1, "one", credentials);
+    const result = await d.generate(request({ imageGeneration: args.imageGeneration, imageGenerationOptions: args.imageGenerationOptions }));
+    expect(result.images).toMatchObject([{ generation }]);
+  });
+
   beforeEach(() => { refreshMock.mockReset(); });
 
   it("refreshes a quota 401 once, shares the recovery, and uses the new credentials", async () => {

package/bundle/web-dist/client/assets/cost-CY2BJEPC.js

@@ -0,0 +1 @@
+var e=1e6,t=4;function n(t){return t/e}function r(e,n=!1){return`${n?`Known `:``}$${e.toFixed(t)}`}function i(e){return r(n(e))}function a(e){let t=e.is_image_generation&&e.image_cost_usd===null;return e.cost_usd===null&&e.image_cost_usd===null?t?`Unknown`:`—`:r(n((e.cost_usd??0)+(e.image_cost_usd??0)),t)}function o(e){return e.input_tokens<=0?`—`:`${Math.round(e.cache_read_tokens/e.input_tokens*100)}%`}export{r as i,i as n,a as r,o as t};