@moxt-ai/mobius 0.0.315 → 0.0.317

package/dist/runtime.js

@@ -32453,7 +32453,7 @@ import { fetch as fetch3 } from "undici";
 // package.json
 var 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: {
@@ -77739,7 +77739,7 @@ var CodexAgentSpecification = class extends InProcessAcpAgentSpecification {
 
 // src/agent/specification/vendors/pi-agent.ts
 import { createHash as createHash4 } from "node:crypto";
-import { join as join21 } from "node:path";
+import { join as join20 } from "node:path";
 import {
   methods as methods11
 } from "@agentclientprotocol/sdk";
@@ -81588,17 +81588,6 @@ function piAgentOrThrow(agent) {
   return agent;
 }
 
-// src/storage/state-directory.ts
-import { homedir as homedir3 } from "node:os";
-import { join as join20, resolve as resolve13 } from "node:path";
-function readStateDirectory(environment = process.env) {
-  const configured = environment["MOBIUS_STATE_DIRECTORY"]?.trim();
-  if (configured !== void 0 && configured.length > 0) {
-    return resolve13(configured);
-  }
-  return join20(homedir3(), ".mobius");
-}
-
 // src/agent/discovery/agent-probe-error.ts
 var AgentProbeError = class extends Error {
   code;
@@ -81619,13 +81608,7 @@ var PiAgentSpecification = class extends InProcessAcpAgentSpecification {
   // keeps the adapter's opt-in capability flag enabled for every launch it owns.
   createLaunchEnvironment = async (_agent, context) => {
     const workspaceHash = createHash4("sha256").update(context.defaultWorkspace).digest("hex").slice(0, 24);
-    const sessionDirectory = join21(
-      readStateDirectory(context.environment),
-      "agents",
-      "pi",
-      "sessions",
-      workspaceHash
-    );
+    const sessionDirectory = join20(context.dataDirectory, "agents", "pi", "sessions", workspaceHash);
     return Object.freeze({
       PI_ACP_ENABLE_EMBEDDED_CONTEXT: "true",
       MOBIUS_PI_SESSION_DIR: sessionDirectory
@@ -82599,17 +82582,28 @@ var LocalAgentCatalog = class {
   };
 };
 
+// src/storage/state-directory.ts
+import { homedir as homedir3 } from "node:os";
+import { join as join21, resolve as resolve13 } from "node:path";
+function readStateDirectory(environment = process.env) {
+  const configured = environment["MOBIUS_STATE_DIRECTORY"]?.trim();
+  if (configured !== void 0 && configured.length > 0) {
+    return resolve13(configured);
+  }
+  return join21(homedir3(), ".mobius");
+}
+
 // src/runtime/config.ts
-function loadDefaultWorkspace(environment = process.env) {
+function loadDefaultWorkspace(dataDirectory, environment = process.env) {
   const { MOBIUS_DEFAULT_WORKSPACE: configuredWorkspace } = environment;
-  return configuredWorkspace ?? join22(readStateDirectory(environment), "workspace");
+  return configuredWorkspace ?? join22(dataDirectory, "workspace");
 }
 var RuntimeLocalContext = class {
   environment;
   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 });
   }
 };
 function withRuntimeEnvironment(agent, environment) {
@@ -82715,10 +82709,23 @@ function isNodeError(error62, code) {
   return typeof error62 === "object" && error62 !== null && "code" in error62 && error62.code === code;
 }
 
+// src/storage/state-root-layout.ts
+var 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"
+});
+var STATE_ROOT_ENTRY_NAMES = new Set(Object.values(STATE_ROOT_LAYOUT));
+
 // src/storage/installation/installation-files.ts
 var MAXIMUM_FILE_BYTES = 16 * 1024;
 function applicationDirectory(root, applicationId) {
-  return join23(root, "installations", applicationId);
+  return join23(root, STATE_ROOT_LAYOUT.installations, applicationId);
 }
 function installationPointerPath(applicationDirectory2) {
   return join23(applicationDirectory2, "current.json");
@@ -83477,6 +83484,7 @@ function buildPairedRuntime(installation, connection, defaultWorkspace, inventor
     createCatalogAgentResolver(
       (refreshSignal) => discoverLocalAgentInventory({
         defaultWorkspace,
+        dataDirectory: localContext.stateDirectory,
         environment: localContext.environment,
         signal: refreshSignal
       }),
@@ -83485,6 +83493,7 @@ function buildPairedRuntime(installation, connection, defaultWorkspace, inventor
     ),
     (refreshSignal) => discoverLocalAgentInventory({
       defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
       environment: localContext.environment,
       signal: refreshSignal
     }).then((inventory2) => inventory2.readyAgents())
@@ -83501,6 +83510,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
   });
@@ -83537,6 +83547,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
   });
@@ -86237,7 +86248,12 @@ var SessionManager2 = class {
       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");
@@ -86256,10 +86272,8 @@ var SessionManager2 = class {
     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",
@@ -86279,6 +86293,7 @@ var SessionManager2 = class {
         }
       });
     }
+    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",
@@ -86289,7 +86304,7 @@ var SessionManager2 = class {
     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 {
@@ -86557,7 +86572,8 @@ var NativeSessionService = class {
         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 = {
@@ -89337,7 +89353,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
@@ -89384,7 +89400,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
@@ -90001,7 +90017,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");
@@ -90358,7 +90374,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,
@@ -90521,7 +90537,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,
@@ -91446,8 +91462,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({
@@ -91630,7 +91648,7 @@ function loadMobiusRuntimeConnection(environment = process.env) {
   }
   return Object.freeze({
     channelId,
-    defaultWorkspace: loadDefaultWorkspace(environment),
+    defaultWorkspace: loadDefaultWorkspace(readStateDirectory(environment), environment),
     relayUrl: requiredEnvironmentValue(environment, "MOBIUS_RELAY_URL"),
     runtimeCredential: requiredEnvironmentValue(environment, "MOBIUS_RELAY_TOKEN")
   });
@@ -91657,6 +91675,7 @@ async function createMobiusRuntimeEngine(connection, signal, environment = proce
   const discoveryEnvironment = localContext.environment;
   const discover = async (refreshSignal) => await discoverLocalAgentInventory({
     defaultWorkspace,
+    dataDirectory: localContext.stateDirectory,
     environment: discoveryEnvironment,
     signal: refreshSignal,
     specifications