run402-mcp 3.6.0 → 3.7.0

package/sdk/dist/namespaces/deploy.js

@@ -146,7 +146,11 @@ export class Deploy {
      * response and a byte-reader map keyed by sha256 (used by `upload`).
      */
     async plan(spec, opts = {}) {
-        return planInternal(this.client, spec, opts.idempotencyKey, opts.dryRun);
+        return planInternal(this.client, spec, opts.idempotencyKey, {
+            dryRun: opts.dryRun ?? opts.mode === "legacyDryRun",
+            reviewedPlan: opts.mode === "reviewedPlan",
+            requiredPlan: opts.requiredPlan,
+        });
     }
     /**
      * Low-level upload: ensure every ref the gateway reported as missing for
@@ -166,7 +170,7 @@ export class Deploy {
      */
     async commit(planId, opts = {}) {
         const emit = makeEmitter(opts.onEvent);
-        const commit = requireCloudCommitResponse(await commitInternal(this.client, planId, opts.idempotencyKey, opts.project), "committing deploy");
+        const commit = requireCloudCommitResponse(await commitInternal(this.client, planId, opts.idempotencyKey, opts.project, opts.requiredPlan), "committing deploy");
         return await pollUntilReady(this.client, commit, {}, [], emit, opts.project);
     }
     /**
@@ -455,10 +459,14 @@ async function applyOnce(client, spec, opts, emit) {
     const target = opts.target === "core" ? "core" : "cloud";
     const sliceKinds = deriveSliceKinds(spec);
     emit({ type: "plan.started" });
-    const { plan, byteReaders } = await planInternal(client, spec, opts.idempotencyKey, false, target);
+    const { plan, byteReaders } = await planInternal(client, spec, opts.idempotencyKey, {
+        target,
+        requiredPlan: opts.requiredPlan,
+    });
     emit({ type: "plan.diff", diff: plan.diff });
     emitPlanWarnings(plan, emit);
-    abortOnConfirmationWarnings(plan, opts, allowWarningCodes);
+    if (!opts.requiredPlan)
+        abortOnConfirmationWarnings(plan, opts, allowWarningCodes);
     if (plan.payment_required) {
         emit({
             type: "payment.required",
@@ -481,7 +489,7 @@ async function applyOnce(client, spec, opts, emit) {
             ...(sliceKinds.length > 0 ? { slice_kinds: sliceKinds } : {}),
         });
         const planId = requirePlanId(plan, "applying deploy to Core");
-        const commit = await commitInternal(client, planId, opts.idempotencyKey, spec.project);
+        const commit = await commitInternal(client, planId, opts.idempotencyKey, spec.project, opts.requiredPlan);
         if (!isCoreCommitResponse(commit)) {
             return await pollUntilReady(client, commit, plan.diff, plan.warnings, emit, spec.project, sliceKinds);
         }
@@ -495,7 +503,7 @@ async function applyOnce(client, spec, opts, emit) {
         ...(sliceKinds.length > 0 ? { slice_kinds: sliceKinds } : {}),
     });
     const { planId } = requirePersistedPlan(plan, "applying deploy");
-    const commit = requireCloudCommitResponse(await commitInternal(client, planId, opts.idempotencyKey, spec.project), "applying deploy");
+    const commit = requireCloudCommitResponse(await commitInternal(client, planId, opts.idempotencyKey, spec.project, opts.requiredPlan), "applying deploy");
     const result = await pollUntilReady(client, commit, plan.diff, plan.warnings, emit, spec.project, sliceKinds);
     // v1.48 unified-apply: thread the plan response's `asset_entries[]` back
     // into DeployResult.assets so callers reading `result.assets.byKey[key]`
@@ -528,7 +536,7 @@ async function applyOnce(client, spec, opts, emit) {
         });
         if (hasImagePut) {
             try {
-                const { plan: recheck } = await planInternal(client, spec, undefined, true);
+                const { plan: recheck } = await planInternal(client, spec, undefined, { dryRun: true });
                 if (recheck.asset_entries && recheck.asset_entries.length > 0) {
                     for (const recheckEntry of recheck.asset_entries) {
                         const existing = result.assets.byKey[recheckEntry.key];
@@ -889,7 +897,10 @@ function releaseSpecToWire(spec) {
         ...(spec.i18n !== undefined ? { i18n: spec.i18n === null ? null : i18nToWire(spec.i18n) } : {}),
     };
 }
-async function planInternal(client, spec, idempotencyKey, dryRun = false, target = "cloud") {
+async function planInternal(client, spec, idempotencyKey, opts = {}) {
+    const dryRun = opts.dryRun === true;
+    const reviewedPlan = opts.reviewedPlan === true;
+    const target = opts.target ?? "cloud";
     const ciCredentials = isCiClient(client);
     validateSpec(spec);
     if (ciCredentials)
@@ -908,8 +919,12 @@ async function planInternal(client, spec, idempotencyKey, dryRun = false, target
     // gateway still needs `spec` in the body (with at least the project), so
     // we keep a minimal stub there.
     const inlineBody = { spec: wireSpec };
-    if (idempotencyKey && !dryRun)
+    if (idempotencyKey && !dryRun && !reviewedPlan)
         inlineBody.idempotency_key = idempotencyKey;
+    if (reviewedPlan)
+        inlineBody.mode = "reviewed_plan";
+    if (opts.requiredPlan)
+        inlineBody.required_plan = requiredPlanToWire(opts.requiredPlan);
     const inlineBytes = new TextEncoder().encode(JSON.stringify(inlineBody)).byteLength;
     let body;
     if (inlineBytes <= PLAN_BODY_LIMIT_BYTES) {
@@ -925,9 +940,9 @@ async function planInternal(client, spec, idempotencyKey, dryRun = false, target
         });
     }
     else {
-        if (dryRun) {
-            throw new Run402DeployError("Dry-run deploy planning requires an inline spec under the gateway body cap; the normalized deploy plan would require manifest_ref.", {
-                code: "DRY_RUN_REQUIRES_INLINE_SPEC",
+        if (dryRun || reviewedPlan || opts.requiredPlan) {
+            throw new Run402DeployError("Check/plan/require-plan deploy planning requires an inline spec under the gateway body cap; the normalized deploy plan would require manifest_ref.", {
+                code: "PLAN_REQUIRES_INLINE_SPEC",
                 phase: "validate",
                 resource: "manifest_ref",
                 retryable: false,
@@ -967,6 +982,12 @@ async function planInternal(client, spec, idempotencyKey, dryRun = false, target
     }
     return { plan, byteReaders };
 }
+function requiredPlanToWire(plan) {
+    const wire = { plan_id: plan.planId };
+    if (plan.planFingerprint !== undefined)
+        wire.plan_fingerprint = plan.planFingerprint;
+    return wire;
+}
 async function preflightTierFunctionLimits(client, spec, ciCredentials) {
     if (ciCredentials)
         return;
@@ -1299,11 +1320,16 @@ function expandCronNumberPart(part, min, max) {
     }
     return values;
 }
-async function commitInternal(client, planId, idempotencyKey, project) {
+async function commitInternal(client, planId, idempotencyKey, project, requiredPlan) {
     try {
+        const body = {};
+        if (idempotencyKey)
+            body.idempotency_key = idempotencyKey;
+        if (requiredPlan)
+            body.required_plan = requiredPlanToWire(requiredPlan);
         return await client.request(`/apply/v1/plans/${encodeURIComponent(planId)}/commit`, {
             method: "POST",
-            body: idempotencyKey ? { idempotency_key: idempotencyKey } : {},
+            body,
             // Operator-approval scope: committing a deploy is `project.deploy` on this project.
             ...(project
                 ? {
@@ -1704,10 +1730,13 @@ async function startInternal(client, spec, opts) {
         }
     };
     emit({ type: "plan.started" });
-    const { plan, byteReaders } = await planInternal(client, spec, opts.idempotencyKey);
+    const { plan, byteReaders } = await planInternal(client, spec, opts.idempotencyKey, {
+        requiredPlan: opts.requiredPlan,
+    });
     emit({ type: "plan.diff", diff: plan.diff });
     emitPlanWarnings(plan, emit);
-    abortOnConfirmationWarnings(plan, opts, allowWarningCodes);
+    if (!opts.requiredPlan)
+        abortOnConfirmationWarnings(plan, opts, allowWarningCodes);
     if (plan.payment_required) {
         emit({
             type: "payment.required",
@@ -1727,7 +1756,7 @@ async function startInternal(client, spec, opts) {
             ...(sliceKinds.length > 0 ? { slice_kinds: sliceKinds } : {}),
         });
         const { planId } = requirePersistedPlan(plan, "starting deploy");
-        const commit = requireCloudCommitResponse(await commitInternal(client, planId, opts.idempotencyKey, spec.project), "starting deploy");
+        const commit = requireCloudCommitResponse(await commitInternal(client, planId, opts.idempotencyKey, spec.project, opts.requiredPlan), "starting deploy");
         return await pollUntilReady(client, commit, plan.diff, plan.warnings, emit, spec.project, sliceKinds);
     })();
     // Avoid an unhandled-rejection at construction time. Consumers must call