@google/gemini-cli 0.25.0-preview.0 → 0.26.0-nightly.20260115.6cb3ae4e0

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.
Files changed (149) hide show
  1. package/dist/package.json +3 -3
  2. package/dist/src/commands/extensions/configure.js +8 -1
  3. package/dist/src/commands/extensions/configure.js.map +1 -1
  4. package/dist/src/commands/skills/disable.js +6 -4
  5. package/dist/src/commands/skills/disable.js.map +1 -1
  6. package/dist/src/commands/skills/disable.test.js +16 -0
  7. package/dist/src/commands/skills/disable.test.js.map +1 -1
  8. package/dist/src/commands/skills/enable.test.js +3 -3
  9. package/dist/src/commands/skills/enable.test.js.map +1 -1
  10. package/dist/src/commands/skills/install.d.ts +1 -0
  11. package/dist/src/commands/skills/install.js +17 -2
  12. package/dist/src/commands/skills/install.js.map +1 -1
  13. package/dist/src/commands/skills/install.test.js +43 -5
  14. package/dist/src/commands/skills/install.test.js.map +1 -1
  15. package/dist/src/config/config.js +9 -9
  16. package/dist/src/config/config.js.map +1 -1
  17. package/dist/src/config/config.test.js +8 -0
  18. package/dist/src/config/config.test.js.map +1 -1
  19. package/dist/src/config/extension-manager-scope.test.js +9 -0
  20. package/dist/src/config/extension-manager-scope.test.js.map +1 -1
  21. package/dist/src/config/extension-manager.js +13 -5
  22. package/dist/src/config/extension-manager.js.map +1 -1
  23. package/dist/src/config/extension.test.js +6 -3
  24. package/dist/src/config/extension.test.js.map +1 -1
  25. package/dist/src/config/extensions/consent.d.ts +4 -0
  26. package/dist/src/config/extensions/consent.js +40 -16
  27. package/dist/src/config/extensions/consent.js.map +1 -1
  28. package/dist/src/config/extensions/consent.test.js +31 -7
  29. package/dist/src/config/extensions/consent.test.js.map +1 -1
  30. package/dist/src/config/extensions/extensionUpdates.test.js +6 -2
  31. package/dist/src/config/extensions/extensionUpdates.test.js.map +1 -1
  32. package/dist/src/config/keyBindings.d.ts +3 -5
  33. package/dist/src/config/keyBindings.js +10 -13
  34. package/dist/src/config/keyBindings.js.map +1 -1
  35. package/dist/src/config/keyBindings.test.js +3 -8
  36. package/dist/src/config/keyBindings.test.js.map +1 -1
  37. package/dist/src/config/settingsSchema.d.ts +18 -0
  38. package/dist/src/config/settingsSchema.js +18 -0
  39. package/dist/src/config/settingsSchema.js.map +1 -1
  40. package/dist/src/config/settingsSchema.test.js +10 -0
  41. package/dist/src/config/settingsSchema.test.js.map +1 -1
  42. package/dist/src/gemini.js +0 -2
  43. package/dist/src/gemini.js.map +1 -1
  44. package/dist/src/generated/git-commit.d.ts +2 -2
  45. package/dist/src/generated/git-commit.js +2 -2
  46. package/dist/src/generated/git-commit.js.map +1 -1
  47. package/dist/src/nonInteractiveCli.d.ts +1 -2
  48. package/dist/src/nonInteractiveCli.js +1 -16
  49. package/dist/src/nonInteractiveCli.js.map +1 -1
  50. package/dist/src/nonInteractiveCli.test.js +0 -39
  51. package/dist/src/nonInteractiveCli.test.js.map +1 -1
  52. package/dist/src/test-utils/render.js +1 -0
  53. package/dist/src/test-utils/render.js.map +1 -1
  54. package/dist/src/ui/AppContainer.test.js +0 -5
  55. package/dist/src/ui/AppContainer.test.js.map +1 -1
  56. package/dist/src/ui/auth/ApiAuthDialog.test.js +0 -1
  57. package/dist/src/ui/auth/ApiAuthDialog.test.js.map +1 -1
  58. package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js +0 -2
  59. package/dist/src/ui/auth/LoginWithGoogleRestartDialog.test.js.map +1 -1
  60. package/dist/src/ui/commands/agentsCommand.js +158 -1
  61. package/dist/src/ui/commands/agentsCommand.js.map +1 -1
  62. package/dist/src/ui/commands/agentsCommand.test.js +136 -1
  63. package/dist/src/ui/commands/agentsCommand.test.js.map +1 -1
  64. package/dist/src/ui/commands/skillsCommand.test.js +3 -3
  65. package/dist/src/ui/commands/skillsCommand.test.js.map +1 -1
  66. package/dist/src/ui/components/Composer.test.js +1 -1
  67. package/dist/src/ui/components/Composer.test.js.map +1 -1
  68. package/dist/src/ui/components/HistoryItemDisplay.test.js +1 -0
  69. package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
  70. package/dist/src/ui/components/InputPrompt.js +6 -9
  71. package/dist/src/ui/components/InputPrompt.js.map +1 -1
  72. package/dist/src/ui/components/InputPrompt.test.js +8 -14
  73. package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
  74. package/dist/src/ui/components/MultiFolderTrustDialog.test.js +0 -1
  75. package/dist/src/ui/components/MultiFolderTrustDialog.test.js.map +1 -1
  76. package/dist/src/ui/components/RewindConfirmation.d.ts +21 -0
  77. package/dist/src/ui/components/RewindConfirmation.js +63 -0
  78. package/dist/src/ui/components/RewindConfirmation.js.map +1 -0
  79. package/dist/src/ui/components/RewindConfirmation.test.d.ts +6 -0
  80. package/dist/src/ui/components/RewindConfirmation.test.js +53 -0
  81. package/dist/src/ui/components/RewindConfirmation.test.js.map +1 -0
  82. package/dist/src/ui/components/RewindViewer.d.ts +15 -0
  83. package/dist/src/ui/components/RewindViewer.js +79 -0
  84. package/dist/src/ui/components/RewindViewer.js.map +1 -0
  85. package/dist/src/ui/components/RewindViewer.test.d.ts +6 -0
  86. package/dist/src/ui/components/RewindViewer.test.js +239 -0
  87. package/dist/src/ui/components/RewindViewer.test.js.map +1 -0
  88. package/dist/src/ui/components/SessionBrowser.test.js +0 -1
  89. package/dist/src/ui/components/SessionBrowser.test.js.map +1 -1
  90. package/dist/src/ui/components/SettingsDialog.js +1 -1
  91. package/dist/src/ui/components/SettingsDialog.js.map +1 -1
  92. package/dist/src/ui/components/StatusDisplay.js +1 -1
  93. package/dist/src/ui/components/StatusDisplay.js.map +1 -1
  94. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js +1 -0
  95. package/dist/src/ui/components/messages/ToolConfirmationMessage.test.js.map +1 -1
  96. package/dist/src/ui/components/shared/TextInput.test.js +0 -8
  97. package/dist/src/ui/components/shared/TextInput.test.js.map +1 -1
  98. package/dist/src/ui/components/shared/text-buffer.js +7 -18
  99. package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
  100. package/dist/src/ui/components/shared/text-buffer.test.js +0 -19
  101. package/dist/src/ui/components/shared/text-buffer.test.js.map +1 -1
  102. package/dist/src/ui/constants/tips.js +150 -150
  103. package/dist/src/ui/constants/tips.js.map +1 -1
  104. package/dist/src/ui/constants/wittyPhrases.js +118 -118
  105. package/dist/src/ui/constants/wittyPhrases.js.map +1 -1
  106. package/dist/src/ui/contexts/KeypressContext.d.ts +0 -1
  107. package/dist/src/ui/contexts/KeypressContext.js +2 -6
  108. package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
  109. package/dist/src/ui/contexts/KeypressContext.test.js +2 -10
  110. package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
  111. package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
  112. package/dist/src/ui/hooks/useKeypress.test.js +11 -13
  113. package/dist/src/ui/hooks/useKeypress.test.js.map +1 -1
  114. package/dist/src/ui/hooks/useReactToolScheduler.js.map +1 -1
  115. package/dist/src/ui/hooks/useSelectionList.test.js +0 -3
  116. package/dist/src/ui/hooks/useSelectionList.test.js.map +1 -1
  117. package/dist/src/ui/hooks/vim.js +0 -1
  118. package/dist/src/ui/hooks/vim.js.map +1 -1
  119. package/dist/src/ui/hooks/vim.test.js +0 -1
  120. package/dist/src/ui/hooks/vim.test.js.map +1 -1
  121. package/dist/src/ui/keyMatchers.js +1 -16
  122. package/dist/src/ui/keyMatchers.js.map +1 -1
  123. package/dist/src/ui/keyMatchers.test.js +2 -14
  124. package/dist/src/ui/keyMatchers.test.js.map +1 -1
  125. package/dist/src/ui/utils/formatters.d.ts +9 -0
  126. package/dist/src/ui/utils/formatters.js +26 -0
  127. package/dist/src/ui/utils/formatters.js.map +1 -1
  128. package/dist/src/ui/utils/formatters.test.js +70 -2
  129. package/dist/src/ui/utils/formatters.test.js.map +1 -1
  130. package/dist/src/ui/utils/textUtils.test.js +1 -0
  131. package/dist/src/ui/utils/textUtils.test.js.map +1 -1
  132. package/dist/src/utils/agentSettings.d.ts +31 -0
  133. package/dist/src/utils/agentSettings.js +105 -0
  134. package/dist/src/utils/agentSettings.js.map +1 -0
  135. package/dist/src/utils/agentUtils.d.ts +15 -0
  136. package/dist/src/utils/agentUtils.js +50 -0
  137. package/dist/src/utils/agentUtils.js.map +1 -0
  138. package/dist/src/utils/agentUtils.test.d.ts +6 -0
  139. package/dist/src/utils/agentUtils.test.js +121 -0
  140. package/dist/src/utils/agentUtils.test.js.map +1 -0
  141. package/dist/src/utils/skillUtils.d.ts +2 -1
  142. package/dist/src/utils/skillUtils.js +58 -56
  143. package/dist/src/utils/skillUtils.js.map +1 -1
  144. package/dist/src/utils/skillUtils.test.js +13 -0
  145. package/dist/src/utils/skillUtils.test.js.map +1 -1
  146. package/dist/src/zed-integration/zedIntegration.js +6 -1
  147. package/dist/src/zed-integration/zedIntegration.js.map +1 -1
  148. package/dist/tsconfig.tsbuildinfo +1 -1
  149. package/package.json +4 -4
@@ -1 +1 @@
1
- {"version":3,"file":"textUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"textUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/textUtils.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,31 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { SettingScope, type LoadedSettings } from '../config/settings.js';
7
+ import type { ModifiedScope } from './skillSettings.js';
8
+ export type AgentActionStatus = 'success' | 'no-op' | 'error';
9
+ /**
10
+ * Metadata representing the result of an agent settings operation.
11
+ */
12
+ export interface AgentActionResult {
13
+ status: AgentActionStatus;
14
+ agentName: string;
15
+ action: 'enable' | 'disable';
16
+ /** Scopes where the agent's state was actually changed. */
17
+ modifiedScopes: ModifiedScope[];
18
+ /** Scopes where the agent was already in the desired state. */
19
+ alreadyInStateScopes: ModifiedScope[];
20
+ /** Error message if status is 'error'. */
21
+ error?: string;
22
+ }
23
+ /**
24
+ * Enables an agent by ensuring it is not disabled in any writable scope (User and Workspace).
25
+ * It sets `agents.overrides.<agentName>.disabled` to `false` if it was found to be `true`.
26
+ */
27
+ export declare function enableAgent(settings: LoadedSettings, agentName: string): AgentActionResult;
28
+ /**
29
+ * Disables an agent by setting `agents.overrides.<agentName>.disabled` to `true` in the specified scope.
30
+ */
31
+ export declare function disableAgent(settings: LoadedSettings, agentName: string, scope: SettingScope): AgentActionResult;
@@ -0,0 +1,105 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { SettingScope, isLoadableSettingScope, } from '../config/settings.js';
7
+ /**
8
+ * Enables an agent by ensuring it is not disabled in any writable scope (User and Workspace).
9
+ * It sets `agents.overrides.<agentName>.disabled` to `false` if it was found to be `true`.
10
+ */
11
+ export function enableAgent(settings, agentName) {
12
+ const writableScopes = [SettingScope.Workspace, SettingScope.User];
13
+ const foundInDisabledScopes = [];
14
+ const alreadyEnabledScopes = [];
15
+ for (const scope of writableScopes) {
16
+ if (isLoadableSettingScope(scope)) {
17
+ const scopePath = settings.forScope(scope).path;
18
+ const agentOverrides = settings.forScope(scope).settings.agents
19
+ ?.overrides;
20
+ const isDisabled = agentOverrides?.[agentName]?.disabled === true;
21
+ if (isDisabled) {
22
+ foundInDisabledScopes.push({ scope, path: scopePath });
23
+ }
24
+ else {
25
+ alreadyEnabledScopes.push({ scope, path: scopePath });
26
+ }
27
+ }
28
+ }
29
+ if (foundInDisabledScopes.length === 0) {
30
+ return {
31
+ status: 'no-op',
32
+ agentName,
33
+ action: 'enable',
34
+ modifiedScopes: [],
35
+ alreadyInStateScopes: alreadyEnabledScopes,
36
+ };
37
+ }
38
+ const modifiedScopes = [];
39
+ for (const { scope, path } of foundInDisabledScopes) {
40
+ if (isLoadableSettingScope(scope)) {
41
+ // Explicitly enable it to override any lower-precedence disables, or just clear the disable.
42
+ // Setting to false ensures it is enabled.
43
+ settings.setValue(scope, `agents.overrides.${agentName}.disabled`, false);
44
+ modifiedScopes.push({ scope, path });
45
+ }
46
+ }
47
+ return {
48
+ status: 'success',
49
+ agentName,
50
+ action: 'enable',
51
+ modifiedScopes,
52
+ alreadyInStateScopes: alreadyEnabledScopes,
53
+ };
54
+ }
55
+ /**
56
+ * Disables an agent by setting `agents.overrides.<agentName>.disabled` to `true` in the specified scope.
57
+ */
58
+ export function disableAgent(settings, agentName, scope) {
59
+ if (!isLoadableSettingScope(scope)) {
60
+ return {
61
+ status: 'error',
62
+ agentName,
63
+ action: 'disable',
64
+ modifiedScopes: [],
65
+ alreadyInStateScopes: [],
66
+ error: `Invalid settings scope: ${scope}`,
67
+ };
68
+ }
69
+ const scopePath = settings.forScope(scope).path;
70
+ const agentOverrides = settings.forScope(scope).settings.agents?.overrides;
71
+ const isDisabled = agentOverrides?.[agentName]?.disabled === true;
72
+ if (isDisabled) {
73
+ return {
74
+ status: 'no-op',
75
+ agentName,
76
+ action: 'disable',
77
+ modifiedScopes: [],
78
+ alreadyInStateScopes: [{ scope, path: scopePath }],
79
+ };
80
+ }
81
+ // Check if it's already disabled in the other writable scope
82
+ const otherScope = scope === SettingScope.Workspace
83
+ ? SettingScope.User
84
+ : SettingScope.Workspace;
85
+ const alreadyDisabledInOther = [];
86
+ if (isLoadableSettingScope(otherScope)) {
87
+ const otherOverrides = settings.forScope(otherScope).settings.agents
88
+ ?.overrides;
89
+ if (otherOverrides?.[agentName]?.disabled === true) {
90
+ alreadyDisabledInOther.push({
91
+ scope: otherScope,
92
+ path: settings.forScope(otherScope).path,
93
+ });
94
+ }
95
+ }
96
+ settings.setValue(scope, `agents.overrides.${agentName}.disabled`, true);
97
+ return {
98
+ status: 'success',
99
+ agentName,
100
+ action: 'disable',
101
+ modifiedScopes: [{ scope, path: scopePath }],
102
+ alreadyInStateScopes: alreadyDisabledInOther,
103
+ };
104
+ }
105
+ //# sourceMappingURL=agentSettings.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"agentSettings.js","sourceRoot":"","sources":["../../../src/utils/agentSettings.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,15 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import type { AgentActionResult } from './agentSettings.js';
7
+ /**
8
+ * Shared logic for building the core agent action message while allowing the
9
+ * caller to control how each scope and its path are rendered (e.g., bolding or
10
+ * dimming).
11
+ *
12
+ * This function ONLY returns the description of what happened. It is up to the
13
+ * caller to append any interface-specific guidance.
14
+ */
15
+ export declare function renderAgentActionFeedback(result: AgentActionResult, formatScope: (label: string, path: string) => string): string;
@@ -0,0 +1,50 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { SettingScope } from '../config/settings.js';
7
+ /**
8
+ * Shared logic for building the core agent action message while allowing the
9
+ * caller to control how each scope and its path are rendered (e.g., bolding or
10
+ * dimming).
11
+ *
12
+ * This function ONLY returns the description of what happened. It is up to the
13
+ * caller to append any interface-specific guidance.
14
+ */
15
+ export function renderAgentActionFeedback(result, formatScope) {
16
+ const { agentName, action, status, error } = result;
17
+ if (status === 'error') {
18
+ return (error ||
19
+ `An error occurred while attempting to ${action} agent "${agentName}".`);
20
+ }
21
+ if (status === 'no-op') {
22
+ return `Agent "${agentName}" is already ${action === 'enable' ? 'enabled' : 'disabled'}.`;
23
+ }
24
+ const isEnable = action === 'enable';
25
+ const actionVerb = isEnable ? 'enabled' : 'disabled';
26
+ const preposition = isEnable
27
+ ? 'by setting it to enabled in'
28
+ : 'by setting it to disabled in';
29
+ const formatScopeItem = (s) => {
30
+ const label = s.scope === SettingScope.Workspace ? 'project' : s.scope.toLowerCase();
31
+ return formatScope(label, s.path);
32
+ };
33
+ const totalAffectedScopes = [
34
+ ...result.modifiedScopes,
35
+ ...result.alreadyInStateScopes,
36
+ ];
37
+ if (totalAffectedScopes.length === 2) {
38
+ const s1 = formatScopeItem(totalAffectedScopes[0]);
39
+ const s2 = formatScopeItem(totalAffectedScopes[1]);
40
+ if (isEnable) {
41
+ return `Agent "${agentName}" ${actionVerb} ${preposition} ${s1} and ${s2} settings.`;
42
+ }
43
+ else {
44
+ return `Agent "${agentName}" is now disabled in both ${s1} and ${s2} settings.`;
45
+ }
46
+ }
47
+ const s = formatScopeItem(totalAffectedScopes[0]);
48
+ return `Agent "${agentName}" ${actionVerb} ${preposition} ${s} settings.`;
49
+ }
50
+ //# sourceMappingURL=agentUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"agentUtils.js","sourceRoot":"","sources":["../../../src/utils/agentUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD;;;;;;;GAOG;AACH,MAAM,UAAU,yBAAyB,CACvC,MAAyB,EACzB,WAAoD;IAEpD,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC;IAEpD,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,OAAO,CACL,KAAK;YACL,yCAAyC,MAAM,WAAW,SAAS,IAAI,CACxE,CAAC;IACJ,CAAC;IAED,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,OAAO,UAAU,SAAS,gBAAgB,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC;IAC5F,CAAC;IAED,MAAM,QAAQ,GAAG,MAAM,KAAK,QAAQ,CAAC;IACrC,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;IACrD,MAAM,WAAW,GAAG,QAAQ;QAC1B,CAAC,CAAC,6BAA6B;QAC/B,CAAC,CAAC,8BAA8B,CAAC;IAEnC,MAAM,eAAe,GAAG,CAAC,CAAwC,EAAE,EAAE;QACnE,MAAM,KAAK,GACT,CAAC,CAAC,KAAK,KAAK,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACzE,OAAO,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,mBAAmB,GAAG;QAC1B,GAAG,MAAM,CAAC,cAAc;QACxB,GAAG,MAAM,CAAC,oBAAoB;KAC/B,CAAC;IAEF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACnD,MAAM,EAAE,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QAEnD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,UAAU,SAAS,KAAK,UAAU,IAAI,WAAW,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC;QACvF,CAAC;aAAM,CAAC;YACN,OAAO,UAAU,SAAS,6BAA6B,EAAE,QAAQ,EAAE,YAAY,CAAC;QAClF,CAAC;IACH,CAAC;IAED,MAAM,CAAC,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,OAAO,UAAU,SAAS,KAAK,UAAU,IAAI,WAAW,IAAI,CAAC,YAAY,CAAC;AAC5E,CAAC"}
@@ -0,0 +1,6 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ export {};
@@ -0,0 +1,121 @@
1
+ /**
2
+ * @license
3
+ * Copyright 2026 Google LLC
4
+ * SPDX-License-Identifier: Apache-2.0
5
+ */
6
+ import { describe, it, expect, vi } from 'vitest';
7
+ vi.mock('../config/settings.js', () => ({
8
+ SettingScope: {
9
+ User: 'User',
10
+ Workspace: 'Workspace',
11
+ System: 'System',
12
+ SystemDefaults: 'SystemDefaults',
13
+ },
14
+ }));
15
+ import { renderAgentActionFeedback } from './agentUtils.js';
16
+ import { SettingScope } from '../config/settings.js';
17
+ describe('agentUtils', () => {
18
+ describe('renderAgentActionFeedback', () => {
19
+ const mockFormatScope = (label, path) => `[${label}:${path}]`;
20
+ it('should return error message if status is error', () => {
21
+ const result = {
22
+ status: 'error',
23
+ agentName: 'my-agent',
24
+ action: 'enable',
25
+ modifiedScopes: [],
26
+ alreadyInStateScopes: [],
27
+ error: 'Something went wrong',
28
+ };
29
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Something went wrong');
30
+ });
31
+ it('should return default error message if status is error and no error message provided', () => {
32
+ const result = {
33
+ status: 'error',
34
+ agentName: 'my-agent',
35
+ action: 'enable',
36
+ modifiedScopes: [],
37
+ alreadyInStateScopes: [],
38
+ };
39
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('An error occurred while attempting to enable agent "my-agent".');
40
+ });
41
+ it('should return no-op message for enable', () => {
42
+ const result = {
43
+ status: 'no-op',
44
+ agentName: 'my-agent',
45
+ action: 'enable',
46
+ modifiedScopes: [],
47
+ alreadyInStateScopes: [],
48
+ };
49
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" is already enabled.');
50
+ });
51
+ it('should return no-op message for disable', () => {
52
+ const result = {
53
+ status: 'no-op',
54
+ agentName: 'my-agent',
55
+ action: 'disable',
56
+ modifiedScopes: [],
57
+ alreadyInStateScopes: [],
58
+ };
59
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" is already disabled.');
60
+ });
61
+ it('should return success message for enable (single scope)', () => {
62
+ const result = {
63
+ status: 'success',
64
+ agentName: 'my-agent',
65
+ action: 'enable',
66
+ modifiedScopes: [
67
+ { scope: SettingScope.User, path: '/path/to/user/settings' },
68
+ ],
69
+ alreadyInStateScopes: [],
70
+ };
71
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" enabled by setting it to enabled in [user:/path/to/user/settings] settings.');
72
+ });
73
+ it('should return success message for enable (two scopes)', () => {
74
+ const result = {
75
+ status: 'success',
76
+ agentName: 'my-agent',
77
+ action: 'enable',
78
+ modifiedScopes: [
79
+ { scope: SettingScope.User, path: '/path/to/user/settings' },
80
+ ],
81
+ alreadyInStateScopes: [
82
+ {
83
+ scope: SettingScope.Workspace,
84
+ path: '/path/to/workspace/settings',
85
+ },
86
+ ],
87
+ };
88
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" enabled by setting it to enabled in [user:/path/to/user/settings] and [project:/path/to/workspace/settings] settings.');
89
+ });
90
+ it('should return success message for disable (single scope)', () => {
91
+ const result = {
92
+ status: 'success',
93
+ agentName: 'my-agent',
94
+ action: 'disable',
95
+ modifiedScopes: [
96
+ { scope: SettingScope.User, path: '/path/to/user/settings' },
97
+ ],
98
+ alreadyInStateScopes: [],
99
+ };
100
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" disabled by setting it to disabled in [user:/path/to/user/settings] settings.');
101
+ });
102
+ it('should return success message for disable (two scopes)', () => {
103
+ const result = {
104
+ status: 'success',
105
+ agentName: 'my-agent',
106
+ action: 'disable',
107
+ modifiedScopes: [
108
+ { scope: SettingScope.User, path: '/path/to/user/settings' },
109
+ ],
110
+ alreadyInStateScopes: [
111
+ {
112
+ scope: SettingScope.Workspace,
113
+ path: '/path/to/workspace/settings',
114
+ },
115
+ ],
116
+ };
117
+ expect(renderAgentActionFeedback(result, mockFormatScope)).toBe('Agent "my-agent" is now disabled in both [user:/path/to/user/settings] and [project:/path/to/workspace/settings] settings.');
118
+ });
119
+ });
120
+ });
121
+ //# sourceMappingURL=agentUtils.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"agentUtils.test.js","sourceRoot":"","sources":["../../../src/utils/agentUtils.test.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,7 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  import type { SkillActionResult } from './skillSettings.js';
7
+ import { type SkillDefinition } from '@google/gemini-cli-core';
7
8
  /**
8
9
  * Shared logic for building the core skill action message while allowing the
9
10
  * caller to control how each scope and its path are rendered (e.g., bolding or
@@ -17,7 +18,7 @@ export declare function renderSkillActionFeedback(result: SkillActionResult, for
17
18
  /**
18
19
  * Central logic for installing a skill from a remote URL or local path.
19
20
  */
20
- export declare function installSkill(source: string, scope: 'user' | 'workspace', subpath: string | undefined, onLog: (msg: string) => void): Promise<Array<{
21
+ export declare function installSkill(source: string, scope: 'user' | 'workspace', subpath: string | undefined, onLog: (msg: string) => void, requestConsent?: (skills: SkillDefinition[], targetDir: string) => Promise<boolean>): Promise<Array<{
21
22
  name: string;
22
23
  location: string;
23
24
  }>>;
@@ -4,7 +4,7 @@
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
6
  import { SettingScope } from '../config/settings.js';
7
- import { Storage, loadSkillsFromDir } from '@google/gemini-cli-core';
7
+ import { Storage, loadSkillsFromDir, } from '@google/gemini-cli-core';
8
8
  import { cloneFromGit } from '../config/extensions/github.js';
9
9
  import extract from 'extract-zip';
10
10
  import * as fs from 'node:fs/promises';
@@ -34,7 +34,7 @@ export function renderSkillActionFeedback(result, formatScope) {
34
34
  ? 'by removing it from the disabled list in'
35
35
  : 'by adding it to the disabled list in';
36
36
  const formatScopeItem = (s) => {
37
- const label = s.scope === SettingScope.Workspace ? 'project' : s.scope.toLowerCase();
37
+ const label = s.scope === SettingScope.Workspace ? 'workspace' : s.scope.toLowerCase();
38
38
  return formatScope(label, s.path);
39
39
  };
40
40
  const totalAffectedScopes = [
@@ -57,72 +57,74 @@ export function renderSkillActionFeedback(result, formatScope) {
57
57
  /**
58
58
  * Central logic for installing a skill from a remote URL or local path.
59
59
  */
60
- export async function installSkill(source, scope, subpath, onLog) {
60
+ export async function installSkill(source, scope, subpath, onLog, requestConsent = () => Promise.resolve(true)) {
61
61
  let sourcePath = source;
62
62
  let tempDirToClean = undefined;
63
63
  const isGitUrl = source.startsWith('git@') ||
64
64
  source.startsWith('http://') ||
65
65
  source.startsWith('https://');
66
66
  const isSkillFile = source.toLowerCase().endsWith('.skill');
67
- if (isGitUrl) {
68
- tempDirToClean = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-skill-'));
69
- sourcePath = tempDirToClean;
70
- onLog(`Cloning skill from ${source}...`);
71
- // Reuse existing robust git cloning utility from extension manager.
72
- await cloneFromGit({
73
- source,
74
- type: 'git',
75
- }, tempDirToClean);
76
- }
77
- else if (isSkillFile) {
78
- tempDirToClean = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-skill-'));
79
- sourcePath = tempDirToClean;
80
- onLog(`Extracting skill from ${source}...`);
81
- await extract(path.resolve(source), { dir: tempDirToClean });
82
- }
83
- // If a subpath is provided, resolve it against the cloned/local root.
84
- if (subpath) {
85
- sourcePath = path.join(sourcePath, subpath);
86
- }
87
- sourcePath = path.resolve(sourcePath);
88
- // Quick security check to prevent directory traversal out of temp dir when cloning
89
- if (tempDirToClean && !sourcePath.startsWith(path.resolve(tempDirToClean))) {
90
- if (tempDirToClean) {
91
- await fs.rm(tempDirToClean, { recursive: true, force: true });
67
+ try {
68
+ if (isGitUrl) {
69
+ tempDirToClean = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-skill-'));
70
+ sourcePath = tempDirToClean;
71
+ onLog(`Cloning skill from ${source}...`);
72
+ // Reuse existing robust git cloning utility from extension manager.
73
+ await cloneFromGit({
74
+ source,
75
+ type: 'git',
76
+ }, tempDirToClean);
77
+ }
78
+ else if (isSkillFile) {
79
+ tempDirToClean = await fs.mkdtemp(path.join(os.tmpdir(), 'gemini-skill-'));
80
+ sourcePath = tempDirToClean;
81
+ onLog(`Extracting skill from ${source}...`);
82
+ await extract(path.resolve(source), { dir: tempDirToClean });
83
+ }
84
+ // If a subpath is provided, resolve it against the cloned/local root.
85
+ if (subpath) {
86
+ sourcePath = path.join(sourcePath, subpath);
87
+ }
88
+ sourcePath = path.resolve(sourcePath);
89
+ // Quick security check to prevent directory traversal out of temp dir when cloning
90
+ if (tempDirToClean &&
91
+ !sourcePath.startsWith(path.resolve(tempDirToClean))) {
92
+ throw new Error('Invalid path: Directory traversal not allowed.');
93
+ }
94
+ onLog(`Searching for skills in ${sourcePath}...`);
95
+ const skills = await loadSkillsFromDir(sourcePath);
96
+ if (skills.length === 0) {
97
+ throw new Error(`No valid skills found in ${source}${subpath ? ` at path "${subpath}"` : ''}. Ensure a SKILL.md file exists with valid frontmatter.`);
98
+ }
99
+ const workspaceDir = process.cwd();
100
+ const storage = new Storage(workspaceDir);
101
+ const targetDir = scope === 'workspace'
102
+ ? storage.getProjectSkillsDir()
103
+ : Storage.getUserSkillsDir();
104
+ if (!(await requestConsent(skills, targetDir))) {
105
+ throw new Error('Skill installation cancelled by user.');
92
106
  }
93
- throw new Error('Invalid path: Directory traversal not allowed.');
107
+ await fs.mkdir(targetDir, { recursive: true });
108
+ const installedSkills = [];
109
+ for (const skill of skills) {
110
+ const skillName = skill.name;
111
+ const skillDir = path.dirname(skill.location);
112
+ const destPath = path.join(targetDir, skillName);
113
+ const exists = await fs.stat(destPath).catch(() => null);
114
+ if (exists) {
115
+ onLog(`Skill "${skillName}" already exists. Overwriting...`);
116
+ await fs.rm(destPath, { recursive: true, force: true });
117
+ }
118
+ await fs.cp(skillDir, destPath, { recursive: true });
119
+ installedSkills.push({ name: skillName, location: destPath });
120
+ }
121
+ return installedSkills;
94
122
  }
95
- onLog(`Searching for skills in ${sourcePath}...`);
96
- const skills = await loadSkillsFromDir(sourcePath);
97
- if (skills.length === 0) {
123
+ finally {
98
124
  if (tempDirToClean) {
99
125
  await fs.rm(tempDirToClean, { recursive: true, force: true });
100
126
  }
101
- throw new Error(`No valid skills found in ${source}${subpath ? ` at path "${subpath}"` : ''}. Ensure a SKILL.md file exists with valid frontmatter.`);
102
- }
103
- const workspaceDir = process.cwd();
104
- const storage = new Storage(workspaceDir);
105
- const targetDir = scope === 'workspace'
106
- ? storage.getProjectSkillsDir()
107
- : Storage.getUserSkillsDir();
108
- await fs.mkdir(targetDir, { recursive: true });
109
- const installedSkills = [];
110
- for (const skill of skills) {
111
- const skillName = skill.name;
112
- const skillDir = path.dirname(skill.location);
113
- const destPath = path.join(targetDir, skillName);
114
- const exists = await fs.stat(destPath).catch(() => null);
115
- if (exists) {
116
- onLog(`Skill "${skillName}" already exists. Overwriting...`);
117
- await fs.rm(destPath, { recursive: true, force: true });
118
- }
119
- await fs.cp(skillDir, destPath, { recursive: true });
120
- installedSkills.push({ name: skillName, location: destPath });
121
- }
122
- if (tempDirToClean) {
123
- await fs.rm(tempDirToClean, { recursive: true, force: true });
124
127
  }
125
- return installedSkills;
126
128
  }
127
129
  /**
128
130
  * Central logic for uninstalling a skill by name.
@@ -1 +1 @@
1
- {"version":3,"file":"skillUtils.js","sourceRoot":"","sources":["../../../src/utils/skillUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"skillUtils.js","sourceRoot":"","sources":["../../../src/utils/skillUtils.ts"],"names":[],"mappings":"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"}
@@ -53,5 +53,18 @@ describe('skillUtils', () => {
53
53
  const installedExists = await fs.stat(installedPath).catch(() => null);
54
54
  expect(installedExists?.isDirectory()).toBe(true);
55
55
  });
56
+ it('should abort installation if consent is rejected', async () => {
57
+ const mockSkillDir = path.join(tempDir, 'mock-skill-source');
58
+ const skillSubDir = path.join(mockSkillDir, 'test-skill');
59
+ await fs.mkdir(skillSubDir, { recursive: true });
60
+ await fs.writeFile(path.join(skillSubDir, 'SKILL.md'), '---\nname: test-skill\ndescription: test\n---\nbody');
61
+ const requestConsent = vi.fn().mockResolvedValue(false);
62
+ await expect(installSkill(mockSkillDir, 'workspace', undefined, () => { }, requestConsent)).rejects.toThrow('Skill installation cancelled by user.');
63
+ expect(requestConsent).toHaveBeenCalled();
64
+ // Verify it was NOT copied
65
+ const installedPath = path.join(tempDir, '.gemini/skills', 'test-skill');
66
+ const installedExists = await fs.stat(installedPath).catch(() => null);
67
+ expect(installedExists).toBeNull();
68
+ });
56
69
  });
57
70
  //# sourceMappingURL=skillUtils.test.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"skillUtils.test.js","sourceRoot":"","sources":["../../../src/utils/skillUtils.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"skillUtils.test.js","sourceRoot":"","sources":["../../../src/utils/skillUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,QAAQ,CAAC,YAAY,EAAE,GAAG,EAAE;IAC1B,IAAI,OAAe,CAAC;IACpB,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC;IAE/D,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,CAAC,CAAC,CAAC;QACxE,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACnB,MAAM,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACvD,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAC9D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,qBAAqB,CAAC,CAAC;QAEhE,yBAAyB;QACzB,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,0EAA0E;YAC1E,iFAAiF;YACjF,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,SAAS,EACT,WAAW,EACX,SAAS,EACT,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACzC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAE7C,mDAAmD;QACnD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,eAAe,CAAC,CAAC;QAC5E,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,eAAe,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAElD,MAAM,aAAa,GAAG,MAAM,EAAE;aAC3B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;aAC1C,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACrB,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QAClE,gCAAgC;QAChC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC1D,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EAClC,qDAAqD,CACtD,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,YAAY,CAC/B,YAAY,EACZ,WAAW,EACX,SAAS,EACT,GAAG,EAAE,GAAE,CAAC,CACT,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAE1C,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,eAAe,EAAE,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAC1D,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,MAAM,EAAE,CAAC,SAAS,CAChB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,UAAU,CAAC,EAClC,qDAAqD,CACtD,CAAC;QAEF,MAAM,cAAc,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAExD,MAAM,MAAM,CACV,YAAY,CACV,YAAY,EACZ,WAAW,EACX,SAAS,EACT,GAAG,EAAE,GAAE,CAAC,EACR,cAAc,CACf,CACF,CAAC,OAAO,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;QAE3D,MAAM,CAAC,cAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAE1C,2BAA2B;QAC3B,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,EAAE,YAAY,CAAC,CAAC;QACzE,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,CAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -13,12 +13,17 @@ import * as path from 'node:path';
13
13
  import { z } from 'zod';
14
14
  import { randomUUID } from 'node:crypto';
15
15
  import { loadCliConfig } from '../config/config.js';
16
+ import { runExitCleanup } from '../utils/cleanup.js';
16
17
  export async function runZedIntegration(config, settings, argv) {
17
18
  const { stdout: workingStdout } = createWorkingStdio();
18
19
  const stdout = Writable.toWeb(workingStdout);
19
20
  const stdin = Readable.toWeb(process.stdin);
20
21
  const stream = acp.ndJsonStream(stdout, stdin);
21
- new acp.AgentSideConnection((connection) => new GeminiAgent(config, settings, argv, connection), stream);
22
+ const connection = new acp.AgentSideConnection((connection) => new GeminiAgent(config, settings, argv, connection), stream);
23
+ // SIGTERM/SIGINT handlers (in sdk.ts) don't fire when stdin closes.
24
+ // We must explicitly await the connection close to flush telemetry.
25
+ // Use finally() to ensure cleanup runs even on stream errors.
26
+ await connection.closed.finally(runExitCleanup);
22
27
  }
23
28
  export class GeminiAgent {
24
29
  config;