@yswgaicx/yswg-img-cli 0.1.5 → 0.1.7

package/README.md

@@ -43,6 +43,18 @@ Use these rules when an AI agent calls the CLI:
 yswg-img generate --prompt "一只可爱的白色兔子，粉色背景" --json
 ```
 
+- Read the local model cache without calling the backend:
+
+```bash
+yswg-img models --json
+```
+
+- If model validation fails after backend permissions change, refresh the cache:
+
+```bash
+yswg-img models refresh --json
+```
+
 - For up to 4 parallel images in one backend request, call:
 
 ```bash
@@ -204,18 +216,37 @@ The command calls `/prod-api/web/amazon/asin/{asin}` and returns the backend
 
 ## Configuration
 
-Flags override environment variables, which override the saved config.
+Runtime flags override environment variables, which override the saved config.
+The app ID is the exception: it is fixed to the `npm` app and cannot be
+overridden.
 
 - `YSWG_TOKEN`
 - `YSWG_REFRESH_TOKEN`
-- `YSWG_APP_ID`
 - `YSWG_BASE_URL`
 - `YSWG_WS_PATH`
 
-Default app ID: `2014153035982319618`.
+Default app name: `npm`.
+Default app ID: `2066371323654864898`.
+The app ID is fixed. `--app-id` and `YSWG_APP_ID` are intentionally rejected.
 Default ratio: `1:1`.
 Default generation model: `gemini-3.1-flash-image-preview` (`groupId=6`, 三代).
 
+## Model Cache
+
+`yswg-img models --json` reads local metadata from
+`~/.yswg-img-cli/model-cache.json`. If that file does not exist, the CLI falls
+back to built-in `npm` app defaults. This keeps generation validation fast and
+stable for agents.
+
+Run this only when backend model permissions or model metadata change:
+
+```bash
+yswg-img models refresh --json
+```
+
+If generation reports a model/group validation mismatch, refresh the cache
+before submitting the same task again.
+
 ## Code Structure
 
 - `bin/yswg-img.js`: executable entrypoint only.
@@ -223,5 +254,6 @@ Default generation model: `gemini-3.1-flash-image-preview` (`groupId=6`, 三代)
 - `src/generate.js`: generation payloads, validation, history recovery, WebSocket wait, uploads, downloads.
 - `src/api.js`: YSWG HTTP API client.
 - `src/config.js`: config loading, env/flag precedence, email normalization.
+- `src/model-cache.js`: built-in model metadata plus local cache refresh/read helpers.
 - `src/args.js`: minimal CLI argument parsing.
 - `src/image-compress.js`: frontend-compatible reference image compression.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yswgaicx/yswg-img-cli",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "CLI wrapper for YSWG Monkey Genius image generation.",
   "type": "module",
   "bin": {

package/src/cli.js

@@ -1,5 +1,6 @@
 import { parseArgs, readFlag, splitCsv } from "./args.js";
-import { loadConfig, normalizeEmail, resolveConfig, saveConfig, DEFAULT_CONFIG_PATH } from "./config.js";
+import { loadConfig, normalizeEmail, resolveConfig, saveConfig, DEFAULT_APP_ID, DEFAULT_APP_NAME, DEFAULT_CONFIG_PATH } from "./config.js";
+import { loadModelCache, refreshModelCache } from "./model-cache.js";
 import { YswgApi } from "./api.js";
 import {
   buildGeneratePayload,
@@ -25,8 +26,8 @@ export function buildHelpText() {
 Commands:
   auth send-code --email <name|email>
   auth login --email <name|email> --code <6 digits>
-  models [--app-id <id>]
-  templates [--app-id <id>] [--json]
+  models [refresh] [--json]
+  templates [--json]
   amazon asin <asin> [--max 7] [--json]
   tasks search [--size 10] [--keyword <text>] [--tab all|expiring1d|expiring2d|nightQueue] [--json]
   tasks get --id <record-id> [--json]
@@ -37,6 +38,9 @@ Commands:
 
 Agent usage:
   Always prefer --json for machine-readable output.
+  Default app: ${DEFAULT_APP_NAME} (${DEFAULT_APP_ID}).
+  The app ID is fixed; --app-id and YSWG_APP_ID are not supported.
+  Model metadata is read from local cache. Use "models refresh --json" after backend model changes.
   Defaults: group-id=6, model=gemini-3.1-flash-image-preview, ratio=1:1, count=1.
   One generate request supports count 1-4. For larger batches, split calls.
   For long tasks, use --no-wait first, then tasks recover --task-id <id>.
@@ -44,7 +48,7 @@ Agent usage:
   Amazon ASIN gallery lookup: amazon asin <asin> --max 7 --json returns asin, title, images.
 
 Environment:
-  YSWG_TOKEN, YSWG_REFRESH_TOKEN, YSWG_APP_ID, YSWG_BASE_URL, YSWG_WS_PATH
+  YSWG_TOKEN, YSWG_REFRESH_TOKEN, YSWG_BASE_URL, YSWG_WS_PATH
 
 Config:
   ${DEFAULT_CONFIG_PATH}
@@ -58,6 +62,11 @@ function writeOutput(write, data, json = false) {
   write(`${text}\n`);
 }
 
+function rejectAppIdOverride(flags) {
+  if (flags.appId !== undefined) throw new Error("不允许传入 --app-id；CLI 固定使用 npm app。");
+  if (process.env.YSWG_APP_ID) throw new Error("不允许设置 YSWG_APP_ID；CLI 固定使用 npm app。");
+}
+
 function assertAuthenticated(resolved) {
   if (!resolved.token) throw new Error("missing token; run auth login or set YSWG_TOKEN");
 }
@@ -109,7 +118,7 @@ async function handleGenerate({ api, config, flags, resolved, json, write }) {
   });
 
   if (!flags.skipValidate) {
-    const modelGroups = await api.models(resolved.appId);
+    const modelGroups = await loadModelCache();
     validateGenerateOptions({
       model: findModelByGroupId(modelGroups, groupId),
       ratio,
@@ -180,7 +189,7 @@ async function handleTaskCommand({ api, config, flags, resolved, subcommand, jso
       tab: String(readFlag(flags, ["tab"], "all")),
       keyword: String(readFlag(flags, ["keyword", "q"], "")),
       userId: getUserId(config),
-      appId: String(readFlag(flags, ["appId"], resolved.appId)),
+      appId: resolved.appId,
       size: readFlag(flags, ["size"], 10),
     }));
     writeOutput(write, result, json);
@@ -210,7 +219,7 @@ async function handleTaskCommand({ api, config, flags, resolved, subcommand, jso
     if (!taskIds.length) throw new Error("missing --task-id");
     const records = await findRecordsByInvokeTaskIds(api, {
       taskIds,
-      appId: String(readFlag(flags, ["appId"], resolved.appId)),
+      appId: resolved.appId,
       userId: getUserId(config),
       pageSize: normalizeHistoryLimit(readFlag(flags, ["size"], 10)),
       maxPages: 1,
@@ -247,6 +256,8 @@ async function handleAmazonCommand({ api, flags, resolved, subcommand, positiona
 export async function runCli(argv, {
   loadConfigFn = loadConfig,
   saveConfigFn = saveConfig,
+  loadModelCacheFn = loadModelCache,
+  refreshModelCacheFn = refreshModelCache,
   createApi = (resolved) => new YswgApi(resolved),
   write = (text) => process.stdout.write(text),
 } = {}) {
@@ -257,6 +268,7 @@ export async function runCli(argv, {
     write(buildHelpText());
     return;
   }
+  rejectAppIdOverride(flags);
 
   const config = await loadConfigFn();
   const resolved = resolveConfig(config, flags);
@@ -291,13 +303,21 @@ export async function runCli(argv, {
   }
 
   if (command === "models") {
-    writeOutput(write, await api.models(resolved.appId), json);
+    if (subcommand === "refresh") {
+      assertAuthenticated(resolved);
+      const result = await refreshModelCacheFn({
+        fetchModels: () => api.models(resolved.appId),
+      });
+      writeOutput(write, { ok: true, ...result }, json);
+      return;
+    }
+    writeOutput(write, await loadModelCacheFn(), json);
     return;
   }
 
   if (command === "templates") {
     assertAuthenticated(resolved);
-    writeOutput(write, await api.templates(String(readFlag(flags, ["appId"], resolved.appId))), json);
+    writeOutput(write, await api.templates(resolved.appId), json);
     return;
   }
 

package/src/config.js

@@ -4,7 +4,8 @@ import { homedir } from "node:os";
 
 export const DEFAULT_CONFIG_PATH = join(homedir(), ".yswg-img-cli", "config.json");
 export const DEFAULT_BASE_URL = "https://www.yswg.love";
-export const DEFAULT_APP_ID = "2014153035982319618";
+export const DEFAULT_APP_NAME = "npm";
+export const DEFAULT_APP_ID = "2066371323654864898";
 export const DEFAULT_WS_PATH = "/websocket";
 
 export async function loadConfig(path = DEFAULT_CONFIG_PATH) {
@@ -25,7 +26,7 @@ export async function saveConfig(config, path = DEFAULT_CONFIG_PATH) {
 export function resolveConfig(config, flags = {}) {
   return {
     baseUrl: flags.baseUrl || process.env.YSWG_BASE_URL || config.baseUrl || DEFAULT_BASE_URL,
-    appId: flags.appId || process.env.YSWG_APP_ID || config.appId || DEFAULT_APP_ID,
+    appId: DEFAULT_APP_ID,
     token: flags.token || process.env.YSWG_TOKEN || config.token || "",
     refreshToken: flags.refreshToken || process.env.YSWG_REFRESH_TOKEN || config.refreshToken || "",
     wsPath: flags.wsPath || process.env.YSWG_WS_PATH || config.wsPath || DEFAULT_WS_PATH,

package/src/model-cache.js

@@ -0,0 +1,162 @@
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import { dirname, join } from "node:path";
+import { homedir } from "node:os";
+
+export const DEFAULT_MODEL_CACHE_PATH = join(homedir(), ".yswg-img-cli", "model-cache.json");
+
+export const DEFAULT_MODEL_GROUPS = [
+  {
+    typeId: "2066371840108666882",
+    typeName: "npm",
+    typeCode: "npm",
+    sort: 0,
+    enabled: true,
+    bindingType: 1,
+    templates: [],
+    models: [
+      {
+        groupId: "2",
+        modelName: "gemini-3-pro-image-preview",
+        size: "1k",
+        label: "天才猴子二代1k",
+        points: 8,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "3",
+        modelName: "gemini-3-pro-image-preview",
+        size: "2k",
+        label: "天才猴子二代2k",
+        points: 8,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "5",
+        modelName: "gemini-3-pro-image-preview",
+        size: "4k",
+        label: "天才猴子二代4k",
+        points: 8,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "1",
+        modelName: "gemini-2.5-flash-image",
+        size: "1k",
+        label: "天才猴子一代",
+        points: 1,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "4",
+        modelName: "gemini-3.1-flash-image-preview",
+        size: "2k",
+        label: "天才猴子三代2k",
+        points: 2,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "6",
+        modelName: "gemini-3.1-flash-image-preview",
+        size: "4k",
+        label: "天才猴子三代4k",
+        points: 2,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "2046043157249933314",
+        modelName: "图灵二代",
+        size: "1k",
+        label: "图灵二代",
+        points: 2,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "2046853405565095939",
+        modelName: "图灵二代（高清）",
+        size: "2k",
+        label: "图灵二代高清",
+        points: 2,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "2046853405565095940",
+        modelName: "图灵二代（超清）",
+        size: "4k",
+        label: "图灵二代超清",
+        points: 2,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+      {
+        groupId: "12",
+        modelName: "gemini-2.5-flash-lite",
+        size: "",
+        label: "一代文本",
+        points: 1,
+      },
+      {
+        groupId: "13",
+        modelName: "gemini-3-flash-preview",
+        size: "",
+        label: "二代文本",
+        points: 1,
+      },
+      {
+        groupId: "930000000000000301",
+        modelName: "seedance-2-0",
+        size: "720p",
+        label: "Seedance 2.0",
+        points: 6,
+      },
+      {
+        groupId: "910000000000000304",
+        modelName: "kling-3.0-omni",
+        size: "720p",
+        label: "kling 3.0",
+        points: 5,
+      },
+      {
+        groupId: "21",
+        modelName: "grok_video",
+        size: "720P",
+        label: "Grok视频",
+        points: 15,
+        skipAspectRatio: true,
+      },
+      {
+        groupId: "17",
+        modelName: "veo_fast",
+        size: "720x1280",
+        label: "VEO",
+        points: 15,
+        skipAspectRatio: true,
+        imageGenOptions: { imageCountEnabled: true, imageRadioEnabled: true },
+      },
+    ],
+  },
+];
+
+export async function loadModelCache(cachePath = DEFAULT_MODEL_CACHE_PATH) {
+  try {
+    const text = await readFile(cachePath, "utf8");
+    const parsed = JSON.parse(text);
+    return Array.isArray(parsed?.models) ? parsed.models : parsed;
+  } catch (error) {
+    if (error.code === "ENOENT") return DEFAULT_MODEL_GROUPS;
+    throw error;
+  }
+}
+
+export async function refreshModelCache({
+  cachePath = DEFAULT_MODEL_CACHE_PATH,
+  fetchModels,
+} = {}) {
+  if (typeof fetchModels !== "function") throw new Error("missing fetchModels");
+  const models = await fetchModels();
+  const payload = {
+    refreshedAt: new Date().toISOString(),
+    models,
+  };
+  await mkdir(dirname(cachePath), { recursive: true });
+  await writeFile(cachePath, `${JSON.stringify(payload, null, 2)}\n`, { mode: 0o600 });
+  return { cachePath, models };
+}