@cartanova/qgrid-cli 2.10.10 → 2.11.0

package/bundle/src/application/qgrid/schema-prompt.ts

@@ -15,6 +15,14 @@
  * - 렌더된 계약은 parseEnvelope 의 zod 계약({"result": ...} 한 겹, 상호배타 변형)과
  *   정확히 일치해야 한다 — 교차 테스트(schema-prompt.test.ts)가 드리프트를 막는다.
  */
+import { z } from "zod";
+
+import {
+  isJsonObject,
+  type JsonObject,
+  type JsonValue,
+  jsonValueSchema,
+} from "../../utils/providers/common/provider-types";
 import { type QgridTool, type QueryInput } from "./qgrid.types";
 
 /**
@@ -27,7 +35,9 @@ export function composeSystemWithSchemaContract(
   input: Pick<QueryInput, "tools" | "jsonSchema">,
 ): string | undefined {
   const contract = renderSchemaContractPrompt(input);
+
   if (contract === undefined) return system;
+
   return system ? `${system}\n\n${contract}` : contract;
 }
 
@@ -38,9 +48,11 @@ export function renderSchemaContractPrompt(
   if (input.tools?.length) {
     return renderToolEnvelopePrompt(input.tools, input.jsonSchema);
   }
+
   if (input.jsonSchema !== undefined) {
     return renderOutputSchemaPrompt(input.jsonSchema);
   }
+
   return undefined;
 }
 
@@ -68,33 +80,47 @@ export function renderOutputSchemaPrompt(jsonSchema: string): string {
  * 있으면 **fail-closed** — 위반 가능성이 있는 예시를 싣는 대신 예시 자체를 생략하고
  * 렌더러가 프로즈 서술로 대체한다 (`toolCallExample: undefined`).
  */
-export function buildEnvelopeExamples(tools: QgridTool[]): {
+export interface EnvelopeExamples {
   toolCallExample?: string;
   textAnswerExample: string;
-} {
+}
+
+export function buildEnvelopeExamples(tools: QgridTool[]): EnvelopeExamples {
   const firstTool = tools[0];
-  const args = firstTool ? exampleValueForSchema(firstTool.inputSchema) : { ok: true, value: {} };
-  return {
-    ...(args.ok
-      ? {
-          toolCallExample: JSON.stringify({
-            result: {
-              action: "tool_call",
-              answer: null,
-              toolCalls: [
-                { toolName: firstTool?.name ?? "toolName", args: JSON.stringify(args.value) },
-              ],
-            },
-          }),
-        }
-      : {}),
+  const args = exampleArgsForTool(firstTool);
+
+  const examples: EnvelopeExamples = {
     textAnswerExample: JSON.stringify({
       result: { action: "answer", answer: "your final answer", toolCalls: null },
     }),
   };
+
+  if (args.ok) {
+    examples.toolCallExample = JSON.stringify({
+      result: {
+        action: "tool_call",
+        answer: null,
+        toolCalls: [{ toolName: firstTool?.name ?? "toolName", args: JSON.stringify(args.value) }],
+      },
+    });
+  }
+
+  return examples;
 }
 
-type ExampleResult = { ok: true; value: unknown } | { ok: false };
+type ExampleResult = { ok: true; value: JsonValue } | { ok: false };
+
+/** A missing tool or schema allows any object; a schema that is not JSON yields no example. */
+function exampleArgsForTool(tool: QgridTool | undefined): ExampleResult {
+  if (tool === undefined || tool.inputSchema === undefined) return { ok: true, value: {} };
+  const inputSchema = jsonValueSchema.safeParse(tool.inputSchema);
+
+  return inputSchema.success ? exampleValueForSchema(inputSchema.data) : { ok: false };
+}
+
+function jsonNumber(value: JsonValue | undefined): number | undefined {
+  return z.number().safeParse(value).data;
+}
 
 /** 생성기가 값 선택에 반영하는 keyword. 어노테이션(description 등)은 값과 무관해 무시한다. */
 const EXAMPLE_ANNOTATION_KEYWORDS = new Set([
@@ -107,6 +133,7 @@ const EXAMPLE_ANNOTATION_KEYWORDS = new Set([
   "readOnly",
   "writeOnly",
 ]);
+
 const EXAMPLE_HANDLED_KEYWORDS = new Set([
   "type",
   "enum",
@@ -132,10 +159,11 @@ const EXAMPLE_HANDLED_KEYWORDS = new Set([
  * (pattern/format/$ref/allOf/not/if/multipleOf/uniqueItems/...)을 만나면 값을
  * 지어내지 않고 { ok: false } 를 돌려준다 — 계약 위반 예시는 모델이 베낀다.
  */
-function exampleValueForSchema(schema: unknown): ExampleResult {
+function exampleValueForSchema(schema: JsonValue | undefined): ExampleResult {
   if (schema === true || schema === undefined) return { ok: true, value: {} };
-  if (schema === null || typeof schema !== "object" || Array.isArray(schema)) return { ok: false };
-  const node = schema as Record<string, unknown>;
+
+  if (!isJsonObject(schema)) return { ok: false };
+  const node = schema;
 
   for (const keyword of Object.keys(node)) {
     if (!EXAMPLE_HANDLED_KEYWORDS.has(keyword) && !EXAMPLE_ANNOTATION_KEYWORDS.has(keyword)) {
@@ -143,79 +171,114 @@ function exampleValueForSchema(schema: unknown): ExampleResult {
     }
   }
 
-  if (Array.isArray(node.enum) && node.enum.length > 0) return { ok: true, value: node.enum[0] };
-  if ("const" in node) return { ok: true, value: node.const };
+  const enumValues = node.enum;
+
+  if (Array.isArray(enumValues) && enumValues.length > 0) {
+    return { ok: true, value: enumValues[0] ?? null };
+  }
+
+  if ("const" in node) return { ok: true, value: node.const ?? null };
 
   for (const kw of ["anyOf", "oneOf"] as const) {
-    if (Array.isArray(node[kw])) {
+    const list = node[kw];
+
+    if (Array.isArray(list)) {
       // oneOf 는 "정확히 하나"라 첫 브랜치 값이 다른 브랜치에도 매칭될 수 있다 —
       // 검증기 없이 확신할 수 없으므로 브랜치가 하나일 때만 생성한다.
-      const list = node[kw] as unknown[];
       if (kw === "oneOf" && list.length > 1) return { ok: false };
+
       for (const branch of list) {
         const result = exampleValueForSchema(branch);
+
         if (result.ok) return result;
       }
+
       return { ok: false };
     }
   }
 
   const type = Array.isArray(node.type) ? node.type[0] : node.type;
+
   switch (type) {
     case "string": {
-      const min = typeof node.minLength === "number" ? node.minLength : 0;
+      const min = jsonNumber(node.minLength) ?? 0;
+      const maxLength = jsonNumber(node.maxLength);
+
       if (min > 64) return { ok: false };
       const base = "example";
       const value = base.length >= min ? base : base.padEnd(min, "x");
-      if (typeof node.maxLength === "number" && value.length > node.maxLength) {
-        if (node.maxLength < min) return { ok: false };
-        return { ok: true, value: value.slice(0, node.maxLength) };
+
+      if (maxLength !== undefined && value.length > maxLength) {
+        if (maxLength < min) return { ok: false };
+
+        return { ok: true, value: value.slice(0, maxLength) };
       }
+
       return { ok: true, value };
     }
+
     case "number":
     case "integer": {
       let value = 0;
-      if (typeof node.minimum === "number") value = node.minimum;
-      else if (typeof node.exclusiveMinimum === "number") value = node.exclusiveMinimum + 1;
-      if (typeof node.maximum === "number" && value > node.maximum) return { ok: false };
-      if (typeof node.exclusiveMaximum === "number" && value >= node.exclusiveMaximum) {
+      const minimum = jsonNumber(node.minimum);
+      const exclusiveMinimum = jsonNumber(node.exclusiveMinimum);
+      const maximum = jsonNumber(node.maximum);
+      const exclusiveMaximum = jsonNumber(node.exclusiveMaximum);
+
+      if (minimum !== undefined) value = minimum;
+      else if (exclusiveMinimum !== undefined) value = exclusiveMinimum + 1;
+
+      if (maximum !== undefined && value > maximum) return { ok: false };
+
+      if (exclusiveMaximum !== undefined && value >= exclusiveMaximum) {
         return { ok: false };
       }
+
       return { ok: true, value };
     }
+
     case "boolean":
       return { ok: true, value: false };
     case "null":
       return { ok: true, value: null };
     case "array": {
-      const min = typeof node.minItems === "number" ? node.minItems : 0;
+      const min = jsonNumber(node.minItems) ?? 0;
+      const maxItems = jsonNumber(node.maxItems);
+
       if (min > 8) return { ok: false };
-      if (typeof node.maxItems === "number" && node.maxItems < min) return { ok: false };
+
+      if (maxItems !== undefined && maxItems < min) return { ok: false };
+
       if (min === 0) return { ok: true, value: [] };
       const item = exampleValueForSchema(node.items);
+
       if (!item.ok) return { ok: false };
+
       // 같은 값 반복이라 uniqueItems 와 충돌하지만, uniqueItems 는 지원 집합 밖이라
       // 위의 keyword 검사에서 이미 fail-closed 된다.
       return { ok: true, value: Array.from({ length: min }, () => item.value) };
     }
+
     case undefined:
     case "object": {
-      const properties =
-        node.properties && typeof node.properties === "object" && !Array.isArray(node.properties)
-          ? (node.properties as Record<string, unknown>)
-          : {};
+      const properties: JsonObject = isJsonObject(node.properties) ? node.properties : {};
+
       const required = Array.isArray(node.required)
-        ? node.required.filter((k): k is string => typeof k === "string")
+        ? node.required.flatMap((key) => z.string().safeParse(key).data ?? [])
         : [];
-      const entries: Array<[string, unknown]> = [];
+
+      const entries: Array<[string, JsonValue]> = [];
+
       for (const key of required) {
         const child = exampleValueForSchema(properties[key]);
+
         if (!child.ok) return { ok: false };
         entries.push([key, child.value]);
       }
+
       return { ok: true, value: Object.fromEntries(entries) };
     }
+
     default:
       return { ok: false };
   }
@@ -230,6 +293,7 @@ export function renderToolEnvelopePrompt(tools: QgridTool[], jsonSchema?: string
   const toolList = tools
     .map((tool) => {
       const description = tool.description ? ` — ${tool.description}` : "";
+
       return `- ${tool.name}${description}\n  inputSchema: ${JSON.stringify(tool.inputSchema)}`;
     })
     .join("\n");

package/bundle/src/application/qgrid/slack-user-map.ts

@@ -14,12 +14,15 @@ import { getSetting } from "../setting/setting.store";
 /** `토큰명:SlackUserId` 목록을 파싱한다. */
 export function parseSlackUserMap(raw: string | undefined): Map<string, string> {
   const map = new Map<string, string>();
+
   if (!raw) return map;
 
   for (const entry of raw.split(",")) {
     const [name, userId] = entry.split(":").map((s) => s.trim());
+
     if (name && userId) map.set(name, userId);
   }
+
   return map;
 }
 
@@ -27,12 +30,14 @@ export function parseSlackUserMap(raw: string | undefined): Map<string, string>
 export function ownerOf(tokenName: string | null): string {
   if (!tokenName) return "";
   const slash = tokenName.indexOf("/");
+
   return slash === -1 ? tokenName : tokenName.slice(slash + 1);
 }
 
 /** 매핑이 있으면 `<@U...>`, 없으면 빈 문자열. 호출부가 멘션 유무로 문구를 고른다. */
 export function mentionFor(tokenName: string | null, userMap: Map<string, string>): string {
   const userId = userMap.get(ownerOf(tokenName));
+
   return userId ? `<@${userId}>` : "";
 }
 

package/bundle/src/application/qgrid/token-death.ts

@@ -28,12 +28,15 @@ export async function deactivateAuthDeadToken(
     token.id,
     token.credentials,
   );
+
   if (staleCredentials) {
     logger.info(
       `skipping auth-death for ${token.name}(id=${token.id}): credentials rotated since this attempt`,
     );
+
     return false;
   }
+
   if (!marked) return false;
 
   logger.warn(`token requires re-login: ${token.name}(id=${token.id}) reason=${reasonCode}`);
@@ -55,6 +58,7 @@ export async function deactivateAuthDeadToken(
     color: SLACK_COLOR.bad,
     urgent: wasLastActive,
   });
+
   return true;
 }
 

package/bundle/src/application/qgrid/token-subscriber.test.ts

@@ -22,7 +22,7 @@ function openaiToken(active = true) {
     provider: "openai",
     active,
     name: "tok-A",
-    credentials: { accessToken: "access", accountId: "account" },
+    credentials: { accessToken: "access", refreshToken: "refresh", accessTokenExpiresAt: 0, accountId: "account" },
     quota_threshold: 80,
     weight: 4,
   };
@@ -70,7 +70,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     expect(openaiDispatcher.onTokenUpdated).toHaveBeenCalledWith(
       1,
       "tok-A",
-      { accessToken: "access", accountId: "account" },
+      { accessToken: "access", refreshToken: "refresh", accessTokenExpiresAt: 0, accountId: "account" },
       80,
       4,
     );
@@ -90,7 +90,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     findOneMock.mockResolvedValueOnce({
       ...openaiToken(true),
       provider: "anthropic",
-      credentials: { accessToken: "access", refreshToken: "refresh" },
+      credentials: { accessToken: "access", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
     });
 
     await subscriber.handleNotification(JSON.stringify({ op: "UPDATE", id: 1 }));
@@ -98,7 +98,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     expect(anthropicDispatcher.onTokenUpdated).toHaveBeenCalledWith(
       1,
       "tok-A",
-      { accessToken: "access", refreshToken: "refresh" },
+      { accessToken: "access", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
       80,
       4,
     );
@@ -120,7 +120,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     findOneMock.mockResolvedValueOnce({
       ...openaiToken(true),
       provider: "anthropic",
-      credentials: { accessToken: "access", refreshToken: "refresh" },
+      credentials: { accessToken: "access", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
     });
 
     await subscriber.handleNotification(JSON.stringify({ op: "INSERT", id: 1 }));
@@ -132,7 +132,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     const previous = {
       ...openaiToken(true),
       provider: "anthropic",
-      credentials: { accessToken: "old", refreshToken: "refresh" },
+      credentials: { accessToken: "old", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
     };
     const anthropicDispatcher = { onTokenUpdated: vi.fn() };
     const subscriber = new TokenSubscriber(
@@ -148,7 +148,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     subscriber.tokenChangeHandler = onTokensChanged;
     findOneMock.mockResolvedValueOnce({
       ...previous,
-      credentials: { accessToken: "new", refreshToken: "refresh" },
+      credentials: { accessToken: "new", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
     });
 
     await subscriber.handleNotification(JSON.stringify({ op: "UPDATE", id: previous.id }));
@@ -161,7 +161,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     const previous = {
       ...openaiToken(true),
       provider: "anthropic",
-      credentials: { accessToken: "access", refreshToken: "refresh" },
+      credentials: { accessToken: "access", refreshToken: "refresh", expiresAt: 0, accountUuid: "account" },
     };
     const subscriber = new TokenSubscriber(
       {} as never,
@@ -182,8 +182,14 @@ describe("TokenSubscriber OpenAI notifications", () => {
   });
 
   it("serializes token reloads so rapid weight updates cannot apply backward", async () => {
-    let resolveFirst!: (value: ReturnType<typeof openaiToken>) => void;
-    const firstRow = new Promise<ReturnType<typeof openaiToken>>((resolve) => {
+    const anthropicToken = (weight: number) => ({
+      ...openaiToken(true),
+      provider: "anthropic",
+      credentials: { accessToken: "access", refreshToken: "refresh", expiresAt: 0, accountUuid: "a" },
+      weight,
+    });
+    let resolveFirst!: (value: ReturnType<typeof anthropicToken>) => void;
+    const firstRow = new Promise<ReturnType<typeof anthropicToken>>((resolve) => {
       resolveFirst = resolve;
     });
     const anthropicDispatcher = { onTokenUpdated: vi.fn() };
@@ -196,11 +202,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
         anthropicDispatcher,
       } as never,
     );
-    findOneMock.mockReturnValueOnce(firstRow).mockResolvedValueOnce({
-      ...openaiToken(true),
-      provider: "anthropic",
-      weight: 5,
-    });
+    findOneMock.mockReturnValueOnce(firstRow).mockResolvedValueOnce(anthropicToken(5));
 
     const first = subscriber.handleNotification(JSON.stringify({ op: "UPDATE", id: 1 }));
     const second = subscriber.handleNotification(JSON.stringify({ op: "UPDATE", id: 1 }));
@@ -208,7 +210,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     await flushPromises();
     expect(findOneMock).toHaveBeenCalledTimes(1);
 
-    resolveFirst({ ...openaiToken(true), provider: "anthropic", weight: 2 });
+    resolveFirst(anthropicToken(2));
     await Promise.all([first, second]);
 
     expect(anthropicDispatcher.onTokenUpdated.mock.calls.map((call) => call[4])).toEqual([2, 5]);
@@ -244,13 +246,13 @@ describe("TokenSubscriber OpenAI notifications", () => {
       {
         ...openaiToken(true),
         provider: "anthropic",
-        credentials: { accessToken: "access-a", refreshToken: "refresh-a" },
+        credentials: { accessToken: "access-a", refreshToken: "refresh-a", expiresAt: 0, accountUuid: "account" },
       },
       {
         ...openaiToken(true),
         id: 2,
         name: "tok-B",
-        credentials: { accessToken: "access-b", accountId: "account-b" },
+        credentials: { accessToken: "access-b", refreshToken: "refresh", accessTokenExpiresAt: 0, accountId: "account-b" },
       },
     ]);
 
@@ -270,7 +272,7 @@ describe("TokenSubscriber OpenAI notifications", () => {
     const currentAnthropic = {
       ...openaiToken(true),
       provider: "anthropic",
-      credentials: { accessToken: "access-a", refreshToken: "refresh-a" },
+      credentials: { accessToken: "access-a", refreshToken: "refresh-a", expiresAt: 0, accountUuid: "account" },
     };
     const dispatcher = {
       tokens: new Map([[currentAnthropic.id, currentAnthropic]]),