improvement(mothership): structure sim side typing

Author: icecrasher321

apps/sim/app/api/copilot/confirm/route.test.ts

@@ -161,27 +161,33 @@ describe('Copilot Confirm API Route', () => {
     )
   })
 
-  it('uses upsertAsyncToolCall for non-terminal confirmations', async () => {
+  it('accepts primitive terminal confirmation data', async () => {
     const response = await POST(
       createMockPostRequest({
         toolCallId: 'tool-call-123',
-        status: 'accepted',
+        status: 'success',
+        message: 'Tool executed successfully',
+        data: 'done',
       })
     )
 
     expect(response.status).toBe(200)
-    expect(upsertAsyncToolCall).toHaveBeenCalledWith({
-      runId: 'run-1',
-      checkpointId: 'checkpoint-1',
+    expect(completeAsyncToolCall).toHaveBeenCalledWith({
       toolCallId: 'tool-call-123',
-      toolName: 'client_tool',
-      args: { foo: 'bar' },
-      status: 'pending',
+      status: 'completed',
+      result: 'done',
+      error: null,
     })
-    expect(completeAsyncToolCall).not.toHaveBeenCalled()
+    expect(publishToolConfirmation).toHaveBeenCalledWith(
+      expect.objectContaining({
+        toolCallId: 'tool-call-123',
+        status: 'success',
+        data: 'done',
+      })
+    )
   })
 
-  it('publishes confirmation after a durable non-terminal update', async () => {
+  it('keeps background as a live pending detach confirmation', async () => {
     const response = await POST(
       createMockPostRequest({
         toolCallId: 'tool-call-123',
@@ -190,14 +196,8 @@ describe('Copilot Confirm API Route', () => {
     )
 
     expect(response.status).toBe(200)
-    expect(upsertAsyncToolCall).toHaveBeenCalledWith({
-      runId: 'run-1',
-      checkpointId: 'checkpoint-1',
-      toolCallId: 'tool-call-123',
-      toolName: 'client_tool',
-      args: { foo: 'bar' },
-      status: 'pending',
-    })
+    expect(upsertAsyncToolCall).not.toHaveBeenCalled()
+    expect(completeAsyncToolCall).not.toHaveBeenCalled()
     expect(publishToolConfirmation).toHaveBeenCalledWith(
       expect.objectContaining({
         toolCallId: 'tool-call-123',
@@ -206,6 +206,32 @@ describe('Copilot Confirm API Route', () => {
     )
   })
 
+  it('rejects unsupported accepted and rejected confirmation statuses', async () => {
+    const acceptedResponse = await POST(
+      createMockPostRequest({
+        toolCallId: 'tool-call-123',
+        status: 'accepted',
+      })
+    )
+
+    expect(acceptedResponse.status).toBe(400)
+    expect(await acceptedResponse.json()).toEqual({
+      error: 'Invalid request data: Invalid notification status',
+    })
+
+    const rejectedResponse = await POST(
+      createMockPostRequest({
+        toolCallId: 'tool-call-123',
+        status: 'rejected',
+      })
+    )
+
+    expect(rejectedResponse.status).toBe(400)
+    expect(await rejectedResponse.json()).toEqual({
+      error: 'Invalid request data: Invalid notification status',
+    })
+  })
+
   it('returns 400 when the durable write fails before publish', async () => {
     completeAsyncToolCall.mockRejectedValueOnce(new Error('db down'))
 

apps/sim/app/api/copilot/confirm/route.ts

@@ -1,7 +1,12 @@
 import { createLogger } from '@sim/logger'
 import { type NextRequest, NextResponse } from 'next/server'
 import { z } from 'zod'
-import { ASYNC_TOOL_STATUS } from '@/lib/copilot/async-runs/lifecycle'
+import {
+  ASYNC_TOOL_CONFIRMATION_STATUS,
+  ASYNC_TOOL_STATUS,
+  type AsyncCompletionData,
+  type AsyncConfirmationStatus,
+} from '@/lib/copilot/async-runs/lifecycle'
 import {
   completeAsyncToolCall,
   getAsyncToolCall,
@@ -16,37 +21,55 @@ import {
   createNotFoundResponse,
   createRequestTracker,
   createUnauthorizedResponse,
-  type NotificationStatus,
 } from '@/lib/copilot/request/http'
 
 const logger = createLogger('CopilotConfirmAPI')
 
 // Schema for confirmation request
 const ConfirmationSchema = z.object({
   toolCallId: z.string().min(1, 'Tool call ID is required'),
-  status: z.enum(['success', 'error', 'accepted', 'rejected', 'background', 'cancelled'] as const, {
-    errorMap: () => ({ message: 'Invalid notification status' }),
-  }),
+  status: z.enum(
+    Object.values(ASYNC_TOOL_CONFIRMATION_STATUS) as [
+      AsyncConfirmationStatus,
+      ...AsyncConfirmationStatus[],
+    ],
+    {
+      errorMap: () => ({ message: 'Invalid notification status' }),
+    }
+  ),
   message: z.string().optional(),
-  data: z.record(z.unknown()).optional(),
+  data: z.unknown().optional(),
 })
 
 /**
- * Persist the durable tool status, then publish a wakeup event.
+ * Persist terminal durable tool status, then publish a wakeup event.
+ *
+ * `background` remains a live detach signal in the current browser workflow
+ * runtime, so it should not rewrite the durable async row.
  */
 async function updateToolCallStatus(
   existing: NonNullable<Awaited<ReturnType<typeof getAsyncToolCall>>>,
-  status: NotificationStatus,
+  status: AsyncConfirmationStatus,
   message?: string,
-  data?: Record<string, unknown>
+  data?: AsyncCompletionData
 ): Promise<boolean> {
   const toolCallId = existing.toolCallId
+  if (status === ASYNC_TOOL_CONFIRMATION_STATUS.background) {
+    publishToolConfirmation({
+      toolCallId,
+      status,
+      message: message || undefined,
+      timestamp: new Date().toISOString(),
+      data,
+    })
+    return true
+  }
   const durableStatus =
     status === 'success'
       ? ASYNC_TOOL_STATUS.completed
       : status === 'cancelled'
         ? ASYNC_TOOL_STATUS.cancelled
-        : status === 'error' || status === 'rejected'
+        : status === 'error'
           ? ASYNC_TOOL_STATUS.failed
           : ASYNC_TOOL_STATUS.pending
   try {
@@ -71,12 +94,11 @@ async function updateToolCallStatus(
         status: durableStatus,
       })
     }
-    const timestamp = new Date().toISOString()
     publishToolConfirmation({
       toolCallId,
       status,
       message: message || undefined,
-      timestamp,
+      timestamp: new Date().toISOString(),
       data,
     })
     return true
@@ -92,7 +114,7 @@ async function updateToolCallStatus(
 
 /**
  * POST /api/copilot/confirm
- * Update tool call status (Accept/Reject)
+ * Accept client tool completion or detach confirmations.
  */
 export async function POST(req: NextRequest) {
   const tracker = createRequestTracker()