From ae2ccf2386a101ece725012ac4281000419483c5 Mon Sep 17 00:00:00 2001
From: iliya <iliyazelenkog@gmail.com>
Date: Mon, 6 Apr 2026 15:58:48 +0300
Subject: [PATCH] fix(team): preserve desktop teammate fallback semantics

---
 src/main/services/team/TeamProvisioningService.ts |  6 ------
 src/main/services/team/runtimeTeammateMode.ts     | 14 +++++++-------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/services/team/TeamProvisioningService.ts b/src/main/services/team/TeamProvisioningService.ts
index 2d74b6c9..da04959c 100644
--- a/src/main/services/team/TeamProvisioningService.ts
+++ b/src/main/services/team/TeamProvisioningService.ts
@@ -4391,9 +4391,6 @@ export class TeamProvisioningService {
         ...(request.model ? ['--model', request.model] : []),
         ...(request.effort ? ['--effort', request.effort] : []),
         ...(request.worktree ? ['--worktree', request.worktree] : []),
-        ...(teammateModeDecision.injectedTeammateMode
-          ? ['--teammate-mode', teammateModeDecision.injectedTeammateMode]
-          : []),
         ...parseCliArgs(request.extraCliArgs),
       ];
       const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
@@ -4915,9 +4912,6 @@ export class TeamProvisioningService {
       if (request.worktree) {
         launchArgs.push('--worktree', request.worktree);
       }
-      if (teammateModeDecision.injectedTeammateMode) {
-        launchArgs.push('--teammate-mode', teammateModeDecision.injectedTeammateMode);
-      }
       launchArgs.push(...parseCliArgs(request.extraCliArgs));
       const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
         geminiRuntimeAuth,
diff --git a/src/main/services/team/runtimeTeammateMode.ts b/src/main/services/team/runtimeTeammateMode.ts
index d260c3da..2c743d6c 100644
--- a/src/main/services/team/runtimeTeammateMode.ts
+++ b/src/main/services/team/runtimeTeammateMode.ts
@@ -76,13 +76,6 @@ async function isTmuxAvailable(): Promise<boolean> {
 export async function resolveDesktopTeammateModeDecision(
   rawExtraCliArgs: string | undefined
 ): Promise<DesktopTeammateModeDecision> {
-  if (process.platform === 'win32') {
-    return {
-      injectedTeammateMode: null,
-      forceProcessTeammates: false,
-    };
-  }
-
   const explicitMode = getExplicitTeammateMode(rawExtraCliArgs);
   if (explicitMode === 'tmux') {
     return {
@@ -98,6 +91,13 @@ export async function resolveDesktopTeammateModeDecision(
     };
   }
 
+  if (process.platform === 'win32') {
+    return {
+      injectedTeammateMode: null,
+      forceProcessTeammates: false,
+    };
+  }
+
   if (!(await isTmuxAvailable())) {
     return {
       injectedTeammateMode: null,