@google/gemini-cli 0.42.0-preview.0 → 0.42.0-preview.1
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-GFPE65Z3.js → chunk-47QC6PWE.js} +7 -7
- package/bundle/{chunk-CBWESCDG.js → chunk-5AFGMGVT.js} +7 -7
- package/bundle/{chunk-NOEPPT4R.js → chunk-5MQ5VMQK.js} +1 -1
- package/bundle/{chunk-6KCFSK2J.js → chunk-66C7JVNE.js} +2 -2
- package/bundle/{chunk-EW6BCPVC.js → chunk-6K3EFSDX.js} +1 -1
- package/bundle/{chunk-J3JE6HQX.js → chunk-7H3CQGS6.js} +1 -1
- package/bundle/{chunk-F7B6HX6S.js → chunk-7LOMS5HP.js} +2 -2
- package/bundle/{chunk-KILMJEVY.js → chunk-A3GDBSEI.js} +9 -8
- package/bundle/{chunk-NQ7WZMXX.js → chunk-A564QXJJ.js} +4 -5
- package/bundle/{chunk-M4GY7DCE.js → chunk-ARLWCFGI.js} +6834 -12733
- package/bundle/{chunk-VUENLVGO.js → chunk-AS4E6DX7.js} +3 -3
- package/bundle/{chunk-4LCWAZQL.js → chunk-BI5ZICGL.js} +1 -1
- package/bundle/{chunk-6QYD32J3.js → chunk-BUJZOWQ7.js} +9 -6
- package/bundle/chunk-BZZHETT5.js +512 -0
- package/bundle/{chunk-Y2QKRHXR.js → chunk-GZ4FSF4B.js} +2 -2
- package/bundle/{chunk-J6LCLN2Y.js → chunk-I5JMJ2LU.js} +1 -1
- package/bundle/chunk-IBIKJW2L.js +17230 -0
- package/bundle/{chunk-HSZC7H6N.js → chunk-KSNNZBTV.js} +2 -2
- package/bundle/{chunk-6BMBSK77.js → chunk-L6GBKGQX.js} +3 -3
- package/bundle/chunk-L7GACEVA.js +118 -0
- package/bundle/chunk-LCB7VVYS.js +356008 -0
- package/bundle/{chunk-WSLK3AUT.js → chunk-LK7LIPO6.js} +1 -1
- package/bundle/{chunk-CLT3IJGB.js → chunk-NHDN46IK.js} +1 -1
- package/bundle/chunk-OGZGOFAJ.js +1571 -0
- package/bundle/{chunk-N3W3RYXN.js → chunk-PBD26LJQ.js} +68 -55
- package/bundle/{chunk-IGYW5IPQ.js → chunk-QZ2JZRLK.js} +3 -4
- package/bundle/chunk-UKCYYERR.js +391 -0
- package/bundle/{chunk-ETRUTVTR.js → chunk-UVBJHP26.js} +1 -1
- package/bundle/{chunk-UO7OO22U.js → chunk-UZZVXATH.js} +1 -1
- package/bundle/chunk-VERP26KN.js +81544 -0
- package/bundle/{chunk-QMK75Y7E.js → chunk-WX6CHISQ.js} +2 -2
- package/bundle/chunk-YDSDSLSO.js +156 -0
- package/bundle/{cleanup-T2HYKF7I.js → cleanup-6PVHIK4C.js} +2 -2
- package/bundle/{cleanup-LH7RU457.js → cleanup-FRS7FPOS.js} +2 -2
- package/bundle/{cleanup-ZBHF7PUC.js → cleanup-NDTUQVOW.js} +3 -3
- package/bundle/cleanup-O4IDJYU2.js +33 -0
- package/bundle/{core-QH4PNJQ3.js → core-RZFMBCSX.js} +1 -1
- package/bundle/{devtoolsService-NXXQULSB.js → devtoolsService-6D355RSX.js} +2 -2
- package/bundle/{devtoolsService-NIEGPNPT.js → devtoolsService-7SBW23VD.js} +5 -4
- package/bundle/devtoolsService-SPV43SGI.js +857 -0
- package/bundle/{devtoolsService-USWJ4OCC.js → devtoolsService-WER5PRLG.js} +2 -2
- package/bundle/{dist-P6VZ5KI4.js → dist-7BJPFNU7.js} +1 -1
- package/bundle/{core-IIB5TH4W.js → dist-DTPIOJ3P.js} +2 -2
- package/bundle/dist-ZZ5HEQGP.js +2096 -0
- package/bundle/{gemini-H26TLDOV.js → gemini-3NXWUDHV.js} +13 -13
- package/bundle/{gemini-NFPXCHZM.js → gemini-GLORNPU2.js} +200 -186
- package/bundle/gemini-HCJBP42A.js +16256 -0
- package/bundle/{gemini-U45ZMNQE.js → gemini-KMMF6AK3.js} +13 -13
- package/bundle/gemini.js +7 -7
- package/bundle/{interactiveCli-AT7D6KM5.js → interactiveCli-5UVCH7FM.js} +8 -8
- package/bundle/{interactiveCli-MMM7Z6CJ.js → interactiveCli-BNDKNCVJ.js} +294 -276
- package/bundle/{interactiveCli-O6EFASZD.js → interactiveCli-HBRMSAIT.js} +8 -8
- package/bundle/interactiveCli-TWDP2H52.js +34505 -0
- package/bundle/{liteRtServerManager-G5EHBOWM.js → liteRtServerManager-3YA2HL46.js} +4 -4
- package/bundle/{liteRtServerManager-QB74ZF32.js → liteRtServerManager-BYQVAM6Y.js} +4 -4
- package/bundle/{liteRtServerManager-JCITNPUM.js → liteRtServerManager-IQHHDTUM.js} +5 -5
- package/bundle/liteRtServerManager-RTBP2SLV.js +66 -0
- package/bundle/node_modules/@google/gemini-cli-devtools/package.json +1 -1
- package/bundle/{oauth2-provider-V6ROFUMU.js → oauth2-provider-C66JRVDQ.js} +1 -1
- package/bundle/{oauth2-provider-K5IZHYDJ.js → oauth2-provider-OAXWX3Z3.js} +39 -73
- package/bundle/{oauth2-provider-ZKX2USIN.js → oauth2-provider-TUVQXNLY.js} +1 -1
- package/bundle/oauth2-provider-ZPJOR5SG.js +237 -0
- package/bundle/{start-WILIWWLN.js → start-ELTWFVNO.js} +6 -6
- package/bundle/{start-B4GKBYKT.js → start-HHZI73VV.js} +7 -7
- package/bundle/start-NCMR7HOQ.js +19 -0
- package/bundle/{start-SW3EMEQ2.js → start-S3TEO5BN.js} +6 -6
- package/package.json +1 -1
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
import {
|
|
7
7
|
exitCli,
|
|
8
8
|
require_source
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-LK7LIPO6.js";
|
|
10
10
|
import {
|
|
11
11
|
DEFAULT_BACKGROUND_OPACITY,
|
|
12
12
|
DEFAULT_BORDER_OPACITY,
|
|
@@ -57,17 +57,19 @@ import {
|
|
|
57
57
|
stripUnsafeCharacters,
|
|
58
58
|
toCodePoints,
|
|
59
59
|
validateCustomTheme
|
|
60
|
-
} from "./chunk-
|
|
60
|
+
} from "./chunk-BUJZOWQ7.js";
|
|
61
61
|
import {
|
|
62
62
|
isDevelopment
|
|
63
|
-
} from "./chunk-
|
|
63
|
+
} from "./chunk-66C7JVNE.js";
|
|
64
64
|
import {
|
|
65
65
|
emptyIcon,
|
|
66
66
|
require_react
|
|
67
|
-
} from "./chunk-
|
|
67
|
+
} from "./chunk-BZZHETT5.js";
|
|
68
68
|
import {
|
|
69
69
|
AsyncFzf,
|
|
70
|
+
AuthType,
|
|
70
71
|
Config,
|
|
72
|
+
CoreToolCallStatus,
|
|
71
73
|
ExtensionDisableEvent,
|
|
72
74
|
ExtensionEnableEvent,
|
|
73
75
|
ExtensionInstallEvent,
|
|
@@ -76,17 +78,27 @@ import {
|
|
|
76
78
|
ExtensionUninstallEvent,
|
|
77
79
|
ExtensionUpdateEvent,
|
|
78
80
|
GEMINI_CLI_COMPANION_EXTENSION_NAME,
|
|
81
|
+
HookType,
|
|
82
|
+
IDEConnectionStatus,
|
|
79
83
|
INITIAL_HISTORY_LENGTH,
|
|
80
84
|
IdeClient,
|
|
81
85
|
IdeConnectionEvent,
|
|
86
|
+
IdeConnectionType,
|
|
87
|
+
IntegrityDataStatus,
|
|
82
88
|
KeychainTokenStorage,
|
|
89
|
+
LlmRole,
|
|
90
|
+
MCPDiscoveryState,
|
|
83
91
|
MCPOAuthTokenStorage,
|
|
92
|
+
MCPServerStatus,
|
|
84
93
|
ModelSlashCommandEvent,
|
|
85
94
|
ProjectIdRequiredError,
|
|
86
95
|
ReadManyFilesTool,
|
|
87
96
|
RewindEvent,
|
|
97
|
+
SessionEndReason,
|
|
98
|
+
SessionStartSource,
|
|
88
99
|
ShellExecutionService,
|
|
89
100
|
StartSessionEvent,
|
|
101
|
+
TrustLevel,
|
|
90
102
|
UPGRADE_URL_PAGE,
|
|
91
103
|
UserAccountManager,
|
|
92
104
|
ValidationRequiredError,
|
|
@@ -200,12 +212,13 @@ import {
|
|
|
200
212
|
stripAnsi,
|
|
201
213
|
tokenLimit,
|
|
202
214
|
uiTelemetryService
|
|
203
|
-
} from "./chunk-
|
|
215
|
+
} from "./chunk-ARLWCFGI.js";
|
|
204
216
|
import {
|
|
205
217
|
ApprovalMode,
|
|
206
218
|
CoreEvent,
|
|
207
219
|
DiscoveredMCPTool,
|
|
208
220
|
GEMINI_DIR,
|
|
221
|
+
PolicyDecision,
|
|
209
222
|
REFERENCE_CONTENT_END,
|
|
210
223
|
REFERENCE_CONTENT_START,
|
|
211
224
|
Storage,
|
|
@@ -226,7 +239,7 @@ import {
|
|
|
226
239
|
shortenPath,
|
|
227
240
|
tildeifyPath,
|
|
228
241
|
unescapePath
|
|
229
|
-
} from "./chunk-
|
|
242
|
+
} from "./chunk-JEW7ZIWE.js";
|
|
230
243
|
import {
|
|
231
244
|
require_src
|
|
232
245
|
} from "./chunk-RJTRUG2J.js";
|
|
@@ -39445,7 +39458,7 @@ var import_react34 = __toESM(require_react(), 1);
|
|
|
39445
39458
|
function useIdeTrustListener() {
|
|
39446
39459
|
const settings = useSettings();
|
|
39447
39460
|
const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
|
|
39448
|
-
|
|
39461
|
+
IDEConnectionStatus.Disconnected
|
|
39449
39462
|
);
|
|
39450
39463
|
const previousTrust = (0, import_react34.useRef)(void 0);
|
|
39451
39464
|
const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
|
|
@@ -39475,7 +39488,7 @@ function useIdeTrustListener() {
|
|
|
39475
39488
|
};
|
|
39476
39489
|
}, []);
|
|
39477
39490
|
const getSnapshot = () => {
|
|
39478
|
-
if (connectionStatus !==
|
|
39491
|
+
if (connectionStatus !== IDEConnectionStatus.Connected) {
|
|
39479
39492
|
return void 0;
|
|
39480
39493
|
}
|
|
39481
39494
|
return ideContextStore.get()?.workspaceState?.isTrusted;
|
|
@@ -40180,7 +40193,7 @@ async function initializeApp(config, settings) {
|
|
|
40180
40193
|
await ideClient.connect();
|
|
40181
40194
|
logIdeConnection(
|
|
40182
40195
|
config,
|
|
40183
|
-
new IdeConnectionEvent(
|
|
40196
|
+
new IdeConnectionEvent(IdeConnectionType.START)
|
|
40184
40197
|
);
|
|
40185
40198
|
}).catch((e) => {
|
|
40186
40199
|
debugLogger.error("Failed to initialize IDE client:", e);
|
|
@@ -40198,16 +40211,16 @@ async function initializeApp(config, settings) {
|
|
|
40198
40211
|
// packages/cli/src/config/auth.ts
|
|
40199
40212
|
function validateAuthMethod(authMethod) {
|
|
40200
40213
|
loadEnvironment(loadSettings().merged, process.cwd());
|
|
40201
|
-
if (authMethod ===
|
|
40214
|
+
if (authMethod === AuthType.LOGIN_WITH_GOOGLE || authMethod === AuthType.COMPUTE_ADC) {
|
|
40202
40215
|
return null;
|
|
40203
40216
|
}
|
|
40204
|
-
if (authMethod ===
|
|
40217
|
+
if (authMethod === AuthType.USE_GEMINI) {
|
|
40205
40218
|
if (!process.env["GEMINI_API_KEY"]) {
|
|
40206
40219
|
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)!";
|
|
40207
40220
|
}
|
|
40208
40221
|
return null;
|
|
40209
40222
|
}
|
|
40210
|
-
if (authMethod ===
|
|
40223
|
+
if (authMethod === AuthType.USE_VERTEX_AI) {
|
|
40211
40224
|
const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
|
|
40212
40225
|
const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
|
|
40213
40226
|
if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
|
|
@@ -44627,7 +44640,7 @@ var ExtensionManager = class extends ExtensionLoader {
|
|
|
44627
44640
|
const trustedFolders = loadTrustedFolders();
|
|
44628
44641
|
await trustedFolders.setValue(
|
|
44629
44642
|
this.workspaceDir,
|
|
44630
|
-
|
|
44643
|
+
TrustLevel.TRUST_FOLDER
|
|
44631
44644
|
);
|
|
44632
44645
|
} else {
|
|
44633
44646
|
throw new Error(
|
|
@@ -44813,7 +44826,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44813
44826
|
newExtensionConfig.version,
|
|
44814
44827
|
previousExtensionConfig.version,
|
|
44815
44828
|
installMetadata.type,
|
|
44816
|
-
|
|
44829
|
+
CoreToolCallStatus.Success
|
|
44817
44830
|
)
|
|
44818
44831
|
);
|
|
44819
44832
|
if (newExtensionName !== previousName) {
|
|
@@ -44836,7 +44849,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44836
44849
|
getExtensionId(newExtensionConfig, installMetadata),
|
|
44837
44850
|
newExtensionConfig.version,
|
|
44838
44851
|
installMetadata.type,
|
|
44839
|
-
|
|
44852
|
+
CoreToolCallStatus.Success
|
|
44840
44853
|
)
|
|
44841
44854
|
);
|
|
44842
44855
|
await this.enableExtension(
|
|
@@ -44869,7 +44882,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44869
44882
|
newExtensionConfig?.version ?? "",
|
|
44870
44883
|
previousExtensionConfig.version,
|
|
44871
44884
|
installMetadata.type,
|
|
44872
|
-
|
|
44885
|
+
CoreToolCallStatus.Error
|
|
44873
44886
|
)
|
|
44874
44887
|
);
|
|
44875
44888
|
} else {
|
|
@@ -44881,7 +44894,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44881
44894
|
extensionId ?? "",
|
|
44882
44895
|
newExtensionConfig?.version ?? "",
|
|
44883
44896
|
installMetadata.type,
|
|
44884
|
-
|
|
44897
|
+
CoreToolCallStatus.Error
|
|
44885
44898
|
)
|
|
44886
44899
|
);
|
|
44887
44900
|
}
|
|
@@ -44912,7 +44925,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
44912
44925
|
extension.name,
|
|
44913
44926
|
hashValue(extension.name),
|
|
44914
44927
|
extension.id,
|
|
44915
|
-
|
|
44928
|
+
CoreToolCallStatus.Success
|
|
44916
44929
|
)
|
|
44917
44930
|
);
|
|
44918
44931
|
}
|
|
@@ -45182,7 +45195,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
45182
45195
|
if (eventHooks) {
|
|
45183
45196
|
for (const definition of eventHooks) {
|
|
45184
45197
|
for (const hook of definition.hooks) {
|
|
45185
|
-
if (hook.type ===
|
|
45198
|
+
if (hook.type === HookType.Command) {
|
|
45186
45199
|
hook.env = { ...hook.env, ...hookEnv };
|
|
45187
45200
|
}
|
|
45188
45201
|
}
|
|
@@ -46214,7 +46227,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
46214
46227
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
46215
46228
|
name: `resources/read (${resource.serverName})`,
|
|
46216
46229
|
description: resource.uri,
|
|
46217
|
-
status:
|
|
46230
|
+
status: CoreToolCallStatus.Success,
|
|
46218
46231
|
isClientInitiated: true,
|
|
46219
46232
|
resultDisplay: `Successfully read resource ${resource.uri}`,
|
|
46220
46233
|
confirmationDetails: void 0
|
|
@@ -46229,7 +46242,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
46229
46242
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
46230
46243
|
name: `resources/read (${resource.serverName})`,
|
|
46231
46244
|
description: resource.uri,
|
|
46232
|
-
status:
|
|
46245
|
+
status: CoreToolCallStatus.Error,
|
|
46233
46246
|
isClientInitiated: true,
|
|
46234
46247
|
resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
|
|
46235
46248
|
confirmationDetails: void 0
|
|
@@ -46254,7 +46267,7 @@ Content from @${result.uri}:
|
|
|
46254
46267
|
}
|
|
46255
46268
|
if (hasError) {
|
|
46256
46269
|
const firstError = displays.find(
|
|
46257
|
-
(d) => d.status ===
|
|
46270
|
+
(d) => d.status === CoreToolCallStatus.Error
|
|
46258
46271
|
);
|
|
46259
46272
|
return {
|
|
46260
46273
|
parts: [],
|
|
@@ -46290,7 +46303,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
|
|
|
46290
46303
|
callId: `client-read-${userMessageTimestamp}`,
|
|
46291
46304
|
name: readManyFilesTool.displayName,
|
|
46292
46305
|
description: invocation.getDescription(),
|
|
46293
|
-
status:
|
|
46306
|
+
status: CoreToolCallStatus.Success,
|
|
46294
46307
|
isClientInitiated: true,
|
|
46295
46308
|
resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
|
|
46296
46309
|
confirmationDetails: void 0
|
|
@@ -46337,7 +46350,7 @@ Content from @${displayPath}:
|
|
|
46337
46350
|
callId: `client-read-${userMessageTimestamp}`,
|
|
46338
46351
|
name: readManyFilesTool.displayName,
|
|
46339
46352
|
description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
|
|
46340
|
-
status:
|
|
46353
|
+
status: CoreToolCallStatus.Error,
|
|
46341
46354
|
isClientInitiated: true,
|
|
46342
46355
|
resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
|
|
46343
46356
|
confirmationDetails: void 0
|
|
@@ -49566,7 +49579,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
|
|
|
49566
49579
|
if (wasRaw) {
|
|
49567
49580
|
setRawMode?.(true);
|
|
49568
49581
|
}
|
|
49569
|
-
coreEvents.emit(
|
|
49582
|
+
coreEvents.emit(CoreEvent.ExternalEditorClosed);
|
|
49570
49583
|
}
|
|
49571
49584
|
}
|
|
49572
49585
|
|
|
@@ -52256,7 +52269,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
|
|
|
52256
52269
|
extension.name,
|
|
52257
52270
|
installMetadata
|
|
52258
52271
|
);
|
|
52259
|
-
if (status ===
|
|
52272
|
+
if (status === IntegrityDataStatus.INVALID) {
|
|
52260
52273
|
throw new Error("Extension integrity cannot be verified");
|
|
52261
52274
|
}
|
|
52262
52275
|
} catch (e) {
|
|
@@ -53674,11 +53687,11 @@ var ShellProcessor = class {
|
|
|
53674
53687
|
},
|
|
53675
53688
|
void 0
|
|
53676
53689
|
);
|
|
53677
|
-
if (decision ===
|
|
53690
|
+
if (decision === PolicyDecision.DENY) {
|
|
53678
53691
|
throw new Error(
|
|
53679
53692
|
`${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
|
|
53680
53693
|
);
|
|
53681
|
-
} else if (decision ===
|
|
53694
|
+
} else if (decision === PolicyDecision.ASK_USER) {
|
|
53682
53695
|
commandsToConfirm.add(command);
|
|
53683
53696
|
}
|
|
53684
53697
|
}
|
|
@@ -54793,7 +54806,7 @@ var MultiFolderTrustDialog = ({
|
|
|
54793
54806
|
if (choice === 1 /* YES_AND_REMEMBER */) {
|
|
54794
54807
|
await trustedFolders.setValue(
|
|
54795
54808
|
expandedPath,
|
|
54796
|
-
|
|
54809
|
+
TrustLevel.TRUST_FOLDER
|
|
54797
54810
|
);
|
|
54798
54811
|
}
|
|
54799
54812
|
workspaceContext.addDirectory(expandedPath);
|
|
@@ -56441,7 +56454,7 @@ var authCommand = {
|
|
|
56441
56454
|
import process28 from "node:process";
|
|
56442
56455
|
|
|
56443
56456
|
// packages/cli/src/generated/git-commit.ts
|
|
56444
|
-
var GIT_COMMIT_INFO = "
|
|
56457
|
+
var GIT_COMMIT_INFO = "92f410d6d";
|
|
56445
56458
|
|
|
56446
56459
|
// packages/cli/src/ui/utils/historyExportUtils.ts
|
|
56447
56460
|
import * as fsPromises from "node:fs/promises";
|
|
@@ -57087,7 +57100,7 @@ var clearCommand = {
|
|
|
57087
57100
|
const config = context.services.agentContext?.config;
|
|
57088
57101
|
const hookSystem = config?.getHookSystem();
|
|
57089
57102
|
if (hookSystem) {
|
|
57090
|
-
await hookSystem.fireSessionEndEvent(
|
|
57103
|
+
await hookSystem.fireSessionEndEvent(SessionEndReason.Clear);
|
|
57091
57104
|
}
|
|
57092
57105
|
config?.injectionService.clear();
|
|
57093
57106
|
let newSessionId;
|
|
@@ -57104,7 +57117,7 @@ var clearCommand = {
|
|
|
57104
57117
|
}
|
|
57105
57118
|
let result;
|
|
57106
57119
|
if (hookSystem) {
|
|
57107
|
-
result = await hookSystem.fireSessionStartEvent(
|
|
57120
|
+
result = await hookSystem.fireSessionStartEvent(SessionStartSource.Clear);
|
|
57108
57121
|
}
|
|
57109
57122
|
await new Promise((resolve8) => setImmediate(resolve8));
|
|
57110
57123
|
if (config) {
|
|
@@ -60011,7 +60024,7 @@ var Footer = () => {
|
|
|
60011
60024
|
case "auth": {
|
|
60012
60025
|
if (!settings.merged.ui.showUserIdentity) break;
|
|
60013
60026
|
if (!authType) break;
|
|
60014
|
-
const displayStr = authType ===
|
|
60027
|
+
const displayStr = authType === AuthType.LOGIN_WITH_GOOGLE ? email ?? "google" : authType;
|
|
60015
60028
|
addCol(
|
|
60016
60029
|
id,
|
|
60017
60030
|
header,
|
|
@@ -61758,12 +61771,12 @@ import path28 from "node:path";
|
|
|
61758
61771
|
function getIdeStatusMessage(ideClient) {
|
|
61759
61772
|
const connection = ideClient.getConnectionStatus();
|
|
61760
61773
|
switch (connection.status) {
|
|
61761
|
-
case
|
|
61774
|
+
case IDEConnectionStatus.Connected:
|
|
61762
61775
|
return {
|
|
61763
61776
|
messageType: "info",
|
|
61764
61777
|
content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
|
|
61765
61778
|
};
|
|
61766
|
-
case
|
|
61779
|
+
case IDEConnectionStatus.Connecting:
|
|
61767
61780
|
return {
|
|
61768
61781
|
messageType: "info",
|
|
61769
61782
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -61804,7 +61817,7 @@ ${infoMessage}`;
|
|
|
61804
61817
|
async function getIdeStatusMessageWithFiles(ideClient) {
|
|
61805
61818
|
const connection = ideClient.getConnectionStatus();
|
|
61806
61819
|
switch (connection.status) {
|
|
61807
|
-
case
|
|
61820
|
+
case IDEConnectionStatus.Connected: {
|
|
61808
61821
|
let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
|
|
61809
61822
|
const context = ideContextStore.get();
|
|
61810
61823
|
const openFiles = context?.workspaceState?.openFiles;
|
|
@@ -61816,7 +61829,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
|
|
|
61816
61829
|
content
|
|
61817
61830
|
};
|
|
61818
61831
|
}
|
|
61819
|
-
case
|
|
61832
|
+
case IDEConnectionStatus.Connecting:
|
|
61820
61833
|
return {
|
|
61821
61834
|
messageType: "info",
|
|
61822
61835
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -61838,7 +61851,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
|
|
|
61838
61851
|
const ideClient = await IdeClient.getInstance();
|
|
61839
61852
|
if (value) {
|
|
61840
61853
|
await ideClient.connect(options);
|
|
61841
|
-
logIdeConnection(config, new IdeConnectionEvent(
|
|
61854
|
+
logIdeConnection(config, new IdeConnectionEvent(IdeConnectionType.SESSION));
|
|
61842
61855
|
} else {
|
|
61843
61856
|
await ideClient.disconnect();
|
|
61844
61857
|
}
|
|
@@ -61926,7 +61939,7 @@ var ideCommand = async () => {
|
|
|
61926
61939
|
logToConsole: false
|
|
61927
61940
|
}
|
|
61928
61941
|
);
|
|
61929
|
-
if (ideClient.getConnectionStatus().status ===
|
|
61942
|
+
if (ideClient.getConnectionStatus().status === IDEConnectionStatus.Connected) {
|
|
61930
61943
|
break;
|
|
61931
61944
|
}
|
|
61932
61945
|
await new Promise((resolve8) => setTimeout(resolve8, 500));
|
|
@@ -62003,7 +62016,7 @@ var ideCommand = async () => {
|
|
|
62003
62016
|
}
|
|
62004
62017
|
};
|
|
62005
62018
|
const { status } = ideClient.getConnectionStatus();
|
|
62006
|
-
const isConnected = status ===
|
|
62019
|
+
const isConnected = status === IDEConnectionStatus.Connected;
|
|
62007
62020
|
if (isConnected) {
|
|
62008
62021
|
ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
|
|
62009
62022
|
} else {
|
|
@@ -62103,13 +62116,13 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
62103
62116
|
const displayListener = (message) => {
|
|
62104
62117
|
context.ui.addItem({ type: "info", text: message });
|
|
62105
62118
|
};
|
|
62106
|
-
coreEvents.on(
|
|
62119
|
+
coreEvents.on(CoreEvent.OauthDisplayMessage, displayListener);
|
|
62107
62120
|
try {
|
|
62108
62121
|
context.ui.addItem({
|
|
62109
62122
|
type: "info",
|
|
62110
62123
|
text: `Starting OAuth authentication for MCP server '${serverName}'...`
|
|
62111
62124
|
});
|
|
62112
|
-
const { MCPOAuthProvider } = await import("./
|
|
62125
|
+
const { MCPOAuthProvider } = await import("./dist-7BJPFNU7.js");
|
|
62113
62126
|
let oauthConfig = server.oauth;
|
|
62114
62127
|
if (!oauthConfig) {
|
|
62115
62128
|
oauthConfig = { enabled: false };
|
|
@@ -62146,7 +62159,7 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
62146
62159
|
content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
|
|
62147
62160
|
};
|
|
62148
62161
|
} finally {
|
|
62149
|
-
coreEvents.removeListener(
|
|
62162
|
+
coreEvents.removeListener(CoreEvent.OauthDisplayMessage, displayListener);
|
|
62150
62163
|
}
|
|
62151
62164
|
},
|
|
62152
62165
|
completion: async (context, partialArg) => {
|
|
@@ -62192,10 +62205,10 @@ var listAction2 = async (context, showDescriptions = false, showSchema = false,
|
|
|
62192
62205
|
}
|
|
62193
62206
|
const serverNames = Object.keys(mcpServers);
|
|
62194
62207
|
const connectingServers = serverNames.filter(
|
|
62195
|
-
(name) => getMCPServerStatus(name) ===
|
|
62208
|
+
(name) => getMCPServerStatus(name) === MCPServerStatus.CONNECTING
|
|
62196
62209
|
);
|
|
62197
62210
|
const discoveryState = getMCPDiscoveryState();
|
|
62198
|
-
const discoveryInProgress = discoveryState ===
|
|
62211
|
+
const discoveryInProgress = discoveryState === MCPDiscoveryState.IN_PROGRESS || connectingServers.length > 0;
|
|
62199
62212
|
const allTools = toolRegistry.getAllTools();
|
|
62200
62213
|
const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
|
|
62201
62214
|
const promptRegistry = config.getPromptRegistry();
|
|
@@ -77966,7 +77979,7 @@ Return a JSON object with:
|
|
|
77966
77979
|
},
|
|
77967
77980
|
abortSignal: new AbortController().signal,
|
|
77968
77981
|
promptId: "triage-duplicates",
|
|
77969
|
-
role:
|
|
77982
|
+
role: LlmRole.UTILITY_TOOL
|
|
77970
77983
|
});
|
|
77971
77984
|
const rec = response;
|
|
77972
77985
|
let canonical;
|
|
@@ -78800,7 +78813,7 @@ Return a JSON object with:
|
|
|
78800
78813
|
},
|
|
78801
78814
|
abortSignal: abortControllerRef.current.signal,
|
|
78802
78815
|
promptId: "triage-issues",
|
|
78803
|
-
role:
|
|
78816
|
+
role: LlmRole.UTILITY_TOOL
|
|
78804
78817
|
});
|
|
78805
78818
|
return response;
|
|
78806
78819
|
},
|
|
@@ -79374,8 +79387,8 @@ var planCommand = {
|
|
|
79374
79387
|
return;
|
|
79375
79388
|
}
|
|
79376
79389
|
const previousApprovalMode = config.getApprovalMode();
|
|
79377
|
-
config.setApprovalMode(
|
|
79378
|
-
if (previousApprovalMode !==
|
|
79390
|
+
config.setApprovalMode(ApprovalMode.PLAN);
|
|
79391
|
+
if (previousApprovalMode !== ApprovalMode.PLAN) {
|
|
79379
79392
|
coreEvents.emitFeedback("info", "Switched to Plan Mode.");
|
|
79380
79393
|
}
|
|
79381
79394
|
if (context.invocation?.args) {
|
|
@@ -79434,10 +79447,10 @@ var categorizeRulesByMode = (rules) => {
|
|
|
79434
79447
|
rules.forEach((rule) => {
|
|
79435
79448
|
const modes = rule.modes?.length ? rule.modes : ALL_MODES;
|
|
79436
79449
|
const modeSet = new Set(modes);
|
|
79437
|
-
if (modeSet.has(
|
|
79438
|
-
if (modeSet.has(
|
|
79439
|
-
if (modeSet.has(
|
|
79440
|
-
if (modeSet.has(
|
|
79450
|
+
if (modeSet.has(ApprovalMode.DEFAULT)) result.normal.push(rule);
|
|
79451
|
+
if (modeSet.has(ApprovalMode.AUTO_EDIT)) result.autoEdit.push(rule);
|
|
79452
|
+
if (modeSet.has(ApprovalMode.YOLO)) result.yolo.push(rule);
|
|
79453
|
+
if (modeSet.has(ApprovalMode.PLAN)) result.plan.push(rule);
|
|
79441
79454
|
});
|
|
79442
79455
|
return result;
|
|
79443
79456
|
};
|
|
@@ -80789,7 +80802,7 @@ var upgradeCommand = {
|
|
|
80789
80802
|
action: async (context) => {
|
|
80790
80803
|
const config = context.services.agentContext?.config;
|
|
80791
80804
|
const authType = config?.getContentGeneratorConfig()?.authType;
|
|
80792
|
-
if (authType !==
|
|
80805
|
+
if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
|
|
80793
80806
|
return {
|
|
80794
80807
|
type: "message",
|
|
80795
80808
|
messageType: "error",
|
|
@@ -81017,7 +81030,7 @@ var BuiltinCommandLoader = class {
|
|
|
81017
81030
|
setupGithubCommand,
|
|
81018
81031
|
terminalSetupCommand,
|
|
81019
81032
|
...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
|
|
81020
|
-
...this.config?.getContentGeneratorConfig()?.authType ===
|
|
81033
|
+
...this.config?.getContentGeneratorConfig()?.authType === AuthType.LOGIN_WITH_GOOGLE ? [upgradeCommand] : []
|
|
81021
81034
|
];
|
|
81022
81035
|
handle?.end();
|
|
81023
81036
|
return allDefinitions.filter((cmd) => cmd !== null);
|
|
@@ -246396,7 +246396,7 @@ import { createHash } from "node:crypto";
|
|
|
246396
246396
|
import * as os12 from "node:os";
|
|
246397
246397
|
|
|
246398
246398
|
// packages/core/src/generated/git-commit.ts
|
|
246399
|
-
var GIT_COMMIT_INFO = "
|
|
246399
|
+
var GIT_COMMIT_INFO = "246f98459";
|
|
246400
246400
|
var CLI_VERSION = "0.42.0-preview.0";
|
|
246401
246401
|
|
|
246402
246402
|
// packages/core/src/ide/detect-ide.ts
|
|
@@ -303280,7 +303280,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
|
|
|
303280
303280
|
return provider;
|
|
303281
303281
|
}
|
|
303282
303282
|
case "oauth2": {
|
|
303283
|
-
const { OAuth2AuthProvider } = await import("./oauth2-provider-
|
|
303283
|
+
const { OAuth2AuthProvider } = await import("./oauth2-provider-TUVQXNLY.js");
|
|
303284
303284
|
const provider = new OAuth2AuthProvider(
|
|
303285
303285
|
authConfig,
|
|
303286
303286
|
options.agentName ?? "unknown",
|
|
@@ -324229,8 +324229,7 @@ var PolicyEngine = class {
|
|
|
324229
324229
|
shouldDowngradeForRedirection(command, allowRedirection) {
|
|
324230
324230
|
if (allowRedirection) return false;
|
|
324231
324231
|
if (!hasRedirection(command)) return false;
|
|
324232
|
-
|
|
324233
|
-
if (sandboxEnabled && (this.approvalMode === "autoEdit" /* AUTO_EDIT */ || this.approvalMode === "yolo" /* YOLO */)) {
|
|
324232
|
+
if (this.approvalMode === "autoEdit" /* AUTO_EDIT */ || this.approvalMode === "yolo" /* YOLO */) {
|
|
324234
324233
|
return false;
|
|
324235
324234
|
}
|
|
324236
324235
|
return true;
|