@cartanova/qgrid-cli 1.5.6 → 1.6.0

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

@@ -11,7 +11,7 @@ import {
   generatePKCE,
   refreshAccessToken,
 } from "./oauth";
-import { type ClaudePool, getPool } from "./pool";
+import { QgridDispatcher } from "./qgrid.dispatcher";
 import {
   type CliResult,
   type HealthResponse,
@@ -20,7 +20,6 @@ import {
   type UsageResponse,
 } from "./qgrid.types";
 
-// PKCE 세션 메모리 저장 (state → { codeVerifier, name, redirectUri })
 const pendingOAuth = new Map<string, { codeVerifier: string; name: string; redirectUri: string }>();
 
 class QgridFrameClass extends BaseFrameClass {
@@ -29,14 +28,17 @@ class QgridFrameClass extends BaseFrameClass {
   }
 
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
-  async query(prompt: string, system?: string, timeout?: number): Promise<CliResult> {
-    const pool = getPool();
-    const result = await pool.query({ system, prompt }, timeout);
+  async query(
+    prompt: string,
+    system?: string,
+    timeout?: number,
+    model?: string,
+  ): Promise<CliResult> {
+    const result = await QgridDispatcher.query({ system, prompt, model }, timeout);
 
-    // 로그 기록 실패해도 쿼리 결과는 반환
     RequestLogModel.save([
       {
-        token_name: pool.getLastUsedWorkerName(),
+        token_name: result.tokenName,
         query: system ? `[System]\n${system}\n\n[User]\n${prompt}` : prompt,
         response: result.text,
         input_tokens: result.usage.input_tokens,
@@ -53,7 +55,7 @@ class QgridFrameClass extends BaseFrameClass {
 
   @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
   async stats(): Promise<TokenStats[]> {
-    return getPool().getStats();
+    return QgridDispatcher.getStats();
   }
 
   @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
@@ -70,7 +72,7 @@ class QgridFrameClass extends BaseFrameClass {
         ...(refreshToken && refreshToken.length > 0 ? { refresh_token: refreshToken } : {}),
       },
     ]);
-    getPool().createWorkers(token, name);
+    QgridDispatcher.addToken(token, name);
     return { added: true };
   }
 
@@ -81,7 +83,6 @@ class QgridFrameClass extends BaseFrameClass {
     newToken?: string,
     refreshToken?: string,
   ): Promise<{ updated: boolean }> {
-    const pool = getPool();
     const entry = await TokenModel.findByToken("A", token);
     if (!entry) return { updated: false };
 
@@ -97,52 +98,44 @@ class QgridFrameClass extends BaseFrameClass {
     ]);
 
     if (hasNewToken) {
-      pool.destroyWorkers(token);
-      pool.createWorkers(newToken, name ?? entry.name);
+      QgridDispatcher.removeToken(token);
+      QgridDispatcher.addToken(newToken, name ?? entry.name);
     }
     return { updated: true };
   }
 
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async removeToken(token: string): Promise<{ removed: boolean }> {
-    const pool = getPool();
-    if (!pool.workers.has(token)) return { removed: false };
+    if (!QgridDispatcher.hasToken(token)) return { removed: false };
 
     const entry = await TokenModel.findByToken("A", token);
     if (entry) await TokenModel.del([entry.id]);
-    pool.destroyWorkers(token);
+    QgridDispatcher.removeToken(token);
     return { removed: true };
   }
 
   /**
-   *
    * @param id token_id
-   * 토큰 활성화/비활성화 토글 (pool 워커 생성/제거 & DB의 active 필드 업데이트)
-   *
+   * 토큰 활성화/비활성화 토글 (dispatcher 등록/제거 & DB의 active 필드 업데이트)
    * @returns 토큰 활성화 여부
    */
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async toggleToken(id: number): Promise<{ active: boolean }> {
-    const pool = getPool();
     const entry = await TokenModel.findOne("A", { id });
     if (!entry) return { active: false };
 
     const newActive = !entry.active;
     await TokenModel.save([{ id, token: entry.token, active: newActive, name: entry.name }]);
 
-    // 토큰의 새로운 상태가 활성화면/비활성화면
     if (newActive) {
-      // 워커 생성
-      pool.createWorkers(entry.token, entry.name);
+      QgridDispatcher.addToken(entry.token, entry.name);
     } else {
-      // 워커 제거
-      pool.destroyWorkers(entry.token);
+      QgridDispatcher.removeToken(entry.token);
     }
 
     return { active: newActive };
   }
 
-  // OAuth 로그인: authUrl 생성 (프론트에서 이 API 호출 후 authUrl로 리다이렉트)
   @api({ httpMethod: "POST", clients: ["axios", "tanstack-mutation"] })
   async oauthStart(name: string): Promise<OAuthStartResult> {
     const { codeVerifier, codeChallenge, state } = generatePKCE();
@@ -151,16 +144,13 @@ class QgridFrameClass extends BaseFrameClass {
     const redirectUri = `http://localhost:${serverPort}/callback`;
     const authUrl = buildAuthUrl(codeChallenge, state, redirectUri);
 
-    // PKCE를 메모리에 저장 (5분 TTL)
     pendingOAuth.set(state, { codeVerifier, name, redirectUri });
     setTimeout(() => pendingOAuth.delete(state), 300_000);
 
     return { authUrl };
   }
 
-  // OAuth 콜백 처리 — sonamu.config.ts의 custom 라우트에서 호출됨
   async handleOAuthCallback(code: string, state: string, reply: FastifyReply): Promise<void> {
-    const pool = getPool();
     const pending = pendingOAuth.get(state);
     if (!pending) {
       return reply.redirect("/?oauth=error&reason=invalid_state");
@@ -175,16 +165,14 @@ class QgridFrameClass extends BaseFrameClass {
         pending.redirectUri,
       );
 
-      // 같은 계정의 이전 토큰이 있으면 교체
       if (tokens.accountUuid) {
         const oldEntries = await TokenModel.findByAccountUuid("A", tokens.accountUuid);
-        for (const old of oldEntries) {
-          pool.destroyWorkers(old.token);
-          await TokenModel.del([old.id]);
+        if (oldEntries.length > 0) {
+          for (const old of oldEntries) QgridDispatcher.removeToken(old.token);
+          await TokenModel.del(oldEntries.map((o) => o.id));
         }
       }
 
-      // 새 토큰 저장 + pool에 등록
       await TokenModel.save([
         {
           token: tokens.accessToken,
@@ -194,7 +182,7 @@ class QgridFrameClass extends BaseFrameClass {
           account_uuid: tokens.accountUuid,
         },
       ]);
-      pool.createWorkers(tokens.accessToken, pending.name);
+      QgridDispatcher.addToken(tokens.accessToken, pending.name);
 
       return reply.redirect(`/?oauth=success&name=${encodeURIComponent(pending.name)}`);
     } catch (e) {
@@ -202,10 +190,8 @@ class QgridFrameClass extends BaseFrameClass {
     }
   }
 
-  // 토큰 사용량 조회 (OAuth usage API)
   @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
   async usage(tokenName?: string): Promise<UsageResponse> {
-    const pool = getPool();
     const { rows: allTokens } = await TokenModel.findMany("A");
     const entry = tokenName
       ? allTokens.find((e) => e.name === tokenName)
@@ -213,26 +199,23 @@ class QgridFrameClass extends BaseFrameClass {
 
     if (!entry) return { error: "NOT_FOUND" };
 
-    // 만료 확인 + refresh 시도
     let accessToken = entry.token;
     const isExpired = entry.expires_at && Number(entry.expires_at) < Date.now();
 
     if (isExpired && entry.refresh_token) {
       try {
-        accessToken = await this.refreshToken(pool, entry);
+        accessToken = await this.refreshToken(entry);
       } catch (e) {
         console.warn(`[usage] refresh failed for ${entry.name}: ${(e as Error).message}`);
         return { error: "re-login required" };
       }
     }
 
-    // usage 호출
     const result = await fetchUsage(accessToken);
 
-    // 인증 에러면 refresh_token으로 재시도
     if (result.error && entry.refresh_token) {
       try {
-        accessToken = await this.refreshToken(pool, entry);
+        accessToken = await this.refreshToken(entry);
         return await fetchUsage(accessToken);
       } catch (e) {
         console.warn(`[usage] refresh failed for ${entry.name}: ${(e as Error).message}`);
@@ -243,7 +226,7 @@ class QgridFrameClass extends BaseFrameClass {
     return result;
   }
 
-  async refreshToken(pool: ClaudePool, token: RefreshTokenParams): Promise<string> {
+  async refreshToken(token: RefreshTokenParams): Promise<string> {
     if (!token.refresh_token) throw new Error("No refresh token");
     const refreshed = await refreshAccessToken(token.refresh_token);
     await TokenModel.save([
@@ -255,19 +238,14 @@ class QgridFrameClass extends BaseFrameClass {
         name: token.name ?? "",
       },
     ]);
-    pool.destroyWorkers(token.token);
-    pool.createWorkers(refreshed.accessToken, token.name);
+    QgridDispatcher.removeToken(token.token);
+    QgridDispatcher.addToken(refreshed.accessToken, token.name);
     return refreshed.accessToken;
   }
 
   @api({ httpMethod: "GET", clients: ["axios", "tanstack-query"] })
   async health(): Promise<HealthResponse> {
-    const pool = getPool();
-    return {
-      status: "ok",
-      workers: [...pool.workers.values()].flat().length,
-      activeTokens: pool.workers.size - pool.quotaExhausted.size,
-    };
+    return { status: "ok", activeTokens: QgridDispatcher.tokens.size };
   }
 }
 

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

@@ -5,12 +5,14 @@ import { z } from "zod";
 export const QueryInput = z.object({
   system: z.string().optional(),
   prompt: z.string(),
+  model: z.string().optional(),
   timeout: z.number().optional(),
 });
 export type QueryInput = z.infer<typeof QueryInput>;
 
 export const CliResult = z.object({
   text: z.string(),
+  tokenName: z.string().optional(),
   usage: z.object({
     input_tokens: z.number(),
     output_tokens: z.number(),
@@ -22,18 +24,6 @@ export const CliResult = z.object({
 });
 export type CliResult = z.infer<typeof CliResult>;
 
-// ─── Pool Config ───
-
-export const PoolConfig = z.object({
-  tokens: z.array(z.object({ token: z.string(), name: z.string() })),
-  size: z.number().optional(),
-  model: z.string().optional(),
-  timeout: z.number().optional(),
-  cwd: z.string().optional(),
-  maxCalls: z.number().optional(),
-});
-export type PoolConfig = z.infer<typeof PoolConfig>;
-
 // ─── Token Management ───
 
 export const AddTokenInput = z.object({
@@ -51,7 +41,6 @@ export const TokenStats = z.object({
   token: z.string(),
   name: z.string(),
   requests: z.number(),
-  active: z.boolean(),
 });
 export type TokenStats = z.infer<typeof TokenStats>;
 
@@ -93,7 +82,6 @@ export type UsageResponse = z.infer<typeof UsageResponse>;
 
 export const HealthResponse = z.object({
   status: z.string(),
-  workers: z.number(),
   activeTokens: z.number(),
 });
 export type HealthResponse = z.infer<typeof HealthResponse>;

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

@@ -128,7 +128,8 @@ Content-Type: application/json
 {
   "prompt": "PROMPT",
   "system": "SYSTEM",
-  "timeout": 0
+  "timeout": 0,
+  "model": "MODEL"
 }
 
 ###

package/bundle/src/i18n/sd.generated.ts

@@ -11,7 +11,7 @@ function getCurrentLocale(): (typeof SUPPORTED_LOCALES)[number] {
   try {
     const ctx = Sonamu.getContext();
     return (ctx.locale as (typeof SUPPORTED_LOCALES)[number]) ?? DEFAULT_LOCALE;
-  } catch {
+  } catch (_) {
     return DEFAULT_LOCALE;
   }
 }

package/bundle/src/sonamu.config.ts

@@ -219,19 +219,16 @@ export default defineConfig({
           console.warn(`⚠ Migration skipped: ${(e as Error).message}`);
         }
 
-        // Pool 초기화
-        const { initPool } = await import("./application/qgrid/pool");
+        const { QgridDispatcher } = await import("./application/qgrid/qgrid.dispatcher");
         try {
           const { TokenModel } = await import("./application/token/token.model");
           const entries = await TokenModel.findActive("A");
-          const tokens = entries.map((e) => ({ token: e.token, name: e.name }));
-          const pool = initPool(tokens);
+          for (const e of entries) QgridDispatcher.addToken(e.token, e.name);
           console.log(
-            `🌲 Server listening on http://${host}:${port} (${pool.workers.size} tokens loaded)`,
+            `🌲 Server listening on http://${host}:${port} (${QgridDispatcher.tokens.size} tokens loaded)`,
           );
         } catch (e) {
-          console.warn(`⚠ Pool init failed: ${(e as Error).message}`);
-          initPool([]);
+          console.warn(`⚠ Dispatcher init failed: ${(e as Error).message}`);
           console.log(`🌲 Server listening on http://${host}:${port} (no tokens)`);
         }
       },