@evomap/evolver-proxy 2.0.0-beta.6 → 2.0.0-beta.7

package/dist/lifecycle/legacyNodeId.d.ts

@@ -12,32 +12,29 @@ export interface LegacyNodeIdCandidateOptions {
  * Legacy node_id file locations, in priority order. Mirror of v1
  * `_loadPersistedNodeId`:
  *
- *  0. `<EVOMAP_DIR>/node_id` — the explicit dir the CLI recipe / ATP / proxy
+ *  0. `<EVOMAP_HOME>/node_id` — when an explicit identity home is configured, it
+ *     must precede every state-root candidate. The legacy node_secret resolver uses
+ *     the same priority, keeping both credentials on one identity in split layouts.
+ *  1. `<EVOMAP_DIR>/node_id` — the explicit dir the CLI recipe / ATP / proxy
  *     anti-abuse code write under (`recipeHomeCandidates` puts EVOMAP_DIR ahead
  *     of EVOLVER_HOME/EVOMAP_HOME). `resolveEvomapHome` never consults EVOMAP_DIR,
  *     so a deployment that pivots on it would otherwise send no node_id on hello
- *     and let the hub mint a duplicate. Probed FIRST and ADDITIVELY (the
- *     EVOLVER_HOME/EVOMAP_HOME candidates below are kept), so setting EVOMAP_DIR
- *     never hides an id that lives under one of the home overrides. Deduped.
- *  1. `<identity home>/node_id` — the override-aware home files. `identityHomeCandidates()`
- *     probes EVOMAP_HOME first (THE identity home, #555 T2 — the evox agentDir split keeps
- *     node files under `<agentDir>/evomap` while EVOLVER_HOME points at the state root) and
- *     then EVOLVER_HOME (matching v1 `getEvomapDir`), after dropping blank/relative
- *     overrides. Probing both keeps the v1 #120 lesson — the reader walks every dir a
- *     writer may have used — while the order makes a split identity dir win over the
- *     state root when both hold files.
- *  2. `~/.evomap/node_id` — the UNCONDITIONAL v1 location. v1's writer pivots on
+ *     and let the hub mint a duplicate. It remains first when EVOMAP_HOME is not
+ *     configured, preserving the existing EVOMAP_DIR-only contract. Deduped.
+ *  2. `<EVOLVER_HOME>/node_id` — the state-home compatibility candidate, kept
+ *     after the identity roots so readers still walk every dir a writer may have used.
+ *  3. `~/.evomap/node_id` — the UNCONDITIONAL v1 location. v1's writer pivots on
  *     `getEvomapDir` = `EVOLVER_HOME || ~/.evomap` and ignores EVOMAP_HOME
  *     entirely, so unless EVOLVER_HOME was set a v1 file always physically lands
  *     here. We probe it explicitly so a v2 install that sets only EVOMAP_HOME
  *     (which steers candidate 1 away from `~/.evomap`) still recovers the v1
  *     identity instead of letting the hub mint a duplicate orphan node. Deduped
  *     against candidate 1 for the common no-override case where they coincide.
- *  3. `<proxy package>/.evomap_node_id` — the install-root file the writer falls
+ *  4. `<proxy package>/.evomap_node_id` — the install-root file the writer falls
  *     back to when `~/.evomap/` isn't writable (read-only $HOME in
  *     containers / restricted CI). Kept first for parity with the old v2
  *     candidate.
- *  4. `<outer package/workspace root>/.evomap_node_id` — the v1/outer install
+ *  5. `<outer package/workspace root>/.evomap_node_id` — the v1/outer install
  *     root fallback. In v2's multi-package layout the proxy code lives below
  *     `packages/evolver-proxy`, so only checking the proxy package root misses
  *     a file written at the install/workspace root.

package/dist/lifecycle/legacyNodeId.js

@@ -19,9 +19,10 @@ function cleanAbsolutePath(value) {
 }
 // Identity homes in probe order (#555 T2): the explicit test/caller override wins outright; otherwise
 // EVOMAP_HOME (THE identity home) outranks EVOLVER_HOME (the state root) so the evox agentDir split
-// (`--evomap-home <agentDir>/evomap` + `--home <agentDir>/evolver`) reads node files from the evomap dir
-// instead of missing them and falling through to the machine-global ~/.evomap node. Both homes stay in the
-// candidate union, so single-home setups resolve exactly as before.
+// (`--evomap-home <agentDir>/evomap` + `--home <agentDir>/evolver`) reads node files from the evomap dir.
+// legacyNodeIdCandidates() splices that explicit identity home ahead of EVOMAP_DIR so node_id and
+// node_secret cannot come from different halves of the split layout. Both homes stay in the candidate union,
+// so single-home setups resolve exactly as before.
 function identityHomeCandidates(opts, fallbackHomeDir) {
     const fromOpts = cleanAbsolutePath(opts.evomapHomeDir);
     if (fromOpts !== undefined)
@@ -70,32 +71,29 @@ function installRootNodeIdCandidates(moduleDir) {
  * Legacy node_id file locations, in priority order. Mirror of v1
  * `_loadPersistedNodeId`:
  *
- *  0. `<EVOMAP_DIR>/node_id` — the explicit dir the CLI recipe / ATP / proxy
+ *  0. `<EVOMAP_HOME>/node_id` — when an explicit identity home is configured, it
+ *     must precede every state-root candidate. The legacy node_secret resolver uses
+ *     the same priority, keeping both credentials on one identity in split layouts.
+ *  1. `<EVOMAP_DIR>/node_id` — the explicit dir the CLI recipe / ATP / proxy
  *     anti-abuse code write under (`recipeHomeCandidates` puts EVOMAP_DIR ahead
  *     of EVOLVER_HOME/EVOMAP_HOME). `resolveEvomapHome` never consults EVOMAP_DIR,
  *     so a deployment that pivots on it would otherwise send no node_id on hello
- *     and let the hub mint a duplicate. Probed FIRST and ADDITIVELY (the
- *     EVOLVER_HOME/EVOMAP_HOME candidates below are kept), so setting EVOMAP_DIR
- *     never hides an id that lives under one of the home overrides. Deduped.
- *  1. `<identity home>/node_id` — the override-aware home files. `identityHomeCandidates()`
- *     probes EVOMAP_HOME first (THE identity home, #555 T2 — the evox agentDir split keeps
- *     node files under `<agentDir>/evomap` while EVOLVER_HOME points at the state root) and
- *     then EVOLVER_HOME (matching v1 `getEvomapDir`), after dropping blank/relative
- *     overrides. Probing both keeps the v1 #120 lesson — the reader walks every dir a
- *     writer may have used — while the order makes a split identity dir win over the
- *     state root when both hold files.
- *  2. `~/.evomap/node_id` — the UNCONDITIONAL v1 location. v1's writer pivots on
+ *     and let the hub mint a duplicate. It remains first when EVOMAP_HOME is not
+ *     configured, preserving the existing EVOMAP_DIR-only contract. Deduped.
+ *  2. `<EVOLVER_HOME>/node_id` — the state-home compatibility candidate, kept
+ *     after the identity roots so readers still walk every dir a writer may have used.
+ *  3. `~/.evomap/node_id` — the UNCONDITIONAL v1 location. v1's writer pivots on
  *     `getEvomapDir` = `EVOLVER_HOME || ~/.evomap` and ignores EVOMAP_HOME
  *     entirely, so unless EVOLVER_HOME was set a v1 file always physically lands
  *     here. We probe it explicitly so a v2 install that sets only EVOMAP_HOME
  *     (which steers candidate 1 away from `~/.evomap`) still recovers the v1
  *     identity instead of letting the hub mint a duplicate orphan node. Deduped
  *     against candidate 1 for the common no-override case where they coincide.
- *  3. `<proxy package>/.evomap_node_id` — the install-root file the writer falls
+ *  4. `<proxy package>/.evomap_node_id` — the install-root file the writer falls
  *     back to when `~/.evomap/` isn't writable (read-only $HOME in
  *     containers / restricted CI). Kept first for parity with the old v2
  *     candidate.
- *  4. `<outer package/workspace root>/.evomap_node_id` — the v1/outer install
+ *  5. `<outer package/workspace root>/.evomap_node_id` — the v1/outer install
  *     root fallback. In v2's multi-package layout the proxy code lives below
  *     `packages/evolver-proxy`, so only checking the proxy package root misses
  *     a file written at the install/workspace root.
@@ -110,11 +108,16 @@ export function legacyNodeIdCandidates(opts = {}) {
     const home = cleanAbsolutePath(opts.homeDir) ?? cleanAbsolutePath(homedir());
     const moduleDir = opts.moduleDir ?? _moduleDir;
     const evomapHomes = identityHomeCandidates(opts, home);
+    const identityHome = cleanAbsolutePath(opts.evomapHomeDir)
+        ?? cleanAbsolutePath(process.env['EVOMAP_HOME']);
     const evomapDir = cleanAbsolutePath(opts.evomapDir) ?? cleanAbsolutePath(process.env['EVOMAP_DIR']);
     return [
         ...new Set([
+            ...(identityHome === undefined ? [] : [join(identityHome, 'node_id')]),
             ...(evomapDir === undefined ? [] : [join(evomapDir, 'node_id')]),
-            ...evomapHomes.map((dir) => join(dir, 'node_id')),
+            ...evomapHomes
+                .filter((dir) => dir !== identityHome)
+                .map((dir) => join(dir, 'node_id')),
             ...(home === undefined ? [] : [join(home, '.evomap', 'node_id')]),
             ...installRootNodeIdCandidates(moduleDir),
         ]),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evomap/evolver-proxy",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "private": false,
   "type": "module",
   "description": "系统级 mailbox/hub 同步 daemon (Node)",
@@ -26,8 +26,8 @@
   },
   "dependencies": {
     "@aws-sdk/client-bedrock-runtime": "^3.1053.0",
-    "@evomap/evolver-adapter-public": "2.0.0-beta.6",
-    "@evomap/evolver-core": "2.0.0-beta.6"
+    "@evomap/evolver-adapter-public": "2.0.0-beta.7",
+    "@evomap/evolver-core": "2.0.0-beta.7"
   },
   "repository": {
     "type": "git",