The open source coding agent.
TypeScript
deslopity deslopity (#18343)
Luke Parker0bbf26a1ce54
diff --git a/packages/ui/src/components/message-part.tsx b/packages/ui/src/components/message-part.tsxindex 68170b06121..e8c9dcf9505 100644--- a/packages/ui/src/components/message-part.tsx+++ b/packages/ui/src/components/message-part.tsx@@ -4,15 +4,15 @@ import {createMemo,createSignal,For,- Index,Match,onMount,Show,Switch,onCleanup,+ Index,type JSX,} from "solid-js"-import { createStore, unwrap } from "solid-js/store"+import { createStore } from "solid-js/store"import stripAnsi from "strip-ansi"import { Dynamic } from "solid-js/web"import {@@ -481,15 +481,6 @@ function partDefaultOpen(part: PartType, shell = false, edit = false) {return toolDefaultOpen(part.tool, shell, edit)}-function bindMessage<T extends MessageType>(input: T) {- const data = useData()- const base = structuredClone(unwrap(input)) as T- return createMemo(() => {- const next = data.store.message?.[base.sessionID]?.find((item) => item.id === base.id)- return (next as T | undefined) ?? base- })-}-export function AssistantParts(props: {messages: AssistantMessage[]showAssistantCopyPartID?: string | null@@ -530,55 +521,62 @@ export function AssistantParts(props: {return (<Index each={grouped()}>- {(entry) => {- const kind = createMemo(() => entry().type)- const parts = createMemo(- () => {- const value = entry()- if (value.type !== "context") return emptyTools- return value.refs- .map((ref) => part().get(ref.messageID)?.get(ref.partID))- .filter((part): part is ToolPart => !!part && isContextGroupTool(part))- },- emptyTools,- { equals: same },- )- const busy = createMemo(() => props.working && last() === entry().key)- const message = createMemo(() => {- const value = entry()- if (value.type !== "part") return- return msgs().get(value.ref.messageID)- })- const item = createMemo(() => {- const value = entry()- if (value.type !== "part") return- return part().get(value.ref.messageID)?.get(value.ref.partID)- })- const ready = createMemo(() => {- if (kind() !== "part") return- const msg = message()- const value = item()- if (!msg || !value) return- return { msg, value }- })+ {(entryAccessor) => {+ const entryType = createMemo(() => entryAccessor().type)return (- <>- <Show when={kind() === "context" && parts().length > 0}>- <ContextToolGroup parts={parts()} busy={busy()} />- </Show>- <Show when={ready()}>- {(ready) => (- <Part- part={ready().value}- message={ready().msg}- showAssistantCopyPartID={props.showAssistantCopyPartID}- turnDurationMs={props.turnDurationMs}- defaultOpen={partDefaultOpen(ready().value, props.shellToolDefaultOpen, props.editToolDefaultOpen)}- />- )}- </Show>- </>+ <Switch>+ <Match when={entryType() === "context"}>+ {(() => {+ const parts = createMemo(+ () => {+ const entry = entryAccessor()+ if (entry.type !== "context") return emptyTools+ return entry.refs+ .map((ref) => part().get(ref.messageID)?.get(ref.partID))+ .filter((part): part is ToolPart => !!part && isContextGroupTool(part))+ },+ emptyTools,+ { equals: same },+ )+ const busy = createMemo(() => props.working && last() === entryAccessor().key)++ return (+ <Show when={parts().length > 0}>+ <ContextToolGroup parts={parts()} busy={busy()} />+ </Show>+ )+ })()}+ </Match>+ <Match when={entryType() === "part"}>+ {(() => {+ const message = createMemo(() => {+ const entry = entryAccessor()+ if (entry.type !== "part") return+ return msgs().get(entry.ref.messageID)+ })+ const item = createMemo(() => {+ const entry = entryAccessor()+ if (entry.type !== "part") return+ return part().get(entry.ref.messageID)?.get(entry.ref.partID)+ })++ return (+ <Show when={message()}>+ <Show when={item()}>+ <Part+ part={item()!}+ message={message()!}+ showAssistantCopyPartID={props.showAssistantCopyPartID}+ turnDurationMs={props.turnDurationMs}+ defaultOpen={partDefaultOpen(item()!, props.shellToolDefaultOpen, props.editToolDefaultOpen)}+ />+ </Show>+ </Show>+ )+ })()}+ </Match>+ </Switch>)}}</Index>@@ -690,22 +688,25 @@ export function registerPartComponent(type: string, component: PartComponent) {}export function Message(props: MessageProps) {- if (props.message.role === "user") {- return <UserMessageDisplay message={props.message as UserMessage} parts={props.parts} actions={props.actions} />- }-- if (props.message.role === "assistant") {- return (- <AssistantMessageDisplay- message={props.message as AssistantMessage}- parts={props.parts}- showAssistantCopyPartID={props.showAssistantCopyPartID}- showReasoningSummaries={props.showReasoningSummaries}- />- )- }-- return undefined+ return (+ <Switch>+ <Match when={props.message.role === "user" && props.message}>+ {(userMessage) => (+ <UserMessageDisplay message={userMessage() as UserMessage} parts={props.parts} actions={props.actions} />+ )}+ </Match>+ <Match when={props.message.role === "assistant" && props.message}>+ {(assistantMessage) => (+ <AssistantMessageDisplay+ message={assistantMessage() as AssistantMessage}+ parts={props.parts}+ showAssistantCopyPartID={props.showAssistantCopyPartID}+ showReasoningSummaries={props.showReasoningSummaries}+ />+ )}+ </Match>+ </Switch>+ )}export function AssistantMessageDisplay(props: {@@ -732,42 +733,52 @@ export function AssistantMessageDisplay(props: {return (<Index each={grouped()}>- {(entry) => {- const kind = createMemo(() => entry().type)- const parts = createMemo(- () => {- const value = entry()- if (value.type !== "context") return emptyTools- return value.refs- .map((ref) => part().get(ref.partID))- .filter((part): part is ToolPart => !!part && isContextGroupTool(part))- },- emptyTools,- { equals: same },- )- const item = createMemo(() => {- const value = entry()- if (value.type !== "part") return- return part().get(value.ref.partID)- })- const ready = createMemo(() => {- if (kind() !== "part") return- const value = item()- if (!value) return- return value- })+ {(entryAccessor) => {+ const entryType = createMemo(() => entryAccessor().type)return (- <>- <Show when={kind() === "context" && parts().length > 0}>- <ContextToolGroup parts={parts()} />- </Show>- <Show when={ready()}>- {(ready) => (- <Part part={ready()} message={props.message} showAssistantCopyPartID={props.showAssistantCopyPartID} />- )}- </Show>- </>+ <Switch>+ <Match when={entryType() === "context"}>+ {(() => {+ const parts = createMemo(+ () => {+ const entry = entryAccessor()+ if (entry.type !== "context") return emptyTools+ return entry.refs+ .map((ref) => part().get(ref.partID))+ .filter((part): part is ToolPart => !!part && isContextGroupTool(part))+ },+ emptyTools,+ { equals: same },+ )++ return (+ <Show when={parts().length > 0}>+ <ContextToolGroup parts={parts()} />+ </Show>+ )+ })()}+ </Match>+ <Match when={entryType() === "part"}>+ {(() => {+ const item = createMemo(() => {+ const entry = entryAccessor()+ if (entry.type !== "part") return+ return part().get(entry.ref.partID)+ })++ return (+ <Show when={item()}>+ <Part+ part={item()!}+ message={props.message}+ showAssistantCopyPartID={props.showAssistantCopyPartID}+ />+ </Show>+ )+ })()}+ </Match>+ </Switch>)}}</Index>@@ -834,9 +845,11 @@ function ContextToolGroup(props: { parts: ToolPart[]; busy?: boolean }) {<Collapsible.Content><div data-component="context-tool-group-list"><Index each={props.parts}>- {(part) => {- const trigger = createMemo(() => contextToolTrigger(part(), i18n))- const running = createMemo(() => part().state.status === "pending" || part().state.status === "running")+ {(partAccessor) => {+ const trigger = createMemo(() => contextToolTrigger(partAccessor(), i18n))+ const running = createMemo(+ () => partAccessor().state.status === "pending" || partAccessor().state.status === "running",+ )return (<div data-slot="context-tool-group-item"><div data-component="tool-trigger">@@ -874,7 +887,6 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTypconst data = useData()const dialog = useDialog()const i18n = useI18n()- const message = bindMessage(props.message)const [state, setState] = createStore({copied: false,busy: undefined as "fork" | "revert" | undefined,@@ -897,8 +909,8 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTypconst agents = createMemo(() => (props.parts?.filter((p) => p.type === "agent") as AgentPart[]) ?? [])const model = createMemo(() => {- const providerID = message().model?.providerID- const modelID = message().model?.modelID+ const providerID = props.message.model?.providerID+ const modelID = props.message.model?.modelIDif (!providerID || !modelID) return ""const match = data.store.provider?.all?.find((p) => p.id === providerID)return match?.models?.[modelID]?.name ?? modelID@@ -906,13 +918,13 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTypconst timefmt = createMemo(() => new Intl.DateTimeFormat(i18n.locale(), { timeStyle: "short" }))const stamp = createMemo(() => {- const created = message().time?.created+ const created = props.message.time?.createdif (typeof created !== "number") return ""return timefmt().format(created)})const metaHead = createMemo(() => {- const agent = message().agent+ const agent = props.message.agentconst items = [agent ? agent[0]?.toUpperCase() + agent.slice(1) : "", model()]return items.filter((x) => !!x).join("\u00A0\u00B7\u00A0")})@@ -938,8 +950,8 @@ export function UserMessageDisplay(props: { message: UserMessage; parts: PartTypvoid Promise.resolve().then(() =>act({- sessionID: message().sessionID,- messageID: message().id,+ sessionID: props.message.sessionID,+ messageID: props.message.id,}),).finally(() => {@@ -1298,27 +1310,27 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {const i18n = useI18n()const numfmt = createMemo(() => new Intl.NumberFormat(i18n.locale()))const part = () => props.part as TextPart- const message = bindMessage(props.message)const interrupted = createMemo(- () => message().role === "assistant" && (message() as AssistantMessage).error?.name === "MessageAbortedError",+ () =>+ props.message.role === "assistant" && (props.message as AssistantMessage).error?.name === "MessageAbortedError",)const model = createMemo(() => {- const current = message()- if (current.role !== "assistant") return ""- const match = data.store.provider?.all?.find((p) => p.id === current.providerID)- return match?.models?.[current.modelID]?.name ?? current.modelID+ if (props.message.role !== "assistant") return ""+ const message = props.message as AssistantMessage+ const match = data.store.provider?.all?.find((p) => p.id === message.providerID)+ return match?.models?.[message.modelID]?.name ?? message.modelID})const duration = createMemo(() => {- const current = message()- if (current.role !== "assistant") return ""- const completed = current.time.completed+ if (props.message.role !== "assistant") return ""+ const message = props.message as AssistantMessage+ const completed = message.time.completedconst ms =typeof props.turnDurationMs === "number"? props.turnDurationMs: typeof completed === "number"- ? completed - current.time.created+ ? completed - message.time.created: -1if (!(ms >= 0)) return ""const total = Math.round(ms / 1000)@@ -1332,9 +1344,8 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {})const meta = createMemo(() => {- const current = message()- if (current.role !== "assistant") return ""- const agent = current.agent+ if (props.message.role !== "assistant") return ""+ const agent = (props.message as AssistantMessage).agentconst items = [agent ? agent[0]?.toUpperCase() + agent.slice(1) : "",model(),@@ -1347,13 +1358,13 @@ PART_MAPPING["text"] = function TextPartDisplay(props) {const displayText = () => (part().text ?? "").trim()const throttledText = createThrottledValue(displayText)const isLastTextPart = createMemo(() => {- const last = (data.store.part?.[message().id] ?? [])+ const last = (data.store.part?.[props.message.id] ?? []).filter((item): item is TextPart => item?.type === "text" && !!item.text?.trim()).at(-1)return last?.id === part().id})const showCopy = createMemo(() => {- if (message().role !== "assistant") return isLastTextPart()+ if (props.message.role !== "assistant") return isLastTextPart()if (props.showAssistantCopyPartID === null) return falseif (typeof props.showAssistantCopyPartID === "string") return props.showAssistantCopyPartID === part().idreturn isLastTextPart()