@openma/deepseek-harness-acp 0.4.3 → 0.4.5

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");
   };
@@ -964,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)) {
@@ -1093,7 +1174,12 @@ async function apply(ctx, config = {}) {
       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: "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];
@@ -1146,6 +1232,37 @@ async function apply(ctx, config = {}) {
       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");
@@ -1210,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);
@@ -1322,13 +1482,24 @@ async function apply(ctx, config = {}) {
             mcpCapabilities: { http: true, sse: false },
             ...hasPersistence ? { sessionCapabilities: { list: {} } } : {}
           },
-          authMethods: []
+          authMethods: [
+            // ACP Terminal Auth (see the registry's AUTHENTICATION.md):
+            // the client runs `dsh-acp login` in an interactive
+            // terminal; the key lands in the shared harness
+            // credential store (~/.dsh/.credentials.yaml).
+            {
+              id: "terminal-login",
+              name: "Log in with a DeepSeek API key",
+              description: "Interactive terminal setup \u2014 saves the key to the harness credential store shared with the dsh Web UI",
+              _meta: { "terminal-auth": { args: ["login"], env: {} } }
+            }
+          ]
         });
       },
       async authenticate(_params) {
         if (!await credentialPresent()) {
           throw authRequired(
-            "no DeepSeek credential found: save one in the dsh Web UI (Settings \u2192 Models) or set DEEPSEEK_API_KEY"
+            "no DeepSeek credential found: run `dsh-acp login`, save one in the dsh Web UI (Settings \u2192 Models), or set DEEPSEEK_API_KEY"
           );
         }
       },
@@ -1370,68 +1541,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),
@@ -1465,7 +1576,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");
         }
@@ -1491,6 +1602,15 @@ 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) {
@@ -1507,7 +1627,9 @@ async function apply(ctx, config = {}) {
             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);
             }
           }
@@ -1558,7 +1680,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",
@@ -1567,7 +1689,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");
   };
@@ -989,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)) {
@@ -1118,7 +1199,12 @@ async function apply(ctx, config = {}) {
       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: "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];
@@ -1171,6 +1257,37 @@ async function apply(ctx, config = {}) {
       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");
@@ -1235,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);
@@ -1347,13 +1507,24 @@ async function apply(ctx, config = {}) {
             mcpCapabilities: { http: true, sse: false },
             ...hasPersistence ? { sessionCapabilities: { list: {} } } : {}
           },
-          authMethods: []
+          authMethods: [
+            // ACP Terminal Auth (see the registry's AUTHENTICATION.md):
+            // the client runs `dsh-acp login` in an interactive
+            // terminal; the key lands in the shared harness
+            // credential store (~/.dsh/.credentials.yaml).
+            {
+              id: "terminal-login",
+              name: "Log in with a DeepSeek API key",
+              description: "Interactive terminal setup \u2014 saves the key to the harness credential store shared with the dsh Web UI",
+              _meta: { "terminal-auth": { args: ["login"], env: {} } }
+            }
+          ]
         });
       },
       async authenticate(_params) {
         if (!await credentialPresent()) {
           throw authRequired(
-            "no DeepSeek credential found: save one in the dsh Web UI (Settings \u2192 Models) or set DEEPSEEK_API_KEY"
+            "no DeepSeek credential found: run `dsh-acp login`, save one in the dsh Web UI (Settings \u2192 Models), or set DEEPSEEK_API_KEY"
           );
         }
       },
@@ -1395,68 +1566,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),
@@ -1490,7 +1601,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");
         }
@@ -1516,6 +1627,15 @@ 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) {
@@ -1532,7 +1652,9 @@ async function apply(ctx, config = {}) {
             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);
             }
           }
@@ -1583,7 +1705,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",
@@ -1592,7 +1714,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) {
@@ -2245,6 +2367,9 @@ async function bootAcpProfile(host, overrides) {
     overlays.push({ id: "session-telemetry-otel", disabled: true });
   }
   const bridgeRow = rows.get("acp-bridge");
+  if (overrides?.serve === false && bridgeRow !== void 0) {
+    overlays.push({ id: "acp-bridge", disabled: true });
+  }
   if (overrides !== void 0 && bridgeRow !== void 0) {
     const patch = {};
     if (overrides.provider !== void 0) patch["provider"] = overrides.provider;
@@ -2281,9 +2406,93 @@ async function bootAcpProfile(host, overrides) {
   return ctx;
 }
 
+// src/login.ts
+import { createRequire as createRequire3 } from "node:module";
+import { join as join3 } from "node:path";
+import { pathToFileURL as pathToFileURL3 } from "node:url";
+async function readSecret(promptText) {
+  const stdin = process.stdin;
+  if (!stdin.isTTY) {
+    const chunks = [];
+    for await (const chunk of stdin) {
+      chunks.push(Buffer.from(chunk));
+      const text = Buffer.concat(chunks).toString("utf8");
+      const newline = text.indexOf("\n");
+      if (newline >= 0) return text.slice(0, newline).trim();
+    }
+    return Buffer.concat(chunks).toString("utf8").trim();
+  }
+  process.stderr.write(promptText);
+  return await new Promise((resolve2) => {
+    stdin.setRawMode(true);
+    stdin.resume();
+    stdin.setEncoding("utf8");
+    let buffer = "";
+    const onData = (chunk) => {
+      for (const char of chunk) {
+        if (char === "\n" || char === "\r" || char === "") {
+          stdin.setRawMode(false);
+          stdin.pause();
+          stdin.off("data", onData);
+          process.stderr.write("\n");
+          resolve2(buffer.trim());
+          return;
+        }
+        if (char === "") {
+          stdin.setRawMode(false);
+          process.stderr.write("^C\n");
+          process.exit(130);
+        }
+        if (char === "\x7F" || char === "\b") {
+          buffer = buffer.slice(0, -1);
+          continue;
+        }
+        buffer += char;
+      }
+    };
+    stdin.on("data", onData);
+  });
+}
+async function runLogin(ctx, hostBase, argv) {
+  const req = createRequire3(join3(hostBase, "noop.js"));
+  let credentialRef2;
+  try {
+    const mod = await import(pathToFileURL3(req.resolve("@deepseek-ai/dsh-credentials")).href);
+    credentialRef2 = mod.credentialRef;
+  } catch {
+    credentialRef2 = void 0;
+  }
+  const store = ctx.get("credentials");
+  if (store === void 0 || credentialRef2 === void 0) {
+    process.stderr.write(
+      "This composition has no writable credential store; export DEEPSEEK_API_KEY instead.\n"
+    );
+    return 1;
+  }
+  const ref = credentialRef2("DEEPSEEK_API_KEY");
+  const before = await store.describe(ref);
+  if (before.configured && before.source !== void 0) {
+    process.stderr.write(`A key is already configured (source: ${before.source}).
+`);
+  }
+  const key = argv[0] ?? await readSecret("DeepSeek API key (input hidden): ");
+  if (key.length === 0) {
+    process.stderr.write("No key entered; nothing saved.\n");
+    return 1;
+  }
+  await store.set(ref, key);
+  const masked = key.length <= 8 ? "\u2026" : `${key.slice(0, 4)}\u2026${key.slice(-4)}`;
+  process.stderr.write(
+    `Saved ${masked} to the harness credential store (~/.dsh/.credentials.yaml, mode 600).
+The dsh Web UI and every dsh surface share this credential.
+`
+  );
+  return 0;
+}
+
 // src/settings.ts
 import { homedir } from "node:os";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 var DEFAULT_PERSONA = `You are a coding assistant powered by the {{model}} model, working inside an editor via the Agent Client Protocol. Your working directory is {{cwd}}. Your bash tool runs under a file sandbox \u2014 a \`[sandbox: file access denied \u2026]\` result is policy, not a command bug.
 
 Verify your work by running the code or tests. Keep answers brief and factual.`;
@@ -2376,7 +2585,7 @@ function resolveSettings(argv) {
     models,
     maxTokens,
     permissionMode,
-    sessionRoot: stringFlag(parsed, "session-root") ?? envString("DSH_SESSION_ROOT") ?? join3(homedir(), ".dsh-acp", "sessions"),
+    sessionRoot: stringFlag(parsed, "session-root") ?? envString("DSH_SESSION_ROOT") ?? join4(homedir(), ".dsh-acp", "sessions"),
     persona: stringFlag(parsed, "persona") ?? envString("DSH_SYSTEM_PROMPT") ?? DEFAULT_PERSONA,
     thinking: !parsed.flags.has("no-thinking"),
     reasoningEffort: reasoningRaw,
@@ -2384,6 +2593,8 @@ function resolveSettings(argv) {
   };
 }
 var HELP_TEXT = `Usage: dsh-acp [options]
+       dsh-acp login [api-key]   Save a DeepSeek API key (interactive when omitted)
+       dsh-acp update            Self-update via npm
 
 Agent Client Protocol (ACP) stdio server for DeepSeek Harness. Speak ACP on
 stdin/stdout from an ACP client such as Zed; diagnostics go to stderr.
@@ -2427,6 +2638,32 @@ async function main() {
     console.log(HELP_TEXT.trimEnd());
     return;
   }
+  if (argv[0] === "login") {
+    let booted;
+    let hostBase;
+    try {
+      const host = resolveHost(void 0);
+      hostBase = host.base;
+      booted = await bootAcpProfile(host, { serve: false });
+    } catch (error) {
+      if (error instanceof HarnessNotFoundError) {
+        logError(error.message);
+        process.exitCode = 1;
+        return;
+      }
+      throw error;
+    }
+    try {
+      process.exitCode = await runLogin(
+        booted,
+        hostBase,
+        argv.slice(1)
+      );
+    } finally {
+      await booted.fiber.dispose().catch(() => void 0);
+    }
+    return;
+  }
   if (argv[0] === "update") {
     logInfo(`updating ${NAME} (npm install -g ${NAME}@latest)\u2026`);
     const result = spawnSync("npm", ["install", "-g", `${NAME}@latest`], { stdio: ["ignore", 2, 2] });

package/package.json

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