{#key selectedJob}
@@ -679,6 +682,7 @@
workspaceId={selectedJob?.workspace_id}
jobId={selectedJob?.id}
result={selectedJob?.result}
+ result_stream={selectedJob?.result_stream}
externalToolbarAvailable
fixTableSizingToParent
on:toolbar-location-changed={({ detail }) => {
diff --git a/frontend/src/lib/components/runs/JobPreview.svelte b/frontend/src/lib/components/runs/JobPreview.svelte
index 0368235feb..a35d90dedf 100644
--- a/frontend/src/lib/components/runs/JobPreview.svelte
+++ b/frontend/src/lib/components/runs/JobPreview.svelte
@@ -28,7 +28,7 @@
let { id, blankLink = false, workspace }: Props = $props()
- let job: Job | undefined = $state(undefined)
+ let job: (Job & { result_stream?: string }) | undefined = $state(undefined)
let result: any = $state()
@@ -82,7 +82,7 @@
let jobLoader: JobLoader | undefined = $state(undefined)
-
{#if job}
@@ -239,7 +239,7 @@
{:else}
{/if}
- {:else if job !== undefined && 'result' in job && job.result !== undefined}
+ {:else if job !== undefined && (job.result_stream || (job.type == 'CompletedJob' && job.result !== undefined))}
{:else if drawerContent?.mode === 'plain'}
-
Logs & Result
@@ -151,7 +151,7 @@
{@render children?.()}
- {#if previewJob != undefined && 'result' in previewJob}
+ {#if previewJob != undefined && (previewJob.result_stream || previewJob.result)}
{#snippet copilot_fix()}
diff --git a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
index 659c0ee5a7..dce8353dab 100644
--- a/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/run/[...run]/+page.svelte
@@ -68,7 +68,7 @@
import JobArgs from '$lib/components/JobArgs.svelte'
import FlowProgressBar from '$lib/components/flows/FlowProgressBar.svelte'
import JobProgressBar from '$lib/components/jobs/JobProgressBar.svelte'
- import Tabs from '$lib/components/common/tabs/Tabs.svelte'
+ import Tabs from '$lib/components/common/tabs/TabsV2.svelte'
import Badge from '$lib/components/common/badge/Badge.svelte'
import { goto } from '$lib/navigation'
import { sendUserToast } from '$lib/toast'
@@ -97,7 +97,7 @@
} from '$lib/components/flows/FlowAssetsHandler.svelte'
import JobAssetsViewer from '$lib/components/assets/JobAssetsViewer.svelte'
- let job: Job | undefined = $state()
+ let job: (Job & { result?: any; result_stream?: string }) | undefined = $state()
let jobUpdateLastFetch: Date | undefined = $state()
let scriptProgress: number | undefined = $state(undefined)
@@ -123,6 +123,8 @@
let lastJobId: string | undefined = $state(undefined)
let concurrencyKey: string | undefined = $state(undefined)
+ let manuallySetLogs: boolean = $state(false)
+
setContext(
'FlowGraphAssetContext',
initFlowGraphAssetsCtx({ getModules: () => job?.raw_flow?.modules ?? [] })
@@ -173,7 +175,7 @@
// If we get results, focus on that tab. Else, focus on logs
function initView(): void {
- if (job && 'result' in job && job.result != undefined) {
+ if (job && (job.result || job.result_stream)) {
viewTab = 'result'
} else if (viewTab == 'result') {
viewTab = 'logs'
@@ -182,6 +184,11 @@
async function getJob() {
await jobLoader?.watchJob($page.params.run, {
+ change(job: Job & { result_stream?: string }) {
+ if (!manuallySetLogs && viewTab == 'logs' && job.result_stream) {
+ viewTab = 'result'
+ }
+ },
done(job) {
if (job?.['result'] != undefined) {
viewTab = 'result'
@@ -366,13 +373,7 @@
runImmediatelyLoading = false
}
}
- $effect(() => {
- job?.logs == undefined &&
- job &&
- viewTab == 'logs' &&
- isNotFlow(job?.job_kind) &&
- jobLoader?.getLogs()
- })
+
$effect(() => {
job?.id && lastJobId !== job.id && untrack(() => getConcurrencyKey(job))
})
@@ -427,7 +428,6 @@
{/if}
{#if !job || (job?.job_kind != 'flow' && job?.job_kind != 'flownode' && job?.job_kind != 'flowpreview')}
-
+ {
+ manuallySetLogs = value == 'logs'
+ }}
+ >
Result
Logs
Metrics
@@ -975,9 +980,10 @@
- {:else if job !== undefined && 'result' in job && job.result !== undefined}
+ {:else if job !== undefined && (job.result || job.result_stream)}
Optional[str]:
if s.startswith("var://"):
return s[6:]
return None
+
+
+def append_to_result_stream(text: str) -> None:
+ """Append a text to the result stream.
+
+ Args:
+ text: text to append to the result stream
+ """
+ print(f"WM_STREAM: {text.replace(chr(10), '\\n')}")
+
+
+def stream_result(stream) -> None:
+ """Stream to the result stream.
+
+ Args:
+ stream: stream to stream to the result stream
+ """
+ for text in stream:
+ append_to_result_stream(text)
diff --git a/typescript-client/build.jsr.sh b/typescript-client/build.jsr.sh
index b08b1c894e..26fcd52ffe 100755
--- a/typescript-client/build.jsr.sh
+++ b/typescript-client/build.jsr.sh
@@ -14,6 +14,6 @@ cp "${script_dirpath}/s3Types.ts" "${script_dirpath}/src/"
echo "" >> "${script_dirpath}/src/index.ts"
echo 'export type { S3Object, DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult } from "./client";' >> "${script_dirpath}/src/index.ts"
diff --git a/typescript-client/build.sh b/typescript-client/build.sh
index bb6be9338c..c17fb2a8c9 100755
--- a/typescript-client/build.sh
+++ b/typescript-client/build.sh
@@ -39,4 +39,4 @@ cp "${script_dirpath}/s3Types.ts" "${script_dirpath}/src/"
echo "" >> "${script_dirpath}/src/index.ts"
echo 'export type { S3Object, DenoS3LightClientSettings } from "./s3Types";' >> "${script_dirpath}/src/index.ts"
echo "" >> "${script_dirpath}/src/index.ts"
-echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval } from "./client";' >> "${script_dirpath}/src/index.ts"
+echo 'export { type Base64, setClient, getVariable, setVariable, getResource, setResource, getResumeUrls, setState, setProgress, getProgress, getState, getIdToken, denoS3LightClientSettings, loadS3FileStream, loadS3File, writeS3File, signS3Objects, signS3Object, task, runScript, runScriptAsync, runScriptByPath, runScriptByHash, runScriptByPathAsync, runScriptByHashAsync, runFlow, runFlowAsync, waitJob, getRootJobId, setFlowUserState, getFlowUserState, usernameToEmail, requestInteractiveSlackApproval, Sql, requestInteractiveTeamsApproval, appendToResultStream, streamResult } from "./client";' >> "${script_dirpath}/src/index.ts"
diff --git a/typescript-client/client.ts b/typescript-client/client.ts
index 9ac146a64d..8ad2cd92f7 100644
--- a/typescript-client/client.ts
+++ b/typescript-client/client.ts
@@ -181,6 +181,28 @@ export async function runScriptByHash(
return _runScriptInternal(null, hash_, args, verbose);
}
+/**
+ * Append a text to the result stream
+ * @param text text to append to the result stream
+ */
+export function appendToResultStream(
+ text: string
+) {
+ console.log("WM_STREAM: " + text.replaceAll("\n", "\\n"));
+}
+
+/**
+ * Stream to the result stream
+ * @param stream stream to stream to the result stream
+ */
+export async function streamResult(
+ stream: AsyncIterable
+) {
+ for await (const text of stream) {
+ appendToResultStream(text);
+ }
+}
+
export async function runFlow(
path: string | null = null,
args: Record | null = null,
@@ -328,7 +350,7 @@ async function _runScriptAsyncInternal(
} else {
throw new Error("path or hash_ must be provided");
}
-
+
let url = new URL(OpenAPI.BASE + endpoint);
url.search = new URLSearchParams(params).toString();
@@ -793,8 +815,7 @@ export async function loadS3FileStream(
// We use raw fetch here b/c OpenAPI generated client doesn't handle Blobs nicely
const response = await fetch(
- `${
- OpenAPI.BASE
+ `${OpenAPI.BASE
}/w/${getWorkspace()}/job_helpers/download_s3_file?${queryParams}`,
{
method: "GET",
From 7102bd34f0a2cf96a637c5d65ba44b00cc16707e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel
Date: Wed, 6 Aug 2025 23:02:44 +0000
Subject: [PATCH 004/106] nit
---
typescript-client/client.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/typescript-client/client.ts b/typescript-client/client.ts
index 8ad2cd92f7..93fc66669d 100644
--- a/typescript-client/client.ts
+++ b/typescript-client/client.ts
@@ -188,7 +188,7 @@ export async function runScriptByHash(
export function appendToResultStream(
text: string
) {
- console.log("WM_STREAM: " + text.replaceAll("\n", "\\n"));
+ console.log("WM_STREAM: " + text.replace(/\n/g, "\\n"));
}
/**
From cb649b26893d8829aae0ed8cdf896607a3331804 Mon Sep 17 00:00:00 2001
From: Alexander Petric
Date: Wed, 6 Aug 2025 19:03:03 -0400
Subject: [PATCH 005/106] feat: git sync v2 + cli git_branches support (#6327)
* adding branch support
* gitsync settings refactor
* promotionOverride
* require branches and initialize them
* branches -> git_branches
* profiles
* format
* format
* only warn instead of error when branches: not set in git context
* error handling
* formatting
* modal job handling improvement
* respect --yes
* logging + apply effective settings
* nit
* ui updates
* npm check
* Update frontend/src/lib/components/git_sync/PullWorkspaceModal.svelte
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
* hubpaths
---------
Co-authored-by: ellipsis-dev[bot] <65095814+ellipsis-dev[bot]@users.noreply.github.com>
---
.../commands/gitsync-settings/converter.ts | 135 ++
.../gitsync-settings/gitsync-settings.ts | 1355 +----------------
cli/src/commands/gitsync-settings/index.ts | 60 +
.../gitsync-settings/legacySettings.ts | 144 ++
cli/src/commands/gitsync-settings/pull.ts | 492 ++++++
cli/src/commands/gitsync-settings/push.ts | 361 +++++
cli/src/commands/gitsync-settings/types.ts | 63 +
cli/src/commands/gitsync-settings/utils.ts | 188 +++
cli/src/commands/init/init.ts | 130 +-
cli/src/commands/sync/sync.ts | 135 +-
cli/src/commands/workspace/workspace.ts | 113 +-
cli/src/core/branch-profiles.ts | 74 +
cli/src/core/conf.ts | 181 ++-
cli/src/core/context.ts | 247 ++-
cli/src/main.ts | 10 +-
cli/src/utils/git.ts | 29 +
.../components/git_sync/DetectionFlow.svelte | 91 +-
.../git_sync/GitSyncContext.svelte.ts | 9 +-
.../git_sync/GitSyncRepositoryCard.svelte | 39 +-
.../git_sync/PullWorkspaceModal.svelte | 103 +-
.../GitSyncFilterSettings.svelte | 27 +-
frontend/src/lib/hubPaths.json | 5 +-
22 files changed, 2336 insertions(+), 1655 deletions(-)
create mode 100644 cli/src/commands/gitsync-settings/converter.ts
create mode 100644 cli/src/commands/gitsync-settings/index.ts
create mode 100644 cli/src/commands/gitsync-settings/legacySettings.ts
create mode 100644 cli/src/commands/gitsync-settings/pull.ts
create mode 100644 cli/src/commands/gitsync-settings/push.ts
create mode 100644 cli/src/commands/gitsync-settings/types.ts
create mode 100644 cli/src/commands/gitsync-settings/utils.ts
create mode 100644 cli/src/core/branch-profiles.ts
create mode 100644 cli/src/utils/git.ts
diff --git a/cli/src/commands/gitsync-settings/converter.ts b/cli/src/commands/gitsync-settings/converter.ts
new file mode 100644
index 0000000000..89600fd5d1
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/converter.ts
@@ -0,0 +1,135 @@
+import { SyncOptions } from "../../core/conf.ts";
+import { BackendGitSyncSettings, GIT_SYNC_FIELDS, INCLUDE_TYPE_MAPPINGS } from "./types.ts";
+
+// Helper to compare string arrays (used for includes/excludes/extraIncludes)
+function arraysEqual(arr1: string[], arr2: string[]): boolean {
+ if (arr1.length !== arr2.length) {
+ return false;
+ }
+ const sorted1 = [...arr1].sort();
+ const sorted2 = [...arr2].sort();
+ return sorted1.every((item, index) => item === sorted2[index]);
+}
+
+export class GitSyncSettingsConverter {
+ // Convert backend include_type array to SyncOptions boolean flags
+ static fromBackendFormat(settings: BackendGitSyncSettings): SyncOptions {
+ const includeTypes = settings.include_type || [];
+
+ const result: SyncOptions = {
+ includes: settings.include_path || [],
+ excludes: settings.exclude_path || [],
+ skipScripts: !includeTypes.includes("script"),
+ skipFlows: !includeTypes.includes("flow"),
+ skipApps: !includeTypes.includes("app"),
+ skipFolders: !includeTypes.includes("folder"),
+ skipVariables: !includeTypes.includes("variable"),
+ skipResources: !includeTypes.includes("resource"),
+ skipResourceTypes: !includeTypes.includes("resourcetype"),
+ skipSecrets: !includeTypes.includes("secret"),
+ includeSchedules: includeTypes.includes("schedule"),
+ includeTriggers: includeTypes.includes("trigger"),
+ includeUsers: includeTypes.includes("user"),
+ includeGroups: includeTypes.includes("group"),
+ includeSettings: includeTypes.includes("settings"),
+ includeKey: includeTypes.includes("key"),
+ };
+
+ // Only include extraIncludes if it has content
+ if (settings.extra_include_path && settings.extra_include_path.length > 0) {
+ result.extraIncludes = settings.extra_include_path;
+ }
+
+ return result;
+ }
+
+ // Convert SyncOptions boolean flags to backend include_type array
+ static toBackendFormat(opts: SyncOptions): BackendGitSyncSettings {
+ const includeTypes: string[] = [];
+
+ if (!opts.skipScripts) includeTypes.push("script");
+ if (!opts.skipFlows) includeTypes.push("flow");
+ if (!opts.skipApps) includeTypes.push("app");
+ if (!opts.skipFolders) includeTypes.push("folder");
+ if (!opts.skipVariables) includeTypes.push("variable");
+ if (!opts.skipResources) includeTypes.push("resource");
+ if (!opts.skipResourceTypes) includeTypes.push("resourcetype");
+ if (!opts.skipSecrets) includeTypes.push("secret");
+ if (opts.includeSchedules) includeTypes.push("schedule");
+ if (opts.includeTriggers) includeTypes.push("trigger");
+ if (opts.includeUsers) includeTypes.push("user");
+ if (opts.includeGroups) includeTypes.push("group");
+ if (opts.includeSettings) includeTypes.push("settings");
+ if (opts.includeKey) includeTypes.push("key");
+
+ const result: BackendGitSyncSettings = {
+ include_path: opts.includes || [],
+ include_type: includeTypes,
+ };
+
+ // Only include optional arrays if they have content
+ if (opts.excludes && opts.excludes.length > 0) {
+ result.exclude_path = opts.excludes;
+ }
+ if (opts.extraIncludes && opts.extraIncludes.length > 0) {
+ result.extra_include_path = opts.extraIncludes;
+ }
+
+ return result;
+ }
+
+ // Normalize SyncOptions for semantic comparison - treat undefined values as their defaults
+ static normalize(opts: SyncOptions): SyncOptions {
+ return {
+ ...opts,
+ includes: opts.includes || [],
+ excludes: opts.excludes || [],
+ extraIncludes: opts.extraIncludes || [],
+ skipVariables: opts.skipVariables ?? false,
+ skipResources: opts.skipResources ?? false,
+ skipResourceTypes: opts.skipResourceTypes ?? false,
+ skipSecrets: opts.skipSecrets ?? true,
+ skipScripts: opts.skipScripts ?? false,
+ skipFlows: opts.skipFlows ?? false,
+ skipApps: opts.skipApps ?? false,
+ skipFolders: opts.skipFolders ?? false,
+ includeSchedules: opts.includeSchedules ?? false,
+ includeTriggers: opts.includeTriggers ?? false,
+ includeUsers: opts.includeUsers ?? false,
+ includeGroups: opts.includeGroups ?? false,
+ includeSettings: opts.includeSettings ?? false,
+ includeKey: opts.includeKey ?? false,
+ };
+ }
+
+ // Extract only git-sync relevant fields for comparison
+ static extractGitSyncFields(opts: SyncOptions): Partial {
+ return {
+ includes: opts.includes || [],
+ excludes: opts.excludes || [],
+ extraIncludes: opts.extraIncludes || [],
+ skipScripts: opts.skipScripts,
+ skipFlows: opts.skipFlows,
+ skipApps: opts.skipApps,
+ skipFolders: opts.skipFolders,
+ skipVariables: opts.skipVariables,
+ skipResources: opts.skipResources,
+ skipResourceTypes: opts.skipResourceTypes,
+ skipSecrets: opts.skipSecrets,
+ includeSchedules: opts.includeSchedules,
+ includeTriggers: opts.includeTriggers,
+ includeUsers: opts.includeUsers,
+ includeGroups: opts.includeGroups,
+ includeSettings: opts.includeSettings,
+ includeKey: opts.includeKey,
+ };
+ }
+
+ // Check if two values are different, with special handling for arrays
+ static isDifferent(value1: any, value2: any): boolean {
+ if (Array.isArray(value1) && Array.isArray(value2)) {
+ return !arraysEqual(value1 as string[], value2 as string[]);
+ }
+ return value1 !== value2;
+ }
+}
diff --git a/cli/src/commands/gitsync-settings/gitsync-settings.ts b/cli/src/commands/gitsync-settings/gitsync-settings.ts
index 858bcc3498..5eb3e0dc85 100644
--- a/cli/src/commands/gitsync-settings/gitsync-settings.ts
+++ b/cli/src/commands/gitsync-settings/gitsync-settings.ts
@@ -1,1353 +1,2 @@
-import { colors, Command, Confirm, log, yamlStringify } from "../../../deps.ts";
-import { GlobalOptions } from "../../types.ts";
-import { requireLogin } from "../../core/auth.ts";
-import { resolveWorkspace } from "../../core/context.ts";
-import * as wmill from "../../../gen/services.gen.ts";
-import {
- DEFAULT_SYNC_OPTIONS,
- getEffectiveSettings,
- readConfigFile,
- SyncOptions,
-} from "../../core/conf.ts";
-import { deepEqual, Repository, selectRepository } from "../../utils/utils.ts";
-
-// Constants for git-sync fields to avoid duplication
-const GIT_SYNC_FIELDS = [
- "includes",
- "excludes",
- "extraIncludes",
- "skipScripts",
- "skipFlows",
- "skipApps",
- "skipFolders",
- "skipVariables",
- "skipResources",
- "skipResourceTypes",
- "skipSecrets",
- "includeSchedules",
- "includeTriggers",
- "includeUsers",
- "includeGroups",
- "includeSettings",
- "includeKey",
-] as const;
-
-// Helper to normalize repository path by removing $res: prefix
-function normalizeRepoPath(path: string): string {
- return path.replace(/^\$res:/, "");
-}
-
-// Helper to get typed field value from SyncOptions
-function getFieldValue(opts: SyncOptions, field: string): any {
- return (opts as any)[field];
-}
-
-// Construct override key using the single format: baseUrl:workspaceId:repo
-function constructOverrideKey(
- baseUrl: string,
- workspaceId: string,
- repoPath: string,
- workspaceLevel = false,
-): string {
- // Validate that components don't contain colons to avoid key collisions
- if (baseUrl.includes(':') && !baseUrl.startsWith('http')) {
- throw new Error(`Invalid baseUrl contains colon: ${baseUrl}`);
- }
- if (workspaceId.includes(':')) {
- throw new Error(`Invalid workspaceId contains colon: ${workspaceId}`);
- }
- if (repoPath.includes(':') && !repoPath.startsWith('$res:')) {
- throw new Error(`Invalid repoPath contains colon: ${repoPath}`);
- }
-
- if (workspaceLevel) {
- return `${baseUrl}:${workspaceId}:*`;
- }
- return `${baseUrl}:${workspaceId}:${repoPath}`;
-}
-
-// Helper to compare string arrays (used for includes/excludes/extraIncludes)
-function arraysEqual(arr1: string[], arr2: string[]): boolean {
- if (arr1.length !== arr2.length) {
- return false;
- }
- const sorted1 = [...arr1].sort();
- const sorted2 = [...arr2].sort();
- return sorted1.every((item, index) => item === sorted2[index]);
-}
-
-// Normalize SyncOptions for semantic comparison - treat undefined arrays as empty arrays
-function normalizeSyncOptions(opts: SyncOptions): SyncOptions {
- return {
- ...opts,
- includes: opts.includes || [],
- excludes: opts.excludes || [],
- extraIncludes: opts.extraIncludes || [],
- };
-}
-
-// Extract only git-sync relevant fields for comparison
-function extractGitSyncFields(opts: SyncOptions): Partial {
- return {
- includes: opts.includes || [],
- excludes: opts.excludes || [],
- extraIncludes: opts.extraIncludes || [],
- skipScripts: opts.skipScripts,
- skipFlows: opts.skipFlows,
- skipApps: opts.skipApps,
- skipFolders: opts.skipFolders,
- skipVariables: opts.skipVariables,
- skipResources: opts.skipResources,
- skipResourceTypes: opts.skipResourceTypes,
- skipSecrets: opts.skipSecrets,
- includeSchedules: opts.includeSchedules,
- includeTriggers: opts.includeTriggers,
- includeUsers: opts.includeUsers,
- includeGroups: opts.includeGroups,
- includeSettings: opts.includeSettings,
- includeKey: opts.includeKey,
- };
-}
-
-// Helper function to determine current settings based on write mode and conflicts
-function getCurrentSettings(
- localConfig: SyncOptions,
- writeMode: "override" | "replace",
- overrideKey?: string,
-): SyncOptions {
- if (
- writeMode === "override" &&
- overrideKey &&
- localConfig.overrides?.[overrideKey]
- ) {
- return {
- ...DEFAULT_SYNC_OPTIONS,
- ...localConfig,
- ...localConfig.overrides[overrideKey],
- };
- } else {
- // For "replace" mode, exclude overrides since they're never accessed
- const { overrides, ...configWithoutOverrides } = localConfig;
- return { ...DEFAULT_SYNC_OPTIONS, ...configWithoutOverrides };
- }
-}
-
-// Interface for git-sync repository settings from backend
-interface GitSyncRepository extends Repository {
- settings: {
- include_path: string[];
- include_type: string[];
- exclude_path?: string[];
- extra_include_path?: string[];
- };
-}
-
-// Convert backend include_type array to SyncOptions boolean flags
-function includeTypeToSyncOptions(
- includeTypes: string[],
-): Partial {
- return {
- skipScripts: !includeTypes.includes("script"),
- skipFlows: !includeTypes.includes("flow"),
- skipApps: !includeTypes.includes("app"),
- skipFolders: !includeTypes.includes("folder"),
- skipVariables: !includeTypes.includes("variable"),
- skipResources: !includeTypes.includes("resource"),
- skipResourceTypes: !includeTypes.includes("resourcetype"),
- skipSecrets: !includeTypes.includes("secret"),
- includeSchedules: includeTypes.includes("schedule"),
- includeTriggers: includeTypes.includes("trigger"),
- includeUsers: includeTypes.includes("user"),
- includeGroups: includeTypes.includes("group"),
- includeSettings: includeTypes.includes("settings"),
- includeKey: includeTypes.includes("key"),
- };
-}
-
-// Shared migration function for legacy repositories
-async function handleLegacyRepositoryMigration(
- selectedRepo: any,
- gitSyncSettings: any,
- workspace: any,
- opts: { yes?: boolean },
- operationName: string = "operation"
-): Promise {
- if (selectedRepo.settings) {
- return selectedRepo; // Already migrated
- }
-
- // This repository is in legacy format - handle migration
- if (!gitSyncSettings.include_path || !gitSyncSettings.include_type) {
- throw new Error(
- `Repository "${selectedRepo.git_repo_resource_path}" has legacy format but workspace-level include_path or include_type is missing. This indicates corrupted git-sync settings.`
- );
- }
-
- const workspaceIncludePath = gitSyncSettings.include_path;
- const workspaceIncludeType = gitSyncSettings.include_type;
-
- if (Deno.stdout.isTerminal() && !opts.yes) {
- // Interactive mode - show migration prompt
- console.log(colors.yellow('\n⚠️ Legacy git-sync settings detected!'));
- console.log(`\nRepository "${selectedRepo.git_repo_resource_path}" has legacy settings format.`);
- console.log('The new format allows per-repository filter configuration.');
- if (operationName === "push") {
- console.log('This repository must be migrated before pushing settings.\n');
- } else {
- console.log('\n');
- }
-
- console.log(colors.bold('Current workspace-level settings:'));
- console.log(` Include paths: ${workspaceIncludePath.join(', ')}`);
- console.log(` Include types: ${workspaceIncludeType.join(', ')}\n`);
-
- // Show what the migration will do
- let finalIncludeType = [...workspaceIncludeType];
- if (selectedRepo.exclude_types_override && selectedRepo.exclude_types_override.length > 0) {
- const originalCount = finalIncludeType.length;
- finalIncludeType = finalIncludeType.filter(
- type => !selectedRepo.exclude_types_override.includes(type)
- );
- const excludedCount = originalCount - finalIncludeType.length;
- console.log(colors.yellow(`Repository excludes ${excludedCount} types: ${selectedRepo.exclude_types_override.join(', ')}`));
- }
-
- console.log(colors.bold('\nAfter migration, repository will have:'));
- console.log(` Include paths: ${workspaceIncludePath.join(', ')}`);
- console.log(` Include types: ${finalIncludeType.join(', ')}\n`);
-
- const confirm = await Confirm.prompt({
- message: operationName === "push"
- ? 'Do you want to migrate this repository before pushing?'
- : 'Do you want to migrate this repository?',
- default: true
- });
-
- if (!confirm) {
- const message = operationName === "push"
- ? '\n⚠️ Migration skipped. Cannot push to legacy repository.'
- : '\n⚠️ Migration skipped. You can migrate later via the UI.';
- console.log(colors.yellow(message));
- if (operationName === "push") {
- return null; // Signal to exit push operation
- }
- throw new Error('Migration cancelled by user');
- }
-
- // Perform the migration
- let migratedIncludeType = [...workspaceIncludeType];
- if (selectedRepo.exclude_types_override && selectedRepo.exclude_types_override.length > 0) {
- migratedIncludeType = migratedIncludeType.filter(
- type => !selectedRepo.exclude_types_override.includes(type)
- );
- }
-
- const migratedRepo = {
- ...selectedRepo,
- settings: {
- include_path: [...workspaceIncludePath],
- include_type: migratedIncludeType,
- exclude_path: [],
- extra_include_path: []
- }
- };
-
- // Remove the old field
- delete migratedRepo.exclude_types_override;
-
- // Update the backend with migrated repository
- const updatedRepositories = gitSyncSettings.repositories.map((repo: any) => {
- if (repo.git_repo_resource_path === selectedRepo.git_repo_resource_path) {
- return migratedRepo;
- }
- return repo;
- });
-
- await wmill.editWorkspaceGitSyncConfig({
- workspace: workspace.workspaceId,
- requestBody: {
- git_sync_settings: {
- repositories: updatedRepositories,
- // Keep workspace-level settings if other repos are still legacy
- ...(gitSyncSettings.repositories.some((r: any) => r.git_repo_resource_path !== selectedRepo.git_repo_resource_path && !r.settings) && {
- include_path: workspaceIncludePath,
- include_type: workspaceIncludeType
- })
- }
- }
- });
-
- console.log(colors.green('\n✓ Repository migration completed successfully!'));
- if (operationName === "push") {
- console.log('Now proceeding with push operation...\n');
- }
- return migratedRepo;
-
- } else {
- // Non-interactive mode - show error
- console.error(colors.red('\n❌ Legacy git-sync settings detected!'));
- console.error(`\nRepository "${selectedRepo.git_repo_resource_path}" has legacy settings format.`);
- if (operationName === "push") {
- console.error('This repository must be migrated before pushing settings.');
- }
- console.error('Please choose one of the following options:\n');
- console.error('1. Go to the Windmill UI > Workspace Settings > Git Sync');
- console.error(' Review and save this repository to migrate to the new format.\n');
- console.error('2. Run this command in interactive mode (with TTY) to migrate.');
- console.error(` Example: wmill gitsync-settings ${operationName}\n`);
- if (operationName === "push") {
- console.error('3. Pull settings first to migrate: wmill gitsync-settings pull\n');
- } else {
- console.error('3. Push local settings to override backend settings:');
- console.error(' wmill gitsync-settings push\n');
- }
- Deno.exit(1);
- }
-}
-
-// Convert SyncOptions boolean flags to backend include_type array
-function syncOptionsToIncludeType(opts: SyncOptions): string[] {
- const includeTypes: string[] = [];
-
- if (!opts.skipScripts) includeTypes.push("script");
- if (!opts.skipFlows) includeTypes.push("flow");
- if (!opts.skipApps) includeTypes.push("app");
- if (!opts.skipFolders) includeTypes.push("folder");
- if (!opts.skipVariables) includeTypes.push("variable");
- if (!opts.skipResources) includeTypes.push("resource");
- if (!opts.skipResourceTypes) includeTypes.push("resourcetype");
- if (!opts.skipSecrets) includeTypes.push("secret");
- if (opts.includeSchedules) includeTypes.push("schedule");
- if (opts.includeTriggers) includeTypes.push("trigger");
- if (opts.includeUsers) includeTypes.push("user");
- if (opts.includeGroups) includeTypes.push("group");
- if (opts.includeSettings) includeTypes.push("settings");
- if (opts.includeKey) includeTypes.push("key");
-
- return includeTypes;
-}
-
-// Convert SyncOptions to backend format used by both Windmill backend and UI
-function syncOptionsToBackendFormat(opts: SyncOptions): {
- include_path: string[];
- exclude_path: string[];
- extra_include_path: string[];
- include_type: string[];
-} {
- return {
- include_path: opts.includes || [],
- exclude_path: opts.excludes || [],
- extra_include_path: opts.extraIncludes || [],
- include_type: syncOptionsToIncludeType(opts),
- };
-}
-
-// Select repository interactively if multiple exist
-// Generate structured diff showing field changes
-function generateStructuredDiff(
- current: any,
- backend: any,
-): { [key: string]: { from: any; to: any } } {
- const diff: { [key: string]: { from: any; to: any } } = {};
-
- // Get all unique keys from both objects
- const allKeys = new Set([...Object.keys(current), ...Object.keys(backend)]);
-
- for (const key of allKeys) {
- const currentValue = current[key];
- const backendValue = backend[key];
-
- if (!deepEqual(currentValue, backendValue)) {
- diff[key] = {
- from: currentValue,
- to: backendValue,
- };
- }
- }
-
- return diff;
-}
-
-// Helper to generate changes between two normalized SyncOptions objects
-function generateChanges(
- normalizedCurrent: SyncOptions,
- normalizedNew: SyncOptions,
-): { [key: string]: { from: any; to: any } } {
- const changes: { [key: string]: { from: any; to: any } } = {};
-
- for (const field of GIT_SYNC_FIELDS) {
- const currentValue = getFieldValue(normalizedCurrent, field);
- const newValue = getFieldValue(normalizedNew, field);
- if (!deepEqual(currentValue, newValue)) {
- changes[field] = {
- from: currentValue,
- to: newValue,
- };
- }
- }
-
- return changes;
-}
-
-// Helper to display changes in human-readable format
-function displayChanges(
- changes: { [key: string]: { from: any; to: any } },
-): void {
- for (const [field, change] of Object.entries(changes)) {
- if (
- Array.isArray(change.from) ||
- Array.isArray(change.to)
- ) {
- console.log(colors.yellow(` ${field}:`));
- console.log(
- colors.red(
- ` - ${JSON.stringify(change.from)}`,
- ),
- );
- console.log(
- colors.green(
- ` + ${JSON.stringify(change.to)}`,
- ),
- );
- } else {
- console.log(
- colors.yellow(` ${field}: `) +
- colors.red(`${change.from}`) +
- " → " +
- colors.green(`${change.to}`),
- );
- }
- }
-}
-
-async function selectAndLogRepository(
- repositories: GitSyncRepository[],
- repository?: string,
-): Promise {
- let selectedRepo: GitSyncRepository;
-
- if (repository) {
- const found = repositories.find(
- (r: GitSyncRepository) =>
- r.git_repo_resource_path === repository ||
- r.git_repo_resource_path === `$res:${repository}`,
- );
- if (!found) {
- throw new Error(`Repository ${repository} not found`);
- }
- selectedRepo = found;
- const repoPath = selectedRepo.git_repo_resource_path.replace(/^\$res:/, "");
- log.info(colors.cyan(`Using repository: ${colors.bold(repoPath)}`));
- } else {
- selectedRepo = await selectRepository(repositories);
- }
-
- return selectedRepo;
-}
-
-async function pullGitSyncSettings(
- opts: GlobalOptions & {
- repository?: string;
- workspaceLevel?: boolean;
- default?: boolean;
- diff?: boolean;
- jsonOutput?: boolean;
- replace?: boolean;
- override?: boolean;
- withBackendSettings?: string;
- yes?: boolean;
- },
-) {
- const workspace = await resolveWorkspace(opts);
- await requireLogin(opts);
-
- try {
- // Parse and validate --with-backend-settings if provided
- let settings: any;
- if (opts.withBackendSettings) {
- try {
- const parsedSettings = JSON.parse(opts.withBackendSettings);
-
- // Validate the structure matches expected test format (raw settings object)
- if (
- !parsedSettings.include_path ||
- !Array.isArray(parsedSettings.include_path)
- ) {
- throw new Error(
- "Invalid settings format. Expected include_path array",
- );
- }
- if (
- !parsedSettings.include_type ||
- !Array.isArray(parsedSettings.include_type)
- ) {
- throw new Error(
- "Invalid settings format. Expected include_type array",
- );
- }
-
- // Create mock backend response with single repository using provided settings
- const mockRepositoryPath = opts.repository || "u/mock/repo";
- settings = {
- git_sync: {
- repositories: [{
- git_repo_resource_path: mockRepositoryPath,
- settings: {
- include_path: parsedSettings.include_path,
- include_type: parsedSettings.include_type,
- exclude_path: parsedSettings.exclude_path || [],
- extra_include_path: parsedSettings.extra_include_path || [],
- },
- }],
- },
- };
- } catch (parseError) {
- const errorMessage = parseError instanceof Error ? parseError.message : String(parseError);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error:
- `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
- }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
- ),
- );
- }
- return;
- }
- } else {
- // Fetch workspace settings to get git-sync configuration
- try {
- settings = await wmill.getSettings({
- workspace: workspace.workspaceId,
- });
- } catch (apiError) {
- const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error: `Failed to fetch workspace settings: ${errorMessage}`,
- }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to fetch workspace settings: ${errorMessage}`,
- ),
- );
- }
- return;
- }
- }
-
- if (
- !settings.git_sync?.repositories ||
- settings.git_sync.repositories.length === 0
- ) {
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error: "No git-sync repositories configured",
- }),
- );
- } else {
- log.error(
- colors.red(
- "No git-sync repositories configured in workspace",
- ),
- );
- }
- return;
- }
-
- // Find the repository to work with
- let selectedRepo = await selectAndLogRepository(
- settings.git_sync.repositories,
- opts.repository,
- );
-
- // Check if the selected repository needs migration and handle it
- selectedRepo = await handleLegacyRepositoryMigration(
- selectedRepo,
- settings.git_sync,
- workspace,
- opts,
- "pull"
- );
-
- // Convert backend settings to SyncOptions format
- const backendSyncOptions: SyncOptions = {
- includes: selectedRepo.settings.include_path || [],
- excludes: selectedRepo.settings.exclude_path || [],
- extraIncludes: selectedRepo.settings.extra_include_path || [],
- ...includeTypeToSyncOptions(
- selectedRepo.settings.include_type || [],
- ),
- };
-
- // Check if wmill.yaml exists - require it for git-sync settings commands
- try {
- await Deno.stat("wmill.yaml");
- } catch (error) {
- log.error(
- colors.red(
- "No wmill.yaml file found. Please run 'wmill init' first to create the configuration file.",
- ),
- );
- Deno.exit(1);
- }
-
- // Read current local configuration
- const localConfig = await readConfigFile();
-
- // Determine where to write the settings for diff display
- let overrideKey: string | undefined;
- let writeMode: "override" | "replace" = "replace";
-
- // For diff mode, determine what the write mode would be without interactive prompts
- if (opts.default) {
- writeMode = "replace";
- } else if (opts.replace) {
- writeMode = "replace";
- } else if (opts.override || opts.workspaceLevel) {
- writeMode = "override";
- if (opts.workspaceLevel) {
- overrideKey = constructOverrideKey(
- workspace.remote,
- workspace.workspaceId,
- "",
- true,
- );
- } else {
- const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
- overrideKey = constructOverrideKey(
- workspace.remote,
- workspace.workspaceId,
- repoPath,
- );
- }
- } else {
- // Default behavior for existing files with no explicit flags
- // Use same logic as diff to determine if there's a real conflict
- const currentSettings = getCurrentSettings(
- localConfig,
- "replace", // Check against replace mode
- undefined,
- );
-
- const gitSyncBackend = extractGitSyncFields(
- normalizeSyncOptions(backendSyncOptions),
- );
- const gitSyncCurrent = extractGitSyncFields(
- normalizeSyncOptions(currentSettings),
- );
- const hasConflict = !deepEqual(gitSyncBackend, gitSyncCurrent);
-
- if (hasConflict) {
- // For diff mode, show what override would look like
- writeMode = "override";
- const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
- overrideKey = constructOverrideKey(
- workspace.remote,
- workspace.workspaceId,
- repoPath,
- );
- } else {
- writeMode = "replace";
- }
- }
-
- if (opts.diff) {
- // Show differences between local and backend
- const currentSettings = getCurrentSettings(
- localConfig,
- writeMode,
- overrideKey,
- );
-
- const normalizedCurrent = normalizeSyncOptions(currentSettings);
- const normalizedBackend = normalizeSyncOptions(backendSyncOptions);
- const gitSyncCurrent = extractGitSyncFields(normalizedCurrent);
- const gitSyncBackend = extractGitSyncFields(normalizedBackend);
- const hasChanges = !deepEqual(gitSyncBackend, gitSyncCurrent);
-
- if (opts.jsonOutput) {
- const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
-
- // Generate structured diff using the same normalized objects
- const structuredDiff = hasChanges
- ? generateStructuredDiff(gitSyncCurrent, gitSyncBackend)
- : {};
-
- console.log(
- JSON.stringify({
- success: true,
- hasChanges,
- local: syncOptionsToBackendFormat(normalizedCurrent),
- backend: syncOptionsToBackendFormat(normalizedBackend),
- repository: selectedRepo.git_repo_resource_path,
- diff: structuredDiff,
- }),
- );
- } else {
- if (hasChanges) {
- log.info("Changes that would be applied locally:");
- const changes = generateChanges(normalizedCurrent, normalizedBackend);
-
- if (Object.keys(changes).length === 0) {
- log.info(colors.green("No differences found"));
- } else {
- displayChanges(changes);
- }
- } else {
- log.info(colors.green("No differences found"));
- }
- }
- return;
- }
-
- // For non-diff mode, handle interactive logic if needed
- // Only show interactive prompts for existing files with conflicts
- if (
- !opts.diff &&
- !opts.default &&
- !opts.replace &&
- !opts.override &&
- !opts.workspaceLevel
- ) {
- // Use the same logic as diff to determine current settings
- const currentSettings = getCurrentSettings(
- localConfig,
- writeMode,
- overrideKey,
- );
-
- const gitSyncBackend = extractGitSyncFields(
- normalizeSyncOptions(backendSyncOptions),
- );
- const gitSyncCurrent = extractGitSyncFields(
- normalizeSyncOptions(currentSettings),
- );
- const hasConflict = !deepEqual(gitSyncBackend, gitSyncCurrent);
-
- if (hasConflict && !opts.yes && Deno.stdin.isTerminal()) {
- // Show the diff first
- log.info("Changes that would be applied locally:");
- const changes = generateChanges(currentSettings, backendSyncOptions);
- if (Object.keys(changes).length > 0) {
- displayChanges(changes);
- }
-
- // Interactive mode - ask user
- const { Select } = await import("../../../deps.ts");
- const choice = await Select.prompt({
- message: "Settings conflict detected. How would you like to proceed?",
- options: [
- {
- name: "Replace existing settings",
- value: "replace",
- },
- {
- name: "Add repository-specific override",
- value: "override",
- },
- { name: "Cancel", value: "cancel" },
- ],
- });
-
- if (choice === "cancel") {
- log.info("Operation cancelled");
- return;
- }
-
- writeMode = choice as "replace" | "override";
- if (writeMode === "override") {
- const repoPath = normalizeRepoPath(
- selectedRepo.git_repo_resource_path,
- );
- overrideKey = constructOverrideKey(
- workspace.remote,
- workspace.workspaceId,
- repoPath,
- );
- }
- } else if (hasConflict && opts.yes) {
- // --yes flag: default to override behavior for conflicts
- writeMode = "override";
- const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
- overrideKey = constructOverrideKey(
- workspace.remote,
- workspace.workspaceId,
- repoPath,
- );
- log.info(colors.yellow("Settings conflict detected. Using --override behavior (default for --yes)."));
- } else if (hasConflict) {
- // Non-interactive mode with conflicts - show message and exit
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error:
- "Settings conflict detected. Use --replace or --override flags to resolve.",
- hasConflict: true,
- }),
- );
- } else {
- log.error(colors.red("Settings conflict detected."));
- log.info(
- "Use --replace to overwrite existing settings or --override to add repository-specific override.",
- );
- }
- return;
- }
- }
-
- // Check if there are actually any changes before writing
- const currentSettingsForCheck = getCurrentSettings(
- localConfig,
- writeMode,
- overrideKey,
- );
- const gitSyncBackend = extractGitSyncFields(
- normalizeSyncOptions(backendSyncOptions),
- );
- const gitSyncCurrent = extractGitSyncFields(
- normalizeSyncOptions(currentSettingsForCheck),
- );
- const hasActualChanges = !deepEqual(gitSyncBackend, gitSyncCurrent);
-
- if (!hasActualChanges) {
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: true,
- message: "No changes needed",
- repository: selectedRepo.git_repo_resource_path,
- }),
- );
- } else {
- log.info(
- colors.green(
- "No changes needed - settings are already up to date",
- ),
- );
- }
- return;
- }
-
- // Apply the settings based on write mode
- let updatedConfig: SyncOptions;
-
- // Log which settings mode is being used
- const repoPath = selectedRepo.git_repo_resource_path.replace(/^\$res:/, "");
- if (writeMode === "override") {
- log.info(`Applied repository-specific overrides for repository "${repoPath}"`);
- } else {
- log.info(`Applied settings for repository "${repoPath}"`);
- }
-
- if (writeMode === "replace") {
- // Preserve existing local config and update only git-sync fields
- updatedConfig = { ...localConfig };
- // Clear overrides since we're in replace mode, but keep empty object for consistency
- updatedConfig.overrides = {};
- // Update with backend git-sync settings
- Object.assign(updatedConfig, backendSyncOptions);
- } else if (writeMode === "override" && overrideKey) {
- // Add repository-specific override
- updatedConfig = { ...localConfig };
- if (!updatedConfig.overrides) {
- updatedConfig.overrides = {};
- }
-
- // Only store the delta - settings that differ from current effective settings
- const currentEffective = getCurrentSettings(localConfig, "replace");
- const deltaSettings: Partial = {};
-
- // Compare each setting and only include differences
- for (const [key, value] of Object.entries(backendSyncOptions)) {
- if (key === "overrides") continue; // Skip overrides field
-
- const currentValue = (currentEffective as any)[key];
- const newValue = value;
-
- // Compare arrays by content, primitives by value
- const isDifferent =
- Array.isArray(currentValue) && Array.isArray(newValue)
- ? !arraysEqual(currentValue, newValue)
- : currentValue !== newValue;
-
- if (isDifferent) {
- (deltaSettings as any)[key] = newValue;
- }
- }
-
- updatedConfig.overrides[overrideKey] = deltaSettings;
- } else {
- // Replace top-level settings
- updatedConfig = { ...localConfig };
- // Copy all backend settings to top level, excluding overrides
- const { overrides, ...topLevelSettings } = backendSyncOptions;
- Object.assign(updatedConfig, topLevelSettings);
- }
-
- // Write updated configuration
- await Deno.writeTextFile("wmill.yaml", yamlStringify(updatedConfig));
-
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: true,
- message: `Git-sync settings pulled successfully`,
- repository: selectedRepo.git_repo_resource_path,
- overrideKey,
- }),
- );
- } else {
- log.info(
- colors.green(
- `Git-sync settings pulled successfully from ${selectedRepo.git_repo_resource_path}`,
- ),
- );
- if (writeMode === "override" && overrideKey) {
- log.info(
- colors.gray(
- `Settings written to override key: ${overrideKey}`,
- ),
- );
- } else if (writeMode === "replace") {
- log.info(colors.gray(`Settings written as simple configuration`));
- } else {
- log.info(colors.gray(`Settings written to top-level defaults`));
- }
- }
- } catch (error) {
- const errorMessage = error instanceof Error ? error.message : String(error);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({ success: false, error: errorMessage }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to pull git-sync settings: ${errorMessage}`,
- ),
- );
- }
- }
-}
-
-async function pushGitSyncSettings(
- opts: GlobalOptions & {
- repository?: string;
- diff?: boolean;
- jsonOutput?: boolean;
- withBackendSettings?: string;
- yes?: boolean;
- },
-) {
- const workspace = await resolveWorkspace(opts);
- await requireLogin(opts);
-
- try {
- // Check if wmill.yaml exists - require it for git-sync settings commands
- try {
- await Deno.stat("wmill.yaml");
- } catch (error) {
- log.error(
- colors.red(
- "No wmill.yaml file found. Please run 'wmill init' first to create the configuration file.",
- ),
- );
- Deno.exit(1);
- }
-
- // Read local configuration
- const localConfig = await readConfigFile();
-
- // Parse and validate --with-backend-settings if provided, otherwise fetch from backend
- let settings: any;
- if (opts.withBackendSettings) {
- try {
- const parsedSettings = JSON.parse(opts.withBackendSettings);
-
- // Validate the structure matches expected test format (raw settings object)
- if (
- !parsedSettings.include_path ||
- !Array.isArray(parsedSettings.include_path)
- ) {
- throw new Error(
- "Invalid settings format. Expected include_path array",
- );
- }
- if (
- !parsedSettings.include_type ||
- !Array.isArray(parsedSettings.include_type)
- ) {
- throw new Error(
- "Invalid settings format. Expected include_type array",
- );
- }
-
- // Create mock backend response with single repository using provided settings
- const mockRepositoryPath = opts.repository || "u/mock/repo";
- settings = {
- git_sync: {
- repositories: [{
- git_repo_resource_path: mockRepositoryPath,
- settings: {
- include_path: parsedSettings.include_path,
- include_type: parsedSettings.include_type,
- exclude_path: parsedSettings.exclude_path || [],
- extra_include_path: parsedSettings.extra_include_path || [],
- },
- }],
- },
- };
- } catch (parseError) {
- const errorMessage = parseError instanceof Error ? parseError.message : String(parseError);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error:
- `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
- }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
- ),
- );
- }
- return;
- }
- } else {
- // Fetch current backend settings
- try {
- settings = await wmill.getSettings({
- workspace: workspace.workspaceId,
- });
- } catch (apiError) {
- const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error: `Failed to fetch workspace settings: ${errorMessage}`,
- }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to fetch workspace settings: ${errorMessage}`,
- ),
- );
- }
- return;
- }
- }
-
- if (
- !settings.git_sync?.repositories ||
- settings.git_sync.repositories.length === 0
- ) {
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error: "No git-sync repositories configured",
- }),
- );
- } else {
- log.error(
- colors.red(
- "No git-sync repositories configured in workspace",
- ),
- );
- }
- return;
- }
-
- // Find the repository to work with
- let selectedRepo = await selectAndLogRepository(
- settings.git_sync.repositories,
- opts.repository,
- );
-
- // Check if the selected repository needs migration and handle it
- selectedRepo = await handleLegacyRepositoryMigration(
- selectedRepo,
- settings.git_sync,
- workspace,
- opts,
- "push"
- );
-
- // If migration was cancelled, exit
- if (selectedRepo === null) {
- return;
- }
-
- // Get effective settings for this workspace/repo
- const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
- const effectiveSettings = getEffectiveSettings(
- localConfig,
- workspace.remote,
- workspace.workspaceId,
- repoPath,
- );
-
- // Convert to backend format
- const backendFormat = {
- include_path: effectiveSettings.includes || [],
- include_type: syncOptionsToIncludeType(effectiveSettings),
- exclude_path: effectiveSettings.excludes || [],
- extra_include_path: effectiveSettings.extraIncludes || [],
- };
-
- // Calculate diff for all modes
- const currentBackend = selectedRepo.settings;
-
- // Convert current backend settings to SyncOptions for user-friendly display
- const currentSyncOptions: SyncOptions = {
- includes: currentBackend.include_path || [],
- excludes: currentBackend.exclude_path || [],
- extraIncludes: currentBackend.extra_include_path || [],
- ...includeTypeToSyncOptions(currentBackend.include_type || []),
- };
-
- const normalizedCurrent = normalizeSyncOptions(currentSyncOptions);
- const normalizedEffective = normalizeSyncOptions(effectiveSettings);
- const gitSyncCurrent = extractGitSyncFields(normalizedCurrent);
- const gitSyncEffective = extractGitSyncFields(normalizedEffective);
- const hasChanges = !deepEqual(gitSyncEffective, gitSyncCurrent);
-
- if (opts.diff) {
- // --diff flag: show differences and exit
- if (opts.jsonOutput) {
- // Generate structured diff using the same normalized objects
- const structuredDiff = hasChanges
- ? generateStructuredDiff(gitSyncCurrent, gitSyncEffective)
- : {};
-
- console.log(
- JSON.stringify({
- success: true,
- hasChanges,
- local: syncOptionsToBackendFormat(normalizedEffective),
- backend: syncOptionsToBackendFormat(normalizedCurrent),
- repository: selectedRepo.git_repo_resource_path,
- diff: structuredDiff,
- }),
- );
- } else {
- if (hasChanges) {
- log.info("Changes that would be pushed to Windmill:");
- const changes = generateChanges(
- normalizedCurrent,
- normalizedEffective,
- );
-
- if (Object.keys(changes).length === 0) {
- log.info(colors.green("No changes to push"));
- } else {
- displayChanges(changes);
- }
- } else {
- log.info(colors.green("No changes to push"));
- }
- }
- return;
- }
-
- // Default behavior: show changes and ask for confirmation (unless --yes is passed)
- if (hasChanges) {
- if (!opts.jsonOutput) {
- const changes = generateChanges(
- normalizedCurrent,
- normalizedEffective,
- );
-
- if (Object.keys(changes).length === 0) {
- log.info(colors.green("No changes to push"));
- return;
- } else {
- log.info("Changes that would be pushed to Windmill:");
- displayChanges(changes);
- }
- }
-
- // Ask for confirmation unless --yes is passed or not in TTY
- if (!opts.yes && Deno.stdin.isTerminal()) {
- const confirmed = await Confirm.prompt({
- message: `Do you want to apply these changes to the remote?`,
- default: true,
- });
-
- if (!confirmed) {
- return;
- }
- }
- } else {
- log.info(colors.green("No changes to push"));
- return;
- }
-
- if (opts.withBackendSettings) {
- // Skip backend update when using simulated settings
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: true,
- message:
- `Git-sync settings push simulated (--with-backend-settings used)`,
- repository: selectedRepo.git_repo_resource_path,
- simulated: true,
- }),
- );
- } else {
- log.info(
- colors.green(
- `Git-sync settings push simulated for ${selectedRepo.git_repo_resource_path} (--with-backend-settings used)`,
- ),
- );
- }
- } else {
- // Update the specific repository settings
- const updatedRepos = settings.git_sync.repositories.map(
- (repo: GitSyncRepository) => {
- if (
- repo.git_repo_resource_path ===
- selectedRepo.git_repo_resource_path
- ) {
- return {
- ...repo,
- settings: backendFormat,
- };
- }
- return repo;
- },
- );
-
- // Push updated settings to backend
- try {
- await wmill.editWorkspaceGitSyncConfig({
- workspace: workspace.workspaceId,
- requestBody: {
- git_sync_settings: {
- repositories: updatedRepos,
- },
- },
- });
- } catch (apiError) {
- const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: false,
- error: `Failed to update workspace git-sync config: ${errorMessage}`,
- }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to update workspace git-sync config: ${errorMessage}`,
- ),
- );
- }
- return;
- }
-
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({
- success: true,
- message: `Git-sync settings pushed successfully`,
- repository: selectedRepo.git_repo_resource_path,
- }),
- );
- } else {
- log.info(
- colors.green(
- `Git-sync settings pushed successfully to ${selectedRepo.git_repo_resource_path}`,
- ),
- );
- }
- }
- } catch (error) {
- const errorMessage = error instanceof Error ? error.message : String(error);
- if (opts.jsonOutput) {
- console.log(
- JSON.stringify({ success: false, error: errorMessage }),
- );
- } else {
- log.error(
- colors.red(
- `Failed to push git-sync settings: ${errorMessage}`,
- ),
- );
- }
- }
-}
-
-const command = new Command()
- .description(
- "Manage git-sync settings between local wmill.yaml and Windmill backend",
- )
- .command("pull")
- .description(
- "Pull git-sync settings from Windmill backend to local wmill.yaml",
- )
- .option(
- "--repository ",
- "Specify repository path (e.g., u/user/repo)",
- )
- .option(
- "--workspace-level",
- "Write settings to workspace:* override instead of workspace:repo",
- )
- .option(
- "--default",
- "Write settings to top-level defaults instead of overrides",
- )
- .option("--replace", "Replace existing settings (non-interactive mode)")
- .option(
- "--override",
- "Add repository-specific override (non-interactive mode)",
- )
- .option("--diff", "Show differences without applying changes")
- .option("--json-output", "Output in JSON format")
- .option(
- "--with-backend-settings ",
- "Use provided JSON settings instead of querying backend (for testing)",
- )
- .option("--yes", "Skip interactive prompts and use default behavior")
- .action(pullGitSyncSettings as any)
- .command("push")
- .description(
- "Push git-sync settings from local wmill.yaml to Windmill backend",
- )
- .option(
- "--repository ",
- "Specify repository path (e.g., u/user/repo)",
- )
- .option("--diff", "Show what would be pushed without applying changes")
- .option("--json-output", "Output in JSON format")
- .option(
- "--with-backend-settings ",
- "Use provided JSON settings instead of querying backend (for testing)",
- )
- .option("--yes", "Skip interactive prompts and use default behavior")
- .action(pushGitSyncSettings as any);
-
-export { pullGitSyncSettings, pushGitSyncSettings };
-export default command;
+export { pullGitSyncSettings, pushGitSyncSettings } from "./index.ts";
+export { default } from "./index.ts";
\ No newline at end of file
diff --git a/cli/src/commands/gitsync-settings/index.ts b/cli/src/commands/gitsync-settings/index.ts
new file mode 100644
index 0000000000..567bc50d1a
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/index.ts
@@ -0,0 +1,60 @@
+import { Command } from "../../../deps.ts";
+import { pullGitSyncSettings } from "./pull.ts";
+import { pushGitSyncSettings } from "./push.ts";
+
+const command = new Command()
+ .description(
+ "Manage git-sync settings between local wmill.yaml and Windmill backend",
+ )
+ .command("pull")
+ .description(
+ "Pull git-sync settings from Windmill backend to local wmill.yaml",
+ )
+ .option(
+ "--repository ",
+ "Specify repository path (e.g., u/user/repo)",
+ )
+ .option(
+ "--default",
+ "Write settings to top-level defaults instead of overrides",
+ )
+ .option("--replace", "Replace existing settings (non-interactive mode)")
+ .option(
+ "--override",
+ "Add branch-specific override (non-interactive mode)",
+ )
+ .option("--diff", "Show differences without applying changes")
+ .option("--json-output", "Output in JSON format")
+ .option(
+ "--with-backend-settings ",
+ "Use provided JSON settings instead of querying backend (for testing)",
+ )
+ .option("--yes", "Skip interactive prompts and use default behavior")
+ .option(
+ "--promotion ",
+ "Use promotionOverrides from the specified branch instead of regular overrides"
+ )
+ .action(pullGitSyncSettings as any)
+ .command("push")
+ .description(
+ "Push git-sync settings from local wmill.yaml to Windmill backend",
+ )
+ .option(
+ "--repository ",
+ "Specify repository path (e.g., u/user/repo)",
+ )
+ .option("--diff", "Show what would be pushed without applying changes")
+ .option("--json-output", "Output in JSON format")
+ .option(
+ "--with-backend-settings ",
+ "Use provided JSON settings instead of querying backend (for testing)",
+ )
+ .option("--yes", "Skip interactive prompts and use default behavior")
+ .option(
+ "--promotion ",
+ "Use promotionOverrides from the specified branch instead of regular overrides"
+ )
+ .action(pushGitSyncSettings as any);
+
+export { pullGitSyncSettings, pushGitSyncSettings };
+export default command;
\ No newline at end of file
diff --git a/cli/src/commands/gitsync-settings/legacySettings.ts b/cli/src/commands/gitsync-settings/legacySettings.ts
new file mode 100644
index 0000000000..fe6f29faa5
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/legacySettings.ts
@@ -0,0 +1,144 @@
+import { colors, Confirm } from "../../../deps.ts";
+import * as wmill from "../../../gen/services.gen.ts";
+import { GitSyncRepository } from "./types.ts";
+
+// Shared migration function for legacy repositories
+export async function handleLegacyRepositoryMigration(
+ selectedRepo: any,
+ gitSyncSettings: any,
+ workspace: any,
+ opts: { yes?: boolean },
+ operationName: string = "operation"
+): Promise {
+ if (selectedRepo.settings) {
+ return selectedRepo; // Already migrated
+ }
+
+ // This repository is in legacy format - handle migration
+ if (!gitSyncSettings.include_path || !gitSyncSettings.include_type) {
+ throw new Error(
+ `Repository "${selectedRepo.git_repo_resource_path}" has legacy format but workspace-level include_path or include_type is missing. This indicates corrupted git-sync settings.`
+ );
+ }
+
+ const workspaceIncludePath = gitSyncSettings.include_path;
+ const workspaceIncludeType = gitSyncSettings.include_type;
+
+ if (Deno.stdout.isTerminal() && !opts.yes) {
+ // Interactive mode - show migration prompt
+ console.log(colors.yellow('\n⚠️ Legacy git-sync settings detected!'));
+ console.log(`\nRepository "${selectedRepo.git_repo_resource_path}" has legacy settings format.`);
+ console.log('The new format allows per-repository filter configuration.');
+ if (operationName === "push") {
+ console.log('This repository must be migrated before pushing settings.\n');
+ } else {
+ console.log('\n');
+ }
+
+ console.log(colors.bold('Current workspace-level settings:'));
+ console.log(` Include paths: ${workspaceIncludePath.join(', ')}`);
+ console.log(` Include types: ${workspaceIncludeType.join(', ')}\n`);
+
+ // Show what the migration will do
+ let finalIncludeType = [...workspaceIncludeType];
+ if (selectedRepo.exclude_types_override && selectedRepo.exclude_types_override.length > 0) {
+ const originalCount = finalIncludeType.length;
+ finalIncludeType = finalIncludeType.filter(
+ type => !selectedRepo.exclude_types_override.includes(type)
+ );
+ const excludedCount = originalCount - finalIncludeType.length;
+ console.log(colors.yellow(`Repository excludes ${excludedCount} types: ${selectedRepo.exclude_types_override.join(', ')}`));
+ }
+
+ console.log(colors.bold('\nAfter migration, repository will have:'));
+ console.log(` Include paths: ${workspaceIncludePath.join(', ')}`);
+ console.log(` Include types: ${finalIncludeType.join(', ')}\n`);
+
+ const confirm = await Confirm.prompt({
+ message: operationName === "push"
+ ? 'Do you want to migrate this repository before pushing?'
+ : 'Do you want to migrate this repository?',
+ default: true
+ });
+
+ if (!confirm) {
+ const message = operationName === "push"
+ ? '\n⚠️ Migration skipped. Cannot push to legacy repository.'
+ : '\n⚠️ Migration skipped. You can migrate later via the UI.';
+ console.log(colors.yellow(message));
+ if (operationName === "push") {
+ return null; // Signal to exit push operation
+ }
+ throw new Error('Migration cancelled by user');
+ }
+
+ // Perform the migration
+ let migratedIncludeType = [...workspaceIncludeType];
+ if (selectedRepo.exclude_types_override && selectedRepo.exclude_types_override.length > 0) {
+ migratedIncludeType = migratedIncludeType.filter(
+ type => !selectedRepo.exclude_types_override.includes(type)
+ );
+ }
+
+ const migratedRepo = {
+ ...selectedRepo,
+ settings: {
+ include_path: [...workspaceIncludePath],
+ include_type: migratedIncludeType,
+ exclude_path: [],
+ extra_include_path: []
+ }
+ };
+
+ // Remove the old field
+ delete migratedRepo.exclude_types_override;
+
+ // Update the backend with migrated repository
+ const updatedRepositories = gitSyncSettings.repositories.map((repo: any) => {
+ if (repo.git_repo_resource_path === selectedRepo.git_repo_resource_path) {
+ return migratedRepo;
+ }
+ return repo;
+ });
+
+ await wmill.editWorkspaceGitSyncConfig({
+ workspace: workspace.workspaceId,
+ requestBody: {
+ git_sync_settings: {
+ repositories: updatedRepositories,
+ // Keep workspace-level settings if other repos are still legacy
+ ...(gitSyncSettings.repositories.some((r: any) => r.git_repo_resource_path !== selectedRepo.git_repo_resource_path && !r.settings) && {
+ include_path: workspaceIncludePath,
+ include_type: workspaceIncludeType
+ })
+ }
+ }
+ });
+
+ console.log(colors.green('\n✓ Repository migration completed successfully!'));
+ if (operationName === "push") {
+ console.log('Now proceeding with push operation...\n');
+ }
+ return migratedRepo;
+
+ } else {
+ // Non-interactive mode - show error
+ console.error(colors.red('\n❌ Legacy git-sync settings detected!'));
+ console.error(`\nRepository "${selectedRepo.git_repo_resource_path}" has legacy settings format.`);
+ if (operationName === "push") {
+ console.error('This repository must be migrated before pushing settings.');
+ }
+ console.error('Please choose one of the following options:\n');
+ console.error('1. Go to the Windmill UI > Workspace Settings > Git Sync');
+ console.error(' Review and save this repository to migrate to the new format.\n');
+ console.error('2. Run this command in interactive mode (with TTY) to migrate.');
+ console.error(` Example: wmill gitsync-settings ${operationName}\n`);
+ if (operationName === "push") {
+ console.error('3. Pull settings first to migrate: wmill gitsync-settings pull\n');
+ } else {
+ console.error('3. Push local settings to override backend settings:');
+ console.error(' wmill gitsync-settings push\n');
+ }
+ Deno.exit(1);
+ }
+}
\ No newline at end of file
diff --git a/cli/src/commands/gitsync-settings/pull.ts b/cli/src/commands/gitsync-settings/pull.ts
new file mode 100644
index 0000000000..b02017af55
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/pull.ts
@@ -0,0 +1,492 @@
+import { colors, log, yamlStringify } from "../../../deps.ts";
+import { GlobalOptions } from "../../types.ts";
+import { requireLogin } from "../../core/auth.ts";
+import { resolveWorkspace } from "../../core/context.ts";
+import * as wmill from "../../../gen/services.gen.ts";
+import { SyncOptions, readConfigFile, getEffectiveSettings, DEFAULT_SYNC_OPTIONS } from "../../core/conf.ts";
+import { deepEqual } from "../../utils/utils.ts";
+import { getCurrentGitBranch, isGitRepository } from "../../utils/git.ts";
+
+import { GitSyncRepository, WriteMode } from "./types.ts";
+import { GitSyncSettingsConverter } from "./converter.ts";
+import { handleLegacyRepositoryMigration } from "./legacySettings.ts";
+import {
+ selectAndLogRepository,
+ generateStructuredDiff,
+ generateChanges,
+ displayChanges,
+ applyBackendSettingsToBranch,
+ normalizeRepoPath,
+ outputResult
+} from "./utils.ts";
+
+export async function pullGitSyncSettings(
+ opts: GlobalOptions & {
+ repository?: string;
+ workspaceLevel?: boolean;
+ default?: boolean;
+ diff?: boolean;
+ jsonOutput?: boolean;
+ replace?: boolean;
+ override?: boolean;
+ withBackendSettings?: string;
+ yes?: boolean;
+ promotion?: string;
+ },
+) {
+ const workspace = await resolveWorkspace(opts);
+ await requireLogin(opts);
+
+ try {
+ // Parse and validate --with-backend-settings if provided
+ let settings: any;
+ if (opts.withBackendSettings) {
+ try {
+ const parsedSettings = JSON.parse(opts.withBackendSettings);
+
+ // Validate the structure matches expected format (raw settings object)
+ if (
+ !parsedSettings.include_path ||
+ !Array.isArray(parsedSettings.include_path)
+ ) {
+ throw new Error(
+ "Invalid settings format. Expected include_path array",
+ );
+ }
+ if (
+ !parsedSettings.include_type ||
+ !Array.isArray(parsedSettings.include_type)
+ ) {
+ throw new Error(
+ "Invalid settings format. Expected include_type array",
+ );
+ }
+
+ // Create mock backend response with single repository using provided settings
+ const mockRepositoryPath = opts.repository || "u/mock/repo";
+ settings = {
+ git_sync: {
+ repositories: [{
+ git_repo_resource_path: mockRepositoryPath,
+ settings: {
+ include_path: parsedSettings.include_path,
+ include_type: parsedSettings.include_type,
+ exclude_path: parsedSettings.exclude_path || [],
+ extra_include_path: parsedSettings.extra_include_path || [],
+ },
+ }],
+ },
+ };
+ } catch (parseError) {
+ const errorMessage = parseError instanceof Error ? parseError.message : String(parseError);
+ outputResult(opts, {
+ success: false,
+ error: `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
+ });
+ return;
+ }
+ } else {
+ // Fetch workspace settings to get git-sync configuration
+ try {
+ settings = await wmill.getSettings({
+ workspace: workspace.workspaceId,
+ });
+ } catch (apiError) {
+ const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
+ outputResult(opts, {
+ success: false,
+ error: `Failed to fetch workspace settings: ${errorMessage}`,
+ });
+ return;
+ }
+ }
+
+ if (
+ !settings.git_sync?.repositories ||
+ settings.git_sync.repositories.length === 0
+ ) {
+ outputResult(opts, {
+ success: false,
+ error: "No git-sync repositories configured",
+ });
+ return;
+ }
+
+ // Find the repository to work with
+ let selectedRepo = await selectAndLogRepository(
+ settings.git_sync.repositories,
+ opts.repository,
+ opts.jsonOutput,
+ );
+
+ // Check if the selected repository needs migration and handle it
+ selectedRepo = await handleLegacyRepositoryMigration(
+ selectedRepo,
+ settings.git_sync,
+ workspace,
+ opts,
+ "pull"
+ );
+
+ // Convert backend settings to SyncOptions format
+ const backendSyncOptions: SyncOptions = GitSyncSettingsConverter.fromBackendFormat(selectedRepo.settings);
+
+ // Check if wmill.yaml exists - create a default one if it doesn't exist
+ let wmillYamlExists = true;
+ try {
+ await Deno.stat("wmill.yaml");
+ } catch (error) {
+ wmillYamlExists = false;
+ if (!opts.jsonOutput) {
+ log.info(
+ colors.yellow(
+ "No wmill.yaml file found. Will create one with backend git-sync settings.",
+ ),
+ );
+ }
+ }
+
+ let localConfig: SyncOptions;
+ if (wmillYamlExists) {
+ localConfig = await readConfigFile();
+ } else {
+ localConfig = { ...DEFAULT_SYNC_OPTIONS };
+ }
+
+ // Handle the case where wmill.yaml doesn't exist - just create it with backend settings
+ if (!wmillYamlExists) {
+ // When creating from scratch, just apply backend settings directly
+ let updatedConfig = { ...localConfig };
+
+ // Apply backend settings to the default config
+ Object.assign(updatedConfig, backendSyncOptions);
+
+ // Add git branch structure if in a git repository
+ if (isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch) {
+ if (!updatedConfig.git_branches) {
+ updatedConfig.git_branches = {};
+ }
+ if (!updatedConfig.git_branches[currentBranch]) {
+ updatedConfig.git_branches[currentBranch] = { overrides: {} };
+ }
+ }
+ }
+
+ // Write the new configuration
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(updatedConfig));
+
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message: "wmill.yaml created with backend git-sync settings",
+ repository: selectedRepo.git_repo_resource_path,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ `wmill.yaml created with git-sync settings from ${selectedRepo.git_repo_resource_path}`,
+ ),
+ );
+ }
+ return;
+ }
+
+ // For existing wmill.yaml files, continue with the normal flow
+ // Calculate current settings once and reuse throughout
+ const currentSettings = await getEffectiveSettings(localConfig, opts.promotion, true, opts.jsonOutput);
+
+ // Determine write mode for branch-based configuration
+ let writeMode: WriteMode = "replace";
+
+ // Determine write mode based on flags
+ if (opts.default || opts.replace) {
+ writeMode = "replace";
+ } else if (opts.override) {
+ writeMode = "override";
+ } else {
+ // Default behavior for existing files with no explicit flags
+ // Use same logic as diff to determine if there's a real conflict
+ const gitSyncBackend = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(backendSyncOptions),
+ );
+ const gitSyncCurrent = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(currentSettings),
+ );
+ const hasConflict = !deepEqual(gitSyncBackend, gitSyncCurrent);
+
+ if (hasConflict) {
+ // For diff mode, show what override would look like
+ writeMode = "override";
+ } else {
+ writeMode = "replace";
+ }
+ }
+
+ if (opts.diff) {
+ // Show differences between local and backend
+ const normalizedCurrent = GitSyncSettingsConverter.normalize(currentSettings);
+ const normalizedBackend = GitSyncSettingsConverter.normalize(backendSyncOptions);
+ const gitSyncCurrent = GitSyncSettingsConverter.extractGitSyncFields(normalizedCurrent);
+ const gitSyncBackend = GitSyncSettingsConverter.extractGitSyncFields(normalizedBackend);
+ const hasChanges = !deepEqual(gitSyncBackend, gitSyncCurrent);
+
+ if (opts.jsonOutput) {
+ const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
+
+ // Generate structured diff using the same normalized objects
+ const structuredDiff = hasChanges
+ ? generateStructuredDiff(gitSyncCurrent, gitSyncBackend)
+ : {};
+
+ console.log(
+ JSON.stringify({
+ success: true,
+ hasChanges,
+ local: GitSyncSettingsConverter.toBackendFormat(normalizedCurrent),
+ backend: GitSyncSettingsConverter.toBackendFormat(normalizedBackend),
+ repository: selectedRepo.git_repo_resource_path,
+ diff: structuredDiff,
+ }),
+ );
+ } else {
+ if (hasChanges) {
+ log.info("Changes that would be applied locally:");
+ const changes = generateChanges(currentSettings, backendSyncOptions);
+
+ if (Object.keys(changes).length === 0) {
+ log.info(colors.green("No differences found"));
+ } else {
+ displayChanges(changes);
+ }
+ } else {
+ log.info(colors.green("No differences found"));
+ }
+ }
+ return;
+ }
+
+ // For non-diff mode, handle interactive logic if needed
+ // Only show interactive prompts for existing files with conflicts
+ if (
+ !opts.diff &&
+ !opts.default &&
+ !opts.replace &&
+ !opts.override
+ ) {
+ // Recalculate current settings with promotion if needed
+ const effectiveCurrentSettings = await getEffectiveSettings(localConfig, opts.promotion, true, opts.jsonOutput);
+ // Use the same logic as diff to determine current settings
+ const gitSyncBackend = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(backendSyncOptions),
+ );
+ const gitSyncCurrent = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(effectiveCurrentSettings),
+ );
+ const hasConflict = !deepEqual(gitSyncBackend, gitSyncCurrent);
+
+ if (hasConflict && !opts.yes && Deno.stdin.isTerminal()) {
+ // Show the diff first
+ log.info("Changes that would be applied locally:");
+ const changes = generateChanges(effectiveCurrentSettings, backendSyncOptions);
+ if (Object.keys(changes).length > 0) {
+ displayChanges(changes);
+ }
+
+ // Interactive mode - ask user
+ const { Select } = await import("../../../deps.ts");
+ const choice = await Select.prompt({
+ message: "Settings conflict detected. How would you like to proceed?",
+ options: [
+ {
+ name: "Replace existing settings",
+ value: "replace",
+ },
+ {
+ name: "Add branch-specific override",
+ value: "override",
+ },
+ { name: "Cancel", value: "cancel" },
+ ],
+ });
+
+ if (choice === "cancel") {
+ log.info("Operation cancelled");
+ return;
+ }
+
+ writeMode = choice as WriteMode;
+ } else if (hasConflict && opts.yes) {
+ // --yes flag: default to override behavior for conflicts
+ writeMode = "override";
+ log.info(colors.yellow("Settings conflict detected. Using --override behavior (default for --yes)."));
+ } else if (hasConflict) {
+ // Non-interactive mode with conflicts - show message and exit
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: false,
+ error:
+ "Settings conflict detected. Use --replace or --override flags to resolve.",
+ hasConflict: true,
+ }),
+ );
+ } else {
+ log.error(colors.red("Settings conflict detected."));
+ log.info(
+ "Use --replace to overwrite existing settings or --override to add branch-specific override.",
+ );
+ }
+ return;
+ }
+ }
+
+ // Check if there are actually any changes before writing
+ const gitSyncBackend = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(backendSyncOptions),
+ );
+ const gitSyncCurrent = GitSyncSettingsConverter.extractGitSyncFields(
+ GitSyncSettingsConverter.normalize(currentSettings),
+ );
+ const hasActualChanges = !deepEqual(gitSyncBackend, gitSyncCurrent);
+
+ if (!hasActualChanges && wmillYamlExists) {
+ // Even if no changes, check if we need to create empty branch structure
+ let needsBranchStructure = false;
+ if (isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch && (!localConfig.git_branches || !localConfig.git_branches[currentBranch])) {
+ needsBranchStructure = true;
+
+ // Create empty branch structure
+ const updatedConfig = { ...localConfig };
+ if (!updatedConfig.git_branches) {
+ updatedConfig.git_branches = {};
+ }
+ if (!updatedConfig.git_branches[currentBranch]) {
+ updatedConfig.git_branches[currentBranch] = { overrides: {} };
+ }
+
+ // Write updated configuration
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(updatedConfig));
+
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message: `Created empty branch structure for: ${currentBranch}`,
+ repository: selectedRepo.git_repo_resource_path,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ `Created empty branch structure for: ${currentBranch}`,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message: "No changes needed",
+ repository: selectedRepo.git_repo_resource_path,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ "No changes needed - settings are already up to date",
+ ),
+ );
+ }
+ return;
+ }
+
+ // Apply the settings based on write mode
+ let updatedConfig: SyncOptions;
+
+
+ if (writeMode === "replace") {
+ // Replace top-level settings
+ updatedConfig = { ...localConfig };
+ // Update with backend git-sync settings
+ Object.assign(updatedConfig, backendSyncOptions);
+ } else {
+ // Override mode - will be handled by branch logic below
+ updatedConfig = { ...localConfig };
+ }
+
+ // For replace mode, add empty branch structure if in Git repo
+ if (writeMode === "replace" && isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch) {
+ log.info(`Detected Git repository, adding empty branch structure for: ${currentBranch}`);
+ if (!updatedConfig.git_branches) {
+ updatedConfig.git_branches = {};
+ }
+ if (!updatedConfig.git_branches[currentBranch]) {
+ updatedConfig.git_branches[currentBranch] = { overrides: {} };
+ }
+ }
+ }
+
+ // For override mode, write to branch overrides
+ if (writeMode === "override" && isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch) {
+ log.info(`Detected Git repository, writing settings to branch: ${currentBranch}`);
+ updatedConfig = applyBackendSettingsToBranch(localConfig, currentBranch, backendSyncOptions);
+ }
+ }
+
+ // Write updated configuration
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(updatedConfig));
+
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message: `Git-sync settings pulled successfully`,
+ repository: selectedRepo.git_repo_resource_path,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ `Git-sync settings pulled successfully from ${selectedRepo.git_repo_resource_path}`,
+ ),
+ );
+ if (writeMode === "override") {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch) {
+ log.info(
+ colors.gray(`Settings written to branch '${currentBranch}' overrides`),
+ );
+ }
+ } else if (writeMode === "replace") {
+ log.info(colors.gray(`Settings written to top-level configuration`));
+ }
+ }
+ } catch (error) {
+ const errorMessage = error instanceof Error ? error.message : String(error);
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({ success: false, error: errorMessage }),
+ );
+ } else {
+ log.error(
+ colors.red(
+ `Failed to pull git-sync settings: ${errorMessage}`,
+ ),
+ );
+ }
+ }
+}
diff --git a/cli/src/commands/gitsync-settings/push.ts b/cli/src/commands/gitsync-settings/push.ts
new file mode 100644
index 0000000000..14f8a52d98
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/push.ts
@@ -0,0 +1,361 @@
+import { colors, log, Confirm } from "../../../deps.ts";
+import { GlobalOptions } from "../../types.ts";
+import { requireLogin } from "../../core/auth.ts";
+import { resolveWorkspace } from "../../core/context.ts";
+import * as wmill from "../../../gen/services.gen.ts";
+import { SyncOptions, readConfigFile, validateBranchConfiguration, getEffectiveSettings } from "../../core/conf.ts";
+import { deepEqual } from "../../utils/utils.ts";
+
+import { GitSyncRepository } from "./types.ts";
+import { GitSyncSettingsConverter } from "./converter.ts";
+import { handleLegacyRepositoryMigration } from "./legacySettings.ts";
+import {
+ selectAndLogRepository,
+ generateStructuredDiff,
+ generateChanges,
+ displayChanges,
+ normalizeRepoPath,
+ outputResult
+} from "./utils.ts";
+
+export async function pushGitSyncSettings(
+ opts: GlobalOptions & {
+ repository?: string;
+ diff?: boolean;
+ jsonOutput?: boolean;
+ withBackendSettings?: string;
+ yes?: boolean;
+ promotion?: string;
+ },
+) {
+ // Validate branch configuration like sync commands
+ try {
+ await validateBranchConfiguration();
+ } catch (error) {
+ if (error instanceof Error && error.message.includes("overrides")) {
+ log.error(error.message);
+ Deno.exit(1);
+ }
+ throw error;
+ }
+
+ const workspace = await resolveWorkspace(opts);
+ await requireLogin(opts);
+
+ try {
+ // Check if wmill.yaml exists - require it for git-sync settings commands
+ try {
+ await Deno.stat("wmill.yaml");
+ } catch (error) {
+ log.error(
+ colors.red(
+ "No wmill.yaml file found. Please run 'wmill init' first to create the configuration file.",
+ ),
+ );
+ Deno.exit(1);
+ }
+
+ // Read local configuration
+ const localConfig = await readConfigFile();
+
+ // Parse and validate --with-backend-settings if provided, otherwise fetch from backend
+ let settings: any;
+ if (opts.withBackendSettings) {
+ try {
+ const parsedSettings = JSON.parse(opts.withBackendSettings);
+
+ // Validate the structure matches expected test format (raw settings object)
+ if (
+ !parsedSettings.include_path ||
+ !Array.isArray(parsedSettings.include_path)
+ ) {
+ throw new Error(
+ "Invalid settings format. Expected include_path array",
+ );
+ }
+ if (
+ !parsedSettings.include_type ||
+ !Array.isArray(parsedSettings.include_type)
+ ) {
+ throw new Error(
+ "Invalid settings format. Expected include_type array",
+ );
+ }
+
+ // Create mock backend response with single repository using provided settings
+ const mockRepositoryPath = opts.repository || "u/mock/repo";
+ settings = {
+ git_sync: {
+ repositories: [{
+ git_repo_resource_path: mockRepositoryPath,
+ settings: {
+ include_path: parsedSettings.include_path,
+ include_type: parsedSettings.include_type,
+ exclude_path: parsedSettings.exclude_path || [],
+ extra_include_path: parsedSettings.extra_include_path || [],
+ },
+ }],
+ },
+ };
+ } catch (parseError) {
+ const errorMessage = parseError instanceof Error ? parseError.message : String(parseError);
+ outputResult(opts, {
+ success: false,
+ error: `Failed to parse --with-backend-settings JSON: ${errorMessage}`,
+ });
+ return;
+ }
+ } else {
+ // Fetch current backend settings
+ try {
+ settings = await wmill.getSettings({
+ workspace: workspace.workspaceId,
+ });
+ } catch (apiError) {
+ const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: false,
+ error: `Failed to fetch workspace settings: ${errorMessage}`,
+ }),
+ );
+ } else {
+ log.error(
+ colors.red(
+ `Failed to fetch workspace settings: ${errorMessage}`,
+ ),
+ );
+ }
+ return;
+ }
+ }
+
+ if (
+ !settings.git_sync?.repositories ||
+ settings.git_sync.repositories.length === 0
+ ) {
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: false,
+ error: "No git-sync repositories configured",
+ }),
+ );
+ } else {
+ log.error(
+ colors.red(
+ "No git-sync repositories configured in workspace",
+ ),
+ );
+ }
+ return;
+ }
+
+ // Find the repository to work with
+ let selectedRepo = await selectAndLogRepository(
+ settings.git_sync.repositories,
+ opts.repository,
+ opts.jsonOutput,
+ );
+
+ // Check if the selected repository needs migration and handle it
+ selectedRepo = await handleLegacyRepositoryMigration(
+ selectedRepo,
+ settings.git_sync,
+ workspace,
+ opts,
+ "push"
+ );
+
+ // If migration was cancelled, exit
+ if (selectedRepo === null) {
+ return;
+ }
+
+ // Get effective settings for this workspace/repo
+ const repoPath = normalizeRepoPath(selectedRepo.git_repo_resource_path);
+ const effectiveSettings = await getEffectiveSettings(localConfig, opts.promotion, true, opts.jsonOutput);
+
+ // Convert to backend format
+ const backendFormat = GitSyncSettingsConverter.toBackendFormat(effectiveSettings);
+
+ // Calculate diff for all modes
+ const currentBackend = selectedRepo.settings;
+
+ // Convert current backend settings to SyncOptions for user-friendly display
+ const currentSyncOptions: SyncOptions = GitSyncSettingsConverter.fromBackendFormat(currentBackend);
+
+ const normalizedCurrent = GitSyncSettingsConverter.normalize(currentSyncOptions);
+ const normalizedEffective = GitSyncSettingsConverter.normalize(effectiveSettings);
+ const gitSyncCurrent = GitSyncSettingsConverter.extractGitSyncFields(normalizedCurrent);
+ const gitSyncEffective = GitSyncSettingsConverter.extractGitSyncFields(normalizedEffective);
+ const hasChanges = !deepEqual(gitSyncEffective, gitSyncCurrent);
+
+ if (opts.diff) {
+ // --diff flag: show differences and exit
+ if (opts.jsonOutput) {
+ // Generate structured diff using the same normalized objects
+ const structuredDiff = hasChanges
+ ? generateStructuredDiff(gitSyncCurrent, gitSyncEffective)
+ : {};
+
+ console.log(
+ JSON.stringify({
+ success: true,
+ hasChanges,
+ local: GitSyncSettingsConverter.toBackendFormat(normalizedEffective),
+ backend: GitSyncSettingsConverter.toBackendFormat(normalizedCurrent),
+ repository: selectedRepo.git_repo_resource_path,
+ diff: structuredDiff,
+ }),
+ );
+ } else {
+ if (hasChanges) {
+ log.info("Changes that would be pushed to Windmill:");
+ const changes = generateChanges(
+ currentSyncOptions,
+ effectiveSettings,
+ );
+
+ if (Object.keys(changes).length === 0) {
+ log.info(colors.green("No changes to push"));
+ } else {
+ displayChanges(changes);
+ }
+ } else {
+ log.info(colors.green("No changes to push"));
+ }
+ }
+ return;
+ }
+
+ // Default behavior: show changes and ask for confirmation (unless --yes is passed)
+ if (hasChanges) {
+ if (!opts.jsonOutput) {
+ const changes = generateChanges(
+ currentSyncOptions,
+ effectiveSettings,
+ );
+
+ if (Object.keys(changes).length === 0) {
+ log.info(colors.green("No changes to push"));
+ return;
+ } else {
+ log.info("Changes that would be pushed to Windmill:");
+ displayChanges(changes);
+ }
+ }
+
+ // Ask for confirmation unless --yes is passed or not in TTY
+ if (!opts.yes && Deno.stdin.isTerminal()) {
+ const confirmed = await Confirm.prompt({
+ message: `Do you want to apply these changes to the remote?`,
+ default: true,
+ });
+
+ if (!confirmed) {
+ return;
+ }
+ }
+ } else {
+ log.info(colors.green("No changes to push"));
+ return;
+ }
+
+ if (opts.withBackendSettings) {
+ // Skip backend update when using simulated settings
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message:
+ `Git-sync settings push simulated (--with-backend-settings used)`,
+ repository: selectedRepo.git_repo_resource_path,
+ simulated: true,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ `Git-sync settings push simulated for ${selectedRepo.git_repo_resource_path} (--with-backend-settings used)`,
+ ),
+ );
+ }
+ } else {
+ // Update the specific repository settings
+ const updatedRepos = settings.git_sync.repositories.map(
+ (repo: GitSyncRepository) => {
+ if (
+ repo.git_repo_resource_path ===
+ selectedRepo.git_repo_resource_path
+ ) {
+ return {
+ ...repo,
+ settings: backendFormat,
+ };
+ }
+ return repo;
+ },
+ );
+
+ // Push updated settings to backend
+ try {
+ await wmill.editWorkspaceGitSyncConfig({
+ workspace: workspace.workspaceId,
+ requestBody: {
+ git_sync_settings: {
+ repositories: updatedRepos,
+ },
+ },
+ });
+ } catch (apiError) {
+ const errorMessage = apiError instanceof Error ? apiError.message : String(apiError);
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: false,
+ error: `Failed to update workspace git-sync config: ${errorMessage}`,
+ }),
+ );
+ } else {
+ log.error(
+ colors.red(
+ `Failed to update workspace git-sync config: ${errorMessage}`,
+ ),
+ );
+ }
+ return;
+ }
+
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({
+ success: true,
+ message: `Git-sync settings pushed successfully`,
+ repository: selectedRepo.git_repo_resource_path,
+ }),
+ );
+ } else {
+ log.info(
+ colors.green(
+ `Git-sync settings pushed successfully to ${selectedRepo.git_repo_resource_path}`,
+ ),
+ );
+ }
+ }
+ } catch (error) {
+ const errorMessage = error instanceof Error ? error.message : String(error);
+ if (opts.jsonOutput) {
+ console.log(
+ JSON.stringify({ success: false, error: errorMessage }),
+ );
+ } else {
+ log.error(
+ colors.red(
+ `Failed to push git-sync settings: ${errorMessage}`,
+ ),
+ );
+ }
+ }
+}
diff --git a/cli/src/commands/gitsync-settings/types.ts b/cli/src/commands/gitsync-settings/types.ts
new file mode 100644
index 0000000000..36b51aedbc
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/types.ts
@@ -0,0 +1,63 @@
+import { Repository } from "../../utils/utils.ts";
+
+// Interface for git-sync repository settings from backend
+export interface GitSyncRepository extends Repository {
+ settings: {
+ include_path: string[];
+ include_type: string[];
+ exclude_path?: string[];
+ extra_include_path?: string[];
+ };
+}
+
+// Backend format for git-sync settings
+export interface BackendGitSyncSettings {
+ include_path: string[];
+ include_type: string[];
+ exclude_path?: string[];
+ extra_include_path?: string[];
+}
+
+// Constants for git-sync fields
+export const GIT_SYNC_FIELDS = [
+ "includes",
+ "excludes",
+ "extraIncludes",
+ "skipScripts",
+ "skipFlows",
+ "skipApps",
+ "skipFolders",
+ "skipVariables",
+ "skipResources",
+ "skipResourceTypes",
+ "skipSecrets",
+ "includeSchedules",
+ "includeTriggers",
+ "includeUsers",
+ "includeGroups",
+ "includeSettings",
+ "includeKey",
+] as const;
+
+export type GitSyncField = typeof GIT_SYNC_FIELDS[number];
+
+// Type mappings for backend include_type values
+export const INCLUDE_TYPE_MAPPINGS = {
+ script: "skipScripts",
+ flow: "skipFlows",
+ app: "skipApps",
+ folder: "skipFolders",
+ variable: "skipVariables",
+ resource: "skipResources",
+ resourcetype: "skipResourceTypes",
+ secret: "skipSecrets",
+ schedule: "includeSchedules",
+ trigger: "includeTriggers",
+ user: "includeUsers",
+ group: "includeGroups",
+ settings: "includeSettings",
+ key: "includeKey",
+} as const;
+
+// Write mode for branch-based configuration
+export type WriteMode = "override" | "replace";
\ No newline at end of file
diff --git a/cli/src/commands/gitsync-settings/utils.ts b/cli/src/commands/gitsync-settings/utils.ts
new file mode 100644
index 0000000000..47db2c8dfb
--- /dev/null
+++ b/cli/src/commands/gitsync-settings/utils.ts
@@ -0,0 +1,188 @@
+import { colors, log } from "../../../deps.ts";
+import { deepEqual, selectRepository } from "../../utils/utils.ts";
+import { SyncOptions, getEffectiveSettings, DEFAULT_SYNC_OPTIONS } from "../../core/conf.ts";
+import { GitSyncRepository, GIT_SYNC_FIELDS } from "./types.ts";
+import { GitSyncSettingsConverter } from "./converter.ts";
+
+// Helper for consistent output handling between JSON and regular modes
+export function outputResult(opts: { jsonOutput?: boolean }, result: {
+ success: boolean;
+ message?: string;
+ error?: string;
+ [key: string]: any;
+}): void {
+ if (opts.jsonOutput) {
+ console.log(JSON.stringify(result));
+ } else if (result.success && result.message) {
+ log.info(colors.green(result.message));
+ } else if (!result.success && result.error) {
+ log.error(colors.red(result.error));
+ }
+}
+
+// Helper to normalize repository path by removing $res: prefix
+export function normalizeRepoPath(path: string): string {
+ return path.replace(/^\$res:/, "");
+}
+
+// Helper to get or create branch configuration
+export function getOrCreateBranchConfig(config: SyncOptions, branchName: string): {
+ config: SyncOptions;
+ branchKey: string;
+} {
+ if (!config.git_branches) {
+ config.git_branches = {};
+ }
+
+ if (!config.git_branches[branchName]) {
+ config.git_branches[branchName] = {};
+ }
+
+ return {
+ config,
+ branchKey: branchName
+ };
+}
+
+// Helper to apply backend settings to branch configuration
+export function applyBackendSettingsToBranch(
+ config: SyncOptions,
+ branchName: string,
+ backendSettings: SyncOptions
+): SyncOptions {
+ const { config: updatedConfig } = getOrCreateBranchConfig(config, branchName);
+
+ // Get the base settings (top-level + defaults) to compare against
+ const { git_branches, ...topLevelSettings } = config;
+ const baseSettings: Partial = { ...DEFAULT_SYNC_OPTIONS, ...topLevelSettings };
+
+ // Only store fields that differ from the base settings
+ Object.keys(backendSettings).forEach(key => {
+ if (key !== 'git_branches' && backendSettings[key as keyof SyncOptions] !== undefined) {
+ const backendValue = backendSettings[key as keyof SyncOptions];
+ const baseValue = baseSettings[key as keyof SyncOptions];
+
+ // Only store if different from base
+ const isDifferent = GitSyncSettingsConverter.isDifferent(backendValue, baseValue);
+
+ if (isDifferent) {
+ if (!updatedConfig.git_branches![branchName].overrides) {
+ updatedConfig.git_branches![branchName].overrides = {};
+ }
+ (updatedConfig.git_branches![branchName].overrides as any)[key] = backendValue;
+ }
+ }
+ });
+
+ return updatedConfig;
+}
+
+// Select repository interactively if multiple exist
+export async function selectAndLogRepository(
+ repositories: GitSyncRepository[],
+ repository?: string,
+ suppressLogs?: boolean,
+): Promise {
+ let selectedRepo: GitSyncRepository;
+
+ if (repository) {
+ const found = repositories.find(
+ (r: GitSyncRepository) =>
+ r.git_repo_resource_path === repository ||
+ r.git_repo_resource_path === `$res:${repository}`,
+ );
+ if (!found) {
+ throw new Error(`Repository ${repository} not found`);
+ }
+ selectedRepo = found;
+ const repoPath = selectedRepo.git_repo_resource_path.replace(/^\$res:/, "");
+ if (!suppressLogs) {
+ log.info(colors.cyan(`Using repository: ${colors.bold(repoPath)}`));
+ }
+ } else {
+ selectedRepo = await selectRepository(repositories);
+ }
+
+ return selectedRepo;
+}
+
+// Generate structured diff showing field changes
+export function generateStructuredDiff(
+ current: any,
+ backend: any,
+): { [key: string]: { from: any; to: any } } {
+ const diff: { [key: string]: { from: any; to: any } } = {};
+
+ // Get all unique keys from both objects
+ const allKeys = new Set([...Object.keys(current), ...Object.keys(backend)]);
+
+ for (const key of allKeys) {
+ const currentValue = current[key];
+ const backendValue = backend[key];
+
+ if (!deepEqual(currentValue, backendValue)) {
+ diff[key] = {
+ from: currentValue,
+ to: backendValue,
+ };
+ }
+ }
+
+ return diff;
+}
+
+// Helper to generate changes between two SyncOptions objects (normalizes automatically)
+export function generateChanges(
+ current: SyncOptions,
+ new_: SyncOptions,
+): { [key: string]: { from: any; to: any } } {
+ const changes: { [key: string]: { from: any; to: any } } = {};
+
+ // Normalize both inputs for consistent comparison
+ const normalizedCurrent = GitSyncSettingsConverter.normalize(current);
+ const normalizedNew = GitSyncSettingsConverter.normalize(new_);
+
+ for (const field of GIT_SYNC_FIELDS) {
+ const currentValue = (normalizedCurrent as any)[field];
+ const newValue = (normalizedNew as any)[field];
+ if (!deepEqual(currentValue, newValue)) {
+ changes[field] = {
+ from: currentValue,
+ to: newValue,
+ };
+ }
+ }
+
+ return changes;
+}
+
+// Helper to display changes in human-readable format
+export function displayChanges(
+ changes: { [key: string]: { from: any; to: any } },
+): void {
+ for (const [field, change] of Object.entries(changes)) {
+ if (
+ Array.isArray(change.from) ||
+ Array.isArray(change.to)
+ ) {
+ console.log(colors.yellow(` ${field}:`));
+ console.log(
+ colors.red(
+ ` - ${JSON.stringify(change.from)}`,
+ ),
+ );
+ console.log(
+ colors.green(
+ ` + ${JSON.stringify(change.to)}`,
+ ),
+ );
+ } else {
+ console.log(
+ colors.yellow(` ${field}: `) +
+ colors.red(`${change.from}`) +
+ " → " +
+ colors.green(`${change.to}`),
+ );
+ }
+ }
+}
diff --git a/cli/src/commands/init/init.ts b/cli/src/commands/init/init.ts
index fc612e7922..c150c4f4fc 100644
--- a/cli/src/commands/init/init.ts
+++ b/cli/src/commands/init/init.ts
@@ -3,6 +3,7 @@ import {
Command,
log,
yamlStringify,
+ Confirm,
} from "../../../deps.ts";
import { GlobalOptions } from "../../types.ts";
import { readLockfile } from "../../utils/metadata.ts";
@@ -19,6 +20,7 @@ export interface InitOptions {
token?: string;
baseUrl?: string;
configDir?: string;
+ bindProfile?: boolean;
}
/**
@@ -32,22 +34,24 @@ async function initAction(opts: InitOptions) {
const { DEFAULT_SYNC_OPTIONS } = await import("../../core/conf.ts");
// Create initial config with defaults
- const initialConfig = {
- defaultTs: DEFAULT_SYNC_OPTIONS.defaultTs,
- includes: DEFAULT_SYNC_OPTIONS.includes,
- excludes: DEFAULT_SYNC_OPTIONS.excludes,
- codebases: DEFAULT_SYNC_OPTIONS.codebases,
- skipVariables: DEFAULT_SYNC_OPTIONS.skipVariables,
- skipResources: DEFAULT_SYNC_OPTIONS.skipResources,
- skipSecrets: DEFAULT_SYNC_OPTIONS.skipSecrets,
- skipScripts: DEFAULT_SYNC_OPTIONS.skipScripts,
- skipFlows: DEFAULT_SYNC_OPTIONS.skipFlows,
- skipApps: DEFAULT_SYNC_OPTIONS.skipApps,
- skipFolders: DEFAULT_SYNC_OPTIONS.skipFolders,
- includeSchedules: DEFAULT_SYNC_OPTIONS.includeSchedules,
- includeTriggers: DEFAULT_SYNC_OPTIONS.includeTriggers,
- overrides: {},
- };
+ const initialConfig = { ...DEFAULT_SYNC_OPTIONS } as any;
+
+ // Add branch structure
+ const { isGitRepository, getCurrentGitBranch } = await import(
+ "../../utils/git.ts"
+ );
+ if (isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+ if (currentBranch) {
+ initialConfig.git_branches = {
+ [currentBranch]: { overrides: {} },
+ };
+ } else {
+ initialConfig.git_branches = {};
+ }
+ } else {
+ initialConfig.git_branches = {};
+ }
await Deno.writeTextFile("wmill.yaml", yamlStringify(initialConfig));
log.info(colors.green("wmill.yaml created with default settings"));
@@ -55,6 +59,89 @@ async function initAction(opts: InitOptions) {
// Create lock file
await readLockfile();
+ // Offer to bind workspace profile to current branch
+ if (isGitRepository()) {
+ const { getActiveWorkspace } = await import("../workspace/workspace.ts");
+ const activeWorkspace = await getActiveWorkspace(
+ opts as GlobalOptions
+ );
+ const currentBranch = getCurrentGitBranch();
+
+ if (activeWorkspace && currentBranch) {
+ // Determine binding behavior based on flags
+ const shouldBind = opts.bindProfile === true;
+ const shouldPrompt =
+ opts.bindProfile === undefined &&
+ Deno.stdin.isTerminal() &&
+ !opts.useDefault;
+ const shouldSkip =
+ opts.bindProfile === false ||
+ opts.useDefault ||
+ (!Deno.stdin.isTerminal() && opts.bindProfile === undefined);
+
+ if (shouldSkip) {
+ return;
+ }
+
+ // Show workspace info if we're binding or prompting
+ if (shouldBind || shouldPrompt) {
+ log.info(
+ colors.yellow(
+ `\nCurrent Git branch: ${colors.bold(currentBranch)}`
+ )
+ );
+ log.info(
+ colors.yellow(
+ `Active workspace profile: ${colors.bold(
+ activeWorkspace.name
+ )}`
+ )
+ );
+ log.info(
+ colors.yellow(
+ ` ${activeWorkspace.workspaceId} on ${activeWorkspace.remote}`
+ )
+ );
+ }
+
+ if (
+ shouldBind ||
+ (shouldPrompt &&
+ (await Confirm.prompt({
+ message: "Bind workspace profile to current Git branch?",
+ default: true,
+ })))
+ ) {
+ // Update the config with workspace binding
+ const currentConfig = await import("../../core/conf.ts").then((m) =>
+ m.readConfigFile()
+ );
+ if (!currentConfig.git_branches) {
+ currentConfig.git_branches = {};
+ }
+ if (!currentConfig.git_branches[currentBranch]) {
+ currentConfig.git_branches[currentBranch] = { overrides: {} };
+ }
+
+ currentConfig.git_branches[currentBranch].baseUrl =
+ activeWorkspace.remote;
+ currentConfig.git_branches[currentBranch].workspaceId =
+ activeWorkspace.workspaceId;
+
+ await Deno.writeTextFile(
+ "wmill.yaml",
+ yamlStringify(currentConfig)
+ );
+
+ log.info(
+ colors.green(
+ `✓ Bound branch '${currentBranch}' to workspace '${activeWorkspace.name}'`
+ )
+ );
+ }
+ }
+ }
+
// Check for backend git-sync settings unless --use-default is specified
if (!opts.useDefault) {
try {
@@ -153,10 +240,8 @@ async function initAction(opts: InitOptions) {
}
} catch (error) {
// If there's an error checking backend settings, just continue with defaults
- const errorMessage =
- error instanceof Error ? error.message : String(error);
log.warn(
- `Could not check backend for git-sync settings: ${errorMessage}`
+ `Could not check backend for git-sync settings: ${error.message}`
);
log.info("Continuing with default settings");
}
@@ -223,6 +308,11 @@ const command = new Command()
"--repository ",
"Specify repository path (e.g., u/user/repo) when using backend settings"
)
+ .option(
+ "--bind-profile",
+ "Automatically bind active workspace profile to current Git branch"
+ )
+ .option("--no-bind-profile", "Skip workspace profile binding prompt")
.action(initAction as any);
-export default command;
\ No newline at end of file
+export default command;
diff --git a/cli/src/commands/sync/sync.ts b/cli/src/commands/sync/sync.ts
index 32d387cf76..b1ebfcfcda 100644
--- a/cli/src/commands/sync/sync.ts
+++ b/cli/src/commands/sync/sync.ts
@@ -37,7 +37,12 @@ import {
import { handleFile } from "../script/script.ts";
import { deepEqual, isFileResource } from "../../utils/utils.ts";
-import { SyncOptions, readConfigFile, getEffectiveSettings } from "../../core/conf.ts";
+import {
+ SyncOptions,
+ readConfigFile,
+ getEffectiveSettings,
+ validateBranchConfiguration,
+} from "../../core/conf.ts";
import { Workspace } from "../workspace/workspace.ts";
import { removePathPrefix } from "../../types.ts";
import { SyncCodebase, listSyncCodebases } from "../../utils/codebase.ts";
@@ -59,98 +64,13 @@ function mergeCliWithEffectiveOptions<
return Object.assign({}, effectiveOpts, cliOpts) as T;
}
-// Resolve effective sync options with smart repository detection
+// Resolve effective sync options using branch-based configuration
async function resolveEffectiveSyncOptions(
workspace: Workspace,
- repositoryPath?: string
+ promotion?: string
): Promise {
const localConfig = await readConfigFile();
-
- // If repository path is already specified, use it directly
- if (repositoryPath) {
- return getEffectiveSettings(
- localConfig,
- workspace.remote,
- workspace.workspaceId,
- repositoryPath
- );
- }
-
- // Auto-detect repository from overrides if not specified
- if (localConfig.overrides) {
- const prefix = `${workspace.remote}:${workspace.workspaceId}:`;
- const applicableRepos: string[] = [];
-
- // Find all repository-specific overrides for this workspace
- for (const key of Object.keys(localConfig.overrides)) {
- if (key.startsWith(prefix) && !key.endsWith(":*")) {
- const repo = key.substring(prefix.length);
- if (repo) {
- applicableRepos.push(repo);
- }
- }
- }
-
- if (applicableRepos.length === 1) {
- // Single repository found - auto-select it
- log.info(`Auto-selected repository: ${applicableRepos[0]}`);
- return getEffectiveSettings(
- localConfig,
- workspace.remote,
- workspace.workspaceId,
- applicableRepos[0]
- );
- } else if (applicableRepos.length > 1) {
- // Multiple repositories found - prompt for selection
- const isInteractive = Deno.stdin.isTerminal() && Deno.stdout.isTerminal();
-
- if (isInteractive) {
- const choices = [
- {
- name: "Use top-level settings (no repository-specific override)",
- value: "",
- },
- ...applicableRepos.map((repo) => ({ name: repo, value: repo })),
- ];
-
- const selectedRepo = await Select.prompt({
- message: "Multiple repository overrides found. Select which to use:",
- options: choices,
- });
-
- if (selectedRepo) {
- log.info(`Selected repository: ${selectedRepo}`);
- }
-
- return getEffectiveSettings(
- localConfig,
- workspace.remote,
- workspace.workspaceId,
- selectedRepo
- );
- } else {
- // Non-interactive mode - list options and use top-level
- log.warn(
- `Multiple repository overrides found: ${applicableRepos.join(", ")}`
- );
- log.warn(
- `Running in non-interactive mode. Use --repository flag to specify which one to use.`
- );
- log.info(
- `Falling back to top-level settings (no repository-specific overrides applied)`
- );
- }
- }
- }
-
- // No repository overrides found or selected - use top-level settings
- log.info(`No repository overrides found, using top-level settings`);
- return getEffectiveSettings(
- localConfig,
- workspace.remote,
- workspace.workspaceId,
- ""
- );
+ return await getEffectiveSettings(localConfig, promotion);
}
type DynFSElement = {
@@ -1138,8 +1058,20 @@ async function buildTracker(changes: Change[]) {
}
export async function pull(
- opts: GlobalOptions & SyncOptions & { repository?: string }
+ opts: GlobalOptions &
+ SyncOptions & { repository?: string; promotion?: string }
) {
+ // Validate branch configuration early
+ try {
+ await validateBranchConfiguration(false, opts.yes);
+ } catch (error) {
+ if (error instanceof Error && error.message.includes("overrides")) {
+ log.error(error.message);
+ Deno.exit(1);
+ }
+ throw error;
+ }
+
if (opts.stateful) {
await ensureDir(path.join(Deno.cwd(), ".wmill"));
}
@@ -1147,10 +1079,10 @@ export async function pull(
const workspace = await resolveWorkspace(opts);
await requireLogin(opts);
- // Resolve effective sync options with repository awareness
+ // Resolve effective sync options with branch awareness
const effectiveOpts = await resolveEffectiveSyncOptions(
workspace,
- opts.repository
+ opts.promotion
);
// Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
@@ -1465,13 +1397,24 @@ function removeSuffix(str: string, suffix: string) {
export async function push(
opts: GlobalOptions & SyncOptions & { repository?: string }
) {
+ // Validate branch configuration early
+ try {
+ await validateBranchConfiguration(false, opts.yes);
+ } catch (error) {
+ if (error instanceof Error && error.message.includes("overrides")) {
+ log.error(error.message);
+ Deno.exit(1);
+ }
+ throw error;
+ }
+
const workspace = await resolveWorkspace(opts);
await requireLogin(opts);
- // Resolve effective sync options with repository awareness
+ // Resolve effective sync options with branch awareness
const effectiveOpts = await resolveEffectiveSyncOptions(
workspace,
- opts.repository
+ opts.promotion
);
// Merge CLI flags with resolved settings (CLI flags take precedence only for explicit overrides)
@@ -2074,6 +2017,10 @@ const command = new Command()
"--repository ",
"Specify repository path (e.g., u/user/repo) when multiple repositories exist"
)
+ .option(
+ "--promotion ",
+ "Use promotionOverrides from the specified branch instead of regular overrides"
+ )
// deno-lint-ignore no-explicit-any
.action(pull as any)
.command("push")
diff --git a/cli/src/commands/workspace/workspace.ts b/cli/src/commands/workspace/workspace.ts
index b4bab0866c..fbf93aed76 100644
--- a/cli/src/commands/workspace/workspace.ts
+++ b/cli/src/commands/workspace/workspace.ts
@@ -298,42 +298,6 @@ export async function addWorkspace(workspace: Workspace, opts: any) {
}
}
- // Check 2: Same (remote, workspaceId) tuple already exists under different name
- const tupleConflict = existingWorkspaces.find(w =>
- w.remote === workspace.remote &&
- w.workspaceId === workspace.workspaceId &&
- w.name !== workspace.name
- );
-
- if (tupleConflict) {
- log.info(colors.red.bold(`❌ Workspace ${workspace.workspaceId} on ${workspace.remote} already exists!`));
- log.info(` Existing name: "${tupleConflict.name}"`);
- log.info(` New name: "${workspace.name}"`);
- log.info(colors.yellow(`\nNote: Backend constraint prevents duplicate (remote, workspaceId) combinations.`));
-
- if (!isInteractive) {
- // In non-interactive mode (tests, scripts), auto-overwrite with force flag
- if (opts.force) {
- log.info(colors.yellow(`Force flag enabled, overwriting existing workspace "${tupleConflict.name}".`));
- } else {
- throw new Error(`Backend constraint violation: (${workspace.remote}, ${workspace.workspaceId}) already exists as "${tupleConflict.name}". Use --force to overwrite.`);
- }
- } else {
- const overwrite = await Confirm.prompt({
- message: `Do you want to overwrite the existing workspace "${tupleConflict.name}"?`,
- default: false,
- });
-
- if (!overwrite) {
- log.info(colors.yellow("Operation cancelled."));
- return;
- }
- }
-
- // Remove the conflicting workspace
- await removeWorkspace(tupleConflict.name, true, opts);
- }
-
// Remove existing workspace with same name (if updating)
await removeWorkspace(workspace.name, true, opts);
@@ -395,7 +359,74 @@ async function whoami(_opts: GlobalOptions) {
log.info("Active: " + colors.green.bold(activeName || "none"));
}
+async function bind(
+ opts: GlobalOptions & { branch?: string },
+ bindWorkspace?: boolean
+) {
+ const { isGitRepository, getCurrentGitBranch } = await import("../../utils/git.ts");
+
+ if (!isGitRepository()) {
+ log.error(colors.red("Not in a Git repository"));
+ return;
+ }
+
+ const branch = opts.branch || getCurrentGitBranch();
+ if (!branch) {
+ log.error(colors.red("Could not determine current Git branch"));
+ return;
+ }
+
+ const { readConfigFile } = await import("../../core/conf.ts");
+ const config = await readConfigFile();
+
+ const activeWorkspace = await getActiveWorkspace(opts);
+ if (!activeWorkspace && bindWorkspace) {
+ log.error(colors.red("No active workspace. Use 'wmill workspace add' or 'wmill workspace switch' first"));
+ return;
+ }
+
+ // For unbind, check if branch exists
+ if (!bindWorkspace && (!config.git_branches || !config.git_branches[branch])) {
+ log.error(colors.red(`Branch '${branch}' not found in wmill.yaml git_branches`));
+ return;
+ }
+
+ // Update the branch configuration with workspace binding
+ if (!config.git_branches) {
+ config.git_branches = {};
+ }
+ if (!config.git_branches[branch]) {
+ config.git_branches[branch] = { overrides: {} };
+ }
+
+ if (bindWorkspace && activeWorkspace) {
+ config.git_branches[branch].baseUrl = activeWorkspace.remote;
+ config.git_branches[branch].workspaceId = activeWorkspace.workspaceId;
+
+ log.info(colors.green(
+ `✓ Bound branch '${branch}' to workspace '${activeWorkspace.name}'\n` +
+ ` ${activeWorkspace.workspaceId} on ${activeWorkspace.remote}`
+ ));
+ } else {
+ // Unbind
+ delete config.git_branches[branch].baseUrl;
+ delete config.git_branches[branch].workspaceId;
+
+ log.info(colors.green(`✓ Removed workspace binding from branch '${branch}'`));
+ }
+
+ // Write back the updated config
+ const { yamlStringify } = await import("../../../deps.ts");
+ try {
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(config));
+ } catch (error) {
+ log.error(colors.red(`Failed to save configuration: ${error.message}`));
+ return;
+ }
+}
+
const command = new Command()
+ .alias("profile")
.description("workspace related commands")
.action(list as any)
.command("switch")
@@ -425,6 +456,14 @@ const command = new Command()
.action(remove as any)
.command("whoami")
.description("Show the currently active user")
- .action(whoami as any);
+ .action(whoami as any)
+ .command("bind")
+ .description("Bind the current Git branch to the active workspace")
+ .option("--branch ", "Specify branch (defaults to current)")
+ .action((opts) => bind(opts as any, true))
+ .command("unbind")
+ .description("Remove workspace binding from the current Git branch")
+ .option("--branch ", "Specify branch (defaults to current)")
+ .action((opts) => bind(opts as any, false));
export default command;
diff --git a/cli/src/core/branch-profiles.ts b/cli/src/core/branch-profiles.ts
new file mode 100644
index 0000000000..006b7fed18
--- /dev/null
+++ b/cli/src/core/branch-profiles.ts
@@ -0,0 +1,74 @@
+import { log } from "../../deps.ts";
+import { getStore } from "./store.ts";
+
+export interface BranchProfileMapping {
+ lastUsed: {
+ [key: string]: string; // key format: "branch|baseUrl|workspaceId" -> profile name
+ };
+}
+
+const BRANCH_PROFILES_FILE = "branch-profiles.json";
+
+export async function getBranchProfilesPath(configDirOverride?: string): Promise {
+ return (await getStore("", configDirOverride)) + BRANCH_PROFILES_FILE;
+}
+
+export async function loadBranchProfiles(configDirOverride?: string): Promise {
+ try {
+ const path = await getBranchProfilesPath(configDirOverride);
+ const content = await Deno.readTextFile(path);
+ return JSON.parse(content);
+ } catch {
+ // File doesn't exist or invalid JSON - return empty mapping
+ return { lastUsed: {} };
+ }
+}
+
+export async function saveBranchProfiles(
+ mapping: BranchProfileMapping,
+ configDirOverride?: string
+): Promise {
+ const path = await getBranchProfilesPath(configDirOverride);
+ await Deno.writeTextFile(path, JSON.stringify(mapping, null, 2));
+}
+
+export function getBranchProfileKey(
+ branch: string,
+ baseUrl: string,
+ workspaceId: string
+): string {
+ // Normalize baseUrl to ensure consistency
+ let normalizedUrl: string;
+ try {
+ normalizedUrl = new URL(baseUrl).toString();
+ } catch {
+ // Fallback to non-normalized URL if parsing fails
+ normalizedUrl = baseUrl;
+ }
+ return `${branch}|${normalizedUrl}|${workspaceId}`;
+}
+
+export async function getLastUsedProfile(
+ branch: string,
+ baseUrl: string,
+ workspaceId: string,
+ configDirOverride?: string
+): Promise {
+ const mapping = await loadBranchProfiles(configDirOverride);
+ const key = getBranchProfileKey(branch, baseUrl, workspaceId);
+ return mapping.lastUsed[key];
+}
+
+export async function setLastUsedProfile(
+ branch: string,
+ baseUrl: string,
+ workspaceId: string,
+ profileName: string,
+ configDirOverride?: string
+): Promise {
+ const mapping = await loadBranchProfiles(configDirOverride);
+ const key = getBranchProfileKey(branch, baseUrl, workspaceId);
+ mapping.lastUsed[key] = profileName;
+ await saveBranchProfiles(mapping, configDirOverride);
+ log.debug(`Saved last used profile for ${key}: ${profileName}`);
+}
diff --git a/cli/src/core/conf.ts b/cli/src/core/conf.ts
index efbbb56f17..23f2fd2820 100644
--- a/cli/src/core/conf.ts
+++ b/cli/src/core/conf.ts
@@ -1,4 +1,5 @@
-import { log, yamlParseFile } from "../../deps.ts";
+import { log, yamlParseFile, Confirm, yamlStringify } from "../../deps.ts";
+import { getCurrentGitBranch, isGitRepository } from "../utils/git.ts";
export let showDiffs = false;
export function setShowDiffs(value: boolean) {
@@ -36,7 +37,15 @@ export interface SyncOptions {
codebases?: Codebase[];
parallel?: number;
jsonOutput?: boolean;
- overrides?: { [key: string]: Partial };
+ git_branches?: {
+ [branchName: string]: SyncOptions & {
+ overrides?: Partial;
+ promotionOverrides?: Partial;
+ baseUrl?: string;
+ workspaceId?: string;
+ }
+ };
+ promotion?: string;
}
export interface Codebase {
@@ -56,6 +65,31 @@ export interface Codebase {
export async function readConfigFile(): Promise {
try {
const conf = (await yamlParseFile("wmill.yaml")) as SyncOptions;
+
+ // Handle obsolete overrides format
+ if (conf && 'overrides' in conf) {
+ const overrides = conf.overrides as any;
+ const hasSettings = overrides && typeof overrides === 'object' && Object.keys(overrides).length > 0;
+
+ if (hasSettings) {
+ throw new Error(
+ "❌ The 'overrides' field is no longer supported.\n" +
+ " The configuration system now uses Git branch-based configuration only.\n" +
+ " Please delete your wmill.yaml and run 'wmill init' to recreate it with the new format."
+ );
+ } else {
+ // Remove empty overrides with a note
+ log.info("ℹ️ Removing empty 'overrides: {}' from wmill.yaml (migrated to git_branches format)");
+ delete conf.overrides;
+ // Write the updated config back to file
+ try {
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(conf));
+ } catch (error) {
+ log.warn(`Could not update wmill.yaml to remove empty overrides: ${error instanceof Error ? error.message : error}`);
+ }
+ }
+ }
+
if (conf?.defaultTs == undefined) {
log.warn(
"No defaultTs defined in your wmill.yaml. Using 'bun' as default."
@@ -63,6 +97,9 @@ export async function readConfigFile(): Promise {
}
return typeof conf == "object" ? conf : ({} as SyncOptions);
} catch (e) {
+ if (e instanceof Error && (e.message.includes("overrides") || e.message.includes("Obsolete configuration format"))) {
+ throw e; // Re-throw the specific obsolete format error
+ }
log.warn(
"No wmill.yaml found. Use 'wmill init' to bootstrap it. Using 'bun' as default typescript runtime."
);
@@ -104,53 +141,107 @@ export async function mergeConfigWithConfigFile(
return Object.assign(configFile ?? {}, opts);
}
-// Get effective settings by merging top-level settings and overrides
-export function getEffectiveSettings(
- config: SyncOptions,
- baseUrl: string,
- workspaceId: string,
- repo: string
-): SyncOptions {
- // Start with empty object - no defaults
- let effective = {} as SyncOptions;
+// Validate branch configuration early in the process
+export async function validateBranchConfiguration(skipValidation?: boolean, autoAccept?: boolean): Promise {
+ if (skipValidation || !isGitRepository()) {
+ return;
+ }
- // Merge top-level settings from config (which contains user's chosen defaults)
- Object.keys(config).forEach(key => {
- if (key !== 'overrides' && config[key as keyof SyncOptions] !== undefined) {
- (effective as any)[key] = config[key as keyof SyncOptions];
+ const config = await readConfigFile();
+ const { git_branches } = config;
+ const currentBranch = getCurrentGitBranch();
+
+ // In a git repository, git_branches section is recommended
+ if (!git_branches || Object.keys(git_branches).length === 0) {
+ log.warn(
+ "⚠️ WARNING: In a Git repository, the 'git_branches' section is recommended in wmill.yaml.\n" +
+ " Consider adding a git_branches section with configuration for your Git branches.\n" +
+ " Run 'wmill init' to recreate the configuration file with proper branch setup."
+ );
+ return;
+ }
+
+ // Current branch must be defined in git_branches config
+ if (currentBranch && !git_branches[currentBranch]) {
+ // In interactive mode, offer to create the branch
+ if (Deno.stdin.isTerminal()) {
+ const availableBranches = Object.keys(git_branches).join(', ');
+ log.info(
+ `Current Git branch '${currentBranch}' is not defined in the git_branches configuration.\n` +
+ `Available branches: ${availableBranches}`
+ );
+
+ const shouldCreate = autoAccept || await Confirm.prompt({
+ message: `Create empty branch configuration for '${currentBranch}'?`,
+ default: true,
+ });
+
+ if (shouldCreate) {
+ // Read current config, add branch, and write it back
+ const currentConfig = await readConfigFile();
+
+ if (!currentConfig.git_branches) {
+ currentConfig.git_branches = {};
+ }
+ currentConfig.git_branches[currentBranch] = { overrides: {} };
+
+ await Deno.writeTextFile("wmill.yaml", yamlStringify(currentConfig));
+
+ log.info(`✅ Created empty branch configuration for '${currentBranch}'`);
+ } else {
+ log.warn("⚠️ WARNING: Branch creation cancelled. You can manually add the branch to wmill.yaml or use 'wmill gitsync-settings pull' to pull configuration from an existing windmill workspace git-sync configuration.");
+ return;
+ }
+ } else {
+ log.warn(
+ `⚠️ WARNING: Current Git branch '${currentBranch}' is not defined in the git_branches configuration.\n` +
+ ` Consider adding configuration for branch '${currentBranch}' in the git_branches section of wmill.yaml.\n` +
+ ` Available branches: ${Object.keys(git_branches).join(', ')}`
+ );
+ return;
}
- });
+ }
+}
- if (!config.overrides) {
- if (repo) {
- log.info(`No overrides found in wmill.yaml, using top-level settings (repository flag ignored)`);
+// Get effective settings by merging top-level settings with branch-specific overrides
+export async function getEffectiveSettings(config: SyncOptions, promotion?: string, skipBranchValidation?: boolean, suppressLogs?: boolean): Promise {
+ // Start with top-level settings from config
+ const { git_branches, ...topLevelSettings } = config;
+ let effective = { ...topLevelSettings };
+
+ if (isGitRepository()) {
+ const currentBranch = getCurrentGitBranch();
+
+ // If promotion is specified, use that branch's promotionOverrides or overrides
+ if (promotion && git_branches && git_branches[promotion]) {
+ const targetBranch = git_branches[promotion];
+
+ // First try promotionOverrides, then fall back to overrides
+ if (targetBranch.promotionOverrides) {
+ Object.assign(effective, targetBranch.promotionOverrides);
+ if (!suppressLogs) {
+ log.info(`Applied promotion settings from branch: ${promotion}`);
+ }
+ } else if (targetBranch.overrides) {
+ Object.assign(effective, targetBranch.overrides);
+ if (!suppressLogs) {
+ log.info(`Applied settings from branch: ${promotion} (no promotionOverrides found)`);
+ }
+ } else {
+ log.debug(`No promotion or regular overrides found for branch '${promotion}', using top-level settings`);
+ }
}
- return effective;
- }
-
- // Construct override keys using the single format
- const workspaceKey = `${baseUrl}:${workspaceId}:*`;
- const repoKey = `${baseUrl}:${workspaceId}:${repo}`;
-
- let appliedOverrides: string[] = [];
-
- // Apply workspace-level overrides
- if (config.overrides[workspaceKey]) {
- Object.assign(effective, config.overrides[workspaceKey]);
- appliedOverrides.push("workspace-level");
- }
-
- // Apply repository-specific overrides (overrides workspace-level)
- if (config.overrides[repoKey]) {
- Object.assign(effective, config.overrides[repoKey]);
- appliedOverrides.push("repository-specific");
- } else if (repo) {
- // Repository was specified but no override found
- log.info(`Repository override not found for "${repo}", using ${appliedOverrides.length > 0 ? appliedOverrides.join(" + ") : "top-level"} settings`);
- }
-
- if (appliedOverrides.length > 0) {
- log.info(`Applied ${appliedOverrides.join(" + ")} overrides${repo ? ` for repository "${repo}"` : ""}`);
+ // Otherwise use current branch overrides (existing behavior)
+ else if (currentBranch && git_branches && git_branches[currentBranch] && git_branches[currentBranch].overrides) {
+ Object.assign(effective, git_branches[currentBranch].overrides);
+ if (!suppressLogs) {
+ log.info(`Applied settings for Git branch: ${currentBranch}`);
+ }
+ } else if (currentBranch) {
+ log.debug(`No branch-specific overrides found for '${currentBranch}', using top-level settings`);
+ }
+ } else {
+ log.debug("Not in a Git repository, using top-level settings");
}
return effective;
diff --git a/cli/src/core/context.ts b/cli/src/core/context.ts
index a305f597ff..628471dcce 100644
--- a/cli/src/core/context.ts
+++ b/cli/src/core/context.ts
@@ -1,13 +1,86 @@
// deno-lint-ignore-file no-explicit-any
-import { colors, log } from "../../deps.ts";
+import { colors, log, Select, Confirm, Input } from "../../deps.ts";
+import { loginInteractive } from "./login.ts";
import { GlobalOptions } from "../types.ts";
import { getHeaders } from "../utils/utils.ts";
+
import {
getActiveWorkspace,
getWorkspaceByName,
Workspace,
+ allWorkspaces,
+ addWorkspace,
} from "../commands/workspace/workspace.ts";
+import {
+ getLastUsedProfile,
+ setLastUsedProfile
+} from "./branch-profiles.ts";
+import { readConfigFile } from "./conf.ts";
+import { getCurrentGitBranch, isGitRepository } from "../utils/git.ts";
+
+// Helper function to select from multiple matching profiles
+async function selectFromMultipleProfiles(
+ profiles: Workspace[],
+ baseUrl: string,
+ workspaceId: string,
+ context: string,
+ configDir?: string
+): Promise {
+ if (profiles.length === 1) {
+ return profiles[0];
+ }
+
+ // Check for last used profile
+ const lastUsedProfileName = await getLastUsedProfile("", baseUrl, workspaceId, configDir);
+ if (lastUsedProfileName) {
+ const lastUsedProfile = profiles.find(p => p.name === lastUsedProfileName);
+ if (lastUsedProfile) {
+ log.info(colors.green(`Using last used profile '${lastUsedProfile.name}' for ${context}`));
+ return lastUsedProfile;
+ }
+ }
+
+ // No last used or it no longer exists - prompt for selection
+ if (!Deno.stdin.isTerminal() || !Deno.stdout.isTerminal()) {
+ const selectedProfile = profiles[0];
+ log.info(colors.yellow(`Multiple profiles found for ${context}. Using first available profile: '${selectedProfile.name}'`));
+
+ // Save selection for next time
+ await setLastUsedProfile(
+ "", // No branch context for general workspace selection
+ baseUrl,
+ workspaceId,
+ selectedProfile.name,
+ configDir
+ );
+
+ return selectedProfile;
+ }
+
+ log.info(colors.yellow(`\nMultiple workspace profiles found for ${context}:`));
+
+ const selectedName = await Select.prompt({
+ message: "Select profile",
+ options: profiles.map(p => ({
+ name: `${p.name} (${p.workspaceId} on ${p.remote})`,
+ value: p.name,
+ })),
+ });
+
+ const selectedProfile = profiles.find(p => p.name === selectedName)!;
+
+ // Save selection for next time
+ await setLastUsedProfile(
+ "", // No branch context for general workspace selection
+ baseUrl,
+ workspaceId,
+ selectedProfile.name,
+ configDir
+ );
+
+ return selectedProfile;
+}
export type Context = {
workspace: string;
@@ -47,12 +120,154 @@ async function tryResolveWorkspace(
return { isError: false, value: defaultWorkspace };
}
+async function tryResolveBranchWorkspace(
+ opts: GlobalOptions
+): Promise {
+ // Only try branch-based resolution if in a Git repository
+ if (!isGitRepository()) {
+ return undefined;
+ }
+
+ const currentBranch = getCurrentGitBranch();
+ if (!currentBranch) {
+ return undefined;
+ }
+
+ // Read wmill.yaml to check for branch workspace configuration
+ const config = await readConfigFile();
+ const branchConfig = config.git_branches?.[currentBranch];
+
+ // Check if branch has workspace configuration
+ if (!branchConfig?.baseUrl || !branchConfig?.workspaceId) {
+ return undefined;
+ }
+
+ const { baseUrl, workspaceId } = branchConfig;
+ let normalizedBaseUrl: string;
+ try {
+ normalizedBaseUrl = new URL(baseUrl).toString();
+ } catch (error) {
+ log.error(colors.red(`Invalid baseUrl in branch configuration: ${baseUrl}`));
+ return undefined;
+ }
+
+ // Find all profiles matching this baseUrl and workspaceId
+ const allProfiles = await allWorkspaces(opts.configDir);
+ const matchingProfiles = allProfiles.filter(
+ w => w.remote === normalizedBaseUrl && w.workspaceId === workspaceId
+ );
+
+ if (matchingProfiles.length === 0) {
+ // No matching profile exists - prompt to create one
+ log.info(colors.yellow(
+ `\nNo workspace profile found for branch '${currentBranch}'\n` +
+ `(${normalizedBaseUrl}, ${workspaceId})`
+ ));
+
+ if (!Deno.stdin.isTerminal() || !Deno.stdout.isTerminal()) {
+ log.info("Not a TTY, cannot create profile interactively. Use 'wmill workspace add' first.");
+ return undefined;
+ }
+
+ const shouldCreate = await Confirm.prompt({
+ message: "Would you like to create a new profile?",
+ default: true,
+ });
+
+ if (!shouldCreate) {
+ return undefined;
+ }
+
+ // Prompt for profile details
+ const profileName = await Input.prompt({
+ message: "Profile name",
+ default: workspaceId,
+ });
+
+ const token = await loginInteractive(normalizedBaseUrl);
+ if (!token) {
+ log.error("Failed to obtain token");
+ return undefined;
+ }
+
+ // Create the new profile
+ const newWorkspace: Workspace = {
+ name: profileName,
+ remote: normalizedBaseUrl,
+ workspaceId: workspaceId,
+ token: token,
+ };
+
+ await addWorkspace(newWorkspace, opts);
+
+ // Set as last used for this branch
+ await setLastUsedProfile(currentBranch, normalizedBaseUrl, workspaceId, profileName, opts.configDir);
+
+ log.info(colors.green(`✓ Created profile '${profileName}' for ${workspaceId} on ${normalizedBaseUrl}`));
+ log.info(colors.green(`✓ Profile '${profileName}' is now active`));
+
+ return newWorkspace;
+ }
+
+ // Handle multiple profiles - use special branch-aware logic
+ let selectedProfile: Workspace;
+
+ if (matchingProfiles.length === 1) {
+ selectedProfile = matchingProfiles[0];
+ log.info(colors.green(`Using workspace profile '${selectedProfile.name}' for branch '${currentBranch}'`));
+ } else {
+ // For multiple profiles, check branch-specific last used first
+ const lastUsedName = await getLastUsedProfile(
+ currentBranch,
+ normalizedBaseUrl,
+ workspaceId,
+ opts.configDir
+ );
+
+ if (lastUsedName) {
+ const lastUsedProfile = matchingProfiles.find(p => p.name === lastUsedName);
+ if (lastUsedProfile) {
+ log.info(colors.green(`Using workspace profile '${lastUsedProfile.name}' for branch '${currentBranch}' (last used)`));
+ return lastUsedProfile;
+ }
+ }
+
+ // Fall back to general selection logic
+ selectedProfile = await selectFromMultipleProfiles(
+ matchingProfiles,
+ normalizedBaseUrl,
+ workspaceId,
+ `branch '${currentBranch}'`,
+ opts.configDir
+ );
+
+ // Save branch-specific selection
+ await setLastUsedProfile(
+ currentBranch,
+ normalizedBaseUrl,
+ workspaceId,
+ selectedProfile.name,
+ opts.configDir
+ );
+
+ log.info(colors.green(`Using workspace profile '${selectedProfile.name}' for branch '${currentBranch}'`));
+ }
+
+ return selectedProfile;
+}
+
export async function resolveWorkspace(
opts: GlobalOptions
): Promise {
if (opts.baseUrl) {
if (opts.workspace && opts.token) {
- const normalizedBaseUrl = new URL(opts.baseUrl).toString(); // add trailing slash if not present
+ let normalizedBaseUrl: string;
+ try {
+ normalizedBaseUrl = new URL(opts.baseUrl).toString(); // add trailing slash if not present
+ } catch (error) {
+ log.info(colors.red(`Invalid base URL: ${opts.baseUrl}`));
+ return Deno.exit(-1);
+ }
// Try to find existing workspace profile by name, then by workspaceId + remote
if (opts.workspace) {
@@ -67,9 +282,14 @@ export async function resolveWorkspace(
w => w.workspaceId === opts.workspace && w.remote === normalizedBaseUrl
);
- // Due to uniqueness constraint, there can only be 0 or 1 match
- if (matchingWorkspaces.length === 1) {
- existingWorkspace = matchingWorkspaces[0];
+ if (matchingWorkspaces.length >= 1) {
+ existingWorkspace = await selectFromMultipleProfiles(
+ matchingWorkspaces,
+ normalizedBaseUrl,
+ opts.workspace!,
+ `workspace "${opts.workspace}" on ${normalizedBaseUrl}`,
+ opts.configDir
+ );
}
}
@@ -107,13 +327,22 @@ export async function resolveWorkspace(
return Deno.exit(-1);
}
}
+
+ // Try explicit workspace flag first (should override branch-based resolution)
const res = await tryResolveWorkspace(opts);
- if (res.isError) {
- log.info(colors.red.bold(res.error));
- return Deno.exit(-1);
- } else {
+ if (!res.isError) {
return res.value;
}
+
+ // Fall back to branch-based resolution if no explicit workspace
+ const branchWorkspace = await tryResolveBranchWorkspace(opts);
+ if (branchWorkspace) {
+ return branchWorkspace;
+ }
+
+ // If both failed, show the original error from explicit workspace resolution
+ log.info(colors.red.bold(res.error));
+ return Deno.exit(-1);
}
diff --git a/cli/src/main.ts b/cli/src/main.ts
index 894fc32d25..b3a4a0b3b2 100644
--- a/cli/src/main.ts
+++ b/cli/src/main.ts
@@ -8,7 +8,9 @@ import {
import flow from "./commands/flow/flow.ts";
import app from "./commands/app/apps.ts";
import script from "./commands/script/script.ts";
-import workspace, { getActiveWorkspace } from "./commands/workspace/workspace.ts";
+import workspace, {
+ getActiveWorkspace,
+} from "./commands/workspace/workspace.ts";
import resource from "./commands/resource/resource.ts";
import resourceType from "./commands/resource-type/resource-type.ts";
import user from "./commands/user/user.ts";
@@ -167,8 +169,6 @@ const command = new Command()
)
.command("completions", new CompletionsCommand());
-
-
async function main() {
try {
if (Deno.args.length === 0) {
@@ -205,7 +205,9 @@ async function main() {
await command.parse(Deno.args);
} catch (e) {
if (e && typeof e === "object" && "name" in e && e.name === "ApiError") {
- console.log("Server failed. " + (e as any).statusText + ": " + (e as any).body);
+ console.log(
+ "Server failed. " + (e as any).statusText + ": " + (e as any).body
+ );
}
throw e;
}
diff --git a/cli/src/utils/git.ts b/cli/src/utils/git.ts
new file mode 100644
index 0000000000..c1032a8218
--- /dev/null
+++ b/cli/src/utils/git.ts
@@ -0,0 +1,29 @@
+import { log } from "../../deps.ts";
+import { execSync } from "node:child_process";
+
+export function getCurrentGitBranch(): string | null {
+ try {
+ const result = execSync("git rev-parse --abbrev-ref HEAD", {
+ encoding: "utf8",
+ stdio: "pipe"
+ });
+ const branch = result.trim();
+ return branch || null;
+ } catch (error) {
+ log.debug(`Failed to get Git branch: ${error}`);
+ return null;
+ }
+}
+
+export function isGitRepository(): boolean {
+ try {
+ execSync("git rev-parse --git-dir", {
+ encoding: "utf8",
+ stdio: "pipe"
+ });
+ return true;
+ } catch (error) {
+ log.debug(`Failed to check Git repository: ${error}`);
+ return false;
+ }
+}
diff --git a/frontend/src/lib/components/git_sync/DetectionFlow.svelte b/frontend/src/lib/components/git_sync/DetectionFlow.svelte
index db826c5ec6..8677c877d5 100644
--- a/frontend/src/lib/components/git_sync/DetectionFlow.svelte
+++ b/frontend/src/lib/components/git_sync/DetectionFlow.svelte
@@ -49,7 +49,32 @@
{#if repo}
{#if !repo.detectionState || repo.detectionState === 'idle'}
-
+
+
+
+
+ {#if repo.use_individual_branch}
+
+ {/if}
+
+
+