feat: add native result streaming (#6242)

* feat: add stream output feature to SSE job updates Adds stream_output field to JobUpdate struct that extracts log lines starting with '[wm_stream]:' from job logs. Regular logs now exclude stream lines, which are captured separately for specialized handling. - Added stream_output: Option<String> field to JobUpdate struct - Created extract_stream_output_from_logs() function to filter stream lines - Modified get_job_update_data() to use stream extraction logic - SSE clients now receive both new_logs and stream_output in job updates Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> * feat: rename stream_output to stream and handle newlines as \n - Renamed `stream_output` field to `stream` in JobUpdate struct - Updated extract_stream_output_from_logs to extract_stream_from_logs - Changed stream output to join with literal \n instead of actual newlines - Stream lines are properly excluded from regular new_logs 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Ruben Fiszel <rubenfiszel@users.noreply.github.com> * decision tree nits * push ee ref * push ee ref * fix: fix id renaming in apps * remove duplicate caching (#6285) * feat: migrate audit log ids to bigints (blocking migration for EE) * fix(mcp): add proper check for mcp routes (#6282) * add proper check for mcp routes * cleaner * apply to flow * fix add checks scopes --------- Co-authored-by: dieriba <dieriba.pro@gmail.com> * chore(main): release 1.514.0 (#6283) * chore(main): release 1.514.0 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * fix: pin tokio to 1.46.1 and aws-sdks-ts * pin rustls to 0.23.29 + pin aws-sdk * chore(main): release 1.514.1 (#6288) * chore(main): release 1.514.1 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * fix: improve docker logs collection in docker mode * support $res: string in form inputs of arrays * fix import nit * fix: fix DynSelect * nits * fix: resource-type-ts-parser (#6289) * fix: resource types as arg in typescript handle imported defined types * Update nix flake (#6291) * merge * Small UI fixes (#6294) * fix step history not refreshing with staticInputs * fix array of obj not showing up in json editor in test this step * datatable scales correctly in DisplayResult and scrolling is much more usable * avoid next button disapearing and changing layout / hurting ux * nits * fix bug when renaming module A to B then module C to A, C takes the schema of A * fix bug with comments in sql repl * fix aggrid theme randomly not loading * bindable script * better delete button in db manager * property select doesnt exist * fix all warnings * delete $flowStateStore[id] on delete * feat(cli): generate cursor rules on init (#6270) * create cursor rules on init * change gen * add missing resource-type command * add resource type command in guidance * add schema option * revert * nit * nit * add flow guidance * nit * chore(main): release 1.515.0 (#6292) * chore(main): release 1.515.0 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * fix: improved logs for script * nits logs * chore(main): release 1.515.1 (#6295) * chore(main): release 1.515.1 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * merge * even more indexer tracings * add more tracing logs * feat: prevent too large results (>500Mb) from OOMing database * nit naming * feat: add CA certificate update at startup via environment variable (#6280) * feat: add CA certificate update at startup via environment variable Add support for running 'update-ca-certificates' at binary startup when RUN_UPDATE_CA_CERTIFICATE_AT_START environment variable is set to "true". - Check for RUN_UPDATE_CA_CERTIFICATE_AT_START env var on startup - Execute update-ca-certificates command if env var is set to "true" - Log success/failure appropriately with tracing - Continue startup even if CA certificate update fails - Non-blocking implementation with proper error handling Fixes #6279 Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> * refactor: extract CA certificate update logic into separate function Extract the CA certificate update logic from windmill_main() into a dedicated update_ca_certificates_if_requested() function for better code organization and maintainability. Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> * improvements --------- Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> Co-authored-by: Alexander Petric <alpetric@users.noreply.github.com> Co-authored-by: Alexander Petric <alex@windmill.dev> * fix: indexer collection of job logs before indexing (#6300) * Add flume as dependecy for indexer * Update ee-repo-ref * Remove flags from cargo.toml * Update ee-repo-ref * Update ee-repo-ref * fix rust sdk build error (#6305) Signed-off-by: pyranota <pyra@duck.com> * fix broken audit logs filter (#6304) * rename to from to * goto fix * default to false if field not present operator settings (#6301) * git sync UI improvements (#6303) * ui improvements round 1 * modal cleanup * init * UI refactor * UI cleanup + refactor * legacy cleanup * success model -> github actions, non-ee warnings * sqlx * npm check * ee warning everywhere * last comments * formatting * no hardcoded theme * claude review improvemenets * fix: no process relative imports for scripts with codebase * fix: sqs oidc authentication disconnect #6307 * handle metadata for new scripts happen after commit * handle_deployment_metadata in a task * nits * chore: add windmill-utils-internal package (#6299) * add utils package * naming * cleaning * add docs * remove log * use autogenerated types * remove old * fix * cleaning * add docs * chore(main): release 1.516.0 (#6298) * chore(main): release 1.516.0 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * merge * indexer improvements * upgrade tantivy to 0.24.2 * use tantivy fork * nit warnings * fix oss build * improve indexer * chore: use windmill-utils-internal for cli (#6297) * add utils package * naming * cleaning * simplify assignPath * rename old files * same for locks * create on confirm * default true * use replaceinlinescripts from utils * use extractscriptfromflows * make it compile * cleaning * use argsigtojson * fix * fix missing await * cleaner * cleaning * cleaning * use in frontend * add docs * testing * remove log * use autogenerated types * remove old * fix * cleaning * adapt usage * draft * better build script * fix build * revert to default creation * add docs * remove and rename * make everything work * add await * only if not installed * add vs code setting * add to publish action * fix bc * safer use of sep * fix * do not rename on push * no publish on release * use published package on frontend * nit * Add dependencies to run sqlx prepare to nix flake (#6309) * feat(cli): wmill-lock.yaml v2 for easier git merge diffs * merge * merge * all * all * rm warnings * fix styling on aichatinput (#6312) * fix: use with_capacity back presusre for tantivy directory multipart writes (#6313) * use with capacity for tantivy directory multi part uploads * Update ee repo ref * Update ee-repo-ref * Update ee-repo-ref * chore(main): release 1.517.0 (#6310) * chore(main): release 1.517.0 * Apply automatic changes --------- Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> * fix typo on cli build (#6314) * cleanup * feat(utils): add flow.yaml validation function (#6316) * add validateflow function * cleaner code * preprocess json * cleaning * create specific package * cleaning * add tests * fix: cleanup concurrency_counter automatically + remove orphans keys automatically * fix: add disabled support to resource picker in schema forms * fix: add wm_labels to tracing spans * all * merge * all * fix: delete empty git connection (#6318) * fix checks * bun handling * all * all? * all * all * update * all * update * check * fix history * all * all * all * Remove leftover debug tracing statements - Remove commented debug trace in jobs.rs for stream output - Remove commented debug trace in result_stream.rs for stream processing Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> * fix test * all * handle iter * fix --------- Signed-off-by: pyranota <pyra@duck.com> Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com> Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com> Co-authored-by: Ruben Fiszel <ruben@windmill.dev> Co-authored-by: centdix <40307056+centdix@users.noreply.github.com> Co-authored-by: dieriba <dieriba.pro@gmail.com> Co-authored-by: rubenfiszel <275584+rubenfiszel@users.noreply.github.com> Co-authored-by: wendrul <53628737+wendrul@users.noreply.github.com> Co-authored-by: Diego Imbert <70353967+diegoimbert@users.noreply.github.com> Co-authored-by: Alexander Petric <alpetric@users.noreply.github.com> Co-authored-by: Alexander Petric <alex@windmill.dev> Co-authored-by: pyranota <92104930+pyranota@users.noreply.github.com>
2026-08-18 16:02:10 +00:00 · 2025-08-06 22:40:42 +00:00
parent 138a2a6379
commit 161dbbc6d6
63 changed files with 979 additions and 515 deletions
@@ -1,75 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "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                SUBSTR(logs, GREATEST($1 - log_offset, 0)) AS logs,\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.workflow_as_code_status, f.workflow_as_code_status) AS \"workflow_as_code_status: sqlx::types::Json<Box<RawValue>>\",\n                job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 AS log_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            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 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": "mem_peak",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 4,
-        "name": "flow_status: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 5,
-        "name": "workflow_as_code_status: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 6,
-        "name": "log_offset",
-        "type_info": "Int4"
-      },
-      {
-        "ordinal": 7,
-        "name": "created_by!",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "progress",
-        "type_info": "Int4"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Text",
-        "Uuid",
-        "Bool",
-        "Bool",
-        "TextArray"
-      ]
-    },
-    "nullable": [
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      null,
-      false,
-      null
-    ]
-  },
-  "hash": "278bc6b4f149f824b5db32dacfaa714ee3852dc2ddf2d661dfdd5a986a9bb62b"
-}
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            INSERT INTO job_result_stream (workspace_id, job_id, stream)\n            VALUES ($1, $2, $3)\n            ON CONFLICT (job_id) DO UPDATE SET stream = job_result_stream.stream || $3\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Text"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "4bc533074c720820cebff8d97a203df52520b7606378ecca267e88383a45b49b"
+}
@@ -0,0 +1,95 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "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                SUBSTR(rs.stream, $8) 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.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                CHAR_LENGTH(rs.stream) + 1 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 job_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": "workflow_as_code_status: sqlx::types::Json<Box<RawValue>>",
+        "type_info": "Jsonb"
+      },
+      {
+        "ordinal": 7,
+        "name": "log_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 8,
+        "name": "stream_offset",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 9,
+        "name": "created_by!",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 10,
+        "name": "progress",
+        "type_info": "Int4"
+      },
+      {
+        "ordinal": 11,
+        "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,
+      false,
+      null,
+      false
+    ]
+  },
+  "hash": "4f372d047c78532907adf2d2dc114352aa7b5b28dccc50a1231a7f6539397da7"
+}
@@ -0,0 +1,48 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job.tag,\n                v2_job_queue.running as \"running: Option<bool>\", SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\", CHAR_LENGTH(rs.stream) AS stream_offset\n                FROM v2_job\n                LEFT JOIN v2_job_queue USING (id)\n                LEFT JOIN v2_job_completed USING (id)\n                LEFT JOIN job_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"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      true,
+      false,
+      false,
+      null,
+      null
+    ]
+  },
+  "hash": "69924462c788dbc8f31aacc7f8ae588d76bf1f25d631833ce4b194818a7d1437"
+}
@@ -1,184 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT workspace_id, slack_team_id, teams_team_id, teams_team_name, slack_name, slack_command_script, teams_command_script, slack_email, auto_invite_domain, auto_invite_operator, auto_add, customer_id, plan, webhook, deploy_to, ai_config, error_handler, error_handler_extra_args, error_handler_muted_on_cancel, large_file_storage, git_sync, deploy_ui, default_app, default_scripts, mute_critical_alerts, color, operator_settings, git_app_installations FROM workspace_settings WHERE workspace_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "workspace_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "slack_team_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 2,
-        "name": "teams_team_id",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 3,
-        "name": "teams_team_name",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 4,
-        "name": "slack_name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 5,
-        "name": "slack_command_script",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 6,
-        "name": "teams_command_script",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 7,
-        "name": "slack_email",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 8,
-        "name": "auto_invite_domain",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 9,
-        "name": "auto_invite_operator",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 10,
-        "name": "auto_add",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 11,
-        "name": "customer_id",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 12,
-        "name": "plan",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 13,
-        "name": "webhook",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 14,
-        "name": "deploy_to",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 15,
-        "name": "ai_config",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 16,
-        "name": "error_handler",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 17,
-        "name": "error_handler_extra_args",
-        "type_info": "Json"
-      },
-      {
-        "ordinal": 18,
-        "name": "error_handler_muted_on_cancel",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 19,
-        "name": "large_file_storage",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 20,
-        "name": "git_sync",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 21,
-        "name": "deploy_ui",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 22,
-        "name": "default_app",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 23,
-        "name": "default_scripts",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 24,
-        "name": "mute_critical_alerts",
-        "type_info": "Bool"
-      },
-      {
-        "ordinal": 25,
-        "name": "color",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 26,
-        "name": "operator_settings",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 27,
-        "name": "git_app_installations",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false
-    ]
-  },
-  "hash": "71a040866adbd192080da165eb120abf7531b2542a2da225152e19144400f950"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "PostgreSQL",
-  "query": "\n        SELECT\n            id AS \"id!\", workspace_id AS \"workspace_id!\", parent_job, is_flow_step,\n            flow_status AS \"flow_status: Box<str>\", last_ping, same_worker\n        FROM v2_as_queue\n        WHERE running = true AND suspend = 0 AND suspend_until IS null AND scheduled_for <= now()\n            AND (job_kind = 'flow' OR job_kind = 'flowpreview' OR job_kind = 'flownode')\n            AND last_ping IS NOT NULL AND last_ping < NOW() - ($1 || ' seconds')::interval\n            AND canceled = false\n        ",
+  "query": "\n        SELECT\n            id AS \"id!\", workspace_id AS \"workspace_id!\", parent_job, is_flow_step,\n            flow_status AS \"flow_status: Box<str>\", last_ping, same_worker\n        FROM v2_as_queue\n        WHERE running = true AND suspend = 0 AND suspend_until IS null AND scheduled_for <= now()\n            AND (job_kind = 'flow' OR job_kind = 'flowpreview' OR job_kind = 'flownode')\n            AND last_ping IS NOT NULL AND last_ping < NOW() - ($1 || ' seconds')::interval\n            AND canceled = false\n            \n        ",
  "describe": {
    "columns": [
      {
@@ -54,5 +54,5 @@
      true
    ]
  },
-  "hash": "e653d36b607a16c0dfc0324690942ab25883b53a81ebb581fe019af2ec5eb567"
+  "hash": "72956f508f66312807738399b57aa01a048fa4f9281327cf5b78111178424b43"
 }
@@ -14,7 +14,8 @@
              "Enum": [
                "s3object",
                "resource",
-                "variable"
+                "variable",
+                "ducklake"
              ]
            }
          }
@@ -0,0 +1,36 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\", CHAR_LENGTH(rs.stream) + 1 AS stream_offset\n                 FROM v2_job_completed  FULL OUTER JOIN job_result_stream rs ON rs.job_id = v2_job_completed.id WHERE (v2_job_completed.id = $2 AND v2_job_completed.workspace_id = $1 OR rs.workspace_id = $1)",
+  "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"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Uuid",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      true,
+      null,
+      null
+    ]
+  },
+  "hash": "9f5b677a02690d3e4b4a5f5e141c7107077bbe90423102b5469e219f2a8b9293"
+}
@@ -1,29 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job_queue.running as \"running: Option<bool>\" FROM v2_job_completed FULL OUTER JOIN v2_job_queue USING (id) WHERE (v2_job_queue.id = $1 AND v2_job_queue.workspace_id = $2) OR (v2_job_completed.id = $1 AND v2_job_completed.workspace_id = $2)",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "result: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      },
-      {
-        "ordinal": 1,
-        "name": "running: Option<bool>",
-        "type_info": "Bool"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Text"
-      ]
-    },
-    "nullable": [
-      true,
-      false
-    ]
-  },
-  "hash": "b9b3c341fe452da916ee29637e14b5c1ad75462eba17083c6f81ff6ef35af77f"
-}
@@ -1,23 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\" FROM v2_job_completed WHERE id = $2 AND workspace_id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "result: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Uuid"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "ceb8c2607023883e1eebd4b9539e36ed202a6ecd12e3f90cb070341c38886de4"
-}
@@ -0,0 +1,42 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT \n                        result as \"result: sqlx::types::Json<Box<RawValue>>\",\n                        v2_job_queue.running as \"running: Option<bool>\",\n                        SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\",\n                        CHAR_LENGTH(rs.stream) + 1 AS stream_offset\n                    FROM v2_job_completed FULL OUTER JOIN v2_job_queue USING (id) \n                    LEFT JOIN job_result_stream rs ON rs.job_id = $1\n                    WHERE (v2_job_queue.id = $1 AND v2_job_queue.workspace_id = $2) OR (v2_job_completed.id = $1 AND v2_job_completed.workspace_id = $2)",
+  "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"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Uuid",
+        "Text",
+        "Int4"
+      ]
+    },
+    "nullable": [
+      true,
+      false,
+      null,
+      null
+    ]
+  },
+  "hash": "ec0f8fa36328507e51c1974dbef884b755504a6cefa4af34fa4659fb95a7ee9a"
+}
@@ -1,35 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job.tag,\n                v2_job_queue.running as \"running: Option<bool>\"\n                FROM v2_job\n                LEFT JOIN v2_job_queue USING (id)\n                LEFT JOIN v2_job_completed USING (id)\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"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Uuid"
-      ]
-    },
-    "nullable": [
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "fab257c4e20aa51b8f785b1882aa0b16fde33b246cbf0749ffa0e4ed63504451"
-}
@@ -0,0 +1,2 @@
+-- Add down migration script here
+DROP TABLE job_result_stream;
@@ -0,0 +1,11 @@
+-- Add up migration script here
+CREATE TABLE job_result_stream (
+    job_id UUID NOT NULL PRIMARY KEY,
+    workspace_id TEXT NOT NULL,
+    stream TEXT NOT NULL
+);
+
+ALTER TABLE job_result_stream ADD CONSTRAINT fk_job_result_stream_job_id FOREIGN KEY (job_id) REFERENCES v2_job_queue(id) ON DELETE CASCADE;
+
+GRANT ALL ON TABLE job_result_stream TO windmill_admin;
+GRANT ALL ON TABLE job_result_stream TO windmill_user;
@@ -2129,6 +2129,7 @@ async fn handle_zombie_flows(db: &DB) -> error::Result<()> {
            AND (job_kind = 'flow' OR job_kind = 'flowpreview' OR job_kind = 'flownode')
            AND last_ping IS NOT NULL AND last_ping < NOW() - ($1 || ' seconds')::interval
            AND canceled = false
+            
        "#,
        FLOW_ZOMBIE_TRANSITION_TIMEOUT.as_str()
    )
@@ -27,7 +27,7 @@ use serde::Serialize;
 use windmill_common::flows::InputTransform;
 use windmill_common::worker::WORKER_CONFIG;

-#[cfg(feature = "python")]
+#[cfg(any(feature = "python", feature = "deno_core"))]
 use windmill_common::flow_status::{FlowStatus, FlowStatusModule, RestartedFrom};

 use windmill_common::{
@@ -7798,10 +7798,18 @@ paths:
          in: query
          schema:
            type: integer
+        - name: stream_offset
+          in: query
+          schema:
+            type: integer
        - name: get_progress
          in: query
          schema:
            type: boolean
+        - name: no_logs
+          in: query
+          schema:
+            type: boolean

      responses:
        "200":
@@ -7823,6 +7831,10 @@ paths:
                    type: integer
                  progress:
                    type: integer
+                  stream_offset:
+                    type: integer
+                  new_result_stream:
+                    type: string
                  flow_status:
                    $ref: "../../openflow.openapi.yaml#/components/schemas/FlowStatus"
                  workflow_as_code_status:
@@ -7853,6 +7865,10 @@ paths:
          in: query
          schema:
            type: boolean
+        - name: no_logs
+          in: query
+          schema:
+            type: boolean

      responses:
        "200":
@@ -14840,7 +14856,7 @@ components:
                                - key
                                - typ
                    required:
-                      - object 
+                      - object
                  - type: object
                    properties:
                      list:
@@ -1,18 +1,24 @@
-use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use uuid::Uuid;
-use std::str::FromStr;
-use regex::Regex;
-use serde_json::Value;
 use crate::auth::OptTokened;
 use crate::db::{ApiAuthed, DB};
-use crate::jobs::{cancel_suspended_job, resume_suspended_job, QueryApprover, QueryOrBody, ResumeUrls, get_resume_urls_internal};
-use axum::{extract::{Path, Query}, Extension};
-use windmill_common::error::Error;
+use crate::jobs::{
+    cancel_suspended_job, get_resume_urls_internal, resume_suspended_job, QueryApprover,
+    QueryOrBody, ResumeUrls,
+};
+use axum::{
+    extract::{Path, Query},
+    Extension,
+};
+use regex::Regex;
+use serde::{Deserialize, Serialize};
+use serde_json::value::RawValue;
+use serde_json::Value;
+use std::collections::HashMap;
+use std::str::FromStr;
+use uuid::Uuid;
 use windmill_common::cache;
+use windmill_common::error::Error;
 use windmill_common::jobs::JobKind;
 use windmill_common::scripts::ScriptHash;
-use serde_json::value::RawValue;

 #[derive(Debug, Deserialize, Serialize)]
 pub struct ResumeSchema {
@@ -234,7 +240,7 @@ pub async fn get_approval_form_details(
    .ok_or_else(|| Error::BadRequest("This workflow is no longer running and has either already timed out or been cancelled or completed.".to_string()))
    .map(|r| (r.job_kind, r.script_hash, r.raw_flow, r.parent_job, r.created_at, r.created_by, r.script_path, r.args))?;

-    let flow_data = match cache::job::fetch_flow(&db, job_kind, script_hash).await {
+    let flow_data = match cache::job::fetch_flow(&db, &job_kind, script_hash).await {
        Ok(data) => data,
        Err(_) => {
            if let Some(parent_job_id) = parent_job_id.as_ref() {
@@ -900,11 +900,10 @@ impl<'a> GetQuery<'a> {
    /// when pushed from an un-updated workers.
    /// This function is used to make the above change transparent for the API, as the returned jobs
    /// will have the raw values as if they were still in the tables.
-    async fn resolve_raw_values<T>(
+    async fn resolve_raw_values<T: JobCommon>(
        &self,
        db: &DB,
        id: Uuid,
-        kind: JobKind,
        hash: Option<ScriptHash>,
        job: &mut JobExtended<T>,
    ) {
@@ -917,18 +916,18 @@ impl<'a> GetQuery<'a> {
            // Try to fetch the flow from the cache, fallback to the preview flow.
            // NOTE: This could check for the job kinds instead of the `or_else` but it's not
            // necessary as `fetch_flow` return early if the job kind is not a preview one.
-            cache::job::fetch_flow(db, kind, hash)
+            cache::job::fetch_flow(db, job.job_kind(), hash)
                .or_else(|_| cache::job::fetch_preview_flow(db, &id, raw_flow))
                .await
                .ok()
                .inspect(|data| job.raw_flow = Some(sqlx::types::Json(data.raw_flow.clone())));
        }
-        if self.with_code {
+        if self.with_code && job.job_kind() == &JobKind::Preview {
            // Try to fetch the code from the cache, fallback to the preview code.
            // NOTE: This could check for the job kinds instead of the `or_else` but it's not
            // necessary as `fetch_script` return early if the job kind is not a preview one.
            let conn = Connection::from(db.clone());
-            cache::job::fetch_script(db.clone(), kind, hash)
+            cache::job::fetch_script(db.clone(), job.job_kind(), hash)
                .or_else(|_| cache::job::fetch_preview_script(&conn, &id, raw_lock, raw_code))
                .await
                .ok()
@@ -958,7 +957,7 @@ impl<'a> GetQuery<'a> {

        self.check_auth(job.as_ref().map(|job| job.created_by.as_str()))?;
        if let Some(job) = job.as_mut() {
-            self.resolve_raw_values(&db, job.id, job.job_kind, job.script_hash, job)
+            self.resolve_raw_values(&db, job.id, job.script_hash, job)
                .await;
        }
        if self.with_flow {
@@ -992,7 +991,7 @@ impl<'a> GetQuery<'a> {

        self.check_auth(cjob.as_ref().map(|job| job.created_by.as_str()))?;
        if let Some(job) = cjob.as_mut() {
-            self.resolve_raw_values(db, job.id, job.job_kind, job.script_hash, job)
+            self.resolve_raw_values(db, job.id, job.script_hash, job)
                .await;
        }

@@ -2642,7 +2641,7 @@ pub async fn get_resume_urls_internal(
 }

 #[derive(sqlx::FromRow, Debug, Serialize)]
-pub struct JobExtended<T> {
+pub struct JobExtended<T: JobCommon> {
    #[sqlx(flatten)]
    #[serde(flatten)]
    inner: T,
@@ -2665,7 +2664,23 @@ pub struct JobExtended<T> {
    pub aggregate_wait_time_ms: Option<i64>,
 }

-impl<T> JobExtended<T> {
+pub trait JobCommon {
+    fn job_kind(&self) -> &JobKind;
+}
+
+impl JobCommon for QueuedJob {
+    fn job_kind(&self) -> &JobKind {
+        &self.job_kind
+    }
+}
+
+impl JobCommon for CompletedJob {
+    fn job_kind(&self) -> &JobKind {
+        &self.job_kind
+    }
+}
+
+impl<T: JobCommon> JobExtended<T> {
    pub fn new(
        self_wait_time_ms: Option<i64>,
        aggregate_wait_time_ms: Option<i64>,
@@ -2683,7 +2698,7 @@ impl<T> JobExtended<T> {
    }
 }

-impl<T> Deref for JobExtended<T> {
+impl<T: JobCommon> Deref for JobExtended<T> {
    type Target = T;

    fn deref(&self) -> &Self::Target {
@@ -2691,7 +2706,7 @@ impl<T> Deref for JobExtended<T> {
    }
 }

-impl<T> DerefMut for JobExtended<T> {
+impl<T: JobCommon> DerefMut for JobExtended<T> {
    fn deref_mut(&mut self) -> &mut Self::Target {
        &mut self.inner
    }
@@ -4538,8 +4553,13 @@ pub async fn run_wait_result_script_by_path_internal(
    check_queue_too_long(&db, QUEUE_LIMIT_WAIT_RESULT.or(run_query.queue_limit)).await?;

    let mut tx = user_db.clone().begin(&authed).await?;
-    let (job_payload, tag, delete_after_use, timeout, on_behalf_of) =
-        script_path_to_payload(script_path.to_path(), &mut *tx, &w_id, run_query.skip_preprocessor).await?;
+    let (job_payload, tag, delete_after_use, timeout, on_behalf_of) = script_path_to_payload(
+        script_path.to_path(),
+        &mut *tx,
+        &w_id,
+        run_query.skip_preprocessor,
+    )
+    .await?;
    drop(tx);

    let tag = run_query.tag.clone().or(tag);
@@ -5680,22 +5700,38 @@ pub async fn run_job_by_hash_inner(
 pub struct JobUpdateQuery {
    pub running: Option<bool>,
    pub log_offset: Option<i32>,
+    pub stream_offset: Option<i32>,
    pub get_progress: Option<bool>,
+    pub no_logs: Option<bool>,
    pub only_result: Option<bool>,
    pub fast: Option<bool>,
 }

 #[derive(Serialize, Debug)]
 pub struct JobUpdate {
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub running: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub completed: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub new_logs: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub new_result_stream: Option<String>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub log_offset: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stream_offset: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub mem_peak: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub progress: Option<i32>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub flow_status: Option<Box<serde_json::value::RawValue>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub workflow_as_code_status: Option<Box<serde_json::value::RawValue>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub job: Option<Job>,
+    #[serde(skip_serializing_if = "Option::is_none")]
    pub only_result: Option<Box<serde_json::value::RawValue>>,
 }

@@ -5714,6 +5750,7 @@ impl Hash for JobUpdate {
        self.log_offset.hash(state);
        self.mem_peak.hash(state);
        self.progress.hash(state);
+        self.stream_offset.hash(state);
        if !self.completed.unwrap_or(false) {
            self.flow_status.as_ref().map(|x| x.get().hash(state));
            self.workflow_as_code_status
@@ -5779,7 +5816,7 @@ async fn get_job_update(
    opt_tokened: OptTokened,
    Extension(db): Extension<DB>,
    Path((w_id, job_id)): Path<(String, Uuid)>,
-    Query(JobUpdateQuery { log_offset, get_progress, running, only_result, .. }): Query<
+    Query(JobUpdateQuery { log_offset, stream_offset, get_progress, running, only_result, no_logs, .. }): Query<
        JobUpdateQuery,
    >,
 ) -> JsonResult<JobUpdate> {
@@ -5791,11 +5828,13 @@ async fn get_job_update(
            &w_id,
            &job_id,
            log_offset,
+            stream_offset,
            get_progress,
            running,
            true,
            false,
            only_result,
+            no_logs,
        )
        .await?,
    ))
@@ -5806,7 +5845,7 @@ async fn get_job_update_sse(
    opt_tokened: OptTokened,
    Extension(db): Extension<DB>,
    Path((w_id, job_id)): Path<(String, Uuid)>,
-    Query(JobUpdateQuery { log_offset, get_progress, running, only_result, fast }): Query<
+    Query(JobUpdateQuery { log_offset, stream_offset, get_progress, running, no_logs, only_result, fast }): Query<
        JobUpdateQuery,
    >,
 ) -> Response {
@@ -5817,10 +5856,12 @@ async fn get_job_update_sse(
        w_id,
        job_id,
        log_offset,
+        stream_offset,
        get_progress,
        running,
        only_result,
        fast,
+        no_logs,
    )
    .map(|x| {
        format!(
@@ -5857,19 +5898,24 @@ fn get_job_update_sse_stream(
    w_id: String,
    job_id: Uuid,
    initial_log_offset: Option<i32>,
+    initial_stream_offset: Option<i32>,
    get_progress: Option<bool>,
    running: Option<bool>,
    only_result: Option<bool>,
    fast: Option<bool>,
+    no_logs: Option<bool>,
 ) -> impl futures::Stream<Item = JobUpdateSSEStream> {
    let (tx, rx) = tokio::sync::mpsc::channel(32);

    tokio::spawn(async move {
        let mut log_offset = initial_log_offset;
+        let mut stream_offset = initial_stream_offset;
        let mut last_update_hash: Option<String> = None;

        // Send initial update immediately
        let mut running = running;
+        let mut mem_peak = 0;
+
        match get_job_update_data(
            &opt_authed,
            &opt_tokened,
@@ -5877,22 +5923,38 @@ fn get_job_update_sse_stream(
            &w_id,
            &job_id,
            log_offset,
+            stream_offset,
            get_progress,
            running,
            true,
            true,
            only_result,
+            no_logs,
        )
        .await
        {
-            Ok(update) => {
+            Ok(mut update) => {
                last_update_hash = Some(update.hash_str());
                let completion_sent = update.completed.unwrap_or(false);
                if running.is_some() && update.running.is_some_and(|x| x) {
                    running = Some(true);
                }
+                if let Some(new_mem_peak) = update.mem_peak {
+                    mem_peak = new_mem_peak;
+                }
                if let Some(new_offset) = update.log_offset {
-                    log_offset = Some(new_offset);
+                    if new_offset != log_offset.unwrap_or(0) {
+                        log_offset = Some(new_offset);
+                    } else {
+                        update.log_offset = None;
+                    }
+                }
+                if let Some(new_stream_offset) = update.stream_offset {
+                    if new_stream_offset != stream_offset.unwrap_or(0) {
+                        stream_offset = Some(new_stream_offset);
+                    } else {
+                        update.stream_offset = None;
+                    }
                }
                if tx.send(JobUpdateSSEStream::Update(update)).await.is_err() {
                    tracing::warn!("Failed to send initial job update for job {job_id}");
@@ -5918,6 +5980,7 @@ fn get_job_update_sse_stream(
        let mut i = 0;
        let start = Instant::now();
        let mut last_ping = Instant::now();
+
        loop {
            i += 1;
            let ms_duration = if i > 100 || !fast.unwrap_or(false) {
@@ -5950,18 +6013,27 @@ fn get_job_update_sse_stream(
                &w_id,
                &job_id,
                log_offset,
+                stream_offset,
                get_progress,
                running,
                false,
                true,
                only_result,
+                no_logs,
            )
            .await
            {
-                Ok(update) => {
+                Ok(mut update) => {
                    if running.is_some() && update.running.is_some_and(|x| x) {
                        running = Some(true);
                    }
+                    if update.completed.is_some_and(|x| !x) {
+                        update.completed = None;
+                    }
+                    if update.new_logs.as_ref().is_some_and(|x| x.is_empty()) {
+                        update.new_logs = None;
+                    }
+
                    // if !only_result.unwrap_or(false) {
                    //     tracing::error!("update {:?}", update);
                    // }
@@ -5970,7 +6042,25 @@ fn get_job_update_sse_stream(
                    if last_update_hash.as_ref() != Some(&update_last_status) {
                        // Update log offset if available
                        if let Some(new_offset) = update.log_offset {
-                            log_offset = Some(new_offset);
+                            if new_offset != log_offset.unwrap_or(0) {
+                                log_offset = Some(new_offset);
+                            } else {
+                                update.log_offset = None;
+                            }
+                        }
+                        if let Some(new_stream_offset) = update.stream_offset {
+                            if new_stream_offset != stream_offset.unwrap_or(0) {
+                                stream_offset = Some(new_stream_offset);
+                            } else {
+                                update.stream_offset = None;
+                            }
+                        }
+                        if let Some(new_mem_peak) = update.mem_peak {
+                            if new_mem_peak != mem_peak {
+                                mem_peak = new_mem_peak;
+                            } else {
+                                update.mem_peak = None;
+                            }
                        }
                        let completed = update.completed.unwrap_or(false);
                        if tx.send(JobUpdateSSEStream::Update(update)).await.is_err() {
@@ -5983,7 +6073,8 @@ fn get_job_update_sse_stream(
                        last_update_hash = Some(update_last_status);
                    }
                }
-                Err(_) => {
+                Err(e) => {
+                    tracing::error!("Error getting job update: {:?}", e);
                    if tx.send(JobUpdateSSEStream::NotFound).await.is_err() {
                        tracing::warn!("Failed to send job not found for job {job_id}");
                    }
@@ -6003,11 +6094,13 @@ async fn get_job_update_data(
    w_id: &str,
    job_id: &Uuid,
    log_offset: Option<i32>,
+    stream_offset: Option<i32>,
    get_progress: Option<bool>,
    running: Option<bool>,
    log_view: bool,
    get_full_job_on_completion: bool,
    only_result: Option<bool>,
+    no_logs: Option<bool>,
 ) -> error::Result<JobUpdate> {
    let tags = if log_view {
        log_job_view(
@@ -6028,19 +6121,22 @@ async fn get_job_update_data(

    if only_result.unwrap_or(false) {
        let result = if let Some(tags) = tags {
-            let r = sqlx::query!(
-                "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job.tag,
-                v2_job_queue.running as \"running: Option<bool>\"
+            let r = 
+                sqlx::query!(
+                    "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job.tag,
+                v2_job_queue.running as \"running: Option<bool>\", SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\", CHAR_LENGTH(rs.stream) AS stream_offset
                FROM v2_job
                LEFT JOIN v2_job_queue USING (id)
                LEFT JOIN v2_job_completed USING (id)
+                LEFT JOIN job_result_stream rs ON rs.job_id = $2
                WHERE v2_job.id = $2 AND v2_job.workspace_id = $1",
-                w_id,
-                job_id,
-            )
-            .fetch_optional(db)
-            .await?
-            .ok_or_else(|| Error::NotFound(format!("Job not found: {}", job_id)))?;
+                    w_id,
+                    job_id,
+                    stream_offset.unwrap_or(0),
+                )
+                .fetch_optional(db)
+                .await?
+                .ok_or_else(|| Error::NotFound(format!("Job not found: {}", job_id)))?;

            if !tags.contains(&r.tag.as_str()) {
                return Err(Error::NotAuthorized(format!(
@@ -6050,27 +6146,44 @@ async fn get_job_update_data(
                )));
            }
            let running = r.running.as_ref().map(|x| *x);
-            (r.result.map(|x| x.0), running)
+            (r.result.map(|x| x.0), running, r.result_stream.flatten(), r.stream_offset)
        } else {
            if running.is_some_and(|x| !x) {
                let r = sqlx::query!(
-                    "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", v2_job_queue.running as \"running: Option<bool>\" FROM v2_job_completed FULL OUTER JOIN v2_job_queue USING (id) WHERE (v2_job_queue.id = $1 AND v2_job_queue.workspace_id = $2) OR (v2_job_completed.id = $1 AND v2_job_completed.workspace_id = $2)",
+                    "SELECT 
+                        result as \"result: sqlx::types::Json<Box<RawValue>>\",
+                        v2_job_queue.running as \"running: Option<bool>\",
+                        SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\",
+                        CHAR_LENGTH(rs.stream) + 1 AS stream_offset
+                    FROM v2_job_completed FULL OUTER JOIN v2_job_queue USING (id) 
+                    LEFT JOIN job_result_stream rs ON rs.job_id = $1
+                    WHERE (v2_job_queue.id = $1 AND v2_job_queue.workspace_id = $2) OR (v2_job_completed.id = $1 AND v2_job_completed.workspace_id = $2)",
                    job_id,
                    w_id,
+                    stream_offset.unwrap_or(0),
                ).fetch_optional(db).await?;
                if let Some(r) = r {
                    let running = r.running.as_ref().map(|x| *x);
-                    (r.result.map(|x| x.0), running)
+                    (r.result.map(|x| x.0), running, r.result_stream.flatten(), r.stream_offset)
                } else {
-                    (None, None)
+                    (None, None, None, None)
                }
            } else {
-                (sqlx::query_scalar!(
-                    "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\" FROM v2_job_completed WHERE id = $2 AND workspace_id = $1",
+                let q =  sqlx::query!(
+                    "SELECT result as \"result: sqlx::types::Json<Box<RawValue>>\", SUBSTR(rs.stream, $3) AS \"result_stream: Option<String>\", CHAR_LENGTH(rs.stream) + 1 AS stream_offset
+                 FROM v2_job_completed  FULL OUTER JOIN job_result_stream rs ON rs.job_id = v2_job_completed.id WHERE (v2_job_completed.id = $2 AND v2_job_completed.workspace_id = $1 OR rs.workspace_id = $1)",
                    w_id,
                    job_id,
-                ).fetch_optional(db).await?.flatten()
-                .map(|x| x.0), running)
+                    stream_offset.unwrap_or(0),
+                )
+                .fetch_optional(db)
+                .await?;
+                tracing::error!("q {:?}", q);
+                if let Some(r) = q {
+                    (r.result.map(|x| x.0), running, r.result_stream.flatten(), r.stream_offset)
+                } else {
+                    (None, None, None, None)
+                }
            }
        };
        Ok(JobUpdate {
@@ -6078,6 +6191,8 @@ async fn get_job_update_data(
            completed: if result.0.is_some() { Some(true) } else { None },
            log_offset: None,
            new_logs: None,
+            new_result_stream: result.2,
+            stream_offset: result.3,
            mem_peak: None,
            progress: None,
            job: None,
@@ -6093,20 +6208,24 @@ async fn get_job_update_data(
                    WHEN q.id IS NOT NULL THEN (CASE WHEN NOT $5 AND q.running THEN true ELSE null END)
                    ELSE false
                END AS running,
-                SUBSTR(logs, GREATEST($1 - log_offset, 0)) AS logs,
+                CASE WHEN $7::BOOLEAN THEN NULL ELSE SUBSTR(logs, GREATEST($1 - log_offset, 0)) END AS logs,
+                SUBSTR(rs.stream, $8) AS new_result_stream,
                COALESCE(r.memory_peak, c.memory_peak) AS mem_peak,
                COALESCE(c.flow_status, f.flow_status) AS \"flow_status: sqlx::types::Json<Box<RawValue>>\",
                COALESCE(c.workflow_as_code_status, f.workflow_as_code_status) AS \"workflow_as_code_status: sqlx::types::Json<Box<RawValue>>\",
-                job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 AS log_offset,
+                CASE WHEN $7::BOOLEAN THEN NULL ELSE job_logs.log_offset + CHAR_LENGTH(job_logs.logs) + 1 END AS log_offset,
+                CHAR_LENGTH(rs.stream) + 1 AS stream_offset,
                created_by AS \"created_by!\",
                CASE WHEN $4::BOOLEAN THEN (
                    SELECT scalar_int FROM job_stats WHERE job_id = $3 AND metric_id = 'progress_perc'
-                ) END AS progress
+                ) END AS progress,
+                rs.stream AS \"result_stream: Option<String>\"
            FROM v2_job j
                LEFT JOIN v2_job_queue q USING (id)
                LEFT JOIN v2_job_runtime r USING (id)
                LEFT JOIN v2_job_status f USING (id)
                LEFT JOIN v2_job_completed c USING (id)
+                LEFT JOIN job_result_stream rs ON rs.job_id = $3
                LEFT JOIN job_logs ON job_logs.job_id =  $3
            WHERE j.workspace_id = $2 AND j.id = $3
            AND ($6::text[] IS NULL OR j.tag = ANY($6))",
@@ -6116,6 +6235,8 @@ async fn get_job_update_data(
            get_progress.unwrap_or(false),
            running,
            tags.as_ref().map(|v| v.as_slice()) as Option<&[&str]>,
+            no_logs.unwrap_or(false),
+            stream_offset.unwrap_or(0),
        )
        .fetch_optional(db)
        .await?
@@ -6139,6 +6260,8 @@ async fn get_job_update_data(
            completed: record.completed,
            log_offset: record.log_offset,
            new_logs: record.logs,
+            new_result_stream: record.new_result_stream,
+            stream_offset: record.stream_offset,
            mem_peak: record.mem_peak,
            progress: record.progress,
            workflow_as_code_status: record
@@ -797,11 +797,12 @@ pub mod job {
    #[track_caller]
    pub fn fetch_script(
        db: DB,
-        kind: JobKind,
+        kind: &JobKind,
        hash: Option<ScriptHash>,
    ) -> impl Future<Output = error::Result<Arc<ScriptData>>> {
        use JobKind::*;
        let loc = Location::caller();
+        let kind = kind.clone();
        async move {
            match (kind, hash.map(|ScriptHash(id)| id)) {
                (FlowScript, Some(id)) => {
@@ -825,11 +826,12 @@ pub mod job {
    #[track_caller]
    pub fn fetch_flow<'c>(
        db: &'c DB,
-        kind: JobKind,
+        kind: &JobKind,
        hash: Option<ScriptHash>,
    ) -> impl Future<Output = error::Result<Arc<FlowData>>> + 'c {
        use JobKind::*;
        let loc = Location::caller();
+        let kind = kind.clone();
        async move {
            match (kind, hash.map(|ScriptHash(id)| id)) {
                (FlowDependencies, Some(id)) => flow::fetch_version(db, id).await,
@@ -82,6 +82,7 @@ pub mod variables;
 pub mod worker;
 pub mod workspaces;
 pub mod triggers;
+pub mod result_stream;
 pub mod stream;

 pub const DEFAULT_MAX_CONNECTIONS_SERVER: u32 = 50;
@@ -0,0 +1,33 @@
+use uuid::Uuid;
+use crate::{error, DB};
+
+pub const STREAM_PREFIX: &str = "WM_STREAM: ";
+
+pub fn extract_stream_from_logs(line: &str) -> Option<String> {
+    if line.starts_with(STREAM_PREFIX) {
+        // Extract the content after "WM_STREAM:" prefix
+        let stream_content = line.strip_prefix(STREAM_PREFIX).unwrap_or("");
+        if !stream_content.is_empty() {
+            return Some(stream_content.to_string().replace("\\n", "\n"));
+        }
+    }
+    None
+}
+
+
+
+pub async fn append_result_stream_db(db: &DB, workspace_id: &str, job_id: &Uuid, nstream: &str) -> error::Result<()> {
+    if !nstream.is_empty() {
+        sqlx::query!(
+            r#"
+            INSERT INTO job_result_stream (workspace_id, job_id, stream)
+            VALUES ($1, $2, $3)
+            ON CONFLICT (job_id) DO UPDATE SET stream = job_result_stream.stream || $3
+            "#,
+            workspace_id,
+            job_id,
+            nstream,
+        ).execute(db).await?;
+    }
+    Ok(())
+}
@@ -1281,7 +1281,7 @@ async fn restart_job_if_perpetual_inner(

 #[cfg(feature = "enterprise")]
 async fn has_failure_module(db: &Pool<Postgres>, job: &MiniPulledJob) -> bool {
-    if let Ok(flow) = cache::job::fetch_flow(db, job.kind, job.runnable_id).await {
+    if let Ok(flow) = cache::job::fetch_flow(db, &job.kind, job.runnable_id).await {
        return flow.value().failure_module.is_some();
    }
    sqlx::query_scalar!(
@@ -4785,7 +4785,7 @@ async fn restarted_flows_resolution(
        ))
    })?;

-    let flow_data = cache::job::fetch_flow(db, row.job_kind, row.script_hash)
+    let flow_data = cache::job::fetch_flow(db, &row.job_kind, row.script_hash)
        .or_else(|_| cache::job::fetch_preview_flow(db.into(), &completed_flow_id, row.raw_flow))
        .await?;
    let flow_value = flow_data.value();
@@ -364,7 +364,7 @@ pub async fn install_bun_lockfile(
            occupancy_metrics,
            None,
        )
-        .await?
+        .await?;
    } else {
        Box::into_pin(child_process.wait()).await?;
    }
@@ -1081,6 +1081,10 @@ function argsObjToArr({{ {spread} }}) {{
    return [ {spread} ];
 }}

+function isAsyncIterable(obj) {{
+    return obj != null && typeof obj[Symbol.asyncIterator] === 'function';
+}}
+
 BigInt.prototype.toJSON = function () {{
    return this.toString();
 }};
@@ -1093,6 +1097,12 @@ async function run() {{
        throw new Error("{main_name} function is missing");
    }}
    let res = await Main.{main_name}(...argsArr);
+    if (isAsyncIterable(res)) {{
+        for await (const chunk of res) {{
+            console.log("WM_STREAM: " + chunk.replace('\n', '\\n'));
+        }}
+        res = null;
+    }}
    const res_json = JSON.stringify(res ?? null, (key, value) => typeof value === 'undefined' ? null : value);
    await fs.writeFile("result.json", res_json);
    process.exit(0);
@@ -1441,7 +1451,7 @@ try {{
        .await?
    };

-    handle_child(
+    let handle_result = handle_child(
        &job.id,
        conn,
        mem_peak,
@@ -1474,7 +1484,7 @@ try {{
            })?;
        *new_args = Some(args.clone());
    }
-    read_result(job_dir).await
+    read_result(job_dir, handle_result.result_stream).await
 }

 pub async fn get_common_bun_proc_envs(base_internal_url: Option<&str>) -> HashMap<String, String> {
@@ -359,11 +359,41 @@ pub async fn read_file(path: &str) -> error::Result<Box<RawValue>> {
    return Ok(r);
 }

+pub async fn merge_result_stream(
+    result: error::Result<Box<RawValue>>,
+    result_stream: Option<String>,
+) -> error::Result<Box<RawValue>> {
+    if let Some(result_stream) = result_stream {
+        result.and_then(|x| {
+            let mut value: Value = serde_json::from_str(x.get())?;
+
+            // Insert the string at the "wm_stream" field
+            if let Value::Object(ref mut map) = value {
+                map.insert("wm_stream".to_string(), Value::String(result_stream));
+            } else if value.is_null() {
+                // return Ok(unsafe_raw(json))
+                return Ok(to_raw_value(&json!(result_stream)));
+            } else {
+                return Ok(x);
+            }
+
+            // Convert back to RawValue
+            let json_string = serde_json::to_string(&value)?;
+            Ok(RawValue::from_string(json_string)?)
+        })
+    } else {
+        result
+    }
+}
 /// Read the `result.json` file. This function assumes that the file contains valid json and will
 /// result in undefined behaviour if it isn't. If the result.json is user generated or otherwise
 /// not guaranteed to be valid, use `read_and_check_result`
-pub async fn read_result(job_dir: &str) -> error::Result<Box<RawValue>> {
-    return read_file(&format!("{job_dir}/result.json")).await;
+pub async fn read_result(
+    job_dir: &str,
+    result_stream: Option<String>,
+) -> error::Result<Box<RawValue>> {
+    let rf = read_file(&format!("{job_dir}/result.json")).await;
+    merge_result_stream(rf, result_stream).await
 }

 pub async fn read_and_check_file(path: &str) -> error::Result<Box<RawValue>> {
@@ -641,5 +641,5 @@ pub async fn handle_csharp_job(
        None,
    )
    .await?;
-    read_result(job_dir).await
+    read_result(job_dir, None).await
 }
@@ -126,7 +126,7 @@ pub async fn handle_dedicated_process(
        let status = Box::into_pin(child.wait())
            .await
            .expect("child process encountered an error");
-        if let Err(e) = process_status(&cmd_name, status) {
+        if let Err(e) = process_status(&cmd_name, status, vec![]) {
            tracing::error!("child exit status was not success: {e:#}");
        } else {
            tracing::info!("child exit status was success");
@@ -283,6 +283,10 @@ BigInt.prototype.toJSON = function () {{
    return this.toString();
 }};

+function isAsyncIterable(obj) {{
+    return obj != null && typeof obj[Symbol.asyncIterator] === 'function';
+}}
+
 async function run() {{
    {dates}
    {preprocessor}
@@ -291,6 +295,12 @@ async function run() {{
        throw new Error("{main_name} function is missing");
    }}
    let res: any = await {main_name}(...argsArr);
+    if (isAsyncIterable(res)) {{
+        for await (const chunk of res) {{
+            console.log("WM_STREAM: " + chunk.replace('\n', '\\n'));
+        }}
+        res = null;
+    }}
    const res_json = JSON.stringify(res ?? null, (key, value) => typeof value === 'undefined' ? null : value);
    await Deno.writeTextFile("result.json", res_json);
    Deno.exit(0);
@@ -408,7 +418,7 @@ try {{
    };
    // logs.push_str(format!("prepare: {:?}\n", start.elapsed().as_micros()).as_str());
    // start = Instant::now();
-    handle_child(
+    let handle_result = handle_child(
        &job.id,
        conn,
        mem_peak,
@@ -445,7 +455,7 @@ try {{
            })?;
        *new_args = Some(args.clone());
    }
-    read_result(job_dir).await
+    read_result(job_dir, handle_result.result_stream).await
 }

 async fn build_import_map(
@@ -408,7 +408,7 @@ func Run(req Req) (interface{{}}, error){{
        run_go.stdout(Stdio::piped()).stderr(Stdio::piped());
        start_child_process(run_go, &compiled_executable_name).await?
    };
-    handle_child(
+    let handle_result = handle_child(
        &job.id,
        conn,
        mem_peak,
@@ -425,7 +425,7 @@ func Run(req Req) (interface{{}}, error){{
    )
    .await?;

-    read_result(job_dir).await
+    read_result(job_dir, handle_result.result_stream).await
 }

 async fn gen_go_mod(
@@ -7,6 +7,7 @@ use nix::unistd::Pid;
 use process_wrap::tokio::TokioChildWrapper;
 use windmill_common::agent_workers::PingJobStatusResponse;
 use windmill_common::jobs::LARGE_LOG_THRESHOLD_SIZE;
+use windmill_common::result_stream::extract_stream_from_logs;

 #[cfg(windows)]
 use std::process::Stdio;
@@ -52,7 +53,7 @@ use futures::{
 };

 use crate::common::{resolve_job_timeout, OccupancyMetrics};
-use crate::job_logger::{append_job_logs, append_with_limit};
+use crate::job_logger::{append_job_logs, append_result_stream, append_with_limit};
 use crate::job_logger_oss::process_streaming_log_lines;
 use crate::worker_utils::{ping_job_status, update_worker_ping_from_job};
 use crate::{MAX_RESULT_SIZE, MAX_WAIT_FOR_SIGINT, MAX_WAIT_FOR_SIGTERM};
@@ -87,6 +88,10 @@ async fn kill_process_tree(pid: Option<u32>) -> Result<(), String> {
    }
 }

+pub struct HandleChildResult {
+    pub result_stream: Option<String>,
+}
+
 /// - wait until child exits and return with exit status
 /// - read lines from stdout and stderr and append them to the "queue"."logs"
 ///   quitting early if output exceedes MAX_LOG_SIZE characters (not bytes)
@@ -109,7 +114,7 @@ pub async fn handle_child(
    occupancy_metrics: &mut Option<&mut OccupancyMetrics>,
    // Do not print logs to output, but instead save to string.
    pipe_stdout: Option<&mut String>,
-) -> error::Result<()> {
+) -> error::Result<HandleChildResult> {
    let start = Instant::now();

    let pid = child.id();
@@ -296,6 +301,7 @@ pub async fn handle_child(
        }
    };

+    let mut stream_result = Vec::new();
    /* a future that reads output from the child and appends to the database */
    let lines = write_lines(
        output,
@@ -308,6 +314,7 @@ pub async fn handle_child(
        pipe_stdout,
        &mut rx2,
        child_name,
+        &mut stream_result,
    )
    .instrument(trace_span!("child_lines"));

@@ -322,7 +329,7 @@ pub async fn handle_child(
        _ if *too_many_logs.borrow() => Err(Error::ExecutionErr(format!(
            "logs or result reached limit. (current max size: {MAX_RESULT_SIZE} characters)"
        ))),
-        Ok(Ok(status)) => process_status(&child_name, status),
+        Ok(Ok(status)) => process_status(&child_name, status, stream_result),
        Ok(Err(kill_reason)) => match kill_reason {
            KillReason::AlreadyCompleted => {
                Err(Error::AlreadyCompleted("Job already completed".to_string()))
@@ -346,6 +353,7 @@ pub async fn write_lines(
    pipe_stdout: Option<&mut String>,
    rx2: &mut broadcast::Receiver<()>,
    child_name: &str,
+    stream_result: &mut Vec<String>,
 ) {
    let max_log_size = if *CLOUD_HOSTED {
        MAX_RESULT_SIZE
@@ -401,13 +409,25 @@ pub async fn write_lines(
        let mut joined = String::new();

        let job_id = job_id.clone();
+        let mut nstream = String::new();
        while let Some(line) = read_lines.next().await {
            match line {
                Ok(line) => {
                    if line.is_empty() {
                        continue;
                    }
-                    append_with_limit(&mut joined, &line, &mut log_remaining);
+                    if let Some(stream) = extract_stream_from_logs(&line) {
+                        let len = stream.len();
+                        if log_remaining >= len {
+                            log_remaining -= len;
+                            nstream.push_str(&stream);
+                            stream_result.push(stream);
+                        } else {
+                            log_remaining = 0;
+                        }
+                    } else {
+                        append_with_limit(&mut joined, &line, &mut log_remaining);
+                    }
                    if log_remaining == 0 {
                        tracing::info!(%job_id, "Too many logs lines for job {job_id}");
                        let _ = set_too_many_logs.send(true);
@@ -460,6 +480,14 @@ pub async fn write_lines(
            let job_id = job_id.clone();
            let pg_log_total_size = pg_log_total_size.clone();
            (do_write, write_result) = tokio::spawn(async move {
+                if !nstream.is_empty() {
+                    if let Err(err) = append_result_stream(&conn, &w_id, &job_id, &nstream).await {
+                        tracing::error!(
+                            "Unable to send result stream for job {job_id}. Error was: {:?}",
+                            err
+                        );
+                    }
+                }
                append_job_logs(
                    &job_id,
                    &w_id,
@@ -762,9 +790,19 @@ pub fn lines_to_stream<R: tokio::io::AsyncBufRead + Unpin>(
    })
 }

-pub fn process_status(program: &str, status: ExitStatus) -> error::Result<()> {
+pub fn process_status(
+    program: &str,
+    status: ExitStatus,
+    stream_result: Vec<String>,
+) -> error::Result<HandleChildResult> {
    if status.success() {
-        Ok(())
+        Ok(HandleChildResult {
+            result_stream: if stream_result.is_empty() {
+                None
+            } else {
+                Some(stream_result.join(""))
+            },
+        })
    } else if let Some(code) = status.code() {
        Err(error::Error::ExitStatus(program.to_string(), code))
    } else {
@@ -88,7 +88,7 @@ pub async fn handle_java_job<'a>(mut args: JobHandlerInput<'a>) -> Result<Box<Ra
    }
    // --- Retrieve results ---
    {
-        read_result(&args.job_dir).await
+        read_result(&args.job_dir, None).await
    }
 }

@@ -718,7 +718,8 @@ async fn run<'a>(
        &mut Some(occupancy_metrics),
        None,
    )
-    .await
+    .await?;
+    Ok(())
 }

 #[derive(Default, Debug)]
@@ -1,10 +1,11 @@
 use regex::Regex;

 pub use windmill_common::jobs::LARGE_LOG_THRESHOLD_SIZE;
+use windmill_common::result_stream::append_result_stream_db;
 use windmill_common::utils::WarnAfterExt;
 use windmill_common::worker::{Connection, CLOUD_HOSTED};

-use windmill_common::DB;
+use windmill_common::{error, DB};
 use windmill_queue::append_logs;

 use std::sync::atomic::AtomicU32;
@@ -61,6 +62,32 @@ pub async fn append_job_logs(
    }
 }

+pub async fn append_result_stream(
+    conn: &Connection,
+    workspace_id: &str,
+    job_id: &Uuid,
+    nstream: &str,
+) -> error::Result<()> {
+    match conn {
+        Connection::Sql(db) => {
+            append_result_stream_db(db, workspace_id, job_id, nstream).await?;
+        }
+        Connection::Http(client) => {
+            if let Err(e) = client
+                .post::<_, String>(
+                    &format!("/api/w/{}/agent_workers/push_logs/{}", workspace_id, job_id),
+                    None,
+                    &nstream,
+                )
+                .await
+            {
+                tracing::error!(%job_id, %e, "error sending result stream for  job {job_id}: {e}");
+            };
+        }
+    }
+    Ok(())
+}
+
 pub async fn append_logs_with_compaction(
    job_id: &Uuid,
    w_id: &str,
@@ -701,7 +701,7 @@ pub struct MainArgs {

 #[cfg(feature = "deno_core")]
 pub struct LogString {
-    pub s: String,
+    pub s: mpsc::UnboundedSender<String>,
 }

 #[cfg(feature = "deno_core")]
@@ -894,6 +894,8 @@ pub async fn eval_fetch_timeout(
            return y*2;
        });

+        let (log_sender, mut log_receiver) = mpsc::unbounded_channel::<String>();
+
        {
            let op_state = js_runtime.op_state();
            let mut op_state = op_state.borrow_mut();
@@ -901,7 +903,7 @@ pub async fn eval_fetch_timeout(
            //reqwest client seems to not be sharable between runtimes unfortunately
            // op_state.put(HTTP_CLIENT.clone());
            op_state.put(MainArgs { args: spread });
-            op_state.put(LogString { s: String::new() });
+            op_state.put(LogString { s: log_sender });
        }

        sender
@@ -913,23 +915,51 @@ pub async fn eval_fetch_timeout(
            .build()?;

        let future = async {
+            use crate::common::merge_result_stream;
+
+            if !extra_logs.is_empty() {
+                append_logs(&job_id, w_id_.as_str(), format!("{extra_logs}"), &conn_).await;
+            }
+            let w_id = w_id_.clone();
+            let handle = tokio::spawn(async move {
+                let mut result_stream = String::new();
+                while let Some(log) = log_receiver.recv().await {
+                    use windmill_common::result_stream::extract_stream_from_logs;
+
+                    if let Some(stream) = extract_stream_from_logs(&log.trim_end_matches("\n")) {
+                        use crate::job_logger::append_result_stream;
+
+                        result_stream.push_str(&stream);
+                        if let Err(e) = append_result_stream(&conn_, &w_id, &job_id, &stream).await
+                        {
+                            tracing::error!("failed to append result stream for job {job_id}: {e}");
+                        }
+                    } else {
+                        append_logs(&job_id, w_id_.as_str(), log, &conn_).await;
+                    }
+                }
+                if !result_stream.is_empty() {
+                    Some(result_stream)
+                } else {
+                    None
+                }
+            });
+
            let r = tokio::select! {
                r = eval_fetch(&mut js_runtime, &js_expr, Some(env_code), script_entrypoint_override, load_client, &job_id) => Ok(r),
                _ = memory_limit_rx.recv() => Err(Error::ExecutionErr("Memory limit reached, killing isolate".to_string()))
            };
-
-            append_logs(
-                &job_id,
-                w_id_.as_str(),
-                format!(
-                    "{extra_logs}{}",
-                    js_runtime.op_state().borrow().borrow::<LogString>().s
-                ),
-                &conn_,
-            )
-            .await;
-
-            r
+            drop(js_runtime);
+            if let Ok(r) = r {
+                match handle.await {
+                    Ok(Some(logs)) => Ok(merge_result_stream(r, Some(logs)).await),
+                    Ok(None) => Ok(r),
+                    Err(e) => Err(Error::ExecutionErr(e.to_string())),
+                }
+            } else {
+                r
+            }
+            // r
        };
        let r = runtime.block_on(future)?;
        // tracing::info!("total: {:?}", instant.elapsed());
@@ -1039,8 +1069,46 @@ async fn eval_fetch(
            "<anon>",
            format!(
                r#"
+function isAsyncIterable(obj) {{
+    // return true;    // TODO: remove this
+    return obj != null && typeof obj[Symbol.asyncIterator] === 'function';
+}}
+
+function processStreamIterative(res) {{
+    const iterator = res[Symbol.asyncIterator]();
+    
+    function processLoop() {{
+        return new Promise(function(resolve) {{
+            function step() {{
+                iterator.next().then(function(result) {{
+                    if (!result.done) {{
+                        const chunk = result.value;
+                        console.log("WM_STREAM: " + chunk.replace('\n', '\\n'));
+                        // Continue the loop
+                        step();
+                    }} else {{
+                        resolve("null");
+                    }}
+                }}).catch(function(error) {{
+                    resolve("null");
+                }});
+            }}
+            step();
+        }});
+    }}
+    
+    return processLoop();
+}}
+
 let args = Deno.core.ops.op_get_static_args().map(JSON.parse)
-import("file:///eval.ts").then((module) => module.{main_override}(...args)).then(JSON.stringify)
+import("file:///eval.ts").then((module) => module.{main_override}(...args))
+    .then(res => {{
+        if (isAsyncIterable(res)) {{
+            return processStreamIterative(res)
+        }} else {{
+            return JSON.stringify(res ?? null);
+        }}
+    }})
 "#
            ),
        )
@@ -1120,11 +1188,14 @@ fn op_get_static_args(op_state: Rc<RefCell<OpState>>) -> Vec<Option<String>> {
 #[op2(fast)]
 fn op_log(op_state: Rc<RefCell<OpState>>, #[string] log: &str) {
    // tracing::error!("log: |{}|", log);
-    op_state
+    if let Err(e) = op_state
        .borrow_mut()
        .borrow_mut::<LogString>()
        .s
-        .push_str(log);
+        .send(log.to_string())
+    {
+        tracing::error!("failed to send log: {e}");
+    }
 }

 #[cfg(feature = "deno_core")]
@@ -20,7 +20,6 @@ use crate::{
 };
 use windmill_common::client::AuthedClient;

-
 const NSJAIL_CONFIG_RUN_NU_CONTENT: &str = include_str!("../nsjail/run.nu.config.proto");
 lazy_static::lazy_static! {
    static ref NU_PATH: String = std::env::var("NU_PATH").unwrap_or_else(|_| "/usr/bin/nu".to_string());
@@ -69,7 +68,7 @@ pub async fn handle_nu_job<'a>(mut args: JobHandlerInput<'a>) -> Result<Box<RawV
    }
    // --- Retrieve results ---
    {
-        read_result(&args.job_dir).await
+        read_result(&args.job_dir, None).await
    }
 }

@@ -341,7 +340,8 @@ async fn run<'a>(
        &mut Some(occupancy_metrics),
        None,
    )
-    .await
+    .await?;
+    Ok(())
 }
 // #[cfg(test)]
 // mod test {
@@ -20,8 +20,7 @@ use crate::{
        read_result, start_child_process, OccupancyMetrics,
    },
    handle_child::handle_child,
-    COMPOSER_CACHE_DIR, COMPOSER_PATH, DISABLE_NSJAIL, DISABLE_NUSER, NSJAIL_PATH,
-    PHP_PATH,
+    COMPOSER_CACHE_DIR, COMPOSER_PATH, DISABLE_NSJAIL, DISABLE_NUSER, NSJAIL_PATH, PHP_PATH,
 };
 use windmill_common::client::AuthedClient;

@@ -345,5 +344,5 @@ try {{
        None,
    )
    .await?;
-    read_result(job_dir).await
+    read_result(job_dir, None).await
 }
@@ -679,8 +679,7 @@ replace_invalid_fields = re.compile(r'(?:\bNaN\b|\\*\\u0000|Infinity|\-Infinity)

 result_json = os.path.join(os.path.abspath(os.path.dirname(__file__)), "result.json")

-def res_to_json(res):
-    typ = type(res)
+def res_to_json(res, typ):
    if typ.__name__ == 'DataFrame':
        if typ.__module__ == 'pandas.core.frame':
            res = res.values.tolist()
@@ -704,7 +703,12 @@ try:
    if inner_script.{main_override} is None or not callable(inner_script.{main_override}):
        raise ValueError("{main_override} function is missing")
    res = inner_script.{main_override}(**args)
-    res_json = res_to_json(res)
+    typ = type(res)
+    if hasattr(res, '__iter__') and not isinstance(res, (str, dict, list, bytes, tuple, set, frozenset, range, memoryview, bytearray)) and typ.__name__ != 'DataFrame':
+        for chunk in res:
+            print("WM_STREAM: " + chunk.replace('\n', '\\n'))
+        res = None
+    res_json = res_to_json(res, typ)
    with open(result_json, 'w') as f:
        f.write(res_json)
 except BaseException as e:
@@ -858,7 +862,7 @@ mount {{
        start_child_process(python_cmd, &python_path).await?
    };

-    handle_child(
+    let handle_result = handle_child(
        &job.id,
        conn,
        mem_peak,
@@ -892,7 +896,7 @@ mount {{
        *new_args = Some(args.clone());
    }

-    read_result(job_dir).await
+    read_result(job_dir, handle_result.result_stream).await
 }

 async fn prepare_wrapper(
@@ -656,7 +656,8 @@ impl PyV {
            occupancy_metrics,
            None,
        )
-        .await
+        .await?;
+        Ok(())
    }
    async fn find_python(&self) -> error::Result<Option<String>> {
        #[cfg(windows)]
@@ -382,7 +382,7 @@ pub async fn process_result(
        Err(e) => {
            let error_value = match e {
                Error::ExitStatus(program, i) => {
-                    let res = read_result(job_dir).await.ok();
+                    let res = read_result(job_dir, None).await.ok();

                    if res.as_ref().is_some_and(|x| !x.get().is_empty()) {
                        res.unwrap()
@@ -600,5 +600,5 @@ pub async fn handle_rust_job(
        None,
    )
    .await?;
-    read_result(job_dir).await
+    read_result(job_dir, None).await
 }
@@ -2401,7 +2401,7 @@ pub async fn handle_queued_job(
            let flow_data = match preview_data {
                Some(RawData::Flow(data)) => data,
                // Not a preview: fetch from the cache or the database.
-                _ => cache::job::fetch_flow(db, job.kind, job.runnable_id).await?,
+                _ => cache::job::fetch_flow(db, &job.kind, job.runnable_id).await?,
            };
            handle_flow(
                job,
@@ -287,7 +287,7 @@ pub async fn update_flow_status_after_job_completion_internal(
             ))
         })?;

-        let flow_data = cache::job::fetch_flow(db, job_kind, script_hash)
+        let flow_data = cache::job::fetch_flow(db, &job_kind, script_hash)
            .or_else(|_| cache::job::fetch_preview_flow(db, &flow, raw_flow))
            .await?;
        let flow_value = flow_data.value();
@@ -39,6 +39,7 @@
 	import { getContext, hasContext, createEventDispatcher, onDestroy } from 'svelte'
 	import { toJsonStr } from '$lib/utils'
 	import { userStore } from '$lib/stores'
+	import ResultStreamDisplay from './ResultStreamDisplay.svelte'

 	const IMG_MAX_SIZE = 10000000
 	const TABLE_MAX_SIZE = 5000000
@@ -83,12 +84,14 @@
 		noControls?: boolean
 		drawerOpen?: boolean
 		nodeId?: string | undefined
+		loading?: boolean | undefined
 		language?: string | undefined
 		appPath?: string | undefined
 		customUi?: DisplayResultUi | undefined
 		isTest?: boolean
 		externalToolbarAvailable?: boolean
 		forceJson?: boolean
+		result_stream?: string | undefined
 		fixTableSizingToParent?: boolean
 		copilot_fix?: import('svelte').Snippet
 		children?: import('svelte').Snippet
@@ -111,9 +114,11 @@
 		isTest = true,
 		externalToolbarAvailable = false,
 		forceJson = $bindable(false),
+		result_stream = undefined,
 		fixTableSizingToParent = false,
 		copilot_fix,
-		children
+		children,
+		loading = false
 	}: Props = $props()
 	let enableHtml = $state(false)
 	let s3FileDisplayRawMode = $state(false)
@@ -487,7 +492,15 @@
 </script>

 <HighlightTheme />
-{#if is_render_all}
+
+{#if result_stream && result == undefined}
+	<div class="flex flex-col w-full gap-2">
+		<div class="flex items-center gap-2 text-tertiary">
+			<Loader2 class="animate-spin" size={16} /> Streaming result
+		</div>
+		<ResultStreamDisplay {result_stream} />
+	</div>
+{:else if is_render_all}
 	<div class="flex flex-col w-full gap-2">
 		{#if !noControls}
 			<div class="text-tertiary text-sm">
@@ -690,7 +703,7 @@
 				{:else if !forceJson && resultKind === 'plain'}<div class="h-full text-2xs"
 						><pre class="whitespace-pre-wrap"
 							>{typeof result === 'string' ? result : result?.['result']}</pre
-						>{#if !noControls}
+						>{#if !noControls && !loading}
 							<div class="flex">
 								<Button
 									on:click={() =>
@@ -14,6 +14,7 @@
 	interface Props {
 		waitingForExecutor?: boolean
 		result: any
+		result_stream?: string
 		logs: string | undefined
 		col?: boolean
 		noBorder?: boolean
@@ -31,6 +32,7 @@
 	let {
 		waitingForExecutor = false,
 		result,
+		result_stream,
 		logs = $bindable(),
 		col = false,
 		noBorder = false,
@@ -105,8 +107,8 @@
 >
 	<div class="bg-surface {col ? '' : 'max-h-80'} p-1 overflow-auto relative">
 		<span class="text-tertiary">Result</span>
-		{#if result !== undefined}
-			<DisplayResult {workspaceId} {jobId} {filename} {result} />
+		{#if result !== undefined || result_stream !== undefined}
+			<DisplayResult {workspaceId} {jobId} {filename} {result} {result_stream} />
 		{:else if loading}
 			<Loader2 class="animate-spin" />
 		{:else}
@@ -20,6 +20,7 @@
 		suspendStatus: Writable<Record<string, { job: Job; nb: number }>>
 		hideJobId?: boolean
 		extra?: import('svelte').Snippet
+		result_streams?: Record<string, string | undefined>
 	}

 	let {
@@ -32,7 +33,8 @@
 		innerModules,
 		suspendStatus,
 		hideJobId,
-		extra
+		extra,
+		result_streams
 	}: Props = $props()
 </script>

@@ -105,6 +107,9 @@
 						<Loader2 class="animate-spin mt-0.5" /></span
 					></div
 				>
+				{#if mod.job && result_streams?.[mod.job]}
+					<pre class="text-xs text-primary">{result_streams?.[mod.job]}</pre>
+				{/if}
 			{/if}
 		{/each}
 	</div>
@@ -83,10 +83,17 @@
 		subflowParentsDurationStatuses?: Writable<Record<string, DurationStatus>>[]
 		isForloopSelected?: boolean
 		parentRecursiveRefresh?: Record<string, (clear, root) => Promise<void>>
-		job?: Job | undefined
+		job?: (Job & { result_stream?: string }) | undefined
 		rightColumnSelect?: 'timeline' | 'node_status' | 'node_definition' | 'user_states'
 		localModuleStates?: Writable<Record<string, GraphModuleState>>
 		localDurationStatuses?: Writable<Record<string, DurationStatus>>
+		onResultStreamUpdate?: ({
+			jobId,
+			result_stream
+		}: {
+			jobId: string
+			result_stream?: string
+		}) => void
 		customUi?: {
 			tagLabel?: string | undefined
 		}
@@ -119,8 +126,24 @@
 		rightColumnSelect = $bindable('timeline'),
 		localModuleStates = writable({}),
 		localDurationStatuses = writable({}),
-		customUi
+		customUi,
+		onResultStreamUpdate = undefined
 	}: Props = $props()
+
+	let resultStreams: Record<string, string | undefined> = $state({})
+
+	if (onResultStreamUpdate == undefined) {
+		onResultStreamUpdate = ({
+			jobId,
+			result_stream
+		}: {
+			jobId: string
+			result_stream?: string
+		}) => {
+			resultStreams[jobId] = result_stream
+		}
+	}
+
 	let recursiveRefresh: Record<string, (clear, root) => Promise<void>> = $state({})

 	// Add support for the input args assets shown as an asset node
@@ -516,6 +539,9 @@
 					jobLoader?.watchJob(jobId, {
 						change(newJob) {
 							setJob(newJob, true)
+						},
+						resultStreamUpdate({ id, result_stream }: { id: string; result_stream?: string }) {
+							onResultStreamUpdate?.({ jobId: id, result_stream })
 						}
 					})
 				}
@@ -959,6 +985,7 @@
 					<DisplayResult
 						workspaceId={job?.workspace_id}
 						{jobId}
+						result_stream={job?.result_stream}
 						result={jobResults}
 						language={job?.language}
 					/>
@@ -976,6 +1003,7 @@
 					{innerModules}
 					{suspendStatus}
 					{hideJobId}
+					result_streams={resultStreams}
 				/>
 			</div>
 		{/if}
@@ -1067,6 +1095,7 @@
 										storedListJobs[j] = job
 										innerJobLoaded(job, j, false, force)
 									}}
+									{onResultStreamUpdate}
 								/>
 							</div>
 						{/if}
@@ -1142,6 +1171,7 @@
 											{reducedPolling}
 											{workspaceId}
 											jobId={failedRetry}
+											{onResultStreamUpdate}
 										/>
 									</div>
 								{/each}
@@ -1174,6 +1204,7 @@
 											let { force, job } = e.detail
 											onJobsLoaded(mod, job, force)
 										}}
+										{onResultStreamUpdate}
 									/>
 								{:else if mod.flow_jobs?.length == 0 && mod.job == '00000000-0000-0000-0000-000000000000'}
 									<div class="text-secondary">no subflow (empty loop?)</div>
@@ -1205,6 +1236,7 @@
 											let { job, force } = e.detail
 											onJobsLoaded(mod, job, force)
 										}}
+										{onResultStreamUpdate}
 									/>
 								{/if}
 							{:else}
@@ -1428,6 +1460,7 @@
 											waitingForExecutor={node.type == 'WaitingForExecutor'}
 											refreshLog={node.type == 'InProgress'}
 											col
+											result_stream={resultStreams[node.job_id ?? '']}
 											result={node.result}
 											tag={node.tag}
 											logs={node.logs}
@@ -23,11 +23,12 @@
 		cancel?: ({ id }: { id: string }) => void
 		started?: ({ id }: { id: string }) => void
 		running?: ({ id }: { id: string }) => void
+		resultStreamUpdate?: ({ id, result_stream }: { id: string; result_stream?: string }) => void
 	}

 	interface Props {
 		isLoading?: boolean
-		job?: Job | undefined
+		job?: (Job & { result_stream?: string }) | undefined
 		noCode?: boolean
 		noLogs?: boolean
 		workspaceOverride?: string | undefined
@@ -35,7 +36,6 @@
 		allowConcurentRequests?: boolean
 		jobUpdateLastFetch?: Date | undefined
 		toastError?: boolean
-		lazyLogs?: boolean
 		onlyResult?: boolean
 		// If you want to find out progress of subjobs of a flow, check job.flow_status.progress
 		scriptProgress?: number | undefined
@@ -52,7 +52,6 @@
 		notfound = $bindable(false),
 		jobUpdateLastFetch = $bindable(undefined),
 		toastError = false,
-		lazyLogs = false,
 		onlyResult = false,
 		scriptProgress = $bindable(undefined),
 		noLogs = false,
@@ -74,6 +73,7 @@
 	let errorIteration = 0

 	let logOffset = 0
+	let resultStreamOffset = 0
 	let lastCallbacks: Callbacks | undefined = undefined

 	let finished: string[] = []
@@ -194,6 +194,9 @@
 		if (logOffset == 0) {
 			logOffset = job?.logs?.length ? job.logs?.length + 1 : 0
 		}
+		if (resultStreamOffset == 0) {
+			resultStreamOffset = job?.result_stream?.length ? job.result_stream?.length + 1 : 0
+		}
 	}
 	export async function getLogs() {
 		if (job) {
@@ -285,6 +288,7 @@
 	let startedWatchingJob: number | undefined = undefined
 	export async function watchJob(testId: string, callbacks?: Callbacks) {
 		logOffset = 0
+		resultStreamOffset = 0
 		syncIteration = 0
 		errorIteration = 0
 		currentId = testId
@@ -334,7 +338,7 @@

 	function updateJobFromProgress(
 		previewJobUpdates: GetJobUpdatesResponse,
-		job: Job,
+		job: Job & { result_stream?: string },
 		callbacks: Callbacks | undefined
 	) {
 		// Clamp number between two values with the following line:
@@ -357,10 +361,26 @@
 			}
 		}

+		if (previewJobUpdates.new_result_stream) {
+			if (!job.result_stream) {
+				job.result_stream = previewJobUpdates.new_result_stream
+			} else {
+				job.result_stream = job.result_stream.concat(previewJobUpdates.new_result_stream)
+			}
+			callbacks?.resultStreamUpdate?.({
+				id: job.id,
+				result_stream: job.result_stream
+			})
+		}
+
 		if (previewJobUpdates.log_offset) {
 			logOffset = previewJobUpdates.log_offset ?? 0
 		}

+		if (previewJobUpdates.stream_offset) {
+			resultStreamOffset = previewJobUpdates.stream_offset ?? 0
+		}
+
 		if (previewJobUpdates.flow_status) {
 			job.flow_status = previewJobUpdates.flow_status as FlowStatus
 		}
@@ -415,7 +435,7 @@
 					job = await JobService.getJob({
 						workspace: workspace!,
 						id,
-						noLogs: lazyLogs || onlyResult || noLogs,
+						noLogs: onlyResult || noLogs,
 						noCode
 					})
 				}
@@ -504,6 +524,7 @@
 		callbacks?: Callbacks
 	): Promise<boolean> {
 		let isCompleted = false
+		let resultOnlyResultStream: string = ''
 		if (isCurrentJob(id)) {
 			try {
 				// First load the job to get initial state
@@ -511,11 +532,18 @@
 					job = await JobService.getJob({
 						workspace: workspace!,
 						id,
-						noLogs: lazyLogs || noLogs,
+						noLogs: noLogs,
 						noCode
 					})
 				}

+				if (!onlyResult) {
+					callbacks?.resultStreamUpdate?.({
+						id,
+						result_stream: undefined
+					})
+				}
+
 				// If job is already completed, don't start SSE
 				if (job?.type === 'CompletedJob') {
 					isCompleted = true
@@ -555,6 +583,12 @@
 					if (startedWatchingJob && startedWatchingJob > Date.now() - 5000) {
 						params.set('fast', 'true')
 					}
+					if (noLogs) {
+						params.set('no_logs', 'true')
+					}
+					if (resultStreamOffset) {
+						params.set('stream_offset', resultStreamOffset.toString())
+					}

 					const sseUrl = `/api/w/${workspace}/jobs_u/getupdate_sse/${id}?${params.toString()}`

@@ -598,6 +632,17 @@
 								callbacks?.running?.({ id })
 							}

+							if (onlyResult && previewJobUpdates.new_result_stream) {
+								resultOnlyResultStream = resultOnlyResultStream.concat(
+									previewJobUpdates.new_result_stream
+								)
+								// console.log('resultOnlyResultStream', resultOnlyResultStream)
+								callbacks?.resultStreamUpdate?.({
+									id,
+									result_stream: resultOnlyResultStream
+								})
+							}
+
 							// Check if job is completed
 							if (previewJobUpdates.completed) {
 								currentEventSource?.close()
@@ -611,8 +656,9 @@
 									})
 									clearCurrentId()
 								} else {
-									const njob = previewJobUpdates.job as Job
+									const njob = previewJobUpdates.job as Job & { result_stream?: string }
 									njob.logs = job?.logs ?? ''
+									njob.result_stream = job?.result_stream ?? ''
 									job = njob
 									onJobCompleted(id, job, callbacks)
 								}
@@ -0,0 +1,5 @@
+<script lang="ts">
+	let { result_stream } = $props()
+</script>
+
+<pre class="text-xs">{result_stream}</pre>
@@ -26,6 +26,7 @@
 		configuration: RichConfigurations
 	}

+	let result_stream: string | undefined = $state(undefined)
 	let {
 		id,
 		componentInput,
@@ -57,6 +58,7 @@
 	})

 	let css = $state(initCss($app.css?.displaycomponent, customCss))
+	let loading = $state(false)
 </script>

 {#each Object.keys(components['displaycomponent'].initialData.configuration) as key (key)}
@@ -78,7 +80,15 @@
 	/>
 {/each}

-<RunnableWrapper {outputs} {render} {componentInput} {id} bind:initializing bind:result>
+<RunnableWrapper
+	{outputs}
+	{render}
+	{componentInput}
+	{id}
+	bind:initializing
+	bind:result
+	bind:loading
+>
 	<div class="flex flex-col w-full h-full component-wrapper">
 		<div
 			class={twMerge(
@@ -103,8 +113,10 @@
 			)}
 		>
 			<DisplayResult
+				{loading}
 				workspaceId={workspace}
 				{result}
+				{result_stream}
 				{requireHtmlApproval}
 				disableExpand={resolvedConfig?.hideDetails}
 				appPath={$userStore ? undefined : $appPath}
@@ -18,7 +18,6 @@
 		getContext<AppViewerContext>('AppViewerContext')

 	let result: any = $state(noBackend ? runnable.noBackendValue : undefined)
-
 	export function onSuccess() {
 		if (runnable.recomputeIds) {
 			runnable.recomputeIds.forEach((id) => $runnableComponents?.[id]?.cb?.map((cb) => cb()))
@@ -38,6 +38,7 @@
 		extraQueryParams?: Record<string, any>
 		autoRefresh?: boolean
 		result?: any
+		result_stream?: string
 		forceSchemaDisplay?: boolean
 		wrapperClass?: string
 		wrapperStyle?: string
@@ -72,6 +73,7 @@
 		extraQueryParams = {},
 		autoRefresh = true,
 		result = $bindable(undefined),
+		result_stream = $bindable(undefined),
 		forceSchemaDisplay = false,
 		wrapperClass = '',
 		wrapperStyle = '',
@@ -226,6 +228,15 @@
 				loading = false
 				dispatch('done', { id, result })
 			},
+			resultStreamUpdate({
+				id,
+				result_stream: nresult_stream
+			}: {
+				id: string
+				result_stream?: string
+			}) {
+				setResult(nresult_stream, id)
+			},
 			cancel({ id }: { id: string }) {
 				onCancel?.()
 				let jobId = id
@@ -42,11 +42,12 @@
 			<div class="break-words relative h-full px-1">
 				<DisplayResult bind:drawerOpen={resultDrawerOpen} result={frontendJob} />
 			</div>
-		{:else if testJob != undefined && 'result' in testJob && testJob.result != undefined}
+		{:else if testJob != undefined && (testJob.type == 'CompletedJob' || testJob.result_stream)}
 			<div class="break-words relative h-full px-1">
 				<DisplayResult
 					bind:drawerOpen={resultDrawerOpen}
 					workspaceId={testJob?.workspace_id}
+					result_stream={testJob?.result_stream}
 					jobId={testJob?.id}
 					result={testJob.result}
 					language={testJob?.language}
@@ -15,6 +15,7 @@
 		children?: import('svelte').Snippet<[any]>
 		content?: import('svelte').Snippet
 		onSelectedChange?: (value: string) => void
+		onTabClick?: (value: string) => void
 	}

 	let {
@@ -27,7 +28,8 @@
 		values = undefined,
 		children,
 		content,
-		onSelectedChange
+		onSelectedChange,
+		onTabClick
 	}: Props = $props()

 	const selectedStore = writable(selected)
@@ -37,6 +39,7 @@
 		update: (value: string) => {
 			selectedStore.set(value)
 			selected = value
+			onTabClick?.(value)
 		},
 		hashNavigation
 	})
@@ -55,9 +58,11 @@
 			}
 		}
 	}
+
 	$effect(() => {
 		selected && untrack(() => updateSelected())
 	})
+
 	$effect(() => {
 		$selectedStore && untrack(() => onSelectedChange?.($selectedStore))
 	})
@@ -111,7 +111,6 @@
 					<Button
 						{...btn.buttonProps}
 						startIcon={{ icon: btn.buttonProps.startIcon }}
-						on:click={btn.buttonProps.onClick}
 						btnClasses="hidden md:flex items-center gap-1"
 					>
 						{btn.label}
@@ -119,7 +118,6 @@
 					<Button
 						{...btn.buttonProps}
 						startIcon={{ icon: btn.buttonProps.startIcon }}
-						on:click={btn.buttonProps.onClick}
 						iconOnly
 						btnClasses="flex md:hidden items-center gap-1"
 					>
@@ -13,7 +13,8 @@ export const forbiddenIds: string[] = [
 	'new',
 	'in',
 	'failure',
-	'preprocessor'
+	'preprocessor',
+	'as'
 ]

 export function numberToChars(n: number) {
@@ -20,7 +20,11 @@
 		<div
 			class={twMerge(
 				'rounded-full w-2 h-2',
-				'success' in job && job.success ? 'bg-green-400' : 'bg-red-400'
+				'success' in job && job.success
+					? 'bg-green-400'
+					: job.type === 'CompletedJob'
+						? 'bg-red-400'
+						: 'bg-yellow-400'
 			)}
 			title={'success' in job && job.success ? 'Success' : 'Failed'}
 		></div>
@@ -57,7 +57,7 @@
 		disableMock?: boolean
 		disableHistory?: boolean
 		lastJob?: Job
-		testJob?: Job
+		testJob?: Job & { result_stream?: string }
 		derivedHistoryOpen?: boolean // derived from historyOpen
 		historyOffset?: any
 		clazz?: string
@@ -116,7 +116,7 @@
 						workspace_id: string
 						success: boolean
 				  }
-		  ) & { preview?: boolean })
+		  ) & { preview?: boolean; result_stream?: string; result?: unknown })
 		| undefined

 	let jsonView = $state(false)
@@ -135,9 +135,9 @@
 	}

 	function selectJob(nJob: SelectedJob | undefined) {
-		if (nJob && 'result' in nJob) {
+		if (nJob && (nJob.result_stream || nJob.type == 'CompletedJob')) {
 			selectedJob = nJob
-		} else if (job && 'result' in job) {
+		} else if (job && (job.result_stream || job.type == 'CompletedJob')) {
 			selectedJob = job
 		} else {
 			selectedJob = undefined
@@ -145,7 +145,7 @@
 	}

 	$effect(() => {
-		if (!job || !('result' in job)) {
+		if (!job || !(job.result_stream || job.type == 'CompletedJob')) {
 			return
 		}
 		selectJob(job)
@@ -266,11 +266,13 @@
 			return { ...lastJob, preview: false }
 		}
 		return undefined
-	})
+	}) as SelectedJob | undefined

 	let popoverHeight = $derived(customHeight ?? (clientHeight > 0 ? clientHeight : 0))

-	const isLoadingAndNotMock = $derived(isLoading && !mock?.enabled)
+	const isLoadingAndNotMock = $derived(
+		isLoading && job?.result_stream === undefined && !mock?.enabled
+	)

 	const copilot_fix_render = $derived(copilot_fix)
 </script>
@@ -650,6 +652,7 @@
 							bind:forceJson
 							workspaceId={undefined}
 							jobId={undefined}
+							result_stream={undefined}
 							result={mock?.return_value}
 							externalToolbarAvailable
 							fixTableSizingToParent
@@ -669,7 +672,7 @@
 						pureViewer={false}
 					/>
 				{/if}
-			{:else if selectedJob != undefined && 'result' in selectedJob}
+			{:else if selectedJob != undefined && (selectedJob.result_stream || selectedJob.type == 'CompletedJob')}
 				{#if fullResult}
 					<div class="break-words relative h-full">
 						{#key selectedJob}
@@ -679,6 +682,7 @@
 								workspaceId={selectedJob?.workspace_id}
 								jobId={selectedJob?.id}
 								result={selectedJob?.result}
+								result_stream={selectedJob?.result_stream}
 								externalToolbarAvailable
 								fixTableSizingToParent
 								on:toolbar-location-changed={({ detail }) => {
@@ -28,7 +28,7 @@

 	let { id, blankLink = false, workspace }: Props = $props()

-	let job: Job | undefined = $state(undefined)
+	let job: (Job & { result_stream?: string }) | undefined = $state(undefined)

 	let result: any = $state()

@@ -82,7 +82,7 @@
 	let jobLoader: JobLoader | undefined = $state(undefined)
 </script>

-<JobLoader lazyLogs workspaceOverride={workspace} bind:job={currentJob} bind:this={jobLoader} />
+<JobLoader noLogs workspaceOverride={workspace} bind:job={currentJob} bind:this={jobLoader} />

 <div class="p-4 flex flex-col gap-2 items-start h-full">
 	{#if job}
@@ -239,7 +239,7 @@
 								{:else}
 									<Skeleton layout={[[5]]} />
 								{/if}
-							{:else if job !== undefined && 'result' in job && job.result !== undefined}
+							{:else if job !== undefined && (job.result_stream || (job.type == 'CompletedJob' && job.result !== undefined))}
 								<DisplayResult
 									workspaceId={job?.workspace_id}
 									jobId={job?.id}
@@ -36,7 +36,7 @@
 	interface Props {
 		lang: Preview['language'] | undefined
 		previewIsLoading?: boolean
-		previewJob: Job | undefined
+		previewJob: (Job & { result_stream?: string; result?: any; success?: boolean }) | undefined
 		pastPreviews?: CompletedJob[]
 		editor?: Editor | undefined
 		diffEditor?: DiffEditor | undefined
@@ -102,6 +102,7 @@
 				result={drawerContent.content}
 				customUi={customUi?.displayResult}
 				language={lang}
+				result_stream={previewJob?.result_stream}
 			/>
 		{:else if drawerContent?.mode === 'plain'}
 			<pre
@@ -113,7 +114,6 @@
 		{/if}
 	</DrawerContent>
 </Drawer>
-
 <div class="h-full flex flex-col">
 	<Tabs bind:selected={selectedTab} class="pt-1" wrapperClass="flex-none">
 		<Tab value="logs" size="xs">Logs & Result</Tab>
@@ -151,7 +151,7 @@
 							</Pane>
 							<Pane>
 								{@render children?.()}
-								{#if previewJob != undefined && 'result' in previewJob}
+								{#if previewJob != undefined && (previewJob.result_stream || previewJob.result)}
 									<div class="relative w-full h-full p-2">
 										<div class="relative h-full">
 											<DisplayResult
@@ -161,6 +161,7 @@
 												result={previewJob.result}
 												customUi={customUi?.displayResult}
 												language={lang}
+												result_stream={previewJob?.result_stream}
 												fixTableSizingToParent
 											>
 												{#snippet copilot_fix()}
@@ -68,7 +68,7 @@
 	import JobArgs from '$lib/components/JobArgs.svelte'
 	import FlowProgressBar from '$lib/components/flows/FlowProgressBar.svelte'
 	import JobProgressBar from '$lib/components/jobs/JobProgressBar.svelte'
-	import Tabs from '$lib/components/common/tabs/Tabs.svelte'
+	import Tabs from '$lib/components/common/tabs/TabsV2.svelte'
 	import Badge from '$lib/components/common/badge/Badge.svelte'
 	import { goto } from '$lib/navigation'
 	import { sendUserToast } from '$lib/toast'
@@ -97,7 +97,7 @@
 	} from '$lib/components/flows/FlowAssetsHandler.svelte'
 	import JobAssetsViewer from '$lib/components/assets/JobAssetsViewer.svelte'

-	let job: Job | undefined = $state()
+	let job: (Job & { result?: any; result_stream?: string }) | undefined = $state()
 	let jobUpdateLastFetch: Date | undefined = $state()

 	let scriptProgress: number | undefined = $state(undefined)
@@ -123,6 +123,8 @@
 	let lastJobId: string | undefined = $state(undefined)
 	let concurrencyKey: string | undefined = $state(undefined)

+	let manuallySetLogs: boolean = $state(false)
+
 	setContext(
 		'FlowGraphAssetContext',
 		initFlowGraphAssetsCtx({ getModules: () => job?.raw_flow?.modules ?? [] })
@@ -173,7 +175,7 @@

 	// If we get results, focus on that tab. Else, focus on logs
 	function initView(): void {
-		if (job && 'result' in job && job.result != undefined) {
+		if (job && (job.result || job.result_stream)) {
 			viewTab = 'result'
 		} else if (viewTab == 'result') {
 			viewTab = 'logs'
@@ -182,6 +184,11 @@

 	async function getJob() {
 		await jobLoader?.watchJob($page.params.run, {
+			change(job: Job & { result_stream?: string }) {
+				if (!manuallySetLogs && viewTab == 'logs' && job.result_stream) {
+					viewTab = 'result'
+				}
+			},
 			done(job) {
 				if (job?.['result'] != undefined) {
 					viewTab = 'result'
@@ -366,13 +373,7 @@
 			runImmediatelyLoading = false
 		}
 	}
-	$effect(() => {
-		job?.logs == undefined &&
-			job &&
-			viewTab == 'logs' &&
-			isNotFlow(job?.job_kind) &&
-			jobLoader?.getLogs()
-	})
+
 	$effect(() => {
 		job?.id && lastJobId !== job.id && untrack(() => getConcurrencyKey(job))
 	})
@@ -427,7 +428,6 @@
 {/if}
 {#if !job || (job?.job_kind != 'flow' && job?.job_kind != 'flownode' && job?.job_kind != 'flowpreview')}
 	<JobLoader
-		lazyLogs
 		bind:scriptProgress
 		bind:this={jobLoader}
 		bind:isLoading={testIsLoading}
@@ -933,7 +933,12 @@
 				{/if}
 				<!-- Logs and outputs-->
 				<div class="mr-2 sm:mr-0 mt-12">
-					<Tabs bind:selected={viewTab}>
+					<Tabs
+						bind:selected={viewTab}
+						onTabClick={(value) => {
+							manuallySetLogs = value == 'logs'
+						}}
+					>
 						<Tab value="result">Result</Tab>
 						<Tab value="logs">Logs</Tab>
 						<Tab value="stats">Metrics</Tab>
@@ -975,9 +980,10 @@
 								<div class="w-full">
 									<MemoryFootprintViewer jobId={job.id} bind:jobUpdateLastFetch />
 								</div>
-							{:else if job !== undefined && 'result' in job && job.result !== undefined}
+							{:else if job !== undefined && (job.result || job.result_stream)}
 								<DisplayResult
 									workspaceId={job?.workspace_id}
+									result_stream={job.result_stream}
 									jobId={job?.id}
 									result={job.result}
 									language={job?.language}
@@ -1523,3 +1523,22 @@ def parse_variable_syntax(s: str) -> Optional[str]:
    if s.startswith("var://"):
        return s[6:]
    return None
+
+
+def append_to_result_stream(text: str) -> None:
+    """Append a text to the result stream.
+    
+    Args:
+        text: text to append to the result stream
+    """
+    print(f"WM_STREAM: {text.replace(chr(10), '\\n')}")
+
+
+def stream_result(stream) -> None:
+    """Stream to the result stream.
+    
+    Args:
+        stream: stream to stream to the result stream
+    """
+    for text in stream:
+        append_to_result_stream(text)
@@ -14,6 +14,6 @@ cp "${script_dirpath}/s3Types.ts" "${script_dirpath}/src/"
 echo "" >> "${script_dirpath}/src/index.ts"
 echo 'export type { S3Object, DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
 echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult } from "./client";' >> "${script_dirpath}/src/index.ts"


@@ -39,4 +39,4 @@ cp "${script_dirpath}/s3Types.ts" "${script_dirpath}/src/"
 echo "" >> "${script_dirpath}/src/index.ts"
 echo 'export type { S3Object, DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
 echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult } from "./client";' >> "${script_dirpath}/src/index.ts"
@@ -181,6 +181,28 @@ export async function runScriptByHash(
  return _runScriptInternal(null, hash_, args, verbose);
 }

+/**
+ * Append a text to the result stream
+ * @param text text to append to the result stream
+ */
+export function appendToResultStream(
+  text: string
+) {
+  console.log("WM_STREAM: " + text.replaceAll("\n", "\\n"));
+}
+
+/**
+ * Stream to the result stream
+ * @param stream stream to stream to the result stream
+ */
+export async function streamResult(
+  stream: AsyncIterable<string>
+) {
+  for await (const text of stream) {
+    appendToResultStream(text);
+  }
+}
+
 export async function runFlow(
  path: string | null = null,
  args: Record<string, any> | null = null,
@@ -328,7 +350,7 @@ async function _runScriptAsyncInternal(
  } else {
    throw new Error("path or hash_ must be provided");
  }
-  
+
  let url = new URL(OpenAPI.BASE + endpoint);
  url.search = new URLSearchParams(params).toString();

@@ -793,8 +815,7 @@ export async function loadS3FileStream(

  // We use raw fetch here b/c OpenAPI generated client doesn't handle Blobs nicely
  const response = await fetch(
-    `${
-      OpenAPI.BASE
+    `${OpenAPI.BASE
    }/w/${getWorkspace()}/job_helpers/download_s3_file?${queryParams}`,
    {
      method: "GET",