@defai.digital/ax-cli 3.11.0 → 3.11.4
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/README.md +17 -158
- package/dist/sdk/version.d.ts +1 -1
- package/dist/sdk/version.js +1 -1
- package/dist/sdk/version.js.map +1 -1
- package/dist/ui/components/chat-history.js +102 -31
- package/dist/ui/components/chat-history.js.map +1 -1
- package/dist/ui/components/diff-renderer.js +8 -4
- package/dist/ui/components/diff-renderer.js.map +1 -1
- package/dist/ui/components/keyboard-help.js +11 -5
- package/dist/ui/components/keyboard-help.js.map +1 -1
- package/dist/ui/components/keyboard-hints.js +6 -3
- package/dist/ui/components/keyboard-hints.js.map +1 -1
- package/dist/ui/components/reasoning-display.js +9 -6
- package/dist/ui/components/reasoning-display.js.map +1 -1
- package/dist/ui/components/tool-group-display.js +86 -21
- package/dist/ui/components/tool-group-display.js.map +1 -1
- package/dist/ui/hooks/use-enhanced-input.d.ts +1 -0
- package/dist/ui/hooks/use-enhanced-input.js +105 -15
- package/dist/ui/hooks/use-enhanced-input.js.map +1 -1
- package/dist/ui/utils/change-summarizer.js +84 -19
- package/dist/ui/utils/change-summarizer.js.map +1 -1
- package/dist/ui/utils/markdown-renderer.js +11 -5
- package/dist/ui/utils/markdown-renderer.js.map +1 -1
- package/dist/ui/utils/semantic-action-detector.js +51 -7
- package/dist/ui/utils/semantic-action-detector.js.map +1 -1
- package/dist/ui/utils/tool-grouper.d.ts +2 -0
- package/dist/ui/utils/tool-grouper.js +184 -20
- package/dist/ui/utils/tool-grouper.js.map +1 -1
- package/dist/utils/paste-utils.js +29 -5
- package/dist/utils/paste-utils.js.map +1 -1
- package/node_modules/@ax-cli/schemas/package.json +1 -1
- package/package.json +1 -1
- package/packages/schemas/package.json +1 -1
|
@@ -35,11 +35,15 @@ export function KeyboardHelp({ onClose, verbosityLevel = 0, backgroundMode = fal
|
|
|
35
35
|
React.createElement(Text, { bold: true, color: "yellow" }, "Input Editing:"),
|
|
36
36
|
React.createElement(Box, { paddingLeft: 2, flexDirection: "column" },
|
|
37
37
|
React.createElement(Text, null,
|
|
38
|
-
React.createElement(Text, { color: "cyan", bold: true }, "
|
|
39
|
-
React.createElement(Text, { color: "gray" }, "
|
|
38
|
+
React.createElement(Text, { color: "cyan", bold: true }, "Ctrl+J"),
|
|
39
|
+
React.createElement(Text, { color: "gray" }, " Insert newline "),
|
|
40
|
+
React.createElement(Text, { color: "green" }, "(recommended)")),
|
|
41
|
+
React.createElement(Text, null,
|
|
42
|
+
React.createElement(Text, { color: "cyan", bold: true }, "\\+Enter"),
|
|
43
|
+
React.createElement(Text, { color: "gray" }, " Insert newline (backslash escape)")),
|
|
40
44
|
React.createElement(Text, null,
|
|
41
|
-
React.createElement(Text, { color: "cyan", bold: true }, "
|
|
42
|
-
React.createElement(Text, { color: "gray" }, "
|
|
45
|
+
React.createElement(Text, { color: "cyan", bold: true }, "Enter"),
|
|
46
|
+
React.createElement(Text, { color: "gray" }, " Submit prompt")),
|
|
43
47
|
React.createElement(Text, null,
|
|
44
48
|
React.createElement(Text, { color: "cyan", bold: true }, "Ctrl+A"),
|
|
45
49
|
React.createElement(Text, { color: "gray" }, " Move to start of line")),
|
|
@@ -51,7 +55,9 @@ export function KeyboardHelp({ onClose, verbosityLevel = 0, backgroundMode = fal
|
|
|
51
55
|
React.createElement(Text, { color: "gray" }, " Delete word before cursor")),
|
|
52
56
|
React.createElement(Text, null,
|
|
53
57
|
React.createElement(Text, { color: "cyan", bold: true }, "Ctrl+K"),
|
|
54
|
-
React.createElement(Text, { color: "gray" }, " Open quick actions menu")))
|
|
58
|
+
React.createElement(Text, { color: "gray" }, " Open quick actions menu"))),
|
|
59
|
+
React.createElement(Box, { paddingLeft: 2, marginTop: 0 },
|
|
60
|
+
React.createElement(Text, { color: "gray", dimColor: true }, "Note: Shift+Enter may not work in all terminals. Use Ctrl+J instead."))),
|
|
55
61
|
React.createElement(Box, { flexDirection: "column", marginBottom: 1 },
|
|
56
62
|
React.createElement(Text, { bold: true, color: "yellow" }, "Mode Toggles:"),
|
|
57
63
|
React.createElement(Box, { paddingLeft: 2, flexDirection: "column" },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard-help.js","sourceRoot":"","sources":["../../../src/ui/components/keyboard-help.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAS1C,MAAM,UAAU,YAAY,CAAC,EAC3B,OAAO,EACP,cAAc,GAAG,CAAC,EAClB,cAAc,GAAG,KAAK,EACtB,eAAe,GAAG,IAAI,GACJ;IAClB,6CAA6C;IAC7C,QAAQ,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,CAAC,MAAM,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;YAChC,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;QAElD,oBAAC,GAAG,IAAC,WAAW,EAAC,QAAQ,EAAC,WAAW,EAAC,MAAM,EAAC,QAAQ,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC;YACvE,oBAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAC,MAAM,8CAEhB;YACP,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,iCAAkC,CAChD;QAGN,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC;YACzC,oBAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAC,QAAQ,kBAElB;YACP,oBAAC,GAAG,IAAC,WAAW,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ;gBACzC,oBAAC,IAAI;oBACH,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,0BAAW;oBAClC,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,wCAAyC,CACtD;gBACP,oBAAC,IAAI;oBACH,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,mBAAc;oBACrC,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,iCAAkC,CAC/C;gBACP,oBAAC,IAAI;oBACH,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,mBAAc;oBACrC,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,yBAA0B,CACvC,CACH,CACF;QAGN,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC;YACzC,oBAAC,IAAI,IAAC,IAAI,QAAC,KAAK,EAAC,QAAQ,qBAElB;YACP,oBAAC,GAAG,IAAC,WAAW,EAAE,CAAC,EAAE,aAAa,EAAC,QAAQ;gBACzC,oBAAC,IAAI;oBACH,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"keyboard-help.js","sourceRoot":"","sources":["../../../src/ui/components/keyboard-help.tsx"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ const SHORTCUTS_BY_MODE = {
|
|
|
13
13
|
],
|
|
14
14
|
typing: [
|
|
15
15
|
{ keys: "Enter", description: "send" },
|
|
16
|
-
{ keys: "
|
|
16
|
+
{ keys: "Ctrl+J", description: "new line" },
|
|
17
17
|
{ keys: "Ctrl+P", description: "toggle paste" },
|
|
18
18
|
{ keys: "Tab", description: "complete" },
|
|
19
19
|
{ keys: "Esc", description: "clear" },
|
|
@@ -66,7 +66,8 @@ export const ALL_SHORTCUTS = {
|
|
|
66
66
|
],
|
|
67
67
|
"Actions": [
|
|
68
68
|
{ keys: "Enter", description: "Send message / confirm" },
|
|
69
|
-
{ keys: "
|
|
69
|
+
{ keys: "Ctrl+J", description: "Insert newline (recommended)" },
|
|
70
|
+
{ keys: "\\+Enter", description: "Insert newline (backslash escape)" },
|
|
70
71
|
{ keys: "Ctrl+K", description: "Open quick actions menu" },
|
|
71
72
|
{ keys: "Ctrl+P", description: "Expand/collapse pasted text" },
|
|
72
73
|
{ keys: "Ctrl+Y", description: "Copy last response" },
|
|
@@ -82,7 +83,9 @@ export const ALL_SHORTCUTS = {
|
|
|
82
83
|
],
|
|
83
84
|
};
|
|
84
85
|
export function KeyboardHints({ mode, showExtended = false, }) {
|
|
85
|
-
|
|
86
|
+
// BUG FIX: Use bracket notation with explicit fallback to avoid potential undefined
|
|
87
|
+
// Also ensure 'idle' fallback exists in case of unknown mode values
|
|
88
|
+
const shortcuts = SHORTCUTS_BY_MODE[mode] ?? SHORTCUTS_BY_MODE['idle'] ?? [];
|
|
86
89
|
return (React.createElement(Box, { flexDirection: "row", flexWrap: "wrap" },
|
|
87
90
|
shortcuts.map((shortcut, index) => (React.createElement(Box, { key: shortcut.keys, marginRight: 2 },
|
|
88
91
|
React.createElement(Text, { color: "yellow", dimColor: true }, shortcut.keys),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard-hints.js","sourceRoot":"","sources":["../../../src/ui/components/keyboard-hints.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAahC,MAAM,iBAAiB,GAA+B;IACpD,IAAI,EAAE;QACJ,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE;QAC9C,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE;QAChD,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE;QACvC,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE;KAC/C;IACD,MAAM,EAAE;QACN,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE;QACtC,EAAE,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"keyboard-hints.js","sourceRoot":"","sources":["../../../src/ui/components/keyboard-hints.tsx"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,10 @@ import { Box, Text } from "ink";
|
|
|
15
15
|
*/
|
|
16
16
|
export function ReasoningDisplay({ content, visible = true, isStreaming = false, defaultCollapsed = false, }) {
|
|
17
17
|
// Auto-collapse if content is long (>200 words or >1000 chars) and not explicitly set
|
|
18
|
-
const
|
|
19
|
-
|
|
18
|
+
const trimmedContent = content.trim();
|
|
19
|
+
// BUG FIX: Empty string split returns [""], so check for empty first
|
|
20
|
+
const wordCount = trimmedContent.length === 0 ? 0 : trimmedContent.split(/\s+/).length;
|
|
21
|
+
const charCount = trimmedContent.length;
|
|
20
22
|
const shouldAutoCollapse = !isStreaming && (wordCount > 200 || charCount > 1000);
|
|
21
23
|
// Note: setCollapsed is available for future interactive toggle feature (Ctrl+R)
|
|
22
24
|
const [collapsed] = useState(defaultCollapsed || shouldAutoCollapse);
|
|
@@ -25,11 +27,12 @@ export function ReasoningDisplay({ content, visible = true, isStreaming = false,
|
|
|
25
27
|
return null;
|
|
26
28
|
}
|
|
27
29
|
// Show preview when collapsed (first 80 characters)
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
// BUG FIX: Use trimmedContent for consistent length check
|
|
31
|
+
const preview = collapsed && trimmedContent.length > 80
|
|
32
|
+
? trimmedContent.slice(0, 80) + "..."
|
|
30
33
|
: null;
|
|
31
34
|
return (React.createElement(Box, { flexDirection: "column", marginBottom: 1, paddingLeft: 2, borderStyle: "single", borderColor: "gray" },
|
|
32
|
-
React.createElement(Box, { flexDirection: "row", marginBottom: collapsed ? 0 :
|
|
35
|
+
React.createElement(Box, { flexDirection: "row", marginBottom: collapsed ? 0 : 1 },
|
|
33
36
|
React.createElement(Text, { color: "cyan" },
|
|
34
37
|
"\uD83D\uDCAD Thinking ",
|
|
35
38
|
collapsed ? "▸" : "▾",
|
|
@@ -38,6 +41,6 @@ export function ReasoningDisplay({ content, visible = true, isStreaming = false,
|
|
|
38
41
|
collapsed && preview && (React.createElement(Box, { flexDirection: "column", paddingLeft: 1, marginTop: 0 },
|
|
39
42
|
React.createElement(Text, { color: "gray", dimColor: true, italic: true }, preview))),
|
|
40
43
|
!collapsed && (React.createElement(Box, { flexDirection: "column", paddingLeft: 1 },
|
|
41
|
-
React.createElement(Text, { color: "white", dimColor: true, italic: true },
|
|
44
|
+
React.createElement(Text, { color: "white", dimColor: true, italic: true }, trimmedContent)))));
|
|
42
45
|
}
|
|
43
46
|
//# sourceMappingURL=reasoning-display.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reasoning-display.js","sourceRoot":"","sources":["../../../src/ui/components/reasoning-display.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAwBhC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,OAAO,EACP,OAAO,GAAG,IAAI,EACd,WAAW,GAAG,KAAK,EACnB,gBAAgB,GAAG,KAAK,GACF;IACtB,sFAAsF;IACtF,MAAM,
|
|
1
|
+
{"version":3,"file":"reasoning-display.js","sourceRoot":"","sources":["../../../src/ui/components/reasoning-display.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAwBhC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAAC,EAC/B,OAAO,EACP,OAAO,GAAG,IAAI,EACd,WAAW,GAAG,KAAK,EACnB,gBAAgB,GAAG,KAAK,GACF;IACtB,sFAAsF;IACtF,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IACtC,qEAAqE;IACrE,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC;IACvF,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC;IACxC,MAAM,kBAAkB,GAAG,CAAC,WAAW,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,SAAS,GAAG,IAAI,CAAC,CAAC;IAEjF,iFAAiF;IACjF,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,gBAAgB,IAAI,kBAAkB,CAAC,CAAC;IAErE,4CAA4C;IAC5C,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,oDAAoD;IACpD,0DAA0D;IAC1D,MAAM,OAAO,GAAG,SAAS,IAAI,cAAc,CAAC,MAAM,GAAG,EAAE;QACrD,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK;QACrC,CAAC,CAAC,IAAI,CAAC;IAET,OAAO,CACL,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,YAAY,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,WAAW,EAAC,QAAQ,EAAC,WAAW,EAAC,MAAM;QAElG,oBAAC,GAAG,IAAC,aAAa,EAAC,KAAK,EAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM;;gBACH,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG;gBACjC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,SAAS,SAAS,CACzC;YACN,CAAC,WAAW,IAAI,CACf,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,QAAQ,gCAA2B,CACvD,CACG;QACL,SAAS,IAAI,OAAO,IAAI,CACvB,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;YACtD,oBAAC,IAAI,IAAC,KAAK,EAAC,MAAM,EAAC,QAAQ,QAAC,MAAM,UAC/B,OAAO,CACH,CACH,CACP;QACA,CAAC,SAAS,IAAI,CACb,oBAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,WAAW,EAAE,CAAC;YAExC,oBAAC,IAAI,IAAC,KAAK,EAAC,OAAO,EAAC,QAAQ,QAAC,MAAM,UAChC,cAAc,CACV,CACH,CACP,CACG,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -26,33 +26,65 @@ function getResourceDisplayName(group) {
|
|
|
26
26
|
return '(unknown file)';
|
|
27
27
|
}
|
|
28
28
|
const parts = group.resource.split('/');
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
// BUG FIX: Handle trailing slashes by filtering empty parts and taking last non-empty
|
|
30
|
+
// BUG FIX: Also trim whitespace from parts
|
|
31
|
+
const nonEmptyParts = parts.filter(p => p.trim().length > 0);
|
|
32
|
+
const filename = nonEmptyParts.length > 0 ? nonEmptyParts[nonEmptyParts.length - 1].trim() : '';
|
|
33
|
+
return filename || group.resource.trim() || '(unknown file)';
|
|
31
34
|
case 'bash':
|
|
32
35
|
// Handle both bash commands and background task monitoring
|
|
33
36
|
if (group.resource.startsWith('task:')) {
|
|
34
|
-
|
|
37
|
+
// BUG FIX: Trim whitespace from taskId
|
|
38
|
+
const taskId = group.resource.replace('task:', '').trim();
|
|
35
39
|
return taskId ? `task ${taskId}` : '(unknown task)';
|
|
36
40
|
}
|
|
37
|
-
|
|
38
|
-
|
|
41
|
+
// BUG FIX: Trim whitespace from command
|
|
42
|
+
const cmd = group.resource.replace('bash:', '').trim();
|
|
43
|
+
// BUG FIX: Handle 'empty' command case from bash:empty resource
|
|
44
|
+
if (!cmd || cmd === 'empty') {
|
|
45
|
+
return '(empty command)';
|
|
46
|
+
}
|
|
47
|
+
return cmd;
|
|
39
48
|
case 'search':
|
|
40
49
|
const query = group.resource.replace('search:', '');
|
|
41
|
-
|
|
50
|
+
// BUG FIX: Trim whitespace to avoid displaying blank query
|
|
51
|
+
return query.trim() || '(unknown query)';
|
|
42
52
|
case 'todo':
|
|
43
53
|
return 'tasks';
|
|
44
54
|
case 'analysis':
|
|
45
55
|
if (group.resource.startsWith('analysis:')) {
|
|
46
56
|
const analysisPath = group.resource.replace('analysis:', '');
|
|
47
|
-
|
|
57
|
+
// BUG FIX: Trim whitespace
|
|
58
|
+
return analysisPath.trim() || 'project';
|
|
48
59
|
}
|
|
49
60
|
if (group.resource.startsWith('validation:')) {
|
|
50
61
|
const validationPath = group.resource.replace('validation:', '');
|
|
51
|
-
|
|
62
|
+
// BUG FIX: Trim whitespace
|
|
63
|
+
return validationPath.trim() || 'project';
|
|
64
|
+
}
|
|
65
|
+
return group.resource?.trim() || 'project';
|
|
66
|
+
case 'mixed':
|
|
67
|
+
// BUG FIX: Handle MCP tools and other mixed operations with clean display
|
|
68
|
+
if (group.resource.startsWith('mcp:')) {
|
|
69
|
+
// Format: mcp:servername:resource or mcp:servername
|
|
70
|
+
const mcpParts = group.resource.split(':');
|
|
71
|
+
// BUG FIX: Trim whitespace from serverName
|
|
72
|
+
const serverName = mcpParts[1]?.trim() || 'mcp';
|
|
73
|
+
const mcpResource = mcpParts.slice(2).join(':').trim();
|
|
74
|
+
if (mcpResource) {
|
|
75
|
+
// Extract filename from resource path if it looks like a path
|
|
76
|
+
// BUG FIX: Trim whitespace from path parts
|
|
77
|
+
const resourceParts = mcpResource.split('/').filter(p => p.trim().length > 0);
|
|
78
|
+
const displayResource = resourceParts.length > 0 ? resourceParts[resourceParts.length - 1].trim() : mcpResource;
|
|
79
|
+
return `${serverName}: ${displayResource}`;
|
|
80
|
+
}
|
|
81
|
+
return serverName;
|
|
52
82
|
}
|
|
53
|
-
|
|
83
|
+
// BUG FIX: Trim whitespace
|
|
84
|
+
return group.resource?.trim() || '(unknown)';
|
|
54
85
|
default:
|
|
55
|
-
|
|
86
|
+
// BUG FIX: Trim whitespace
|
|
87
|
+
return group.resource?.trim() || '(unknown)';
|
|
56
88
|
}
|
|
57
89
|
}
|
|
58
90
|
/**
|
|
@@ -66,6 +98,7 @@ function formatOperationCounts(counts, groupType, isSemanticGroup) {
|
|
|
66
98
|
}
|
|
67
99
|
const parts = [];
|
|
68
100
|
if (groupType === 'file') {
|
|
101
|
+
// BUG FIX: Show counts only if > 0 to avoid "0 edits" display
|
|
69
102
|
if (counts.updates > 0) {
|
|
70
103
|
parts.push(`${counts.updates} edit${counts.updates > 1 ? 's' : ''}`);
|
|
71
104
|
}
|
|
@@ -75,18 +108,46 @@ function formatOperationCounts(counts, groupType, isSemanticGroup) {
|
|
|
75
108
|
if (counts.creates > 0) {
|
|
76
109
|
parts.push(`${counts.creates} create${counts.creates > 1 ? 's' : ''}`);
|
|
77
110
|
}
|
|
111
|
+
// BUG FIX: If no file operations found, show total operations as fallback
|
|
112
|
+
if (parts.length === 0) {
|
|
113
|
+
// BUG FIX: Include all operation types in total
|
|
114
|
+
const total = counts.updates + counts.reads + counts.creates + counts.bash + counts.searches + counts.todos + counts.analysis + counts.other;
|
|
115
|
+
if (total > 0) {
|
|
116
|
+
parts.push(`${total} operation${total > 1 ? 's' : ''}`);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
78
119
|
}
|
|
79
120
|
else if (groupType === 'bash') {
|
|
80
|
-
|
|
121
|
+
// BUG FIX: Only show if > 0
|
|
122
|
+
if (counts.bash > 0) {
|
|
123
|
+
parts.push(`${counts.bash} command${counts.bash > 1 ? 's' : ''}`);
|
|
124
|
+
}
|
|
81
125
|
}
|
|
82
126
|
else if (groupType === 'search') {
|
|
83
|
-
|
|
127
|
+
// BUG FIX: Only show if > 0
|
|
128
|
+
if (counts.searches > 0) {
|
|
129
|
+
parts.push(`${counts.searches} search${counts.searches > 1 ? 'es' : ''}`);
|
|
130
|
+
}
|
|
84
131
|
}
|
|
85
132
|
else if (groupType === 'todo') {
|
|
86
|
-
|
|
133
|
+
// BUG FIX: Only show if > 0
|
|
134
|
+
if (counts.todos > 0) {
|
|
135
|
+
parts.push(`${counts.todos} update${counts.todos > 1 ? 's' : ''}`);
|
|
136
|
+
}
|
|
87
137
|
}
|
|
88
138
|
else if (groupType === 'analysis') {
|
|
89
|
-
|
|
139
|
+
// BUG FIX: Correct pluralization - "analysis" vs "analyses", only show if > 0
|
|
140
|
+
if (counts.analysis > 0) {
|
|
141
|
+
parts.push(`${counts.analysis} ${counts.analysis > 1 ? 'analyses' : 'analysis'}`);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
else if (groupType === 'mixed') {
|
|
145
|
+
// BUG FIX: Handle MCP and other mixed operations
|
|
146
|
+
// BUG FIX: Include todos and analysis in total count
|
|
147
|
+
const total = counts.reads + counts.updates + counts.creates + counts.bash + counts.searches + counts.todos + counts.analysis + counts.other;
|
|
148
|
+
if (total > 0) {
|
|
149
|
+
parts.push(`${total} operation${total > 1 ? 's' : ''}`);
|
|
150
|
+
}
|
|
90
151
|
}
|
|
91
152
|
return parts.join(', ');
|
|
92
153
|
}
|
|
@@ -101,6 +162,10 @@ export function ToolGroupDisplay({ group, index }) {
|
|
|
101
162
|
const changesSummary = summarizeChanges(group);
|
|
102
163
|
// Add subtle alternating background for better scannability
|
|
103
164
|
const isEven = index % 2 === 0;
|
|
165
|
+
// BUG FIX: Determine proper status - only show success when complete and no errors
|
|
166
|
+
const isComplete = group.isComplete !== false; // Default to true for backwards compatibility
|
|
167
|
+
const statusColor = group.hasError ? "red" : (isComplete ? "green" : "cyan");
|
|
168
|
+
const statusIcon = group.hasError ? "✗" : (isComplete ? "✓" : "...");
|
|
104
169
|
// For semantic groups, use a cleaner display format (Claude Code-style)
|
|
105
170
|
if (group.isSemanticGroup && group.actionDescription) {
|
|
106
171
|
return (React.createElement(Box, { flexDirection: "column", marginTop: 0, paddingLeft: isEven ? 0 : 1 },
|
|
@@ -109,10 +174,10 @@ export function ToolGroupDisplay({ group, index }) {
|
|
|
109
174
|
React.createElement(Text, { color: "white" },
|
|
110
175
|
" ",
|
|
111
176
|
resourceName),
|
|
112
|
-
React.createElement(Text, { color:
|
|
177
|
+
React.createElement(Text, { color: statusColor },
|
|
113
178
|
" ",
|
|
114
|
-
|
|
115
|
-
duration >= 100 && (React.createElement(Text, { color: "
|
|
179
|
+
statusIcon),
|
|
180
|
+
isComplete && duration >= 100 && (React.createElement(Text, { color: "yellow" },
|
|
116
181
|
" ",
|
|
117
182
|
formatDuration(duration)))),
|
|
118
183
|
group.hasError && (React.createElement(Box, { marginLeft: 2 },
|
|
@@ -133,13 +198,13 @@ export function ToolGroupDisplay({ group, index }) {
|
|
|
133
198
|
" (",
|
|
134
199
|
operationsText,
|
|
135
200
|
")")),
|
|
136
|
-
React.createElement(Text, { color:
|
|
201
|
+
React.createElement(Text, { color: statusColor },
|
|
137
202
|
" ",
|
|
138
|
-
|
|
139
|
-
duration >= 100 && (React.createElement(Text, { color: "yellow" },
|
|
203
|
+
statusIcon),
|
|
204
|
+
isComplete && duration >= 100 && (React.createElement(Text, { color: "yellow" },
|
|
140
205
|
" ",
|
|
141
206
|
formatDuration(duration)))),
|
|
142
|
-
changesSummary && !group.hasError && (React.createElement(Box, { marginLeft: 2 },
|
|
207
|
+
changesSummary && !group.hasError && isComplete && (React.createElement(Box, { marginLeft: 2 },
|
|
143
208
|
React.createElement(Text, { color: "gray" },
|
|
144
209
|
"\u2514\u2500 ",
|
|
145
210
|
changesSummary))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-group-display.js","sourceRoot":"","sources":["../../../src/ui/components/tool-group-display.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAChG,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAOjE;;;GAGG;AACH,SAAS,sBAAsB,CAAC,KAAgB;IAC9C,kDAAkD;IAClD,IAAI,KAAK,CAAC,eAAe,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;QACrD,OAAO,KAAK,CAAC,iBAAiB,CAAC;IACjC,CAAC;IAED,QAAQ,KAAK,CAAC,SAAS,EAAE,CAAC;QACxB,KAAK,MAAM;YACT,6BAA6B;YAC7B,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBACpB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACxC,MAAM,
|
|
1
|
+
{"version":3,"file":"tool-group-display.js","sourceRoot":"","sources":["../../../src/ui/components/tool-group-display.tsx"],"names":[],"mappings":"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"}
|