fix(team): preserve desktop teammate fallback semantics
This commit is contained in:
parent
5402ddfe97
commit
ae2ccf2386
2 changed files with 7 additions and 13 deletions
|
|
@ -4391,9 +4391,6 @@ export class TeamProvisioningService {
|
||||||
...(request.model ? ['--model', request.model] : []),
|
...(request.model ? ['--model', request.model] : []),
|
||||||
...(request.effort ? ['--effort', request.effort] : []),
|
...(request.effort ? ['--effort', request.effort] : []),
|
||||||
...(request.worktree ? ['--worktree', request.worktree] : []),
|
...(request.worktree ? ['--worktree', request.worktree] : []),
|
||||||
...(teammateModeDecision.injectedTeammateMode
|
|
||||||
? ['--teammate-mode', teammateModeDecision.injectedTeammateMode]
|
|
||||||
: []),
|
|
||||||
...parseCliArgs(request.extraCliArgs),
|
...parseCliArgs(request.extraCliArgs),
|
||||||
];
|
];
|
||||||
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
||||||
|
|
@ -4915,9 +4912,6 @@ export class TeamProvisioningService {
|
||||||
if (request.worktree) {
|
if (request.worktree) {
|
||||||
launchArgs.push('--worktree', request.worktree);
|
launchArgs.push('--worktree', request.worktree);
|
||||||
}
|
}
|
||||||
if (teammateModeDecision.injectedTeammateMode) {
|
|
||||||
launchArgs.push('--teammate-mode', teammateModeDecision.injectedTeammateMode);
|
|
||||||
}
|
|
||||||
launchArgs.push(...parseCliArgs(request.extraCliArgs));
|
launchArgs.push(...parseCliArgs(request.extraCliArgs));
|
||||||
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
||||||
geminiRuntimeAuth,
|
geminiRuntimeAuth,
|
||||||
|
|
|
||||||
|
|
@ -76,13 +76,6 @@ async function isTmuxAvailable(): Promise<boolean> {
|
||||||
export async function resolveDesktopTeammateModeDecision(
|
export async function resolveDesktopTeammateModeDecision(
|
||||||
rawExtraCliArgs: string | undefined
|
rawExtraCliArgs: string | undefined
|
||||||
): Promise<DesktopTeammateModeDecision> {
|
): Promise<DesktopTeammateModeDecision> {
|
||||||
if (process.platform === 'win32') {
|
|
||||||
return {
|
|
||||||
injectedTeammateMode: null,
|
|
||||||
forceProcessTeammates: false,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
const explicitMode = getExplicitTeammateMode(rawExtraCliArgs);
|
const explicitMode = getExplicitTeammateMode(rawExtraCliArgs);
|
||||||
if (explicitMode === 'tmux') {
|
if (explicitMode === 'tmux') {
|
||||||
return {
|
return {
|
||||||
|
|
@ -98,6 +91,13 @@ export async function resolveDesktopTeammateModeDecision(
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
return {
|
||||||
|
injectedTeammateMode: null,
|
||||||
|
forceProcessTeammates: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
if (!(await isTmuxAvailable())) {
|
if (!(await isTmuxAvailable())) {
|
||||||
return {
|
return {
|
||||||
injectedTeammateMode: null,
|
injectedTeammateMode: null,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue