@mutmutco/cli 3.25.0 → 3.26.0

package/dist/main.cjs

@@ -6196,7 +6196,7 @@ function formatGcPlan(plan, apply) {
 }
 
 // src/project-model.ts
-var PROJECT_TYPES = ["web-app", "hub-service", "content", "desktop-game", "non-deployable", "cli-tool", "worker"];
+var PROJECT_TYPES = ["web-app", "hub-service", "content", "desktop-app", "desktop-game", "non-deployable", "cli-tool", "worker"];
 var DEPLOY_MODELS = ["hub-serverless", "serverless", "tenant-container", "solo-container", "registry-publish", "content", "none"];
 var RELEASE_TRACKS = ["full", "direct", "trunk"];
 var PROJECT_TYPE_SET = new Set(PROJECT_TYPES);
@@ -6233,12 +6233,12 @@ function resolveDeployModel(meta, repo) {
   const projectType = resolveProjectType(meta, repo);
   if (projectType === "content" || meta?.class === "content") return "content";
   if (projectType === "hub-service" || repoIsHub(repo)) return "hub-serverless";
-  if (projectType === "desktop-game" || projectType === "non-deployable") return "none";
+  if (projectType === "desktop-app" || projectType === "desktop-game" || projectType === "non-deployable") return "none";
   if (projectType === "cli-tool") return "registry-publish";
   return "tenant-container";
 }
 function projectTypeClearsWebProfile(projectType, deployModel) {
-  return projectType === "content" || projectType === "desktop-game" || projectType === "non-deployable" || projectType === "cli-tool" || deployModel === "content" || deployModel === "none" || deployModel === "registry-publish";
+  return projectType === "content" || projectType === "desktop-app" || projectType === "desktop-game" || projectType === "non-deployable" || projectType === "cli-tool" || deployModel === "content" || deployModel === "none" || deployModel === "registry-publish";
 }
 function inferReleaseTrackFromBranches(hints) {
   if (hints.hasRcBranch) return void 0;
@@ -9608,6 +9608,10 @@ function seedMatchesDeployModel(seed, deployModel) {
   if (!seed.deployModels?.length) return true;
   return deployModel != null && seed.deployModels.includes(deployModel);
 }
+function seedMatchesProjectType(seed, projectType) {
+  if (!seed.projectTypes?.length) return true;
+  return projectType != null && seed.projectTypes.includes(projectType);
+}
 function planSeedAction(seed, exists) {
   if (seed.source === "fanout") {
     return { target: seed.target, action: "skip", ownership: "fanout", reason: "delivered by the fanout pipeline" };
@@ -9620,18 +9624,25 @@ function planSeedAction(seed, exists) {
   }
   return exists ? { target: seed.target, action: "update", ownership: "org", reason: "org-owned, refresh to current" } : { target: seed.target, action: "create", ownership: "org", reason: "org-owned, missing" };
 }
-function reconcileSeedAction(action, content, isManagedBlock) {
+function reconcileSeedAction(action, content, isManagedBlock, remoteContent = null) {
   if (action.action === "skip") return action;
   if (content == null) {
     return { ...action, action: "skip", reason: "no resolvable content" };
   }
-  if (isManagedBlock) return action;
-  const unfilled = missingPlaceholders(content);
-  if (unfilled.length) {
-    return { ...action, action: "skip", reason: `unfilled: ${unfilled.join(", ")} \u2014 pass --var` };
+  if (!isManagedBlock) {
+    const unfilled = missingPlaceholders(content);
+    if (unfilled.length) {
+      return { ...action, action: "skip", reason: `unfilled: ${unfilled.join(", ")} \u2014 pass --var` };
+    }
+  }
+  if (action.action === "update" && remoteContent != null && sameIgnoringEol(content, remoteContent)) {
+    return { ...action, action: "skip", reason: "already current" };
   }
   return action;
 }
+function sameIgnoringEol(a, b) {
+  return a.replace(/\r\n/g, "\n") === b.replace(/\r\n/g, "\n");
+}
 function renderSeedPlan(actions) {
   const lines = ["bootstrap apply \u2014 seed plan (dry-run; no mutations):"];
   for (const a of actions) {
@@ -11927,7 +11938,6 @@ function bootstrapPlan(repo, repoClass) {
     { label: `apply branch protection / allowlist: ${protectedBranches}`, gated: true },
     { label: "attach GitHub Project v2 and register Hub registry META", gated: true },
     { label: "seed README.md and architecture.md", gated: true },
-    { label: "commit .cursor/rules/<repo>.mdc", gated: true },
     { label: `register fanout target on ${repoClass === "content" ? "main" : "development"}`, gated: true }
   ];
 }
@@ -14957,9 +14967,6 @@ async function contentText(deps, repo, branch, path2) {
     return null;
   }
 }
-function repoSlugFromFullName(repo) {
-  return (repo.includes("/") ? repo.split("/")[1] : repo).toLowerCase();
-}
 async function getProtection(deps, repo, branch) {
   try {
     return await deps.client.rest("GET", `repos/${repo}/branches/${branch}/protection`) ?? {};
@@ -15109,13 +15116,6 @@ async function verifyBootstrap(repo, repoClass, deps, releaseTrack) {
     label: "architecture.md is filled (no template placeholders)",
     detail: archPlaceholders.length ? `unfilled: ${archPlaceholders.join(", ")}` : void 0
   });
-  const agentRulesPath = `.cursor/rules/${repoSlugFromFullName(repo)}.mdc`;
-  const agentRulesOk = await contentExists2(deps, repo, baseBranch, agentRulesPath);
-  checks.push({
-    ok: agentRulesOk,
-    label: "Cursor agent rules file exists",
-    detail: agentRulesOk ? void 0 : `expected: ${agentRulesPath}`
-  });
   const labels = await restPagedJson2(deps, `repos/${repo}/labels`, []);
   const labelNames = new Set(labels.map((l) => l.name));
   for (const label of requiredLabels) {
@@ -15699,10 +15699,16 @@ function attestedLine(att) {
 var CONTRACT_UNDECLARED_LINE = "No runtime secrets declared \u2014 declare requiredRuntimeSecrets (a per-stage name map) in the registry META, or attest the app needs none with an explicit empty stage map ({ dev: [], rc: [], main: [] }).";
 function appGapsFor(meta, model, slug, projectType, mainDeployFact) {
   const attested = appAttestationOf(meta);
-  const isTenantWeb = !(projectType === "content" || model === "content") && projectType !== "desktop-game" && projectType !== "cli-tool" && !(projectType === "non-deployable" || model === "none") && model !== "hub-serverless" && model !== "serverless" && model !== "registry-publish";
+  const isTenantWeb = !(projectType === "content" || model === "content") && projectType !== "desktop-app" && projectType !== "desktop-game" && projectType !== "cli-tool" && !(projectType === "non-deployable" || model === "none") && model !== "hub-serverless" && model !== "serverless" && model !== "registry-publish";
   const contractUndeclared = isTenantWeb && Boolean(meta) && !hasRuntimeSecretContract(meta?.requiredRuntimeSecrets);
   if (attested) return contractUndeclared ? [attestedLine(attested), CONTRACT_UNDECLARED_LINE] : [attestedLine(attested)];
   if (projectType === "content" || model === "content") return ["Content repo: keep app-owned work to docs/content changes; release train does not apply."];
+  if (projectType === "desktop-app") {
+    return [
+      "Desktop app: no Hub deploy coords, Google OAuth, DWD, or tenant control by default; keep app-owned installer/packaging outside the tenant train.",
+      "Keep README.md and architecture.md explicit about the per-OS build and distribution path (installer, and any registry publish alongside it) so readiness does not guess web infra."
+    ];
+  }
   if (projectType === "desktop-game") {
     return [
       "Desktop game: no Hub deploy coords, Google OAuth, DWD, or tenant control by default; keep app-owned release packaging outside the tenant train.",
@@ -15836,7 +15842,7 @@ function buildV2HealPatch(repoOrSlug, meta, mainDeployFact) {
       patch.requiredRuntimeSecrets = next;
     }
   }
-  const appOwnedGaps = confidentType ? appGapsFor(meta, model, slug, confidentType, mainDeployFact) : [`Project type is unset and not derivable \u2014 classify with \`mmi-cli project set ${repo} --project-type <web-app|hub-service|content|desktop-game|non-deployable|cli-tool|worker> --deploy-model <tenant-container|solo-container|hub-serverless|serverless|registry-publish|content|none>\` before heal completes the v2 fields (prevents defaulting a non-web repo to tenant-container).`];
+  const appOwnedGaps = confidentType ? appGapsFor(meta, model, slug, confidentType, mainDeployFact) : [`Project type is unset and not derivable \u2014 classify with \`mmi-cli project set ${repo} --project-type <web-app|hub-service|content|desktop-app|desktop-game|non-deployable|cli-tool|worker> --deploy-model <tenant-container|solo-container|hub-serverless|serverless|registry-publish|content|none>\` before heal completes the v2 fields (prevents defaulting a non-web repo to tenant-container).`];
   if (boardRegistryGaps(meta).length) appOwnedGaps.unshift(boardRegistryGapMessage(repo));
   return { slug, patch, appOwnedGaps };
 }
@@ -22937,6 +22943,7 @@ bootstrap.command("apply <repo>").description("run from the MMI-Hub repo root: i
   const actions = [];
   const applied = [];
   let applyDeployModel;
+  let applyProjectType;
   try {
     const payload = buildRegisterPayload(repo, o.class, vars, {
       projectType: o.projectType || void 0,
@@ -22944,6 +22951,7 @@ bootstrap.command("apply <repo>").description("run from the MMI-Hub repo root: i
       releaseTrack: o.releaseTrack || void 0
     });
     applyDeployModel = payload.deployModel;
+    applyProjectType = payload.projectType;
   } catch {
   }
   let seedPlan = { mode: "direct", ref: baseBranch, reason: "dry-run (no protection probe)" };
@@ -22968,6 +22976,7 @@ bootstrap.command("apply <repo>").description("run from the MMI-Hub repo root: i
   for (const seed of manifest.seeds) {
     if (!seed.classes.includes(o.class)) continue;
     if (!seedMatchesDeployModel(seed, applyDeployModel)) continue;
+    if (!seedMatchesProjectType(seed, applyProjectType)) continue;
     const resolved = { ...seed, target: seed.target.replace("{{REPO_SLUG}}", slug) };
     let exists = false;
     let sha;
@@ -22991,7 +23000,7 @@ bootstrap.command("apply <repo>").description("run from the MMI-Hub repo root: i
     const planned = planSeedAction(resolved, exists);
     const isBlock = resolved.source === "managed-block";
     const content = planned.action === "create" || planned.action === "update" ? isBlock ? upsertManagedGitignoreBlock(remoteContent).content : resolveSeedContent(resolved, vars, readFile4) : null;
-    const action = reconcileSeedAction(planned, content, isBlock);
+    const action = reconcileSeedAction(planned, content, isBlock, remoteContent);
     actions.push(action);
     if (o.execute && (action.action === "create" || action.action === "update")) {
       await gh(contentPutArgs(repo, resolved.target, content, seedPlan.ref, action.action === "update" ? sha : void 0));
@@ -23024,10 +23033,17 @@ bootstrap.command("apply <repo>").description("run from the MMI-Hub repo root: i
       ]);
       seedPrUrl = created.url;
     }
+    let autoMergeEnabled = true;
     await gh(["pr", "merge", seedPrUrl, "--repo", repo, "--auto", "--squash"]).catch((e) => {
-      if (!/already/i.test(String(e.message ?? ""))) throw e;
+      const message = String(e.message ?? "");
+      if (/already/i.test(message)) return;
+      if (/clean status|enablePullRequestAutoMerge/i.test(message)) {
+        autoMergeEnabled = false;
+        return;
+      }
+      throw e;
     });
-    applied.push(`seed: PR ${seedPrUrl} (base ${baseBranch} protected; auto-merge enabled)`);
+    applied.push(autoMergeEnabled ? `seed: PR ${seedPrUrl} (base ${baseBranch} protected; auto-merge enabled)` : `seed: PR ${seedPrUrl} (base ${baseBranch} protected; auto-merge refused \u2014 PR is already clean. Land it: mmi-cli pr land <n> --repo ${repo})`);
   }
   if (o.execute && o.class === "deployable") {
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mutmutco/cli",
-  "version": "3.25.0",
+  "version": "3.26.0",
   "description": "MMI Future CLI — the org dev toolbox (board, registry, keyless secrets, release train, bootstrap, doctor) and the cross-IDE engine the plugin's session-start hook drives.",
   "type": "module",
   "license": "UNLICENSED",