mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-08 13:12:08 +00:00
fix(desktop): compact tool row titles
Make completed desktop tool rows read like useful activity labels instead of raw plumbing: terminal rows use a dispatch-style shell summarizer for agent wrappers, and read_file rows keep the action plus filename and requested line range. The shell cleanup follows condensed-milk-pi's shape: split command compounds on real separators, strip pipe tails inside each segment, clean redirects/env prefixes, then classify setup/banner/status segments. Multi-command probes render as `first command + N commands`; the full command remains available in copy/detail. Read rows now render as `Read package.json` or `Read main.ts L25-34`, using requested positive offset/limit and returned line numbers only as fallback for negative/unknown offsets.
This commit is contained in:
Brooklyn Nicholson
parent
7a65800fed
commit
41f302fa73
8 changed files with 480 additions and 12 deletions
110
apps/desktop/src/lib/summarize-command.test.ts
Normal file
110
apps/desktop/src/lib/summarize-command.test.ts
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import { summarizeShellCommand } from './summarize-command'
|
||||
|
||||
describe('summarizeShellCommand', () => {
|
||||
it('strips a leading cd and trailing tail + status echo', () => {
|
||||
expect(
|
||||
summarizeShellCommand(
|
||||
'cd /Users/me/www/bb-rainbows && pnpm run lint 2>&1 | tail -10; echo "lint_exit=${PIPESTATUS[0]}"'
|
||||
)
|
||||
).toBe('pnpm run lint')
|
||||
})
|
||||
|
||||
it('keeps flags on the surviving command', () => {
|
||||
expect(summarizeShellCommand('cd /x && pnpm run preview --port 4317 2>&1')).toBe(
|
||||
'pnpm run preview --port 4317'
|
||||
)
|
||||
})
|
||||
|
||||
it('drops a source/activate prefix', () => {
|
||||
expect(summarizeShellCommand('source .venv/bin/activate && pytest -q')).toBe('pytest -q')
|
||||
})
|
||||
|
||||
it('skips leading env assignments', () => {
|
||||
expect(summarizeShellCommand('cd /x && NODE_ENV=test FOO=bar vitest run 2>&1 | tail -5')).toBe(
|
||||
'NODE_ENV=test FOO=bar vitest run'
|
||||
)
|
||||
})
|
||||
|
||||
it('compacts a genuine multi-command compound without listing every command', () => {
|
||||
const compound = 'git add -A && git commit -m "wip"'
|
||||
expect(summarizeShellCommand(compound)).toBe('git add -A + 1 command')
|
||||
})
|
||||
|
||||
it('leaves a single bare command untouched', () => {
|
||||
expect(summarizeShellCommand('git status --short')).toBe('git status --short')
|
||||
})
|
||||
|
||||
it('does not split on operators inside quotes', () => {
|
||||
const cmd = 'git commit -m "fix: a | b && c"'
|
||||
expect(summarizeShellCommand(cmd)).toBe(cmd)
|
||||
})
|
||||
|
||||
it('does not strip a redirection-looking char inside quotes', () => {
|
||||
expect(summarizeShellCommand('cd /x && git commit -m "a > b"')).toBe('git commit -m "a > b"')
|
||||
})
|
||||
|
||||
it('handles empty / whitespace input', () => {
|
||||
expect(summarizeShellCommand('')).toBe('')
|
||||
expect(summarizeShellCommand(' ')).toBe('')
|
||||
})
|
||||
|
||||
it('returns the original when every segment is plumbing', () => {
|
||||
const allSetup = 'cd /x && export FOO=1'
|
||||
expect(summarizeShellCommand(allSetup)).toBe(allSetup)
|
||||
})
|
||||
|
||||
it('collapses 2>&1 redirection on a plain pipeline', () => {
|
||||
expect(summarizeShellCommand('cd /x && tsc --noEmit 2>&1 | tail -20')).toBe('tsc --noEmit')
|
||||
})
|
||||
|
||||
it('drops a leading echo banner around a single command', () => {
|
||||
expect(
|
||||
summarizeShellCommand('echo "--- proto pnpm direct ---"; ~/.proto/tools/node/24.11.0/bin/pnpm --version 2>&1 | tail -3')
|
||||
).toBe('~/.proto/tools/node/24.11.0/bin/pnpm --version')
|
||||
})
|
||||
|
||||
it('drops echo banners on both sides plus the trailing status echo', () => {
|
||||
expect(summarizeShellCommand('echo "--- build ---"; npm run build 2>&1 | tail -5; echo "build_exit=$?"')).toBe(
|
||||
'npm run build'
|
||||
)
|
||||
})
|
||||
|
||||
it('compacts a genuine multi-command probe from session 20260624_231846_bdbd1e', () => {
|
||||
const probe = 'which node pnpm corepack; node -v; corepack --version 2>&1'
|
||||
expect(summarizeShellCommand(probe)).toBe('which node pnpm corepack + 2 commands')
|
||||
})
|
||||
|
||||
it('compacts the corepack diagnostic command from session 20260624_231846_bdbd1e', () => {
|
||||
expect(
|
||||
summarizeShellCommand(
|
||||
'which node pnpm corepack; node -v; echo "---"; corepack --version 2>&1; echo "---pnpm via corepack---"; pnpm --version 2>&1 | tail -5'
|
||||
)
|
||||
).toBe('which node pnpm corepack + 3 commands')
|
||||
})
|
||||
|
||||
it('compacts the proto/cache probe from session 20260624_231846_bdbd1e', () => {
|
||||
expect(
|
||||
summarizeShellCommand(
|
||||
'echo "--- proto pnpm direct ---"; ~/.proto/tools/node/24.11.0/bin/pnpm --version 2>&1 | tail -3; echo "--- proto node ---"; ls ~/.proto/tools/node/ 2>&1; echo "--- corepack cache ---"; ls ~/.cache/node/corepack/v1/pnpm/ 2>&1'
|
||||
)
|
||||
).toBe('~/.proto/tools/node/24.11.0/bin/pnpm --version + 2 commands')
|
||||
})
|
||||
|
||||
it('summarizes the successful lint command from session 20260624_231846_bdbd1e', () => {
|
||||
expect(
|
||||
summarizeShellCommand(
|
||||
'cd /Users/brooklyn/www/bb-rainbows && pnpm run lint 2>&1 | tail -20; echo "lint_exit=${PIPESTATUS[0]}"'
|
||||
)
|
||||
).toBe('pnpm run lint')
|
||||
})
|
||||
|
||||
it('summarizes a background build command from session 20260624_231846_bdbd1e', () => {
|
||||
expect(
|
||||
summarizeShellCommand(
|
||||
'cd /Users/brooklyn/www/bb-rainbows && pnpm run build 2>&1 | tail -20; echo "build_exit=${PIPESTATUS[0]}"'
|
||||
)
|
||||
).toBe('pnpm run build')
|
||||
})
|
||||
})
|
||||
216
apps/desktop/src/lib/summarize-command.ts
Normal file
216
apps/desktop/src/lib/summarize-command.ts
Normal file
|
|
@ -0,0 +1,216 @@
|
|||
// Adapted from condensed-milk-pi's command dispatcher: split compounds first,
|
||||
// strip pipe tails (`| head`, `| tail`, ...), then clean redirects/env prefixes
|
||||
// before deciding which segment is meaningful. This is display-only; the full
|
||||
// command remains available through Copy / detail.
|
||||
const SILENT_HEADS = new Set(['cd', 'pushd', 'popd', 'export', 'set', 'unset', 'source', '.', 'true', 'false', ':'])
|
||||
const PIPE_TAIL_HEADS = new Set(['head', 'tail', 'wc', 'sort', 'uniq'])
|
||||
|
||||
const basename = (head: string): string => head.split('/').pop() || head
|
||||
|
||||
// Split on command-chain separators, but NOT pipe. A pipe usually belongs to
|
||||
// the segment's output plumbing (`cmd 2>&1 | tail -20`); condensed-milk strips
|
||||
// that after segmenting instead of treating it as a separate producer.
|
||||
function splitCompoundCommand(input: string): string[] {
|
||||
const segments: string[] = []
|
||||
let buf = ''
|
||||
let quote: '"' | "'" | null = null
|
||||
|
||||
for (let i = 0; i < input.length; i += 1) {
|
||||
const ch = input[i]!
|
||||
|
||||
if (quote) {
|
||||
buf += ch
|
||||
|
||||
if (ch === quote && input[i - 1] !== '\\') {
|
||||
quote = null
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if (ch === '"' || ch === "'") {
|
||||
quote = ch
|
||||
buf += ch
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
const op =
|
||||
input.startsWith('&&', i) || input.startsWith('||', i)
|
||||
? input.slice(i, i + 2)
|
||||
: ch === ';' || ch === '\n'
|
||||
? ch
|
||||
: ''
|
||||
|
||||
if (op) {
|
||||
segments.push(buf)
|
||||
buf = ''
|
||||
i += op.length - 1
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
buf += ch
|
||||
}
|
||||
|
||||
segments.push(buf)
|
||||
|
||||
return segments.map(segment => stripPipeTail(segment.trim())).filter(Boolean)
|
||||
}
|
||||
|
||||
function splitWords(segment: string): string[] {
|
||||
const words: string[] = []
|
||||
let buf = ''
|
||||
let quote: '"' | "'" | null = null
|
||||
|
||||
for (let i = 0; i < segment.length; i += 1) {
|
||||
const ch = segment[i]!
|
||||
|
||||
if (quote) {
|
||||
buf += ch
|
||||
|
||||
if (ch === quote && segment[i - 1] !== '\\') {
|
||||
quote = null
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if (ch === '"' || ch === "'") {
|
||||
quote = ch
|
||||
buf += ch
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if (/\s/.test(ch)) {
|
||||
if (buf) {
|
||||
words.push(buf)
|
||||
buf = ''
|
||||
}
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
buf += ch
|
||||
}
|
||||
|
||||
if (buf) {
|
||||
words.push(buf)
|
||||
}
|
||||
|
||||
return words
|
||||
}
|
||||
|
||||
// The command word of a segment, skipping any `FOO=bar` env assignments.
|
||||
function headWord(segment: string): string {
|
||||
const tokens = splitWords(segment)
|
||||
let index = 0
|
||||
|
||||
while (index < tokens.length && /^[A-Za-z_]\w*=/.test(tokens[index]!)) {
|
||||
index += 1
|
||||
}
|
||||
|
||||
return basename(tokens[index] ?? '')
|
||||
}
|
||||
|
||||
function stripPipeTail(segment: string): string {
|
||||
const words = splitWords(segment)
|
||||
const out: string[] = []
|
||||
|
||||
for (let i = 0; i < words.length; i += 1) {
|
||||
const word = words[i]!
|
||||
|
||||
if (word === '|' && PIPE_TAIL_HEADS.has(basename(words[i + 1] ?? ''))) {
|
||||
break
|
||||
}
|
||||
|
||||
out.push(word)
|
||||
}
|
||||
|
||||
return out.join(' ').trim()
|
||||
}
|
||||
|
||||
function cleanSegment(segment: string): string {
|
||||
const words = splitWords(segment)
|
||||
const out: string[] = []
|
||||
|
||||
for (let i = 0; i < words.length; i += 1) {
|
||||
const word = words[i]!
|
||||
|
||||
if (/^\d*(?:>>?|<)$/.test(word)) {
|
||||
i += 1
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
if (/^\d*(?:>&|<&)\d+$/.test(word) || /^\d*>&\d+$/.test(word)) {
|
||||
continue
|
||||
}
|
||||
|
||||
out.push(word)
|
||||
}
|
||||
|
||||
return out.join(' ').trim()
|
||||
}
|
||||
|
||||
function isBoundaryEcho(segment: string): boolean {
|
||||
const words = splitWords(segment)
|
||||
|
||||
if (basename(words[0] ?? '') !== 'echo') {
|
||||
return false
|
||||
}
|
||||
|
||||
// Banner/status echoes are UI plumbing. Do not treat arbitrary `echo $VALUE`
|
||||
// as noise; it may be the command's actual output.
|
||||
const rest = words.slice(1).join(' ')
|
||||
|
||||
return /-{2,}|_exit=|(?:^|\s|=)\$[?{]|PIPESTATUS/.test(rest)
|
||||
}
|
||||
|
||||
/**
|
||||
* Reduce a verbose shell command to the "main" command, for display only.
|
||||
*
|
||||
* Agents wrap real work in plumbing — `cd <dir> && <cmd> 2>&1 | tail -N; echo
|
||||
* "x_exit=${PIPESTATUS[0]}"` — which buries the command the user actually cares
|
||||
* about. This peels that wrapper off using small head-word allowlists instead of
|
||||
* one giant regex:
|
||||
*
|
||||
* 1. split into segments on top-level `&&` `||` `;` (quote-aware)
|
||||
* 2. strip trailing pipe tails (`| head`, `| tail`, `| wc`, ...)
|
||||
* 3. clean env var prefixes / redirects
|
||||
* 4. drop setup/banner/status segments
|
||||
*
|
||||
* If one real command survives, show it. If multiple real commands survive,
|
||||
* show a short `first command + N commands` label instead of flooding the row
|
||||
* with every probe. The full command is always still available via Copy/detail.
|
||||
*/
|
||||
export function summarizeShellCommand(raw: string): string {
|
||||
const original = (raw ?? '').trim()
|
||||
|
||||
if (!original) {
|
||||
return ''
|
||||
}
|
||||
|
||||
const segments = splitCompoundCommand(original)
|
||||
|
||||
if (segments.length <= 1) {
|
||||
return cleanSegment(original) || original
|
||||
}
|
||||
|
||||
const core = segments.map(cleanSegment).filter(segment => {
|
||||
const head = headWord(segment)
|
||||
|
||||
return segment && !SILENT_HEADS.has(head) && !isBoundaryEcho(segment)
|
||||
})
|
||||
|
||||
if (core.length === 0) {
|
||||
return original
|
||||
}
|
||||
|
||||
if (core.length === 1) {
|
||||
return core[0]!
|
||||
}
|
||||
|
||||
return `${core[0]} + ${core.length - 1} ${core.length === 2 ? 'command' : 'commands'}`
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue