fix(shell): respect POSH_DISABLE_STREAMING at runtime

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: JanDeDobbeleer

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.
+// streamingEnabled reports whether streaming should be enabled: it's configured.
 func (cfg *Config) streamingEnabled(env runtime.Environment) bool {
-	return cfg.Streaming > 0 && env.Getenv("POSH_DISABLE_STREAMING") != "1"
+	return cfg.Streaming > 0
 }
 
 func (cfg *Config) Features(env runtime.Environment) shell.Features {

src/config/config_test.go

@@ -177,12 +177,6 @@ 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 {

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\") ~= \"1\" 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") ~= "1" 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 test \"$POSH_DISABLE_STREAMING\" != \"1\"; set --global _omp_enable_streaming 1; end"
 	case Upgrade:
 		return unixUpgrade
 	case Notice:

src/shell/fish_test.go

@@ -18,7 +18,7 @@ set --global _omp_ftcs_marks 1
 "$_omp_executable" notice
 set --global _omp_prompt_mark 1
 set --global _omp_cursor_positioning 1
-set --global _omp_enable_streaming 1
+if test "$POSH_DISABLE_STREAMING" != "1"; set --global _omp_enable_streaming 1; end
 _omp_enable_vimode
 set --global _omp_transient_rprompt 1`
 

src/shell/pwsh_test.go

@@ -33,6 +33,11 @@ Enable-PoshVIMode`
 	assert.Equal(t, want, got)
 }
 
+func TestPwshStreamingGuard(t *testing.T) {
+	assert.Contains(t, pwshInit, "if ($env:POSH_DISABLE_STREAMING -eq '1') {")
+	assert.Contains(t, pwshInit, "return")
+}
+
 func TestSourceCommandAsyncPwsh(t *testing.T) {
 	got := sourceCommandAsync(PWSH, "C:/cache/init.pwsh.ps1")
 

src/shell/scripts/omp.ps1

@@ -993,6 +993,10 @@ New-Module -Name "oh-my-posh-core" -ScriptBlock {
     }
 
     function Enable-PoshStreaming {
+        if ($env:POSH_DISABLE_STREAMING -eq '1') {
+            return
+        }
+
         $global:_ompStreaming = $true
 
         if (-not $script:ServeSupported) {

src/shell/zsh.go

@@ -22,7 +22,7 @@ func (f Features) Zsh() Code {
 	case Notice:
 		return unixNotice
 	case Streaming:
-		return "_omp_enable_streaming=1"
+		return "if [[ \"${POSH_DISABLE_STREAMING:-}\" != \"1\" ]]; then _omp_enable_streaming=1; fi"
 	case VIMode:
 		return "_omp_enable_vimode"
 	case PromptMark, RPrompt, PoshGit, Azure, LineError, Jobs, Async, KeyHandlers:

src/shell/zsh_test.go

@@ -20,7 +20,7 @@ _omp_ftcs_marks=1
 "$_omp_executable" upgrade --auto
 "$_omp_executable" notice
 _omp_cursor_positioning=1
-_omp_enable_streaming=1
+if [[ "${POSH_DISABLE_STREAMING:-}" != "1" ]]; then _omp_enable_streaming=1; fi
 _omp_enable_vimode`
 
 	assert.Equal(t, want, got)