@pippit-dev/cli 1.0.45 → 1.0.47

package/README.md

@@ -149,6 +149,12 @@ pippit-tool-cli --version
 4. 验证通过后，在 GitHub Actions 的 `Promote canary to latest` workflow 中点击 `Run workflow`，填写已验证的 `X.Y.Z`。该 workflow 须先合入默认分支才会显示手动入口，并复用仓库已有的 `NPM_TOKEN`。
 5. 提升流程要求输入版本与当前 `canary` 一致，只移动 npm `latest` 指针并回读确认，不重新构建或发布 npm 包。如果 canary 已更新，需要验证新的候选版本后再提升。
 
+GitHub Release 已成功、npm 发布失败时的补发步骤：
+
+1. 在 GitHub Actions 选择 `Republish npm from Release`，点击 `Run workflow`，填写已有的 `vX.Y.Z` tag。该 workflow 须先合入默认分支，复用已有 `NPM_TOKEN`。
+2. 流程检出指定 tag，校验源码版本、已发布的六个平台产物及 `checksums.txt`，复用这些二进制，只准备并发布 npm canary，不运行 GoReleaser。
+3. 目标必须高于当前 latest 和 canary，且 npm 上尚无该版本；发布前查询异常会停止。npm 接收发布后可能暂时返回 404，流程会有上限地重试读取版本与渠道，确认 canary 指向目标版本、latest 保持原值。回读超时只表示结果尚未确认，先核实 npm 实际处理状态，不连续重复发布，也不删除已有 Release 或重打 tag。
+
 维护者回滚步骤：
 
 1. 在 [GitHub Actions](https://github.com/Pippit-dev/cli/actions) 选择 `Rollback CLI`，点击 `Run workflow`。该 workflow 须先合入默认分支；复用 `NPM_TOKEN` 修改 npm 标签，使用只读 `GITHUB_TOKEN` 检查 Release。
@@ -157,7 +163,7 @@ pippit-tool-cli --version
 4. 写入前再次核对当前渠道，随后只移动所选 npm 标签并回读确认。不会重新构建、发包、修改 Git tag 或改变另一渠道。Actions 日志和运行摘要会记录目标及确认结果；写入或回读失败时，先用 `npm view @pippit-dev/cli dist-tags --prefer-online` 核实实际状态，再决定是否重试。
 5. 已安装问题版本的用户需要主动执行 `pippit-tool-cli update --channel stable`（回滚 canary 时使用 `--channel canary`）并核对 `pippit-tool-cli --version`。旧 CLI 可执行默认 `update` 获取 `latest`，但须确保未设置 `PIPPIT_CLI_INSTALL_PACKAGE` 覆盖变量。已运行的进程及 Skill 独立缓存中的 CLI 不会被渠道回滚自动替换。
 
-发布、提升和回滚共用并发组，避免这些 workflow 同时修改渠道；不取消正在运行的任务。GitHub 默认只保留一个等待中的同组任务，连续触发时请检查是否有等待任务被替换。并发组不能锁住维护者在终端执行的 npm 写入，操作期间应避免其它渠道修改。此阶段不提供百分比放量或自动回滚，普通客户端也不会因指针变化而自动安装；显式指定问题版本的安装仍然可用。
+发布、补发、提升和回滚共用并发组，避免这些 workflow 同时修改渠道；不取消正在运行的任务。GitHub 默认只保留一个等待中的同组任务，连续触发时请检查是否有等待任务被替换。并发组不能锁住维护者在终端执行的 npm 写入，操作期间应避免其它渠道修改。此阶段不提供百分比放量或自动回滚，普通客户端也不会因指针变化而自动安装；显式指定问题版本的安装仍然可用。
 
 ## 短剧工作流技能
 

package/checksums.txt

@@ -1,6 +1,6 @@
-3802437e93dcd395df47e4e735a8a4b958528f76ea64d672cd3fa3cb719fd163  pippit-tool-cli-1.0.45-darwin-amd64.tar.gz
-b80b030e77b0fbdffb0b05c8a38fdc5c939d01ca69cb1ab6d2c0bd0c1e236892  pippit-tool-cli-1.0.45-darwin-arm64.tar.gz
-33095e1ceec2220ea1b79abfa56948dd5d237c1831ab2437c8af064d00db7c99  pippit-tool-cli-1.0.45-linux-amd64.tar.gz
-85a91aeae7b9ea1324a8aee1be576fad12297cecdfe2828851147d50f4dbc177  pippit-tool-cli-1.0.45-linux-arm64.tar.gz
-e93240dbc814104ea278197aff983c2491089be1b9fe55f216007b1a612c7f93  pippit-tool-cli-1.0.45-windows-amd64.zip
-d5f196ea5b5f466911573a1177702ad00f27da153d2f29b5b1e65cd60f7f5100  pippit-tool-cli-1.0.45-windows-arm64.zip
+966d956f11b6922cd1112cc8e969578d7faaa093150676dc8fbcad1988ec185e  pippit-tool-cli-1.0.47-darwin-amd64.tar.gz
+5bf74cd01214b76bc046c090e5dcdb8cccde9ac0af8ca1bcb9a01f45b7d7377f  pippit-tool-cli-1.0.47-darwin-arm64.tar.gz
+e043d77d2c7869b245081179abce175d9bd42608a3549205c143e7bc9aef76db  pippit-tool-cli-1.0.47-linux-amd64.tar.gz
+3a1bd95631363c4702004da2b823ae34baf37576324eca5501d9e832ba8773cc  pippit-tool-cli-1.0.47-linux-arm64.tar.gz
+3e0a59ff3f467ec1318c128d97fc33ec952b26715c4053c5abae27ee365f6f1d  pippit-tool-cli-1.0.47-windows-amd64.zip
+cbab4b7a34567a30b08abf2b2856958d0813aca6515b1a8edcead5939b47610c  pippit-tool-cli-1.0.47-windows-arm64.zip

package/cmd/generate_video_test.go

@@ -8,14 +8,18 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sync/atomic"
 	"testing"
 
 	"github.com/bytedance/sonic"
 )
 
 func TestGenerateVideo(t *testing.T) {
-	assetIDs := []string{"image_asset_1", "image_asset_2", "video_asset_1", "video_asset_2", "audio_asset_1"}
-	uploadIndex := 0
+	assetIDs := map[string]string{
+		"cat1.jpg": "image_asset_1", "cat2.jpg": "image_asset_2",
+		"video1.mp4": "video_asset_1", "video2.mp4": "video_asset_2", "bgm.wav": "audio_asset_1",
+	}
+	var uploadCount atomic.Int32
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Header.Get("Authorization") != "Bearer test-token" {
@@ -26,9 +30,6 @@ func TestGenerateVideo(t *testing.T) {
 			if r.Method != http.MethodPost {
 				t.Fatalf("upload method = %s, want POST", r.Method)
 			}
-			if uploadIndex >= len(assetIDs) {
-				t.Fatalf("unexpected upload %d", uploadIndex)
-			}
 			if err := r.ParseMultipartForm(1 << 20); err != nil {
 				t.Fatalf("ParseMultipartForm(): %v", err)
 			}
@@ -39,11 +40,15 @@ func TestGenerateVideo(t *testing.T) {
 			if files[0].Filename == "bgm.wav" && !strings.HasPrefix(files[0].Header.Get("Content-Type"), "audio/") {
 				t.Fatalf("audio content type = %q, want audio content type", files[0].Header.Get("Content-Type"))
 			}
-			uploadIndex++
-			_, _ = w.Write([]byte(`{"ret":"0","errmsg":"","data":{"pippit_asset_id":"` + assetIDs[uploadIndex-1] + `"}}`))
+			assetID, ok := assetIDs[files[0].Filename]
+			if !ok {
+				t.Errorf("unexpected upload %q", files[0].Filename)
+			}
+			uploadCount.Add(1)
+			_, _ = w.Write([]byte(`{"ret":"0","errmsg":"","data":{"pippit_asset_id":"` + assetID + `"}}`))
 		case "/api/biz/v1/skill/submit_run":
-			if uploadIndex != len(assetIDs) {
-				t.Fatalf("submit called after %d uploads, want %d", uploadIndex, len(assetIDs))
+			if got := uploadCount.Load(); int(got) != len(assetIDs) {
+				t.Fatalf("submit called after %d uploads, want %d", got, len(assetIDs))
 			}
 			data, err := io.ReadAll(r.Body)
 			if err != nil {
@@ -288,19 +293,24 @@ func TestGenerateVideoAcceptsReferencesBeyondFormerLimits(t *testing.T) {
 		}
 	}
 
-	uploadIndex := 0
+	var uploadCount atomic.Int32
 	submitted := false
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/api/biz/v1/skill/upload_file":
-			if uploadIndex >= len(assetIDs) {
-				t.Fatalf("unexpected upload %d", uploadIndex)
-			}
-			_, _ = w.Write([]byte(`{"ret":"0","data":{"pippit_asset_id":"` + assetIDs[uploadIndex] + `"}}`))
-			uploadIndex++
+			file, header, err := r.FormFile("file")
+			if err != nil {
+				t.Errorf("FormFile(): %v", err)
+				http.Error(w, "invalid upload", http.StatusBadRequest)
+				return
+			}
+			file.Close()
+			defer r.MultipartForm.RemoveAll()
+			uploadCount.Add(1)
+			_, _ = w.Write([]byte(`{"ret":"0","data":{"pippit_asset_id":"` + header.Filename + `"}}`))
 		case "/api/biz/v1/skill/submit_run":
-			if uploadIndex != len(assetIDs) {
-				t.Fatalf("uploaded %d references, want %d", uploadIndex, len(assetIDs))
+			if got := uploadCount.Load(); int(got) != len(assetIDs) {
+				t.Fatalf("uploaded %d references, want %d", got, len(assetIDs))
 			}
 			data, err := io.ReadAll(r.Body)
 			if err != nil {

package/cmd/media_upload_test.go

@@ -0,0 +1,132 @@
+package cmd
+
+import (
+	"bytes"
+	"errors"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"testing"
+
+	"github.com/Pippit-dev/pippit-cli/internal/common"
+	"github.com/Pippit-dev/pippit-cli/internal/config"
+)
+
+func TestGenerationCollectsUploadFailuresBeforeReturning(t *testing.T) {
+	for _, command := range []string{"generate-image", "generate-video"} {
+		t.Run(command, func(t *testing.T) {
+			t.Setenv("HOME", t.TempDir())
+			t.Setenv("XDG_CACHE_HOME", t.TempDir())
+			t.Setenv("LocalAppData", t.TempDir())
+			type material struct {
+				flag, name, failure string
+				missing             bool
+			}
+			materials := []material{
+				{flag: "image", name: "rejected-a.jpg", failure: `第1张参考图片 "rejected-a.jpg" 上传失败: 上传文件请求返回失败: ret=1 errmsg=图片不符合社区规范 log_id=log-rejected-a.jpg`},
+				{flag: "image", name: "accepted.jpg"},
+				{flag: "image", name: "rejected-b.jpg", failure: `第3张参考图片 "rejected-b.jpg" 上传失败: 上传文件请求返回失败: ret=1 errmsg=图片不符合社区规范 log_id=log-rejected-b.jpg`},
+			}
+			if command == "generate-video" {
+				materials = append(materials,
+					material{flag: "video", name: "rejected.mp4", failure: `第1个参考视频 "rejected.mp4" 上传失败: 上传文件请求返回失败: ret=1 errmsg=视频不符合社区规范 log_id=log-rejected.mp4`},
+					material{flag: "video", name: "accepted.mp4"},
+					material{flag: "audio", name: "missing.wav", missing: true, failure: `第1段参考音频 "missing.wav" 上传失败: 上传文件不存在:`},
+					material{flag: "audio", name: "unavailable.wav", failure: `第2段参考音频 "unavailable.wav" 上传失败: 上传文件请求返回失败: ret=1 errmsg=服务暂不可用 log_id=log-unavailable.wav`},
+				)
+			}
+			args := []string{command, "--prompt", "test"}
+			if command == "generate-image" {
+				args = append(args, "--model", "Seedream 5.0 Pro")
+			}
+			dir := t.TempDir()
+			for _, item := range materials {
+				path := filepath.Join(dir, item.name)
+				if !item.missing {
+					if err := os.WriteFile(path, []byte("media"), 0600); err != nil {
+						t.Fatal(err)
+					}
+				}
+				args = append(args, "--"+item.flag, path)
+			}
+			var mu sync.Mutex
+			seen := make(map[string]int)
+			var submits atomic.Int32
+			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.UploadFilePath:
+					file, header, err := r.FormFile("file")
+					if err != nil {
+						t.Errorf("FormFile(): %v", err)
+						http.Error(w, "invalid upload", http.StatusBadRequest)
+						return
+					}
+					file.Close()
+					defer r.MultipartForm.RemoveAll()
+					mu.Lock()
+					seen[header.Filename]++
+					mu.Unlock()
+					switch {
+					case strings.HasPrefix(header.Filename, "accepted"):
+						fmt.Fprintf(w, `{"ret":"0","data":{"pippit_asset_id":%q}}`, header.Filename)
+					case header.Filename == "unavailable.wav":
+						fmt.Fprintf(w, `{"ret":"1","errmsg":"服务暂不可用","log_id":%q}`, "log-"+header.Filename)
+					default:
+						reason := "图片不符合社区规范"
+						if strings.HasSuffix(header.Filename, ".mp4") {
+							reason = "视频不符合社区规范"
+						}
+						fmt.Fprintf(w, `{"ret":"1","errmsg":%q,"log_id":%q}`, reason, "log-"+header.Filename)
+					}
+				case config.SubmitRunPath:
+					submits.Add(1)
+					http.Error(w, "must not submit", http.StatusInternalServerError)
+				default:
+					t.Errorf("unexpected request %s", r.URL.Path)
+					http.NotFound(w, r)
+				}
+			}))
+			defer server.Close()
+			var stdout, stderr bytes.Buffer
+			root := newTestRootCommand(t, &stdout, &stderr, server.URL)
+			root.SetArgs(args)
+			err := root.Execute()
+			if err == nil || !strings.Contains(err.Error(), "未提交生成") {
+				t.Fatalf("error = %v, want upload failure summary", err)
+			}
+			var logErr *common.LogIDError
+			if !errors.As(err, &logErr) || logErr.LogID() != "log-rejected-a.jpg" {
+				t.Errorf("aggregated error lost the original LogID error chain: %v", err)
+			}
+			lastPosition := -1
+			mu.Lock()
+			defer mu.Unlock()
+			for _, item := range materials {
+				wantRequests := 1
+				if item.missing {
+					wantRequests = 0
+				}
+				if seen[item.name] != wantRequests {
+					t.Errorf("%s uploaded %d times, want %d", item.name, seen[item.name], wantRequests)
+				}
+				if item.failure != "" {
+					position := strings.Index(err.Error(), item.failure)
+					if position <= lastPosition {
+						t.Errorf("failure missing or out of order: %s; error: %v", item.failure, err)
+					}
+					lastPosition = position
+				}
+			}
+			if submits.Load() != 0 || stdout.Len() != 0 {
+				t.Fatalf("failed uploads created a task: submits=%d stdout=%s", submits.Load(), stdout.String())
+			}
+		})
+	}
+}

package/dist/checksums.txt

@@ -1,6 +1,6 @@
-3802437e93dcd395df47e4e735a8a4b958528f76ea64d672cd3fa3cb719fd163  pippit-tool-cli-1.0.45-darwin-amd64.tar.gz
-b80b030e77b0fbdffb0b05c8a38fdc5c939d01ca69cb1ab6d2c0bd0c1e236892  pippit-tool-cli-1.0.45-darwin-arm64.tar.gz
-33095e1ceec2220ea1b79abfa56948dd5d237c1831ab2437c8af064d00db7c99  pippit-tool-cli-1.0.45-linux-amd64.tar.gz
-85a91aeae7b9ea1324a8aee1be576fad12297cecdfe2828851147d50f4dbc177  pippit-tool-cli-1.0.45-linux-arm64.tar.gz
-e93240dbc814104ea278197aff983c2491089be1b9fe55f216007b1a612c7f93  pippit-tool-cli-1.0.45-windows-amd64.zip
-d5f196ea5b5f466911573a1177702ad00f27da153d2f29b5b1e65cd60f7f5100  pippit-tool-cli-1.0.45-windows-arm64.zip
+966d956f11b6922cd1112cc8e969578d7faaa093150676dc8fbcad1988ec185e  pippit-tool-cli-1.0.47-darwin-amd64.tar.gz
+5bf74cd01214b76bc046c090e5dcdb8cccde9ac0af8ca1bcb9a01f45b7d7377f  pippit-tool-cli-1.0.47-darwin-arm64.tar.gz
+e043d77d2c7869b245081179abce175d9bd42608a3549205c143e7bc9aef76db  pippit-tool-cli-1.0.47-linux-amd64.tar.gz
+3a1bd95631363c4702004da2b823ae34baf37576324eca5501d9e832ba8773cc  pippit-tool-cli-1.0.47-linux-arm64.tar.gz
+3e0a59ff3f467ec1318c128d97fc33ec952b26715c4053c5abae27ee365f6f1d  pippit-tool-cli-1.0.47-windows-amd64.zip
+cbab4b7a34567a30b08abf2b2856958d0813aca6515b1a8edcead5939b47610c  pippit-tool-cli-1.0.47-windows-arm64.zip