Clean code, fix bugs

Author: Sg312

apps/sim/app/api/workflows/[id]/deployments/[version]/revert/route.ts

@@ -1,12 +1,7 @@
-import { db, workflow, workflowDeploymentVersion } from '@sim/db'
 import { createLogger } from '@sim/logger'
-import { and, eq } from 'drizzle-orm'
 import type { NextRequest } from 'next/server'
-import { AuditAction, AuditResourceType, recordAudit } from '@/lib/audit/log'
-import { env } from '@/lib/core/config/env'
 import { generateRequestId } from '@/lib/core/utils/request'
-import { captureServerEvent } from '@/lib/posthog/server'
-import { saveWorkflowToNormalizedTables } from '@/lib/workflows/persistence/utils'
+import { performRevertToVersion } from '@/lib/workflows/orchestration'
 import { validateWorkflowPermissions } from '@/lib/workflows/utils'
 import { createErrorResponse, createSuccessResponse } from '@/app/api/workflows/utils'
 
@@ -37,105 +32,26 @@ export async function POST(
       return createErrorResponse('Invalid version', 400)
     }
 
-    let stateRow: { state: any } | null = null
-    if (version === 'active') {
-      const [row] = await db
-        .select({ state: workflowDeploymentVersion.state })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, id),
-            eq(workflowDeploymentVersion.isActive, true)
-          )
-        )
-        .limit(1)
-      stateRow = row || null
-    } else {
-      const [row] = await db
-        .select({ state: workflowDeploymentVersion.state })
-        .from(workflowDeploymentVersion)
-        .where(
-          and(
-            eq(workflowDeploymentVersion.workflowId, id),
-            eq(workflowDeploymentVersion.version, versionSelector as number)
-          )
-        )
-        .limit(1)
-      stateRow = row || null
-    }
-
-    if (!stateRow?.state) {
-      return createErrorResponse('Deployment version not found', 404)
-    }
-
-    const deployedState = stateRow.state
-    if (!deployedState.blocks || !deployedState.edges) {
-      return createErrorResponse('Invalid deployed state structure', 500)
-    }
-
-    const saveResult = await saveWorkflowToNormalizedTables(id, {
-      blocks: deployedState.blocks,
-      edges: deployedState.edges,
-      loops: deployedState.loops || {},
-      parallels: deployedState.parallels || {},
-      lastSaved: Date.now(),
-    })
-
-    if (!saveResult.success) {
-      return createErrorResponse(saveResult.error || 'Failed to save deployed state', 500)
-    }
-
-    await db
-      .update(workflow)
-      .set({ lastSynced: new Date(), updatedAt: new Date() })
-      .where(eq(workflow.id, id))
-
-    try {
-      const socketServerUrl = env.SOCKET_SERVER_URL || 'http://localhost:3002'
-      await fetch(`${socketServerUrl}/api/workflow-reverted`, {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-          'x-api-key': env.INTERNAL_API_SECRET,
-        },
-        body: JSON.stringify({ workflowId: id, timestamp: Date.now() }),
-      })
-    } catch (e) {
-      logger.error('Error sending workflow reverted event to socket server', e)
-    }
-
-    captureServerEvent(
-      session!.user.id,
-      'workflow_deployment_reverted',
-      {
-        workflow_id: id,
-        workspace_id: workflowRecord?.workspaceId ?? '',
-        version,
-      },
-      workflowRecord?.workspaceId
-        ? { groups: { workspace: workflowRecord.workspaceId } }
-        : undefined
-    )
-
-    recordAudit({
-      workspaceId: workflowRecord?.workspaceId ?? null,
-      actorId: session!.user.id,
-      action: AuditAction.WORKFLOW_DEPLOYMENT_REVERTED,
-      resourceType: AuditResourceType.WORKFLOW,
-      resourceId: id,
+    const result = await performRevertToVersion({
+      workflowId: id,
+      version: version === 'active' ? 'active' : (versionSelector as number),
+      userId: session!.user.id,
+      workflow: (workflowRecord ?? {}) as Record<string, unknown>,
+      request,
       actorName: session!.user.name ?? undefined,
       actorEmail: session!.user.email ?? undefined,
-      resourceName: workflowRecord?.name ?? undefined,
-      description: `Reverted workflow to deployment version ${version}`,
-      metadata: {
-        targetVersion: version,
-      },
-      request,
     })
 
+    if (!result.success) {
+      return createErrorResponse(
+        result.error || 'Failed to revert',
+        result.errorCode === 'not_found' ? 404 : 500
+      )
+    }
+
     return createSuccessResponse({
       message: 'Reverted to deployment version',
-      lastSaved: Date.now(),
+      lastSaved: result.lastSaved,
     })
   } catch (error: any) {
     logger.error('Error reverting to deployment version', error)

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

@@ -1,6 +1,6 @@
 import { useMemo } from 'react'
 import { PillsRing } from '@/components/emcn'
-import { FunctionExecute, WorkspaceFile } from '@/lib/copilot/generated/tool-catalog-v1'
+import { WorkspaceFile } from '@/lib/copilot/generated/tool-catalog-v1'
 import type { ToolCallStatus } from '../../../../types'
 import { getToolIcon } from '../../utils'
 
@@ -56,42 +56,6 @@ function StatusIcon({ status, toolName }: { status: ToolCallStatus; toolName: st
   return <CircleCheck className='h-[15px] w-[15px] text-[var(--text-tertiary)]' />
 }
 
-const LANG_ALIASES: Record<string, string> = {
-  javascript: 'javascript',
-  python: 'python',
-  shell: 'bash',
-  bash: 'bash',
-}
-
-function extractFunctionExecutePreview(raw: string): { code: string; lang: string } | null {
-  if (!raw) return null
-  const langMatch = raw.match(/"language"\s*:\s*"(\w+)"/)
-  const lang = langMatch ? (LANG_ALIASES[langMatch[1]] ?? langMatch[1]) : 'javascript'
-
-  const codeStart = raw.indexOf('"code"')
-  if (codeStart === -1) return null
-  const colonIdx = raw.indexOf(':', codeStart + 6)
-  if (colonIdx === -1) return null
-  const quoteIdx = raw.indexOf('"', colonIdx + 1)
-  if (quoteIdx === -1) return null
-
-  let value = raw.slice(quoteIdx + 1)
-  if (value.endsWith('"}') || value.endsWith('"\n}')) {
-    value = value.replace(/"\s*\}?\s*$/, '')
-  }
-  if (value.endsWith('"')) {
-    value = value.slice(0, -1)
-  }
-
-  const code = value
-    .replace(/\\n/g, '\n')
-    .replace(/\\t/g, '\t')
-    .replace(/\\"/g, '"')
-    .replace(/\\\\/g, '\\')
-
-  return code.length > 0 ? { code, lang } : null
-}
-
 interface ToolCallItemProps {
   toolName: string
   displayTitle: string
@@ -128,14 +92,6 @@ export function ToolCallItem({ toolName, displayTitle, status, streamingArgs }:
       .replace(/\\\\/g, '\\')
     return `${verb} ${unescaped}`
   }, [toolName, streamingArgs])
-  const extracted = useMemo(() => {
-    if (toolName !== FunctionExecute.id || !streamingArgs) return null
-    return extractFunctionExecutePreview(streamingArgs)
-  }, [toolName, streamingArgs])
-  const markdown = useMemo(
-    () => (extracted ? `\`\`\`${extracted.lang}\n${extracted.code}\n\`\`\`` : null),
-    [extracted]
-  )
 
   return (
     <div className='flex items-center gap-[8px] pl-[24px]'>

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

@@ -6,7 +6,7 @@ import {
   WorkspaceFile,
 } from '@/lib/copilot/generated/tool-catalog-v1'
 import { resolveToolDisplay } from '@/lib/copilot/tools/client/store-utils'
-import { ClientToolCallState } from '@/lib/copilot/tools/client/tool-display-registry'
+import { ClientToolCallState } from '@/lib/copilot/tools/client/tool-call-state'
 import type { ContentBlock, MothershipResource, OptionItem, ToolCallData } from '../../types'
 import { SUBAGENT_LABELS, TOOL_UI_METADATA } from '../../types'
 import type { AgentGroupItem } from './components'
@@ -94,8 +94,7 @@ function mapToolStatusToClientState(
 
 function getOverrideDisplayTitle(tc: NonNullable<ContentBlock['toolCall']>): string | undefined {
   if (tc.name === ReadTool.id || tc.name === 'respond' || tc.name.endsWith('_respond')) {
-    return resolveToolDisplay(tc.name, mapToolStatusToClientState(tc.status), tc.id, tc.params)
-      ?.text
+    return resolveToolDisplay(tc.name, mapToolStatusToClientState(tc.status), tc.params)?.text
   }
   return undefined
 }

apps/sim/app/workspace/[workspaceId]/home/hooks/use-chat.ts

@@ -494,7 +494,6 @@ function resolveStreamingToolDisplayTitle(name: string, streamingArgs: string):
 type StreamToolUI = {
   hidden?: boolean
   title?: string
-  phaseLabel?: string
   clientExecutable?: boolean
 }
 
@@ -597,10 +596,16 @@ function getToolUI(ui?: MothershipStreamV1ToolUI): StreamToolUI | undefined {
     return undefined
   }
 
+  const title =
+    typeof ui.title === 'string'
+      ? ui.title
+      : typeof ui.phaseLabel === 'string'
+        ? ui.phaseLabel
+        : undefined
+
   return {
     ...(typeof ui.hidden === 'boolean' ? { hidden: ui.hidden } : {}),
-    ...(typeof ui.title === 'string' ? { title: ui.title } : {}),
-    ...(typeof ui.phaseLabel === 'string' ? { phaseLabel: ui.phaseLabel } : {}),
+    ...(title ? { title } : {}),
     ...(typeof ui.clientExecutable === 'boolean' ? { clientExecutable: ui.clientExecutable } : {}),
   }
 }
@@ -1934,8 +1939,7 @@ export function useChat(
               }
               const ui = getToolUI(payload.ui)
               if (ui?.hidden) break
-              let displayTitle = ui?.title || ui?.phaseLabel
-              const phaseLabel = ui?.phaseLabel
+              let displayTitle = ui?.title
               const args = payload.arguments as Record<string, unknown> | undefined
 
               displayTitle = resolveToolDisplayTitle(name, args) ?? displayTitle
@@ -1966,7 +1970,6 @@ export function useChat(
                     name,
                     status: 'executing',
                     displayTitle,
-                    phaseLabel,
                     params: args,
                     calledBy: activeSubagent,
                   },
@@ -1980,7 +1983,6 @@ export function useChat(
                 if (tc) {
                   tc.name = name
                   if (displayTitle) tc.displayTitle = displayTitle
-                  if (phaseLabel) tc.phaseLabel = phaseLabel
                   if (args) tc.params = args
                 }
               }
@@ -2525,13 +2527,7 @@ export function useChat(
           const isCancelled =
             block.toolCall.status === 'executing' || block.toolCall.status === 'cancelled'
           const displayTitle = isCancelled ? 'Stopped by user' : block.toolCall.displayTitle
-          const display =
-            displayTitle || block.toolCall.phaseLabel
-              ? {
-                  ...(displayTitle ? { title: displayTitle } : {}),
-                  ...(block.toolCall.phaseLabel ? { phaseLabel: block.toolCall.phaseLabel } : {}),
-                }
-              : undefined
+          const display = displayTitle ? { title: displayTitle } : undefined
           return {
             type: block.type,
             content: block.content,