feat: add fileset resource type support (#8063)

* feat: add fileset resource type support Add a new "fileset" resource type that represents a collection of files stored as a relpath→content map. This enables resource types to manage multiple files (e.g., config directories, template sets) instead of just a single file. Backend: - Add is_fileset column to resource_type table - Update CRUD operations and workspace duplication to handle is_fileset - Add integration tests for fileset resource types Frontend: - Add FilesetEditor component with file explorer + Monaco editor - Extract shared FileExplorer component from RawAppSidebar (dedup) - Add fileset toggle to EditableSchemaWrapper - Show fileset editor in ResourceEditor and ApiConnectForm - Show folder icon for fileset resource types in IconedResourceType CLI: - Support fileset resources in sync pull (expand to .fileset/ directory) - Support fileset resources in sync push (reconstruct from directory) - Handle !inline_fileset YAML tag in resource resolution Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * sqlx * fix: resolve svelte warnings and type error in fileset components - Fix state_referenced_locally warnings in FilesetEditor by computing initial values before creating $state - Fix Promise<boolean> type error in +page.svelte by making resourceNameIsFileset/resourceNameToFileExt synchronous lookups with eager map loading Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: address code review findings for fileset feature - Use sqlb.set() instead of set_str() for boolean is_fileset field to avoid quoting (SET is_fileset = TRUE not 'TRUE') - Add JSDoc comment to isFilesetResource explaining it matches children inside .fileset/ directories, not the directory itself - Update OpenAPI spec for file_resource_type_to_file_ext_map endpoint to document the new response schema with format_extension and is_fileset fields Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: address second round of review findings - Remove bidirectional $effect sync in RawAppSidebar; bind FileExplorer directly to files prop with {} default - Avoid creating new files object on every keystroke in FilesetEditor; merge editContent → args in a single effect without intermediate spread - Simplify no-op `?? undefined` in addResourceType - Add backend validation: reject create_resource_type when both is_fileset and format_extension are set - Fix fileset alert title showing undefined format extension Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: exclude app_theme resources from workspace tab Theme resources (app_theme) were showing on the workspace tab alongside regular resources. Now they are excluded from the workspace tab (like cache and state) and the theme tab loads only app_theme resources. Also includes review fixes: - Remove bidirectional $effect sync in RawAppSidebar - Avoid spreading new files object on every keystroke in FilesetEditor - Simplify ?? undefined no-op - Add backend validation for is_fileset + format_extension conflict - Fix fileset alert title Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: restore full-width file tree items in raw app sidebar FileExplorer's tree container was missing w-full, causing items to not stretch inside PanelSection's items-start flex container. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * fix: prevent iframe from overriding file selection after file creation When files change in the sidebar, setFilesInIframe sends the new files to the iframe which responds with setActiveDocument defaulting to App.tsx, overriding the user's selection. Now we ignore setActiveDocument messages for 500ms after sending setFiles to the iframe. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Revert "fix: prevent iframe from overriding file selection after file creation" This reverts commit 6864e1c0cf. * fix: suppress iframe setActiveDocument during file population Use setFilesAndSelectInIframe in populateFiles to keep the current document selected when re-sending files. Suppress setActiveDocument for 500ms after population to prevent the iframe from defaulting back to App.tsx on focus changes. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
2026-08-22 00:01:34 +00:00 · 2026-02-24 07:37:55 +01:00
parent c3025020d7
commit 960fb5d9ff
39 changed files with 1203 additions and 663 deletions
@@ -37,6 +37,11 @@
        "ordinal": 6,
        "name": "format_extension",
        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "is_fileset",
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -52,7 +57,8 @@
      true,
      true,
      true,
-      true
+      true,
+      false
    ]
  },
  "hash": "03d63d2e64b012f624d2731b5bcb8849c74a9474777be61edf0ed43ddda07ef3"
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "INSERT INTO resource_type (workspace_id, name, schema, description, edited_at, created_by, format_extension, is_fileset)\n         SELECT $2, name, schema, description, edited_at, created_by, format_extension, is_fileset\n         FROM resource_type\n         WHERE workspace_id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Varchar"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "1c2157ce14e90f0751d7f0a9f2dbb3c5a5789a32423e75260098a5300a4af986"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "PostgreSQL",
-  "query": "SELECT schema, description, format_extension\n         FROM resource_type\n         WHERE workspace_id = $1 AND name = $2",
+  "query": "SELECT schema, description, format_extension, is_fileset\n         FROM resource_type\n         WHERE workspace_id = $1 AND name = $2",
  "describe": {
    "columns": [
      {
@@ -17,6 +17,11 @@
        "ordinal": 2,
        "name": "format_extension",
        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 3,
+        "name": "is_fileset",
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -28,8 +33,9 @@
    "nullable": [
      true,
      true,
-      true
+      true,
+      false
    ]
  },
-  "hash": "7bc9fc05dbd162866bef1fdd3e7faeb50429881ed1bc962903f06e4b3d5f8d44"
+  "hash": "2768622b76ad92c05f4f44d997aff285707e1a43ce85e5bb8e87849d78a0637f"
 }
@@ -1,6 +1,6 @@
 {
  "db_name": "PostgreSQL",
-  "query": "INSERT INTO resource_type\n            (workspace_id, name, schema, description, created_by, format_extension, edited_at)\n            VALUES ($1, $2, $3, $4, $5, $6, now())",
+  "query": "INSERT INTO resource_type\n            (workspace_id, name, schema, description, created_by, format_extension, is_fileset, edited_at)\n            VALUES ($1, $2, $3, $4, $5, $6, $7, now())",
  "describe": {
    "columns": [],
    "parameters": {
@@ -10,10 +10,11 @@
        "Jsonb",
        "Text",
        "Varchar",
-        "Varchar"
+        "Varchar",
+        "Bool"
      ]
    },
    "nullable": []
  },
-  "hash": "ffedbb3a2676a6d7b71f81f89109a02a8dba90d40144e942527f8a3fc36dfbc1"
+  "hash": "5899c7614f195fdd23e38389e52b004f957aafa2201b80638b5f87a625373f00"
 }
@@ -1,16 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n            WITH prev_sd AS (\n                DELETE FROM debounce_stale_data WHERE job_id = $1 RETURNING to_relock\n            ) INSERT INTO debounce_stale_data (job_id, to_relock)\n                VALUES ($2, array_cat((SELECT to_relock FROM prev_sd), $3))\n                ON CONFLICT (job_id) DO UPDATE SET to_relock = EXCLUDED.to_relock\n            ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid",
-        "Uuid",
-        "TextArray"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "61b37cb4db6e60c2d35f7d23db5afbe04e040a8dcd1d93afaaaa320665c8779a"
-}
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "INSERT INTO resource_type (workspace_id, name, schema, description, edited_at, created_by, format_extension)\n         SELECT $2, name, schema, description, edited_at, created_by, format_extension\n         FROM resource_type\n         WHERE workspace_id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text",
-        "Varchar"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7abd579d3ec97853ac36cc8dad29013eb133a28cd848bf8fdf9571b2ee402a3e"
-}
@@ -37,6 +37,11 @@
        "ordinal": 6,
        "name": "format_extension",
        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "is_fileset",
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -51,7 +56,8 @@
      true,
      true,
      true,
-      true
+      true,
+      false
    ]
  },
  "hash": "7b1239ad6460e8f5fb41bfe12f662a779528784ec8cf3f6dcce5545ab90bf234"
@@ -0,0 +1,34 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        SELECT name, format_extension, is_fileset FROM resource_type WHERE (format_extension IS NOT NULL OR is_fileset = true) AND (workspace_id = $1 OR workspace_id = 'admins')",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "name",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 1,
+        "name": "format_extension",
+        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 2,
+        "name": "is_fileset",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      false,
+      true,
+      false
+    ]
+  },
+  "hash": "842775bcf91d747abb11ffe9c98fa1208595e012590606ef6667ea3a78105883"
+}
@@ -37,6 +37,11 @@
        "ordinal": 6,
        "name": "format_extension",
        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "is_fileset",
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -51,7 +56,8 @@
      true,
      true,
      true,
-      true
+      true,
+      false
    ]
  },
  "hash": "b8d392ccfcccafe0c19511b3567bc11779b1052b0948c410468a8aeba1d26d33"
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        SELECT name, format_extension FROM resource_type WHERE format_extension IS NOT NULL AND (workspace_id = $1 OR workspace_id = 'admins')",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "name",
-        "type_info": "Varchar"
-      },
-      {
-        "ordinal": 1,
-        "name": "format_extension",
-        "type_info": "Varchar"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": [
-      false,
-      true
-    ]
-  },
-  "hash": "cf1cef7e0fe2e7e3db96b0ec005360361b9eec023a6fc2a4a7a917f59d86af4d"
-}
@@ -37,6 +37,11 @@
        "ordinal": 6,
        "name": "format_extension",
        "type_info": "Varchar"
+      },
+      {
+        "ordinal": 7,
+        "name": "is_fileset",
+        "type_info": "Bool"
      }
    ],
    "parameters": {
@@ -49,7 +54,8 @@
      true,
      true,
      true,
-      true
+      true,
+      false
    ]
  },
  "hash": "eb1f7f01461f5a7540c273b37e5d578c31cf151ab3ef813f7aada76533761e12"
@@ -0,0 +1 @@
+ALTER TABLE resource_type DROP COLUMN is_fileset;
@@ -0,0 +1 @@
+ALTER TABLE resource_type ADD COLUMN is_fileset BOOLEAN NOT NULL DEFAULT FALSE;
@@ -137,7 +137,7 @@ raw_app: path(char), version(int), workspace_id(char), summary(char), edited_at(
  FK: (workspace_id) -> workspace(id)
 resource: workspace_id(char), path(char), value(jsonb), description(text), resource_type(char), extra_perms(jsonb), edited_at(ts), created_by(char)
  FK: (workspace_id) -> workspace(id)
-resource_type: workspace_id(char), name(char), schema(jsonb), description(text), edited_at(ts), created_by(char), format_extension(char)
+resource_type: workspace_id(char), name(char), schema(jsonb), description(text), edited_at(ts), created_by(char), format_extension(char), is_fileset(bool)
  FK: (workspace_id) -> workspace(id)
 resume_job: id(uuid), job(uuid), flow(uuid), created_at(ts), value(jsonb), approver(char), resume_id(int), approved(bool)
  FK: (flow) -> v2_job_queue(id)
@@ -54,6 +54,21 @@ INSERT INTO resource (workspace_id, path, value, description, resource_type, ext
 VALUES ('test-workspace', 'u/test-user/scalar_var_resource', '"$var:u/test-user/db_password"',
        'Scalar var ref', 'string', '{}', 'test-user');

+-- === fileset resource type test data ===
+
+INSERT INTO resource_type (workspace_id, name, schema, description, created_by, is_fileset)
+VALUES ('test-workspace', 'test_fileset', '{}',
+        'Test fileset type', 'test-user', true);
+
+INSERT INTO resource_type (workspace_id, name, schema, description, created_by, format_extension)
+VALUES ('test-workspace', 'test_file', '{"type": "object", "properties": {"content": {"type": "string"}}}',
+        'Test file type', 'test-user', 'txt');
+
+INSERT INTO resource (workspace_id, path, value, description, resource_type, extra_perms, created_by)
+VALUES ('test-workspace', 'u/test-user/fileset_resource',
+        '{"config.yaml": "key: value", "data/input.json": "{\"items\": []}"}',
+        'A fileset resource', 'test_fileset', '{}', 'test-user');
+
 -- === mcp_tools test data ===

 INSERT INTO resource (workspace_id, path, value, description, resource_type, extra_perms, created_by)
@@ -69,8 +69,12 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    assert_eq!(resp.status(), 404);

    // --- get_value_interpolated ---
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/simple_resource").await;
+    let resp = authed_get(
+        port,
+        "get_value_interpolated",
+        "u/test-user/simple_resource",
+    )
+    .await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -78,8 +82,12 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // $var: interpolation
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/resource_with_var").await;
+    let resp = authed_get(
+        port,
+        "get_value_interpolated",
+        "u/test-user/resource_with_var",
+    )
+    .await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -87,8 +95,12 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // $res: interpolation
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/resource_with_res").await;
+    let resp = authed_get(
+        port,
+        "get_value_interpolated",
+        "u/test-user/resource_with_res",
+    )
+    .await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -96,8 +108,7 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // mixed $var: and $res: refs
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/resource_mixed").await;
+    let resp = authed_get(port, "get_value_interpolated", "u/test-user/resource_mixed").await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -105,8 +116,12 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // chained $res: -> $var:
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/chained_resource").await;
+    let resp = authed_get(
+        port,
+        "get_value_interpolated",
+        "u/test-user/chained_resource",
+    )
+    .await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -114,8 +129,7 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // null value
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/null_resource").await;
+    let resp = authed_get(port, "get_value_interpolated", "u/test-user/null_resource").await;
    assert_eq!(resp.status(), 200);
    assert_eq!(
        resp.json::<serde_json::Value>().await?,
@@ -123,8 +137,7 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // not found
-    let resp =
-        authed_get(port, "get_value_interpolated", "u/test-user/nonexistent").await;
+    let resp = authed_get(port, "get_value_interpolated", "u/test-user/nonexistent").await;
    assert_eq!(resp.status(), 404);

    // array passthrough
@@ -162,7 +175,9 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
        "expected at least 10 resources from fixture, got {}",
        list.len()
    );
-    assert!(list.iter().any(|r| r["path"] == "u/test-user/simple_resource"));
+    assert!(list
+        .iter()
+        .any(|r| r["path"] == "u/test-user/simple_resource"));

    // list with resource_type filter
    let resp = authed(client().get(format!("{base}/list?resource_type=mcp_server")))
@@ -259,9 +274,11 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    assert_eq!(body["description"], "Updated description");

    // --- update_value ---
-    let resp = authed(
-        client().post(resource_url(port, "update_value", "u/test-user/new_resource")),
-    )
+    let resp = authed(client().post(resource_url(
+        port,
+        "update_value",
+        "u/test-user/new_resource",
+    )))
    .json(&json!({"value": {"url": "https://final.com"}}))
    .send()
    .await
@@ -275,35 +292,44 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    );

    // --- delete ---
-    let resp = authed(
-        client().delete(resource_url(port, "delete", "u/test-user/new_resource")),
-    )
-    .send()
-    .await
-    .unwrap();
+    let resp = authed(client().delete(resource_url(port, "delete", "u/test-user/new_resource")))
+        .send()
+        .await
+        .unwrap();
    assert_eq!(resp.status(), 200);

    let resp = authed_get(port, "exists", "u/test-user/new_resource").await;
    assert_eq!(resp.json::<bool>().await?, false);

    // delete nonexistent -> 404
-    let resp = authed(
-        client().delete(resource_url(port, "delete", "u/test-user/new_resource")),
-    )
-    .send()
-    .await
-    .unwrap();
+    let resp = authed(client().delete(resource_url(port, "delete", "u/test-user/new_resource")))
+        .send()
+        .await
+        .unwrap();
    assert_eq!(resp.status(), 404);

    // --- file_resource_type_to_file_ext_map ---
-    let resp = authed(client().get(format!(
-        "{base}/file_resource_type_to_file_ext_map"
-    )))
-    .send()
-    .await
-    .unwrap();
+    let resp = authed(client().get(format!("{base}/file_resource_type_to_file_ext_map")))
+        .send()
+        .await
+        .unwrap();
    assert_eq!(resp.status(), 200);
-    resp.json::<serde_json::Value>().await?;
+    let ext_map = resp.json::<serde_json::Value>().await?;
+    // Verify the map includes fileset type info with is_fileset flag (no format_extension)
+    let fileset_info = &ext_map["test_fileset"];
+    assert_eq!(fileset_info["format_extension"], serde_json::Value::Null);
+    assert_eq!(fileset_info["is_fileset"], true);
+    // Verify non-fileset file type
+    let file_info = &ext_map["test_file"];
+    assert_eq!(file_info["format_extension"], "txt");
+    assert_eq!(file_info["is_fileset"], false);
+
+    // --- fileset resource value ---
+    let resp = authed_get(port, "get_value", "u/test-user/fileset_resource").await;
+    assert_eq!(resp.status(), 200);
+    let fileset_val = resp.json::<serde_json::Value>().await?;
+    assert_eq!(fileset_val["config.yaml"], "key: value");
+    assert_eq!(fileset_val["data/input.json"], "{\"items\": []}");

    // --- resource types ---

@@ -384,17 +410,68 @@ async fn test_resource_endpoints(db: Pool<Postgres>) -> anyhow::Result<()> {
    assert_eq!(body["description"], "Updated type desc");

    // type/delete
-    let resp = authed(
-        client().delete(resource_url(port, "type/delete", "new_test_type")),
-    )
-    .send()
-    .await
-    .unwrap();
+    let resp = authed(client().delete(resource_url(port, "type/delete", "new_test_type")))
+        .send()
+        .await
+        .unwrap();
    assert_eq!(resp.status(), 200);

    let resp = authed_get(port, "type/exists", "new_test_type").await;
    assert_eq!(resp.json::<bool>().await?, false);

+    // --- fileset resource type CRUD ---
+
+    // type/get for fileset type - verify is_fileset is returned
+    let resp = authed_get(port, "type/get", "test_fileset").await;
+    assert_eq!(resp.status(), 200);
+    let body = resp.json::<serde_json::Value>().await?;
+    assert_eq!(body["name"], "test_fileset");
+    assert_eq!(body["is_fileset"], true);
+    assert_eq!(body["format_extension"], serde_json::Value::Null);
+
+    // type/get for non-fileset type - verify is_fileset is false
+    let resp = authed_get(port, "type/get", "test_db").await;
+    assert_eq!(resp.status(), 200);
+    let body = resp.json::<serde_json::Value>().await?;
+    assert_eq!(body["is_fileset"], false);
+
+    // type/create fileset type (no format_extension needed)
+    let resp = authed(client().post(format!("{base}/type/create")))
+        .json(&json!({
+            "name": "new_fileset_type",
+            "description": "A fileset type",
+            "schema": {},
+            "is_fileset": true
+        }))
+        .send()
+        .await
+        .unwrap();
+    assert_eq!(resp.status(), 201);
+
+    let resp = authed_get(port, "type/get", "new_fileset_type").await;
+    let body = resp.json::<serde_json::Value>().await?;
+    assert_eq!(body["is_fileset"], true);
+    assert_eq!(body["format_extension"], serde_json::Value::Null);
+
+    // type/update - set is_fileset on existing type
+    let resp = authed(client().post(resource_url(port, "type/update", "new_fileset_type")))
+        .json(&json!({"is_fileset": false}))
+        .send()
+        .await
+        .unwrap();
+    assert_eq!(resp.status(), 200);
+
+    let resp = authed_get(port, "type/get", "new_fileset_type").await;
+    let body = resp.json::<serde_json::Value>().await?;
+    assert_eq!(body["is_fileset"], false);
+
+    // cleanup
+    let resp = authed(client().delete(resource_url(port, "type/delete", "new_fileset_type")))
+        .send()
+        .await
+        .unwrap();
+    assert_eq!(resp.status(), 200);
+
    Ok(())
 }

@@ -30,7 +30,6 @@ use uuid::Uuid;
 use windmill_audit::audit_oss::{audit_log, AuditAuthorable};
 use windmill_audit::ActionKind;
 use windmill_common::db::UserDB;
-use windmill_types::s3::LargeFileStorage;
 use windmill_common::users::username_to_permissioned_as;
 use windmill_common::variables::{build_crypt, decrypt, encrypt, WORKSPACE_CRYPT_CACHE};
 use windmill_common::worker::{to_raw_value, CLOUD_HOSTED};
@@ -55,6 +54,7 @@ use windmill_dep_map::scoped_dependency_map::{
    DependencyDependent, DependencyMap, ScopedDependencyMap,
 };
 use windmill_git_sync::{handle_deployment_metadata, handle_fork_branch_creation, DeployedObject};
+use windmill_types::s3::LargeFileStorage;

 use hyper::StatusCode;
 use serde::{Deserialize, Serialize};
@@ -3010,8 +3010,8 @@ async fn clone_resource_types(
    target_workspace_id: &str,
 ) -> Result<()> {
    sqlx::query!(
-        "INSERT INTO resource_type (workspace_id, name, schema, description, edited_at, created_by, format_extension)
-         SELECT $2, name, schema, description, edited_at, created_by, format_extension
+        "INSERT INTO resource_type (workspace_id, name, schema, description, edited_at, created_by, format_extension, is_fileset)
+         SELECT $2, name, schema, description, edited_at, created_by, format_extension, is_fileset
         FROM resource_type
         WHERE workspace_id = $1",
        source_workspace_id,
@@ -5254,7 +5254,7 @@ async fn compare_two_resource_types(
 ) -> Result<ItemComparison> {
    // Get resource type from each workspace
    let source_resource_type = sqlx::query!(
-        "SELECT schema, description, format_extension
+        "SELECT schema, description, format_extension, is_fileset
         FROM resource_type
         WHERE workspace_id = $1 AND name = $2",
        source_workspace_id,
@@ -5264,7 +5264,7 @@ async fn compare_two_resource_types(
    .await?;

    let target_resource_type = sqlx::query!(
-        "SELECT schema, description, format_extension
+        "SELECT schema, description, format_extension, is_fileset
         FROM resource_type
         WHERE workspace_id = $1 AND name = $2",
        fork_workspace_id,
@@ -5280,6 +5280,7 @@ async fn compare_two_resource_types(
        if source.schema != target.schema
            || source.description != target.description
            || source.format_extension != target.format_extension
+            || source.is_fileset != target.is_fileset
        {
            has_changes = true;
        }
@@ -5244,10 +5244,19 @@ paths:
        - $ref: "#/components/parameters/WorkspaceId"
      responses:
        "200":
-          description: map from resource type to file ext
+          description: map from resource type to file resource info
          content:
            application/json:
-              schema: {}
+              schema:
+                type: object
+                additionalProperties:
+                  type: object
+                  properties:
+                    format_extension:
+                      type: string
+                      nullable: true
+                    is_fileset:
+                      type: boolean

  /w/{workspace}/resources/type/delete/{path}:
    delete:
@@ -19885,6 +19894,8 @@ components:
          format: date-time
        format_extension:
          type: string
+        is_fileset:
+          type: boolean
      required:
        - name

@@ -19894,6 +19905,8 @@ components:
        schema: {}
        description:
          type: string
+        is_fileset:
+          type: boolean

    Schedule:
      type: object
@@ -98,6 +98,7 @@ pub struct ResourceType {
    pub created_by: Option<String>,
    pub edited_at: Option<chrono::DateTime<chrono::Utc>>,
    pub format_extension: Option<String>,
+    pub is_fileset: bool,
 }

 #[derive(Deserialize)]
@@ -106,12 +107,14 @@ pub struct CreateResourceType {
    pub schema: Option<serde_json::Value>,
    pub description: Option<String>,
    pub format_extension: Option<String>,
+    pub is_fileset: Option<bool>,
 }

 #[derive(Deserialize)]
 pub struct EditResourceType {
    pub schema: Option<serde_json::Value>,
    pub description: Option<String>,
+    pub is_fileset: Option<bool>,
 }

 #[derive(FromRow, Serialize, Deserialize)]
@@ -1209,29 +1212,38 @@ async fn update_resource_value(
    Ok(format!("value of resource {} updated", path))
 }

+#[derive(Serialize)]
+pub struct FileResourceTypeInfo {
+    pub format_extension: Option<String>,
+    pub is_fileset: bool,
+}
+
 async fn file_resource_ext_to_resource_type(
    Extension(db): Extension<DB>,
    Path(w_id): Path<String>,
-) -> JsonResult<HashMap<String, String>> {
-    #[derive(Serialize, sqlx::FromRow)]
+) -> JsonResult<HashMap<String, FileResourceTypeInfo>> {
+    #[derive(sqlx::FromRow)]
    struct LocalFileResourceExtension {
        name: String,
        format_extension: Option<String>,
+        is_fileset: bool,
    }

    let r = sqlx::query_as!(LocalFileResourceExtension, "
-        SELECT name, format_extension FROM resource_type WHERE format_extension IS NOT NULL AND (workspace_id = $1 OR workspace_id = 'admins')", w_id)
+        SELECT name, format_extension, is_fileset FROM resource_type WHERE (format_extension IS NOT NULL OR is_fileset = true) AND (workspace_id = $1 OR workspace_id = 'admins')", w_id)
        .fetch_all(&db)
        .await?;

-    let hashmap: HashMap<String, String> = r
+    let hashmap: HashMap<String, FileResourceTypeInfo> = r
        .into_iter()
-        .filter_map(|entry| {
-            if let Some(format_extension) = entry.format_extension {
-                Some((entry.name, format_extension))
-            } else {
-                None
-            }
+        .map(|entry| {
+            (
+                entry.name,
+                FileResourceTypeInfo {
+                    format_extension: entry.format_extension,
+                    is_fileset: entry.is_fileset,
+                },
+            )
        })
        .collect();

@@ -1331,16 +1343,25 @@ async fn create_resource_type(

    check_rt_path_conflict(&mut tx, &w_id, &resource_type.name).await?;

+    let is_fileset = resource_type.is_fileset.unwrap_or(false);
+
+    if is_fileset && resource_type.format_extension.is_some() {
+        return Err(Error::BadRequest(
+            "A fileset resource type cannot have a format_extension".to_string(),
+        ));
+    }
+
    sqlx::query!(
        "INSERT INTO resource_type
-            (workspace_id, name, schema, description, created_by, format_extension, edited_at)
-            VALUES ($1, $2, $3, $4, $5, $6, now())",
+            (workspace_id, name, schema, description, created_by, format_extension, is_fileset, edited_at)
+            VALUES ($1, $2, $3, $4, $5, $6, $7, now())",
        w_id,
        resource_type.name,
        resource_type.schema,
        resource_type.description,
        authed.username,
        resource_type.format_extension,
+        is_fileset,
    )
    .execute(&mut *tx)
    .await?;
@@ -1501,6 +1522,9 @@ async fn update_resource_type(
    if let Some(ndesc) = ns.description {
        sqlb.set_str("description", ndesc);
    }
+    if let Some(is_fileset) = ns.is_fileset {
+        sqlb.set("is_fileset", if is_fileset { "TRUE" } else { "FALSE" });
+    }
    sqlb.set_str("edited_at", "now()");
    let sql = sqlb.sql().map_err(|e| Error::internal_err(e.to_string()))?;
    let mut tx = user_db.begin(&authed).await?;
@@ -6,16 +6,11 @@
    "": {
      "name": "wmill-dev",
      "dependencies": {
-        "@ayonli/jsext": "^1.9.0",
        "@cliffy/ansi": "npm:@jsr/cliffy__ansi@1.0.0",
        "@cliffy/command": "npm:@jsr/cliffy__command@1.0.0",
        "@cliffy/prompt": "npm:@jsr/cliffy__prompt@1.0.0",
        "@cliffy/table": "npm:@jsr/cliffy__table@1.0.0",
-        "@std/encoding": "npm:@jsr/std__encoding@1.0.10",
-        "@std/log": "npm:@jsr/std__log@0.224.14",
-        "@std/path": "npm:@jsr/std__path@1.1.4",
-        "@std/yaml": "npm:@jsr/std__yaml@1.0.10",
-        "@windmill-labs/shared-utils": "npm:@jsr/windmill-labs__shared-utils@1.0.12",
+        "@windmill-labs/shared-utils": "^1.0.12",
        "diff": "^5.2.0",
        "esbuild": "0.24.2",
        "get-port": "7.1.0",
@@ -23,6 +18,7 @@
        "minimatch": "^10.0.0",
        "open": "^10.0.0",
        "svelte": "^5.45.2",
+        "tar-stream": "^3.1.7",
        "windmill-parser-wasm-csharp": "*",
        "windmill-parser-wasm-go": "*",
        "windmill-parser-wasm-java": "*",
@@ -44,25 +40,11 @@
      "devDependencies": {
        "@types/diff": "^5.2.3",
        "@types/node": "^22.0.0",
+        "@types/tar-stream": "^3.1.4",
        "@types/ws": "^8.5.0",
        "typescript": "^5.7.0"
      }
    },
-    "node_modules/@ayonli/jsext": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/@ayonli/jsext/-/jsext-1.9.0.tgz",
-      "integrity": "sha512-hIu6lQhoLr5e26lmt+vzopuZffaAyb623r4+8HlN/rhXgm2ywHslzk7UHiATdfDbfPjBARkB6cfXjVEi3aav6g==",
-      "license": "MIT",
-      "dependencies": {
-        "iconv-lite": "^0.6.3",
-        "sudo-prompt": "^9.2.1",
-        "ws": "^8.17.0",
-        "zod": "^3.23.8"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
    "node_modules/@cliffy/ansi": {
      "name": "@jsr/cliffy__ansi",
      "version": "1.0.0",
@@ -623,15 +605,6 @@
      "resolved": "https://npm.jsr.io/~/11/@jsr/std__fmt/1.0.9.tgz",
      "integrity": "sha512-YFJJMozmORj2K91c5J9opWeh0VUwrd+Mwb7Pr0FkVCAKVLu2UhT4LyvJqWiyUT+eF+MdfqQ9F7RtQj4bXn9Smw=="
    },
-    "node_modules/@jsr/std__fs": {
-      "version": "1.0.23",
-      "resolved": "https://npm.jsr.io/~/11/@jsr/std__fs/1.0.23.tgz",
-      "integrity": "sha512-e8jspB3M44E5YhWiLCTqibBBTwVmxQaHN06WvFa/elAKm5E/LfAe8Hj5XGNC8P7a0MIPASlNJsnF1bgO/g+aqg==",
-      "dependencies": {
-        "@jsr/std__internal": "^1.0.12",
-        "@jsr/std__path": "^1.1.4"
-      }
-    },
    "node_modules/@jsr/std__internal": {
      "version": "1.0.12",
      "resolved": "https://npm.jsr.io/~/11/@jsr/std__internal/1.0.12.tgz",
@@ -671,38 +644,6 @@
        "@jsr/std__regexp": "^1.0.1"
      }
    },
-    "node_modules/@std/encoding": {
-      "name": "@jsr/std__encoding",
-      "version": "1.0.10",
-      "resolved": "https://npm.jsr.io/~/11/@jsr/std__encoding/1.0.10.tgz",
-      "integrity": "sha512-WK2njnDTyKefroRNk2Ooq7GStp6Y0ccAvr4To+Z/zecRAGe7+OSvH9DbiaHpAKwEi2KQbmpWMOYsdNt+TsdmSw=="
-    },
-    "node_modules/@std/log": {
-      "name": "@jsr/std__log",
-      "version": "0.224.14",
-      "resolved": "https://npm.jsr.io/~/11/@jsr/std__log/0.224.14.tgz",
-      "integrity": "sha512-EHT7E0plakyzk/gxMrwqUf3YGCCxN3Is25QrEh7toYA7qwj46R4qY7cIaDEKy8QqI5JHOFHwWXOClcPK6goIoQ==",
-      "dependencies": {
-        "@jsr/std__fmt": "^1.0.5",
-        "@jsr/std__fs": "^1.0.11",
-        "@jsr/std__io": "^0.225.2"
-      }
-    },
-    "node_modules/@std/path": {
-      "name": "@jsr/std__path",
-      "version": "1.1.4",
-      "resolved": "https://npm.jsr.io/~/11/@jsr/std__path/1.1.4.tgz",
-      "integrity": "sha512-SK4u9H6NVTfolhPdlvdYXfNFefy1W04AEHWJydryYbk+xqzNiVmr5o7TLJLJFqwHXuwMRhwrn+mcYeUfS0YFaA==",
-      "dependencies": {
-        "@jsr/std__internal": "^1.0.12"
-      }
-    },
-    "node_modules/@std/yaml": {
-      "name": "@jsr/std__yaml",
-      "version": "1.0.10",
-      "resolved": "https://npm.jsr.io/~/11/@jsr/std__yaml/1.0.10.tgz",
-      "integrity": "sha512-1WIM023Kvi48pvPE3UO5YcieambLgywUooLhAkkaObIcMB77F/YP2ILdl+vNfik+vElkl9znmuST9AZo8mbCpA=="
-    },
    "node_modules/@stoplight/ordered-object-literal": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/@stoplight/ordered-object-literal/-/ordered-object-literal-1.0.5.tgz",
@@ -784,6 +725,16 @@
        "undici-types": "~6.21.0"
      }
    },
+    "node_modules/@types/tar-stream": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@types/tar-stream/-/tar-stream-3.1.4.tgz",
+      "integrity": "sha512-921gW0+g29mCJX0fRvqeHzBlE/XclDaAG0Ousy1LCghsOhvaKacDeRGEVzQP9IPfKn8Vysy7FEXAIxycpc/CMg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
    "node_modules/@types/trusted-types": {
      "version": "2.0.7",
      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz",
@@ -852,6 +803,20 @@
        "node": ">= 0.4"
      }
    },
+    "node_modules/b4a": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz",
+      "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "react-native-b4a": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-b4a": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/balanced-match": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.3.tgz",
@@ -861,6 +826,20 @@
        "node": "20 || >=22"
      }
    },
+    "node_modules/bare-events": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz",
+      "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==",
+      "license": "Apache-2.0",
+      "peerDependencies": {
+        "bare-abort-controller": "*"
+      },
+      "peerDependenciesMeta": {
+        "bare-abort-controller": {
+          "optional": true
+        }
+      }
+    },
    "node_modules/brace-expansion": {
      "version": "5.0.2",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.2.tgz",
@@ -1013,12 +992,27 @@
        "@jridgewell/sourcemap-codec": "^1.4.15"
      }
    },
+    "node_modules/events-universal": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz",
+      "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bare-events": "^2.7.0"
+      }
+    },
    "node_modules/fast-deep-equal": {
      "version": "3.1.3",
      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
      "license": "MIT"
    },
+    "node_modules/fast-fifo": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz",
+      "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==",
+      "license": "MIT"
+    },
    "node_modules/fast-uri": {
      "version": "3.1.0",
      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
@@ -1047,18 +1041,6 @@
        "url": "https://github.com/sponsors/sindresorhus"
      }
    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "license": "MIT",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
    "node_modules/immediate": {
      "version": "3.0.6",
      "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz",
@@ -1263,12 +1245,6 @@
      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
      "license": "MIT"
    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "license": "MIT"
-    },
    "node_modules/set-immediate-shim": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
@@ -1278,6 +1254,17 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/streamx": {
+      "version": "2.23.0",
+      "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz",
+      "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==",
+      "license": "MIT",
+      "dependencies": {
+        "events-universal": "^1.0.0",
+        "fast-fifo": "^1.3.2",
+        "text-decoder": "^1.1.0"
+      }
+    },
    "node_modules/string_decoder": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -1287,13 +1274,6 @@
        "safe-buffer": "~5.1.0"
      }
    },
-    "node_modules/sudo-prompt": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz",
-      "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "license": "MIT"
-    },
    "node_modules/svelte": {
      "version": "5.53.2",
      "resolved": "https://registry.npmjs.org/svelte/-/svelte-5.53.2.tgz",
@@ -1321,6 +1301,26 @@
        "node": ">=18"
      }
    },
+    "node_modules/tar-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.7.tgz",
+      "integrity": "sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==",
+      "license": "MIT",
+      "dependencies": {
+        "b4a": "^1.6.4",
+        "fast-fifo": "^1.2.0",
+        "streamx": "^2.15.0"
+      }
+    },
+    "node_modules/text-decoder": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz",
+      "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "b4a": "^1.6.4"
+      }
+    },
    "node_modules/tslib": {
      "version": "2.8.1",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -1484,15 +1484,6 @@
      "resolved": "https://registry.npmjs.org/zimmerframe/-/zimmerframe-1.1.4.tgz",
      "integrity": "sha512-B58NGBEoc8Y9MWWCQGl/gq9xBCe4IiKM0a2x7GZdQKOW5Exr8S1W24J6OgM1njK8xCRGvAJIL/MxXHf6SkmQKQ==",
      "license": "MIT"
-    },
-    "node_modules/zod": {
-      "version": "3.25.76",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/colinhacks"
-      }
    }
  }
 }
@@ -1,5 +1,6 @@
-import { stat, writeFile } from "node:fs/promises";
+import { stat, writeFile, readdir, readFile } from "node:fs/promises";
 import { stringify as yamlStringify } from "yaml";
+import nodePath from "node:path";

 import {
  GlobalOptions,
@@ -27,6 +28,24 @@ export interface ResourceFile {
  is_oauth?: boolean; // deprecated
 }

+async function readFilesetDirectory(dirPath: string): Promise<Record<string, string>> {
+  const result: Record<string, string> = {};
+  async function walk(currentPath: string, prefix: string) {
+    const entries = await readdir(currentPath, { withFileTypes: true });
+    for (const entry of entries) {
+      const entryPath = nodePath.join(currentPath, entry.name);
+      const relPath = prefix ? prefix + "/" + entry.name : entry.name;
+      if (entry.isDirectory()) {
+        await walk(entryPath, relPath);
+      } else if (entry.isFile()) {
+        result[relPath] = await readFile(entryPath, "utf-8");
+      }
+    }
+  }
+  await walk(dirPath, "");
+  return result;
+}
+
 export async function pushResource(
  workspace: string,
  remotePath: string,
@@ -46,7 +65,10 @@ export async function pushResource(

  // Helper function to resolve inline content
  const resolveInlineContent = async () => {
-    if (localResource.value["content"]?.startsWith("!inline ")) {
+    if (typeof localResource.value === "string" && localResource.value.startsWith("!inline_fileset ")) {
+      const dirPath = localResource.value.split(" ")[1];
+      localResource.value = await readFilesetDirectory(dirPath.replaceAll("/", SEP));
+    } else if (localResource.value["content"]?.startsWith("!inline ")) {
      const basePath = localResource.value["content"].split(" ")[1];

      // If we're processing a branch-specific metadata file, read from branch-specific resource file
@@ -38,6 +38,7 @@ import {
  deepEqual,
  fetchRemoteVersion,
  isFileResource,
+  isFilesetResource,
  isRawAppFile,
  isWorkspaceDependencies,
 } from "../../utils/utils.ts";
@@ -484,11 +485,53 @@ export function extractInlineScriptsForApps(
  return [];
 }

+type FileResourceTypeInfo = { format_extension: string | null; is_fileset: boolean };
+
+function parseFileResourceTypeMap(
+  raw: Record<string, string | FileResourceTypeInfo>,
+): { formatExtMap: Record<string, string>; filesetMap: Record<string, boolean> } {
+  const formatExtMap: Record<string, string> = {};
+  const filesetMap: Record<string, boolean> = {};
+  for (const [k, v] of Object.entries(raw)) {
+    if (typeof v === "string") {
+      formatExtMap[k] = v;
+      filesetMap[k] = false;
+    } else {
+      if (v.format_extension) {
+        formatExtMap[k] = v.format_extension;
+      }
+      filesetMap[k] = v.is_fileset ?? false;
+    }
+  }
+  return { formatExtMap, filesetMap };
+}
+
+async function findFilesetResourceFile(changePath: string): Promise<string> {
+  // Extract the base path before .fileset/
+  const filesetIdx = changePath.indexOf(".fileset" + SEP);
+  if (filesetIdx === -1) {
+    throw new Error(`Not a fileset resource path: ${changePath}`);
+  }
+  const basePath = changePath.substring(0, filesetIdx);
+  const candidates = [basePath + ".resource.json", basePath + ".resource.yaml"];
+
+  for (const candidate of candidates) {
+    try {
+      const s = await stat(candidate);
+      if (s.isFile()) return candidate;
+    } catch {
+      // not found, try next
+    }
+  }
+  throw new Error(`No resource metadata file found for fileset resource: ${changePath}`);
+}
+
 function ZipFSElement(
  zip: JSZip,
  useYaml: boolean,
  defaultTs: "bun" | "deno",
  resourceTypeToFormatExtension: Record<string, string>,
+  resourceTypeToIsFileset: Record<string, boolean>,
  ignoreCodebaseChanges: boolean,
 ): DynFSElement {
  async function _internal_file(
@@ -860,10 +903,17 @@ function ZipFSElement(
              log.error(`Failed to parse resource.yaml at path: ${p}`);
              throw error;
            }
+            const resourceType = parsed["resource_type"];
            const formatExtension =
-              resourceTypeToFormatExtension[parsed["resource_type"]];
+              resourceTypeToFormatExtension[resourceType];
+            const isFileset = resourceTypeToIsFileset[resourceType] ?? false;

-            if (formatExtension) {
+            if (isFileset) {
+              parsed["value"] =
+                "!inline_fileset " +
+                removeSuffix(p.replaceAll(SEP, "/"), ".resource.json") +
+                ".fileset";
+            } else if (formatExtension) {
              parsed["value"]["content"] =
                "!inline " +
                removeSuffix(p.replaceAll(SEP, "/"), ".resource.json") +
@@ -918,10 +968,37 @@ function ZipFSElement(
        log.error(`Failed to parse resource file content at path: ${p}`);
        throw error;
      }
+      const resourceType = parsed["resource_type"];
      const formatExtension =
-        resourceTypeToFormatExtension[parsed["resource_type"]];
+        resourceTypeToFormatExtension[resourceType];
+      const isFileset = resourceTypeToIsFileset[resourceType] ?? false;

-      if (formatExtension) {
+      if (isFileset && typeof parsed["value"] === "object" && parsed["value"] !== null) {
+        const filesetBasePath =
+          removeSuffix(finalPath, ".resource.json") + ".fileset";
+        // Push directory entry for the fileset
+        r.push({
+          isDirectory: true,
+          path: filesetBasePath,
+          async *getChildren() {
+            for (const [relPath, fileContent] of Object.entries(parsed["value"])) {
+              if (typeof fileContent === "string") {
+                yield {
+                  isDirectory: false,
+                  path: path.join(filesetBasePath, relPath),
+                  async *getChildren() {},
+                  async getContentText() {
+                    return fileContent;
+                  },
+                };
+              }
+            }
+          },
+          async getContentText() {
+            throw new Error("Cannot get content of directory");
+          },
+        });
+      } else if (formatExtension) {
        const fileContent: string = parsed["value"]["content"];
        if (typeof fileContent === "string") {
          r.push({
@@ -1058,6 +1135,7 @@ export async function elementsToMap(
    const path = entry.path;
    if (
      !isFileResource(path) &&
+      !isFilesetResource(path) &&
      !isRawAppFile(path) &&
      !isWorkspaceDependencies(path)
    ) {
@@ -1103,7 +1181,7 @@ export async function elementsToMap(
      }
    }

-    if (skips.skipResources && isFileResource(path)) continue;
+    if (skips.skipResources && (isFileResource(path) || isFilesetResource(path))) continue;

    const ext = json ? ".json" : ".yaml";
    if (!skips.includeSchedules && path.endsWith(".schedule" + ext)) continue;
@@ -1715,10 +1793,14 @@ export async function pull(
  );

  let resourceTypeToFormatExtension: Record<string, string> = {};
+  let resourceTypeToIsFileset: Record<string, boolean> = {};
  try {
-    resourceTypeToFormatExtension = (await wmill.fileResourceTypeToFileExtMap({
+    const raw = (await wmill.fileResourceTypeToFileExtMap({
      workspace: workspace.workspaceId,
-    })) as Record<string, string>;
+    })) as Record<string, string | FileResourceTypeInfo>;
+    const parsed = parseFileResourceTypeMap(raw);
+    resourceTypeToFormatExtension = parsed.formatExtMap;
+    resourceTypeToIsFileset = parsed.filesetMap;
  } catch {
    // ignore
  }
@@ -1745,6 +1827,7 @@ export async function pull(
    !opts.json,
    opts.defaultTs ?? "bun",
    resourceTypeToFormatExtension,
+    resourceTypeToIsFileset,
    true,
  );

@@ -2241,10 +2324,14 @@ export async function push(
    ),
  );
  let resourceTypeToFormatExtension: Record<string, string> = {};
+  let resourceTypeToIsFileset: Record<string, boolean> = {};
  try {
-    resourceTypeToFormatExtension = (await wmill.fileResourceTypeToFileExtMap({
+    const raw = (await wmill.fileResourceTypeToFileExtMap({
      workspace: workspace.workspaceId,
-    })) as Record<string, string>;
+    })) as Record<string, string | FileResourceTypeInfo>;
+    const parsed = parseFileResourceTypeMap(raw);
+    resourceTypeToFormatExtension = parsed.formatExtMap;
+    resourceTypeToIsFileset = parsed.filesetMap;
  } catch {
    // ignore
  }
@@ -2269,6 +2356,7 @@ export async function push(
    !opts.json,
    opts.defaultTs ?? "bun",
    resourceTypeToFormatExtension,
+    resourceTypeToIsFileset,
    false,
  );

@@ -2587,6 +2675,39 @@ export async function push(
                  continue;
                }
              }
+              if (isFilesetResource(change.path)) {
+                const resourceFilePath = await findFilesetResourceFile(change.path);
+                if (!alreadySynced.includes(resourceFilePath)) {
+                  alreadySynced.push(resourceFilePath);
+
+                  const newObj = parseFromPath(
+                    resourceFilePath,
+                    await readFile(resourceFilePath, "utf-8"),
+                  );
+
+                  let serverPath = resourceFilePath;
+                  const currentBranch = cachedBranchForPush;
+
+                  if (currentBranch && isBranchSpecificFile(resourceFilePath)) {
+                    serverPath = fromBranchSpecificPath(
+                      resourceFilePath,
+                      currentBranch,
+                    );
+                  }
+
+                  await pushResource(
+                    workspace.workspaceId,
+                    serverPath,
+                    undefined,
+                    newObj,
+                    resourceFilePath,
+                  );
+                  if (stateTarget) {
+                    await writeFile(stateTarget, change.after, "utf-8");
+                  }
+                  continue;
+                }
+              }
              const oldObj = parseFromPath(change.path, change.before);
              const newObj = parseFromPath(change.path, change.after);

@@ -2619,7 +2740,8 @@ export async function push(
                change.path.endsWith(".script.json") ||
                change.path.endsWith(".script.yaml") ||
                change.path.endsWith(".lock") ||
-                isFileResource(change.path)
+                isFileResource(change.path) ||
+                isFilesetResource(change.path)
              ) {
                continue;
              } else if (
@@ -1,6 +1,6 @@
 import { minimatch } from "minimatch";
 import { getCurrentGitBranch, isGitRepository } from "../utils/git.ts";
-import { isFileResource } from "../utils/utils.ts";
+import { isFileResource, isFilesetResource } from "../utils/utils.ts";
 import { SyncOptions } from "./conf.ts";
 import { TRIGGER_TYPES } from "../types.ts";

@@ -165,7 +165,7 @@ export function isItemTypeConfigured(path: string, specificItems: SpecificItemsC
    return specificItems.settings !== undefined;
  }

-  if (isFileResource(path)) {
+  if (isFileResource(path) || isFilesetResource(path)) {
    return specificItems.resources !== undefined;
  }

@@ -219,6 +219,14 @@ export function isSpecificItem(path: string, specificItems: SpecificItemsConfig
    }
  }

+  if (isFilesetResource(path)) {
+    const basePathMatch = path.match(/^(.+?)\.fileset[/\\]/);
+    if (basePathMatch && specificItems.resources) {
+      const basePath = basePathMatch[1] + '.resource.yaml';
+      return matchesPatterns(basePath, specificItems.resources);
+    }
+  }
+
  return false;
 }

@@ -14,7 +14,7 @@ import { pushResourceType } from "./commands/resource-type/resource-type.ts";
 import { pushVariable } from "./commands/variable/variable.ts";
 import { yamlOptions } from "./commands/sync/sync.ts";
 import { showDiffs } from "./core/conf.ts";
-import { deepEqual, isFileResource, isWorkspaceDependencies } from "./utils/utils.ts";
+import { deepEqual, isFileResource, isFilesetResource, isWorkspaceDependencies } from "./utils/utils.ts";
 import { pushSchedule } from "./commands/schedule/schedule.ts";
 import { pushWorkspaceUser } from "./commands/user/user.ts";
 import { pushGroup } from "./commands/user/user.ts";
@@ -333,7 +333,7 @@ export function getTypeStrFromPath(
  ) {
    return typeEnding;
  } else {
-    if (isFileResource(p)) {
+    if (isFileResource(p) || isFilesetResource(p)) {
      return "resource";
    }
    throw new Error("Could not infer type of path " + JSON.stringify(parsed));
@@ -154,6 +154,11 @@ export function isFileResource(path: string): boolean {
  );
 }

+/** Matches children inside a .fileset/ directory, not the directory itself. */
+export function isFilesetResource(path: string): boolean {
+  return path.includes(".fileset/") || path.includes(".fileset\\");
+}
+
 export function isRawAppFile(path: string): boolean {
  return isRawAppPath(path);
 }
@@ -4,7 +4,7 @@
 */

 import { expect, test, describe } from "bun:test";
-import { deepEqual, isFileResource, toCamel, capitalize } from "../src/utils/utils.ts";
+import { deepEqual, isFileResource, isFilesetResource, toCamel, capitalize } from "../src/utils/utils.ts";
 import {
  getTypeStrFromPath,
  removeType,
@@ -156,6 +156,32 @@ describe("isFileResource", () => {
  });
 });

+// =============================================================================
+// isFilesetResource
+// =============================================================================
+
+describe("isFilesetResource", () => {
+  test("detects fileset resource paths (unix separator)", () => {
+    expect(isFilesetResource("f/test/my_config.fileset/config.yaml")).toBe(true);
+    expect(isFilesetResource("u/admin/templates.fileset/path/to/file.txt")).toBe(true);
+  });
+
+  test("detects fileset resource paths (windows separator)", () => {
+    expect(isFilesetResource("f\\test\\my_config.fileset\\config.yaml")).toBe(true);
+  });
+
+  test("rejects non-fileset paths", () => {
+    expect(isFilesetResource("f/test/my_resource.resource.yaml")).toBe(false);
+    expect(isFilesetResource("f/test/my_file.resource.file.txt")).toBe(false);
+    expect(isFilesetResource("f/test/my_script.ts")).toBe(false);
+  });
+
+  test("rejects paths ending with .fileset (no child file)", () => {
+    // The directory itself is not a fileset resource file - only children are
+    expect(isFilesetResource("f/test/my_config.fileset")).toBe(false);
+  });
+});
+
 // =============================================================================
 // removeType
 // =============================================================================
@@ -241,6 +267,11 @@ describe("getTypeStrFromPath", () => {
    expect(getTypeStrFromPath("devs.group.yaml")).toBe("group");
  });

+  test("detects fileset resource files as resource type", () => {
+    expect(getTypeStrFromPath("f/test/my_config.fileset/config.yaml")).toBe("resource");
+    expect(getTypeStrFromPath("u/admin/templates.fileset/path/to/file.txt")).toBe("resource");
+  });
+
  test("throws for unknown type", () => {
    expect(() => getTypeStrFromPath("f/test/unknown.xyz.yaml")).toThrow();
  });
@@ -835,7 +835,6 @@
 			"version": "1.7.1",
 			"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz",
 			"integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==",
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -847,7 +846,6 @@
 			"version": "1.7.1",
 			"resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz",
 			"integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==",
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -858,7 +856,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
 			"integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -1348,7 +1345,6 @@
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.0.tgz",
 			"integrity": "sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==",
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -1503,7 +1499,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1520,7 +1515,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1537,7 +1531,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1554,7 +1547,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1571,7 +1563,6 @@
 			"cpu": [
 				"arm"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1588,7 +1579,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1605,7 +1595,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1622,7 +1611,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1639,7 +1627,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1656,7 +1643,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1673,7 +1659,6 @@
 			"cpu": [
 				"wasm32"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -1690,7 +1675,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -1707,7 +1691,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"os": [
@@ -2313,7 +2296,6 @@
 			"version": "0.10.1",
 			"resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
 			"integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
-			"dev": true,
 			"license": "MIT",
 			"optional": true,
 			"dependencies": {
@@ -7193,7 +7175,7 @@
 			"version": "1.21.7",
 			"resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
 			"integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-			"dev": true,
+			"devOptional": true,
 			"license": "MIT",
 			"bin": {
 				"jiti": "bin/jiti.js"
@@ -7692,7 +7674,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7713,7 +7694,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7734,7 +7714,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7755,7 +7734,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7776,7 +7754,6 @@
 			"cpu": [
 				"arm"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7797,7 +7774,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7818,7 +7794,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7839,7 +7814,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7860,7 +7834,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7881,7 +7854,6 @@
 			"cpu": [
 				"arm64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -7902,7 +7874,6 @@
 			"cpu": [
 				"x64"
 			],
-			"dev": true,
 			"license": "MPL-2.0",
 			"optional": true,
 			"os": [
@@ -12529,21 +12500,6 @@
 				}
 			}
 		},
-		"node_modules/svelte-check/node_modules/picomatch": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
-			"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"peer": true,
-			"engines": {
-				"node": ">=12"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/jonschlinkert"
-			}
-		},
 		"node_modules/svelte-eslint-parser": {
 			"version": "0.43.0",
 			"resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-0.43.0.tgz",
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { OauthService, type ResourceType } from '$lib/gen'
+	import FilesetEditor from './FilesetEditor.svelte'
 	import { workspaceStore } from '$lib/stores'
 	import { emptySchema, emptyString } from '$lib/utils'
 	import SchemaForm from './SchemaForm.svelte'
@@ -79,7 +80,7 @@
 			rawCode = JSON.stringify(args, null, 2)
 		} else {
 			parseJson()
-			if (resourceTypeInfo?.format_extension) {
+			if (resourceTypeInfo?.format_extension && !resourceTypeInfo?.is_fileset) {
 				textFileContent = args.content
 			}
 		}
@@ -237,6 +238,11 @@
 			/>
 		{/await}
 	</div>
+{:else if resourceTypeInfo?.is_fileset}
+	<h5 class="mt-1 inline-flex items-center gap-4">
+		Fileset
+	</h5>
+	<FilesetEditor bind:args />
 {:else if resourceTypeInfo?.format_extension}
 	<h5 class="mt-4 inline-flex items-center gap-4">
 		File content ({resourceTypeInfo.format_extension})
@@ -0,0 +1,293 @@
+<script lang="ts">
+	import Button from './common/button/Button.svelte'
+	import { Plus, File, Folder, FolderOpen } from 'lucide-svelte'
+	import FileTreeNode from './raw_apps/FileTreeNode.svelte'
+	import type { TreeNode } from './raw_apps/fileTreeUtils'
+	import { buildFileTree } from './raw_apps/fileTreeUtils'
+
+	interface Props {
+		/** File path → content map. Keys use / prefix (e.g. /index.html). */
+		files: Record<string, string>
+		/** Currently selected path (/-prefixed). Read-only; changes via onSelectPath callback. */
+		selectedPath?: string | undefined
+		/** Called when user clicks a path (file or folder). */
+		onSelectPath?: (path: string) => void
+		/** Extra tree nodes appended after the main tree (e.g. read-only wmill.ts). */
+		extraNodes?: TreeNode[]
+		/** Show a root / entry at the top of the tree. */
+		showRoot?: boolean
+		/** Hide the built-in header (useful when parent provides its own). */
+		hideHeader?: boolean
+	}
+
+	let {
+		files = $bindable({}),
+		selectedPath = undefined,
+		onSelectPath,
+		extraNodes,
+		showRoot = false,
+		hideHeader = false
+	}: Props = $props()
+
+	let pendingNewFilePath: string | undefined = $state(undefined)
+	let pathToEdit: string | undefined = $state(undefined)
+	// Empty folders exist only in the UI until a file is created inside them
+	let emptyFolders: string[] = $state([])
+
+	const fileTree = $derived(
+		buildFileTree([
+			...Object.keys(files ?? {}),
+			...emptyFolders,
+			...(pendingNewFilePath ? [pendingNewFilePath] : [])
+		])
+	)
+
+	function getUniquePath(basePath: string): string {
+		const existingPaths = new Set(
+			[...Object.keys(files ?? {}), ...emptyFolders, pendingNewFilePath].filter(Boolean)
+		)
+
+		if (!existingPaths.has(basePath)) return basePath
+
+		const isFolder = basePath.endsWith('/')
+		let pathWithoutTrailing = isFolder ? basePath.slice(0, -1) : basePath
+		const lastSlash = pathWithoutTrailing.lastIndexOf('/')
+		const parentPath = pathWithoutTrailing.substring(0, lastSlash + 1)
+		const fileName = pathWithoutTrailing.substring(lastSlash + 1)
+
+		let nameWithoutExt: string
+		let ext: string
+		if (isFolder) {
+			nameWithoutExt = fileName
+			ext = ''
+		} else {
+			const dotIndex = fileName.lastIndexOf('.')
+			nameWithoutExt = dotIndex > 0 ? fileName.substring(0, dotIndex) : fileName
+			ext = dotIndex > 0 ? fileName.substring(dotIndex) : ''
+		}
+
+		let counter = 1
+		let candidate: string
+		do {
+			const newName = `${nameWithoutExt} (${counter})${ext}`
+			candidate = isFolder ? `${parentPath}${newName}/` : `${parentPath}${newName}`
+			counter++
+		} while (existingPaths.has(candidate))
+		return candidate
+	}
+
+	function handleFileClick(path: string) {
+		onSelectPath?.(path)
+	}
+
+	function handleAddFile(folderPath: string) {
+		const normalizedFolder = folderPath.endsWith('/') ? folderPath : folderPath + '/'
+		const basePath = normalizedFolder + 'newfile.txt'
+		const newPath = getUniquePath(basePath)
+		pendingNewFilePath = newPath
+		pathToEdit = newPath
+	}
+
+	export function handleAddRootFile() {
+		let basePath: string
+		if (selectedPath && selectedPath !== '/') {
+			if (selectedPath.endsWith('/')) {
+				basePath = selectedPath + 'newfile.txt'
+			} else {
+				const pathParts = selectedPath.split('/').filter(Boolean)
+				const parentPath =
+					pathParts.length > 1 ? '/' + pathParts.slice(0, -1).join('/') + '/' : '/'
+				basePath = parentPath + 'newfile.txt'
+			}
+		} else {
+			basePath = '/newfile.txt'
+		}
+		const newPath = getUniquePath(basePath)
+		pendingNewFilePath = newPath
+		pathToEdit = newPath
+	}
+
+	function handleAddFolder(folderPath: string) {
+		const normalizedFolder = folderPath.endsWith('/') ? folderPath : folderPath + '/'
+		const basePath = normalizedFolder + 'newfolder/'
+		const newPath = getUniquePath(basePath)
+		pendingNewFilePath = newPath
+		pathToEdit = newPath
+	}
+
+	export function handleAddRootFolder() {
+		let basePath: string
+		if (selectedPath && selectedPath !== '/') {
+			if (selectedPath.endsWith('/')) {
+				basePath = selectedPath + 'newfolder/'
+			} else {
+				const pathParts = selectedPath.split('/').filter(Boolean)
+				const parentPath =
+					pathParts.length > 1 ? '/' + pathParts.slice(0, -1).join('/') + '/' : '/'
+				basePath = parentPath + 'newfolder/'
+			}
+		} else {
+			basePath = '/newfolder/'
+		}
+		const newPath = getUniquePath(basePath)
+		pendingNewFilePath = newPath
+		pathToEdit = newPath
+	}
+
+	function handleRename(oldPath: string, newName: string) {
+		const isFolder = oldPath.endsWith('/')
+		const pathParts = oldPath.split('/').filter(Boolean)
+		const parentPath = '/' + pathParts.slice(0, -1).join('/')
+		let newPath = parentPath === '/' ? '/' + newName : parentPath + '/' + newName
+		if (isFolder && !newPath.endsWith('/')) {
+			newPath = newPath + '/'
+		}
+
+		const isPendingNew = pendingNewFilePath === oldPath
+
+		if (!isPendingNew && oldPath === newPath) {
+			pathToEdit = undefined
+			return
+		}
+
+		const nfiles = { ...files }
+
+		if (isFolder) {
+			if (isPendingNew) {
+				// New empty folder — track in UI until a file is created inside
+				emptyFolders = [...emptyFolders, newPath]
+				pendingNewFilePath = undefined
+			} else {
+				// Rename all children under old folder path
+				for (const key of Object.keys(nfiles)) {
+					if (key === oldPath || key.startsWith(oldPath)) {
+						const newKey = newPath + key.substring(oldPath.length)
+						nfiles[newKey] = nfiles[key]
+						delete nfiles[key]
+					}
+				}
+				// Also rename in emptyFolders
+				emptyFolders = emptyFolders.map((f) =>
+					f === oldPath || f.startsWith(oldPath)
+						? newPath + f.substring(oldPath.length)
+						: f
+				)
+			}
+		} else {
+			if (isPendingNew) {
+				nfiles[newPath] = ''
+				pendingNewFilePath = undefined
+			} else {
+				nfiles[newPath] = nfiles[oldPath]
+				delete nfiles[oldPath]
+			}
+			// Remove empty folders that are now implicitly defined by this file path
+			emptyFolders = emptyFolders.filter((f) => !newPath.startsWith(f))
+		}
+
+		files = nfiles
+		pathToEdit = undefined
+		onSelectPath?.(newPath)
+	}
+
+	function handleDelete(path: string) {
+		const isFolder = path.endsWith('/')
+		const nfiles = { ...files }
+
+		if (isFolder) {
+			for (const key of Object.keys(nfiles)) {
+				if (key === path || key.startsWith(path)) {
+					delete nfiles[key]
+				}
+			}
+			emptyFolders = emptyFolders.filter((f) => f !== path && !f.startsWith(path))
+		} else {
+			delete nfiles[path]
+		}
+
+		files = nfiles
+
+		if (selectedPath === path || (isFolder && selectedPath?.startsWith(path))) {
+			const remaining = Object.keys(nfiles)
+			if (remaining.length > 0) {
+				onSelectPath?.(remaining[0])
+			} else {
+				onSelectPath?.(showRoot ? '/' : '')
+			}
+		}
+	}
+</script>
+
+{#if !hideHeader}
+	<div class="p-2 border-b flex items-center justify-between">
+		<span class="text-xs font-semibold text-emphasis">Files</span>
+		<div class="flex gap-1">
+			<Button
+				onClick={handleAddRootFile}
+				title="Add file"
+				unifiedSize="xs"
+				variant="subtle"
+				btnClasses="px-1 gap-0.5"
+			>
+				<Plus size={12} />
+				<File size={12} />
+			</Button>
+			<Button
+				onClick={handleAddRootFolder}
+				title="Add folder"
+				unifiedSize="xs"
+				variant="subtle"
+				btnClasses="px-1 gap-0.5"
+			>
+				<Plus size={12} />
+				<Folder size={12} />
+			</Button>
+		</div>
+	</div>
+{/if}
+<div class="flex-1 overflow-y-auto py-1 w-full">
+	{#if showRoot}
+		<button
+			onclick={() => onSelectPath?.('/')}
+			class="w-full flex items-center gap-1 px-2 py-1 text-xs hover:bg-surface-hover transition-colors rounded text-left {selectedPath ===
+			'/'
+				? 'bg-surface-accent-selected'
+				: ''}"
+		>
+			<FolderOpen size={12} class="flex-shrink-0 text-secondary" />
+			<span
+				class="truncate text-primary font-normal {selectedPath === '/' ? 'text-accent' : ''}"
+				>/</span
+			>
+		</button>
+	{/if}
+	{#each fileTree as node (node.path)}
+		<FileTreeNode
+			{node}
+			onFileClick={handleFileClick}
+			onAddFile={handleAddFile}
+			onAddFolder={handleAddFolder}
+			onRename={handleRename}
+			onDelete={handleDelete}
+			{selectedPath}
+			{pathToEdit}
+			onRequestEdit={(path) => (pathToEdit = path)}
+			onCancelEdit={() => {
+				pathToEdit = undefined
+				pendingNewFilePath = undefined
+			}}
+		/>
+	{/each}
+	{#if extraNodes}
+		{#each extraNodes as node (node.path)}
+			<FileTreeNode
+				{node}
+				noEdit
+				onFileClick={handleFileClick}
+				onAddFile={handleAddFile}
+				onAddFolder={handleAddFolder}
+				{selectedPath}
+			/>
+		{/each}
+	{/if}
+</div>
@@ -0,0 +1,120 @@
+<script lang="ts">
+	import SimpleEditor from './SimpleEditor.svelte'
+	import FileExplorer from './FileExplorer.svelte'
+
+	interface Props {
+		args: Record<string, any>
+	}
+
+	let { args = $bindable({}) }: Props = $props()
+
+	// Internal files map uses /-prefixed keys (matching tree node paths).
+	// Compute initial files + selection together to avoid referencing $state outside reactive context.
+	const initialFiles = Object.fromEntries(
+		Object.entries(args ?? {}).map(([k, v]) => ['/' + k, String(v ?? '')])
+	)
+	const initialFile = Object.keys(initialFiles).find((k) => !k.endsWith('/'))
+
+	let files: Record<string, string> = $state(initialFiles)
+	let selectedPath: string | undefined = $state(initialFile ?? '/')
+	let editContent: string = $state(initialFile ? (initialFiles[initialFile] ?? '') : '')
+
+	// The selected file path (/-prefixed, not a folder)
+	const selectedFileKey: string | undefined = $derived.by(() => {
+		if (selectedPath != null && !selectedPath.endsWith('/')) {
+			return selectedPath
+		}
+		return undefined
+	})
+
+	// Display key without leading /
+	const selectedDisplayKey: string | undefined = $derived(
+		selectedFileKey?.replace(/^\//, '')
+	)
+
+	function flushEditContent() {
+		if (selectedFileKey != null && selectedFileKey in files && files[selectedFileKey] !== editContent) {
+			files = { ...files, [selectedFileKey]: editContent }
+		}
+	}
+
+	function handleSelectPath(path: string) {
+		flushEditContent()
+		selectedPath = path
+		if (!path.endsWith('/') && path !== '') {
+			editContent = files[path] ?? ''
+		}
+	}
+
+	// Sync files → args, overlaying current editContent for the active file.
+	// This avoids spreading a new files object on every keystroke.
+	$effect(() => {
+		const currentKey = selectedFileKey
+		const currentContent = editContent
+		const newArgs: Record<string, any> = {}
+		for (const [key, value] of Object.entries(files)) {
+			if (!key.endsWith('/')) {
+				const argKey = key.replace(/^\//, '')
+				newArgs[argKey] = key === currentKey ? currentContent : value
+			}
+		}
+		args = newArgs
+	})
+
+	function inferLang(filePath: string): string {
+		const ext = filePath.split('.').pop()?.toLowerCase()
+		if (!ext) return 'plaintext'
+		const langMap: Record<string, string> = {
+			json: 'json',
+			yaml: 'yaml',
+			yml: 'yaml',
+			toml: 'toml',
+			ini: 'ini',
+			xml: 'xml',
+			html: 'html',
+			css: 'css',
+			js: 'javascript',
+			ts: 'typescript',
+			py: 'python',
+			sh: 'shell',
+			bash: 'shell',
+			sql: 'sql',
+			md: 'markdown',
+			cfg: 'ini',
+			conf: 'ini',
+			j2: 'jinja',
+			jinja: 'jinja'
+		}
+		return langMap[ext] ?? 'plaintext'
+	}
+</script>
+
+<div class="flex border rounded-md overflow-hidden" style="min-height: 200px; max-height: 60vh;">
+	<div class="w-56 shrink-0 border-r flex flex-col bg-surface-secondary">
+		<FileExplorer
+			bind:files
+			{selectedPath}
+			onSelectPath={handleSelectPath}
+			showRoot
+		/>
+	</div>
+	<div class="flex-1 min-w-0 overflow-y-auto">
+		{#if selectedDisplayKey != null}
+			<div class="px-3 py-1.5 border-b text-xs text-secondary bg-surface-secondary sticky top-0 z-10">
+				{selectedDisplayKey}
+			</div>
+			{#key selectedFileKey}
+				<SimpleEditor
+					autoHeight
+					lang={inferLang(selectedDisplayKey)}
+					bind:code={editContent}
+					fixedOverflowWidgets={false}
+				/>
+			{/key}
+		{:else}
+			<div class="flex items-center justify-center h-full text-xs text-secondary">
+				Select a file or add a new one
+			</div>
+		{/if}
+	</div>
+</div>
@@ -1,5 +1,5 @@
 <script>
-	import { FileText } from 'lucide-svelte'
+	import { FileText, FolderOpen } from 'lucide-svelte'
 	import { APP_TO_ICON_COMPONENT } from './icons'
 	/**
 	 * @typedef {Object} Props
@@ -11,6 +11,7 @@
 	 * @property {boolean} [center]
 	 * @property {boolean} [isSelected]
 	 * @property {any} [formatExtension]
+	 * @property {boolean} [isFileset]
 	 */

 	/** @type {Props} */
@@ -22,7 +23,8 @@
 		width = '24px',
 		center = false,
 		isSelected = false,
-		formatExtension = undefined
+		formatExtension = undefined,
+		isFileset = false
 	} = $props()

 	let iconComponent = $derived(
@@ -45,6 +47,10 @@
 		<span class={isSelected ? 'text-secondary' : 'text-secondary'}>
 			<SvelteComponent {height} {width} size={widthInPixels} />
 		</span>
+	{:else if isFileset}
+		<span class={isSelected ? 'text-secondary' : 'text-secondary grayscale'}>
+			<FolderOpen {height} {width} />
+		</span>
 	{:else if formatExtension}
 		<span class={isSelected ? 'text-secondary' : 'text-secondary grayscale'}>
 			<FileText {height} {width} />
@@ -12,6 +12,7 @@
 	import { userStore, workspaceStore } from '$lib/stores'
 	import SchemaForm from './SchemaForm.svelte'
 	import SimpleEditor from './SimpleEditor.svelte'
+	import FilesetEditor from './FilesetEditor.svelte'
 	import Toggle from './Toggle.svelte'
 	import { sendUserToast } from '$lib/toast'
 	import TestConnection from './TestConnection.svelte'
@@ -128,7 +129,7 @@
 					resourceSchema.order =
 						resourceSchema.order ?? Object.keys(resourceSchema.properties).sort()
 				}
-				if (resourceTypeInfo?.format_extension) {
+				if (resourceTypeInfo?.format_extension && !resourceTypeInfo?.is_fileset) {
 					textFileContent = args.content
 				}
 			} catch (err) {
@@ -165,7 +166,7 @@
 			rawCode = JSON.stringify(args, null, 2)
 		} else {
 			parseJson()
-			if (resourceTypeInfo?.format_extension) {
+			if (resourceTypeInfo?.format_extension && !resourceTypeInfo?.is_fileset) {
 				textFileContent = args.content
 			}
 		}
@@ -294,9 +295,14 @@
 			<div>
 				{#if loadingSchema}
 					<Skeleton layout={[[4]]} />
+				{:else if !viewJsonSchema && resourceTypeInfo?.is_fileset}
+					<h5 class="mt-1 inline-flex items-center gap-4">
+						Fileset
+					</h5>
+					<FilesetEditor bind:args />
 				{:else if !viewJsonSchema && resourceSchema && resourceSchema?.properties}
 					{#if resourceTypeInfo?.format_extension}
-						<h5 class="mt-4 inline-flex items-center gap-4 pb-2">
+						<h5 class="mt-1 inline-flex items-center gap-4">
 							File content ({resourceTypeInfo.format_extension})
 						</h5>
 						<div class="">
@@ -122,6 +122,7 @@
 		if (e.key === 'Enter') {
 			finishEdit()
 		} else if (e.key === 'Escape') {
+			e.stopPropagation()
 			editValue = node.name // Reset to original
 			onCancelEdit?.()
 		}
@@ -17,7 +17,7 @@
 	import type { Modules } from './RawAppModules.svelte'
 	import { isRunnableByName, isRunnableByPath } from '../apps/inputType'
 	import { aiChatManager, AIMode } from '../copilot/chat/AIChatManager.svelte'
-	import { onMount } from 'svelte'
+	import { onMount, untrack } from 'svelte'
 	import type { LintResult, DataTableSchema, InspectorElementInfo } from '../copilot/chat/app/core'
 	import type { AppCodeSelectionElement } from '../copilot/chat/context'
 	import { rawAppLintStore } from './lintStore'
@@ -158,10 +158,20 @@
 	}

 	let iframeLoaded = $state(false) // @hmr:keep
+	let suppressSetActiveDocument = false

 	function populateFiles() {
 		if (files) {
-			setFilesInIframe(files)
+			// Suppress iframe's automatic setActiveDocument for a short window
+			// after sending files, to prevent it from resetting to App.tsx.
+			suppressSetActiveDocument = true
+			setTimeout(() => { suppressSetActiveDocument = false }, 500)
+			const doc = untrack(() => selectedDocument)
+			if (doc) {
+				setFilesAndSelectInIframe(files, doc)
+			} else {
+				setFilesInIframe(files)
+			}
 		}
 	}
 	function setFilesInIframe(newFiles: Record<string, string>) {
@@ -612,6 +622,7 @@
 		} else if (e.data.type === 'updateModules') {
 			modules = e.data.modules
 		} else if (e.data.type === 'setActiveDocument') {
+			if (suppressSetActiveDocument) return
 			// Normalize Windows-style path separators to Linux-style
 			selectedDocument = e.data.path?.replace(/\\/g, '/')
 		} else if (e.data.type === 'inspectorSelect') {
@@ -2,8 +2,7 @@
 	import PanelSection from '../apps/editor/settingsPanel/common/PanelSection.svelte'
 	import type { Runnable } from '../apps/inputType'
 	import RawAppInlineScriptPanelList from './RawAppInlineScriptPanelList.svelte'
-	import FileTreeNode from './FileTreeNode.svelte'
-	import { buildFileTree } from './fileTreeUtils'
+	import FileExplorer from '../FileExplorer.svelte'
 	import { Plus, File, Folder, Camera } from 'lucide-svelte'
 	import type { Modules } from './RawAppModules.svelte'
 	import RawAppModules from './RawAppModules.svelte'
@@ -17,7 +16,7 @@
 	interface Props {
 		runnables: Record<string, Runnable>
 		selectedRunnable: string | undefined
-		files: Record<string, string> | undefined
+		files: Record<string, string>
 		modules?: Modules
 		onSelectFile?: (path: string) => void
 		selectedDocument: string | undefined
@@ -38,7 +37,7 @@
 	let {
 		runnables,
 		selectedRunnable = $bindable(),
-		files = $bindable(),
+		files = $bindable({}),
 		modules,
 		onSelectFile,
 		selectedDocument = $bindable(),
@@ -70,329 +69,54 @@

 	function handleSelectDataTable(ref: DataTableRef, index: number) {
 		selectedDataTableIndex = selectedDataTableIndex === index ? undefined : index
-		// Open the drawer in manage mode when selecting a data table
 		if (selectedDataTableIndex === index) {
 			dataTableDrawer?.openDrawerWithRef(ref)
 		}
 	}

-	// Track pending new file/folder that hasn't been confirmed yet
-	let pendingNewFilePath = $state<string | undefined>(undefined)
+	let fileExplorer: FileExplorer | undefined = $state()

-	const fileTree = $derived(
-		buildFileTree([
-			...Object.keys(files ?? {}),
-			...(pendingNewFilePath ? [pendingNewFilePath] : [])
-		])
-	)
-
-	let pathToEdit = $state<string | undefined>(undefined)
-
-	// Helper to find a unique path by appending numbers if needed
-	function getUniquePath(basePath: string): string {
-		const existingPaths = new Set([...Object.keys(files ?? {}), pendingNewFilePath].filter(Boolean))
-
-		if (!existingPaths.has(basePath)) {
-			return basePath
-		}
-
-		// Split path into name and extension (for files) or handle folders
-		const isFolder = basePath.endsWith('/')
-		let pathWithoutTrailing = isFolder ? basePath.slice(0, -1) : basePath
-		const lastSlash = pathWithoutTrailing.lastIndexOf('/')
-		const parentPath = pathWithoutTrailing.substring(0, lastSlash + 1)
-		const fileName = pathWithoutTrailing.substring(lastSlash + 1)
-
-		let nameWithoutExt: string
-		let ext: string
-
-		if (isFolder) {
-			nameWithoutExt = fileName
-			ext = ''
-		} else {
-			const dotIndex = fileName.lastIndexOf('.')
-			if (dotIndex > 0) {
-				nameWithoutExt = fileName.substring(0, dotIndex)
-				ext = fileName.substring(dotIndex)
-			} else {
-				nameWithoutExt = fileName
-				ext = ''
-			}
-		}
-
-		// Try incrementing numbers until we find a unique path
-		let counter = 1
-		let candidatePath: string
-		do {
-			const newName = `${nameWithoutExt} (${counter})${ext}`
-			candidatePath = isFolder ? `${parentPath}${newName}/` : `${parentPath}${newName}`
-			counter++
-		} while (existingPaths.has(candidatePath))
-
-		return candidatePath
-	}
-
-	function handleFileClick(path: string) {
-		console.log('File clicked:', path)
+	function handleSelectPath(path: string) {
 		selectedDocument = path
-		// Only open files in the editor, not folders
 		if (!path.endsWith('/')) {
 			onSelectFile?.(path)
 		}
 	}
-
-	function handleAddFile(folderPath: string) {
-		console.log('Add file to:', folderPath)
-		// Ensure folderPath ends with /
-		const normalizedFolder = folderPath.endsWith('/') ? folderPath : folderPath + '/'
-		const basePath = normalizedFolder + 'newfile.txt'
-		const newPath = getUniquePath(basePath)
-		// Don't update files yet - just mark as pending and enter edit mode
-		pendingNewFilePath = newPath
-		pathToEdit = newPath
-	}
-
-	function handleRename(oldPath: string, newName: string) {
-		const pathParts = oldPath.split('/').filter(Boolean)
-		const parentPath = '/' + pathParts.slice(0, -1).join('/')
-		let newPath = parentPath === '/' ? '/' + newName : parentPath + '/' + newName
-
-		// Check if this is a folder (ends with /)
-		const isFolder = oldPath.endsWith('/')
-
-		// For folders, ensure new path also ends with /
-		if (isFolder && !newPath.endsWith('/')) {
-			newPath = newPath + '/'
-		}
-
-		// Check if this is a pending new file/folder being created
-		const isPendingNew = pendingNewFilePath === oldPath
-
-		// For existing items, skip if name didn't change
-		if (!isPendingNew && oldPath === newPath) {
-			pathToEdit = undefined
-			return
-		}
-
-		if (!files) {
-			files = {}
-		}
-		const nfiles = { ...files }
-
-		if (isFolder) {
-			if (isPendingNew) {
-				// Creating a new folder - just add it with the final name
-				nfiles[newPath] = ''
-				pendingNewFilePath = undefined
-			} else {
-				// Renaming existing folder
-				const oldFolderPath = oldPath
-				const newFolderPath = newPath
-
-				// Collect all paths to rename (including the folder itself and all children)
-				const pathsToRename: Array<{ old: string; new: string }> = []
-
-				Object.keys(nfiles).forEach((filePath) => {
-					if (filePath === oldFolderPath) {
-						// The folder itself
-						pathsToRename.push({ old: filePath, new: newFolderPath })
-					} else if (filePath.startsWith(oldFolderPath)) {
-						// Children of the folder
-						const relativePath = filePath.substring(oldFolderPath.length)
-						const updatedPath = newFolderPath + relativePath
-						pathsToRename.push({ old: filePath, new: updatedPath })
-					}
-				})
-
-				// Apply all renames
-				pathsToRename.forEach(({ old, new: newPath }) => {
-					nfiles[newPath] = nfiles[old]
-					delete nfiles[old]
-				})
-			}
-
-			selectedDocument = newPath
-		} else {
-			if (isPendingNew) {
-				// Creating a new file - just add it with the final name
-				nfiles[newPath] = ''
-				pendingNewFilePath = undefined
-			} else {
-				// Renaming existing file
-				nfiles[newPath] = nfiles[oldPath]
-				delete nfiles[oldPath]
-			}
-			selectedDocument = newPath
-		}
-
-		files = nfiles
-		pathToEdit = undefined
-
-		// Select the new file in the editor (only for files, not folders)
-		if (!isFolder) {
-			onSelectFile?.(newPath)
-		}
-	}
-
-	function handleAddFolder(folderPath: string) {
-		console.log('Add folder to:', folderPath)
-		// Ensure folderPath ends with /
-		const normalizedFolder = folderPath.endsWith('/') ? folderPath : folderPath + '/'
-		const basePath = normalizedFolder + 'newfolder/'
-		const newPath = getUniquePath(basePath)
-		// Don't update files yet - just mark as pending and enter edit mode
-		pendingNewFilePath = newPath
-		pathToEdit = newPath
-	}
-
-	function handleAddRootFile() {
-		console.log('Add file to root or selected folder')
-		let basePath: string
-
-		if (selectedDocument) {
-			// If a folder is selected, add the file inside it
-			if (selectedDocument.endsWith('/')) {
-				basePath = selectedDocument + 'newfile.txt'
-			} else {
-				// If a file is selected, add the new file in the same folder
-				const pathParts = selectedDocument.split('/').filter(Boolean)
-				if (pathParts.length > 1) {
-					// File is in a subfolder
-					const parentPath = '/' + pathParts.slice(0, -1).join('/') + '/'
-					basePath = parentPath + 'newfile.txt'
-				} else {
-					// File is at root
-					basePath = '/newfile.txt'
-				}
-			}
-		} else {
-			basePath = '/newfile.txt'
-		}
-
-		const newPath = getUniquePath(basePath)
-		// Don't update files yet - just mark as pending and enter edit mode
-		pendingNewFilePath = newPath
-		pathToEdit = newPath
-	}
-
-	function handleAddRootFolder() {
-		let basePath: string
-
-		if (selectedDocument) {
-			// If a folder is selected, add the folder inside it
-			if (selectedDocument.endsWith('/')) {
-				basePath = selectedDocument + 'newfolder/'
-			} else {
-				// If a file is selected, add the new folder in the same folder
-				const pathParts = selectedDocument.split('/').filter(Boolean)
-				if (pathParts.length > 1) {
-					// File is in a subfolder
-					const parentPath = '/' + pathParts.slice(0, -1).join('/') + '/'
-					basePath = parentPath + 'newfolder/'
-				} else {
-					// File is at root
-					basePath = '/newfolder/'
-				}
-			}
-		} else {
-			basePath = '/newfolder/'
-		}
-
-		const newPath = getUniquePath(basePath)
-		// Don't update files yet - just mark as pending and enter edit mode
-		pendingNewFilePath = newPath
-		pathToEdit = newPath
-	}
-
-	function handleDelete(path: string) {
-		if (files) {
-			console.log('Delete:', path)
-			const nfiles = { ...files }
-
-			// Check if this is a folder (ends with /)
-			const isFolder = path.endsWith('/')
-
-			if (isFolder) {
-				// Delete the folder and all its children
-				Object.keys(nfiles).forEach((filePath) => {
-					if (filePath === path || filePath.startsWith(path)) {
-						delete nfiles[filePath]
-					}
-				})
-			} else {
-				// Delete single file
-				delete nfiles[path]
-			}
-
-			files = nfiles
-			console.log(nfiles)
-
-			// Clear selection if deleted item was selected
-			if (selectedDocument === path || (isFolder && selectedDocument?.startsWith(path))) {
-				selectedDocument = undefined
-			}
-		}
-	}
 </script>

 <PanelSection size="sm" fullHeight={false} title="frontend" id="app-editor-frontend-panel">
 	{#snippet action()}
 		<div class="flex gap-1">
-			<div class="flex gap-1">
-				<Button
-					onClick={handleAddRootFile}
-					title="Add file to root"
-					unifiedSize="xs"
-					variant="subtle"
-					btnClasses="px-1 gap-0.5"
-				>
-					<Plus size={12} />
-					<File size={12} />
-				</Button>
-				<Button
-					onClick={handleAddRootFolder}
-					title="Add folder to root"
-					unifiedSize="xs"
-					variant="subtle"
-					btnClasses="px-1 gap-0.5"
-				>
-					<Plus size={12} />
-					<Folder size={12} />
-				</Button>
-			</div>
+			<Button
+				onClick={() => fileExplorer?.handleAddRootFile()}
+				title="Add file to root"
+				unifiedSize="xs"
+				variant="subtle"
+				btnClasses="px-1 gap-0.5"
+			>
+				<Plus size={12} />
+				<File size={12} />
+			</Button>
+			<Button
+				onClick={() => fileExplorer?.handleAddRootFolder()}
+				title="Add folder to root"
+				unifiedSize="xs"
+				variant="subtle"
+				btnClasses="px-1 gap-0.5"
+			>
+				<Plus size={12} />
+				<Folder size={12} />
+			</Button>
 		</div>
 	{/snippet}
-	<div class="flex flex-col gap-0.5 w-full">
-		{#each fileTree as node (node.path)}
-			<FileTreeNode
-				{node}
-				onFileClick={handleFileClick}
-				onAddFile={handleAddFile}
-				onAddFolder={handleAddFolder}
-				onRename={handleRename}
-				onDelete={handleDelete}
-				selectedPath={selectedDocument}
-				{pathToEdit}
-				onRequestEdit={(path) => (pathToEdit = path)}
-				onCancelEdit={() => {
-					pathToEdit = undefined
-					pendingNewFilePath = undefined
-				}}
-			/>
-		{/each}
-		<FileTreeNode
-			node={{
-				name: 'wmill.ts',
-				path: '/wmill.ts',
-				isFolder: false
-			}}
-			noEdit={true}
-			onFileClick={handleFileClick}
-			onAddFile={handleAddFile}
-			onAddFolder={handleAddFolder}
-			selectedPath={selectedDocument}
-		/>
-	</div>
+	<FileExplorer
+		bind:this={fileExplorer}
+		bind:files
+		selectedPath={selectedDocument}
+		onSelectPath={handleSelectPath}
+		extraNodes={[{ name: 'wmill.ts', path: '/wmill.ts', isFolder: false }]}
+		hideHeader
+	/>
 </PanelSection>

 <RawAppModules {modules} />
@@ -1,31 +1,40 @@
 <script lang="ts">
 	import { twMerge } from 'tailwind-merge'
 	import EditableSchemaForm from '../EditableSchemaForm.svelte'
-	import Toggle from '../Toggle.svelte'
 	import { emptySchema, validateFileExtension } from '$lib/utils'
 	import { Alert } from '../common'
 	import AddPropertyV2 from '$lib/components/schema/AddPropertyV2.svelte'
 	import { Plus } from 'lucide-svelte'
 	import Select from '../select/Select.svelte'
 	import { safeSelectItems } from '../select/utils.svelte'
+	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
+	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import type { EditableSchemaWrapperProps } from './editable_schema_wrapper'

+	type ResourceMode = 'schema' | 'file' | 'fileset'
+
 	let {
 		schema = $bindable(),
 		uiOnly = false,
 		noPreview = false,
 		fullHeight = true,
 		formatExtension = $bindable(undefined),
+		isFileset = $bindable(undefined),
 		customUi
 	}: EditableSchemaWrapperProps = $props()

-	let resourceIsTextFile: boolean = $state(false)
+	let resourceMode: ResourceMode = $state('schema')
 	let addPropertyComponent: AddPropertyV2 | undefined = $state(undefined)
 	let editableSchemaForm: EditableSchemaForm | undefined = $state(undefined)

 	$effect(() => {
-		if (!resourceIsTextFile && formatExtension !== undefined) {
-			formatExtension = undefined
+		if (resourceMode === 'schema') {
+			if (formatExtension !== undefined) {
+				formatExtension = undefined
+			}
+			if (isFileset) {
+				isFileset = undefined
+			}
 		}
 	})

@@ -35,12 +44,15 @@
 			: false
 	)

-	function switchResourceIsFile() {
-		if (!resourceIsTextFile) {
+	function switchResourceMode(mode: ResourceMode) {
+		resourceMode = mode
+		if (mode === 'schema') {
 			schema = emptySchema()
 			formatExtension = undefined
-		} else {
+			isFileset = undefined
+		} else if (mode === 'file') {
 			formatExtension = ''
+			isFileset = undefined
 			schema = emptySchema()
 			schema.order = ['content']
 			schema.properties = {
@@ -49,6 +61,10 @@
 					description: 'Text contents of the file'
 				}
 			}
+		} else if (mode === 'fileset') {
+			formatExtension = undefined
+			isFileset = true
+			schema = emptySchema()
 		}
 	}

@@ -66,7 +82,7 @@
 	])
 </script>

-{#if !resourceIsTextFile}
+{#if resourceMode === 'schema'}
 	<div
 		class={twMerge(
 			fullHeight ? 'h-full' : 'h-80',
@@ -124,7 +140,7 @@
 		</EditableSchemaForm>
 	</div>
 {/if}
-{#if resourceIsTextFile}
+{#if resourceMode === 'file'}
 	<label
 		for="format-extension"
 		class="text-xs font-semibold text-emphasis whitespace-nowrap flex items-center gap-4"
@@ -146,19 +162,26 @@
 		</Alert>
 	{:else if formatExtension && formatExtension !== ''}
 		<Alert title={`Example: my_file.${formatExtension}`} type="info">
-			The <span class="font-bold font-mono"> .{formatExtension} </span> extension will be used to infer
-			the format when displaying the content and this is also how the resource will appear when pulling
-			via the CLI.
+			The <span class="font-bold font-mono"> .{formatExtension} </span> extension will be used to
+			infer the format when displaying the content and this is also how the resource will appear
+			when pulling via the CLI.
 		</Alert>
 		<div></div>
 	{/if}
 {/if}
-<Toggle
-	bind:checked={resourceIsTextFile}
-	options={{
-		right: 'This resource type represents a plain text file (clears current schema)',
-		rightTooltip:
-			'A text file such as a config file, template, or any other file format that contains plain text'
-	}}
-	on:change={() => switchResourceIsFile()}
-/>
+{#if resourceMode === 'fileset'}
+	<Alert title="Fileset resource type" type="info">
+		This resource type represents a collection of files. Each file is identified by its relative
+		path and contains text content. In the CLI, filesets are stored as directories.
+	</Alert>
+{/if}
+<ToggleButtonGroup
+	selected={resourceMode}
+	onSelected={(mode) => switchResourceMode(mode)}
+>
+	{#snippet children({ item })}
+		<ToggleButton value="schema" label="JSON" {item} size="sm" />
+		<ToggleButton value="file" label="File" {item} size="sm" />
+		<ToggleButton value="fileset" label="Fileset" {item} size="sm" />
+	{/snippet}
+</ToggleButtonGroup>
@@ -6,6 +6,7 @@ export type EditableSchemaWrapperProps = {
 	noPreview?: boolean
 	fullHeight?: boolean
 	formatExtension?: string | undefined
+	isFileset?: boolean | undefined
 	customUi?: {
 		noAddPopover?: boolean
 	}
@@ -80,6 +80,7 @@

 	let cacheResources: ResourceW[] | undefined = $state()
 	let stateResources: ResourceW[] | undefined = $state()
+	let themeResources: ResourceW[] | undefined = $state()
 	let resources: ResourceW[] | undefined = $state()
 	let resourceTypes: ResourceTypeW[] | undefined = $state()

@@ -93,7 +94,8 @@
 		rt: '',
 		description: '',
 		schema: emptySchema(),
-		formatExtension: undefined as string | undefined
+		formatExtension: undefined as string | undefined,
+		isFileset: false
 	})

 	let resourceTypeDrawer: Drawer | undefined = $state(undefined)
@@ -102,7 +104,8 @@
 		name: '',
 		schema: emptySchema(),
 		description: '',
-		formatExtension: undefined
+		formatExtension: undefined as string | undefined,
+		isFileset: undefined as boolean | undefined
 	})
 	let isNewResourceTypeNameValid: boolean = $state(false)
 	let resourceTypeNameExists: boolean = $state(false)
@@ -111,7 +114,8 @@
 		name: '',
 		schema: emptySchema(),
 		description: '',
-		formatExtension: undefined as string | undefined
+		formatExtension: undefined as string | undefined,
+		isFileset: false
 	})
 	let resourceEditor: ResourceEditorDrawer | undefined = $state(undefined)
 	let shareModal: ShareModal | undefined = $state(undefined)
@@ -146,7 +150,7 @@
 	let filters = useUrlSyncedFilterInstance(untrack(() => resourcesFilterSchema))

 	async function loadResources(): Promise<void> {
-		resources = await loadResourceInternal(undefined, 'cache,state')
+		resources = await loadResourceInternal(undefined, 'cache,state,app_theme')
 		loading.resources = false
 	}

@@ -160,6 +164,11 @@
 		loading.resources = false
 	}

+	async function loadTheme(): Promise<void> {
+		themeResources = await loadResourceInternal('app_theme', undefined)
+		loading.resources = false
+	}
+
 	async function loadResourceInternal(
 		resourceType: string | undefined,
 		resourceTypeExclude: string | undefined
@@ -229,11 +238,13 @@
 	}

 	async function addResourceType(): Promise<void> {
-		if (newResourceType.formatExtension === '') {
-			throw new Error('Invalid empty file extension (make sure it is selected)')
-		}
-		if (!validateFileExtension(newResourceType.formatExtension ?? 'txt')) {
-			throw new Error('Invalid file extension')
+		if (!newResourceType.isFileset) {
+			if (newResourceType.formatExtension === '') {
+				throw new Error('Invalid empty file extension (make sure it is selected)')
+			}
+			if (!validateFileExtension(newResourceType.formatExtension ?? 'txt')) {
+				throw new Error('Invalid file extension')
+			}
 		}
 		await ResourceService.createResourceType({
 			workspace: $workspaceStore!,
@@ -241,7 +252,8 @@
 				name: (disableCustomPrefix ? '' : 'c_') + newResourceType.name,
 				schema: newResourceType.schema,
 				description: newResourceType.description,
-				format_extension: newResourceType.formatExtension
+				format_extension: newResourceType.formatExtension,
+				is_fileset: newResourceType.isFileset
 			}
 		})
 		resourceTypeDrawer?.closeDrawer?.()
@@ -303,7 +315,8 @@
 			name: uniqueName,
 			schema: emptySchema(),
 			description: '',
-			formatExtension: undefined
+			formatExtension: undefined,
+			isFileset: undefined
 		}
 		validateResourceTypeName()

@@ -316,7 +329,8 @@
 			name: rt.name,
 			schema: rt.schema as any,
 			description: rt.description ?? '',
-			formatExtension: rt.format_extension
+			formatExtension: rt.format_extension,
+			isFileset: rt.is_fileset ?? false
 		}
 		editResourceTypeDrawer?.openDrawer?.()
 	}
@@ -431,34 +445,64 @@
 		validateResourceTypeName()
 	}

-	let resourceNameToFileExtMap: any = undefined
+	let resourceNameToFileExtMap: Record<string, string> | undefined = undefined
+	let resourceNameToIsFilesetMap: Record<string, boolean> | undefined = undefined

 	let loadingResourceNameToFileExt = false
-	async function resourceNameToFileExt(resourceName: string) {
-		if (resourceNameToFileExtMap == undefined && !loadingResourceNameToFileExt) {
-			loadingResourceNameToFileExt = true
-			try {
-				resourceNameToFileExtMap = await ResourceService.fileResourceTypeToFileExtMap({
-					workspace: $workspaceStore!
-				})
-			} catch (e) {
-				console.error('Error loading resourceNameToFileExtMap', e)
-			} finally {
-				loadingResourceNameToFileExt = false
-			}
-		} else {
+	async function loadResourceNameToFileExtMap() {
+		if (resourceNameToFileExtMap != undefined) return
+		if (loadingResourceNameToFileExt) {
 			while (resourceNameToFileExtMap == undefined) {
 				console.log('waiting for resourceNameToFileExtMap')
 				await new Promise((resolve) => setTimeout(resolve, 100))
 			}
+			return
+		}
+		loadingResourceNameToFileExt = true
+		try {
+			const raw = (await ResourceService.fileResourceTypeToFileExtMap({
+				workspace: $workspaceStore!
+			})) as Record<string, string | { format_extension: string | null; is_fileset: boolean }>
+			resourceNameToFileExtMap = {}
+			resourceNameToIsFilesetMap = {}
+			for (const [k, v] of Object.entries(raw)) {
+				if (typeof v === 'string') {
+					resourceNameToFileExtMap[k] = v
+					resourceNameToIsFilesetMap![k] = false
+				} else {
+					if (v.format_extension) {
+						resourceNameToFileExtMap[k] = v.format_extension
+					}
+					resourceNameToIsFilesetMap![k] = v.is_fileset ?? false
+				}
+			}
+		} catch (e) {
+			console.error('Error loading resourceNameToFileExtMap', e)
+		} finally {
+			loadingResourceNameToFileExt = false
 		}
-
-		return resourceNameToFileExtMap[resourceName]
 	}

+	function resourceNameToFileExt(resourceName: string): string | undefined {
+		return resourceNameToFileExtMap?.[resourceName]
+	}
+
+	function resourceNameIsFileset(resourceName: string): boolean {
+		return resourceNameToIsFilesetMap?.[resourceName] ?? false
+	}
+
+	// Eagerly load the map
+	loadResourceNameToFileExtMap()
+
 	// Current resources based on tab
 	let currentResources = $derived(
-		tab == 'cache' ? cacheResources : tab == 'states' ? stateResources : resources
+		tab == 'cache'
+			? cacheResources
+			: tab == 'states'
+				? stateResources
+				: tab == 'theme'
+					? themeResources
+					: resources
 	)

 	// Filter resources client-side for user folder filtering (admin feature)
@@ -480,8 +524,10 @@
 		filters.val
 		if ($workspaceStore) {
 			untrack(() => {
-				if (tab === 'workspace' || tab === 'theme') {
+				if (tab === 'workspace') {
 					loadResources()
+				} else if (tab === 'theme') {
+					loadTheme()
 				} else if (tab === 'cache') {
 					loadCache()
 				} else if (tab === 'states') {
@@ -560,6 +606,7 @@
 				><IconedResourceType
 					name={resourceTypeViewerObj.rt}
 					formatExtension={resourceTypeViewerObj.formatExtension}
+					isFileset={resourceTypeViewerObj.isFileset}
 				/></h1
 			>
 			{#if resourceTypeViewerObj.description}
@@ -567,7 +614,12 @@
 					<GfmMarkdown md={resourceTypeViewerObj.description ?? ''} />
 				</div>
 			{/if}
-			{#if resourceTypeViewerObj.formatExtension}
+			{#if resourceTypeViewerObj.isFileset}
+				<Alert type="info" title="Fileset resource type">
+					This resource type represents a collection of files. Each file is identified by its
+					relative path and contains text content. In the CLI, filesets are stored as directories.
+				</Alert>
+			{:else if resourceTypeViewerObj.formatExtension}
 				<Alert
 					type="info"
 					title="Plain text file resource (.{resourceTypeViewerObj.formatExtension})"
@@ -619,7 +671,11 @@
 				></textarea></label
 			>
 			<div>
-				{#if editResourceType.formatExtension}
+				{#if editResourceType.isFileset}
+					<Alert type="info" title="Fileset resource type">
+						This resource type represents a collection of files. The schema cannot be edited.
+					</Alert>
+				{:else if editResourceType.formatExtension}
 					<Alert type="info" title="Plain text file resource (.{editResourceType.formatExtension})">
 						This resource type represents a plain text file with a <b
 							>.{editResourceType.formatExtension}</b
@@ -721,6 +777,7 @@
 					<EditableSchemaWrapper
 						bind:schema={newResourceType.schema}
 						bind:formatExtension={newResourceType.formatExtension}
+						bind:isFileset={newResourceType.isFileset}
 						fullHeight
 					/>
 				</div>
@@ -895,7 +952,8 @@
 															//@ts-ignore
 															schema: linkedRt.schema,
 															description: linkedRt.description ?? '',
-															formatExtension: linkedRt.format_extension
+															formatExtension: linkedRt.format_extension,
+															isFileset: linkedRt.is_fileset ?? false
 														}
 														resourceTypeViewer?.openDrawer?.()
 													} else {
@@ -910,6 +968,7 @@
 													name={resource_type}
 													after={true}
 													formatExtension={resourceNameToFileExt(resource_type)}
+													isFileset={resourceNameIsFileset(resource_type)}
 												/>
 											</a>
 										</Cell>
@@ -1096,7 +1155,7 @@
 						</Head>
 						<tbody class="divide-y bg-surface">
 							{#if resourceTypes}
-								{#each resourceTypes as { name, description, schema, canWrite, format_extension }}
+								{#each resourceTypes as { name, description, schema, canWrite, format_extension, is_fileset }}
 									<Row>
 										<Cell first>
 											<a
@@ -1107,7 +1166,8 @@
 														//@ts-ignore
 														schema: schema,
 														description: description ?? '',
-														formatExtension: format_extension
+														formatExtension: format_extension,
+														isFileset: is_fileset ?? false
 													}

 													resourceTypeViewer?.openDrawer?.()
@@ -1117,6 +1177,7 @@
 													after={true}
 													{name}
 													formatExtension={format_extension}
+													isFileset={is_fileset}
 												/>
 											</a>
 										</Cell>
				`@@ -0,0 +1 @@`
				`ALTER TABLE resource_type DROP COLUMN is_fileset;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE resource_type ADD COLUMN is_fileset BOOLEAN NOT NULL DEFAULT FALSE;`