@treeseed/sdk 0.6.10 → 0.6.11

package/dist/workflow/operations.js

@@ -232,6 +232,26 @@ function ensureWorkflowCommandBins(root, helpers) {
     helpers.write(`[workspace][link] Linked ${name} command shim.`);
   }
 }
+function unresolvedMergePaths(repoDir) {
+  return run("git", ["diff", "--name-only", "--diff-filter=U"], { cwd: repoDir, capture: true }).split("\n").map((line) => line.trim()).filter(Boolean);
+}
+function resolveRootReleaseSubmoduleConflicts(root, selectedPackageNames) {
+  const gitRoot = repoRoot(root);
+  const packages = checkedOutWorkspacePackageRepos(root).filter((pkg) => selectedPackageNames.has(pkg.name)).map((pkg) => ({
+    ...pkg,
+    repoPath: relative(gitRoot, pkg.dir)
+  }));
+  const packagePaths = new Set(packages.map((pkg) => pkg.repoPath));
+  const unresolved = unresolvedMergePaths(gitRoot);
+  if (unresolved.length === 0 || unresolved.some((filePath) => !packagePaths.has(filePath))) {
+    return false;
+  }
+  for (const pkg of packages) {
+    syncBranchWithOrigin(pkg.dir, PRODUCTION_BRANCH);
+    run("git", ["add", pkg.repoPath], { cwd: gitRoot });
+  }
+  return true;
+}
 function unlinkWorkflowWorkspaceLinks(root, helpers, mode = "auto") {
   if (!shouldManageWorkspaceLinks(mode, helpers.context.env)) {
     return inspectWorkspaceDependencyMode(root, { mode: "off", env: helpers.context.env });
@@ -3363,12 +3383,21 @@ async function workflowRelease(helpers, input) {
           commitAllIfChanged(gitRoot, `release: ${level} bump`);
           pushBranch(gitRoot, STAGING_BRANCH);
           const stagingCommit = headCommit(gitRoot);
-          const released = mergeBranchIntoTarget(root, {
-            sourceBranch: STAGING_BRANCH,
-            targetBranch: PRODUCTION_BRANCH,
-            message: `release: ${STAGING_BRANCH} -> ${PRODUCTION_BRANCH}`,
-            pushTarget: false
-          });
+          let released;
+          try {
+            released = mergeBranchIntoTarget(root, {
+              sourceBranch: STAGING_BRANCH,
+              targetBranch: PRODUCTION_BRANCH,
+              message: `release: ${STAGING_BRANCH} -> ${PRODUCTION_BRANCH}`,
+              pushTarget: false
+            });
+          } catch (error) {
+            if (!resolveRootReleaseSubmoduleConflicts(root, effectiveSelectedPackageNames)) {
+              throw error;
+            }
+            commitAllIfChanged(gitRoot, `release: ${STAGING_BRANCH} -> ${PRODUCTION_BRANCH}`);
+            released = { commitSha: headCommit(gitRoot) };
+          }
           for (const pkg of checkedOutWorkspacePackageRepos(root)) {
             if (effectiveSelectedPackageNames.has(pkg.name)) {
               syncBranchWithOrigin(pkg.dir, PRODUCTION_BRANCH);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@treeseed/sdk",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "description": "Shared Treeseed SDK for content-backed and D1-backed object models.",
   "license": "AGPL-3.0-only",
   "repository": {