fix(mcp): carry a whole structuredContent read through nested deps mocks

A whole read now adds every declared field below it, through nested objects and array items, even where the consumer also reads a nested path by name.

Author: waleedlatif1

apps/sim/lib/mothership/agent-cli/engines.test.ts

@@ -353,6 +353,40 @@ describe('workflows deps', () => {
       })
     })
 
+    it('keeps every declared field below a whole read, through objects and array items', async () => {
+      expect(
+        await depsMock(
+          '<oncall.structuredContent> <oncall.structuredContent.person.id> <oncall.structuredContent.shifts.0.start>',
+          {
+            ...snapshot,
+            schema: {
+              ...snapshot.schema,
+              properties: {
+                ...snapshot.schema.properties,
+                person: {
+                  type: 'object',
+                  properties: { id: { type: 'string' }, name: { type: 'string' } },
+                },
+                shifts: {
+                  type: 'array',
+                  items: {
+                    type: 'object',
+                    properties: { start: { type: 'string' }, end: { type: 'string' } },
+                  },
+                },
+              },
+            },
+          }
+        )
+      ).toEqual({
+        structuredContent: {
+          role: null,
+          person: { id: null, name: null },
+          shifts: [{ start: null, end: null }],
+        },
+      })
+    })
+
     it('keeps the read-path skeleton when the operation declares no schema', async () => {
       expect(
         await depsMock('return <oncall.structuredContent>', { server: 'server-1', tool: 'on_call' })

apps/sim/lib/mothership/agent-cli/engines/deps.ts

@@ -153,18 +153,20 @@ function fillDeclaredStructuredContent(
   if (!declared) return
   const readWhole = new Set(paths.map((path) => pathSegments(path).join('.')))
 
-  const fill = (value: unknown, node: unknown, at: string): unknown => {
+  /** `within` holds once a value at or above `at` is read whole: then every declared field below it belongs in the mock. */
+  const fill = (value: unknown, node: unknown, at: string, within: boolean): unknown => {
     if (value === null) return skeletonFromDeclaredOutput(node)
     if (!isRecordLike(node)) return value
+    const whole = within || readWhole.has(at)
     if (Array.isArray(value))
-      return value.map((item, index) => fill(item, node.items, `${at}.${index}`))
+      return value.map((item, index) => fill(item, node.items, `${at}.${index}`, whole))
     if (!isRecordLike(value) || !isRecordLike(node.properties)) return value
     const properties = node.properties
     const read = Object.entries(value).map(([key, child]): [string, unknown] => [
       key,
-      Object.hasOwn(properties, key) ? fill(child, properties[key], `${at}.${key}`) : child,
+      Object.hasOwn(properties, key) ? fill(child, properties[key], `${at}.${key}`, whole) : child,
     ])
-    const added = readWhole.has(at)
+    const added = whole
       ? Object.entries(properties)
           .filter(([key]) => !Object.hasOwn(value, key))
           .map(([key, child]): [string, unknown] => [key, skeletonFromDeclaredOutput(child)])
@@ -174,7 +176,8 @@ function fillDeclaredStructuredContent(
   mock[MCP_STRUCTURED_CONTENT_OUTPUT] = fill(
     mock[MCP_STRUCTURED_CONTENT_OUTPUT],
     declared,
-    MCP_STRUCTURED_CONTENT_OUTPUT
+    MCP_STRUCTURED_CONTENT_OUTPUT,
+    false
   )
 }