The previous logic incorrectly skipped branch-specific files when:
- specificItems was configured but didn't include the item type
- e.g., folders: ["f/**"] in config, but a folder.dev.meta.yaml file
would be skipped because isSpecificItem returned false
New logic with isItemTypeConfigured:
- If item type is NOT configured in specificItems -> process normally
- If item type IS configured but doesn't match pattern -> skip
- If item type IS configured and matches pattern -> process
Added tests for:
- isItemTypeConfigured function
- Filtering behavior with different config combinations
- getSpecificItemsForCurrentBranch with branch override
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Branch-specific files (folder.dev.meta.yaml, settings.main.yaml, etc.)
should ALWAYS be skipped if:
1. Not on any git branch
2. On a different branch than the file's branch name
Previously, this filtering only happened when specificItems was configured.
Now it applies unconditionally based on the file naming convention.
Also refactored the path mapping logic to be clearer:
- Branch-specific files for current branch -> map to base path
- Regular base files -> add to map (unless it's a specific item)
- Branch-specific files for other branches -> filtered out earlier
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
When a file (folder.meta.yaml, settings.yaml, etc.) is configured as
a branch-specific item, the base file should be skipped and only the
branch-specific version (folder.branchName.meta.yaml) should be used.
Previously, base files were only skipped if a branch-specific version
was already processed, but they should always be skipped for specific
items regardless of processing order.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
- Add settings.yaml as a branch-specific item (settings: true in config)
- settings.yaml -> settings.branchName.yaml conversion
- Skip "Create empty branch configuration" prompt when using --branch flag
- User explicitly specifies branch, so skip validation prompts
- Add folders and settings fields to gitBranches type definitions
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* fix(cli): prevent duplicate 'Using non-dotted paths' log message
Add a flag to track whether the message has already been logged,
so it only prints once even if setNonDottedPaths is called multiple times.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* feat(cli): add --branch option to sync pull/push commands
Add a --branch argument that allows overriding the current git branch
for sync operations. This enables:
- Using branch-specific settings even when not in a git repository
- Overriding the detected git branch when needed
The branch override is applied to:
- getEffectiveSettings() for branch-specific config overrides
- getSpecificItemsForCurrentBranch() for branch-specific items
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* fix(cli): correct log message for workspace fork branches
Use rawGitBranch instead of currentBranch in the log message when
showing the origin of a workspace fork branch.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* feat(cli): extend --branch support to specificItems functionality
Update getBranchSpecificPath and isCurrentBranchFile to accept optional
branchOverride parameter. This ensures that branch-specific file handling
(for variables, resources, triggers) works correctly with --branch flag.
Updated functions:
- getBranchSpecificPath(): now accepts branchOverride
- isCurrentBranchFile(): now accepts branchOverride
- elementsToMap(): now accepts branchOverride
- compareDynFSElement(): now accepts branchOverride
- prettyChanges(): now accepts branchOverride
All call sites updated to pass opts.branch through the call chain.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* fix(cli): resolve TypeScript type errors
- Fix Timeout type in dev.ts using ReturnType<typeof setTimeout>
- Add proper type casts for unknown error types
- Cast FlowModule to any to resolve generated type mismatch
- Cast Uint8Array to BlobPart for Blob constructor compatibility
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* test(cli): add unit tests for branch detection and --branch override
- Add specific_items.test.ts with 35 tests covering:
- toBranchSpecificPath and fromBranchSpecificPath conversions
- isSpecificItem pattern matching
- isBranchSpecificFile detection
- Round-trip path conversions
- branchOverride parameter functionality
- Add conf_branch_override.test.ts with 6 tests covering:
- getEffectiveSettings with branchOverride parameter
- Branch-specific overrides application
- promotionOverrides precedence
- Fallback to top-level settings
- Fix containerized_backend.ts to use dynamic paths instead of
hardcoded user home directories
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* chore(cli): add conf.ts barrel file for test imports
Re-exports from src/core/conf.ts to support existing test imports.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* all
* fix(cli): pass --branch override to workspace resolution
Previously, the --branch flag was only used for config resolution but
not for workspace resolution. This caused confusing log messages that
showed the git branch (e.g., master) before showing the override branch.
Changes:
- Add branchOverride parameter to tryResolveBranchWorkspace()
- Add branchOverride parameter to resolveWorkspace()
- Pass opts.branch from sync pull/push to resolveWorkspace()
- Log "Using branch override" early in workspace resolution
- Remove duplicate log from getEffectiveSettings()
Now when using --branch foobar, the logs show:
Using branch override: foobar
Applied settings for Git branch: foobar
...
Instead of the confusing previous output that mentioned both master
and foobar.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
* refactor(cli): remove redundant branch detection in elementsToMap
isCurrentBranchFile() already validates that a branch exists (via
branchOverride or git detection) before returning true. No need to
pre-compute currentBranch before calling it.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
* cli file resource specific items
* improvement
* resource command + correct order of context
* no dynamic imports
* support trigger types for branch specific items
* also update trigger cli function to be branch aware
* hubscript path
* feat(cli): add better error handling with path logging for JSON parsing failures
- Add try-catch blocks with path logging for all JSON.parse operations in ZipFSElement
- Log specific file paths for flow.yaml, app.yaml, script.yaml, and resource.yaml parsing failures
- Improve debugging experience by showing which file caused parse errors before re-throwing
- Addresses feedback in issue #6369 for better error handling in CLI sync command
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
* feat(cli): extend error handling to cover extractInlineScripts and additional parsing operations
- Add try-catch blocks around extractInlineScriptsForFlows and extractInlineScriptsForApps calls
- Add error handling for yamlStringify operations in flow, app, script, and resource processing
- Add error handling for yamlParseContent operations in multiple locations
- Add error handling for JSON.parse operations in comparison logic
- All error handlers log the specific file path that caused the failure for better debugging
Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com>
* refactor(cli): remove unnecessary try-catch blocks around yamlStringify calls
yamlStringify operations cannot fail so the try-catch blocks were
unnecessary. Kept the essential error handling for operations that
can actually fail like extractInlineScripts, JSON.parse, and yamlParseContent.
Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com>
---------
Co-authored-by: claude[bot] <209825114+claude[bot]@users.noreply.github.com>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
Co-authored-by: Ruben Fiszel <rubenfiszel@users.noreply.github.com>
Ruben Fiszel
centdix
Pyra
Alexander Petric
hugocasa
claude[bot]