Merge main into feat/cli-branch-override (folder support)

Folders can now be configured as branch-specific items in wmill.yaml:

```yaml
gitBranches:
  staging:
    specificItems:
      folders:
        - "f/env_*"
        - "u/admin/config"
```

This allows different folder configurations per branch. A folder like
`f/env_staging/folder.meta.yaml` becomes `f/env_staging.main/folder.meta.yaml`
on the main branch.

Changes:
- Add `folders?: string[]` to SpecificItemsConfig
- Add folder detection in isSpecificItem()
- Add folder pattern to toBranchSpecificPath/fromBranchSpecificPath
- Add folder pattern to isBranchSpecificFile/isCurrentBranchFile
- Add 8 new tests for folder functionality

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

cli/src/commands/script/script.ts

@@ -314,8 +314,7 @@ export async function handleFile(
             continue;
           }
           log.info(`Adding file: ${file.path.substring(1)}`);
-          // deno-lint-ignore no-explicit-any
-          const fil = new File([file.contents as any], file.path.substring(1));
+          const fil = new File([file.contents as BlobPart], file.path.substring(1));
           tarball.append(fil);
         }
         const endTime = performance.now();
@@ -542,8 +541,8 @@ async function streamToBlob(stream: ReadableStream<Uint8Array>): Promise<Blob> {
     chunks.push(value);
   }
 
-  // deno-lint-ignore no-explicit-any
-  const blob = new Blob(chunks as any);
+  // Create a Blob from the chunks
+  const blob = new Blob(chunks as BlobPart[]);
   return blob;
 }
 

cli/src/core/specific_items.ts

@@ -8,6 +8,7 @@ export interface SpecificItemsConfig {
   variables?: string[];
   resources?: string[];
   triggers?: string[];
+  folders?: string[];
 }
 
 // Define all branch-specific file types (computed lazily)
@@ -15,6 +16,7 @@ function getBranchSpecificTypes() {
   return {
     variable: '.variable.yaml',
     resource: '.resource.yaml',
+    folder: '/folder.meta.yaml',
     // Generate trigger patterns from the list
     ...Object.fromEntries(
       TRIGGER_TYPES.map(t => [`${t}_trigger`, `.${t}_trigger.yaml`])
@@ -142,6 +144,16 @@ export function isSpecificItem(path: string, specificItems: SpecificItemsConfig
     return specificItems.triggers ? matchesPatterns(path, specificItems.triggers) : false;
   }
 
+  // Check for folder meta files
+  if (path.endsWith('/folder.meta.yaml')) {
+    if (specificItems.folders) {
+      // Match against the folder path (without /folder.meta.yaml)
+      const folderPath = path.slice(0, -'/folder.meta.yaml'.length);
+      return matchesPatterns(folderPath, specificItems.folders);
+    }
+    return false;
+  }
+
   // Check for resource files using the standard detection function
   if (isFileResource(path)) {
     // Extract the base path without the file extension to match against patterns
@@ -197,7 +209,20 @@ export function fromBranchSpecificPath(branchSpecificPath: string, branchName: s
   const sanitizedBranchName = branchName.replace(/[\/\\:*?"<>|.]/g, '_');
   const escapedBranchName = sanitizedBranchName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 
-  // Check for resource file pattern first
+  // Check for folder pattern: path.branchName/folder.meta.yaml -> path/folder.meta.yaml
+  const folderPattern = new RegExp(`\\.${escapedBranchName}(/folder\\.meta\\.yaml)$`);
+  const folderMatch = branchSpecificPath.match(folderPattern);
+
+  if (folderMatch) {
+    const extension = folderMatch[1];
+    const pathWithoutBranchAndExtension = branchSpecificPath.substring(
+      0,
+      branchSpecificPath.length - `.${sanitizedBranchName}${extension}`.length
+    );
+    return `${pathWithoutBranchAndExtension}${extension}`;
+  }
+
+  // Check for resource file pattern
   const resourceFilePattern = new RegExp(`\\.${escapedBranchName}(\\.resource\\.file\\..+)$`);
   const resourceFileMatch = branchSpecificPath.match(resourceFilePattern);
 
@@ -283,7 +308,11 @@ export function isCurrentBranchFile(path: string, branchOverride?: string): bool
   // Use cached pattern or create and cache new one
   let pattern = branchPatternCache.get(currentBranch);
   if (!pattern) {
-    pattern = new RegExp(`\\.${escapedBranchName}\\.${buildYamlTypePattern()}\\.yaml$|\\.${escapedBranchName}\\.resource\\.file\\..+$`);
+    pattern = new RegExp(
+      `\\.${escapedBranchName}\\.${buildYamlTypePattern()}\\.yaml$|` +
+      `\\.${escapedBranchName}\\.resource\\.file\\..+$|` +
+      `\\.${escapedBranchName}/folder\\.meta\\.yaml$`
+    );
     branchPatternCache.set(currentBranch, pattern);
   }
 
@@ -296,5 +325,9 @@ export function isCurrentBranchFile(path: string, branchOverride?: string): bool
  */
 export function isBranchSpecificFile(path: string): boolean {
   const yamlTypePattern = buildYamlTypePattern();
-  return new RegExp(`\\.[^.]+\\.${yamlTypePattern}\\.yaml$|\\.[^.]+\\.resource\\.file\\..+$`).test(path);
+  return new RegExp(
+    `\\.[^.]+\\.${yamlTypePattern}\\.yaml$|` +
+    `\\.[^.]+\\.resource\\.file\\..+$|` +
+    `\\.[^.]+/folder\\.meta\\.yaml$`
+  ).test(path);
 }

cli/test/specific_items.test.ts

@@ -336,3 +336,56 @@ Deno.test("branchOverride: getSpecificItemsForCurrentBranch merges common and br
   assertEquals(result?.resources, ["shared/**"]);
   assertEquals(result?.triggers, ["dev/triggers/**"]);
 });
+
+// =============================================================================
+// FOLDER BRANCH-SPECIFIC TESTS
+// =============================================================================
+
+Deno.test("toBranchSpecificPath: converts folder path to branch-specific", () => {
+  const result = toBranchSpecificPath("f/my_folder/folder.meta.yaml", "main");
+  assertEquals(result, "f/my_folder.main/folder.meta.yaml");
+});
+
+Deno.test("toBranchSpecificPath: converts nested folder path to branch-specific", () => {
+  const result = toBranchSpecificPath("f/parent/child/folder.meta.yaml", "develop");
+  assertEquals(result, "f/parent/child.develop/folder.meta.yaml");
+});
+
+Deno.test("fromBranchSpecificPath: converts branch-specific folder back to base", () => {
+  const result = fromBranchSpecificPath("f/my_folder.main/folder.meta.yaml", "main");
+  assertEquals(result, "f/my_folder/folder.meta.yaml");
+});
+
+Deno.test("fromBranchSpecificPath: handles sanitized branch names for folders", () => {
+  const result = fromBranchSpecificPath("f/my_folder.feature_test/folder.meta.yaml", "feature/test");
+  assertEquals(result, "f/my_folder/folder.meta.yaml");
+});
+
+Deno.test("isSpecificItem: matches folder paths with glob pattern", () => {
+  const config: SpecificItemsConfig = {
+    folders: ["f/env_*"],
+  };
+  assertEquals(isSpecificItem("f/env_staging/folder.meta.yaml", config), true);
+  assertEquals(isSpecificItem("f/env_production/folder.meta.yaml", config), true);
+  assertEquals(isSpecificItem("f/other/folder.meta.yaml", config), false);
+});
+
+Deno.test("isBranchSpecificFile: detects branch-specific folder files", () => {
+  assertEquals(isBranchSpecificFile("f/my_folder.main/folder.meta.yaml"), true);
+  assertEquals(isBranchSpecificFile("f/my_folder.develop/folder.meta.yaml"), true);
+  assertEquals(isBranchSpecificFile("f/my_folder/folder.meta.yaml"), false);
+});
+
+Deno.test("isCurrentBranchFile: detects branch-specific folder for current branch", () => {
+  assertEquals(isCurrentBranchFile("f/my_folder.staging/folder.meta.yaml", "staging"), true);
+  assertEquals(isCurrentBranchFile("f/my_folder.staging/folder.meta.yaml", "production"), false);
+  assertEquals(isCurrentBranchFile("f/my_folder/folder.meta.yaml", "staging"), false);
+});
+
+Deno.test("round-trip: folder path conversion", () => {
+  const original = "f/configs/env_folder/folder.meta.yaml";
+  const branch = "feature/new-env";
+  const branchSpecific = toBranchSpecificPath(original, branch);
+  const restored = fromBranchSpecificPath(branchSpecific, branch);
+  assertEquals(restored, original);
+});