Skip to content

fix(app): stop using orphaned assistant messages for working state #23087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
richard-fairthorne wants to merge 1 commit into
base: dev
Choose a base branch
from
+3 −16
Open

fix(app): stop using orphaned assistant messages for working state #23087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 1 addition & 11 deletions packages/app/src/pages/layout/sidebar-items.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,18 +151,8 @@ export const SessionItem = (props: SessionItemProps): JSX.Element => {
})
const isWorking = createMemo(() => {
if (hasPermissions()) return false
const pending = (sessionStore.message[props.session.id] ?? []).findLast(
(message) =>
message.role === "assistant" &&
typeof (message as { time?: { completed?: unknown } }).time?.completed !== "number",
)
const status = sessionStore.session_status[props.session.id]
return (
pending !== undefined ||
status?.type === "busy" ||
status?.type === "retry" ||
(status !== undefined && status.type !== "idle")
)
return status?.type === "busy" || status?.type === "retry" || (status !== undefined && status.type !== "idle")
})

const tint = createMemo(() => messageAgentColor(sessionStore.message[props.session.id], sessionStore.agent))
Expand Down
5 changes: 1 addition & 4 deletions packages/app/src/pages/session.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1497,10 +1497,7 @@ export default function Page() {
})

const busy = (sessionID: string) => {
if ((sync.data.session_status[sessionID] ?? { type: "idle" as const }).type !== "idle") return true
return (sync.data.message[sessionID] ?? []).some(
(item) => item.role === "assistant" && typeof item.time.completed !== "number",
)
return (sync.data.session_status[sessionID] ?? { type: "idle" as const }).type !== "idle"
}

const queuedFollowups = createMemo(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/pages/session/message-timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ export function MessageTimeline(props: {
if (!id) return idle
return sync.data.session_status[id] ?? idle
})
const working = createMemo(() => !!pending() || sessionStatus().type !== "idle")
const working = createMemo(() => sessionStatus().type !== "idle")
const tint = createMemo(() => messageAgentColor(sessionMessages(), sync.data.agent))

const [timeoutDone, setTimeoutDone] = createSignal(true)
Expand Down
Loading