Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .changeset/log-tui-enhancements.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@perstack/filesystem-storage": patch
"@perstack/log": patch
"@perstack/tui-components": patch
"perstack": patch
---

Optimize log viewer performance with filename-level event type filtering and add CLI TUI routing
37 changes: 35 additions & 2 deletions apps/perstack/bin/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

import { PerstackError } from "@perstack/core"
import { installHandler } from "@perstack/installer"
import { logHandler, parsePositiveInt } from "@perstack/log"
import {
createLogDataFetcher,
createStorageAdapter,
logHandler,
parsePositiveInt,
} from "@perstack/log"
import {
findConfigPath,
findLockfile,
Expand All @@ -24,6 +29,7 @@ import {
expertYankHandler,
} from "@perstack/studio"
import { runHandler, startHandler } from "@perstack/tui"
import { renderLogViewer } from "@perstack/tui-components"
import { Command } from "commander"
import packageJson from "../package.json" with { type: "json" }

Expand Down Expand Up @@ -151,7 +157,34 @@ program
)
.option("--messages", "Show message history for checkpoint")
.option("--summary", "Show summarized view")
.action((options) => logHandler(options))
.option("--text", "Force text output mode (skip interactive TUI)")
.action(async (options) => {
const hasOutputFlags =
options.json || options.pretty || options.summary || options.messages || options.text
const hasFilterFlags =
options.step ||
options.type ||
options.errors ||
options.tools ||
options.delegations ||
options.filter ||
options.verbose ||
options.take !== undefined ||
options.offset !== undefined ||
options.context !== undefined
if (hasOutputFlags || hasFilterFlags) {
await logHandler(options)
} else {
const storagePath = process.env.PERSTACK_STORAGE_PATH ?? `${process.cwd()}/perstack`
const adapter = createStorageAdapter(storagePath)
const fetcher = createLogDataFetcher(adapter)
await renderLogViewer({
fetcher,
initialJobId: options.job,
initialRunId: options.run,
})
}
})

program
.command("install")
Expand Down
1 change: 1 addition & 0 deletions apps/perstack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"@perstack/perstack-toml": "workspace:*",
"@perstack/studio": "workspace:*",
"@perstack/tui": "workspace:*",
"@perstack/tui-components": "workspace:*",
"@tsconfig/node22": "^22.0.5",
"@types/node": "^25.3.0",
"typescript": "^5.9.3"
Expand Down
3 changes: 2 additions & 1 deletion bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion packages/filesystem/src/event.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ function getEventsByRun(
.sort((a, b) => a.stepNumber - b.stepNumber)
}

export function getEventContents(jobId: string, runId: string, maxStepNumber?: number): RunEvent[] {
export function getEventContents(
jobId: string,
runId: string,
maxStepNumber?: number,
typeFilter?: Set<string>,
): RunEvent[] {
const runDir = getRunDir(jobId, runId)
if (!existsSync(runDir)) {
return []
Expand All @@ -42,6 +47,7 @@ export function getEventContents(jobId: string, runId: string, maxStepNumber?: n
return { file, timestamp: Number(timestamp), stepNumber: Number(step), type }
})
.filter((e) => maxStepNumber === undefined || e.stepNumber <= maxStepNumber)
.filter((e) => !typeFilter || typeFilter.has(e.type))
.sort((a, b) => a.timestamp - b.timestamp)
const events: RunEvent[] = []
for (const { file } of eventFiles) {
Expand Down
32 changes: 30 additions & 2 deletions packages/log/src/data-fetcher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ export interface LogDataFetcher {
getCheckpoint(jobId: string, checkpointId: string): Promise<Checkpoint>
getEvents(jobId: string, runId: string): Promise<RunEvent[]>
getAllEventsForJob(jobId: string): Promise<RunEvent[]>
getTreeEventsForJob(jobId: string): Promise<RunEvent[]>
}

export interface StorageAdapter {
getAllJobs(): Promise<Job[]>
retrieveJob(jobId: string): Promise<Job | undefined>
getCheckpointsByJobId(jobId: string): Promise<Checkpoint[]>
retrieveCheckpoint(jobId: string, checkpointId: string): Promise<Checkpoint>
getEventContents(jobId: string, runId: string, maxStep?: number): Promise<RunEvent[]>
getEventContents(
jobId: string,
runId: string,
maxStep?: number,
typeFilter?: Set<string>,
): Promise<RunEvent[]>
getAllRuns(): Promise<RunSetting[]>
getJobIds(): string[]
getBasePath(): string
Expand Down Expand Up @@ -114,6 +120,27 @@ export function createLogDataFetcher(storage: StorageAdapter): LogDataFetcher {
}
return allEvents.sort((a, b) => a.timestamp - b.timestamp)
},

async getTreeEventsForJob(jobId: string): Promise<RunEvent[]> {
const treeEventTypes = new Set([
"startRun",
"resumeFromStop",
"stopRunByDelegate",
"callTools",
"completeRun",
"stopRunByError",
"retry",
"continueToNextStep",
"resolveToolResults",
])
const runs = await this.getRuns(jobId)
const allEvents: RunEvent[] = []
for (const run of runs) {
const events = await storage.getEventContents(jobId, run.runId, undefined, treeEventTypes)
allEvents.push(...events)
}
return allEvents.sort((a, b) => a.timestamp - b.timestamp)
},
}
}

Expand All @@ -137,7 +164,8 @@ export function createStorageAdapter(basePath: string): StorageAdapter {
getCheckpointsByJobId: async (jobId) => getCheckpointsByJobId(jobId),
retrieveCheckpoint: async (jobId, checkpointId) =>
defaultRetrieveCheckpoint(jobId, checkpointId),
getEventContents: async (jobId, runId, maxStep) => getEventContents(jobId, runId, maxStep),
getEventContents: async (jobId, runId, maxStep, typeFilter) =>
getEventContents(jobId, runId, maxStep, typeFilter),
getAllRuns: async () => getAllRuns(),
getJobIds: () => {
const jobsDir = path.join(basePath, "jobs")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Text, useInput } from "ink"
import { Text } from "ink"
import type React from "react"
import { colors } from "../../colors.js"
import { useTextInput } from "../../hooks/use-text-input.js"
import { BottomPanel } from "../../components/bottom-panel.js"
import type { DelegationTreeState } from "../hooks/use-delegation-tree.js"
import type { RunStatus } from "../hooks/use-execution-state.js"
import { DelegationTree } from "./delegation-tree.js"
Expand Down Expand Up @@ -38,25 +38,10 @@ export const InterfacePanel = ({
cacheHitRate,
elapsedTime,
}: InterfacePanelProps): React.ReactNode => {
const { input, handleInput } = useTextInput({
onSubmit,
canSubmit: runStatus !== "running",
})

useInput(handleInput)

const isWaiting = runStatus === "waiting"

return (
<Box
flexDirection="column"
borderStyle="single"
borderColor={colors.muted}
borderTop={true}
borderBottom={false}
borderLeft={false}
borderRight={false}
>
<BottomPanel onSubmit={onSubmit} canSubmit={runStatus !== "running"}>
{isWaiting ? (
<Text color={colors.accent}>Waiting for query...</Text>
) : (
Expand Down Expand Up @@ -87,11 +72,6 @@ export const InterfacePanel = ({
</>
)}
<DelegationTree state={delegationTreeState} />
<Text>
<Text color={colors.muted}>&gt; </Text>
<Text>{input}</Text>
<Text color={colors.accent}>_</Text>
</Text>
</Box>
</BottomPanel>
)
}
44 changes: 31 additions & 13 deletions packages/tui-components/src/execution/hooks/use-delegation-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,28 +133,37 @@ export function getStatusCounts(state: DelegationTreeState): {
return { running, waiting }
}

/**
* Flatten the entire tree without pruning — includes all nodes regardless of status.
* Useful for testing and debugging where the full tree structure matters.
*/
/** Flatten tree without pruning - shows all nodes including completed/error. For log viewer. */
export function flattenTreeAll(state: DelegationTreeState): FlatTreeNode[] {
if (!state.rootRunId) return []
const root = state.nodes.get(state.rootRunId)
if (!root) return []

const result: FlatTreeNode[] = []
const visited = new Set<string>()

function dfs(nodeId: string, depth: number, isLast: boolean, ancestorIsLast: boolean[]) {
const node = state.nodes.get(nodeId)
if (!node) return
if (!node || visited.has(nodeId)) return

visited.add(nodeId)
result.push({ node, depth, isLast, ancestorIsLast: [...ancestorIsLast] })
for (let i = 0; i < node.childRunIds.length; i++) {
const childIsLast = i === node.childRunIds.length - 1
dfs(node.childRunIds[i]!, depth + 1, childIsLast, [...ancestorIsLast, isLast])

const children = node.childRunIds
for (let i = 0; i < children.length; i++) {
const childIsLast = i === children.length - 1
dfs(children[i]!, depth + 1, childIsLast, [...ancestorIsLast, isLast])
}
}

if (state.rootRunId) {
dfs(state.rootRunId, 0, true, [])
}

// Show orphaned nodes (no parent in tree) at root level
for (const [nodeId, node] of state.nodes) {
if (!visited.has(nodeId)) {
visited.add(nodeId)
result.push({ node, depth: 0, isLast: true, ancestorIsLast: [] })
}
}

dfs(state.rootRunId, 0, true, [])
return result
}

Expand Down Expand Up @@ -350,6 +359,9 @@ export function processDelegationTreeEvent(
node.actionLabel = label
node.actionFileArg = fileArg
node.totalTokens += event.usage.totalTokens
node.inputTokens += event.usage.inputTokens
node.outputTokens += event.usage.outputTokens
node.cachedInputTokens += event.usage.cachedInputTokens
state.jobTotalTokens += event.usage.totalTokens
state.jobReasoningTokens += event.usage.reasoningTokens
state.jobInputTokens += event.usage.inputTokens
Expand Down Expand Up @@ -381,6 +393,9 @@ export function processDelegationTreeEvent(
node.actionLabel = "Completed"
node.actionFileArg = undefined
node.totalTokens += event.usage.totalTokens
node.inputTokens += event.usage.inputTokens
node.outputTokens += event.usage.outputTokens
node.cachedInputTokens += event.usage.cachedInputTokens
state.jobTotalTokens += event.usage.totalTokens
state.jobReasoningTokens += event.usage.reasoningTokens
state.jobInputTokens += event.usage.inputTokens
Expand Down Expand Up @@ -425,6 +440,9 @@ export function processDelegationTreeEvent(
const node = state.nodes.get(nodeId)
if (node) {
node.totalTokens += event.usage.totalTokens
node.inputTokens += event.usage.inputTokens
node.outputTokens += event.usage.outputTokens
node.cachedInputTokens += event.usage.cachedInputTokens
state.jobTotalTokens += event.usage.totalTokens
state.jobReasoningTokens += event.usage.reasoningTokens
state.jobInputTokens += event.usage.inputTokens
Expand Down
2 changes: 1 addition & 1 deletion packages/tui-components/src/log-viewer/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ async function extractJobQuery(fetcher: LogDataFetcher, job: Job): Promise<strin
}

async function buildRunTree(fetcher: LogDataFetcher, jobId: string) {
const allEvents = await fetcher.getAllEventsForJob(jobId)
const allEvents = await fetcher.getTreeEventsForJob(jobId)
return buildRunTreeFromEvents(allEvents)
}

Expand Down
Loading