@pippit-dev/cli 1.0.31 → 1.0.33

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/root.go

@@ -73,6 +73,7 @@ func newRootCommand(stdout, stderr io.Writer, runner *common.Runner) *cobra.Comm
 	root.AddCommand(newDownloadResultCommand(stdout, stderr, runner))
 	root.AddCommand(newGetCreditBalanceCommand(stdout, stderr, runner))
 	root.AddCommand(newModelCommand(stdout, stderr, runner))
+	root.AddCommand(newMarketingCommand(stdout, stderr, runner))
 	root.AddCommand(newGetThreadCommand(stdout, stderr, runner))
 	root.AddCommand(newSubmitRunCommand(stdout, stderr, runner))
 	root.AddCommand(newUploadFileCommand(stdout, stderr, runner))

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 @@
-0023facaf65dc042d7dd08b285efbd046efd3dd4cebd29f31e3421b919d38bc9  pippit-tool-cli-1.0.31-darwin-amd64.tar.gz
-a6989ce590556924da7a2ceb5d94a8d75f81b459dae5fe016d0d929ae9c31a0f  pippit-tool-cli-1.0.31-darwin-arm64.tar.gz
-2ccc7bfb01fc00a0a7c2948abb18eda6da0769c7c1f21bca3db942a1e7b3a0b3  pippit-tool-cli-1.0.31-linux-amd64.tar.gz
-2a6c10aada4090701a97ef8af69ad91abf4d0fda000634c344157487c7895da7  pippit-tool-cli-1.0.31-linux-arm64.tar.gz
-fcf2e3e988952e046e23a4505630d758e7471d6d7125541eba7d5882588b67cb  pippit-tool-cli-1.0.31-windows-amd64.zip
-5b9ce586c808866404c3d6e006c9ed359d1d8aecee105ac38e0015b79be78d64  pippit-tool-cli-1.0.31-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/client.go

@@ -46,7 +46,17 @@ func NewHTTPClient(baseURL string, timeout time.Duration, authorizer RequestAuth
 	return newHTTPClient(baseURL, timeout, authorizer)
 }
 
-func newHTTPClient(baseURL string, timeout time.Duration, authorizer RequestAuthorizer) Client {
+// NewNonRedirectingHTTPClient keeps one-shot submissions from being replayed.
+// Authentication and request handling still use the shared CLI client.
+func NewNonRedirectingHTTPClient(baseURL string, timeout time.Duration, authorizer RequestAuthorizer) Client {
+	client := newHTTPClient(baseURL, timeout, authorizer)
+	client.httpClient.CheckRedirect = func(_ *http.Request, _ []*http.Request) error {
+		return fmt.Errorf("拒绝营销 API 重定向；请求未重试")
+	}
+	return client
+}
+
+func newHTTPClient(baseURL string, timeout time.Duration, authorizer RequestAuthorizer) *httpClient {
 	client := &httpClient{
 		baseURL:    strings.TrimRight(baseURL, "/"),
 		headers:    make(http.Header),

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
 }

package/internal/generate_image/generate_image_test.go

@@ -1,6 +1,7 @@
 package generate_image
 
 import (
+	"encoding/json"
 	"strings"
 	"testing"
 )
@@ -19,10 +20,10 @@ func TestValidateOptionsRequiresModel(t *testing.T) {
 	}
 }
 
-func TestValidateOptionsAllowsServerDecidedModel(t *testing.T) {
+func TestValidateOptionsAllowsDynamicModelName(t *testing.T) {
 	opts := &Options{
 		Prompt: "x",
-		Model:  "seedream_3.0",
+		Model:  "图片测试模型",
 	}
 
 	if err := ValidateOptions(opts); err != nil {
@@ -33,7 +34,7 @@ func TestValidateOptionsAllowsServerDecidedModel(t *testing.T) {
 func TestValidateOptionsAllowsServerDecidedRatio(t *testing.T) {
 	opts := &Options{
 		Prompt: "x",
-		Model:  "seedream_4.5",
+		Model:  "图片测试模型",
 		Ratio:  "99",
 	}
 
@@ -45,7 +46,7 @@ func TestValidateOptionsAllowsServerDecidedRatio(t *testing.T) {
 func TestValidateOptionsAllowsServerDecidedResolution(t *testing.T) {
 	opts := &Options{
 		Prompt:     "x",
-		Model:      "seedream_4.5",
+		Model:      "图片测试模型",
 		Resolution: "8K",
 	}
 
@@ -58,7 +59,7 @@ func TestValidateOptionsRejectsNegativeGenerateImageCount(t *testing.T) {
 	count := -1
 	opts := &Options{
 		Prompt:             "x",
-		Model:              "seedream_4.5",
+		Model:              "图片测试模型",
 		GenerateImageCount: &count,
 	}
 
@@ -83,6 +84,13 @@ func TestParseRatioSupportsVisibleEnumValues(t *testing.T) {
 		{ratio: "4", want: 4},
 		{ratio: "5", want: 5},
 		{ratio: "6", want: 6},
+		{ratio: "7", want: 7},
+		{ratio: "8", want: 8},
+		{ratio: "9", want: 9},
+		{ratio: "10", want: 10},
+		{ratio: "11", want: 11},
+		{ratio: "12", want: 12},
+		{ratio: "99", want: 99},
 	}
 
 	for _, tt := range cases {
@@ -98,20 +106,55 @@ func TestParseRatioSupportsVisibleEnumValues(t *testing.T) {
 	}
 }
 
-func TestParseRatioRejectsNonInteger(t *testing.T) {
-	_, err := parseRatio("1:1")
-	if err == nil {
-		t.Fatal("parseRatio() error = nil, want integer validation")
+func TestImageOptionalParametersAndEffortPassThrough(t *testing.T) {
+	for _, effort := range []string{"", " HIGH ", "future-effort"} {
+		opts := &Options{Prompt: "image", Model: "未来图片模型", Effort: effort}
+		if err := ValidateOptions(opts); err != nil {
+			t.Fatal(err)
+		}
+		raw, err := json.Marshal(buildSubmitRunBody(opts, "future-image-model", nil))
+		if err != nil {
+			t.Fatal(err)
+		}
+		var body struct {
+			Settings map[string]json.RawMessage `json:"general_agent_settings"`
+		}
+		if err := json.Unmarshal(raw, &body); err != nil {
+			t.Fatal(err)
+		}
+		for _, key := range []string{"ratio", "resolution", "generate_image_count"} {
+			if _, exists := body.Settings[key]; exists {
+				t.Fatalf("unspecified %s was filled: %s", key, raw)
+			}
+		}
+		if effort == "" {
+			if _, exists := body.Settings["image_effort"]; exists {
+				t.Fatalf("unspecified effort was filled: %s", raw)
+			}
+		} else {
+			var got string
+			if err := json.Unmarshal(body.Settings["image_effort"], &got); err != nil || got != strings.ToLower(strings.TrimSpace(effort)) {
+				t.Fatalf("effort not forwarded: %s, %v", raw, err)
+			}
+		}
 	}
-	if !strings.Contains(err.Error(), `ratio "1:1" 必须是整数枚举值`) {
-		t.Fatalf("error = %q, want integer validation", err)
+}
+
+func TestParseRatioRejectsNonInteger(t *testing.T) {
+	for _, ratio := range []string{"9:16", "adaptive", "17:11", "3.0"} {
+		t.Run(ratio, func(t *testing.T) {
+			err := ValidateOptions(&Options{Prompt: "image", Model: "未来图片模型", Ratio: ratio})
+			if err == nil || !strings.Contains(err.Error(), "必须是整数枚举值") {
+				t.Fatalf("ratio %q: error = %v, want integer enum validation", ratio, err)
+			}
+		})
 	}
 }
 
 func TestValidateOptionsRejectsUnsupportedImageExtension(t *testing.T) {
 	opts := &Options{
 		Prompt:     "x",
-		Model:      "seedream_4.5",
+		Model:      "图片测试模型",
 		ImagePaths: []string{"ref.tiff"},
 	}
 
@@ -128,13 +171,13 @@ func TestBuildSubmitRunBodyWithGeneralAgentSettings(t *testing.T) {
 	count := 2
 	opts := &Options{
 		Prompt:             "  生成小猫海报  ",
-		Model:              " seedream_5.0_pro ",
+		Model:              " Seedream 5.0 Pro ",
 		Ratio:              "6",
 		Resolution:         " 4k ",
 		GenerateImageCount: &count,
 	}
 
-	body := buildSubmitRunBody(opts, []string{"asset_1"})
+	body := buildSubmitRunBody(opts, "seedream_5.0_pro", []string{"asset_1"})
 	if body["agent_name"] != agentNameNest {
 		t.Fatalf("agent_name = %v, want nest agent", body["agent_name"])
 	}

package/internal/models/describe.go

@@ -6,17 +6,15 @@ import (
 	"slices"
 	"strconv"
 	"strings"
-)
 
-// Mirrors capcut_business_common.Ratio and the Skill API's skillVideoRatio.
-// Custom (1) has no corresponding generate-video --ratio value.
-var ratioValues = map[int64]string{
-	0: "adaptive", 1: "", 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",
-}
+	"github.com/Pippit-dev/pippit-cli/internal/common"
+)
 
 type dimensionConfig struct {
 	Key          string  `json:"key"`
+	Label        string  `json:"label"`
+	Description  string  `json:"description"`
+	Required     *bool   `json:"required_field"`
 	DefaultValue *string `json:"default_value"`
 	OptionList   []struct {
 		Value    string `json:"value"`
@@ -36,6 +34,8 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 	var fields map[string]json.RawMessage
 	var source struct {
 		Key       string  `json:"key"`
+		Name      string  `json:"name"`
+		Kind      string  `json:"kind"`
 		Ratios    []int64 `json:"supported_ratio_list"`
 		Default   *int64  `json:"default_ratio"`
 		Parameter struct {
@@ -57,18 +57,27 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 	}
 	delete(out, "config_key")
 	delete(out, "is_default") // A server default does not authorize model selection.
+	if source.Kind == "image" {
+		// Billing maps and other Web-only metadata can contain wire model names.
+		// Keep them in the raw catalog, not in host-facing command output.
+		out = map[string]any{"name": strings.TrimSpace(source.Name), "kind": source.Kind}
+		for _, key := range []string{"description", "parameter_config", "creation_mode_config"} {
+			if value, exists := fields[key]; exists {
+				out[key] = value
+			}
+		}
+	}
 	warnings := []string{}
 	warn := func(message string) { warnings = append(warnings, message) }
-	ratios := make([]string, 0, len(source.Ratios))
+	ratios := make([]any, 0, len(source.Ratios))
 	for _, value := range source.Ratios {
-		// Unknown enums and Custom cannot be submitted as CLI ratio strings.
-		if value := ratioValues[value]; value != "" && !slices.Contains(ratios, value) {
+		if value, ok := cliRatioValue(value, source.Kind); ok && !slices.Contains(ratios, value) {
 			ratios = append(ratios, value)
 		}
 	}
 	ratio := map[string]any{"options": ratios}
 	if source.Default != nil {
-		if value := ratioValues[*source.Default]; value != "" {
+		if value, ok := cliRatioValue(*source.Default, source.Kind); ok {
 			if slices.Contains(ratios, value) {
 				ratio["default"] = value
 			} else {
@@ -84,17 +93,37 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 
 	seen := make(map[string]bool)
 	for _, dimension := range source.Parameter.Dimensions {
-		if dimension == nil || (dimension.Key != "resolution" && dimension.Key != "duration") {
+		if dimension == nil {
+			continue
+		}
+		if source.Kind == "image" {
+			if dimension.Key != "resolution" && dimension.Key != "ratio" && dimension.Key != "effort" {
+				continue
+			}
+		} else if dimension.Key != "resolution" && dimension.Key != "duration" {
 			continue
 		}
 		if seen[dimension.Key] {
 			return nil, fmt.Errorf("模型配置包含重复 %s 维度，请 --refresh 重试", dimension.Key)
 		}
 		seen[dimension.Key] = true
-		out[dimension.Key] = describeDimension(dimension, warn)
+		out[dimension.Key] = describeDimension(dimension, source.Kind, warn)
+	}
+	if source.Kind == "image" {
+		if imageRatio, ok := out["ratio"].(map[string]any); ok {
+			if options, ok := imageRatio["options"].([]any); ok {
+				labels := make(map[string]string, len(options))
+				for _, option := range options {
+					value := option.(int64)
+					labels[strconv.FormatInt(value, 10)] = common.RatioValue(value)
+				}
+				imageRatio["option_labels"] = labels
+			}
+		}
 	}
-	// Keep unrelated parameter dimensions and combination constraints as supplied.
-	if parameterRaw, ok := fields["parameter_config"]; ok && string(parameterRaw) != "null" {
+	// Image dimensions retain their complete source metadata and combination rules.
+	// Video descriptions keep the existing compact representation.
+	if parameterRaw, ok := fields["parameter_config"]; source.Kind != "image" && ok && string(parameterRaw) != "null" {
 		var parameter map[string]json.RawMessage
 		if err := json.Unmarshal(parameterRaw, &parameter); err != nil {
 			return nil, err
@@ -146,7 +175,7 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 	if len(limits) > 0 {
 		out["material_limits"] = limits
 	}
-	if source.Creation != nil {
+	if source.Creation != nil && source.Kind != "image" {
 		modes := make([]map[string]any, 0, len(source.Creation.Modes))
 		for _, rawMode := range source.Creation.Modes {
 			if string(rawMode) == "null" {
@@ -181,7 +210,7 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 			case "", "inherit":
 				entry["ratio"] = ratio
 				if mode.Key == "text_to_video" && (source.Key == "MiniMax-H3" || source.Key == "MiniMax-H3-Max") {
-					fixed := make([]string, 0, len(ratios))
+					fixed := make([]any, 0, len(ratios))
 					for _, value := range ratios {
 						if value != "adaptive" {
 							fixed = append(fixed, value)
@@ -210,7 +239,7 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 		}
 		out["creation_modes"] = modes
 	}
-	if (source.Key == "MiniMax-H3" || source.Key == "MiniMax-H3-Max") && slices.Contains(ratios, "adaptive") {
+	if source.Kind != "image" && (source.Key == "MiniMax-H3" || source.Key == "MiniMax-H3-Max") && slices.Contains(ratios, "adaptive") {
 		out["notes"] = []string{"MiniMax 使用 adaptive 需要参考图片或视频；纯文生视频请选择固定比例。创作模式的比例策略优先于模型级选项。"}
 	}
 	if len(warnings) > 0 {
@@ -219,8 +248,29 @@ func describeModel(raw json.RawMessage) (json.RawMessage, error) {
 	return json.Marshal(out)
 }
 
-func describeDimension(d *dimensionConfig, warn func(string)) map[string]any {
+// Image generation accepts wire enums; video generation accepts ratio strings.
+func cliRatioValue(value int64, kind string) (any, bool) {
+	label := common.RatioValue(value)
+	if label == "" {
+		return nil, false
+	}
+	if kind == "image" {
+		return value, true
+	}
+	return label, true
+}
+
+func describeDimension(d *dimensionConfig, kind string, warn func(string)) map[string]any {
 	out := map[string]any{}
+	if d.Label != "" {
+		out["label"] = d.Label
+	}
+	if d.Description != "" {
+		out["description"] = d.Description
+	}
+	if d.Required != nil {
+		out["required_field"] = *d.Required
+	}
 	if len(d.ActiveWhenAny) > 0 {
 		out["active_when_any"] = d.ActiveWhenAny
 	}
@@ -230,6 +280,16 @@ func describeDimension(d *dimensionConfig, warn func(string)) map[string]any {
 			number, err := strconv.ParseInt(value, 10, 32)
 			return number, err == nil && number > 0
 		}
+		if d.Key == "ratio" {
+			number, err := strconv.ParseInt(value, 10, 64)
+			if err != nil {
+				return nil, false
+			}
+			return cliRatioValue(number, kind)
+		}
+		if kind == "image" && d.Key == "resolution" {
+			return strings.ToUpper(value), value != ""
+		}
 		return strings.ToLower(value), value != ""
 	}
 	if d.Key == "duration" {