@moxt-ai/mobius 0.0.181 → 0.0.183

package/dist/index.js

@@ -19791,6 +19791,8 @@ var SESSION_LIST_KIND = "session.list";
 var SESSION_LISTED_KIND = "session.listed";
 var SESSION_QUERY_KIND = "session.query";
 var SESSION_QUERIED_KIND = "session.queried";
+var SESSION_RESTORE_KIND = "session.restore";
+var SESSION_RESTORED_KIND = "session.restored";
 var SESSION_STATUS_CHANGED_KIND = "session.status.changed";
 var SESSION_CONFIGURE_KIND = "session.configure";
 var SESSION_CONFIG_UPDATED_KIND = "session.config.updated";
@@ -19871,6 +19873,11 @@ var sessionsQueriedEventSchema = external_exports.object({
   kind: external_exports.literal(SESSION_QUERIED_KIND),
   requestId: identifierStringSchema
 }).readonly();
+var sessionRestoreCommandSchema = external_exports.object({
+  kind: external_exports.literal(SESSION_RESTORE_KIND),
+  requestId: identifierStringSchema,
+  sessionId: identifierStringSchema
+}).readonly();
 var fileReadCommandSchema = external_exports.object({
   kind: external_exports.literal(FILE_READ_KIND),
   maxBytes: external_exports.number().int().positive().max(128 * 1024 * 1024),
@@ -20185,6 +20192,12 @@ var sessionReadyEventSchema = external_exports.object({
   runtimeTimings: runtimeTimingsSchema.optional(),
   sessionId: identifierStringSchema
 }).readonly();
+var sessionRestoredEventSchema = external_exports.object({
+  entry: sessionMetadataSchema,
+  kind: external_exports.literal(SESSION_RESTORED_KIND),
+  ready: sessionReadyEventSchema,
+  requestId: identifierStringSchema
+}).readonly();
 var sessionConfigureCommandSchema = external_exports.object({
   ...sessionIdentityFields,
   booleanValue: external_exports.boolean(),
@@ -20400,6 +20413,10 @@ var decodeSessionQueryCommand = (encoded) => decode3(encoded, sessionQueryComman
 var encodeSessionQueryCommand = (message) => encode3(message, sessionQueryCommandSchema);
 var decodeSessionsQueriedEvent = (encoded) => decode3(encoded, sessionsQueriedEventSchema);
 var encodeSessionsQueriedEvent = (message) => encode3(message, sessionsQueriedEventSchema);
+var decodeSessionRestoreCommand = (encoded) => decode3(encoded, sessionRestoreCommandSchema);
+var encodeSessionRestoreCommand = (message) => encode3(message, sessionRestoreCommandSchema);
+var decodeSessionRestoredEvent = (encoded) => decode3(encoded, sessionRestoredEventSchema);
+var encodeSessionRestoredEvent = (message) => encode3(message, sessionRestoredEventSchema);
 var decodeSessionStatusChangedEvent = (encoded) => decode3(encoded, sessionStatusChangedEventSchema);
 var encodeSessionStatusChangedEvent = (message) => encode3(message, sessionStatusChangedEventSchema);
 var decodeSessionPrepareCommand = (encoded) => decode3(encoded, sessionPrepareCommandSchema);
@@ -21482,6 +21499,11 @@ var serviceToDaemonSignatures = {
     encodeSessionQueryCommand,
     decodeSessionQueryCommand
   ),
+  [SESSION_RESTORE_KIND]: defineMessageSignature(
+    SESSION_RESTORE_KIND,
+    encodeSessionRestoreCommand,
+    decodeSessionRestoreCommand
+  ),
   [NATIVE_SESSION_CANCEL_KIND]: defineMessageSignature(
     NATIVE_SESSION_CANCEL_KIND,
     encodeNativeSessionCancel,
@@ -21613,6 +21635,11 @@ var daemonToServiceSignatures = {
     encodeSessionsQueriedEvent,
     decodeSessionsQueriedEvent
   ),
+  [SESSION_RESTORED_KIND]: defineMessageSignature(
+    SESSION_RESTORED_KIND,
+    encodeSessionRestoredEvent,
+    decodeSessionRestoredEvent
+  ),
   [SESSION_STATUS_CHANGED_KIND]: defineMessageSignature(
     SESSION_STATUS_CHANGED_KIND,
     encodeSessionStatusChangedEvent,
@@ -31492,6 +31519,24 @@ var embeddedImageSchema = external_exports.looseObject({
   data: external_exports.string(),
   mimeType: external_exports.string()
 });
+var inlineImageUrlSchema = external_exports.string().regex(/^data:image\/(?:png|jpeg|gif|webp);base64,/u).transform((url2) => ({
+  type: "image",
+  data: url2.slice(url2.indexOf(",") + 1),
+  mimeType: url2.slice(5, url2.indexOf(";"))
+}));
+var toolImageSchema = external_exports.union([
+  embeddedImageSchema,
+  external_exports.object({ type: external_exports.literal("file"), mime: external_exports.string(), url: inlineImageUrlSchema }).refine(({ mime, url: url2 }) => mime === url2.mimeType).transform(({ url: url2 }) => url2),
+  external_exports.object({ type: external_exports.literal("inputImage"), imageUrl: inlineImageUrlSchema }).transform(({ imageUrl }) => imageUrl),
+  external_exports.object({
+    type: external_exports.literal("image"),
+    source: external_exports.object({ type: external_exports.literal("base64"), data: external_exports.string(), media_type: external_exports.string() })
+  }).transform(({ source }) => ({ type: "image", data: source.data, mimeType: source.media_type })),
+  external_exports.object({
+    type: external_exports.literal("image"),
+    file: external_exports.object({ base64: external_exports.string(), type: external_exports.string() })
+  }).transform(({ file: file2 }) => ({ type: "image", data: file2.base64, mimeType: file2.type }))
+]);
 function isRecord6(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -31611,7 +31656,7 @@ var AcpContentExternalizer = class {
     if (!isRecord6(value)) {
       return value;
     }
-    const image = embeddedImageSchema.safeParse(value);
+    const image = toolImageSchema.safeParse(value);
     if (image.success && image.data.data.length > 0) {
       const prepared = await this.#content(sessionId, image.data, signal);
       if (isRecord6(prepared.event) && typeof prepared.event["imageKey"] === "string") {
@@ -31630,6 +31675,7 @@ var AcpContentExternalizer = class {
   async #toolUpdate(sessionId, update, signal) {
     const images = /* @__PURE__ */ new Map();
     const rawOutput = update.rawOutput === void 0 ? void 0 : await this.#rawOutput(sessionId, update.rawOutput, images, signal);
+    const metadata = update._meta === void 0 || update._meta === null ? update._meta : external_exports.record(external_exports.string(), external_exports.unknown()).parse(await this.#rawOutput(sessionId, update._meta, images, signal));
     const originalJson = images.size === 0 ? void 0 : JSON.stringify(update.rawOutput);
     const rewrittenJson = images.size === 0 ? void 0 : JSON.stringify(rawOutput);
     const agentContent = [];
@@ -31653,10 +31699,11 @@ var AcpContentExternalizer = class {
       eventContent.push({ type: "content", content: prepared.event });
     }
     const output2 = update.rawOutput === void 0 ? {} : { rawOutput };
+    const meta3 = metadata === void 0 ? {} : { _meta: metadata };
     const hasContent = update.content !== void 0 && update.content !== null || agentContent.length > 0;
     return {
-      agent: { ...update, ...output2, ...hasContent ? { content: agentContent } : {} },
-      event: { ...update, ...output2, ...hasContent ? { content: eventContent } : {} }
+      agent: { ...update, ...meta3, ...output2, ...hasContent ? { content: agentContent } : {} },
+      event: { ...update, ...meta3, ...output2, ...hasContent ? { content: eventContent } : {} }
     };
   }
   update = async (sessionId, update, signal) => {
@@ -33354,6 +33401,7 @@ import {
 import { spawn as spawn3 } from "node:child_process";
 
 // src/acp/codex/app-server-protocol.ts
+import { isAbsolute as isAbsolute3 } from "node:path";
 var boundedText = (maximum) => external_exports.string().max(maximum);
 var jsonValue = external_exports.lazy(() => external_exports.unknown());
 var requestIdSchema = external_exports.union([external_exports.number(), external_exports.string()]).refine((value) => typeof value === "number" || value.length <= 256);
@@ -33424,6 +33472,7 @@ var imageGenerationItemSchema = external_exports.object({
 });
 var threadItemSchema = external_exports.discriminatedUnion("type", [
   imageGenerationItemSchema,
+  external_exports.object({ type: external_exports.literal("imageView"), id: boundedText(256), path: boundedText(32768).refine(isAbsolute3) }),
   external_exports.object({
     id: boundedText(256),
     text: boundedText(1e6),
@@ -33848,6 +33897,7 @@ var CodexAppServerClient = class {
 };
 
 // src/acp/codex/items.ts
+import { pathToFileURL } from "node:url";
 var TOOL_OUTPUT_CHARACTER_LIMIT = 32768;
 var TITLE_CHARACTER_LIMIT = 500;
 function truncate4(value, limit) {
@@ -33869,6 +33919,14 @@ function textContent(text2) {
   const block = { text: truncate4(text2, TOOL_OUTPUT_CHARACTER_LIMIT), type: "text" };
   return { content: block, type: "content" };
 }
+function structuredToolText(value) {
+  const result = external_exports.object({ content: external_exports.array(external_exports.unknown()) }).safeParse(value);
+  const items = Array.isArray(value) ? value : result.success ? result.data.content : [];
+  return items.flatMap((item) => {
+    const text2 = external_exports.object({ type: external_exports.enum(["text", "inputText"]), text: external_exports.string() }).safeParse(item);
+    return text2.success ? [textContent(text2.data.text)] : [];
+  });
+}
 function firstLine(value) {
   const line = value.split("\n", 1)[0] ?? "";
   return line.trim().length > 0 ? line.trim() : value.trim();
@@ -33889,6 +33947,22 @@ function mcpStatus(status) {
   return status === "inProgress" ? "in_progress" : status === "completed" ? "completed" : "failed";
 }
 function presentToolItem(item) {
+  if (item.type === "imageView") {
+    return {
+      content: [
+        {
+          type: "content",
+          content: { type: "image", data: "", mimeType: "", uri: pathToFileURL(item.path).href }
+        }
+      ],
+      kind: "read",
+      locations: [{ path: item.path }],
+      rawInput: { path: item.path },
+      rawOutput: null,
+      status: "completed",
+      title: "View image"
+    };
+  }
   if (item.type === "imageGeneration") {
     const failed = item.failure != null || item.status === "failed";
     const content = [];
@@ -33953,13 +34027,7 @@ function presentToolItem(item) {
   }
   if (item.type === "mcpToolCall") {
     const label = `${item.server}/${item.tool}`;
-    const content = [];
-    if (item.result != null) {
-      content.push(textContent(JSON.stringify(item.result)));
-    }
-    if (item.error != null) {
-      content.push(textContent(JSON.stringify(item.error)));
-    }
+    const content = structuredToolText(item.error ?? item.result);
     return {
       content,
       kind: "other",
@@ -33972,13 +34040,13 @@ function presentToolItem(item) {
   }
   if (item.type === "dynamicToolCall") {
     const label = item.namespace == null ? item.tool : `${item.namespace}/${item.tool}`;
-    const content = (item.contentItems ?? []).map((entry) => textContent(JSON.stringify(entry)));
+    const content = structuredToolText(item.contentItems);
     return {
       content,
       kind: "other",
       locations: [],
       rawInput: item.arguments ?? null,
-      rawOutput: item.success === true ? null : item.contentItems ?? null,
+      rawOutput: item.contentItems ?? null,
       status: mcpStatus(item.status),
       title: truncate4(label, TITLE_CHARACTER_LIMIT)
     };
@@ -33991,12 +34059,12 @@ function toolCallUpdate(item, lifecycle) {
     return null;
   }
   return {
-    content: [...presentation.content],
+    content: item.type === "imageView" && lifecycle === "started" ? [] : [...presentation.content],
     kind: presentation.kind,
     locations: [...presentation.locations],
     rawInput: presentation.rawInput,
     rawOutput: presentation.rawOutput,
-    status: lifecycle === "completed" && presentation.status === "in_progress" ? "completed" : presentation.status,
+    status: item.type === "imageView" && lifecycle === "started" ? "in_progress" : lifecycle === "completed" && presentation.status === "in_progress" ? "completed" : presentation.status,
     title: presentation.title,
     toolCallId: item.id
   };
@@ -35220,12 +35288,12 @@ var AgentProbeError = class extends Error {
 };
 
 // src/agent-catalog/agents/resolve-user-local-executable.ts
-import { isAbsolute as isAbsolute3, join as join7 } from "node:path";
+import { isAbsolute as isAbsolute4, join as join7 } from "node:path";
 async function resolveUserLocalExecutable(executableName, context) {
   context.signal.throwIfAborted();
   const platform = context.platform ?? process.platform;
   const homeDirectory = context.environment["HOME"];
-  if (platform === "win32" || homeDirectory === void 0 || !isAbsolute3(homeDirectory)) {
+  if (platform === "win32" || homeDirectory === void 0 || !isAbsolute4(homeDirectory)) {
     return [];
   }
   const executable = await resolveExecutablePath(join7(homeDirectory, ".local", "bin", executableName), platform);
@@ -35318,7 +35386,7 @@ var CursorCliAgentSpecification = class extends DirectAcpAgentDefinition {
 
 // src/agent-catalog/agents/deepseek-harness-agent.ts
 import { mkdir as mkdir3, realpath as realpath5, stat as stat5, writeFile as writeFile2 } from "node:fs/promises";
-import { isAbsolute as isAbsolute4, join as join8, normalize as normalize2 } from "node:path";
+import { isAbsolute as isAbsolute5, join as join8, normalize as normalize2 } from "node:path";
 
 // src/agent-installation/deepseek-managed-package.ts
 var DeepSeekHarnessManagedPackage = class extends SriManagedNpmPackageDefinition {
@@ -35342,7 +35410,7 @@ var DEEPSEEK_HARNESS_IMAGE_PROMPT_PATCH = `# Managed by Mobius: pin the ACP brid
     model: deepseek-v4-flash-vision-exp
 `;
 async function prepareAgentHome(path2, imagePrompts) {
-  if (!isAbsolute4(path2) || normalize2(path2) !== path2) {
+  if (!isAbsolute5(path2) || normalize2(path2) !== path2) {
     throw new AgentProbeError("agent_environment_invalid", "The configured Agent home is invalid");
   }
   try {
@@ -35474,7 +35542,7 @@ var GeminiCliAgentSpecification = class extends DirectAcpAgentDefinition {
 
 // src/agent-catalog/agents/grok-build-agent.ts
 import { realpath as realpath6 } from "node:fs/promises";
-import { isAbsolute as isAbsolute5, join as join9, relative as relative2, sep as sep2 } from "node:path";
+import { isAbsolute as isAbsolute6, join as join9, relative as relative2, sep as sep2 } from "node:path";
 import {
   RequestError as RequestError2
 } from "@agentclientprotocol/sdk";
@@ -35540,7 +35608,7 @@ function grokBuildManagedPackage(platform, architecture) {
 // src/agent-catalog/agents/grok-build-agent.ts
 function isContainedPath2(root, candidate) {
   const difference = relative2(root, candidate);
-  return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep2}`) && !isAbsolute5(difference);
+  return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep2}`) && !isAbsolute6(difference);
 }
 var GrokBuildAgentSpecification = class extends DirectAcpAgentDefinition {
   adapterVersion = GROK_BUILD_MANAGED_VERSION;
@@ -35689,7 +35757,7 @@ import { join as join11 } from "node:path";
 import { createHash as createHash2 } from "node:crypto";
 import { createReadStream } from "node:fs";
 import { chmod, copyFile, mkdir as mkdir4, mkdtemp as mkdtemp2, open as open4, realpath as realpath7, rename as rename3, rm as rm3, stat as stat6, writeFile as writeFile3 } from "node:fs/promises";
-import { delimiter as delimiter2, dirname as dirname3, isAbsolute as isAbsolute6, join as join10, relative as relative3, sep as sep3 } from "node:path";
+import { delimiter as delimiter2, dirname as dirname3, isAbsolute as isAbsolute7, join as join10, relative as relative3, sep as sep3 } from "node:path";
 
 // src/agent-installation/verified-download.ts
 import { fetch } from "undici";
@@ -35795,7 +35863,7 @@ function isRecord8(value) {
 }
 function isContainedPath3(root, candidate) {
   const difference = relative3(root, candidate);
-  return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep3}`) && !isAbsolute6(difference);
+  return difference.length > 0 && difference !== ".." && !difference.startsWith(`..${sep3}`) && !isAbsolute7(difference);
 }
 async function hashFile(path2, signal) {
   signal.throwIfAborted();
@@ -36185,7 +36253,7 @@ var PiAgentSpecification = class extends BridgedAcpAgentDefinition {
 };
 
 // src/agent-catalog/agents/workbuddy-agent.ts
-import { isAbsolute as isAbsolute7, join as join13 } from "node:path";
+import { isAbsolute as isAbsolute8, join as join13 } from "node:path";
 
 // src/agent-installation/workbuddy-managed-package.ts
 var WORKBUDDY_MANAGED_VERSION = "2.146.0";
@@ -36253,7 +36321,7 @@ var WorkBuddyAgentSpecification = class extends DirectAcpAgentDefinition {
     }
     const requestedPaths = [join13("/Applications", ...WORKBUDDY_MACOS_EXECUTABLE_PATH)];
     const homeDirectory = context.environment["HOME"];
-    if (homeDirectory !== void 0 && isAbsolute7(homeDirectory)) {
+    if (homeDirectory !== void 0 && isAbsolute8(homeDirectory)) {
       requestedPaths.unshift(join13(homeDirectory, "Applications", ...WORKBUDDY_MACOS_EXECUTABLE_PATH));
     }
     const executables = [];
@@ -36589,7 +36657,7 @@ function isAgentVersionSupported(reportedVersion, minimumSupportedVersion) {
 }
 
 // src/agent-catalog/executable-discovery.ts
-import { isAbsolute as isAbsolute8, join as join15 } from "node:path";
+import { isAbsolute as isAbsolute9, join as join15 } from "node:path";
 
 // src/agent-installation/managed-adapter-installer.ts
 import { join as join14 } from "node:path";
@@ -36694,7 +36762,7 @@ async function resolveManagedAdapterExecutable(specification, context) {
 async function resolveSpecificationExecutables(executableName, overrideVariable, resolveInstalled, resolveManaged, context) {
   const override = context.environment[overrideVariable];
   if (override !== void 0) {
-    if (override.length === 0 || !isAbsolute8(override)) {
+    if (override.length === 0 || !isAbsolute9(override)) {
       return [];
     }
     const executable = await resolveExecutablePath(override, context.platform);
@@ -38411,7 +38479,7 @@ var FixedInstallationExecutor = class {
 // src/authorization/workspace-directory.ts
 import { readdir as readdir4, realpath as realpath9, stat as stat8 } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { basename as basename4, dirname as dirname5, isAbsolute as isAbsolute9, join as join17, normalize as normalize3, relative as relative4 } from "node:path";
+import { basename as basename4, dirname as dirname5, isAbsolute as isAbsolute10, join as join17, normalize as normalize3, relative as relative4 } from "node:path";
 var WorkspaceDirectoryListing = class {
   directoryId;
   directoryLabel;
@@ -38467,7 +38535,7 @@ var WorkspaceDirectoryService = class {
     }
     if (id.startsWith("path-")) {
       const path2 = expandCurrentUserHome(decodePath(id, "path-"));
-      if (isAbsolute9(path2)) {
+      if (isAbsolute10(path2)) {
         return path2;
       }
     }
@@ -38475,7 +38543,7 @@ var WorkspaceDirectoryService = class {
   };
   resolvePath = async (requested, signal) => {
     signal.throwIfAborted();
-    if (!isAbsolute9(requested) || requested.includes("\0") || normalize3(requested) !== requested) {
+    if (!isAbsolute10(requested) || requested.includes("\0") || normalize3(requested) !== requested) {
       throw new LocalAuthorizationError("The local directory path is invalid");
     }
     try {
@@ -38483,7 +38551,7 @@ var WorkspaceDirectoryService = class {
       signal.throwIfAborted();
       const metadata = await stat8(target);
       signal.throwIfAborted();
-      if (!isAbsolute9(target) || normalize3(target) !== target || !metadata.isDirectory()) {
+      if (!isAbsolute10(target) || normalize3(target) !== target || !metadata.isDirectory()) {
         throw new LocalAuthorizationError("The selected location is not a directory");
       }
       return target;
@@ -38499,7 +38567,7 @@ var WorkspaceDirectoryService = class {
   };
   label = (path2) => {
     const suffix = relative4(homedir2(), path2);
-    return suffix === "" ? "~" : !isAbsolute9(suffix) && suffix !== ".." && !suffix.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) ? `~/${suffix.replaceAll("\\", "/")}` : path2;
+    return suffix === "" ? "~" : !isAbsolute10(suffix) && suffix !== ".." && !suffix.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) ? `~/${suffix.replaceAll("\\", "/")}` : path2;
   };
   identify = async (bindingId, requestedPath2, signal) => {
     this.authorizeMachine(bindingId);
@@ -41577,7 +41645,7 @@ function createAgentSettingsDiscoveryHandler(dependencies) {
 // src/artifacts/local-file-streamer.ts
 import { createReadStream as createReadStream2 } from "node:fs";
 import { realpath as realpath10, stat as stat9 } from "node:fs/promises";
-import { basename as basename5, isAbsolute as isAbsolute10, normalize as normalize4, resolve as resolve7 } from "node:path";
+import { basename as basename5, isAbsolute as isAbsolute11, normalize as normalize4, resolve as resolve7 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 var CHUNK_BYTES = 192 * 1024;
 function requestedPath(value) {
@@ -41596,17 +41664,17 @@ function requestedPath(value) {
 }
 async function resolveFile(value, workingDirectory, signal) {
   const path2 = requestedPath(value);
-  if (path2 === null || !isAbsolute10(path2) && workingDirectory === null) {
+  if (path2 === null || !isAbsolute11(path2) && workingDirectory === null) {
     return null;
   }
   const requested = workingDirectory === null ? path2 : resolve7(workingDirectory, path2);
-  if (!isAbsolute10(requested) || isAbsolute10(path2) && normalize4(path2) !== path2) {
+  if (!isAbsolute11(requested) || isAbsolute11(path2) && normalize4(path2) !== path2) {
     return null;
   }
   try {
     const target = await realpath10(requested);
     signal.throwIfAborted();
-    return isAbsolute10(target) && normalize4(target) === target ? target : null;
+    return isAbsolute11(target) && normalize4(target) === target ? target : null;
   } catch {
     signal.throwIfAborted();
     return null;
@@ -42135,6 +42203,72 @@ async function executePrompt({
 }
 
 // src/daemon-session-commands.ts
+async function prepareSession(command, config2, directories, audit, sessions, metrics, signal) {
+  return await metrics.measure("prepare-total", async () => {
+    const resolved = await metrics.measure(
+      "workspace-resolve",
+      async () => await resolveSessionDirectories(
+        directories,
+        config2.bindingId,
+        command.directoryId,
+        command.additionalDirectoryIds,
+        signal
+      )
+    );
+    const agent = config2.catalog.find(command.agentId);
+    const preparation = {
+      additionalDirectories: resolved.additionalDirectories,
+      agent,
+      cwd: resolved.cwd,
+      sessionId: command.sessionId,
+      signal
+    };
+    const prepared = command.transient === true ? await sessions.inspectSession(preparation, metrics) : await sessions.prepareSession(preparation, metrics);
+    const configuration = command.configuration;
+    const configOptions = configuration === void 0 ? prepared.configOptions : await metrics.measure(
+      "configuration",
+      async () => await sessions.configureSession({
+        ...preparation,
+        booleanValue: configuration.booleanValue,
+        configId: configuration.configId,
+        requestId: command.requestId,
+        value: configuration.value,
+        valueType: configuration.valueType
+      })
+    );
+    const listing = await metrics.measure(
+      "workspace-list",
+      async () => await directories.list(config2.bindingId, command.directoryId, signal)
+    );
+    audit.record({
+      commandId: command.requestId,
+      event: "session_prepared",
+      sessionId: command.sessionId
+    });
+    if (command.configuration !== void 0) {
+      audit.record({
+        commandId: command.requestId,
+        event: "session_configured",
+        sessionId: command.sessionId
+      });
+    }
+    return {
+      additionalDirectories: resolved.additionalDirectoryEntries,
+      agentId: command.agentId,
+      agentName: prepared.agentName,
+      agentVersion: prepared.agentVersion,
+      capabilities: prepared.capabilities,
+      commands: prepared.commands,
+      configOptions,
+      directoryId: command.directoryId,
+      directoryLabel: listing.directoryLabel,
+      kind: "session.ready",
+      requestId: command.requestId,
+      restored: prepared.restored,
+      sessionId: command.sessionId
+    };
+  });
+}
 async function executeWorkspaceList(socket, command, directories, audit, signal) {
   try {
     const listing = await directories.list(command.bindingId, command.directoryId, signal);
@@ -42159,72 +42293,7 @@ async function executeWorkspaceList(socket, command, directories, audit, signal)
 async function executeSessionPrepare(socket, command, config2, directories, audit, sessions, diagnostics, signal) {
   const metrics = new AccumulatingOperationMetrics();
   try {
-    const readyEvent = await metrics.measure("prepare-total", async () => {
-      const resolved = await metrics.measure(
-        "workspace-resolve",
-        async () => await resolveSessionDirectories(
-          directories,
-          config2.bindingId,
-          command.directoryId,
-          command.additionalDirectoryIds,
-          signal
-        )
-      );
-      const agent = config2.catalog.find(command.agentId);
-      const preparation = {
-        additionalDirectories: resolved.additionalDirectories,
-        agent,
-        cwd: resolved.cwd,
-        sessionId: command.sessionId,
-        signal
-      };
-      const prepared = command.transient === true ? await sessions.inspectSession(preparation, metrics) : await sessions.prepareSession(preparation, metrics);
-      const configuration = command.configuration;
-      const configOptions = configuration === void 0 ? prepared.configOptions : await metrics.measure(
-        "configuration",
-        async () => await sessions.configureSession({
-          ...preparation,
-          booleanValue: configuration.booleanValue,
-          configId: configuration.configId,
-          requestId: command.requestId,
-          value: configuration.value,
-          valueType: configuration.valueType
-        })
-      );
-      const listing = await metrics.measure(
-        "workspace-list",
-        async () => await directories.list(config2.bindingId, command.directoryId, signal)
-      );
-      audit.record({
-        commandId: command.requestId,
-        event: "session_prepared",
-        sessionId: command.sessionId
-      });
-      if (command.configuration !== void 0) {
-        audit.record({
-          commandId: command.requestId,
-          event: "session_configured",
-          sessionId: command.sessionId
-        });
-      }
-      const event = {
-        additionalDirectories: resolved.additionalDirectoryEntries,
-        agentId: command.agentId,
-        agentName: prepared.agentName,
-        agentVersion: prepared.agentVersion,
-        capabilities: prepared.capabilities,
-        commands: prepared.commands,
-        configOptions,
-        directoryId: command.directoryId,
-        directoryLabel: listing.directoryLabel,
-        kind: "session.ready",
-        requestId: command.requestId,
-        restored: prepared.restored,
-        sessionId: command.sessionId,
-        runtimeTimings: metrics.snapshot()
-      };
-      return event;
-    });
+    const readyEvent = await prepareSession(command, config2, directories, audit, sessions, metrics, signal);
     send(socket, {
       ...readyEvent,
       runtimeTimings: metrics.snapshot()
@@ -42252,6 +42321,59 @@ async function executeSessionPrepare(socket, command, config2, directories, audi
     reportOperationFailure(socket, command.requestId, command.sessionId, error62, metrics.snapshot());
   }
 }
+async function executeSessionRestore(socket, command, config2, directories, audit, sessions, nativeSessions, diagnostics, signal) {
+  const metrics = new AccumulatingOperationMetrics();
+  try {
+    const entry = await metrics.measure("session-lookup", async () => {
+      const [found] = await nativeSessions.querySessions([command.sessionId], signal);
+      if (found === void 0) {
+        throw new AcpExecutionError("The Session was not found", {}, "session_not_found");
+      }
+      return found;
+    });
+    const ready = await prepareSession(
+      {
+        additionalDirectoryIds: entry.additionalDirectories.map((directory) => directory.directoryId),
+        agentId: entry.agentId,
+        bindingId: config2.bindingId,
+        directoryId: entry.directoryId,
+        kind: "session.prepare",
+        requestId: command.requestId,
+        sessionId: command.sessionId,
+        sessionState: "provisioned"
+      },
+      config2,
+      directories,
+      audit,
+      sessions,
+      metrics,
+      signal
+    );
+    send(socket, {
+      entry,
+      kind: "session.restored",
+      ready: { ...ready, runtimeTimings: metrics.snapshot() },
+      requestId: command.requestId
+    });
+  } catch (error62) {
+    diagnostics.daemonDiagnostic(
+      "session_restore_failed",
+      command.requestId,
+      {
+        code: operationErrorCode(error62),
+        sessionId: command.sessionId
+      },
+      error62
+    );
+    audit.record({
+      commandId: command.requestId,
+      details: { code: operationErrorCode(error62) },
+      event: "session_restore_failed",
+      sessionId: command.sessionId
+    });
+    reportOperationFailure(socket, command.requestId, command.sessionId, error62, metrics.snapshot());
+  }
+}
 async function executeSessionConfigure(socket, command, config2, directories, audit, sessions, signal) {
   try {
     const resolved = await resolveSessionDirectories(
@@ -42565,6 +42687,21 @@ function createDaemonCommandHandler({
         });
         return;
       }
+      if (kind === SESSION_RESTORE_KIND) {
+        const command2 = message;
+        void executeSessionRestore(
+          socket,
+          command2,
+          config2,
+          directories,
+          audit,
+          sessions,
+          nativeSessions,
+          diagnostics,
+          signal
+        );
+        return;
+      }
       if (kind === SESSION_PERMISSION_RESPOND_KIND) {
         const command2 = message;
         void sessions.respondPermission(command2).then(() => {