Merge branch 'main' into workspace-dependencies-cache-rework-patch

* feat: add S3 support to download button and PDF preview components

Add S3 object and s3:// URL support to AppDownload and AppPdf components,
following the same pattern used in AppImage component. Both components now:
- Handle partial S3 objects with storage and presigned URL support
- Handle s3:// URL format
- Construct proper API endpoints for S3 file downloads

Fixes #7240

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>

* handle policy + fix s3 picker

---------

Co-authored-by: claude[bot] <41898282+claude[bot]@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>

backend/.sqlx/query-0382065b3dfd78b384e26f81317af91de289f52462e74343770a8b0d47d0577d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO kafka_trigger (\n                workspace_id,\n                path,\n                kafka_resource_path,\n                group_id,\n                topics,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now(), $11, $12, $13, $14\n            )\n            ",
+  "query": "\n            INSERT INTO kafka_trigger (\n                workspace_id,\n                path,\n                kafka_resource_path,\n                group_id,\n                topics,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now(), $11, $12, $13\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,11 +17,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "7eb91a2d17a286146f6e829f2677b142c22253929740075d99daec65b3a73475"
+  "hash": "0382065b3dfd78b384e26f81317af91de289f52462e74343770a8b0d47d0577d"
 }

backend/.sqlx/query-06af027f6ed10200de2006a2fc48771a8f42c28c87b78220eec1bddeae1f648f.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO postgres_trigger (\n                workspace_id,\n                path,\n                postgres_resource_path,\n                replication_slot_name,\n                publication_name,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now(), $11, $12, $13, $14\n            )\n            ",
+  "query": "\n            INSERT INTO postgres_trigger (\n                workspace_id,\n                path,\n                postgres_resource_path,\n                replication_slot_name,\n                publication_name,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, now(), $11, $12, $13\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,11 +17,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "8d56504bbe6e9c0a5b11b2e4d96bafd7e7071c8f4a8ceacf0fc906339f356de3"
+  "hash": "06af027f6ed10200de2006a2fc48771a8f42c28c87b78220eec1bddeae1f648f"
 }

backend/.sqlx/query-08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a.json

@@ -1,83 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a.json
-  "query": "\n            INSERT INTO http_trigger (\n                workspace_id,\n                path,\n                route_path,\n                route_path_key,\n                workspaced_route,\n                authentication_resource_path,\n                wrap_body,\n                raw_string,\n                script_path,\n                summary,\n                description,\n                is_flow,\n                request_type,\n                authentication_method,\n                http_method,\n                static_asset_config,\n                edited_by,\n                email,\n                edited_at,\n                is_static_website,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19, $20, $21, $22, $23\n            )\n            ",
-========
-  "query": "\n            INSERT INTO http_trigger (\n                workspace_id,\n                path,\n                route_path,\n                route_path_key,\n                workspaced_route,\n                authentication_resource_path,\n                wrap_body,\n                raw_string,\n                script_path,\n                summary,\n                description,\n                is_flow,\n                enabled,\n                request_type,\n                authentication_method,\n                http_method,\n                static_asset_config,\n                edited_by,\n                email,\n                edited_at,\n                is_static_website,\n                error_handler_path,\n                error_handler_args,\n                retry\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, now(), $20, $21, $22, $23\n            )\n            ",
->>>>>>>> main:backend/.sqlx/query-94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e.json
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Text",
-        "Bool",
-        "Bool",
-        {
-          "Custom": {
-            "name": "request_type",
-            "kind": {
-              "Enum": [
-                "sync",
-                "async",
-                "sync_sse"
-              ]
-            }
-          }
-        },
-        {
-          "Custom": {
-            "name": "authentication_method",
-            "kind": {
-              "Enum": [
-                "none",
-                "windmill",
-                "api_key",
-                "basic_http",
-                "custom_script",
-                "signature"
-              ]
-            }
-          }
-        },
-        {
-          "Custom": {
-            "name": "http_method",
-            "kind": {
-              "Enum": [
-                "get",
-                "post",
-                "put",
-                "delete",
-                "patch"
-              ]
-            }
-          }
-        },
-        "Jsonb",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Bool"
-      ]
-    },
-    "nullable": []
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a.json
-  "hash": "08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a"
-========
-  "hash": "94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e"
->>>>>>>> main:backend/.sqlx/query-94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e.json
-}

backend/.sqlx/query-0c0f3909b80c35210fc64c685905308621f9135c2c45a2fa0531ea750387da1f.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT \n                CASE \n                    WHEN flow_version.id IS NOT NULL THEN\n                        (flow_version.value -> 'flow_env' -> $3) #> $4\n                    ELSE\n                        (root_job.raw_flow -> 'flow_env' -> $3) #> $4\n                END AS \"flow_env: sqlx::types::Json<Box<RawValue>>\"\n            FROM \n                v2_job current_job\n            JOIN \n                v2_job root_job ON root_job.id = COALESCE(current_job.root_job, current_job.flow_innermost_root_job, current_job.parent_job, current_job.id)\n                AND root_job.workspace_id = current_job.workspace_id\n            LEFT JOIN\n                flow_version ON flow_version.id = root_job.runnable_id\n                AND flow_version.path = root_job.runnable_path\n                AND flow_version.workspace_id = root_job.workspace_id\n           WHERE \n                current_job.id = $1 AND \n                current_job.workspace_id = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "flow_env: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text",
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "0c0f3909b80c35210fc64c685905308621f9135c2c45a2fa0531ea750387da1f"
+}

backend/.sqlx/query-0c89ef278782f5a72b0b07ab3ba0edc487f03edd61936fcf77dee93fb22839ea.json

@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT jsonb_build_object(\n                'kind', jb.kind,\n                'script_path', jb.runnable_path,\n                'latest_schema', COALESCE(\n                    (SELECT DISTINCT ON (s.path) s.schema FROM script s WHERE s.workspace_id = $1 AND s.path = jb.runnable_path AND jb.kind = 'script' ORDER BY s.path, s.created_at DESC),\n                    (SELECT flow_version.schema FROM flow LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)] WHERE flow.workspace_id = $1 AND flow.path = jb.runnable_path AND jb.kind = 'flow')\n                ),\n                'schemas', ARRAY(\n                    SELECT jsonb_build_object(\n                        'script_hash', LPAD(TO_HEX(COALESCE(s.hash, f.id)), 16, '0'),\n                        'job_ids', ARRAY_AGG(DISTINCT j.id),\n                        'schema', (ARRAY_AGG(COALESCE(s.schema, f.schema)))[1]\n                    ) FROM v2_job j\n                    LEFT JOIN script s ON s.hash = j.runnable_id AND j.kind = 'script'\n                    LEFT JOIN flow_version f ON f.id = j.runnable_id AND j.kind = 'flow'\n                    WHERE j.id = ANY(ARRAY_AGG(jb.id))\n                    GROUP BY COALESCE(s.hash, f.id)\n                )\n            ) FROM v2_job jb\n            WHERE (jb.kind = 'flow' OR jb.kind = 'script')\n                AND jb.workspace_id = $1 AND jb.id = ANY($2)\n            GROUP BY jb.kind, jb.runnable_path",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "jsonb_build_object",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "UuidArray"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "0c89ef278782f5a72b0b07ab3ba0edc487f03edd61936fcf77dee93fb22839ea"
-}

backend/.sqlx/query-0d86a31d7d53e52d24df76fa745d968cda48e036139cdaecf4e87d948f8c365e.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        UPDATE v2_job_status f SET flow_status = JSONB_SET(flow_status,  ARRAY['user_states'], JSONB_SET(COALESCE(flow_status->'user_states', '{}'::jsonb), ARRAY[$1], $2))\n        FROM v2_job j\n        WHERE f.id = $3 AND f.id = j.id AND j.workspace_id = $4 AND kind IN ('flow', 'flowpreview', 'flownode') RETURNING 1\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Int4"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Jsonb",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "0d86a31d7d53e52d24df76fa745d968cda48e036139cdaecf4e87d948f8c365e"
+}

backend/.sqlx/query-0ef1e5bbbefc117a4cdaf414b3652354641c2f735d071540f858bc064f2432cd.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE nats_trigger \n            SET \n                nats_resource_path = $1,\n                subjects = $2,\n                stream_name = $3,\n                consumer_name = $4,\n                use_jetstream = $5,\n                script_path = $6,\n                path = $7,\n                is_flow = $8,\n                edited_by = $9,\n                email = $10,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $13,\n                error_handler_args = $14,\n                retry = $15,\n                active_mode = $16\n            WHERE \n                workspace_id = $11 AND path = $12\n            ",
+  "query": "\n            UPDATE nats_trigger \n            SET \n                nats_resource_path = $1,\n                subjects = $2,\n                stream_name = $3,\n                consumer_name = $4,\n                use_jetstream = $5,\n                script_path = $6,\n                path = $7,\n                is_flow = $8,\n                edited_by = $9,\n                email = $10,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $13,\n                error_handler_args = $14,\n                retry = $15\n            WHERE \n                workspace_id = $11 AND path = $12\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -19,11 +19,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "8dcc91ceb6e4467ec8c46e34676236b588a312255c41cd549c55f05e3d28bcd9"
+  "hash": "0ef1e5bbbefc117a4cdaf414b3652354641c2f735d071540f858bc064f2432cd"
 }

backend/.sqlx/query-0f697b1ab3105e2ea036f8ecace2d54f97bc2d0ef52f5812244a97c289523592.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                mqtt_trigger \n            SET\n                mqtt_resource_path = $1,\n                subscribe_topics = $2,\n                client_version = $3,\n                client_id = $4,\n                v3_config = $5,\n                v5_config = $6,\n                is_flow = $7, \n                edited_by = $8, \n                email = $9,\n                script_path = $10,\n                path = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16,\n                active_mode = $17\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
+  "query": "\n            UPDATE \n                mqtt_trigger \n            SET\n                mqtt_resource_path = $1,\n                subscribe_topics = $2,\n                client_version = $3,\n                client_id = $4,\n                v3_config = $5,\n                v5_config = $6,\n                is_flow = $7, \n                edited_by = $8, \n                email = $9,\n                script_path = $10,\n                path = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -30,11 +30,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "56869503297144ba82077dd8d32a1cb644df582b23c330ff29ddfcad7286759d"
+  "hash": "0f697b1ab3105e2ea036f8ecace2d54f97bc2d0ef52f5812244a97c289523592"
 }

backend/.sqlx/query-140f4ad799fca6c25975a0aca7c9051f0760e22eccdd291c83ed86599ce571cb.json

@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO v2_job_status (id, workflow_as_code_status)\n            VALUES ($1, JSONB_SET('{}'::JSONB, array[$2], $3))\n            ON CONFLICT (id) DO UPDATE SET\n                workflow_as_code_status = JSONB_SET(\n                    COALESCE(v2_job_status.workflow_as_code_status, '{}'::JSONB),\n                    array[$2],\n                    $3\n                )",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text",
+        "Jsonb"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "140f4ad799fca6c25975a0aca7c9051f0760e22eccdd291c83ed86599ce571cb"
+}

backend/.sqlx/query-17ca259e1c78e1317fdd19436e15bef428fc4f0d52776d7a5fca64f17225ef30.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                gcp_trigger \n            SET \n                gcp_resource_path = $1,\n                subscription_id = $2,\n                topic_id = $3,\n                delivery_type = $4,\n                delivery_config = $5,\n                is_flow = $6, \n                edited_by = $7, \n                email = $8,\n                script_path = $9,\n                path = $10,\n                enabled = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16,\n                auto_acknowledge_msg = $17,\n                ack_deadline = $18,\n                active_mode = $19\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
+  "query": "\n            UPDATE \n                gcp_trigger \n            SET \n                gcp_resource_path = $1,\n                subscription_id = $2,\n                topic_id = $3,\n                delivery_type = $4,\n                delivery_config = $5,\n                is_flow = $6, \n                edited_by = $7, \n                email = $8,\n                script_path = $9,\n                path = $10,\n                enabled = $11,\n                edited_at = now(), \n                error = NULL,\n                server_id = NULL,\n                error_handler_path = $14,\n                error_handler_args = $15,\n                retry = $16,\n                auto_acknowledge_msg = $17,\n                ack_deadline = $18\n            WHERE \n                workspace_id = $12 AND \n                path = $13\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -32,11 +32,10 @@
         "Jsonb",
         "Jsonb",
         "Bool",
-        "Int4",
-        "Bool"
+        "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "c2e91dd1dc5ab62ec2221762aaae16ed97b991dda940ff09081f52c8826c8ada"
+  "hash": "17ca259e1c78e1317fdd19436e15bef428fc4f0d52776d7a5fca64f17225ef30"
 }

backend/.sqlx/query-1c88ba17e8bd5caae8f40c9f6da77e6e91b6285154e3a71268f4dbb994a69b55.json

@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT \n                    path \n                FROM \n                    flow_version \n                WHERE \n                    id = $1 AND \n                    workspace_id = $2\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "1c88ba17e8bd5caae8f40c9f6da77e6e91b6285154e3a71268f4dbb994a69b55"
-}

backend/.sqlx/query-25cba74bec5959e6752265cd7b6f84846f74d468f0073f02f81122895e86c364.json

@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT COALESCE(s.flow_status, s.workflow_as_code_status)->'user_states'->$1\n        FROM v2_job_queue q LEFT JOIN v2_job_status s USING (id)\n        WHERE q.id = $2 AND q.workspace_id = $3\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "?column?",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "25cba74bec5959e6752265cd7b6f84846f74d468f0073f02f81122895e86c364"
+}

backend/.sqlx/query-26761fbd7953416eb391de47b1694e0f4ab2bb96a6d838f1b1fdce4b58a8f5d4.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT jsonb_build_object(\n            'kind', jb.kind,\n            'script_path', jb.runnable_path,\n            'latest_schema', COALESCE(\n                (SELECT DISTINCT ON (s.path) s.schema FROM script s WHERE s.workspace_id = $1 AND s.path = jb.runnable_path AND jb.kind = 'script' ORDER BY s.path, s.created_at DESC),\n                (SELECT flow_version.schema FROM flow LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)] WHERE flow.workspace_id = $1 AND flow.path = jb.runnable_path AND jb.kind = 'flow')\n            ),\n            'schemas', ARRAY(\n                SELECT jsonb_build_object(\n                    'script_hash', LPAD(TO_HEX(COALESCE(s.hash, f.id)), 16, '0'),\n                    'job_ids', ARRAY_AGG(DISTINCT j.id),\n                    'schema', (ARRAY_AGG(COALESCE(s.schema, f.schema)))[1]\n                ) FROM v2_job j\n                LEFT JOIN script s ON s.hash = j.runnable_id AND j.kind = 'script'\n                LEFT JOIN flow_version f ON f.id = j.runnable_id AND j.kind = 'flow'\n                WHERE j.id = ANY(ARRAY_AGG(jb.id))\n                GROUP BY COALESCE(s.hash, f.id)\n            )\n        ) FROM v2_job jb\n        WHERE (jb.kind = 'flow' OR jb.kind = 'script')\n            AND jb.workspace_id = $1 AND jb.id = ANY($2)\n        GROUP BY jb.kind, jb.runnable_path",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "jsonb_build_object",
+        "type_info": "Jsonb"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "UuidArray"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "26761fbd7953416eb391de47b1694e0f4ab2bb96a6d838f1b1fdce4b58a8f5d4"
+}

backend/.sqlx/query-2729c73b53605908e2fa26b4e4bbbd75d6d5bb77e6a92bf187d978a059d7af4a.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT COUNT(*) FROM v2_job_queue q WHERE q.canceled_by IS NULL AND (q.scheduled_for <= now()\n            OR (q.suspend_until IS NOT NULL\n                AND (q.suspend <= 0 OR q.suspend_until <= now())))",
+  "query": "SELECT COUNT(*) FROM v2_job_queue q WHERE q.canceled_by IS NULL AND (q.scheduled_for <= now()\n        OR (q.suspend_until IS NOT NULL\n            AND (q.suspend <= 0 OR q.suspend_until <= now())))",
   "describe": {
     "columns": [
       {
@@ -16,5 +16,5 @@
       null
     ]
   },
-  "hash": "998ca12977082959544b6964333b090b54b1e7e039452283644ca53548704f39"
+  "hash": "2729c73b53605908e2fa26b4e4bbbd75d6d5bb77e6a92bf187d978a059d7af4a"
 }

backend/.sqlx/query-28a6766d38539146b6cac9a3dbf0b8592a93b178c7db91f7e4a3c04f7017c539.json

@@ -1,24 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT COALESCE(s.flow_status, s.workflow_as_code_status)->'user_states'->$1\n            FROM v2_job_queue q LEFT JOIN v2_job_status s USING (id)\n            WHERE q.id = $2 AND q.workspace_id = $3\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "?column?",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "28a6766d38539146b6cac9a3dbf0b8592a93b178c7db91f7e4a3c04f7017c539"
-}

backend/.sqlx/query-292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d.json

@@ -1,86 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d.json
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    active_mode,\n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE workspace_id = $1 \n                    AND local_part = $2 \n                    AND (workspaced_local_part = TRUE OR $3 IS TRUE)\n                ",
-========
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE workspace_id = $1 \n                    AND local_part = $2 \n                    AND (workspaced_local_part = TRUE OR $3 IS TRUE)\n                    AND enabled IS TRUE\n                ",
->>>>>>>> main:backend/.sqlx/query-df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b.json
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "active_mode",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "error_handler_path: _",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d.json
-  "hash": "292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d"
-========
-  "hash": "df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b"
->>>>>>>> main:backend/.sqlx/query-df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b.json
-}

backend/.sqlx/query-29785f22ee7092e8cebeae3757caf0563e3f98fff1f100616c33e8dc95fbff99.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT j.created_by AS \"created_by!\", j.args as \"args: sqlx::types::Json<Box<RawValue>>\"\n            FROM v2_job j\n            WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
+  "query": "SELECT j.created_by AS \"created_by!\", j.args as \"args: sqlx::types::Json<Box<RawValue>>\"\n        FROM v2_job j\n        WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -26,5 +26,5 @@
       true
     ]
   },
-  "hash": "848c5e2c26f77341d3f3bbb49c5d90b8bca91ce425bfbe39b1c1c6520ad38419"
+  "hash": "29785f22ee7092e8cebeae3757caf0563e3f98fff1f100616c33e8dc95fbff99"
 }

backend/.sqlx/query-2bf89418f30c1a0bf1cfd0d6bbfa2944181187deeadd07a3db9686869f60e0b9.json

@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO v2_job_status (id, workflow_as_code_status)\n                VALUES ($1, JSONB_SET('{}'::JSONB, array[$2], $3))\n                ON CONFLICT (id) DO UPDATE SET\n                    workflow_as_code_status = JSONB_SET(\n                        COALESCE(v2_job_status.workflow_as_code_status, '{}'::JSONB),\n                        array[$2],\n                        $3\n                    )",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text",
-        "Jsonb"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "2bf89418f30c1a0bf1cfd0d6bbfa2944181187deeadd07a3db9686869f60e0b9"
-}

backend/.sqlx/query-2c0c9312b8b326a3759566059d01c79efee28920a1a5afe2df92043526c1de82.json

@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO resume_job\n                    (id, resume_id, job, flow, value, approver, approved)\n             VALUES ($1, $2, $3, $4, $5, $6, $7)\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Int4",
+        "Uuid",
+        "Uuid",
+        "Jsonb",
+        "Varchar",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "2c0c9312b8b326a3759566059d01c79efee28920a1a5afe2df92043526c1de82"
+}

backend/.sqlx/query-2f27fd4d7aed67c987d9f0cca0a2426f3fbd22c1f0759be943625ad5c921f91b.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                    result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                    result_columns,\n                    created_by AS \"created_by!\"\n                FROM v2_job_completed c\n                    JOIN v2_job USING (id)\n                WHERE c.id = $1 AND c.workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
+  "query": "SELECT\n            result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n            result_columns,\n            status = 'success' AS \"success!\",\n            created_by AS \"created_by!\"\n        FROM v2_job_completed c\n            JOIN v2_job j USING (id)\n        WHERE c.id = $1 AND c.workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -15,6 +15,11 @@
       },
       {
         "ordinal": 2,
+        "name": "success!",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 3,
         "name": "created_by!",
         "type_info": "Varchar"
       }
@@ -29,8 +34,9 @@
     "nullable": [
       true,
       true,
+      null,
       false
     ]
   },
-  "hash": "a2af6124a04fda8b6b3cf0075250733b33e76a4f823c7d0e12a79c66ed2b098a"
+  "hash": "2f27fd4d7aed67c987d9f0cca0a2426f3fbd22c1f0759be943625ad5c921f91b"
 }

backend/.sqlx/query-37285436c16684449b33810d97d0a2611dab30faff2891fc3a7f00ee8c120950.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT j.created_by AS \"created_by!\", CONCAT(coalesce(job_logs.logs, '')) as logs, coalesce(job_logs.log_offset, 0) as log_offset, job_logs.log_file_index\n                FROM v2_job j\n                LEFT JOIN job_logs ON job_logs.job_id = j.id\n                WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
+  "query": "SELECT j.created_by AS \"created_by!\", CONCAT(coalesce(job_logs.logs, '')) as logs, coalesce(job_logs.log_offset, 0) as log_offset, job_logs.log_file_index\n            FROM v2_job j\n            LEFT JOIN job_logs ON job_logs.job_id = j.id\n            WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -38,5 +38,5 @@
       true
     ]
   },
-  "hash": "0d7c3ebcb37452ffd46916d2c291a6c4f8b3ba7c1b1c671171bb0194dc48e5a1"
+  "hash": "37285436c16684449b33810d97d0a2611dab30faff2891fc3a7f00ee8c120950"
 }

backend/.sqlx/query-38e1377d3799968ad603d801e4fff6eadd2c7b0b2f8fac9dc6b87958f38bb0eb.json

@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO v2_job_completed AS cj\n                    ( workspace_id\n                    , id\n                    , duration_ms\n                    , result\n                    , canceled_by\n                    , canceled_reason\n                    , flow_status\n                    , status\n                    , worker\n                    )\n                    SELECT  q.workspace_id\n                    , q.id\n                    , 0\n                    , $4\n                    , $1\n                    , 'cancel all'\n                    , (SELECT flow_status FROM v2_job_status WHERE id = q.id)\n                    , 'canceled'::job_status\n                    , worker\n            FROM v2_job_queue q\n                JOIN v2_job USING (id)\n            WHERE q.id = any($2) AND running = false AND parent_job IS NULL AND q.workspace_id = $3 AND trigger IS NULL\n                FOR UPDATE SKIP LOCKED\n            ON CONFLICT (id) DO NOTHING RETURNING id AS \"id!\"",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id!",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "UuidArray",
-        "Text",
-        "Jsonb"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "38e1377d3799968ad603d801e4fff6eadd2c7b0b2f8fac9dc6b87958f38bb0eb"
-}

backend/.sqlx/query-39cd46049a6e7d21d310a4973b3b40604cbb8c5ea1d28e4f74651505c317b440.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        SELECT \n            gcp_resource_path, \n            script_path,\n            is_flow,\n            active_mode,\n            workspace_id,\n            path,\n            edited_by,\n            email,\n            delivery_config AS \"delivery_config: _\",\n            retry as \"retry: _\",\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\"\n        FROM\n            gcp_trigger\n        WHERE\n            workspace_id = $1 AND\n            path = $2 AND\n            delivery_type = 'push'::DELIVERY_MODE \n        ",
+  "query": "\n        SELECT \n            gcp_resource_path, \n            script_path,\n            is_flow, \n            workspace_id,\n            path,\n            edited_by,\n            email,\n            delivery_config AS \"delivery_config: _\",\n            retry as \"retry: _\",\n            error_handler_path,\n            error_handler_args as \"error_handler_args: _\"\n        FROM\n            gcp_trigger\n        WHERE\n            workspace_id = $1 AND\n            path = $2 AND\n            delivery_type = 'push'::DELIVERY_MODE \n        ",
   "describe": {
     "columns": [
       {
@@ -20,46 +20,41 @@
       },
       {
         "ordinal": 3,
-        "name": "active_mode",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
         "name": "workspace_id",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 5,
+        "ordinal": 4,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "edited_by",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "email",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "delivery_config: _",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "retry: _",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 10,
+        "ordinal": 9,
         "name": "error_handler_path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 11,
+        "ordinal": 10,
         "name": "error_handler_args: _",
         "type_info": "Jsonb"
       }
@@ -78,12 +73,11 @@
       false,
       false,
       false,
-      false,
       true,
       true,
       true,
       true
     ]
   },
-  "hash": "d8cd8b3a372321c49bc7b200aaef3f71164f68590654c652015bb88d670132cc"
+  "hash": "39cd46049a6e7d21d310a4973b3b40604cbb8c5ea1d28e4f74651505c317b440"
 }

backend/.sqlx/query-3a6cfe23cb393a430fb91e9cf5321c6da937a26b37bd0e4afadf808ecddd642d.json

@@ -1,38 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                v2_job_queue \n            SET \n                scheduled_for = now() \n            FROM \n                v2_job \n            WHERE \n                v2_job_queue.id = v2_job.id AND \n                v2_job_queue.running is FALSE AND\n                v2_job_queue.scheduled_for = $1 AND\n                v2_job_queue.workspace_id = $2 AND\n                v2_job.trigger_kind = $3 AND\n                v2_job.trigger = $4\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Timestamptz",
-        "Text",
-        {
-          "Custom": {
-            "name": "job_trigger_kind",
-            "kind": {
-              "Enum": [
-                "webhook",
-                "http",
-                "websocket",
-                "kafka",
-                "email",
-                "nats",
-                "schedule",
-                "app",
-                "ui",
-                "postgres",
-                "sqs",
-                "gcp",
-                "mqtt"
-              ]
-            }
-          }
-        },
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "3a6cfe23cb393a430fb91e9cf5321c6da937a26b37bd0e4afadf808ecddd642d"
-}

backend/.sqlx/query-3b6bd7b41f130ce6df62fdecb351a3e01be0726d02d3f863e0ea5c476a8e785e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE kafka_trigger \n            SET \n                kafka_resource_path = $1,\n                group_id = $2,\n                topics = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                edited_by = $7,\n                email = $8,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $11,\n                error_handler_args = $12,\n                retry = $13,\n                active_mode = $14\n            WHERE \n                workspace_id = $9 AND path = $10\n            ",
+  "query": "\n            UPDATE kafka_trigger \n            SET \n                kafka_resource_path = $1,\n                group_id = $2,\n                topics = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                edited_by = $7,\n                email = $8,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $11,\n                error_handler_args = $12,\n                retry = $13\n            WHERE \n                workspace_id = $9 AND path = $10\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,11 +17,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "72bc52905015d84b7e2483526a1f31600b6fd4f808a263bdb903d6e2c001527b"
+  "hash": "3b6bd7b41f130ce6df62fdecb351a3e01be0726d02d3f863e0ea5c476a8e785e"
 }

backend/.sqlx/query-3d46bfb231a219afd2e2662bc06cb0167131a86a4e49d000b84a73a8b47235f2.json

@@ -1,49 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        WITH result_stream AS (\n                            SELECT \n                                string_agg(stream, '' order by idx asc) as stream, \n                                job_id, \n                                max(idx) + 1 as offset \n                            FROM job_result_stream_v2\n                            WHERE job_id = $1 AND idx >= $3\n                            GROUP BY job_id\n                        )\n                        SELECT\n                            COALESCE(jc.result, jc.result) as \"result: sqlx::types::Json<Box<RawValue>>\",\n                            jq.running as \"running: Option<bool>\",\n                            rs.stream AS \"result_stream: Option<String>\",\n                            rs.offset AS stream_offset,\n                            CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                        FROM (\n                            SELECT $1::uuid as job_id, $2::text as workspace_id\n                        ) base\n                        LEFT JOIN v2_job_completed jc ON jc.id = base.job_id AND jc.workspace_id = base.workspace_id\n                        LEFT JOIN v2_job_queue jq ON jq.id = base.job_id AND jq.workspace_id = base.workspace_id\n                        LEFT JOIN v2_job_status js ON js.id = base.job_id\n                        LEFT JOIN result_stream rs ON rs.job_id = base.job_id\n                        WHERE base.job_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "result: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 1,
-        "name": "running: Option<bool>",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "result_stream: Option<String>",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "stream_offset",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "stream_job",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text",
-        "Int4",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      null,
-      false,
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "3d46bfb231a219afd2e2662bc06cb0167131a86a4e49d000b84a73a8b47235f2"
-}

backend/.sqlx/query-4545e1e0953cde730272353e78044744910a17af23f8201d853f0a4f8404fc73.json

@@ -0,0 +1,29 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT j.tag as \"tag!\", COUNT(*) as \"count!\"\n        FROM v2_job_completed c JOIN v2_job j USING (id)\n        WHERE c.started_at > NOW() - make_interval(secs => $1) AND ($2::text IS NULL OR j.workspace_id = $2)\n        GROUP BY j.tag\n        ORDER BY \"count!\" DESC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "tag!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "count!",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Float8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      null
+    ]
+  },
+  "hash": "4545e1e0953cde730272353e78044744910a17af23f8201d853f0a4f8404fc73"
+}

backend/.sqlx/query-46b44de4ea6eb15258c1cb9bbd21cab7fc350b46e8899d59759945eae02a6d40.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT EXISTS (SELECT 1 FROM resume_job WHERE id = $1)\n            ",
+  "query": "\n        SELECT EXISTS (SELECT 1 FROM resume_job WHERE id = $1)\n        ",
   "describe": {
     "columns": [
       {
@@ -18,5 +18,5 @@
       null
     ]
   },
-  "hash": "8e99bd48ae67aed1b081c5f84df897541cd93dcda63c28395cd9edee374156f8"
+  "hash": "46b44de4ea6eb15258c1cb9bbd21cab7fc350b46e8899d59759945eae02a6d40"
 }

backend/.sqlx/query-488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "WITH uuid_table as (\n                select gen_random_uuid() as uuid from generate_series(1, $16)\n            )\n            INSERT INTO v2_job\n                (id, workspace_id, raw_code, raw_lock, raw_flow, tag, runnable_id, runnable_path, kind,\n                script_lang, created_by, permissioned_as, permissioned_as_email, concurrent_limit,\n                concurrency_time_window_s, timeout, args)\n                (SELECT uuid, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,\n                ('{ \"uuid\": \"' || uuid || '\" }')::jsonb FROM uuid_table)\n            RETURNING id AS \"id!\"",
+  "query": "WITH uuid_table as (\n            select gen_random_uuid() as uuid from generate_series(1, $16)\n        )\n        INSERT INTO v2_job\n            (id, workspace_id, raw_code, raw_lock, raw_flow, tag, runnable_id, runnable_path, kind,\n             script_lang, created_by, permissioned_as, permissioned_as_email, concurrent_limit,\n             concurrency_time_window_s, timeout, args)\n            (SELECT uuid, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15,\n             ('{ \"uuid\": \"' || uuid || '\" }')::jsonb FROM uuid_table)\n        RETURNING id AS \"id!\"",
   "describe": {
     "columns": [
       {
@@ -91,5 +91,5 @@
       false
     ]
   },
-  "hash": "7bb8ff3426ec73672fb572cd1ce36f495a84e0ad7d60fd39eddcccbc129d43c8"
+  "hash": "488dd591096b2b47787afdc3a1d73917ed13269f2ee20b86df79fca2c8efe672"
 }

backend/.sqlx/query-49f7e7481019d27b44d5c8a167f9d5d3309a31b195b3147fa32f2ca8a6c9c90e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                j.runnable_path as script_path, j.args AS \"args: sqlx::types::Json<HashMap<String, Box<RawValue>>>\",\n                j.tag AS \"tag!\", j.priority\n            FROM v2_job j\n            WHERE j.id = $1 and j.workspace_id = $2",
+  "query": "SELECT\n            j.runnable_path as script_path, j.args AS \"args: sqlx::types::Json<HashMap<String, Box<RawValue>>>\",\n            j.tag AS \"tag!\", j.priority\n        FROM v2_job j\n        WHERE j.id = $1 and j.workspace_id = $2",
   "describe": {
     "columns": [
       {
@@ -37,5 +37,5 @@
       true
     ]
   },
-  "hash": "f7753f8f7b40aebf66de607203f97681d06ac04f9d547b4c49c032d9e933a29e"
+  "hash": "49f7e7481019d27b44d5c8a167f9d5d3309a31b195b3147fa32f2ca8a6c9c90e"
 }

backend/.sqlx/query-4b056d33215b3a1e9849bb66ce84e96c69d10e3970e38151c97d1fca0cb7388d.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    WITH result_stream AS (\n                        SELECT \n                            string_agg(stream, '' order by idx asc) as stream, \n                            job_id, \n                            max(idx) + 1 as offset \n                        FROM job_result_stream_v2\n                        WHERE job_id = $2 AND idx >= $3\n                        GROUP BY job_id\n                    )\n                    SELECT \n                        jc.result as \"result: sqlx::types::Json<Box<RawValue>>\",\n                        v2_job.tag,\n                        v2_job_queue.running as \"running: Option<bool>\",\n                        rs.stream AS \"result_stream: Option<String>\",\n                        rs.offset AS stream_offset,\n                        CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                    FROM v2_job\n                    LEFT JOIN v2_job_queue USING (id)\n                    LEFT JOIN v2_job_completed jc USING (id)\n                    LEFT JOIN v2_job_status js USING (id)\n                    LEFT JOIN result_stream rs ON rs.job_id = $2\n                    WHERE v2_job.id = $2 AND v2_job.workspace_id = $1",
+  "query": "\n                    WITH result_stream AS (\n                        SELECT \n                            string_agg(stream, '' order by idx asc) as stream, \n                            job_id, \n                            max(idx) + 1 as offset \n                        FROM job_result_stream_v2\n                        WHERE job_id = $2 AND idx >= $3\n                        GROUP BY job_id\n                    )\n                    SELECT\n                        COALESCE(jc.result, NULL) as \"result: sqlx::types::Json<Box<RawValue>>\",\n                        rs.stream AS \"result_stream: Option<String>\",\n                        rs.offset AS stream_offset,\n                        COALESCE(js.flow_status, jc.flow_status) as \"flow_status: sqlx::types::Json<Box<RawValue>>\",\n                        CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                    FROM (\n                        SELECT $2::uuid as job_id, $1::text as workspace_id\n                    ) base\n                    LEFT JOIN v2_job_completed jc ON jc.id = base.job_id AND jc.workspace_id = base.workspace_id\n                    LEFT JOIN v2_job_status js ON js.id = base.job_id\n                    LEFT JOIN result_stream rs ON rs.job_id = base.job_id\n                    WHERE base.job_id = $2",
   "describe": {
     "columns": [
       {
@@ -10,26 +10,21 @@
       },
       {
         "ordinal": 1,
-        "name": "tag",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "running: Option<bool>",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 3,
         "name": "result_stream: Option<String>",
         "type_info": "Text"
       },
       {
-        "ordinal": 4,
+        "ordinal": 2,
         "name": "stream_offset",
         "type_info": "Int4"
       },
       {
-        "ordinal": 5,
+        "ordinal": 3,
+        "name": "flow_status: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 4,
         "name": "stream_job",
         "type_info": "Uuid"
       }
@@ -43,13 +38,12 @@
       ]
     },
     "nullable": [
-      true,
-      false,
-      false,
+      null,
+      null,
       null,
       null,
       null
     ]
   },
-  "hash": "d75346523ede1a7677cca073ce894b540d637b1067ece6209d9365c92fc59e03"
+  "hash": "4b056d33215b3a1e9849bb66ce84e96c69d10e3970e38151c97d1fca0cb7388d"
 }

backend/.sqlx/query-51a19a7d611807c8b0957babf821e58e9aa1ce345f1cd5965298fda6f9e158a9.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO v2_job_completed AS cj\n                   ( workspace_id\n                   , id\n                   , duration_ms\n                   , result\n                   , canceled_by\n                   , canceled_reason\n                   , flow_status\n                   , status\n                   , worker\n                )\n                SELECT  q.workspace_id\n                   , q.id\n                   , 0\n                   , $4\n                   , $1\n                   , 'cancel all'\n                   , (SELECT flow_status FROM v2_job_status WHERE id = q.id)\n                   , 'canceled'::job_status\n                   , worker\n        FROM v2_job_queue q\n            JOIN v2_job USING (id)\n        WHERE q.id = any($2) AND running = false AND parent_job IS NULL AND q.workspace_id = $3 AND trigger IS NULL\n            FOR UPDATE SKIP LOCKED\n        ON CONFLICT (id) DO NOTHING RETURNING id AS \"id!\"",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id!",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "UuidArray",
+        "Text",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "51a19a7d611807c8b0957babf821e58e9aa1ce345f1cd5965298fda6f9e158a9"
+}

backend/.sqlx/query-51ef2ee9dc252f7accc41b89d13a2aa1e4c11d4860894e9e661b6ee3bccd8522.json

@@ -0,0 +1,24 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE v2_job_completed c SET\n                result = NULL,\n                deleted = TRUE\n            FROM v2_job j\n            WHERE c.id = $1\n                AND j.id = c.id\n                AND c.workspace_id = $2\n                AND ($3::TEXT[] IS NULL OR tag = ANY($3))\n            RETURNING c.id\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text",
+        "TextArray"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "51ef2ee9dc252f7accc41b89d13a2aa1e4c11d4860894e9e661b6ee3bccd8522"
+}

backend/.sqlx/query-5387fbfd4be55674dcbe9f9b3ce9649d0f5db125776fbdffea993a53a09708de.json

@@ -0,0 +1,55 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            SELECT id FROM workspace_dependencies\n            WHERE name IS NOT DISTINCT FROM $1 AND workspace_id = $2 AND archived = false AND language = $3\n            LIMIT 1\n            ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        {
+          "Custom": {
+            "name": "script_lang",
+            "kind": {
+              "Enum": [
+                "python3",
+                "deno",
+                "go",
+                "bash",
+                "postgresql",
+                "nativets",
+                "bun",
+                "mysql",
+                "bigquery",
+                "snowflake",
+                "graphql",
+                "powershell",
+                "mssql",
+                "php",
+                "bunnative",
+                "rust",
+                "ansible",
+                "csharp",
+                "oracledb",
+                "nu",
+                "java",
+                "duckdb",
+                "ruby"
+              ]
+            }
+          }
+        }
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "5387fbfd4be55674dcbe9f9b3ce9649d0f5db125776fbdffea993a53a09708de"
+}

backend/.sqlx/query-5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b.json

@@ -1,176 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b.json
-  "query": "\n                    SELECT\n                        path,\n                        script_path,\n                        is_flow,\n                        route_path,\n                        authentication_resource_path,\n                        workspace_id,\n                        request_type AS \"request_type: _\",\n                        authentication_method  AS \"authentication_method: _\",\n                        edited_by,\n                        email,\n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website,\n                        error_handler_path,\n                        error_handler_args as \"error_handler_args: _\",\n                        retry as \"retry: _\",\n                        active_mode\n                    FROM\n                        http_trigger\n                    WHERE\n                        http_method = $1\n                    ",
-========
-  "query": "\n                    SELECT\n                        path,\n                        script_path,\n                        is_flow,\n                        route_path,\n                        authentication_resource_path,\n                        workspace_id,\n                        request_type AS \"request_type: _\",\n                        authentication_method  AS \"authentication_method: _\",\n                        edited_by,\n                        email,\n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website,\n                        error_handler_path,\n                        error_handler_args as \"error_handler_args: _\",\n                        retry as \"retry: _\"\n                    FROM\n                        http_trigger\n                    WHERE\n                        http_method = $1 AND\n                        enabled is TRUE\n                    ",
->>>>>>>> main:backend/.sqlx/query-bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346.json
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 3,
-        "name": "route_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 4,
-        "name": "authentication_resource_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "request_type: _",
-        "type_info": {
-          "Custom": {
-            "name": "request_type",
-            "kind": {
-              "Enum": [
-                "sync",
-                "async",
-                "sync_sse"
-              ]
-            }
-          }
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "authentication_method: _",
-        "type_info": {
-          "Custom": {
-            "name": "authentication_method",
-            "kind": {
-              "Enum": [
-                "none",
-                "windmill",
-                "api_key",
-                "basic_http",
-                "custom_script",
-                "signature"
-              ]
-            }
-          }
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 9,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 10,
-        "name": "static_asset_config: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 11,
-        "name": "wrap_body",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 12,
-        "name": "raw_string",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 13,
-        "name": "workspaced_route",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 14,
-        "name": "is_static_website",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 15,
-        "name": "error_handler_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 17,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 18,
-        "name": "active_mode",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        {
-          "Custom": {
-            "name": "http_method",
-            "kind": {
-              "Enum": [
-                "get",
-                "post",
-                "put",
-                "delete",
-                "patch"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      false
-    ]
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b.json
-  "hash": "5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b"
-========
-  "hash": "bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346"
->>>>>>>> main:backend/.sqlx/query-bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346.json
-}

backend/.sqlx/query-53b43ebf9659a8310540603791593cdfa218ceb7187e00cee2cf2ea00e9ef8dc.json

@@ -1,24 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_completed c SET\n                    result = NULL,\n                    deleted = TRUE\n                FROM v2_job j\n                WHERE c.id = $1\n                    AND j.id = c.id\n                    AND c.workspace_id = $2\n                    AND ($3::TEXT[] IS NULL OR tag = ANY($3))\n                RETURNING c.id\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "53b43ebf9659a8310540603791593cdfa218ceb7187e00cee2cf2ea00e9ef8dc"
-}

backend/.sqlx/query-542b670194b802f09af8ecc4f339524b914fd1bbd620a6d529a0a96766591bc8.json

@@ -1,101 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                WITH result_stream AS (\n                    SELECT \n                        string_agg(stream, '' order by idx asc) as stream, \n                        job_id, \n                        max(idx) + 1 as offset \n                    FROM job_result_stream_v2\n                    WHERE job_id = $3 AND idx >= $8\n                    GROUP BY job_id\n                )\n                SELECT\n                    c.id IS NOT NULL AS completed,\n                    CASE\n                        WHEN q.id IS NOT NULL THEN (CASE WHEN NOT $5 AND q.running THEN true ELSE null END)\n                        ELSE false\n                    END AS running,\n                    CASE WHEN $7::BOOLEAN THEN NULL ELSE SUBSTR(logs, GREATEST($1 - log_offset, 0)) END AS logs,\n                    rs.stream AS new_result_stream,\n                    COALESCE(r.memory_peak, c.memory_peak) AS mem_peak,\n                    COALESCE(c.flow_status, f.flow_status) AS \"flow_status: sqlx::types::Json<Box<RawValue>>\",\n                    (COALESCE(c.flow_status, f.flow_status)->>'stream_job')::uuid AS stream_job,\n                    COALESCE(c.workflow_as_code_status, f.workflow_as_code_status) AS \"workflow_as_code_status: sqlx::types::Json<Box<RawValue>>\",\n                    CASE WHEN $7::BOOLEAN THEN NULL ELSE job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 END AS log_offset,\n                    rs.offset AS stream_offset,\n                    created_by AS \"created_by!\",\n                    CASE WHEN $4::BOOLEAN THEN (\n                        SELECT scalar_int FROM job_stats WHERE job_id = $3 AND metric_id = 'progress_perc'\n                    ) END AS progress,\n                    rs.stream AS \"result_stream: Option<String>\"\n                FROM v2_job j\n                    LEFT JOIN v2_job_queue q USING (id)\n                    LEFT JOIN v2_job_runtime r USING (id)\n                    LEFT JOIN v2_job_status f USING (id)\n                    LEFT JOIN v2_job_completed c USING (id)\n                    LEFT JOIN result_stream rs ON rs.job_id = $3\n                    LEFT JOIN job_logs ON job_logs.job_id =  $3\n                WHERE j.workspace_id = $2 AND j.id = $3\n                AND ($6::text[] IS NULL OR j.tag = ANY($6))",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "completed",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 1,
-        "name": "running",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "logs",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "new_result_stream",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "mem_peak",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 5,
-        "name": "flow_status: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 6,
-        "name": "stream_job",
-        "type_info": "Uuid"
-      },
-      {
-        "ordinal": 7,
-        "name": "workflow_as_code_status: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 8,
-        "name": "log_offset",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 9,
-        "name": "stream_offset",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 10,
-        "name": "created_by!",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 11,
-        "name": "progress",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 12,
-        "name": "result_stream: Option<String>",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Text",
-        "Uuid",
-        "Bool",
-        "Bool",
-        "TextArray",
-        "Bool",
-        "Int4"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      false,
-      null,
-      null
-    ]
-  },
-  "hash": "542b670194b802f09af8ecc4f339524b914fd1bbd620a6d529a0a96766591bc8"
-}

backend/.sqlx/query-584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1.json

@@ -1,84 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1.json
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    active_mode,\n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE local_part = $1 \n                    AND workspaced_local_part = FALSE\n                ",
-========
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE local_part = $1 \n                    AND workspaced_local_part = FALSE\n                    AND enabled IS TRUE\n                ",
->>>>>>>> main:backend/.sqlx/query-628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941.json
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "script_path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "is_flow",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 2,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 3,
-        "name": "active_mode",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
-        "name": "edited_by",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "path",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "error_handler_path: _",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "error_handler_args: _",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 9,
-        "name": "retry: _",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      true
-    ]
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1.json
-  "hash": "584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1"
-========
-  "hash": "628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941"
->>>>>>>> main:backend/.sqlx/query-628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941.json
-}

backend/.sqlx/query-5e7cadffbee74b11e224b60322b102b9899b4a97b8e557692c0085a9b472b8a7.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT j.created_by AS \"created_by\", coalesce(job_logs.logs, '') as logs, COALESCE(job_logs.log_offset, 0) as log_offset, job_logs.log_file_index\n            FROM v2_job j\n            LEFT JOIN job_logs ON job_logs.job_id = j.id\n            WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
+  "query": "SELECT j.created_by AS \"created_by\", coalesce(job_logs.logs, '') as logs, COALESCE(job_logs.log_offset, 0) as log_offset, job_logs.log_file_index\n        FROM v2_job j\n        LEFT JOIN job_logs ON job_logs.job_id = j.id\n        WHERE j.id = $1 AND j.workspace_id = $2 AND ($3::text[] IS NULL OR j.tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -38,5 +38,5 @@
       true
     ]
   },
-  "hash": "f0bfdcd5949cba7cb9c3ee5632ca9e0bb94fc00b72d51aa755efea09dfc582f1"
+  "hash": "5e7cadffbee74b11e224b60322b102b9899b4a97b8e557692c0085a9b472b8a7"
 }

backend/.sqlx/query-628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1.json
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    active_mode,\n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE local_part = $1 \n                    AND workspaced_local_part = FALSE\n                ",
-========
   "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE local_part = $1 \n                    AND workspaced_local_part = FALSE\n                    AND enabled IS TRUE\n                ",
->>>>>>>> main:backend/.sqlx/query-628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941.json
   "describe": {
     "columns": [
       {
@@ -24,36 +20,31 @@
       },
       {
         "ordinal": 3,
-        "name": "active_mode",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
         "name": "edited_by",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 5,
+        "ordinal": 4,
         "name": "email",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "error_handler_path: _",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "error_handler_args: _",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "retry: _",
         "type_info": "Jsonb"
       }
@@ -70,15 +61,10 @@
       false,
       false,
       false,
-      false,
       true,
       true,
       true
     ]
   },
-<<<<<<<< HEAD:backend/.sqlx/query-584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1.json
-  "hash": "584be877a6c0efe42e82b0ee441968dd4955ff342db3ebe13dcd9f66361b9ef1"
-========
   "hash": "628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941"
->>>>>>>> main:backend/.sqlx/query-628d303956d55d22e5ac64496b66010d4476d5c222184f09e5a189975a37b941.json
 }

backend/.sqlx/query-68b21b67e0d7977cf34a4e360a0fdeb62c81b1ef19d4283debeb252f398a7543.json

@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT COUNT(*) as count\n                FROM v2_job_queue\n                WHERE scheduled_for < to_timestamp($1::bigint / 1000.0)\n                AND running = false\n                AND suspend_until IS NULL",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "count",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "68b21b67e0d7977cf34a4e360a0fdeb62c81b1ef19d4283debeb252f398a7543"
-}

backend/.sqlx/query-695a02db2ee43d18fdf139b52eb546cffa44845cd634f188d6619cf39462ca93.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                    result #> $3 AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                    result_columns,\n                    created_by AS \"created_by!\"\n                FROM v2_job_completed c\n                    JOIN v2_job USING (id)\n                WHERE c.id = $1 AND c.workspace_id = $2 AND ($4::text[] IS NULL OR tag = ANY($4))",
+  "query": "SELECT\n                result #> $3 AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                result_columns,\n                created_by AS \"created_by!\"\n            FROM v2_job_completed c\n                JOIN v2_job USING (id)\n            WHERE c.id = $1 AND c.workspace_id = $2 AND ($4::text[] IS NULL OR tag = ANY($4))",
   "describe": {
     "columns": [
       {
@@ -33,5 +33,5 @@
       false
     ]
   },
-  "hash": "0e9c3bc8afd819635ff60ed9fb548bbd25e7cf76bdbe06107d82430601c402b7"
+  "hash": "695a02db2ee43d18fdf139b52eb546cffa44845cd634f188d6619cf39462ca93"
 }

backend/.sqlx/query-69f370c2e3596c1a8256b0903332a36e5b8bd03099617db11eed44f291377880.json

@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            SELECT j.tag as \"tag!\", COUNT(*) as \"count!\"\n            FROM v2_job_completed c JOIN v2_job j USING (id)\n            WHERE c.started_at > NOW() - make_interval(secs => $1) AND ($2::text IS NULL OR j.workspace_id = $2)\n            GROUP BY j.tag\n            ORDER BY \"count!\" DESC\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "tag!",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "count!",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Float8",
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      null
-    ]
-  },
-  "hash": "69f370c2e3596c1a8256b0903332a36e5b8bd03099617db11eed44f291377880"
-}

backend/.sqlx/query-6b9ea0059ad1037a77f67b70d5de13776870612e8faa8d8fa577f8e7b7309f76.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT j.id AS \"id!\", COALESCE(s.flow_status, s.workflow_as_code_status) as flow_status, q.suspend AS \"suspend!\", j.runnable_path as script_path\n            FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_status s USING (id)\n            WHERE j.id = $1\n            ",
+  "query": "\n        SELECT j.id AS \"id!\", COALESCE(s.flow_status, s.workflow_as_code_status) as flow_status, q.suspend AS \"suspend!\", j.runnable_path as script_path\n        FROM v2_job_queue q JOIN v2_job j USING (id) LEFT JOIN v2_job_status s USING (id)\n        WHERE j.id = $1\n        ",
   "describe": {
     "columns": [
       {
@@ -36,5 +36,5 @@
       true
     ]
   },
-  "hash": "485dc289a61a06595acae28d4968f3b6b2aeb6a8aee863dc999d6c8d58397814"
+  "hash": "6b9ea0059ad1037a77f67b70d5de13776870612e8faa8d8fa577f8e7b7309f76"
 }

backend/.sqlx/query-6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff.json
-  "query": "\n            INSERT INTO email_trigger (\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                local_part,\n                workspaced_local_part,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, now(), $9, $10, $11, $12\n            )\n            ",
-========
   "query": "\n            INSERT INTO email_trigger (\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                local_part,\n                workspaced_local_part,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                enabled\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, now(), $9, $10, $11, $12\n            )\n            ",
->>>>>>>> main:backend/.sqlx/query-6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c.json
   "describe": {
     "columns": [],
     "parameters": {
@@ -25,9 +21,5 @@
     },
     "nullable": []
   },
-<<<<<<<< HEAD:backend/.sqlx/query-a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff.json
-  "hash": "a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff"
-========
   "hash": "6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c"
->>>>>>>> main:backend/.sqlx/query-6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c.json
 }

backend/.sqlx/query-6df2ca52e3e8515c398943da701600a33e64525809fdd67bce63e28d98eababc.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT created_by AS \"created_by!\", coalesce(job_logs.logs, '') as logs\n            FROM v2_job\n            LEFT JOIN job_logs ON job_logs.job_id = v2_job.id\n            WHERE v2_job.id = $1 AND v2_job.workspace_id = $2 AND ($3::text[] IS NULL OR v2_job.tag = ANY($3))\n            ORDER BY job_logs.log_offset DESC\n            LIMIT 100",
+  "query": "SELECT created_by AS \"created_by!\", coalesce(job_logs.logs, '') as logs\n        FROM v2_job\n        LEFT JOIN job_logs ON job_logs.job_id = v2_job.id\n        WHERE v2_job.id = $1 AND v2_job.workspace_id = $2 AND ($3::text[] IS NULL OR v2_job.tag = ANY($3))\n        ORDER BY job_logs.log_offset DESC\n        LIMIT 100",
   "describe": {
     "columns": [
       {
@@ -26,5 +26,5 @@
       null
     ]
   },
-  "hash": "eff41f41ffa6793baa65131258d8c9b67669db25ad3923bdb43093fd7b409736"
+  "hash": "6df2ca52e3e8515c398943da701600a33e64525809fdd67bce63e28d98eababc"
 }

backend/.sqlx/query-750f09238caf114d01f752a145fd4289f04f3961d5035d42f3fd0bd2f87eed1a.json

@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE v2_job_status f SET flow_status = JSONB_SET(flow_status,  ARRAY['user_states'], JSONB_SET(COALESCE(flow_status->'user_states', '{}'::jsonb), ARRAY[$1], $2))\n            FROM v2_job j\n            WHERE f.id = $3 AND f.id = j.id AND j.workspace_id = $4 AND kind IN ('flow', 'flowpreview', 'flownode') RETURNING 1\n            ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "?column?",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Jsonb",
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "750f09238caf114d01f752a145fd4289f04f3961d5035d42f3fd0bd2f87eed1a"
-}

backend/.sqlx/query-76690ea29969da28840c90016ec78e5ea7f326df9f19e9d2f0445e662c921fea.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT q.id, f.flow_status, q.suspend, j.runnable_path AS script_path\n            FROM v2_job_queue q\n                JOIN v2_job j USING (id)\n                JOIN v2_job_status f USING (id)\n            WHERE id = ( SELECT parent_job FROM v2_job WHERE id = $1 )\n            FOR UPDATE\n            ",
+  "query": "\n        SELECT q.id, f.flow_status, q.suspend, j.runnable_path AS script_path\n        FROM v2_job_queue q\n            JOIN v2_job j USING (id)\n            JOIN v2_job_status f USING (id)\n        WHERE id = ( SELECT parent_job FROM v2_job WHERE id = $1 )\n        FOR UPDATE\n        ",
   "describe": {
     "columns": [
       {
@@ -36,5 +36,5 @@
       true
     ]
   },
-  "hash": "83785ee2f7dcc7f2252b0e8bcc8322dfd7689d615a34b63e29c9c6699b7e5514"
+  "hash": "76690ea29969da28840c90016ec78e5ea7f326df9f19e9d2f0445e662c921fea"
 }

backend/.sqlx/query-79d6b757c9556cfcf0c98f52035b5f1a9036b6005764b79c415373a5d39c3211.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                    SELECT\n                        result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                        result_columns,\n                        status = 'success' AS \"success!\"\n                    FROM \n                        v2_job_completed\n                    WHERE \n                        id = $1 AND \n                        workspace_id = $2\n                    ",
+  "query": "\n                SELECT\n                    result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                    result_columns,\n                    status = 'success' AS \"success!\"\n                FROM \n                    v2_job_completed\n                WHERE \n                    id = $1 AND \n                    workspace_id = $2\n                ",
   "describe": {
     "columns": [
       {
@@ -31,5 +31,5 @@
       null
     ]
   },
-  "hash": "f7f0c846cb9db866fd5188631f238eb69709b86976079425549d5bab8eefbac7"
+  "hash": "79d6b757c9556cfcf0c98f52035b5f1a9036b6005764b79c415373a5d39c3211"
 }

backend/.sqlx/query-7b524ee24bb78e494a93c5ea205259bd989a9d769a6a300d37ab116960438882.json

@@ -0,0 +1,101 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            WITH result_stream AS (\n                SELECT \n                    string_agg(stream, '' order by idx asc) as stream, \n                    job_id, \n                    max(idx) + 1 as offset \n                FROM job_result_stream_v2\n                WHERE job_id = $3 AND idx >= $8\n                GROUP BY job_id\n            )\n            SELECT\n                c.id IS NOT NULL AS completed,\n                CASE\n                    WHEN q.id IS NOT NULL THEN (CASE WHEN NOT $5 AND q.running THEN true ELSE null END)\n                    ELSE false\n                END AS running,\n                CASE WHEN $7::BOOLEAN THEN NULL ELSE SUBSTR(logs, GREATEST($1 - log_offset, 0)) END AS logs,\n                rs.stream AS new_result_stream,\n                COALESCE(r.memory_peak, c.memory_peak) AS mem_peak,\n                COALESCE(c.flow_status, f.flow_status) AS \"flow_status: sqlx::types::Json<Box<RawValue>>\",\n                (COALESCE(c.flow_status, f.flow_status)->>'stream_job')::uuid AS stream_job,\n                COALESCE(c.workflow_as_code_status, f.workflow_as_code_status) AS \"workflow_as_code_status: sqlx::types::Json<Box<RawValue>>\",\n                CASE WHEN $7::BOOLEAN THEN NULL ELSE job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 END AS log_offset,\n                rs.offset AS stream_offset,\n                created_by AS \"created_by!\",\n                CASE WHEN $4::BOOLEAN THEN (\n                    SELECT scalar_int FROM job_stats WHERE job_id = $3 AND metric_id = 'progress_perc'\n                ) END AS progress,\n                rs.stream AS \"result_stream: Option<String>\"\n            FROM v2_job j\n                LEFT JOIN v2_job_queue q USING (id)\n                LEFT JOIN v2_job_runtime r USING (id)\n                LEFT JOIN v2_job_status f USING (id)\n                LEFT JOIN v2_job_completed c USING (id)\n                LEFT JOIN result_stream rs ON rs.job_id = $3\n                LEFT JOIN job_logs ON job_logs.job_id =  $3\n            WHERE j.workspace_id = $2 AND j.id = $3\n            AND ($6::text[] IS NULL OR j.tag = ANY($6))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "completed",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 1,
+        "name": "running",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "logs",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "new_result_stream",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "mem_peak",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 5,
+        "name": "flow_status: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 6,
+        "name": "stream_job",
+        "type_info": "Uuid"
+      },
+      {
+        "ordinal": 7,
+        "name": "workflow_as_code_status: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 8,
+        "name": "log_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 9,
+        "name": "stream_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 10,
+        "name": "created_by!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 11,
+        "name": "progress",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 12,
+        "name": "result_stream: Option<String>",
+        "type_info": "Text"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Text",
+        "Uuid",
+        "Bool",
+        "Bool",
+        "TextArray",
+        "Bool",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      false,
+      null,
+      null
+    ]
+  },
+  "hash": "7b524ee24bb78e494a93c5ea205259bd989a9d769a6a300d37ab116960438882"
+}

backend/.sqlx/query-7b5dc50b685afc7de0b99bd68e2217d660529c15b41860a4513f63d465bb9abb.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO concurrency_counter(concurrency_id, job_uuids)\n                VALUES ($1, '{}'::jsonb)",
+  "query": "INSERT INTO concurrency_counter(concurrency_id, job_uuids)\n             VALUES ($1, '{}'::jsonb)",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "a5313b8d1d29c13a5b23cd8b6f9bd4c3d96c53dd0d8702facfefaaf35b7d6b26"
+  "hash": "7b5dc50b685afc7de0b99bd68e2217d660529c15b41860a4513f63d465bb9abb"
 }

backend/.sqlx/query-7cab8475996f0abd7ca7888b460bd3faf3bef6e34200c258e3704981817c241e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT \n                path \n            FROM \n                flow_version \n            WHERE \n                id = $1 AND \n                workspace_id = $2\n            ",
+  "query": "\n            SELECT \n                path \n            FROM \n                flow_version \n            WHERE \n                id = $1 AND \n                workspace_id = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -19,5 +19,5 @@
       false
     ]
   },
-  "hash": "0188214a2d01b11e441b6bec56f62c97a821d50f0be73df88f735978ae2ea0ae"
+  "hash": "7cab8475996f0abd7ca7888b460bd3faf3bef6e34200c258e3704981817c241e"
 }

backend/.sqlx/query-81ba1e003d3f6e8e7c74a4dd09b980888d71121082390f3fdb91269cd0c5d0b2.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT coalesce(flow_version_lite.value, flow_version.value) as \"value!: sqlx::types::Json<Box<RawValue>>\" FROM flow\n                        LEFT JOIN flow_version\n                            ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]\n                        LEFT JOIN flow_version_lite\n                            ON flow_version_lite.id = flow_version.id\n                        WHERE flow.path = $1 AND flow.workspace_id = $2 LIMIT 1",
+  "query": "SELECT coalesce(flow_version_lite.value, flow_version.value) as \"value!: sqlx::types::Json<Box<RawValue>>\" FROM flow\n                    LEFT JOIN flow_version\n                        ON flow_version.id = flow.versions[array_upper(flow.versions, 1)]\n                    LEFT JOIN flow_version_lite\n                        ON flow_version_lite.id = flow_version.id\n                    WHERE flow.path = $1 AND flow.workspace_id = $2 LIMIT 1",
   "describe": {
     "columns": [
       {
@@ -19,5 +19,5 @@
       null
     ]
   },
-  "hash": "530b2a88c1465e89670bb3a42f31e44df72184613cd563cc38f846bb992f7ce2"
+  "hash": "81ba1e003d3f6e8e7c74a4dd09b980888d71121082390f3fdb91269cd0c5d0b2"
 }

backend/.sqlx/query-8440081df15fa7874dded86b8af572d971d5892b7dd4c8e824b953113bd6c4a9.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            SELECT parent_job\n            FROM v2_job\n            WHERE id = $1 AND workspace_id = $2\n            ",
+  "query": "\n        SELECT parent_job\n        FROM v2_job\n        WHERE id = $1 AND workspace_id = $2\n        ",
   "describe": {
     "columns": [
       {
@@ -19,5 +19,5 @@
       true
     ]
   },
-  "hash": "16bc77fd2debbc66187883e48c599aa9d3b280ae792ab2af9bb492c0f6f7c029"
+  "hash": "8440081df15fa7874dded86b8af572d971d5892b7dd4c8e824b953113bd6c4a9"
 }

backend/.sqlx/query-9272643a0efd45b7a2f9ed6957801d57b74f4f41f6df80324ae964447b90fe8f.json

@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                SELECT \n                    CASE \n                        WHEN flow_version.id IS NOT NULL THEN\n                            (flow_version.value -> 'flow_env' -> $3) #> $4\n                        ELSE\n                            (root_job.raw_flow -> 'flow_env' -> $3) #> $4\n                    END AS \"flow_env: sqlx::types::Json<Box<RawValue>>\"\n                FROM \n                    v2_job current_job\n                JOIN \n                    v2_job root_job ON root_job.id = COALESCE(current_job.root_job, current_job.flow_innermost_root_job, current_job.parent_job, current_job.id)\n                    AND root_job.workspace_id = current_job.workspace_id\n                LEFT JOIN\n                    flow_version ON flow_version.id = root_job.runnable_id\n                    AND flow_version.path = root_job.runnable_path\n                    AND flow_version.workspace_id = root_job.workspace_id\n            WHERE \n                    current_job.id = $1 AND \n                    current_job.workspace_id = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "flow_env: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text",
-        "Text",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "9272643a0efd45b7a2f9ed6957801d57b74f4f41f6df80324ae964447b90fe8f"
-}

backend/.sqlx/query-94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a.json
-  "query": "\n            INSERT INTO http_trigger (\n                workspace_id,\n                path,\n                route_path,\n                route_path_key,\n                workspaced_route,\n                authentication_resource_path,\n                wrap_body,\n                raw_string,\n                script_path,\n                summary,\n                description,\n                is_flow,\n                request_type,\n                authentication_method,\n                http_method,\n                static_asset_config,\n                edited_by,\n                email,\n                edited_at,\n                is_static_website,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, now(), $19, $20, $21, $22, $23\n            )\n            ",
-========
   "query": "\n            INSERT INTO http_trigger (\n                workspace_id,\n                path,\n                route_path,\n                route_path_key,\n                workspaced_route,\n                authentication_resource_path,\n                wrap_body,\n                raw_string,\n                script_path,\n                summary,\n                description,\n                is_flow,\n                enabled,\n                request_type,\n                authentication_method,\n                http_method,\n                static_asset_config,\n                edited_by,\n                email,\n                edited_at,\n                is_static_website,\n                error_handler_path,\n                error_handler_args,\n                retry\n            )\n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, now(), $20, $21, $22, $23\n            )\n            ",
->>>>>>>> main:backend/.sqlx/query-94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e.json
   "describe": {
     "columns": [],
     "parameters": {
@@ -69,15 +65,10 @@
         "Bool",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-<<<<<<<< HEAD:backend/.sqlx/query-08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a.json
-  "hash": "08f27a09648b10524253580e957571080b7cee24655ba613782f47eda4ebd31a"
-========
   "hash": "94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e"
->>>>>>>> main:backend/.sqlx/query-94e2e899fc0a5134c29217feda1f0530d03548cc5c884c83d7b85d068e738b8e.json
 }

backend/.sqlx/query-9abbb75c238372cc3dbaebf1dbc50ff78df6c5dcf92b08d611afe23c5b865521.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO sqs_trigger (\n                workspace_id,\n                path,\n                queue_url,\n                aws_resource_path,\n                message_attributes,\n                aws_auth_resource_type,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, now(), $12, $13, $14, $15\n            )\n            ",
+  "query": "\n            INSERT INTO sqs_trigger (\n                workspace_id,\n                path,\n                queue_url,\n                aws_resource_path,\n                message_attributes,\n                aws_auth_resource_type,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, now(), $12, $13, $14\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -28,11 +28,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "cdd03d9904fc27f52483776de0f70315ac8e04c878c12f6d0d1e4819260c7dcf"
+  "hash": "9abbb75c238372cc3dbaebf1dbc50ff78df6c5dcf92b08d611afe23c5b865521"
 }

backend/.sqlx/query-9c0bbd44902d8eee393236f7c2372b273d14a093bb29ec12dda8bbfaecd49a35.json

@@ -0,0 +1,55 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                WITH result_stream AS (\n                    SELECT \n                        string_agg(stream, '' order by idx asc) as stream, \n                        job_id, \n                        max(idx) + 1 as offset \n                    FROM job_result_stream_v2\n                    WHERE job_id = $2 AND idx >= $3\n                    GROUP BY job_id\n                )\n                SELECT \n                    jc.result as \"result: sqlx::types::Json<Box<RawValue>>\",\n                    v2_job.tag,\n                    v2_job_queue.running as \"running: Option<bool>\",\n                    rs.stream AS \"result_stream: Option<String>\",\n                    rs.offset AS stream_offset,\n                    CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                FROM v2_job\n                LEFT JOIN v2_job_queue USING (id)\n                LEFT JOIN v2_job_completed jc USING (id)\n                LEFT JOIN v2_job_status js USING (id)\n                LEFT JOIN result_stream rs ON rs.job_id = $2\n                WHERE v2_job.id = $2 AND v2_job.workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "result: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 1,
+        "name": "tag",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "running: Option<bool>",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 3,
+        "name": "result_stream: Option<String>",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 4,
+        "name": "stream_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 5,
+        "name": "stream_job",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Int4",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      true,
+      false,
+      false,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "9c0bbd44902d8eee393236f7c2372b273d14a093bb29ec12dda8bbfaecd49a35"
+}

backend/.sqlx/query-9ebf262393fc4a29e8f09b304dd99e786fe78dd21721e8f54dc943dd571a7e08.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO websocket_trigger (\n                workspace_id,\n                path,\n                url,\n                script_path,\n                is_flow,\n                enabled,\n                filters,\n                initial_messages,\n                url_runnable_args,\n                edited_by,\n                can_return_message,\n                can_return_error_result,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, now(), $14, $15, $16, $17\n            )\n            ",
+  "query": "\n            INSERT INTO websocket_trigger (\n                workspace_id,\n                path,\n                url,\n                script_path,\n                is_flow,\n                enabled,\n                filters,\n                initial_messages,\n                url_runnable_args,\n                edited_by,\n                can_return_message,\n                can_return_error_result,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, now(), $14, $15, $16\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -20,11 +20,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "772a01c49b358714765ba75462476f05c70b377f8f0da6129882943dc8f1e18c"
+  "hash": "9ebf262393fc4a29e8f09b304dd99e786fe78dd21721e8f54dc943dd571a7e08"
 }

backend/.sqlx/query-a1ab1f23f49496f745d89d6c33a91c6b693afc4477a634aa84f81db91f9e03a4.json

@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT COALESCE(\n                    (SELECT DISTINCT ON (s.path) s.schema FROM script s WHERE s.path = jb.runnable_path AND jb.kind = 'script' ORDER BY s.path, s.created_at DESC),\n                    (SELECT flow_version.schema FROM flow LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)] WHERE flow.path = jb.runnable_path AND jb.kind = 'flow')\n                ) FROM v2_job jb\n                WHERE jb.id = $1 AND jb.workspace_id = $2\n                GROUP BY jb.kind, jb.runnable_path",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "coalesce",
-        "type_info": "Json"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "a1ab1f23f49496f745d89d6c33a91c6b693afc4477a634aa84f81db91f9e03a4"
-}

backend/.sqlx/query-a76eec5797ca8f97e63ed5542bf03873e7dfd1cf9fe984c769afb5a8bdb48d49.json

@@ -0,0 +1,49 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                    WITH result_stream AS (\n                        SELECT \n                            string_agg(stream, '' order by idx asc) as stream, \n                            job_id, \n                            max(idx) + 1 as offset \n                        FROM job_result_stream_v2\n                        WHERE job_id = $1 AND idx >= $3\n                        GROUP BY job_id\n                    )\n                    SELECT\n                        COALESCE(jc.result, jc.result) as \"result: sqlx::types::Json<Box<RawValue>>\",\n                        jq.running as \"running: Option<bool>\",\n                        rs.stream AS \"result_stream: Option<String>\",\n                        rs.offset AS stream_offset,\n                        CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                    FROM (\n                        SELECT $1::uuid as job_id, $2::text as workspace_id\n                    ) base\n                    LEFT JOIN v2_job_completed jc ON jc.id = base.job_id AND jc.workspace_id = base.workspace_id\n                    LEFT JOIN v2_job_queue jq ON jq.id = base.job_id AND jq.workspace_id = base.workspace_id\n                    LEFT JOIN v2_job_status js ON js.id = base.job_id\n                    LEFT JOIN result_stream rs ON rs.job_id = base.job_id\n                    WHERE base.job_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "result: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 1,
+        "name": "running: Option<bool>",
+        "type_info": "Bool"
+      },
+      {
+        "ordinal": 2,
+        "name": "result_stream: Option<String>",
+        "type_info": "Text"
+      },
+      {
+        "ordinal": 3,
+        "name": "stream_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 4,
+        "name": "stream_job",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text",
+        "Int4",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null,
+      false,
+      null,
+      null,
+      null
+    ]
+  },
+  "hash": "a76eec5797ca8f97e63ed5542bf03873e7dfd1cf9fe984c769afb5a8bdb48d49"
+}

backend/.sqlx/query-a810e7912b65e6d4b361c9d34aa4c34d17c8444699f7bf29cc6907cdac6106f3.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO v2_job_status (id, flow_status)\n                SELECT unnest($1::uuid[]), $2",
+  "query": "INSERT INTO v2_job_status (id, flow_status)\n            SELECT unnest($1::uuid[]), $2",
   "describe": {
     "columns": [],
     "parameters": {
@@ -11,5 +11,5 @@
     },
     "nullable": []
   },
-  "hash": "6adafb42a54ed389bfbf8cf0065aece2d59e4f8b1d433273220d929671a6c94d"
+  "hash": "a810e7912b65e6d4b361c9d34aa4c34d17c8444699f7bf29cc6907cdac6106f3"
 }

backend/.sqlx/query-a8ccf0f70cb8286e9dcafda5cbd542af647ca392cf6e307dc9358ed8b2ba640f.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                result_columns,\n                status = 'success' AS \"success!\",\n                created_by AS \"created_by!\"\n            FROM v2_job_completed c\n                JOIN v2_job j USING (id)\n            WHERE c.id = $1 AND c.workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
+  "query": "SELECT\n                result AS \"result: sqlx::types::Json<Box<RawValue>>\",\n                result_columns,\n                created_by AS \"created_by!\"\n            FROM v2_job_completed c\n                JOIN v2_job USING (id)\n            WHERE c.id = $1 AND c.workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -15,11 +15,6 @@
       },
       {
         "ordinal": 2,
-        "name": "success!",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 3,
         "name": "created_by!",
         "type_info": "Varchar"
       }
@@ -34,9 +29,8 @@
     "nullable": [
       true,
       true,
-      null,
       false
     ]
   },
-  "hash": "e0ddd0ca6c3f94a26345d34a6b04c2e240bb90075bba33a91402655c9e764b30"
+  "hash": "a8ccf0f70cb8286e9dcafda5cbd542af647ca392cf6e307dc9358ed8b2ba640f"
 }

backend/.sqlx/query-a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff.json

@@ -1,33 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff.json
-  "query": "\n            INSERT INTO email_trigger (\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                local_part,\n                workspaced_local_part,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, now(), $9, $10, $11, $12\n            )\n            ",
-========
-  "query": "\n            INSERT INTO email_trigger (\n                workspace_id,\n                path,\n                script_path,\n                is_flow,\n                local_part,\n                workspaced_local_part,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                enabled\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, now(), $9, $10, $11, $12\n            )\n            ",
->>>>>>>> main:backend/.sqlx/query-6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c.json
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Bool"
-      ]
-    },
-    "nullable": []
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff.json
-  "hash": "a94ad46c7755fe5d92acc0e7b8ed58193bcea63b38ec567d570491e06fca6aff"
-========
-  "hash": "6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c"
->>>>>>>> main:backend/.sqlx/query-6c568509908c1833d9e6f58f739b8a186fc91f94d4fcc40eeb9914084e4ef60c.json
-}

backend/.sqlx/query-ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1.json
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                wrap_body = $1,\n                raw_string = $2,\n                authentication_resource_path = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                http_method = $7,\n                static_asset_config = $8,\n                edited_by = $9,\n                email = $10,\n                request_type = $11,\n                authentication_method = $12,\n                summary = $13,\n                description = $14,\n                edited_at = now(),\n                is_static_website = $15,\n                error_handler_path = $16,\n                error_handler_args = $17,\n                retry = $18,\n                active_mode = $19\n            WHERE\n                workspace_id = $20 AND\n                path = $21\n            ",
-========
   "query": "\n            UPDATE\n                http_trigger\n            SET\n                wrap_body = $1,\n                raw_string = $2,\n                authentication_resource_path = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                enabled = $7,\n                http_method = $8,\n                static_asset_config = $9,\n                edited_by = $10,\n                email = $11,\n                request_type = $12,\n                authentication_method = $13,\n                summary = $14,\n                description = $15,\n                edited_at = now(),\n                is_static_website = $16,\n                error_handler_path = $17,\n                error_handler_args = $18,\n                retry = $19\n            WHERE\n                workspace_id = $20 AND\n                path = $21\n            ",
->>>>>>>> main:backend/.sqlx/query-ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2.json
   "describe": {
     "columns": [],
     "parameters": {
@@ -66,16 +62,11 @@
         "Varchar",
         "Jsonb",
         "Jsonb",
-        "Bool",
         "Text",
         "Text"
       ]
     },
     "nullable": []
   },
-<<<<<<<< HEAD:backend/.sqlx/query-fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1.json
-  "hash": "fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1"
-========
   "hash": "ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2"
->>>>>>>> main:backend/.sqlx/query-ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2.json
 }

backend/.sqlx/query-aeaae7641539d51f4535b04e9a7adb7545bd37d0d706edb54b8f5507403105ee.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT resume_id, approver\n                FROM resume_job\n                WHERE job = $1\n                ",
+  "query": "\n            SELECT resume_id, approver\n            FROM resume_job\n            WHERE job = $1\n            ",
   "describe": {
     "columns": [
       {
@@ -24,5 +24,5 @@
       true
     ]
   },
-  "hash": "b6a431847363eda74ffbacdaccedb0aa19608014983b41522befd9e2e00033d6"
+  "hash": "aeaae7641539d51f4535b04e9a7adb7545bd37d0d706edb54b8f5507403105ee"
 }

backend/.sqlx/query-b2f6327828acc4ba1872c20a138ac5fb13680b0e574d6c7c16e3bc420dd90727.json

@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*) as count\n             FROM v2_job_queue\n             WHERE scheduled_for < to_timestamp($1::bigint / 1000.0)\n             AND running = false\n             AND suspend_until IS NULL",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b2f6327828acc4ba1872c20a138ac5fb13680b0e574d6c7c16e3bc420dd90727"
+}

backend/.sqlx/query-b3c02fd225a6aa78785d466e7f033b38deb9c7fa17bd3836c9ad8884f27be84a.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT\n                        j.id,\n                        j.kind AS \"kind: _\",\n                        COALESCE(s.path, f.path) AS \"script_path!\",\n                        COALESCE(s.hash, f.id) AS \"script_hash!: _\",\n                        COALESCE(jc.started_at, jq.scheduled_for, make_date(1970, 1, 1)) AS \"scheduled_for!: _\",\n                        args AS input,\n                        COALESCE(s.schema, f.schema) AS \"schema: _\"\n                    FROM v2_job j\n                    LEFT JOIN script s ON j.runnable_id = s.hash AND j.kind = 'script'\n                    LEFT JOIN flow_version f ON j.runnable_id = f.id AND j.runnable_path = f.path AND j.kind = 'flow'\n                    LEFT JOIN v2_job_completed jc ON jc.id = j.id\n                    LEFT JOIN v2_job_queue jq ON jq.id = j.id\n                    WHERE j.id = ANY($1)\n                        AND j.workspace_id = $2\n                        AND COALESCE(s.hash, f.id) IS NOT NULL\n                        AND COALESCE(s.path, f.path) IS NOT NULL",
+  "query": "SELECT\n                    j.id,\n                    j.kind AS \"kind: _\",\n                    COALESCE(s.path, f.path) AS \"script_path!\",\n                    COALESCE(s.hash, f.id) AS \"script_hash!: _\",\n                    COALESCE(jc.started_at, jq.scheduled_for, make_date(1970, 1, 1)) AS \"scheduled_for!: _\",\n                    args AS input,\n                    COALESCE(s.schema, f.schema) AS \"schema: _\"\n                FROM v2_job j\n                LEFT JOIN script s ON j.runnable_id = s.hash AND j.kind = 'script'\n                LEFT JOIN flow_version f ON j.runnable_id = f.id AND j.runnable_path = f.path AND j.kind = 'flow'\n                LEFT JOIN v2_job_completed jc ON jc.id = j.id\n                LEFT JOIN v2_job_queue jq ON jq.id = j.id\n                WHERE j.id = ANY($1)\n                    AND j.workspace_id = $2\n                    AND COALESCE(s.hash, f.id) IS NOT NULL\n                    AND COALESCE(s.path, f.path) IS NOT NULL",
   "describe": {
     "columns": [
       {
@@ -82,5 +82,5 @@
       null
     ]
   },
-  "hash": "e2905bca184696a80357d8e4126832a902b3088d91fbbb858f6c0aa9de8a5ff7"
+  "hash": "b3c02fd225a6aa78785d466e7f033b38deb9c7fa17bd3836c9ad8884f27be84a"
 }

backend/.sqlx/query-b5f6870444fc97d8beab3cf61c91e58936138d80a97b423c17338ba069b6a3aa.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        UPDATE \n            websocket_trigger\n        SET\n            url = $1,\n            script_path = $2,\n            path = $3,\n            is_flow = $4,\n            filters = $5,\n            initial_messages = $6,\n            url_runnable_args = $7,\n            edited_by = $8,\n            email = $9,\n            can_return_message = $10,\n            can_return_error_result = $11,\n            edited_at = now(),\n            server_id = NULL,\n            error = NULL,\n            error_handler_path = $14,\n            error_handler_args = $15,\n            retry = $16,\n            active_mode = $17\n        WHERE\n            workspace_id = $12 AND path = $13\n    ",
+  "query": "\n        UPDATE \n            websocket_trigger\n        SET\n            url = $1,\n            script_path = $2,\n            path = $3,\n            is_flow = $4,\n            filters = $5,\n            initial_messages = $6,\n            url_runnable_args = $7,\n            edited_by = $8,\n            email = $9,\n            can_return_message = $10,\n            can_return_error_result = $11,\n            edited_at = now(),\n            server_id = NULL,\n            error = NULL,\n            error_handler_path = $14,\n            error_handler_args = $15,\n            retry = $16\n        WHERE\n            workspace_id = $12 AND path = $13\n    ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -20,11 +20,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "86e97135c59a128cb95925fb01d1b70a7c47fd3c85ffc6519b90aafd4f47e4d0"
+  "hash": "b5f6870444fc97d8beab3cf61c91e58936138d80a97b423c17338ba069b6a3aa"
 }

backend/.sqlx/query-b82f97f2a858e20b1fb6d9b0b3eab5bab2bafa91689eac5073c1678c338afb27.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT \n            path \n        FROM \n            flow_version \n        WHERE \n            id = $1 AND \n            workspace_id = $2\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "path",
+        "type_info": "Varchar"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Text"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "b82f97f2a858e20b1fb6d9b0b3eab5bab2bafa91689eac5073c1678c338afb27"
+}

backend/.sqlx/query-b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c.json
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                route_path = $1,\n                route_path_key = $2,\n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7,\n                path = $8,\n                is_flow = $9,\n                http_method = $10,\n                static_asset_config = $11,\n                edited_by = $12,\n                email = $13,\n                request_type = $14,\n                authentication_method = $15,\n                summary = $16,\n                description = $17,\n                edited_at = now(),\n                is_static_website = $18,\n                error_handler_path = $19,\n                error_handler_args = $20,\n                retry = $21,\n                active_mode = $22\n            WHERE\n                workspace_id = $23 AND\n                path = $24\n            ",
-========
   "query": "\n            UPDATE\n                http_trigger\n            SET\n                route_path = $1,\n                route_path_key = $2,\n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7,\n                path = $8,\n                is_flow = $9,\n                enabled = $10,\n                http_method = $11,\n                static_asset_config = $12,\n                edited_by = $13,\n                email = $14,\n                request_type = $15,\n                authentication_method = $16,\n                summary = $17,\n                description = $18,\n                edited_at = now(),\n                is_static_website = $19,\n                error_handler_path = $20,\n                error_handler_args = $21,\n                retry = $22\n            WHERE\n                workspace_id = $23 AND\n                path = $24\n            ",
->>>>>>>> main:backend/.sqlx/query-b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96.json
   "describe": {
     "columns": [],
     "parameters": {
@@ -69,16 +65,11 @@
         "Varchar",
         "Jsonb",
         "Jsonb",
-        "Bool",
         "Text",
         "Text"
       ]
     },
     "nullable": []
   },
-<<<<<<<< HEAD:backend/.sqlx/query-f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c.json
-  "hash": "f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c"
-========
   "hash": "b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96"
->>>>>>>> main:backend/.sqlx/query-b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96.json
 }

backend/.sqlx/query-bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b.json
-  "query": "\n                    SELECT\n                        path,\n                        script_path,\n                        is_flow,\n                        route_path,\n                        authentication_resource_path,\n                        workspace_id,\n                        request_type AS \"request_type: _\",\n                        authentication_method  AS \"authentication_method: _\",\n                        edited_by,\n                        email,\n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website,\n                        error_handler_path,\n                        error_handler_args as \"error_handler_args: _\",\n                        retry as \"retry: _\",\n                        active_mode\n                    FROM\n                        http_trigger\n                    WHERE\n                        http_method = $1\n                    ",
-========
   "query": "\n                    SELECT\n                        path,\n                        script_path,\n                        is_flow,\n                        route_path,\n                        authentication_resource_path,\n                        workspace_id,\n                        request_type AS \"request_type: _\",\n                        authentication_method  AS \"authentication_method: _\",\n                        edited_by,\n                        email,\n                        static_asset_config AS \"static_asset_config: _\",\n                        wrap_body,\n                        raw_string,\n                        workspaced_route,\n                        is_static_website,\n                        error_handler_path,\n                        error_handler_args as \"error_handler_args: _\",\n                        retry as \"retry: _\"\n                    FROM\n                        http_trigger\n                    WHERE\n                        http_method = $1 AND\n                        enabled is TRUE\n                    ",
->>>>>>>> main:backend/.sqlx/query-bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346.json
   "describe": {
     "columns": [
       {
@@ -121,11 +117,6 @@
         "ordinal": 17,
         "name": "retry: _",
         "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 18,
-        "name": "active_mode",
-        "type_info": "Bool"
       }
     ],
     "parameters": {
@@ -164,13 +155,8 @@
       false,
       true,
       true,
-      true,
-      false
+      true
     ]
   },
-<<<<<<<< HEAD:backend/.sqlx/query-5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b.json
-  "hash": "5388c3aa4b9ff20036d63019317a1608ccb14cfb01294b2391f6a7fa197ae20b"
-========
   "hash": "bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346"
->>>>>>>> main:backend/.sqlx/query-bbc96ae911d4ca0330582340e65c10e008e507610f095ff3936865101c9ba346.json
 }

backend/.sqlx/query-bc0bd9659bb8b58ed5967754b1c403e77ebb044063f0659485f44b1d04bb6b4d.json

@@ -1,25 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "WITH uuid_table as (\n                select unnest($4::uuid[]) as uuid\n            )\n            INSERT INTO v2_job_queue\n                (id, workspace_id, scheduled_for, tag)\n                (SELECT uuid, $1, $2, $3 FROM uuid_table)\n            RETURNING id",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Timestamptz",
-        "Varchar",
-        "UuidArray"
-      ]
-    },
-    "nullable": [
-      false
-    ]
-  },
-  "hash": "bc0bd9659bb8b58ed5967754b1c403e77ebb044063f0659485f44b1d04bb6b4d"
-}

backend/.sqlx/query-cad2dfc50d57c2298cb0ec05ed3b42b9fd3edd05c314c9d96ba33cad37fe35c2.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO job_perms (job_id, email, username, is_admin, is_operator, folders, groups, workspace_id)\n            SELECT unnest($1::uuid[]), $2, $3, $4, $5, $6, $7, $8",
+  "query": "INSERT INTO job_perms (job_id, email, username, is_admin, is_operator, folders, groups, workspace_id)\n        SELECT unnest($1::uuid[]), $2, $3, $4, $5, $6, $7, $8",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,5 +17,5 @@
     },
     "nullable": []
   },
-  "hash": "ee56be959ce50ba4c8bfde170b5d965c0d35f69f62212549e14d3a2938be65c0"
+  "hash": "cad2dfc50d57c2298cb0ec05ed3b42b9fd3edd05c314c9d96ba33cad37fe35c2"
 }

backend/.sqlx/query-cd333b93d70640bfa124d334ab324629fb873a7234b56cc554e43db6585fbc49.json

@@ -1,20 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO resume_job\n                        (id, resume_id, job, flow, value, approver, approved)\n                VALUES ($1, $2, $3, $4, $5, $6, $7)\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Int4",
-        "Uuid",
-        "Uuid",
-        "Jsonb",
-        "Varchar",
-        "Bool"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "cd333b93d70640bfa124d334ab324629fb873a7234b56cc554e43db6585fbc49"
-}

backend/.sqlx/query-ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14.json

@@ -1,34 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14.json
-  "query": "\n                UPDATE email_trigger \n                SET \n                    script_path = $1,\n                    path = $2,\n                    is_flow = $3,\n                    local_part = $4,\n                    workspaced_local_part = $5,\n                    edited_by = $6,\n                    email = $7,\n                    edited_at = now(),\n                    error_handler_path = $8,\n                    error_handler_args = $9,\n                    retry = $10,\n                    active_mode = $11\n                WHERE \n                    workspace_id = $12 AND path = $13\n                ",
-========
-  "query": "\n                UPDATE email_trigger \n                SET \n                    script_path = $1,\n                    path = $2,\n                    is_flow = $3,\n                    local_part = $4,\n                    workspaced_local_part = $5,\n                    edited_by = $6,\n                    email = $7,\n                    edited_at = now(),\n                    error_handler_path = $8,\n                    error_handler_args = $9,\n                    retry = $10,\n                    enabled = $11\n                WHERE \n                    workspace_id = $12 AND path = $13\n                ",
->>>>>>>> main:backend/.sqlx/query-fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79.json
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Bool",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14.json
-  "hash": "ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14"
-========
-  "hash": "fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79"
->>>>>>>> main:backend/.sqlx/query-fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79.json
-}

backend/.sqlx/query-d067bf59ed65562f1efbfbc9c264cbcb90e5a8d94d628cc78d1f2271c43e56f1.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO v2_job_status (id, workflow_as_code_status) VALUES ($1, '{}'::JSONB)\n                ON CONFLICT (id) DO NOTHING",
+  "query": "INSERT INTO v2_job_status (id, workflow_as_code_status) VALUES ($1, '{}'::JSONB)\n            ON CONFLICT (id) DO NOTHING",
   "describe": {
     "columns": [],
     "parameters": {
@@ -10,5 +10,5 @@
     },
     "nullable": []
   },
-  "hash": "c0eddbf3f0e97334a6c1a4836a7229ddee4af66a4714cf76e05b5d9e17cb1217"
+  "hash": "d067bf59ed65562f1efbfbc9c264cbcb90e5a8d94d628cc78d1f2271c43e56f1"
 }

backend/.sqlx/query-d1fdfabd4f3bbe93cf9667e8e76bd8f537e68fabceb094fe535693fbd146eff2.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COALESCE(\n                (SELECT DISTINCT ON (s.path) s.schema FROM script s WHERE s.path = jb.runnable_path AND jb.kind = 'script' ORDER BY s.path, s.created_at DESC),\n                (SELECT flow_version.schema FROM flow LEFT JOIN flow_version ON flow_version.id = flow.versions[array_upper(flow.versions, 1)] WHERE flow.path = jb.runnable_path AND jb.kind = 'flow')\n            ) FROM v2_job jb\n            WHERE jb.id = $1 AND jb.workspace_id = $2\n            GROUP BY jb.kind, jb.runnable_path",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "coalesce",
+        "type_info": "Json"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "d1fdfabd4f3bbe93cf9667e8e76bd8f537e68fabceb094fe535693fbd146eff2"
+}

backend/.sqlx/query-d21ce84db3bc79a9ca92cb52c8ed62893f9fdd4156aedf1dac52cc9dfdfc18d3.json

@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE v2_job_status \n            SET flow_status = jsonb_set(\n                flow_status,\n                '{memory_id}',\n                to_jsonb($2::uuid)\n            )\n            WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "d21ce84db3bc79a9ca92cb52c8ed62893f9fdd4156aedf1dac52cc9dfdfc18d3"
-}

backend/.sqlx/query-d2fe10b3e608407147adb704a7cf3da60f22dcce6f05852de2f75c737b57907f.json

@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                        SELECT \n                            schema \n                        FROM \n                            flow \n                        WHERE \n                            workspace_id = $1 AND \n                            path = $2\n                    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "schema",
+        "type_info": "Json"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      true
+    ]
+  },
+  "hash": "d2fe10b3e608407147adb704a7cf3da60f22dcce6f05852de2f75c737b57907f"
+}

backend/.sqlx/query-d42f1d8e8fa35e5800ce8b37fdf787443a6bdabf7c77b02ab46a9e19dbd66c7c.json

@@ -1,39 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            UPDATE \n                v2_job_queue \n            SET \n                canceled_by = $1,\n                canceled_reason = 'cancelled by trigger bulk operation',\n                scheduled_for = now()\n            FROM \n                v2_job \n            WHERE \n                v2_job_queue.id = v2_job.id AND \n                v2_job_queue.workspace_id = $2 AND \n                v2_job_queue.running is FALSE AND\n                v2_job_queue.scheduled_for = $3 AND\n                v2_job.trigger_kind = $4 AND\n                v2_job.trigger = $5\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Text",
-        "Timestamptz",
-        {
-          "Custom": {
-            "name": "job_trigger_kind",
-            "kind": {
-              "Enum": [
-                "webhook",
-                "http",
-                "websocket",
-                "kafka",
-                "email",
-                "nats",
-                "schedule",
-                "app",
-                "ui",
-                "postgres",
-                "sqs",
-                "gcp",
-                "mqtt"
-              ]
-            }
-          }
-        },
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "d42f1d8e8fa35e5800ce8b37fdf787443a6bdabf7c77b02ab46a9e19dbd66c7c"
-}

backend/.sqlx/query-dd92bce0ddbfbf06834807aab4d589fc104647cae7abf37ddce3ef7109726261.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n                SELECT \n                    string_agg(stream, '' order by idx asc) as stream, \n                    max(idx) + 1 as offset \n                FROM job_result_stream_v2\n                WHERE job_id = $2 AND idx >= $1\n                ",
+  "query": "\n            SELECT \n                string_agg(stream, '' order by idx asc) as stream, \n                max(idx) + 1 as offset \n            FROM job_result_stream_v2\n            WHERE job_id = $2 AND idx >= $1\n            ",
   "describe": {
     "columns": [
       {
@@ -25,5 +25,5 @@
       null
     ]
   },
-  "hash": "e72e81370a93a6c53a1da01db0df55074d4b5ffcd80cabbe0c5fedcd90e0712b"
+  "hash": "dd92bce0ddbfbf06834807aab4d589fc104647cae7abf37ddce3ef7109726261"
 }

backend/.sqlx/query-df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d.json
-  "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    active_mode,\n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE workspace_id = $1 \n                    AND local_part = $2 \n                    AND (workspaced_local_part = TRUE OR $3 IS TRUE)\n                ",
-========
   "query": "\n                SELECT \n                    script_path, \n                    is_flow, \n                    workspace_id, \n                    edited_by, \n                    email, \n                    path, \n                    error_handler_path as \"error_handler_path: _\", \n                    error_handler_args as \"error_handler_args: _\", \n                    retry as \"retry: _\" \n                FROM email_trigger \n                WHERE workspace_id = $1 \n                    AND local_part = $2 \n                    AND (workspaced_local_part = TRUE OR $3 IS TRUE)\n                    AND enabled IS TRUE\n                ",
->>>>>>>> main:backend/.sqlx/query-df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b.json
   "describe": {
     "columns": [
       {
@@ -24,36 +20,31 @@
       },
       {
         "ordinal": 3,
-        "name": "active_mode",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 4,
         "name": "edited_by",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 5,
+        "ordinal": 4,
         "name": "email",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 6,
+        "ordinal": 5,
         "name": "path",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 7,
+        "ordinal": 6,
         "name": "error_handler_path: _",
         "type_info": "Varchar"
       },
       {
-        "ordinal": 8,
+        "ordinal": 7,
         "name": "error_handler_args: _",
         "type_info": "Jsonb"
       },
       {
-        "ordinal": 9,
+        "ordinal": 8,
         "name": "retry: _",
         "type_info": "Jsonb"
       }
@@ -72,15 +63,10 @@
       false,
       false,
       false,
-      false,
       true,
       true,
       true
     ]
   },
-<<<<<<<< HEAD:backend/.sqlx/query-292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d.json
-  "hash": "292771ba699b5460a6840b8338aec1defad30c9904e9b9c0843ac9afbf95f84d"
-========
   "hash": "df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b"
->>>>>>>> main:backend/.sqlx/query-df6972fb16a2364f10379fe37e125ae228697602e3769c479582470dc0b9488b.json
 }

backend/.sqlx/query-e56c71de41ba0750ae9ae8540c903cb0bf241d959a6c8f7bb896160001a6672b.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE postgres_trigger \n            SET \n                postgres_resource_path = $1,\n                replication_slot_name = $2,\n                publication_name = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                edited_by = $7,\n                email = $8,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $11,\n                error_handler_args = $12,\n                retry = $13,\n                active_mode = $14\n            WHERE \n                workspace_id = $9 AND path = $10\n            ",
+  "query": "\n            UPDATE postgres_trigger \n            SET \n                postgres_resource_path = $1,\n                replication_slot_name = $2,\n                publication_name = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                edited_by = $7,\n                email = $8,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $11,\n                error_handler_args = $12,\n                retry = $13\n            WHERE \n                workspace_id = $9 AND path = $10\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -17,11 +17,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "95a5edd2c35bd87e4bdad781da4096f755b6938357d27a3cf85c1cbecf92738e"
+  "hash": "e56c71de41ba0750ae9ae8540c903cb0bf241d959a6c8f7bb896160001a6672b"
 }

backend/.sqlx/query-e7c61bbdcf882f6e1e9b11df03e7a2ee318c72b365c0fe0b9fbec886a461f5e4.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n        INSERT INTO gcp_trigger (\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            delivery_type,\n            delivery_config,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry,\n            auto_acknowledge_msg,\n            ack_deadline,\n            active_mode\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4,\n            $5,\n            $6, \n            $7, \n            $8, \n            $9,\n            $10,\n            $11,\n            $12,\n            $13,\n            $14,\n            $15,\n            $16,\n            $17,\n            $18\n        )",
+  "query": "\n        INSERT INTO gcp_trigger (\n            gcp_resource_path,\n            subscription_id,\n            topic_id,\n            delivery_type,\n            delivery_config,\n            workspace_id, \n            path, \n            script_path, \n            is_flow, \n            email, \n            enabled, \n            edited_by,\n            error_handler_path,\n            error_handler_args,\n            retry,\n            auto_acknowledge_msg,\n            ack_deadline\n        ) \n        VALUES (\n            $1, \n            $2, \n            $3, \n            $4,\n            $5,\n            $6, \n            $7, \n            $8, \n            $9,\n            $10,\n            $11,\n            $12,\n            $13,\n            $14,\n            $15,\n            $16,\n            $17\n        )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -31,11 +31,10 @@
         "Jsonb",
         "Jsonb",
         "Bool",
-        "Int4",
-        "Bool"
+        "Int4"
       ]
     },
     "nullable": []
   },
-  "hash": "2bce583a4d5ca8ecdc2844494f812b0761ad0875e0d1b87dd4361b641f50dd88"
+  "hash": "e7c61bbdcf882f6e1e9b11df03e7a2ee318c72b365c0fe0b9fbec886a461f5e4"
 }

backend/.sqlx/query-e9941e580a21848fa71b38c58030078a25f117a3bfec78d5270a4c4970f2465e.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            UPDATE sqs_trigger \n            SET \n                queue_url = $1,\n                aws_resource_path = $2,\n                message_attributes = $3,\n                aws_auth_resource_type = $4,\n                script_path = $5,\n                path = $6,\n                is_flow = $7,\n                edited_by = $8,\n                email = $9,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $12,\n                error_handler_args = $13,\n                retry = $14,\n                active_mode = $15\n            WHERE \n                workspace_id = $10 AND path = $11\n            ",
+  "query": "\n            UPDATE sqs_trigger \n            SET \n                queue_url = $1,\n                aws_resource_path = $2,\n                message_attributes = $3,\n                aws_auth_resource_type = $4,\n                script_path = $5,\n                path = $6,\n                is_flow = $7,\n                edited_by = $8,\n                email = $9,\n                edited_at = now(),\n                server_id = NULL,\n                error = NULL,\n                error_handler_path = $12,\n                error_handler_args = $13,\n                retry = $14\n            WHERE \n                workspace_id = $10 AND path = $11\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -28,11 +28,10 @@
         "Text",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "096b228f909a5024cdea042d0442509c6c98549a39a7c7141f0d8b419bacef00"
+  "hash": "e9941e580a21848fa71b38c58030078a25f117a3bfec78d5270a4c4970f2465e"
 }

backend/.sqlx/query-ed5ff52b210e9158706ceffb4700108d4965e911656028be19b5ce530ab01d92.json

@@ -1,49 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                        WITH result_stream AS (\n                            SELECT \n                                string_agg(stream, '' order by idx asc) as stream, \n                                job_id, \n                                max(idx) + 1 as offset \n                            FROM job_result_stream_v2\n                            WHERE job_id = $2 AND idx >= $3\n                            GROUP BY job_id\n                        )\n                        SELECT\n                            COALESCE(jc.result, NULL) as \"result: sqlx::types::Json<Box<RawValue>>\",\n                            rs.stream AS \"result_stream: Option<String>\",\n                            rs.offset AS stream_offset,\n                            COALESCE(js.flow_status, jc.flow_status) as \"flow_status: sqlx::types::Json<Box<RawValue>>\",\n                            CASE WHEN $4 THEN NULL ELSE (COALESCE(js.flow_status, jc.flow_status)->>'stream_job')::uuid END as stream_job\n                        FROM (\n                            SELECT $2::uuid as job_id, $1::text as workspace_id\n                        ) base\n                        LEFT JOIN v2_job_completed jc ON jc.id = base.job_id AND jc.workspace_id = base.workspace_id\n                        LEFT JOIN v2_job_status js ON js.id = base.job_id\n                        LEFT JOIN result_stream rs ON rs.job_id = base.job_id\n                        WHERE base.job_id = $2",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "result: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 1,
-        "name": "result_stream: Option<String>",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "stream_offset",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 3,
-        "name": "flow_status: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 4,
-        "name": "stream_job",
-        "type_info": "Uuid"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Uuid",
-        "Int4",
-        "Bool"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      null,
-      null,
-      null
-    ]
-  },
-  "hash": "ed5ff52b210e9158706ceffb4700108d4965e911656028be19b5ce530ab01d92"
-}

backend/.sqlx/query-ef8413620c6860c3bf200894c5917c9209817a9cd8eb3bcd05a74f55423054ae.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "SELECT created_by AS \"created_by!\", args as \"args: sqlx::types::Json<Box<RawValue>>\"\n                FROM v2_job\n                WHERE id = $1 AND workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
+  "query": "SELECT created_by AS \"created_by!\", args as \"args: sqlx::types::Json<Box<RawValue>>\"\n            FROM v2_job\n            WHERE id = $1 AND workspace_id = $2 AND ($3::text[] IS NULL OR tag = ANY($3))",
   "describe": {
     "columns": [
       {
@@ -26,5 +26,5 @@
       true
     ]
   },
-  "hash": "f0fd8fccb98032139568afccc666af148d57ff3a2eb8183298ac35585501b2fc"
+  "hash": "ef8413620c6860c3bf200894c5917c9209817a9cd8eb3bcd05a74f55423054ae"
 }

backend/.sqlx/query-f027ddbf2877c6ed9be749ae1c5b852061399ada923d8206ac666745664d58e6.json

@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                            SELECT \n                                schema \n                            FROM \n                                flow \n                            WHERE \n                                workspace_id = $1 AND \n                                path = $2\n                        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "schema",
-        "type_info": "Json"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "f027ddbf2877c6ed9be749ae1c5b852061399ada923d8206ac666745664d58e6"
-}

backend/.sqlx/query-f0e7d28be69c4b922b34b76abb780766003d79884d33f94a79e61f0259807dbc.json

@@ -1,128 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                    SELECT id, content, language AS \"language: ScriptLang\", name, description, archived, workspace_id, created_at\n                    FROM workspace_dependencies\n                    WHERE name IS NOT DISTINCT FROM $1 AND workspace_id = $2 AND archived = false AND language = $3\n                    LIMIT 1\n                    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      },
-      {
-        "ordinal": 1,
-        "name": "content",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 2,
-        "name": "language: ScriptLang",
-        "type_info": {
-          "Custom": {
-            "name": "script_lang",
-            "kind": {
-              "Enum": [
-                "python3",
-                "deno",
-                "go",
-                "bash",
-                "postgresql",
-                "nativets",
-                "bun",
-                "mysql",
-                "bigquery",
-                "snowflake",
-                "graphql",
-                "powershell",
-                "mssql",
-                "php",
-                "bunnative",
-                "rust",
-                "ansible",
-                "csharp",
-                "oracledb",
-                "nu",
-                "java",
-                "duckdb",
-                "ruby"
-              ]
-            }
-          }
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 4,
-        "name": "description",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 5,
-        "name": "archived",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 6,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 7,
-        "name": "created_at",
-        "type_info": "Timestamptz"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Text",
-        {
-          "Custom": {
-            "name": "script_lang",
-            "kind": {
-              "Enum": [
-                "python3",
-                "deno",
-                "go",
-                "bash",
-                "postgresql",
-                "nativets",
-                "bun",
-                "mysql",
-                "bigquery",
-                "snowflake",
-                "graphql",
-                "powershell",
-                "mssql",
-                "php",
-                "bunnative",
-                "rust",
-                "ansible",
-                "csharp",
-                "oracledb",
-                "nu",
-                "java",
-                "duckdb",
-                "ruby"
-              ]
-            }
-          }
-        }
-      ]
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      false,
-      false,
-      false,
-      false
-    ]
-  },
-  "hash": "f0e7d28be69c4b922b34b76abb780766003d79884d33f94a79e61f0259807dbc"
-}

backend/.sqlx/query-f28b71a304721643dd90fa468f61f351d6df8282415e54f0ea4f905417657ba8.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO nats_trigger (\n                workspace_id,\n                path,\n                nats_resource_path,\n                subjects,\n                stream_name,\n                consumer_name,\n                use_jetstream,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), $13, $14, $15, $16\n            )\n            ",
+  "query": "\n            INSERT INTO nats_trigger (\n                workspace_id,\n                path,\n                nats_resource_path,\n                subjects,\n                stream_name,\n                consumer_name,\n                use_jetstream,\n                script_path,\n                is_flow,\n                enabled,\n                edited_by,\n                email,\n                edited_at,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, now(), $13, $14, $15\n            )\n            ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -19,11 +19,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "23f0c02c3f50f67d0fa8f6bd996bbee83f1c07fc843dc6e21bf4090c2a8821cb"
+  "hash": "f28b71a304721643dd90fa468f61f351d6df8282415e54f0ea4f905417657ba8"
 }

backend/.sqlx/query-f6e63a324664423353b56bccd9f3b322a3512ccfa86485e0f01664942ae04d0f.json

@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "WITH uuid_table as (\n            select unnest($4::uuid[]) as uuid\n        )\n        INSERT INTO v2_job_queue\n            (id, workspace_id, scheduled_for, tag)\n            (SELECT uuid, $1, $2, $3 FROM uuid_table)\n        RETURNING id",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Uuid"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Timestamptz",
+        "Varchar",
+        "UuidArray"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "f6e63a324664423353b56bccd9f3b322a3512ccfa86485e0f01664942ae04d0f"
+}

backend/.sqlx/query-f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c.json

@@ -1,84 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c.json
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                route_path = $1,\n                route_path_key = $2,\n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7,\n                path = $8,\n                is_flow = $9,\n                http_method = $10,\n                static_asset_config = $11,\n                edited_by = $12,\n                email = $13,\n                request_type = $14,\n                authentication_method = $15,\n                summary = $16,\n                description = $17,\n                edited_at = now(),\n                is_static_website = $18,\n                error_handler_path = $19,\n                error_handler_args = $20,\n                retry = $21,\n                active_mode = $22\n            WHERE\n                workspace_id = $23 AND\n                path = $24\n            ",
-========
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                route_path = $1,\n                route_path_key = $2,\n                workspaced_route = $3,\n                wrap_body = $4,\n                raw_string = $5,\n                authentication_resource_path = $6,\n                script_path = $7,\n                path = $8,\n                is_flow = $9,\n                enabled = $10,\n                http_method = $11,\n                static_asset_config = $12,\n                edited_by = $13,\n                email = $14,\n                request_type = $15,\n                authentication_method = $16,\n                summary = $17,\n                description = $18,\n                edited_at = now(),\n                is_static_website = $19,\n                error_handler_path = $20,\n                error_handler_args = $21,\n                retry = $22\n            WHERE\n                workspace_id = $23 AND\n                path = $24\n            ",
->>>>>>>> main:backend/.sqlx/query-b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96.json
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Bool",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Bool",
-        {
-          "Custom": {
-            "name": "http_method",
-            "kind": {
-              "Enum": [
-                "get",
-                "post",
-                "put",
-                "delete",
-                "patch"
-              ]
-            }
-          }
-        },
-        "Jsonb",
-        "Varchar",
-        "Varchar",
-        {
-          "Custom": {
-            "name": "request_type",
-            "kind": {
-              "Enum": [
-                "sync",
-                "async",
-                "sync_sse"
-              ]
-            }
-          }
-        },
-        {
-          "Custom": {
-            "name": "authentication_method",
-            "kind": {
-              "Enum": [
-                "none",
-                "windmill",
-                "api_key",
-                "basic_http",
-                "custom_script",
-                "signature"
-              ]
-            }
-          }
-        },
-        "Varchar",
-        "Text",
-        "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Bool",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c.json
-  "hash": "f7d713937d174054954c4ed599ffd8b841aff63e8e8f2d6cc1890b38eb91b46c"
-========
-  "hash": "b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96"
->>>>>>>> main:backend/.sqlx/query-b8bcf1fef244395dad802174dfc9bff45ff6f9cd1298eae5de40218cbab2eb96.json
-}

backend/.sqlx/query-fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1.json

@@ -1,81 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1.json
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                wrap_body = $1,\n                raw_string = $2,\n                authentication_resource_path = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                http_method = $7,\n                static_asset_config = $8,\n                edited_by = $9,\n                email = $10,\n                request_type = $11,\n                authentication_method = $12,\n                summary = $13,\n                description = $14,\n                edited_at = now(),\n                is_static_website = $15,\n                error_handler_path = $16,\n                error_handler_args = $17,\n                retry = $18,\n                active_mode = $19\n            WHERE\n                workspace_id = $20 AND\n                path = $21\n            ",
-========
-  "query": "\n            UPDATE\n                http_trigger\n            SET\n                wrap_body = $1,\n                raw_string = $2,\n                authentication_resource_path = $3,\n                script_path = $4,\n                path = $5,\n                is_flow = $6,\n                enabled = $7,\n                http_method = $8,\n                static_asset_config = $9,\n                edited_by = $10,\n                email = $11,\n                request_type = $12,\n                authentication_method = $13,\n                summary = $14,\n                description = $15,\n                edited_at = now(),\n                is_static_website = $16,\n                error_handler_path = $17,\n                error_handler_args = $18,\n                retry = $19\n            WHERE\n                workspace_id = $20 AND\n                path = $21\n            ",
->>>>>>>> main:backend/.sqlx/query-ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2.json
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Bool",
-        "Bool",
-        "Varchar",
-        "Varchar",
-        "Varchar",
-        "Bool",
-        "Bool",
-        {
-          "Custom": {
-            "name": "http_method",
-            "kind": {
-              "Enum": [
-                "get",
-                "post",
-                "put",
-                "delete",
-                "patch"
-              ]
-            }
-          }
-        },
-        "Jsonb",
-        "Varchar",
-        "Varchar",
-        {
-          "Custom": {
-            "name": "request_type",
-            "kind": {
-              "Enum": [
-                "sync",
-                "async",
-                "sync_sse"
-              ]
-            }
-          }
-        },
-        {
-          "Custom": {
-            "name": "authentication_method",
-            "kind": {
-              "Enum": [
-                "none",
-                "windmill",
-                "api_key",
-                "basic_http",
-                "custom_script",
-                "signature"
-              ]
-            }
-          }
-        },
-        "Varchar",
-        "Text",
-        "Bool",
-        "Varchar",
-        "Jsonb",
-        "Jsonb",
-        "Bool",
-        "Text",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-<<<<<<<< HEAD:backend/.sqlx/query-fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1.json
-  "hash": "fdcdb87848ebacbab9119ba00b008e18204c1886c87419b0c124e360a824c5e1"
-========
-  "hash": "ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2"
->>>>>>>> main:backend/.sqlx/query-ada1a14b4f25e41742df153b07e8bdf5b5feac9c6fa9de38bd24104bac8539d2.json
-}

backend/.sqlx/query-fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79.json

@@ -1,10 +1,6 @@
 {
   "db_name": "PostgreSQL",
-<<<<<<<< HEAD:backend/.sqlx/query-ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14.json
-  "query": "\n                UPDATE email_trigger \n                SET \n                    script_path = $1,\n                    path = $2,\n                    is_flow = $3,\n                    local_part = $4,\n                    workspaced_local_part = $5,\n                    edited_by = $6,\n                    email = $7,\n                    edited_at = now(),\n                    error_handler_path = $8,\n                    error_handler_args = $9,\n                    retry = $10,\n                    active_mode = $11\n                WHERE \n                    workspace_id = $12 AND path = $13\n                ",
-========
   "query": "\n                UPDATE email_trigger \n                SET \n                    script_path = $1,\n                    path = $2,\n                    is_flow = $3,\n                    local_part = $4,\n                    workspaced_local_part = $5,\n                    edited_by = $6,\n                    email = $7,\n                    edited_at = now(),\n                    error_handler_path = $8,\n                    error_handler_args = $9,\n                    retry = $10,\n                    enabled = $11\n                WHERE \n                    workspace_id = $12 AND path = $13\n                ",
->>>>>>>> main:backend/.sqlx/query-fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79.json
   "describe": {
     "columns": [],
     "parameters": {
@@ -26,9 +22,5 @@
     },
     "nullable": []
   },
-<<<<<<<< HEAD:backend/.sqlx/query-ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14.json
-  "hash": "ce72092a501647ee23e701538a73c11a9bdc191b72e1c014d61a38aa16605d14"
-========
   "hash": "fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79"
->>>>>>>> main:backend/.sqlx/query-fe12006498b9e7aece6b104fc5d9a80eeac12c6ca07a0e8950941ba796b0ba79.json
 }

backend/.sqlx/query-fe78796c5ea2384bdb6191b66943d746de874ca6600178f5db9797eda44f1733.json

@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "\n            INSERT INTO mqtt_trigger (\n                mqtt_resource_path,\n                subscribe_topics,\n                client_version,\n                client_id,\n                v3_config,\n                v5_config,\n                workspace_id,\n                path, \n                script_path, \n                is_flow, \n                email, \n                enabled, \n                edited_by,\n                error_handler_path,\n                error_handler_args,\n                retry,\n                active_mode\n            ) \n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17\n            )",
+  "query": "\n            INSERT INTO mqtt_trigger (\n                mqtt_resource_path,\n                subscribe_topics,\n                client_version,\n                client_id,\n                v3_config,\n                v5_config,\n                workspace_id,\n                path, \n                script_path, \n                is_flow, \n                email, \n                enabled, \n                edited_by,\n                error_handler_path,\n                error_handler_args,\n                retry\n            ) \n            VALUES (\n                $1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16\n            )",
   "describe": {
     "columns": [],
     "parameters": {
@@ -30,11 +30,10 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Jsonb",
-        "Bool"
+        "Jsonb"
       ]
     },
     "nullable": []
   },
-  "hash": "526e95e05d1596add10d1bc7fbc9ee36b88e4cdfd5d225551df6e58f5513b990"
+  "hash": "fe78796c5ea2384bdb6191b66943d746de874ca6600178f5db9797eda44f1733"
 }

backend/ee-repo-ref.txt

@@ -1 +1 @@
-a01942048c2464317fc0484c0b2414e14aa5f2a4
+2e6cce1bcb9deb750276ffbde4c7ca1f22e70c62

backend/migrations/20251127103823_add_unassigned_kind.down.sql

@@ -1 +0,0 @@
--- Add down migration script here

backend/migrations/20251127103823_add_unassigned_kind.up.sql

@@ -1,4 +0,0 @@
--- Add up migration script here
-ALTER TYPE JOB_KIND ADD VALUE IF NOT EXISTS 'unassigned_script';
-ALTER TYPE JOB_KIND ADD VALUE IF NOT EXISTS 'unassigned_flow';
-ALTER TYPE JOB_KIND ADD VALUE IF NOT EXISTS 'unassigned_singlestepflow';

backend/migrations/20251127104100_add_suspended_mode_to_triggers.down.sql

@@ -1,93 +0,0 @@
--- Add down migration script here
--- Revert mode column back to enabled boolean for each trigger table
-ALTER TABLE email_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE email_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE email_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE http_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE http_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE http_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE websocket_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE websocket_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE websocket_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE sqs_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE sqs_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE sqs_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE postgres_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE postgres_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE postgres_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE nats_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE nats_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE nats_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE mqtt_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE mqtt_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE mqtt_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE kafka_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE kafka_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE kafka_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-ALTER TABLE gcp_trigger
-ADD COLUMN enabled BOOLEAN;
-
-UPDATE gcp_trigger SET enabled = CASE WHEN mode = 'enabled'::TRIGGER_MODE THEN true ELSE false END;
-
-ALTER TABLE gcp_trigger
-ALTER COLUMN enabled SET NOT NULL,
-ALTER COLUMN enabled SET DEFAULT true,
-DROP COLUMN mode;
-
-DROP TYPE IF EXISTS TRIGGER_MODE;