-
+ {/* 20px-viewBox path at 16px: 1.25 renders the 1px stroke Figma specifies. */}
+
@@ -129,33 +135,38 @@ export function ToolErrorCard(props: ToolErrorCardProps) {
-
-
-
-
-
- }
- size="normal"
- variant="ghost"
- onMouseDown={(e) => e.preventDefault()}
- onClick={(e) => {
- e.stopPropagation()
- void copy()
- }}
- aria-label={copied() ? i18n.t("ui.message.copied") : i18n.t("ui.toolErrorCard.copyError")}
- />
-
-
-
-
{(value) => {value()}}
-
+
+ {summary()}
+
+
+
+
+
+
+
+ }
+ size="normal"
+ variant="ghost"
+ onMouseDown={(e) => e.preventDefault()}
+ onClick={(e) => {
+ e.stopPropagation()
+ void copy()
+ }}
+ aria-label={copied() ? i18n.t("ui.message.copied") : i18n.t("ui.toolErrorCard.copyError")}
+ />
+
+
+
+
{detail()}
+
)
diff --git a/packages/session-ui/src/message/current-message.test.ts b/packages/session-ui/src/message/current-message.test.ts
index 3f8dd30ca55..a1337f87d95 100644
--- a/packages/session-ui/src/message/current-message.test.ts
+++ b/packages/session-ui/src/message/current-message.test.ts
@@ -29,20 +29,23 @@ describe("current content default open", () => {
expect(currentContentDefaultOpen(tool("patch"), false, false)).toBe(true)
})
- test("collapses failed patches", () => {
- const patch: SessionMessageAssistantTool = {
+ test("collapses errored tools regardless of disclosure preferences", () => {
+ const errored = (name: string): SessionMessageAssistantTool => ({
type: "tool",
- id: "tool_patch",
- name: "patch",
+ id: `tool_${name}`,
+ name,
state: {
status: "error",
input: {},
- error: { type: "ToolError", message: "Verification failed" },
+ error: { type: "ToolError", message: "Tool execution interrupted" },
metadata: {},
},
time: { created: 1, completed: 2 },
- }
- expect(currentContentDefaultOpen(patch, false, false)).toBe(false)
+ })
+ expect(currentContentDefaultOpen(errored("shell"), true, true)).toBe(false)
+ expect(currentContentDefaultOpen(errored("execute"), true, true)).toBe(false)
+ expect(currentContentDefaultOpen(errored("edit"), true, true)).toBe(false)
+ expect(currentContentDefaultOpen(errored("patch"), false, false)).toBe(false)
})
test("opens deletion-only patches", () => {
diff --git a/packages/session-ui/src/message/current-tool-state.ts b/packages/session-ui/src/message/current-tool-state.ts
index bd566d0e134..b8ef9a7cd6f 100644
--- a/packages/session-ui/src/message/current-tool-state.ts
+++ b/packages/session-ui/src/message/current-tool-state.ts
@@ -35,8 +35,10 @@ export function currentContentDefaultOpen(
editExpanded: boolean,
) {
if (content.type !== "tool") return undefined
+ // Errored tools render the error card, which starts collapsed.
+ if (content.state.status === "error") return false
if (content.name === "shell" || content.name === "execute") return shellExpanded
- if (content.name === "patch") return content.state.status !== "error"
+ if (content.name === "patch") return true
if (content.name !== "edit" && content.name !== "write") return undefined
if (!editExpanded) return false
const files = currentToolMetadata(content).files
diff --git a/packages/session-ui/src/tools/tool-renderer.tsx b/packages/session-ui/src/tools/tool-renderer.tsx
index fac419e20e5..896defa476e 100644
--- a/packages/session-ui/src/tools/tool-renderer.tsx
+++ b/packages/session-ui/src/tools/tool-renderer.tsx
@@ -772,6 +772,7 @@ export function ToolDisplay(
if (typeof value === "string" && value) return value
return taskId()
})
+ const errorSubtitle = createMemo(() => toolErrorSubtitle(props, i18n))
const error = createMemo(() => toolDisplayError(props, i18n.t("ui.toolErrorCard.failed")))
const render = createMemo(() => ToolRegistry.render(props.tool) ?? GenericTool)
@@ -799,7 +800,7 @@ export function ToolDisplay(
defaultOpen={props.defaultOpen}
open={props.open}
onOpenChange={props.onOpenChange}
- subtitle={taskSubtitle()}
+ subtitle={taskSubtitle() ?? errorSubtitle()}
href={taskHref()}
onSubtitleClick={(event) => {
if (!data.navigateToSession) return
@@ -822,6 +823,32 @@ export function ToolDisplay(
)
}
+// Each branch must stay in sync with its tool trigger's subtitle expression so
+// failed rows read like their non-error counterparts ("Shell sleep 30").
+function toolErrorSubtitle(props: ToolProps, i18n: UiI18n) {
+ const text = (value: unknown) => (typeof value === "string" && value ? value : undefined)
+ if (props.tool === "shell") return text(props.input.command) ?? text(props.metadata.command)
+ if (props.tool === "execute") return text(props.input.code)
+ if (props.tool === "read") return getFilename(readToolPath(props.input) ?? "")
+ if (props.tool === "edit" || props.tool === "write") return getFilename(text(props.input.path) ?? "")
+ if (props.tool === "list" || props.tool === "glob" || props.tool === "grep")
+ return displayDirectory(text(props.input.path) ?? "/")
+ if (props.tool === "webfetch") return text(props.input.url)
+ if (props.tool === "websearch") return text(props.input.query)
+ if (props.tool === "skill") return skillToolName(props.input, props.metadata)
+ if (props.tool === "patch") {
+ const count = patchFileGroups(props.metadata.files).length
+ if (count === 0) return undefined
+ return `${count} ${i18n.plural("ui.common.file", count)}`
+ }
+ if (props.tool === "question") {
+ const count = Array.isArray(props.input.questions) ? props.input.questions.filter(questionInfo).length : 0
+ if (count === 0) return undefined
+ return `${count} ${i18n.plural("ui.common.question", count)}`
+ }
+ return undefined
+}
+
function toolDisplayError(props: ToolProps & { error?: string }, fallback: string) {
if (props.status === "error") return props.error
if (props.tool !== "execute") return undefined