@postman-cse/onboarding-repo-sync 2.1.0 → 2.1.1

package/dist/action.cjs

@@ -122063,7 +122063,7 @@ function getIDToken(aud) {
 }
 
 // src/index.ts
-var import_node_fs2 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var path8 = __toESM(require("node:path"), 1);
 
 // node_modules/js-yaml/dist/js-yaml.mjs
@@ -125366,6 +125366,7 @@ function getCiWorkflowTemplate(provider, options = {}) {
 }
 
 // src/lib/github/repo-mutation.ts
+var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"), 1);
 
 // src/lib/secrets.ts
@@ -125607,17 +125608,21 @@ function normalizeStagePaths(stagePaths) {
     if (hasControlCharacter(rawPath) || import_node_path.default.isAbsolute(stagePath) || import_node_path.default.win32.isAbsolute(stagePath) || segments.includes("..") || stagePath.startsWith(":") || hasControlCharacter(stagePath)) {
       throw new Error(`Unsafe git stage path: ${stagePath}`);
     }
-    normalized.push(stagePath);
+    if (!normalized.includes(stagePath)) {
+      normalized.push(stagePath);
+    }
   }
   return normalized;
 }
 var RepoMutationService = class {
+  cwd;
   execute;
   provider;
   repository;
   repoUrl;
   secretMasker;
   constructor(options) {
+    this.cwd = options.cwd ?? process.cwd();
     this.execute = options.execute;
     this.provider = options.provider ?? "github";
     this.repository = options.repository;
@@ -125626,7 +125631,8 @@ var RepoMutationService = class {
   }
   async commitAndPush(options) {
     const resolvedCurrentRef = resolveCurrentRef(options);
-    const stagePaths = normalizeStagePaths(options.stagePaths);
+    const removePaths = normalizeStagePaths(options.removePaths ?? []);
+    const stagePaths = normalizeStagePaths([...options.stagePaths, ...removePaths]);
     const tokens = this.provider === "azure-devops" ? buildPushTokenOrder({ adoToken: options.adoToken }) : buildPushTokenOrder({
       fallbackToken: options.fallbackToken,
       githubToken: options.githubToken
@@ -125639,8 +125645,43 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
+    const changed = await this.execute("git", [
+      "status",
+      "--porcelain=v1",
+      "--untracked-files=all",
+      "--",
+      ...stagePaths
+    ]);
+    if (changed.exitCode !== 0) {
+      throw new Error(this.secretMasker(changed.stderr || changed.stdout || "Failed to inspect generated changes"));
+    }
+    const hasPlannedRemoval = removePaths.some(
+      (removePath) => (0, import_node_fs.existsSync)(import_node_path.default.resolve(this.cwd, removePath))
+    );
+    if (!changed.stdout.trim() && !hasPlannedRemoval) {
+      return {
+        commitSha: "",
+        pushed: false,
+        resolvedCurrentRef
+      };
+    }
+    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
+    if (options.repoWriteMode === "commit-and-push") {
+      if (!supportsTokenRemote(this.provider)) {
+        throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
+      }
+      if (!resolvedCurrentRef) {
+        throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
+      }
+      if (tokens.length === 0 && !usePersistedCredentials) {
+        throw new Error("No push token configured for repo-write-mode=commit-and-push");
+      }
+    }
     await this.execute("git", ["config", "user.name", options.committerName]);
     await this.execute("git", ["config", "user.email", options.committerEmail]);
+    for (const removePath of removePaths) {
+      (0, import_node_fs.rmSync)(import_node_path.default.resolve(this.cwd, removePath), { force: true });
+    }
     await this.execute("git", ["add", "-A", "--", ...stagePaths]);
     const staged = await this.execute("git", ["diff", "--cached", "--quiet"]);
     if (staged.exitCode === 0) {
@@ -125663,16 +125704,6 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
-    if (!resolvedCurrentRef) {
-      throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
-    }
-    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
-    if (tokens.length === 0 && !usePersistedCredentials) {
-      throw new Error("No push token configured for repo-write-mode=commit-and-push");
-    }
-    if (tokens.length > 0 && !supportsTokenRemote(this.provider)) {
-      throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
-    }
     const originalRemote = (await this.execute("git", ["remote", "get-url", "origin"])).stdout.trim();
     let pushed = false;
     let lastError = "";
@@ -126192,11 +126223,11 @@ function createTelemetryContext(options) {
 }
 
 // src/action-version.ts
-var import_node_fs = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
 function resolveActionVersion2() {
   try {
-    const raw = (0, import_node_fs.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
+    const raw = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
     return JSON.parse(raw).version ?? "unknown";
   } catch {
     return "unknown";
@@ -127951,8 +127982,27 @@ function normalizeInputValue(value) {
   return String(value ?? "").trim();
 }
 function getInput2(name, env = process.env) {
-  const envName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
-  return normalizeInputValue(env[envName]);
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  const normalizedRaw = env[normalizedName];
+  const runnerRaw = runnerName === normalizedName ? void 0 : env[runnerName];
+  const hasNormalized = normalizedRaw !== void 0;
+  const hasRunner = runnerRaw !== void 0;
+  if (hasNormalized && hasRunner) {
+    const normalizedValue = normalizeInputValue(normalizedRaw);
+    const runnerValue = normalizeInputValue(runnerRaw);
+    if (normalizedValue !== runnerValue) {
+      throw new Error(
+        `Conflicting values for ${name}: ${normalizedName}=${JSON.stringify(normalizedValue)} vs ${runnerName}=${JSON.stringify(runnerValue)}`
+      );
+    }
+  }
+  return normalizeInputValue(hasNormalized ? normalizedRaw : runnerRaw);
+}
+function hasInput(name, env = process.env) {
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  return env[normalizedName] !== void 0 || runnerName !== normalizedName && env[runnerName] !== void 0;
 }
 function parseJsonMap(raw) {
   if (!raw.trim()) return {};
@@ -127982,7 +128032,9 @@ function normalizeRepoWriteMode(value) {
   if (value === "none" || value === "commit-only" || value === "commit-and-push") {
     return value;
   }
-  return "commit-and-push";
+  throw new Error(
+    `Unsupported repo-write-mode "${value}". Allowed values: none, commit-only, commit-and-push`
+  );
 }
 function normalizeCollectionSyncMode(value) {
   if (value === "refresh" || value === "version") {
@@ -128064,7 +128116,7 @@ function resolveInputs(env = process.env) {
     environmentUids,
     envRuntimeUrls,
     artifactDir: getInput2("artifact-dir", env) || "postman",
-    repoWriteMode: normalizeRepoWriteMode(getInput2("repo-write-mode", env) || "commit-and-push"),
+    repoWriteMode: hasInput("repo-write-mode", env) ? normalizeRepoWriteMode(getInput2("repo-write-mode", env)) : "commit-and-push",
     currentRef: getInput2("current-ref", env) || normalizeInputValue(env.GITHUB_REF) || normalizeInputValue(env.BUILD_SOURCEBRANCH),
     githubHeadRef: getInput2("github-head-ref", env) || normalizeInputValue(env.GITHUB_HEAD_REF) || normalizeInputValue(env.SYSTEM_PULLREQUEST_SOURCEBRANCH),
     githubRefName: getInput2("github-ref-name", env) || normalizeInputValue(env.GITHUB_REF_NAME) || normalizeInputValue(repoContext.ref),
@@ -128113,7 +128165,7 @@ function buildEnvironmentValues(envName, baseUrl) {
 var LEGACY_BASELINE_COLLECTION_PREFIX = "[Baseline]";
 function readResourcesState() {
   try {
-    return load((0, import_node_fs2.readFileSync)(".postman/resources.yaml", "utf8"));
+    return load((0, import_node_fs3.readFileSync)(".postman/resources.yaml", "utf8"));
   } catch {
     return null;
   }
@@ -128151,7 +128203,7 @@ function isOpenApiSpecFile(filePath) {
     return false;
   }
   try {
-    const raw = (0, import_node_fs2.readFileSync)(filePath, "utf8");
+    const raw = (0, import_node_fs3.readFileSync)(filePath, "utf8");
     const parsed = filePath.endsWith(".json") ? JSON.parse(raw) : load(raw);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return false;
@@ -128180,7 +128232,7 @@ function scanLocalSpecReferences(baseDir = ".") {
   const found = /* @__PURE__ */ new Set();
   const refs = [];
   const visit2 = (currentDir) => {
-    for (const entry of (0, import_node_fs2.readdirSync)(currentDir, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs3.readdirSync)(currentDir, { withFileTypes: true })) {
       if (ignoredDirs.has(entry.name)) {
         continue;
       }
@@ -128210,7 +128262,7 @@ function resolveMappedSpecReference(explicitSpecPath, discoveredSpecs) {
   const normalizedExplicitPath = normalizeToPosix(explicitSpecPath.trim());
   if (normalizedExplicitPath) {
     const explicitFullPath = path8.resolve(normalizedExplicitPath);
-    if ((0, import_node_fs2.existsSync)(explicitFullPath) && (0, import_node_fs2.statSync)(explicitFullPath).isFile()) {
+    if ((0, import_node_fs3.existsSync)(explicitFullPath) && (0, import_node_fs3.statSync)(explicitFullPath).isFile()) {
       return {
         repoRelativePath: normalizedExplicitPath,
         configRelativePath: normalizeToPosix(path8.join("..", normalizedExplicitPath))
@@ -128425,7 +128477,7 @@ async function upsertEnvironments(inputs, dependencies, resourcesState) {
   return envUids;
 }
 function ensureDir(path9) {
-  (0, import_node_fs2.mkdirSync)(path9, { recursive: true });
+  (0, import_node_fs3.mkdirSync)(path9, { recursive: true });
 }
 function getCollectionDirectoryName(kind, projectName) {
   if (kind === "Baseline") {
@@ -128462,7 +128514,7 @@ function stripVolatileFields(obj) {
 }
 function writeJsonFile(path9, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
-  (0, import_node_fs2.writeFileSync)(path9, JSON.stringify(data, null, 2));
+  (0, import_node_fs3.writeFileSync)(path9, JSON.stringify(data, null, 2));
 }
 function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
   const manifest = {
@@ -128536,21 +128588,21 @@ function assertPathWithinCwd(targetPath, fieldName) {
   if (!rawPath || hasControlCharacter2(originalPath) || path8.isAbsolute(rawPath) || path8.win32.isAbsolute(rawPath) || segments.includes("..") || rawPath.startsWith(":") || hasControlCharacter2(rawPath)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
-  const base = (0, import_node_fs2.realpathSync)(process.cwd());
+  const base = (0, import_node_fs3.realpathSync)(process.cwd());
   const resolved = path8.resolve(base, rawPath);
   const relative3 = path8.relative(base, resolved);
   if (relative3.startsWith("..") || path8.isAbsolute(relative3)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
   let existingPath = resolved;
-  while (!(0, import_node_fs2.existsSync)(existingPath)) {
+  while (!(0, import_node_fs3.existsSync)(existingPath)) {
     const parent = path8.dirname(existingPath);
     if (parent === existingPath) {
       break;
     }
     existingPath = parent;
   }
-  const realExistingPath = (0, import_node_fs2.realpathSync)(existingPath);
+  const realExistingPath = (0, import_node_fs3.realpathSync)(existingPath);
   const realRelative = path8.relative(base, realExistingPath);
   if (realRelative.startsWith("..") || path8.isAbsolute(realRelative)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
@@ -128578,8 +128630,8 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   ensureDir(specsDir);
   ensureDir(".postman");
   const globalsFilePath = `${globalsDir}/workspace.globals.yaml`;
-  if (!(0, import_node_fs2.existsSync)(globalsFilePath)) {
-    (0, import_node_fs2.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
+  if (!(0, import_node_fs3.existsSync)(globalsFilePath)) {
+    (0, import_node_fs3.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
   }
   if (inputs.generateCiWorkflow) {
     const ciDir = inputs.ciWorkflowPath.split("/").slice(0, -1).join("/");
@@ -128615,7 +128667,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
-  (0, import_node_fs2.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
+  (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
     inputs.workspaceId,
     manifestCollections,
     envUids,
@@ -128625,7 +128677,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
     inputs.specId || void 0
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
-    (0, import_node_fs2.writeFileSync)(
+    (0, import_node_fs3.writeFileSync)(
       ".postman/workflows.yaml",
       buildSpecCollectionWorkflowManifest(
         mappedSpec.configRelativePath,
@@ -128662,29 +128714,27 @@ function createRepoSummary(outputs, envUids, pushed) {
   });
 }
 async function commitAndPushGeneratedFiles(inputs, dependencies) {
-  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
-    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
-  }
   if (inputs.generateCiWorkflow) {
+    assertPathWithinCwd(inputs.ciWorkflowPath, "ci-workflow-path");
     const ciWorkflow = renderCiWorkflow(inputs);
     const parts = inputs.ciWorkflowPath.split("/");
     if (parts.length > 1) {
       const dir = parts.slice(0, -1).join("/");
       ensureDir(dir);
     }
-    (0, import_node_fs2.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
+    (0, import_node_fs3.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
   }
-  const provisionPath = ".github/workflows/provision.yml";
-  const provisionExists = inputs.provider === "github" && (0, import_node_fs2.existsSync)(provisionPath);
-  if (provisionExists) {
-    (0, import_node_fs2.rmSync)(provisionPath);
+  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
+    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
   }
+  const provisionPath = ".github/workflows/provision.yml";
+  const provisionExists = inputs.provider === "github" && (0, import_node_fs3.existsSync)(provisionPath);
   const stagePaths = [
     inputs.artifactDir,
     ".postman",
     inputs.generateCiWorkflow ? inputs.ciWorkflowPath : null,
     provisionExists ? provisionPath : null
-  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs2.existsSync)(entry) || entry === provisionPath));
+  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs3.existsSync)(entry) || entry === provisionPath));
   if (stagePaths.length === 0) {
     dependencies.core.info("No generated repository paths were found; skipping repo mutation.");
     return {
@@ -128708,6 +128758,7 @@ async function commitAndPushGeneratedFiles(inputs, dependencies) {
     adoToken: inputs.provider === "azure-devops" ? inputs.adoToken : void 0,
     githubToken: inputs.provider === "azure-devops" ? void 0 : inputs.githubToken,
     fallbackToken: inputs.provider === "azure-devops" ? void 0 : inputs.ghFallbackToken,
+    removePaths: provisionExists ? [provisionPath] : [],
     stagePaths
   });
   return {

package/dist/cli.cjs

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 "use strict";
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -119797,7 +119798,7 @@ __export(cli_exports, {
 });
 module.exports = __toCommonJS(cli_exports);
 var import_node_child_process = require("node:child_process");
-var import_node_fs3 = require("node:fs");
+var import_node_fs4 = require("node:fs");
 var import_promises = require("node:fs/promises");
 var import_node_path3 = __toESM(require("node:path"), 1);
 var import_node_util = require("node:util");
@@ -120165,7 +120166,7 @@ var ExitCode;
 })(ExitCode || (ExitCode = {}));
 
 // src/index.ts
-var import_node_fs2 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var path3 = __toESM(require("node:path"), 1);
 
 // node_modules/js-yaml/dist/js-yaml.mjs
@@ -123468,6 +123469,7 @@ function getCiWorkflowTemplate(provider, options = {}) {
 }
 
 // src/lib/github/repo-mutation.ts
+var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"), 1);
 
 // src/lib/secrets.ts
@@ -123709,17 +123711,21 @@ function normalizeStagePaths(stagePaths) {
     if (hasControlCharacter(rawPath) || import_node_path.default.isAbsolute(stagePath) || import_node_path.default.win32.isAbsolute(stagePath) || segments.includes("..") || stagePath.startsWith(":") || hasControlCharacter(stagePath)) {
       throw new Error(`Unsafe git stage path: ${stagePath}`);
     }
-    normalized.push(stagePath);
+    if (!normalized.includes(stagePath)) {
+      normalized.push(stagePath);
+    }
   }
   return normalized;
 }
 var RepoMutationService = class {
+  cwd;
   execute;
   provider;
   repository;
   repoUrl;
   secretMasker;
   constructor(options) {
+    this.cwd = options.cwd ?? process.cwd();
     this.execute = options.execute;
     this.provider = options.provider ?? "github";
     this.repository = options.repository;
@@ -123728,7 +123734,8 @@ var RepoMutationService = class {
   }
   async commitAndPush(options) {
     const resolvedCurrentRef = resolveCurrentRef(options);
-    const stagePaths = normalizeStagePaths(options.stagePaths);
+    const removePaths = normalizeStagePaths(options.removePaths ?? []);
+    const stagePaths = normalizeStagePaths([...options.stagePaths, ...removePaths]);
     const tokens = this.provider === "azure-devops" ? buildPushTokenOrder({ adoToken: options.adoToken }) : buildPushTokenOrder({
       fallbackToken: options.fallbackToken,
       githubToken: options.githubToken
@@ -123741,8 +123748,43 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
+    const changed = await this.execute("git", [
+      "status",
+      "--porcelain=v1",
+      "--untracked-files=all",
+      "--",
+      ...stagePaths
+    ]);
+    if (changed.exitCode !== 0) {
+      throw new Error(this.secretMasker(changed.stderr || changed.stdout || "Failed to inspect generated changes"));
+    }
+    const hasPlannedRemoval = removePaths.some(
+      (removePath) => (0, import_node_fs.existsSync)(import_node_path.default.resolve(this.cwd, removePath))
+    );
+    if (!changed.stdout.trim() && !hasPlannedRemoval) {
+      return {
+        commitSha: "",
+        pushed: false,
+        resolvedCurrentRef
+      };
+    }
+    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
+    if (options.repoWriteMode === "commit-and-push") {
+      if (!supportsTokenRemote(this.provider)) {
+        throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
+      }
+      if (!resolvedCurrentRef) {
+        throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
+      }
+      if (tokens.length === 0 && !usePersistedCredentials) {
+        throw new Error("No push token configured for repo-write-mode=commit-and-push");
+      }
+    }
     await this.execute("git", ["config", "user.name", options.committerName]);
     await this.execute("git", ["config", "user.email", options.committerEmail]);
+    for (const removePath of removePaths) {
+      (0, import_node_fs.rmSync)(import_node_path.default.resolve(this.cwd, removePath), { force: true });
+    }
     await this.execute("git", ["add", "-A", "--", ...stagePaths]);
     const staged = await this.execute("git", ["diff", "--cached", "--quiet"]);
     if (staged.exitCode === 0) {
@@ -123765,16 +123807,6 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
-    if (!resolvedCurrentRef) {
-      throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
-    }
-    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
-    if (tokens.length === 0 && !usePersistedCredentials) {
-      throw new Error("No push token configured for repo-write-mode=commit-and-push");
-    }
-    if (tokens.length > 0 && !supportsTokenRemote(this.provider)) {
-      throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
-    }
     const originalRemote = (await this.execute("git", ["remote", "get-url", "origin"])).stdout.trim();
     let pushed = false;
     let lastError = "";
@@ -124294,11 +124326,11 @@ function createTelemetryContext(options) {
 }
 
 // src/action-version.ts
-var import_node_fs = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
 function resolveActionVersion2() {
   try {
-    const raw = (0, import_node_fs.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
+    const raw = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
     return JSON.parse(raw).version ?? "unknown";
   } catch {
     return "unknown";
@@ -126001,8 +126033,27 @@ function normalizeInputValue(value) {
   return String(value ?? "").trim();
 }
 function getInput(name, env = process.env) {
-  const envName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
-  return normalizeInputValue(env[envName]);
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  const normalizedRaw = env[normalizedName];
+  const runnerRaw = runnerName === normalizedName ? void 0 : env[runnerName];
+  const hasNormalized = normalizedRaw !== void 0;
+  const hasRunner = runnerRaw !== void 0;
+  if (hasNormalized && hasRunner) {
+    const normalizedValue = normalizeInputValue(normalizedRaw);
+    const runnerValue = normalizeInputValue(runnerRaw);
+    if (normalizedValue !== runnerValue) {
+      throw new Error(
+        `Conflicting values for ${name}: ${normalizedName}=${JSON.stringify(normalizedValue)} vs ${runnerName}=${JSON.stringify(runnerValue)}`
+      );
+    }
+  }
+  return normalizeInputValue(hasNormalized ? normalizedRaw : runnerRaw);
+}
+function hasInput(name, env = process.env) {
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  return env[normalizedName] !== void 0 || runnerName !== normalizedName && env[runnerName] !== void 0;
 }
 function parseJsonMap(raw) {
   if (!raw.trim()) return {};
@@ -126029,7 +126080,9 @@ function normalizeRepoWriteMode(value) {
   if (value === "none" || value === "commit-only" || value === "commit-and-push") {
     return value;
   }
-  return "commit-and-push";
+  throw new Error(
+    `Unsupported repo-write-mode "${value}". Allowed values: none, commit-only, commit-and-push`
+  );
 }
 function normalizeCollectionSyncMode(value) {
   if (value === "refresh" || value === "version") {
@@ -126111,7 +126164,7 @@ function resolveInputs(env = process.env) {
     environmentUids,
     envRuntimeUrls,
     artifactDir: getInput("artifact-dir", env) || "postman",
-    repoWriteMode: normalizeRepoWriteMode(getInput("repo-write-mode", env) || "commit-and-push"),
+    repoWriteMode: hasInput("repo-write-mode", env) ? normalizeRepoWriteMode(getInput("repo-write-mode", env)) : "commit-and-push",
     currentRef: getInput("current-ref", env) || normalizeInputValue(env.GITHUB_REF) || normalizeInputValue(env.BUILD_SOURCEBRANCH),
     githubHeadRef: getInput("github-head-ref", env) || normalizeInputValue(env.GITHUB_HEAD_REF) || normalizeInputValue(env.SYSTEM_PULLREQUEST_SOURCEBRANCH),
     githubRefName: getInput("github-ref-name", env) || normalizeInputValue(env.GITHUB_REF_NAME) || normalizeInputValue(repoContext.ref),
@@ -126160,7 +126213,7 @@ function buildEnvironmentValues(envName, baseUrl) {
 var LEGACY_BASELINE_COLLECTION_PREFIX = "[Baseline]";
 function readResourcesState() {
   try {
-    return load((0, import_node_fs2.readFileSync)(".postman/resources.yaml", "utf8"));
+    return load((0, import_node_fs3.readFileSync)(".postman/resources.yaml", "utf8"));
   } catch {
     return null;
   }
@@ -126198,7 +126251,7 @@ function isOpenApiSpecFile(filePath) {
     return false;
   }
   try {
-    const raw = (0, import_node_fs2.readFileSync)(filePath, "utf8");
+    const raw = (0, import_node_fs3.readFileSync)(filePath, "utf8");
     const parsed = filePath.endsWith(".json") ? JSON.parse(raw) : load(raw);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return false;
@@ -126227,7 +126280,7 @@ function scanLocalSpecReferences(baseDir = ".") {
   const found = /* @__PURE__ */ new Set();
   const refs = [];
   const visit2 = (currentDir) => {
-    for (const entry of (0, import_node_fs2.readdirSync)(currentDir, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs3.readdirSync)(currentDir, { withFileTypes: true })) {
       if (ignoredDirs.has(entry.name)) {
         continue;
       }
@@ -126257,7 +126310,7 @@ function resolveMappedSpecReference(explicitSpecPath, discoveredSpecs) {
   const normalizedExplicitPath = normalizeToPosix(explicitSpecPath.trim());
   if (normalizedExplicitPath) {
     const explicitFullPath = path3.resolve(normalizedExplicitPath);
-    if ((0, import_node_fs2.existsSync)(explicitFullPath) && (0, import_node_fs2.statSync)(explicitFullPath).isFile()) {
+    if ((0, import_node_fs3.existsSync)(explicitFullPath) && (0, import_node_fs3.statSync)(explicitFullPath).isFile()) {
       return {
         repoRelativePath: normalizedExplicitPath,
         configRelativePath: normalizeToPosix(path3.join("..", normalizedExplicitPath))
@@ -126338,7 +126391,7 @@ async function upsertEnvironments(inputs, dependencies, resourcesState) {
   return envUids;
 }
 function ensureDir(path5) {
-  (0, import_node_fs2.mkdirSync)(path5, { recursive: true });
+  (0, import_node_fs3.mkdirSync)(path5, { recursive: true });
 }
 function getCollectionDirectoryName(kind, projectName) {
   if (kind === "Baseline") {
@@ -126375,7 +126428,7 @@ function stripVolatileFields(obj) {
 }
 function writeJsonFile(path5, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
-  (0, import_node_fs2.writeFileSync)(path5, JSON.stringify(data, null, 2));
+  (0, import_node_fs3.writeFileSync)(path5, JSON.stringify(data, null, 2));
 }
 function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
   const manifest = {
@@ -126449,21 +126502,21 @@ function assertPathWithinCwd(targetPath, fieldName) {
   if (!rawPath || hasControlCharacter2(originalPath) || path3.isAbsolute(rawPath) || path3.win32.isAbsolute(rawPath) || segments.includes("..") || rawPath.startsWith(":") || hasControlCharacter2(rawPath)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
-  const base = (0, import_node_fs2.realpathSync)(process.cwd());
+  const base = (0, import_node_fs3.realpathSync)(process.cwd());
   const resolved = path3.resolve(base, rawPath);
   const relative2 = path3.relative(base, resolved);
   if (relative2.startsWith("..") || path3.isAbsolute(relative2)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
   let existingPath = resolved;
-  while (!(0, import_node_fs2.existsSync)(existingPath)) {
+  while (!(0, import_node_fs3.existsSync)(existingPath)) {
     const parent = path3.dirname(existingPath);
     if (parent === existingPath) {
       break;
     }
     existingPath = parent;
   }
-  const realExistingPath = (0, import_node_fs2.realpathSync)(existingPath);
+  const realExistingPath = (0, import_node_fs3.realpathSync)(existingPath);
   const realRelative = path3.relative(base, realExistingPath);
   if (realRelative.startsWith("..") || path3.isAbsolute(realRelative)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
@@ -126491,8 +126544,8 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   ensureDir(specsDir);
   ensureDir(".postman");
   const globalsFilePath = `${globalsDir}/workspace.globals.yaml`;
-  if (!(0, import_node_fs2.existsSync)(globalsFilePath)) {
-    (0, import_node_fs2.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
+  if (!(0, import_node_fs3.existsSync)(globalsFilePath)) {
+    (0, import_node_fs3.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
   }
   if (inputs.generateCiWorkflow) {
     const ciDir = inputs.ciWorkflowPath.split("/").slice(0, -1).join("/");
@@ -126528,7 +126581,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
-  (0, import_node_fs2.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
+  (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
     inputs.workspaceId,
     manifestCollections,
     envUids,
@@ -126538,7 +126591,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
     inputs.specId || void 0
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
-    (0, import_node_fs2.writeFileSync)(
+    (0, import_node_fs3.writeFileSync)(
       ".postman/workflows.yaml",
       buildSpecCollectionWorkflowManifest(
         mappedSpec.configRelativePath,
@@ -126575,29 +126628,27 @@ function createRepoSummary(outputs, envUids, pushed) {
   });
 }
 async function commitAndPushGeneratedFiles(inputs, dependencies) {
-  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
-    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
-  }
   if (inputs.generateCiWorkflow) {
+    assertPathWithinCwd(inputs.ciWorkflowPath, "ci-workflow-path");
     const ciWorkflow = renderCiWorkflow(inputs);
     const parts = inputs.ciWorkflowPath.split("/");
     if (parts.length > 1) {
       const dir = parts.slice(0, -1).join("/");
       ensureDir(dir);
     }
-    (0, import_node_fs2.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
+    (0, import_node_fs3.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
   }
-  const provisionPath = ".github/workflows/provision.yml";
-  const provisionExists = inputs.provider === "github" && (0, import_node_fs2.existsSync)(provisionPath);
-  if (provisionExists) {
-    (0, import_node_fs2.rmSync)(provisionPath);
+  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
+    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
   }
+  const provisionPath = ".github/workflows/provision.yml";
+  const provisionExists = inputs.provider === "github" && (0, import_node_fs3.existsSync)(provisionPath);
   const stagePaths = [
     inputs.artifactDir,
     ".postman",
     inputs.generateCiWorkflow ? inputs.ciWorkflowPath : null,
     provisionExists ? provisionPath : null
-  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs2.existsSync)(entry) || entry === provisionPath));
+  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs3.existsSync)(entry) || entry === provisionPath));
   if (stagePaths.length === 0) {
     dependencies.core.info("No generated repository paths were found; skipping repo mutation.");
     return {
@@ -126621,6 +126672,7 @@ async function commitAndPushGeneratedFiles(inputs, dependencies) {
     adoToken: inputs.provider === "azure-devops" ? inputs.adoToken : void 0,
     githubToken: inputs.provider === "azure-devops" ? void 0 : inputs.githubToken,
     fallbackToken: inputs.provider === "azure-devops" ? void 0 : inputs.ghFallbackToken,
+    removePaths: provisionExists ? [provisionPath] : [],
     stagePaths
   });
   return {
@@ -127020,6 +127072,71 @@ function createRepoSyncDependencies(inputs, resolved, factories, options = {}) {
 
 // src/cli.ts
 var execFileAsync = (0, import_node_util.promisify)(import_node_child_process.execFile);
+var CLI_INPUT_NAMES = [
+  "project-name",
+  "workspace-id",
+  "baseline-collection-id",
+  "smoke-collection-id",
+  "contract-collection-id",
+  "collection-sync-mode",
+  "spec-sync-mode",
+  "release-label",
+  "environments-json",
+  "git-provider",
+  "ado-token",
+  "repo-url",
+  "integration-backend",
+  "workspace-link-enabled",
+  "environment-sync-enabled",
+  "system-env-map-json",
+  "environment-uids-json",
+  "env-runtime-urls-json",
+  "artifact-dir",
+  "repo-write-mode",
+  "repository",
+  "current-ref",
+  "github-head-ref",
+  "github-ref-name",
+  "committer-name",
+  "committer-email",
+  "postman-api-key",
+  "postman-access-token",
+  "credential-preflight",
+  "github-token",
+  "gh-fallback-token",
+  "ci-workflow-base64",
+  "generate-ci-workflow",
+  "monitor-type",
+  "ci-workflow-path",
+  "org-mode",
+  "monitor-id",
+  "mock-url",
+  "monitor-cron",
+  "ssl-client-cert",
+  "ssl-client-key",
+  "ssl-client-passphrase",
+  "ssl-extra-ca-certs",
+  "spec-id",
+  "spec-path",
+  "team-id",
+  "postman-region",
+  "postman-stack"
+];
+var HELP_TEXT = `Usage: postman-repo-sync [options]
+
+Sync Postman artifacts into a git repository.
+
+Options:
+  --help                         Show this help and exit
+  --version                      Show version and exit
+  --result-json <path>           Write JSON result (default: postman-repo-sync-result.json)
+  --dotenv-path <path>           Optional dotenv output path
+  --<input-name> <value>         Action input as kebab-case flag (same names as action.yml)
+
+Examples:
+  postman-repo-sync --help
+  postman-repo-sync --repo-write-mode none --workspace-id <id> ...
+`;
 var ConsoleReporter = class {
   info(message) {
     console.error(message);
@@ -127032,19 +127149,6 @@ var ConsoleReporter = class {
   setSecret() {
   }
 };
-function readFlag(argv, name) {
-  const prefix = `--${name}=`;
-  for (let index = 0; index < argv.length; index += 1) {
-    const arg = argv[index];
-    if (arg === `--${name}`) {
-      return argv[index + 1];
-    }
-    if (arg?.startsWith(prefix)) {
-      return arg.slice(prefix.length);
-    }
-  }
-  return void 0;
-}
 function normalizeCliFlag(name) {
   return `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
 }
@@ -127107,68 +127211,117 @@ function createCliExec(secretMasker) {
     }
   };
 }
+function resolvePackageVersion() {
+  const candidates = [];
+  if (typeof __filename === "string" && __filename) {
+    candidates.push(import_node_path3.default.join(import_node_path3.default.dirname(__filename), "..", "package.json"));
+  }
+  candidates.push(import_node_path3.default.join(process.cwd(), "package.json"));
+  for (const packageJsonPath of candidates) {
+    try {
+      const packageJson = JSON.parse((0, import_node_fs4.readFileSync)(packageJsonPath, "utf8"));
+      if (packageJson.name === "@postman-cse/onboarding-repo-sync" && packageJson.version) {
+        return String(packageJson.version).trim();
+      }
+    } catch {
+    }
+  }
+  return "0.0.0";
+}
+function wantsHelp(argv) {
+  return argv.includes("--help") || argv.includes("-h");
+}
+function wantsVersion(argv) {
+  return argv.includes("--version") || argv.includes("-V");
+}
+function runnerFormEnvName(name) {
+  return `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+}
 function parseCliArgs(argv, env = process.env) {
-  const inputNames = [
-    "project-name",
-    "workspace-id",
-    "baseline-collection-id",
-    "smoke-collection-id",
-    "contract-collection-id",
-    "collection-sync-mode",
-    "spec-sync-mode",
-    "release-label",
-    "environments-json",
-    "git-provider",
-    "ado-token",
-    "repo-url",
-    "integration-backend",
-    "workspace-link-enabled",
-    "environment-sync-enabled",
-    "system-env-map-json",
-    "environment-uids-json",
-    "env-runtime-urls-json",
-    "artifact-dir",
-    "repo-write-mode",
-    "repository",
-    "current-ref",
-    "github-head-ref",
-    "github-ref-name",
-    "committer-name",
-    "committer-email",
-    "postman-api-key",
-    "postman-access-token",
-    "credential-preflight",
-    "github-token",
-    "gh-fallback-token",
-    "ci-workflow-base64",
-    "generate-ci-workflow",
-    "monitor-type",
-    "ci-workflow-path",
-    "org-mode",
-    "monitor-id",
-    "mock-url",
-    "monitor-cron",
-    "ssl-client-cert",
-    "ssl-client-key",
-    "ssl-client-passphrase",
-    "ssl-extra-ca-certs",
-    "spec-id",
-    "spec-path",
-    "team-id",
-    "postman-region",
-    "postman-stack"
-  ];
+  const inputNames = new Set(CLI_INPUT_NAMES);
   const inputEnv = { ...env };
-  for (const name of inputNames) {
-    const value = readFlag(argv, name);
-    if (value !== void 0) {
-      inputEnv[normalizeCliFlag(name)] = value;
+  let resultJsonPath = "postman-repo-sync-result.json";
+  let dotenvPath;
+  const seenFlags = /* @__PURE__ */ new Map();
+  let sawHelp = false;
+  let sawVersion = false;
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (!arg) {
+      continue;
+    }
+    if (arg === "--help" || arg === "-h") {
+      sawHelp = true;
+      continue;
+    }
+    if (arg === "--version" || arg === "-V") {
+      sawVersion = true;
+      continue;
+    }
+    if (!arg.startsWith("--")) {
+      throw new Error(`Unexpected positional argument: ${arg}`);
     }
+    let name;
+    let value;
+    const separator = arg.indexOf("=");
+    if (separator !== -1) {
+      name = arg.slice(2, separator);
+      value = arg.slice(separator + 1);
+      if (value === "") {
+        throw new Error(`Missing value for --${name}`);
+      }
+    } else {
+      name = arg.slice(2);
+      const next = argv[index + 1];
+      if (next === void 0 || next.startsWith("--")) {
+        throw new Error(`Missing value for --${name}`);
+      }
+      value = next;
+      index += 1;
+    }
+    if (!name) {
+      throw new Error(`Unknown option ${arg}`);
+    }
+    if (name === "result-json") {
+      const previous2 = seenFlags.get(name);
+      if (previous2 !== void 0 && previous2 !== value) {
+        throw new Error(`Conflicting values for --${name}`);
+      }
+      seenFlags.set(name, value);
+      resultJsonPath = value;
+      continue;
+    }
+    if (name === "dotenv-path") {
+      const previous2 = seenFlags.get(name);
+      if (previous2 !== void 0 && previous2 !== value) {
+        throw new Error(`Conflicting values for --${name}`);
+      }
+      seenFlags.set(name, value);
+      dotenvPath = value;
+      continue;
+    }
+    if (!inputNames.has(name)) {
+      throw new Error(`Unknown option --${name}`);
+    }
+    const previous = seenFlags.get(name);
+    if (previous !== void 0 && previous !== value) {
+      throw new Error(`Conflicting values for --${name}`);
+    }
+    seenFlags.set(name, value);
+    const normalized = normalizeCliFlag(name);
+    const runnerForm = runnerFormEnvName(name);
+    inputEnv[normalized] = value;
+    if (runnerForm !== normalized) {
+      delete inputEnv[runnerForm];
+    }
+  }
+  if (sawHelp && sawVersion) {
+    throw new Error("Cannot use --help and --version together");
   }
   return {
     inputEnv,
-    resultJsonPath: readFlag(argv, "result-json") ?? "postman-repo-sync-result.json",
-    dotenvPath: readFlag(argv, "dotenv-path")
+    resultJsonPath,
+    dotenvPath
   };
 }
 function toDotenv(outputs) {
@@ -127216,6 +127369,20 @@ function createCliDependencies(inputs, resolved) {
   );
 }
 async function runCli(argv = process.argv.slice(2), runtime = {}) {
+  const writeStdout = runtime.writeStdout ?? ((chunk) => process.stdout.write(chunk));
+  if (wantsHelp(argv) && wantsVersion(argv)) {
+    throw new Error("Cannot use --help and --version together");
+  }
+  if (wantsHelp(argv)) {
+    writeStdout(HELP_TEXT.endsWith("\n") ? HELP_TEXT : `${HELP_TEXT}
+`);
+    return;
+  }
+  if (wantsVersion(argv)) {
+    writeStdout(`${resolvePackageVersion()}
+`);
+    return;
+  }
   const env = runtime.env ?? process.env;
   const config = parseCliArgs(argv, env);
   const inputs = resolveInputs(config.inputEnv);
@@ -127267,7 +127434,6 @@ async function runCli(argv = process.argv.slice(2), runtime = {}) {
   const result = await (runtime.executeRepoSync ?? runRepoSync)(inputs, dependencies);
   await writeOptionalFile(config.resultJsonPath, JSON.stringify(result, null, 2));
   await writeOptionalFile(config.dotenvPath, toDotenv(result));
-  const writeStdout = runtime.writeStdout ?? ((chunk) => process.stdout.write(chunk));
   writeStdout(`${JSON.stringify(result, null, 2)}
 `);
 }
@@ -127278,7 +127444,7 @@ function isEntrypoint(currentPath, entrypointPath) {
     return false;
   }
   try {
-    return (0, import_node_fs3.realpathSync)(currentPath) === (0, import_node_fs3.realpathSync)(entrypointPath);
+    return (0, import_node_fs4.realpathSync)(currentPath) === (0, import_node_fs4.realpathSync)(entrypointPath);
   } catch {
     return import_node_path3.default.resolve(currentPath) === import_node_path3.default.resolve(entrypointPath);
   }

package/dist/index.cjs

@@ -119790,6 +119790,7 @@ __export(index_exports, {
   assertPathWithinCwd: () => assertPathWithinCwd,
   createRepoSyncDependencies: () => createRepoSyncDependencies,
   getInput: () => getInput2,
+  hasInput: () => hasInput,
   readActionInputs: () => readActionInputs,
   resolveInputs: () => resolveInputs,
   resolvePostmanApiKeyAndTeamId: () => resolvePostmanApiKeyAndTeamId,
@@ -122077,7 +122078,7 @@ function getIDToken(aud) {
 }
 
 // src/index.ts
-var import_node_fs2 = require("node:fs");
+var import_node_fs3 = require("node:fs");
 var path8 = __toESM(require("node:path"), 1);
 
 // node_modules/js-yaml/dist/js-yaml.mjs
@@ -125380,6 +125381,7 @@ function getCiWorkflowTemplate(provider, options = {}) {
 }
 
 // src/lib/github/repo-mutation.ts
+var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"), 1);
 
 // src/lib/secrets.ts
@@ -125621,17 +125623,21 @@ function normalizeStagePaths(stagePaths) {
     if (hasControlCharacter(rawPath) || import_node_path.default.isAbsolute(stagePath) || import_node_path.default.win32.isAbsolute(stagePath) || segments.includes("..") || stagePath.startsWith(":") || hasControlCharacter(stagePath)) {
       throw new Error(`Unsafe git stage path: ${stagePath}`);
     }
-    normalized.push(stagePath);
+    if (!normalized.includes(stagePath)) {
+      normalized.push(stagePath);
+    }
   }
   return normalized;
 }
 var RepoMutationService = class {
+  cwd;
   execute;
   provider;
   repository;
   repoUrl;
   secretMasker;
   constructor(options) {
+    this.cwd = options.cwd ?? process.cwd();
     this.execute = options.execute;
     this.provider = options.provider ?? "github";
     this.repository = options.repository;
@@ -125640,7 +125646,8 @@ var RepoMutationService = class {
   }
   async commitAndPush(options) {
     const resolvedCurrentRef = resolveCurrentRef(options);
-    const stagePaths = normalizeStagePaths(options.stagePaths);
+    const removePaths = normalizeStagePaths(options.removePaths ?? []);
+    const stagePaths = normalizeStagePaths([...options.stagePaths, ...removePaths]);
     const tokens = this.provider === "azure-devops" ? buildPushTokenOrder({ adoToken: options.adoToken }) : buildPushTokenOrder({
       fallbackToken: options.fallbackToken,
       githubToken: options.githubToken
@@ -125653,8 +125660,43 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
+    const changed = await this.execute("git", [
+      "status",
+      "--porcelain=v1",
+      "--untracked-files=all",
+      "--",
+      ...stagePaths
+    ]);
+    if (changed.exitCode !== 0) {
+      throw new Error(this.secretMasker(changed.stderr || changed.stdout || "Failed to inspect generated changes"));
+    }
+    const hasPlannedRemoval = removePaths.some(
+      (removePath) => (0, import_node_fs.existsSync)(import_node_path.default.resolve(this.cwd, removePath))
+    );
+    if (!changed.stdout.trim() && !hasPlannedRemoval) {
+      return {
+        commitSha: "",
+        pushed: false,
+        resolvedCurrentRef
+      };
+    }
+    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
+    if (options.repoWriteMode === "commit-and-push") {
+      if (!supportsTokenRemote(this.provider)) {
+        throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
+      }
+      if (!resolvedCurrentRef) {
+        throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
+      }
+      if (tokens.length === 0 && !usePersistedCredentials) {
+        throw new Error("No push token configured for repo-write-mode=commit-and-push");
+      }
+    }
     await this.execute("git", ["config", "user.name", options.committerName]);
     await this.execute("git", ["config", "user.email", options.committerEmail]);
+    for (const removePath of removePaths) {
+      (0, import_node_fs.rmSync)(import_node_path.default.resolve(this.cwd, removePath), { force: true });
+    }
     await this.execute("git", ["add", "-A", "--", ...stagePaths]);
     const staged = await this.execute("git", ["diff", "--cached", "--quiet"]);
     if (staged.exitCode === 0) {
@@ -125677,16 +125719,6 @@ var RepoMutationService = class {
         resolvedCurrentRef
       };
     }
-    if (!resolvedCurrentRef) {
-      throw new Error("No current ref could be resolved for repo-write-mode=commit-and-push");
-    }
-    const usePersistedCredentials = tokens.length === 0 && this.provider === "azure-devops";
-    if (tokens.length === 0 && !usePersistedCredentials) {
-      throw new Error("No push token configured for repo-write-mode=commit-and-push");
-    }
-    if (tokens.length > 0 && !supportsTokenRemote(this.provider)) {
-      throw new Error(`repo-write-mode=commit-and-push is not supported for git provider "${this.provider}"`);
-    }
     const originalRemote = (await this.execute("git", ["remote", "get-url", "origin"])).stdout.trim();
     let pushed = false;
     let lastError = "";
@@ -126206,11 +126238,11 @@ function createTelemetryContext(options) {
 }
 
 // src/action-version.ts
-var import_node_fs = require("node:fs");
+var import_node_fs2 = require("node:fs");
 var import_node_path2 = require("node:path");
 function resolveActionVersion2() {
   try {
-    const raw = (0, import_node_fs.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
+    const raw = (0, import_node_fs2.readFileSync)((0, import_node_path2.join)(__dirname, "..", "package.json"), "utf8");
     return JSON.parse(raw).version ?? "unknown";
   } catch {
     return "unknown";
@@ -127965,8 +127997,27 @@ function normalizeInputValue(value) {
   return String(value ?? "").trim();
 }
 function getInput2(name, env = process.env) {
-  const envName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
-  return normalizeInputValue(env[envName]);
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  const normalizedRaw = env[normalizedName];
+  const runnerRaw = runnerName === normalizedName ? void 0 : env[runnerName];
+  const hasNormalized = normalizedRaw !== void 0;
+  const hasRunner = runnerRaw !== void 0;
+  if (hasNormalized && hasRunner) {
+    const normalizedValue = normalizeInputValue(normalizedRaw);
+    const runnerValue = normalizeInputValue(runnerRaw);
+    if (normalizedValue !== runnerValue) {
+      throw new Error(
+        `Conflicting values for ${name}: ${normalizedName}=${JSON.stringify(normalizedValue)} vs ${runnerName}=${JSON.stringify(runnerValue)}`
+      );
+    }
+  }
+  return normalizeInputValue(hasNormalized ? normalizedRaw : runnerRaw);
+}
+function hasInput(name, env = process.env) {
+  const normalizedName = `INPUT_${name.replace(/-/g, "_").toUpperCase()}`;
+  const runnerName = `INPUT_${name.replace(/ /g, "_").toUpperCase()}`;
+  return env[normalizedName] !== void 0 || runnerName !== normalizedName && env[runnerName] !== void 0;
 }
 function parseJsonMap(raw) {
   if (!raw.trim()) return {};
@@ -127996,7 +128047,9 @@ function normalizeRepoWriteMode(value) {
   if (value === "none" || value === "commit-only" || value === "commit-and-push") {
     return value;
   }
-  return "commit-and-push";
+  throw new Error(
+    `Unsupported repo-write-mode "${value}". Allowed values: none, commit-only, commit-and-push`
+  );
 }
 function normalizeCollectionSyncMode(value) {
   if (value === "refresh" || value === "version") {
@@ -128078,7 +128131,7 @@ function resolveInputs(env = process.env) {
     environmentUids,
     envRuntimeUrls,
     artifactDir: getInput2("artifact-dir", env) || "postman",
-    repoWriteMode: normalizeRepoWriteMode(getInput2("repo-write-mode", env) || "commit-and-push"),
+    repoWriteMode: hasInput("repo-write-mode", env) ? normalizeRepoWriteMode(getInput2("repo-write-mode", env)) : "commit-and-push",
     currentRef: getInput2("current-ref", env) || normalizeInputValue(env.GITHUB_REF) || normalizeInputValue(env.BUILD_SOURCEBRANCH),
     githubHeadRef: getInput2("github-head-ref", env) || normalizeInputValue(env.GITHUB_HEAD_REF) || normalizeInputValue(env.SYSTEM_PULLREQUEST_SOURCEBRANCH),
     githubRefName: getInput2("github-ref-name", env) || normalizeInputValue(env.GITHUB_REF_NAME) || normalizeInputValue(repoContext.ref),
@@ -128127,7 +128180,7 @@ function buildEnvironmentValues(envName, baseUrl) {
 var LEGACY_BASELINE_COLLECTION_PREFIX = "[Baseline]";
 function readResourcesState() {
   try {
-    return load((0, import_node_fs2.readFileSync)(".postman/resources.yaml", "utf8"));
+    return load((0, import_node_fs3.readFileSync)(".postman/resources.yaml", "utf8"));
   } catch {
     return null;
   }
@@ -128165,7 +128218,7 @@ function isOpenApiSpecFile(filePath) {
     return false;
   }
   try {
-    const raw = (0, import_node_fs2.readFileSync)(filePath, "utf8");
+    const raw = (0, import_node_fs3.readFileSync)(filePath, "utf8");
     const parsed = filePath.endsWith(".json") ? JSON.parse(raw) : load(raw);
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
       return false;
@@ -128194,7 +128247,7 @@ function scanLocalSpecReferences(baseDir = ".") {
   const found = /* @__PURE__ */ new Set();
   const refs = [];
   const visit2 = (currentDir) => {
-    for (const entry of (0, import_node_fs2.readdirSync)(currentDir, { withFileTypes: true })) {
+    for (const entry of (0, import_node_fs3.readdirSync)(currentDir, { withFileTypes: true })) {
       if (ignoredDirs.has(entry.name)) {
         continue;
       }
@@ -128224,7 +128277,7 @@ function resolveMappedSpecReference(explicitSpecPath, discoveredSpecs) {
   const normalizedExplicitPath = normalizeToPosix(explicitSpecPath.trim());
   if (normalizedExplicitPath) {
     const explicitFullPath = path8.resolve(normalizedExplicitPath);
-    if ((0, import_node_fs2.existsSync)(explicitFullPath) && (0, import_node_fs2.statSync)(explicitFullPath).isFile()) {
+    if ((0, import_node_fs3.existsSync)(explicitFullPath) && (0, import_node_fs3.statSync)(explicitFullPath).isFile()) {
       return {
         repoRelativePath: normalizedExplicitPath,
         configRelativePath: normalizeToPosix(path8.join("..", normalizedExplicitPath))
@@ -128439,7 +128492,7 @@ async function upsertEnvironments(inputs, dependencies, resourcesState) {
   return envUids;
 }
 function ensureDir(path9) {
-  (0, import_node_fs2.mkdirSync)(path9, { recursive: true });
+  (0, import_node_fs3.mkdirSync)(path9, { recursive: true });
 }
 function getCollectionDirectoryName(kind, projectName) {
   if (kind === "Baseline") {
@@ -128476,7 +128529,7 @@ function stripVolatileFields(obj) {
 }
 function writeJsonFile(path9, content, normalize3 = false) {
   const data = normalize3 ? stripVolatileFields(content) : content;
-  (0, import_node_fs2.writeFileSync)(path9, JSON.stringify(data, null, 2));
+  (0, import_node_fs3.writeFileSync)(path9, JSON.stringify(data, null, 2));
 }
 function buildResourcesManifest(workspaceId, collectionMap, envMap, artifactDir, localSpecRefs, mappedSpecRef, specId) {
   const manifest = {
@@ -128550,21 +128603,21 @@ function assertPathWithinCwd(targetPath, fieldName) {
   if (!rawPath || hasControlCharacter2(originalPath) || path8.isAbsolute(rawPath) || path8.win32.isAbsolute(rawPath) || segments.includes("..") || rawPath.startsWith(":") || hasControlCharacter2(rawPath)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
-  const base = (0, import_node_fs2.realpathSync)(process.cwd());
+  const base = (0, import_node_fs3.realpathSync)(process.cwd());
   const resolved = path8.resolve(base, rawPath);
   const relative3 = path8.relative(base, resolved);
   if (relative3.startsWith("..") || path8.isAbsolute(relative3)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
   }
   let existingPath = resolved;
-  while (!(0, import_node_fs2.existsSync)(existingPath)) {
+  while (!(0, import_node_fs3.existsSync)(existingPath)) {
     const parent = path8.dirname(existingPath);
     if (parent === existingPath) {
       break;
     }
     existingPath = parent;
   }
-  const realExistingPath = (0, import_node_fs2.realpathSync)(existingPath);
+  const realExistingPath = (0, import_node_fs3.realpathSync)(existingPath);
   const realRelative = path8.relative(base, realExistingPath);
   if (realRelative.startsWith("..") || path8.isAbsolute(realRelative)) {
     throw new Error(`${fieldName} must stay within the repository root; received ${targetPath}`);
@@ -128592,8 +128645,8 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
   ensureDir(specsDir);
   ensureDir(".postman");
   const globalsFilePath = `${globalsDir}/workspace.globals.yaml`;
-  if (!(0, import_node_fs2.existsSync)(globalsFilePath)) {
-    (0, import_node_fs2.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
+  if (!(0, import_node_fs3.existsSync)(globalsFilePath)) {
+    (0, import_node_fs3.writeFileSync)(globalsFilePath, "name: Globals\nvalues: []\n");
   }
   if (inputs.generateCiWorkflow) {
     const ciDir = inputs.ciWorkflowPath.split("/").slice(0, -1).join("/");
@@ -128629,7 +128682,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
       true
     );
   }
-  (0, import_node_fs2.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
+  (0, import_node_fs3.writeFileSync)(".postman/resources.yaml", buildResourcesManifest(
     inputs.workspaceId,
     manifestCollections,
     envUids,
@@ -128639,7 +128692,7 @@ async function exportArtifacts(inputs, dependencies, envUids, assetProjectName)
     inputs.specId || void 0
   ));
   if (mappedSpec && Object.keys(manifestCollections).length > 0) {
-    (0, import_node_fs2.writeFileSync)(
+    (0, import_node_fs3.writeFileSync)(
       ".postman/workflows.yaml",
       buildSpecCollectionWorkflowManifest(
         mappedSpec.configRelativePath,
@@ -128676,29 +128729,27 @@ function createRepoSummary(outputs, envUids, pushed) {
   });
 }
 async function commitAndPushGeneratedFiles(inputs, dependencies) {
-  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
-    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
-  }
   if (inputs.generateCiWorkflow) {
+    assertPathWithinCwd(inputs.ciWorkflowPath, "ci-workflow-path");
     const ciWorkflow = renderCiWorkflow(inputs);
     const parts = inputs.ciWorkflowPath.split("/");
     if (parts.length > 1) {
       const dir = parts.slice(0, -1).join("/");
       ensureDir(dir);
     }
-    (0, import_node_fs2.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
+    (0, import_node_fs3.writeFileSync)(inputs.ciWorkflowPath, ciWorkflow);
   }
-  const provisionPath = ".github/workflows/provision.yml";
-  const provisionExists = inputs.provider === "github" && (0, import_node_fs2.existsSync)(provisionPath);
-  if (provisionExists) {
-    (0, import_node_fs2.rmSync)(provisionPath);
+  if (!dependencies.repoMutation || inputs.repoWriteMode === "none") {
+    return { commitSha: "", resolvedCurrentRef: "", pushed: false };
   }
+  const provisionPath = ".github/workflows/provision.yml";
+  const provisionExists = inputs.provider === "github" && (0, import_node_fs3.existsSync)(provisionPath);
   const stagePaths = [
     inputs.artifactDir,
     ".postman",
     inputs.generateCiWorkflow ? inputs.ciWorkflowPath : null,
     provisionExists ? provisionPath : null
-  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs2.existsSync)(entry) || entry === provisionPath));
+  ].filter((entry) => typeof entry === "string" && ((0, import_node_fs3.existsSync)(entry) || entry === provisionPath));
   if (stagePaths.length === 0) {
     dependencies.core.info("No generated repository paths were found; skipping repo mutation.");
     return {
@@ -128722,6 +128773,7 @@ async function commitAndPushGeneratedFiles(inputs, dependencies) {
     adoToken: inputs.provider === "azure-devops" ? inputs.adoToken : void 0,
     githubToken: inputs.provider === "azure-devops" ? void 0 : inputs.githubToken,
     fallbackToken: inputs.provider === "azure-devops" ? void 0 : inputs.ghFallbackToken,
+    removePaths: provisionExists ? [provisionPath] : [],
     stagePaths
   });
   return {
@@ -129179,6 +129231,7 @@ async function runAction(actionCore = core_exports, actionExec = exec_exports) {
   assertPathWithinCwd,
   createRepoSyncDependencies,
   getInput,
+  hasInput,
   readActionInputs,
   resolveInputs,
   resolvePostmanApiKeyAndTeamId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postman-cse/onboarding-repo-sync",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Postman repo sync GitHub Action.",
   "type": "module",
   "main": "dist/index.cjs",
@@ -17,7 +17,7 @@
   "scripts": {
     "prepare": "git config core.hooksPath .githooks",
     "build": "npm run typecheck && rm -rf dist && esbuild src/index.ts --bundle --platform=node --target=node24 --format=cjs --outfile=dist/index.cjs && esbuild src/main.ts --bundle --platform=node --target=node24 --format=cjs --outfile=dist/action.cjs && esbuild src/cli.ts --bundle --platform=node --target=node24 --format=cjs --outfile=dist/cli.cjs",
-    "verify:dist": "npm run build && git diff --ignore-space-at-eol --text --exit-code -- dist",
+    "verify:dist": "npm run build && node -e \"const fs=require('fs');const p='dist/cli.cjs';const s=fs.readFileSync(p,'utf8');if(!s.startsWith('#!/usr/bin/env node\\n')){console.error('dist/cli.cjs missing Node shebang');process.exit(1)}if(!(fs.statSync(p).mode&0o111)){console.error('dist/cli.cjs is not executable');process.exit(1)}\" && git diff --ignore-space-at-eol --text --exit-code -- dist",
     "docs:tables": "node scripts/render-action-tables.mjs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",