merged improvement/connection into staging (#604)

* merged improvement/connection into staging

* fix: merge conflicts and improved block path calculation

* fix: removed migration

* fix: removed duplicate call

* fix: resolver and merge conflicts

* fix: knowledge base folder

* fix: settings modal

* fix: typeform block

* fix: parallel handler

* fix: stores index

* fix: tests

* fix: tag-dropdown

* improvement: start block input and tag dropdown

* fix block id resolution + missing bracket

* fix lint

* fix test

* works

* fix

* fix lint

* Revert "fix lint"

This reverts commit 433e2f9.

---------

Co-authored-by: Vikhyath Mondreti <vikhyathvikku@gmail.com>
Co-authored-by: Vikhyath Mondreti <vikhyathmondreti@Vikhyaths-MacBook-Air.local>

Author: 3 people

apps/sim/app/api/workflows/[id]/deploy/route.ts

@@ -139,7 +139,7 @@ export async function POST(request: NextRequest, { params }: { params: Promise<{
       return createErrorResponse(validation.error.message, validation.error.status)
     }
 
-    // Get the workflow to find the user (removed deprecated state column)
+    // Get the workflow to find the user
     const workflowData = await db
       .select({
         userId: workflow.userId,

apps/sim/components/ui/tag-dropdown.tsx

@@ -8,7 +8,6 @@ import { Serializer } from '@/serializer'
 import { useVariablesStore } from '@/stores/panel/variables/store'
 import type { Variable } from '@/stores/panel/variables/types'
 import { useWorkflowRegistry } from '@/stores/workflows/registry/store'
-import { useSubBlockStore } from '@/stores/workflows/subblock/store'
 import { useWorkflowStore } from '@/stores/workflows/workflow/store'
 
 interface BlockTagGroup {

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

@@ -163,15 +163,15 @@ export class WorkflowBlockHandler implements BlockHandler {
 
       logger.info(`Loaded child workflow: ${workflowData.name} (${workflowId})`)
 
-      // Extract the workflow state (API returns normalized data in state field)
+      // Extract the workflow state
       const workflowState = workflowData.state
 
       if (!workflowState || !workflowState.blocks) {
         logger.error(`Child workflow ${workflowId} has invalid state`)
         return null
       }
 
-      // Use blocks directly since API returns data from normalized tables
+      // Use blocks directly since DB format should match UI format
       const serializedWorkflow = this.serializer.serializeWorkflow(
         workflowState.blocks,
         workflowState.edges || [],

apps/sim/providers/google/index.ts

@@ -380,7 +380,15 @@ export const googleProvider: ProviderConfig = {
                     duration: firstResponseTime,
                   },
                 ],
+<<<<<<< HEAD
                 // Cost will be calculated in logger
+=======
+                cost: {
+                  total: 0.0, // Initial estimate, updated as tokens are processed
+                  input: 0.0,
+                  output: 0.0,
+                },
+>>>>>>> 34b590a10 (merged improvement/connection into staging (#604))
               },
             },
             logs: [],
@@ -776,6 +784,14 @@ export const googleProvider: ProviderConfig = {
                           firstResponseTime,
                           iterations: iterationCount + 1,
                           timeSegments,
+<<<<<<< HEAD
+=======
+                        },
+                        cost: {
+                          total: (tokens.total || 0) * 0.0001, // Estimate cost based on tokens
+                          input: (tokens.prompt || 0) * 0.0001,
+                          output: (tokens.completion || 0) * 0.0001,
+>>>>>>> 34b590a10 (merged improvement/connection into staging (#604))
                         },
                         // Cost will be calculated in logger
                       },