@pippit-dev/cli 1.0.16 → 1.0.18

package/internal/common/client_test.go

@@ -0,0 +1,213 @@
+package common
+
+import (
+	"context"
+	"net/http"
+	"net/http/httptest"
+	"net/url"
+	"os"
+	"path/filepath"
+	"strings"
+	"sync/atomic"
+	"testing"
+	"time"
+)
+
+type observedHeaders struct {
+	authorization string
+}
+
+func TestHTTPClientScopesCredentialsToBaseOrigin(t *testing.T) {
+	apiHeaders := make(chan observedHeaders, 1)
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		apiHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer api.Close()
+
+	thirdPartyHeaders := make(chan observedHeaders, 1)
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		thirdPartyHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer thirdParty.Close()
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("secret-ak"),
+	)
+	if err := client.SendRequest(context.Background(), "/api/test", nil, nil); err != nil {
+		t.Fatalf("same-origin SendRequest() error = %v", err)
+	}
+	gotAPI := <-apiHeaders
+	if gotAPI.authorization != "Bearer secret-ak" {
+		t.Fatalf("same-origin Authorization = %q", gotAPI.authorization)
+	}
+
+	thirdPartyURL := thirdParty.URL + "/asset.mp4"
+	err := client.SendRequestWithHeaders(context.Background(), thirdPartyURL, nil, map[string]string{
+		"Authorization": "Bearer caller-supplied",
+	}, nil)
+	if err != nil {
+		t.Fatalf("third-party SendRequest() error = %v", err)
+	}
+	gotThirdParty := <-thirdPartyHeaders
+	if gotThirdParty != (observedHeaders{}) {
+		t.Fatalf("third-party sensitive headers leaked: %#v", gotThirdParty)
+	}
+}
+
+func TestHTTPClientTreatsSameOriginAbsoluteURLAsAPI(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(
+		server.URL+"/base-path",
+		time.Second,
+		NewAccessKeyAuthorizer("same-origin-ak"),
+	)
+	if err := client.SendRequest(context.Background(), server.URL+"/api/absolute", nil, nil); err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer same-origin-ak" {
+		t.Fatalf("same-origin absolute headers = %#v", got)
+	}
+}
+
+func TestHTTPClientRejectsAPICrossOriginRedirectBeforeSendingBody(t *testing.T) {
+	var thirdPartyRequests atomic.Int32
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		thirdPartyRequests.Add(1)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer thirdParty.Close()
+
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		http.Redirect(w, r, thirdParty.URL+"/redirected-asset", http.StatusTemporaryRedirect)
+	}))
+	defer api.Close()
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("redirect-ak"),
+	)
+	err := client.SendRequest(context.Background(), "/api/redirect", map[string]string{"canvas": "private"}, nil)
+	if err == nil || !strings.Contains(err.Error(), "拒绝 Pippit API 跨域重定向") {
+		t.Fatalf("SendRequest() error = %v, want cross-origin redirect rejection", err)
+	}
+	if got := thirdPartyRequests.Load(); got != 0 {
+		t.Fatalf("third party received %d API redirect requests, want 0", got)
+	}
+}
+
+func TestHTTPClientDoesNotRestoreAuthorizationAfterCrossOriginRedirect(t *testing.T) {
+	finalHeaders := make(chan observedHeaders, 1)
+	var apiURL string
+	thirdParty := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if got := captureRoutingHeaders(r); got != (observedHeaders{}) {
+			t.Errorf("cross-origin hop leaked protected headers: %#v", got)
+		}
+		http.Redirect(w, r, apiURL+"/final", http.StatusFound)
+	}))
+	defer thirdParty.Close()
+
+	api := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		finalHeaders <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer api.Close()
+	apiURL = api.URL
+
+	client := NewHTTPClient(
+		api.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("redirect-bounce-ak"),
+	)
+	if err := client.SendRequest(context.Background(), thirdParty.URL+"/bounce", nil, nil); err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	if got := <-finalHeaders; got != (observedHeaders{}) {
+		t.Fatalf("trusted return hop restored protected headers: %#v", got)
+	}
+}
+
+func TestHTTPClientPreventsCallerAuthorizationOverride(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	client := NewHTTPClient(
+		server.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("production-ak"),
+	)
+	err := client.SendRequestWithHeaders(context.Background(), "/api/test", nil, map[string]string{
+		"Authorization": "Bearer caller-override",
+	}, nil)
+	if err != nil {
+		t.Fatalf("SendRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer production-ak" {
+		t.Fatalf("protected headers = %#v", got)
+	}
+}
+
+func TestHTTPClientMultipartRequestInjectsOnlyAuthorization(t *testing.T) {
+	headers := make(chan observedHeaders, 1)
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		headers <- captureRoutingHeaders(r)
+		_, _ = w.Write([]byte(`{}`))
+	}))
+	defer server.Close()
+
+	filePath := filepath.Join(t.TempDir(), "sample.txt")
+	if err := os.WriteFile(filePath, []byte("sample"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	client := NewHTTPClient(
+		server.URL,
+		time.Second,
+		NewAccessKeyAuthorizer("upload-ak"),
+	)
+	err := client.SendMultipartRequest(context.Background(), "/api/upload", nil, MultipartFile{
+		FieldName: "file",
+		Path:      filePath,
+	}, nil)
+	if err != nil {
+		t.Fatalf("SendMultipartRequest() error = %v", err)
+	}
+	got := <-headers
+	if got.authorization != "Bearer upload-ak" {
+		t.Fatalf("multipart headers = %#v", got)
+	}
+}
+
+func TestSameOriginUsesEffectiveDefaultPorts(t *testing.T) {
+	httpsDefault, _ := url.Parse("https://xyq.jianying.com/api")
+	httpsExplicit, _ := url.Parse("https://XYQ.JIANYING.COM:443/asset")
+	if !sameOrigin(httpsDefault, httpsExplicit) {
+		t.Fatal("sameOrigin() = false for equivalent HTTPS origins")
+	}
+
+	differentPort, _ := url.Parse("https://xyq.jianying.com:8443/api")
+	if sameOrigin(httpsDefault, differentPort) {
+		t.Fatal("sameOrigin() = true for different ports")
+	}
+}
+
+func captureRoutingHeaders(r *http.Request) observedHeaders {
+	return observedHeaders{
+		authorization: r.Header.Get("Authorization"),
+	}
+}

package/internal/common/runner.go

@@ -1,13 +1,28 @@
 package common
 
 import (
+	"context"
+
+	"github.com/Pippit-dev/pippit-cli/internal/auth"
 	"github.com/Pippit-dev/pippit-cli/internal/config"
 )
 
+// AuthManager is the credential boundary shared by native CLI commands. It
+// resolves explicit CI credentials first and browser-managed credentials
+// second, without exposing either value to command output.
+type AuthManager interface {
+	ResolveAccessKey(context.Context) (string, error)
+	Login(context.Context, auth.LoginOptions) (*auth.Credential, error)
+	Status(context.Context) (*auth.Status, error)
+	Logout(context.Context, bool) error
+	CredentialScope(context.Context) (string, error)
+}
+
 // Runner carries runtime dependencies for command execution.
 type Runner struct {
 	Config *config.Config
 	Client Client
+	Auth   AuthManager
 }
 
 func NewRunner(cfg *config.Config, client Client) *Runner {

package/internal/config/config.go

@@ -10,8 +10,6 @@ const (
 	DefaultBaseURL              = "https://xyq.jianying.com"
 	DefaultHTTPTimeout          = 30 * time.Minute
 	DefaultAuthTTL              = 30 * time.Second
-	DefaultOAuthClientKey       = "mock-cli"
-	DefaultOAuthBaseURL         = "https://passport.bytedance.com"
 	DefaultAuthStoreServiceName = "pippit-cli"
 	SubmitRunPath               = "/api/biz/v1/skill/submit_run"
 	GetThreadPath               = "/api/biz/v1/skill/get_thread"
@@ -27,17 +25,9 @@ type Config struct {
 	HTTPTimeout time.Duration
 	AuthTTL     time.Duration
 	AccessKey   string
-	OAuth       *OAuth
 	Paths       *Paths
 }
 
-type OAuth struct {
-	ClientKey        string
-	BaseURL          string
-	StoreServiceName string
-	Scopes           []string
-}
-
 type Paths struct {
 	SubmitRun      string
 	GetThread      string
@@ -52,7 +42,6 @@ func Load() *Config {
 		HTTPTimeout: DefaultHTTPTimeout,
 		AuthTTL:     DefaultAuthTTL,
 		AccessKey:   strings.TrimSpace(os.Getenv(EnvXYQAccessKey)),
-		OAuth:       resolveOAuth(),
 		Paths: &Paths{
 			SubmitRun:      SubmitRunPath,
 			GetThread:      GetThreadPath,
@@ -61,12 +50,3 @@ func Load() *Config {
 		},
 	}
 }
-
-func resolveOAuth() *OAuth {
-	return &OAuth{
-		ClientKey:        DefaultOAuthClientKey,
-		BaseURL:          DefaultOAuthBaseURL,
-		StoreServiceName: DefaultAuthStoreServiceName,
-		Scopes:           []string{"user_info", "aigc_generate"},
-	}
-}

package/internal/config/config_test.go

@@ -17,24 +17,6 @@ func TestLoadUsesDefaultConfig(t *testing.T) {
 	if cfg.AccessKey != "" {
 		t.Fatalf("AccessKey = %q, want empty", cfg.AccessKey)
 	}
-	if cfg.OAuth.ClientKey != DefaultOAuthClientKey {
-		t.Fatalf("OAuth.ClientKey = %q, want %q", cfg.OAuth.ClientKey, DefaultOAuthClientKey)
-	}
-	if cfg.OAuth.StoreServiceName != DefaultAuthStoreServiceName {
-		t.Fatalf("OAuth.StoreServiceName = %q, want %q", cfg.OAuth.StoreServiceName, DefaultAuthStoreServiceName)
-	}
-	if cfg.OAuth.BaseURL != DefaultOAuthBaseURL {
-		t.Fatalf("OAuth.BaseURL = %q, want %q", cfg.OAuth.BaseURL, DefaultOAuthBaseURL)
-	}
-	wantScopes := []string{"user_info", "aigc_generate"}
-	if len(cfg.OAuth.Scopes) != len(wantScopes) {
-		t.Fatalf("OAuth.Scopes = %#v, want %#v", cfg.OAuth.Scopes, wantScopes)
-	}
-	for i := range wantScopes {
-		if cfg.OAuth.Scopes[i] != wantScopes[i] {
-			t.Fatalf("OAuth.Scopes = %#v, want %#v", cfg.OAuth.Scopes, wantScopes)
-		}
-	}
 	if cfg.Paths.SubmitRun != SubmitRunPath {
 		t.Fatalf("SubmitRun path = %q, want %q", cfg.Paths.SubmitRun, SubmitRunPath)
 	}

package/package.json

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

package/skills/short-drama/SKILL.md

@@ -86,14 +86,14 @@ metadata:
 npx @pippit-dev/cli@latest install
 ```
 
-部分功能需要先配置 `XYQ_ACCESS_KEY`。缺失时 CLI 会直接提示用户先创建 Access Key，此时请等待用户给与Access Key后再继续运行。
-
-Access Key 创建地址：https://xyq.jianying.com/home?tab_name=home
+首次使用原生 CLI 时运行网页登录；CLI 会自动申请或复用本机专属凭证，并保存到系统安全凭证库，不要求用户复制 Access Key：
 
 ```bash
-export XYQ_ACCESS_KEY="<access-key>"
+pippit-tool-cli login
 ```
 
+`XYQ_ACCESS_KEY` 仅保留给 CI、Agent 等非交互环境作为显式覆盖。若该环境变量已设置但无效，CLI 不会静默改用个人网页登录凭证；应先修正或取消该环境变量。
+
 ## 小云雀界面打开契约
 
 `+submit-run` 返回 `web_thread_link` 后，用户侧 Agent 必须优先把小云雀短剧 WebUI 打开给用户，而不是只展示链接。

package/skills/xyq-nest-skill/SKILL.md

@@ -71,7 +71,7 @@ pippit-tool-cli query-result \
 满足任一条件时，必须直接使用 `pippit-tool-cli generate-video`，不要改走 `submit_run.py`：
 
 - 用户明确说“视频模型直出”、“直接调模型”或“直接调用 CLI”。
-- 用户指定了具体视频模型（如 Seedance），并希望单次直接生成视频。
+- 用户指定了具体视频模型（如 `Seedance_2.5`），并希望单次直接生成视频。
 - 用户明确要求“首尾帧生视频”、指定首帧和尾帧，或要求从第一张图过渡到第二张图。
 - 上游流程已明确将任务标记为 direct-model / 模型直出。
 
@@ -81,12 +81,13 @@ pippit-tool-cli query-result \
 2. 真实提交会消耗 credits；如果用户本轮尚未明确确认生成，按“用户确认与反问”规则征得明确确认后再运行。
 3. 保留用户原始 prompt，不要自行扩写、润色、翻译或增加风格词。
 4. 只添加用户已经给出的 `--model`、`--duration`、`--ratio`、`--resolution`、`--image`、`--video`、`--audio`、`--generate-type` 参数；未给参数交给 CLI 默认值。
-5. 首尾帧请求固定传 `--generate-type 1`，并按首帧、尾帧顺序传入两次 `--image`，不得重排。用户未明确两张图片的角色或缺少任一张时，先询问用户；不要在 skill 侧维护额外的 `generate_type` 枚举 allowlist，其他值原样交给服务端处理。
-6. `generate-video` 返回后，保存 `thread_id`、`run_id`，并立即向用户展示 `web_thread_link`。
-7. 每隔 10 秒调用 `query-result`，直到 `completed=true`。出现 `error_message` 时停止并报告；成功时展示并下载 `videos[].output_path`。
+5. 普通用户支持模型 `Seedance_2.0_mini_lite`；VIP 专属模型包括 `seedance2.0_vision`、`seedance2.0_fast_vision`、`Seedance_2.0_mini` 和 `Seedance_2.5`。该列表仅用于指导用户选择和传入准确的 `--model` 值，不要在 skill 侧增加模型枚举校验，实际合法性由服务端决定。
+6. 首尾帧请求固定传 `--generate-type 1`，并按首帧、尾帧顺序传入两次 `--image`，不得重排。用户未明确两张图片的角色或缺少任一张时，先询问用户；不要在 skill 侧维护额外的 `generate_type` 枚举 allowlist，其他值原样交给服务端处理。
+7. `generate-video` 返回后，保存 `thread_id`、`run_id`，并立即向用户展示 `web_thread_link`。
+8. 每隔 10 秒调用 `query-result`，直到 `completed=true`。出现 `error_message` 时停止并报告；成功时展示并下载 `videos[].output_path`。
 
 ```bash
-pippit-tool-cli generate-video --prompt "用户原始描述"
+pippit-tool-cli generate-video --prompt "用户原始描述" --model "Seedance_2.5"
 
 pippit-tool-cli generate-video \
   --prompt "用户原始描述" \
@@ -165,6 +166,16 @@ pippit-tool-cli query-result \
 
 ## 前置要求
 
+图片/视频模型直出和视频处理（路由 A/B/C）使用原生 CLI。首次使用时运行网页登录，CLI 会自动申请或复用本机专属凭证，并保存到系统安全凭证库：
+
+```bash
+pippit-tool-cli login
+```
+
+`XYQ_ACCESS_KEY` 仅作为原生 CLI 在 CI、Agent 等非交互环境中的显式覆盖。如果该环境变量已经设置但无效，CLI 不会静默改用网页登录凭证，应先修正或取消该环境变量。
+
+默认的后端 Agent 编排（路由 D）仍由独立 Python 脚本 `submit_run.py`、`get_thread.py` 和 `upload_file.py` 执行。这些脚本尚未接入 CLI 的系统安全凭证库，使用前必须配置：
+
 ```bash
 export XYQ_ACCESS_KEY="your-access-key"
 ```
@@ -410,7 +421,7 @@ python3 {baseDir}/scripts/download_results.py --urls URL1 URL2 URL3 --output-dir
 
 ## 注意事项
 
-- 鉴权方式为请求头 `Authorization: Bearer <XYQ_ACCESS_KEY>`
+- 独立 Python 会话 API 脚本的鉴权方式为请求头 `Authorization: Bearer <XYQ_ACCESS_KEY>`
 - 创建会话时 `message` 是用户的指令要求，不能为空
 - 查询会话时可用 --after-seq 做增量拉取，便于轮询新消息（含 assistant 回复与生图/生视频结果）
 - 上传文件仅支持图片（image/*）、视频（video/*）和 `.mp3/.wav` 音频文件，其他类型会被拒绝，文件大小须在 200MB 以下