@pippit-dev/cli 0.0.22 → 0.0.24

package/README.md

@@ -8,12 +8,12 @@
 
 | 技能 | 说明 | 路径 |
 |-------|-------------|------|
-| `pippit-short-drama-skill` | 短剧工作流技能，支持提交创作任务、上传参考文件、查询进度、列出会话文件和下载产物。 | `skills/short-drama/` |
-| `xyq-nest-skill` | 通用 NestAgent 技能，支持图片/视频生成、编辑、文件上传、进度查询和结果下载。 | `skills/xyq-nest-skill/` |
+| `xyq-short-drama-skill` | 短剧工作流技能，支持提交创作任务、上传参考文件、查询进度、列出会话文件和下载产物。 | `skills/short-drama/` |
+| `xyq-skill` | 通用 NestAgent 技能，支持图片/视频生成、编辑、文件上传、进度查询和结果下载。 | `skills/xyq-nest-skill/` |
 
 ## 通用 NestAgent 技能
 
-`xyq-nest-skill` 通过接入小云雀 NestAgent 的综合创作能力，实现 AI 图片/视频生成、编辑、风格转换、文件上传、进度查询和结果下载。
+`xyq-skill` 通过接入小云雀 NestAgent 的综合创作能力，实现 AI 图片/视频生成、编辑、风格转换、文件上传、进度查询和结果下载。
 
 ### 功能特性
 
@@ -32,7 +32,7 @@
 
 ### 配置
 
-所有 `xyq-nest-skill` 脚本都使用 Bearer 令牌鉴权：
+所有 `xyq-skill` 脚本都使用 Bearer 令牌鉴权：
 
 ```bash
 export XYQ_ACCESS_KEY="<access-key>"
@@ -214,4 +214,4 @@ pippit-tool-cli short-drama +download-result --output-path ./thread_123/results/
 
 ## 鉴权
 
-`short-drama +submit-run`、`short-drama +get-thread`、`short-drama +upload-file` 以及 `xyq-nest-skill` Python 脚本都使用 `Authorization: Bearer <XYQ_ACCESS_KEY>` 鉴权。OAuth 命令代码仍保留在仓库中，但短剧运行时请求不使用 OAuth。
+`short-drama +submit-run`、`short-drama +get-thread`、`short-drama +upload-file` 以及 `xyq-skill` Python 脚本都使用 `Authorization: Bearer <XYQ_ACCESS_KEY>` 鉴权。OAuth 命令代码仍保留在仓库中，但短剧运行时请求不使用 OAuth。

package/checksums.txt

@@ -1,6 +1,6 @@
-2de4679cc459fe3c4d674fb25f00c8df8fa84e98f80a2fd01f5357d07c663c3e  pippit-tool-cli-0.0.22-darwin-amd64.tar.gz
-9a63d12f5f0534994c01f57caba16ec0d31a141afbe342cf8f42f7e954270633  pippit-tool-cli-0.0.22-darwin-arm64.tar.gz
-61d20c1df72d556b0bd7157c77cdfe3e4c91bc0d85d8924efb0d49c4d6b36ef2  pippit-tool-cli-0.0.22-linux-amd64.tar.gz
-76407ca98a7f885e06cab745eb09a8e5225bbeaae2226ad4c63c3c403bbdec5d  pippit-tool-cli-0.0.22-linux-arm64.tar.gz
-3db90d5c2b5a6a0ba964dd51424ffbc0eaf6dffb3497b5be226d16534504e8e6  pippit-tool-cli-0.0.22-windows-amd64.zip
-b3a69cb5e43a21c037e30e5f6af53c1806de5f24e0724ddbbcbd005255cd20ce  pippit-tool-cli-0.0.22-windows-arm64.zip
+489fab9b2e6334ea206ada098598bf60a63d7930b17e646598414fda2685d0cb  pippit-tool-cli-0.0.24-darwin-amd64.tar.gz
+da482045b41ccd8ba12291ba589a38ad4ad72dc20a1b71413d73b8c49ebe8609  pippit-tool-cli-0.0.24-darwin-arm64.tar.gz
+d3720a47492cc73f1118e3f8521e6344b50b5d9405185718a95de7b3df048f94  pippit-tool-cli-0.0.24-linux-amd64.tar.gz
+98bab626d1f985e9a4039e93e96f089da72292e5df98f567dee387b663818d6e  pippit-tool-cli-0.0.24-linux-arm64.tar.gz
+81c026da8883962fa74d8f59749cb4987f85911d30cc1df12fdf9811e85d526c  pippit-tool-cli-0.0.24-windows-amd64.zip
+cb27d671c861089bb432461d1ec3dab9dca862665f4f0b26351b78b68ae0a211  pippit-tool-cli-0.0.24-windows-arm64.zip

package/cmd/short_drama_test.go

@@ -184,9 +184,7 @@ func TestShortDramaSubmitRunRequiresAccessKey(t *testing.T) {
 	if err == nil {
 		t.Fatal("Execute() error = nil, want access key error")
 	}
-	if !strings.Contains(err.Error(), "XYQ_ACCESS_KEY is required") {
-		t.Fatalf("error = %q, want access key guidance", err)
-	}
+	assertAccessKeyGuidance(t, err)
 }
 
 func TestShortDramaUploadFile(t *testing.T) {
@@ -286,9 +284,7 @@ func TestShortDramaUploadFileRequiresAccessKey(t *testing.T) {
 	if err == nil {
 		t.Fatal("Execute() error = nil, want access key error")
 	}
-	if !strings.Contains(err.Error(), "XYQ_ACCESS_KEY is required") {
-		t.Fatalf("error = %q, want access key guidance", err)
-	}
+	assertAccessKeyGuidance(t, err)
 }
 
 func TestShortDramaUploadFileRejectsUnsupportedFileType(t *testing.T) {
@@ -768,9 +764,7 @@ func TestShortDramaGetThreadRequiresAccessKey(t *testing.T) {
 	if err == nil {
 		t.Fatal("Execute() error = nil, want access key error")
 	}
-	if !strings.Contains(err.Error(), "XYQ_ACCESS_KEY is required") {
-		t.Fatalf("error = %q, want access key guidance", err)
-	}
+	assertAccessKeyGuidance(t, err)
 }
 
 func TestShortDramaListThreadFile(t *testing.T) {
@@ -892,6 +886,23 @@ func TestShortDramaListThreadFileRequiresThreadID(t *testing.T) {
 	}
 }
 
+func TestShortDramaListThreadFileRequiresAccessKey(t *testing.T) {
+	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		t.Fatal("server should not receive request without access key")
+	}))
+	defer server.Close()
+
+	var stdout, stderr bytes.Buffer
+	root := newTestRootCommandWithAccessKey(t, &stdout, &stderr, server.URL, "")
+	root.SetArgs([]string{"short-drama", "+list-thread-file", "--thread-id", "thread_123"})
+
+	err := root.Execute()
+	if err == nil {
+		t.Fatal("Execute() error = nil, want access key error")
+	}
+	assertAccessKeyGuidance(t, err)
+}
+
 func TestShortDramaListThreadFileRejectsPageSizeAboveMax(t *testing.T) {
 	var stdout, stderr bytes.Buffer
 	root := NewRootCommand(&stdout, &stderr)
@@ -925,6 +936,23 @@ func newTestRootCommandWithAccessKey(t *testing.T, stdout, stderr io.Writer, bas
 	return newRootCommand(stdout, stderr, runner)
 }
 
+func assertAccessKeyGuidance(t *testing.T, err error) {
+	t.Helper()
+	if err == nil {
+		t.Fatal("error = nil, want access key guidance")
+	}
+	msg := err.Error()
+	if !strings.Contains(msg, "XYQ_ACCESS_KEY is required") {
+		t.Fatalf("error = %q, want access key guidance", err)
+	}
+	if !strings.Contains(msg, "https://xyq.jianying.com/home?tab_name=home") {
+		t.Fatalf("error = %q, want access key settings URL", err)
+	}
+	if !strings.Contains(msg, `export XYQ_ACCESS_KEY="<access-key>"`) {
+		t.Fatalf("error = %q, want setup command guidance", err)
+	}
+}
+
 func decodeJSON(t *testing.T, data []byte) map[string]any {
 	t.Helper()
 	var got map[string]any

package/cmd/update/update.go

@@ -14,6 +14,11 @@ import (
 
 const defaultPackage = "@pippit-dev/cli"
 
+var legacyGlobalSkills = []string{
+	"pippit-short-drama-skill",
+	"xyq-nest-skill",
+}
+
 // NewCommand builds the update command.
 func NewCommand(stdout, stderr io.Writer) *cobra.Command {
 	cmd := &cobra.Command{
@@ -74,7 +79,30 @@ func installSkills(root string, stderr io.Writer) error {
 	} else if !info.IsDir() {
 		return fmt.Errorf("%s is not a directory", filepath.Join(root, "skills"))
 	}
-	return runInherit(stderr, "npx", "-y", "skills", "add", root, "-g", "-y", "--skill", "*")
+	if err := runInherit(stderr, "npx", "-y", "skills", "add", root, "-g", "-y", "--skill", "*"); err != nil {
+		return err
+	}
+	return cleanupLegacyGlobalSkills(defaultGlobalSkillsDir())
+}
+
+func defaultGlobalSkillsDir() string {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return ""
+	}
+	return filepath.Join(home, ".agents", "skills")
+}
+
+func cleanupLegacyGlobalSkills(globalSkillsDir string) error {
+	if globalSkillsDir == "" {
+		return nil
+	}
+	for _, skillName := range legacyGlobalSkills {
+		if err := os.RemoveAll(filepath.Join(globalSkillsDir, skillName)); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 func runInherit(stderr io.Writer, name string, args ...string) error {

package/cmd/update/update_test.go

@@ -29,6 +29,7 @@ func TestInstallSkillsInstallsAllBundledSkills(t *testing.T) {
 
 	t.Setenv("PATH", binDir+string(os.PathListSeparator)+os.Getenv("PATH"))
 	t.Setenv("CAPTURE_ARGS", capturePath)
+	t.Setenv("HOME", t.TempDir())
 
 	var stderr bytes.Buffer
 	if err := installSkills(root, &stderr); err != nil {
@@ -45,3 +46,27 @@ func TestInstallSkillsInstallsAllBundledSkills(t *testing.T) {
 		t.Fatalf("npx args mismatch\ngot:  %#v\nwant: %#v", got, want)
 	}
 }
+
+func TestCleanupLegacyGlobalSkills(t *testing.T) {
+	globalSkillsDir := t.TempDir()
+	for _, skillName := range []string{"pippit-short-drama-skill", "xyq-nest-skill", "xyq-short-drama-skill", "xyq-skill"} {
+		if err := os.Mkdir(filepath.Join(globalSkillsDir, skillName), 0o755); err != nil {
+			t.Fatal(err)
+		}
+	}
+
+	if err := cleanupLegacyGlobalSkills(globalSkillsDir); err != nil {
+		t.Fatalf("cleanupLegacyGlobalSkills() error = %v", err)
+	}
+
+	for _, skillName := range []string{"pippit-short-drama-skill", "xyq-nest-skill"} {
+		if _, err := os.Stat(filepath.Join(globalSkillsDir, skillName)); !os.IsNotExist(err) {
+			t.Fatalf("legacy skill %s still exists or stat failed: %v", skillName, err)
+		}
+	}
+	for _, skillName := range []string{"xyq-short-drama-skill", "xyq-skill"} {
+		if _, err := os.Stat(filepath.Join(globalSkillsDir, skillName)); err != nil {
+			t.Fatalf("new skill %s was not preserved: %v", skillName, err)
+		}
+	}
+}

package/internal/common/access_key.go

@@ -22,7 +22,7 @@ func (a *accessKeyAuthorizer) Inject(ctx context.Context, req *http.Request) err
 		return err
 	}
 	if a.accessKey == "" && req.Method == http.MethodPost {
-		return fmt.Errorf("%s is required for authenticated requests", config.EnvXYQAccessKey)
+		return fmt.Errorf("%s 缺失. 请前往小云雀官网个人设置页创建 Access Key，地址：https://xyq.jianying.com/home?tab_name=home\n配置后重试：\n  export %s=\"<your-access-key>\"", config.EnvXYQAccessKey, config.EnvXYQAccessKey)
 	}
 	if a.accessKey != "" {
 		req.Header.Set("Authorization", "Bearer "+a.accessKey)

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@pippit-dev/cli",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "Pippit CLI",
   "bin": {
     "pippit-tool-cli": "scripts/run.js"
   },
   "scripts": {
     "postinstall": "node scripts/install.js",
-    "test": "node scripts/version-check.test.js && go test ./... && go vet ./..."
+    "test": "node scripts/version-check.test.js && node scripts/skills.test.js && go test ./... && go vet ./..."
   },
   "os": [
     "darwin",

package/scripts/skills.js

@@ -1,8 +1,26 @@
 const fs = require("fs");
+const os = require("os");
 const path = require("path");
 const { run, runSilent } = require("./platform");
 
 const DEFAULT_PKG = "@pippit-dev/cli";
+const LEGACY_GLOBAL_SKILLS = [
+  "pippit-short-drama-skill",
+  "xyq-nest-skill",
+];
+
+function defaultGlobalSkillsDir() {
+  return path.join(os.homedir(), ".agents", "skills");
+}
+
+function cleanupLegacyGlobalSkills(globalSkillsDir = defaultGlobalSkillsDir()) {
+  for (const skillName of LEGACY_GLOBAL_SKILLS) {
+    fs.rmSync(path.join(globalSkillsDir, skillName), {
+      force: true,
+      recursive: true,
+    });
+  }
+}
 
 function installSkillsFromRoot(root, opts = {}) {
   const source = path.resolve(root);
@@ -13,6 +31,7 @@ function installSkillsFromRoot(root, opts = {}) {
   run("npx", ["-y", "skills", "add", source, "-g", "-y", "--skill", "*"], {
     timeout: opts.timeout || 120000,
   });
+  cleanupLegacyGlobalSkills(opts.globalSkillsDir);
 }
 
 function globalPackageRoot(pkg = DEFAULT_PKG) {
@@ -26,6 +45,9 @@ function installGlobalPackageSkills(pkg = DEFAULT_PKG, opts = {}) {
 
 module.exports = {
   DEFAULT_PKG,
+  LEGACY_GLOBAL_SKILLS,
+  cleanupLegacyGlobalSkills,
+  defaultGlobalSkillsDir,
   globalPackageRoot,
   installGlobalPackageSkills,
   installSkillsFromRoot,

package/skills/short-drama/SKILL.md

@@ -1,5 +1,5 @@
 ---
-name: pippit-short-drama-skill
+name: xyq-short-drama-skill
 description: 使用 pippit-tool-cli 的短剧场景能力提交和查询短剧创作任务。覆盖短剧生成、续写、改写、剧情扩展、人物设定、分集草稿、世界观设定、会话文件获取、文件资源下载等创作场景。当用户要求创作短剧、写短剧剧本、续写故事、修改剧情、补充角色设定、查询短剧任务进展、获取短剧会话文件或下载短剧文件资源，或提到 pippit-tool-cli short-drama / 小云雀短剧时触发。
 user-invocable: true
 metadata:
@@ -67,6 +67,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
+
+```bash
+export XYQ_ACCESS_KEY="<access-key>"
+```
+
 ## 使用方法
 
 ### 1. 提交短剧任务

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

@@ -1,5 +1,5 @@
 ---
-name: xyq-nest-skill
+name: xyq-skill
 description: 通过小云雀的 AI 能力进行综合创作，支持生成和编辑图片/视频。覆盖场景包括：生成（文生图、文生视频、图生视频、做动画、画一个xxx、来段xxx）、编辑修改（把xxx换成yyy、去掉xxx、加上xxx、改成xxx、调整xxx、局部修改、改镜头）、风格转换（风格迁移、转绘、换风格）、视频续写延长、复刻视频/TVC/宣传片、短剧/短漫剧生成、音乐MV生成、产品广告/展示片制作、分镜/故事板设计、教育视频/短视频制作。当用户提到小云雀、xyq、上传参考图/视频、查看生成进度时也应触发。关键判断：只要用户的请求涉及 AI 视频的创作、生成、编辑、修改，无论措辞如何（如"画只猫"、"做个海报"、"做个视频"、"这个视频帮我改一下"、"帮我复刻这段视频"、"用这首歌做个MV"、"一句话生成短剧"），都必须触发此技能。
 user-invocable: true
 metadata: