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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,11 @@ export function ConversationView({
const debugLogsCloudRuns = useSettingsStore((s) => s.debugLogsCloudRuns);
const showDebugLogs = agentLogsEnabled && debugLogsCloudRuns;

const { items: conversationItems, lastTurnInfo } = useMemo(
const {
items: conversationItems,
lastTurnInfo,
isCompacting,
} = useMemo(
() =>
buildConversationItems(events, isPromptPending, {
showDebugLogs,
Expand Down Expand Up @@ -199,6 +203,7 @@ export function ConversationView({
queuedCount={queuedMessages.length}
hasPendingPermission={pendingPermissionsCount > 0}
pausedDurationMs={pausedDurationMs}
isCompacting={isCompacting}
/>
</div>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ interface SessionFooterProps {
queuedCount?: number;
hasPendingPermission?: boolean;
pausedDurationMs?: number;
isCompacting?: boolean;
}

export function SessionFooter({
Expand All @@ -21,8 +22,9 @@ export function SessionFooter({
queuedCount = 0,
hasPendingPermission = false,
pausedDurationMs,
isCompacting = false,
}: SessionFooterProps) {
if (isPromptPending) {
if (isPromptPending && !isCompacting) {
// Show static "waiting" state when permission is pending
if (hasPendingPermission) {
return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ export interface LastTurnInfo {
export interface BuildResult {
items: ConversationItem[];
lastTurnInfo: LastTurnInfo | null;
isCompacting: boolean;
}

interface TurnState {
Expand All @@ -71,6 +72,7 @@ interface ItemBuilder {
currentTurn: TurnState | null;
pendingPrompts: Map<number, TurnState>;
shellExecutes: Map<string, { item: UserShellExecute; index: number }>;
isCompacting: boolean;
nextId: () => number;
}

Expand All @@ -81,6 +83,7 @@ function createItemBuilder(): ItemBuilder {
currentTurn: null,
pendingPrompts: new Map(),
shellExecutes: new Map(),
isCompacting: false,
nextId: () => idCounter++,
};
}
Expand Down Expand Up @@ -179,7 +182,7 @@ export function buildConversationItems(
}
: null;

return { items: b.items, lastTurnInfo };
return { items: b.items, lastTurnInfo, isCompacting: b.isCompacting };
}

function handlePromptRequest(
Expand Down Expand Up @@ -354,6 +357,9 @@ function handleNotification(
if (isPosthogMethod(msg.method, "status")) {
if (!b.currentTurn) ensureImplicitTurn(b, ts);
const params = msg.params as { status: string; isComplete?: boolean };
if (params.status === "compacting" && !params.isComplete) {
b.isCompacting = true;
}
pushItem(b, {
sessionUpdate: "status",
status: params.status,
Expand Down Expand Up @@ -382,6 +388,7 @@ function handleNotification(
}

function markCompactingStatusComplete(b: ItemBuilder) {
b.isCompacting = false;
for (let i = b.items.length - 1; i >= 0; i--) {
const item = b.items[i];
if (
Expand Down
Loading