@postman-cse/onboarding-repo-sync 2.1.7 → 2.1.8

package/dist/action.cjs

@@ -126895,7 +126895,85 @@ var BifrostInternalIntegrationAdapter = class {
       throw advised ?? httpErr;
     }
   }
-  async connectWorkspaceToRepository(workspaceId, repoUrl) {
+  /**
+   * Probe who (if anyone) already owns the global `(repo, path)` filesystem
+   * link. Non-fatal: unexpected statuses / network errors yield `unknown` so
+   * callers can proceed and rely on reactive POST conflict handling.
+   *
+   * Bifrost states (FileSystemController.fetchWorkspaceForFileSystem):
+   *   - 200 + data null  -> free
+   *   - 200 + data       -> linked-visible (workspace payload)
+   *   - 403 + error.meta.workspaceId -> linked-invisible
+   *   - 200 + error.meta.workspaceId -> linked-invisible (proxy envelope)
+   */
+  async findWorkspaceForRepo(repoUrl, path9 = "/") {
+    const fsPath = path9 && path9.trim() ? path9.trim() : "/";
+    const url = `${this.bifrostBaseUrl}/ws/proxy`;
+    const payload = {
+      service: "workspaces",
+      method: "GET",
+      path: `/workspaces/filesystem?repo=${encodeURIComponent(repoUrl)}&path=${encodeURIComponent(fsPath)}`
+    };
+    try {
+      const response = await this.fetchImpl(url, {
+        method: "POST",
+        headers: this.bifrostHeaders(),
+        body: JSON.stringify(payload)
+      });
+      let parsed = {};
+      try {
+        parsed = await response.json();
+      } catch {
+        return {
+          state: "unknown",
+          reason: `filesystem lookup returned non-JSON body (HTTP ${response.status})`
+        };
+      }
+      const errorMetaWorkspaceId = typeof parsed?.error?.meta?.workspaceId === "string" && parsed.error.meta.workspaceId.trim() ? parsed.error.meta.workspaceId.trim() : void 0;
+      if (errorMetaWorkspaceId) {
+        return { state: "linked-invisible", workspaceId: errorMetaWorkspaceId };
+      }
+      if (response.ok) {
+        if (parsed?.data == null) {
+          return { state: "free" };
+        }
+        const id = typeof parsed.data.id === "string" ? parsed.data.id.trim() : "";
+        if (!id) {
+          return {
+            state: "unknown",
+            reason: "filesystem lookup returned 200 without a workspace id"
+          };
+        }
+        const name = typeof parsed.data.name === "string" && parsed.data.name.trim() ? parsed.data.name.trim() : void 0;
+        return {
+          state: "linked-visible",
+          workspace: name ? { id, name } : { id }
+        };
+      }
+      if (response.status === 403) {
+        const workspaceId = extractDuplicateWorkspaceId(
+          JSON.stringify(parsed)
+        );
+        if (workspaceId) {
+          return { state: "linked-invisible", workspaceId };
+        }
+        return {
+          state: "unknown",
+          reason: "filesystem lookup returned 403 without error.meta.workspaceId"
+        };
+      }
+      return {
+        state: "unknown",
+        reason: `filesystem lookup returned HTTP ${response.status}`
+      };
+    } catch (error2) {
+      return {
+        state: "unknown",
+        reason: error2 instanceof Error ? error2.message : String(error2)
+      };
+    }
+  }
+  async connectWorkspaceToRepository(workspaceId, repoUrl, options) {
     const url = `${this.bifrostBaseUrl}/ws/proxy`;
     const payload = {
       service: "workspaces",
@@ -126922,6 +127000,11 @@ var BifrostInternalIntegrationAdapter = class {
         if (isDuplicate) {
           const existingWorkspaceId = extractDuplicateWorkspaceId(body);
           if (existingWorkspaceId && existingWorkspaceId !== workspaceId) {
+            if (options?.preflightWasFree) {
+              throw new Error(
+                `REPOSITORY_LINK_CONFLICT_UNRESOLVED: Preflight found no active owner, but link creation reported workspace ${existingWorkspaceId}. Stop and contact Postman support; do not alter the repository URL.`
+              );
+            }
             throw new Error(
               await this.describeWorkspaceLinkConflict(existingWorkspaceId, workspaceId, repoUrl)
             );
@@ -129848,6 +129931,39 @@ async function runRepoSyncInner(inputs, dependencies) {
       }
     }
   }
+  let skipRepositoryLinkPost = false;
+  let repositoryLinkPreflightWasFree = false;
+  if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration?.findWorkspaceForRepo) {
+    const probe = await dependencies.internalIntegration.findWorkspaceForRepo(
+      inputs.repoUrl,
+      "/"
+    );
+    if (probe.state === "linked-visible") {
+      if (probe.workspace.id === inputs.workspaceId) {
+        skipRepositoryLinkPost = true;
+        dependencies.core.info(
+          `REPOSITORY_LINK_ALREADY_TARGET: Repository ${inputs.repoUrl} at path / is already linked to target workspace ${inputs.workspaceId}; continuing.`
+        );
+      } else {
+        const ownerName = probe.workspace.name?.trim() || "unknown";
+        throw new Error(
+          `REPOSITORY_LINK_CONFLICT_VISIBLE: Repository ${inputs.repoUrl} at path / is already linked to workspace ${probe.workspace.id} ("${ownerName}"). No Postman assets were changed. Reuse that workspace or disconnect it in Workspace Settings, then rerun.`
+        );
+      }
+    } else if (probe.state === "linked-invisible") {
+      let message = `REPOSITORY_LINK_CONFLICT_INVISIBLE: Repository ${inputs.repoUrl} at path / is linked to workspace ${probe.workspaceId}, but these credentials cannot view it. No Postman assets were changed. Ask its owner or a team admin to disconnect it.`;
+      if (inputs.orgMode) {
+        message += " Verify workspace-team-id; if the owner is in another sub-team, ask that sub-team's admin to disconnect it.";
+      }
+      throw new Error(message);
+    } else if (probe.state === "free") {
+      repositoryLinkPreflightWasFree = true;
+    } else {
+      dependencies.core.warning(
+        `REPOSITORY_LINK_PREFLIGHT_UNKNOWN: Unable to determine the existing repository link (${probe.reason}); continuing and relying on link creation conflict handling.`
+      );
+    }
+  }
   const branchAssetMarker = buildBranchAssetMarker(branchDecision, inputs);
   const envUids = await upsertEnvironments(inputs, dependencies, resourcesState, branchAssetMarker);
   outputs["environment-uids-json"] = JSON.stringify(envUids);
@@ -129980,18 +130096,33 @@ async function runRepoSyncInner(inputs, dependencies) {
   }
   if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration) {
     try {
-      await dependencies.internalIntegration.connectWorkspaceToRepository(
-        inputs.workspaceId,
-        inputs.repoUrl
-      );
-      outputs["workspace-link-status"] = "success";
-      dependencies.core.info(
-        `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
-      );
+      if (skipRepositoryLinkPost) {
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl} (preflight already-target; link POST skipped)`
+        );
+      } else {
+        await dependencies.internalIntegration.connectWorkspaceToRepository(
+          inputs.workspaceId,
+          inputs.repoUrl,
+          repositoryLinkPreflightWasFree ? { preflightWasFree: true } : void 0
+        );
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
+        );
+      }
     } catch (error2) {
       outputs["workspace-link-status"] = "failed";
-      const message = `Workspace link failed: ${error2 instanceof Error ? error2.message : String(error2)}`;
+      const rawMessage = error2 instanceof Error ? error2.message : String(error2);
+      const isUnresolvedContract = rawMessage.startsWith(
+        "REPOSITORY_LINK_CONFLICT_UNRESOLVED:"
+      );
+      const message = isUnresolvedContract ? rawMessage : `Workspace link failed: ${rawMessage}`;
       if (branchDecision.tier === "canonical") {
+        if (isUnresolvedContract && error2 instanceof Error) {
+          throw error2;
+        }
         throw new Error(message, { cause: error2 });
       }
       dependencies.core.warning(message);

package/dist/cli.cjs

@@ -124998,7 +124998,85 @@ var BifrostInternalIntegrationAdapter = class {
       throw advised ?? httpErr;
     }
   }
-  async connectWorkspaceToRepository(workspaceId, repoUrl) {
+  /**
+   * Probe who (if anyone) already owns the global `(repo, path)` filesystem
+   * link. Non-fatal: unexpected statuses / network errors yield `unknown` so
+   * callers can proceed and rely on reactive POST conflict handling.
+   *
+   * Bifrost states (FileSystemController.fetchWorkspaceForFileSystem):
+   *   - 200 + data null  -> free
+   *   - 200 + data       -> linked-visible (workspace payload)
+   *   - 403 + error.meta.workspaceId -> linked-invisible
+   *   - 200 + error.meta.workspaceId -> linked-invisible (proxy envelope)
+   */
+  async findWorkspaceForRepo(repoUrl, path5 = "/") {
+    const fsPath = path5 && path5.trim() ? path5.trim() : "/";
+    const url = `${this.bifrostBaseUrl}/ws/proxy`;
+    const payload = {
+      service: "workspaces",
+      method: "GET",
+      path: `/workspaces/filesystem?repo=${encodeURIComponent(repoUrl)}&path=${encodeURIComponent(fsPath)}`
+    };
+    try {
+      const response = await this.fetchImpl(url, {
+        method: "POST",
+        headers: this.bifrostHeaders(),
+        body: JSON.stringify(payload)
+      });
+      let parsed = {};
+      try {
+        parsed = await response.json();
+      } catch {
+        return {
+          state: "unknown",
+          reason: `filesystem lookup returned non-JSON body (HTTP ${response.status})`
+        };
+      }
+      const errorMetaWorkspaceId = typeof parsed?.error?.meta?.workspaceId === "string" && parsed.error.meta.workspaceId.trim() ? parsed.error.meta.workspaceId.trim() : void 0;
+      if (errorMetaWorkspaceId) {
+        return { state: "linked-invisible", workspaceId: errorMetaWorkspaceId };
+      }
+      if (response.ok) {
+        if (parsed?.data == null) {
+          return { state: "free" };
+        }
+        const id = typeof parsed.data.id === "string" ? parsed.data.id.trim() : "";
+        if (!id) {
+          return {
+            state: "unknown",
+            reason: "filesystem lookup returned 200 without a workspace id"
+          };
+        }
+        const name = typeof parsed.data.name === "string" && parsed.data.name.trim() ? parsed.data.name.trim() : void 0;
+        return {
+          state: "linked-visible",
+          workspace: name ? { id, name } : { id }
+        };
+      }
+      if (response.status === 403) {
+        const workspaceId = extractDuplicateWorkspaceId(
+          JSON.stringify(parsed)
+        );
+        if (workspaceId) {
+          return { state: "linked-invisible", workspaceId };
+        }
+        return {
+          state: "unknown",
+          reason: "filesystem lookup returned 403 without error.meta.workspaceId"
+        };
+      }
+      return {
+        state: "unknown",
+        reason: `filesystem lookup returned HTTP ${response.status}`
+      };
+    } catch (error) {
+      return {
+        state: "unknown",
+        reason: error instanceof Error ? error.message : String(error)
+      };
+    }
+  }
+  async connectWorkspaceToRepository(workspaceId, repoUrl, options) {
     const url = `${this.bifrostBaseUrl}/ws/proxy`;
     const payload = {
       service: "workspaces",
@@ -125025,6 +125103,11 @@ var BifrostInternalIntegrationAdapter = class {
         if (isDuplicate) {
           const existingWorkspaceId = extractDuplicateWorkspaceId(body);
           if (existingWorkspaceId && existingWorkspaceId !== workspaceId) {
+            if (options?.preflightWasFree) {
+              throw new Error(
+                `REPOSITORY_LINK_CONFLICT_UNRESOLVED: Preflight found no active owner, but link creation reported workspace ${existingWorkspaceId}. Stop and contact Postman support; do not alter the repository URL.`
+              );
+            }
             throw new Error(
               await this.describeWorkspaceLinkConflict(existingWorkspaceId, workspaceId, repoUrl)
             );
@@ -127758,6 +127841,39 @@ async function runRepoSyncInner(inputs, dependencies) {
       }
     }
   }
+  let skipRepositoryLinkPost = false;
+  let repositoryLinkPreflightWasFree = false;
+  if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration?.findWorkspaceForRepo) {
+    const probe = await dependencies.internalIntegration.findWorkspaceForRepo(
+      inputs.repoUrl,
+      "/"
+    );
+    if (probe.state === "linked-visible") {
+      if (probe.workspace.id === inputs.workspaceId) {
+        skipRepositoryLinkPost = true;
+        dependencies.core.info(
+          `REPOSITORY_LINK_ALREADY_TARGET: Repository ${inputs.repoUrl} at path / is already linked to target workspace ${inputs.workspaceId}; continuing.`
+        );
+      } else {
+        const ownerName = probe.workspace.name?.trim() || "unknown";
+        throw new Error(
+          `REPOSITORY_LINK_CONFLICT_VISIBLE: Repository ${inputs.repoUrl} at path / is already linked to workspace ${probe.workspace.id} ("${ownerName}"). No Postman assets were changed. Reuse that workspace or disconnect it in Workspace Settings, then rerun.`
+        );
+      }
+    } else if (probe.state === "linked-invisible") {
+      let message = `REPOSITORY_LINK_CONFLICT_INVISIBLE: Repository ${inputs.repoUrl} at path / is linked to workspace ${probe.workspaceId}, but these credentials cannot view it. No Postman assets were changed. Ask its owner or a team admin to disconnect it.`;
+      if (inputs.orgMode) {
+        message += " Verify workspace-team-id; if the owner is in another sub-team, ask that sub-team's admin to disconnect it.";
+      }
+      throw new Error(message);
+    } else if (probe.state === "free") {
+      repositoryLinkPreflightWasFree = true;
+    } else {
+      dependencies.core.warning(
+        `REPOSITORY_LINK_PREFLIGHT_UNKNOWN: Unable to determine the existing repository link (${probe.reason}); continuing and relying on link creation conflict handling.`
+      );
+    }
+  }
   const branchAssetMarker = buildBranchAssetMarker(branchDecision, inputs);
   const envUids = await upsertEnvironments(inputs, dependencies, resourcesState, branchAssetMarker);
   outputs["environment-uids-json"] = JSON.stringify(envUids);
@@ -127890,18 +128006,33 @@ async function runRepoSyncInner(inputs, dependencies) {
   }
   if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration) {
     try {
-      await dependencies.internalIntegration.connectWorkspaceToRepository(
-        inputs.workspaceId,
-        inputs.repoUrl
-      );
-      outputs["workspace-link-status"] = "success";
-      dependencies.core.info(
-        `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
-      );
+      if (skipRepositoryLinkPost) {
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl} (preflight already-target; link POST skipped)`
+        );
+      } else {
+        await dependencies.internalIntegration.connectWorkspaceToRepository(
+          inputs.workspaceId,
+          inputs.repoUrl,
+          repositoryLinkPreflightWasFree ? { preflightWasFree: true } : void 0
+        );
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
+        );
+      }
     } catch (error) {
       outputs["workspace-link-status"] = "failed";
-      const message = `Workspace link failed: ${error instanceof Error ? error.message : String(error)}`;
+      const rawMessage = error instanceof Error ? error.message : String(error);
+      const isUnresolvedContract = rawMessage.startsWith(
+        "REPOSITORY_LINK_CONFLICT_UNRESOLVED:"
+      );
+      const message = isUnresolvedContract ? rawMessage : `Workspace link failed: ${rawMessage}`;
       if (branchDecision.tier === "canonical") {
+        if (isUnresolvedContract && error instanceof Error) {
+          throw error;
+        }
         throw new Error(message, { cause: error });
       }
       dependencies.core.warning(message);

package/dist/index.cjs

@@ -126915,7 +126915,85 @@ var BifrostInternalIntegrationAdapter = class {
       throw advised ?? httpErr;
     }
   }
-  async connectWorkspaceToRepository(workspaceId, repoUrl) {
+  /**
+   * Probe who (if anyone) already owns the global `(repo, path)` filesystem
+   * link. Non-fatal: unexpected statuses / network errors yield `unknown` so
+   * callers can proceed and rely on reactive POST conflict handling.
+   *
+   * Bifrost states (FileSystemController.fetchWorkspaceForFileSystem):
+   *   - 200 + data null  -> free
+   *   - 200 + data       -> linked-visible (workspace payload)
+   *   - 403 + error.meta.workspaceId -> linked-invisible
+   *   - 200 + error.meta.workspaceId -> linked-invisible (proxy envelope)
+   */
+  async findWorkspaceForRepo(repoUrl, path9 = "/") {
+    const fsPath = path9 && path9.trim() ? path9.trim() : "/";
+    const url = `${this.bifrostBaseUrl}/ws/proxy`;
+    const payload = {
+      service: "workspaces",
+      method: "GET",
+      path: `/workspaces/filesystem?repo=${encodeURIComponent(repoUrl)}&path=${encodeURIComponent(fsPath)}`
+    };
+    try {
+      const response = await this.fetchImpl(url, {
+        method: "POST",
+        headers: this.bifrostHeaders(),
+        body: JSON.stringify(payload)
+      });
+      let parsed = {};
+      try {
+        parsed = await response.json();
+      } catch {
+        return {
+          state: "unknown",
+          reason: `filesystem lookup returned non-JSON body (HTTP ${response.status})`
+        };
+      }
+      const errorMetaWorkspaceId = typeof parsed?.error?.meta?.workspaceId === "string" && parsed.error.meta.workspaceId.trim() ? parsed.error.meta.workspaceId.trim() : void 0;
+      if (errorMetaWorkspaceId) {
+        return { state: "linked-invisible", workspaceId: errorMetaWorkspaceId };
+      }
+      if (response.ok) {
+        if (parsed?.data == null) {
+          return { state: "free" };
+        }
+        const id = typeof parsed.data.id === "string" ? parsed.data.id.trim() : "";
+        if (!id) {
+          return {
+            state: "unknown",
+            reason: "filesystem lookup returned 200 without a workspace id"
+          };
+        }
+        const name = typeof parsed.data.name === "string" && parsed.data.name.trim() ? parsed.data.name.trim() : void 0;
+        return {
+          state: "linked-visible",
+          workspace: name ? { id, name } : { id }
+        };
+      }
+      if (response.status === 403) {
+        const workspaceId = extractDuplicateWorkspaceId(
+          JSON.stringify(parsed)
+        );
+        if (workspaceId) {
+          return { state: "linked-invisible", workspaceId };
+        }
+        return {
+          state: "unknown",
+          reason: "filesystem lookup returned 403 without error.meta.workspaceId"
+        };
+      }
+      return {
+        state: "unknown",
+        reason: `filesystem lookup returned HTTP ${response.status}`
+      };
+    } catch (error2) {
+      return {
+        state: "unknown",
+        reason: error2 instanceof Error ? error2.message : String(error2)
+      };
+    }
+  }
+  async connectWorkspaceToRepository(workspaceId, repoUrl, options) {
     const url = `${this.bifrostBaseUrl}/ws/proxy`;
     const payload = {
       service: "workspaces",
@@ -126942,6 +127020,11 @@ var BifrostInternalIntegrationAdapter = class {
         if (isDuplicate) {
           const existingWorkspaceId = extractDuplicateWorkspaceId(body);
           if (existingWorkspaceId && existingWorkspaceId !== workspaceId) {
+            if (options?.preflightWasFree) {
+              throw new Error(
+                `REPOSITORY_LINK_CONFLICT_UNRESOLVED: Preflight found no active owner, but link creation reported workspace ${existingWorkspaceId}. Stop and contact Postman support; do not alter the repository URL.`
+              );
+            }
             throw new Error(
               await this.describeWorkspaceLinkConflict(existingWorkspaceId, workspaceId, repoUrl)
             );
@@ -129868,6 +129951,39 @@ async function runRepoSyncInner(inputs, dependencies) {
       }
     }
   }
+  let skipRepositoryLinkPost = false;
+  let repositoryLinkPreflightWasFree = false;
+  if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration?.findWorkspaceForRepo) {
+    const probe = await dependencies.internalIntegration.findWorkspaceForRepo(
+      inputs.repoUrl,
+      "/"
+    );
+    if (probe.state === "linked-visible") {
+      if (probe.workspace.id === inputs.workspaceId) {
+        skipRepositoryLinkPost = true;
+        dependencies.core.info(
+          `REPOSITORY_LINK_ALREADY_TARGET: Repository ${inputs.repoUrl} at path / is already linked to target workspace ${inputs.workspaceId}; continuing.`
+        );
+      } else {
+        const ownerName = probe.workspace.name?.trim() || "unknown";
+        throw new Error(
+          `REPOSITORY_LINK_CONFLICT_VISIBLE: Repository ${inputs.repoUrl} at path / is already linked to workspace ${probe.workspace.id} ("${ownerName}"). No Postman assets were changed. Reuse that workspace or disconnect it in Workspace Settings, then rerun.`
+        );
+      }
+    } else if (probe.state === "linked-invisible") {
+      let message = `REPOSITORY_LINK_CONFLICT_INVISIBLE: Repository ${inputs.repoUrl} at path / is linked to workspace ${probe.workspaceId}, but these credentials cannot view it. No Postman assets were changed. Ask its owner or a team admin to disconnect it.`;
+      if (inputs.orgMode) {
+        message += " Verify workspace-team-id; if the owner is in another sub-team, ask that sub-team's admin to disconnect it.";
+      }
+      throw new Error(message);
+    } else if (probe.state === "free") {
+      repositoryLinkPreflightWasFree = true;
+    } else {
+      dependencies.core.warning(
+        `REPOSITORY_LINK_PREFLIGHT_UNKNOWN: Unable to determine the existing repository link (${probe.reason}); continuing and relying on link creation conflict handling.`
+      );
+    }
+  }
   const branchAssetMarker = buildBranchAssetMarker(branchDecision, inputs);
   const envUids = await upsertEnvironments(inputs, dependencies, resourcesState, branchAssetMarker);
   outputs["environment-uids-json"] = JSON.stringify(envUids);
@@ -130000,18 +130116,33 @@ async function runRepoSyncInner(inputs, dependencies) {
   }
   if (inputs.workspaceLinkEnabled && inputs.workspaceId && inputs.repoUrl && dependencies.internalIntegration) {
     try {
-      await dependencies.internalIntegration.connectWorkspaceToRepository(
-        inputs.workspaceId,
-        inputs.repoUrl
-      );
-      outputs["workspace-link-status"] = "success";
-      dependencies.core.info(
-        `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
-      );
+      if (skipRepositoryLinkPost) {
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl} (preflight already-target; link POST skipped)`
+        );
+      } else {
+        await dependencies.internalIntegration.connectWorkspaceToRepository(
+          inputs.workspaceId,
+          inputs.repoUrl,
+          repositoryLinkPreflightWasFree ? { preflightWasFree: true } : void 0
+        );
+        outputs["workspace-link-status"] = "success";
+        dependencies.core.info(
+          `workspace-link-status=success workspace-id=${inputs.workspaceId} repo=${inputs.repoUrl}`
+        );
+      }
     } catch (error2) {
       outputs["workspace-link-status"] = "failed";
-      const message = `Workspace link failed: ${error2 instanceof Error ? error2.message : String(error2)}`;
+      const rawMessage = error2 instanceof Error ? error2.message : String(error2);
+      const isUnresolvedContract = rawMessage.startsWith(
+        "REPOSITORY_LINK_CONFLICT_UNRESOLVED:"
+      );
+      const message = isUnresolvedContract ? rawMessage : `Workspace link failed: ${rawMessage}`;
       if (branchDecision.tier === "canonical") {
+        if (isUnresolvedContract && error2 instanceof Error) {
+          throw error2;
+        }
         throw new Error(message, { cause: error2 });
       }
       dependencies.core.warning(message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postman-cse/onboarding-repo-sync",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Postman repo sync GitHub Action.",
   "type": "module",
   "main": "dist/index.cjs",