@pippit-dev/cli 1.0.38 → 1.0.40

package/cmd/update/update.go

@@ -14,7 +14,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/Pippit-dev/pippit-cli/internal/adapter"
 	"github.com/Pippit-dev/pippit-cli/internal/auth"
+	"github.com/Pippit-dev/pippit-cli/internal/commandnames"
 	"github.com/Pippit-dev/pippit-cli/internal/version"
 	"github.com/spf13/cobra"
 )
@@ -38,29 +40,53 @@ var telemetrySkillNames = []string{
 	"xyq-short-drama-skill",
 }
 
-var telemetryHTTPClient = &http.Client{Timeout: telemetryWaitTimeout}
+// Each update command instance owns its HTTP client so instances using different adapters do not affect each other.
+type updater struct{ telemetryHTTPClient *http.Client }
+
+func newUpdater(policy adapter.HTTPAdapter) *updater {
+	return &updater{telemetryHTTPClient: &http.Client{
+		Timeout:   telemetryWaitTimeout,
+		Transport: adapter.HTTPOrDefault(policy).WrapTransport(nil),
+	}}
+}
 
 // NewCommand builds the update command.
 func NewCommand(stdout, stderr io.Writer) *cobra.Command {
+	return NewCommandWithAdapter(stdout, stderr, adapter.Default{})
+}
+
+func NewCommandWithAdapter(stdout, stderr io.Writer, policy adapter.HTTPAdapter) *cobra.Command {
+	updater := newUpdater(policy)
 	var source string
+	var channel string
 	cmd := &cobra.Command{
-		Use:   "update",
+		Use:   commandnames.Update,
 		Short: "Update pippit-tool-cli and bundled skills",
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			if !cmd.Flags().Changed("source") {
 				source = os.Getenv("PIPPIT_CLI_SOURCE")
 			}
-			return runUpdate(stdout, stderr, source)
+			return updater.runUpdate(stdout, stderr, source, channel)
 		},
 	}
 	cmd.Flags().StringVar(&source, "source", "", "optional real host identifier reported as host_platform; defaults to PIPPIT_CLI_SOURCE when unset")
+	cmd.Flags().StringVar(&channel, "channel", "", "channel for this update only: stable (npm latest) or canary; overrides PIPPIT_CLI_INSTALL_PACKAGE")
 	return cmd
 }
 
-func runUpdate(stdout, stderr io.Writer, source string) error {
+func (u *updater) runUpdate(stdout, stderr io.Writer, hostPlatform, channel string) error {
 	pkg := os.Getenv("PIPPIT_CLI_INSTALL_PACKAGE")
-	if pkg == "" {
+	switch channel {
+	case "":
+		if pkg == "" {
+			pkg = defaultPackage + "@latest"
+		}
+	case "stable":
 		pkg = defaultPackage + "@latest"
+	case "canary":
+		pkg = defaultPackage + "@canary"
+	default:
+		return fmt.Errorf("不支持的更新渠道 %q，可选值为 stable 或 canary", channel)
 	}
 
 	fmt.Fprintf(stderr, "Updating pippit-tool-cli via npm: %s\n", pkg)
@@ -83,7 +109,7 @@ func runUpdate(stdout, stderr io.Writer, source string) error {
 		return fmt.Errorf("更新 pippit-tool-cli skills 失败: %w", err)
 	}
 
-	reportBundledSkillTelemetry("update", "cli_update", source, stderr)
+	u.reportBundledSkillTelemetry("update", "cli_update", hostPlatform, stderr)
 	fmt.Fprintln(stdout, "pippit-tool-cli and skills updated")
 	return nil
 }
@@ -143,7 +169,7 @@ type telemetryPayload struct {
 	Arch         string `json:"arch"`
 }
 
-func reportBundledSkillTelemetry(event, source, hostPlatform string, stderr io.Writer) {
+func (u *updater) reportBundledSkillTelemetry(event, source, hostPlatform string, stderr io.Writer) {
 	if os.Getenv("PIPPIT_CLI_DISABLE_TELEMETRY") == "1" {
 		return
 	}
@@ -161,7 +187,7 @@ func reportBundledSkillTelemetry(event, source, hostPlatform string, stderr io.W
 		wg.Add(1)
 		go func(payload telemetryPayload) {
 			defer wg.Done()
-			if err := reportSkillTelemetry(payload); err != nil && os.Getenv("PIPPIT_CLI_DEBUG_TELEMETRY") == "1" {
+			if err := u.reportSkillTelemetry(payload); err != nil && os.Getenv("PIPPIT_CLI_DEBUG_TELEMETRY") == "1" {
 				fmt.Fprintf(stderr, "[pippit-tool-cli] 埋点上报失败: %v\n", err)
 			}
 		}(payload)
@@ -177,7 +203,7 @@ func reportBundledSkillTelemetry(event, source, hostPlatform string, stderr io.W
 	}
 }
 
-func reportSkillTelemetry(payload telemetryPayload) error {
+func (u *updater) reportSkillTelemetry(payload telemetryPayload) error {
 	body, err := json.Marshal(payload)
 	if err != nil {
 		return err
@@ -190,7 +216,7 @@ func reportSkillTelemetry(payload telemetryPayload) error {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", telemetryAuthHeader)
 
-	resp, err := telemetryHTTPClient.Do(req)
+	resp, err := u.telemetryHTTPClient.Do(req)
 	if err != nil {
 		return err
 	}

package/cmd/update/update_test.go

@@ -11,8 +11,78 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	"github.com/Pippit-dev/pippit-cli/internal/adapter"
 )
 
+func TestUpdateCommandSelectsChannel(t *testing.T) {
+	if runtime.GOOS == "windows" {
+		t.Skip("test uses POSIX shell scripts to stub npm and npx")
+	}
+	cases := []struct {
+		name     string
+		args     []string
+		override string
+		want     string
+		wantErr  bool
+	}{
+		{name: "default stable", want: defaultPackage + "@latest"},
+		{name: "explicit stable", args: []string{"--channel", "stable"}, want: defaultPackage + "@latest"},
+		{name: "explicit canary", args: []string{"--channel", "canary"}, want: defaultPackage + "@canary"},
+		{name: "package override preserved", override: defaultPackage + "@1.0.38", want: defaultPackage + "@1.0.38"},
+		{name: "stable overrides environment", args: []string{"--channel", "stable"}, override: defaultPackage + "@canary", want: defaultPackage + "@latest"},
+		{name: "canary overrides environment", args: []string{"--channel", "canary"}, override: defaultPackage + "@1.0.38", want: defaultPackage + "@canary"},
+		{name: "invalid channel", args: []string{"--channel", "beta"}, wantErr: true},
+		{name: "invalid channel with override", args: []string{"--channel", "beta"}, override: defaultPackage + "@1.0.38", wantErr: true},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			binDir := t.TempDir()
+			npmRoot := t.TempDir()
+			capturePath := filepath.Join(t.TempDir(), "npm-args.txt")
+			if err := os.MkdirAll(filepath.Join(npmRoot, "@pippit-dev", "cli", "skills"), 0o755); err != nil {
+				t.Fatal(err)
+			}
+			npmScript := "#!/bin/sh\ncase \"$1\" in\ninstall) printf '%s\\n' \"$@\" > \"$CAPTURE_ARGS\";;\nroot) printf '%s\\n' \"$TEST_NPM_ROOT\";;\n*) exit 1;;\nesac\n"
+			for name, script := range map[string]string{"npm": npmScript, "npx": "#!/bin/sh\nexit 0\n"} {
+				if err := os.WriteFile(filepath.Join(binDir, name), []byte(script), 0o755); err != nil {
+					t.Fatal(err)
+				}
+			}
+			t.Setenv("PATH", binDir+string(os.PathListSeparator)+os.Getenv("PATH"))
+			t.Setenv("HOME", t.TempDir())
+			t.Setenv("CAPTURE_ARGS", capturePath)
+			t.Setenv("TEST_NPM_ROOT", npmRoot)
+			t.Setenv("PIPPIT_CLI_DISABLE_TELEMETRY", "1")
+			t.Setenv("PIPPIT_CLI_INSTALL_PACKAGE", tc.override)
+			var stdout, stderr bytes.Buffer
+			cmd := NewCommand(&stdout, &stderr)
+			cmd.SetArgs(append([]string{}, tc.args...))
+			err := cmd.Execute()
+			if tc.wantErr {
+				if err == nil || !strings.Contains(err.Error(), "不支持的更新渠道") {
+					t.Fatalf("error = %v, want invalid channel error", err)
+				}
+				if _, err := os.Stat(capturePath); !os.IsNotExist(err) {
+					t.Fatalf("invalid channel invoked npm or stat failed: %v", err)
+				}
+				return
+			}
+			if err != nil {
+				t.Fatalf("update failed: %v, stderr: %s", err, stderr.String())
+			}
+			got, err := os.ReadFile(capturePath)
+			if err != nil {
+				t.Fatal(err)
+			}
+			want := strings.Join([]string{"install", "-g", "--prefer-online", "--foreground-scripts", tc.want, ""}, "\n")
+			if string(got) != want {
+				t.Fatalf("npm args = %q, want %q", got, want)
+			}
+		})
+	}
+}
+
 func TestInstallSkillsInstallsAllBundledSkills(t *testing.T) {
 	if runtime.GOOS == "windows" {
 		t.Skip("test uses a POSIX shell script to stub npx")
@@ -92,7 +162,7 @@ func TestReportSkillTelemetry(t *testing.T) {
 	defer server.Close()
 
 	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", server.URL+"/")
-	err := reportSkillTelemetry(telemetryPayload{
+	err := newUpdater(adapter.Default{}).reportSkillTelemetry(telemetryPayload{
 		Event:        "update",
 		SkillName:    "xyq-skill",
 		Source:       "cli_update",
@@ -121,7 +191,7 @@ func TestReportBundledSkillTelemetryWaitsBriefly(t *testing.T) {
 
 	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", server.URL)
 	start := time.Now()
-	reportBundledSkillTelemetry("update", "cli_update", " workbuddy ", &bytes.Buffer{})
+	newUpdater(adapter.Default{}).reportBundledSkillTelemetry("update", "cli_update", " workbuddy ", &bytes.Buffer{})
 	if elapsed := time.Since(start); elapsed > 1500*time.Millisecond {
 		t.Fatalf("reportBundledSkillTelemetry() blocked for %v, want <= 1.5s", elapsed)
 	}
@@ -143,7 +213,7 @@ func TestReportBundledSkillTelemetryReportsBothSkills(t *testing.T) {
 	defer server.Close()
 
 	t.Setenv("PIPPIT_CLI_TELEMETRY_BASE_URL", server.URL)
-	reportBundledSkillTelemetry("update", "cli_update", " workbuddy ", &bytes.Buffer{})
+	newUpdater(adapter.Default{}).reportBundledSkillTelemetry("update", "cli_update", " workbuddy ", &bytes.Buffer{})
 
 	got := map[string]bool{}
 	for i := 0; i < len(telemetrySkillNames); i++ {

package/dist/checksums.txt

@@ -1,6 +1,6 @@
-3fca50bc9ffb2c14e74ea65781fb706d4fa2c79484d5b20b3c08ad15847afc30  pippit-tool-cli-1.0.38-darwin-amd64.tar.gz
-0e7d976179d944a2b8f99800acb91c6d3c035f0920cf4ec4348010b3a03d9e38  pippit-tool-cli-1.0.38-darwin-arm64.tar.gz
-4f5723713fc910121982885172079ab1e787d2af9f2515961e59f7e53ba48737  pippit-tool-cli-1.0.38-linux-amd64.tar.gz
-07d8ff5920dfa6748ad46076fcffbabc7b5d8dcef6714d802c7fa5b4b515494e  pippit-tool-cli-1.0.38-linux-arm64.tar.gz
-61f18a00f457ffff80c20593b3c0af84b93a3e8db871b00ed043f61024c6b441  pippit-tool-cli-1.0.38-windows-amd64.zip
-c07399e11956f7c6565e00c74a24f864012613539a61341636f9900d85a72654  pippit-tool-cli-1.0.38-windows-arm64.zip
+14eec459ef3d526057582d47ec5611a48146b825181f06652f31c76e203a7f9c  pippit-tool-cli-1.0.40-darwin-amd64.tar.gz
+81d6967ef44953e91d9a2504bba20979570de7c0554aae4d7b55660da9fb32e8  pippit-tool-cli-1.0.40-darwin-arm64.tar.gz
+8811832e3c840cb0418654953f354b254f3889346966c161ab65279f0cf03662  pippit-tool-cli-1.0.40-linux-amd64.tar.gz
+28ce9f374f34fed4fa3e7b44a2b1b1fcc59c8cd7d83ad7621e8c694dd35194ad  pippit-tool-cli-1.0.40-linux-arm64.tar.gz
+ffd11a5de082b50b54d8b9f701890186c28785bca4cfd6e8e05254ce6eed965c  pippit-tool-cli-1.0.40-windows-amd64.zip
+88ed4320bbef1146355890753226ec6a99b0f0653556e1a4665ad7f23dd17c30  pippit-tool-cli-1.0.40-windows-arm64.zip