diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 1503e37d99e..1c91c6afcb0 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -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"}>
@@ -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! })
@@ -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 }}>
@@ -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>
diff --git a/packages/opencode/src/tool/registry.ts b/packages/opencode/src/tool/registry.ts
index db515284741..40e772882a2 100644
--- a/packages/opencode/src/tool/registry.ts
+++ b/packages/opencode/src/tool/registry.ts
@@ -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,
           }
         },
       }),