@pippit-dev/cli 1.0.48 → 1.0.49

package/README.md

@@ -455,7 +455,7 @@ pippit-tool-cli query-result \
   --download-dir "./output"
 ```
 
-`query-result` 会查询指定 Run 并输出 JSON。Run 成功完成后下载视频和图片产物，`completed=true`，`videos` 和 `images` 中各包含 `download_url` 和 `output_path`；图片扩展名取自产物 `metadata.format`，缺省时兜底 `.png`。Run 失败也视为终态，`completed=true` 且填充 `error_message`；Run 未到终态时 `completed=false`。
+`query-result` 会查询指定 Run 并输出 JSON。Run 成功完成后下载视频和图片产物，`completed=true`、`status="succeeded"`，`videos` 和 `images` 中各包含 `download_url` 和 `output_path`；图片扩展名取自产物 `metadata.format`，缺省时兜底 `.png`。`status` 是机读状态，共 5 种取值：`running`（运行中，对应服务端已提交、处理中、生成中、程序中断等继续轮询的状态）、`succeeded`（成功）、`failed`（失败并填充 `error_message`）、`canceled`（已取消）、`unknown`（未指定、等待补充输入、人工交互中断等无法自动判定的状态）。`completed` 只表示是否到终态（成功、失败、已取消时为 true），判断成功失败请使用 `status`；查询或下载本身失败时 `status="unknown"`、`completed=false`，具体原因见 `error_message`。
 
 ## Adapter 接入边界
 

package/checksums.txt

@@ -1,6 +1,6 @@
-718067da81039c982cdcb9579f50a06a83bbc7c7dd599ab447b50e8b8e2b13ac  pippit-tool-cli-1.0.48-darwin-amd64.tar.gz
-d0aa4e2272c8369fb615b82bbb390a3e575e3b3df39dffbb5d38c6fc8e7d67c3  pippit-tool-cli-1.0.48-darwin-arm64.tar.gz
-838f221cef34481f042a2fec32da0f015d5c61151f43eeb3460ceb94c05601fd  pippit-tool-cli-1.0.48-linux-amd64.tar.gz
-1ff3d84ffe6a04bc6c5ed92d9e784308d8dc16fffc88037faa21665d9a74106c  pippit-tool-cli-1.0.48-linux-arm64.tar.gz
-04400b90e115ba0d9d8e0d6917e8b69cfe980fa5601bd5c9bdb2625135036d5e  pippit-tool-cli-1.0.48-windows-amd64.zip
-e6a2f024b93abcc546007fe1c5e2fcaebed11ab64123943c30dda9f47f8c4b63  pippit-tool-cli-1.0.48-windows-arm64.zip
+5b8a5628d568cef45b662d2e1d9a67da57781cbb4b6fc0d3caa7decafc775a39  pippit-tool-cli-1.0.49-darwin-amd64.tar.gz
+c2c24abe1d53354645e9e4b65c8bdcf22dad8e563e04fbb1fa9ec4599aced2f9  pippit-tool-cli-1.0.49-darwin-arm64.tar.gz
+9e8342eb4142dc874ca0a812e7e453b09db7be24043381149a7b1df2df764496  pippit-tool-cli-1.0.49-linux-amd64.tar.gz
+cccd6a1d4d24e6a5a891dfd0eeb7aea02e5d0fc5a6cb01e936aa1de947a1b5d4  pippit-tool-cli-1.0.49-linux-arm64.tar.gz
+b827be83509691b5509264553fc7aee52931b21524210957c86dad5bf90c0fb0  pippit-tool-cli-1.0.49-windows-amd64.zip
+1b8b36a8ba738cfbbc42ed6418b54c8d0ee4c57b3de0d35afddcf79d54d8dd20  pippit-tool-cli-1.0.49-windows-arm64.zip

package/cmd/generate_video/query_result.go

@@ -26,7 +26,7 @@ func NewQueryResultCommand(stdout, stderr io.Writer, runner *common.Runner) *cob
 					"run_id":       strings.TrimSpace(opts.RunID),
 					"download_dir": strings.TrimSpace(opts.DownloadDir),
 				})
-				result = queryResultFromError(err, opts)
+				result = internalgen.NewQueryResultError(err, opts)
 			}
 			encoder := json.NewEncoder(stdout)
 			encoder.SetIndent("", "  ")
@@ -40,16 +40,3 @@ func NewQueryResultCommand(stdout, stderr io.Writer, runner *common.Runner) *cob
 	cmd.Flags().StringVar(&opts.DownloadDir, "download-dir", "", "directory to download completed videos or images into")
 	return cmd
 }
-
-func queryResultFromError(err error, opts *internalgen.QueryResultOptions) *internalgen.QueryResultResult {
-	result := &internalgen.QueryResultResult{
-		ErrorMessage: err.Error(),
-		Videos:       []internalgen.QueryResultVideo{},
-		Images:       []internalgen.QueryResultImage{},
-	}
-	if opts != nil {
-		result.ThreadID = strings.TrimSpace(opts.ThreadID)
-		result.RunID = strings.TrimSpace(opts.RunID)
-	}
-	return result
-}

package/cmd/generate_video_test.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"net/http"
 	"net/http/httptest"
@@ -496,6 +497,9 @@ func TestQueryResultDownloadsCompletedVideo(t *testing.T) {
 	if got["completed"] != true {
 		t.Fatalf("completed = %v, want true", got["completed"])
 	}
+	if got["status"] != "succeeded" {
+		t.Fatalf("status = %v, want succeeded", got["status"])
+	}
 	if got["thread_id"] != "thread_123" || got["run_id"] != "run_456" {
 		t.Fatalf("ids = (%v, %v), want thread/run ids", got["thread_id"], got["run_id"])
 	}
@@ -600,6 +604,9 @@ func TestQueryResultIgnoresVideoDataWithoutVideoSubType(t *testing.T) {
 	if got["completed"] != false {
 		t.Fatalf("completed = %v, want false", got["completed"])
 	}
+	if got["status"] != "unknown" {
+		t.Fatalf("status = %v, want unknown", got["status"])
+	}
 	if got["thread_id"] != "thread_123" || got["run_id"] != "run_456" {
 		t.Fatalf("ids = (%v, %v), want thread/run ids", got["thread_id"], got["run_id"])
 	}
@@ -628,6 +635,9 @@ func TestQueryResultValidationErrorReturnsJSON(t *testing.T) {
 	if got["completed"] != false {
 		t.Fatalf("completed = %v, want false", got["completed"])
 	}
+	if got["status"] != "unknown" {
+		t.Fatalf("status = %v, want unknown", got["status"])
+	}
 	if got["thread_id"] != "" || got["run_id"] != "run_456" {
 		t.Fatalf("ids = (%v, %v), want empty thread_id and run_id", got["thread_id"], got["run_id"])
 	}
@@ -664,12 +674,15 @@ func TestQueryResultGetThreadBusinessErrorReturnsErrorMessage(t *testing.T) {
 		t.Fatalf("Execute() error = %v, stderr = %s", err, stderr.String())
 	}
 	got := decodeJSON(t, stdout.Bytes())
-	if got["completed"] != true {
-		t.Fatalf("completed = %v, want true", got["completed"])
+	if got["completed"] != false {
+		t.Fatalf("completed = %v, want false", got["completed"])
 	}
 	if got["thread_id"] != "thread_123" || got["run_id"] != "run_456" {
 		t.Fatalf("ids = (%v, %v), want thread/run ids", got["thread_id"], got["run_id"])
 	}
+	if got["status"] != "unknown" {
+		t.Fatalf("status = %v, want unknown", got["status"])
+	}
 	if got["error_message"] != "创作失败：暂时无法生成 log_id=log_456" {
 		t.Fatalf("error_message = %v, want get_thread business error", got["error_message"])
 	}
@@ -706,6 +719,9 @@ func TestQueryResultFailedReturnsErrorMessage(t *testing.T) {
 	if got["completed"] != true {
 		t.Fatalf("completed = %v, want true", got["completed"])
 	}
+	if got["status"] != "failed" {
+		t.Fatalf("status = %v, want failed", got["status"])
+	}
 	if _, ok := got["state"]; ok {
 		t.Fatalf("state should not be returned: %#v", got)
 	}
@@ -745,6 +761,9 @@ func TestQueryResultPendingDoesNotDownload(t *testing.T) {
 	if got["completed"] != false {
 		t.Fatalf("completed = %v, want false", got["completed"])
 	}
+	if got["status"] != "running" {
+		t.Fatalf("status = %v, want running", got["status"])
+	}
 	if _, ok := got["state"]; ok {
 		t.Fatalf("state should not be returned: %#v", got)
 	}
@@ -757,6 +776,58 @@ func TestQueryResultPendingDoesNotDownload(t *testing.T) {
 	}
 }
 
+func TestQueryResultRunStateMapping(t *testing.T) {
+	// state=3 needs artifacts and is covered by the dedicated success tests;
+	// every other state must map deterministically, including unknown values.
+	tests := []struct {
+		state         int
+		wantStatus    string
+		wantCompleted bool
+	}{
+		{0, "unknown", false},
+		{1, "running", false},
+		{2, "running", false},
+		{4, "failed", true},
+		{5, "canceled", true},
+		{6, "unknown", false},
+		{7, "running", false},
+		{8, "running", false},
+		{9, "unknown", false},
+		{99, "unknown", false},
+	}
+	for _, tt := range tests {
+		t.Run(fmt.Sprintf("state=%d", tt.state), func(t *testing.T) {
+			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				if r.URL.Path != "/api/biz/v1/skill/get_thread" {
+					t.Fatalf("unexpected path %s", r.URL.Path)
+				}
+				payload := fmt.Sprintf(`{"ret":"0","data":{"thread":{"thread_id":"thread_123","run_list":[{"run_id":"run_456","state":%d}]}}}`, tt.state)
+				_, _ = w.Write([]byte(payload))
+			}))
+			defer server.Close()
+
+			var stdout, stderr bytes.Buffer
+			root := newTestRootCommand(t, &stdout, &stderr, server.URL)
+			root.SetArgs([]string{
+				"query-result",
+				"--thread-id", "thread_123",
+				"--run-id", "run_456",
+				"--download-dir", t.TempDir(),
+			})
+			if err := root.Execute(); err != nil {
+				t.Fatalf("Execute() error = %v, stderr = %s", err, stderr.String())
+			}
+			got := decodeJSON(t, stdout.Bytes())
+			if got["status"] != tt.wantStatus {
+				t.Fatalf("status = %v, want %s", got["status"], tt.wantStatus)
+			}
+			if got["completed"] != tt.wantCompleted {
+				t.Fatalf("completed = %v, want %v", got["completed"], tt.wantCompleted)
+			}
+		})
+	}
+}
+
 func serverURL(r *http.Request) string {
 	return "http://" + r.Host
 }

package/dist/checksums.txt

@@ -1,6 +1,6 @@
-718067da81039c982cdcb9579f50a06a83bbc7c7dd599ab447b50e8b8e2b13ac  pippit-tool-cli-1.0.48-darwin-amd64.tar.gz
-d0aa4e2272c8369fb615b82bbb390a3e575e3b3df39dffbb5d38c6fc8e7d67c3  pippit-tool-cli-1.0.48-darwin-arm64.tar.gz
-838f221cef34481f042a2fec32da0f015d5c61151f43eeb3460ceb94c05601fd  pippit-tool-cli-1.0.48-linux-amd64.tar.gz
-1ff3d84ffe6a04bc6c5ed92d9e784308d8dc16fffc88037faa21665d9a74106c  pippit-tool-cli-1.0.48-linux-arm64.tar.gz
-04400b90e115ba0d9d8e0d6917e8b69cfe980fa5601bd5c9bdb2625135036d5e  pippit-tool-cli-1.0.48-windows-amd64.zip
-e6a2f024b93abcc546007fe1c5e2fcaebed11ab64123943c30dda9f47f8c4b63  pippit-tool-cli-1.0.48-windows-arm64.zip
+5b8a5628d568cef45b662d2e1d9a67da57781cbb4b6fc0d3caa7decafc775a39  pippit-tool-cli-1.0.49-darwin-amd64.tar.gz
+c2c24abe1d53354645e9e4b65c8bdcf22dad8e563e04fbb1fa9ec4599aced2f9  pippit-tool-cli-1.0.49-darwin-arm64.tar.gz
+9e8342eb4142dc874ca0a812e7e453b09db7be24043381149a7b1df2df764496  pippit-tool-cli-1.0.49-linux-amd64.tar.gz
+cccd6a1d4d24e6a5a891dfd0eeb7aea02e5d0fc5a6cb01e936aa1de947a1b5d4  pippit-tool-cli-1.0.49-linux-arm64.tar.gz
+b827be83509691b5509264553fc7aee52931b21524210957c86dad5bf90c0fb0  pippit-tool-cli-1.0.49-windows-amd64.zip
+1b8b36a8ba738cfbbc42ed6418b54c8d0ee4c57b3de0d35afddcf79d54d8dd20  pippit-tool-cli-1.0.49-windows-arm64.zip

package/internal/generate_video/query_result.go

@@ -14,10 +14,54 @@ import (
 )
 
 const (
-	successRunState = 3
-	failedRunState  = 4
+	successRunState  = 3
+	failedRunState   = 4
+	canceledRunState = 5
 )
 
+// Query-result status values. "completed" stays a terminal flag; "status"
+// carries the machine-readable result so integrators need not parse text.
+const (
+	statusRunning   = "running"
+	statusSucceeded = "succeeded"
+	statusFailed    = "failed"
+	statusCanceled  = "canceled"
+	statusUnknown   = "unknown"
+)
+
+// runStateStatus maps the server-side run state (0-9) to the user-facing
+// status. Any unmapped value falls back to unknown instead of being guessed.
+var runStateStatus = map[int]string{
+	0: statusUnknown, // Unspecified
+	1: statusRunning, // Submitted
+	2: statusRunning, // Working
+	3: statusSucceeded,
+	4: statusFailed,
+	5: statusCanceled,
+	6: statusUnknown, // InputRequired
+	7: statusRunning, // Generating
+	8: statusRunning, // Interrupt
+	9: statusUnknown, // HITL_Interrupt
+}
+
+var terminalRunStates = map[int]struct{}{
+	successRunState:  {},
+	failedRunState:   {},
+	canceledRunState: {},
+}
+
+func statusForRunState(state int) string {
+	if s, ok := runStateStatus[state]; ok {
+		return s
+	}
+	return statusUnknown
+}
+
+func isTerminalRunState(state int) bool {
+	_, ok := terminalRunStates[state]
+	return ok
+}
+
 // QueryResultOptions is the command-facing request shape for query-result.
 type QueryResultOptions struct {
 	ThreadID    string
@@ -27,6 +71,7 @@ type QueryResultOptions struct {
 
 // QueryResultResult describes the user-facing query-result outcome.
 type QueryResultResult struct {
+	Status       string             `json:"status,omitempty"`
 	Completed    bool               `json:"completed"`
 	ThreadID     string             `json:"thread_id"`
 	RunID        string             `json:"run_id"`
@@ -112,10 +157,7 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 		RunID:    opts.RunID,
 	}, runner)
 	if err != nil {
-		if result, ok := queryResultFromGetThreadBusinessError(err, opts); ok {
-			return result, nil
-		}
-		return nil, fmt.Errorf("查询失败：%w", err)
+		return nil, queryResultQueryError(err)
 	}
 
 	thread, err := parseQueryThread(threadResult)
@@ -129,7 +171,8 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 	}
 	if run.State != successRunState {
 		result := &QueryResultResult{
-			Completed: run.State == failedRunState,
+			Status:    statusForRunState(run.State),
+			Completed: isTerminalRunState(run.State),
 			ThreadID:  firstNonEmpty(thread.ThreadID, opts.ThreadID),
 			RunID:     opts.RunID,
 			Videos:    []QueryResultVideo{},
@@ -209,6 +252,7 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 	}
 
 	return &QueryResultResult{
+		Status:    statusSucceeded,
 		Completed: true,
 		ThreadID:  firstNonEmpty(thread.ThreadID, opts.ThreadID),
 		RunID:     opts.RunID,
@@ -217,26 +261,39 @@ func QueryResult(ctx context.Context, opts *QueryResultOptions, runner *common.R
 	}, nil
 }
 
-func queryResultFromGetThreadBusinessError(err error, opts *QueryResultOptions) (*QueryResultResult, bool) {
+// queryResultQueryError converts a get_thread failure into a Go error while
+// keeping a clean, customer-facing message. The command layer maps it to
+// status=unknown; the technical envelope stays in the local error log.
+func queryResultQueryError(err error) error {
 	var logErr *common.LogIDError
-	if !errors.As(err, &logErr) {
-		return nil, false
-	}
-	message := getThreadBusinessErrorMessage(logErr.Message)
-	if message == "" {
-		message = "查询失败"
-	}
-	if logID := logErr.LogID(); logID != "" {
-		message = fmt.Sprintf("%s log_id=%s", message, logID)
+	if errors.As(err, &logErr) {
+		message := getThreadBusinessErrorMessage(logErr.Message)
+		if message == "" {
+			message = "查询失败"
+		}
+		if logID := logErr.LogID(); logID != "" {
+			return fmt.Errorf("%s log_id=%s", message, logID)
+		}
+		return fmt.Errorf("%s", message)
 	}
-	return &QueryResultResult{
-		Completed:    true,
-		ThreadID:     opts.ThreadID,
-		RunID:        opts.RunID,
-		ErrorMessage: message,
+	return fmt.Errorf("查询失败：%w", err)
+}
+
+// NewQueryResultError builds the user-facing result for a failed query. A
+// failed call never produces a run status, so it reports unknown rather than
+// guessing; the concrete cause stays in error_message.
+func NewQueryResultError(err error, opts *QueryResultOptions) *QueryResultResult {
+	result := &QueryResultResult{
+		Status:       statusUnknown,
+		ErrorMessage: err.Error(),
 		Videos:       []QueryResultVideo{},
 		Images:       []QueryResultImage{},
-	}, true
+	}
+	if opts != nil {
+		result.ThreadID = strings.TrimSpace(opts.ThreadID)
+		result.RunID = strings.TrimSpace(opts.RunID)
+	}
+	return result
 }
 
 func getThreadBusinessErrorMessage(message string) string {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"