@treeseed/sdk 0.12.53 → 0.12.55

package/dist/hosting/graph.js

@@ -83,7 +83,8 @@ function publicTreeDxSourcePolicy(input, config, launchEnv) {
       imageRef,
       imageTagRef: "TREESEED_PUBLIC_TREEDX_IMAGE_REF"
     };
-    assertApiRailwaySourcePolicy(input.environment, { key: "public-treedx-node-01", serviceName: "public-treedx-node-01", ...policy2 });
+    const serviceName = input.environment === "prod" ? "public-treedx-node-production-01" : "public-treedx-node-01";
+    assertApiRailwaySourcePolicy(input.environment, { key: serviceName, serviceName, ...policy2 });
     return policy2;
   }
   const policy = {
@@ -174,7 +175,9 @@ function resolveRailwayServiceSourceRoot(input, serviceKey, service) {
 function railwaySourcePolicy(input, serviceKey, service, imageRef) {
   const configuredSource = service.railway?.source && typeof service.railway.source === "object" && !Array.isArray(service.railway.source) ? service.railway.source : {};
   const configuredMode = typeof service.railway?.sourceMode === "string" ? service.railway.sourceMode : null;
-  const serviceName = service.railway?.serviceName ?? null;
+  const baseServiceName = service.railway?.serviceName ?? null;
+  const configuredEnvironmentServiceName = service.environments?.[input.environment]?.railwayServiceName;
+  const serviceName = typeof configuredEnvironmentServiceName === "string" && configuredEnvironmentServiceName.trim() ? configuredEnvironmentServiceName.trim() : input.environment === "prod" && ["api", "operationsRunner"].includes(serviceKey) && baseServiceName ? `${baseServiceName}-production` : baseServiceName;
   const repository = typeof service.railway?.sourceRepo === "string" ? service.railway.sourceRepo : typeof configuredSource.repository === "string" ? configuredSource.repository : typeof configuredSource.repo === "string" ? configuredSource.repo : readPackageRepository(resolveRailwayServiceSourceRoot(input, serviceKey, service)) ?? readPackageRepository(input.tenantRoot) ?? apiRailwayDefaultSourceRepo({ key: serviceKey, serviceName });
   const dockerfilePath = service.railway?.dockerfilePath ?? apiRailwayDefaultDockerfilePath({ key: serviceKey, serviceName });
   const apiPackageSourceEligible = ["api", "operationsRunner"].includes(serviceKey);
@@ -248,14 +251,18 @@ function marketProjectGroup(environment, config) {
   const apiService = config.services?.api && typeof config.services.api === "object" ? config.services.api : null;
   const railwayProjectName = typeof apiService?.railway?.projectName === "string" && apiService.railway.projectName.trim() ? apiService.railway.projectName.trim() : void 0;
   const projectName = railwayProjectName ?? config.slug ?? "treeseed-api";
+  const environmentProjectName = (scope) => {
+    const configured = apiService?.environments?.[scope]?.railwayProjectName;
+    return typeof configured === "string" && configured.trim() ? configured.trim() : projectName;
+  };
   return {
     id: "treeseed-control-plane",
     label: "Treeseed control plane",
     hostId: environment === "local" ? "local-process" : "railway",
     environments: {
       local: { projectName: `${projectName}-local`, environmentName: "local" },
-      staging: { projectName, environmentName: "staging" },
-      prod: { projectName, environmentName: "production" }
+      staging: { projectName: environmentProjectName("staging"), environmentName: "staging" },
+      prod: { projectName: environmentProjectName("prod"), environmentName: "production" }
     },
     metadata: { stableProjectName: projectName }
   };
@@ -377,6 +384,9 @@ function buildProfileFromDeployConfig(input) {
     const imageRefEnv = railwayImageRefEnvForService(serviceKey);
     const imageRef = service.railway?.imageRef ?? (input.environment === "prod" && imageRefEnv ? launchEnv[imageRefEnv] ?? null : null) ?? defaultRailwayImageRefForService(serviceKey, input.environment) ?? null;
     const sourcePolicy = railwaySourcePolicy(input, serviceKey, service, imageRef);
+    const environmentConfig = service.environments?.[input.environment];
+    const baseServiceName = service.railway?.serviceName ?? null;
+    const effectiveServiceName = environmentConfig?.railwayServiceName ?? (input.environment === "prod" && ["api", "operationsRunner"].includes(serviceKey) && baseServiceName ? `${baseServiceName}-production` : baseServiceName);
     services.push({
       id: serviceKey,
       label: placement === "runner-capacity" ? "Runner Capacity" : serviceKey === "api" ? "API Runtime" : serviceKey,
@@ -400,7 +410,7 @@ function buildProfileFromDeployConfig(input) {
         volumeMountPath: service.railway?.volumeMountPath ?? null,
         runnerPool: service.railway?.runnerPool ?? null,
         resourceType: service.railway?.resourceType ?? null,
-        serviceName: service.railway?.serviceName ?? null,
+        serviceName: effectiveServiceName,
         serviceTargets: service.railway?.serviceTargets ?? null
       },
       secretRefs: serviceKey === "treeseedDatabase" ? ["TREESEED_DATABASE_URL"] : [],
@@ -462,7 +472,7 @@ function buildProfileFromDeployConfig(input) {
     const treeDxSourcePolicy = publicTreeDxSourcePolicy(input, config, launchEnv);
     const treeDxNodeUnits = Array.from({ length: treeDxNodePool.bootstrapCount }, (_, offset) => {
       const nodeIndex = offset + 1;
-      const serviceName = indexedName("public-treedx-node", nodeIndex);
+      const serviceName = indexedName(input.environment === "prod" ? "public-treedx-node-production" : "public-treedx-node", nodeIndex);
       return {
         id: serviceName,
         label: `Public TreeDX node ${String(nodeIndex).padStart(2, "0")}`,

package/dist/operations/services/deployment-readiness.js

@@ -143,7 +143,8 @@ function collectTreeseedDeploymentReadiness(options) {
     checks.push(check("hosting:api:healthcheckPath", api.config?.healthcheckPath, "/healthz", "API healthcheck path is /healthz.", "Set services.api.railway.healthcheckPath to /healthz.", "healthcheckPath"));
   }
   if (railwayApi) {
-    checks.push(check("railway-config:api:serviceName", railwayApi.serviceName, "treeseed-api", "Railway API service uses the canonical name.", "Set services.api.railway.serviceName to treeseed-api.", "serviceName"));
+    const expectedServiceName = environment === "prod" ? "treeseed-api-production" : "treeseed-api";
+    checks.push(check("railway-config:api:serviceName", railwayApi.serviceName, expectedServiceName, "Railway API service uses the environment-isolated canonical name.", `Set the API service identity to ${expectedServiceName} for ${environment}.`, "serviceName"));
     checks.push(check("railway-config:api:rootDirectory", relRoot(tenantRoot, railwayApi.rootDir), expectedApiRailwayRoot, "Railway API effective rootDirectory points at the API app.", "Set services.api.railway.rootDir relative to the owning API manifest.", "rootDirectory"));
   }
   if (!runner) {
@@ -176,7 +177,8 @@ function collectTreeseedDeploymentReadiness(options) {
     checks.push(check("hosting:operationsRunner:volumeMountPath", runner.config?.volumeMountPath, "/data", "Runner volume mount path is stable.", "Set services.operationsRunner.railway.volumeMountPath to /data.", "volumeMountPath"));
   }
   if (railwayRunner) {
-    checks.push(check("railway-config:operationsRunner:serviceName", railwayRunner.serviceName, "treeseed-api-operations-runner-01", "Railway runner service instance uses the canonical name.", "Set the runner service instance name to treeseed-api-operations-runner-01.", "serviceName"));
+    const expectedServiceName = environment === "prod" ? "treeseed-api-operations-runner-production-01" : "treeseed-api-operations-runner-01";
+    checks.push(check("railway-config:operationsRunner:serviceName", railwayRunner.serviceName, expectedServiceName, "Railway runner service instance uses the environment-isolated canonical name.", `Set the runner service identity to ${expectedServiceName} for ${environment}.`, "serviceName"));
     checks.push(check("railway-config:operationsRunner:rootDirectory", relRoot(tenantRoot, railwayRunner.rootDir), expectedRunnerRailwayRoot, "Railway runner effective rootDirectory points at the API app.", "Set services.operationsRunner.railway.rootDir relative to the owning API manifest.", "rootDirectory"));
   }
   if (!database) {

package/dist/operations/services/git-workflow.d.ts

@@ -166,6 +166,15 @@ export declare function ensureRemoteBranchFromBase(repoDir: any, branchName: any
 };
 export declare function deleteLocalBranch(repoDir: any, branchName: any): void;
 export declare function deleteRemoteBranch(repoDir: any, branchName: any): boolean;
+export declare function deleteRemoteBranchIfMerged(repoDir: any, branchName: any, targetBranch: any, expectedHead: any, options?: {
+    fetch?: boolean;
+}): boolean;
+export declare function inspectMergedRemoteTaskBranches(repoDir: any): {
+    branch: string;
+    head: string;
+    current: boolean;
+    mergedInto: string | null;
+}[];
 export declare function mergeCurrentBranchIntoStaging(cwd: any, featureBranch: any): {
     repoDir: string;
     targetBranch: string;
@@ -202,7 +211,9 @@ export declare function squashMergeBranchIntoStaging(cwd: any, featureBranch: an
 export declare function currentManagedBranch(cwd?: any): string;
 export declare function isTaskBranch(branchName: any): boolean;
 export declare function assertFeatureBranch(cwd?: any): string;
-export declare function listTaskBranches(repoDir: any): {
+export declare function listTaskBranches(repoDir: any, options?: {
+    fetch?: boolean;
+}): {
     name: string;
     head: string;
     lastCommitDate: string;

package/dist/operations/services/git-workflow.js

@@ -564,6 +564,39 @@ function deleteRemoteBranch(repoDir, branchName) {
   runGit(["push", "origin", "--delete", branchName], { cwd: repoDir });
   return true;
 }
+function deleteRemoteBranchIfMerged(repoDir, branchName, targetBranch, expectedHead, options = {}) {
+  if (!remoteBranchExists(repoDir, branchName)) return false;
+  if (options.fetch !== false) fetchOrigin(repoDir);
+  const observedHead = remoteHeadCommit(repoDir, branchName);
+  if (!expectedHead || observedHead !== expectedHead) {
+    throw new Error(`Refusing to delete origin/${branchName}: expected ${expectedHead || "(missing)"}, observed ${observedHead || "(missing)"}.`);
+  }
+  const targetHead = remoteHeadCommit(repoDir, targetBranch);
+  if (!targetHead) {
+    throw new Error(`Refusing to delete origin/${branchName}: origin/${targetBranch} is missing.`);
+  }
+  const ancestry = runGitAllowFailure(["merge-base", "--is-ancestor", observedHead, targetHead], { cwd: repoDir });
+  if (ancestry.status !== 0) {
+    throw new Error(`Refusing to delete origin/${branchName}: ${observedHead} is not merged into origin/${targetBranch} (${targetHead}).`);
+  }
+  ensureWritableOrigin(repoDir);
+  runGit(["push", `--force-with-lease=refs/heads/${branchName}:${expectedHead}`, "origin", "--delete", branchName], { cwd: repoDir });
+  return true;
+}
+function inspectMergedRemoteTaskBranches(repoDir) {
+  fetchOrigin(repoDir);
+  const targets = [STAGING_BRANCH, PRODUCTION_BRANCH].map((branch) => ({ branch, head: remoteHeadCommit(repoDir, branch) })).filter((target) => Boolean(target.head));
+  return listTaskBranches(repoDir, { fetch: false }).filter((branch) => branch.remote).map((branch) => {
+    const head = remoteHeadCommit(repoDir, branch.name);
+    const mergedTarget = head ? targets.find((target) => runGitAllowFailure(["merge-base", "--is-ancestor", head, target.head], { cwd: repoDir }).status === 0) : void 0;
+    return {
+      branch: branch.name,
+      head,
+      current: branch.current,
+      mergedInto: mergedTarget?.branch ?? null
+    };
+  });
+}
 function mergeCurrentBranchIntoStaging(cwd, featureBranch) {
   return squashMergeBranchIntoStaging(cwd, featureBranch, `stage: ${featureBranch}`);
 }
@@ -635,10 +668,12 @@ function assertFeatureBranch(cwd = workspaceRoot()) {
 function gitLines(repoDir, args) {
   return runGit(args, { cwd: repoDir, capture: true }).split("\n").map((line) => line.trim()).filter(Boolean);
 }
-function listTaskBranches(repoDir) {
-  try {
-    runGit(["fetch", "origin"], { cwd: repoDir, capture: true });
-  } catch {
+function listTaskBranches(repoDir, options = {}) {
+  if (options.fetch !== false) {
+    try {
+      runGit(["fetch", "origin"], { cwd: repoDir, capture: true });
+    } catch {
+    }
   }
   const local = new Set(
     gitLines(repoDir, ["for-each-ref", "--format=%(refname:short)", "refs/heads"]).filter(isTaskBranch)
@@ -649,7 +684,7 @@ function listTaskBranches(repoDir) {
   const current = currentBranch(repoDir);
   const branches = [.../* @__PURE__ */ new Set([...local, ...remote])].sort((left, right) => left.localeCompare(right));
   return branches.map((branchName) => {
-    const ref = local.has(branchName) ? branchName : `origin/${branchName}`;
+    const ref = local.has(branchName) ? `refs/heads/${branchName}` : `refs/remotes/origin/${branchName}`;
     return {
       name: branchName,
       head: runGit(["rev-parse", ref], { cwd: repoDir, capture: true }).trim(),
@@ -780,12 +815,14 @@ export {
   currentManagedBranch,
   deleteLocalBranch,
   deleteRemoteBranch,
+  deleteRemoteBranchIfMerged,
   ensureLocalBranchTracking,
   ensureRemoteBranchFromBase,
   fetchOrigin,
   gitWorkflowRoot,
   headCommit,
   inspectDetachedHeadRepair,
+  inspectMergedRemoteTaskBranches,
   isTaskBranch,
   listTaskBranches,
   mergeBranchDownIntoFeature,

package/dist/operations/services/github-actions-verification.d.ts

@@ -127,6 +127,11 @@ export declare function skippedGitHubActionsGate(gate: GitHubActionsWorkflowGate
     cached: boolean;
 };
 export declare function formatGitHubActionsGateFailure(gate: GitHubActionsWorkflowGate, result: Record<string, unknown>): string;
+export declare function isRetryableGitHubActionsSetupFailure(result: Record<string, unknown>): boolean;
+export declare function rerunGitHubActionsFailedJobs(result: Record<string, unknown>, env?: NodeJS.ProcessEnv | Record<string, string | undefined>): Promise<{
+    repository: string;
+    runId: number;
+}>;
 export declare function createGitHubActionsGateProgressReporter(gate: GitHubActionsWorkflowGate, options?: {
     operation?: string;
     now?: () => number;

package/dist/operations/services/github-actions-verification.js

@@ -433,6 +433,28 @@ Failed jobs: ${failedJobs.join(", ")}` : "";
 Inspect with: gh run view ${runId} --repo ${repository} --log-failed` : "";
   return `${gate.name} ${gate.workflow} completed with conclusion ${String(result.conclusion ?? "unknown")} in ${repository}.${url}${jobLine}${command}`;
 }
+function isRetryableGitHubActionsSetupFailure(result) {
+  const failedJobs = Array.isArray(result.failedJobs) ? result.failedJobs : [];
+  return failedJobs.length > 0 && failedJobs.every((job) => {
+    const steps = Array.isArray(job.steps) ? job.steps : [];
+    return steps.length === 1 && steps[0]?.name === "Set up job" && steps[0]?.conclusion === "failure";
+  });
+}
+async function rerunGitHubActionsFailedJobs(result, env = process.env) {
+  const repository = String(result.repository ?? "");
+  const runId = Number(result.runId);
+  if (!repository || !Number.isSafeInteger(runId) || runId <= 0) {
+    throw new Error("Cannot retry GitHub Actions setup failure without a repository and run ID.");
+  }
+  const { owner, name: repo } = parseGitHubRepositorySlug(repository);
+  const client = createGitHubApiClient({ env });
+  await client.request("POST /repos/{owner}/{repo}/actions/runs/{run_id}/rerun-failed-jobs", {
+    owner,
+    repo,
+    run_id: runId
+  });
+  return { repository, runId };
+}
 function formatElapsed(seconds) {
   const safe = Math.max(0, Math.round(seconds));
   if (safe < 60) return `${safe}s`;
@@ -560,6 +582,8 @@ export {
   createGitHubActionsGateProgressReporter,
   formatGitHubActionsGateFailure,
   inspectGitHubActionsVerification,
+  isRetryableGitHubActionsSetupFailure,
+  rerunGitHubActionsFailedJobs,
   skippedGitHubActionsGate,
   waitForGitHubActionsGate
 };

package/dist/operations/services/railway-deploy.d.ts

@@ -59,7 +59,7 @@ export declare function waitForRailwayManagedDeploymentsSettled(tenantRoot: any,
     };
     message: string;
 }>;
-export declare function configuredRailwayServices(tenantRoot: any, scope: any, envOverlay?: {}): unknown[];
+export declare function configuredRailwayServices(tenantRoot: any, scope: any, envOverlay?: {}, options?: {}): unknown[];
 export declare function configuredRailwayScheduledJobs(tenantRoot: any, scope: any, { phase }?: {
     phase?: string | undefined;
 }): any[];

package/dist/operations/services/railway-deploy.js

@@ -641,8 +641,9 @@ query TreeseedRailwayDeploymentStatus($projectId: String!) {
   });
   return payload.data?.project ?? null;
 }
-function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, application = null, machineConfigRoot = tenantRoot, envOverlay = {}) {
+function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, application = null, machineConfigRoot = tenantRoot, envOverlay = {}, options = {}) {
   const normalizedScope = normalizeScope(scope);
+  const identityOnly = options.identityOnly === true;
   const imageRefKeys = [
     "TREESEED_API_IMAGE_REF",
     "TREESEED_OPERATIONS_RUNNER_IMAGE_REF",
@@ -683,7 +684,9 @@ function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, app
       service.environments?.[normalizedScope]?.railwayEnvironment
     );
     const publicBaseUrl = service.environments?.[normalizedScope]?.baseUrl ?? service.publicBaseUrl ?? (serviceKey === "api" ? configuredApiPublicBaseUrl(deployConfig, normalizedScope) : null);
-    const configuredServiceName = service.railway?.serviceName ?? (serviceKey === "workerRunner" ? deriveRailwayWorkerRunnerServiceName(identity.deploymentKey) : `${identity.deploymentKey}-${railwayServiceNameSuffix(serviceKey)}`);
+    const environmentConfig = service.environments?.[normalizedScope];
+    const baseServiceName = service.railway?.serviceName ?? (serviceKey === "workerRunner" ? deriveRailwayWorkerRunnerServiceName(identity.deploymentKey) : `${identity.deploymentKey}-${railwayServiceNameSuffix(serviceKey)}`);
+    const configuredServiceName = environmentConfig?.railwayServiceName ?? (normalizedScope === "prod" && ["api", "operationsRunner"].includes(serviceKey) ? `${serviceKey === "operationsRunner" ? String(baseServiceName).replace(/-\d+$/u, "") : baseServiceName}-production` : baseServiceName);
     const configuredRunnerPool = service.railway?.runnerPool && typeof service.railway.runnerPool === "object" ? service.railway.runnerPool : null;
     const runnerPool = serviceKey === "operationsRunner" || serviceKey === "capacityProviderRunner" ? {
       bootstrapCount: Math.max(1, Number.parseInt(String(configuredRunnerPool?.bootstrapCount ?? (serviceKey === "capacityProviderRunner" ? 1 : OPERATIONS_RUNNER_BOOTSTRAP_COUNT)), 10) || (serviceKey === "capacityProviderRunner" ? 1 : OPERATIONS_RUNNER_BOOTSTRAP_COUNT)),
@@ -700,13 +703,20 @@ function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, app
       const configuredImageRefEnv = service.railway?.imageRefEnv ?? railwayImageRefEnvForService(serviceKey);
       const canUseImageRefEnv = normalizedScope === "prod" || serviceKey === "capacityProviderManager" || serviceKey === "capacityProviderRunner";
       const imageRef = service.railway?.imageRef ?? (canUseImageRefEnv && configuredImageRefEnv ? envValue(configuredImageRefEnv, imageRefEnv) || null : null) ?? defaultRailwayImageRef(serviceKey, normalizedScope, imageRefEnv);
-      const sourcePolicy = resolveRailwayServiceSourcePolicy({
+      const sourcePolicy = identityOnly ? {
+        sourceMode: normalizedScope === "prod" ? "image" : "git",
+        sourceRepo: null,
+        sourceBranch: null,
+        sourceCommit: null,
+        sourceRootDirectory: null
+      } : resolveRailwayServiceSourcePolicy({
         tenantRoot,
         scope: normalizedScope,
         serviceKey,
         service,
         serviceRoot,
-        imageRef
+        imageRef,
+        serviceName
       });
       const resolvedImageRef = sourcePolicy.sourceMode === "image" ? imageRef : null;
       return {
@@ -716,7 +726,7 @@ function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, app
         serviceConfig: service,
         scope: normalizedScope,
         projectId: service.railway?.projectId ?? null,
-        projectName: service.railway?.projectName ?? identity.deploymentKey,
+        projectName: environmentConfig?.railwayProjectName ?? service.railway?.projectName ?? identity.deploymentKey,
         serviceId: service.railway?.serviceId ?? null,
         serviceName,
         runnerId: serviceKey === "operationsRunner" || serviceKey === "capacityProviderRunner" ? serviceName : null,
@@ -757,11 +767,12 @@ function configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, app
       hostingKind,
       application,
       imageRefEnv,
-      workspaceRoot: machineConfigRoot
+      workspaceRoot: machineConfigRoot,
+      identityOnly
     })
   ];
 }
-function configuredPublicTreeDxRailwayServices({ tenantRoot, scope, deployConfig, identity, hostingKind, application, imageRefEnv, workspaceRoot }) {
+function configuredPublicTreeDxRailwayServices({ tenantRoot, scope, deployConfig, identity, hostingKind, application, imageRefEnv, workspaceRoot, identityOnly = false }) {
   if (deployConfig.hosting?.kind !== "treeseed_control_plane") {
     return [];
   }
@@ -786,7 +797,7 @@ function configuredPublicTreeDxRailwayServices({ tenantRoot, scope, deployConfig
   const baseImageRef = envValue("TREESEED_PUBLIC_TREEDX_IMAGE_REF", imageRefEnv) || "treeseed/treedx";
   return Array.from({ length: bootstrapCount }, (_, offset) => {
     const index = offset + 1;
-    const serviceName = `${PUBLIC_TREEDX_NODE_SERVICE_KEY_PREFIX}${String(index).padStart(2, "0")}`;
+    const serviceName = scope === "prod" ? `public-treedx-node-production-${String(index).padStart(2, "0")}` : `${PUBLIC_TREEDX_NODE_SERVICE_KEY_PREFIX}${String(index).padStart(2, "0")}`;
     const service = {
       key: serviceName,
       serviceName,
@@ -800,7 +811,9 @@ function configuredPublicTreeDxRailwayServices({ tenantRoot, scope, deployConfig
       buildCommand: sourceMode === "git" ? railway.buildCommand ?? null : null,
       startCommand: sourceMode === "git" ? railway.startCommand ?? null : null
     };
-    assertApiRailwaySourcePolicy(scope, service);
+    if (!identityOnly) {
+      assertApiRailwaySourcePolicy(scope, service);
+    }
     return {
       key: service.key,
       instanceKey: serviceName,
@@ -893,11 +906,11 @@ function headCommitSafe(cwd) {
     return null;
   }
 }
-function resolveRailwayServiceSourcePolicy({ tenantRoot, scope, serviceKey, service, serviceRoot, imageRef }) {
+function resolveRailwayServiceSourcePolicy({ tenantRoot, scope, serviceKey, service, serviceRoot, imageRef, serviceName: effectiveServiceName }) {
   const configuredMode = typeof service.railway?.sourceMode === "string" ? service.railway.sourceMode : null;
   const configuredSource = service.railway?.source && typeof service.railway.source === "object" && !Array.isArray(service.railway.source) ? service.railway.source : {};
   const configuredRepo = typeof service.railway?.sourceRepo === "string" ? service.railway.sourceRepo : typeof configuredSource.repository === "string" ? configuredSource.repository : typeof configuredSource.repo === "string" ? configuredSource.repo : null;
-  const serviceName = service.railway?.serviceName ?? null;
+  const serviceName = effectiveServiceName ?? service.railway?.serviceName ?? null;
   const packageRepository = configuredRepo ?? readTreeseedPackageRepository(serviceRoot) ?? readTreeseedPackageRepository(tenantRoot) ?? apiRailwayDefaultSourceRepo({ key: serviceKey, serviceName });
   const dockerfilePath = service.railway?.dockerfilePath ?? apiRailwayDefaultDockerfilePath({ key: serviceKey, serviceName });
   const apiPackageSourceEligible = ["api", "operationsRunner"].includes(serviceKey);
@@ -954,9 +967,9 @@ function resolveRailwayCapacityProviderRoot(tenantRoot, service) {
   );
   return found ?? resolve(tenantRoot, "packages", "agent");
 }
-function configuredRailwayServices(tenantRoot, scope, envOverlay = {}) {
+function configuredRailwayServices(tenantRoot, scope, envOverlay = {}, options = {}) {
   const deployConfig = loadCliDeployConfig(tenantRoot);
-  const direct = configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, null, tenantRoot, envOverlay);
+  const direct = configuredRailwayServicesForConfig(tenantRoot, scope, deployConfig, null, tenantRoot, envOverlay, options);
   const nested = discoverTreeseedApplications(tenantRoot).filter((application) => application.root !== resolve(tenantRoot)).flatMap((application) => configuredRailwayServicesForConfig(
     application.root,
     scope,
@@ -967,7 +980,8 @@ function configuredRailwayServices(tenantRoot, scope, envOverlay = {}) {
       relativeRoot: application.relativeRoot
     },
     tenantRoot,
-    envOverlay
+    envOverlay,
+    options
   ));
   return [...direct, ...nested];
 }

package/dist/operations/services/railway-source-policy.js

@@ -1,7 +1,7 @@
 function isApiRailwaySourcePolicyService(service) {
   const key = String(service.key ?? "").trim();
   const serviceName = String(service.serviceName ?? "").trim();
-  return key.startsWith("public-treedx-node-") || serviceName === "treeseed-api" || /^treeseed-api-operations-runner-\d+$/u.test(serviceName) || /^public-treedx-node-\d+$/u.test(serviceName);
+  return key.startsWith("public-treedx-node-") || /^treeseed-api(?:-production)?$/u.test(serviceName) || /^treeseed-api-operations-runner(?:-production)?-\d+$/u.test(serviceName) || /^public-treedx-node(?:-production)?-\d+$/u.test(serviceName);
 }
 function isImmutableRailwayImageRef(value) {
   const imageRef = typeof value === "string" ? value.trim() : "";
@@ -11,15 +11,15 @@ function isImmutableRailwayImageRef(value) {
 }
 function apiRailwayDefaultSourceRepo(service) {
   const serviceName = String(service.serviceName ?? "").trim();
-  if (serviceName === "treeseed-api" || /^treeseed-api-operations-runner-\d+$/u.test(serviceName)) return "treeseed-ai/api";
-  if (/^public-treedx-node-\d+$/u.test(serviceName) || String(service.key ?? "").startsWith("public-treedx-node-")) return "treeseed-ai/treedx";
+  if (String(service.key ?? "") === "api" || String(service.key ?? "") === "operationsRunner" || /^treeseed-api(?:-production)?$/u.test(serviceName) || /^treeseed-api-operations-runner(?:-production)?-\d+$/u.test(serviceName)) return "treeseed-ai/api";
+  if (/^public-treedx-node(?:-production)?-\d+$/u.test(serviceName) || String(service.key ?? "").startsWith("public-treedx-node-")) return "treeseed-ai/treedx";
   return null;
 }
 function apiRailwayDefaultDockerfilePath(service) {
   const serviceName = String(service.serviceName ?? "").trim();
-  if (serviceName === "treeseed-api") return "/Dockerfile.api";
-  if (/^treeseed-api-operations-runner-\d+$/u.test(serviceName)) return "/Dockerfile.operations-runner";
-  if (/^public-treedx-node-\d+$/u.test(serviceName) || String(service.key ?? "").startsWith("public-treedx-node-")) return "/Dockerfile";
+  if (String(service.key ?? "") === "api" || /^treeseed-api(?:-production)?$/u.test(serviceName)) return "/Dockerfile.api";
+  if (String(service.key ?? "") === "operationsRunner" || /^treeseed-api-operations-runner(?:-production)?-\d+$/u.test(serviceName)) return "/Dockerfile.operations-runner";
+  if (/^public-treedx-node(?:-production)?-\d+$/u.test(serviceName) || String(service.key ?? "").startsWith("public-treedx-node-")) return "/Dockerfile";
   return null;
 }
 function assertApiRailwaySourcePolicy(scope, service) {
@@ -28,6 +28,7 @@ function assertApiRailwaySourcePolicy(scope, service) {
   const label = service.serviceName ?? service.key ?? "Railway service";
   if (normalizedScope === "staging") {
     const issues = [
+      /-production(?:-|$)/u.test(String(service.serviceName ?? "")) ? "serviceName must use the staging-only identity" : null,
       service.sourceMode === "git" ? null : "sourceMode must be git",
       service.imageRef ? "imageRef must be empty" : null,
       service.sourceRepo ? null : "sourceRepo must be set",
@@ -42,6 +43,7 @@ function assertApiRailwaySourcePolicy(scope, service) {
   }
   if (normalizedScope === "prod") {
     const issues = [
+      /-production(?:-|$)/u.test(String(service.serviceName ?? "")) ? null : "serviceName must use a production-only identity",
       service.sourceMode === "image" ? null : "sourceMode must be image",
       isImmutableRailwayImageRef(service.imageRef) ? null : "imageRef must be an immutable released image tag",
       service.sourceRepo ? "sourceRepo must be empty" : null,

package/dist/platform/contracts.d.ts

@@ -212,6 +212,8 @@ export interface TreeseedManagedServiceEnvironmentConfig {
     baseUrl?: string;
     domain?: string;
     railwayEnvironment?: string;
+    railwayProjectName?: string;
+    railwayServiceName?: string;
 }
 export type TreeseedLocalRuntimeMode = 'auto' | 'provider' | 'local';
 export interface TreeseedLocalRuntimeConfig {

package/dist/platform/deploy-config.js

@@ -332,7 +332,9 @@ function parseServiceEnvironmentConfig(value, label) {
   return {
     baseUrl: optionalString(record.baseUrl),
     domain: optionalString(record.domain),
-    railwayEnvironment: optionalString(record.railwayEnvironment)
+    railwayEnvironment: optionalString(record.railwayEnvironment),
+    railwayProjectName: optionalString(record.railwayProjectName),
+    railwayServiceName: optionalString(record.railwayServiceName)
   };
 }
 function parseLocalRuntimeConfig(value, label) {

package/dist/reconcile/builtin-adapters.js

@@ -3657,6 +3657,24 @@ function configuredRailwayProjectSyncGroups(input, scope, serviceKeys) {
   }
   return [...grouped.values()];
 }
+function configuredRailwaySiblingResourceNames(input, scope, projectName) {
+  const siblingScope = scope === "prod" ? "staging" : scope === "staging" ? "prod" : null;
+  if (!siblingScope) return [];
+  const siblingServices = configuredRailwayServices(
+    input.context.tenantRoot,
+    siblingScope,
+    resolveReconcileEnvironmentValues(input, siblingScope),
+    { identityOnly: true }
+  ).filter((service) => service.enabled !== false).filter((service) => !isRailwayCapacityProviderService(service)).filter((service) => service.projectName === projectName);
+  const database = configuredRailwayIacDatabase(input, siblingServices);
+  return [.../* @__PURE__ */ new Set([
+    ...siblingServices.flatMap((service) => [
+      service.serviceName,
+      ...service.volumeMountPath ? [`${service.serviceName}-volume`] : []
+    ]),
+    ...database ? [database.serviceName, `${database.serviceName}-volume`] : []
+  ])];
+}
 function railwayIacServiceInput(input, sync, service, scope) {
   if (scope === "staging" && service.imageRef) {
     throw new Error(`Railway staging service ${service.serviceName} must build from Git source, not Docker image ${service.imageRef}.`);
@@ -3931,11 +3949,13 @@ async function syncRailwayEnvironmentForScope(input, { planOnly = false, service
       })),
       database: databaseForIac
     };
+    const siblingResourceNames = configuredRailwaySiblingResourceNames(input, scope, project.name);
     const {
       applyRailwayIacProject,
       cleanupRailwayIacRender,
       planRailwayIacProject,
       renderRailwayIacProject,
+      selectRailwayIacRetainedResources,
       validateRailwayIacChangeSet
     } = await import("./providers/railway-iac.js");
     let effectiveIacInput = iacInput;
@@ -3986,6 +4006,33 @@ async function syncRailwayEnvironmentForScope(input, { planOnly = false, service
           ]))
         });
       }
+      const retainedResources = selectRailwayIacRetainedResources(plan, siblingResourceNames);
+      if (retainedResources.length > 0) {
+        traceRailwayReconcile(
+          topology.env,
+          "sync:iac-retain-sibling-environment",
+          `${project.name}/${environment.name}:${retainedResources.map((resource) => resource.name).join(",")}`
+        );
+        cleanupRailwayIacRender(rendered);
+        effectiveIacInput = { ...effectiveIacInput, retainedResources };
+        rendered = renderRailwayIacProject(effectiveIacInput);
+        plan = await planRailwayIacProject(effectiveIacInput, rendered);
+        if (!plan.ok) {
+          const diagnostics = plan.diagnostics.map((entry) => entry.message).filter(Boolean).join("; ");
+          throw new Error(`Railway IaC plan failed for ${project.name}/${environment.name}${diagnostics ? `: ${diagnostics}` : "."}`);
+        }
+        validation = validateRailwayIacChangeSet(plan.changeSet, {
+          services: rendered.serviceNames,
+          volumes: rendered.volumeNames,
+          database: rendered.databaseName,
+          scope,
+          serviceSourceModes: Object.fromEntries(effectiveIacInput.services.map((service) => [service.serviceName, service.sourceMode ?? null])),
+          serviceSourceRefs: Object.fromEntries(effectiveIacInput.services.map((service) => [
+            service.serviceName,
+            service.sourceMode === "git" && service.sourceRepo ? `github:${service.sourceRepo}:${service.sourceBranch ?? ""}:${service.sourceRootDirectory ?? ""}:${service.sourceCommit ?? ""}` : service.sourceMode === "image" && service.imageRef ? `image:${service.imageRef}` : null
+          ]))
+        });
+      }
       if (!validation.ok) {
         throw new Error(`Railway IaC plan rejected for ${project.name}/${environment.name}: ${validation.blockedReasons.join("; ")}`);
       }

package/dist/reconcile/providers/railway-iac.d.ts

@@ -1,4 +1,4 @@
-import { type RailwayChangeSet, type RailwayIacApplyResponse, type RailwayIacPlanResponse } from 'railway/iac';
+import { type RailwayChangeSet, type RailwayIacApplyResponse, type RailwayIacPlanResponse, type ResourceNode } from 'railway/iac';
 export type TreeseedRailwayIacService = {
     key: string;
     serviceName: string;
@@ -37,6 +37,7 @@ export type TreeseedRailwayIacProjectInput = {
     railwayApiUrl?: string | null;
     services: TreeseedRailwayIacService[];
     database: TreeseedRailwayIacDatabase | null;
+    retainedResources?: ResourceNode[];
     region?: string | null;
 };
 export type TreeseedRailwayIacRenderResult = {
@@ -47,6 +48,7 @@ export type TreeseedRailwayIacRenderResult = {
     serviceNames: string[];
     volumeNames: string[];
     databaseName: string | null;
+    retainedResourceNames: string[];
     source: string;
 };
 export type RailwayIacValidationResult = {
@@ -56,6 +58,7 @@ export type RailwayIacValidationResult = {
     allowedDrift: string[];
 };
 export declare function renderRailwayIacProject(input: TreeseedRailwayIacProjectInput): TreeseedRailwayIacRenderResult;
+export declare function selectRailwayIacRetainedResources(plan: Pick<RailwayIacPlanResponse, 'changeSet' | 'currentGraph'>, allowedNames: Iterable<string>): ResourceNode[];
 export declare function validateRailwayIacChangeSet(changeSet: RailwayChangeSet | undefined, desiredNames: {
     services: string[];
     volumes: string[];

package/dist/reconcile/providers/railway-iac.js

@@ -1,6 +1,8 @@
 import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
-import { runRailwayIac } from "railway/iac";
+import {
+  runRailwayIac
+} from "railway/iac";
 import { assertApiRailwaySourcePolicy, isApiRailwaySourcePolicyService } from "../../operations/services/railway-source-policy.js";
 function js(value) {
   return JSON.stringify(value);
@@ -115,6 +117,16 @@ function renderRailwayIacProject(input) {
   const volumeNames = [];
   const databaseVariableName = input.database ? "db" : null;
   const databaseEnvName = input.database?.environmentVariable ?? null;
+  const desiredResourceNames = /* @__PURE__ */ new Set([
+    ...input.services.map((service) => service.serviceName),
+    ...input.services.filter((service) => service.volumeMountPath).map((service) => `${service.serviceName}-volume`),
+    ...input.database ? [input.database.serviceName, `${input.database.serviceName}-volume`] : []
+  ]);
+  const retainedResources = (input.retainedResources ?? []).filter((resource) => !desiredResourceNames.has(resource.name));
+  if (retainedResources.length > 0) {
+    declarations.push(`  const retainedResources = ${js(retainedResources)};`);
+    resources.push("...retainedResources");
+  }
   if (input.database) {
     const postgresVolumeName = `${input.database.serviceName}-volume`;
     const postgresMountPath = input.database.mountPath?.trim() || "/var/lib/postgresql/data";
@@ -205,9 +217,15 @@ ${declarations.join("\n")}
     serviceNames: input.services.map((service) => service.serviceName),
     volumeNames,
     databaseName: input.database?.serviceName ?? null,
+    retainedResourceNames: retainedResources.map((resource) => resource.name),
     source
   };
 }
+function selectRailwayIacRetainedResources(plan, allowedNames) {
+  const allowed = new Set(allowedNames);
+  const deletedAllowedNames = new Set((plan.changeSet?.changes ?? []).filter((change) => change.kind === "resource.delete").map((change) => changeName(change)).filter((name) => allowed.has(name)));
+  return (plan.currentGraph?.resources ?? []).filter((resource) => deletedAllowedNames.has(resource.name));
+}
 function changeName(change) {
   return String(change?.resource?.name ?? change?.previous?.name ?? change?.address ?? change?.path ?? "");
 }
@@ -322,5 +340,6 @@ export {
   cleanupRailwayIacRender,
   planRailwayIacProject,
   renderRailwayIacProject,
+  selectRailwayIacRetainedResources,
   validateRailwayIacChangeSet
 };

package/dist/workflow/operations.d.ts

@@ -9,7 +9,7 @@ import { type TreeseedReconcileResult } from '../reconcile/index.js';
 import { type TreeseedWorkflowRunCommand, type TreeseedWorkflowRunJournal } from './runs.js';
 import { type TreeseedWorkflowMode } from './session.js';
 import { type TreeseedManagedRepository } from '../operations/services/managed-repositories.js';
-import type { TreeseedCloseInput, TreeseedCiInput, TreeseedConfigInput, TreeseedDestroyInput, TreeseedExportInput, TreeseedReleaseCandidateInput, TreeseedReleaseInput, TreeseedRecoverInput, TreeseedResumeInput, TreeseedSaveInput, TreeseedStageInput, TreeseedSwitchInput, TreeseedTaskBranchMetadata, TreeseedUpdateInput, TreeseedWorkflowContext, TreeseedWorkflowCiMode, TreeseedWorkflowDevInput, TreeseedWorkflowExecutionMode, TreeseedWorkflowOperationId, TreeseedWorkflowResult, TreeseedWorkflowWorktreeMode, TreeseedReleaseCandidateMode, TreeseedProofInput } from '../workflow.js';
+import type { TreeseedCloseInput, TreeseedCiInput, TreeseedConfigInput, TreeseedDestroyInput, TreeseedExportInput, TreeseedReleaseCandidateInput, TreeseedReleaseInput, TreeseedRecoverInput, TreeseedResumeInput, TreeseedSaveInput, TreeseedStageInput, TreeseedSwitchInput, TreeseedTaskBranchMetadata, TreeseedTasksInput, TreeseedUpdateInput, TreeseedWorkflowContext, TreeseedWorkflowCiMode, TreeseedWorkflowDevInput, TreeseedWorkflowExecutionMode, TreeseedWorkflowOperationId, TreeseedWorkflowResult, TreeseedWorkflowWorktreeMode, TreeseedReleaseCandidateMode, TreeseedProofInput } from '../workflow.js';
 type WorkflowWrite = NonNullable<TreeseedWorkflowContext['write']>;
 type WorkflowStatePayload = ReturnType<typeof resolveTreeseedWorkflowState>;
 type ReleaseCandidateMode = TreeseedReleaseCandidateMode;
@@ -137,7 +137,7 @@ export declare function destroyTreeseedBranchPreview(input: {
 }>;
 export declare function workflowStatus(helpers: WorkflowOperationHelpers, input?: TreeseedWorkflowStatusOptions): Promise<TreeseedWorkflowResult<import("../workflow-state.js").TreeseedWorkflowState>>;
 export declare function workflowCi(helpers: WorkflowOperationHelpers, input?: TreeseedCiInput): Promise<TreeseedWorkflowResult<TreeseedCiResult>>;
-export declare function workflowTasks(helpers: WorkflowOperationHelpers): Promise<TreeseedWorkflowResult<{
+export declare function workflowTasks(helpers: WorkflowOperationHelpers, input?: TreeseedTasksInput): Promise<TreeseedWorkflowResult<{
     tasks: TreeseedTaskBranchMetadata[];
     workstreams: Array<{
         id: string;
@@ -517,14 +517,9 @@ export declare function workflowSave(helpers: WorkflowOperationHelpers, input: T
     rootRepo: import("../operations/services/repository-save-orchestrator.js").RepositorySavePlanRepo;
     blockers: string[];
     autoResumeCandidate: {
-        runId: string;
-        branch: string | null;
-        failure: {
-            code: string;
-            message: string;
-            details: Record<string, unknown> | null;
-            at: string;
-        } | null;
+        runId: any;
+        branch: any;
+        failure: any;
     } | null;
     workspaceLinks: import("../operations/services/workspace-dependency-mode.js").WorkspaceDependencyModeReport;
     sceneArtifacts: "full" | "screenshots";
@@ -650,14 +645,9 @@ export declare function workflowClose(helpers: WorkflowOperationHelpers, input:
     branchName: string | null;
     message: string;
     autoResumeCandidate: {
-        runId: string;
-        branch: string | null;
-        failure: {
-            code: string;
-            message: string;
-            details: Record<string, unknown> | null;
-            at: string;
-        } | null;
+        runId: any;
+        branch: any;
+        failure: any;
     } | null;
 } & {
     finalState?: WorkflowStatePayload;
@@ -688,14 +678,9 @@ export declare function workflowClose(helpers: WorkflowOperationHelpers, input:
         rootRepo: import("../operations/services/repository-save-orchestrator.js").RepositorySavePlanRepo;
         blockers: string[];
         autoResumeCandidate: {
-            runId: string;
-            branch: string | null;
-            failure: {
-                code: string;
-                message: string;
-                details: Record<string, unknown> | null;
-                at: string;
-            } | null;
+            runId: any;
+            branch: any;
+            failure: any;
         } | null;
         workspaceLinks: import("../operations/services/workspace-dependency-mode.js").WorkspaceDependencyModeReport;
         sceneArtifacts: "full" | "screenshots";
@@ -901,14 +886,9 @@ export declare function workflowStage(helpers: WorkflowOperationHelpers, input:
     phases: string[];
     blockers: string[];
     autoResumeCandidate: {
-        runId: string;
-        branch: string | null;
-        failure: {
-            code: string;
-            message: string;
-            details: Record<string, unknown> | null;
-            at: string;
-        } | null;
+        runId: any;
+        branch: any;
+        failure: any;
     } | null;
     legacyMutationPathDisabled: boolean;
 } & {

package/dist/workflow/operations.js

@@ -61,6 +61,8 @@ import {
   createDeprecatedTaskTag,
   deleteLocalBranch,
   deleteRemoteBranch,
+  deleteRemoteBranchIfMerged,
+  inspectMergedRemoteTaskBranches,
   ensureLocalBranchTracking,
   gitWorkflowRoot,
   headCommit,
@@ -80,6 +82,8 @@ import { resolveGitHubCredentialForRepository } from "../operations/services/git
 import {
   formatGitHubActionsGateFailure,
   inspectGitHubActionsVerification,
+  isRetryableGitHubActionsSetupFailure,
+  rerunGitHubActionsFailedJobs,
   skippedGitHubActionsGate,
   waitForGitHubActionsGate
 } from "../operations/services/github-actions-verification.js";
@@ -459,11 +463,21 @@ async function waitForWorkflowGates(operation, gates, ciMode, options = {}) {
         continue;
       }
     }
-    const result = await waitForGitHubActionsGate(gateWithTimeout, {
+    const gateEnv = githubWorkflowGateEnv(options.root, gateWithTimeout);
+    let result = await waitForGitHubActionsGate(gateWithTimeout, {
       operation,
-      env: githubWorkflowGateEnv(options.root, gateWithTimeout),
+      env: gateEnv,
       onProgress: options.onProgress
     });
+    if (result.status === "completed" && result.conclusion !== "success" && isRetryableGitHubActionsSetupFailure(result)) {
+      const retry = await rerunGitHubActionsFailedJobs(result, gateEnv);
+      options.onProgress?.(`[${operation}][gate][${gateWithTimeout.name}] Retrying GitHub-hosted setup failure once for run ${retry.runId}.`);
+      result = await waitForGitHubActionsGate(gateWithTimeout, {
+        operation,
+        env: gateEnv,
+        onProgress: options.onProgress
+      });
+    }
     const normalized = {
       name: gateWithTimeout.name,
       ...result,
@@ -1765,6 +1779,24 @@ function findAutoResumableTaskRun(root, command, branch) {
   if (!branch) return null;
   return listInterruptedWorkflowRuns(root).find((journal) => journal.command === command && journal.resumable && journal.session.branchName === branch) ?? null;
 }
+function rejectImplicitWorkflowResume(operation, journal) {
+  if (!journal) return;
+  workflowError(
+    operation,
+    "resume_unavailable",
+    `Treeseed ${operation} found interrupted run ${journal.runId} for this branch and will not auto-resume recorded inputs. Run \`trsd resume ${journal.runId}\` to continue it, or \`trsd recover --obsolete ${journal.runId} --reason "superseded by a fresh ${operation}"\` before starting a new ${operation}.`,
+    {
+      details: {
+        recovery: {
+          resumable: true,
+          runId: journal.runId,
+          resumeCommand: `trsd resume ${journal.runId}`,
+          obsoleteCommand: `trsd recover --obsolete ${journal.runId} --reason "superseded by a fresh ${operation}"`
+        }
+      }
+    }
+  );
+}
 function stringRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : null;
 }
@@ -3446,8 +3478,37 @@ async function workflowCi(helpers, input = {}) {
     }
   });
 }
-async function workflowTasks(helpers) {
-  return withContextEnv(helpers.context.env, () => createTasksResult(helpers.cwd()));
+async function workflowTasks(helpers, input = {}) {
+  return withContextEnv(helpers.context.env, () => {
+    const cwd = helpers.cwd();
+    if (!input.cleanupMerged) return createTasksResult(cwd);
+    const live = input.cleanupMerged === "live";
+    const repos = [
+      { name: "@treeseed/market", dir: repoRoot(cwd) },
+      ...checkedOutStagePromotionRepos(cwd).map((repo) => ({ name: repo.name, dir: repo.dir }))
+    ];
+    const branchCleanup = repos.map((repo) => {
+      const branches = inspectMergedRemoteTaskBranches(repo.dir).map((branch) => {
+        if (branch.current) {
+          return { ...branch, status: "preserved", reason: "branch is currently checked out" };
+        }
+        if (!branch.head || !branch.mergedInto) {
+          return { ...branch, status: "preserved", reason: "branch is not merged into staging or main" };
+        }
+        if (!live) {
+          return { ...branch, status: "planned", reason: `exact head is merged into ${branch.mergedInto}` };
+        }
+        deleteRemoteBranchIfMerged(repo.dir, branch.branch, branch.mergedInto, branch.head, { fetch: false });
+        return { ...branch, status: "deleted", reason: `exact head was merged into ${branch.mergedInto}` };
+      });
+      return { repository: repo.name, path: repo.dir, branches };
+    });
+    return buildWorkflowResult("tasks", cwd, { tasks: [], workstreams: [], branchCleanup }, {
+      executionMode: live ? "execute" : "plan",
+      includeFinalState: false,
+      summary: live ? "Merged remote task branches were cleaned safely." : "Merged remote task branch cleanup plan ready."
+    });
+  });
 }
 async function workflowConfig(helpers, input = {}) {
   try {
@@ -4464,7 +4525,8 @@ async function workflowSave(helpers, input) {
       const executionMode = normalizeExecutionMode(input);
       const explicitResumeRunId = helpers.context.workflow?.resumeRunId ?? null;
       const autoResumeRun = executionMode === "execute" && !explicitResumeRunId ? findAutoResumableSaveRun(root, branch) : null;
-      const planAutoResumeRun = executionMode === "plan" ? findAutoResumableSaveRun(root, branch) : null;
+      rejectImplicitWorkflowResume("save", autoResumeRun);
+      const planAutoResumeRun = null;
       const effectiveInput = autoResumeRun ? autoResumeRun.input : input;
       const localCleanup = maybeRunLocalWorkflowCleanup(helpers, root, "save", effectiveInput);
       const message = String(effectiveInput.message ?? "").trim();
@@ -4914,7 +4976,8 @@ async function workflowClose(helpers, input) {
       const session = resolveTreeseedWorkflowSession(root);
       const explicitResumeRunId = helpers.context.workflow?.resumeRunId ?? null;
       const autoResumeRun = executionMode === "execute" && !explicitResumeRunId ? findAutoResumableTaskRun(root, "close", session.branchName) : null;
-      const planAutoResumeRun = executionMode === "plan" ? findAutoResumableTaskRun(root, "close", session.branchName) : null;
+      rejectImplicitWorkflowResume("close", autoResumeRun);
+      const planAutoResumeRun = null;
       const effectiveInput = autoResumeRun ? autoResumeRun.input : input;
       const message = ensureMessage("close", effectiveInput.message, "a close reason");
       if (executionMode === "plan") {
@@ -5153,8 +5216,8 @@ function internalPackageDependencies(repoPath) {
   return [...names].sort();
 }
 function normalizeStageCleanupMode(input) {
-  if (input.cleanupMode === "success" || input.deleteBranch === true) return "success";
-  return "manual";
+  if (input.cleanupMode === "manual" || input.deleteBranch === false) return "manual";
+  return "success";
 }
 function stageCandidateManifestPath(root, runId) {
   return {
@@ -5347,7 +5410,7 @@ function cleanupStageSourceBranches(root, branchName, manifest) {
   for (const repo of checkedOutStagePromotionRepos(root)) {
     const manifestRepo = manifest.packages.find((entry) => entry.name === repo.name);
     if (!manifestRepo) continue;
-    const remoteDeleted = deleteRemoteBranch(repo.dir, branchName);
+    const remoteDeleted = deleteRemoteBranchIfMerged(repo.dir, branchName, STAGING_BRANCH, manifestRepo.commit);
     if ((currentBranch(repo.dir) || null) === branchName) {
       syncBranchWithOrigin(repo.dir, STAGING_BRANCH);
     }
@@ -5363,7 +5426,7 @@ function cleanupStageSourceBranches(root, branchName, manifest) {
     });
   }
   const gitRoot = repoRoot(root);
-  const rootRemoteDeleted = deleteRemoteBranch(gitRoot, branchName);
+  const rootRemoteDeleted = deleteRemoteBranchIfMerged(gitRoot, branchName, STAGING_BRANCH, manifest.root.commit);
   const managedWorktree = managedWorkflowWorktreeMetadata(root);
   const worktreeCleanup = managedWorktree ? removeManagedWorkflowWorktree(root, { deleteBranch: false }) : { removed: false, reason: "not-managed" };
   const branchDeletionRoot = managedWorktree?.primaryRoot ? repoRoot(managedWorktree.primaryRoot) : gitRoot;
@@ -5395,8 +5458,9 @@ async function workflowStage(helpers, input) {
       const session = resolveTreeseedWorkflowSession(root);
       const explicitResumeRunId = helpers.context.workflow?.resumeRunId ?? null;
       const rawAutoResumeRun = executionMode === "execute" && !explicitResumeRunId ? findAutoResumableTaskRun(root, "stage", session.branchName) : null;
+      rejectImplicitWorkflowResume("stage", rawAutoResumeRun);
       const autoResumeRun = rawAutoResumeRun?.steps.some((step) => step.id === "preflight") ? rawAutoResumeRun : null;
-      const planAutoResumeRun = executionMode === "plan" ? findAutoResumableTaskRun(root, "stage", session.branchName) : null;
+      const planAutoResumeRun = null;
       const effectiveInput = autoResumeRun ? autoResumeRun.input : input;
       const localCleanup = maybeRunLocalWorkflowCleanup(helpers, root, "stage", effectiveInput);
       const message = ensureMessage("stage", effectiveInput.message, "a resolution message");

package/dist/workflow.d.ts

@@ -36,6 +36,9 @@ export type TreeseedReleaseCandidateVerifyDriver = 'auto' | 'local' | 'action';
 export type TreeseedStageVerifyMode = 'action' | 'local' | 'none';
 export type TreeseedStageCiMode = 'off' | 'hosted';
 export type TreeseedStageCleanupMode = 'success' | 'manual';
+export type TreeseedTasksInput = {
+    cleanupMerged?: 'plan' | 'live';
+};
 export type TreeseedWorkflowContext = {
     cwd?: string;
     env?: NodeJS.ProcessEnv;
@@ -298,12 +301,14 @@ export declare class TreeseedWorkflowSdk {
     execute(operation: TreeseedWorkflowOperationId, input?: Record<string, unknown>): Promise<TreeseedWorkflowResult<import("./workflow-state.js").TreeseedWorkflowState> | TreeseedWorkflowResult<TreeseedCiResult> | TreeseedWorkflowResult<{
         tasks: TreeseedTaskBranchMetadata[];
         workstreams: TreeseedWorkflowWorkstreamSummary[];
+        branchCleanup?: unknown;
     }> | TreeseedWorkflowResult<Record<string, unknown>>>;
     status(input?: TreeseedWorkflowStatusOptions): Promise<TreeseedWorkflowResult<ReturnType<typeof resolveTreeseedWorkflowState>>>;
     ci(input?: TreeseedCiInput): Promise<TreeseedWorkflowResult<TreeseedCiResult>>;
-    tasks(): Promise<TreeseedWorkflowResult<{
+    tasks(input?: TreeseedTasksInput): Promise<TreeseedWorkflowResult<{
         tasks: TreeseedTaskBranchMetadata[];
         workstreams: TreeseedWorkflowWorkstreamSummary[];
+        branchCleanup?: unknown;
     }>>;
     config(input?: TreeseedConfigInput): Promise<TreeseedWorkflowResult>;
     switchTask(input: TreeseedSwitchInput): Promise<TreeseedWorkflowResult>;

package/dist/workflow.js

@@ -49,7 +49,7 @@ class TreeseedWorkflowSdk {
       case "ci":
         return this.ci(input);
       case "tasks":
-        return this.tasks();
+        return this.tasks(input);
       case "config":
         return this.config(input);
       case "switch":
@@ -88,8 +88,8 @@ class TreeseedWorkflowSdk {
   async ci(input = {}) {
     return workflowCi(this.helpers(), input);
   }
-  async tasks() {
-    return workflowTasks(this.helpers());
+  async tasks(input = {}) {
+    return workflowTasks(this.helpers(), input);
   }
   async config(input = {}) {
     return workflowConfig(this.helpers(), input);

package/package.json

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