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
5 changes: 5 additions & 0 deletions .changeset/fix-status-line-counts.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@perstack/tui-components": patch
---

Show running and waiting expert counts separately in status line
3 changes: 2 additions & 1 deletion packages/tui-components/src/execution/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ export const ExecutionApp = (props: ExecutionAppProps) => {
runStatus={state.runStatus}
onSubmit={state.handleSubmit}
delegationTreeState={state.delegationTreeState}
inProgressCount={state.inProgressCount}
runningCount={state.runningCount}
waitingCount={state.waitingCount}
formattedTotalTokens={state.formattedTotalTokens}
elapsedTime={state.elapsedTime}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ type InterfacePanelProps = {
runStatus: RunStatus
onSubmit: (query: string) => void
delegationTreeState: DelegationTreeState
inProgressCount: number
runningCount: number
waitingCount: number
formattedTotalTokens: string
elapsedTime: string
}
Expand All @@ -21,7 +22,8 @@ export const InterfacePanel = ({
runStatus,
onSubmit,
delegationTreeState,
inProgressCount,
runningCount,
waitingCount,
formattedTotalTokens,
elapsedTime,
}: InterfacePanelProps): React.ReactNode => {
Expand Down Expand Up @@ -53,7 +55,8 @@ export const InterfacePanel = ({
<Text>{query || "–"}</Text>
</Text>
<Text dimColor>
<Text>{inProgressCount} in progress experts</Text>
<Text>{runningCount} running</Text>
{waitingCount > 0 ? <Text> · {waitingCount} waiting</Text> : null}
<Text> · </Text>
<Text>{elapsedTime}</Text>
<Text> · </Text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
deriveActionLabel,
flattenTree,
formatTokenCount,
getInProgressCount,
getStatusCounts,
processDelegationTreeEvent,
resolveRunId,
} from "./use-delegation-tree.js"
Expand Down Expand Up @@ -1165,8 +1165,8 @@ describe("flattenTree", () => {
})
})

describe("getInProgressCount", () => {
it("counts running and suspending nodes", () => {
describe("getStatusCounts", () => {
it("counts running and waiting nodes separately", () => {
const state = createInitialDelegationTreeState()
processDelegationTreeEvent(
state,
Expand Down Expand Up @@ -1225,6 +1225,6 @@ describe("getInProgressCount", () => {
}),
)
// run-1 = suspending, run-2 = completed, run-3 = running
expect(getInProgressCount(state)).toBe(2)
expect(getStatusCounts(state)).toEqual({ running: 1, waiting: 1 })
})
})
15 changes: 10 additions & 5 deletions packages/tui-components/src/execution/hooks/use-delegation-tree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,17 @@ export function formatTokenCount(n: number): string {
return String(n)
}

export function getInProgressCount(state: DelegationTreeState): number {
let count = 0
export function getStatusCounts(state: DelegationTreeState): {
running: number
waiting: number
} {
let running = 0
let waiting = 0
for (const node of state.nodes.values()) {
if (node.status === "running" || node.status === "suspending") count++
if (node.status === "running") running++
else if (node.status === "suspending") waiting++
}
return count
return { running, waiting }
}

export function flattenTree(state: DelegationTreeState): FlatTreeNode[] {
Expand Down Expand Up @@ -393,7 +398,7 @@ export function useDelegationTree() {
return {
state,
processEvent,
inProgressCount: getInProgressCount(state),
statusCounts: getStatusCounts(state),
formattedTotalTokens: formatTokenCount(state.jobTotalTokens),
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ export type ExecutionState = {
runStatus: RunStatus
handleSubmit: (query: string) => void
delegationTreeState: DelegationTreeState
inProgressCount: number
runningCount: number
waitingCount: number
formattedTotalTokens: string
elapsedTime: string
}
Expand Down Expand Up @@ -169,7 +170,8 @@ export const useExecutionState = (options: UseExecutionStateOptions): ExecutionS
runStatus,
handleSubmit,
delegationTreeState: delegationTree.state,
inProgressCount: delegationTree.inProgressCount,
runningCount: delegationTree.statusCounts.running,
waitingCount: delegationTree.statusCounts.waiting,
formattedTotalTokens: delegationTree.formattedTotalTokens,
elapsedTime,
}
Expand Down