@automattic/vip 4.1.3 → 4.1.5

package/cmd/vip-next/commands/devenv_telemetry_test.go

@@ -0,0 +1,322 @@
+package commands
+
+import (
+	"errors"
+	"io"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/Automattic/vip/internal/devenv"
+	"github.com/Automattic/vip/internal/devenv/paths"
+	"github.com/Automattic/vip/internal/telemetry"
+	"github.com/spf13/cobra"
+)
+
+type devEnvCapturedEvent struct {
+	name  string
+	props map[string]any
+}
+
+type devEnvEventClient struct{ events []devEnvCapturedEvent }
+
+func (c *devEnvEventClient) TrackEvent(name string, props map[string]any) error {
+	copyProps := make(map[string]any, len(props))
+	for k, v := range props {
+		copyProps[k] = v
+	}
+	c.events = append(c.events, devEnvCapturedEvent{name: name, props: copyProps})
+	return nil
+}
+
+func TestDevEnvTrackingInfoOmitsCredentials(t *testing.T) {
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	slug := "example-site"
+	if err := os.MkdirAll(paths.EnvironmentPath(slug), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	data := []byte(`{"siteSlug":"example-site","wpTitle":"Example Site","php":"php-fpm:8.4","adminPassword":"local-password","autologinKey":"local-key","envVars":{"API_TOKEN":"private-value"},"overrides":"API_TOKEN: private-value"}`)
+	if err := os.WriteFile(filepath.Join(paths.EnvironmentPath(slug), "instance_data.json"), data, 0o600); err != nil {
+		t.Fatal(err)
+	}
+
+	got := devEnvTrackingInfo(slug)
+	if got["slug"] != slug || got["site_slug"] != slug || got["wp_title"] != "Example Site" || got["php"] != "8.4" {
+		t.Fatalf("safe tracking properties = %#v", got)
+	}
+	for _, key := range []string{"admin_password", "autologin_key", "env_vars", "overrides"} {
+		if _, ok := got[key]; ok {
+			t.Errorf("credential-bearing property %q was included", key)
+		}
+	}
+}
+
+func TestDevEnvTrackingInfoMissingRecord(t *testing.T) {
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	got := devEnvTrackingInfo("missing")
+	if len(got) != 1 || got["slug"] != "missing" {
+		t.Fatalf("missing-record tracking properties = %#v, want slug only", got)
+	}
+}
+
+func TestDevEnvTrackingInfoMapsLegacyFields(t *testing.T) {
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	slug := "legacy-site"
+	if err := os.MkdirAll(paths.EnvironmentPath(slug), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	data := []byte(`{"siteSlug":"legacy-site","clientCode":{"repo":"example"},"elasticsearchEnabled":true}`)
+	if err := os.WriteFile(filepath.Join(paths.EnvironmentPath(slug), "instance_data.json"), data, 0o600); err != nil {
+		t.Fatal(err)
+	}
+	got := devEnvTrackingInfo(slug)
+	if got["app_code"] != `{"repo":"example"}` || got["elasticsearch"] != true {
+		t.Fatalf("legacy tracking properties = %#v", got)
+	}
+	if _, ok := got["client_code"]; ok {
+		t.Fatalf("legacy field was sent directly: %#v", got)
+	}
+}
+
+func TestDevEnvCommandTelemetryAfterSlugResolution(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	info := &cobra.Command{Use: "info", RunE: func(cmd *cobra.Command, _ []string) error {
+		_, err := ResolveSlug(cmd)
+		return err
+	}}
+	addSlugFlag(info)
+	root.AddCommand(info)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"info", "--slug=example-site"})
+	if err := root.Execute(); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.events) != 2 || client.events[0].name != "dev_env_info_command_execute" || client.events[1].name != "dev_env_info_command_success" {
+		t.Fatalf("events = %#v", client.events)
+	}
+	if client.events[0].props["slug"] != "example-site" {
+		t.Fatalf("execute properties = %#v", client.events[0].props)
+	}
+}
+
+func TestDevEnvTelemetryDoesNotStartBeforeSlugResolution(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	t.Chdir(t.TempDir())
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	info := &cobra.Command{Use: "info", RunE: func(cmd *cobra.Command, _ []string) error {
+		_, err := ResolveSlug(cmd)
+		return err
+	}}
+	addSlugFlag(info)
+	root.AddCommand(info)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"info"})
+	if err := root.Execute(); err == nil {
+		t.Fatal("expected missing environment to fail")
+	}
+	if len(client.events) != 0 {
+		t.Fatalf("events before slug resolution = %#v", client.events)
+	}
+}
+
+func TestDevEnvTelemetryRecordsCommandError(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	logs := &cobra.Command{Use: "logs", RunE: func(cmd *cobra.Command, _ []string) error {
+		if _, err := ResolveSlug(cmd); err != nil {
+			return err
+		}
+		return errors.New("log stream failed")
+	}}
+	addSlugFlag(logs)
+	root.AddCommand(logs)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"logs", "--slug=example-site"})
+	if err := root.Execute(); err == nil {
+		t.Fatal("expected logs to fail")
+	}
+	if len(client.events) != 2 || client.events[1].name != "dev_env_logs_command_error" || client.events[1].props["failure"] != "log stream failed" {
+		t.Fatalf("error events = %#v", client.events)
+	}
+}
+
+func TestDevEnvCreateEmitsCommandEvents(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	t.Chdir(t.TempDir())
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := DevEnvCmd()
+	root.SetOut(io.Discard)
+	root.SetErr(io.Discard)
+	root.SetArgs([]string{"create", "--slug=example-site", "--title=Example Site"})
+	if err := root.Execute(); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.events) != 2 || client.events[0].name != "dev_env_create_command_execute" || client.events[1].name != "dev_env_create_command_success" {
+		t.Fatalf("create events = %#v", client.events)
+	}
+	if client.events[0].props["slug"] != "example-site" {
+		t.Fatalf("create properties = %#v", client.events[0].props)
+	}
+}
+
+func TestDevEnvImportSQLTracksDumpType(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	file := filepath.Join(t.TempDir(), "export.sql")
+	if err := os.WriteFile(file, []byte("-- ordinary SQL export\nCREATE TABLE wp_posts (id int);\n"), 0o600); err != nil {
+		t.Fatal(err)
+	}
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	imp := &cobra.Command{Use: "import"}
+	sql := &cobra.Command{Use: "sql", RunE: func(cmd *cobra.Command, _ []string) error {
+		_, err := ResolveSlug(cmd)
+		return err
+	}}
+	addSlugFlag(sql)
+	imp.AddCommand(sql)
+	root.AddCommand(imp)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"import", "sql", "--slug=example-site", file})
+	if err := root.Execute(); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.events) != 2 || client.events[0].props["sqldump_type"] != "MYSQLDUMP" {
+		t.Fatalf("import SQL events = %#v", client.events)
+	}
+}
+
+func TestDevEnvEnvvarSetInvalidNameEvent(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	t.Setenv("XDG_DATA_HOME", t.TempDir())
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := DevEnvCmd()
+	root.SetOut(io.Discard)
+	root.SetErr(io.Discard)
+	root.SetArgs([]string{"envvar", "set", "--slug=example-site", "invalid-name", "value"})
+	if err := root.Execute(); err == nil {
+		t.Fatal("expected invalid variable name to fail")
+	}
+	if len(client.events) != 2 || client.events[0].name != "dev_env_envvar_set_command_execute" || client.events[1].name != "dev_env_envvar_set_invalid_name" {
+		t.Fatalf("invalid-name events = %#v", client.events)
+	}
+}
+
+func TestDevEnvEventNamesCoverEveryCommandLeaf(t *testing.T) {
+	root := DevEnvCmd()
+	seen := map[string]bool{}
+	var walk func(*cobra.Command, string)
+	walk = func(parent *cobra.Command, prefix string) {
+		for _, child := range parent.Commands() {
+			path := strings.TrimSpace(prefix + " " + child.Name())
+			if child.RunE != nil {
+				if _, ok := devEnvEventNames[path]; !ok {
+					t.Errorf("no event name for %q", path)
+				}
+				seen[path] = true
+			}
+			walk(child, path)
+		}
+	}
+	walk(root, "")
+	for path := range devEnvEventNames {
+		if !seen[path] {
+			t.Errorf("event name %q has no command leaf", path)
+		}
+	}
+}
+
+func TestDevEnvAllCommandUsesAllProperty(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	info := &cobra.Command{Use: "info", RunE: func(*cobra.Command, []string) error { return nil }}
+	info.Flags().Bool("all", false, "")
+	root.AddCommand(info)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"info", "--all"})
+	if err := root.Execute(); err != nil {
+		t.Fatal(err)
+	}
+	if len(client.events) != 2 || client.events[0].props["all"] != true || client.events[1].props["all"] != true {
+		t.Fatalf("all events = %#v", client.events)
+	}
+}
+
+func TestDevEnvSyncNotRunningUsesNodeEvent(t *testing.T) {
+	t.Setenv("DO_NOT_TRACK", "")
+	t.Setenv("GO_ENV", "")
+	t.Setenv("NODE_ENV", "")
+	client := &devEnvEventClient{}
+	old := GetConfig()
+	SetConfig(Config{Tracker: &telemetry.Tracker{Clients: []telemetry.Client{client}}})
+	t.Cleanup(func() { SetConfig(old) })
+
+	root := &cobra.Command{Use: "dev-env"}
+	sync := &cobra.Command{Use: "sync"}
+	sql := &cobra.Command{Use: "sql", RunE: func(cmd *cobra.Command, _ []string) error {
+		devEnvTrackingBegin(cmd, map[string]any{"slug": "example-site", "app": 123, "env": "develop", "multisite": false})
+		return devenv.ErrEnvironmentNotStarted
+	}}
+	sync.AddCommand(sql)
+	root.AddCommand(sync)
+	installDevEnvTelemetry(root)
+	root.SetArgs([]string{"sync", "sql"})
+	if err := root.Execute(); !errors.Is(err, devenv.ErrEnvironmentNotStarted) {
+		t.Fatalf("got error %v", err)
+	}
+	if len(client.events) != 2 || client.events[1].name != "dev_env_sync_sql_command_env_not_running_error" || client.events[1].props["errorMessage"] != "Environment was not running" {
+		t.Fatalf("sync events = %#v", client.events)
+	}
+}

package/cmd/vip-next/commands/devenv_update.go

@@ -77,7 +77,7 @@ func resolveUpdateConfig(cmd *cobra.Command, cur *instancedata.InstanceData) (de
 		v, _ := f.GetString("php")
 		c.PHP = &v
 	} else if interactive {
-		sel, err := selectWithDefault(cmd, "PHP version", phpLabels(), phpLabelForVersion(currentPHPVersion(cur)))
+		sel, err := selectWithDefault(cmd, "PHP version", phpLabels(), phpDefaultLabel(currentPHPVersion(cur)))
 		if err != nil {
 			return c, err
 		}

package/cmd/vip-next/commands/devenv_update_test.go

@@ -59,14 +59,40 @@ func TestCurrentPHPVersion(t *testing.T) {
 }
 
 func TestPHPLabelForVersion(t *testing.T) {
-	if phpLabelForVersion("8.2") != "8.2 (recommended)" {
-		t.Fatal("8.2 should map to the recommended label")
+	if phpLabelForVersion("8.4") != "8.4 (recommended)" {
+		t.Fatal("8.4 should map to the recommended label")
+	}
+	if phpLabelForVersion("8.2") != "8.2" {
+		t.Fatal("8.2 should map to its plain label")
 	}
 	if phpLabelForVersion("9.9") != "" {
 		t.Fatal("unknown version should map to empty")
 	}
 }
 
+func TestPHPDefaultLabelUsesRecommendedVersionWhenCurrentVersionIsMissing(t *testing.T) {
+	if got := phpDefaultLabel(""); got != "8.4 (recommended)" {
+		t.Fatalf("phpDefaultLabel(\"\") = %q, want 8.4 (recommended)", got)
+	}
+	if got := phpDefaultLabel("8.2"); got != "8.2" {
+		t.Fatalf("phpDefaultLabel(\"8.2\") = %q, want 8.2", got)
+	}
+}
+
+func TestPHPDefaultSelectionUsesRecommendedVersion(t *testing.T) {
+	t.Setenv("VIP_NON_INTERACTIVE", "1")
+	got, err := selectWithDefault(&cobra.Command{}, "PHP version", phpLabels(), phpDefaultLabel(""))
+	if err != nil {
+		t.Fatal(err)
+	}
+	if got != "8.4 (recommended)" {
+		t.Fatalf("default PHP selection = %q, want 8.4 (recommended)", got)
+	}
+	if version := phpVersionForLabel(got); version != "8.4" {
+		t.Fatalf("selected PHP version = %q, want 8.4", version)
+	}
+}
+
 func TestRawTruthy(t *testing.T) {
 	if !rawTruthy(json.RawMessage("true")) {
 		t.Fatal("true should be truthy")

package/cmd/vip-next/commands/import_debug_test.go

@@ -0,0 +1,110 @@
+package commands
+
+import (
+	"bytes"
+	"io"
+	"strings"
+	"testing"
+
+	"github.com/Khan/genqlient/graphql"
+
+	"github.com/Automattic/vip/internal/debuglog"
+)
+
+func TestImportSQLDebugSafeRemoteSummary(t *testing.T) {
+	stub := &importStub{}
+	srv := stub.start(t)
+	SetConfig(Config{GQLClient: graphql.NewClient(srv.URL+"/graphql", srv.Client()), APIHost: srv.URL, Token: "TOKEN_SECRET"})
+	defer SetConfig(Config{})
+	t.Setenv("VIP_IMPORT_SQL_INTERVAL_MS", "1")
+	restore := stubImportPrompts("EXAMPLE.COM", true)
+	defer restore()
+	cmd := ImportSQLCmd()
+	var logs bytes.Buffer
+	cmd.SetOut(io.Discard)
+	cmd.SetErr(io.Discard)
+	cmd.SetContext(debuglog.WithLogger(importCtx(42, 7, 2), "@automattic/vip:bin:vip-import-sql", &logs))
+	_ = cmd.Flags().Set("header", "Authorization: HEADER_SECRET")
+	_ = cmd.Flags().Set("search-replace", "FROM_SECRET,TO_SECRET")
+	if err := runImportSQL(cmd, []string{"https://URL_SECRET.example/dump.sql?token=QUERY_SECRET"}); err != nil {
+		t.Fatal(err)
+	}
+	for _, want := range []string{"remote=true", "headers=1", "replacements=1", "Import queued"} {
+		if !strings.Contains(logs.String(), want) {
+			t.Errorf("missing %q in %s", want, &logs)
+		}
+	}
+	for _, secret := range []string{"TOKEN_SECRET", "HEADER_SECRET", "FROM_SECRET", "TO_SECRET", "URL_SECRET", "QUERY_SECRET"} {
+		if strings.Contains(logs.String(), secret) {
+			t.Errorf("leaked %q", secret)
+		}
+	}
+}
+
+func TestImportSQLDebugValidation(t *testing.T) {
+	for _, skip := range []bool{false, true} {
+		t.Run(map[bool]string{false: "validate", true: "skip"}[skip], func(t *testing.T) {
+			cmd := ImportSQLCmd()
+			var logs bytes.Buffer
+			cmd.SetOut(io.Discard)
+			cmd.SetContext(debuglog.WithLogger(importCtx(42, 7, 2), "*", &logs))
+			path := writeTempSQL(t, cleanWPDump)
+			if _, err := validateAndGetTableNames(cmd, nil, 42, 7, path, skip, nil, false); err != nil {
+				t.Fatal(err)
+			}
+			want := "target_multisite=false dump_multisite=false"
+			if skip {
+				want = "Validation was skipped"
+			}
+			if !strings.Contains(logs.String(), want) {
+				t.Errorf("missing %q in %s", want, &logs)
+			}
+			if strings.Contains(logs.String(), path) || strings.Contains(logs.String(), "wp_posts") {
+				t.Errorf("file data leaked: %s", &logs)
+			}
+		})
+	}
+}
+
+func TestImportMediaDebugSafeRemoteSummary(t *testing.T) {
+	stub := &mediaStub{progressBodies: []string{mediaProgress("COMPLETED", 1, 1, "")}}
+	setupMediaTest(t, stub)
+	cmd := ImportMediaCmd()
+	var logs bytes.Buffer
+	cmd.SetOut(io.Discard)
+	cmd.SetErr(io.Discard)
+	cmd.SetContext(debuglog.WithLogger(importCtx(42, 7, 2), "vip:vip-import-media", &logs))
+	if err := runImportMedia(cmd, []string{"https://URL_SECRET.example/up.zip?token=QUERY_SECRET"}); err != nil {
+		t.Fatal(err)
+	}
+	for _, want := range []string{"local=false", "Import queued"} {
+		if !strings.Contains(logs.String(), want) {
+			t.Errorf("missing %q in %s", want, &logs)
+		}
+	}
+	for _, secret := range []string{"URL_SECRET", "QUERY_SECRET"} {
+		if strings.Contains(logs.String(), secret) {
+			t.Errorf("leaked %q", secret)
+		}
+	}
+}
+
+func TestImportValidationDebugSilence(t *testing.T) {
+	for _, namespace := range []string{"", "vip:unrelated"} {
+		t.Run(namespace, func(t *testing.T) {
+			cmd := ImportSQLCmd()
+			var logs, stdout bytes.Buffer
+			cmd.SetOut(&stdout)
+			cmd.SetContext(debuglog.WithLogger(importCtx(42, 7, 2), namespace, &logs))
+			if _, err := validateAndGetTableNames(cmd, nil, 42, 7, "UNREAD_PATH_SECRET", true, nil, false); err != nil {
+				t.Fatal(err)
+			}
+			if logs.Len() != 0 {
+				t.Errorf("unexpected diagnostics: %s", &logs)
+			}
+			if stdout.String() != "Skipping SQL file validation.\n" {
+				t.Errorf("changed stdout: %q", stdout.String())
+			}
+		})
+	}
+}

package/cmd/vip-next/commands/import_media.go

@@ -18,6 +18,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/Automattic/vip/internal/appctx"
+	"github.com/Automattic/vip/internal/debuglog"
 	"github.com/Automattic/vip/internal/gql"
 	"github.com/Automattic/vip/internal/httpproxy"
 	"github.com/Automattic/vip/internal/mediaimport"
@@ -136,6 +137,7 @@ func runImportMedia(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		fmt.Fprint(out, "\n")
+		debuglog.Printf(cmd.Context(), "vip:vip-import-media", "Upload complete: bytes=%d", res.Meta.FileSize)
 
 		pre, err := uc.GetSignedUploadRequestData(cmd.Context(), upload.SignedRequestArgs{
 			Action: "GetObject", AppID: ae.App.ID, EnvID: ae.Env.ID, BaseName: res.Meta.BaseName,
@@ -146,6 +148,7 @@ func runImportMedia(cmd *cobra.Command, args []string) error {
 		archiveURL = pre.URL
 	}
 
+	debuglog.Printf(cmd.Context(), "vip:vip-import-media", "Options: local=%t overwrite_existing=%t import_intermediate_images=%t", sourceIsLocal, overwriteExistingFiles, importIntermediateImages)
 	trackEvent("import_media_start_execute", nil)
 
 	tracker := mediaimport.NewTracker()
@@ -181,6 +184,7 @@ func runImportMedia(cmd *cobra.Command, args []string) error {
 		return nil
 	}
 
+	debuglog.Printf(cmd.Context(), "vip:vip-import-media", "Import queued")
 	return mediaImportCheckStatusCmd(cmd, tracker, ae, exportJSON, saveErrorLog)
 }
 

package/cmd/vip-next/commands/import_sql.go

@@ -18,6 +18,7 @@ import (
 	"golang.org/x/term"
 
 	"github.com/Automattic/vip/internal/appctx"
+	"github.com/Automattic/vip/internal/debuglog"
 	"github.com/Automattic/vip/internal/gql"
 	"github.com/Automattic/vip/internal/searchreplace"
 	"github.com/Automattic/vip/internal/siteimport"
@@ -343,6 +344,7 @@ func importSQLGates(g gateInput) error {
 func validateAndGetTableNames(cmd *cobra.Command, client graphql.Client, appID, envID int64, fileName string, skipValidate bool, searchReplace []string, isMultiSite bool) ([]string, error) {
 	out := cmd.OutOrStdout()
 	if skipValidate {
+		debuglog.Printf(cmd.Context(), "@automattic/vip:bin:vip-import-sql", "Validation was skipped. No playbook information will be displayed.")
 		fmt.Fprintln(out, "Skipping SQL file validation.")
 		return []string{}, nil
 	}
@@ -359,6 +361,7 @@ func validateAndGetTableNames(cmd *cobra.Command, client graphql.Client, appID,
 	wpSiteCapture := siteimport.NewMultilineCapture("INSERT INTO `wp_site`")
 	var wpSiteStatements [][]string
 	ticker := newImportLineTicker(out, isTerminalWriter(out))
+	debuglog.Printf(cmd.Context(), "vip:validations:line-by-line", "Validations: static SQL checks and site type")
 	res, scanErr := sqlvalidation.ValidateWithLineHook(f, func(line string, lineNum int) {
 		if lineNum%500 == 0 {
 			ticker.tick(lineNum) // sql.ts:533 trailing space
@@ -370,6 +373,7 @@ func validateAndGetTableNames(cmd *cobra.Command, client graphql.Client, appID,
 		return nil, fmt.Errorf("Error validating input file: %s", scanErr)
 	}
 	isMultiSiteSqlDump := res.IsMultiSite
+	debuglog.Printf(cmd.Context(), "vip:vip-import-sql", "Site type: target_multisite=%t dump_multisite=%t", isMultiSite, isMultiSiteSqlDump)
 
 	// Static-validation report (import mode): problems throw with the
 	// joined error output + --skip-validate advice (vip-import-sql.js:436).
@@ -744,6 +748,8 @@ func runImportSQL(cmd *cobra.Command, args []string) error {
 		output = ""
 	}
 
+	debuglog.Printf(cmd.Context(), "@automattic/vip:bin:vip-import-sql", "Options: remote=%t skip_validate=%t skip_backup=%t headers=%d replacements=%d", isURL, skipValidate, skipBackup, len(headers), len(searchReplace))
+
 	trackEvent("import_sql_command_execute", map[string]any{"is_url": isURL})
 
 	if err := importSQLGates(gateInput{
@@ -831,7 +837,7 @@ func runImportSQL(cmd *cobra.Command, args []string) error {
 	switch {
 	case localSearchReplaceNeeded(isURL, inPlace, output, searchReplace):
 		_ = pt.StepRunning("replace")
-		res, srErr := searchreplace.Run(fileNameOrURL, searchReplace, searchreplace.Options{
+		res, srErr := searchreplace.RunContext(cmd.Context(), fileNameOrURL, searchReplace, searchreplace.Options{
 			InPlace: inPlace, Output: output,
 		})
 		if srErr != nil {
@@ -902,6 +908,7 @@ func runImportSQL(cmd *cobra.Command, args []string) error {
 		input.Md5 = &checksum
 		input.SearchReplace = []*gql.AppEnvironmentImportSearchReplace{}
 		_ = pt.StepSuccess("upload")
+		debuglog.Printf(cmd.Context(), "@automattic/vip:bin:vip-import-sql", "Upload complete. Initiating the import.")
 		trackEvent("import_sql_upload_complete", nil)
 	}
 
@@ -917,6 +924,7 @@ func runImportSQL(cmd *cobra.Command, args []string) error {
 		_ = pt.StepFailed("queue_import")
 		return failWithError(fmt.Errorf("StartImport call failed: %s", err))
 	}
+	debuglog.Printf(cmd.Context(), "@automattic/vip:bin:vip-import-sql", "Import queued")
 	_ = pt.StepSuccess("queue_import")
 
 	return importSQLCheckStatus(cmd, pt, renderer, ae, domain, false)

package/cmd/vip-next/commands/logout.go

@@ -27,7 +27,7 @@ func LogoutCmd() *cobra.Command {
 			store := auth.NewStore(k)
 
 			if raw, err := store.LoadPrimary(); err == nil && raw != "" {
-				_ = auth.PostLogout(cfg.APIHost, raw)
+				_ = auth.PostLogoutContext(cmd.Context(), cfg.APIHost, raw)
 			}
 			if err := store.Delete(); err != nil && !errors.Is(err, auth.ErrNoToken) {
 				return err

package/cmd/vip-next/commands/searchreplace.go

@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/Automattic/vip/internal/appctx"
+	"github.com/Automattic/vip/internal/debuglog"
 	"github.com/Automattic/vip/internal/searchreplace"
 )
 
@@ -45,7 +46,7 @@ func SearchReplaceCmd() *cobra.Command {
 					return nil
 				}
 			}
-			res, err := searchreplace.Run(args[0], pairs, searchreplace.Options{InPlace: inPlace, Output: output})
+			res, err := searchreplace.RunContext(cmd.Context(), args[0], pairs, searchreplace.Options{InPlace: inPlace, Output: output})
 			if err != nil {
 				return err
 			}
@@ -53,6 +54,7 @@ func SearchReplaceCmd() *cobra.Command {
 			// file to stdout and remove the temp file (Node: "output to STDOUT by
 			// default").
 			if !inPlace && output == "" {
+				debuglog.Printf(cmd.Context(), "@automattic/vip:lib:search-and-replace", "input=file output=stdout")
 				f, err := os.Open(res.OutputFileName)
 				if err != nil {
 					return err