@google/gemini-cli 0.24.0-nightly.20251227.37be16243 → 0.24.0-nightly.20260103.30f5c4af4
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/dist/google-gemini-cli-0.24.0-nightly.20251227.37be16243.tgz +0 -0
- package/dist/package.json +2 -2
- package/dist/src/config/config.d.ts +0 -1
- package/dist/src/config/config.js +2 -3
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +2 -8
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/extension-manager.js +25 -0
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/settings.js +0 -1
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +33 -18
- package/dist/src/config/settingsSchema.js +31 -21
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/config/settings_repro.test.js +1 -1
- package/dist/src/config/settings_repro.test.js.map +1 -1
- package/dist/src/gemini.js +35 -16
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +7 -7
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/gemini_cleanup.test.js +1 -0
- package/dist/src/gemini_cleanup.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +3 -3
- package/dist/src/generated/git-commit.js +3 -3
- package/dist/src/nonInteractiveCli.js +29 -1
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCli.test.js +48 -10
- package/dist/src/nonInteractiveCli.test.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +3 -3
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.test.js +11 -14
- package/dist/src/services/BuiltinCommandLoader.test.js.map +1 -1
- package/dist/src/services/FileCommandLoader.js +6 -6
- package/dist/src/services/FileCommandLoader.js.map +1 -1
- package/dist/src/ui/AppContainer.js +1 -9
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.test.js +18 -7
- package/dist/src/ui/IdeIntegrationNudge.test.js.map +1 -1
- package/dist/src/ui/auth/AuthInProgress.test.js +16 -6
- package/dist/src/ui/auth/AuthInProgress.test.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.js +18 -1
- package/dist/src/ui/commands/directoryCommand.js.map +1 -1
- package/dist/src/ui/commands/directoryCommand.test.js +38 -2
- package/dist/src/ui/commands/directoryCommand.test.js.map +1 -1
- package/dist/src/ui/commands/skillsCommand.d.ts +7 -0
- package/dist/src/ui/commands/skillsCommand.js +148 -0
- package/dist/src/ui/commands/skillsCommand.js.map +1 -0
- package/dist/src/ui/commands/skillsCommand.test.d.ts +6 -0
- package/dist/src/ui/commands/skillsCommand.test.js +162 -0
- package/dist/src/ui/commands/skillsCommand.test.js.map +1 -0
- package/dist/src/ui/commands/types.d.ts +5 -0
- package/dist/src/ui/components/Composer.js +1 -1
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +10 -4
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.d.ts +1 -0
- package/dist/src/ui/components/ContextSummaryDisplay.js +12 -5
- package/dist/src/ui/components/ContextSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/ContextSummaryDisplay.test.js +9 -6
- package/dist/src/ui/components/ContextSummaryDisplay.test.js.map +1 -1
- package/dist/src/ui/components/EditorSettingsDialog.js +2 -1
- package/dist/src/ui/components/EditorSettingsDialog.js.map +1 -1
- package/dist/src/ui/components/EditorSettingsDialog.test.js +3 -2
- package/dist/src/ui/components/EditorSettingsDialog.test.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +2 -1
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/IdeTrustChangeDialog.js +2 -1
- package/dist/src/ui/components/IdeTrustChangeDialog.js.map +1 -1
- package/dist/src/ui/components/IdeTrustChangeDialog.test.js +4 -3
- package/dist/src/ui/components/IdeTrustChangeDialog.test.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.js +2 -2
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.test.js +5 -5
- package/dist/src/ui/components/InputPrompt.test.js.map +1 -1
- package/dist/src/ui/components/Notifications.js +2 -2
- package/dist/src/ui/components/Notifications.js.map +1 -1
- package/dist/src/ui/components/SettingsDialog.js +2 -2
- package/dist/src/ui/components/SettingsDialog.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js +4 -3
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.js +4 -4
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.js +2 -2
- package/dist/src/ui/components/views/ExtensionsList.js.map +1 -1
- package/dist/src/ui/components/views/ExtensionsList.test.js +26 -0
- package/dist/src/ui/components/views/ExtensionsList.test.js.map +1 -1
- package/dist/src/ui/components/views/SkillsList.d.ts +13 -0
- package/dist/src/ui/components/views/SkillsList.js +15 -0
- package/dist/src/ui/components/views/SkillsList.js.map +1 -0
- package/dist/src/ui/components/views/SkillsList.test.d.ts +6 -0
- package/dist/src/ui/components/views/SkillsList.test.js +64 -0
- package/dist/src/ui/components/views/SkillsList.test.js.map +1 -0
- package/dist/src/ui/hooks/atCommandProcessor.js +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +0 -6
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.test.js +0 -2
- package/dist/src/ui/hooks/slashCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.js +5 -7
- package/dist/src/ui/hooks/useExtensionUpdates.js.map +1 -1
- package/dist/src/ui/hooks/useExtensionUpdates.test.js +2 -2
- package/dist/src/ui/hooks/useExtensionUpdates.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +13 -1
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +60 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useIncludeDirsTrust.js +2 -2
- package/dist/src/ui/hooks/useIncludeDirsTrust.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useSelectionList.js +2 -1
- package/dist/src/ui/hooks/useSelectionList.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.js +3 -3
- package/dist/src/ui/hooks/useSessionBrowser.js.map +1 -1
- package/dist/src/ui/hooks/useSessionBrowser.test.js +4 -10
- package/dist/src/ui/hooks/useSessionBrowser.test.js.map +1 -1
- package/dist/src/ui/hooks/useShellHistory.js +3 -3
- package/dist/src/ui/hooks/useShellHistory.js.map +1 -1
- package/dist/src/ui/hooks/useSlashCompletion.js +4 -1
- package/dist/src/ui/hooks/useSlashCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +0 -2
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +12 -1
- package/dist/src/ui/types.js +1 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/ui/utils/ConsolePatcher.js +1 -0
- package/dist/src/ui/utils/ConsolePatcher.js.map +1 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js +2 -1
- package/dist/src/ui/utils/InlineMarkdownRenderer.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.d.ts +8 -0
- package/dist/src/ui/utils/directoryUtils.js +92 -0
- package/dist/src/ui/utils/directoryUtils.js.map +1 -1
- package/dist/src/ui/utils/directoryUtils.test.js +189 -2
- package/dist/src/ui/utils/directoryUtils.test.js.map +1 -1
- package/dist/src/utils/errors.js +9 -10
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.js +95 -37
- package/dist/src/utils/errors.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +3 -1
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +13 -7
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/src/utils/sandbox.js +10 -7
- package/dist/src/utils/sandbox.js.map +1 -1
- package/dist/src/utils/sessionCleanup.integration.test.js +2 -2
- package/dist/src/utils/sessionCleanup.integration.test.js.map +1 -1
- package/dist/src/utils/sessionCleanup.js +4 -4
- package/dist/src/utils/sessionCleanup.js.map +1 -1
- package/dist/src/utils/sessionCleanup.test.js +18 -68
- package/dist/src/utils/sessionCleanup.test.js.map +1 -1
- package/dist/src/utils/sessions.js +9 -9
- package/dist/src/utils/sessions.js.map +1 -1
- package/dist/src/utils/sessions.test.js +38 -41
- package/dist/src/utils/sessions.test.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.d.ts +1 -1
- package/dist/src/validateNonInterActiveAuth.js +1 -2
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.test.js +40 -56
- package/dist/src/validateNonInterActiveAuth.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/dist/google-gemini-cli-0.24.0-nightly.20251226.546baf993.tgz +0 -0
|
@@ -5,6 +5,10 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import * as os from 'node:os';
|
|
7
7
|
import * as path from 'node:path';
|
|
8
|
+
import * as fs from 'node:fs';
|
|
9
|
+
import { opendir } from 'node:fs/promises';
|
|
10
|
+
const MAX_SUGGESTIONS = 50;
|
|
11
|
+
const MATCH_BUFFER_MULTIPLIER = 3;
|
|
8
12
|
export function expandHomeDir(p) {
|
|
9
13
|
if (!p) {
|
|
10
14
|
return '';
|
|
@@ -18,4 +22,92 @@ export function expandHomeDir(p) {
|
|
|
18
22
|
}
|
|
19
23
|
return path.normalize(expandedPath);
|
|
20
24
|
}
|
|
25
|
+
function parsePartialPath(partialPath) {
|
|
26
|
+
const isHomeExpansion = partialPath.startsWith('~');
|
|
27
|
+
const expandedPath = expandHomeDir(partialPath || '.');
|
|
28
|
+
let searchDir;
|
|
29
|
+
let filter;
|
|
30
|
+
if (partialPath === '' ||
|
|
31
|
+
partialPath.endsWith('/') ||
|
|
32
|
+
partialPath.endsWith(path.sep)) {
|
|
33
|
+
searchDir = expandedPath;
|
|
34
|
+
filter = '';
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
searchDir = path.dirname(expandedPath);
|
|
38
|
+
filter = path.basename(expandedPath);
|
|
39
|
+
// Special case for ~ because path.dirname('~') can be '.'
|
|
40
|
+
if (isHomeExpansion &&
|
|
41
|
+
!partialPath.includes('/') &&
|
|
42
|
+
!partialPath.includes(path.sep)) {
|
|
43
|
+
searchDir = os.homedir();
|
|
44
|
+
filter = partialPath.substring(1);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
// Calculate result prefix
|
|
48
|
+
let resultPrefix = '';
|
|
49
|
+
if (partialPath === '' ||
|
|
50
|
+
partialPath.endsWith('/') ||
|
|
51
|
+
partialPath.endsWith(path.sep)) {
|
|
52
|
+
resultPrefix = partialPath;
|
|
53
|
+
}
|
|
54
|
+
else {
|
|
55
|
+
const lastSlashIndex = Math.max(partialPath.lastIndexOf('/'), partialPath.lastIndexOf(path.sep));
|
|
56
|
+
if (lastSlashIndex !== -1) {
|
|
57
|
+
resultPrefix = partialPath.substring(0, lastSlashIndex + 1);
|
|
58
|
+
}
|
|
59
|
+
else if (isHomeExpansion) {
|
|
60
|
+
resultPrefix = `~${path.sep}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
return { searchDir, filter, isHomeExpansion, resultPrefix };
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Gets directory suggestions based on a partial path.
|
|
67
|
+
* Uses async iteration with fs.opendir for efficient handling of large directories.
|
|
68
|
+
*
|
|
69
|
+
* @param partialPath The partial path typed by the user.
|
|
70
|
+
* @returns A promise resolving to an array of directory path suggestions.
|
|
71
|
+
*/
|
|
72
|
+
export async function getDirectorySuggestions(partialPath) {
|
|
73
|
+
try {
|
|
74
|
+
const { searchDir, filter, resultPrefix } = parsePartialPath(partialPath);
|
|
75
|
+
if (!fs.existsSync(searchDir) || !fs.statSync(searchDir).isDirectory()) {
|
|
76
|
+
return [];
|
|
77
|
+
}
|
|
78
|
+
const matches = [];
|
|
79
|
+
const filterLower = filter.toLowerCase();
|
|
80
|
+
const showHidden = filter.startsWith('.');
|
|
81
|
+
const dir = await opendir(searchDir);
|
|
82
|
+
try {
|
|
83
|
+
for await (const entry of dir) {
|
|
84
|
+
if (!entry.isDirectory()) {
|
|
85
|
+
continue;
|
|
86
|
+
}
|
|
87
|
+
if (entry.name.startsWith('.') && !showHidden) {
|
|
88
|
+
continue;
|
|
89
|
+
}
|
|
90
|
+
if (entry.name.toLowerCase().startsWith(filterLower)) {
|
|
91
|
+
matches.push(entry.name);
|
|
92
|
+
// Early termination with buffer for sorting
|
|
93
|
+
if (matches.length >= MAX_SUGGESTIONS * MATCH_BUFFER_MULTIPLIER) {
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
finally {
|
|
100
|
+
await dir.close().catch(() => { });
|
|
101
|
+
}
|
|
102
|
+
// Use the separator style from user's input for consistency
|
|
103
|
+
const userSep = resultPrefix.includes('/') ? '/' : path.sep;
|
|
104
|
+
return matches
|
|
105
|
+
.sort()
|
|
106
|
+
.slice(0, MAX_SUGGESTIONS)
|
|
107
|
+
.map((name) => resultPrefix + name + userSep);
|
|
108
|
+
}
|
|
109
|
+
catch (_) {
|
|
110
|
+
return [];
|
|
111
|
+
}
|
|
112
|
+
}
|
|
21
113
|
//# sourceMappingURL=directoryUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directoryUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/directoryUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC"}
|
|
1
|
+
{"version":3,"file":"directoryUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/directoryUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAElC,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAChD,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;SAAM,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,YAAY,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC;AASD,SAAS,gBAAgB,CAAC,WAAmB;IAC3C,MAAM,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,aAAa,CAAC,WAAW,IAAI,GAAG,CAAC,CAAC;IAEvD,IAAI,SAAiB,CAAC;IACtB,IAAI,MAAc,CAAC;IAEnB,IACE,WAAW,KAAK,EAAE;QAClB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;QACzB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAC9B,CAAC;QACD,SAAS,GAAG,YAAY,CAAC;QACzB,MAAM,GAAG,EAAE,CAAC;IACd,CAAC;SAAM,CAAC;QACN,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAErC,0DAA0D;QAC1D,IACE,eAAe;YACf,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC1B,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAC/B,CAAC;YACD,SAAS,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;YACzB,MAAM,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IACE,WAAW,KAAK,EAAE;QAClB,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;QACzB,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAC9B,CAAC;QACD,YAAY,GAAG,WAAW,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAC7B,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,EAC5B,WAAW,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,CAClC,CAAC;QACF,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1B,YAAY,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;QAC9D,CAAC;aAAM,IAAI,eAAe,EAAE,CAAC;YAC3B,YAAY,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;QAChC,CAAC;IACH,CAAC;IAED,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC;AAC9D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAmB;IAEnB,IAAI,CAAC;QACH,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAE1E,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACvE,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC;QACzC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAC;QAErC,IAAI,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,EAAE,CAAC;gBAC9B,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;oBACzB,SAAS;gBACX,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;oBAC9C,SAAS;gBACX,CAAC;gBAED,IAAI,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;oBACrD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAEzB,4CAA4C;oBAC5C,IAAI,OAAO,CAAC,MAAM,IAAI,eAAe,GAAG,uBAAuB,EAAE,CAAC;wBAChE,MAAM;oBACR,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,GAAG,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACpC,CAAC;QAED,4DAA4D;QAC5D,MAAM,OAAO,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAE5D,OAAO,OAAO;aACX,IAAI,EAAE;aACN,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC;aACzB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,GAAG,IAAI,GAAG,OAAO,CAAC,CAAC;IAClD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC"}
|
|
@@ -3,9 +3,11 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { vi, describe, it, expect } from 'vitest';
|
|
7
|
-
import { expandHomeDir } from './directoryUtils.js';
|
|
6
|
+
import { vi, describe, it, expect, beforeEach } from 'vitest';
|
|
7
|
+
import { expandHomeDir, getDirectorySuggestions } from './directoryUtils.js';
|
|
8
8
|
import * as path from 'node:path';
|
|
9
|
+
import * as fs from 'node:fs';
|
|
10
|
+
import * as fsPromises from 'node:fs/promises';
|
|
9
11
|
vi.mock('@google/gemini-cli-core', async (importOriginal) => {
|
|
10
12
|
const original = await importOriginal();
|
|
11
13
|
return {
|
|
@@ -25,7 +27,37 @@ vi.mock('node:os', async (importOriginal) => {
|
|
|
25
27
|
homedir: vi.fn(() => mockHomeDir),
|
|
26
28
|
};
|
|
27
29
|
});
|
|
30
|
+
vi.mock('node:fs', () => ({
|
|
31
|
+
existsSync: vi.fn(),
|
|
32
|
+
statSync: vi.fn(),
|
|
33
|
+
}));
|
|
34
|
+
vi.mock('node:fs/promises', () => ({
|
|
35
|
+
opendir: vi.fn(),
|
|
36
|
+
}));
|
|
37
|
+
function createMockDir(entries) {
|
|
38
|
+
let index = 0;
|
|
39
|
+
const iterator = {
|
|
40
|
+
async next() {
|
|
41
|
+
if (index < entries.length) {
|
|
42
|
+
return { value: entries[index++], done: false };
|
|
43
|
+
}
|
|
44
|
+
return { value: undefined, done: true };
|
|
45
|
+
},
|
|
46
|
+
[Symbol.asyncIterator]() {
|
|
47
|
+
return this;
|
|
48
|
+
},
|
|
49
|
+
};
|
|
50
|
+
return {
|
|
51
|
+
[Symbol.asyncIterator]() {
|
|
52
|
+
return iterator;
|
|
53
|
+
},
|
|
54
|
+
close: vi.fn().mockResolvedValue(undefined),
|
|
55
|
+
};
|
|
56
|
+
}
|
|
28
57
|
describe('directoryUtils', () => {
|
|
58
|
+
beforeEach(() => {
|
|
59
|
+
vi.clearAllMocks();
|
|
60
|
+
});
|
|
29
61
|
describe('expandHomeDir', () => {
|
|
30
62
|
it('should expand ~ to the home directory', () => {
|
|
31
63
|
expect(expandHomeDir('~')).toBe(mockHomeDir);
|
|
@@ -48,5 +80,160 @@ describe('directoryUtils', () => {
|
|
|
48
80
|
expect(expandHomeDir('')).toBe('');
|
|
49
81
|
});
|
|
50
82
|
});
|
|
83
|
+
describe('getDirectorySuggestions', () => {
|
|
84
|
+
it('should return suggestions for an empty path', async () => {
|
|
85
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
86
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
87
|
+
isDirectory: () => true,
|
|
88
|
+
});
|
|
89
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
90
|
+
{ name: 'docs', isDirectory: () => true },
|
|
91
|
+
{ name: 'src', isDirectory: () => true },
|
|
92
|
+
{ name: 'file.txt', isDirectory: () => false },
|
|
93
|
+
]));
|
|
94
|
+
const suggestions = await getDirectorySuggestions('');
|
|
95
|
+
expect(suggestions).toEqual([`docs${path.sep}`, `src${path.sep}`]);
|
|
96
|
+
});
|
|
97
|
+
it('should return suggestions for a partial path', async () => {
|
|
98
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
99
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
100
|
+
isDirectory: () => true,
|
|
101
|
+
});
|
|
102
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
103
|
+
{ name: 'docs', isDirectory: () => true },
|
|
104
|
+
{ name: 'src', isDirectory: () => true },
|
|
105
|
+
]));
|
|
106
|
+
const suggestions = await getDirectorySuggestions('d');
|
|
107
|
+
expect(suggestions).toEqual([`docs${path.sep}`]);
|
|
108
|
+
});
|
|
109
|
+
it('should return suggestions for a path with trailing slash', async () => {
|
|
110
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
111
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
112
|
+
isDirectory: () => true,
|
|
113
|
+
});
|
|
114
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
115
|
+
{ name: 'sub', isDirectory: () => true },
|
|
116
|
+
]));
|
|
117
|
+
const suggestions = await getDirectorySuggestions('docs/');
|
|
118
|
+
expect(suggestions).toEqual(['docs/sub/']);
|
|
119
|
+
});
|
|
120
|
+
it('should return suggestions for a path with ~', async () => {
|
|
121
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
122
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
123
|
+
isDirectory: () => true,
|
|
124
|
+
});
|
|
125
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
126
|
+
{ name: 'Downloads', isDirectory: () => true },
|
|
127
|
+
]));
|
|
128
|
+
const suggestions = await getDirectorySuggestions('~/');
|
|
129
|
+
expect(suggestions).toEqual(['~/Downloads/']);
|
|
130
|
+
});
|
|
131
|
+
it('should return suggestions for a partial path with ~', async () => {
|
|
132
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
133
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
134
|
+
isDirectory: () => true,
|
|
135
|
+
});
|
|
136
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
137
|
+
{ name: 'Downloads', isDirectory: () => true },
|
|
138
|
+
]));
|
|
139
|
+
const suggestions = await getDirectorySuggestions('~/Down');
|
|
140
|
+
expect(suggestions).toEqual(['~/Downloads/']);
|
|
141
|
+
});
|
|
142
|
+
it('should return suggestions for ../', async () => {
|
|
143
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
144
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
145
|
+
isDirectory: () => true,
|
|
146
|
+
});
|
|
147
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
148
|
+
{ name: 'other-project', isDirectory: () => true },
|
|
149
|
+
]));
|
|
150
|
+
const suggestions = await getDirectorySuggestions('../');
|
|
151
|
+
expect(suggestions).toEqual(['../other-project/']);
|
|
152
|
+
});
|
|
153
|
+
it('should ignore hidden directories', async () => {
|
|
154
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
155
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
156
|
+
isDirectory: () => true,
|
|
157
|
+
});
|
|
158
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
159
|
+
{ name: '.git', isDirectory: () => true },
|
|
160
|
+
{ name: 'src', isDirectory: () => true },
|
|
161
|
+
]));
|
|
162
|
+
const suggestions = await getDirectorySuggestions('');
|
|
163
|
+
expect(suggestions).toEqual([`src${path.sep}`]);
|
|
164
|
+
});
|
|
165
|
+
it('should show hidden directories when filter starts with .', async () => {
|
|
166
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
167
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
168
|
+
isDirectory: () => true,
|
|
169
|
+
});
|
|
170
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
171
|
+
{ name: '.git', isDirectory: () => true },
|
|
172
|
+
{ name: '.github', isDirectory: () => true },
|
|
173
|
+
{ name: '.vscode', isDirectory: () => true },
|
|
174
|
+
{ name: 'src', isDirectory: () => true },
|
|
175
|
+
]));
|
|
176
|
+
const suggestions = await getDirectorySuggestions('.g');
|
|
177
|
+
expect(suggestions).toEqual([`.git${path.sep}`, `.github${path.sep}`]);
|
|
178
|
+
});
|
|
179
|
+
it('should return empty array if directory does not exist', async () => {
|
|
180
|
+
vi.mocked(fs.existsSync).mockReturnValue(false);
|
|
181
|
+
const suggestions = await getDirectorySuggestions('nonexistent/');
|
|
182
|
+
expect(suggestions).toEqual([]);
|
|
183
|
+
});
|
|
184
|
+
it('should limit results to 50 suggestions', async () => {
|
|
185
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
186
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
187
|
+
isDirectory: () => true,
|
|
188
|
+
});
|
|
189
|
+
// Create 200 directories
|
|
190
|
+
const manyDirs = Array.from({ length: 200 }, (_, i) => ({
|
|
191
|
+
name: `dir${String(i).padStart(3, '0')}`,
|
|
192
|
+
isDirectory: () => true,
|
|
193
|
+
}));
|
|
194
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir(manyDirs));
|
|
195
|
+
const suggestions = await getDirectorySuggestions('');
|
|
196
|
+
expect(suggestions).toHaveLength(50);
|
|
197
|
+
});
|
|
198
|
+
it('should terminate early after 150 matches for performance', async () => {
|
|
199
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
200
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
201
|
+
isDirectory: () => true,
|
|
202
|
+
});
|
|
203
|
+
// Create 200 directories
|
|
204
|
+
const manyDirs = Array.from({ length: 200 }, (_, i) => ({
|
|
205
|
+
name: `dir${String(i).padStart(3, '0')}`,
|
|
206
|
+
isDirectory: () => true,
|
|
207
|
+
}));
|
|
208
|
+
const mockDir = createMockDir(manyDirs);
|
|
209
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(mockDir);
|
|
210
|
+
await getDirectorySuggestions('');
|
|
211
|
+
// The close method should be called, indicating early termination
|
|
212
|
+
expect(mockDir.close).toHaveBeenCalled();
|
|
213
|
+
});
|
|
214
|
+
});
|
|
215
|
+
describe.skipIf(process.platform !== 'win32')('getDirectorySuggestions (Windows)', () => {
|
|
216
|
+
it('should handle %userprofile% expansion', async () => {
|
|
217
|
+
vi.mocked(fs.existsSync).mockReturnValue(true);
|
|
218
|
+
vi.mocked(fs.statSync).mockReturnValue({
|
|
219
|
+
isDirectory: () => true,
|
|
220
|
+
});
|
|
221
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
222
|
+
{ name: 'Documents', isDirectory: () => true },
|
|
223
|
+
{ name: 'Downloads', isDirectory: () => true },
|
|
224
|
+
]));
|
|
225
|
+
expect(await getDirectorySuggestions('%userprofile%\\')).toEqual([
|
|
226
|
+
`%userprofile%\\Documents${path.sep}`,
|
|
227
|
+
`%userprofile%\\Downloads${path.sep}`,
|
|
228
|
+
]);
|
|
229
|
+
vi.mocked(fsPromises.opendir).mockResolvedValue(createMockDir([
|
|
230
|
+
{ name: 'Documents', isDirectory: () => true },
|
|
231
|
+
{ name: 'Downloads', isDirectory: () => true },
|
|
232
|
+
]));
|
|
233
|
+
expect(await getDirectorySuggestions('%userprofile%\\Doc')).toEqual([
|
|
234
|
+
`%userprofile%\\Documents${path.sep}`,
|
|
235
|
+
]);
|
|
236
|
+
});
|
|
237
|
+
});
|
|
51
238
|
});
|
|
52
239
|
//# sourceMappingURL=directoryUtils.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"directoryUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/directoryUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAElC,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1D,MAAM,QAAQ,GACZ,MAAM,cAAc,EAA4C,CAAC;IACnE,OAAO;QACL,GAAG,QAAQ;QACX,4BAA4B,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC;YACtD,aAAa,EAAE,aAAa;YAC5B,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,WAAW,CAAC;SACzB,CAAC;KACH,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,CAAC;AAE1E,EAAE,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAC1C,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAmB,CAAC;IACzD,OAAO;QACL,GAAG,QAAQ;QACX,OAAO,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC;KAClC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;IAC9B,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YACrD,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;gBACnD,MAAM,CAAC,aAAa,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uDAAuD,EAAE,GAAG,EAAE;YAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YACrD,MAAM,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"directoryUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/directoryUtils.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/utils/errors.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Copyright 2025 Google LLC
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
|
-
import { OutputFormat, JsonFormatter, StreamJsonFormatter, JsonStreamEventType, uiTelemetryService, parseAndFormatApiError, FatalTurnLimitedError, FatalCancellationError, FatalToolExecutionError, isFatalToolError, } from '@google/gemini-cli-core';
|
|
6
|
+
import { OutputFormat, JsonFormatter, StreamJsonFormatter, JsonStreamEventType, uiTelemetryService, parseAndFormatApiError, FatalTurnLimitedError, FatalCancellationError, FatalToolExecutionError, isFatalToolError, debugLogger, coreEvents, } from '@google/gemini-cli-core';
|
|
7
7
|
import { runSyncCleanup } from './cleanup.js';
|
|
8
8
|
export function getErrorMessage(error) {
|
|
9
9
|
if (error instanceof Error) {
|
|
@@ -63,12 +63,11 @@ export function handleError(error, config, customErrorCode) {
|
|
|
63
63
|
const formatter = new JsonFormatter();
|
|
64
64
|
const errorCode = customErrorCode ?? extractErrorCode(error);
|
|
65
65
|
const formattedError = formatter.formatError(error instanceof Error ? error : new Error(getErrorMessage(error)), errorCode, config.getSessionId());
|
|
66
|
-
|
|
66
|
+
coreEvents.emitFeedback('error', formattedError);
|
|
67
67
|
runSyncCleanup();
|
|
68
68
|
process.exit(getNumericExitCode(errorCode));
|
|
69
69
|
}
|
|
70
70
|
else {
|
|
71
|
-
console.error(errorMessage);
|
|
72
71
|
throw error;
|
|
73
72
|
}
|
|
74
73
|
}
|
|
@@ -104,16 +103,16 @@ export function handleToolError(toolName, toolError, config, errorType, resultDi
|
|
|
104
103
|
else if (config.getOutputFormat() === OutputFormat.JSON) {
|
|
105
104
|
const formatter = new JsonFormatter();
|
|
106
105
|
const formattedError = formatter.formatError(toolExecutionError, errorType ?? toolExecutionError.exitCode, config.getSessionId());
|
|
107
|
-
|
|
106
|
+
coreEvents.emitFeedback('error', formattedError);
|
|
108
107
|
}
|
|
109
108
|
else {
|
|
110
|
-
|
|
109
|
+
coreEvents.emitFeedback('error', errorMessage);
|
|
111
110
|
}
|
|
112
111
|
runSyncCleanup();
|
|
113
112
|
process.exit(toolExecutionError.exitCode);
|
|
114
113
|
}
|
|
115
114
|
// Non-fatal: log and continue
|
|
116
|
-
|
|
115
|
+
debugLogger.warn(errorMessage);
|
|
117
116
|
}
|
|
118
117
|
/**
|
|
119
118
|
* Handles cancellation/abort signals consistently.
|
|
@@ -139,12 +138,12 @@ export function handleCancellationError(config) {
|
|
|
139
138
|
else if (config.getOutputFormat() === OutputFormat.JSON) {
|
|
140
139
|
const formatter = new JsonFormatter();
|
|
141
140
|
const formattedError = formatter.formatError(cancellationError, cancellationError.exitCode, config.getSessionId());
|
|
142
|
-
|
|
141
|
+
coreEvents.emitFeedback('error', formattedError);
|
|
143
142
|
runSyncCleanup();
|
|
144
143
|
process.exit(cancellationError.exitCode);
|
|
145
144
|
}
|
|
146
145
|
else {
|
|
147
|
-
|
|
146
|
+
coreEvents.emitFeedback('error', cancellationError.message);
|
|
148
147
|
runSyncCleanup();
|
|
149
148
|
process.exit(cancellationError.exitCode);
|
|
150
149
|
}
|
|
@@ -173,12 +172,12 @@ export function handleMaxTurnsExceededError(config) {
|
|
|
173
172
|
else if (config.getOutputFormat() === OutputFormat.JSON) {
|
|
174
173
|
const formatter = new JsonFormatter();
|
|
175
174
|
const formattedError = formatter.formatError(maxTurnsError, maxTurnsError.exitCode, config.getSessionId());
|
|
176
|
-
|
|
175
|
+
coreEvents.emitFeedback('error', formattedError);
|
|
177
176
|
runSyncCleanup();
|
|
178
177
|
process.exit(maxTurnsError.exitCode);
|
|
179
178
|
}
|
|
180
179
|
else {
|
|
181
|
-
|
|
180
|
+
coreEvents.emitFeedback('error', maxTurnsError.message);
|
|
182
181
|
runSyncCleanup();
|
|
183
182
|
process.exit(maxTurnsError.exitCode);
|
|
184
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EACL,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACtB,uBAAuB,EACvB,gBAAgB,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|