@pippit-dev/cli 1.0.32 → 1.0.33

package/README.md

@@ -51,7 +51,7 @@ node skills/xyq-marketing-skill/scripts/marketing.js query --thread-id THREAD_ID
 | 登录授权 | `status` / `login` / `logout` | [授权](skills/xyq-nest-skill/commands/auth.md) |
 | 个人 Canvas 画布与节点编辑 | `canvas` | [画布](skills/xyq-nest-skill/commands/canvas.md) |
 | 生图、参考图编辑 | `generate-image` | [图片](skills/xyq-nest-skill/commands/generate-image.md) |
-| 查看可用视频模型、参数配置 | `model list` / `model describe` | [模型发现](skills/xyq-nest-skill/commands/model.md) |
+| 查看可用图片/视频模型、参数配置 | `model list` / `model describe` | [模型发现](skills/xyq-nest-skill/commands/model.md) |
 | 生视频、首尾帧 | `generate-video` | [视频](skills/xyq-nest-skill/commands/generate-video.md) |
 | 视频超分 | `video-super-resolution` | [超分](skills/xyq-nest-skill/commands/video-super-resolution.md) |
 | 擦字幕 | `erase-video-subtitle` | [擦字幕](skills/xyq-nest-skill/commands/erase-video-subtitle.md) |
@@ -205,20 +205,22 @@ pippit-tool-cli canvas command run xyq.generation.update_prompt \
 
 ## 生图 CLI
 
-`generate-image` 会上传本地参考图片，然后向综合 Nest Agent 提交生图请求：
+`generate-image` 使用图片模型的展示名称；先查询当前列表并选择模型，再上传本地参考图片并提交生图请求。以下假设列表包含该名称：
 
 ```bash
 pippit-tool-cli generate-image \
   --prompt "生成一张小猫海报" \
   --image "~/images/cat.png" \
-  --model "seedream_4.5" \
+  --model "智能图片V2.5 Fast" \
   --ratio 6 \
   --generate-image-count 2
 ```
 
-命令输出 `thread_id`、`run_id` 和 `web_thread_link`。提交 HTTP 请求时，`agent_name` 固定为 `pippit_nest_agent`，参考图会使用上传接口返回的 `pippit_asset_id` 写入顶层 `asset_ids`，生图模型写入 `general_agent_settings.image_model`，比例写入 `general_agent_settings.ratio`，生图数量写入 `general_agent_settings.generate_image_count`。`--model` 为必填参数，CLI 只做非空校验，具体模型值是否可用由服务端决定。
+命令输出 `thread_id`、`run_id` 和 `web_thread_link`。提交 HTTP 请求时，`agent_name` 固定为 `pippit_nest_agent`，参考图会使用上传接口返回的 `pippit_asset_id` 写入顶层 `asset_ids`，生图模型写入 `general_agent_settings.image_model`，比例写入 `general_agent_settings.ratio`，生图数量写入 `general_agent_settings.generate_image_count`。`--model` 为必填参数，填写 `model list --type image` 返回的完整名称，例如 `"智能图片V2.5 Fast"`。CLI 在上传素材前查询或复用有效缓存，解析名称后仅在提交请求中填写服务端模型标识；名称缺失、重复或未找到时停止，不猜测模型。
 
-`--ratio` 可选，填写服务端 `Ratio` 枚举值。CLI 只做整数格式解析，不检查枚举值是否在下表范围内；具体值是否可用由服务端决定。常用枚举值含义如下：
+图片 `model list/search/describe` 返回给宿主的是 API 下发的展示名称 `name`，例如 `美学模型 8.2`。生成时填写 `--model "美学模型 8.2"`，CLI 仅在提交请求中使用该条目对应的 `key`。名称、可用模型和参数均由接口动态提供，不维护静态名称映射。
+
+`--ratio` 可选，只接受服务端 `Ratio` 数字枚举，例如 `--ratio 3` 表示 `9:16`。通过 `model describe "模型名称" --type image` 查看当前可用的数字 `options/default`，`option_labels` 说明每个数字对应的比例。CLI 校验整数格式，模型是否支持该枚举由服务端决定。常用枚举值含义如下：
 
 | ratio 参数 | IDL 枚举 | 含义 |
 | ---: | --- | --- |
@@ -232,18 +234,27 @@ pippit-tool-cli generate-image \
 
 `--generate-image-count` 可选，填写生图数量，对应 IDL 字段 `GeneralSettingsPart.GenerateImageCount` / JSON 字段 `generate_image_count`。CLI 只校验不能为负数；具体数量范围由服务端决定。
 
-图片支持 `.jpg`、`.jpeg`、`.png`、`.gif`、`.bmp`、`.webp`、`.svg`。CLI 会在提交前校验 prompt、model 必填、ratio 整数格式、generate-image-count 非负和文件后缀。
+`--resolution` 写入 `general_agent_settings.resolution`（转大写），新增 `--effort` 写入 `general_agent_settings.image_effort`（转小写）。分辨率和推理强度选项都来自该模型的动态配置；没有 `effort` 维度的模型不展示推理强度选择。只传用户指定的参数，未指定时省略，不自动补查询默认值。
+
+图片支持 `.jpg`、`.jpeg`、`.png`、`.gif`、`.bmp`、`.webp`、`.svg`。CLI 会在提交前校验 prompt、model 必填、ratio 格式、generate-image-count 非负和文件后缀；不新增模型或参数组合白名单。
 
-## 视频模型发现
+## 图片与视频模型发现
 
 ```bash
+# 图片模型及可选参数
+pippit-tool-cli model list --type image
+pippit-tool-cli model search "智能图片" --type image
+pippit-tool-cli model describe "智能图片V2.5 Fast" --type image
+pippit-tool-cli model list --type image --refresh
+
+# 省略 --type 保持查询视频
 pippit-tool-cli model list
 pippit-tool-cli model search MiniMax
 pippit-tool-cli model describe MiniMax-H3
 pippit-tool-cli model list --refresh
 ```
 
-使用当前登录凭证查询服务端；成功结果按账号和环境隔离缓存 5 分钟，`--refresh` 强制刷新。失败时提示重试，不回退静态列表或过期缓存。`describe` 将比例枚举转换为可直接传给 `--ratio` 的字符串，并整理分辨率、时长和素材限制；不展示内部 `config_key`，未知比例枚举跳过。生成仍由服务端校验。详见 [模型发现](skills/xyq-nest-skill/commands/model.md)。
+使用当前个人登录凭证查询服务端 Skill 模型接口；图片 scene 为 `web_image_agent`，视频为 `web_turbo_video_generator`，不传 TeamID。成功结果按账号、环境和场景隔离缓存 5 分钟，`--refresh` 强制刷新。失败时提示重试，不回退静态列表或过期缓存。`describe` 提供可直接传给生成命令的参数：图片比例保留数字枚举并附比例说明，视频比例转换为字符串，同时整理分辨率、图片推理强度、视频时长和素材限制；不展示内部 `config_key`，未知比例枚举跳过。图片列表和详情仅用 `name` 标识模型，不展示底层模型枚举；搜索、详情查询和 `generate-image --model` 均使用名称，包含空格时加引号。图片详情保留原始 `parameter_config`，包括条件、必选标记、选项说明和参数组合约束。生成仍由服务端校验；服务端尚未开放图片场景或提交参数时会返回错误，不回退静态模型清单。详见 [模型发现](skills/xyq-nest-skill/commands/model.md)。
 
 ## 生视频 CLI
 

package/checksums.txt

@@ -1,6 +1,6 @@
-2f3c2a486a66e408a6d3841f19ecb909fbaa657636a469ee782a424e59596a68  pippit-tool-cli-1.0.32-darwin-amd64.tar.gz
-f4ccd97a007167a9677ea85be52339a041f5448c4e4afd2ec996d32006ccec83  pippit-tool-cli-1.0.32-darwin-arm64.tar.gz
-91ae74eb2067844be741aa8a5f5f932152214c168d43efae801244d46e3f5cab  pippit-tool-cli-1.0.32-linux-amd64.tar.gz
-1928d81ea0f11fa20ae65a689654a9d2dddc4cacb4e6a5ae41a5cdd35e40eac5  pippit-tool-cli-1.0.32-linux-arm64.tar.gz
-79283336e84c3196454aecf96c367383795636f4e153234a11996124a78dd7a5  pippit-tool-cli-1.0.32-windows-amd64.zip
-aa73d963a3dd7d0eb5dba433fdf14d97510dfbe90515aab5318e55c0147d14d9  pippit-tool-cli-1.0.32-windows-arm64.zip
+dd742dedf06e2645d02bc13a4cfa1af45778ae0200a8a6e67df177ba7e069775  pippit-tool-cli-1.0.33-darwin-amd64.tar.gz
+8d9fc0112650839c430e58cb7d6917e5bb1b95fde49659aecbbf14d1421c28f5  pippit-tool-cli-1.0.33-darwin-arm64.tar.gz
+f2f2f741c920b115b2a1a9c4c4f074c1a07fd6cbc3a442cf4dc4d793c1b9ef5a  pippit-tool-cli-1.0.33-linux-amd64.tar.gz
+2ed6e791c7dbea0e2ea8a1d05a0db298442218ecfc17ec47d70d49639f1d91b6  pippit-tool-cli-1.0.33-linux-arm64.tar.gz
+f713c05325043f177f4a9e01a433b6a7fc8f57fea123f712ee459707955d199e  pippit-tool-cli-1.0.33-windows-amd64.zip
+7e637f67fbbb818db0e66c49f7814d7e79cd71857d8c3bd6a5397af9d18533ce  pippit-tool-cli-1.0.33-windows-arm64.zip

package/cmd/generate_image/generate_image.go

@@ -34,6 +34,7 @@ func NewCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Command
 					"model":                strings.TrimSpace(opts.Model),
 					"ratio":                strings.TrimSpace(opts.Ratio),
 					"resolution":           strings.ToUpper(strings.TrimSpace(opts.Resolution)),
+					"effort":               strings.ToLower(strings.TrimSpace(opts.Effort)),
 					"generate_image_count": optionalIntString(opts.GenerateImageCount),
 				})
 				return err
@@ -47,9 +48,10 @@ func NewCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Command
 	flags.StringVar(&opts.Source, "source", "", "optional host agent/platform identifier for statistics only; filled silently by the host agent (e.g. doubao_office, workbuddy, codex)")
 	flags.StringVar(&opts.Prompt, "prompt", "", "image generation prompt")
 	flags.StringArrayVar(&opts.ImagePaths, "image", nil, "local reference image path; repeat for multiple images")
-	flags.StringVar(&opts.Model, "model", "", "image model; supported: seedream_5.0_pro, seedream_5.0, seedream_4.3, nova2, seedream_4.5, seedream_4.1, seedream_4")
+	flags.StringVar(&opts.Model, "model", "", "exact image model name from 'model list --type image' (quote names containing spaces)")
 	flags.StringVar(&opts.Ratio, "ratio", "", "image ratio; "+internalgen.SupportedRatioUsage())
-	flags.StringVar(&opts.Resolution, "resolution", "", "image resolution; only seedream_5.0_pro supports these options: 1K, 2K, 4K")
+	flags.StringVar(&opts.Resolution, "resolution", "", "image resolution; use 'model describe \"MODEL_NAME\" --type image' for available values")
+	flags.StringVar(&opts.Effort, "effort", "", "image reasoning effort; only use values exposed by 'model describe \"MODEL_NAME\" --type image'")
 	flags.IntVar(&generateImageCount, "generate-image-count", 0, "generated image count")
 	return cmd
 }

package/cmd/generate_image_test.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -10,18 +11,29 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/Pippit-dev/pippit-cli/internal/config"
 	"github.com/bytedance/sonic"
 )
 
 func TestGenerateImage(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("XDG_CACHE_HOME", t.TempDir())
+	t.Setenv("LocalAppData", t.TempDir())
 	var uploaded bool
+	var modelQueried bool
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Header.Get("Authorization") != "Bearer test-token" {
 			t.Fatalf("Authorization = %q, want test bearer token", r.Header.Get("Authorization"))
 		}
 		switch r.URL.Path {
+		case "/api/biz/v1/skill/get_available_model_list":
+			modelQueried = true
+			_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-key","config":{"models":[{"key":"seedream_5.0_pro","name":"Seedream 5.0 Pro","kind":"image"}]}}}`))
 		case "/api/biz/v1/skill/upload_file":
+			if !modelQueried {
+				t.Fatal("image name must be resolved before uploading")
+			}
 			if r.Method != http.MethodPost {
 				t.Fatalf("upload method = %s, want POST", r.Method)
 			}
@@ -100,7 +112,7 @@ func TestGenerateImage(t *testing.T) {
 		"generate-image",
 		"--prompt", "生成小猫海报",
 		"--image", image,
-		"--model", "seedream_5.0_pro",
+		"--model", "Seedream 5.0 Pro",
 		"--ratio", "6",
 		"--resolution", "4K",
 		"--generate-image-count", "2",
@@ -137,3 +149,140 @@ func TestGenerateImageRequiresModel(t *testing.T) {
 		t.Fatalf("error = %q, want model validation", err)
 	}
 }
+
+func TestGenerateImageDynamicParameters(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("XDG_CACHE_HOME", t.TempDir())
+	t.Setenv("LocalAppData", t.TempDir())
+	requests := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requests++
+		if r.URL.Path == "/api/biz/v1/skill/get_available_model_list" {
+			_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-key","config":{"models":[{"key":"future-image-model","name":"未来图片模型","kind":"image"}]}}}`))
+			return
+		}
+		if r.URL.Path != "/api/biz/v1/skill/submit_run" {
+			t.Errorf("unexpected path: %s", r.URL.Path)
+		}
+		raw, err := io.ReadAll(r.Body)
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		var body struct {
+			AgentName string `json:"agent_name"`
+			Settings  struct {
+				Model      string `json:"image_model"`
+				Ratio      int    `json:"ratio"`
+				Resolution string `json:"resolution"`
+				Effort     string `json:"image_effort"`
+			} `json:"general_agent_settings"`
+		}
+		if err := sonic.Unmarshal(raw, &body); err != nil {
+			t.Error(err)
+			return
+		}
+		if body.AgentName != "pippit_nest_agent" || body.Settings.Model != "future-image-model" || body.Settings.Ratio != 13 || body.Settings.Resolution != "8K" || body.Settings.Effort != "future-effort" {
+			t.Errorf("incorrect request mapping: %s", raw)
+		}
+		_, _ = w.Write([]byte(`{"ret":"0","data":{"run":{"thread_id":"image-thread","run_id":"image-run"}}}`))
+	}))
+	defer server.Close()
+	var stdout, stderr bytes.Buffer
+	root := newTestRootCommand(t, &stdout, &stderr, server.URL)
+	root.SetArgs([]string{"generate-image", "--prompt", "image", "--model", "未来图片模型", "--ratio", "13", "--resolution", "8k", "--effort", " FUTURE-EFFORT "})
+	if err := root.Execute(); err != nil || requests != 2 {
+		t.Fatalf("Execute: err=%v requests=%d", err, requests)
+	}
+}
+
+func TestImageModelNameFromDiscoveryToSubmission(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("XDG_CACHE_HOME", t.TempDir())
+	t.Setenv("LocalAppData", t.TempDir())
+	queries, submits := 0, 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		switch r.URL.Path {
+		case config.GetAvailableModelListPath:
+			queries++
+			_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-key","config":{"models":[{"key":"ali_midjourney_8_2","name":"美学模型 8.2","benefit_map_by_combination":{"ali_midjourney_8_2":{"resource_id":"ali_midjourney_8_2"}},"kind":"image"}]}}}`))
+		case config.SubmitRunPath:
+			submits++
+			var body struct {
+				Settings map[string]json.RawMessage `json:"general_agent_settings"`
+			}
+			if err := json.NewDecoder(r.Body).Decode(&body); err != nil {
+				t.Error(err)
+			}
+			if string(body.Settings["image_model"]) != `"ali_midjourney_8_2"` || len(body.Settings) != 1 {
+				t.Errorf("wire model not resolved or unrequested defaults filled: %v", body.Settings)
+			}
+			_, _ = w.Write([]byte(`{"ret":"1","errmsg":"ali_midjourney_8_2 暂时不可用","log_id":"image-log"}`))
+		default:
+			t.Errorf("unexpected request: %s", r.URL.Path)
+		}
+	}))
+	defer server.Close()
+	execute := func(args ...string) (string, string, error) {
+		var stdout, stderr bytes.Buffer
+		root := newTestRootCommand(t, &stdout, &stderr, server.URL)
+		root.SetArgs(args)
+		err := root.Execute()
+		return stdout.String(), stderr.String(), err
+	}
+	list, _, err := execute("model", "list", "--type", "image")
+	if err != nil {
+		t.Fatal(err)
+	}
+	var output struct{ Models []struct{ Name string } }
+	if err := json.Unmarshal([]byte(list), &output); err != nil || len(output.Models) != 1 {
+		t.Fatalf("list=%s err=%v", list, err)
+	}
+	name := output.Models[0].Name
+	if name != "美学模型 8.2" {
+		t.Fatalf("unexpected display name: %q", name)
+	}
+	detail, _, err := execute("model", "describe", name, "--type", "image")
+	if err != nil || !strings.Contains(detail, name) || strings.Contains(list+detail, "ali_midjourney_8_2") {
+		t.Fatalf("user-facing identity changed: list=%s detail=%s err=%v", list, detail, err)
+	}
+	stdout, stderr, err := execute("generate-image", "--prompt", "一张猫咪图片", "--model", name)
+	if err == nil || !strings.Contains(err.Error(), name) || !strings.Contains(err.Error(), "image-log") || strings.Contains(stdout+stderr+err.Error(), "ali_midjourney_8_2") {
+		t.Fatalf("server rejection must keep name and log ID: stdout=%s stderr=%s err=%v", stdout, stderr, err)
+	}
+	if queries != 1 || submits != 1 {
+		t.Fatalf("expected shared cache and no submit retry: queries=%d submits=%d", queries, submits)
+	}
+}
+
+func TestImageNameFailureStopsBeforeUploadAndSubmit(t *testing.T) {
+	for _, tc := range []struct{ name, selection, models string }{
+		{"unknown name", "不存在", `[{"key":"private-image","name":"图片模型","kind":"image"}]`},
+		{"wire key", "private-image", `[{"key":"private-image","name":"图片模型","kind":"image"}]`},
+		{"missing name", "图片模型", `[{"key":"private-image","kind":"image"}]`},
+		{"duplicate name", "图片模型", `[{"key":"private-image","name":"图片模型","kind":"image"},{"key":"private-image-2","name":"图片模型","kind":"image"}]`},
+		{"empty list", "图片模型", `[]`},
+	} {
+		t.Run(tc.name, func(t *testing.T) {
+			t.Setenv("HOME", t.TempDir())
+			t.Setenv("XDG_CACHE_HOME", t.TempDir())
+			t.Setenv("LocalAppData", t.TempDir())
+			requests := 0
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				requests++
+				if r.URL.Path != config.GetAvailableModelListPath {
+					t.Errorf("must not upload or submit: %s", r.URL.Path)
+				}
+				_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-key","config":{"models":` + tc.models + `}}}`))
+			}))
+			defer server.Close()
+			var stdout, stderr bytes.Buffer
+			root := newTestRootCommand(t, &stdout, &stderr, server.URL)
+			root.SetArgs([]string{"generate-image", "--prompt", "image", "--model", tc.selection, "--image", "/missing.png"})
+			err := root.Execute()
+			if err == nil || requests != 1 || strings.Contains(stdout.String()+stderr.String()+err.Error(), "private-image") {
+				t.Fatalf("invalid name accepted or exposed: requests=%d stdout=%s stderr=%s err=%v", requests, stdout.String(), stderr.String(), err)
+			}
+		})
+	}
+}

package/cmd/model.go

@@ -16,10 +16,7 @@ func newModelCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Com
 	var modelType string
 	service := models.NewService(runner)
 	query := func(cmd *cobra.Command, args []string, describe bool) error {
-		if modelType != "video" {
-			return fmt.Errorf("当前仅支持 --type video")
-		}
-		result, err := service.Get(cmd.Context(), refresh)
+		result, err := service.Get(cmd.Context(), modelType, refresh)
 		if err != nil {
 			return err
 		}
@@ -43,9 +40,9 @@ func newModelCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Com
 		return common.WriteJSON(stdout, output)
 	}
 	cmd := &cobra.Command{
-		Use:   "model [key]",
-		Short: "Discover available video models and their server configuration",
-		Long:  "Query available video models using your current credentials. Successful queries are cached locally for 5 minutes. Use --refresh to bypass the cache; retry if a query fails.",
+		Use:   "model [name-or-key]",
+		Short: "Discover available image and video models and their server configuration",
+		Long:  "Query available image and video models using your current credentials. Select images by their full display name (in quotes), videos by key. Successful queries are cached locally for 5 minutes. Use --refresh to bypass the cache; retry if a query fails.",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: withErrorLog("model", nil, func(cmd *cobra.Command, args []string) error {
 			return query(cmd, args, len(args) > 0)
@@ -54,17 +51,17 @@ func newModelCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Com
 	cmd.SetOut(stdout)
 	cmd.SetErr(stderr)
 	cmd.PersistentFlags().BoolVar(&refresh, "refresh", false, "refresh the 5-minute local model cache")
-	cmd.PersistentFlags().StringVarP(&modelType, "type", "t", "video", "model type (currently video only)")
+	cmd.PersistentFlags().StringVarP(&modelType, "type", "t", "video", "model type: video or image (default video)")
 	cmd.AddCommand(&cobra.Command{
 		Use: "list [query]", Aliases: []string{"search"},
-		Short: "List video models, optionally filtered by key or name",
+		Short: "List models; search images by name, videos by key or name",
 		Args:  cobra.MaximumNArgs(1),
 		RunE: withErrorLog("model list", nil, func(cmd *cobra.Command, args []string) error {
 			return query(cmd, args, false)
 		}),
 	})
 	cmd.AddCommand(&cobra.Command{
-		Use: "describe <key>", Short: "Show model parameters with CLI-ready ratios, defaults, and limits",
+		Use: "describe <name-or-key>", Short: "Show model parameters; use the full image name or video key",
 		Args: cobra.ExactArgs(1),
 		RunE: withErrorLog("model describe", nil, func(cmd *cobra.Command, args []string) error {
 			return query(cmd, args, true)

package/cmd/model_test.go

@@ -67,7 +67,7 @@ func TestModelCommands(t *testing.T) {
 }
 
 func TestModelHelpDoesNotRequireLoginOrRequest(t *testing.T) {
-	for _, args := range [][]string{{"model", "--help"}, {"generate-video", "--help"}} {
+	for _, args := range [][]string{{"model", "--help"}, {"generate-video", "--help"}, {"generate-image", "--help"}} {
 		var stdout, stderr bytes.Buffer
 		root := NewRootCommand(&stdout, &stderr)
 		root.SetArgs(args)
@@ -79,3 +79,61 @@ func TestModelHelpDoesNotRequireLoginOrRequest(t *testing.T) {
 		}
 	}
 }
+
+func TestImageModelCommands(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("XDG_CACHE_HOME", t.TempDir())
+	t.Setenv("LocalAppData", t.TempDir())
+	requests := 0
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		requests++
+		var body map[string]string
+		if err := json.NewDecoder(r.Body).Decode(&body); err != nil || body["scene"] != "web_image_agent" || body["source_model_key"] != "" || r.URL.Path != config.GetAvailableModelListPath {
+			t.Errorf("unexpected request: body=%v path=%s err=%v", body, r.URL.Path, err)
+		}
+		_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-config","config":{"models":[{"key":"image-model","report_name":"image-model","name":"图片测试模型","kind":"image","is_default":true,"supported_ratio_list":[0,2,6],"parameter_config":{"dimensions":[{"key":"resolution","default_value":"2K","option_list":[{"value":"2K"}]},{"key":"effort","default_value":"low","option_list":[{"value":"low"},{"value":"high"}]}]}}]}}}`))
+	}))
+	defer server.Close()
+	for _, args := range [][]string{
+		{"model", "list", "--type", "image"},
+		{"model", "search", "图片", "-t", "image"},
+		{"model", "describe", "图片测试模型", "--type", "image"},
+		{"model", "图片测试模型", "-t", "image"},
+	} {
+		var stdout, stderr bytes.Buffer
+		cfg := config.Load()
+		cfg.BaseURL, cfg.AccessKey = server.URL, "image-model-test-key"
+		root := newRootCommand(&stdout, &stderr, newRootRunner(cfg))
+		root.SetArgs(args)
+		if err := root.Execute(); err != nil {
+			t.Fatalf("%v: %v", args, err)
+		}
+		if !strings.Contains(stdout.String(), `"scene": "web_image_agent"`) && !strings.Contains(stdout.String(), `"scene":"web_image_agent"`) {
+			t.Fatalf("missing image scene: %s", stdout.String())
+		}
+		if strings.Contains(stdout.String(), `"is_default"`) || strings.Contains(stdout.String(), `"config_key"`) || strings.Contains(stdout.String(), "image-model") {
+			t.Fatalf("internal fields exposed: %s", stdout.String())
+		}
+		if args[1] == "describe" || args[1] == "图片测试模型" {
+			var output struct {
+				Model struct {
+					Effort struct{ Options []string }
+				}
+			}
+			if err := json.Unmarshal(stdout.Bytes(), &output); err != nil || len(output.Model.Effort.Options) != 2 {
+				t.Fatalf("missing effort choices: %s err=%v", stdout.String(), err)
+			}
+		}
+	}
+	if requests != 1 {
+		t.Fatalf("commands did not share image cache: %d requests", requests)
+	}
+	var stdout, stderr bytes.Buffer
+	cfg := config.Load()
+	cfg.BaseURL, cfg.AccessKey = server.URL, "image-model-test-key"
+	root := newRootCommand(&stdout, &stderr, newRootRunner(cfg))
+	root.SetArgs([]string{"model", "list", "--type", "audio"})
+	if err := root.Execute(); err == nil || requests != 1 {
+		t.Fatalf("invalid type must fail before request: err=%v requests=%d", err, requests)
+	}
+}

package/cmd/short_drama_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/Pippit-dev/pippit-cli/internal/auth"
 	"github.com/Pippit-dev/pippit-cli/internal/common"
 	"github.com/Pippit-dev/pippit-cli/internal/config"
 	"github.com/Pippit-dev/pippit-cli/internal/version"
@@ -963,6 +964,7 @@ func newTestRootCommandWithAccessKey(t *testing.T, stdout, stderr io.Writer, bas
 	cfg.AccessKey = accessKey
 	client := common.NewHTTPClient(cfg.BaseURL, cfg.HTTPTimeout, common.NewAccessKeyAuthorizer(cfg.AccessKey))
 	runner := common.NewRunner(cfg, client)
+	runner.Auth = auth.NewManager(cfg)
 	return newRootCommand(stdout, stderr, runner)
 }
 

package/cmd/source_test.go

@@ -16,6 +16,9 @@ import (
 )
 
 func TestSkillSubmitSourcePreservesCreativeRequest(t *testing.T) {
+	t.Setenv("HOME", t.TempDir())
+	t.Setenv("XDG_CACHE_HOME", t.TempDir())
+	t.Setenv("LocalAppData", t.TempDir())
 	for _, name := range []string{"submit-run", "generate-image", "generate-video", "video-super-resolution", "erase-video-subtitle", "short-drama"} {
 		t.Run(name, func(t *testing.T) {
 			video := filepath.Join(t.TempDir(), "input.mp4")
@@ -24,7 +27,7 @@ func TestSkillSubmitSourcePreservesCreativeRequest(t *testing.T) {
 			}
 			args := map[string][]string{
 				"submit-run":             {"submit-run", "--message", "  保留原文\nworkbuddy 只是内容  ", "--thread-id", "skill_existing", "--asset-ids", "asset_1"},
-				"generate-image":         {"generate-image", "--prompt", "cat", "--model", "seedream_5.0_pro", "--ratio", "6", "--resolution", "4K"},
+				"generate-image":         {"generate-image", "--prompt", "cat", "--model", "Seedream 5.0 Pro", "--ratio", "6", "--resolution", "4K"},
 				"generate-video":         {"generate-video", "--prompt", "cat", "--model", "Seedance_2.0_mini", "--duration", "4", "--ratio", "16:9"},
 				"video-super-resolution": {"video-super-resolution", "--video", video, "--output-resolution", "1080p"},
 				"erase-video-subtitle":   {"erase-video-subtitle", "--video", video},
@@ -37,6 +40,8 @@ func TestSkillSubmitSourcePreservesCreativeRequest(t *testing.T) {
 			uploadFailure := false
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				switch r.URL.Path {
+				case config.GetAvailableModelListPath:
+					_, _ = w.Write([]byte(`{"ret":"0","data":{"scene":"web_image_agent","config_key":"image-key","config":{"models":[{"key":"seedream_5.0_pro","name":"Seedream 5.0 Pro","kind":"image"}]}}}`))
 				case config.SubmitRunPath:
 					submitCount++
 					if r.Method != http.MethodPost || r.Header.Get("Authorization") != "Bearer test-token" {

package/dist/checksums.txt

@@ -1,6 +1,6 @@
-2f3c2a486a66e408a6d3841f19ecb909fbaa657636a469ee782a424e59596a68  pippit-tool-cli-1.0.32-darwin-amd64.tar.gz
-f4ccd97a007167a9677ea85be52339a041f5448c4e4afd2ec996d32006ccec83  pippit-tool-cli-1.0.32-darwin-arm64.tar.gz
-91ae74eb2067844be741aa8a5f5f932152214c168d43efae801244d46e3f5cab  pippit-tool-cli-1.0.32-linux-amd64.tar.gz
-1928d81ea0f11fa20ae65a689654a9d2dddc4cacb4e6a5ae41a5cdd35e40eac5  pippit-tool-cli-1.0.32-linux-arm64.tar.gz
-79283336e84c3196454aecf96c367383795636f4e153234a11996124a78dd7a5  pippit-tool-cli-1.0.32-windows-amd64.zip
-aa73d963a3dd7d0eb5dba433fdf14d97510dfbe90515aab5318e55c0147d14d9  pippit-tool-cli-1.0.32-windows-arm64.zip
+dd742dedf06e2645d02bc13a4cfa1af45778ae0200a8a6e67df177ba7e069775  pippit-tool-cli-1.0.33-darwin-amd64.tar.gz
+8d9fc0112650839c430e58cb7d6917e5bb1b95fde49659aecbbf14d1421c28f5  pippit-tool-cli-1.0.33-darwin-arm64.tar.gz
+f2f2f741c920b115b2a1a9c4c4f074c1a07fd6cbc3a442cf4dc4d793c1b9ef5a  pippit-tool-cli-1.0.33-linux-amd64.tar.gz
+2ed6e791c7dbea0e2ea8a1d05a0db298442218ecfc17ec47d70d49639f1d91b6  pippit-tool-cli-1.0.33-linux-arm64.tar.gz
+f713c05325043f177f4a9e01a433b6a7fc8f57fea123f712ee459707955d199e  pippit-tool-cli-1.0.33-windows-amd64.zip
+7e637f67fbbb818db0e66c49f7814d7e79cd71857d8c3bd6a5397af9d18533ce  pippit-tool-cli-1.0.33-windows-arm64.zip

package/internal/common/ratio.go

@@ -0,0 +1,12 @@
+package common
+
+// RatioValue mirrors capcut_business_common.Ratio. Custom (1) has no CLI
+// width/height parameters, so it and unknown enums have no display value.
+func RatioValue(value int64) string {
+	return ratioValues[value]
+}
+
+var ratioValues = map[int64]string{
+	0: "adaptive", 2: "16:9", 3: "9:16", 4: "4:3", 5: "3:4", 6: "1:1",
+	7: "2:1", 8: "2.35:1", 9: "1.85:1", 10: "1.125:2.436", 11: "3:2", 12: "2:3", 13: "21:9",
+}

package/internal/generate_image/generate_image.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/Pippit-dev/pippit-cli/internal/common"
+	"github.com/Pippit-dev/pippit-cli/internal/models"
 )
 
 const (
@@ -19,7 +20,7 @@ var (
 	allowedImageExtensions    = common.StringSet(allowedImageExtensionList)
 )
 
-const ratioUsage = "enum values: 0=原始比例/自动, 2=16:9(横屏), 13=21:9(电影), 3=9:16(竖屏), 4=4:3, 5=3:4, 6=1:1"
+const ratioUsage = "integer enum from 'model describe \"MODEL_NAME\" --type image' (e.g. 0=adaptive, 2=16:9, 3=9:16, 6=1:1)"
 
 // Options is the stable command-facing request shape for generate-image.
 type Options struct {
@@ -29,6 +30,7 @@ type Options struct {
 	Model              string
 	Ratio              string
 	Resolution         string
+	Effort             string
 	GenerateImageCount *int
 }
 
@@ -36,6 +38,7 @@ type generalAgentSettings struct {
 	ImageModel         string `json:"image_model"`
 	Ratio              *int   `json:"ratio,omitempty"`
 	Resolution         string `json:"resolution,omitempty"`
+	ImageEffort        string `json:"image_effort,omitempty"`
 	GenerateImageCount *int   `json:"generate_image_count,omitempty"`
 }
 
@@ -53,23 +56,31 @@ func Run(ctx context.Context, opts *Options, runner *common.Runner) (*Result, er
 	if err := ValidateOptions(opts); err != nil {
 		return nil, err
 	}
+	catalog, err := models.NewService(runner).Get(ctx, "image", false)
+	if err != nil {
+		return nil, err
+	}
+	modelKey, err := catalog.Catalog.ImageModelKey(opts.Model)
+	if err != nil {
+		return nil, err
+	}
 
 	imageAssetIDs, err := uploadImageList(ctx, opts.ImagePaths, runner)
 	if err != nil {
 		return nil, fmt.Errorf("上传图片失败: %w", err)
 	}
 
-	body := buildSubmitRunBody(opts, imageAssetIDs)
+	body := buildSubmitRunBody(opts, modelKey, imageAssetIDs)
 
 	var resp common.SubmitRunResponse
 	if err := runner.Client.SendRequest(ctx, common.SubmitRunPath(runner), body, &resp); err != nil {
-		return nil, fmt.Errorf("提交 generate-image 请求失败: %w", err)
+		return nil, fmt.Errorf("提交 generate-image 请求失败: %s", catalog.Catalog.ImageDisplayMessage(err.Error()))
 	}
 	if resp.Ret != "0" {
 		if resp.Errmsg == "" {
 			resp.Errmsg = "未知错误"
 		}
-		return nil, common.NewLogIDError(fmt.Sprintf("generate-image 请求返回失败: ret=%s errmsg=%s", resp.Ret, resp.Errmsg), resp.LogID)
+		return nil, common.NewLogIDError(fmt.Sprintf("generate-image 请求返回失败: ret=%s errmsg=%s", resp.Ret, catalog.Catalog.ImageDisplayMessage(resp.Errmsg)), resp.LogID)
 	}
 	if resp.Data.Run.ThreadID == "" {
 		return nil, fmt.Errorf("generate-image 响应缺少 data.run.thread_id")
@@ -137,15 +148,16 @@ func uploadImageList(ctx context.Context, paths []string, runner *common.Runner)
 	return assetIDs, nil
 }
 
-func buildSubmitRunBody(opts *Options, imageAssetIDs []string) map[string]any {
+func buildSubmitRunBody(opts *Options, modelKey string, imageAssetIDs []string) map[string]any {
 	ratio, _ := parseRatio(opts.Ratio)
 	body := map[string]any{
 		"agent_name": agentNameNest,
 		"message":    strings.TrimSpace(opts.Prompt),
 		"general_agent_settings": generalAgentSettings{
-			ImageModel:         strings.TrimSpace(opts.Model),
+			ImageModel:         modelKey,
 			Ratio:              ratio,
 			Resolution:         strings.ToUpper(strings.TrimSpace(opts.Resolution)),
+			ImageEffort:        strings.ToLower(strings.TrimSpace(opts.Effort)),
 			GenerateImageCount: opts.GenerateImageCount,
 		},
 	}
@@ -162,7 +174,7 @@ func parseRatio(raw string) (*int, error) {
 	}
 	value, err := strconv.Atoi(ratio)
 	if err != nil {
-		return nil, fmt.Errorf("ratio %q 必须是整数枚举值；可参考：%s", ratio, ratioUsage)
+		return nil, fmt.Errorf("ratio %q 必须是整数枚举值（如 3 表示 9:16）；请用 model describe \"模型名称\" --type image 查询", ratio)
 	}
 	return &value, nil
 }