dsh-cindy-host 0.1.27 → 0.1.28

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.28 — 2026-10-28
+
+- Fix busy input confirmation on both controllers: DSH admission no longer removes an actual pending inbox row from later projections.
+- Reconcile queued, next-step steering, claimed and accepted states using real inbox/user evidence; never infer consumption from a lagging mirror.
+- Preserve pendingQueue across an Android push overtaking its enqueue ACK; remove it only on genuine claim/consumption/cancellation.
+- Test current Android projection parsing and authority epochs, alongside the existing durable delivery regressions.
+
 ## 0.1.27 — 2026-10-28
 
 - Implements current input-delivery v1 in Host: transactional complete-payload ownership before ACK, receipts, cancellation seals, authoritative clear boundaries, immutable logical identity and recoverable edits.

package/README.md

@@ -7,12 +7,16 @@ A Host-side adapter connecting current Cindy clients to DeepSeek Harness.
 Version 0.1.27 targets the verified **DSH 0.2.1-rc.3** service contracts, with **Node.js >=22.16**. Its DSH peer versions are pinned to this carrier to prevent an installer from mixing a newer prerelease SDK into the running host. The verified Desktop runtime includes Node.js 24.21. Install through the Desktop DSH plugin manager. CLI-managed profiles can use:
 
 ```sh
-dsh plugin --profile <profile> add dsh-cindy-host@0.1.27
+dsh plugin --profile <profile> add dsh-cindy-host@0.1.28
 ```
 
 Reload the Host plugin after installation. A full DSH restart is separate. Keep existing Cindy sign-in, device identity and settings; do not run two Host processes with the same identity.
 
-## 0.1.27: current durable input delivery
+## 0.1.28: busy enqueue confirmation
+
+A real DSH pending inbox occurrence remains in pendingQueue (or steeringQueueClientIds) in enqueue replies, pushes and polling until it is actually claimed or committed. Handing input to DSH is not delivery to the user turn. This fixes 0.1.27 empty follow-up projections overwriting the busy-queue acknowledgment on Android and desktop. Regression tests execute the current Android parser and stale-ACK authority handling, not just the durable outbox state machine.
+
+## Current durable input delivery
 
 - Implements input-delivery v1, not a legacy history-only fallback. Complete text and attachment bytes are held in a private, FULL-synchronous SQLite ledger **before enqueue acknowledgment**.
 - Provides per-clientId pending/accepted/removed/unknown receipts and real chronological around/around-client-id history. Accepted means a real user event was flushed and verified through public persistent storage, not an empty inbox or an in-memory event.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-cindy-host",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "private": false,
   "description": "Cindy 手机客户端连接 DSH 的 Host 侧插件：会话/消息/审批/todo/goal 的手机通道，以及配套的设置卡片",
   "license": "MIT",

package/src/host-input-delivery.js

@@ -17,19 +17,40 @@ function identity(sessionId,clientId){if(typeof sessionId!=='string'||!sessionId
 function requestShape(row){return Object.fromEntries(['text','persistedContent','files','agentReferences','sessionRefs','origin','sourcePlugin','createOpts'].filter(k=>row[k]!==undefined).map(k=>[k,row[k]]));}
 /** One owner for durable handoff, session command serialization, and permission to retry admission. */
 export function createInputDeliveryCoordinator({store,backend,baseProjection=()=>({pendingQueue:[],steeringQueueClientIds:[]}),onChange=()=>{},onError=()=>{},validateProjection=()=>true,now=()=>Date.now()}){
-  const lanes=new Map(), scheduled=new Set();let stopped=false;
+  const lanes=new Map(), scheduled=new Set(), runningBySession=new Map();let stopped=false;
   function notify(sid){queueMicrotask(()=>Promise.resolve().then(()=>onChange(sid)).catch(onError));}
   function lane(sid,fn){const previous=lanes.get(sid)??Promise.resolve();const result=previous.catch(()=>{}).then(fn);const tail=result.catch(()=>{}).finally(()=>{if(lanes.get(sid)===tail)lanes.delete(sid);});lanes.set(sid,tail);return result;}
   function save(entry){store.transaction(()=>store.put(entry));}
   function view(sid,ids=[],override){
-    const base=override??baseProjection(sid);const pending=(base.pendingQueue??[]).filter(row=>!terminal(store.get(sid,row.clientId)?.phase));
-    for(const e of store.list(sid))if(e.phase==='stored' && e.queued){const at=pending.findIndex(p=>p.clientId===e.clientId);if(at<0)pending.push(e.queued);else pending[at]=e.queued;}
-    return {...base,sessionId:sid,pendingQueue:pending,inputDeliveryVersion:1,clearBoundaryMs:store.boundary(sid),deliveryReceipts:ids.map(clientId=>{const e=store.get(sid,clientId);return{clientId,state:e?e.phase==='removed'?'removed':e.phase==='accepted'?'accepted':e.payload===undefined?'unknown':'pending':'unknown'};})};
+    const base={...baseProjection(sid),...override};
+    const entries=store.list(sid);const owned=new Map(entries.map(e=>[e.clientId,e]));
+    const isSteering=e=>e.phase==='DSH-pending'&&e.placement==='next-step';
+    const pending=(base.pendingQueue??[]).filter(row=>{const e=owned.get(row.clientId);return !e||(!terminal(e.phase)&&e.phase!=='claimed'&&!isSteering(e));});
+    const steering=new Set((base.steeringQueueClientIds??[]).filter(cid=>{const e=owned.get(cid);return !e||isSteering(e);}));
+    // Admission into DSH is not consumption: keep the real pending occurrence visible
+    // even before the independent control-stream mirror catches up.
+    for(const e of entries){
+      if(isSteering(e)){steering.add(e.clientId);continue;}
+      if((e.phase==='stored'||e.phase==='DSH-pending')&&e.queued){const at=pending.findIndex(p=>p.clientId===e.clientId);if(at<0)pending.push(e.queued);else pending[at]=e.queued;}
+    }
+    const running=runningBySession.get(sid)??base.turnInProgress;
+    return {...base,...(typeof running==='boolean'?{turnInProgress:running}:{}),sessionId:sid,pendingQueue:pending,steeringQueueClientIds:[...steering],inputDeliveryVersion:1,clearBoundaryMs:store.boundary(sid),deliveryReceipts:ids.map(clientId=>{const e=store.get(sid,clientId);return{clientId,state:e?e.phase==='removed'?'removed':e.phase==='accepted'?'accepted':e.payload===undefined?'unknown':'pending':'unknown'};})};
   }
   async function evidence(sid){
     const proof=await backend.evidence(sid);
     if(!proof || !Array.isArray(proof.users) || !Array.isArray(proof.inbox))throw deliveryError('DELIVERY_EVIDENCE_UNAVAILABLE','Durable DSH evidence is unavailable');
-    store.transaction(()=>{for(const user of proof.users){const e=store.get(sid,user.clientId);if(e?.phase==='removed')throw deliveryError('DELIVERY_CANCEL_CONFLICT','A sealed cancellation has a durable user message');if(e && e.phase!=='accepted')store.put({...e,phase:'accepted',payload:null,userSeq:user.seq,error:null});}});
+    let changed=false;const held=new Map(proof.inbox.map(item=>[item.clientId,item]));
+    store.transaction(()=>{
+      for(const user of proof.users){const e=store.get(sid,user.clientId);if(e?.phase==='removed')throw deliveryError('DELIVERY_CANCEL_CONFLICT','A sealed cancellation has a durable user message');if(e&&e.phase!=='accepted'){store.put({...e,phase:'accepted',payload:null,userSeq:user.seq,error:null});changed=true;}}
+      for(const e of store.list(sid)){
+        if(terminal(e.phase)||e.phase==='stored')continue;
+        const item=held.get(e.clientId);
+        if(item){const placement=item.placement??'next-turn';if(e.phase!=='DSH-pending'||e.placement!==placement){store.put({...e,phase:'DSH-pending',placement});changed=true;}}
+        else if(e.phase==='DSH-pending'){store.put({...e,phase:'claimed',placement:null});changed=true;}
+      }
+    });
+    if(typeof proof.running==='boolean'){if(runningBySession.get(sid)!==proof.running)changed=true;runningBySession.set(sid,proof.running);}
+    if(changed)notify(sid);
     return proof;
   }
   async function runSession(sid){

package/src/host-version.js

@@ -4,4 +4,4 @@
  */
 export const HOST_APP_VERSION = '0.1.82';
 /** Actual npm release, separate from the Cindy compatibility identity. */
-export const HOST_PLUGIN_VERSION = '0.1.27';
+export const HOST_PLUGIN_VERSION = '0.1.28';