d8dfun/claudecodeui
1
0
Fork 0
mirror of https://github.com/siteboon/claudecodeui.git synced 2026-06-29 16:12:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(chat): group shell commands interleaved within thinking mode

Browse Source
This commit is contained in:
Haileyesus
2026-06-28 18:34:15 +03:00
parent 2afe0955ed
commit fcc469b55c
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/components/chat/view/subcomponents/ChatMessagesPane.tsx
View File

@@ -256,6 +256,9 @@ export default function ChatMessagesPane({
{(() => {
const isBashCommand = (m: ChatMessage | null | undefined) =>
Boolean(m && m.isToolUse && m.toolName === 'Bash' && !m.isSubagentContainer);
// Messages that render nothing (e.g. thinking hidden when showThinking
// is off) shouldn't break a visual run of commands.
const isRendered = (m: ChatMessage) => !(m.isThinking && !showThinking);
const items: ReactNode[] = [];
@@ -264,17 +267,32 @@ export default function ChatMessagesPane({
// Collapse a run of 2+ consecutive shell commands under a single
// header so long command runs stay tidy (Codex-in-VSCode style).
// Skip over non-rendered messages (e.g. hidden reasoning that Codex
// interleaves between commands) so they don't split the run.
if (isBashCommand(message)) {
let end = index;
while (end + 1 < visibleMessages.length && isBashCommand(visibleMessages[end + 1])) {
end++;
const runIndices = [index];
let cursor = index + 1;
while (cursor < visibleMessages.length) {
const candidate = visibleMessages[cursor];
if (!isRendered(candidate)) {
cursor++;
continue;
}
if (isBashCommand(candidate)) {
runIndices.push(cursor);
cursor++;
continue;
}
break;
}
if (end > index) {
const groupMessages = visibleMessages.slice(index, end + 1);
if (runIndices.length >= 2) {
const groupMessages = runIndices.map((i) => visibleMessages[i]);
items.push(
<CommandRunGroup key={getMessageKey(groupMessages[0])} messages={groupMessages} />,
);
index = end;
// Consume everything up to the last command in the run (any
// trailing skipped messages render nothing anyway).
index = runIndices[runIndices.length - 1];
continue;
}
}