@myvillage/cli 1.88.0 → 1.88.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "1.88.0",
+  "version": "1.88.2",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/agent-runtime/runner.js

@@ -171,9 +171,12 @@ async function resolveMachineIdentity(opts) {
   }
 
   if (saved?.machineKey) {
-    // Re-register with the stored credential so name/metadata/version refresh.
-    const { machineId } = await register(makeClient(saved.machineKey, null), opts);
-    persistRunnerState({ ...saved, machineId, name: opts.name || saved.name, registeredAt: new Date().toISOString() });
+    // Re-register with the stored credential so metadata/version refresh. Keep
+    // the name this machine already goes by unless a new one was asked for —
+    // restarting the runner must not rename the machine out from under the user.
+    const name = opts.name || saved.name || os.hostname();
+    const { machineId } = await register(makeClient(saved.machineKey, null), { ...opts, name });
+    persistRunnerState({ ...saved, machineId, name, registeredAt: new Date().toISOString() });
     return { machineId, machineKey: saved.machineKey };
   }
 
@@ -251,6 +254,21 @@ async function reconcileOnce(ctx) {
       continue;
     }
     const epoch = lease.json.data.leaseEpoch;
+
+    // Never fork a second daemon on top of a live one. An agent started outside
+    // the fleet (Studio's local Start, or a previous CLI `agent start`) has no
+    // lease, so it reaches here with a fresh lease and an already-running
+    // process; forking again would double-run it and orphan the first daemon
+    // (the pid file is last-writer-wins). Adopt it instead.
+    if (isDaemonRunning(entry.name)) {
+      ctx.leases.set(a.agentProfileId, { name: entry.name, epoch });
+      log(
+        `adopted already-running ${entry.name} under lease (epoch ${epoch}) — started outside the fleet, so it ` +
+          `reports no fence; stop/start it from Studio to relaunch it fenced`,
+      );
+      continue;
+    }
+
     const pid = startAgent(entry.name, entry.config, ctx.machineId, epoch);
     ctx.leases.set(a.agentProfileId, { name: entry.name, epoch });
     log(`started ${entry.name} (pid ${pid}, epoch ${epoch})`);