fix(team): prefer tmux teammates for desktop launches
This commit is contained in:
parent
cf8df6b306
commit
d549006aaf
3 changed files with 56 additions and 0 deletions
|
|
@ -73,6 +73,7 @@ import { TeamMetaStore } from './TeamMetaStore';
|
||||||
import { TeamSentMessagesStore } from './TeamSentMessagesStore';
|
import { TeamSentMessagesStore } from './TeamSentMessagesStore';
|
||||||
import { TeamTaskReader } from './TeamTaskReader';
|
import { TeamTaskReader } from './TeamTaskReader';
|
||||||
import { TeamLaunchStateStore } from './TeamLaunchStateStore';
|
import { TeamLaunchStateStore } from './TeamLaunchStateStore';
|
||||||
|
import { getDesktopPreferredTeammateMode } from './runtimeTeammateMode';
|
||||||
import {
|
import {
|
||||||
createPersistedLaunchSnapshot,
|
createPersistedLaunchSnapshot,
|
||||||
snapshotFromRuntimeMemberStatuses,
|
snapshotFromRuntimeMemberStatuses,
|
||||||
|
|
@ -4356,6 +4357,7 @@ export class TeamProvisioningService {
|
||||||
const { env: shellEnv, geminiRuntimeAuth } = await this.buildProvisioningEnv(
|
const { env: shellEnv, geminiRuntimeAuth } = await this.buildProvisioningEnv(
|
||||||
request.providerId
|
request.providerId
|
||||||
);
|
);
|
||||||
|
const preferredTeammateMode = await getDesktopPreferredTeammateMode(request.extraCliArgs);
|
||||||
let mcpConfigPath: string;
|
let mcpConfigPath: string;
|
||||||
try {
|
try {
|
||||||
mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(request.cwd);
|
mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(request.cwd);
|
||||||
|
|
@ -4386,6 +4388,7 @@ 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] : []),
|
||||||
|
...(preferredTeammateMode ? ['--teammate-mode', preferredTeammateMode] : []),
|
||||||
...parseCliArgs(request.extraCliArgs),
|
...parseCliArgs(request.extraCliArgs),
|
||||||
];
|
];
|
||||||
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
||||||
|
|
@ -4859,6 +4862,7 @@ export class TeamProvisioningService {
|
||||||
const { env: shellEnv, geminiRuntimeAuth } = await this.buildProvisioningEnv(
|
const { env: shellEnv, geminiRuntimeAuth } = await this.buildProvisioningEnv(
|
||||||
request.providerId
|
request.providerId
|
||||||
);
|
);
|
||||||
|
const preferredTeammateMode = await getDesktopPreferredTeammateMode(request.extraCliArgs);
|
||||||
let mcpConfigPath: string;
|
let mcpConfigPath: string;
|
||||||
try {
|
try {
|
||||||
mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(request.cwd);
|
mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(request.cwd);
|
||||||
|
|
@ -4903,6 +4907,9 @@ export class TeamProvisioningService {
|
||||||
if (request.worktree) {
|
if (request.worktree) {
|
||||||
launchArgs.push('--worktree', request.worktree);
|
launchArgs.push('--worktree', request.worktree);
|
||||||
}
|
}
|
||||||
|
if (preferredTeammateMode) {
|
||||||
|
launchArgs.push('--teammate-mode', preferredTeammateMode);
|
||||||
|
}
|
||||||
launchArgs.push(...parseCliArgs(request.extraCliArgs));
|
launchArgs.push(...parseCliArgs(request.extraCliArgs));
|
||||||
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
|
||||||
geminiRuntimeAuth,
|
geminiRuntimeAuth,
|
||||||
|
|
@ -9653,6 +9660,7 @@ export class TeamProvisioningService {
|
||||||
? { CLAUDE_CONFIG_DIR: getClaudeBasePath() }
|
? { CLAUDE_CONFIG_DIR: getClaudeBasePath() }
|
||||||
: {}),
|
: {}),
|
||||||
CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS: '1',
|
CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS: '1',
|
||||||
|
CLAUDE_CODE_ENTRYPOINT: 'claude-desktop',
|
||||||
};
|
};
|
||||||
applyConfiguredRuntimeBackendsEnv(env);
|
applyConfiguredRuntimeBackendsEnv(env);
|
||||||
applyProviderRuntimeEnv(env, providerId);
|
applyProviderRuntimeEnv(env, providerId);
|
||||||
|
|
|
||||||
47
src/main/services/team/runtimeTeammateMode.ts
Normal file
47
src/main/services/team/runtimeTeammateMode.ts
Normal file
|
|
@ -0,0 +1,47 @@
|
||||||
|
import { execFile } from 'child_process';
|
||||||
|
|
||||||
|
import { parseCliArgs } from '@shared/utils/cliArgsParser';
|
||||||
|
|
||||||
|
let tmuxAvailablePromise: Promise<boolean> | null = null;
|
||||||
|
|
||||||
|
function execFileAsync(command: string, args: string[], timeout: number): Promise<void> {
|
||||||
|
return new Promise((resolve, reject) => {
|
||||||
|
execFile(command, args, { timeout }, (error) => {
|
||||||
|
if (error) {
|
||||||
|
reject(error);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
resolve();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function hasExplicitTeammateMode(rawExtraCliArgs: string | undefined): boolean {
|
||||||
|
return parseCliArgs(rawExtraCliArgs).some(
|
||||||
|
(token) => token === '--teammate-mode' || token.startsWith('--teammate-mode=')
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function isTmuxAvailable(): Promise<boolean> {
|
||||||
|
if (!tmuxAvailablePromise) {
|
||||||
|
tmuxAvailablePromise = execFileAsync('tmux', ['-V'], 3_000)
|
||||||
|
.then(() => true)
|
||||||
|
.catch(() => false);
|
||||||
|
}
|
||||||
|
|
||||||
|
return tmuxAvailablePromise;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getDesktopPreferredTeammateMode(
|
||||||
|
rawExtraCliArgs: string | undefined
|
||||||
|
): Promise<'tmux' | null> {
|
||||||
|
if (process.platform === 'win32') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasExplicitTeammateMode(rawExtraCliArgs)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (await isTmuxAvailable()) ? 'tmux' : null;
|
||||||
|
}
|
||||||
|
|
@ -26,6 +26,7 @@ export const PROTECTED_CLI_FLAGS = new Set([
|
||||||
'--verbose',
|
'--verbose',
|
||||||
'--model',
|
'--model',
|
||||||
'--effort',
|
'--effort',
|
||||||
|
'--teammate-mode',
|
||||||
'--resume',
|
'--resume',
|
||||||
'--permission-mode',
|
'--permission-mode',
|
||||||
'--permission-prompt-tool',
|
'--permission-prompt-tool',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue