From ebe65a88176b8addf2dbc42e4392e74178a7cd03 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 20 Jan 2026 19:11:20 +0000 Subject: [PATCH] fix(cli): recognize branch-specific settings and encryption_key files Extends the getTypeStrFromPath function to recognize branch-specific variants of settings.yaml and encryption_key.yaml (e.g., settings.main.yaml, encryption_key.dev.yaml). Previously, only base filenames were recognized, causing branch-specific files to throw "Could not infer type of path" errors. This follows the same fix pattern applied to folder.meta files. Co-Authored-By: Claude Opus 4.5 --- cli/src/types.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cli/src/types.ts b/cli/src/types.ts index 23c361e6e9..504a0986f4 100644 --- a/cli/src/types.ts +++ b/cli/src/types.ts @@ -293,6 +293,14 @@ export function getTypeStrFromPath( if (parsed.name === "folder.meta" || /^folder\.[^.]+\.meta$/.test(parsed.name)) { return "folder"; } + // Match settings (base) or settings. (branch-specific) + if (parsed.name === "settings" || /^settings\.[^.]+$/.test(parsed.name)) { + return "settings"; + } + // Match encryption_key (base) or encryption_key. (branch-specific) + if (parsed.name === "encryption_key" || /^encryption_key\.[^.]+$/.test(parsed.name)) { + return "encryption_key"; + } const typeEnding = parsed.name.split(".").at(-1); if (