@umsai/ums-code 0.5.0-v1 → 0.6.0-v1
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/package.json +4 -4
- package/dist/src/acp-integration/acp.d.ts +6 -0
- package/dist/src/acp-integration/acp.js +7 -0
- package/dist/src/acp-integration/acp.js.map +1 -1
- package/dist/src/acp-integration/acpAgent.js +33 -7
- package/dist/src/acp-integration/acpAgent.js.map +1 -1
- package/dist/src/acp-integration/schema.d.ts +1235 -892
- package/dist/src/acp-integration/schema.js +19 -0
- package/dist/src/acp-integration/schema.js.map +1 -1
- package/dist/src/acp-integration/session/Session.d.ts +0 -5
- package/dist/src/acp-integration/session/Session.js +94 -15
- package/dist/src/acp-integration/session/Session.js.map +1 -1
- package/dist/src/commandMode.d.ts +11 -0
- package/dist/src/commandMode.js +238 -0
- package/dist/src/commandMode.js.map +1 -0
- package/dist/src/config/auth.js +26 -0
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/config.d.ts +8 -0
- package/dist/src/config/config.js +96 -21
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extensions/update.test.js +9 -0
- package/dist/src/config/extensions/update.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +41 -2
- package/dist/src/config/settingsSchema.js +36 -2
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/core/initializer.js +3 -0
- package/dist/src/core/initializer.js.map +1 -1
- package/dist/src/gemini.js +39 -19
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/gemini.test.js +30 -4
- package/dist/src/gemini.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/i18n/index.d.ts +10 -2
- package/dist/src/i18n/index.js +22 -1
- package/dist/src/i18n/index.js.map +1 -1
- package/dist/src/i18n/languages.d.ts +20 -0
- package/dist/src/i18n/languages.js +36 -0
- package/dist/src/i18n/languages.js.map +1 -0
- package/dist/src/i18n/locales/de.js +1073 -0
- package/dist/src/i18n/locales/en.js +120 -162
- package/dist/src/i18n/locales/ru.js +125 -151
- package/dist/src/i18n/locales/zh.js +51 -164
- package/dist/src/nonInteractive/control/controllers/systemController.d.ts +1 -1
- package/dist/src/nonInteractive/control/controllers/systemController.js +5 -10
- package/dist/src/nonInteractive/control/controllers/systemController.js.map +1 -1
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.js +11 -4
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.js.map +1 -1
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.test.js +40 -0
- package/dist/src/nonInteractive/io/BaseJsonOutputAdapter.test.js.map +1 -1
- package/dist/src/nonInteractive/io/StreamJsonOutputAdapter.test.js +50 -0
- package/dist/src/nonInteractive/io/StreamJsonOutputAdapter.test.js.map +1 -1
- package/dist/src/nonInteractiveCli.js +104 -18
- package/dist/src/nonInteractiveCli.js.map +1 -1
- package/dist/src/nonInteractiveCliCommands.d.ts +48 -9
- package/dist/src/nonInteractiveCliCommands.js +180 -64
- package/dist/src/nonInteractiveCliCommands.js.map +1 -1
- package/dist/src/{ui/hooks/useQuotaAndFallback.test.d.ts → nonInteractiveCliCommands.test.d.ts} +1 -1
- package/dist/src/nonInteractiveCliCommands.test.js +157 -0
- package/dist/src/nonInteractiveCliCommands.test.js.map +1 -0
- package/dist/src/services/BuiltinCommandLoader.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.js +4 -2
- package/dist/src/services/McpPromptLoader.js.map +1 -1
- package/dist/src/services/McpPromptLoader.test.js +1 -1
- package/dist/src/services/McpPromptLoader.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +23 -20
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +0 -46
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +4 -4
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +11 -3
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/commands/approvalModeCommand.js +53 -4
- package/dist/src/ui/commands/approvalModeCommand.js.map +1 -1
- package/dist/src/ui/commands/approvalModeCommand.test.js +72 -10
- package/dist/src/ui/commands/approvalModeCommand.test.js.map +1 -1
- package/dist/src/ui/commands/compressCommand.js +86 -16
- package/dist/src/ui/commands/compressCommand.js.map +1 -1
- package/dist/src/ui/commands/languageCommand.d.ts +6 -1
- package/dist/src/ui/commands/languageCommand.js +162 -216
- package/dist/src/ui/commands/languageCommand.js.map +1 -1
- package/dist/src/ui/commands/languageCommand.test.js +105 -10
- package/dist/src/ui/commands/languageCommand.test.js.map +1 -1
- package/dist/src/ui/commands/restoreCommand.js +1 -1
- package/dist/src/ui/commands/restoreCommand.js.map +1 -1
- package/dist/src/ui/commands/resumeCommand.d.ts +7 -0
- package/dist/src/ui/commands/resumeCommand.js +19 -0
- package/dist/src/ui/commands/resumeCommand.js.map +1 -0
- package/dist/src/ui/{components/ProQuotaDialog.test.d.ts → commands/resumeCommand.test.d.ts} +1 -1
- package/dist/src/ui/commands/resumeCommand.test.js +32 -0
- package/dist/src/ui/commands/resumeCommand.test.js.map +1 -0
- package/dist/src/ui/commands/reviewCommand.js +871 -92
- package/dist/src/ui/commands/reviewCommand.js.map +1 -1
- package/dist/src/ui/commands/reviewCommand.test.js +55 -0
- package/dist/src/ui/commands/reviewCommand.test.js.map +1 -1
- package/dist/src/ui/commands/summaryCommand.js +129 -42
- package/dist/src/ui/commands/summaryCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +21 -2
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +4 -4
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +5 -2
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js +1 -1
- package/dist/src/ui/components/PermissionsModifyTrustDialog.js.map +1 -1
- package/dist/src/ui/components/SessionPicker.d.ts +18 -0
- package/dist/src/ui/components/SessionPicker.js +69 -0
- package/dist/src/ui/components/SessionPicker.js.map +1 -0
- package/dist/src/ui/components/SessionSummaryDisplay.js +6 -2
- package/dist/src/ui/components/SessionSummaryDisplay.js.map +1 -1
- package/dist/src/ui/components/{ResumeSessionPicker.d.ts → StandaloneSessionPicker.d.ts} +1 -1
- package/dist/src/ui/components/StandaloneSessionPicker.js +78 -0
- package/dist/src/ui/components/StandaloneSessionPicker.js.map +1 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.d.ts +6 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.js +410 -0
- package/dist/src/ui/components/StandaloneSessionPicker.test.js.map +1 -0
- package/dist/src/ui/components/ums/UMSKeyPrompt.js +1 -1
- package/dist/src/ui/components/ums/UMSKeyPrompt.js.map +1 -1
- package/dist/src/ui/contexts/UIActionsContext.d.ts +3 -1
- package/dist/src/ui/contexts/UIActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/UIStateContext.d.ts +2 -8
- package/dist/src/ui/contexts/UIStateContext.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +1 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js +9 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +46 -11
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +11 -6
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/usePhraseCycler.js +12 -136
- package/dist/src/ui/hooks/usePhraseCycler.js.map +1 -1
- package/dist/src/ui/hooks/useQwenAuth.test.js +1 -1
- package/dist/src/ui/hooks/useQwenAuth.test.js.map +1 -1
- package/dist/src/ui/hooks/useResumeCommand.d.ts +20 -0
- package/dist/src/ui/hooks/useResumeCommand.js +49 -0
- package/dist/src/ui/hooks/useResumeCommand.js.map +1 -0
- package/dist/src/ui/hooks/useResumeCommand.test.d.ts +6 -0
- package/dist/src/ui/hooks/useResumeCommand.test.js +144 -0
- package/dist/src/ui/hooks/useResumeCommand.test.js.map +1 -0
- package/dist/src/ui/hooks/useSessionPicker.d.ts +36 -0
- package/dist/src/ui/hooks/useSessionPicker.js +189 -0
- package/dist/src/ui/hooks/useSessionPicker.js.map +1 -0
- package/dist/src/ui/hooks/useToolScheduler.test.js +1 -1
- package/dist/src/ui/models/availableModels.d.ts +1 -0
- package/dist/src/ui/models/availableModels.js +8 -0
- package/dist/src/ui/models/availableModels.js.map +1 -1
- package/dist/src/ui/utils/resumeHistoryUtils.js +5 -1
- package/dist/src/ui/utils/resumeHistoryUtils.js.map +1 -1
- package/dist/src/ui/utils/resumeHistoryUtils.test.js +5 -0
- package/dist/src/ui/utils/resumeHistoryUtils.test.js.map +1 -1
- package/dist/src/ui/utils/sessionPickerUtils.d.ts +30 -0
- package/dist/src/ui/utils/sessionPickerUtils.js +41 -0
- package/dist/src/ui/utils/sessionPickerUtils.js.map +1 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.d.ts +6 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.js +38 -0
- package/dist/src/ui/utils/sessionPickerUtils.test.js.map +1 -0
- package/dist/src/utils/errors.d.ts +1 -1
- package/dist/src/utils/errors.js +14 -3
- package/dist/src/utils/errors.js.map +1 -1
- package/dist/src/utils/errors.test.js +43 -1
- package/dist/src/utils/errors.test.js.map +1 -1
- package/dist/src/utils/gitUtils.js +22 -5
- package/dist/src/utils/gitUtils.js.map +1 -1
- package/dist/src/utils/gitUtils.test.js +59 -0
- package/dist/src/utils/gitUtils.test.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.d.ts +3 -1
- package/dist/src/utils/nonInteractiveHelpers.js +13 -14
- package/dist/src/utils/nonInteractiveHelpers.js.map +1 -1
- package/dist/src/utils/nonInteractiveHelpers.test.js +35 -20
- package/dist/src/utils/nonInteractiveHelpers.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +2 -2
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +5 -5
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/src/utils/systemInfo.js +2 -1
- package/dist/src/utils/systemInfo.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +9 -0
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +5 -5
- package/dist/src/ui/components/ProQuotaDialog.d.ts +0 -13
- package/dist/src/ui/components/ProQuotaDialog.js +0 -24
- package/dist/src/ui/components/ProQuotaDialog.js.map +0 -1
- package/dist/src/ui/components/ProQuotaDialog.test.js +0 -58
- package/dist/src/ui/components/ProQuotaDialog.test.js.map +0 -1
- package/dist/src/ui/components/ResumeSessionPicker.js +0 -249
- package/dist/src/ui/components/ResumeSessionPicker.js.map +0 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.d.ts +0 -21
- package/dist/src/ui/hooks/useQuotaAndFallback.js +0 -122
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +0 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +0 -269
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +0 -1
|
@@ -10,6 +10,11 @@ const makeConfig = (tools) => ({
|
|
|
10
10
|
getToolRegistry: () => ({
|
|
11
11
|
getTool: (name) => tools[name],
|
|
12
12
|
}),
|
|
13
|
+
getContentGenerator: () => ({
|
|
14
|
+
// Default to showing full thinking content during resume unless explicitly
|
|
15
|
+
// summarized; tests don't care about summarized thinking behavior.
|
|
16
|
+
useSummarizedThinking: () => false,
|
|
17
|
+
}),
|
|
13
18
|
});
|
|
14
19
|
describe('resumeHistoryUtils', () => {
|
|
15
20
|
let mockTool;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resumeHistoryUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/resumeHistoryUtils.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"resumeHistoryUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/resumeHistoryUtils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Qwen Code
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import type { SessionListItem } from '@umsai/ums-code-core';
|
|
7
|
+
/**
|
|
8
|
+
* State for managing loaded sessions in the session picker.
|
|
9
|
+
*/
|
|
10
|
+
export interface SessionState {
|
|
11
|
+
sessions: SessionListItem[];
|
|
12
|
+
hasMore: boolean;
|
|
13
|
+
nextCursor?: number;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Page size for loading sessions.
|
|
17
|
+
*/
|
|
18
|
+
export declare const SESSION_PAGE_SIZE = 20;
|
|
19
|
+
/**
|
|
20
|
+
* Truncates text to fit within a given width, adding ellipsis if needed.
|
|
21
|
+
*/
|
|
22
|
+
export declare function truncateText(text: string, maxWidth: number): string;
|
|
23
|
+
/**
|
|
24
|
+
* Filters sessions optionally by branch.
|
|
25
|
+
*/
|
|
26
|
+
export declare function filterSessions(sessions: SessionListItem[], filterByBranch: boolean, currentBranch?: string): SessionListItem[];
|
|
27
|
+
/**
|
|
28
|
+
* Formats message count for display with proper pluralization.
|
|
29
|
+
*/
|
|
30
|
+
export declare function formatMessageCount(count: number): string;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Qwen Code
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
/**
|
|
7
|
+
* Page size for loading sessions.
|
|
8
|
+
*/
|
|
9
|
+
export const SESSION_PAGE_SIZE = 20;
|
|
10
|
+
/**
|
|
11
|
+
* Truncates text to fit within a given width, adding ellipsis if needed.
|
|
12
|
+
*/
|
|
13
|
+
export function truncateText(text, maxWidth) {
|
|
14
|
+
const firstLine = text.split(/\r?\n/, 1)[0];
|
|
15
|
+
if (firstLine.length <= maxWidth) {
|
|
16
|
+
return firstLine;
|
|
17
|
+
}
|
|
18
|
+
if (maxWidth <= 3) {
|
|
19
|
+
return firstLine.slice(0, maxWidth);
|
|
20
|
+
}
|
|
21
|
+
return firstLine.slice(0, maxWidth - 3) + '...';
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Filters sessions optionally by branch.
|
|
25
|
+
*/
|
|
26
|
+
export function filterSessions(sessions, filterByBranch, currentBranch) {
|
|
27
|
+
return sessions.filter((session) => {
|
|
28
|
+
// Apply branch filter if enabled
|
|
29
|
+
if (filterByBranch && currentBranch) {
|
|
30
|
+
return session.gitBranch === currentBranch;
|
|
31
|
+
}
|
|
32
|
+
return true;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Formats message count for display with proper pluralization.
|
|
37
|
+
*/
|
|
38
|
+
export function formatMessageCount(count) {
|
|
39
|
+
return count === 1 ? '1 message' : `${count} messages`;
|
|
40
|
+
}
|
|
41
|
+
//# sourceMappingURL=sessionPickerUtils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionPickerUtils.js","sourceRoot":"","sources":["../../../../src/ui/utils/sessionPickerUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC;;GAEG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,QAAgB;IACzD,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,IAAI,SAAS,CAAC,MAAM,IAAI,QAAQ,EAAE,CAAC;QACjC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,QAAQ,IAAI,CAAC,EAAE,CAAC;QAClB,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IACD,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;AAClD,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAC5B,QAA2B,EAC3B,cAAuB,EACvB,aAAsB;IAEtB,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE;QACjC,iCAAiC;QACjC,IAAI,cAAc,IAAI,aAAa,EAAE,CAAC;YACpC,OAAO,OAAO,CAAC,SAAS,KAAK,aAAa,CAAC;QAC7C,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,KAAK,WAAW,CAAC;AACzD,CAAC"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Qwen Code
|
|
4
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect } from 'vitest';
|
|
7
|
+
import { truncateText } from './sessionPickerUtils.js';
|
|
8
|
+
describe('sessionPickerUtils', () => {
|
|
9
|
+
describe('truncateText', () => {
|
|
10
|
+
it('returns the original text when it fits and has no newline', () => {
|
|
11
|
+
expect(truncateText('hello', 10)).toBe('hello');
|
|
12
|
+
});
|
|
13
|
+
it('truncates long text with ellipsis', () => {
|
|
14
|
+
expect(truncateText('hello world', 5)).toBe('he...');
|
|
15
|
+
});
|
|
16
|
+
it('truncates without ellipsis when maxWidth <= 3', () => {
|
|
17
|
+
expect(truncateText('hello', 3)).toBe('hel');
|
|
18
|
+
expect(truncateText('hello', 2)).toBe('he');
|
|
19
|
+
});
|
|
20
|
+
it('breaks at newline and returns only the first line', () => {
|
|
21
|
+
expect(truncateText('hello\nworld', 20)).toBe('hello');
|
|
22
|
+
expect(truncateText('hello\r\nworld', 20)).toBe('hello');
|
|
23
|
+
});
|
|
24
|
+
it('breaks at newline and still truncates the first line when needed', () => {
|
|
25
|
+
expect(truncateText('hello\nworld', 2)).toBe('he');
|
|
26
|
+
expect(truncateText('hello\nworld', 3)).toBe('hel');
|
|
27
|
+
expect(truncateText('hello\nworld', 4)).toBe('h...');
|
|
28
|
+
});
|
|
29
|
+
it('does not add ellipsis when the string ends at a newline', () => {
|
|
30
|
+
expect(truncateText('hello\n', 20)).toBe('hello');
|
|
31
|
+
expect(truncateText('hello\r\n', 20)).toBe('hello');
|
|
32
|
+
});
|
|
33
|
+
it('returns only the first line even if there are multiple line breaks', () => {
|
|
34
|
+
expect(truncateText('hello\n\nworld', 20)).toBe('hello');
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
//# sourceMappingURL=sessionPickerUtils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionPickerUtils.test.js","sourceRoot":"","sources":["../../../../src/ui/utils/sessionPickerUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;YACnE,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;YACvD,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;YAC3D,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvD,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;YAC1E,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnD,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,CAAC,YAAY,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;YACjE,MAAM,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAClD,MAAM,CAAC,YAAY,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;YAC5E,MAAM,CAAC,YAAY,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -24,7 +24,7 @@ export declare function handleError(error: unknown, config: Config, customErrorC
|
|
|
24
24
|
* @param errorCode - Optional error code
|
|
25
25
|
* @param resultDisplay - Optional display message for the error
|
|
26
26
|
*/
|
|
27
|
-
export declare function handleToolError(toolName: string, toolError: Error, config: Config,
|
|
27
|
+
export declare function handleToolError(toolName: string, toolError: Error, config: Config, errorCode?: string | number, resultDisplay?: string): void;
|
|
28
28
|
/**
|
|
29
29
|
* Handles cancellation/abort signals consistently.
|
|
30
30
|
*/
|
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, parseAndFormatApiError, FatalTurnLimitedError, FatalCancellationError, } from '@umsai/ums-code-core';
|
|
6
|
+
import { OutputFormat, JsonFormatter, parseAndFormatApiError, FatalTurnLimitedError, FatalCancellationError, ToolErrorType, } from '@umsai/ums-code-core';
|
|
7
7
|
export function getErrorMessage(error) {
|
|
8
8
|
if (error instanceof Error) {
|
|
9
9
|
return error.message;
|
|
@@ -65,8 +65,19 @@ export function handleError(error, config, customErrorCode) {
|
|
|
65
65
|
* @param errorCode - Optional error code
|
|
66
66
|
* @param resultDisplay - Optional display message for the error
|
|
67
67
|
*/
|
|
68
|
-
export function handleToolError(toolName, toolError, config,
|
|
69
|
-
//
|
|
68
|
+
export function handleToolError(toolName, toolError, config, errorCode, resultDisplay) {
|
|
69
|
+
// Check if this is a permission denied error in non-interactive mode
|
|
70
|
+
const isExecutionDenied = errorCode === ToolErrorType.EXECUTION_DENIED;
|
|
71
|
+
const isNonInteractive = !config.isInteractive();
|
|
72
|
+
const isTextMode = config.getOutputFormat() === OutputFormat.TEXT;
|
|
73
|
+
// Show warning for permission denied errors in non-interactive text mode
|
|
74
|
+
if (isExecutionDenied && isNonInteractive && isTextMode) {
|
|
75
|
+
const warningMessage = `Warning: Tool "${toolName}" requires user approval but cannot execute in non-interactive mode.\n` +
|
|
76
|
+
`To enable automatic tool execution, use the -y flag (YOLO mode):\n` +
|
|
77
|
+
`Example: qwen -p 'your prompt' -y\n\n`;
|
|
78
|
+
process.stderr.write(warningMessage);
|
|
79
|
+
}
|
|
80
|
+
// Always log detailed error in debug mode
|
|
70
81
|
if (config.getDebugMode()) {
|
|
71
82
|
console.error(`Error executing tool ${toolName}: ${resultDisplay || toolError.message}`);
|
|
72
83
|
}
|
|
@@ -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,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/utils/errors.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { vi } from 'vitest';
|
|
7
|
-
import { OutputFormat, FatalInputError } from '@umsai/ums-code-core';
|
|
7
|
+
import { OutputFormat, FatalInputError, ToolErrorType, } from '@umsai/ums-code-core';
|
|
8
8
|
import { getErrorMessage, handleError, handleToolError, handleCancellationError, handleMaxTurnsExceededError, } from './errors.js';
|
|
9
9
|
// Mock the core modules
|
|
10
10
|
vi.mock('@umsai/ums-code-core', async (importOriginal) => {
|
|
@@ -47,12 +47,17 @@ vi.mock('@umsai/ums-code-core', async (importOriginal) => {
|
|
|
47
47
|
describe('errors', () => {
|
|
48
48
|
let mockConfig;
|
|
49
49
|
let processExitSpy;
|
|
50
|
+
let processStderrWriteSpy;
|
|
50
51
|
let consoleErrorSpy;
|
|
51
52
|
beforeEach(() => {
|
|
52
53
|
// Reset mocks
|
|
53
54
|
vi.clearAllMocks();
|
|
54
55
|
// Mock console.error
|
|
55
56
|
consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
|
|
57
|
+
// Mock process.stderr.write
|
|
58
|
+
processStderrWriteSpy = vi
|
|
59
|
+
.spyOn(process.stderr, 'write')
|
|
60
|
+
.mockImplementation(() => true);
|
|
56
61
|
// Mock process.exit to throw instead of actually exiting
|
|
57
62
|
processExitSpy = vi.spyOn(process, 'exit').mockImplementation((code) => {
|
|
58
63
|
throw new Error(`process.exit called with code: ${code}`);
|
|
@@ -62,10 +67,12 @@ describe('errors', () => {
|
|
|
62
67
|
getOutputFormat: vi.fn().mockReturnValue(OutputFormat.TEXT),
|
|
63
68
|
getContentGeneratorConfig: vi.fn().mockReturnValue({ authType: 'test' }),
|
|
64
69
|
getDebugMode: vi.fn().mockReturnValue(true),
|
|
70
|
+
isInteractive: vi.fn().mockReturnValue(false),
|
|
65
71
|
};
|
|
66
72
|
});
|
|
67
73
|
afterEach(() => {
|
|
68
74
|
consoleErrorSpy.mockRestore();
|
|
75
|
+
processStderrWriteSpy.mockRestore();
|
|
69
76
|
processExitSpy.mockRestore();
|
|
70
77
|
});
|
|
71
78
|
describe('getErrorMessage', () => {
|
|
@@ -275,6 +282,41 @@ describe('errors', () => {
|
|
|
275
282
|
expect(processExitSpy).not.toHaveBeenCalled();
|
|
276
283
|
});
|
|
277
284
|
});
|
|
285
|
+
describe('permission denied warnings', () => {
|
|
286
|
+
it('should show warning when EXECUTION_DENIED in non-interactive text mode', () => {
|
|
287
|
+
mockConfig.getDebugMode.mockReturnValue(false);
|
|
288
|
+
mockConfig.isInteractive.mockReturnValue(false);
|
|
289
|
+
mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
|
|
290
|
+
handleToolError(toolName, toolError, mockConfig, ToolErrorType.EXECUTION_DENIED);
|
|
291
|
+
expect(processStderrWriteSpy).toHaveBeenCalledWith(expect.stringContaining('Warning: Tool "test-tool" requires user approval'));
|
|
292
|
+
expect(processStderrWriteSpy).toHaveBeenCalledWith(expect.stringContaining('use the -y flag (YOLO mode)'));
|
|
293
|
+
expect(processExitSpy).not.toHaveBeenCalled();
|
|
294
|
+
});
|
|
295
|
+
it('should not show warning when EXECUTION_DENIED in interactive mode', () => {
|
|
296
|
+
mockConfig.getDebugMode.mockReturnValue(false);
|
|
297
|
+
mockConfig.isInteractive.mockReturnValue(true);
|
|
298
|
+
mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
|
|
299
|
+
handleToolError(toolName, toolError, mockConfig, ToolErrorType.EXECUTION_DENIED);
|
|
300
|
+
expect(processStderrWriteSpy).not.toHaveBeenCalled();
|
|
301
|
+
expect(processExitSpy).not.toHaveBeenCalled();
|
|
302
|
+
});
|
|
303
|
+
it('should not show warning when EXECUTION_DENIED in JSON mode', () => {
|
|
304
|
+
mockConfig.getDebugMode.mockReturnValue(false);
|
|
305
|
+
mockConfig.isInteractive.mockReturnValue(false);
|
|
306
|
+
mockConfig.getOutputFormat.mockReturnValue(OutputFormat.JSON);
|
|
307
|
+
handleToolError(toolName, toolError, mockConfig, ToolErrorType.EXECUTION_DENIED);
|
|
308
|
+
expect(processStderrWriteSpy).not.toHaveBeenCalled();
|
|
309
|
+
expect(processExitSpy).not.toHaveBeenCalled();
|
|
310
|
+
});
|
|
311
|
+
it('should not show warning for non-EXECUTION_DENIED errors', () => {
|
|
312
|
+
mockConfig.getDebugMode.mockReturnValue(false);
|
|
313
|
+
mockConfig.isInteractive.mockReturnValue(false);
|
|
314
|
+
mockConfig.getOutputFormat.mockReturnValue(OutputFormat.TEXT);
|
|
315
|
+
handleToolError(toolName, toolError, mockConfig, ToolErrorType.FILE_NOT_FOUND);
|
|
316
|
+
expect(processStderrWriteSpy).not.toHaveBeenCalled();
|
|
317
|
+
expect(processExitSpy).not.toHaveBeenCalled();
|
|
318
|
+
});
|
|
319
|
+
});
|
|
278
320
|
});
|
|
279
321
|
describe('handleCancellationError', () => {
|
|
280
322
|
describe('in text mode', () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../../src/utils/errors.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"errors.test.js","sourceRoot":"","sources":["../../../src/utils/errors.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,12 +78,29 @@ export function getGitHubRepoInfo() {
|
|
|
78
78
|
const remoteUrl = execSync('git remote get-url origin', {
|
|
79
79
|
encoding: 'utf-8',
|
|
80
80
|
}).trim();
|
|
81
|
-
//
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
81
|
+
// Handle SCP-style SSH URLs (git@github.com:owner/repo.git)
|
|
82
|
+
let urlToParse = remoteUrl;
|
|
83
|
+
if (remoteUrl.startsWith('git@github.com:')) {
|
|
84
|
+
urlToParse = remoteUrl.replace('git@github.com:', '');
|
|
85
|
+
}
|
|
86
|
+
else if (remoteUrl.startsWith('git@')) {
|
|
87
|
+
// SSH URL for a different provider (GitLab, Bitbucket, etc.)
|
|
88
|
+
throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
|
|
89
|
+
}
|
|
90
|
+
let parsedUrl;
|
|
91
|
+
try {
|
|
92
|
+
parsedUrl = new URL(urlToParse, 'https://github.com');
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
|
|
96
|
+
}
|
|
97
|
+
if (parsedUrl.host !== 'github.com') {
|
|
98
|
+
throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
|
|
99
|
+
}
|
|
100
|
+
const parts = parsedUrl.pathname.split('/').filter((part) => part !== '');
|
|
101
|
+
if (parts.length !== 2 || !parts[0] || !parts[1]) {
|
|
85
102
|
throw new Error(`Owner & repo could not be extracted from remote URL: ${remoteUrl}`);
|
|
86
103
|
}
|
|
87
|
-
return { owner:
|
|
104
|
+
return { owner: parts[0], repo: parts[1].replace(/\.git$/, '') };
|
|
88
105
|
}
|
|
89
106
|
//# sourceMappingURL=gitUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAY,EAAE;IAC9C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,CACd,QAAQ,CAAC,eAAe,EAAE;YACxB,QAAQ,EAAE,OAAO;SAClB,CAAC,IAAI,EAAE,CACT,CAAC,IAAI,EAAE,CAAC;QAET,MAAM,OAAO,GAAG,aAAa,CAAC;QAE9B,OAAO,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,wDAAwD;QACxD,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;QACnD,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,GAAW,EAAE;IACzC,MAAM,WAAW,GAAG,CAClB,QAAQ,CAAC,+BAA+B,EAAE;QACxC,QAAQ,EAAE,OAAO;KAClB,CAAC,IAAI,EAAE,CACT,CAAC,IAAI,EAAE,CAAC;IAET,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,KAAc,EACG,EAAE;IACnB,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;QAEzC,MAAM,QAAQ,GAAG,sEAAsE,CAAC;QAExF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,MAAM,EAAE,6BAA6B;gBACrC,cAAc,EAAE,kBAAkB;gBAClC,sBAAsB,EAAE,YAAY;aACrC;YACD,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;YACrD,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;SAC3D,CAAC,CAAC;QAElB,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CACb,0BAA0B,QAAQ,CAAC,MAAM,MAAM,QAAQ,CAAC,UAAU,EAAE,CACrE,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CACX,sDAAsD,EACtD,MAAM,CACP,CAAC;QACF,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,SAAS,GAAG,QAAQ,CAAC,2BAA2B,EAAE;QACtD,QAAQ,EAAE,OAAO;KAClB,CAAC,CAAC,IAAI,EAAE,CAAC;IAEV,
|
|
1
|
+
{"version":3,"file":"gitUtils.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,65 @@ describe('getGitHubRepoInfo', async () => {
|
|
|
57
57
|
vi.mocked(child_process.execSync).mockReturnValueOnce('https://github.com/owner/repo.git ');
|
|
58
58
|
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
59
59
|
});
|
|
60
|
+
// Tests for credential formats
|
|
61
|
+
it('returns the owner and repo for URL with classic PAT token (ghp_)', async () => {
|
|
62
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://ghp_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@github.com/owner/repo.git');
|
|
63
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
64
|
+
});
|
|
65
|
+
it('returns the owner and repo for URL with fine-grained PAT token (github_pat_)', async () => {
|
|
66
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://github_pat_xxxxxxxxxxxxxxxxxxxxxx_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx@github.com/owner/repo.git');
|
|
67
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
68
|
+
});
|
|
69
|
+
it('returns the owner and repo for URL with username:password format', async () => {
|
|
70
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://username:password@github.com/owner/repo.git');
|
|
71
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
72
|
+
});
|
|
73
|
+
it('returns the owner and repo for URL with OAuth token (oauth2:token)', async () => {
|
|
74
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://oauth2:gho_xxxxxxxxxxxx@github.com/owner/repo.git');
|
|
75
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
76
|
+
});
|
|
77
|
+
it('returns the owner and repo for URL with GitHub Actions token (x-access-token)', async () => {
|
|
78
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://x-access-token:ghs_xxxxxxxxxxxx@github.com/owner/repo.git');
|
|
79
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
80
|
+
});
|
|
81
|
+
// Tests for case insensitivity
|
|
82
|
+
it('returns the owner and repo for URL with uppercase GITHUB.COM', async () => {
|
|
83
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://GITHUB.COM/owner/repo.git');
|
|
84
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
85
|
+
});
|
|
86
|
+
it('returns the owner and repo for URL with mixed case GitHub.Com', async () => {
|
|
87
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://GitHub.Com/owner/repo.git');
|
|
88
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
89
|
+
});
|
|
90
|
+
// Tests for SSH format
|
|
91
|
+
it('returns the owner and repo for SSH URL', async () => {
|
|
92
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('git@github.com:owner/repo.git');
|
|
93
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
94
|
+
});
|
|
95
|
+
it('throws for non-GitHub SSH URL', async () => {
|
|
96
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('git@gitlab.com:owner/repo.git');
|
|
97
|
+
expect(() => {
|
|
98
|
+
getGitHubRepoInfo();
|
|
99
|
+
}).toThrowError(/Owner & repo could not be extracted from remote URL/);
|
|
100
|
+
});
|
|
101
|
+
// Tests for edge cases
|
|
102
|
+
it('returns the owner and repo for URL without .git suffix', async () => {
|
|
103
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://github.com/owner/repo');
|
|
104
|
+
expect(getGitHubRepoInfo()).toEqual({ owner: 'owner', repo: 'repo' });
|
|
105
|
+
});
|
|
106
|
+
it('throws for non-GitHub HTTPS URL', async () => {
|
|
107
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://gitlab.com/owner/repo.git');
|
|
108
|
+
expect(() => {
|
|
109
|
+
getGitHubRepoInfo();
|
|
110
|
+
}).toThrowError(/Owner & repo could not be extracted from remote URL/);
|
|
111
|
+
});
|
|
112
|
+
it('handles repo names containing .git substring', async () => {
|
|
113
|
+
vi.mocked(child_process.execSync).mockReturnValueOnce('https://github.com/owner/my.git.repo.git');
|
|
114
|
+
expect(getGitHubRepoInfo()).toEqual({
|
|
115
|
+
owner: 'owner',
|
|
116
|
+
repo: 'my.git.repo',
|
|
117
|
+
});
|
|
118
|
+
});
|
|
60
119
|
});
|
|
61
120
|
describe('getGitRepoRoot', async () => {
|
|
62
121
|
beforeEach(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gitUtils.test.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gitUtils.test.js","sourceRoot":"","sources":["../../../src/utils/gitUtils.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,kBAAkB,EAClB,cAAc,EACd,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,eAAe,CAAC;AAEvB,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;AAEzB,QAAQ,CAAC,oBAAoB,EAAE,KAAK,IAAI,EAAE;IACxC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAW,EAAE;YAChE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,CAAC;QAC5E,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC;;;KAGrD,CAAC,CAAC;QACH,MAAM,CAAC,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,mBAAmB,EAAE,KAAK,IAAI,EAAE;IACvC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAW,EAAE;YAChE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,EAAE;YACV,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,EAAE;YACV,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC,YAAY,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QAC1C,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,oCAAoC,CACrC,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,+BAA+B;IAE/B,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,4EAA4E,CAC7E,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,iIAAiI,CAClI,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAChF,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,qDAAqD,CACtD,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,2DAA2D,CAC5D,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,mEAAmE,CACpE,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,+BAA+B;IAE/B,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,mCAAmC,CACpC,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,mCAAmC,CACpC,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,uBAAuB;IAEvB,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;QACtD,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,+BAA+B,CAChC,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,+BAA+B,CAChC,CAAC;QACF,MAAM,CAAC,GAAG,EAAE;YACV,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC,YAAY,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,uBAAuB;IAEvB,EAAE,CAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,+BAA+B,CAChC,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;QAC/C,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,mCAAmC,CACpC,CAAC;QACF,MAAM,CAAC,GAAG,EAAE;YACV,iBAAiB,EAAE,CAAC;QACtB,CAAC,CAAC,CAAC,YAAY,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;QAC5D,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CACnD,0CAA0C,CAC3C,CAAC;QACF,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,OAAO;YACd,IAAI,EAAE,aAAa;SACpB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,gBAAgB,EAAE,KAAK,IAAI,EAAE;IACpC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAW,EAAE;YAChE,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,EAAE;YACV,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;QACpD,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;QAC1D,MAAM,CAAC,GAAG,EAAE;YACV,cAAc,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC,YAAY,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;QAChC,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;QAC3E,MAAM,CAAC,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;IACtC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;QAClD,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CACzD,gCAAgC,CACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACxE,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CACxB,OAAO,CAAC,OAAO,CAAC;YACd,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;SAChC,CAAC,CACf,CAAC;QACF,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CACzD,gCAAgC,CACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6BAA6B,EAAE,KAAK,IAAI,EAAE;QAC3C,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CACxB,OAAO,CAAC,OAAO,CAAC;YACd,EAAE,EAAE,IAAI;YACR,IAAI,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;SACxC,CAAC,CACf,CAAC;QACF,MAAM,MAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -51,9 +51,11 @@ export declare function computeUsageFromMetrics(metrics: SessionMetrics): Usage;
|
|
|
51
51
|
* @param config - Config instance
|
|
52
52
|
* @param sessionId - Session identifier
|
|
53
53
|
* @param permissionMode - Current permission/approval mode
|
|
54
|
+
* @param allowedBuiltinCommandNames - Optional array of allowed built-in command names.
|
|
55
|
+
* If not provided, defaults to empty array (only file commands will be included).
|
|
54
56
|
* @returns Promise resolving to CLISystemMessage
|
|
55
57
|
*/
|
|
56
|
-
export declare function buildSystemMessage(config: Config, sessionId: string, permissionMode: PermissionMode): Promise<CLISystemMessage>;
|
|
58
|
+
export declare function buildSystemMessage(config: Config, sessionId: string, permissionMode: PermissionMode, allowedBuiltinCommandNames?: string[]): Promise<CLISystemMessage>;
|
|
57
59
|
/**
|
|
58
60
|
* Creates an output update handler specifically for Task tool subagent execution.
|
|
59
61
|
* This handler monitors TaskResultDisplay updates and converts them to protocol messages
|
|
@@ -4,9 +4,8 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { OutputFormat, ToolErrorType, getMCPServerStatus, } from '@umsai/ums-code-core';
|
|
7
|
-
import { CommandService } from '../services/CommandService.js';
|
|
8
|
-
import { BuiltinCommandLoader } from '../services/BuiltinCommandLoader.js';
|
|
9
7
|
import { computeSessionStats } from '../ui/utils/computeStats.js';
|
|
8
|
+
import { getAvailableCommands } from '../nonInteractiveCliCommands.js';
|
|
10
9
|
/**
|
|
11
10
|
* Normalizes various part list formats into a consistent Part[] array.
|
|
12
11
|
*
|
|
@@ -123,21 +122,19 @@ export function computeUsageFromMetrics(metrics) {
|
|
|
123
122
|
return usage;
|
|
124
123
|
}
|
|
125
124
|
/**
|
|
126
|
-
* Load slash command names using
|
|
125
|
+
* Load slash command names using getAvailableCommands
|
|
127
126
|
*
|
|
128
127
|
* @param config - Config instance
|
|
128
|
+
* @param allowedBuiltinCommandNames - Optional array of allowed built-in command names.
|
|
129
|
+
* If not provided, uses the default from getAvailableCommands.
|
|
129
130
|
* @returns Promise resolving to array of slash command names
|
|
130
131
|
*/
|
|
131
|
-
async function loadSlashCommandNames(config) {
|
|
132
|
+
async function loadSlashCommandNames(config, allowedBuiltinCommandNames) {
|
|
132
133
|
const controller = new AbortController();
|
|
133
134
|
try {
|
|
134
|
-
const
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
for (const command of commands) {
|
|
138
|
-
names.add(command.name);
|
|
139
|
-
}
|
|
140
|
-
return Array.from(names).sort();
|
|
135
|
+
const commands = await getAvailableCommands(config, controller.signal, allowedBuiltinCommandNames);
|
|
136
|
+
// Extract command names and sort
|
|
137
|
+
return commands.map((cmd) => cmd.name).sort();
|
|
141
138
|
}
|
|
142
139
|
catch (error) {
|
|
143
140
|
if (config.getDebugMode()) {
|
|
@@ -164,9 +161,11 @@ async function loadSlashCommandNames(config) {
|
|
|
164
161
|
* @param config - Config instance
|
|
165
162
|
* @param sessionId - Session identifier
|
|
166
163
|
* @param permissionMode - Current permission/approval mode
|
|
164
|
+
* @param allowedBuiltinCommandNames - Optional array of allowed built-in command names.
|
|
165
|
+
* If not provided, defaults to empty array (only file commands will be included).
|
|
167
166
|
* @returns Promise resolving to CLISystemMessage
|
|
168
167
|
*/
|
|
169
|
-
export async function buildSystemMessage(config, sessionId, permissionMode) {
|
|
168
|
+
export async function buildSystemMessage(config, sessionId, permissionMode, allowedBuiltinCommandNames) {
|
|
170
169
|
const toolRegistry = config.getToolRegistry();
|
|
171
170
|
const tools = toolRegistry ? toolRegistry.getAllToolNames() : [];
|
|
172
171
|
const mcpServers = config.getMcpServers();
|
|
@@ -176,8 +175,8 @@ export async function buildSystemMessage(config, sessionId, permissionMode) {
|
|
|
176
175
|
status: getMCPServerStatus(name),
|
|
177
176
|
}))
|
|
178
177
|
: [];
|
|
179
|
-
// Load slash commands
|
|
180
|
-
const slashCommands = await loadSlashCommandNames(config);
|
|
178
|
+
// Load slash commands with filtering based on allowed built-in commands
|
|
179
|
+
const slashCommands = await loadSlashCommandNames(config, allowedBuiltinCommandNames);
|
|
181
180
|
// Load subagent names from config
|
|
182
181
|
let agentNames = [];
|
|
183
182
|
try {
|