@appchy/jarvis 0.1.31 → 0.1.33

package/bin/jarvis-dev.mjs

@@ -0,0 +1,40 @@
+#!/usr/bin/env node
+
+/**
+ * Jarvis CLI — Dev Launcher
+ *
+ * Always runs `tsx src/bin.ts` against the source tree so the dev binary
+ * can coexist on PATH with the prod `jarvis` (which runs `dist/bin.js`).
+ *
+ * Errors out cleanly if the source tree isn't present (e.g. someone
+ * installed the published prod package and got `jarvis-dev` along for
+ * the ride — there's nothing for it to run).
+ */
+
+import { fileURLToPath } from "url";
+import { dirname, join } from "path";
+import { existsSync } from "fs";
+import { execFileSync } from "child_process";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const root = join(__dirname, "..");
+const srcEntry = join(root, "src", "bin.ts");
+const tsxBin = join(root, "node_modules", ".bin", "tsx");
+
+if (!existsSync(srcEntry)) {
+  console.error(
+    "jarvis-dev requires the source tree (apps/cli/src/bin.ts).\n" +
+    "Run it from a checkout of the repo, or use `jarvis` (prod) instead.",
+  );
+  process.exit(1);
+}
+
+try {
+  execFileSync(tsxBin, [srcEntry, ...process.argv.slice(2)], {
+    stdio: "inherit",
+    cwd: process.cwd(),
+    env: { ...process.env, NODE_NO_WARNINGS: "1" },
+  });
+} catch (err) {
+  process.exit(err.status ?? 1);
+}

package/bin/jarvis.mjs

@@ -1,10 +1,17 @@
 #!/usr/bin/env node
 
 /**
- * Jarvis CLI Launcher
+ * Jarvis CLI — Prod Launcher
  *
- * Dev mode:  src/bin.ts exists → run via tsx (TypeScript, hot reload)
- * Prod mode: dist/bin.js exists → run directly with node (bundled, no tsx)
+ * Always runs the bundled `dist/bin.js` (production: hits jarvis.appchy.com).
+ * For source-tree development, use `jarvis-dev` instead — it skips the
+ * dist/ check and always runs `tsx src/bin.ts` against the live source.
+ *
+ * The previous version of this launcher auto-detected dev vs prod based on
+ * whether `src/bin.ts` existed. That meant invoking `jarvis` from a source
+ * checkout silently flipped to dev mode against localhost — not what users
+ * who installed `@appchy/jarvis` globally expect. The split bins
+ * (`jarvis` / `jarvis-dev`) make the choice explicit and irreversible.
  */
 
 import { fileURLToPath } from "url";
@@ -12,27 +19,18 @@ import { dirname, join } from "path";
 import { existsSync } from "fs";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const root = join(__dirname, "..");
-const srcEntry = join(root, "src", "bin.ts");
-const distEntry = join(root, "dist", "bin.js");
+const distEntry = join(__dirname, "..", "dist", "bin.js");
 
-if (existsSync(srcEntry)) {
-  // Dev: use tsx to run TypeScript source directly
-  const { execFileSync } = await import("child_process");
-  const tsxBin = join(root, "node_modules", ".bin", "tsx");
-  try {
-    execFileSync(tsxBin, [srcEntry, ...process.argv.slice(2)], {
-      stdio: "inherit",
-      cwd: process.cwd(),
-      env: { ...process.env, NODE_NO_WARNINGS: "1" },
-    });
-  } catch (err) {
-    process.exit(err.status ?? 1);
+if (!existsSync(distEntry)) {
+  const isSourceCheckout = existsSync(join(__dirname, "..", "src", "bin.ts"));
+  console.error("Error: dist/bin.js not found.");
+  if (isSourceCheckout) {
+    console.error("  This is a source checkout. Use `jarvis-dev` for dev work,");
+    console.error("  or run `pnpm -C apps/cli build` to produce a prod bundle.");
+  } else {
+    console.error("  The package may be corrupted. Reinstall with `pnpm i -g @appchy/jarvis`.");
   }
-} else if (existsSync(distEntry)) {
-  // Prod: import bundled JS (no tsx needed)
-  await import(distEntry);
-} else {
-  console.error("Error: No entry point found. Run `pnpm build` first.");
   process.exit(1);
 }
+
+await import(distEntry);

package/dist/bin.js

@@ -1,3 +1,4 @@
+import { createRequire as __cr } from 'module'; const require = __cr(import.meta.url);
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -29029,13 +29030,18 @@ import { fileURLToPath } from "url";
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = path.dirname(__filename);
 function isDev() {
-  try {
-    const envFile = path.join(__dirname, "..", "env.json");
-    const data = JSON.parse(fs.readFileSync(envFile, "utf-8"));
-    return data.env === "development";
-  } catch {
-    return false;
+  const candidates = [
+    path.join(__dirname, "env.json"),
+    path.join(__dirname, "..", "env.json")
+  ];
+  for (const envFile of candidates) {
+    try {
+      const data = JSON.parse(fs.readFileSync(envFile, "utf-8"));
+      return data.env === "development";
+    } catch {
+    }
   }
+  return false;
 }
 var PROD_APP_URL = "https://jarvis.appchy.com";
 var DEV_APP_URL = "http://localhost:3000";
@@ -29586,9 +29592,22 @@ async function runInit(options = {}) {
   try {
     console.log("\n  Jarvis local agent setup");
     console.log("  \u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n");
-    console.log("  \u25B8 Pairing this machine");
-    const create = await fetch(`${appUrl}/api/v1/envs/pair`, { method: "POST" });
-    if (!create.ok) throw new Error(`Failed to start pairing (${create.status})`);
+    const mode = isDev() ? "dev" : "prod";
+    console.log(`  \u25B8 Pairing this machine  [${mode} \u2192 ${appUrl}]`);
+    const pairUrl = `${appUrl}/api/v1/envs/pair`;
+    let create;
+    try {
+      create = await fetch(pairUrl, { method: "POST" });
+    } catch (err) {
+      const cause = err instanceof Error ? err.cause : void 0;
+      const errCode = cause?.code ? ` (${cause.code})` : "";
+      const hint = mode === "dev" ? "  Is the local web running on :3000? Try `pnpm dev` from the repo root." : "  Check connectivity to https://jarvis.appchy.com.";
+      throw new Error(
+        `Pair request failed${errCode}: ${pairUrl}
+${hint}`
+      );
+    }
+    if (!create.ok) throw new Error(`Failed to start pairing at ${pairUrl} (${create.status})`);
     const body = await create.json();
     const code = body.code;
     const url2 = absolutizeUrl(body.url, code, appUrl);