@openma/deepseek-harness-acp 0.4.2 → 0.4.4

package/dist/bridge.js

@@ -863,6 +863,87 @@ async function apply(ctx, config = {}) {
     if (record === void 0) throw invalidParams(`unknown session: ${sessionId}`);
     return record;
   };
+  const requireOrRestoreSession = async (sessionId) => {
+    const record = sessions.get(sessionId);
+    if (record !== void 0) return record;
+    if (ctx.get("sessionPersistence") === void 0) throw invalidParams(`unknown session: ${sessionId}`);
+    logWarn(`restoring session ${sessionId} from the persisted log`);
+    try {
+      return await restoreSession(sessionId, { replay: false });
+    } catch (error) {
+      throw invalidParams(`unknown session: ${sessionId} (${errorChain2(error)})`);
+    }
+  };
+  const restoreSession = async (sessionId, options) => {
+    const persistence = requirePersistence();
+    const existing = sessions.get(sessionId);
+    if (existing !== void 0) {
+      sessions.delete(sessionId);
+      existing.agent.cancel({ kind: "user" });
+      settlePrompt(existing, "cancelled");
+      await existing.dispose().catch((error) => {
+        logWarn(`dispose before reload failed: ${String(error)}`);
+      });
+    }
+    let events;
+    let storedHeader;
+    try {
+      const inspected = await persistence.inspect(SessionId2(sessionId));
+      events = inspected.events;
+      storedHeader = inspected.header;
+    } catch (error) {
+      throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
+    }
+    const replay = buildReplay(events);
+    if (options.replay) {
+      for (const update of replay.updates) notify(sessionId, update);
+      if (replay.title !== void 0) {
+        notify(sessionId, {
+          sessionUpdate: "session_info_update",
+          title: replay.title
+        });
+      }
+    }
+    const presets = presetsService();
+    const storedPreset = presetFromLog(storedHeader, events);
+    const presetId = presets === void 0 ? void 0 : (await presets.resolve(storedPreset)).id;
+    const handle = await agents.resume({
+      resumeSessionId: SessionId2(sessionId),
+      agentOptions: agentOptionsFor(config.model),
+      ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
+    });
+    const cwd = options.cwd ?? storedHeader?.cwd;
+    const projection = new SessionProjection(replay.contextWindow, {
+      terminalOutput: clientTerminalOutput,
+      ...cwd !== void 0 ? { cwd } : {}
+    });
+    projection.title = replay.title;
+    const record = registerRecord(
+      sessionId,
+      handle.agent,
+      () => handle.dispose(),
+      config.model,
+      config.permissionMode ?? "workspace-write",
+      projection
+    );
+    if (presetId !== void 0) record.preset = presetId;
+    {
+      const permission = permissionService();
+      const storedMode = permission?.current(events);
+      if (storedMode !== void 0) record.modeId = storedMode;
+      for (let index = events.length - 1; index >= 0; index -= 1) {
+        const event = events[index];
+        if (event?.type === "approval/policy") {
+          const policy = event.data?.policy;
+          if (policy === "ask" || policy === "never") record.approvals = policy;
+          break;
+        }
+      }
+    }
+    ensureSelection(record);
+    queueMicrotask(() => publishCommands(sessionId));
+    return record;
+  };
   const assertOpen = () => {
     if (closed) throw internalError("the ACP bridge has been disposed");
   };
@@ -954,6 +1035,7 @@ async function apply(ctx, config = {}) {
     delete record.selection;
     ensureSelection(record);
     setApprovalPolicy(record, record.approvals);
+    publishCommands(acpSessionId, record);
   };
   const setApprovalPolicy = (record, policy) => {
     try {
@@ -963,7 +1045,7 @@ async function apply(ctx, config = {}) {
     }
     record.approvals = policy;
   };
-  const permissionService = () => ctx.get("permission");
+  const permissionService = () => ctx.get("permissionPresets") ?? ctx.get("permission");
   const applyMode = (record, sessionId, modeId) => {
     const permission = permissionService();
     if (permission !== void 0 && permission.names.includes(modeId)) {
@@ -1085,20 +1167,102 @@ async function apply(ctx, config = {}) {
     }
     return result;
   };
-  const publishCommands = (sessionId) => {
-    notify(sessionId, {
-      sessionUpdate: "available_commands_update",
-      availableCommands: [
-        { name: "status", description: "Show adapter, model, mode, and token status" },
-        {
-          name: "login",
-          description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
-          input: { hint: "<api-key>" }
-        },
-        { name: "logout", description: "Remove the API key stored in the harness credential store" }
-      ]
+  const BUILTIN_COMMANDS = [
+    { name: "status", description: "Show adapter, model, mode, and token status" },
+    {
+      name: "login",
+      description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
+      input: { hint: "<api-key>" }
+    },
+    { name: "logout", description: "Remove the API key stored in the harness credential store" },
+    {
+      name: "model",
+      description: "Select the model for this conversation",
+      input: { hint: "[model] \u2014 blank lists available models" }
+    }
+  ];
+  const availableCommandsFor = async (record) => {
+    const list = [...BUILTIN_COMMANDS];
+    const seen = new Set(list.map((command) => command.name));
+    const commandsSvc = ctx.get("commands");
+    if (commandsSvc !== void 0) {
+      try {
+        for (const descriptor of commandsSvc.list(record.agent)) {
+          if (seen.has(descriptor.name)) continue;
+          seen.add(descriptor.name);
+          list.push({
+            name: descriptor.name,
+            description: descriptor.description,
+            ...descriptor.input !== void 0 ? { input: { hint: descriptor.input.hint } } : {}
+          });
+        }
+      } catch (error) {
+        logWarn(`command listing failed: ${String(error)}`);
+      }
+    }
+    const skillsSvc = ctx.get("skills");
+    if (skillsSvc !== void 0) {
+      try {
+        const skills = await skillsSvc.list({
+          ...record.agent.session.header.cwd !== void 0 ? { cwd: record.agent.session.header.cwd } : {},
+          scope: record.agent
+        });
+        for (const skill of skills) {
+          if (skill.invocation.userInvocable !== true) continue;
+          if (seen.has(skill.name)) continue;
+          seen.add(skill.name);
+          list.push({
+            name: skill.name,
+            description: skill.description,
+            input: { hint: "instructions for the skill" }
+          });
+        }
+      } catch (error) {
+        logDebug(`skill listing failed: ${String(error)}`);
+      }
+    }
+    return list;
+  };
+  const publishCommands = (sessionId, record) => {
+    const target = record ?? sessions.get(sessionId);
+    if (target === void 0) return;
+    void availableCommandsFor(target).then((availableCommands) => {
+      notify(sessionId, { sessionUpdate: "available_commands_update", availableCommands });
+    }).catch((error) => {
+      logWarn(`publishing commands failed: ${String(error)}`);
     });
   };
+  const publishConfigOptions = (sessionId, record) => {
+    void configOptions(record).then((options) => {
+      notify(sessionId, {
+        sessionUpdate: "config_option_update",
+        configOptions: options
+      });
+    }).catch((error) => {
+      logWarn(`publishing config options failed: ${String(error)}`);
+    });
+  };
+  const syncPermissionState = (record, sessionId) => {
+    const events = record.agent.session.events;
+    if (events === void 0) return;
+    const permission = permissionService();
+    const storedMode = permission?.current(events);
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+      const event = events[index];
+      if (event?.type === "approval/policy") {
+        const policy = event.data?.policy;
+        if (policy === "ask" || policy === "never") record.approvals = policy;
+        break;
+      }
+    }
+    if (storedMode !== void 0 && storedMode !== record.modeId) {
+      record.modeId = storedMode;
+      notify(sessionId, {
+        sessionUpdate: "current_mode_update",
+        currentModeId: record.modeId
+      });
+    }
+  };
   const credentialStore = () => {
     const brand = harness.credentialRef;
     const store = ctx.get("credentials");
@@ -1163,6 +1327,49 @@ async function apply(ctx, config = {}) {
     const remaining = await describeCredential();
     return remaining === "not configured" ? "Removed the stored DEEPSEEK_API_KEY. No credential is configured now." : `Removed the stored DEEPSEEK_API_KEY; requests now authenticate via: ${remaining}.`;
   };
+  const modelCommandText = async (record, acpSessionId, query) => {
+    const discovered = await discoverModels();
+    const catalog = [
+      ...discovered.map((entry) => ({
+        value: encodeChoice(entry.provider, entry.model),
+        label: entry.label
+      })),
+      ...modelCandidates().filter((model) => !discovered.some((entry) => entry.model === model)).map((model) => ({ value: encodeChoice(void 0, model), label: model }))
+    ];
+    const route = routeOf(record);
+    const currentValue = encodeChoice(record.provider, record.model ?? route.model ?? "");
+    if (query === "") {
+      const lines = catalog.map(
+        (entry) => `${entry.value === currentValue ? "\u2192" : " "} ${entry.label} \u2014 ${entry.value}`
+      );
+      return [
+        `model: ${route.model ?? "(product default)"}${record.effort !== void 0 ? ` (effort ${record.effort})` : ""}`,
+        "",
+        ...lines.length > 0 ? lines : ["no models discovered \u2014 check credentials with /status"],
+        "",
+        "switch with /model <name>"
+      ].join("\n");
+    }
+    const lowered = query.toLowerCase();
+    const exact = catalog.filter(
+      (entry) => entry.value.toLowerCase() === lowered || decodeChoice(entry.value).model.toLowerCase() === lowered
+    );
+    const matches = exact.length > 0 ? exact : catalog.filter(
+      (entry) => entry.value.toLowerCase().includes(lowered) || entry.label.toLowerCase().includes(lowered)
+    );
+    if (matches.length === 0) return `no model matches "${query}" \u2014 see /model`;
+    if (matches.length > 1) {
+      return [`"${query}" is ambiguous:`, ...matches.map((entry) => `  ${entry.label} \u2014 ${entry.value}`)].join(
+        "\n"
+      );
+    }
+    const target = matches[0];
+    if (target.value === currentValue) return `already on ${target.label}`;
+    await switchModel(record, acpSessionId, target.value);
+    publishCommands(acpSessionId, record);
+    publishConfigOptions(acpSessionId, record);
+    return `model \u2192 ${target.label}`;
+  };
   const statusText = async (record) => {
     const used = record.projection.contextWindow;
     const route = routeOf(record);
@@ -1323,68 +1530,8 @@ async function apply(ctx, config = {}) {
         assertOpen();
         validateCwd(params.cwd);
         syncMcpServers(params.mcpServers, params.cwd);
-        const persistence = requirePersistence();
-        const sessionId = params.sessionId;
-        const existing = sessions.get(sessionId);
-        if (existing !== void 0) {
-          sessions.delete(sessionId);
-          existing.agent.cancel({ kind: "user" });
-          settlePrompt(existing, "cancelled");
-          await existing.dispose().catch((error) => {
-            logWarn(`dispose before reload failed: ${String(error)}`);
-          });
-        }
-        let events;
-        let storedHeader;
-        try {
-          const inspected = await persistence.inspect(SessionId2(sessionId));
-          events = inspected.events;
-          storedHeader = inspected.header;
-        } catch (error) {
-          throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
-        }
-        const replay = buildReplay(events);
-        for (const update of replay.updates) notify(sessionId, update);
-        if (replay.title !== void 0) {
-          notify(sessionId, {
-            sessionUpdate: "session_info_update",
-            title: replay.title
-          });
-        }
-        const presets = presetsService();
-        const storedPreset = presetFromLog(storedHeader, events);
-        const presetId = presets === void 0 ? void 0 : (await presets.resolve(storedPreset)).id;
-        const handle = await agents.resume({
-          resumeSessionId: SessionId2(sessionId),
-          agentOptions: agentOptionsFor(config.model),
-          ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
-        });
-        const projection = new SessionProjection(replay.contextWindow);
-        projection.title = replay.title;
-        const record = registerRecord(
-          sessionId,
-          handle.agent,
-          () => handle.dispose(),
-          config.model,
-          config.permissionMode ?? "workspace-write",
-          projection
-        );
-        if (presetId !== void 0) record.preset = presetId;
-        {
-          const permission = permissionService();
-          const storedMode = permission?.current(events);
-          if (storedMode !== void 0) record.modeId = storedMode;
-          for (let index = events.length - 1; index >= 0; index -= 1) {
-            const event = events[index];
-            if (event?.type === "approval/policy") {
-              const policy = event.data?.policy;
-              if (policy === "ask" || policy === "never") record.approvals = policy;
-              break;
-            }
-          }
-        }
-        ensureSelection(record);
-        queueMicrotask(() => publishCommands(sessionId));
+        requirePersistence();
+        const record = await restoreSession(params.sessionId, { replay: true, cwd: params.cwd });
         const options = await configOptions(record);
         return {
           modes: modeState(record),
@@ -1418,7 +1565,7 @@ async function apply(ctx, config = {}) {
       },
       async prompt(params) {
         assertOpen();
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         if (record.inflight !== void 0) {
           throw invalidParams("a prompt is already in flight for this session");
         }
@@ -1444,6 +1591,38 @@ async function apply(ctx, config = {}) {
           return respond(await loginText(trimmed.slice(commandMatch[0].length)));
         }
         if (commandMatch?.[1] === "logout") return respond(await logoutText());
+        if (commandMatch?.[1] === "model") {
+          return respond(
+            await modelCommandText(
+              record,
+              params.sessionId,
+              trimmed.slice(commandMatch[0].length).trim()
+            )
+          );
+        }
+        if (commandMatch !== null && commandMatch[1] !== void 0) {
+          const commandsSvc = ctx.get("commands");
+          if (commandsSvc !== void 0) {
+            let execution;
+            try {
+              execution = await commandsSvc.execute(
+                record.agent,
+                trimmed,
+                new AbortController().signal
+              );
+            } catch (error) {
+              return respond(`\u26A0 /${commandMatch[1]} failed: ${errorChain2(error)}`);
+            }
+            if (execution !== void 0) {
+              const { result } = execution;
+              const text = result.text ?? (result.kind === "success" ? `/${commandMatch[1]} \u2713` : `/${commandMatch[1]} failed`);
+              syncPermissionState(record, params.sessionId);
+              publishCommands(params.sessionId, record);
+              publishConfigOptions(params.sessionId, record);
+              return respond(result.kind === "error" ? `\u26A0 ${text}` : text);
+            }
+          }
+        }
         if (!await credentialPresent()) {
           return respond(
             [
@@ -1490,7 +1669,7 @@ async function apply(ctx, config = {}) {
         return { stopReason, ...usage !== void 0 ? { usage } : {} };
       },
       async setSessionMode(params) {
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         applyMode(record, params.sessionId, params.modeId);
         notify(params.sessionId, {
           sessionUpdate: "config_option_update",
@@ -1499,7 +1678,7 @@ async function apply(ctx, config = {}) {
         return {};
       },
       async setSessionConfigOption(params) {
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         const value = typeof params.value === "string" ? params.value : void 0;
         if (value === void 0) throw invalidParams(`invalid value: ${String(params.value)}`);
         switch (params.configId) {

package/dist/index.js

@@ -888,6 +888,87 @@ async function apply(ctx, config = {}) {
     if (record === void 0) throw invalidParams(`unknown session: ${sessionId}`);
     return record;
   };
+  const requireOrRestoreSession = async (sessionId) => {
+    const record = sessions.get(sessionId);
+    if (record !== void 0) return record;
+    if (ctx.get("sessionPersistence") === void 0) throw invalidParams(`unknown session: ${sessionId}`);
+    logWarn(`restoring session ${sessionId} from the persisted log`);
+    try {
+      return await restoreSession(sessionId, { replay: false });
+    } catch (error) {
+      throw invalidParams(`unknown session: ${sessionId} (${errorChain2(error)})`);
+    }
+  };
+  const restoreSession = async (sessionId, options) => {
+    const persistence = requirePersistence();
+    const existing = sessions.get(sessionId);
+    if (existing !== void 0) {
+      sessions.delete(sessionId);
+      existing.agent.cancel({ kind: "user" });
+      settlePrompt(existing, "cancelled");
+      await existing.dispose().catch((error) => {
+        logWarn(`dispose before reload failed: ${String(error)}`);
+      });
+    }
+    let events;
+    let storedHeader;
+    try {
+      const inspected = await persistence.inspect(SessionId2(sessionId));
+      events = inspected.events;
+      storedHeader = inspected.header;
+    } catch (error) {
+      throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
+    }
+    const replay = buildReplay(events);
+    if (options.replay) {
+      for (const update of replay.updates) notify(sessionId, update);
+      if (replay.title !== void 0) {
+        notify(sessionId, {
+          sessionUpdate: "session_info_update",
+          title: replay.title
+        });
+      }
+    }
+    const presets = presetsService();
+    const storedPreset = presetFromLog(storedHeader, events);
+    const presetId = presets === void 0 ? void 0 : (await presets.resolve(storedPreset)).id;
+    const handle = await agents.resume({
+      resumeSessionId: SessionId2(sessionId),
+      agentOptions: agentOptionsFor(config.model),
+      ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
+    });
+    const cwd = options.cwd ?? storedHeader?.cwd;
+    const projection = new SessionProjection(replay.contextWindow, {
+      terminalOutput: clientTerminalOutput,
+      ...cwd !== void 0 ? { cwd } : {}
+    });
+    projection.title = replay.title;
+    const record = registerRecord(
+      sessionId,
+      handle.agent,
+      () => handle.dispose(),
+      config.model,
+      config.permissionMode ?? "workspace-write",
+      projection
+    );
+    if (presetId !== void 0) record.preset = presetId;
+    {
+      const permission = permissionService();
+      const storedMode = permission?.current(events);
+      if (storedMode !== void 0) record.modeId = storedMode;
+      for (let index = events.length - 1; index >= 0; index -= 1) {
+        const event = events[index];
+        if (event?.type === "approval/policy") {
+          const policy = event.data?.policy;
+          if (policy === "ask" || policy === "never") record.approvals = policy;
+          break;
+        }
+      }
+    }
+    ensureSelection(record);
+    queueMicrotask(() => publishCommands(sessionId));
+    return record;
+  };
   const assertOpen = () => {
     if (closed) throw internalError("the ACP bridge has been disposed");
   };
@@ -979,6 +1060,7 @@ async function apply(ctx, config = {}) {
     delete record.selection;
     ensureSelection(record);
     setApprovalPolicy(record, record.approvals);
+    publishCommands(acpSessionId, record);
   };
   const setApprovalPolicy = (record, policy) => {
     try {
@@ -988,7 +1070,7 @@ async function apply(ctx, config = {}) {
     }
     record.approvals = policy;
   };
-  const permissionService = () => ctx.get("permission");
+  const permissionService = () => ctx.get("permissionPresets") ?? ctx.get("permission");
   const applyMode = (record, sessionId, modeId) => {
     const permission = permissionService();
     if (permission !== void 0 && permission.names.includes(modeId)) {
@@ -1110,20 +1192,102 @@ async function apply(ctx, config = {}) {
     }
     return result;
   };
-  const publishCommands = (sessionId) => {
-    notify(sessionId, {
-      sessionUpdate: "available_commands_update",
-      availableCommands: [
-        { name: "status", description: "Show adapter, model, mode, and token status" },
-        {
-          name: "login",
-          description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
-          input: { hint: "<api-key>" }
-        },
-        { name: "logout", description: "Remove the API key stored in the harness credential store" }
-      ]
+  const BUILTIN_COMMANDS = [
+    { name: "status", description: "Show adapter, model, mode, and token status" },
+    {
+      name: "login",
+      description: "Save a DeepSeek API key into the harness credential store (~/.dsh/.credentials.yaml)",
+      input: { hint: "<api-key>" }
+    },
+    { name: "logout", description: "Remove the API key stored in the harness credential store" },
+    {
+      name: "model",
+      description: "Select the model for this conversation",
+      input: { hint: "[model] \u2014 blank lists available models" }
+    }
+  ];
+  const availableCommandsFor = async (record) => {
+    const list = [...BUILTIN_COMMANDS];
+    const seen = new Set(list.map((command) => command.name));
+    const commandsSvc = ctx.get("commands");
+    if (commandsSvc !== void 0) {
+      try {
+        for (const descriptor of commandsSvc.list(record.agent)) {
+          if (seen.has(descriptor.name)) continue;
+          seen.add(descriptor.name);
+          list.push({
+            name: descriptor.name,
+            description: descriptor.description,
+            ...descriptor.input !== void 0 ? { input: { hint: descriptor.input.hint } } : {}
+          });
+        }
+      } catch (error) {
+        logWarn(`command listing failed: ${String(error)}`);
+      }
+    }
+    const skillsSvc = ctx.get("skills");
+    if (skillsSvc !== void 0) {
+      try {
+        const skills = await skillsSvc.list({
+          ...record.agent.session.header.cwd !== void 0 ? { cwd: record.agent.session.header.cwd } : {},
+          scope: record.agent
+        });
+        for (const skill of skills) {
+          if (skill.invocation.userInvocable !== true) continue;
+          if (seen.has(skill.name)) continue;
+          seen.add(skill.name);
+          list.push({
+            name: skill.name,
+            description: skill.description,
+            input: { hint: "instructions for the skill" }
+          });
+        }
+      } catch (error) {
+        logDebug(`skill listing failed: ${String(error)}`);
+      }
+    }
+    return list;
+  };
+  const publishCommands = (sessionId, record) => {
+    const target = record ?? sessions.get(sessionId);
+    if (target === void 0) return;
+    void availableCommandsFor(target).then((availableCommands) => {
+      notify(sessionId, { sessionUpdate: "available_commands_update", availableCommands });
+    }).catch((error) => {
+      logWarn(`publishing commands failed: ${String(error)}`);
+    });
+  };
+  const publishConfigOptions = (sessionId, record) => {
+    void configOptions(record).then((options) => {
+      notify(sessionId, {
+        sessionUpdate: "config_option_update",
+        configOptions: options
+      });
+    }).catch((error) => {
+      logWarn(`publishing config options failed: ${String(error)}`);
     });
   };
+  const syncPermissionState = (record, sessionId) => {
+    const events = record.agent.session.events;
+    if (events === void 0) return;
+    const permission = permissionService();
+    const storedMode = permission?.current(events);
+    for (let index = events.length - 1; index >= 0; index -= 1) {
+      const event = events[index];
+      if (event?.type === "approval/policy") {
+        const policy = event.data?.policy;
+        if (policy === "ask" || policy === "never") record.approvals = policy;
+        break;
+      }
+    }
+    if (storedMode !== void 0 && storedMode !== record.modeId) {
+      record.modeId = storedMode;
+      notify(sessionId, {
+        sessionUpdate: "current_mode_update",
+        currentModeId: record.modeId
+      });
+    }
+  };
   const credentialStore = () => {
     const brand = harness.credentialRef;
     const store = ctx.get("credentials");
@@ -1188,6 +1352,49 @@ async function apply(ctx, config = {}) {
     const remaining = await describeCredential();
     return remaining === "not configured" ? "Removed the stored DEEPSEEK_API_KEY. No credential is configured now." : `Removed the stored DEEPSEEK_API_KEY; requests now authenticate via: ${remaining}.`;
   };
+  const modelCommandText = async (record, acpSessionId, query) => {
+    const discovered = await discoverModels();
+    const catalog = [
+      ...discovered.map((entry) => ({
+        value: encodeChoice(entry.provider, entry.model),
+        label: entry.label
+      })),
+      ...modelCandidates().filter((model) => !discovered.some((entry) => entry.model === model)).map((model) => ({ value: encodeChoice(void 0, model), label: model }))
+    ];
+    const route = routeOf(record);
+    const currentValue = encodeChoice(record.provider, record.model ?? route.model ?? "");
+    if (query === "") {
+      const lines = catalog.map(
+        (entry) => `${entry.value === currentValue ? "\u2192" : " "} ${entry.label} \u2014 ${entry.value}`
+      );
+      return [
+        `model: ${route.model ?? "(product default)"}${record.effort !== void 0 ? ` (effort ${record.effort})` : ""}`,
+        "",
+        ...lines.length > 0 ? lines : ["no models discovered \u2014 check credentials with /status"],
+        "",
+        "switch with /model <name>"
+      ].join("\n");
+    }
+    const lowered = query.toLowerCase();
+    const exact = catalog.filter(
+      (entry) => entry.value.toLowerCase() === lowered || decodeChoice(entry.value).model.toLowerCase() === lowered
+    );
+    const matches = exact.length > 0 ? exact : catalog.filter(
+      (entry) => entry.value.toLowerCase().includes(lowered) || entry.label.toLowerCase().includes(lowered)
+    );
+    if (matches.length === 0) return `no model matches "${query}" \u2014 see /model`;
+    if (matches.length > 1) {
+      return [`"${query}" is ambiguous:`, ...matches.map((entry) => `  ${entry.label} \u2014 ${entry.value}`)].join(
+        "\n"
+      );
+    }
+    const target = matches[0];
+    if (target.value === currentValue) return `already on ${target.label}`;
+    await switchModel(record, acpSessionId, target.value);
+    publishCommands(acpSessionId, record);
+    publishConfigOptions(acpSessionId, record);
+    return `model \u2192 ${target.label}`;
+  };
   const statusText = async (record) => {
     const used = record.projection.contextWindow;
     const route = routeOf(record);
@@ -1348,68 +1555,8 @@ async function apply(ctx, config = {}) {
         assertOpen();
         validateCwd(params.cwd);
         syncMcpServers(params.mcpServers, params.cwd);
-        const persistence = requirePersistence();
-        const sessionId = params.sessionId;
-        const existing = sessions.get(sessionId);
-        if (existing !== void 0) {
-          sessions.delete(sessionId);
-          existing.agent.cancel({ kind: "user" });
-          settlePrompt(existing, "cancelled");
-          await existing.dispose().catch((error) => {
-            logWarn(`dispose before reload failed: ${String(error)}`);
-          });
-        }
-        let events;
-        let storedHeader;
-        try {
-          const inspected = await persistence.inspect(SessionId2(sessionId));
-          events = inspected.events;
-          storedHeader = inspected.header;
-        } catch (error) {
-          throw invalidParams(`session not found: ${sessionId} (${errorChain2(error)})`);
-        }
-        const replay = buildReplay(events);
-        for (const update of replay.updates) notify(sessionId, update);
-        if (replay.title !== void 0) {
-          notify(sessionId, {
-            sessionUpdate: "session_info_update",
-            title: replay.title
-          });
-        }
-        const presets = presetsService();
-        const storedPreset = presetFromLog(storedHeader, events);
-        const presetId = presets === void 0 ? void 0 : (await presets.resolve(storedPreset)).id;
-        const handle = await agents.resume({
-          resumeSessionId: SessionId2(sessionId),
-          agentOptions: agentOptionsFor(config.model),
-          ...presetSetup(presets, presetId) !== void 0 ? { setup: presetSetup(presets, presetId) } : {}
-        });
-        const projection = new SessionProjection(replay.contextWindow);
-        projection.title = replay.title;
-        const record = registerRecord(
-          sessionId,
-          handle.agent,
-          () => handle.dispose(),
-          config.model,
-          config.permissionMode ?? "workspace-write",
-          projection
-        );
-        if (presetId !== void 0) record.preset = presetId;
-        {
-          const permission = permissionService();
-          const storedMode = permission?.current(events);
-          if (storedMode !== void 0) record.modeId = storedMode;
-          for (let index = events.length - 1; index >= 0; index -= 1) {
-            const event = events[index];
-            if (event?.type === "approval/policy") {
-              const policy = event.data?.policy;
-              if (policy === "ask" || policy === "never") record.approvals = policy;
-              break;
-            }
-          }
-        }
-        ensureSelection(record);
-        queueMicrotask(() => publishCommands(sessionId));
+        requirePersistence();
+        const record = await restoreSession(params.sessionId, { replay: true, cwd: params.cwd });
         const options = await configOptions(record);
         return {
           modes: modeState(record),
@@ -1443,7 +1590,7 @@ async function apply(ctx, config = {}) {
       },
       async prompt(params) {
         assertOpen();
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         if (record.inflight !== void 0) {
           throw invalidParams("a prompt is already in flight for this session");
         }
@@ -1469,6 +1616,38 @@ async function apply(ctx, config = {}) {
           return respond(await loginText(trimmed.slice(commandMatch[0].length)));
         }
         if (commandMatch?.[1] === "logout") return respond(await logoutText());
+        if (commandMatch?.[1] === "model") {
+          return respond(
+            await modelCommandText(
+              record,
+              params.sessionId,
+              trimmed.slice(commandMatch[0].length).trim()
+            )
+          );
+        }
+        if (commandMatch !== null && commandMatch[1] !== void 0) {
+          const commandsSvc = ctx.get("commands");
+          if (commandsSvc !== void 0) {
+            let execution;
+            try {
+              execution = await commandsSvc.execute(
+                record.agent,
+                trimmed,
+                new AbortController().signal
+              );
+            } catch (error) {
+              return respond(`\u26A0 /${commandMatch[1]} failed: ${errorChain2(error)}`);
+            }
+            if (execution !== void 0) {
+              const { result } = execution;
+              const text = result.text ?? (result.kind === "success" ? `/${commandMatch[1]} \u2713` : `/${commandMatch[1]} failed`);
+              syncPermissionState(record, params.sessionId);
+              publishCommands(params.sessionId, record);
+              publishConfigOptions(params.sessionId, record);
+              return respond(result.kind === "error" ? `\u26A0 ${text}` : text);
+            }
+          }
+        }
         if (!await credentialPresent()) {
           return respond(
             [
@@ -1515,7 +1694,7 @@ async function apply(ctx, config = {}) {
         return { stopReason, ...usage !== void 0 ? { usage } : {} };
       },
       async setSessionMode(params) {
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         applyMode(record, params.sessionId, params.modeId);
         notify(params.sessionId, {
           sessionUpdate: "config_option_update",
@@ -1524,7 +1703,7 @@ async function apply(ctx, config = {}) {
         return {};
       },
       async setSessionConfigOption(params) {
-        const record = requireSession(params.sessionId);
+        const record = await requireOrRestoreSession(params.sessionId);
         const value = typeof params.value === "string" ? params.value : void 0;
         if (value === void 0) throw invalidParams(`invalid value: ${String(params.value)}`);
         switch (params.configId) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.2",
+  "version": "0.4.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/openma-ai/deepseek-harness-acp.git"