fix(mothership): hold a tool call's display grouping beside its arguments (#9296)

* fix(mothership): hold a tool call's display grouping beside its arguments

* fix(mothership): keep the protocol schemas out of the persisted-message contract

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/agent-group-view.tsx

@@ -5,7 +5,7 @@ import { ActivityTextColumn } from '@/components/ui/activity-status'
 import { ThinkingLoader } from '@/components/ui/thinking-loader'
 import { isBrowserAgentAvailable } from '@/lib/browser-agent/transport'
 import type { ToolActivity } from '@/lib/mothership/generated/protocol'
-import { readToolActivity } from '@/lib/mothership/tools/activity'
+import { readCallActivity } from '@/lib/mothership/tools/activity'
 import { getToolDisplayTitle } from '@/lib/mothership/tools/display'
 import { RETIRED_BROWSER_REQUEST_TAKEOVER_ID } from '@/lib/mothership/tools/retired-tools'
 import { ActivityStream } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/activity-stream'
@@ -135,7 +135,7 @@ export function AgentGroupView({
   const activityDescriptor =
     groupActivity ??
     tools
-      .map((tool) => readToolActivity(tool.params, tool.streamingArgs))
+      .map(readCallActivity)
       .reverse()
       .find((entry) => entry?.title || entry?.completedTitle)
   const browserAgentAvailable = isBrowserAgentAvailable()

apps/sim/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/tool-activity-group.tsx

@@ -8,7 +8,7 @@ import {
   RunCode,
   SearchWorkspace,
 } from '@/lib/mothership/generated/tool-catalog-v1'
-import { getToolActivitySummaryActions, readToolActivity } from '@/lib/mothership/tools/activity'
+import { getToolActivitySummaryActions, readCallActivity } from '@/lib/mothership/tools/activity'
 import { getToolStatusDisplayTitle } from '@/lib/mothership/tools/display'
 import { extractStreamingStringArgument } from '@/lib/mothership/tools/streaming-args'
 import { ActivityStream } from '@/app/workspace/[workspaceId]/home/components/message-content/components/agent-group/activity-stream'
@@ -228,7 +228,7 @@ export function ToolActivityGroup({
   const groupedActivity =
     activity ??
     tools
-      .map((tool) => readToolActivity(tool.params, tool.streamingArgs))
+      .map(readCallActivity)
       .reverse()
       .find((entry) => entry?.title || entry?.completedTitle)
   /** Tense follows liveness: a live group, or one with a call still running, reads in progress. */

apps/sim/app/workspace/[workspaceId]/home/components/message-content/message-content.tsx

@@ -16,7 +16,7 @@ import { isPlainRecord } from '@sim/utils/object'
 import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 import { PrepareFileEdit, Read as ReadTool } from '@/lib/mothership/generated/tool-catalog-v1'
 import type { TaskBlockInfo } from '@/lib/mothership/request/types'
-import { readToolActivity } from '@/lib/mothership/tools/activity'
+import { readCallActivity } from '@/lib/mothership/tools/activity'
 import { isToolHiddenInUi } from '@/lib/mothership/tools/client/hidden-tools'
 import { resolveToolDisplay } from '@/lib/mothership/tools/client/store-utils'
 import { ClientToolCallState } from '@/lib/mothership/tools/client/tool-call-state'
@@ -248,6 +248,7 @@ function toToolData(tc: NonNullable<ContentBlock['toolCall']>): ToolCallData {
     displayTitle,
     activityDescription,
     status: tc.status,
+    activity: tc.activity,
     params: tc.params,
     result: tc.result,
     streamingArgs: tc.streamingArgs,
@@ -567,10 +568,7 @@ function groupByActivity(segments: MessageSegment[], isStreaming: boolean): Mess
     const groups: AgentGroupSegment[] = []
     let current: AgentGroupSegment | undefined
     for (const item of segment.items) {
-      const activity =
-        item.type === 'tool'
-          ? readToolActivity(item.data.params, item.data.streamingArgs)
-          : undefined
+      const activity = item.type === 'tool' ? readCallActivity(item.data) : undefined
       if (activity) labels.set(activity.id, { ...labels.get(activity.id), ...activity })
       if (!current || (activity && activity.id !== current.activity?.id)) {
         current = {

apps/sim/app/workspace/[workspaceId]/home/hooks/message-reconcile.ts

@@ -88,6 +88,7 @@ function toRawPersistedContentBlockBody(block: ContentBlock): PersistedContentBl
           ...(block.toolCall.activityDescription
             ? { activityDescription: block.toolCall.activityDescription }
             : {}),
+          ...(block.toolCall.activity ? { activity: block.toolCall.activity } : {}),
           ...(block.toolCall.params ? { params: block.toolCall.params } : {}),
           ...(block.toolCall.result ? { result: block.toolCall.result } : {}),
           ...(block.toolCall.calledBy ? { calledBy: block.toolCall.calledBy } : {}),

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from 'vitest'
+import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
 import {
   type AgentNode,
@@ -80,9 +81,54 @@ describe('activity metadata replay', () => {
     ])
     const blocks = modelToContentBlocks(model)
     expect(blocks.filter((block) => block.toolCall)).toHaveLength(1)
-    expect(blocks.find((block) => block.toolCall)?.toolCall?.params?.activity).toEqual(activity)
+    expect(blocks.find((block) => block.toolCall)?.toolCall?.activity).toEqual(activity)
     const replay = modelToContentBlocks(contentBlocksToModel(blocks))
-    expect(replay.find((block) => block.toolCall)?.toolCall?.params?.activity).toEqual(activity)
+    expect(replay.find((block) => block.toolCall)?.toolCall?.activity).toEqual(activity)
+  })
+
+  const resolvedOperation = (ownActivity: unknown, grouping?: ToolActivity) =>
+    build([
+      env(1, 'tool', {
+        phase: 'call',
+        toolCallId: 'gateway',
+        toolName: 'call_integration_tool',
+        arguments: {
+          toolId: 'azure_devops_create_work_item',
+          description: 'Filing the task',
+          ...(grouping ? { activity: grouping } : {}),
+          arguments: { title: 'Ship it', activity: ownActivity },
+        },
+      }),
+      ...[2, 3].map((seq) =>
+        env(seq, 'tool', {
+          phase: 'call',
+          toolCallId: 'gateway',
+          toolName: 'azure_devops_create_work_item',
+          arguments: { title: 'Ship it', activity: ownActivity },
+        })
+      ),
+    ])
+
+  it("keeps a resolved operation's own activity argument beside the gateway's grouping", () => {
+    const grouping = { id: 'filing', title: 'Filing tasks', completedTitle: 'Filed tasks' }
+    const ownActivity = 'Development'
+    const model = resolvedOperation(ownActivity, grouping)
+    for (const blocks of [
+      modelToContentBlocks(model),
+      modelToContentBlocks(contentBlocksToModel(modelToContentBlocks(model))),
+    ]) {
+      const toolCall = blocks.find((block) => block.toolCall)?.toolCall
+      expect(toolCall?.params).toEqual({ title: 'Ship it', activity: ownActivity })
+      expect(toolCall?.activity).toEqual(grouping)
+    }
+  })
+
+  it("never takes a live resolved operation's own activity argument for a grouping", () => {
+    const toolCall = modelToContentBlocks(resolvedOperation({ id: 'case-42' })).find(
+      (block) => block.toolCall
+    )?.toolCall
+    expect(toolCall?.params).toEqual({ title: 'Ship it', activity: { id: 'case-42' } })
+    expect(toolCall?.activity).toBeUndefined()
   })
 })
 

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model-serialize.ts

@@ -1,6 +1,6 @@
 import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
-import { readToolActivity } from '@/lib/mothership/tools/activity'
+import { readCallActivity } from '@/lib/mothership/tools/activity'
 import {
   resolveNamedCliToolDisplayTitle,
   type ToolResourceContext,
@@ -141,7 +141,8 @@ export function modelToContentBlocks(
 
     if (node.kind === 'tool') {
       /** Hidden discovery may introduce an activity; carry its labels onto visible calls and replay. */
-      const supplied = node.activity ?? readToolActivity(node.args, node.streamingArgs)
+      // Not `node.args`: the reducer already moved a frame's grouping onto `node.activity`.
+      const supplied = readCallActivity(node)
       if (supplied?.completedTitle) {
         const lane = activities.get(node.spanId) ?? new Map<string, ToolActivity>()
         if (!lane.has(supplied.id)) lane.set(supplied.id, supplied)
@@ -166,9 +167,8 @@ export function modelToContentBlocks(
             ...(node.integrationDescription
               ? { integrationDescription: node.integrationDescription }
               : {}),
-            ...(node.args || activity
-              ? { params: { ...node.args, ...(activity ? { activity } : {}) } }
-              : {}),
+            ...(node.args ? { params: node.args } : {}),
+            ...(activity ? { activity } : {}),
             ...(node.streamingArgs ? { streamingArgs: node.streamingArgs } : {}),
             ...(node.result
               ? {
@@ -403,6 +403,7 @@ export function contentBlocksToModel(blocks: ContentBlock[]): TurnModel {
             toolCallId: tc.id,
             toolName: tc.name,
             arguments: tc.params,
+            ...(tc.activity ? { activity: tc.activity } : {}),
             ...(tc.activityDescription ? { activityDescription: tc.activityDescription } : {}),
             // Carries an unanswered permission prompt across a snapshot rebuild
             // so the reloaded row is still actionable rather than a spinner.

apps/sim/app/workspace/[workspaceId]/home/hooks/stream/turn-model.ts

@@ -14,6 +14,7 @@ import { ToolActivity } from '@/lib/mothership/generated/protocol'
 import { CallIntegrationTool } from '@/lib/mothership/generated/tool-catalog-v1'
 import type { PersistedStreamEventEnvelope } from '@/lib/mothership/request/session/contract'
 import type { TaskBlockInfo } from '@/lib/mothership/request/types'
+import { readFrameActivity } from '@/lib/mothership/tools/activity'
 import {
   CONTEXT_COMPACTION_DISPLAY_TITLE,
   normalizeToolActivityDescription,
@@ -72,6 +73,8 @@ export interface ToolNode extends NodeBase {
   status: NodeStatus
   args?: Record<string, unknown>
   activity?: ToolActivity
+  /** A gateway call rebound to its resolved operation, whose arguments are the operation's own. */
+  resolvedOperation?: boolean
   streamingArgs?: string
   uiTitle?: string
   /** Model-authored activity text preserved across stream and snapshot replay. */
@@ -240,6 +243,7 @@ function rebindResolvedIntegrationCall(node: ToolNode, toolName: string): void {
   if (description) node.integrationDescription = description
   node.name = toolName
   node.streamingArgs = undefined
+  node.resolvedOperation = true
 }
 
 /**
@@ -524,6 +528,8 @@ export function reduceEvent(model: TurnModel, envelope: PersistedStreamEventEnve
           seq,
           tsMs
         )
+        const args = isRecordLike(payload.arguments) ? payload.arguments : undefined
+        const frameActivity = readFrameActivity({ toolName, args }, node)
         rebindResolvedIntegrationCall(node, toolName)
         node.activityDescription ??= normalizeToolActivityDescription(payload.activityDescription)
         // Sim stamps this onto the call frame for a tool it is holding behind a
@@ -538,16 +544,17 @@ export function reduceEvent(model: TurnModel, envelope: PersistedStreamEventEnve
           // back into an ordinary running row without waiting for the result.
           node.status = 'running'
         }
-        if (isRecordLike(payload.arguments)) {
-          node.args = payload.arguments
-          const activity = ToolActivity.safeParse(payload.arguments.activity)
-          if (!node.activity && activity.success) node.activity = activity.data
-        }
-        // Only the snapshot-replay path (contentBlocksToModel) carries this
-        // field — the live wire never does; it restores the rebound gateway
-        // description across a preserve-state rebuild.
+        // Only the snapshot-replay path (contentBlocksToModel) carries `activity`
+        // and `integrationDescription` — the live wire never does; they restore
+        // the grouping and the rebound gateway description across a rebuild.
+        const restoredActivity = isRecordLike(payload.activity)
+          ? ToolActivity.safeParse(payload.activity)
+          : undefined
+        if (restoredActivity?.success) node.activity = restoredActivity.data
         const restoredDescription = asString(payload.integrationDescription)
         if (restoredDescription) node.integrationDescription = restoredDescription
+        if (args) node.args = args
+        node.activity ??= frameActivity
         const ui = isRecordLike(payload.ui) ? payload.ui : undefined
         if (ui?.hidden === true) node.hidden = true
       } else if (phase === MothershipStreamV1ToolPhase.args_delta) {

apps/sim/app/workspace/[workspaceId]/home/types.ts

@@ -2,6 +2,7 @@ import type { WorkspaceSearchFilters } from '@/lib/api/contracts/knowledge/searc
 import type { MothershipChat } from '@/lib/api/contracts/mothership-chats'
 import type { ManagedMcpConnectorId } from '@/lib/credential-groups/managed-mcp-connectors'
 import type { AssistantSearchLevel } from '@/lib/mothership/generated/assistant'
+import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 import type { ChatContext } from '@/stores/panel'
 import type { BrowserTextSelection, TerminalTextSelection } from '@/stores/panel/types'
 
@@ -74,6 +75,8 @@ export interface ToolCallData {
   displayTitle: string
   activityDescription?: string
   status: ToolCallStatus
+  /** Display grouping, held beside `params`. */
+  activity?: ToolActivity
   params?: Record<string, unknown>
   result?: ToolCallResult
   streamingArgs?: string
@@ -90,6 +93,8 @@ export interface ToolCallInfo {
   activityDescription?: string
   /** Model-authored activity phrase for a gateway-resolved integration call. */
   integrationDescription?: string
+  /** Display grouping, held beside `params`; older history carries it in `params.activity`. */
+  activity?: ToolActivity
   params?: Record<string, unknown>
   calledBy?: string
   result?: ToolCallResult

apps/sim/lib/api/contracts/copilot-messages.ts

@@ -1,3 +1,4 @@
+import { isRecordLike } from '@sim/utils/object'
 import { z } from 'zod'
 import {
   MothershipStreamV1CompletionStatus,
@@ -8,6 +9,7 @@ import {
   MothershipStreamV1ToolOutcome,
   MothershipStreamV1ToolPhase,
 } from '@/lib/mothership/generated/mothership-stream-v1'
+import type { ToolActivity } from '@/lib/mothership/generated/protocol'
 
 const persistedToolStateSchema = z.enum([
   ...Object.values(MothershipStreamV1ToolOutcome),
@@ -23,6 +25,12 @@ const persistedToolCallSchema = z.object({
   name: z.string(),
   state: persistedToolStateSchema,
   activityDescription: z.string().optional(),
+  /**
+   * Display grouping, held beside `params`; older rows carry it in `params.activity`. Validated
+   * where history is read (`normalizeMessage`), which keeps the protocol schemas out of every page
+   * that imports this contract.
+   */
+  activity: z.custom<ToolActivity>(isRecordLike).optional(),
   params: z.record(z.string(), z.unknown()).optional(),
   result: z
     .object({ success: z.boolean(), output: z.unknown().optional(), error: z.string().optional() })

apps/sim/lib/mothership/chat/display-message.ts

@@ -56,6 +56,7 @@ function toToolCallInfo(block: PersistedContentBlock, stored: boolean): ToolCall
     status,
     displayTitle: status === ToolCallStatus.cancelled ? 'Stopped by user' : tc.display?.title,
     ...(activityDescription ? { activityDescription } : {}),
+    ...(tc.activity ? { activity: tc.activity } : {}),
     params: tc.params,
     calledBy: tc.calledBy,
     result: tc.result,