dsh-acp-enhanced 0.5.0 → 0.5.2

package/lib/index.js

@@ -446,8 +446,12 @@ export function apply(ctx, config) {
   /** Whether one live session has produced anything yet. A preset swap is only
    *  legal while it is blank (dsh-agent-presets product rule): swapping tools
    *  mid-conversation would strand logged tool calls the new composition cannot
-   *  make. */
-  const isBlankSession = (session) => !session.events.some((event) => event.type === 'turn/start')
+   *  make. Checks both the live turn marker and persisted user messages, so the
+   *  same rule holds for resumed sessions whose on-disk logs may not carry
+   *  `turn/start`. */
+  const isBlankSession = (session) => !session.events.some((event) => (
+    event.type === 'turn/start' || event.type === 'user/message'
+  ))
 
   /**
    * Resolve the preset a new/resumed session will run under, and the setup hook
@@ -476,13 +480,21 @@ export function apply(ctx, config) {
     }
   }
 
-  /** The preset a persisted session runs, or undefined when unrecorded. */
-  async function persistedPresetOf(sessionId) {
+  /** Persisted facts for one stored session: the preset it runs under and
+   *  whether its log shows any real content. Both read from the on-disk log
+   *  because a just-resumed session's in-memory event log fills asynchronously
+   *  — the loadSession response would otherwise judge blank-ness before the
+   *  events arrive. Returns undefined when the artifact is missing/corrupt
+   *  (resume itself reports the failure; this lookup must not mask it). */
+  async function persistedFactsOf(sessionId) {
     const persistence = ctx.get('sessionPersistence')
     if (persistence === undefined) return undefined
     try {
       const { meta, events } = await persistence.load(sessionId)
-      return resolveSessionPreset({ header: meta, events })
+      return {
+        preset: resolveSessionPreset({ header: meta, events }),
+        blank: isBlankSession({ header: meta, events }),
+      }
     } catch {
       // A missing/corrupt artifact leaves resume itself to report the failure;
       // the preset lookup must not mask it with a second, misleading error.
@@ -710,6 +722,16 @@ export function apply(ctx, config) {
         case 'turn/start': {
           record.turnCount += 1
           record.turnStartedAt = Date.now()
+          // The preset-selection window closes the moment the session produces
+          // its first turn: re-advertise the config so the editor's
+          // agent_preset dropdown collapses to the running preset (ACP has no
+          // disabled state; without this the client keeps showing the full
+          // session/new list and offers switches the server must reject).
+          if (record.turnCount === 1) {
+            broadcastConfig(record).catch((error) => {
+              logger.warn(`acp-enhanced: config rebroadcast after first turn failed: ${String(error)}`)
+            })
+          }
           break
         }
         case 'turn/end': {
@@ -1090,18 +1112,30 @@ export function apply(ctx, config) {
       // Broken presets must not be offered: mounting one always fails.
       const mountable = (await presets.list()).filter((preset) => preset.broken === undefined)
       if (mountable.length > 0) {
+        const current = runningPresetOf(record.agent.session) ?? ''
+        // A just-resumed session's in-memory events fill asynchronously; trust
+        // the on-disk log snapshot taken at load time when one exists.
+        const blank = record.blankFromLog ?? isBlankSession(record.agent.session)
         options.push({
           id: 'agent_preset',
           type: 'select',
           name: 'Agent preset',
-          description: 'Model-facing tool/prompt composition for this session (switch only while blank).',
+          description: blank
+            ? 'Model-facing tool/prompt composition for this session (switch only while blank).'
+            : 'Model-facing tool/prompt composition for this session (locked: switching requires a blank session).',
           category: 'model_config',
-          currentValue: runningPresetOf(record.agent.session) ?? '',
-          options: mountable.map((preset) => ({
-            value: preset.id,
-            name: preset.name ?? preset.id,
-            ...preset.description === undefined ? {} : { description: preset.description },
-          })),
+          currentValue: current,
+          // ACP has no per-option disabled state, so a non-blank session
+          // advertises only the running preset — the editor shows the current
+          // mode without offering a switch the server would reject (the
+          // setSessionConfigOption guard stays as the authoritative check).
+          options: blank
+            ? mountable.map((preset) => ({
+              value: preset.id,
+              name: preset.name ?? preset.id,
+              ...preset.description === undefined ? {} : { description: preset.description },
+            }))
+            : [{ value: current, name: mountable.find((preset) => preset.id === current)?.name ?? (current || 'host') }],
         })
       }
     }
@@ -1761,6 +1795,10 @@ export function apply(ctx, config) {
       buffer: {},
       thoughtBuffer: {},
       contextWindow: undefined,
+      /** Blank-ness captured from the on-disk log at load time (resumed
+       *  sessions' in-memory events fill asynchronously). Undefined for
+       *  fresh/live sessions, which judge blank-ness live. */
+      blankFromLog: undefined,
       lastUsage: undefined,
       selection,
     }
@@ -2021,10 +2059,10 @@ export function apply(ctx, config) {
             configOptions: await buildConfigOptions(live),
           }
         }
-        const runningPreset = await persistedPresetOf(sessionId)
+        const runningPreset = await persistedFactsOf(sessionId)
         let composition
         try {
-          composition = await composePreset(runningPreset)
+          composition = await composePreset(runningPreset?.preset)
         } catch (error) {
           // Same mapping as session/new: a roster that cannot supply the
           // session's logged preset is reported as a client mistake.
@@ -2048,6 +2086,7 @@ export function apply(ctx, config) {
         }
         const record = makeRecord(handle)
         record.additionalDirectories = additionalDirectories
+        record.blankFromLog = runningPreset?.blank
         sessions.set(sessionId, record)
         // Zed inserts the thread before the load RPC completes; replay the
         // conversation history as notifications so the thread renders.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-acp-enhanced",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Enhanced ACP server for DeepSeek Harness: block-level streaming, usage/stat telemetry (cache hit rate, token speed, input/output tokens, context length, turns, tool timing), model & reasoning-effort switching, and permission-preset control over the ACP wire (Zed-friendly)",
   "keywords": [
     "dsh",