Skip to content
Open
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
18 changes: 12 additions & 6 deletions packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ function ToolPart(props: { last: boolean; part: ToolPart; message: AssistantMess
<Match when={props.part.tool === "edit"}>
<Edit {...toolprops} />
</Match>
<Match when={props.part.tool === "task"}>
<Match when={props.part.tool === "task" || toolprops.metadata.sessionId}>
<Task {...toolprops} />
</Match>
<Match when={props.part.tool === "patch"}>
Expand Down Expand Up @@ -1647,11 +1647,16 @@ function Task(props: ToolProps<typeof TaskTool>) {

const current = createMemo(() => props.metadata.summary?.findLast((x) => x.state.status !== "pending"))

const agentName = createMemo(() => {
const input = props.input as Record<string, unknown>
return (input.subagent_type ?? input.agent ?? input.category ?? props.tool ?? "unknown") as string
})

return (
<Switch>
<Match when={props.metadata.summary?.length}>
<Match when={props.metadata.sessionId}>
<BlockTool
title={"# " + Locale.titlecase(props.input.subagent_type ?? "unknown") + " Task"}
title={"# " + Locale.titlecase(agentName()) + " Task"}
onClick={
props.metadata.sessionId
? () => navigate({ type: "session", sessionID: props.metadata.sessionId! })
Expand All @@ -1661,7 +1666,8 @@ function Task(props: ToolProps<typeof TaskTool>) {
>
<box>
<text style={{ fg: theme.textMuted }}>
{props.input.description} ({props.metadata.summary?.length} toolcalls)
{props.input.description}
<Show when={props.metadata.summary?.length}> ({props.metadata.summary?.length} toolcalls)</Show>
</text>
<Show when={current()}>
<text style={{ fg: current()!.state.status === "error" ? theme.error : theme.textMuted }}>
Expand All @@ -1680,10 +1686,10 @@ function Task(props: ToolProps<typeof TaskTool>) {
<InlineTool
icon="◉"
pending="Delegating..."
complete={props.input.subagent_type ?? props.input.description}
complete={agentName() ?? props.input.description}
part={props.part}
>
{Locale.titlecase(props.input.subagent_type ?? "unknown")} Task "{props.input.description}"
{Locale.titlecase(agentName())} Task "{props.input.description}"
</InlineTool>
</Match>
</Switch>
Expand Down
19 changes: 16 additions & 3 deletions packages/opencode/src/tool/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,24 @@ export namespace ToolRegistry {
parameters: z.object(def.args),
description: def.description,
execute: async (args, ctx) => {
const result = await def.execute(args as any, ctx)
let capturedTitle = ""
let capturedMetadata: Record<string, unknown> = {}
const wrappedCtx = {
...ctx,
metadata: (input: { title?: string; metadata?: Record<string, unknown> }) => {
if (input.title) capturedTitle = input.title
if (input.metadata) capturedMetadata = { ...capturedMetadata, ...input.metadata }
return ctx.metadata(input)
},
}
const result = await def.execute(
args as Record<string, unknown>,
wrappedCtx as unknown as Parameters<typeof def.execute>[1],
)
return {
title: "",
title: capturedTitle,
output: result,
metadata: {},
metadata: capturedMetadata,
}
},
}),
Expand Down