address comment

Author: icecrasher321

apps/sim/lib/copilot/request/tools/files.test.ts

@@ -72,19 +72,18 @@ describe('serializeOutputForFile (json / txt / md)', () => {
 })
 
 describe('extractTabularData', () => {
-  it('extracts rows from function_execute { result: [...] } via unwrap', () => {
-    const rows = extractTabularData({
-      result: [{ a: 1 }, { a: 2 }],
-      stdout: '',
-    })
-    expect(rows).toEqual([{ a: 1 }, { a: 2 }])
+  it('extracts rows directly from an array input', () => {
+    expect(extractTabularData([{ a: 1 }, { a: 2 }])).toEqual([{ a: 1 }, { a: 2 }])
   })
 
-  it('returns null when function_execute result is a non-tabular string', () => {
-    expect(extractTabularData({ result: 'name,age\nAlice,30', stdout: '' })).toBeNull()
+  it('does NOT unwrap function_execute envelopes on its own (callers must pre-unwrap)', () => {
+    // Caller is responsible for unwrapping { result, stdout } envelopes first.
+    // Keeping that concern out of this function prevents a double unwrap when
+    // the user's payload itself happens to have matching keys.
+    expect(extractTabularData({ result: [{ a: 1 }], stdout: '' })).toBeNull()
   })
 
-  it('still extracts rows from the user_table query_rows shape', () => {
+  it('extracts rows from the user_table query_rows shape', () => {
     const rows = extractTabularData({
       data: {
         rows: [
@@ -96,4 +95,10 @@ describe('extractTabularData', () => {
     })
     expect(rows).toEqual([{ name: 'Alice' }, { name: 'Bob' }])
   })
+
+  it('returns null for non-tabular inputs', () => {
+    expect(extractTabularData('plain string')).toBeNull()
+    expect(extractTabularData(null)).toBeNull()
+    expect(extractTabularData({ foo: 'bar' })).toBeNull()
+  })
 })

apps/sim/lib/copilot/request/tools/files.ts

@@ -44,21 +44,23 @@ export function unwrapFunctionExecuteOutput(output: unknown): unknown {
 }
 
 /**
- * Try to pull a flat array of row-objects out of the various shapes that
- * `function_execute` and `user_table` can return.
+ * Try to pull a flat array of row-objects out of an already-unwrapped tool
+ * payload. Callers are responsible for stripping any `function_execute`
+ * envelope first (via {@link unwrapFunctionExecuteOutput}) — this function
+ * does not re-unwrap, so a user payload that coincidentally has `result` and
+ * `stdout` keys is not mistaken for another envelope.
  */
 export function extractTabularData(output: unknown): Record<string, unknown>[] | null {
-  const unwrapped = unwrapFunctionExecuteOutput(output)
-  if (!unwrapped || typeof unwrapped !== 'object') return null
+  if (!output || typeof output !== 'object') return null
 
-  if (Array.isArray(unwrapped)) {
-    if (unwrapped.length > 0 && typeof unwrapped[0] === 'object' && unwrapped[0] !== null) {
-      return unwrapped as Record<string, unknown>[]
+  if (Array.isArray(output)) {
+    if (output.length > 0 && typeof output[0] === 'object' && output[0] !== null) {
+      return output as Record<string, unknown>[]
     }
     return null
   }
 
-  const obj = unwrapped as Record<string, unknown>
+  const obj = output as Record<string, unknown>
 
   // user_table query_rows shape: { data: { rows: [{ data: {...} }], totalCount } }
   if (obj.data && typeof obj.data === 'object' && !Array.isArray(obj.data)) {