mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-04-22 02:54:31 -07:00
rename zed
This commit is contained in:
+1
-1
@@ -14,7 +14,7 @@ import {
|
|||||||
type Mock,
|
type Mock,
|
||||||
type Mocked,
|
type Mocked,
|
||||||
} from 'vitest';
|
} from 'vitest';
|
||||||
import { GeminiAgent, Session } from './zedIntegration.js';
|
import { GeminiAgent, Session } from './acpClient.js';
|
||||||
import * as acp from '@agentclientprotocol/sdk';
|
import * as acp from '@agentclientprotocol/sdk';
|
||||||
import {
|
import {
|
||||||
AuthType,
|
AuthType,
|
||||||
+1
-1
@@ -61,7 +61,7 @@ import { loadCliConfig } from '../config/config.js';
|
|||||||
import { runExitCleanup } from '../utils/cleanup.js';
|
import { runExitCleanup } from '../utils/cleanup.js';
|
||||||
import { SessionSelector } from '../utils/sessionUtils.js';
|
import { SessionSelector } from '../utils/sessionUtils.js';
|
||||||
|
|
||||||
export async function runZedIntegration(
|
export async function runAcpClient(
|
||||||
config: Config,
|
config: Config,
|
||||||
settings: LoadedSettings,
|
settings: LoadedSettings,
|
||||||
argv: CliArgs,
|
argv: CliArgs,
|
||||||
+1
-1
@@ -13,7 +13,7 @@ import {
|
|||||||
type Mocked,
|
type Mocked,
|
||||||
type Mock,
|
type Mock,
|
||||||
} from 'vitest';
|
} from 'vitest';
|
||||||
import { GeminiAgent } from './zedIntegration.js';
|
import { GeminiAgent } from './acpClient.js';
|
||||||
import * as acp from '@agentclientprotocol/sdk';
|
import * as acp from '@agentclientprotocol/sdk';
|
||||||
import {
|
import {
|
||||||
ApprovalMode,
|
ApprovalMode,
|
||||||
@@ -79,7 +79,7 @@ import {
|
|||||||
type InitializationResult,
|
type InitializationResult,
|
||||||
} from './core/initializer.js';
|
} from './core/initializer.js';
|
||||||
import { validateAuthMethod } from './config/auth.js';
|
import { validateAuthMethod } from './config/auth.js';
|
||||||
import { runZedIntegration } from './zed-integration/zedIntegration.js';
|
import { runAcpClient } from './acp/acpClient.js';
|
||||||
import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
|
import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
|
||||||
import { checkForUpdates } from './ui/utils/updateCheck.js';
|
import { checkForUpdates } from './ui/utils/updateCheck.js';
|
||||||
import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
|
import { handleAutoUpdate } from './utils/handleAutoUpdate.js';
|
||||||
@@ -673,7 +673,7 @@ export async function main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (config.getAcpMode()) {
|
if (config.getAcpMode()) {
|
||||||
return runZedIntegration(config, settings, argv);
|
return runAcpClient(config, settings, argv);
|
||||||
}
|
}
|
||||||
|
|
||||||
let input = config.getQuestion();
|
let input = config.getQuestion();
|
||||||
|
|||||||
@@ -141,8 +141,8 @@ vi.mock('./utils/cleanup.js', async (importOriginal) => {
|
|||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
vi.mock('./zed-integration/zedIntegration.js', () => ({
|
vi.mock('./acp/acpClient.js', () => ({
|
||||||
runZedIntegration: vi.fn().mockResolvedValue(undefined),
|
runAcpClient: vi.fn().mockResolvedValue(undefined),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
vi.mock('./utils/readStdin.js', () => ({
|
vi.mock('./utils/readStdin.js', () => ({
|
||||||
|
|||||||
@@ -271,7 +271,7 @@ async function initOauthClient(
|
|||||||
|
|
||||||
await triggerPostAuthCallbacks(client.credentials);
|
await triggerPostAuthCallbacks(client.credentials);
|
||||||
} else {
|
} else {
|
||||||
// In Zed integration, we skip the interactive consent and directly open the browser
|
// In ACP mode, we skip the interactive consent and directly open the browser
|
||||||
if (!config.getAcpMode()) {
|
if (!config.getAcpMode()) {
|
||||||
const userConsent = await getConsentForOauth('');
|
const userConsent = await getConsentForOauth('');
|
||||||
if (!userConsent) {
|
if (!userConsent) {
|
||||||
|
|||||||
Reference in New Issue
Block a user