@amaster.ai/dsh-a2a 0.1.19 → 0.1.20

package/README.md

@@ -53,7 +53,7 @@ Disabled by default. Configure via the profile's `cordis.patch.yml`:
 ## Endpoints
 
 - `GET /.well-known/agent-card.json` — agent card: A2A 1.0 shape for `A2A-Version: 1.0` clients, the 0.3 shape for headerless clients (the legacy `/.well-known/agent.json` path is served as an alias)
-- `POST <basePath>/` — JSON-RPC. v1 methods: `SendMessage` (blocking by default, `configuration.returnImmediately: true` returns after the first event), `SendStreamingMessage` (SSE), `GetTask`, `ListTasks` (filter + cursor pagination), `CancelTask`, `SubscribeToTask` (the current task is the first event; the bus stays alive while the task is interrupted, so interrupted tasks can be re-followed live). v0.3 spellings (`message/send`, `message/stream`, `tasks/get`, `tasks/cancel`, `tasks/resubscribe`) keep working through the compat layer. Legacy `tasks/get` also accepts `contextId` without `id` on this path or root `/`, returning the latest stored task or `result: null` when absent.
+- `POST <basePath>/` — JSON-RPC. v1 methods: `SendMessage` (blocking by default, `configuration.returnImmediately: true` returns after the first event), `SendStreamingMessage` (SSE), `GetTask`, `ListTasks` (filter + cursor pagination), `CancelTask`, `SubscribeToTask` (the current task is the first event; the bus stays alive while the task is interrupted, so interrupted tasks can be re-followed live). v0.3 spellings (`message/send`, `message/stream`, `tasks/get`, `tasks/cancel`, `tasks/resubscribe`) keep working through the compat layer. Legacy SSE status updates that end an interaction carry `final: true`, including `input-required` after a completed turn or an approval wait; this ends the stream without making the task terminal. Resubscribe snapshots keep waiting for future events while a live task bus exists. Legacy `tasks/get` also accepts `contextId` without `id` on this path or root `/`, returning the latest stored task or `result: null` when absent.
 
 ## Behavior notes
 

package/lib/legacy-stream.js

@@ -0,0 +1,100 @@
+import { Extensions } from '@a2a-js/sdk';
+import { LegacyJsonRpcTransportHandler } from '@a2a-js/sdk/compat/v0_3/server';
+import { defaultServerCallContextBuilder, validateVersion, } from '@a2a-js/sdk/server';
+import { UserBuilder } from '@a2a-js/sdk/server/express';
+/** SDK 1.1.0 derives legacy final from task terminality, losing interaction endings. */
+export function legacyStreamHandler(requestHandler) {
+    const transport = new LegacyJsonRpcTransportHandler(requestHandler);
+    return async (req, res, next) => {
+        if (req.method !== 'POST' ||
+            req.path !== '/' ||
+            !req.is('application/json') ||
+            !['message/stream', 'tasks/resubscribe'].includes(req.body?.method)) {
+            next();
+            return;
+        }
+        const errorResponse = (error) => ({
+            jsonrpc: '2.0',
+            id: req.body?.id ?? null,
+            error: LegacyJsonRpcTransportHandler.mapToLegacyJSONRPCError(error),
+        });
+        try {
+            const context = defaultServerCallContextBuilder({
+                extensions: Extensions.parseServiceParameter(req.header('X-A2A-Extensions') ?? req.header('A2A-Extensions')),
+                user: await UserBuilder.noAuthentication(),
+                headers: req.headers,
+                requestedVersion: req.header('A2A-Version'),
+            });
+            validateVersion(context.requestedVersion, await requestHandler.getAgentCard(), 'JSONRPC');
+            const response = await transport.handle(req.body, context);
+            if (!(Symbol.asyncIterator in response)) {
+                res.json(response);
+                return;
+            }
+            const stream = response;
+            try {
+                const startStream = () => {
+                    if (context.activatedExtensions)
+                        res.setHeader('X-A2A-Extensions', Array.from(context.activatedExtensions));
+                    res.setHeader('Content-Type', 'text/event-stream');
+                    res.setHeader('Cache-Control', 'no-cache');
+                    res.setHeader('Connection', 'keep-alive');
+                    res.flushHeaders();
+                };
+                // The SDK always streams resubscribe errors; sends validate before SSE headers.
+                if (req.body.method === 'tasks/resubscribe')
+                    startStream();
+                const first = await stream.next();
+                if (!res.headersSent)
+                    startStream();
+                let last;
+                const write = (event) => {
+                    last = event;
+                    const result = event.result;
+                    // INPUT_REQUIRED closes the SDK queue, including real approval waits.
+                    // A task snapshot on resubscribe does not close it and is left intact.
+                    if (result?.kind === 'status-update' && result.status?.state === 'input-required')
+                        result.final = true;
+                    res.write(`data: ${JSON.stringify(event)}\n\n`);
+                    return result?.kind === 'status-update' && result.final;
+                };
+                if (!first.done && write(first.value))
+                    return;
+                for await (const event of stream) {
+                    if (res.destroyed)
+                        break;
+                    if (write(event))
+                        return;
+                }
+                // A cold subscription has no live bus: the SDK ends after the snapshot.
+                const snapshot = last?.result;
+                if (!res.destroyed && snapshot?.kind === 'task')
+                    write({
+                        ...last,
+                        result: {
+                            kind: 'status-update',
+                            taskId: snapshot.id,
+                            contextId: snapshot.contextId,
+                            status: snapshot.status,
+                            metadata: snapshot.metadata,
+                            final: true,
+                        },
+                    });
+            }
+            finally {
+                await stream.return(undefined);
+            }
+        }
+        catch (error) {
+            console.error('[dsh-a2a] legacy stream failed:', error);
+            if (!res.headersSent)
+                res.json(errorResponse(error));
+            else if (!res.destroyed)
+                res.write(`event: error\ndata: ${JSON.stringify(errorResponse(error))}\n\n`);
+        }
+        finally {
+            if (!res.writableEnded)
+                res.end();
+        }
+    };
+}

package/lib/server.js

@@ -19,6 +19,7 @@ import { RequestMalformedError } from '@a2a-js/sdk/errors';
 import { DefaultExecutionEventBus, DefaultRequestHandler, ServerCallContext, STATE_HEADERS_KEY, } from '@a2a-js/sdk/server';
 import { agentCardHandler, jsonRpcHandler, UserBuilder } from '@a2a-js/sdk/server/express';
 import express from 'express';
+import { legacyStreamHandler } from './legacy-stream.js';
 export async function startA2aServer(options) {
     const intervalMs = options.heartbeat?.intervalMs ?? 15_000;
     if (!Number.isInteger(intervalMs) || intervalMs < 1 || intervalMs > 2_147_483_647) {
@@ -437,7 +438,7 @@ export async function startA2aServer(options) {
                 res.sendStatus(404);
         }, contextLookup, rpcHandler);
     }
-    app.use(base, contextLookup, rpcHandler);
+    app.use(base, contextLookup, legacyStreamHandler(requestHandler), rpcHandler);
     const server = createServer(app);
     await new Promise((resolve, reject) => {
         server.once('error', reject);

package/lib/types/legacy-stream.d.ts

@@ -0,0 +1,4 @@
+import { type A2ARequestHandler } from '@a2a-js/sdk/server';
+import type { RequestHandler } from 'express';
+/** SDK 1.1.0 derives legacy final from task terminality, losing interaction endings. */
+export declare function legacyStreamHandler(requestHandler: A2ARequestHandler): RequestHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/dsh-a2a",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "description": "A2A protocol (JSON-RPC + SSE) server plugin for DeepSeek Harness: expose dsh agents as A2A agents.",
   "type": "module",
   "main": "lib/index.js",
@@ -61,6 +61,7 @@
     }
   },
   "devDependencies": {
+    "@a2a-js/sdk-v03": "npm:@a2a-js/sdk@0.3.14",
     "@deepseek-ai/cordis": "^4.0.4",
     "@deepseek-ai/dsh-agent": "0.2.0-rc.2",
     "@deepseek-ai/dsh-attachment": "0.2.0-rc.2",