@moxt-ai/mobius 0.0.315 → 0.0.317

package/dist/agent/discovery/agent-discovery-context.d.ts

@@ -1,5 +1,7 @@
 export interface LocalAgentDiscoveryContext {
     readonly architecture?: NodeJS.Architecture;
+    /** The Runtime's local data directory, where Agents that Mobius configures keep their Mobius-owned state. */
+    readonly dataDirectory: string;
     readonly defaultWorkspace: string;
     readonly environment: Readonly<NodeJS.ProcessEnv>;
     readonly platform?: NodeJS.Platform;

package/dist/agent/discovery/agent-discovery-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-discovery-context.d.ts","sourceRoot":"","sources":["../../../src/agent/discovery/agent-discovery-context.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IAC5C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAChC"}
+{"version":3,"file":"agent-discovery-context.d.ts","sourceRoot":"","sources":["../../../src/agent/discovery/agent-discovery-context.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,0BAA0B;IACvC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IAC5C,6GAA6G;IAC7G,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;CAChC"}

package/dist/agent/specification/vendors/pi-agent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pi-agent.d.ts","sourceRoot":"","sources":["../../../../src/agent/specification/vendors/pi-agent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAE1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAG7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAE7F,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAI3E,qBAAa,oBAAqB,SAAQ,8BAA8B;IACpE,SAAkB,2BAA2B,SAAkC;IAC/E,QAAQ,CAAC,eAAe,QAAQ;IAChC,QAAQ,CAAC,cAAc,EAAE,2BAA2B,CAA2C;IAG/F,SAAkB,uBAAuB,WAC7B,kBAAkB,WACjB,0BAA0B,KACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAgB1C;IACF,QAAQ,CAAC,EAAE,QAAQ;IACnB,QAAQ,CAAC,KAAK,QAAQ;IACtB,SAAkB,4BAA4B,YAAY;IAC1D,SAAkB,yBAAyB,WAAW;IACtD,SAAkB,qBAAqB,QAAO,MAAM,CAAS;IAC7D,cAEC;IAED,SAAkB,SAAS,eACX,gBAAgB,eACf,kBAAkB,oBACb,MAAM,UAChB,WAAW,KACpB,OAAO,CAAC,IAAI,CAAC,CA4Bd;CACL"}
+{"version":3,"file":"pi-agent.d.ts","sourceRoot":"","sources":["../../../../src/agent/specification/vendors/pi-agent.ts"],"names":[],"mappings":"AAEA,OAAO,EAEH,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EAE1B,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,2CAA2C,CAAC;AAE7F,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,4CAA4C,CAAC;AAE7F,OAAO,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAI3E,qBAAa,oBAAqB,SAAQ,8BAA8B;IACpE,SAAkB,2BAA2B,SAAkC;IAC/E,QAAQ,CAAC,eAAe,QAAQ;IAChC,QAAQ,CAAC,cAAc,EAAE,2BAA2B,CAA2C;IAG/F,SAAkB,uBAAuB,WAC7B,kBAAkB,WACjB,0BAA0B,KACpC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAU1C;IACF,QAAQ,CAAC,EAAE,QAAQ;IACnB,QAAQ,CAAC,KAAK,QAAQ;IACtB,SAAkB,4BAA4B,YAAY;IAC1D,SAAkB,yBAAyB,WAAW;IACtD,SAAkB,qBAAqB,QAAO,MAAM,CAAS;IAC7D,cAEC;IAED,SAAkB,SAAS,eACX,gBAAgB,eACf,kBAAkB,oBACb,MAAM,UAChB,WAAW,KACpB,OAAO,CAAC,IAAI,CAAC,CA4Bd;CACL"}

package/dist/agent/specification/vendors/pi-agent.js

@@ -2,7 +2,6 @@ import { createHash } from "node:crypto";
 import { join } from "node:path";
 import { methods, } from "@agentclientprotocol/sdk";
 import { PiAcpEndpoint } from "../../../acp/harness/pi/endpoint.js";
-import { readStateDirectory } from "../../../storage/state-directory.js";
 import { AgentProbeError } from "../../discovery/agent-probe-error.js";
 import { InProcessAcpAgentSpecification } from "../agent-specification.js";
 const ACP_PROBE_TIMEOUT_MILLISECONDS = 30_000;
@@ -17,7 +16,7 @@ export class PiAgentSpecification extends InProcessAcpAgentSpecification {
         // workspaces therefore exceed filesystem name limits before Mobius can run a readiness turn.
         // Keep persistence, but derive a bounded, stable directory from the resolved workspace.
         const workspaceHash = createHash("sha256").update(context.defaultWorkspace).digest("hex").slice(0, 24);
-        const sessionDirectory = join(readStateDirectory(context.environment), "agents", "pi", "sessions", workspaceHash);
+        const sessionDirectory = join(context.dataDirectory, "agents", "pi", "sessions", workspaceHash);
         return Object.freeze({
             PI_ACP_ENABLE_EMBEDDED_CONTEXT: "true",
             MOBIUS_PI_SESSION_DIR: sessionDirectory,

package/dist/agent/specification/vendors/pi-agent.js.map

@@ -1 +1 @@
-{"version":3,"file":"pi-agent.js","sourceRoot":"","sources":["../../../../src/agent/specification/vendors/pi-agent.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pi-agent.js","sourceRoot":"","sources":["../../../../src/agent/specification/vendors/pi-agent.ts"],"names":[],"mappings":"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"}

package/dist/cli/handler/agents/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/handler/agents/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUnD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CA4BjF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cli/handler/agents/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAUnD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,GAAG,IAAI,CA6BjF"}

package/dist/cli/handler/agents/index.js

@@ -15,10 +15,11 @@ export function registerAgentsHandler(program, context) {
         .action(async (options) => {
         const installation = await openMobiusCliInstallation(context.shutdownSignal, process.env);
         const localContext = new RuntimeLocalContext(installation.stateDirectory, process.env);
-        const defaultWorkspace = loadDefaultWorkspace(localContext.environment);
+        const defaultWorkspace = loadDefaultWorkspace(localContext.stateDirectory, localContext.environment);
         await ensurePrivateDirectory(defaultWorkspace);
         const inventory = await discoverLocalAgentInventory({
             defaultWorkspace,
+            dataDirectory: localContext.stateDirectory,
             environment: localContext.environment,
             signal: context.shutdownSignal,
         });

package/dist/cli/handler/agents/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/handler/agents/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAQ7F,MAAM,UAAU,qBAAqB,CAAC,OAAgB,EAAE,OAAmB;IACvE,OAAO;SACF,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,sDAAsD,CAAC;SACnE,MAAM,CAAC,QAAQ,EAAE,mCAAmC,CAAC;SACrD,SAAS,CAAC,WAAW,CAAC,oCAAoC,EAAE,8CAA8C,CAAC,CAAC;SAC5G,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;SACzD,MAAM,CAAC,KAAK,EAAE,OAAqB,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1F,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACvF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QACxE,MAAM,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC;YAChD,gBAAgB;YAChB,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,OAAO,CAAC,cAAc;SACjC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,qBAAqB,CACvB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAC3B,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,IAAI,EACxB,OAAO,CAAC,cAAc,CACzB,CAAC;YACF,OAAO;QACX,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;IAC7G,CAAC,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/handler/agents/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,2BAA2B,EAAE,MAAM,mDAAmD,CAAC;AAChG,OAAO,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAC;AAC1F,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAQ7F,MAAM,UAAU,qBAAqB,CAAC,OAAgB,EAAE,OAAmB;IACvE,OAAO;SACF,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,sDAAsD,CAAC;SACnE,MAAM,CAAC,QAAQ,EAAE,mCAAmC,CAAC;SACrD,SAAS,CAAC,WAAW,CAAC,oCAAoC,EAAE,8CAA8C,CAAC,CAAC;SAC5G,MAAM,CAAC,WAAW,EAAE,oCAAoC,CAAC;SACzD,MAAM,CAAC,KAAK,EAAE,OAAqB,EAAE,EAAE;QACpC,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1F,MAAM,YAAY,GAAG,IAAI,mBAAmB,CAAC,YAAY,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACvF,MAAM,gBAAgB,GAAG,oBAAoB,CAAC,YAAY,CAAC,cAAc,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;QACrG,MAAM,sBAAsB,CAAC,gBAAgB,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,MAAM,2BAA2B,CAAC;YAChD,gBAAgB;YAChB,aAAa,EAAE,YAAY,CAAC,cAAc;YAC1C,WAAW,EAAE,YAAY,CAAC,WAAW;YACrC,MAAM,EAAE,OAAO,CAAC,cAAc;SACjC,CAAC,CAAC;QACH,IAAI,OAAO,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;YACnC,MAAM,qBAAqB,CACvB,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAC3B,SAAS,EACT,OAAO,CAAC,OAAO,KAAK,IAAI,EACxB,OAAO,CAAC,cAAc,CACzB,CAAC;YACF,OAAO;QACX,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,KAAK,IAAI,EAAE,OAAO,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC;IAC7G,CAAC,CAAC,CAAC;AACX,CAAC"}

package/dist/cli.js

@@ -2086,7 +2086,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@moxt-ai/mobius",
-      version: "0.0.315",
+      version: "0.0.317",
       description: "Mobius CLI for pairing and running local AI agent services.",
       type: "module",
       bin: {
@@ -5615,12 +5615,31 @@ var init_node_error = __esm({
   }
 });
 
+// src/storage/state-root-layout.ts
+var STATE_ROOT_LAYOUT, STATE_ROOT_ENTRY_NAMES;
+var init_state_root_layout = __esm({
+  "src/storage/state-root-layout.ts"() {
+    "use strict";
+    STATE_ROOT_LAYOUT = Object.freeze({
+      /** Names the version whose data is current. */
+      currentData: "current-data.txt",
+      /** Applications' installations: `installations/<application>/<installation>`. */
+      installations: "installations",
+      /** Managed CLI releases: `npm/<version>`. */
+      releases: "npm",
+      /** Each CLI version's data: `versions/<version>`. */
+      versions: "versions"
+    });
+    STATE_ROOT_ENTRY_NAMES = new Set(Object.values(STATE_ROOT_LAYOUT));
+  }
+});
+
 // src/storage/installation/installation-files.ts
 import { createHash, randomUUID } from "node:crypto";
 import { mkdir, open, readdir, rename, unlink, writeFile } from "node:fs/promises";
 import { dirname, join } from "node:path";
 function applicationDirectory(root, applicationId) {
-  return join(root, "installations", applicationId);
+  return join(root, STATE_ROOT_LAYOUT.installations, applicationId);
 }
 function installationPointerPath(applicationDirectory2) {
   return join(applicationDirectory2, "current.json");
@@ -5683,6 +5702,7 @@ var init_installation_files = __esm({
   "src/storage/installation/installation-files.ts"() {
     "use strict";
     init_node_error();
+    init_state_root_layout();
     MAXIMUM_FILE_BYTES = 16 * 1024;
   }
 });
@@ -5715,7 +5735,7 @@ async function exists(path8) {
 async function owningRoot(directory) {
   const application = dirname2(directory);
   const installations = dirname2(application);
-  if (basename(installations) !== "installations") {
+  if (basename(installations) !== STATE_ROOT_LAYOUT.installations) {
     return null;
   }
   let pointer;
@@ -5728,11 +5748,11 @@ async function owningRoot(directory) {
     return null;
   }
   const container = dirname2(installations);
-  return basename(dirname2(container)) === "versions" ? dirname2(dirname2(container)) : container;
+  return basename(dirname2(container)) === STATE_ROOT_LAYOUT.versions ? dirname2(dirname2(container)) : container;
 }
 async function validateStateRoot(environment) {
   const directory = readStateDirectory(environment);
-  if (await exists(join3(directory, "current-data.txt")) || await exists(join3(directory, "versions"))) {
+  if (await exists(join3(directory, STATE_ROOT_LAYOUT.currentData)) || await exists(join3(directory, STATE_ROOT_LAYOUT.versions))) {
     return;
   }
   const root = await owningRoot(directory);
@@ -5746,6 +5766,7 @@ var init_state_root = __esm({
     "use strict";
     init_installation_files();
     init_state_directory();
+    init_state_root_layout();
     StateRootError = class extends Error {
       code = "state_root_is_installation_data";
       owningRoot;
@@ -42773,8 +42794,8 @@ function inputPath(context, key) {
   return plainString(context.input[key]);
 }
 function isInside(directory, candidate) {
-  const relative6 = path2.relative(path2.resolve(directory), path2.resolve(candidate));
-  return relative6 === "" || !relative6.startsWith(`..${path2.sep}`) && relative6 !== "..";
+  const relative7 = path2.relative(path2.resolve(directory), path2.resolve(candidate));
+  return relative7 === "" || !relative7.startsWith(`..${path2.sep}`) && relative7 !== "..";
 }
 function hasSessionAllowRuleFor(changeSet, toolName) {
   return !!changeSet?.updates.some((update) => update.type === "addRules" && update.destination === "session" && update.behavior === "allow" && update.rules.some((rule) => rule.toolName === toolName));
@@ -80707,7 +80728,6 @@ var init_pi_agent = __esm({
   "src/agent/specification/vendors/pi-agent.ts"() {
     "use strict";
     init_endpoint2();
-    init_state_directory();
     init_agent_probe_error();
     init_agent_specification();
     ACP_PROBE_TIMEOUT_MILLISECONDS2 = 3e4;
@@ -80719,13 +80739,7 @@ var init_pi_agent = __esm({
       // keeps the adapter's opt-in capability flag enabled for every launch it owns.
       createLaunchEnvironment = async (_agent, context) => {
         const workspaceHash = createHash3("sha256").update(context.defaultWorkspace).digest("hex").slice(0, 24);
-        const sessionDirectory = join21(
-          readStateDirectory(context.environment),
-          "agents",
-          "pi",
-          "sessions",
-          workspaceHash
-        );
+        const sessionDirectory = join21(context.dataDirectory, "agents", "pi", "sessions", workspaceHash);
         return Object.freeze({
           PI_ACP_ENABLE_EMBEDDED_CONTEXT: "true",
           MOBIUS_PI_SESSION_DIR: sessionDirectory
@@ -90686,9 +90700,9 @@ var init_catalog2 = __esm({
 
 // src/runtime/config.ts
 import { join as join24, resolve as resolve14 } from "node:path";
-function loadDefaultWorkspace(environment = process.env) {
+function loadDefaultWorkspace(dataDirectory, environment = process.env) {
   const { MOBIUS_DEFAULT_WORKSPACE: configuredWorkspace } = environment;
-  return configuredWorkspace ?? join24(readStateDirectory(environment), "workspace");
+  return configuredWorkspace ?? join24(dataDirectory, "workspace");
 }
 function withRuntimeEnvironment(agent, environment) {
   const launchEnvironment = {};
@@ -90728,7 +90742,7 @@ var init_config = __esm({
       stateDirectory;
       constructor(stateDirectory, environment = process.env) {
         this.stateDirectory = resolve14(stateDirectory);
-        this.environment = Object.freeze({ ...environment, MOBIUS_STATE_DIRECTORY: this.stateDirectory });
+        this.environment = Object.freeze({ ...environment });
       }
     };
     RuntimeReconnectTarget = class {
@@ -91322,9 +91336,9 @@ var init_runtime_installation_store = __esm({
 // src/storage/daemon/version-data.ts
 import { randomUUID as randomUUID11 } from "node:crypto";
 import { cp as cp2, lstat as lstat4, mkdtemp, readFile as readFile7, rename as rename4, rm as rm3, writeFile as writeFile2 } from "node:fs/promises";
-import { join as join25 } from "node:path";
+import { join as join25, relative as relative2, sep as sep5 } from "node:path";
 async function readCurrentDataVersion(root, signal) {
-  const pointer = join25(root, "current-data.txt");
+  const pointer = join25(root, STATE_ROOT_LAYOUT.currentData);
   try {
     await validateLocalPath(pointer, false, true, signal);
     const value = (await readFile7(pointer, { encoding: "utf8", signal })).trim();
@@ -91341,7 +91355,7 @@ async function readCurrentDataVersion(root, signal) {
 }
 async function versionDataExists(root, version2, signal) {
   try {
-    await validateLocalPath(join25(root, "versions", version2), true, true, signal);
+    await validateLocalPath(join25(root, STATE_ROOT_LAYOUT.versions, version2), true, true, signal);
     return true;
   } catch (cause) {
     if (!isNodeError(cause, "ENOENT")) {
@@ -91350,8 +91364,12 @@ async function versionDataExists(root, version2, signal) {
     return false;
   }
 }
+function nestedRootEntry(segments) {
+  return segments.length >= 4 && segments[0] === STATE_ROOT_LAYOUT.installations && STATE_ROOT_ENTRY_NAMES.has(segments[3] ?? "");
+}
 async function copyVersionData(root, sourceVersion, targetVersion, signal) {
-  const versions = join25(root, "versions");
+  const leftBehind = [];
+  const versions = join25(root, STATE_ROOT_LAYOUT.versions);
   const source = join25(versions, sourceVersion);
   const target = join25(versions, targetVersion);
   await validateLocalPath(root, true, true, signal);
@@ -91363,6 +91381,13 @@ async function copyVersionData(root, sourceVersion, targetVersion, signal) {
       recursive: true,
       filter: async (path8) => {
         signal.throwIfAborted();
+        const segments = relative2(source, path8).split(sep5);
+        if (nestedRootEntry(segments)) {
+          if (segments.length === 4) {
+            leftBehind.push(segments.join("/"));
+          }
+          return false;
+        }
         if ((await lstat4(path8)).isSymbolicLink()) {
           throw new DataInheritanceError("The inherited data contains a symbolic link");
         }
@@ -91378,19 +91403,20 @@ async function copyVersionData(root, sourceVersion, targetVersion, signal) {
       }
       await validateLocalPath(target, true, true, signal);
     }
+    return leftBehind;
   } finally {
     await rm3(staging, { recursive: true, force: true });
   }
 }
 async function writeCurrentDataVersion(root, version2, signal) {
   await validateLocalPath(root, true, true, signal);
-  await validateLocalPath(join25(root, "versions", version2), true, true, signal);
+  await validateLocalPath(join25(root, STATE_ROOT_LAYOUT.versions, version2), true, true, signal);
   const temporary = join25(root, `.current-data-${randomUUID11()}.txt`);
   try {
     await writeFile2(temporary, `versions/${version2}
 `, { mode: 384, flag: "wx", signal });
     signal.throwIfAborted();
-    await rename4(temporary, join25(root, "current-data.txt"));
+    await rename4(temporary, join25(root, STATE_ROOT_LAYOUT.currentData));
   } finally {
     await rm3(temporary, { force: true });
   }
@@ -91402,6 +91428,7 @@ var init_version_data = __esm({
     init_protocol();
     init_private_path();
     init_node_error();
+    init_state_root_layout();
     DataInheritanceError = class extends Error {
       code = "data_inheritance_failed";
     };
@@ -91613,7 +91640,13 @@ async function prepareVersionData(version2, signal, environment = process.env, f
   if (previous === null) {
     return;
   }
-  await copyVersionData(root, runtimeUpgradeVersionSchema.parse(previous), targetVersion, signal);
+  const leftBehind = await copyVersionData(root, runtimeUpgradeVersionSchema.parse(previous), targetVersion, signal);
+  for (const entry of leftBehind) {
+    process.stderr.write(
+      `Mobius did not carry ${entry} into version ${targetVersion}: an earlier Mobius ran with that installation as its state root.
+`
+    );
+  }
 }
 async function recordCurrentData(version2, signal) {
   await writeCurrentDataVersion(readStateDirectory(), runtimeUpgradeVersionSchema.parse(version2), signal);
@@ -91818,6 +91851,7 @@ function buildPairedRuntime(installation, connection, defaultWorkspace, inventor
     createCatalogAgentResolver(
       (refreshSignal) => discoverLocalAgentInventory({
         defaultWorkspace,
+        dataDirectory: localContext.stateDirectory,
         environment: localContext.environment,
         signal: refreshSignal
       }),
@@ -91826,6 +91860,7 @@ function buildPairedRuntime(installation, connection, defaultWorkspace, inventor
     ),
     (refreshSignal) => discoverLocalAgentInventory({
       defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
       environment: localContext.environment,
       signal: refreshSignal
     }).then((inventory2) => inventory2.readyAgents())
@@ -91842,6 +91877,7 @@ async function pairRuntime(installation, options, signal, environment) {
   const defaultWorkspace = await resolveDefaultWorkspace(options.workspace);
   const inventory = await discoverLocalAgentInventory({
     defaultWorkspace,
+    dataDirectory: localContext.stateDirectory,
     environment: localContext.environment,
     signal
   });
@@ -91865,6 +91901,7 @@ async function resumeRuntimeConnection(installation, connection, signal, environ
   const defaultWorkspace = await resolveDefaultWorkspace(connection.defaultWorkspace);
   const inventory = await discoverLocalAgentInventory({
     defaultWorkspace,
+    dataDirectory: localContext.stateDirectory,
     environment: localContext.environment,
     signal
   });
@@ -91909,7 +91946,7 @@ async function pairLocalMachine(arguments_, signal = new AbortController().signa
       code: requested.code,
       pairingId: requested.pairingId,
       relayOrigin: requested.relayOrigin,
-      workspace: arguments_.includes("--workspace") ? requested.workspace : loadDefaultWorkspace(localContext.environment)
+      workspace: arguments_.includes("--workspace") ? requested.workspace : loadDefaultWorkspace(localContext.stateDirectory, localContext.environment)
     },
     signal,
     process.env
@@ -92127,10 +92164,11 @@ function registerAgentsHandler(program2, context) {
   program2.command("agents").description("show detected, missing, and integration-ready Agents").option("--json", "write the Agent inventory as JSON").addOption(valueOption("--output-json <existing-file.json>", "write the JSON inventory to an existing file")).option("--verbose", "include per-Agent detection timing").action(async (options) => {
     const installation = await openMobiusCliInstallation(context.shutdownSignal, process.env);
     const localContext = new RuntimeLocalContext(installation.stateDirectory, process.env);
-    const defaultWorkspace = loadDefaultWorkspace(localContext.environment);
+    const defaultWorkspace = loadDefaultWorkspace(localContext.stateDirectory, localContext.environment);
     await ensurePrivateDirectory(defaultWorkspace);
     const inventory = await discoverLocalAgentInventory({
       defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
       environment: localContext.environment,
       signal: context.shutdownSignal
     });
@@ -92346,7 +92384,7 @@ var init_bounded_log = __esm({
 // src/storage/logs/log-files.ts
 import { readFileSync as readFileSync10 } from "node:fs";
 import { lstat as lstat5, readdir as readdir6, readFile as readFile10 } from "node:fs/promises";
-import { join as join30, relative as relative2 } from "node:path";
+import { join as join30, relative as relative3 } from "node:path";
 function unhandledRejectionLogFilename(role) {
   return `unhandled-rejections-${role}.log`;
 }
@@ -92386,7 +92424,7 @@ async function findLogDirectories(root, unreadable, signal) {
         if (status === "listed") {
           found.push(logs);
         } else if (status === "unreadable") {
-          unreadable.push(relative2(root, logs));
+          unreadable.push(relative3(root, logs));
         }
       }
     }
@@ -92400,7 +92438,7 @@ async function listDirectories(path8, root, unreadable, signal) {
     return entries.filter((entry) => entry.isDirectory() && !entry.isSymbolicLink()).map((entry) => entry.name);
   } catch (cause) {
     if (!isAbsent(cause)) {
-      unreadable.push(relative2(root, path8));
+      unreadable.push(relative3(root, path8));
     }
     return [];
   }
@@ -92411,7 +92449,7 @@ async function listLogFiles(directory, root, unreadable) {
     return entries.filter((entry) => entry.isFile() && !entry.isSymbolicLink() && LOG_FILE_NAME_PATTERN.test(entry.name)).map((entry) => entry.name).sort();
   } catch (cause) {
     if (!isAbsent(cause)) {
-      unreadable.push(relative2(root, directory));
+      unreadable.push(relative3(root, directory));
     }
     return [];
   }
@@ -92994,7 +93032,7 @@ var init_manager2 = __esm({
 import { readFile as readFile11, realpath as realpath8 } from "node:fs/promises";
 import { join as join31 } from "node:path";
 function releasePrefix(version2) {
-  return join31(readStateDirectory(), "npm", version2);
+  return join31(readStateDirectory(), STATE_ROOT_LAYOUT.releases, version2);
 }
 async function readInstalledRelease(prefix) {
   const packageRoot = await realpath8(join31(prefix, "node_modules", "@moxt-ai", "mobius"));
@@ -93004,11 +93042,12 @@ var init_release_files = __esm({
   "src/storage/daemon/release-files.ts"() {
     "use strict";
     init_state_directory();
+    init_state_root_layout();
   }
 });
 
 // src/daemon/upgrades/package.ts
-import { isAbsolute as isAbsolute16, join as join32, relative as relative3 } from "node:path";
+import { isAbsolute as isAbsolute16, join as join32, relative as relative4 } from "node:path";
 async function prepareDaemonReleaseVersion(version2, signal) {
   runtimeUpgradeVersionSchema.parse(version2);
   signal.throwIfAborted();
@@ -93090,7 +93129,7 @@ async function verifyInstalledDaemonRelease(installed, prefix, version2, signal)
     engines: external_exports.object({ node: external_exports.string().refine((value) => (0, import_semver.validRange)(value) !== null) })
   }).parse(JSON.parse(installed.manifest));
   const entry = await canonicalPath(join32(installed.packageRoot, metadata.bin.mobius));
-  const resolved = relative3(await canonicalPath(prefix), entry);
+  const resolved = relative4(await canonicalPath(prefix), entry);
   if (resolved.startsWith("..") || isAbsolute16(resolved)) {
     throw new Error("Installed entry escaped npm prefix");
   }
@@ -96208,7 +96247,12 @@ var init_session_manager = __esm({
           return await runtime.loadHistoryEvents(eventLimit, cursor, options2.signal);
         });
       });
-      openNativeSession = async (options, origin) => this.#operations.run(options, async (options2) => {
+      async #nativeTargetOptions(options, sessionId, resolveAgent) {
+        const resolved = await resolveAgent(options.agent.id, options.signal, sessionId);
+        options.signal.throwIfAborted();
+        return { ...options, ...resolved, sessionId };
+      }
+      openNativeSession = async (options, origin, resolveAgent) => this.#operations.run(options, async (options2) => {
         const key = `${options2.agent.id}:${origin.nativeSessionId}`;
         if (this.#nativeOperations.has(key)) {
           throw new AcpExecutionError("The native session is being managed", {}, "session_busy");
@@ -96227,10 +96271,8 @@ var init_session_manager = __esm({
         if (origin.kind === "import" && existing !== void 0) {
           return await this.#executionProcesses.use(existing.sessionId, async () => {
             this.#closedSessions.delete(existing.sessionId);
-            const runtime = await this.ensureSession({
-              ...options2,
-              sessionId: existing.sessionId
-            });
+            const target2 = await this.#nativeTargetOptions(options2, existing.sessionId, resolveAgent);
+            const runtime = await this.ensureSession(target2);
             if (this.#executions.command(existing.sessionId) !== void 0 || this.#nativeOperations.has(key)) {
               throw new AcpExecutionError(
                 "Wait for the native session's running operation to finish",
@@ -96250,6 +96292,7 @@ var init_session_manager = __esm({
             }
           });
         }
+        const target = await this.#nativeTargetOptions(options2, options2.sessionId, resolveAgent);
         if (this.#executionProcesses.get(options2.sessionId) !== void 0 || this.#executionProcesses.pending(options2.sessionId) !== void 0 || this.#store.read(options2.sessionId) instanceof FoundStoredSession) {
           throw new AcpExecutionError(
             "The destination conversation already exists",
@@ -96260,7 +96303,7 @@ var init_session_manager = __esm({
         return await this.#executionProcesses.use(options2.sessionId, async () => {
           this.#nativeOperations.add(key);
           try {
-            const runtime = await this.#startPreparation({ ...options2, origin }, { kind: "interactive-only" });
+            const runtime = await this.#startPreparation({ ...target, origin }, { kind: "interactive-only" });
             const openedKey = `${options2.agent.id}:${runtime.nativeSessionId()}`;
             this.#nativeOperations.add(openedKey);
             try {
@@ -96544,7 +96587,8 @@ var init_native_session_browser = __esm({
             sessionId: command.targetSessionId,
             additionalDirectories: target.additionalDirectories
           },
-          action === "fork" ? { kind: "fork", nativeSessionId: target.info.sessionId, title: title2 } : { kind: "import", nativeSessionId: target.info.sessionId, title: title2 }
+          action === "fork" ? { kind: "fork", nativeSessionId: target.info.sessionId, title: title2 } : { kind: "import", nativeSessionId: target.info.sessionId, title: title2 },
+          this.#resolveAgent
         );
         signal.throwIfAborted();
         const ready = {
@@ -97426,7 +97470,7 @@ var init_session_turns = __esm({
 
 // src/session/workspace/workspace-directory.ts
 import { homedir as homedir4 } from "node:os";
-import { basename as basename8, dirname as dirname11, isAbsolute as isAbsolute17, join as join33, normalize as normalize2, relative as relative4 } from "node:path";
+import { basename as basename8, dirname as dirname11, isAbsolute as isAbsolute17, join as join33, normalize as normalize2, relative as relative5 } from "node:path";
 function encodePath(path8) {
   const encoded = Buffer.from(path8, "utf8").toString("base64url");
   if (path8.length === 0 || path8.length > MAX_WORKSPACE_PATH_LENGTH || encoded.length + "path-".length > MAX_DIRECTORY_IDENTIFIER_LENGTH) {
@@ -97520,7 +97564,7 @@ var init_workspace_directory = __esm({
         }
       };
       label = (path8) => {
-        const suffix = relative4(homedir4(), path8);
+        const suffix = relative5(homedir4(), path8);
         return suffix === "" ? "~" : !isAbsolute17(suffix) && suffix !== ".." && !suffix.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) ? `~/${suffix.replaceAll("\\", "/")}` : path8;
       };
       identify = async (bindingId, requestedPath2, signal) => {
@@ -99443,7 +99487,7 @@ async function executeSessionHistoryPageLoad(socket, command, config2, resolveAg
     );
     const loadOptions = {
       additionalDirectories: resolved.additionalDirectories,
-      ...await resolveAgent(entry.agentId, signal),
+      ...await resolveAgent(entry.agentId, signal, command.sessionId),
       cwd: resolved.cwd,
       sessionId: command.sessionId,
       signal
@@ -99490,7 +99534,7 @@ async function executeSessionPreviewHistoryPageLoad(socket, command, config2, re
     );
     const loadOptions = {
       additionalDirectories: resolved.additionalDirectories,
-      ...await resolveAgent(command.agentId, signal),
+      ...await resolveAgent(command.agentId, signal, command.sessionId),
       cwd: resolved.cwd,
       sessionId: command.sessionId,
       signal
@@ -100158,7 +100202,7 @@ async function executePrompt({
       command.additionalDirectoryIds,
       signal
     );
-    const { agent, adapter } = await resolveAgent(command.agentId, signal);
+    const { agent, adapter } = await resolveAgent(command.agentId, signal, command.sessionId);
     const availability = await waitForSessionAvailability(signal);
     if (availability.kind === "busy") {
       throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
@@ -100554,7 +100598,7 @@ async function prepareSession(command, recovery, closed, config2, resolveAgent,
         signal
       )
     );
-    const resolvedAgent = await resolveAgent(command.agentId, signal);
+    const resolvedAgent = await resolveAgent(command.agentId, signal, command.sessionId);
     const preparation = {
       additionalDirectories: resolved.additionalDirectories,
       ...resolvedAgent,
@@ -100717,7 +100761,7 @@ async function executeSessionConfigure(socket, command, config2, resolveAgent, d
     );
     const configOptions = await sessions.configureSession({
       additionalDirectories: resolved.additionalDirectories,
-      ...await resolveAgent(command.agentId, signal),
+      ...await resolveAgent(command.agentId, signal, command.sessionId),
       booleanValue: command.booleanValue,
       configId: command.configId,
       cwd: resolved.cwd,
@@ -101712,8 +101756,10 @@ async function runRuntime(config2, parentSignal, timer = systemTimer, options =
       processes,
       (sessionId, content, contentSignal) => externalContent.put({ ...content, sessionId, signal: contentSignal })
     );
-    const resolveAgent = async (agentId, resolveSignal) => {
-      const agent = await resolveCatalogAgent(config2, agentId, resolveSignal);
+    const resolveAgent = async (agentId, resolveSignal, sessionId) => {
+      const catalogAgent = await resolveCatalogAgent(config2, agentId, resolveSignal);
+      const environment = sessionId === void 0 ? void 0 : config2.sessionEnvironment?.({ sessionId, agentId });
+      const agent = environment === void 0 ? catalogAgent : catalogAgent.withEnvironment({ ...catalogAgent.environment, ...environment });
       return { agent, adapter: adapters.resolve(agent) };
     };
     const layer = buildSessionLayer({
@@ -102385,7 +102431,7 @@ var init_daemon = __esm({
 });
 
 // src/cli/handler/logs/logic/collect-local-logs.ts
-import { join as join38, relative as relative5, resolve as resolve19 } from "node:path";
+import { join as join38, relative as relative6, resolve as resolve19 } from "node:path";
 async function collectLocalDaemonLogs(stateDirectory, tailLines, signal) {
   signal.throwIfAborted();
   const root = resolve19(stateDirectory);
@@ -102396,7 +102442,7 @@ async function collectLocalDaemonLogs(stateDirectory, tailLines, signal) {
     const names = await listLogFiles(directory, root, unreadable);
     for (const name2 of names) {
       const path8 = join38(directory, name2);
-      const reported = relative5(root, path8);
+      const reported = relative6(root, path8);
       const read = await readOwnedLogFile(path8, signal);
       if (read.kind === "unreadable") {
         unreadable.push(reported);