@opennous/cli 0.18.0 → 0.18.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @opennous/cli changelog
 
+## 0.18.1
+
+### Fixed: one machine is one runner
+
+The runner named your machine by its network hostname, which on a Mac changes with the network, so
+one Mac could show up as two runners. It now uses the Mac's own name, saved once (GET-1308).
+
 ## 0.18.0
 
 ### Changed: one command sets everything up, and the runner is quiet when idle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opennous/cli",
-  "version": "0.18.0",
+  "version": "0.18.1",
   "description": "Ownable CLI — set up Ownable, connect it to your coding agent, and read the Context API from your terminal",
   "type": "module",
   "bin": {

package/src/index.js

@@ -663,13 +663,14 @@ const runnerCmd = program
     const { detectAgents, liveRun, NO_AGENT } = await import("./backfill.js");
     const { runRunner } = await import("./runner.js");
     const agent = await pickAgent(opts.agent, detectAgents, NO_AGENT);
+    const host = await runnerHost();
     const key = await runnerKey(opts);
     const api = apiClient(key);
     const service = process.env.NOUS_RUNNER_SERVICE === "1";
     const stamp = (line) => (service ? `${new Date().toISOString()} ${line}` : line);
     console.log(stamp(`Reading on your ${agent} plan. ${service ? "" : "Stop with Ctrl-C; `nous runner install` keeps it going on its own."}`.trim()));
     await runRunner({
-      agent, version, run: liveRun(), log: (l) => console.log(stamp(l)),
+      agent, host, version, run: liveRun(), log: (l) => console.log(stamp(l)),
       sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
       api: {
         poll: (body) => api.softPost("/v2/runner/poll", body),
@@ -692,7 +693,7 @@ runnerCmd
     const key = await runnerKey(opts);
     // One poll before installing, so a bad key or plan fails here and not silently in the background.
     try {
-      await apiClient(key).softPost("/v2/runner/poll", { agent, host: hostname(), version, limit: 0 });
+      await apiClient(key).softPost("/v2/runner/poll", { agent, host: await runnerHost(), version, limit: 0 });
     } catch (e) {
       console.error(`Couldn't connect: ${e.message}`);
       process.exit(1);
@@ -715,7 +716,7 @@ runnerCmd
     const { uninstallService } = await import("./runner.js");
     const removed = uninstallService();
     // The server stops waiting on this machine (GET-1307): with no runner left, your reading goes back to credits.
-    if (hasKey()) await apiClient().softDelete("/v2/runner", { host: hostname() }).catch(() => {});
+    if (hasKey()) await apiClient().softDelete("/v2/runner", { host: await runnerHost() }).catch(() => {});
     console.log(removed ? "Stopped. It won't start at login any more, and your reading is back on credits unless another machine runs it." : "No runner is installed on this machine.");
   });
 
@@ -730,6 +731,15 @@ runnerCmd
     if (s.log) console.log(`Log: ${s.log}`);
   });
 
+/** This machine's name for its runner, kept in the config so it is the same every run (GET-1308). */
+async function runnerHost() {
+  const { machineName } = await import("./runner.js");
+  const cfg = readConfig();
+  const name = machineName({ saved: cfg.runnerHost ?? null });
+  if (name !== cfg.runnerHost) writeConfig({ ...cfg, runnerHost: name });
+  return name;
+}
+
 /** The agent to read with: the one asked for, or whichever is signed in. Exits with what to do. */
 async function pickAgent(asked, detectAgents, noAgent) {
   const agents = detectAgents();

package/src/runner.js

@@ -34,6 +34,21 @@ const ERROR_BACKOFF_MS = 30_000;
 export const LABEL = "cloud.opennous.runner";
 export const RUN_COMMAND = "npx -y @opennous/cli@latest runner";
 
+/**
+ * This machine's name for Ownable (GET-1308), the same every run. `os.hostname()` on a Mac follows
+ * the network ("Mac.lan" on one, "Bennets-MacBook-Air.local" on another), which made one machine
+ * two runners. The Mac's own name (System Settings → General → About) is asked once and kept.
+ */
+export function machineName({ saved = null, os = platform(), run = spawnSync, host = hostname } = {}) {
+  if (saved) return saved;
+  if (os === "darwin") {
+    const r = run("scutil", ["--get", "ComputerName"], { encoding: "utf8" });
+    const name = r.status === 0 ? String(r.stdout).trim() : "";
+    if (name) return name;
+  }
+  return String(host()).replace(/\.(local|lan|home|localdomain)$/i, "");
+}
+
 /** What the status line says about the read in progress, or null. Pure. */
 export function readingLine(reading) {
   if (!reading) return null;