@google/gemini-cli 0.41.0-preview.0 → 0.41.0-preview.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundle/{chunk-EOA2HX63.js → chunk-2E4E2OEF.js} +2 -2
- package/bundle/{chunk-YBG43HPA.js → chunk-2YV27CKR.js} +1 -1
- package/bundle/{chunk-NQUBPNAU.js → chunk-3GHJ5HPF.js} +6 -6
- package/bundle/{chunk-IEYJEBJX.js → chunk-3Q7BP33C.js} +67 -54
- package/bundle/{chunk-3ANRVMZF.js → chunk-4GYMEM7F.js} +2 -2
- package/bundle/{chunk-LAT5YFL4.js → chunk-6P6WKPYI.js} +2 -2
- package/bundle/{chunk-HR7I3HEY.js → chunk-7CD6GCRT.js} +1 -1
- package/bundle/{chunk-PXLG652S.js → chunk-ANBD6P4M.js} +97 -49
- package/bundle/{chunk-WSDOIL74.js → chunk-BDZNOCWJ.js} +74 -39
- package/bundle/{chunk-JC6VKC3C.js → chunk-BYSXGJG3.js} +1 -1
- package/bundle/chunk-FQGCL5I2.js +80034 -0
- package/bundle/{chunk-MVAX27IS.js → chunk-FZXNSS2J.js} +3 -3
- package/bundle/chunk-HOQYVHXU.js +118 -0
- package/bundle/{chunk-WROAWEH3.js → chunk-L35AXZHM.js} +6728 -12460
- package/bundle/chunk-LBPROGQS.js +156 -0
- package/bundle/{chunk-MJJLAQ6U.js → chunk-ODPEYGXR.js} +1 -1
- package/bundle/{chunk-42DYHGPE.js → chunk-OR5JBPQX.js} +1 -1
- package/bundle/{chunk-WYBLOXVK.js → chunk-RYFTYJ75.js} +1 -1
- package/bundle/{chunk-X2LHBPEJ.js → chunk-S4SLTOZU.js} +14 -12
- package/bundle/chunk-SR4PMLVP.js +354496 -0
- package/bundle/{chunk-BKZ2ONXI.js → chunk-V2QQW5SA.js} +1 -1
- package/bundle/chunk-VHJM22NK.js +1571 -0
- package/bundle/chunk-XBNSSOYA.js +17656 -0
- package/bundle/{chunk-FZCJQ7YB.js → chunk-ZHHJJC4N.js} +6 -6
- package/bundle/{cleanup-UES5UWIG.js → cleanup-2BMR4MMJ.js} +2 -2
- package/bundle/{cleanup-Z4RYESBA.js → cleanup-FHOD65Y6.js} +3 -3
- package/bundle/{cleanup-KLFDN77S.js → cleanup-HRWHMMWM.js} +2 -2
- package/bundle/cleanup-TCNEYDWT.js +33 -0
- package/bundle/{core-Q32MZ3QF.js → core-TKDA7N4G.js} +1 -1
- package/bundle/{devtoolsService-ZDMUH5GA.js → devtoolsService-6EOO2BQ7.js} +2 -2
- package/bundle/{devtoolsService-N3SEUDJ7.js → devtoolsService-7LCCYOTU.js} +5 -4
- package/bundle/devtoolsService-EFVBXKEX.js +857 -0
- package/bundle/{devtoolsService-P5BXPJX5.js → devtoolsService-V2NU6TJG.js} +2 -2
- package/bundle/{dist-UL5N47TA.js → dist-KFV2ASJV.js} +1 -1
- package/bundle/{core-3W43VO4W.js → dist-PGH3GHGN.js} +2 -2
- package/bundle/dist-VXU5NT6O.js +2068 -0
- package/bundle/{gemini-PL45Y473.js → gemini-FLUMXCL4.js} +12 -12
- package/bundle/{gemini-K6LJN552.js → gemini-GNABGJLN.js} +12 -12
- package/bundle/{gemini-DGVTFOIS.js → gemini-V7YPSW3T.js} +191 -175
- package/bundle/gemini-YG4MES4L.js +15988 -0
- package/bundle/gemini.js +3 -3
- package/bundle/{interactiveCli-O7Y36MPM.js → interactiveCli-JNHY7R4J.js} +6 -6
- package/bundle/{interactiveCli-JL5IXH2I.js → interactiveCli-MD3WNLOS.js} +290 -272
- package/bundle/{interactiveCli-ZJGQKU2Z.js → interactiveCli-VP7SGM2Z.js} +6 -6
- package/bundle/interactiveCli-ZWNNSDPF.js +35052 -0
- package/bundle/{liteRtServerManager-QGTT3QOY.js → liteRtServerManager-4OYQKJDU.js} +3 -3
- package/bundle/{liteRtServerManager-2LAXDWUG.js → liteRtServerManager-D3KQXYD2.js} +4 -4
- package/bundle/liteRtServerManager-ONE7YJHO.js +65 -0
- package/bundle/{liteRtServerManager-YCLQ2VZR.js → liteRtServerManager-OYB4D65F.js} +3 -3
- package/bundle/node_modules/@google/gemini-cli-devtools/package.json +1 -1
- package/bundle/{oauth2-provider-ZUEDS4RO.js → oauth2-provider-BT67SZ33.js} +1 -1
- package/bundle/{oauth2-provider-RR3PO6KR.js → oauth2-provider-KNDXPBH3.js} +39 -73
- package/bundle/{oauth2-provider-Q5QVFX4W.js → oauth2-provider-LDPCE34C.js} +1 -1
- package/bundle/oauth2-provider-RGOB2KSE.js +237 -0
- package/bundle/{start-V4W5V2EL.js → start-3OOWLPJZ.js} +5 -5
- package/bundle/{start-P6O7G2IY.js → start-6T3XMMID.js} +5 -5
- package/bundle/{start-6ZXD64J4.js → start-LNWEO65C.js} +6 -6
- package/bundle/start-U3FP4KVT.js +18 -0
- package/package.json +1 -1
|
@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
exitCli,
|
|
4
4
|
require_source
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-ODPEYGXR.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-XBNSSOYA.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
20
|
} from "./chunk-SAJ72M2G.js";
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
import {
|
|
7
7
|
exitCli,
|
|
8
8
|
require_source
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-VHJM22NK.js";
|
|
10
10
|
import {
|
|
11
11
|
DEFAULT_BACKGROUND_OPACITY,
|
|
12
12
|
DEFAULT_BORDER_OPACITY,
|
|
@@ -59,10 +59,10 @@ import {
|
|
|
59
59
|
stripUnsafeCharacters,
|
|
60
60
|
toCodePoints,
|
|
61
61
|
validateCustomTheme
|
|
62
|
-
} from "./chunk-
|
|
62
|
+
} from "./chunk-7CD6GCRT.js";
|
|
63
63
|
import {
|
|
64
64
|
runExitCleanup
|
|
65
|
-
} from "./chunk-
|
|
65
|
+
} from "./chunk-2YV27CKR.js";
|
|
66
66
|
import {
|
|
67
67
|
AsyncFzf,
|
|
68
68
|
AuthType,
|
|
@@ -208,7 +208,7 @@ import {
|
|
|
208
208
|
stripAnsi,
|
|
209
209
|
tokenLimit,
|
|
210
210
|
uiTelemetryService
|
|
211
|
-
} from "./chunk-
|
|
211
|
+
} from "./chunk-L35AXZHM.js";
|
|
212
212
|
import {
|
|
213
213
|
ApprovalMode,
|
|
214
214
|
CoreEvent,
|
|
@@ -55003,7 +55003,7 @@ var authCommand = {
|
|
|
55003
55003
|
import process29 from "node:process";
|
|
55004
55004
|
|
|
55005
55005
|
// packages/cli/src/generated/git-commit.ts
|
|
55006
|
-
var GIT_COMMIT_INFO = "
|
|
55006
|
+
var GIT_COMMIT_INFO = "c6a695d1b";
|
|
55007
55007
|
|
|
55008
55008
|
// packages/cli/src/ui/utils/historyExportUtils.ts
|
|
55009
55009
|
import * as fsPromises from "node:fs/promises";
|
|
@@ -60488,7 +60488,7 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
60488
60488
|
type: "info",
|
|
60489
60489
|
text: `Starting OAuth authentication for MCP server '${serverName}'...`
|
|
60490
60490
|
});
|
|
60491
|
-
const { MCPOAuthProvider } = await import("./dist-
|
|
60491
|
+
const { MCPOAuthProvider } = await import("./dist-VXU5NT6O.js");
|
|
60492
60492
|
let oauthConfig = server.oauth;
|
|
60493
60493
|
if (!oauthConfig) {
|
|
60494
60494
|
oauthConfig = { enabled: false };
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
import {
|
|
7
7
|
exitCli,
|
|
8
8
|
require_source
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-ODPEYGXR.js";
|
|
10
10
|
import {
|
|
11
11
|
DEFAULT_BACKGROUND_OPACITY,
|
|
12
12
|
DEFAULT_BORDER_OPACITY,
|
|
@@ -59,13 +59,15 @@ import {
|
|
|
59
59
|
stripUnsafeCharacters,
|
|
60
60
|
toCodePoints,
|
|
61
61
|
validateCustomTheme
|
|
62
|
-
} from "./chunk-
|
|
62
|
+
} from "./chunk-XBNSSOYA.js";
|
|
63
63
|
import {
|
|
64
64
|
runExitCleanup
|
|
65
|
-
} from "./chunk-
|
|
65
|
+
} from "./chunk-LBPROGQS.js";
|
|
66
66
|
import {
|
|
67
67
|
AsyncFzf,
|
|
68
|
+
AuthType,
|
|
68
69
|
Config,
|
|
70
|
+
CoreToolCallStatus,
|
|
69
71
|
ExtensionDisableEvent,
|
|
70
72
|
ExtensionEnableEvent,
|
|
71
73
|
ExtensionInstallEvent,
|
|
@@ -74,17 +76,27 @@ import {
|
|
|
74
76
|
ExtensionUninstallEvent,
|
|
75
77
|
ExtensionUpdateEvent,
|
|
76
78
|
GEMINI_CLI_COMPANION_EXTENSION_NAME,
|
|
79
|
+
HookType,
|
|
80
|
+
IDEConnectionStatus,
|
|
77
81
|
INITIAL_HISTORY_LENGTH,
|
|
78
82
|
IdeClient,
|
|
79
83
|
IdeConnectionEvent,
|
|
84
|
+
IdeConnectionType,
|
|
85
|
+
IntegrityDataStatus,
|
|
80
86
|
KeychainTokenStorage,
|
|
87
|
+
LlmRole,
|
|
88
|
+
MCPDiscoveryState,
|
|
81
89
|
MCPOAuthTokenStorage,
|
|
90
|
+
MCPServerStatus,
|
|
82
91
|
ModelSlashCommandEvent,
|
|
83
92
|
ProjectIdRequiredError,
|
|
84
93
|
ReadManyFilesTool,
|
|
85
94
|
RewindEvent,
|
|
95
|
+
SessionEndReason,
|
|
96
|
+
SessionStartSource,
|
|
86
97
|
ShellExecutionService,
|
|
87
98
|
StartSessionEvent,
|
|
99
|
+
TrustLevel,
|
|
88
100
|
UPGRADE_URL_PAGE,
|
|
89
101
|
UserAccountManager,
|
|
90
102
|
ValidationRequiredError,
|
|
@@ -196,12 +208,13 @@ import {
|
|
|
196
208
|
stripAnsi,
|
|
197
209
|
tokenLimit,
|
|
198
210
|
uiTelemetryService
|
|
199
|
-
} from "./chunk-
|
|
211
|
+
} from "./chunk-SR4PMLVP.js";
|
|
200
212
|
import {
|
|
201
213
|
ApprovalMode,
|
|
202
214
|
CoreEvent,
|
|
203
215
|
DiscoveredMCPTool,
|
|
204
216
|
GEMINI_DIR,
|
|
217
|
+
PolicyDecision,
|
|
205
218
|
REFERENCE_CONTENT_END,
|
|
206
219
|
REFERENCE_CONTENT_START,
|
|
207
220
|
Storage,
|
|
@@ -222,7 +235,7 @@ import {
|
|
|
222
235
|
shortenPath,
|
|
223
236
|
tildeifyPath,
|
|
224
237
|
unescapePath
|
|
225
|
-
} from "./chunk-
|
|
238
|
+
} from "./chunk-SAJ72M2G.js";
|
|
226
239
|
import {
|
|
227
240
|
require_src
|
|
228
241
|
} from "./chunk-RJTRUG2J.js";
|
|
@@ -39427,7 +39440,7 @@ var import_react34 = __toESM(require_react(), 1);
|
|
|
39427
39440
|
function useIdeTrustListener() {
|
|
39428
39441
|
const settings = useSettings();
|
|
39429
39442
|
const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
|
|
39430
|
-
|
|
39443
|
+
IDEConnectionStatus.Disconnected
|
|
39431
39444
|
);
|
|
39432
39445
|
const previousTrust = (0, import_react34.useRef)(void 0);
|
|
39433
39446
|
const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
|
|
@@ -39457,7 +39470,7 @@ function useIdeTrustListener() {
|
|
|
39457
39470
|
};
|
|
39458
39471
|
}, []);
|
|
39459
39472
|
const getSnapshot = () => {
|
|
39460
|
-
if (connectionStatus !==
|
|
39473
|
+
if (connectionStatus !== IDEConnectionStatus.Connected) {
|
|
39461
39474
|
return void 0;
|
|
39462
39475
|
}
|
|
39463
39476
|
return ideContextStore.get()?.workspaceState?.isTrusted;
|
|
@@ -39843,7 +39856,7 @@ async function initializeApp(config, settings) {
|
|
|
39843
39856
|
await ideClient.connect();
|
|
39844
39857
|
logIdeConnection(
|
|
39845
39858
|
config,
|
|
39846
|
-
new IdeConnectionEvent(
|
|
39859
|
+
new IdeConnectionEvent(IdeConnectionType.START)
|
|
39847
39860
|
);
|
|
39848
39861
|
}).catch((e) => {
|
|
39849
39862
|
debugLogger.error("Failed to initialize IDE client:", e);
|
|
@@ -39861,16 +39874,16 @@ async function initializeApp(config, settings) {
|
|
|
39861
39874
|
// packages/cli/src/config/auth.ts
|
|
39862
39875
|
function validateAuthMethod(authMethod) {
|
|
39863
39876
|
loadEnvironment(loadSettings().merged, process.cwd());
|
|
39864
|
-
if (authMethod ===
|
|
39877
|
+
if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
|
|
39865
39878
|
return null;
|
|
39866
39879
|
}
|
|
39867
|
-
if (authMethod ===
|
|
39880
|
+
if (authMethod === AuthType.USE_GEMINI) {
|
|
39868
39881
|
if (!process.env["GEMINI_API_KEY"]) {
|
|
39869
39882
|
return "When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\nUpdate your environment and try again (no reload needed if using .env)!";
|
|
39870
39883
|
}
|
|
39871
39884
|
return null;
|
|
39872
39885
|
}
|
|
39873
|
-
if (authMethod ===
|
|
39886
|
+
if (authMethod === AuthType.USE_VERTEX_AI) {
|
|
39874
39887
|
const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
|
|
39875
39888
|
const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
|
|
39876
39889
|
if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
|
|
@@ -44587,7 +44600,7 @@ var ExtensionManager = class extends ExtensionLoader {
|
|
|
44587
44600
|
const trustedFolders = loadTrustedFolders();
|
|
44588
44601
|
await trustedFolders.setValue(
|
|
44589
44602
|
this.workspaceDir,
|
|
44590
|
-
|
|
44603
|
+
TrustLevel.TRUST_FOLDER
|
|
44591
44604
|
);
|
|
44592
44605
|
} else {
|
|
44593
44606
|
throw new Error(
|
|
@@ -44773,7 +44786,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44773
44786
|
newExtensionConfig.version,
|
|
44774
44787
|
previousExtensionConfig.version,
|
|
44775
44788
|
installMetadata.type,
|
|
44776
|
-
|
|
44789
|
+
CoreToolCallStatus.Success
|
|
44777
44790
|
)
|
|
44778
44791
|
);
|
|
44779
44792
|
if (newExtensionName !== previousName) {
|
|
@@ -44796,7 +44809,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44796
44809
|
getExtensionId(newExtensionConfig, installMetadata),
|
|
44797
44810
|
newExtensionConfig.version,
|
|
44798
44811
|
installMetadata.type,
|
|
44799
|
-
|
|
44812
|
+
CoreToolCallStatus.Success
|
|
44800
44813
|
)
|
|
44801
44814
|
);
|
|
44802
44815
|
await this.enableExtension(
|
|
@@ -44829,7 +44842,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44829
44842
|
newExtensionConfig?.version ?? "",
|
|
44830
44843
|
previousExtensionConfig.version,
|
|
44831
44844
|
installMetadata.type,
|
|
44832
|
-
|
|
44845
|
+
CoreToolCallStatus.Error
|
|
44833
44846
|
)
|
|
44834
44847
|
);
|
|
44835
44848
|
} else {
|
|
@@ -44841,7 +44854,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44841
44854
|
extensionId ?? "",
|
|
44842
44855
|
newExtensionConfig?.version ?? "",
|
|
44843
44856
|
installMetadata.type,
|
|
44844
|
-
|
|
44857
|
+
CoreToolCallStatus.Error
|
|
44845
44858
|
)
|
|
44846
44859
|
);
|
|
44847
44860
|
}
|
|
@@ -44872,7 +44885,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44872
44885
|
extension.name,
|
|
44873
44886
|
hashValue(extension.name),
|
|
44874
44887
|
extension.id,
|
|
44875
|
-
|
|
44888
|
+
CoreToolCallStatus.Success
|
|
44876
44889
|
)
|
|
44877
44890
|
);
|
|
44878
44891
|
}
|
|
@@ -45142,7 +45155,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
45142
45155
|
if (eventHooks) {
|
|
45143
45156
|
for (const definition of eventHooks) {
|
|
45144
45157
|
for (const hook of definition.hooks) {
|
|
45145
|
-
if (hook.type ===
|
|
45158
|
+
if (hook.type === HookType.Command) {
|
|
45146
45159
|
hook.env = { ...hook.env, ...hookEnv };
|
|
45147
45160
|
}
|
|
45148
45161
|
}
|
|
@@ -46174,7 +46187,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
46174
46187
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
46175
46188
|
name: `resources/read (${resource.serverName})`,
|
|
46176
46189
|
description: resource.uri,
|
|
46177
|
-
status:
|
|
46190
|
+
status: CoreToolCallStatus.Success,
|
|
46178
46191
|
isClientInitiated: true,
|
|
46179
46192
|
resultDisplay: `Successfully read resource ${resource.uri}`,
|
|
46180
46193
|
confirmationDetails: void 0
|
|
@@ -46189,7 +46202,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
46189
46202
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
46190
46203
|
name: `resources/read (${resource.serverName})`,
|
|
46191
46204
|
description: resource.uri,
|
|
46192
|
-
status:
|
|
46205
|
+
status: CoreToolCallStatus.Error,
|
|
46193
46206
|
isClientInitiated: true,
|
|
46194
46207
|
resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
|
|
46195
46208
|
confirmationDetails: void 0
|
|
@@ -46214,7 +46227,7 @@ Content from @${result.uri}:
|
|
|
46214
46227
|
}
|
|
46215
46228
|
if (hasError) {
|
|
46216
46229
|
const firstError = displays.find(
|
|
46217
|
-
(d) => d.status ===
|
|
46230
|
+
(d) => d.status === CoreToolCallStatus.Error
|
|
46218
46231
|
);
|
|
46219
46232
|
return {
|
|
46220
46233
|
parts: [],
|
|
@@ -46250,7 +46263,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
|
|
|
46250
46263
|
callId: `client-read-${userMessageTimestamp}`,
|
|
46251
46264
|
name: readManyFilesTool.displayName,
|
|
46252
46265
|
description: invocation.getDescription(),
|
|
46253
|
-
status:
|
|
46266
|
+
status: CoreToolCallStatus.Success,
|
|
46254
46267
|
isClientInitiated: true,
|
|
46255
46268
|
resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
|
|
46256
46269
|
confirmationDetails: void 0
|
|
@@ -46297,7 +46310,7 @@ Content from @${displayPath}:
|
|
|
46297
46310
|
callId: `client-read-${userMessageTimestamp}`,
|
|
46298
46311
|
name: readManyFilesTool.displayName,
|
|
46299
46312
|
description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
|
|
46300
|
-
status:
|
|
46313
|
+
status: CoreToolCallStatus.Error,
|
|
46301
46314
|
isClientInitiated: true,
|
|
46302
46315
|
resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
|
|
46303
46316
|
confirmationDetails: void 0
|
|
@@ -49526,7 +49539,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
|
|
|
49526
49539
|
if (wasRaw) {
|
|
49527
49540
|
setRawMode?.(true);
|
|
49528
49541
|
}
|
|
49529
|
-
coreEvents.emit(
|
|
49542
|
+
coreEvents.emit(CoreEvent.ExternalEditorClosed);
|
|
49530
49543
|
}
|
|
49531
49544
|
}
|
|
49532
49545
|
|
|
@@ -52206,7 +52219,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
|
|
|
52206
52219
|
extension.name,
|
|
52207
52220
|
installMetadata
|
|
52208
52221
|
);
|
|
52209
|
-
if (status ===
|
|
52222
|
+
if (status === IntegrityDataStatus.INVALID) {
|
|
52210
52223
|
throw new Error("Extension integrity cannot be verified");
|
|
52211
52224
|
}
|
|
52212
52225
|
} catch (e) {
|
|
@@ -54211,7 +54224,7 @@ var MultiFolderTrustDialog = ({
|
|
|
54211
54224
|
if (choice === 1 /* YES_AND_REMEMBER */) {
|
|
54212
54225
|
await trustedFolders.setValue(
|
|
54213
54226
|
expandedPath,
|
|
54214
|
-
|
|
54227
|
+
TrustLevel.TRUST_FOLDER
|
|
54215
54228
|
);
|
|
54216
54229
|
}
|
|
54217
54230
|
workspaceContext.addDirectory(expandedPath);
|
|
@@ -54990,7 +55003,7 @@ var authCommand = {
|
|
|
54990
55003
|
import process29 from "node:process";
|
|
54991
55004
|
|
|
54992
55005
|
// packages/cli/src/generated/git-commit.ts
|
|
54993
|
-
var GIT_COMMIT_INFO = "
|
|
55006
|
+
var GIT_COMMIT_INFO = "c6a695d1b";
|
|
54994
55007
|
|
|
54995
55008
|
// packages/cli/src/ui/utils/historyExportUtils.ts
|
|
54996
55009
|
import * as fsPromises from "node:fs/promises";
|
|
@@ -55504,7 +55517,7 @@ var clearCommand = {
|
|
|
55504
55517
|
const config = context.services.agentContext?.config;
|
|
55505
55518
|
const hookSystem = config?.getHookSystem();
|
|
55506
55519
|
if (hookSystem) {
|
|
55507
|
-
await hookSystem.fireSessionEndEvent(
|
|
55520
|
+
await hookSystem.fireSessionEndEvent(SessionEndReason.Clear);
|
|
55508
55521
|
}
|
|
55509
55522
|
config?.injectionService.clear();
|
|
55510
55523
|
let newSessionId;
|
|
@@ -55521,7 +55534,7 @@ var clearCommand = {
|
|
|
55521
55534
|
}
|
|
55522
55535
|
let result;
|
|
55523
55536
|
if (hookSystem) {
|
|
55524
|
-
result = await hookSystem.fireSessionStartEvent(
|
|
55537
|
+
result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
|
|
55525
55538
|
}
|
|
55526
55539
|
await new Promise((resolve8) => setImmediate(resolve8));
|
|
55527
55540
|
if (config) {
|
|
@@ -58377,7 +58390,7 @@ var Footer = () => {
|
|
|
58377
58390
|
case "auth": {
|
|
58378
58391
|
if (!settings.merged.ui.showUserIdentity) break;
|
|
58379
58392
|
if (!authType) break;
|
|
58380
|
-
const displayStr = authType ===
|
|
58393
|
+
const displayStr = authType === AuthType.LOGIN_WITH_GOOGLE ? email ?? "google" : authType;
|
|
58381
58394
|
addCol(
|
|
58382
58395
|
id,
|
|
58383
58396
|
header,
|
|
@@ -60124,12 +60137,12 @@ import path27 from "node:path";
|
|
|
60124
60137
|
function getIdeStatusMessage(ideClient) {
|
|
60125
60138
|
const connection = ideClient.getConnectionStatus();
|
|
60126
60139
|
switch (connection.status) {
|
|
60127
|
-
case
|
|
60140
|
+
case IDEConnectionStatus.Connected:
|
|
60128
60141
|
return {
|
|
60129
60142
|
messageType: "info",
|
|
60130
60143
|
content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
|
|
60131
60144
|
};
|
|
60132
|
-
case
|
|
60145
|
+
case IDEConnectionStatus.Connecting:
|
|
60133
60146
|
return {
|
|
60134
60147
|
messageType: "info",
|
|
60135
60148
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -60170,7 +60183,7 @@ ${infoMessage}`;
|
|
|
60170
60183
|
async function getIdeStatusMessageWithFiles(ideClient) {
|
|
60171
60184
|
const connection = ideClient.getConnectionStatus();
|
|
60172
60185
|
switch (connection.status) {
|
|
60173
|
-
case
|
|
60186
|
+
case IDEConnectionStatus.Connected: {
|
|
60174
60187
|
let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
|
|
60175
60188
|
const context = ideContextStore.get();
|
|
60176
60189
|
const openFiles = context?.workspaceState?.openFiles;
|
|
@@ -60182,7 +60195,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
|
|
|
60182
60195
|
content
|
|
60183
60196
|
};
|
|
60184
60197
|
}
|
|
60185
|
-
case
|
|
60198
|
+
case IDEConnectionStatus.Connecting:
|
|
60186
60199
|
return {
|
|
60187
60200
|
messageType: "info",
|
|
60188
60201
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -60204,7 +60217,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
|
|
|
60204
60217
|
const ideClient = await IdeClient.getInstance();
|
|
60205
60218
|
if (value) {
|
|
60206
60219
|
await ideClient.connect(options);
|
|
60207
|
-
logIdeConnection(config, new IdeConnectionEvent(
|
|
60220
|
+
logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.SESSION));
|
|
60208
60221
|
} else {
|
|
60209
60222
|
await ideClient.disconnect();
|
|
60210
60223
|
}
|
|
@@ -60292,7 +60305,7 @@ var ideCommand = async () => {
|
|
|
60292
60305
|
logToConsole: false
|
|
60293
60306
|
}
|
|
60294
60307
|
);
|
|
60295
|
-
if (ideClient.getConnectionStatus().status ===
|
|
60308
|
+
if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
|
|
60296
60309
|
break;
|
|
60297
60310
|
}
|
|
60298
60311
|
await new Promise((resolve8) => setTimeout(resolve8, 500));
|
|
@@ -60369,7 +60382,7 @@ var ideCommand = async () => {
|
|
|
60369
60382
|
}
|
|
60370
60383
|
};
|
|
60371
60384
|
const { status } = ideClient.getConnectionStatus();
|
|
60372
|
-
const isConnected = status ===
|
|
60385
|
+
const isConnected = status === IDEConnectionStatus.Connected;
|
|
60373
60386
|
if (isConnected) {
|
|
60374
60387
|
ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
|
|
60375
60388
|
} else {
|
|
@@ -60469,13 +60482,13 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
60469
60482
|
const displayListener = (message) => {
|
|
60470
60483
|
context.ui.addItem({ type: "info", text: message });
|
|
60471
60484
|
};
|
|
60472
|
-
coreEvents.on(
|
|
60485
|
+
coreEvents.on(CoreEvent.OauthDisplayMessage, displayListener);
|
|
60473
60486
|
try {
|
|
60474
60487
|
context.ui.addItem({
|
|
60475
60488
|
type: "info",
|
|
60476
60489
|
text: `Starting OAuth authentication for MCP server '${serverName}'...`
|
|
60477
60490
|
});
|
|
60478
|
-
const { MCPOAuthProvider } = await import("./
|
|
60491
|
+
const { MCPOAuthProvider } = await import("./dist-KFV2ASJV.js");
|
|
60479
60492
|
let oauthConfig = server.oauth;
|
|
60480
60493
|
if (!oauthConfig) {
|
|
60481
60494
|
oauthConfig = { enabled: false };
|
|
@@ -60512,7 +60525,7 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
60512
60525
|
content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
|
|
60513
60526
|
};
|
|
60514
60527
|
} finally {
|
|
60515
|
-
coreEvents.removeListener(
|
|
60528
|
+
coreEvents.removeListener(CoreEvent.OauthDisplayMessage, displayListener);
|
|
60516
60529
|
}
|
|
60517
60530
|
},
|
|
60518
60531
|
completion: async (context, partialArg) => {
|
|
@@ -60558,10 +60571,10 @@ var listAction3 = async (context, showDescriptions = false, showSchema = false,
|
|
|
60558
60571
|
}
|
|
60559
60572
|
const serverNames = Object.keys(mcpServers);
|
|
60560
60573
|
const connectingServers = serverNames.filter(
|
|
60561
|
-
(name) => getMCPServerStatus(name) ===
|
|
60574
|
+
(name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING
|
|
60562
60575
|
);
|
|
60563
60576
|
const discoveryState = getMCPDiscoveryState();
|
|
60564
|
-
const discoveryInProgress = discoveryState ===
|
|
60577
|
+
const discoveryInProgress = discoveryState === MCPDiscoveryState.IN_PROGRESS || connectingServers.length > 0;
|
|
60565
60578
|
const allTools = toolRegistry.getAllTools();
|
|
60566
60579
|
const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
|
|
60567
60580
|
const promptRegistry = config.getPromptRegistry();
|
|
@@ -75965,7 +75978,7 @@ Return a JSON object with:
|
|
|
75965
75978
|
},
|
|
75966
75979
|
abortSignal: new AbortController().signal,
|
|
75967
75980
|
promptId: "triage-duplicates",
|
|
75968
|
-
role:
|
|
75981
|
+
role: LlmRole.UTILITY_TOOL
|
|
75969
75982
|
});
|
|
75970
75983
|
const rec = response;
|
|
75971
75984
|
let canonical;
|
|
@@ -76799,7 +76812,7 @@ Return a JSON object with:
|
|
|
76799
76812
|
},
|
|
76800
76813
|
abortSignal: abortControllerRef.current.signal,
|
|
76801
76814
|
promptId: "triage-issues",
|
|
76802
|
-
role:
|
|
76815
|
+
role: LlmRole.UTILITY_TOOL
|
|
76803
76816
|
});
|
|
76804
76817
|
return response;
|
|
76805
76818
|
},
|
|
@@ -77373,8 +77386,8 @@ var planCommand = {
|
|
|
77373
77386
|
return;
|
|
77374
77387
|
}
|
|
77375
77388
|
const previousApprovalMode = config.getApprovalMode();
|
|
77376
|
-
config.setApprovalMode(
|
|
77377
|
-
if (previousApprovalMode !==
|
|
77389
|
+
config.setApprovalMode(ApprovalMode.PLAN);
|
|
77390
|
+
if (previousApprovalMode !== ApprovalMode.PLAN) {
|
|
77378
77391
|
coreEvents.emitFeedback("info", "Switched to Plan Mode.");
|
|
77379
77392
|
}
|
|
77380
77393
|
if (context.invocation?.args) {
|
|
@@ -77433,10 +77446,10 @@ var categorizeRulesByMode = (rules) => {
|
|
|
77433
77446
|
rules.forEach((rule) => {
|
|
77434
77447
|
const modes = rule.modes?.length ? rule.modes : ALL_MODES;
|
|
77435
77448
|
const modeSet = new Set(modes);
|
|
77436
|
-
if (modeSet.has(
|
|
77437
|
-
if (modeSet.has(
|
|
77438
|
-
if (modeSet.has(
|
|
77439
|
-
if (modeSet.has(
|
|
77449
|
+
if (modeSet.has(ApprovalMode.DEFAULT)) result.normal.push(rule);
|
|
77450
|
+
if (modeSet.has(ApprovalMode.AUTO_EDIT)) result.autoEdit.push(rule);
|
|
77451
|
+
if (modeSet.has(ApprovalMode.YOLO)) result.yolo.push(rule);
|
|
77452
|
+
if (modeSet.has(ApprovalMode.PLAN)) result.plan.push(rule);
|
|
77440
77453
|
});
|
|
77441
77454
|
return result;
|
|
77442
77455
|
};
|
|
@@ -78785,7 +78798,7 @@ var upgradeCommand = {
|
|
|
78785
78798
|
action: async (context) => {
|
|
78786
78799
|
const config = context.services.agentContext?.config;
|
|
78787
78800
|
const authType = config?.getContentGeneratorConfig()?.authType;
|
|
78788
|
-
if (authType !==
|
|
78801
|
+
if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
|
|
78789
78802
|
return {
|
|
78790
78803
|
type: "message",
|
|
78791
78804
|
messageType: "error",
|
|
@@ -79012,7 +79025,7 @@ var BuiltinCommandLoader = class {
|
|
|
79012
79025
|
setupGithubCommand,
|
|
79013
79026
|
terminalSetupCommand,
|
|
79014
79027
|
...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
|
|
79015
|
-
...this.config?.getContentGeneratorConfig()?.authType ===
|
|
79028
|
+
...this.config?.getContentGeneratorConfig()?.authType === AuthType.LOGIN_WITH_GOOGLE ? [upgradeCommand] : []
|
|
79016
79029
|
];
|
|
79017
79030
|
handle?.end();
|
|
79018
79031
|
return allDefinitions.filter((cmd) => cmd !== null);
|
|
@@ -79155,11 +79168,11 @@ var ShellProcessor = class {
|
|
|
79155
79168
|
},
|
|
79156
79169
|
void 0
|
|
79157
79170
|
);
|
|
79158
|
-
if (decision ===
|
|
79171
|
+
if (decision === PolicyDecision.DENY) {
|
|
79159
79172
|
throw new Error(
|
|
79160
79173
|
`${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
|
|
79161
79174
|
);
|
|
79162
|
-
} else if (decision ===
|
|
79175
|
+
} else if (decision === PolicyDecision.ASK_USER) {
|
|
79163
79176
|
commandsToConfirm.add(command);
|
|
79164
79177
|
}
|
|
79165
79178
|
}
|
|
@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
exitCli,
|
|
4
4
|
require_source
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-OR5JBPQX.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-RYFTYJ75.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
20
|
} from "./chunk-XRLFHCHC.js";
|
|
@@ -4,10 +4,10 @@ import {
|
|
|
4
4
|
isTelemetrySdkInitialized,
|
|
5
5
|
resetBrowserSession,
|
|
6
6
|
shutdownTelemetry
|
|
7
|
-
} from "./chunk-
|
|
7
|
+
} from "./chunk-BDZNOCWJ.js";
|
|
8
8
|
import {
|
|
9
9
|
Storage
|
|
10
|
-
} from "./chunk-
|
|
10
|
+
} from "./chunk-SAJ72M2G.js";
|
|
11
11
|
|
|
12
12
|
// packages/cli/src/utils/cleanup.ts
|
|
13
13
|
import { promises as fs } from "node:fs";
|