From 5f4b4eb84542637e749725f9feff0fca646ba30d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Tue, 20 Jan 2026 19:08:15 +0000
Subject: [PATCH] fix(cli): recognize branch-specific folder files in
 getTypeStrFromPath

The function only matched `folder.meta` but not branch-specific variants
like `folder.main.meta` or `folder.dev.meta`. This caused branch-specific
folder files to be skipped during sync operations with --branch flag.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 cli/src/types.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cli/src/types.ts b/cli/src/types.ts
index bebe60be01..23c361e6e9 100644
--- a/cli/src/types.ts
+++ b/cli/src/types.ts
@@ -289,7 +289,8 @@ export function getTypeStrFromPath(
   ) {
     return "script";
   }
-  if (parsed.name === "folder.meta") {
+  // Match folder.meta (base) or folder.<branch>.meta (branch-specific)
+  if (parsed.name === "folder.meta" || /^folder\.[^.]+\.meta$/.test(parsed.name)) {
     return "folder";
   }