fix(pi): clean plan mode output

Author: Bill Leoutsakos

apps/sim/blocks/blocks/pi.test.ts

@@ -102,6 +102,12 @@ describe('Pi cloud authoring surface', () => {
     ])
   })
 
+  it('documents each mode label with its serialized ID', () => {
+    expect(PiBlock.inputs.mode.description).toBe(
+      'Execution mode: Plan (cloud_plan), Create PR (cloud), Update PR (cloud_branch), Review Code (cloud_review), or Local Dev (local)'
+    )
+  })
+
   it.each(['cloud', 'cloud_branch'])(
     'declares Babysit controls and outputs for %s',
     (authoringMode) => {

apps/sim/blocks/blocks/pi.ts

@@ -620,7 +620,8 @@ export const PiBlock: BlockConfig<PiResponse> = {
   inputs: {
     mode: {
       type: 'string',
-      description: 'Execution mode: Plan, Create PR, Update PR, Review Code, or Local Dev',
+      description:
+        'Execution mode: Plan (cloud_plan), Create PR (cloud), Update PR (cloud_branch), Review Code (cloud_review), or Local Dev (local)',
     },
     task: { type: 'string', description: 'Instruction for the coding agent' },
     model: { type: 'string', description: 'AI model to use' },

apps/sim/executor/handlers/pi/cloud/plan/backend.test.ts

@@ -129,6 +129,53 @@ describe('runCloudPlanPi', () => {
     expect(mockRun.mock.calls[0][1].envs.BASE_BRANCH).toBe('')
   })
 
+  it('returns only the final assistant response while preserving live progress events', async () => {
+    mockRun.mockImplementation(
+      (command: string, options: { onStdout?: (chunk: string) => void }) => {
+        if (command.includes('git clone')) {
+          return Promise.resolve({ stdout: '', stderr: '', exitCode: 0 })
+        }
+        options.onStdout?.(
+          `${[
+            JSON.stringify({
+              type: 'message_update',
+              assistantMessageEvent: { type: 'text_delta', delta: 'Inspecting files...' },
+            }),
+            JSON.stringify({
+              type: 'agent_end',
+              messages: [
+                {
+                  role: 'assistant',
+                  stopReason: 'stop',
+                  content: [{ type: 'text', text: 'Inspecting files...' }],
+                },
+                {
+                  role: 'assistant',
+                  stopReason: 'stop',
+                  content: [
+                    { type: 'thinking', thinking: 'Hidden reasoning' },
+                    { type: 'text', text: '# Final Plan\n\n1. Make the change.' },
+                  ],
+                },
+              ],
+            }),
+          ].join('\n')}\n`
+        )
+        return Promise.resolve({ stdout: '', stderr: '', exitCode: 0 })
+      }
+    )
+    const onEvent = vi.fn()
+
+    const result = await runCloudPlanPi(params(), { onEvent })
+
+    expect(onEvent).toHaveBeenCalledWith({ type: 'text', text: 'Inspecting files...' })
+    expect(onEvent).toHaveBeenCalledWith({
+      type: 'final',
+      text: '# Final Plan\n\n1. Make the change.',
+    })
+    expect(result.totals.finalText).toBe('# Final Plan\n\n1. Make the change.')
+  })
+
   it('loads only the Sim search extension and scopes its key to the Pi command', async () => {
     await runCloudPlanPi(params({ search: { provider: 'exa', apiKey: 'exa-secret' } }), {
       onEvent: vi.fn(),

apps/sim/executor/handlers/pi/cloud/plan/backend.ts

@@ -106,6 +106,9 @@ export const runCloudPlanPi: PiBackendRun<PiCloudPlanRunParams> = async (params,
         const event = scrubPiEvent(raw, secrets)
         if (!event) return
         applyPiEvent(totals, event)
+        if (event.type === 'final' && event.text) {
+          totals.finalText = event.text
+        }
         context.onEvent(event)
       }
       const handleChunk = (chunk: string) => {

apps/sim/executor/handlers/pi/core/events.test.ts

@@ -103,6 +103,32 @@ describe('normalizePiEvent', () => {
     })
   })
 
+  it('uses only text blocks from the last assistant message as final text', () => {
+    expect(
+      normalizePiEvent({
+        type: 'agent_end',
+        messages: [
+          {
+            role: 'assistant',
+            stopReason: 'stop',
+            content: [{ type: 'text', text: 'Earlier narration' }],
+          },
+          { role: 'toolResult', content: [{ type: 'text', text: 'Tool output' }] },
+          {
+            role: 'assistant',
+            stopReason: 'stop',
+            content: [
+              { type: 'thinking', thinking: 'Hidden reasoning' },
+              { type: 'text', text: '# Plan' },
+              { type: 'toolCall', name: 'read' },
+              { type: 'text', text: 'Do it' },
+            ],
+          },
+        ],
+      })
+    ).toEqual({ type: 'final', text: '# Plan\nDo it' })
+  })
+
   it('returns other for unknown types and null for non-objects', () => {
     expect(normalizePiEvent({ type: 'queue_update' })).toEqual({ type: 'other' })
     expect(normalizePiEvent('nope')).toBeNull()

apps/sim/executor/handlers/pi/core/events.ts

@@ -83,6 +83,17 @@ function asNumber(value: unknown): number {
   return typeof value === 'number' && Number.isFinite(value) ? value : 0
 }
 
+function extractAssistantText(message: Record<string, unknown>): string {
+  if (!Array.isArray(message.content)) return ''
+  return message.content
+    .map((block) => asRecord(block))
+    .filter((block): block is Record<string, unknown> => block !== null)
+    .filter((block) => asString(block.type) === 'text')
+    .map((block) => asString(block.text))
+    .filter(Boolean)
+    .join('\n')
+}
+
 /**
  * Extracts token usage from an event, tolerating the field names Pi and common
  * provider payloads use (`input`/`output`, `inputTokens`/`outputTokens`,
@@ -149,7 +160,8 @@ export function normalizePiEvent(raw: unknown): PiEvent | null {
             message: asString(message.errorMessage) || `Pi request ${stopReason}`,
           }
         }
-        break
+        const text = extractAssistantText(message)
+        return text ? { type: 'final', text } : { type: 'final' }
       }
       return { type: 'final' }
     }

apps/sim/executor/handlers/pi/core/redaction.test.ts

@@ -32,6 +32,10 @@ describe('Pi secret redaction', () => {
       type: 'error',
       message: 'failed ***',
     })
+    expect(scrubPiEvent({ type: 'final', text: 'plan sk-hosted' }, ['sk-hosted'])).toEqual({
+      type: 'final',
+      text: 'plan ***',
+    })
   })
 
   it('creates sanitized errors without retaining the raw cause', () => {

apps/sim/executor/handlers/pi/core/redaction.ts

@@ -22,6 +22,8 @@ export function scrubPiEvent(event: PiEvent | null, secrets: readonly string[]):
     case 'text':
     case 'thinking':
       return { ...event, text: scrubPiSecrets(event.text, secrets) }
+    case 'final':
+      return event.text ? { ...event, text: scrubPiSecrets(event.text, secrets) } : event
     case 'tool_start':
     case 'tool_end':
       return { ...event, toolName: scrubPiSecrets(event.toolName, secrets) }

apps/sim/executor/handlers/pi/pi-handler.test.ts

@@ -367,8 +367,6 @@ describe('PiBlockHandler', () => {
     expect(output).toMatchObject({
       content: '# Plan\nDo it',
       model: 'claude',
-      changedFiles: [],
-      diff: '',
       tokens: { input: 3, output: 4, total: 7 },
       cost: { input: 0, output: 0, total: 0 },
       providerTiming: {
@@ -379,6 +377,8 @@ describe('PiBlockHandler', () => {
     })
     expect(output).not.toHaveProperty('prUrl')
     expect(output).not.toHaveProperty('branch')
+    expect(output).not.toHaveProperty('changedFiles')
+    expect(output).not.toHaveProperty('diff')
   })
 
   it('routes cloud_review mode and surfaces review output', async () => {

apps/sim/executor/handlers/pi/pi-handler.ts

@@ -439,6 +439,7 @@ export class PiBlockHandler implements BlockHandler {
 
   private buildOutput(
     result: PiRunResult,
+    mode: PiRunParams['mode'],
     model: string,
     isBYOK: boolean,
     startTime: number,
@@ -449,8 +450,12 @@ export class PiBlockHandler implements BlockHandler {
     return {
       content: totals.finalText,
       model,
-      changedFiles: result.changedFiles ?? [],
-      diff: result.diff ?? '',
+      ...(mode === 'cloud_plan'
+        ? {}
+        : {
+            changedFiles: result.changedFiles ?? [],
+            diff: result.diff ?? '',
+          }),
       ...(result.prUrl ? { prUrl: result.prUrl } : {}),
       ...(result.branch ? { branch: result.branch } : {}),
       ...(result.reviewUrl ? { reviewUrl: result.reviewUrl } : {}),
@@ -516,7 +521,14 @@ export class PiBlockHandler implements BlockHandler {
             }
             Object.assign(
               output,
-              this.buildOutput(result, params.model, params.isBYOK, startTime, startTimeISO)
+              this.buildOutput(
+                result,
+                params.mode,
+                params.model,
+                params.isBYOK,
+                startTime,
+                startTimeISO
+              )
             )
             if (memoryConfig) {
               await appendPiMemory(
@@ -558,6 +570,13 @@ export class PiBlockHandler implements BlockHandler {
         result.memoryText ?? result.totals.finalText
       )
     }
-    return this.buildOutput(result, params.model, params.isBYOK, startTime, startTimeISO)
+    return this.buildOutput(
+      result,
+      params.mode,
+      params.model,
+      params.isBYOK,
+      startTime,
+      startTimeISO
+    )
   }
 }