@google/gemini-cli 0.65.0-nightly.20261013.g51617c1bc → 0.65.0-preview.0
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-BXWN65YH.js → chunk-2WVLIJA5.js} +1 -1
- package/bundle/{chunk-5322VSKQ.js → chunk-43EXRO7A.js} +1 -1
- package/bundle/{chunk-3EFBILEW.js → chunk-4DCA4L53.js} +2 -2
- package/bundle/{chunk-NAGGT65S.js → chunk-4JGVVJGK.js} +1 -1
- package/bundle/{chunk-VJXI22NX.js → chunk-BFIV7GTA.js} +2 -2
- package/bundle/{chunk-NJIZWOAO.js → chunk-F6AJM4WN.js} +3 -3
- package/bundle/{chunk-EPXYFN6C.js → chunk-GSQEBEGC.js} +3 -3
- package/bundle/{chunk-SSAL6PAH.js → chunk-H2CZXS7F.js} +1 -1
- package/bundle/{chunk-76GSGGHI.js → chunk-HLOOE7YN.js} +1 -1
- package/bundle/{chunk-ZZJRXUDM.js → chunk-K4G5D5ZZ.js} +1 -1
- package/bundle/{chunk-B22AOTUS.js → chunk-K7AA35SP.js} +26 -22
- package/bundle/{chunk-HVVLEMLR.js → chunk-K7NOVQ6G.js} +24 -20
- package/bundle/{chunk-C3XVWXTB.js → chunk-LLE5Z636.js} +7 -7
- package/bundle/{chunk-KR7RUPIE.js → chunk-NL7ZHGCH.js} +1 -1
- package/bundle/{chunk-6M4QEFFF.js → chunk-QJK54DSE.js} +8 -9
- package/bundle/{chunk-EA2F2LNY.js → chunk-RPHDSDL6.js} +1 -1
- package/bundle/{chunk-LBJNFX6K.js → chunk-S7BCRBI4.js} +1 -1
- package/bundle/{chunk-LB7T3Q3K.js → chunk-SN7QZKXC.js} +58 -71
- package/bundle/{chunk-GI5HEZHG.js → chunk-TP236FKO.js} +14976 -7914
- package/bundle/{chunk-LJV6OKHI.js → chunk-V2R74WAG.js} +5 -7
- package/bundle/{chunk-VLEIPZMF.js → chunk-V72FRESD.js} +2 -2
- package/bundle/{chunk-N2N4FSJX.js → chunk-VF5WQSOE.js} +1 -1
- package/bundle/{chunk-5OZJ7SSG.js → chunk-WGL5FJOS.js} +3 -3
- package/bundle/{chunk-JCR3XD5H.js → chunk-WTRK3NVX.js} +7 -7
- package/bundle/{cleanup-C3GRMYTQ.js → cleanup-HPADDONA.js} +2 -2
- package/bundle/{cleanup-HHEU7BTA.js → cleanup-JOMSXKMP.js} +2 -2
- package/bundle/{cleanup-VCQCBVRV.js → cleanup-LYRJHMMO.js} +2 -2
- package/bundle/{core-EX2SPRDZ.js → core-IVQAI4S6.js} +1 -1
- package/bundle/{dist-GG436DD3.js → core-NCJTYARO.js} +1 -1
- package/bundle/{devtoolsService-OI7AEJQC.js → devtoolsService-HIZA3JGR.js} +2 -2
- package/bundle/{devtoolsService-E3YLHACW.js → devtoolsService-JFJBTZ4B.js} +3 -4
- package/bundle/{devtoolsService-CSRUFNFL.js → devtoolsService-WP2OPVPB.js} +2 -2
- package/bundle/{dist-MRDCUCIF.js → dist-GQKLLBDW.js} +1 -1
- package/bundle/{gemini-TWP2M62H.js → gemini-546WMAHG.js} +198 -214
- package/bundle/{gemini-W7O4SF3Y.js → gemini-5TUKZVGS.js} +14 -14
- package/bundle/{gemini-GG2HNQFT.js → gemini-7CHJYSHM.js} +13 -13
- package/bundle/gemini.js +7 -7
- package/bundle/{interactiveCli-3Y2RHZKF.js → interactiveCli-5XIAIY74.js} +1069 -554
- package/bundle/{interactiveCli-GBXKC6IY.js → interactiveCli-E3PUPYMZ.js} +1069 -554
- package/bundle/{interactiveCli-E5RBGMKR.js → interactiveCli-L4PK7YY3.js} +1348 -852
- package/bundle/{liteRtServerManager-BV7LQRJK.js → liteRtServerManager-22ISMNN2.js} +4 -4
- package/bundle/{liteRtServerManager-EW5TUX2V.js → liteRtServerManager-JCTYJBV5.js} +4 -4
- package/bundle/{liteRtServerManager-G3ETQGQD.js → liteRtServerManager-JERG6KYC.js} +4 -4
- package/bundle/{oauth2-provider-NVW65VJA.js → oauth2-provider-477UJQX6.js} +1 -1
- package/bundle/{oauth2-provider-6Z2ZXOX6.js → oauth2-provider-MKWWBW4K.js} +79 -41
- package/bundle/{oauth2-provider-4CXU66CN.js → oauth2-provider-XRUER2XR.js} +1 -1
- package/bundle/{start-AZFYLAF2.js → start-AGMBPY3O.js} +6 -6
- package/bundle/{start-BHB4KDHO.js → start-MVIPJNQ5.js} +6 -6
- package/bundle/{start-CHWZQ4ZN.js → start-RZWSVT55.js} +6 -6
- package/package.json +1 -1
- package/bundle/chunk-5YND2HLC.js +0 -1571
- package/bundle/chunk-IJ7X4I2Z.js +0 -425
- package/bundle/chunk-K6N5Z54J.js +0 -154
- package/bundle/chunk-LZISQJNJ.js +0 -512
- package/bundle/chunk-OB6IRF7N.js +0 -118
- package/bundle/chunk-TLYQMFOC.js +0 -17535
- package/bundle/chunk-UVUPZGTC.js +0 -402042
- package/bundle/chunk-XHQIF7OW.js +0 -103253
- package/bundle/cleanup-XUHY5LXE.js +0 -32
- package/bundle/devtoolsService-NB2AMKES.js +0 -4359
- package/bundle/dist-O7VOOHX4.js +0 -2268
- package/bundle/gemini-UZP4MEXP.js +0 -17951
- package/bundle/interactiveCli-R3ZT6N5Z.js +0 -35014
- package/bundle/liteRtServerManager-YM2L7SJG.js +0 -65
- package/bundle/oauth2-provider-VEKJJAQ2.js +0 -273
- package/bundle/start-NJW6EU4P.js +0 -18
|
@@ -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-K4G5D5ZZ.js";
|
|
6
6
|
import {
|
|
7
7
|
AppEvent,
|
|
8
8
|
appEvents
|
|
@@ -63,23 +63,21 @@ import {
|
|
|
63
63
|
stripUnsafeCharacters,
|
|
64
64
|
toCodePoints,
|
|
65
65
|
validateCustomTheme
|
|
66
|
-
} from "./chunk-
|
|
66
|
+
} from "./chunk-V2R74WAG.js";
|
|
67
67
|
import {
|
|
68
68
|
isDevelopment
|
|
69
|
-
} from "./chunk-
|
|
69
|
+
} from "./chunk-BFIV7GTA.js";
|
|
70
70
|
import {
|
|
71
71
|
emptyIcon,
|
|
72
72
|
mapCoreStatusToDisplayStatus,
|
|
73
73
|
require_react
|
|
74
|
-
} from "./chunk-
|
|
74
|
+
} from "./chunk-QJK54DSE.js";
|
|
75
75
|
import {
|
|
76
76
|
ALL_EDITORS,
|
|
77
77
|
ApprovalMode,
|
|
78
78
|
AsyncFzf,
|
|
79
|
-
AuthType,
|
|
80
79
|
Config,
|
|
81
80
|
CoreEvent,
|
|
82
|
-
CoreToolCallStatus,
|
|
83
81
|
DiscoveredMCPTool,
|
|
84
82
|
ExtensionDisableEvent,
|
|
85
83
|
ExtensionEnableEvent,
|
|
@@ -90,32 +88,21 @@ import {
|
|
|
90
88
|
ExtensionUpdateEvent,
|
|
91
89
|
GEMINI_CLI_COMPANION_EXTENSION_NAME,
|
|
92
90
|
GEMINI_DIR,
|
|
93
|
-
HookType,
|
|
94
|
-
IDEConnectionStatus,
|
|
95
91
|
INITIAL_HISTORY_LENGTH,
|
|
96
92
|
IdeClient,
|
|
97
93
|
IdeConnectionEvent,
|
|
98
|
-
IdeConnectionType,
|
|
99
|
-
IntegrityDataStatus,
|
|
100
94
|
KeychainTokenStorage,
|
|
101
|
-
LlmRole,
|
|
102
|
-
MCPDiscoveryState,
|
|
103
95
|
MCPOAuthTokenStorage,
|
|
104
|
-
MCPServerStatus,
|
|
105
96
|
ModelSlashCommandEvent,
|
|
106
|
-
PolicyDecision,
|
|
107
97
|
ProjectIdRequiredError,
|
|
108
98
|
REFERENCE_CONTENT_END,
|
|
109
99
|
REFERENCE_CONTENT_START,
|
|
110
100
|
ReadManyFilesTool,
|
|
111
101
|
RewindEvent,
|
|
112
102
|
SHELL_TOOL_NAME,
|
|
113
|
-
SessionEndReason,
|
|
114
|
-
SessionStartSource,
|
|
115
103
|
ShellExecutionService,
|
|
116
104
|
StartSessionEvent,
|
|
117
105
|
Storage,
|
|
118
|
-
TrustLevel,
|
|
119
106
|
UPGRADE_URL_PAGE,
|
|
120
107
|
UserAccountManager,
|
|
121
108
|
ValidationRequiredError,
|
|
@@ -254,7 +241,7 @@ import {
|
|
|
254
241
|
uiTelemetryService,
|
|
255
242
|
unescapePath,
|
|
256
243
|
validateUrlDestination
|
|
257
|
-
} from "./chunk-
|
|
244
|
+
} from "./chunk-K7NOVQ6G.js";
|
|
258
245
|
import {
|
|
259
246
|
require_src
|
|
260
247
|
} from "./chunk-L6PII3GR.js";
|
|
@@ -60122,7 +60109,7 @@ var import_react34 = __toESM(require_react(), 1);
|
|
|
60122
60109
|
function useIdeTrustListener() {
|
|
60123
60110
|
const settings = useSettings();
|
|
60124
60111
|
const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
|
|
60125
|
-
|
|
60112
|
+
"disconnected" /* Disconnected */
|
|
60126
60113
|
);
|
|
60127
60114
|
const previousTrust = (0, import_react34.useRef)(void 0);
|
|
60128
60115
|
const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
|
|
@@ -60152,7 +60139,7 @@ function useIdeTrustListener() {
|
|
|
60152
60139
|
};
|
|
60153
60140
|
}, []);
|
|
60154
60141
|
const getSnapshot = () => {
|
|
60155
|
-
if (connectionStatus !==
|
|
60142
|
+
if (connectionStatus !== "connected" /* Connected */) {
|
|
60156
60143
|
return void 0;
|
|
60157
60144
|
}
|
|
60158
60145
|
return ideContextStore.get()?.workspaceState?.isTrusted;
|
|
@@ -60857,7 +60844,7 @@ async function initializeApp(config, settings) {
|
|
|
60857
60844
|
await ideClient.connect();
|
|
60858
60845
|
logIdeConnection(
|
|
60859
60846
|
config,
|
|
60860
|
-
new IdeConnectionEvent(
|
|
60847
|
+
new IdeConnectionEvent("start" /* START */)
|
|
60861
60848
|
);
|
|
60862
60849
|
}).catch((e) => {
|
|
60863
60850
|
debugLogger.error("Failed to initialize IDE client:", e);
|
|
@@ -60875,17 +60862,17 @@ async function initializeApp(config, settings) {
|
|
|
60875
60862
|
// packages/cli/src/config/auth.ts
|
|
60876
60863
|
async function validateAuthMethod(authMethod) {
|
|
60877
60864
|
loadEnvironment(loadSettings().merged, process.cwd());
|
|
60878
|
-
if (authMethod ===
|
|
60865
|
+
if (authMethod === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authMethod === "compute-default-credentials" /* COMPUTE_ADC */) {
|
|
60879
60866
|
return null;
|
|
60880
60867
|
}
|
|
60881
|
-
if (authMethod ===
|
|
60868
|
+
if (authMethod === "gemini-api-key" /* USE_GEMINI */) {
|
|
60882
60869
|
const key = process.env["GEMINI_API_KEY"] || await loadApiKey();
|
|
60883
60870
|
if (!key) {
|
|
60884
60871
|
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)!";
|
|
60885
60872
|
}
|
|
60886
60873
|
return null;
|
|
60887
60874
|
}
|
|
60888
|
-
if (authMethod ===
|
|
60875
|
+
if (authMethod === "vertex-ai" /* USE_VERTEX_AI */) {
|
|
60889
60876
|
const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
|
|
60890
60877
|
const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
|
|
60891
60878
|
if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
|
|
@@ -65566,7 +65553,7 @@ var ExtensionManager = class extends ExtensionLoader {
|
|
|
65566
65553
|
const trustedFolders = loadTrustedFolders();
|
|
65567
65554
|
await trustedFolders.setValue(
|
|
65568
65555
|
this.workspaceDir,
|
|
65569
|
-
|
|
65556
|
+
"TRUST_FOLDER" /* TRUST_FOLDER */
|
|
65570
65557
|
);
|
|
65571
65558
|
} else {
|
|
65572
65559
|
throw new Error(
|
|
@@ -65752,7 +65739,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65752
65739
|
newExtensionConfig.version,
|
|
65753
65740
|
previousExtensionConfig.version,
|
|
65754
65741
|
installMetadata.type,
|
|
65755
|
-
|
|
65742
|
+
"success" /* Success */
|
|
65756
65743
|
)
|
|
65757
65744
|
);
|
|
65758
65745
|
if (newExtensionName !== previousName) {
|
|
@@ -65775,7 +65762,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65775
65762
|
getExtensionId(newExtensionConfig, installMetadata),
|
|
65776
65763
|
newExtensionConfig.version,
|
|
65777
65764
|
installMetadata.type,
|
|
65778
|
-
|
|
65765
|
+
"success" /* Success */
|
|
65779
65766
|
)
|
|
65780
65767
|
);
|
|
65781
65768
|
await this.enableExtension(
|
|
@@ -65814,7 +65801,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65814
65801
|
newExtensionConfig?.version ?? "",
|
|
65815
65802
|
previousExtensionConfig.version,
|
|
65816
65803
|
installMetadata.type,
|
|
65817
|
-
|
|
65804
|
+
"error" /* Error */
|
|
65818
65805
|
)
|
|
65819
65806
|
);
|
|
65820
65807
|
} else {
|
|
@@ -65826,7 +65813,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65826
65813
|
extensionId ?? "",
|
|
65827
65814
|
newExtensionConfig?.version ?? "",
|
|
65828
65815
|
installMetadata.type,
|
|
65829
|
-
|
|
65816
|
+
"error" /* Error */
|
|
65830
65817
|
)
|
|
65831
65818
|
);
|
|
65832
65819
|
}
|
|
@@ -65854,7 +65841,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65854
65841
|
extension.name,
|
|
65855
65842
|
hashValue(extension.name),
|
|
65856
65843
|
extension.id,
|
|
65857
|
-
|
|
65844
|
+
"success" /* Success */
|
|
65858
65845
|
)
|
|
65859
65846
|
);
|
|
65860
65847
|
}
|
|
@@ -66117,7 +66104,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
66117
66104
|
if (eventHooks) {
|
|
66118
66105
|
for (const definition of eventHooks) {
|
|
66119
66106
|
for (const hook of definition.hooks) {
|
|
66120
|
-
if (hook.type ===
|
|
66107
|
+
if (hook.type === "command" /* Command */) {
|
|
66121
66108
|
hook.env = { ...hook.env, ...hookEnv };
|
|
66122
66109
|
}
|
|
66123
66110
|
}
|
|
@@ -67254,7 +67241,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
67254
67241
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
67255
67242
|
name: `resources/read (${resource.serverName})`,
|
|
67256
67243
|
description: resource.uri,
|
|
67257
|
-
status:
|
|
67244
|
+
status: "success" /* Success */,
|
|
67258
67245
|
isClientInitiated: true,
|
|
67259
67246
|
resultDisplay: `Successfully read resource ${resource.uri}`,
|
|
67260
67247
|
confirmationDetails: void 0
|
|
@@ -67269,7 +67256,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
67269
67256
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
67270
67257
|
name: `resources/read (${resource.serverName})`,
|
|
67271
67258
|
description: resource.uri,
|
|
67272
|
-
status:
|
|
67259
|
+
status: "error" /* Error */,
|
|
67273
67260
|
isClientInitiated: true,
|
|
67274
67261
|
resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
|
|
67275
67262
|
confirmationDetails: void 0
|
|
@@ -67294,7 +67281,7 @@ Content from @${result.uri}:
|
|
|
67294
67281
|
}
|
|
67295
67282
|
if (hasError) {
|
|
67296
67283
|
const firstError = displays.find(
|
|
67297
|
-
(d) => d.status ===
|
|
67284
|
+
(d) => d.status === "error" /* Error */
|
|
67298
67285
|
);
|
|
67299
67286
|
return {
|
|
67300
67287
|
parts: [],
|
|
@@ -67333,7 +67320,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
|
|
|
67333
67320
|
callId: `client-read-${userMessageTimestamp}`,
|
|
67334
67321
|
name: readManyFilesTool.displayName,
|
|
67335
67322
|
description: invocation.getDescription(),
|
|
67336
|
-
status:
|
|
67323
|
+
status: "success" /* Success */,
|
|
67337
67324
|
isClientInitiated: true,
|
|
67338
67325
|
resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
|
|
67339
67326
|
confirmationDetails: void 0
|
|
@@ -67380,7 +67367,7 @@ Content from @${displayPath}:
|
|
|
67380
67367
|
callId: `client-read-${userMessageTimestamp}`,
|
|
67381
67368
|
name: readManyFilesTool.displayName,
|
|
67382
67369
|
description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
|
|
67383
|
-
status:
|
|
67370
|
+
status: "error" /* Error */,
|
|
67384
67371
|
isClientInitiated: true,
|
|
67385
67372
|
resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
|
|
67386
67373
|
confirmationDetails: void 0
|
|
@@ -70647,7 +70634,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
|
|
|
70647
70634
|
if (wasRaw) {
|
|
70648
70635
|
setRawMode?.(true);
|
|
70649
70636
|
}
|
|
70650
|
-
coreEvents.emit(
|
|
70637
|
+
coreEvents.emit("external-editor-closed" /* ExternalEditorClosed */);
|
|
70651
70638
|
}
|
|
70652
70639
|
}
|
|
70653
70640
|
|
|
@@ -73341,7 +73328,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
|
|
|
73341
73328
|
extension.name,
|
|
73342
73329
|
installMetadata
|
|
73343
73330
|
);
|
|
73344
|
-
if (status ===
|
|
73331
|
+
if (status === "invalid" /* INVALID */) {
|
|
73345
73332
|
throw new Error("Extension integrity cannot be verified");
|
|
73346
73333
|
}
|
|
73347
73334
|
} catch (e) {
|
|
@@ -74836,11 +74823,11 @@ var ShellProcessor = class {
|
|
|
74836
74823
|
},
|
|
74837
74824
|
void 0
|
|
74838
74825
|
);
|
|
74839
|
-
if (decision ===
|
|
74826
|
+
if (decision === "deny" /* DENY */) {
|
|
74840
74827
|
throw new Error(
|
|
74841
74828
|
`${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
|
|
74842
74829
|
);
|
|
74843
|
-
} else if (decision ===
|
|
74830
|
+
} else if (decision === "ask_user" /* ASK_USER */) {
|
|
74844
74831
|
commandsToConfirm.add(command);
|
|
74845
74832
|
}
|
|
74846
74833
|
}
|
|
@@ -75970,7 +75957,7 @@ var MultiFolderTrustDialog = ({
|
|
|
75970
75957
|
if (choice === 1 /* YES_AND_REMEMBER */) {
|
|
75971
75958
|
await trustedFolders.setValue(
|
|
75972
75959
|
expandedPath,
|
|
75973
|
-
|
|
75960
|
+
"TRUST_FOLDER" /* TRUST_FOLDER */
|
|
75974
75961
|
);
|
|
75975
75962
|
}
|
|
75976
75963
|
workspaceContext.addDirectory(expandedPath);
|
|
@@ -76256,10 +76243,10 @@ function isShellTool(name) {
|
|
|
76256
76243
|
return name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME || normalized === "shell";
|
|
76257
76244
|
}
|
|
76258
76245
|
function isThisShellFocusable(name, status, config) {
|
|
76259
|
-
return !!(isShellTool(name) && status ===
|
|
76246
|
+
return !!(isShellTool(name) && status === "executing" /* Executing */ && config?.getEnableInteractiveShell());
|
|
76260
76247
|
}
|
|
76261
76248
|
function isThisShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused) {
|
|
76262
|
-
return !!(isShellTool(name) && status ===
|
|
76249
|
+
return !!(isShellTool(name) && status === "executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused);
|
|
76263
76250
|
}
|
|
76264
76251
|
function useFocusHint(isThisShellFocusable2, isThisShellFocused2, resultDisplay) {
|
|
76265
76252
|
const [userHasFocused, setUserHasFocused] = (0, import_react56.useState)(false);
|
|
@@ -76419,14 +76406,14 @@ function getToolGroupBorderAppearance(item, activeShellPtyId, embeddedShellFocus
|
|
|
76419
76406
|
if (isTrackedToolCall(t)) {
|
|
76420
76407
|
return t.status !== "success" && t.status !== "error" && t.status !== "cancelled";
|
|
76421
76408
|
} else {
|
|
76422
|
-
return t.status !==
|
|
76409
|
+
return t.status !== "success" /* Success */ && t.status !== "error" /* Error */ && t.status !== "cancelled" /* Cancelled */;
|
|
76423
76410
|
}
|
|
76424
76411
|
});
|
|
76425
76412
|
const isEmbeddedShellFocused = toolsToInspect.some((t) => {
|
|
76426
76413
|
if (isTrackedToolCall(t)) {
|
|
76427
76414
|
return isShellTool(t.request.name) && t.status === "executing" && t.pid === activeShellPtyId && !!embeddedShellFocused;
|
|
76428
76415
|
} else {
|
|
76429
|
-
return isShellTool(t.name) && t.status ===
|
|
76416
|
+
return isShellTool(t.name) && t.status === "executing" /* Executing */ && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
|
|
76430
76417
|
}
|
|
76431
76418
|
});
|
|
76432
76419
|
const isShellCommand = toolsToInspect.some((t) => {
|
|
@@ -77864,7 +77851,7 @@ var authCommand = {
|
|
|
77864
77851
|
import process29 from "node:process";
|
|
77865
77852
|
|
|
77866
77853
|
// packages/cli/src/generated/git-commit.ts
|
|
77867
|
-
var GIT_COMMIT_INFO = "
|
|
77854
|
+
var GIT_COMMIT_INFO = "204db94ae";
|
|
77868
77855
|
|
|
77869
77856
|
// packages/cli/src/ui/utils/historyExportUtils.ts
|
|
77870
77857
|
import * as fsPromises from "node:fs/promises";
|
|
@@ -78510,7 +78497,7 @@ var clearCommand = {
|
|
|
78510
78497
|
const config = context.services.agentContext?.config;
|
|
78511
78498
|
const hookSystem = config?.getHookSystem();
|
|
78512
78499
|
if (hookSystem) {
|
|
78513
|
-
await hookSystem.fireSessionEndEvent(
|
|
78500
|
+
await hookSystem.fireSessionEndEvent("clear" /* Clear */);
|
|
78514
78501
|
}
|
|
78515
78502
|
config?.injectionService.clear();
|
|
78516
78503
|
let newSessionId;
|
|
@@ -78527,7 +78514,7 @@ var clearCommand = {
|
|
|
78527
78514
|
}
|
|
78528
78515
|
let result;
|
|
78529
78516
|
if (hookSystem) {
|
|
78530
|
-
result = await hookSystem.fireSessionStartEvent(
|
|
78517
|
+
result = await hookSystem.fireSessionStartEvent("clear" /* Clear */);
|
|
78531
78518
|
}
|
|
78532
78519
|
await new Promise((resolve9) => setImmediate(resolve9));
|
|
78533
78520
|
if (config) {
|
|
@@ -81536,7 +81523,7 @@ var Footer = () => {
|
|
|
81536
81523
|
case "auth": {
|
|
81537
81524
|
if (!settings.merged.ui.showUserIdentity) break;
|
|
81538
81525
|
if (!authType) break;
|
|
81539
|
-
const displayStr = authType ===
|
|
81526
|
+
const displayStr = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? email ?? "google" : authType;
|
|
81540
81527
|
addCol(
|
|
81541
81528
|
id,
|
|
81542
81529
|
header,
|
|
@@ -83320,12 +83307,12 @@ import path29 from "node:path";
|
|
|
83320
83307
|
function getIdeStatusMessage(ideClient) {
|
|
83321
83308
|
const connection = ideClient.getConnectionStatus();
|
|
83322
83309
|
switch (connection.status) {
|
|
83323
|
-
case
|
|
83310
|
+
case "connected" /* Connected */:
|
|
83324
83311
|
return {
|
|
83325
83312
|
messageType: "info",
|
|
83326
83313
|
content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
|
|
83327
83314
|
};
|
|
83328
|
-
case
|
|
83315
|
+
case "connecting" /* Connecting */:
|
|
83329
83316
|
return {
|
|
83330
83317
|
messageType: "info",
|
|
83331
83318
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -83366,7 +83353,7 @@ ${infoMessage}`;
|
|
|
83366
83353
|
async function getIdeStatusMessageWithFiles(ideClient) {
|
|
83367
83354
|
const connection = ideClient.getConnectionStatus();
|
|
83368
83355
|
switch (connection.status) {
|
|
83369
|
-
case
|
|
83356
|
+
case "connected" /* Connected */: {
|
|
83370
83357
|
let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
|
|
83371
83358
|
const context = ideContextStore.get();
|
|
83372
83359
|
const openFiles = context?.workspaceState?.openFiles;
|
|
@@ -83378,7 +83365,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
|
|
|
83378
83365
|
content
|
|
83379
83366
|
};
|
|
83380
83367
|
}
|
|
83381
|
-
case
|
|
83368
|
+
case "connecting" /* Connecting */:
|
|
83382
83369
|
return {
|
|
83383
83370
|
messageType: "info",
|
|
83384
83371
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -83400,7 +83387,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
|
|
|
83400
83387
|
const ideClient = await IdeClient.getInstance();
|
|
83401
83388
|
if (value) {
|
|
83402
83389
|
await ideClient.connect(options);
|
|
83403
|
-
logIdeConnection(config, new IdeConnectionEvent(
|
|
83390
|
+
logIdeConnection(config, new IdeConnectionEvent("session" /* SESSION */));
|
|
83404
83391
|
} else {
|
|
83405
83392
|
await ideClient.disconnect();
|
|
83406
83393
|
}
|
|
@@ -83488,7 +83475,7 @@ var ideCommand = async () => {
|
|
|
83488
83475
|
logToConsole: false
|
|
83489
83476
|
}
|
|
83490
83477
|
);
|
|
83491
|
-
if (ideClient.getConnectionStatus().status ===
|
|
83478
|
+
if (ideClient.getConnectionStatus().status === "connected" /* Connected */) {
|
|
83492
83479
|
break;
|
|
83493
83480
|
}
|
|
83494
83481
|
await new Promise((resolve9) => setTimeout(resolve9, 500));
|
|
@@ -83565,7 +83552,7 @@ var ideCommand = async () => {
|
|
|
83565
83552
|
}
|
|
83566
83553
|
};
|
|
83567
83554
|
const { status } = ideClient.getConnectionStatus();
|
|
83568
|
-
const isConnected = status ===
|
|
83555
|
+
const isConnected = status === "connected" /* Connected */;
|
|
83569
83556
|
if (isConnected) {
|
|
83570
83557
|
ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
|
|
83571
83558
|
} else {
|
|
@@ -83665,13 +83652,13 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
83665
83652
|
const displayListener = (message) => {
|
|
83666
83653
|
context.ui.addItem({ type: "info", text: message });
|
|
83667
83654
|
};
|
|
83668
|
-
coreEvents.on(
|
|
83655
|
+
coreEvents.on("oauth-display-message" /* OauthDisplayMessage */, displayListener);
|
|
83669
83656
|
try {
|
|
83670
83657
|
context.ui.addItem({
|
|
83671
83658
|
type: "info",
|
|
83672
83659
|
text: `Starting OAuth authentication for MCP server '${serverName}'...`
|
|
83673
83660
|
});
|
|
83674
|
-
const { MCPOAuthProvider } = await import("./
|
|
83661
|
+
const { MCPOAuthProvider } = await import("./core-IVQAI4S6.js");
|
|
83675
83662
|
let oauthConfig = server.oauth;
|
|
83676
83663
|
if (!oauthConfig) {
|
|
83677
83664
|
oauthConfig = { enabled: false };
|
|
@@ -83708,7 +83695,7 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
83708
83695
|
content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
|
|
83709
83696
|
};
|
|
83710
83697
|
} finally {
|
|
83711
|
-
coreEvents.removeListener(
|
|
83698
|
+
coreEvents.removeListener("oauth-display-message" /* OauthDisplayMessage */, displayListener);
|
|
83712
83699
|
}
|
|
83713
83700
|
},
|
|
83714
83701
|
completion: async (context, partialArg) => {
|
|
@@ -83754,10 +83741,10 @@ var listAction2 = async (context, showDescriptions = false, showSchema = false,
|
|
|
83754
83741
|
}
|
|
83755
83742
|
const serverNames = Object.keys(mcpServers);
|
|
83756
83743
|
const connectingServers = serverNames.filter(
|
|
83757
|
-
(name) => getMCPServerStatus(name) ===
|
|
83744
|
+
(name) => getMCPServerStatus(name) === "connecting" /* CONNECTING */
|
|
83758
83745
|
);
|
|
83759
83746
|
const discoveryState = getMCPDiscoveryState();
|
|
83760
|
-
const discoveryInProgress = discoveryState ===
|
|
83747
|
+
const discoveryInProgress = discoveryState === "in_progress" /* IN_PROGRESS */ || connectingServers.length > 0;
|
|
83761
83748
|
const allTools = toolRegistry.getAllTools();
|
|
83762
83749
|
const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
|
|
83763
83750
|
const promptRegistry = config.getPromptRegistry();
|
|
@@ -99535,7 +99522,7 @@ Return a JSON object with:
|
|
|
99535
99522
|
},
|
|
99536
99523
|
abortSignal: new AbortController().signal,
|
|
99537
99524
|
promptId: "triage-duplicates",
|
|
99538
|
-
role:
|
|
99525
|
+
role: "utility_tool" /* UTILITY_TOOL */
|
|
99539
99526
|
});
|
|
99540
99527
|
const rec = response;
|
|
99541
99528
|
let canonical;
|
|
@@ -100369,7 +100356,7 @@ Return a JSON object with:
|
|
|
100369
100356
|
},
|
|
100370
100357
|
abortSignal: abortControllerRef.current.signal,
|
|
100371
100358
|
promptId: "triage-issues",
|
|
100372
|
-
role:
|
|
100359
|
+
role: "utility_tool" /* UTILITY_TOOL */
|
|
100373
100360
|
});
|
|
100374
100361
|
return response;
|
|
100375
100362
|
},
|
|
@@ -100943,8 +100930,8 @@ var planCommand = {
|
|
|
100943
100930
|
return;
|
|
100944
100931
|
}
|
|
100945
100932
|
const previousApprovalMode = config.getApprovalMode();
|
|
100946
|
-
config.setApprovalMode(
|
|
100947
|
-
if (previousApprovalMode !==
|
|
100933
|
+
config.setApprovalMode("plan" /* PLAN */);
|
|
100934
|
+
if (previousApprovalMode !== "plan" /* PLAN */) {
|
|
100948
100935
|
coreEvents.emitFeedback("info", "Switched to Plan Mode.");
|
|
100949
100936
|
}
|
|
100950
100937
|
if (context.invocation?.args) {
|
|
@@ -101003,10 +100990,10 @@ var categorizeRulesByMode = (rules) => {
|
|
|
101003
100990
|
rules.forEach((rule) => {
|
|
101004
100991
|
const modes = rule.modes?.length ? rule.modes : ALL_MODES;
|
|
101005
100992
|
const modeSet = new Set(modes);
|
|
101006
|
-
if (modeSet.has(
|
|
101007
|
-
if (modeSet.has(
|
|
101008
|
-
if (modeSet.has(
|
|
101009
|
-
if (modeSet.has(
|
|
100993
|
+
if (modeSet.has("default" /* DEFAULT */)) result.normal.push(rule);
|
|
100994
|
+
if (modeSet.has("autoEdit" /* AUTO_EDIT */)) result.autoEdit.push(rule);
|
|
100995
|
+
if (modeSet.has("yolo" /* YOLO */)) result.yolo.push(rule);
|
|
100996
|
+
if (modeSet.has("plan" /* PLAN */)) result.plan.push(rule);
|
|
101010
100997
|
});
|
|
101011
100998
|
return result;
|
|
101012
100999
|
};
|
|
@@ -102387,7 +102374,7 @@ var upgradeCommand = {
|
|
|
102387
102374
|
action: async (context) => {
|
|
102388
102375
|
const config = context.services.agentContext?.config;
|
|
102389
102376
|
const authType = config?.getContentGeneratorConfig()?.authType;
|
|
102390
|
-
if (authType !==
|
|
102377
|
+
if (authType !== "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
|
|
102391
102378
|
return {
|
|
102392
102379
|
type: "message",
|
|
102393
102380
|
messageType: "error",
|
|
@@ -102616,7 +102603,7 @@ var BuiltinCommandLoader = class {
|
|
|
102616
102603
|
setupGithubCommand,
|
|
102617
102604
|
terminalSetupCommand,
|
|
102618
102605
|
...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
|
|
102619
|
-
...this.config?.getContentGeneratorConfig()?.authType ===
|
|
102606
|
+
...this.config?.getContentGeneratorConfig()?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? [upgradeCommand] : []
|
|
102620
102607
|
];
|
|
102621
102608
|
handle?.end();
|
|
102622
102609
|
return allDefinitions.filter((cmd) => cmd !== null);
|