@amaster.ai/dsh-a2a 0.1.29 → 0.1.31

package/README.md

@@ -16,7 +16,7 @@ dsh plugin --profile my-agent add @amaster.ai/dsh-a2a
 
 `inbox.enabled: true` uses the official DSH inbox (`Agent.send`) for ordinary `next-turn` input and `next-step` steering. Tested with the unmodified npm runtime `0.2.1-rc.2`; no core patch is required. The queue and its durable projection belong to DSH. The plugin only materializes messages, attaches A2A task identities, and translates execution events.
 
-Standard `SendMessage` / `SendStreamingMessage`, task queries, cancellation and subscriptions remain the wire interface. The negotiated [inbox extension](../../docs/protocol/inbox-v1.md) forwards `target` and `wakeup` to DSH. `wakeup: false` leaves an idle driver parked; it does not prevent an active driver from consuming pending input. A later real waking message releases pending input.
+Standard `SendMessage` / `SendStreamingMessage`, task queries, cancellation and subscriptions remain the wire interface. The negotiated inbox extension forwards `target` and `wakeup` to DSH. `wakeup: false` leaves an idle driver parked; it does not prevent an active driver from consuming pending input. A later real waking message releases pending input.
 
 The same-process `a2aInbox` service exposes `resolve(contextId)`, `content(message, contextId)`, `enqueue(taskId, message, { target?, wakeup? })`, `promote(contextId, nativeMessageId, activeTaskId)`, and `cancel(taskId)`. There is no separate pause, wake-only, resume, or retained-task restart operation. Cancellation is terminal and removes that task's pending input. Other tasks' input is retained according to official DSH cancellation semantics, and may wait for the next waking message. Clearing a context discards all its pending work.
 

package/lib/inbox.js

@@ -3,6 +3,7 @@ import { randomUUID } from 'node:crypto';
 import { Message, TaskState } from '@a2a-js/sdk';
 import { AgentEvent, ServerCallContext, STATE_HEADERS_KEY, } from '@a2a-js/sdk/server';
 import { createUserMessage } from '@deepseek-ai/dsh-llm/message';
+import { commitInboxInput, markInboxInputPending } from './task-store.js';
 import { agentTextMessage, SessionTranslator, terminalStatusUpdate } from './translator.js';
 export const INBOX_EXTENSION = 'https://github.com/TGYD-helige/dsh-plugins/blob/main/docs/protocol/inbox-v1.md';
 const RETAINED_INPUTS = `${INBOX_EXTENSION}#retained-inputs`;
@@ -201,7 +202,7 @@ export class NativeInbox {
             await this.checkpoint(target.task, target.context);
             if (!valid())
                 throw new Error('Promotion raced input consumption or task settlement.');
-            target.task.history = [...target.task.history, original];
+            target.task.history = [...target.task.history, markInboxInputPending(original)];
             target.headers.set(message.id, source.headers.get(message.id));
             if (!agent.inbox.replace(message.id, promoted))
                 throw new Error('Queued input has already been claimed.');
@@ -293,7 +294,7 @@ export class NativeInbox {
                     throw new Error('Promoted A2A task is not accessible.');
                 const original = Message.fromJSON(JSON.parse(message.source.message));
                 if (!recipient.history.some((item) => item.messageId === original.messageId)) {
-                    recipient.history.push(original);
+                    recipient.history.push(markInboxInputPending(original));
                     await this.checkpoint(recipient, context);
                 }
             }
@@ -651,7 +652,7 @@ export class NativeInbox {
             const history = saved?.history ?? task.task.history;
             const acceptedHistory = history.some((item) => item.messageId === a2aMessage.messageId)
                 ? history
-                : [...history, a2aMessage];
+                : [...history, markInboxInputPending(a2aMessage)];
             await this.checkpoint({ ...task.task, history: acceptedHistory }, context);
             abort.signal.throwIfAborted();
             task.task.history = acceptedHistory;
@@ -759,6 +760,12 @@ export class NativeInbox {
         }
     }
     restoreTask(run, snapshot, context) {
+        for (const event of run.entry.handle.agent.session.snapshotEvents()) {
+            if (event.type === 'user/message' &&
+                event.data.source.kind === 'a2a' &&
+                event.data.source.taskId === snapshot.id)
+                commitInboxInput(snapshot.history, Message.fromJSON(JSON.parse(event.data.source.message)));
+        }
         if (!this.server)
             throw new Error('A2A task recovery requires the running server.');
         const bus = this.server.restoreTask(snapshot, context);
@@ -922,6 +929,24 @@ export class NativeInbox {
             return true;
         }
         try {
+            if (event.type === 'user/message' && event.data.source.kind === 'a2a') {
+                // Commit on the task bus before subsequent assistant deltas, not on admission.
+                const status = {
+                    state: TaskState.TASK_STATE_WORKING,
+                    message: { ...this.protocolMessage(run, task, event.data), taskId: task.task.id },
+                    timestamp: new Date().toISOString(),
+                };
+                task.translator.handle(event);
+                commitInboxInput(task.task.history, status.message);
+                task.task.status = status;
+                task.bus.publish(AgentEvent.statusUpdate({
+                    taskId: task.task.id,
+                    contextId: session.id,
+                    status,
+                    metadata: { dshAgent: { kind: 'user-message' } },
+                }));
+                return true;
+            }
             if (event.type !== 'turn/end') {
                 this.publish(task, event);
                 return true;

package/lib/task-store.js

@@ -16,11 +16,38 @@
  * the shared filter/sort/paginate logic so the backends only enumerate shells.
  */
 import { createHash } from 'node:crypto';
-import { TaskState } from '@a2a-js/sdk';
+import { Role, TaskState, } from '@a2a-js/sdk';
 import { resolveUserScope } from '@a2a-js/sdk/server';
+function inboxMetadata(message) {
+    const value = message.metadata?.dshAgent;
+    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+}
+export function markInboxInputPending(message) {
+    return {
+        ...message,
+        metadata: { ...message.metadata, dshAgent: { ...inboxMetadata(message), inboxPending: true } },
+    };
+}
+/** SDK status updates do not replace admitted history entries with the same ID. */
+export function commitInboxInput(history, message) {
+    const index = history.findIndex((item) => item.messageId === message.messageId && inboxMetadata(item).inboxPending === true);
+    if (index < 0)
+        return;
+    const previous = history[index];
+    const dshAgent = { ...inboxMetadata(previous), ...inboxMetadata(message) };
+    delete dshAgent.inboxPending;
+    history.splice(index, 1);
+    history.push({
+        ...previous,
+        ...structuredClone(message),
+        metadata: { ...previous.metadata, ...message.metadata, dshAgent },
+    });
+}
 /** Omit an unfinished current message from a WORKING snapshot. */
 export function sanitizeTask(task) {
-    const current = task.status?.state === TaskState.TASK_STATE_WORKING && task.status.message?.messageId;
+    const current = task.status?.state === TaskState.TASK_STATE_WORKING &&
+        task.status.message?.role === Role.ROLE_AGENT &&
+        task.status.message.messageId;
     return current
         ? { ...task, history: task.history.filter((message) => message.messageId !== current) }
         : task;
@@ -115,7 +142,9 @@ export class SanitizedTaskStore {
             this.terminalStates.set(task.id, state);
         const history = structuredClone(task.history ?? []);
         const current = task.status?.message;
-        if (task.status?.state === TaskState.TASK_STATE_WORKING && current) {
+        if (current?.role === Role.ROLE_USER)
+            commitInboxInput(history, current);
+        if (task.status?.state === TaskState.TASK_STATE_WORKING && current?.role === Role.ROLE_AGENT) {
             const previous = this.liveHistory
                 .get(task.id)
                 ?.history.find((message) => message.messageId === current.messageId);

package/lib/translator.js

@@ -13,7 +13,7 @@
  *
  *   turn/start                         → statusUpdate(WORKING), ids rotate
  *   stream chunk (text-delta)          → statusUpdate(WORKING, text part),
- *                                        reusing the turn's messageId so
+ *                                        reusing the reply segment's messageId so
  *                                        clients aggregate deltas into one message
  *   stream chunk (reasoning-delta)     → statusUpdate(WORKING, thought metadata)
  *   assistant/message                  → no event; text + usage captured for the
@@ -88,12 +88,12 @@ export class SessionTranslator {
     contextId;
     model;
     source;
-    /** messageId shared by this turn's streamed text deltas (client-side aggregation key). */
+    /** Shared by streamed text deltas until the next committed input or turn. */
     textMessageId = randomUUID();
     thoughtMessageId = randomUUID();
-    /** Authoritative turn text, assembled from `assistant/message` events. */
+    /** Current reply segment, assembled from `assistant/message` events. */
     turnText = '';
-    /** Fallback turn text, accumulated from `text-delta` chunks. */
+    /** Fallback reply segment, accumulated from `text-delta` chunks. */
     deltaText = '';
     sawAssistantMessage = false;
     usage;
@@ -117,6 +117,16 @@ export class SessionTranslator {
                 this.usage = undefined;
                 return [this.status(TaskState.TASK_STATE_WORKING, { kind: 'state-change' })];
             }
+            case 'user/message': {
+                if (event.data.source.kind === 'a2a') {
+                    this.textMessageId = randomUUID();
+                    this.thoughtMessageId = randomUUID();
+                    this.turnText = '';
+                    this.deltaText = '';
+                    this.sawAssistantMessage = false;
+                }
+                return [];
+            }
             case 'assistant/message': {
                 this.sawAssistantMessage = true;
                 for (const block of event.data.message.content) {

package/lib/types/inbox.d.ts

@@ -8,7 +8,7 @@ import type { Session, SessionEvent } from '@deepseek-ai/dsh-session';
 import type { A2aBridge } from './bridge.js';
 import type { A2aTurnContext } from './index.js';
 import type { A2aServer } from './server.js';
-import type { ManagedTaskStore } from './task-store.js';
+import { type ManagedTaskStore } from './task-store.js';
 export declare const INBOX_EXTENSION = "https://github.com/TGYD-helige/dsh-plugins/blob/main/docs/protocol/inbox-v1.md";
 export interface A2aInboxEvent {
     phase: string;

package/lib/types/task-store.d.ts

@@ -15,8 +15,11 @@
  * A2A 1.0 added `list()` to the TaskStore contract; {@link listShells} holds
  * the shared filter/sort/paginate logic so the backends only enumerate shells.
  */
-import { type ListTasksRequest, type ListTasksResponse, type Task } from '@a2a-js/sdk';
+import { type ListTasksRequest, type ListTasksResponse, type Message, type Task } from '@a2a-js/sdk';
 import { type ServerCallContext, type TaskStore } from '@a2a-js/sdk/server';
+export declare function markInboxInputPending(message: Message): Message;
+/** SDK status updates do not replace admitted history entries with the same ID. */
+export declare function commitInboxInput(history: Message[], message: Message): void;
 /** Omit an unfinished current message from a WORKING snapshot. */
 export declare function sanitizeTask(task: Task): Task;
 /** TaskStore with the optional lifecycle our backends add. */

package/lib/types/translator.d.ts

@@ -13,7 +13,7 @@
  *
  *   turn/start                         → statusUpdate(WORKING), ids rotate
  *   stream chunk (text-delta)          → statusUpdate(WORKING, text part),
- *                                        reusing the turn's messageId so
+ *                                        reusing the reply segment's messageId so
  *                                        clients aggregate deltas into one message
  *   stream chunk (reasoning-delta)     → statusUpdate(WORKING, thought metadata)
  *   assistant/message                  → no event; text + usage captured for the
@@ -56,12 +56,12 @@ export declare class SessionTranslator {
     private readonly contextId;
     private readonly model?;
     private readonly source?;
-    /** messageId shared by this turn's streamed text deltas (client-side aggregation key). */
+    /** Shared by streamed text deltas until the next committed input or turn. */
     private textMessageId;
     private thoughtMessageId;
-    /** Authoritative turn text, assembled from `assistant/message` events. */
+    /** Current reply segment, assembled from `assistant/message` events. */
     private turnText;
-    /** Fallback turn text, accumulated from `text-delta` chunks. */
+    /** Fallback reply segment, accumulated from `text-delta` chunks. */
     private deltaText;
     private sawAssistantMessage;
     private usage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/dsh-a2a",
-  "version": "0.1.29",
+  "version": "0.1.31",
   "description": "A2A protocol (JSON-RPC + SSE) server plugin for DeepSeek Harness: expose dsh agents as A2A agents.",
   "type": "module",
   "main": "lib/index.js",