camstack 1.2.15 → 1.2.17

package/dist/cli.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import {
   runDiscover
-} from "./chunk-EA6763XQ.js";
-import "./chunk-K3NQKI34.js";
+} from "./chunk-BQIVUGZ6.js";
+import "./chunk-LMMQX4CK.js";
 
 // src/cli.ts
 import { createRequire } from "module";
@@ -15,7 +15,9 @@ import { parseArgs as parseArgs7 } from "util";
 import { parseArgs } from "util";
 function buildServeEnv(opts) {
   const env = {
-    CAMSTACK_MODE: "hub"
+    // `CAMSTACK_ROLE`, not `CAMSTACK_MODE` — see agent.ts. This one worked
+    // only because an empty role DEFAULTS to hub, i.e. by accident.
+    CAMSTACK_ROLE: "hub"
   };
   if (opts.port) env.PORT = opts.port;
   if (opts.data) env.CAMSTACK_DATA = opts.data;
@@ -36,7 +38,7 @@ async function runServe(args) {
     ...typeof values.data === "string" ? { data: values.data } : {}
   };
   Object.assign(process.env, buildServeEnv(opts));
-  await import("@camstack/server/main.js");
+  await import("./launcher-6P52TSCL.js");
 }
 
 // src/commands/agent.ts
@@ -46,7 +48,11 @@ function buildAgentEnv(opts) {
   const hubPort = opts.port ?? "4443";
   const agentName = opts.name ?? `${os.hostname()}-${os.arch()}`;
   return {
-    CAMSTACK_MODE: "agent",
+    // `CAMSTACK_ROLE`, not `CAMSTACK_MODE`. Nothing in server/backend has ever
+    // read `CAMSTACK_MODE` — the role switch is `resolveNodeRole`
+    // (server/backend/src/node-role.ts), which returns 'hub' for an EMPTY
+    // value. So `camstack agent` set a variable no one reads and booted a HUB.
+    CAMSTACK_ROLE: "agent",
     CAMSTACK_HUB_URL: `ws://${opts.hub}:${hubPort}/agent`,
     CAMSTACK_HUB_TOKEN: opts.token,
     CAMSTACK_AGENT_NAME: agentName
@@ -77,7 +83,7 @@ async function runAgent(args) {
     ...typeof values.port === "string" ? { port: values.port } : {}
   };
   Object.assign(process.env, buildAgentEnv(opts));
-  await import("@camstack/server/main.js");
+  await import("./launcher-6P52TSCL.js");
 }
 
 // src/commands/setup.ts
@@ -238,9 +244,39 @@ function toDeployResult(value) {
     target: typeof value["target"] === "string" ? value["target"] : void 0,
     addonId: typeof value["addonId"] === "string" ? value["addonId"] : void 0,
     capabilities: Array.isArray(value["capabilities"]) ? value["capabilities"].filter((c) => typeof c === "string") : void 0,
+    reloaded: Array.isArray(value["reloaded"]) ? value["reloaded"].filter((c) => typeof c === "string") : void 0,
+    verifiedSha256: typeof value["verifiedSha256"] === "string" ? value["verifiedSha256"] : void 0,
     error: typeof value["error"] === "string" ? value["error"] : void 0
   };
 }
+function checkDeployTarget(result, requestedNodeId) {
+  const actual = result.target;
+  if (actual === void 0) return null;
+  const expected = requestedNodeId ?? "hub";
+  if (actual === expected) return null;
+  return `the hub installed this on "${actual}", NOT on "${expected}" \u2014 the target was ignored. Nothing was deployed to the node you named.`;
+}
+function describeDeployOutcome(result, isAgentTarget) {
+  const id = result.packageName ?? result.addonId ?? "?";
+  const version = result.version ? `@${result.version}` : "";
+  const reloaded = result.reloaded;
+  const suffix = reloaded === void 0 ? "" : ` (reloaded: ${reloaded.join(", ") || "none"})`;
+  const detail = `${id}${version}${suffix}`;
+  if (!isAgentTarget) return { detail, warning: null };
+  if (reloaded === void 0) {
+    return {
+      detail,
+      warning: "node did not report what it reloaded \u2014 its hub runtime predates deploy verification, so nothing confirms the new code is running"
+    };
+  }
+  if (reloaded.length === 0) {
+    return {
+      detail,
+      warning: "bundle landed but the node reloaded NOTHING \u2014 it is probably still running the previous code. Check the node, or restart the addon."
+    };
+  }
+  return { detail, warning: null };
+}
 function toPackFilenames(raw) {
   try {
     const parsed = JSON.parse(raw);
@@ -278,13 +314,13 @@ async function resolveAddonPathInteractive(arg) {
   }
   const cwdAbs = path2.resolve(".");
   if (fs2.existsSync(path2.join(cwdAbs, "package.json"))) {
-    const { discoverAddonsInCwd: discoverAddonsInCwd2 } = await import("./discover-addons-MHWUAAMX.js");
+    const { discoverAddonsInCwd: discoverAddonsInCwd2 } = await import("./discover-addons-3N32LTH7.js");
     const direct = discoverAddonsInCwd2(cwdAbs, 0);
     if (direct.length > 0 && direct[0].path === cwdAbs) {
       return cwdAbs;
     }
   }
-  const { discoverAddonsInCwd } = await import("./discover-addons-MHWUAAMX.js");
+  const { discoverAddonsInCwd } = await import("./discover-addons-3N32LTH7.js");
   const candidates = discoverAddonsInCwd(cwdAbs, 5);
   if (candidates.length === 0) {
     throw new Error(
@@ -376,7 +412,7 @@ function packAddon(addonDir) {
   };
 }
 async function fetchOnlineAgents(serverUrl, token) {
-  const url = `${serverUrl}/trpc/nodes.topology?input=${encodeURIComponent('{"json":null}')}`;
+  const url = `${serverUrl}/trpc/nodes.topology?input=${encodeURIComponent('{"json":{}}')}`;
   const res = await hubRequest(url, {
     headers: { Authorization: `Bearer ${token}` }
   });
@@ -386,7 +422,15 @@ async function fetchOnlineAgents(serverUrl, token) {
     );
   }
   const body = await res.json();
-  const nodes = body.result?.data?.json ?? [];
+  if (body.error) {
+    throw new Error(`nodes.topology failed: ${body.error.json?.message ?? "unknown error"}`);
+  }
+  const nodes = body.result?.data?.json;
+  if (!Array.isArray(nodes)) {
+    throw new Error(
+      "nodes.topology returned no node list \u2014 refusing to assume the cluster is empty"
+    );
+  }
   return nodes.filter((n) => n.isOnline && !n.isHub);
 }
 async function uploadToTarget(args) {
@@ -394,13 +438,7 @@ async function uploadToTarget(args) {
   const fileBuffer = fs2.readFileSync(tgzPath);
   const boundary = `----camstackcli${randomBytes(16).toString("hex")}`;
   const CRLF = "\r\n";
-  const parts = [
-    Buffer.from(
-      `--${boundary}${CRLF}Content-Disposition: form-data; name="file"; filename="${path2.basename(tgzPath)}"${CRLF}Content-Type: application/gzip${CRLF}${CRLF}`
-    ),
-    fileBuffer,
-    Buffer.from(CRLF)
-  ];
+  const parts = [];
   const appendField = (name, value) => {
     parts.push(
       Buffer.from(
@@ -410,6 +448,13 @@ async function uploadToTarget(args) {
   };
   if (nodeId) appendField("nodeId", nodeId);
   if (addonId) appendField("addonId", addonId);
+  parts.push(
+    Buffer.from(
+      `--${boundary}${CRLF}Content-Disposition: form-data; name="file"; filename="${path2.basename(tgzPath)}"${CRLF}Content-Type: application/gzip${CRLF}${CRLF}`
+    ),
+    fileBuffer,
+    Buffer.from(CRLF)
+  );
   parts.push(Buffer.from(`--${boundary}--${CRLF}`));
   const body = Buffer.concat(parts);
   const response = await hubRequest(`${serverUrl}/api/addons/upload`, {
@@ -478,8 +523,8 @@ async function deployAddon(addonPath, opts) {
         }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        console.error(
-          `[camstack] --cluster: failed to enumerate agents \u2014 falling back to hub only (${msg})`
+        throw new Error(
+          `--cluster: cannot enumerate agents, refusing a partial cluster deploy (${msg}). Deploy per node with -n <nodeId> if this is intentional.`
         );
       }
     } else {
@@ -503,11 +548,14 @@ async function deployAddon(addonPath, opts) {
           )
         }
       );
-      if (result.success) {
-        const id = result.packageName ?? result.addonId ?? "?";
-        const ver = result.version ? `@${result.version}` : "";
-        const detail = `${id}${ver}`;
+      const misrouted = result.success ? checkDeployTarget(result, t.nodeId) : null;
+      if (misrouted) {
+        console.error(`[camstack]   \u2717 ${t.label}: ${misrouted}`);
+        outcomes.push({ target: t.label, ok: false, detail: misrouted });
+      } else if (result.success) {
+        const { detail, warning } = describeDeployOutcome(result, t.nodeId !== void 0);
         console.log(`[camstack]   \u2713 ${t.label}: ${detail}`);
+        if (warning) console.warn(`[camstack]   \u26A0 ${t.label}: ${warning}`);
         outcomes.push({ target: t.label, ok: true, detail });
       } else {
         const detail = result.error ?? "unknown";
@@ -1079,7 +1127,7 @@ function isUnknown(_value) {
   return true;
 }
 async function resolveServerInteractive(presetNamespace) {
-  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-UMBUCPOL.js");
+  const { discoverNodes, resolveHubFromDiscovered, filterHubNodes, DEFAULT_HUB_HTTPS_PORT } = await import("./discover-I7QQOQNW.js");
   if (presetNamespace) {
     const spinner4 = clack.spinner();
     spinner4.start(`Discovering hub on LAN (namespace "${presetNamespace}")`);

package/dist/{discover-UMBUCPOL.js → discover-I7QQOQNW.js}

@@ -5,8 +5,8 @@ import {
   filterHubNodes,
   resolveHubFromDiscovered,
   runDiscover
-} from "./chunk-EA6763XQ.js";
-import "./chunk-K3NQKI34.js";
+} from "./chunk-BQIVUGZ6.js";
+import "./chunk-LMMQX4CK.js";
 export {
   DEFAULT_HUB_HTTPS_PORT,
   discoverNodes,

package/dist/{discover-addons-MHWUAAMX.js → discover-addons-3N32LTH7.js}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import "./chunk-K3NQKI34.js";
+import "./chunk-LMMQX4CK.js";
 
 // src/commands/discover-addons.ts
 import * as fs from "fs";