@moxt-ai/mobius 0.0.343 → 0.0.345

package/dist/engine.js

@@ -51,7 +51,7 @@ var __callDispose = (stack, error62, hasError) => {
 
 // src/daemon/pairing/pair-local-machine.ts
 import { hostname as hostname3 } from "node:os";
-import { basename as basename6, join as join26, resolve as resolve16 } from "node:path";
+import { basename as basename9, join as join31, resolve as resolve16 } from "node:path";
 
 // ../mobius-sdk/src/protocol/platform/mobius-api.ts
 var MOBIUS_API_PREFIX = "/mobius/api";
@@ -5102,7 +5102,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve18) {
+function isRecursive(inst, stack, resolve17) {
   const cached2 = recursive.get(inst);
   if (cached2 !== void 0)
     return cached2 ? PROVEN : NONE;
@@ -5112,7 +5112,7 @@ function isRecursive(inst, stack, resolve18) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve18);
+      const answer = isRecursive(child, stack, resolve17);
       if (answer > result)
         result = answer;
     }
@@ -5123,7 +5123,7 @@ function isRecursive(inst, stack, resolve18) {
       const desc2 = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc2.enumerable)
         continue;
-      const child = desc2.get ? ASSUMED : desc2.value?._zod ? isRecursive(desc2.value, stack, resolve18) : NONE;
+      const child = desc2.get ? ASSUMED : desc2.value?._zod ? isRecursive(desc2.value, stack, resolve17) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -5187,7 +5187,7 @@ function isRecursive(inst, stack, resolve18) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve18 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve17 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -19757,7 +19757,7 @@ function decodeIdentifier(value) {
 
 // ../mobius-sdk/src/protocol/runtime/diagnostics.ts
 var identifier = external_exports.custom(isIdentifier);
-var runtimeDiagnosticsRequestSchema = external_exports.strictObject({
+var runtimeDiagnosticsRequestSchema = external_exports.object({
   kind: external_exports.literal("runtime.diagnostics.read"),
   requestId: identifier
 });
@@ -21316,6 +21316,16 @@ var activeTurnSnapshotSchema = external_exports.object({
   sequence: external_exports.number().int().nonnegative(),
   state: external_exports.literal("running")
 }).readonly();
+var commandDeliverySchema = external_exports.discriminatedUnion("state", [
+  // No receipt: the command has not arrived. A delayed submission may still arrive later.
+  external_exports.object({ state: external_exports.literal("unknown") }).readonly(),
+  // The Runtime holds the command and has not finished it; it may be waiting or running.
+  external_exports.object({ state: external_exports.literal("accepted") }).readonly(),
+  external_exports.object({ state: external_exports.literal("completed"), stopReason: external_exports.string().max(2048) }).readonly(),
+  external_exports.object({ code: identifierStringSchema, state: external_exports.literal("failed") }).readonly(),
+  // The command started, but the Runtime no longer retains its result.
+  external_exports.object({ state: external_exports.literal("expired") }).readonly()
+]);
 var identity = {
   ...envelope,
   kind: external_exports.literal(NATIVE_SESSION_REQUEST_KIND),
@@ -21325,7 +21335,14 @@ var identity = {
   directoryId: DIRECTORY_IDENTIFIER
 };
 var nativeSessionRequestSchema = external_exports.discriminatedUnion("action", [
-  external_exports.object({ ...identity, action: external_exports.literal("active-turn"), targetSessionId: identifierStringSchema }).readonly(),
+  external_exports.object({
+    ...identity,
+    action: external_exports.literal("active-turn"),
+    // Asks the Runtime for this command's delivery alongside the execution snapshot. It is not
+    // named `commandId`, which routes a request as the command it names.
+    deliveryCommandId: identifierStringSchema.optional(),
+    targetSessionId: identifierStringSchema
+  }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("find"), nativeSessionId: identifierStringSchema }).readonly(),
   external_exports.object({
     ...identity,
@@ -21340,7 +21357,14 @@ var nativeSessionRequestSchema = external_exports.discriminatedUnion("action", [
   }).readonly()
 ]);
 var nativeSessionCommandSchema = external_exports.discriminatedUnion("action", [
-  external_exports.object({ ...identity, action: external_exports.literal("active-turn"), targetSessionId: identifierStringSchema }).readonly(),
+  external_exports.object({
+    ...identity,
+    action: external_exports.literal("active-turn"),
+    // Asks the Runtime for this command's delivery alongside the execution snapshot. It is not
+    // named `commandId`, which routes a request as the command it names.
+    deliveryCommandId: identifierStringSchema.optional(),
+    targetSessionId: identifierStringSchema
+  }).readonly(),
   external_exports.object({ ...identity, action: external_exports.literal("find"), nativeSessionId: identifierStringSchema }).readonly(),
   external_exports.object({
     ...identity,
@@ -21380,7 +21404,10 @@ var nativeSessionResultSchema = external_exports.discriminatedUnion("action", [
         attachments: external_exports.array(promptAttachmentSchema).max(16).readonly()
       }).readonly()
     ).readonly(),
-    turn: activeTurnSnapshotSchema.nullable()
+    turn: activeTurnSnapshotSchema.nullable(),
+    // Present only when the request named a command and every hop understands it. An
+    // unrecognized delivery from a newer peer reads as absent instead of failing the snapshot.
+    command: commandDeliverySchema.optional().catch(void 0)
   }).readonly(),
   external_exports.object({
     ...resultEnvelope,
@@ -21735,12 +21762,12 @@ var serviceToDaemonSignatures = {
 };
 var serviceToDaemonRegistry = serviceToDaemonSignatures;
 function decodeKnownServiceToDaemonMessage(encoded) {
-  const kind = decodeMessageKind(encoded);
-  const signature = serviceToDaemonRegistry[kind];
-  if (signature === void 0) {
-    return null;
-  }
   try {
+    const kind = decodeMessageKind(encoded);
+    const signature = serviceToDaemonRegistry[kind];
+    if (signature === void 0) {
+      return null;
+    }
     return signature.decoder(encoded);
   } catch {
     return null;
@@ -21884,7 +21911,7 @@ import { fetch as fetch3 } from "undici";
 // package.json
 var package_default = {
   name: "@moxt-ai/mobius",
-  version: "0.0.343",
+  version: "0.0.345",
   description: "Mobius CLI for pairing and running local AI agent services.",
   type: "module",
   bin: {
@@ -58963,11 +58990,11 @@ var Pushable = class {
   done = false;
   push(item) {
     if (this.resolvers.length > 0) {
-      const resolve18 = this.resolvers.shift();
-      if (resolve18 === void 0) {
+      const resolve17 = this.resolvers.shift();
+      if (resolve17 === void 0) {
         return;
       }
-      resolve18({ value: item, done: false });
+      resolve17({ value: item, done: false });
     } else {
       this.queue.push(item);
     }
@@ -58975,8 +59002,8 @@ var Pushable = class {
   end() {
     this.done = true;
     while (this.resolvers.length > 0) {
-      const resolve18 = this.resolvers.shift();
-      resolve18?.({ done: true, value: void 0 });
+      const resolve17 = this.resolvers.shift();
+      resolve17?.({ done: true, value: void 0 });
     }
   }
   [Symbol.asyncIterator]() {
@@ -58992,8 +59019,8 @@ var Pushable = class {
         if (this.done) {
           return Promise.resolve({ done: true, value: void 0 });
         }
-        return new Promise((resolve18) => {
-          this.resolvers.push(resolve18);
+        return new Promise((resolve17) => {
+          this.resolvers.push(resolve17);
         });
       }
     };
@@ -59011,14 +59038,14 @@ function unreachable(value, logger = console) {
 async function withDeadline(signal, timeoutMilliseconds, operation) {
   const deadline = AbortSignal.any([signal, AbortSignal.timeout(timeoutMilliseconds)]);
   deadline.throwIfAborted();
-  return await new Promise((resolve18, reject2) => {
+  return await new Promise((resolve17, reject2) => {
     const settle2 = (callback) => {
       deadline.removeEventListener("abort", onAbort);
       callback();
     };
     const onAbort = () => settle2(() => reject2(deadline.reason));
     deadline.addEventListener("abort", onAbort, { once: true });
-    operation().then((value) => settle2(() => resolve18(value)), (error62) => settle2(() => reject2(error62)));
+    operation().then((value) => settle2(() => resolve17(value)), (error62) => settle2(() => reject2(error62)));
   });
 }
 var environmentChain = Promise.resolve();
@@ -59561,8 +59588,8 @@ function inputPath(context, key) {
   return plainString(context.input[key]);
 }
 function isInside(directory, candidate) {
-  const relative4 = path.relative(path.resolve(directory), path.resolve(candidate));
-  return relative4 === "" || !relative4.startsWith(`..${path.sep}`) && relative4 !== "..";
+  const relative3 = path.relative(path.resolve(directory), path.resolve(candidate));
+  return relative3 === "" || !relative3.startsWith(`..${path.sep}`) && relative3 !== "..";
 }
 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));
@@ -61711,14 +61738,14 @@ function waitUnlessAborted(milliseconds, signal) {
   if (signal.aborted) {
     return Promise.resolve(false);
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const timer = setTimeout(() => {
       signal.removeEventListener("abort", onAbort);
-      resolve18(true);
+      resolve17(true);
     }, milliseconds);
     const onAbort = () => {
       clearTimeout(timer);
-      resolve18(false);
+      resolve17(false);
     };
     signal.addEventListener("abort", onAbort, { once: true });
   });
@@ -61964,7 +61991,7 @@ var ClientConnection = class {
   }
 };
 function raceWithAbort(operation, signal) {
-  return new Promise((resolve18, reject2) => {
+  return new Promise((resolve17, reject2) => {
     const cleanup = () => signal.removeEventListener("abort", onAbort);
     const onAbort = () => {
       cleanup();
@@ -61976,7 +62003,7 @@ function raceWithAbort(operation, signal) {
     }
     void operation.then((value) => {
       cleanup();
-      resolve18(value);
+      resolve17(value);
     }, (error62) => {
       cleanup();
       reject2(error62);
@@ -62559,12 +62586,12 @@ var ClaudeAcpAgent = class {
       }
     };
     let completeTurn;
-    turn.completion = new Promise((resolve18) => {
-      completeTurn = resolve18;
+    turn.completion = new Promise((resolve17) => {
+      completeTurn = resolve17;
     });
-    const response = new Promise((resolve18, reject2) => {
+    const response = new Promise((resolve17, reject2) => {
       turn.resolve = (result) => {
-        resolve18(result);
+        resolve17(result);
         completeTurn();
       };
       turn.reject = (error62) => {
@@ -62979,8 +63006,8 @@ var ClaudeAcpAgent = class {
         pendingNext ??= session.query.next().then((result) => ({ kind: "message", result }));
         const nextMessage = pendingNext;
         let onAbort;
-        const abortRace = new Promise((resolve18) => {
-          onAbort = () => resolve18("abort");
+        const abortRace = new Promise((resolve17) => {
+          onAbort = () => resolve17("abort");
           cancelController.signal.addEventListener("abort", onAbort, { once: true });
         });
         const raced = await Promise.race([nextMessage, abortRace]);
@@ -70567,10 +70594,10 @@ var PiRpcProcess = class _PiRpcProcess {
       shell: shouldUseShellForPiCommand(cmd)
     });
     try {
-      await new Promise((resolve18, reject2) => {
+      await new Promise((resolve17, reject2) => {
         const onSpawn = () => {
           cleanup();
-          resolve18();
+          resolve17();
         };
         const onError = (err) => {
           cleanup();
@@ -70772,7 +70799,7 @@ var PiRpcProcess = class _PiRpcProcess {
     const timeoutMs = opts?.timeoutMs;
     const line = `${JSON.stringify(withId)}
 `;
-    return new Promise((resolve18, reject2) => {
+    return new Promise((resolve17, reject2) => {
       const signal = opts?.signal;
       if (signal?.aborted === true) {
         reject2(signal.reason);
@@ -70794,7 +70821,7 @@ var PiRpcProcess = class _PiRpcProcess {
       this.pending.set(id, {
         resolve: (res) => {
           drop();
-          resolve18(res);
+          resolve17(res);
         },
         reject: (error62) => {
           drop();
@@ -70827,14 +70854,14 @@ var PiRpcProcess = class _PiRpcProcess {
     });
   }
   writeLine(line) {
-    return new Promise((resolve18, reject2) => {
+    return new Promise((resolve17, reject2) => {
       try {
         this.child.stdin.write(line, (error62) => {
           if (error62) {
             reject2(error62);
             return;
           }
-          resolve18();
+          resolve17();
         });
       } catch (error62) {
         reject2(error62);
@@ -72105,8 +72132,8 @@ var PiAcpSession = class {
   }
   async prompt(message, images = []) {
     const expandedMessage = expandSlashCommand(message, this.fileCommands);
-    const turnPromise = new Promise((resolve18, reject2) => {
-      const queued = { message: expandedMessage, images, resolve: resolve18, reject: reject2 };
+    const turnPromise = new Promise((resolve17, reject2) => {
+      const queued = { message: expandedMessage, images, resolve: resolve17, reject: reject2 };
       if (this.pendingTurn) {
         this.turnQueue.push(queued);
         this.emit({
@@ -75073,8 +75100,8 @@ var AdapterRegistry = class {
   #resolve;
   #dependencies;
   #adapters = /* @__PURE__ */ new Map();
-  constructor(resolve18, dependencies) {
-    this.#resolve = resolve18;
+  constructor(resolve17, dependencies) {
+    this.#resolve = resolve17;
     this.#dependencies = dependencies;
   }
   resolve = (agent) => {
@@ -76066,14 +76093,14 @@ function mergeTextChunk(previous, incoming) {
 var SessionEventHistoryProjection = class {
   #toolCallEventIds = /* @__PURE__ */ new Map();
   #latestEvent = null;
-  apply = (liveEvent2, resolve18) => {
+  apply = (liveEvent2, resolve17) => {
     if (liveEvent2.type === "lifecycle-metadata") {
       this.#latestEvent = null;
       return { kind: "skip" };
     }
     if (liveEvent2.type === "acp" && liveEvent2.payload.sessionUpdate === "tool_call_update") {
       const targetEventId = this.#toolCallEventIds.get(liveEvent2.payload.toolCallId);
-      const current = targetEventId === void 0 ? void 0 : resolve18([targetEventId]).get(targetEventId);
+      const current = targetEventId === void 0 ? void 0 : resolve17([targetEventId]).get(targetEventId);
       if (current?.type === "acp" && (current.payload.sessionUpdate === "tool_call" || current.payload.sessionUpdate === "tool_call_update")) {
         return this.#replace(
           current,
@@ -76097,12 +76124,12 @@ var SessionEventHistoryProjection = class {
    * The projected tool call announced with this identifier, in its current
    * merged form, or `undefined` when the projection has not recorded one.
    */
-  getToolCall = (toolCallId, resolve18) => {
+  getToolCall = (toolCallId, resolve17) => {
     const eventId = this.#toolCallEventIds.get(toolCallId);
     if (eventId === void 0) {
       return void 0;
     }
-    const event = resolve18([eventId]).get(eventId);
+    const event = resolve17([eventId]).get(eventId);
     if (event?.type === "acp" && (event.payload.sessionUpdate === "tool_call" || event.payload.sessionUpdate === "tool_call_update")) {
       return event.payload;
     }
@@ -76162,8 +76189,8 @@ var SessionEvents = class {
     this.sessionGenerationId = sessionGenerationId;
     this.#projection = new SessionEventHistoryProjection();
   }
-  apply = (event, resolve18) => {
-    const projected = this.#projection.apply(event, resolve18);
+  apply = (event, resolve17) => {
+    const projected = this.#projection.apply(event, resolve17);
     this.#throughPosition = event.position;
     if (projected.kind === "skip") {
       return;
@@ -76190,7 +76217,7 @@ var SessionEvents = class {
     return this.#cachedItemsByEventId.size;
   }
   /** The projected tool call for this identifier, materializing it if needed. */
-  toolCall = (toolCallId, resolve18) => this.#projection.getToolCall(toolCallId, resolve18);
+  toolCall = (toolCallId, resolve17) => this.#projection.getToolCall(toolCallId, resolve17);
   endIndex = (cursor) => {
     if (cursor === null) {
       return this.#eventIds.length;
@@ -77544,7 +77571,7 @@ function sql(strings, ...params) {
     return new SQL([new StringChunk(str)]);
   }
   _sql.raw = raw;
-  function join34(chunks, separator) {
+  function join32(chunks, separator) {
     const result = [];
     for (const [i, chunk] of chunks.entries()) {
       if (i > 0 && separator !== void 0) result.push(separator);
@@ -77552,7 +77579,7 @@ function sql(strings, ...params) {
     }
     return new SQL(result);
   }
-  _sql.join = join34;
+  _sql.join = join32;
   function identifier2(value) {
     return new Name(value);
   }
@@ -79273,7 +79300,7 @@ var SQLiteSelectBase = class extends TypedQueryBuilder {
       const baseTableName = this.tableName;
       const tableName = getTableLikeName(table);
       for (const item of extractUsedTable(table)) this.usedTables.add(item);
-      if (typeof tableName === "string" && this.config.joins?.some((join34) => join34.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+      if (typeof tableName === "string" && this.config.joins?.some((join32) => join32.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
       if (!this.isPartialSelect) {
         if (Object.keys(this.joinsNotNullableMap).length === 1 && typeof baseTableName === "string") this.config.fields = { [baseTableName]: this.config.fields };
         if (typeof tableName === "string" && !is(table, SQL)) {
@@ -80819,7 +80846,7 @@ var SQLiteDialect = class {
       if (!joins2) return;
       const withEntries = Object.entries(joins2).filter(([_, v]) => v);
       if (!withEntries.length) return;
-      return sql.join(withEntries.map(([k2, join34]) => {
+      return sql.join(withEntries.map(([k2, join32]) => {
         const relation = tableConfig.relations[k2];
         const isSingle2 = is(relation, One2);
         const targetTable = aliasedTable(relation.targetTable, `d${currentDepth + 1}`);
@@ -80830,7 +80857,7 @@ var SQLiteDialect = class {
           table: targetTable,
           mode: isSingle2 ? "first" : "many",
           schema,
-          queryConfig: join34,
+          queryConfig: join32,
           tableConfig: schema[relation.targetTableName],
           relationWhere: filter,
           isNested: true,
@@ -80844,7 +80871,7 @@ var SQLiteDialect = class {
           key: k2,
           selection: innerQuery.selection,
           isArray: !isSingle2,
-          isOptional: (relation.optional ?? false) || join34 !== true && !!join34.where
+          isOptional: (relation.optional ?? false) || join32 !== true && !!join32.where
         });
         const jsonColumns = sql.join(innerQuery.selection.map((s) => {
           return sql`${sql.raw(this.escapeString(s.key))}, ${s.selection ? sql`${jsonb}(${sql.identifier(s.key)})` : sql.identifier(s.key)}`;
@@ -81198,7 +81225,7 @@ var SQLiteUpdateBase = class {
   createJoin(joinType) {
     return ((table, on2) => {
       const tableName = getTableLikeName(table);
-      if (typeof tableName === "string" && this.config.joins.some((join34) => join34.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
+      if (typeof tableName === "string" && this.config.joins.some((join32) => join32.alias === tableName)) throw new Error(`Alias "${tableName}" is already used in this query`);
       if (typeof on2 === "function") {
         const from = this.config.from ? is(table, SQLiteTable) ? table[Table.Symbol.Columns] : is(table, Subquery) ? table._.selectedFields : is(table, SQLiteViewBase) ? table[ViewBaseConfig].selectedFields : void 0 : void 0;
         on2 = on2(new Proxy(this.config.table[Table.Symbol.Columns], new SelectionProxyHandler({
@@ -82858,7 +82885,7 @@ async function publishAgentCatalog(config2, signal) {
 }
 
 // src/engine/runtime/config.ts
-import { join as join24, resolve as resolve14 } from "node:path";
+import { resolve as resolve13 } from "node:path";
 
 // src/engine/util/serial-task-queue.ts
 var SerialTaskQueue = class {
@@ -82929,24 +82956,15 @@ var LocalAgentCatalog = class {
   };
 };
 
-// src/engine/storage/state-directory.ts
-import { homedir as homedir3 } from "node:os";
-import { join as join23, resolve as resolve13 } from "node:path";
-var stateRootSchema = external_exports.string().brand();
-function readStateDirectory(environment = process.env) {
-  const configured = environment["MOBIUS_STATE_DIRECTORY"]?.trim();
-  return stateRootSchema.parse(
-    configured !== void 0 && configured.length > 0 ? resolve13(configured) : join23(homedir3(), ".mobius")
-  );
-}
-
 // src/engine/runtime/config.ts
 var RuntimeLocalContext = class {
-  environment;
+  agentLaunchEnvironment;
   stateDirectory;
-  constructor(stateDirectory, environment = process.env) {
-    this.stateDirectory = resolve14(stateDirectory);
-    this.environment = Object.freeze({ ...environment });
+  maxAcpProcesses;
+  constructor(stateDirectory, agentLaunchEnvironment, maxAcpProcesses = 1e3) {
+    this.stateDirectory = resolve13(stateDirectory);
+    this.agentLaunchEnvironment = Object.freeze({ ...agentLaunchEnvironment });
+    this.maxAcpProcesses = maxAcpProcesses;
   }
 };
 function withRuntimeEnvironment(agent, environment) {
@@ -82969,8 +82987,10 @@ var OpaqueRuntimeReconnectTarget = class extends RuntimeReconnectTarget {
     this.commandArgument = `--connection ${connectionId2}`;
   }
 };
-function createRuntimeConfig(connection, dependencies = new RuntimeAgentDependencies([]), localContext = new RuntimeLocalContext(readStateDirectory(), process.env), reconnectTarget = null, resolveAgent, rediscoverAgents) {
-  const runtimeAgents = dependencies.agents.map((agent) => withRuntimeEnvironment(agent, localContext.environment));
+function createRuntimeConfig(connection, dependencies, localContext, reconnectTarget = null, resolveAgent, rediscoverAgents) {
+  const runtimeAgents = dependencies.agents.map(
+    (agent) => withRuntimeEnvironment(agent, localContext.agentLaunchEnvironment)
+  );
   return {
     adapters: dependencies.adapters,
     agents: runtimeAgents,
@@ -83012,7 +83032,7 @@ function createCatalogAgentResolver(discover, readConfig, publish) {
       signal.throwIfAborted();
       const inventory = await discover(signal);
       signal.throwIfAborted();
-      const rediscovered = inventory.readyAgents().filter((ready) => ready.id === agent.id).map((ready) => withRuntimeEnvironment(ready, config2.localContext.environment));
+      const rediscovered = inventory.readyAgents().filter((ready) => ready.id === agent.id).map((ready) => withRuntimeEnvironment(ready, config2.localContext.agentLaunchEnvironment));
       await config2.catalog.replaceAndPublish(
         (current) => {
           if (!current.some((entry) => entry.id === agent.id)) {
@@ -83043,51 +83063,35 @@ async function unchangedIdentity(agent, signal) {
 
 // src/engine/runtime/connection/runtime-installation-store.ts
 import { randomUUID as randomUUID13 } from "node:crypto";
-import { resolve as resolve15 } from "node:path";
+import { resolve as resolve14 } from "node:path";
 
 // src/engine/storage/installation/installation-files.ts
 import { createHash as createHash5, randomUUID as randomUUID12 } from "node:crypto";
 import { mkdir as mkdir4, open as open5, readdir as readdir5, rename as rename3, unlink as unlink3, writeFile } from "node:fs/promises";
-import { dirname as dirname9, join as join25 } from "node:path";
+import { dirname as dirname9, join as join23 } from "node:path";
 
 // src/engine/util/node-error.ts
 function isNodeError(error62, code) {
   return typeof error62 === "object" && error62 !== null && "code" in error62 && error62.code === code;
 }
 
-// src/engine/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/engine/storage/installation/installation-files.ts
 var MAXIMUM_FILE_BYTES = 16 * 1024;
-function applicationDirectory(root, applicationId) {
-  return join25(root, STATE_ROOT_LAYOUT.installations, applicationId);
-}
-function installationPointerPath(applicationDirectory2) {
-  return join25(applicationDirectory2, "current.json");
+function installationPointerPath(engineDataDir) {
+  return join23(engineDataDir, "current.json");
 }
 var installationDirectorySchema = external_exports.string().brand();
-function installationDirectory(applicationDirectory2, installationId2) {
-  return installationDirectorySchema.parse(join25(applicationDirectory2, installationId2));
+function installationDirectory(engineDataDir, installationId2) {
+  return installationDirectorySchema.parse(join23(engineDataDir, installationId2));
 }
 function connectionDirectory(installationDirectory2) {
-  return join25(installationDirectory2, "connections");
+  return join23(installationDirectory2, "connections");
 }
 function connectionFilePath(connectionDirectory2, connectionId2) {
-  return join25(connectionDirectory2, `${connectionId2}.json`);
+  return join23(connectionDirectory2, `${connectionId2}.json`);
 }
 function channelIndexFilePath(installationDirectory2, channelId) {
-  return join25(installationDirectory2, "channels", `mci_${createHash5("sha256").update(channelId).digest("hex")}.json`);
+  return join23(installationDirectory2, "channels", `mci_${createHash5("sha256").update(channelId).digest("hex")}.json`);
 }
 async function readInstallationFile(path7) {
   let handle;
@@ -83109,7 +83113,7 @@ async function readInstallationFile(path7) {
 async function writeInstallationFile(path7, text2, signal) {
   signal.throwIfAborted();
   const directory = dirname9(path7);
-  const temporaryPath = join25(directory, `.${randomUUID12()}.tmp`);
+  const temporaryPath = join23(directory, `.${randomUUID12()}.tmp`);
   try {
     await mkdir4(directory, { mode: 448, recursive: true });
     signal.throwIfAborted();
@@ -83147,7 +83151,6 @@ var VerifiedRuntimeConnection = class {
   kind = "verified";
   activation;
   appId;
-  applicationId;
   channelId;
   connectionId;
   defaultWorkspace;
@@ -83156,9 +83159,8 @@ var VerifiedRuntimeConnection = class {
   relayOrigin;
   runtimeCredential;
   runtimeId;
-  constructor(activation, applicationId, appId, installationId2, connectionId2, channelId, defaultWorkspace, pairingId, relayOrigin, runtimeCredential2, runtimeId) {
+  constructor(activation, appId, installationId2, connectionId2, channelId, defaultWorkspace, pairingId, relayOrigin, runtimeCredential2, runtimeId) {
     this.activation = activation;
-    this.applicationId = applicationId;
     this.appId = appId;
     this.channelId = channelId;
     this.connectionId = connectionId2;
@@ -83172,22 +83174,14 @@ var VerifiedRuntimeConnection = class {
 };
 
 // src/engine/runtime/connection/runtime-installation-store.ts
-var APPLICATION_ID_PATTERN = /^[a-z][a-z0-9]*(?:[.-][a-z0-9]+){1,31}$/;
 var CONNECTION_ID_PATTERN = /^mcn_[a-f0-9]{32}$/;
 var INSTALLATION_ID_PATTERN = /^min_[a-f0-9]{32}$/;
 var RUNTIME_CREDENTIAL_PATTERN = /^[a-zA-Z0-9_-]{32,256}$/;
 var INSTALLATION_POINTER_KEYS = ["installationId", "version"];
-var CHANNEL_INDEX_KEYS = [
-  "applicationId",
-  "channelId",
-  "connectionId",
-  "installationId",
-  "version"
-];
+var CHANNEL_INDEX_KEYS = ["channelId", "connectionId", "installationId", "version"];
 var VERIFIED_CONNECTION_KEYS = [
   "activation",
   "appId",
-  "applicationId",
   "channelId",
   "connectionId",
   "defaultWorkspace",
@@ -83214,12 +83208,6 @@ function hasExactKeys(value, expectedKeys) {
   const keys = Object.keys(value);
   return keys.length === expectedKeys.length && expectedKeys.every((key) => Object.hasOwn(value, key));
 }
-function validateApplicationId(value) {
-  if (!APPLICATION_ID_PATTERN.test(value)) {
-    throw new RuntimeInstallationStoreError("invalid_application_id", "The application ID is invalid");
-  }
-  return value;
-}
 function validateRemoteAppId(value) {
   if (!isIdentifier(value)) {
     throw new RuntimeInstallationStoreError("invalid_app_id", "The remote App ID is invalid");
@@ -83283,29 +83271,33 @@ function decodeInstallationPointer(value) {
   }
   return { installationId: validateInstallationId(storedInstallationId) };
 }
-function decodeChannelIndex(value) {
-  if (!isRecord8(value) || !hasExactKeys(value, CHANNEL_INDEX_KEYS) || value["version"] !== 1) {
+function retainedFields(value, keys) {
+  return Object.fromEntries(keys.filter((key) => Object.hasOwn(value, key)).map((key) => [key, value[key]]));
+}
+function decodeChannelIndex(input2) {
+  if (!isRecord8(input2)) {
+    throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
+  }
+  const value = input2["version"] === 1 ? retainedFields(input2, CHANNEL_INDEX_KEYS) : input2;
+  if (!hasExactKeys(value, CHANNEL_INDEX_KEYS) || value["version"] !== 1 && value["version"] !== 2) {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
-  const applicationId = value["applicationId"];
   const channelId = value["channelId"];
   const connectionId2 = value["connectionId"];
   const storedInstallationId = value["installationId"];
-  if (typeof applicationId !== "string" || typeof channelId !== "string" || typeof connectionId2 !== "string" || typeof storedInstallationId !== "string") {
+  if (typeof channelId !== "string" || typeof connectionId2 !== "string" || typeof storedInstallationId !== "string") {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
   return {
-    applicationId: validateApplicationId(applicationId),
     channelId: validateIdentifier(channelId, "invalid_connection"),
     connectionId: validateConnectionId(connectionId2),
     installationId: validateInstallationId(storedInstallationId)
   };
 }
 function decodeVerifiedConnection(value) {
-  if (!hasExactKeys(value, VERIFIED_CONNECTION_KEYS) || value["version"] !== 5 || value["kind"] !== "verified") {
+  if (!hasExactKeys(value, VERIFIED_CONNECTION_KEYS) || value["version"] !== 5 && value["version"] !== 6 || value["kind"] !== "verified") {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
-  const applicationId = value["applicationId"];
   const activation = value["activation"];
   const appId = value["appId"];
   const channelId = value["channelId"];
@@ -83316,12 +83308,11 @@ function decodeVerifiedConnection(value) {
   const relayOrigin = value["relayOrigin"];
   const runtimeCredential2 = value["runtimeCredential"];
   const runtimeId = value["runtimeId"];
-  if (typeof applicationId !== "string" || activation !== "active" && activation !== "stopped" || typeof appId !== "string" || typeof channelId !== "string" || typeof connectionId2 !== "string" || typeof defaultWorkspace !== "string" || typeof storedInstallationId !== "string" || typeof pairingId !== "string" || typeof relayOrigin !== "string" || typeof runtimeCredential2 !== "string" || typeof runtimeId !== "string") {
+  if (activation !== "active" && activation !== "stopped" || typeof appId !== "string" || typeof channelId !== "string" || typeof connectionId2 !== "string" || typeof defaultWorkspace !== "string" || typeof storedInstallationId !== "string" || typeof pairingId !== "string" || typeof relayOrigin !== "string" || typeof runtimeCredential2 !== "string" || typeof runtimeId !== "string") {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
   return new VerifiedRuntimeConnection(
     activation,
-    validateApplicationId(applicationId),
     validateRemoteAppId(appId),
     validateInstallationId(storedInstallationId),
     validateConnectionId(connectionId2),
@@ -83337,7 +83328,7 @@ function decodeConnection(value) {
   if (!isRecord8(value)) {
     throw new RuntimeInstallationStoreError("invalid_connection", "The saved Runtime connection is invalid");
   }
-  return decodeVerifiedConnection(value);
+  return decodeVerifiedConnection(value["version"] === 5 ? retainedFields(value, VERIFIED_CONNECTION_KEYS) : value);
 }
 async function readJsonFile2(path7, signal, missingCode) {
   signal.throwIfAborted();
@@ -83381,25 +83372,20 @@ async function writeJsonAtomically(path7, value, signal) {
   }
 }
 var RuntimeInstallationStore = class _RuntimeInstallationStore {
-  applicationId;
   installationId;
   stateDirectory;
   #connectionDirectory;
-  constructor(applicationId, installationId2, stateDirectory) {
-    this.applicationId = applicationId;
+  constructor(installationId2, stateDirectory) {
     this.installationId = installationId2;
     this.stateDirectory = stateDirectory;
     this.#connectionDirectory = connectionDirectory(stateDirectory);
   }
-  static open = async (options, signal) => {
+  static open = async (engineDataDir, signal) => {
     signal.throwIfAborted();
-    const applicationId = validateApplicationId(options.applicationId);
-    const rootDirectory = resolve15(options.stateDirectory);
-    const applicationDirectory2 = applicationDirectory(rootDirectory, applicationId);
+    const dataDirectory = resolve14(engineDataDir);
     try {
-      await ensurePrivateDirectory(rootDirectory);
-      await validateLocalPath(rootDirectory, true, true, signal);
-      await ensurePrivateDirectory(applicationDirectory2);
+      await ensurePrivateDirectory(dataDirectory);
+      await validateLocalPath(dataDirectory, true, true, signal);
     } catch (cause) {
       throw new RuntimeInstallationStoreError(
         "installation_unavailable",
@@ -83409,8 +83395,8 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
         }
       );
     }
-    const storedInstallationId = await readOrCreateInstallationId(applicationDirectory2, signal);
-    const stateDirectory = installationDirectory(applicationDirectory2, storedInstallationId);
+    const storedInstallationId = await readOrCreateInstallationId(dataDirectory, signal);
+    const stateDirectory = installationDirectory(dataDirectory, storedInstallationId);
     try {
       await ensurePrivateDirectory(stateDirectory);
     } catch (cause) {
@@ -83423,15 +83409,18 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
       );
     }
     signal.throwIfAborted();
-    return new _RuntimeInstallationStore(applicationId, storedInstallationId, stateDirectory);
+    return new _RuntimeInstallationStore(storedInstallationId, stateDirectory);
   };
   connectionPath = (connectionId2) => connectionFilePath(this.#connectionDirectory, validateConnectionId(connectionId2));
   channelIndexPath = (channelId) => channelIndexFilePath(this.stateDirectory, validateIdentifier(channelId, "invalid_channel_id"));
   readConnection = async (connectionId2, signal) => {
-    const stored = decodeConnection(
+    return this.decodeOwnedConnection(
       await readJsonFile2(this.connectionPath(connectionId2), signal, "connection_not_found")
     );
-    if (stored.applicationId !== this.applicationId || stored.installationId !== this.installationId) {
+  };
+  decodeOwnedConnection = (record2) => {
+    const stored = decodeConnection(record2);
+    if (stored.installationId !== this.installationId) {
       throw new RuntimeInstallationStoreError(
         "connection_owner_mismatch",
         "The saved Runtime connection belongs to another installation"
@@ -83444,7 +83433,7 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
     const index2 = decodeChannelIndex(
       await readJsonFile2(this.channelIndexPath(normalizedChannelId), signal, "connection_not_found")
     );
-    if (index2.applicationId !== this.applicationId || index2.installationId !== this.installationId || index2.channelId !== normalizedChannelId) {
+    if (index2.installationId !== this.installationId || index2.channelId !== normalizedChannelId) {
       throw new RuntimeInstallationStoreError(
         "connection_owner_mismatch",
         "The saved Runtime connection belongs to another installation"
@@ -83455,7 +83444,6 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
   saveConnection = async (input2, signal) => {
     const stored = new VerifiedRuntimeConnection(
       "active",
-      this.applicationId,
       validateRemoteAppId(input2.appId),
       this.installationId,
       connectionId(),
@@ -83486,11 +83474,10 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
     await writeJsonAtomically(
       this.channelIndexPath(stored.channelId),
       {
-        applicationId: this.applicationId,
         channelId: stored.channelId,
         connectionId: stored.connectionId,
         installationId: this.installationId,
-        version: 1
+        version: 2
       },
       signal
     );
@@ -83528,10 +83515,10 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
     return connections.find((connection) => connection.pairingId === normalizedPairingId) ?? null;
   };
   setConnectionActivation = async (connectionId2, activation, signal) => {
-    const connection = await this.readConnection(connectionId2, signal);
+    const record2 = await readJsonFile2(this.connectionPath(connectionId2), signal, "connection_not_found");
+    const connection = this.decodeOwnedConnection(record2);
     const updated = new VerifiedRuntimeConnection(
       activation,
-      connection.applicationId,
       connection.appId,
       connection.installationId,
       connection.connectionId,
@@ -83542,7 +83529,11 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
       connection.runtimeCredential,
       connection.runtimeId
     );
-    await this.overwriteConnection(updated, signal);
+    if (isRecord8(record2) && record2["version"] === 5) {
+      await writeJsonAtomically(this.connectionPath(connectionId2), { ...record2, activation }, signal);
+    } else {
+      await this.overwriteConnection(updated, signal);
+    }
     return updated;
   };
   removeConnection = async (connectionId2, signal) => {
@@ -83570,7 +83561,6 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
       connectionPath,
       {
         activation: connection.activation,
-        applicationId: connection.applicationId,
         appId: connection.appId,
         channelId: connection.channelId,
         connectionId: connection.connectionId,
@@ -83581,14 +83571,14 @@ var RuntimeInstallationStore = class _RuntimeInstallationStore {
         relayOrigin: connection.relayOrigin.toString(),
         runtimeCredential: connection.runtimeCredential,
         runtimeId: connection.runtimeId,
-        version: 5
+        version: 6
       },
       signal
     );
   };
 };
-async function readOrCreateInstallationId(applicationDirectory2, signal) {
-  const pointerPath = installationPointerPath(applicationDirectory2);
+async function readOrCreateInstallationId(engineDataDir, signal) {
+  const pointerPath = installationPointerPath(engineDataDir);
   try {
     return decodeInstallationPointer(await readJsonFile2(pointerPath, signal, "installation_not_found")).installationId;
   } catch (cause) {
@@ -83614,243 +83604,25 @@ async function readOrCreateInstallationId(applicationDirectory2, signal) {
     return decodeInstallationPointer(await readJsonFile2(pointerPath, signal, "installation_not_found")).installationId;
   }
 }
-async function openRuntimeInstallationStore(options, signal) {
-  return await RuntimeInstallationStore.open(options, signal);
+async function openRuntimeInstallationStore(engineDataDir, signal) {
+  return await RuntimeInstallationStore.open(engineDataDir, signal);
 }
 
-// src/daemon/pairing/pair-local-machine.ts
-var PAIRING_TIMEOUT_MILLISECONDS = 2e4;
-var PAIRING_CODE_PATTERN = /^[A-HJ-NP-Z2-9]{4}(?:-[A-HJ-NP-Z2-9]{4}){4}$/;
-var TOKEN_PATTERN = /^[a-zA-Z0-9_-]{32,256}$/;
-var CLAIM_RESPONSE_KEYS = ["appId", "channelId", "daemonToken", "runtimeId"];
-var REDEEM_RESPONSE_KEYS = ["appId", "channelId", "runtimeCredential", "runtimeId"];
-var PairingClientError = class extends Error {
-  code;
-  constructor(code, message, options = {}) {
-    super(message, options);
-    this.code = code;
-    this.name = "PairingClientError";
-  }
-};
-function hasExactKeys2(value, expectedKeys) {
-  const keys = Object.keys(value);
-  return keys.length === expectedKeys.length && expectedKeys.every((key) => Object.hasOwn(value, key));
-}
-function parseRelayOrigin2(value) {
-  let url2;
-  try {
-    url2 = new URL(value);
-  } catch (error62) {
-    throw new PairingClientError("invalid_relay_url", "The relay URL is invalid", { cause: error62 });
-  }
-  if (url2.protocol !== "https:" && url2.protocol !== "http:") {
-    throw new PairingClientError("invalid_relay_url", "The relay URL must use http or https");
-  }
-  if (url2.username.length > 0 || url2.password.length > 0) {
-    throw new PairingClientError("invalid_relay_url", "The relay URL cannot contain credentials");
-  }
-  if (url2.protocol === "http:" && url2.hostname !== "127.0.0.1" && url2.hostname !== "localhost") {
-    throw new PairingClientError("invalid_relay_url", "A remote relay must use https");
-  }
-  url2.hash = "";
-  url2.pathname = "/";
-  url2.search = "";
-  return url2;
-}
-function parsePairingCode(value) {
-  const code = value.trim().toUpperCase();
-  if (!PAIRING_CODE_PATTERN.test(code)) {
-    throw new PairingClientError(
-      "invalid_pairing_code",
-      "The pairing code must match the code shown in the browser"
-    );
-  }
-  return code;
-}
-function validatePairingId(value) {
-  if (!isIdentifier(value)) {
-    throw new PairingClientError("invalid_pairing_id", "The Runtime pairing ID is invalid");
-  }
-  return value;
-}
-async function resolveDefaultWorkspace(path7) {
-  const requestedWorkspace = resolve16(path7);
-  let defaultWorkspace;
-  try {
-    defaultWorkspace = await ensureCanonicalDirectory(requestedWorkspace);
-  } catch (error62) {
-    throw new PairingClientError("invalid_workspace", "The default workspace cannot be resolved", { cause: error62 });
-  }
-  if (defaultWorkspace === null) {
-    throw new PairingClientError("invalid_workspace", "The default workspace is not a directory");
-  }
-  return defaultWorkspace;
-}
-async function readJsonResponse(response) {
-  if (response.headers.get("cf-mitigated") === "challenge") {
-    throw new PairingClientError(
-      "relay_challenge",
-      "Cloudflare is protecting this temporary preview. Claim the deployment or use an authenticated deployment, then pair again"
-    );
-  }
-  const encoded = await response.text();
-  try {
-    return JSON.parse(encoded);
-  } catch (error62) {
-    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid response", {
-      cause: error62
-    });
-  }
-}
-function readRelayError(value) {
-  if (isRecord3(value)) {
-    const error62 = value["error"];
-    if (isRecord3(error62)) {
-      const code = error62["code"];
-      const message = error62["message"];
-      if (typeof code === "string" && typeof message === "string") {
-        return new PairingClientError(code, message);
-      }
-    }
-  }
-  return new PairingClientError("pairing_failed", "The relay could not pair this machine");
-}
-function decodePairingResponse(value, credentialField, expectedKeys) {
-  if (!isRecord3(value) || !hasExactKeys2(value, expectedKeys)) {
-    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
-  }
-  const appId = value["appId"];
-  const channelId = value["channelId"];
-  const runtimeCredential2 = value[credentialField];
-  const runtimeId = value["runtimeId"];
-  if (typeof appId !== "string" || !isIdentifier(appId) || typeof channelId !== "string" || !isIdentifier(channelId) || typeof runtimeCredential2 !== "string" || !TOKEN_PATTERN.test(runtimeCredential2) || typeof runtimeId !== "string" || !isIdentifier(runtimeId)) {
-    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
-  }
-  return { appId, channelId, runtimeCredential: runtimeCredential2, runtimeId };
-}
-async function claimPairing(options, defaultWorkspace, localAgents, signal) {
-  const agents = localAgents.map((agent) => ({
-    agentPath: agent.agentIdentity.requestedPath,
-    agentVersion: agent.agentVersion,
-    agentSettingsDiscovery: true,
-    capabilities: agent.capabilities,
-    id: agent.id,
-    label: agent.label,
-    sessionTurnConfiguration: true
-  }));
-  const endpoint = options.pairingId.length > 0 ? mobiusApiUrl(options.relayOrigin, `/v1/runtime-pairings/${encodeURIComponent(options.pairingId)}/redeem`) : mobiusApiUrl(options.relayOrigin, "/pairings/claim");
-  let response;
-  try {
-    response = await fetch3(endpoint, {
-      body: JSON.stringify({
-        agents,
-        machineName: hostname3(),
-        pairingCode: options.code,
-        workspaceName: basename6(defaultWorkspace) || "Local workspace"
-      }),
-      dispatcher: environmentProxyDispatcher,
-      headers: { "content-type": "application/json" },
-      method: "POST",
-      signal: AbortSignal.any([signal, AbortSignal.timeout(PAIRING_TIMEOUT_MILLISECONDS)])
-    });
-  } catch (error62) {
-    throw new PairingClientError("relay_unavailable", "The pairing relay could not be reached", { cause: error62 });
-  }
-  const value = await readJsonResponse(response);
-  if (!response.ok) {
-    throw readRelayError(value);
-  }
-  return options.pairingId.length > 0 ? decodePairingResponse(value, "runtimeCredential", REDEEM_RESPONSE_KEYS) : decodePairingResponse(value, "daemonToken", CLAIM_RESPONSE_KEYS);
-}
-function buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext) {
-  const relayUrl = mobiusApiUrl(connection.relayOrigin, "/v1/runtimes/connect");
-  relayUrl.protocol = relayUrl.protocol === "https:" ? "wss:" : "ws:";
-  relayUrl.searchParams.set("token", connection.runtimeCredential);
-  const config2 = createRuntimeConfig(
-    {
-      defaultWorkspace,
-      channelId: connection.channelId,
-      relayUrl
-    },
-    new RuntimeAgentDependencies(inventory.readyAgents()),
-    localContext,
-    new OpaqueRuntimeReconnectTarget(connection.connectionId),
-    createCatalogAgentResolver(
-      (refreshSignal) => discoverLocalAgentInventory({
-        defaultWorkspace,
-        dataDirectory: localContext.stateDirectory,
-        environment: localContext.environment,
-        signal: refreshSignal
-      }),
-      () => config2,
-      publishAgentCatalog
-    ),
-    (refreshSignal) => discoverLocalAgentInventory({
-      defaultWorkspace,
-      dataDirectory: localContext.stateDirectory,
-      environment: localContext.environment,
-      signal: refreshSignal
-    }).then((inventory2) => inventory2.readyAgents())
-  );
-  return {
-    channelUrl: new URL(`/channels/${encodeURIComponent(connection.channelId)}`, connection.relayOrigin).toString(),
-    connectionId: connection.connectionId,
-    config: config2,
-    connectionPath: installation.connectionPath(connection.connectionId)
-  };
-}
-async function pairRuntime(installation, options, signal, environment) {
-  const localContext = new RuntimeLocalContext(installation.stateDirectory, environment);
-  const defaultWorkspace = await resolveDefaultWorkspace(options.workspace);
-  const inventory = await discoverLocalAgentInventory({
-    defaultWorkspace,
-    dataDirectory: localContext.stateDirectory,
-    environment: localContext.environment,
-    signal
-  });
-  const claim2 = await claimPairing(options, defaultWorkspace, inventory.readyAgents(), signal);
-  const connection = await installation.saveConnection(
-    {
-      appId: claim2.appId,
-      channelId: claim2.channelId,
-      defaultWorkspace,
-      pairingId: options.pairingId,
-      relayOrigin: options.relayOrigin,
-      runtimeCredential: claim2.runtimeCredential,
-      runtimeId: claim2.runtimeId
-    },
-    signal
-  );
-  return buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext);
-}
-async function pairMobiusRuntime(installation, options, signal, environment = process.env) {
-  return await pairRuntime(
-    installation,
-    {
-      code: parsePairingCode(options.pairingCode),
-      pairingId: validatePairingId(options.pairingId),
-      relayOrigin: parseRelayOrigin2(options.relayOrigin),
-      workspace: options.defaultWorkspace
-    },
-    signal,
-    environment
-  );
-}
-async function resumeRuntimeConnection(installation, connection, signal, environment) {
-  const localContext = new RuntimeLocalContext(installation.stateDirectory, environment);
-  const defaultWorkspace = await resolveDefaultWorkspace(connection.defaultWorkspace);
-  const inventory = await discoverLocalAgentInventory({
-    defaultWorkspace,
-    dataDirectory: localContext.stateDirectory,
-    environment: localContext.environment,
-    signal
-  });
-  return buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext);
-}
-async function resumeMobiusRuntime(installation, connectionId2, signal, environment = process.env) {
-  const connection = await installation.readConnection(connectionId2, signal);
-  return await resumeRuntimeConnection(installation, connection, signal, environment);
-}
+// 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/state-directory.ts
+var stateRootSchema = external_exports.string().brand();
 
 // src/engine/runtime/run.ts
 import { styleText } from "node:util";
@@ -87273,6 +87045,32 @@ var ExecutionReceipts = class {
     const receipt = this.#executions.get(commandId);
     return receipt?.outcome === null || receipt === void 0 ? void 0 : decodeKnownSessionEventPayload(JSON.parse(receipt.outcome)) ?? void 0;
   };
+  /** The command's delivery as these receipts know it; another Session's command reads as unknown. */
+  delivery = (commandId, sessionId) => {
+    const receipt = this.#executions.get(commandId);
+    if (receipt === void 0) {
+      return this.#table.identity(commandId)?.sessionId === sessionId ? { state: "expired" } : { state: "unknown" };
+    }
+    if (receipt.sessionId !== sessionId) {
+      return { state: "unknown" };
+    }
+    if (receipt.outcome === null) {
+      return { state: "accepted" };
+    }
+    const outcome = this.outcome(commandId);
+    if (outcome?.type !== "lifecycle-metadata") {
+      return { state: "expired" };
+    }
+    switch (outcome.payload.kind) {
+      case "prompt.completed":
+        return { state: "completed", stopReason: outcome.payload.stopReason };
+      case "prompt.failed":
+      case "prompt.failed-before-start":
+        return { code: outcome.payload.code, state: "failed" };
+      default:
+        return { state: "expired" };
+    }
+  };
   /** Reserves an unseen command for cancellation before a delayed prompt can claim its identity. */
   recordCancellationBeforeAdmission = (commandId, sessionId) => {
     const existing = this.#executions.get(commandId);
@@ -87450,8 +87248,8 @@ var RuntimeTurnActivity = class {
   #changed() {
     this.#changedAt = Date.now();
     if (this.count() === 0) {
-      for (const resolve18 of this.#idleWaiters) {
-        resolve18();
+      for (const resolve17 of this.#idleWaiters) {
+        resolve17();
       }
       this.#idleWaiters.clear();
     }
@@ -87461,14 +87259,14 @@ var RuntimeTurnActivity = class {
     if (this.count() === 0) {
       return Promise.resolve();
     }
-    return new Promise((resolve18, reject2) => {
+    return new Promise((resolve17, reject2) => {
       const abort = () => {
         this.#idleWaiters.delete(idle);
         reject2(signal.reason);
       };
       const idle = () => {
         signal.removeEventListener("abort", abort);
-        resolve18();
+        resolve17();
       };
       this.#idleWaiters.add(idle);
       signal.addEventListener("abort", abort, { once: true });
@@ -87598,7 +87396,7 @@ var ActiveRuntimeTurn = class {
 // src/engine/session/turn/session-execution.ts
 var waitForTurnCompletion = (turn, waitSignal) => {
   waitSignal.throwIfAborted();
-  return new Promise((resolve18, reject2) => {
+  return new Promise((resolve17, reject2) => {
     let settled = false;
     const finish = (result) => {
       if (settled) {
@@ -87607,7 +87405,7 @@ var waitForTurnCompletion = (turn, waitSignal) => {
       settled = true;
       waitSignal.removeEventListener("abort", onAbort);
       if (result.kind === "completed") {
-        resolve18();
+        resolve17();
       } else {
         reject2(result.error);
       }
@@ -87789,8 +87587,8 @@ var SessionTurns = class {
 };
 
 // src/engine/session/workspace/workspace-directory.ts
-import { homedir as homedir4 } from "node:os";
-import { basename as basename7, dirname as dirname10, isAbsolute as isAbsolute15, join as join27, normalize as normalize2, relative as relative2 } from "node:path";
+import { homedir as homedir3 } from "node:os";
+import { basename as basename6, dirname as dirname10, isAbsolute as isAbsolute15, join as join24, normalize as normalize2, relative as relative2 } from "node:path";
 var WorkspaceDirectoryListing = class {
   directoryId;
   directoryLabel;
@@ -87811,7 +87609,7 @@ function encodePath(path7) {
   return `path-${encoded}`;
 }
 function expandCurrentUserHome(path7) {
-  return path7.replace(/^~(?=$|\/|\\)/, homedir4());
+  return path7.replace(/^~(?=$|\/|\\)/, homedir3());
 }
 function decodePath(value, prefix) {
   const encoded = value.slice(prefix.length);
@@ -87842,7 +87640,7 @@ var WorkspaceDirectoryService = class {
       return this.#defaultWorkspace;
     }
     if (id === "home") {
-      return homedir4();
+      return homedir3();
     }
     if (id.startsWith("path-")) {
       const path7 = expandCurrentUserHome(decodePath(id, "path-"));
@@ -87877,7 +87675,7 @@ var WorkspaceDirectoryService = class {
     }
   };
   label = (path7) => {
-    const suffix = relative2(homedir4(), path7);
+    const suffix = relative2(homedir3(), path7);
     return suffix === "" ? "~" : !isAbsolute15(suffix) && suffix !== ".." && !suffix.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) ? `~/${suffix.replaceAll("\\", "/")}` : path7;
   };
   identify = async (bindingId, requestedPath2, signal) => {
@@ -87886,7 +87684,7 @@ var WorkspaceDirectoryService = class {
     return {
       path: path7,
       directoryId: encodePath(path7),
-      name: basename7(path7) || path7,
+      name: basename6(path7) || path7,
       label: this.label(path7)
     };
   };
@@ -87912,7 +87710,7 @@ var WorkspaceDirectoryService = class {
           continue;
         }
         try {
-          const path7 = await this.resolvePath(join27(target, child.name), signal);
+          const path7 = await this.resolvePath(join24(target, child.name), signal);
           entries.push({ directoryId: encodePath(path7), name: child.name });
         } catch (cause) {
           signal.throwIfAborted();
@@ -88026,20 +87824,23 @@ function buildSessionLayer(options) {
     resolveAgent,
     directories,
     manager,
-    async (request, requestOptions) => await activeSessions.executionSnapshot(async (command) => {
-      if (command.sessionId !== request.targetSessionId || command.agentId !== request.agentId) {
-        return false;
-      }
-      const cwd = await directories.resolve(command.bindingId, command.directoryId, requestOptions.signal);
-      const additionalDirectories = await directories.resolveMany(
-        command.bindingId,
-        command.additionalDirectoryIds,
-        requestOptions.signal
-      );
-      return cwd === requestOptions.cwd && additionalDirectories.length === requestOptions.additionalDirectories.length && additionalDirectories.every(
-        (directory, index2) => directory === requestOptions.additionalDirectories[index2]
-      );
-    })
+    async (request, requestOptions) => {
+      const snapshot = await activeSessions.executionSnapshot(async (command) => {
+        if (command.sessionId !== request.targetSessionId || command.agentId !== request.agentId) {
+          return false;
+        }
+        const cwd = await directories.resolve(command.bindingId, command.directoryId, requestOptions.signal);
+        const additionalDirectories = await directories.resolveMany(
+          command.bindingId,
+          command.additionalDirectoryIds,
+          requestOptions.signal
+        );
+        return cwd === requestOptions.cwd && additionalDirectories.length === requestOptions.additionalDirectories.length && additionalDirectories.every(
+          (directory, index2) => directory === requestOptions.additionalDirectories[index2]
+        );
+      });
+      return request.deliveryCommandId === void 0 ? snapshot : { ...snapshot, command: operations.delivery(request.deliveryCommandId, request.targetSessionId) };
+    }
   );
   const recoveredEvents = operations.recover().map(({ sessionId, event, recordedAt }) => events.append(sessionId, event, recordedAt));
   return {
@@ -88060,12 +87861,12 @@ function buildSessionLayer(options) {
 
 // src/engine/session/content/external-content-store.ts
 import { createHash as createHash7 } from "node:crypto";
-import { join as join29 } from "node:path";
+import { join as join26 } from "node:path";
 
 // src/engine/storage/files/scratch-directory.ts
 import { randomUUID as randomUUID17 } from "node:crypto";
 import { lstat as lstat4, mkdir as mkdir5, readdir as readdir6, readFile as readFile6, realpath as realpath7, rename as rename4, rm as rm3, stat as stat6, utimes, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname11, join as join28 } from "node:path";
+import { dirname as dirname11, join as join25 } from "node:path";
 async function atomicWrite(path7, bytes, signal) {
   const temporary = `${path7}.${randomUUID17()}.tmp`;
   try {
@@ -88079,7 +87880,7 @@ async function atomicWrite(path7, bytes, signal) {
 var ScratchDirectory = class {
   #root;
   constructor(parent) {
-    this.#root = join28(parent, randomUUID17());
+    this.#root = join25(parent, randomUUID17());
   }
   /** Refreshes this directory's lease and removes sibling directories whose lease is older than `leaseMilliseconds`. */
   refreshLease = async (leaseMilliseconds) => {
@@ -88090,7 +87891,7 @@ var ScratchDirectory = class {
       if (!directory.isDirectory() || !/^[a-f0-9-]{36}$/u.test(directory.name)) {
         continue;
       }
-      const path7 = join28(dirname11(this.#root), directory.name);
+      const path7 = join25(dirname11(this.#root), directory.name);
       if (path7 === this.#root) {
         continue;
       }
@@ -88105,10 +87906,10 @@ var ScratchDirectory = class {
   };
   /** Writes `bytes` atomically to `<group>/<name>` with owner-only permissions and returns the path. */
   write = async (group, name2, bytes, signal) => {
-    const directory = join28(this.#root, group);
+    const directory = join25(this.#root, group);
     await mkdir5(directory, { mode: 448, recursive: true });
     signal.throwIfAborted();
-    const path7 = join28(directory, name2);
+    const path7 = join25(directory, name2);
     await atomicWrite(path7, bytes, signal);
     return path7;
   };
@@ -88155,7 +87956,7 @@ var LocalExternalContentStore = class {
   #expirationTimer;
   #cleanup = Promise.resolve();
   constructor(stateDirectory) {
-    this.#scratch = new ScratchDirectory(join29(stateDirectory, "tmp", "session-content"));
+    this.#scratch = new ScratchDirectory(join26(stateDirectory, "tmp", "session-content"));
     this.#expirationTimer = setInterval(() => {
       void this.#expire().catch(() => void 0);
     }, 6e4);
@@ -88353,18 +88154,6 @@ async function waitForAcpProcessCapacity(completion, signal) {
 var DEFAULT_MAX_ACP_PROCESSES = 1e3;
 var MAX_CONCURRENT_STARTS = 8;
 var ACP_PROCESS_IDLE_TIMEOUT_MILLISECONDS = 2 * 60 * 60 * 1e3;
-var MAX_ACP_PROCESSES_ENVIRONMENT_KEY = "MOBIUS_MAX_ACP_PROCESSES";
-function resolveMaxAcpProcesses(environment) {
-  const configured = environment[MAX_ACP_PROCESSES_ENVIRONMENT_KEY];
-  if (configured === void 0 || configured === "") {
-    return DEFAULT_MAX_ACP_PROCESSES;
-  }
-  const parsed = Number(configured);
-  if (!Number.isInteger(parsed) || parsed < 1) {
-    throw new Error(`${MAX_ACP_PROCESSES_ENVIRONMENT_KEY} must be a positive integer`);
-  }
-  return parsed;
-}
 var AgentProcessPool = class {
   #maxProcesses;
   #timer;
@@ -88538,11 +88327,11 @@ var AgentProcessPool = class {
 };
 
 // src/engine/runtime/observability/diagnostic-log.ts
-import { join as join32 } from "node:path";
+import { join as join29 } from "node:path";
 
 // src/engine/storage/logs/bounded-log.ts
 import { appendFileSync as appendFileSync2, mkdirSync as mkdirSync4, readFileSync as readFileSync9, renameSync as renameSync2, statSync as statSync5, writeFileSync as writeFileSync2 } from "node:fs";
-import { join as join30 } from "node:path";
+import { join as join27 } from "node:path";
 var BoundedLineLog = class {
   #path;
   #maximumBytes;
@@ -88551,7 +88340,7 @@ var BoundedLineLog = class {
   #onWriteFailure;
   constructor(directory, filename, maximumBytes, onWriteFailure = () => void 0) {
     this.#directory = directory;
-    this.#path = join30(directory, filename);
+    this.#path = join27(directory, filename);
     this.#maximumBytes = maximumBytes;
     this.#onWriteFailure = onWriteFailure;
   }
@@ -88602,21 +88391,21 @@ var BoundedLineLog = class {
 
 // src/engine/storage/logs/log-files.ts
 import { readFileSync as readFileSync10 } from "node:fs";
-import { join as join31, relative as relative3 } from "node:path";
+import { join as join28 } from "node:path";
 var DAEMON_LOG_FILENAME = "daemon.log";
 var WORKER_LIFECYCLE_LOG_FILENAME = "worker-lifecycle.log";
 function unhandledRejectionLogFilename(role) {
   return `unhandled-rejections-${role}.log`;
 }
-function logDirectory(stateDirectory) {
-  return join31(stateDirectory, "logs");
+function logDirectory(dataDirectory) {
+  return join28(dataDirectory, "logs");
 }
-function processLogPaths(stateDirectory) {
+function processLogPaths(dataDirectory) {
   return [
     WORKER_LIFECYCLE_LOG_FILENAME,
     unhandledRejectionLogFilename("manager"),
     unhandledRejectionLogFilename("worker")
-  ].map((filename) => join31(logDirectory(stateDirectory), filename));
+  ].map((filename) => join28(logDirectory(dataDirectory), filename));
 }
 function readLogText(path7) {
   try {
@@ -88672,7 +88461,7 @@ var RuntimeDiagnosticLog = class {
     this.#maximumBytes = maximumBytes;
     const processLogsDirectory = options.processLogsDirectory;
     this.#sources = [
-      { maximumBytes, path: join32(directory, DAEMON_LOG_FILENAME) },
+      { maximumBytes, path: join29(directory, DAEMON_LOG_FILENAME) },
       // The process logs a Runtime does not own, but must read to explain its own deaths.
       ...processLogsDirectory === void 0 ? [] : processLogPaths(processLogsDirectory).map((path7) => ({ maximumBytes: null, path: path7 }))
     ];
@@ -88785,6 +88574,8 @@ function addFailureDetails(details, failure2) {
   }
 }
 var RelayConnectionDiagnostics = class {
+  #lastSkippedLogAt = Number.NEGATIVE_INFINITY;
+  #skippedCount = 0;
   #channelId;
   #localLog;
   #lastClosedEpoch = 0;
@@ -88859,6 +88650,16 @@ var RelayConnectionDiagnostics = class {
     );
   };
   daemonDiagnostic = (event, requestId, details, failure2) => {
+    if (event === "protocol_message_discarded" || event === "content_frame_discarded" || event === "content_chunk_discarded" || event === "prompt_attachments_skipped") {
+      this.#skippedCount += 1;
+      const now = Date.now();
+      if (now - this.#lastSkippedLogAt < 6e4) {
+        return;
+      }
+      details = { ...details, skippedCount: this.#skippedCount.toString() };
+      this.#lastSkippedLogAt = now;
+      this.#skippedCount = 0;
+    }
     const recordedDetails = { ...details };
     if (failure2 !== void 0) {
       addFailureDetails(recordedDetails, failure2);
@@ -88930,7 +88731,7 @@ async function refreshAgentCatalog(config2, discover, signal) {
   const readyAgents = await discover(signal);
   signal.throwIfAborted();
   return await config2.catalog.replaceAndPublish(
-    () => readyAgents.map((agent) => withRuntimeEnvironment(agent, config2.localContext.environment)),
+    () => readyAgents.map((agent) => withRuntimeEnvironment(agent, config2.localContext.agentLaunchEnvironment)),
     (publishSignal) => publishAgentCatalog(config2, publishSignal),
     signal
   );
@@ -89655,7 +89456,7 @@ function createContentWriteCommands(context) {
 import { WebSocket as WebSocket5 } from "undici";
 
 // src/engine/session/content/session-files.ts
-import { basename as basename8, extname as extname3, isAbsolute as isAbsolute16, join as join33, normalize as normalize3, resolve as resolve17 } from "node:path";
+import { basename as basename7, extname as extname3, isAbsolute as isAbsolute16, join as join30, normalize as normalize3, resolve as resolve15 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function requestedPath(value) {
   if (value.includes("\0")) {
@@ -89679,7 +89480,7 @@ async function resolveFile(value, workingDirectory, signal) {
   if (isAbsolute16(requested.path) && normalize3(requested.path) !== requested.path) {
     return null;
   }
-  const candidates = requested.explicitUrl || workingDirectory === null ? [requested.path] : isAbsolute16(requested.path) ? [join33(workingDirectory, requested.path), requested.path] : [resolve17(workingDirectory, requested.path)];
+  const candidates = requested.explicitUrl || workingDirectory === null ? [requested.path] : isAbsolute16(requested.path) ? [join30(workingDirectory, requested.path), requested.path] : [resolve15(workingDirectory, requested.path)];
   for (const candidate of candidates) {
     if (!isAbsolute16(candidate) || normalize3(candidate) !== candidate) {
       continue;
@@ -89713,7 +89514,7 @@ async function streamLocalFile(command, send2, sendChunk, signal, workingDirecto
     kind: FILE_BEGIN_KIND,
     mediaType: external?.mediaType ?? raster?.mimeType ?? (extname3(target).toLowerCase() === ".svg" ? "image/svg+xml" : "application/octet-stream"),
     modifiedAt: before.modifiedAt.toISOString(),
-    name: external?.name ?? (basename8(target) || "file"),
+    name: external?.name ?? (basename7(target) || "file"),
     requestId: command.requestId,
     sessionId: command.sessionId
   });
@@ -89764,7 +89565,7 @@ var fileReadCommand = {
 };
 
 // src/engine/session/workspace/resolve-session-directories.ts
-import { basename as basename9 } from "node:path";
+import { basename as basename8 } from "node:path";
 var ResolvedSessionDirectories = class {
   additionalDirectories;
   additionalDirectoryEntries;
@@ -89792,7 +89593,7 @@ async function resolveSessionDirectories(directories, bindingId, directoryId, ad
     additionalDirectories.push(directory);
     additionalDirectoryEntries.push({
       directoryId: additionalDirectoryId,
-      name: basename9(directory)
+      name: basename8(directory)
     });
   }
   return new ResolvedSessionDirectories(cwd, selection.label, additionalDirectories, additionalDirectoryEntries);
@@ -90134,13 +89935,13 @@ function createNativeSessionRequestHandler(dependencies) {
         operationSignal.throwIfAborted();
         const skipPrevious = command.action === "active-turn";
         if (previous.length > 0 && !skipPrevious) {
-          await new Promise((resolve18, reject2) => {
+          await new Promise((resolve17, reject2) => {
             const onAbort = () => reject2(operationSignal.reason);
             operationSignal.addEventListener("abort", onAbort, { once: true });
             void Promise.all(previous.map((request) => request.completion)).then(
               () => {
                 operationSignal.removeEventListener("abort", onAbort);
-                resolve18();
+                resolve17();
               },
               (error62) => {
                 operationSignal.removeEventListener("abort", onAbort);
@@ -90459,10 +90260,7 @@ async function resolvePromptArtifacts(read, attachments, signal) {
     }
     if (attachment.kind === "image") {
       if (bytes.byteLength > PROMPT_IMAGE_MAX_BYTES || images.length >= 8) {
-        throw new PromptArtifactError(
-          "artifact_too_large_for_agent",
-          "The prompt attachment exceeds the Agent image limit"
-        );
+        continue;
       }
       images.push({
         data: Buffer.from(bytes).toString("base64"),
@@ -90472,28 +90270,17 @@ async function resolvePromptArtifacts(read, attachments, signal) {
       continue;
     }
     if (!isTextMediaType(attachment.mimeType)) {
-      throw new PromptArtifactError(
-        "artifact_media_type_unsupported",
-        "The Agent cannot consume this prompt attachment media type"
-      );
+      continue;
     }
     if (bytes.byteLength > MAX_AGENT_RESOURCE_BYTE_LENGTH || resources.length >= 16) {
-      throw new PromptArtifactError(
-        "artifact_too_large_for_agent",
-        "The prompt attachment exceeds the Agent resource limit"
-      );
+      continue;
     }
     let text2;
     try {
       text2 = new TextDecoder("utf-8", { fatal: true }).decode(bytes);
-    } catch (cause) {
-      throw new PromptArtifactError(
-        "artifact_encoding_invalid",
-        "The prompt attachment is not valid UTF-8 text",
-        {
-          cause
-        }
-      );
+    } catch {
+      signal.throwIfAborted();
+      continue;
     }
     resources.push({ mimeType: attachment.mimeType, text: text2, type: "embedded", uri: attachment.uri });
   }
@@ -90585,6 +90372,13 @@ async function executePrompt({
       availability.disposition
     );
     const attachments = await resolvePromptArtifacts(readArtifact, command.attachments, signal);
+    const skipped = command.attachments.length - attachments.images.length - attachments.resources.length;
+    if (skipped > 0) {
+      reportFailure("prompt_attachments_skipped", command.commandId, { count: skipped.toString() });
+    }
+    if (command.prompt.trim().length === 0 && attachments.images.length === 0 && attachments.resources.length === 0) {
+      throw new PromptArtifactError("prompt_attachments_unsupported", "No supported prompt content remains");
+    }
     let stopReason;
     if (availability.disposition === SessionPromptDisposition.Steer) {
       await sessions.steerPrompt({
@@ -91184,7 +90978,21 @@ function createCommandRegistry(context) {
       }
       command.handle(context, message);
     },
-    dispatchChunk: (message) => contentWrites.receiveChunk(decodeContentChunkFrame(message)),
+    dispatchChunk: (message) => {
+      const frame = (() => {
+        try {
+          return decodeContentChunkFrame(message);
+        } catch {
+          context.diagnostics.daemonDiagnostic("content_frame_discarded", "unknown", {
+            reason: "unsupported_frame"
+          });
+          return null;
+        }
+      })();
+      if (frame !== null) {
+        contentWrites.receiveChunk(frame);
+      }
+    },
     settle: async () => {
       await Promise.all([
         contentWrites.settle(),
@@ -91234,7 +91042,7 @@ var RelayConnectionError = class extends Error {
 };
 function connectRelay(url2, signal) {
   signal.throwIfAborted();
-  return new Promise((resolve18, reject2) => {
+  return new Promise((resolve17, reject2) => {
     let dispatchController;
     const dispatcher = environmentProxyDispatcher.compose((dispatch) => (options, handler) => {
       const trackedHandler = Object.create(handler);
@@ -91320,7 +91128,7 @@ function connectRelay(url2, signal) {
       }
       finished = true;
       cleanup();
-      resolve18({ release, socket });
+      resolve17({ release, socket });
     };
     function onTimeout() {
       fail(
@@ -91496,7 +91304,7 @@ async function runRelayConnection({
     }
   });
   try {
-    await new Promise((resolve18, reject2) => {
+    await new Promise((resolve17, reject2) => {
       let finished = false;
       let ready = false;
       const cleanup = () => {
@@ -91514,7 +91322,7 @@ async function runRelayConnection({
         }
         finished = true;
         cleanup();
-        resolve18();
+        resolve17();
       };
       const rejectConnection = (failure2) => {
         if (finished) {
@@ -91601,6 +91409,9 @@ async function runRelayConnection({
         try {
           const message = decodeKnownServiceToDaemonMessage(encoded);
           if (message === null) {
+            diagnostics.daemonDiagnostic("protocol_message_discarded", "unknown", {
+              reason: "unsupported_message"
+            });
             return;
           }
           const kind = message.kind;
@@ -91823,12 +91634,12 @@ function waitForRelayRetry(signal, timer) {
   if (signal.aborted) {
     return Promise.resolve();
   }
-  return new Promise((resolve18) => {
+  return new Promise((resolve17) => {
     const retry = timer.schedule(finish, RELAY_RECONNECT_DELAY_MILLISECONDS);
     function finish() {
       retry.cancel();
       signal.removeEventListener("abort", finish);
-      resolve18();
+      resolve17();
     }
     signal.addEventListener("abort", finish, { once: true });
   });
@@ -91871,7 +91682,7 @@ async function runRuntime(config2, parentSignal, timer = systemTimer, options =
     );
     const publisher = new RuntimeSessionEventPublisher(timer);
     const externalContent = __using(_stack, new LocalExternalContentStore(stateDirectory), true);
-    const processes = new AgentProcessPool(resolveMaxAcpProcesses(config2.localContext.environment) ?? void 0, timer);
+    const processes = new AgentProcessPool(config2.localContext.maxAcpProcesses, timer);
     const adapters = createRuntimeAdapterRegistry(
       config2.adapters,
       processes,
@@ -92073,6 +91884,261 @@ var MobiusRuntimeEngine = class {
     }
   };
 };
+
+// src/daemon/config.ts
+function resolveMaxAcpProcesses(environment) {
+  const configured = environment["MOBIUS_MAX_ACP_PROCESSES"];
+  if (configured === void 0 || configured === "") {
+    return 1e3;
+  }
+  const parsed = Number(configured);
+  if (!Number.isInteger(parsed) || parsed < 1) {
+    throw new Error("MOBIUS_MAX_ACP_PROCESSES must be a positive integer");
+  }
+  return parsed;
+}
+
+// src/daemon/pairing/pair-local-machine.ts
+var PAIRING_TIMEOUT_MILLISECONDS = 2e4;
+var PAIRING_CODE_PATTERN = /^[A-HJ-NP-Z2-9]{4}(?:-[A-HJ-NP-Z2-9]{4}){4}$/;
+var TOKEN_PATTERN = /^[a-zA-Z0-9_-]{32,256}$/;
+var CLAIM_RESPONSE_KEYS = ["appId", "channelId", "daemonToken", "runtimeId"];
+var REDEEM_RESPONSE_KEYS = ["appId", "channelId", "runtimeCredential", "runtimeId"];
+var PairingClientError = class extends Error {
+  code;
+  constructor(code, message, options = {}) {
+    super(message, options);
+    this.code = code;
+    this.name = "PairingClientError";
+  }
+};
+function hasExactKeys2(value, expectedKeys) {
+  const keys = Object.keys(value);
+  return keys.length === expectedKeys.length && expectedKeys.every((key) => Object.hasOwn(value, key));
+}
+function parseRelayOrigin2(value) {
+  let url2;
+  try {
+    url2 = new URL(value);
+  } catch (error62) {
+    throw new PairingClientError("invalid_relay_url", "The relay URL is invalid", { cause: error62 });
+  }
+  if (url2.protocol !== "https:" && url2.protocol !== "http:") {
+    throw new PairingClientError("invalid_relay_url", "The relay URL must use http or https");
+  }
+  if (url2.username.length > 0 || url2.password.length > 0) {
+    throw new PairingClientError("invalid_relay_url", "The relay URL cannot contain credentials");
+  }
+  if (url2.protocol === "http:" && url2.hostname !== "127.0.0.1" && url2.hostname !== "localhost") {
+    throw new PairingClientError("invalid_relay_url", "A remote relay must use https");
+  }
+  url2.hash = "";
+  url2.pathname = "/";
+  url2.search = "";
+  return url2;
+}
+function parsePairingCode(value) {
+  const code = value.trim().toUpperCase();
+  if (!PAIRING_CODE_PATTERN.test(code)) {
+    throw new PairingClientError(
+      "invalid_pairing_code",
+      "The pairing code must match the code shown in the browser"
+    );
+  }
+  return code;
+}
+function validatePairingId(value) {
+  if (!isIdentifier(value)) {
+    throw new PairingClientError("invalid_pairing_id", "The Runtime pairing ID is invalid");
+  }
+  return value;
+}
+async function resolveDefaultWorkspace(path7) {
+  const requestedWorkspace = resolve16(path7);
+  let defaultWorkspace;
+  try {
+    defaultWorkspace = await ensureCanonicalDirectory(requestedWorkspace);
+  } catch (error62) {
+    throw new PairingClientError("invalid_workspace", "The default workspace cannot be resolved", { cause: error62 });
+  }
+  if (defaultWorkspace === null) {
+    throw new PairingClientError("invalid_workspace", "The default workspace is not a directory");
+  }
+  return defaultWorkspace;
+}
+async function readJsonResponse(response) {
+  if (response.headers.get("cf-mitigated") === "challenge") {
+    throw new PairingClientError(
+      "relay_challenge",
+      "Cloudflare is protecting this temporary preview. Claim the deployment or use an authenticated deployment, then pair again"
+    );
+  }
+  const encoded = await response.text();
+  try {
+    return JSON.parse(encoded);
+  } catch (error62) {
+    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid response", {
+      cause: error62
+    });
+  }
+}
+function readRelayError(value) {
+  if (isRecord3(value)) {
+    const error62 = value["error"];
+    if (isRecord3(error62)) {
+      const code = error62["code"];
+      const message = error62["message"];
+      if (typeof code === "string" && typeof message === "string") {
+        return new PairingClientError(code, message);
+      }
+    }
+  }
+  return new PairingClientError("pairing_failed", "The relay could not pair this machine");
+}
+function decodePairingResponse(value, credentialField, expectedKeys) {
+  if (!isRecord3(value) || !hasExactKeys2(value, expectedKeys)) {
+    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
+  }
+  const appId = value["appId"];
+  const channelId = value["channelId"];
+  const runtimeCredential2 = value[credentialField];
+  const runtimeId = value["runtimeId"];
+  if (typeof appId !== "string" || !isIdentifier(appId) || typeof channelId !== "string" || !isIdentifier(channelId) || typeof runtimeCredential2 !== "string" || !TOKEN_PATTERN.test(runtimeCredential2) || typeof runtimeId !== "string" || !isIdentifier(runtimeId)) {
+    throw new PairingClientError("invalid_relay_response", "The relay returned an invalid pairing response");
+  }
+  return { appId, channelId, runtimeCredential: runtimeCredential2, runtimeId };
+}
+async function claimPairing(options, defaultWorkspace, localAgents, signal) {
+  const agents = localAgents.map((agent) => ({
+    agentPath: agent.agentIdentity.requestedPath,
+    agentVersion: agent.agentVersion,
+    agentSettingsDiscovery: true,
+    capabilities: agent.capabilities,
+    id: agent.id,
+    label: agent.label,
+    sessionTurnConfiguration: true
+  }));
+  const endpoint = options.pairingId.length > 0 ? mobiusApiUrl(options.relayOrigin, `/v1/runtime-pairings/${encodeURIComponent(options.pairingId)}/redeem`) : mobiusApiUrl(options.relayOrigin, "/pairings/claim");
+  let response;
+  try {
+    response = await fetch3(endpoint, {
+      body: JSON.stringify({
+        agents,
+        machineName: hostname3(),
+        pairingCode: options.code,
+        workspaceName: basename9(defaultWorkspace) || "Local workspace"
+      }),
+      dispatcher: environmentProxyDispatcher,
+      headers: { "content-type": "application/json" },
+      method: "POST",
+      signal: AbortSignal.any([signal, AbortSignal.timeout(PAIRING_TIMEOUT_MILLISECONDS)])
+    });
+  } catch (error62) {
+    throw new PairingClientError("relay_unavailable", "The pairing relay could not be reached", { cause: error62 });
+  }
+  const value = await readJsonResponse(response);
+  if (!response.ok) {
+    throw readRelayError(value);
+  }
+  return options.pairingId.length > 0 ? decodePairingResponse(value, "runtimeCredential", REDEEM_RESPONSE_KEYS) : decodePairingResponse(value, "daemonToken", CLAIM_RESPONSE_KEYS);
+}
+function buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext) {
+  const relayUrl = mobiusApiUrl(connection.relayOrigin, "/v1/runtimes/connect");
+  relayUrl.protocol = relayUrl.protocol === "https:" ? "wss:" : "ws:";
+  relayUrl.searchParams.set("token", connection.runtimeCredential);
+  const config2 = createRuntimeConfig(
+    {
+      defaultWorkspace,
+      channelId: connection.channelId,
+      relayUrl
+    },
+    new RuntimeAgentDependencies(inventory.readyAgents()),
+    localContext,
+    new OpaqueRuntimeReconnectTarget(connection.connectionId),
+    createCatalogAgentResolver(
+      (refreshSignal) => discoverLocalAgentInventory({
+        defaultWorkspace,
+        dataDirectory: localContext.stateDirectory,
+        environment: localContext.agentLaunchEnvironment,
+        signal: refreshSignal
+      }),
+      () => config2,
+      publishAgentCatalog
+    ),
+    (refreshSignal) => discoverLocalAgentInventory({
+      defaultWorkspace,
+      dataDirectory: localContext.stateDirectory,
+      environment: localContext.agentLaunchEnvironment,
+      signal: refreshSignal
+    }).then((inventory2) => inventory2.readyAgents())
+  );
+  return {
+    channelUrl: new URL(`/channels/${encodeURIComponent(connection.channelId)}`, connection.relayOrigin).toString(),
+    connectionId: connection.connectionId,
+    config: config2,
+    connectionPath: installation.connectionPath(connection.connectionId)
+  };
+}
+async function pairRuntime(installation, options, signal, environment) {
+  const localContext = new RuntimeLocalContext(
+    installation.stateDirectory,
+    environment,
+    resolveMaxAcpProcesses(environment)
+  );
+  const defaultWorkspace = await resolveDefaultWorkspace(options.workspace);
+  const inventory = await discoverLocalAgentInventory({
+    defaultWorkspace,
+    dataDirectory: localContext.stateDirectory,
+    environment: localContext.agentLaunchEnvironment,
+    signal
+  });
+  const claim2 = await claimPairing(options, defaultWorkspace, inventory.readyAgents(), signal);
+  const connection = await installation.saveConnection(
+    {
+      appId: claim2.appId,
+      channelId: claim2.channelId,
+      defaultWorkspace,
+      pairingId: options.pairingId,
+      relayOrigin: options.relayOrigin,
+      runtimeCredential: claim2.runtimeCredential,
+      runtimeId: claim2.runtimeId
+    },
+    signal
+  );
+  return buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext);
+}
+async function pairMobiusRuntime(installation, options, signal, environment = process.env) {
+  return await pairRuntime(
+    installation,
+    {
+      code: parsePairingCode(options.pairingCode),
+      pairingId: validatePairingId(options.pairingId),
+      relayOrigin: parseRelayOrigin2(options.relayOrigin),
+      workspace: options.defaultWorkspace
+    },
+    signal,
+    environment
+  );
+}
+async function resumeRuntimeConnection(installation, connection, signal, environment) {
+  const localContext = new RuntimeLocalContext(
+    installation.stateDirectory,
+    environment,
+    resolveMaxAcpProcesses(environment)
+  );
+  const defaultWorkspace = await resolveDefaultWorkspace(connection.defaultWorkspace);
+  const inventory = await discoverLocalAgentInventory({
+    defaultWorkspace,
+    dataDirectory: localContext.stateDirectory,
+    environment: localContext.agentLaunchEnvironment,
+    signal
+  });
+  return buildPairedRuntime(installation, connection, defaultWorkspace, inventory, localContext);
+}
+async function resumeMobiusRuntime(installation, connectionId2, signal, environment = process.env) {
+  const connection = await installation.readConnection(connectionId2, signal);
+  return await resumeRuntimeConnection(installation, connection, signal, environment);
+}
 export {
   MobiusRuntimeEngine,
   RuntimeRelayRevokedError,