Merge branch 'main' into fix/git-worktree-common-dir

Author: e-kulikov

.github/workflows/release.yml

@@ -154,7 +154,7 @@ jobs:
           az storage blob upload-batch --destination releases/latest --overwrite true --source .
           az storage blob upload-batch --destination releases/latest --overwrite true --source . --pattern "*.appinstaller" --content-type "application/appinstaller"
       - name: Create draft release 📝
-        uses: softprops/action-gh-release@3d0d9888cb7fd7b750713d6e236d1fcb99157228
+        uses: softprops/action-gh-release@efb35369e0ad2afab669f228072c1b0d510eae64
         with:
           tag_name: ${{ needs.changelog.outputs.tag }}
           body: ${{ needs.changelog.outputs.body }}

src/config/config.go

@@ -136,10 +136,9 @@ func (cfg *Config) getPalette() color.Palette {
 	return palette
 }
 
-// streamingEnabled reports whether streaming should be enabled: it's configured, and not
-// force-disabled via POSH_DISABLE_STREAMING regardless of that configuration.
-func (cfg *Config) streamingEnabled(env runtime.Environment) bool {
-	return cfg.Streaming > 0 && env.Getenv("POSH_DISABLE_STREAMING") != "1"
+// streamingEnabled reports whether streaming should be enabled: it's configured.
+func (cfg *Config) streamingEnabled(_ runtime.Environment) bool {
+	return cfg.Streaming > 0
 }
 
 func (cfg *Config) Features(env runtime.Environment) shell.Features {

src/config/config_test.go

@@ -163,10 +163,9 @@ func TestFeaturesShellIntegration(t *testing.T) {
 
 func TestFeaturesStreaming(t *testing.T) {
 	cases := []struct {
-		Case             string
-		DisableStreaming string
-		Streaming        int
-		ExpectedFeats    shell.Features
+		Case          string
+		Streaming     int
+		ExpectedFeats shell.Features
 	}{
 		{
 			Case:          "streaming enabled",
@@ -177,18 +176,11 @@ func TestFeaturesStreaming(t *testing.T) {
 			Case:          "streaming not configured",
 			ExpectedFeats: 0,
 		},
-		{
-			Case:             "POSH_DISABLE_STREAMING overrides the config",
-			Streaming:        100,
-			DisableStreaming: "1",
-			ExpectedFeats:    0,
-		},
 	}
 
 	for _, tc := range cases {
 		env := &mock.Environment{}
 		env.On("Shell").Return(shell.PWSH)
-		env.On("Getenv", "POSH_DISABLE_STREAMING").Return(tc.DisableStreaming)
 
 		cfg := &Config{
 			Streaming: tc.Streaming,

src/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/invopop/jsonschema v0.14.0
 	github.com/lucasb-eyer/go-colorful v1.4.1
 	github.com/pelletier/go-toml/v2 v2.4.3
-	github.com/shirou/gopsutil/v4 v4.26.7
+	github.com/shirou/gopsutil/v4 v4.26.8
 	github.com/stretchr/testify v1.12.1
 	github.com/wayneashleyberry/terminal-dimensions v1.1.0
 	go.yaml.in/yaml/v3 v3.0.5

src/go.sum

@@ -85,8 +85,8 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
 github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/shirou/gopsutil/v4 v4.26.7 h1:IXzpHz/dkMRYAhKkOXr1HB6SuzWU3eoyyeWe7g3bNZc=
-github.com/shirou/gopsutil/v4 v4.26.7/go.mod h1:5O9FjBiXoTDFatIWjZZosqj4pV0DRtLx598xGbBehzM=
+github.com/shirou/gopsutil/v4 v4.26.8 h1:YQMTF/1J50B5+Y0vlo1eDRf5DoR7Gk69hY+8wjYkQeo=
+github.com/shirou/gopsutil/v4 v4.26.8/go.mod h1:5O9FjBiXoTDFatIWjZZosqj4pV0DRtLx598xGbBehzM=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=

src/prompt/golden_test.go

@@ -53,7 +53,7 @@ const regenerateFixtureCommand = "go run . config export data --sanitize --theme
 
 // fixturePath is the single sanitized --data fixture every bundled theme
 // renders against - see the package comment above for why one shared fixture
-// replaces what used to be 124 per-theme files.
+// replaces what used to be 125 per-theme files.
 var fixturePath = filepath.Join("testdata", "fixtures", "prompt.data.json")
 
 // sanitizedPWD is the PWD value cli/sanitize.go bakes into fixturePath (see
@@ -69,7 +69,7 @@ var update = flag.Bool("update", false, "regenerate the golden manifest and repr
 // fixture. code.yml runs `go test ./...` on ubuntu, macOS and windows, so all
 // three matter, not just this machine.
 func TestMain(m *testing.M) {
-	// 65 of 124 themes render a time segment through dateInZone(fmt, date,
+	// 65 of 125 themes render a time segment through dateInZone(fmt, date,
 	// "Local") (template/date.go). The segment's own state is baked into the
 	// fixture at record time (restoreData never re-probes it), but formatting
 	// that recorded instant still happens at render time in the process's
@@ -216,7 +216,7 @@ func renderTheme(t *testing.T, themePath, fixturePath string) []byte {
 	// template.Init only rebuilds the package-level template.Cache singleton
 	// when it is nil (template/init.go) - by design, for the serve daemon,
 	// which stays alive across many renders and calls ResetCache itself
-	// between them (cli/serve.go). This harness renders 124 different themes
+	// between them (cli/serve.go). This harness renders 125 different themes
 	// (each with its own env identity) in one process, and other tests in
 	// this package also populate Cache directly, so without forcing a rebuild
 	// here every render after the first would silently reuse whichever env
@@ -314,13 +314,13 @@ func contextWindow(b []byte, offset int) []byte {
 }
 
 // TestGoldenThemes renders every bundled theme from its committed fixture and
-// checks it two ways: a sha256 line in the manifest (all 124 themes) and,
+// checks it two ways: a sha256 line in the manifest (all 125 themes) and,
 // additionally for representativeThemes, a byte-for-byte comparison against a
 // committed golden file. Run with -update to regenerate both instead of
 // comparing.
 func TestGoldenThemes(t *testing.T) {
 	themePaths := themeFiles(t)
-	require.Lenf(t, themePaths, 124, "expected 124 bundled themes (122 .omp.json + 2 .omp.yaml); "+
+	require.Lenf(t, themePaths, 125, "expected 125 bundled themes (123 .omp.json + 2 .omp.yaml); "+
 		"if this changed intentionally, update the fixture/golden set for the new/removed theme(s)")
 
 	type manifestEntry struct {

src/prompt/testdata/goldens/manifest.txt

@@ -51,6 +51,7 @@ if_tea 1485171bfd8dc7ed6c8741682d96b434075286345a7e493ece046180f276ba6d
 illusi0n 136fcbf744b7423de9326452b336b9c85e7edc2888821a166939019f41d24c5f
 iterm2 39e7436753c8cdae446cd25670bd3f33e11a807720d1f01047f3e724debb679d
 jandedobbeleer 28dc389e8d6265370039f2c749559e181a659d35272aebfc8a1120dc1ed4443d
+jandedobbeleer-accessible d6f8430dbe8df92601134d90ebd6a5838dfe0bb3d91e13def35d7d0e86a530b1
 jblab_2021 72923b996d17e9502f0cc5d182eebc64948eac132fdbf767e6f520ea9a415556
 jonnychipz 4a5ef8a7154c7c3c237e387d8d03858ff59b942b937c232fabd23ec419c9efc0
 json f8a1ebf6f791cb08a142718cf2ad34e338f562584d59655c903064458244efa3

src/shell/cmd.go

@@ -33,7 +33,7 @@ else
     os.execute(string.format('"%s" notice', omp_executable))
 end`
 	case Streaming:
-		return "serve_enabled = true"
+		return "if os.getenv(\"POSH_DISABLE_STREAMING\") == nil then\n    serve_enabled = true\nend"
 	case PromptMark, PoshGit, Azure, LineError, Jobs, CursorPositioning, Async, KeyHandlers, VIMode:
 		fallthrough
 	default:

src/shell/cmd_test.go

@@ -27,7 +27,9 @@ else
     os.execute(string.format('"%s" notice', omp_executable))
 end
 rprompt_enabled = true
-serve_enabled = true`
+if os.getenv("POSH_DISABLE_STREAMING") == nil then
+    serve_enabled = true
+end`
 
 	assert.Equal(t, want, got)
 }

src/shell/fish.go

@@ -24,7 +24,7 @@ func (f Features) Fish() Code {
 	case Tooltips:
 		return "enable_poshtooltips"
 	case Streaming:
-		return "set --global _omp_enable_streaming 1"
+		return "if not set -q POSH_DISABLE_STREAMING; set --global _omp_enable_streaming 1; end"
 	case Upgrade:
 		return unixUpgrade
 	case Notice: