@google/gemini-cli 0.64.0-preview.1 → 0.64.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-6JF3XGX6.js → chunk-5XKZL6EB.js} +2 -2
- package/bundle/{chunk-2XMCTNPW.js → chunk-7H3F2KUX.js} +1 -1
- package/bundle/{chunk-BONG2QK5.js → chunk-DPNFVVVC.js} +2 -2
- package/bundle/{chunk-GWH2CDNQ.js → chunk-ENBP32XB.js} +1 -1
- package/bundle/{chunk-7AV6KELE.js → chunk-EV5MQULH.js} +1 -1
- package/bundle/{chunk-R7OEYEVK.js → chunk-FCPMU3HO.js} +3 -3
- package/bundle/{chunk-EE4FVMPM.js → chunk-FJUB4QHG.js} +3 -3
- package/bundle/{chunk-46DG3MEK.js → chunk-FLKY6NH5.js} +1 -1
- package/bundle/{chunk-XNLASMX4.js → chunk-HHALNKOO.js} +1 -1
- package/bundle/{chunk-RQB6UOWL.js → chunk-IESQO4NS.js} +1 -1
- package/bundle/{chunk-NTBZBCDY.js → chunk-J7SXW2FI.js} +4 -4
- package/bundle/{chunk-RIRMXE4G.js → chunk-KJWA3D3G.js} +7 -7
- package/bundle/{chunk-7FPYEHDV.js → chunk-MA35JFUP.js} +7 -7
- package/bundle/{chunk-MN5WGELB.js → chunk-NR7L3FXV.js} +4 -4
- package/bundle/{chunk-ONZZ4MZP.js → chunk-OQYJODOA.js} +1 -1
- package/bundle/{chunk-BRVQMVD5.js → chunk-P7ZJXXPR.js} +2 -2
- package/bundle/{chunk-BSE7BCTQ.js → chunk-PS4UL4AP.js} +1 -1
- package/bundle/{chunk-T7UXARRX.js → chunk-PZ4GDG24.js} +14895 -7864
- package/bundle/{chunk-L3JNREL2.js → chunk-QCHFD56F.js} +5 -7
- package/bundle/{chunk-J7KGQZGT.js → chunk-QLNDNLK5.js} +1 -1
- package/bundle/{chunk-TVJ4WAFU.js → chunk-QSLJVHXU.js} +8 -9
- package/bundle/{chunk-7OAPTXNW.js → chunk-V7G7CIBW.js} +58 -71
- package/bundle/{chunk-4TPFLAND.js → chunk-VOLZQW4I.js} +1 -1
- package/bundle/{chunk-SQZOWFWU.js → chunk-WLZT2COY.js} +3 -3
- package/bundle/{cleanup-5HA3CDPH.js → cleanup-K7PKM5O3.js} +2 -2
- package/bundle/{cleanup-LXXTR2OE.js → cleanup-NAOD2SQV.js} +2 -2
- package/bundle/{cleanup-RM72YALN.js → cleanup-QRBWTWKF.js} +2 -2
- package/bundle/{core-NBQGNNOM.js → core-4P3HPH34.js} +1 -1
- package/bundle/{dist-24APVFHT.js → core-ICFDSJL3.js} +1 -1
- package/bundle/{devtoolsService-BUAVC3ZD.js → devtoolsService-4MGN7S5K.js} +2 -2
- package/bundle/{devtoolsService-PXS65V3Y.js → devtoolsService-7CS2YIL6.js} +3 -4
- package/bundle/{devtoolsService-DCRIOTR4.js → devtoolsService-LKOU7QN7.js} +2 -2
- package/bundle/{dist-EOOSNLUQ.js → dist-YMXCTNJD.js} +1 -1
- package/bundle/{gemini-UEMV4Y7B.js → gemini-6ESINPDZ.js} +14 -14
- package/bundle/{gemini-Q4LI2KHU.js → gemini-IPXWMEB5.js} +198 -214
- package/bundle/{gemini-LHZDQRUM.js → gemini-Q2GRYIAK.js} +14 -14
- package/bundle/gemini.js +7 -7
- package/bundle/{interactiveCli-HMZ5ZWK4.js → interactiveCli-2T27ZS4G.js} +8 -8
- package/bundle/{interactiveCli-QXZXFSNY.js → interactiveCli-66E5CZDR.js} +8 -8
- package/bundle/{interactiveCli-IQQYS4AV.js → interactiveCli-IX4FVS6G.js} +293 -312
- package/bundle/{liteRtServerManager-2I4N5IEZ.js → liteRtServerManager-BFSWF4GA.js} +4 -4
- package/bundle/{liteRtServerManager-3IZ2LKBD.js → liteRtServerManager-CU5D7FDE.js} +4 -4
- package/bundle/{liteRtServerManager-RABYR6TB.js → liteRtServerManager-JJZYMP2G.js} +4 -4
- package/bundle/{oauth2-provider-XFPEOXNY.js → oauth2-provider-65ILSORU.js} +1 -1
- package/bundle/{oauth2-provider-I3CU23H3.js → oauth2-provider-CHSEPLKC.js} +1 -1
- package/bundle/{oauth2-provider-INBLO6HF.js → oauth2-provider-N73PS5ZT.js} +72 -38
- package/bundle/{start-4UWH3BI7.js → start-6JMUZJ7T.js} +6 -6
- package/bundle/{start-CQTZWDLV.js → start-6KYN7M6S.js} +6 -6
- package/bundle/{start-D6DJS7SZ.js → start-YI7IUIYU.js} +6 -6
- package/package.json +1 -1
- package/bundle/chunk-627EICDK.js +0 -401531
- package/bundle/chunk-BYVRH4VZ.js +0 -103137
- package/bundle/chunk-H2WBGLUF.js +0 -512
- package/bundle/chunk-JLBO43LX.js +0 -154
- package/bundle/chunk-POXVKWMH.js +0 -17519
- package/bundle/chunk-TDYDNMXH.js +0 -425
- package/bundle/chunk-Y3EQFIOM.js +0 -118
- package/bundle/chunk-YKGBOB2S.js +0 -1571
- package/bundle/cleanup-TBTZ6WZD.js +0 -32
- package/bundle/devtoolsService-ZHFOHPIS.js +0 -4359
- package/bundle/dist-YP3VMVL6.js +0 -2262
- package/bundle/gemini-QM6PZXIH.js +0 -17934
- package/bundle/interactiveCli-QCNSW3M7.js +0 -34968
- package/bundle/liteRtServerManager-T3MOB7VG.js +0 -65
- package/bundle/oauth2-provider-UZV2BJA3.js +0 -235
- package/bundle/start-IXFELTCY.js +0 -18
|
@@ -2,8 +2,6 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
|
|
|
2
2
|
import {
|
|
3
3
|
AuthProviderType,
|
|
4
4
|
AuthType,
|
|
5
|
-
CoreEvent,
|
|
6
|
-
CoreToolCallStatus,
|
|
7
5
|
DEFAULT_MODEL_CONFIGS,
|
|
8
6
|
DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
|
|
9
7
|
EDITOR_OPTIONS,
|
|
@@ -33,7 +31,7 @@ import {
|
|
|
33
31
|
partListUnionToString,
|
|
34
32
|
require_strip_json_comments,
|
|
35
33
|
sanitizeFilenamePart
|
|
36
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-PZ4GDG24.js";
|
|
37
35
|
import {
|
|
38
36
|
__commonJS,
|
|
39
37
|
__require,
|
|
@@ -10291,7 +10289,7 @@ function convertSessionToHistoryFormats(messages) {
|
|
|
10291
10289
|
args: tool.args,
|
|
10292
10290
|
description: tool.description || "",
|
|
10293
10291
|
renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
|
|
10294
|
-
status: tool.status === "success" ?
|
|
10292
|
+
status: tool.status === "success" ? "success" /* Success */ : "error" /* Error */,
|
|
10295
10293
|
resultDisplay: tool.resultDisplay,
|
|
10296
10294
|
confirmationDetails: void 0
|
|
10297
10295
|
}))
|
|
@@ -16435,8 +16433,8 @@ var LoadedSettings = class {
|
|
|
16435
16433
|
// React will pass a listener fn into this subscribe fn
|
|
16436
16434
|
// that listener fn will perform an object identity check on the snapshot and trigger a React re render if the snapshot has changed
|
|
16437
16435
|
subscribe(listener) {
|
|
16438
|
-
coreEvents.on(
|
|
16439
|
-
return () => coreEvents.off(
|
|
16436
|
+
coreEvents.on("settings-changed" /* SettingsChanged */, listener);
|
|
16437
|
+
return () => coreEvents.off("settings-changed" /* SettingsChanged */, listener);
|
|
16440
16438
|
}
|
|
16441
16439
|
getSnapshot() {
|
|
16442
16440
|
return this._snapshot;
|
|
@@ -16580,7 +16578,7 @@ function setUpCloudShellEnvironment(envFilePath, isTrusted, isSandboxed, selecte
|
|
|
16580
16578
|
}
|
|
16581
16579
|
}
|
|
16582
16580
|
let value = "cloudshell-gca";
|
|
16583
|
-
if (selectedAuthType ===
|
|
16581
|
+
if (selectedAuthType === "vertex-ai" /* USE_VERTEX_AI */) {
|
|
16584
16582
|
value = process2.env[USER_GCP_PROJECT];
|
|
16585
16583
|
}
|
|
16586
16584
|
if (envFilePath && fs4.existsSync(envFilePath)) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
2
|
import {
|
|
3
3
|
checkExhaustive
|
|
4
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-J7SXW2FI.js";
|
|
5
5
|
import {
|
|
6
6
|
__commonJS,
|
|
7
7
|
__toESM
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
|
|
2
2
|
import {
|
|
3
|
-
CoreToolCallStatus,
|
|
4
3
|
checkExhaustive
|
|
5
|
-
} from "./chunk-
|
|
4
|
+
} from "./chunk-PZ4GDG24.js";
|
|
6
5
|
import {
|
|
7
6
|
__commonJS,
|
|
8
7
|
__toESM
|
|
@@ -465,19 +464,19 @@ var require_react = __commonJS({
|
|
|
465
464
|
var import_react = __toESM(require_react(), 1);
|
|
466
465
|
function mapCoreStatusToDisplayStatus(coreStatus) {
|
|
467
466
|
switch (coreStatus) {
|
|
468
|
-
case
|
|
467
|
+
case "validating" /* Validating */:
|
|
469
468
|
return "Pending" /* Pending */;
|
|
470
|
-
case
|
|
469
|
+
case "awaiting_approval" /* AwaitingApproval */:
|
|
471
470
|
return "Confirming" /* Confirming */;
|
|
472
|
-
case
|
|
471
|
+
case "executing" /* Executing */:
|
|
473
472
|
return "Executing" /* Executing */;
|
|
474
|
-
case
|
|
473
|
+
case "success" /* Success */:
|
|
475
474
|
return "Success" /* Success */;
|
|
476
|
-
case
|
|
475
|
+
case "cancelled" /* Cancelled */:
|
|
477
476
|
return "Canceled" /* Canceled */;
|
|
478
|
-
case
|
|
477
|
+
case "error" /* Error */:
|
|
479
478
|
return "Error" /* Error */;
|
|
480
|
-
case
|
|
479
|
+
case "scheduled" /* Scheduled */:
|
|
481
480
|
return "Pending" /* Pending */;
|
|
482
481
|
default:
|
|
483
482
|
return checkExhaustive(coreStatus);
|
|
@@ -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-OQYJODOA.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-QCHFD56F.js";
|
|
67
67
|
import {
|
|
68
68
|
isDevelopment
|
|
69
|
-
} from "./chunk-
|
|
69
|
+
} from "./chunk-5XKZL6EB.js";
|
|
70
70
|
import {
|
|
71
71
|
emptyIcon,
|
|
72
72
|
mapCoreStatusToDisplayStatus,
|
|
73
73
|
require_react
|
|
74
|
-
} from "./chunk-
|
|
74
|
+
} from "./chunk-QSLJVHXU.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,
|
|
@@ -252,7 +239,7 @@ import {
|
|
|
252
239
|
tokenLimit,
|
|
253
240
|
uiTelemetryService,
|
|
254
241
|
unescapePath
|
|
255
|
-
} from "./chunk-
|
|
242
|
+
} from "./chunk-PZ4GDG24.js";
|
|
256
243
|
import {
|
|
257
244
|
require_src
|
|
258
245
|
} from "./chunk-L6PII3GR.js";
|
|
@@ -60120,7 +60107,7 @@ var import_react34 = __toESM(require_react(), 1);
|
|
|
60120
60107
|
function useIdeTrustListener() {
|
|
60121
60108
|
const settings = useSettings();
|
|
60122
60109
|
const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
|
|
60123
|
-
|
|
60110
|
+
"disconnected" /* Disconnected */
|
|
60124
60111
|
);
|
|
60125
60112
|
const previousTrust = (0, import_react34.useRef)(void 0);
|
|
60126
60113
|
const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
|
|
@@ -60150,7 +60137,7 @@ function useIdeTrustListener() {
|
|
|
60150
60137
|
};
|
|
60151
60138
|
}, []);
|
|
60152
60139
|
const getSnapshot = () => {
|
|
60153
|
-
if (connectionStatus !==
|
|
60140
|
+
if (connectionStatus !== "connected" /* Connected */) {
|
|
60154
60141
|
return void 0;
|
|
60155
60142
|
}
|
|
60156
60143
|
return ideContextStore.get()?.workspaceState?.isTrusted;
|
|
@@ -60855,7 +60842,7 @@ async function initializeApp(config, settings) {
|
|
|
60855
60842
|
await ideClient.connect();
|
|
60856
60843
|
logIdeConnection(
|
|
60857
60844
|
config,
|
|
60858
|
-
new IdeConnectionEvent(
|
|
60845
|
+
new IdeConnectionEvent("start" /* START */)
|
|
60859
60846
|
);
|
|
60860
60847
|
}).catch((e) => {
|
|
60861
60848
|
debugLogger.error("Failed to initialize IDE client:", e);
|
|
@@ -60873,17 +60860,17 @@ async function initializeApp(config, settings) {
|
|
|
60873
60860
|
// packages/cli/src/config/auth.ts
|
|
60874
60861
|
async function validateAuthMethod(authMethod) {
|
|
60875
60862
|
loadEnvironment(loadSettings().merged, process.cwd());
|
|
60876
|
-
if (authMethod ===
|
|
60863
|
+
if (authMethod === "oauth-personal" /* LOGIN_WITH_GOOGLE */ || authMethod === "compute-default-credentials" /* COMPUTE_ADC */) {
|
|
60877
60864
|
return null;
|
|
60878
60865
|
}
|
|
60879
|
-
if (authMethod ===
|
|
60866
|
+
if (authMethod === "gemini-api-key" /* USE_GEMINI */) {
|
|
60880
60867
|
const key = process.env["GEMINI_API_KEY"] || await loadApiKey();
|
|
60881
60868
|
if (!key) {
|
|
60882
60869
|
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)!";
|
|
60883
60870
|
}
|
|
60884
60871
|
return null;
|
|
60885
60872
|
}
|
|
60886
|
-
if (authMethod ===
|
|
60873
|
+
if (authMethod === "vertex-ai" /* USE_VERTEX_AI */) {
|
|
60887
60874
|
const hasVertexProjectLocationConfig = !!process.env["GOOGLE_CLOUD_PROJECT"] && !!process.env["GOOGLE_CLOUD_LOCATION"];
|
|
60888
60875
|
const hasGoogleApiKey = !!process.env["GOOGLE_API_KEY"];
|
|
60889
60876
|
if (!hasVertexProjectLocationConfig && !hasGoogleApiKey) {
|
|
@@ -65455,7 +65442,7 @@ var ExtensionManager = class extends ExtensionLoader {
|
|
|
65455
65442
|
const trustedFolders = loadTrustedFolders();
|
|
65456
65443
|
await trustedFolders.setValue(
|
|
65457
65444
|
this.workspaceDir,
|
|
65458
|
-
|
|
65445
|
+
"TRUST_FOLDER" /* TRUST_FOLDER */
|
|
65459
65446
|
);
|
|
65460
65447
|
} else {
|
|
65461
65448
|
throw new Error(
|
|
@@ -65641,7 +65628,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65641
65628
|
newExtensionConfig.version,
|
|
65642
65629
|
previousExtensionConfig.version,
|
|
65643
65630
|
installMetadata.type,
|
|
65644
|
-
|
|
65631
|
+
"success" /* Success */
|
|
65645
65632
|
)
|
|
65646
65633
|
);
|
|
65647
65634
|
if (newExtensionName !== previousName) {
|
|
@@ -65664,7 +65651,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65664
65651
|
getExtensionId(newExtensionConfig, installMetadata),
|
|
65665
65652
|
newExtensionConfig.version,
|
|
65666
65653
|
installMetadata.type,
|
|
65667
|
-
|
|
65654
|
+
"success" /* Success */
|
|
65668
65655
|
)
|
|
65669
65656
|
);
|
|
65670
65657
|
await this.enableExtension(
|
|
@@ -65703,7 +65690,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65703
65690
|
newExtensionConfig?.version ?? "",
|
|
65704
65691
|
previousExtensionConfig.version,
|
|
65705
65692
|
installMetadata.type,
|
|
65706
|
-
|
|
65693
|
+
"error" /* Error */
|
|
65707
65694
|
)
|
|
65708
65695
|
);
|
|
65709
65696
|
} else {
|
|
@@ -65715,7 +65702,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65715
65702
|
extensionId ?? "",
|
|
65716
65703
|
newExtensionConfig?.version ?? "",
|
|
65717
65704
|
installMetadata.type,
|
|
65718
|
-
|
|
65705
|
+
"error" /* Error */
|
|
65719
65706
|
)
|
|
65720
65707
|
);
|
|
65721
65708
|
}
|
|
@@ -65743,7 +65730,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
65743
65730
|
extension.name,
|
|
65744
65731
|
hashValue(extension.name),
|
|
65745
65732
|
extension.id,
|
|
65746
|
-
|
|
65733
|
+
"success" /* Success */
|
|
65747
65734
|
)
|
|
65748
65735
|
);
|
|
65749
65736
|
}
|
|
@@ -66005,7 +65992,7 @@ Would you like to attempt to install via "git clone" instead?`
|
|
|
66005
65992
|
if (eventHooks) {
|
|
66006
65993
|
for (const definition of eventHooks) {
|
|
66007
65994
|
for (const hook of definition.hooks) {
|
|
66008
|
-
if (hook.type ===
|
|
65995
|
+
if (hook.type === "command" /* Command */) {
|
|
66009
65996
|
hook.env = { ...hook.env, ...hookEnv };
|
|
66010
65997
|
}
|
|
66011
65998
|
}
|
|
@@ -67152,7 +67139,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
67152
67139
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
67153
67140
|
name: `resources/read (${resource.serverName})`,
|
|
67154
67141
|
description: resource.uri,
|
|
67155
|
-
status:
|
|
67142
|
+
status: "success" /* Success */,
|
|
67156
67143
|
isClientInitiated: true,
|
|
67157
67144
|
resultDisplay: `Successfully read resource ${resource.uri}`,
|
|
67158
67145
|
confirmationDetails: void 0
|
|
@@ -67167,7 +67154,7 @@ async function readMcpResources(resourceParts, config, signal) {
|
|
|
67167
67154
|
callId: `mcp-resource-${resource.serverName}-${resource.uri}`,
|
|
67168
67155
|
name: `resources/read (${resource.serverName})`,
|
|
67169
67156
|
description: resource.uri,
|
|
67170
|
-
status:
|
|
67157
|
+
status: "error" /* Error */,
|
|
67171
67158
|
isClientInitiated: true,
|
|
67172
67159
|
resultDisplay: `Error reading resource ${resource.uri}: ${getErrorMessage(error)}`,
|
|
67173
67160
|
confirmationDetails: void 0
|
|
@@ -67192,7 +67179,7 @@ Content from @${result.uri}:
|
|
|
67192
67179
|
}
|
|
67193
67180
|
if (hasError) {
|
|
67194
67181
|
const firstError = displays.find(
|
|
67195
|
-
(d) => d.status ===
|
|
67182
|
+
(d) => d.status === "error" /* Error */
|
|
67196
67183
|
);
|
|
67197
67184
|
return {
|
|
67198
67185
|
parts: [],
|
|
@@ -67233,7 +67220,7 @@ async function readLocalFiles(resolvedFiles, config, signal, userMessageTimestam
|
|
|
67233
67220
|
callId: `client-read-${userMessageTimestamp}`,
|
|
67234
67221
|
name: readManyFilesTool.displayName,
|
|
67235
67222
|
description: invocation.getDescription(),
|
|
67236
|
-
status:
|
|
67223
|
+
status: "success" /* Success */,
|
|
67237
67224
|
isClientInitiated: true,
|
|
67238
67225
|
resultDisplay: result.returnDisplay || `Successfully read: ${fileLabelsForDisplay.join(", ")}`,
|
|
67239
67226
|
confirmationDetails: void 0
|
|
@@ -67280,7 +67267,7 @@ Content from @${displayPath}:
|
|
|
67280
67267
|
callId: `client-read-${userMessageTimestamp}`,
|
|
67281
67268
|
name: readManyFilesTool.displayName,
|
|
67282
67269
|
description: invocation?.getDescription() ?? "Error attempting to execute tool to read files",
|
|
67283
|
-
status:
|
|
67270
|
+
status: "error" /* Error */,
|
|
67284
67271
|
isClientInitiated: true,
|
|
67285
67272
|
resultDisplay: `Error reading files (${fileLabelsForDisplay.join(", ")}): ${getErrorMessage(error)}`,
|
|
67286
67273
|
confirmationDetails: void 0
|
|
@@ -70547,7 +70534,7 @@ async function openFileInEditor(filePath, stdin, setRawMode, preferredEditorType
|
|
|
70547
70534
|
if (wasRaw) {
|
|
70548
70535
|
setRawMode?.(true);
|
|
70549
70536
|
}
|
|
70550
|
-
coreEvents.emit(
|
|
70537
|
+
coreEvents.emit("external-editor-closed" /* ExternalEditorClosed */);
|
|
70551
70538
|
}
|
|
70552
70539
|
}
|
|
70553
70540
|
|
|
@@ -73241,7 +73228,7 @@ async function updateExtension(extension, extensionManager, currentState, dispat
|
|
|
73241
73228
|
extension.name,
|
|
73242
73229
|
installMetadata
|
|
73243
73230
|
);
|
|
73244
|
-
if (status ===
|
|
73231
|
+
if (status === "invalid" /* INVALID */) {
|
|
73245
73232
|
throw new Error("Extension integrity cannot be verified");
|
|
73246
73233
|
}
|
|
73247
73234
|
} catch (e) {
|
|
@@ -74736,11 +74723,11 @@ var ShellProcessor = class {
|
|
|
74736
74723
|
},
|
|
74737
74724
|
void 0
|
|
74738
74725
|
);
|
|
74739
|
-
if (decision ===
|
|
74726
|
+
if (decision === "deny" /* DENY */) {
|
|
74740
74727
|
throw new Error(
|
|
74741
74728
|
`${this.commandName} cannot be run. Blocked command: "${command}". Reason: Blocked by policy.`
|
|
74742
74729
|
);
|
|
74743
|
-
} else if (decision ===
|
|
74730
|
+
} else if (decision === "ask_user" /* ASK_USER */) {
|
|
74744
74731
|
commandsToConfirm.add(command);
|
|
74745
74732
|
}
|
|
74746
74733
|
}
|
|
@@ -75870,7 +75857,7 @@ var MultiFolderTrustDialog = ({
|
|
|
75870
75857
|
if (choice === 1 /* YES_AND_REMEMBER */) {
|
|
75871
75858
|
await trustedFolders.setValue(
|
|
75872
75859
|
expandedPath,
|
|
75873
|
-
|
|
75860
|
+
"TRUST_FOLDER" /* TRUST_FOLDER */
|
|
75874
75861
|
);
|
|
75875
75862
|
}
|
|
75876
75863
|
workspaceContext.addDirectory(expandedPath);
|
|
@@ -76156,10 +76143,10 @@ function isShellTool(name) {
|
|
|
76156
76143
|
return name === SHELL_COMMAND_NAME || name === SHELL_NAME || name === SHELL_TOOL_NAME || normalized === "shell";
|
|
76157
76144
|
}
|
|
76158
76145
|
function isThisShellFocusable(name, status, config) {
|
|
76159
|
-
return !!(isShellTool(name) && status ===
|
|
76146
|
+
return !!(isShellTool(name) && status === "executing" /* Executing */ && config?.getEnableInteractiveShell());
|
|
76160
76147
|
}
|
|
76161
76148
|
function isThisShellFocused(name, status, ptyId, activeShellPtyId, embeddedShellFocused) {
|
|
76162
|
-
return !!(isShellTool(name) && status ===
|
|
76149
|
+
return !!(isShellTool(name) && status === "executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused);
|
|
76163
76150
|
}
|
|
76164
76151
|
function useFocusHint(isThisShellFocusable2, isThisShellFocused2, resultDisplay) {
|
|
76165
76152
|
const [userHasFocused, setUserHasFocused] = (0, import_react56.useState)(false);
|
|
@@ -76319,14 +76306,14 @@ function getToolGroupBorderAppearance(item, activeShellPtyId, embeddedShellFocus
|
|
|
76319
76306
|
if (isTrackedToolCall(t)) {
|
|
76320
76307
|
return t.status !== "success" && t.status !== "error" && t.status !== "cancelled";
|
|
76321
76308
|
} else {
|
|
76322
|
-
return t.status !==
|
|
76309
|
+
return t.status !== "success" /* Success */ && t.status !== "error" /* Error */ && t.status !== "cancelled" /* Cancelled */;
|
|
76323
76310
|
}
|
|
76324
76311
|
});
|
|
76325
76312
|
const isEmbeddedShellFocused = toolsToInspect.some((t) => {
|
|
76326
76313
|
if (isTrackedToolCall(t)) {
|
|
76327
76314
|
return isShellTool(t.request.name) && t.status === "executing" && t.pid === activeShellPtyId && !!embeddedShellFocused;
|
|
76328
76315
|
} else {
|
|
76329
|
-
return isShellTool(t.name) && t.status ===
|
|
76316
|
+
return isShellTool(t.name) && t.status === "executing" /* Executing */ && t.ptyId === activeShellPtyId && !!embeddedShellFocused;
|
|
76330
76317
|
}
|
|
76331
76318
|
});
|
|
76332
76319
|
const isShellCommand = toolsToInspect.some((t) => {
|
|
@@ -77764,7 +77751,7 @@ var authCommand = {
|
|
|
77764
77751
|
import process29 from "node:process";
|
|
77765
77752
|
|
|
77766
77753
|
// packages/cli/src/generated/git-commit.ts
|
|
77767
|
-
var GIT_COMMIT_INFO = "
|
|
77754
|
+
var GIT_COMMIT_INFO = "90997f398";
|
|
77768
77755
|
|
|
77769
77756
|
// packages/cli/src/ui/utils/historyExportUtils.ts
|
|
77770
77757
|
import * as fsPromises from "node:fs/promises";
|
|
@@ -78410,7 +78397,7 @@ var clearCommand = {
|
|
|
78410
78397
|
const config = context.services.agentContext?.config;
|
|
78411
78398
|
const hookSystem = config?.getHookSystem();
|
|
78412
78399
|
if (hookSystem) {
|
|
78413
|
-
await hookSystem.fireSessionEndEvent(
|
|
78400
|
+
await hookSystem.fireSessionEndEvent("clear" /* Clear */);
|
|
78414
78401
|
}
|
|
78415
78402
|
config?.injectionService.clear();
|
|
78416
78403
|
let newSessionId;
|
|
@@ -78427,7 +78414,7 @@ var clearCommand = {
|
|
|
78427
78414
|
}
|
|
78428
78415
|
let result;
|
|
78429
78416
|
if (hookSystem) {
|
|
78430
|
-
result = await hookSystem.fireSessionStartEvent(
|
|
78417
|
+
result = await hookSystem.fireSessionStartEvent("clear" /* Clear */);
|
|
78431
78418
|
}
|
|
78432
78419
|
await new Promise((resolve9) => setImmediate(resolve9));
|
|
78433
78420
|
if (config) {
|
|
@@ -81426,7 +81413,7 @@ var Footer = () => {
|
|
|
81426
81413
|
case "auth": {
|
|
81427
81414
|
if (!settings.merged.ui.showUserIdentity) break;
|
|
81428
81415
|
if (!authType) break;
|
|
81429
|
-
const displayStr = authType ===
|
|
81416
|
+
const displayStr = authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? email ?? "google" : authType;
|
|
81430
81417
|
addCol(
|
|
81431
81418
|
id,
|
|
81432
81419
|
header,
|
|
@@ -83210,12 +83197,12 @@ import path29 from "node:path";
|
|
|
83210
83197
|
function getIdeStatusMessage(ideClient) {
|
|
83211
83198
|
const connection = ideClient.getConnectionStatus();
|
|
83212
83199
|
switch (connection.status) {
|
|
83213
|
-
case
|
|
83200
|
+
case "connected" /* Connected */:
|
|
83214
83201
|
return {
|
|
83215
83202
|
messageType: "info",
|
|
83216
83203
|
content: `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`
|
|
83217
83204
|
};
|
|
83218
|
-
case
|
|
83205
|
+
case "connecting" /* Connecting */:
|
|
83219
83206
|
return {
|
|
83220
83207
|
messageType: "info",
|
|
83221
83208
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -83256,7 +83243,7 @@ ${infoMessage}`;
|
|
|
83256
83243
|
async function getIdeStatusMessageWithFiles(ideClient) {
|
|
83257
83244
|
const connection = ideClient.getConnectionStatus();
|
|
83258
83245
|
switch (connection.status) {
|
|
83259
|
-
case
|
|
83246
|
+
case "connected" /* Connected */: {
|
|
83260
83247
|
let content = `\u{1F7E2} Connected to ${ideClient.getDetectedIdeDisplayName()}`;
|
|
83261
83248
|
const context = ideContextStore.get();
|
|
83262
83249
|
const openFiles = context?.workspaceState?.openFiles;
|
|
@@ -83268,7 +83255,7 @@ async function getIdeStatusMessageWithFiles(ideClient) {
|
|
|
83268
83255
|
content
|
|
83269
83256
|
};
|
|
83270
83257
|
}
|
|
83271
|
-
case
|
|
83258
|
+
case "connecting" /* Connecting */:
|
|
83272
83259
|
return {
|
|
83273
83260
|
messageType: "info",
|
|
83274
83261
|
content: `\u{1F7E1} Connecting...`
|
|
@@ -83290,7 +83277,7 @@ async function setIdeModeAndSyncConnection(config, value, options = {}) {
|
|
|
83290
83277
|
const ideClient = await IdeClient.getInstance();
|
|
83291
83278
|
if (value) {
|
|
83292
83279
|
await ideClient.connect(options);
|
|
83293
|
-
logIdeConnection(config, new IdeConnectionEvent(
|
|
83280
|
+
logIdeConnection(config, new IdeConnectionEvent("session" /* SESSION */));
|
|
83294
83281
|
} else {
|
|
83295
83282
|
await ideClient.disconnect();
|
|
83296
83283
|
}
|
|
@@ -83378,7 +83365,7 @@ var ideCommand = async () => {
|
|
|
83378
83365
|
logToConsole: false
|
|
83379
83366
|
}
|
|
83380
83367
|
);
|
|
83381
|
-
if (ideClient.getConnectionStatus().status ===
|
|
83368
|
+
if (ideClient.getConnectionStatus().status === "connected" /* Connected */) {
|
|
83382
83369
|
break;
|
|
83383
83370
|
}
|
|
83384
83371
|
await new Promise((resolve9) => setTimeout(resolve9, 500));
|
|
@@ -83455,7 +83442,7 @@ var ideCommand = async () => {
|
|
|
83455
83442
|
}
|
|
83456
83443
|
};
|
|
83457
83444
|
const { status } = ideClient.getConnectionStatus();
|
|
83458
|
-
const isConnected = status ===
|
|
83445
|
+
const isConnected = status === "connected" /* Connected */;
|
|
83459
83446
|
if (isConnected) {
|
|
83460
83447
|
ideSlashCommand.subCommands = [statusCommand2, disableCommand5];
|
|
83461
83448
|
} else {
|
|
@@ -83555,13 +83542,13 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
83555
83542
|
const displayListener = (message) => {
|
|
83556
83543
|
context.ui.addItem({ type: "info", text: message });
|
|
83557
83544
|
};
|
|
83558
|
-
coreEvents.on(
|
|
83545
|
+
coreEvents.on("oauth-display-message" /* OauthDisplayMessage */, displayListener);
|
|
83559
83546
|
try {
|
|
83560
83547
|
context.ui.addItem({
|
|
83561
83548
|
type: "info",
|
|
83562
83549
|
text: `Starting OAuth authentication for MCP server '${serverName}'...`
|
|
83563
83550
|
});
|
|
83564
|
-
const { MCPOAuthProvider } = await import("./
|
|
83551
|
+
const { MCPOAuthProvider } = await import("./core-4P3HPH34.js");
|
|
83565
83552
|
let oauthConfig = server.oauth;
|
|
83566
83553
|
if (!oauthConfig) {
|
|
83567
83554
|
oauthConfig = { enabled: false };
|
|
@@ -83598,7 +83585,7 @@ Use /mcp auth <server-name> to authenticate.`
|
|
|
83598
83585
|
content: `Failed to authenticate with MCP server '${serverName}': ${getErrorMessage(error)}`
|
|
83599
83586
|
};
|
|
83600
83587
|
} finally {
|
|
83601
|
-
coreEvents.removeListener(
|
|
83588
|
+
coreEvents.removeListener("oauth-display-message" /* OauthDisplayMessage */, displayListener);
|
|
83602
83589
|
}
|
|
83603
83590
|
},
|
|
83604
83591
|
completion: async (context, partialArg) => {
|
|
@@ -83644,10 +83631,10 @@ var listAction2 = async (context, showDescriptions = false, showSchema = false,
|
|
|
83644
83631
|
}
|
|
83645
83632
|
const serverNames = Object.keys(mcpServers);
|
|
83646
83633
|
const connectingServers = serverNames.filter(
|
|
83647
|
-
(name) => getMCPServerStatus(name) ===
|
|
83634
|
+
(name) => getMCPServerStatus(name) === "connecting" /* CONNECTING */
|
|
83648
83635
|
);
|
|
83649
83636
|
const discoveryState = getMCPDiscoveryState();
|
|
83650
|
-
const discoveryInProgress = discoveryState ===
|
|
83637
|
+
const discoveryInProgress = discoveryState === "in_progress" /* IN_PROGRESS */ || connectingServers.length > 0;
|
|
83651
83638
|
const allTools = toolRegistry.getAllTools();
|
|
83652
83639
|
const mcpTools = allTools.filter((tool) => tool instanceof DiscoveredMCPTool);
|
|
83653
83640
|
const promptRegistry = config.getPromptRegistry();
|
|
@@ -99419,7 +99406,7 @@ Return a JSON object with:
|
|
|
99419
99406
|
},
|
|
99420
99407
|
abortSignal: new AbortController().signal,
|
|
99421
99408
|
promptId: "triage-duplicates",
|
|
99422
|
-
role:
|
|
99409
|
+
role: "utility_tool" /* UTILITY_TOOL */
|
|
99423
99410
|
});
|
|
99424
99411
|
const rec = response;
|
|
99425
99412
|
let canonical;
|
|
@@ -100253,7 +100240,7 @@ Return a JSON object with:
|
|
|
100253
100240
|
},
|
|
100254
100241
|
abortSignal: abortControllerRef.current.signal,
|
|
100255
100242
|
promptId: "triage-issues",
|
|
100256
|
-
role:
|
|
100243
|
+
role: "utility_tool" /* UTILITY_TOOL */
|
|
100257
100244
|
});
|
|
100258
100245
|
return response;
|
|
100259
100246
|
},
|
|
@@ -100827,8 +100814,8 @@ var planCommand = {
|
|
|
100827
100814
|
return;
|
|
100828
100815
|
}
|
|
100829
100816
|
const previousApprovalMode = config.getApprovalMode();
|
|
100830
|
-
config.setApprovalMode(
|
|
100831
|
-
if (previousApprovalMode !==
|
|
100817
|
+
config.setApprovalMode("plan" /* PLAN */);
|
|
100818
|
+
if (previousApprovalMode !== "plan" /* PLAN */) {
|
|
100832
100819
|
coreEvents.emitFeedback("info", "Switched to Plan Mode.");
|
|
100833
100820
|
}
|
|
100834
100821
|
if (context.invocation?.args) {
|
|
@@ -100887,10 +100874,10 @@ var categorizeRulesByMode = (rules) => {
|
|
|
100887
100874
|
rules.forEach((rule) => {
|
|
100888
100875
|
const modes = rule.modes?.length ? rule.modes : ALL_MODES;
|
|
100889
100876
|
const modeSet = new Set(modes);
|
|
100890
|
-
if (modeSet.has(
|
|
100891
|
-
if (modeSet.has(
|
|
100892
|
-
if (modeSet.has(
|
|
100893
|
-
if (modeSet.has(
|
|
100877
|
+
if (modeSet.has("default" /* DEFAULT */)) result.normal.push(rule);
|
|
100878
|
+
if (modeSet.has("autoEdit" /* AUTO_EDIT */)) result.autoEdit.push(rule);
|
|
100879
|
+
if (modeSet.has("yolo" /* YOLO */)) result.yolo.push(rule);
|
|
100880
|
+
if (modeSet.has("plan" /* PLAN */)) result.plan.push(rule);
|
|
100894
100881
|
});
|
|
100895
100882
|
return result;
|
|
100896
100883
|
};
|
|
@@ -102271,7 +102258,7 @@ var upgradeCommand = {
|
|
|
102271
102258
|
action: async (context) => {
|
|
102272
102259
|
const config = context.services.agentContext?.config;
|
|
102273
102260
|
const authType = config?.getContentGeneratorConfig()?.authType;
|
|
102274
|
-
if (authType !==
|
|
102261
|
+
if (authType !== "oauth-personal" /* LOGIN_WITH_GOOGLE */) {
|
|
102275
102262
|
return {
|
|
102276
102263
|
type: "message",
|
|
102277
102264
|
messageType: "error",
|
|
@@ -102500,7 +102487,7 @@ var BuiltinCommandLoader = class {
|
|
|
102500
102487
|
setupGithubCommand,
|
|
102501
102488
|
terminalSetupCommand,
|
|
102502
102489
|
...this.config?.isVoiceModeEnabled() ? [voiceCommand] : [],
|
|
102503
|
-
...this.config?.getContentGeneratorConfig()?.authType ===
|
|
102490
|
+
...this.config?.getContentGeneratorConfig()?.authType === "oauth-personal" /* LOGIN_WITH_GOOGLE */ ? [upgradeCommand] : []
|
|
102504
102491
|
];
|
|
102505
102492
|
handle?.end();
|
|
102506
102493
|
return allDefinitions.filter((cmd) => cmd !== null);
|
|
@@ -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-ENBP32XB.js";
|
|
6
6
|
import {
|
|
7
7
|
DEFAULT_PORT,
|
|
8
8
|
SERVER_START_WAIT_MS,
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
isServerRunning,
|
|
15
15
|
resolveGemmaConfig,
|
|
16
16
|
writeServerProcessInfo
|
|
17
|
-
} from "./chunk-
|
|
17
|
+
} from "./chunk-PS4UL4AP.js";
|
|
18
18
|
import {
|
|
19
19
|
debugLogger
|
|
20
|
-
} from "./chunk-
|
|
20
|
+
} from "./chunk-J7SXW2FI.js";
|
|
21
21
|
import {
|
|
22
22
|
__toESM
|
|
23
23
|
} from "./chunk-34MYV7JD.js";
|
|
@@ -11,8 +11,8 @@ import {
|
|
|
11
11
|
runSyncCleanup,
|
|
12
12
|
setupSignalHandlers,
|
|
13
13
|
setupTtyCheck
|
|
14
|
-
} from "./chunk-
|
|
15
|
-
import "./chunk-
|
|
14
|
+
} from "./chunk-EV5MQULH.js";
|
|
15
|
+
import "./chunk-J7SXW2FI.js";
|
|
16
16
|
import "./chunk-664ZODQF.js";
|
|
17
17
|
import "./chunk-IUUIT4SU.js";
|
|
18
18
|
import "./chunk-L6PII3GR.js";
|
|
@@ -11,8 +11,8 @@ import {
|
|
|
11
11
|
runSyncCleanup,
|
|
12
12
|
setupSignalHandlers,
|
|
13
13
|
setupTtyCheck
|
|
14
|
-
} from "./chunk-
|
|
15
|
-
import "./chunk-
|
|
14
|
+
} from "./chunk-VOLZQW4I.js";
|
|
15
|
+
import "./chunk-NR7L3FXV.js";
|
|
16
16
|
import "./chunk-664ZODQF.js";
|
|
17
17
|
import "./chunk-IUUIT4SU.js";
|
|
18
18
|
import "./chunk-L6PII3GR.js";
|
|
@@ -11,8 +11,8 @@ import {
|
|
|
11
11
|
runSyncCleanup,
|
|
12
12
|
setupSignalHandlers,
|
|
13
13
|
setupTtyCheck
|
|
14
|
-
} from "./chunk-
|
|
15
|
-
import "./chunk-
|
|
14
|
+
} from "./chunk-HHALNKOO.js";
|
|
15
|
+
import "./chunk-PZ4GDG24.js";
|
|
16
16
|
import "./chunk-664ZODQF.js";
|
|
17
17
|
import "./chunk-IUUIT4SU.js";
|
|
18
18
|
import "./chunk-L6PII3GR.js";
|