@cursor/july 0.1.7 → 0.1.9

package/src/internal/cli-deploy.ts

@@ -40,9 +40,11 @@ import {
 } from "./discovery.js";
 import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
 import {
+  isReservedSecretName,
   isValidCursorEventRepo,
   validateSettableSecretName,
 } from "./hosting.js";
+import { deployProgressLabel, sanitizeCustomerError } from "./logs-client.js";
 import { stderrPalette } from "./terminal-style.js";
 
 const DEFAULT_POLL_INTERVAL_MS = 3_000;
@@ -554,6 +556,24 @@ async function deployOne(
     );
     return 1;
   }
+  // Repo-backed fields without a resolvable https origin become a static
+  // deploy body the control plane rejects. Fail here with a fix hint —
+  // common when origin is an unrecognized SSH shape (pass --repo).
+  if (
+    gitRepoUrl === undefined &&
+    (gitRef !== undefined ||
+      agentPath !== undefined ||
+      (options.cursorEventsRepos !== undefined &&
+        options.cursorEventsRepos.length > 0) ||
+      (options.allowDomains !== undefined && options.allowDomains.length > 0))
+  ) {
+    ctx.err(
+      `Could not resolve an https:// git repository URL for this deploy.\n` +
+        `  Pass --repo https://github.com/<owner>/<repo> (inferred from origin when possible).\n` +
+        `  Or omit --ref/--path/--cursor-events-repo/--allow-domain for a static engine.\n`
+    );
+    return 1;
+  }
   for (const repo of options.cursorEventsRepos ?? []) {
     if (!isValidCursorEventRepo(repo)) {
       ctx.err(`Invalid --cursor-events-repo: ${repo} (expected owner/name)\n`);
@@ -659,13 +679,11 @@ async function deployOne(
   }
 
   if (detail.status !== "running") {
-    ctx.err(
-      `Deployment ${slug} ended ${detail.status}${
-        detail.lastError === null || detail.lastError === undefined
-          ? ""
-          : `: ${detail.lastError}`
-      }\n`
-    );
+    const errorDetail =
+      detail.lastError === null || detail.lastError === undefined
+        ? ""
+        : `: ${sanitizeCustomerError(detail.lastError)}`;
+    ctx.err(`Deployment ${slug} ended ${detail.status}${errorDetail}\n`);
     return 1;
   }
   ctx.out(
@@ -709,7 +727,11 @@ function warnMissingSecrets(
     return;
   }
   const setNames = new Set(set ?? []);
-  const missing = declared.filter((name) => !setNames.has(name));
+  // Platform-managed names (CURSOR_*, hosted storage) are injected by the
+  // control plane and never appear in secrets list — do not warn on them.
+  const missing = declared.filter(
+    (name) => !setNames.has(name) && !isReservedSecretName(name)
+  );
   if (missing.length === 0) {
     return;
   }
@@ -793,11 +815,23 @@ export async function cmdDeploymentStatus(
   const lines = [
     `${detail.slug} (team ${detail.teamId})`,
     `  status:      ${detail.status}`,
+  ];
+  if (detail.progress !== undefined) {
+    lines.push(`  progress:    ${detail.progress}`);
+  }
+  if (
+    detail.statusMessage !== null &&
+    detail.statusMessage !== undefined &&
+    detail.statusMessage.trim() !== ""
+  ) {
+    lines.push(`  step:        ${detail.statusMessage}`);
+  }
+  lines.push(
     `  generation:  ${detail.generation}`,
     `  kind:        ${detail.deploymentKind}`,
     `  alias:       ${aliasUrl}`,
-    `  playground:  ${aliasUrl}/playground`,
-  ];
+    `  playground:  ${aliasUrl}/playground`
+  );
   if (detail.gitRepoUrl !== null && detail.gitRepoUrl !== undefined) {
     lines.push(`  repo:        ${detail.gitRepoUrl} @ ${detail.gitRef ?? ""}`);
   }
@@ -835,7 +869,7 @@ export async function cmdDeploymentStatus(
     );
   }
   if (detail.lastError !== null && detail.lastError !== undefined) {
-    lines.push(`  last error:  ${detail.lastError}`);
+    lines.push(`  last error:  ${sanitizeCustomerError(detail.lastError)}`);
   }
   if (detail.desiredUpdatedAt !== undefined) {
     lines.push(`  updated:     ${detail.desiredUpdatedAt}`);
@@ -1229,7 +1263,9 @@ function createLineReader(
 /**
  * Poll deployment status every `pollIntervalMs` until it lands in
  * `terminal` (single-line progress on a TTY, one line per transition
- * otherwise). Throws DeployApiError on request failures or timeout.
+ * otherwise). Prefers customer `statusMessage` / `progress` over raw
+ * status so create → checkout → start is visible. Throws DeployApiError
+ * on request failures or timeout.
  */
 async function pollUntil(
   ctx: DeployCliContext,
@@ -1238,21 +1274,22 @@ async function pollUntil(
 ): Promise<DeploymentDetail> {
   const startedAt = Date.now();
   const tty = process.stderr.isTTY === true;
-  let lastStatus: DeploymentStatus | undefined;
+  let lastLabel: string | undefined;
   let sawProgress = false;
 
-  const report = (status: DeploymentStatus): void => {
+  const report = (detail: DeploymentDetail): void => {
     if (ctx.json) {
       return;
     }
+    const label = deployProgressLabel(detail);
     const elapsed = Math.round((Date.now() - startedAt) / 1000);
     if (tty) {
-      ctx.err(`\r\x1b[2K${slug}: ${status} (${elapsed}s)`);
+      ctx.err(`\r\x1b[2K${slug}: ${label} (${elapsed}s)`);
       sawProgress = true;
-    } else if (status !== lastStatus) {
-      ctx.err(`${slug}: ${status}\n`);
+    } else if (label !== lastLabel) {
+      ctx.err(`${slug}: ${label}\n`);
     }
-    lastStatus = status;
+    lastLabel = label;
   };
   const finishProgressLine = (): void => {
     if (tty && sawProgress) {
@@ -1267,15 +1304,16 @@ async function pollUntil(
         finishProgressLine();
         throw error;
       });
-    report(detail.status);
+    report(detail);
     if (terminal.has(detail.status)) {
       finishProgressLine();
       return detail;
     }
     if (Date.now() - startedAt >= ctx.timeoutMs) {
       finishProgressLine();
+      const last = deployProgressLabel(detail);
       throw new DeployApiError(
-        `Timed out after ${Math.round(ctx.timeoutMs / 1000)}s waiting for ${slug} (last status: ${detail.status}). It may still converge — check \`${CLI} deployment ${slug} --team ${ctx.teamId}\`.`,
+        `Timed out after ${Math.round(ctx.timeoutMs / 1000)}s waiting for ${slug} (last: ${last}). It may still converge — check \`${CLI} deployment ${slug} --team ${ctx.teamId}\`.`,
         0
       );
     }