MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-03-20 02:51:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: generalize background execution contract

Browse Source
This commit is contained in:
Adam Weidman
2026-03-08 19:45:50 -04:00
parent 3940d6344a
commit 9a441ef927
6 changed files with 122 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
packages/cli/src/ui/hooks/useGeminiStream.ts
View File

@@ -94,18 +94,19 @@ type ToolResponseWithParts = ToolCallResponseInfo & {
llmContent?: PartListUnion;
};
interface BackgroundExecutionData {
pid?: number;
command?: string;
initialOutput?: string;
}
interface BackgroundedShellInfo {
pid: number;
command: string;
initialOutput: string;
}
interface BackgroundExecutionData {
executionId?: number;
pid?: number;
command?: string;
initialOutput?: string;
}
enum StreamProcessingStatus {
Completed,
UserCancelled,
@@ -123,14 +124,33 @@ function isBackgroundExecutionData(
if (typeof data !== 'object' || data === null) {
return false;
}
const d = data as Partial<BackgroundExecutionData>;
const executionId = 'executionId' in data ? data.executionId : undefined;
const pid = 'pid' in data ? data.pid : undefined;
const command = 'command' in data ? data.command : undefined;
const initialOutput =
'initialOutput' in data ? data.initialOutput : undefined;
return (
(d.pid === undefined || typeof d.pid === 'number') &&
(d.command === undefined || typeof d.command === 'string') &&
(d.initialOutput === undefined || typeof d.initialOutput === 'string')
(executionId === undefined || typeof executionId === 'number') &&
(pid === undefined || typeof pid === 'number') &&
(command === undefined || typeof command === 'string') &&
(initialOutput === undefined || typeof initialOutput === 'string')
);
}
function getBackgroundExecutionId(
data: BackgroundExecutionData,
): number | undefined {
if (typeof data.executionId === 'number') {
return data.executionId;
}
if (typeof data.pid === 'number') {
return data.pid;
}
return undefined;
}
function getBackgroundedShellInfo(
toolCall: TrackedCompletedToolCall | TrackedCancelledToolCall,
): BackgroundedShellInfo | undefined {
@@ -141,13 +161,14 @@ function getBackgroundedShellInfo(
const response = toolCall.response as ToolResponseWithParts;
const rawData = response?.data;
const data = isBackgroundExecutionData(rawData) ? rawData : undefined;
const executionId = data ? getBackgroundExecutionId(data) : undefined;
if (!data?.pid) {
if (!executionId) {
return undefined;
}
return {
pid: data.pid,
pid: executionId,
command: data.command ?? 'shell',
initialOutput: data.initialOutput ?? '',
};