@mesh-tech/mesh-cli 0.20.1 → 0.20.2

package/README.md

@@ -78,11 +78,12 @@ runs it for you.
 mesh init
 ```
 
-Run it in your `<tenant>-mesh-apps` clone (an empty one is fine). The wizard
-asks which tenant this repo belongs to and where it runs — *local only*
-(`mesh start` / `mesh dev`) or *a deployed Mesh platform* — then checks your
-registry access (signing you in if step 2 was skipped), bootstraps the repo
-layout, installs the agent skills, and prints a summary with the next command.
+Run it in your `<tenant>-mesh-apps` clone, or in a brand-new empty folder — the
+wizard runs `git init` there for you. It asks which tenant this repo belongs to
+and where it runs — *local only* (`mesh start` / `mesh dev`) or *a deployed Mesh
+platform* — then checks your registry access (signing you in if step 2 was
+skipped), bootstraps the repo layout, installs the agent skills, and prints a
+summary with the next command.
 Every answer has a flag, so a headless run is one line:
 
 ```bash

package/dist/bin/mesh.js

@@ -12272,6 +12272,7 @@ __export(create_app_exports, {
   PLATFORM_MONOREPO_NAME: () => PLATFORM_MONOREPO_NAME,
   bootstrapAppsRepo: () => bootstrapAppsRepo,
   copyTemplate: () => copyTemplate,
+  describeNoAppsHome: () => describeNoAppsHome,
   ensureRegistryAccess: () => ensureRegistryAccess,
   ensureWorkspaceGlobs: () => ensureWorkspaceGlobs,
   generateComposableApp: () => generateComposableApp,
@@ -12461,6 +12462,18 @@ function parsePrimitives(input2) {
   }
   return selected;
 }
+function describeNoAppsHome(cwd, tenant, baseDir, test) {
+  if (test || isInsidePlatformMonorepo(cwd)) {
+    return {
+      message: `Tenant directory not found: ${baseDir}/${tenant}/`,
+      hint: "Create the tenant directory first, or run from within it."
+    };
+  }
+  return {
+    message: `This directory is not a Mesh apps repo \u2014 no apps/ here${fs23.existsSync(path25.join(cwd, ".git")) ? "" : " and it is not a git repo"}.`,
+    hint: `Run: mesh init   (turns this folder into your ${tenant}-mesh-apps repo), or cd into that repo and re-run mesh create-app.`
+  };
+}
 function resolveAppDir(cwd, tenant, name, test) {
   const baseDir = test ? "tests/tenants" : "tenants";
   const possiblePaths = test ? [path25.join(cwd, baseDir, tenant, "apps")] : [
@@ -12472,8 +12485,9 @@ function resolveAppDir(cwd, tenant, name, test) {
   if (!appsDir) {
     appsDir = path25.join(cwd, baseDir, tenant, "apps");
     if (!fs23.existsSync(path25.join(cwd, baseDir, tenant))) {
-      logError(`Tenant directory not found: ${baseDir}/${tenant}/`);
-      logInfo("Create the tenant directory first, or run from within it.");
+      const { message, hint } = describeNoAppsHome(cwd, tenant, baseDir, test);
+      logError(message);
+      logInfo(hint);
       process.exit(1);
     }
     if (!fs23.existsSync(appsDir)) {
@@ -16887,6 +16901,7 @@ var init_registry = __esm({
 // libs/mesh-cli/src/commands/init/wizard.ts
 var wizard_exports = {};
 __export(wizard_exports, {
+  INIT_REPO_FIX: () => INIT_REPO_FIX,
   INTERRUPTED_EXIT_CODE: () => INTERRUPTED_EXIT_CODE,
   NO_SESSION_NO_TTY_MESSAGE: () => NO_SESSION_NO_TTY_MESSAGE,
   TENANT_REQUIRED_MESSAGE: () => TENANT_REQUIRED_MESSAGE,
@@ -16895,6 +16910,7 @@ __export(wizard_exports, {
   describeMode: () => describeMode,
   registryStep: () => registryStep,
   renderWizardSummary: () => renderWizardSummary,
+  repoStep: () => repoStep,
   resolveAnswers: () => resolveAnswers,
   runInitWizard: () => runInitWizard,
   runWizardSteps: () => runWizardSteps,
@@ -16904,12 +16920,15 @@ __export(wizard_exports, {
 });
 import * as fs30 from "fs";
 import * as path37 from "path";
+import { execFileSync as execFileSync25 } from "child_process";
 import chalk4 from "chalk";
 function wizardExitCode(steps) {
   return steps.some((s) => s.status === "fail") ? 1 : 0;
 }
-function wizardNextCommands(mode) {
-  return mode === "local" ? ["mesh create-app"] : ["mesh create-app", "mesh deploy up   # from the app directory, once it exists"];
+function wizardNextCommands(mode, steps = []) {
+  const repo = steps.find((s) => s.name === STEP_LABELS.repo);
+  const first = repo && repo.status !== "pass" && repo.fix ? repo.fix : "mesh create-app";
+  return mode === "local" ? [first] : [first, "mesh deploy up   # from the app directory, once it exists"];
 }
 function stepBlocks(result) {
   return result.status === "fail" && result.blocking !== false;
@@ -16958,12 +16977,18 @@ function classifyRepo(cwd) {
   if (shouldBootstrapAppsRepo(cwd)) return { kind: "empty-apps-repo", root: cwd };
   const root = resolveTargetRoot(cwd);
   const inRepo = fs30.existsSync(path37.join(root, ".git"));
-  if (!inRepo) return { kind: "no-repo", root };
+  if (!inRepo) {
+    const hasContent = fs30.readdirSync(cwd).some((entry) => !entry.startsWith("."));
+    return { kind: hasContent ? "no-repo" : "empty-dir", root: cwd };
+  }
   const hasWorkspace = fs30.existsSync(path37.join(root, "pnpm-workspace.yaml")) || fs30.existsSync(path37.join(root, "pnpm-lock.yaml"));
   const hasApps = fs30.existsSync(path37.join(root, "apps")) || fs30.existsSync(path37.join(root, "tenants"));
   if (hasWorkspace || hasApps) return { kind: "apps-repo", root };
   return { kind: "other-repo", root };
 }
+function gitInit(dir) {
+  execFileSync25("git", ["init", "-q"], { cwd: dir, stdio: ["ignore", "ignore", "pipe"] });
+}
 async function runWizardSteps(ctx, steps) {
   const results = [];
   for (const step of steps) {
@@ -17055,7 +17080,7 @@ async function runInitWizard(opts, deps = {}) {
       const written = writeMeshJson(root, { tenant, platform: mode === "local" ? "local" : mode.platform });
       logInfo(`Recorded tenant + mode in ${written}`);
     }
-    const outcome = { tenant, mode, steps, next: wizardNextCommands(mode) };
+    const outcome = { tenant, mode, steps, next: wizardNextCommands(mode, steps) };
     const code = wizardExitCode(steps);
     if (opts.json) {
       console.log = origLog;
@@ -17077,7 +17102,7 @@ async function runInitWizard(opts, deps = {}) {
     console.log = origLog;
   }
 }
-var NO_SESSION_NO_TTY_MESSAGE, TENANT_REQUIRED_MESSAGE, INTERRUPTED_EXIT_CODE, STEP_LABELS, registryStep, platformStep, repoStep, skillsStep, WIZARD_STEPS;
+var NO_SESSION_NO_TTY_MESSAGE, TENANT_REQUIRED_MESSAGE, INTERRUPTED_EXIT_CODE, STEP_LABELS, registryStep, platformStep, INIT_REPO_FIX, repoStep, skillsStep, WIZARD_STEPS;
 var init_wizard = __esm({
   "libs/mesh-cli/src/commands/init/wizard.ts"() {
     "use strict";
@@ -17181,6 +17206,7 @@ var init_wizard = __esm({
         };
       }
     };
+    INIT_REPO_FIX = "git init && mesh init";
     repoStep = {
       name: "repo",
       async run(ctx) {
@@ -17190,11 +17216,34 @@ var init_wizard = __esm({
         switch (kind) {
           case "platform-monorepo":
             return { name, status: "skip", detail: "inside mesh-platform \u2014 apps here link workspace packages; nothing to set up" };
+          case "empty-dir": {
+            const go = ctx.yes || !ctx.interactive ? true : await ctx.prompts.confirm({
+              message: `This folder is not a git repo \u2014 initialize ${root} as your ${ctx.tenant}-mesh-apps repo here?`,
+              default: true
+            });
+            if (!go) {
+              return { name, status: "skip", detail: "folder left as is", fix: `cd <your ${ctx.tenant}-mesh-apps clone> && mesh init` };
+            }
+            try {
+              (ctx.seams?.gitInit ?? gitInit)(root);
+            } catch (err) {
+              const why = err instanceof Error && "stderr" in err && err.stderr ? String(err.stderr).trim() : "";
+              return {
+                name,
+                status: "fail",
+                detail: `git init failed \u2014 is git installed and ${root} writable?${why ? ` (${why})` : ""}`,
+                fix: INIT_REPO_FIX
+              };
+            }
+            const created = bootstrapAppsRepo(root, ctx.tenant);
+            return { name, status: "pass", detail: `initialized a git repo and bootstrapped the apps repo: ${created.join(", ")}` };
+          }
           case "no-repo":
             return {
               name,
               status: "skip",
-              detail: `not in a git repo \u2014 clone (or git init) your ${ctx.tenant}-mesh-apps repo and re-run mesh init there`
+              detail: `not in a git repo, and this folder already holds files \u2014 clone (or git init) your ${ctx.tenant}-mesh-apps repo and re-run mesh init there`,
+              fix: INIT_REPO_FIX
             };
           case "other-repo":
             return {
@@ -17533,7 +17582,7 @@ var init_init = __esm({
 });
 
 // libs/mesh-cli/src/commands/install-shim.ts
-import { execFileSync as execFileSync25 } from "child_process";
+import { execFileSync as execFileSync26 } from "child_process";
 import * as fs32 from "fs";
 import * as os10 from "os";
 import * as path39 from "path";
@@ -17646,7 +17695,7 @@ function registerInstallShimCommand(program2) {
     let status = 0;
     let ok = true;
     try {
-      stdout = execFileSync25(target, ["--help"], {
+      stdout = execFileSync26(target, ["--help"], {
         cwd: process.cwd(),
         encoding: "utf8",
         stdio: ["ignore", "pipe", "pipe"]
@@ -17693,7 +17742,7 @@ var init_install_shim = __esm({
 });
 
 // libs/mesh-cli/src/commands/local/hub-local.ts
-import { execFile as execFile3, execFileSync as execFileSync26 } from "child_process";
+import { execFile as execFile3, execFileSync as execFileSync27 } from "child_process";
 import * as fs33 from "fs";
 import * as os11 from "os";
 import * as path40 from "path";
@@ -17713,7 +17762,7 @@ function npmrcPath() {
 }
 function imageExists(tag) {
   try {
-    execFileSync26("docker", ["image", "inspect", tag], { stdio: ["ignore", "pipe", "pipe"] });
+    execFileSync27("docker", ["image", "inspect", tag], { stdio: ["ignore", "pipe", "pipe"] });
     return true;
   } catch {
     return false;
@@ -17723,7 +17772,7 @@ function ensureHubAuthImage() {
   if (imageExists(HUB_AUTH_IMAGE)) return;
   logInfo(`Building ${HUB_AUTH_IMAGE} (Hub auth proxy)\u2026`);
   const hubStackDir = path40.join(findPackageRoot(), "stack", "hub");
-  execFileSync26(
+  execFileSync27(
     "docker",
     ["build", "-f", path40.join(hubStackDir, "Dockerfile.auth"), "-t", HUB_AUTH_IMAGE, hubStackDir],
     { stdio: ["ignore", "inherit", "inherit"], env: { ...process.env, DOCKER_BUILDKIT: "1" } }
@@ -17737,7 +17786,7 @@ function hasRegistryAuth() {
 function localHubVersion() {
   const versions = HUB_IMAGES.map((name) => {
     try {
-      const out = execFileSync26("docker", ["images", name, "--format", "{{.Tag}}"], {
+      const out = execFileSync27("docker", ["images", name, "--format", "{{.Tag}}"], {
         encoding: "utf-8",
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -17816,7 +17865,7 @@ async function ensureHubImages() {
   const context = path40.join(cacheDir(), `context-${version}`);
   fs33.rmSync(context, { recursive: true, force: true });
   fs33.mkdirSync(context, { recursive: true });
-  execFileSync26("tar", ["-xzf", tarball, "-C", context, "--strip-components", "1"], {
+  execFileSync27("tar", ["-xzf", tarball, "-C", context, "--strip-components", "1"], {
     stdio: ["ignore", "pipe", "pipe"]
   });
   const hubStackDir = path40.join(findPackageRoot(), "stack", "hub");
@@ -17827,7 +17876,7 @@ async function ensureHubImages() {
     const tag = `${name}:${version}`;
     if (imageExists(tag)) continue;
     logInfo(`Building ${tag} from the published tarball\u2026`);
-    execFileSync26(
+    execFileSync27(
       "docker",
       [
         "build",
@@ -17857,7 +17906,7 @@ function readHubCompiledAuthz(version) {
     if (!tarball || !fs33.existsSync(path40.join(cacheDir(), tarball))) return null;
     fs33.mkdirSync(context, { recursive: true });
     try {
-      execFileSync26(
+      execFileSync27(
         "tar",
         ["-xzf", path40.join(cacheDir(), tarball), "-C", context, "--strip-components", "1", `package/${HUB_COMPILED_AUTHZ_REL}`],
         { stdio: ["ignore", "pipe", "pipe"] }
@@ -17951,7 +18000,7 @@ async function buildHubImagesFromSource(repoRoot2) {
   await execFileAsync2("pnpm", ["pack", "--pack-destination", context], { cwd: hubDir, maxBuffer: 64 * 1024 * 1024 });
   const tarball = fs33.readdirSync(context).find((f) => f.endsWith(".tgz"));
   if (!tarball) throw new MeshCliError("pnpm pack produced no tarball for apps/hub");
-  execFileSync26("tar", ["-xzf", path40.join(context, tarball), "-C", context, "--strip-components", "1"], {
+  execFileSync27("tar", ["-xzf", path40.join(context, tarball), "-C", context, "--strip-components", "1"], {
     stdio: ["ignore", "pipe", "pipe"]
   });
   const rewritten = normalizeHubManifests(context, readWorkspaceCatalog(repoRoot2));
@@ -17963,7 +18012,7 @@ async function buildHubImagesFromSource(repoRoot2) {
   ]) {
     const tag = `${name}:${version}`;
     logInfo(`Building ${tag} from source\u2026`);
-    execFileSync26(
+    execFileSync27(
       "docker",
       ["build", "-f", path40.join(hubStackDir, dockerfile), "-t", tag, "--secret", `id=npmrc,src=${npmrc}`, context],
       { stdio: ["ignore", "inherit", "inherit"], env: { ...process.env, DOCKER_BUILDKIT: "1" } }
@@ -19595,7 +19644,7 @@ var init_site = __esm({
 });
 
 // libs/mesh-cli/src/commands/stack.ts
-import { execFileSync as execFileSync27 } from "child_process";
+import { execFileSync as execFileSync28 } from "child_process";
 import * as path42 from "path";
 import * as fs35 from "fs";
 import { parse as parseYaml5 } from "yaml";
@@ -19688,7 +19737,7 @@ function readBaseConfigFromYaml(appRoot, stack) {
 }
 function getGitHubUsername() {
   try {
-    const result = execFileSync27("gh", ["api", "user", "--jq", ".login"], {
+    const result = execFileSync28("gh", ["api", "user", "--jq", ".login"], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -19697,7 +19746,7 @@ function getGitHubUsername() {
   } catch {
   }
   try {
-    const result = execFileSync27("git", ["config", "user.email"], {
+    const result = execFileSync28("git", ["config", "user.email"], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -19783,7 +19832,7 @@ Specify which to base on: mesh stack init --from <stack>`
     if (!opts.adopt) {
       let existing = [];
       try {
-        const raw = execFileSync27("pulumi", ["stack", "ls", "--json"], {
+        const raw = execFileSync28("pulumi", ["stack", "ls", "--json"], {
           cwd: appRoot,
           encoding: "utf-8",
           env: pulumiEnv,
@@ -19807,7 +19856,7 @@ Specify which to base on: mesh stack init --from <stack>`
       logInfo(`Using KMS secrets provider: ${secretsProvider}`);
     }
     try {
-      execFileSync27("pulumi", initArgs, {
+      execFileSync28("pulumi", initArgs, {
         cwd: appRoot,
         env: pulumiEnv,
         stdio: "inherit"
@@ -19824,7 +19873,7 @@ Specify which to base on: mesh stack init --from <stack>`
       }
     }
     try {
-      execFileSync27("pulumi", ["stack", "select", newStack], {
+      execFileSync28("pulumi", ["stack", "select", newStack], {
         cwd: appRoot,
         env: pulumiEnv,
         stdio: ["pipe", "pipe", "pipe"]
@@ -19834,7 +19883,7 @@ Specify which to base on: mesh stack init --from <stack>`
     if (!configExists) {
       let baseConfig = {};
       try {
-        const raw = execFileSync27(
+        const raw = execFileSync28(
           "pulumi",
           ["config", "--json", "--stack", baseStack],
           { cwd: appRoot, env: pulumiEnv, encoding: "utf-8", stdio: ["pipe", "pipe", "pipe"] }
@@ -19852,19 +19901,19 @@ Specify which to base on: mesh stack init --from <stack>`
         if (key === "mesh:deploy") continue;
         try {
           if (entry.objectValue !== void 0) {
-            execFileSync27(
+            execFileSync28(
               "pulumi",
               ["config", "set", key, JSON.stringify(entry.objectValue)],
               { cwd: appRoot, env: pulumiEnv, stdio: ["pipe", "pipe", "pipe"] }
             );
           } else if (entry.value === "true" || entry.value === "false") {
-            execFileSync27(
+            execFileSync28(
               "pulumi",
               ["config", "set", "--type", "bool", key, entry.value],
               { cwd: appRoot, env: pulumiEnv, stdio: ["pipe", "pipe", "pipe"] }
             );
           } else {
-            execFileSync27(
+            execFileSync28(
               "pulumi",
               ["config", "set", key, entry.value],
               { cwd: appRoot, env: pulumiEnv, stdio: ["pipe", "pipe", "pipe"] }
@@ -19877,7 +19926,7 @@ Specify which to base on: mesh stack init --from <stack>`
         const baseEnv = readConfigBlockKey(appRoot, baseStack, "mesh:coreEnv") ?? (baseTenant && baseStack.startsWith(`${baseTenant}-`) ? baseStack.slice(baseTenant.length + 1) : baseStack);
         const setCfg = (args) => {
           try {
-            execFileSync27("pulumi", ["config", "set", ...args], {
+            execFileSync28("pulumi", ["config", "set", ...args], {
               cwd: appRoot,
               env: pulumiEnv,
               stdio: ["pipe", "pipe", "pipe"]
@@ -19926,7 +19975,7 @@ Specify which to base on: mesh stack init --from <stack>`
           `Configured Pulumi.${newStack}.yaml (personal platform env on core '${baseEnv}'${opts.parentZone ? `, DNS zone ${newStack.startsWith(`${baseTenant}-`) ? newStack.slice(baseTenant.length + 1) : newStack}.${opts.parentZone}` : ""})`
         );
       } else {
-        execFileSync27("pulumi", ["config", "set", "--type", "bool", "mesh:deploy", "false"], {
+        execFileSync28("pulumi", ["config", "set", "--type", "bool", "mesh:deploy", "false"], {
           cwd: appRoot,
           env: pulumiEnv,
           stdio: ["pipe", "pipe", "pipe"]
@@ -19956,7 +20005,7 @@ Specify which to base on: mesh stack init --from <stack>`
     const args = ["stack", "rm", name];
     if (opts.yes) args.push("--yes");
     try {
-      execFileSync27("pulumi", args, { cwd: appRoot, env: pulumiEnv, stdio: "inherit" });
+      execFileSync28("pulumi", args, { cwd: appRoot, env: pulumiEnv, stdio: "inherit" });
       logSuccess(`Removed stack ${name}`);
     } catch (err) {
       process.exit(err.status ?? 1);
@@ -20168,12 +20217,12 @@ var init_recover_conversation = __esm({
 });
 
 // libs/mesh-cli/src/utils/temporal-codec.ts
-import { execFileSync as execFileSync28 } from "child_process";
+import { execFileSync as execFileSync29 } from "child_process";
 import { webcrypto as crypto4 } from "node:crypto";
 function resolveTemporalEncodingKeyFromK8s(namespace) {
   const secretName = `${namespace}-temporal-encoding-key`;
   try {
-    const b64 = execFileSync28(
+    const b64 = execFileSync29(
       "kubectl",
       [
         "get",
@@ -23513,7 +23562,7 @@ var init_src4 = __esm({
 import * as fs38 from "fs";
 import * as path45 from "path";
 import { createRequire as createRequire2 } from "module";
-import { execFileSync as execFileSync29 } from "child_process";
+import { execFileSync as execFileSync30 } from "child_process";
 function resolveExtractorPath() {
   try {
     const require2 = createRequire2(import.meta.url);
@@ -23568,7 +23617,7 @@ for (const file of files) {
 process.stdout.write(JSON.stringify(results));
 `;
   try {
-    const result = execFileSync29("npx", ["tsx", "--eval", script], {
+    const result = execFileSync30("npx", ["tsx", "--eval", script], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "inherit"],
       maxBuffer: 10 * 1024 * 1024
@@ -23610,7 +23659,7 @@ for (const file of files) {
 process.stdout.write(JSON.stringify(results));
 `;
   try {
-    const result = execFileSync29("npx", ["tsx", "--eval", script], {
+    const result = execFileSync30("npx", ["tsx", "--eval", script], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "inherit"],
       maxBuffer: 10 * 1024 * 1024
@@ -23665,7 +23714,7 @@ for (const file of files) {
 process.stdout.write(JSON.stringify(results));
 `;
   try {
-    const result = execFileSync29("npx", ["tsx", "--eval", script], {
+    const result = execFileSync30("npx", ["tsx", "--eval", script], {
       encoding: "utf-8",
       stdio: ["pipe", "pipe", "inherit"],
       maxBuffer: 10 * 1024 * 1024