@amaster.ai/dsh-a2a 0.1.26 → 0.1.28

package/lib/index.js

@@ -18,6 +18,7 @@ import { A2aBridge } from './bridge.js';
 import { DshAgentExecutor } from './executor.js';
 import { INBOX_EXTENSION, NativeInbox } from './inbox.js';
 import { startA2aServer } from './server.js';
+import { FilesystemTaskStore } from './stores/filesystem.js';
 import { GcsTaskStore } from './stores/gcs.js';
 import { RedisTaskStore } from './stores/redis.js';
 import { MemoryTaskStore, SanitizedTaskStore } from './task-store.js';
@@ -29,7 +30,7 @@ export const name = 'dsh-a2a';
 /** The bridge creates and owns agents through the registry service. */
 export const inject = ['agents'];
 export const Config = Schema.object({
-    inbox: Schema.object({ enabled: Schema.boolean().default(false) }).description('Use durable native inbox execution (requires the upstream native inbox capability).'),
+    inbox: Schema.object({ enabled: Schema.boolean().default(false) }).description('Use the official DSH inbox for queued turns and steering.'),
     enabled: Schema.boolean().default(false),
     host: Schema.string().default('127.0.0.1'),
     port: Schema.natural().default(41241),
@@ -70,9 +71,11 @@ export const Config = Schema.object({
      */
     taskStore: Schema.union([
         Schema.const('memory'),
+        Schema.const('filesystem'),
         Schema.const('redis'),
         Schema.const('gcs'),
     ]).default('memory'),
+    filesystem: Schema.object({ root: Schema.string().default('') }),
     redis: Schema.object({
         url: Schema.string().role('secret').default('redis://127.0.0.1:6379'),
         keyPrefix: Schema.string().default('a2a'),
@@ -198,6 +201,8 @@ export function apply(ctx, config) {
 }
 function createTaskStore(config) {
     switch (config.taskStore) {
+        case 'filesystem':
+            return new SanitizedTaskStore(new FilesystemTaskStore({ root: config.filesystem?.root ?? '' }));
         case 'redis':
             return new SanitizedTaskStore(new RedisTaskStore(config.redis));
         case 'gcs':

package/lib/stores/filesystem.js

@@ -0,0 +1,86 @@
+/** Local task snapshots, retained alongside the DSH session log. */
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdir, open, readdir, readFile, rename, rm } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+import { Task } from '@a2a-js/sdk';
+import { listShells, taskScopeKey } from '../task-store.js';
+export class FilesystemTaskStore {
+    root;
+    constructor(config) {
+        if (!config.root)
+            throw new Error('[dsh-a2a] filesystem.root is required.');
+        this.root = resolve(config.root);
+    }
+    directory(context) {
+        return join(this.root, taskScopeKey(context));
+    }
+    path(id, context) {
+        return join(this.directory(context), `${createHash('sha256').update(id).digest('hex')}.json`);
+    }
+    async save(task, context) {
+        const directory = this.directory(context);
+        await mkdir(directory, { recursive: true, mode: 0o700 });
+        const temporary = join(directory, `${randomUUID()}.tmp`);
+        try {
+            const file = await open(temporary, 'wx', 0o600);
+            try {
+                await file.writeFile(JSON.stringify(Task.toJSON(task)));
+                await file.sync();
+            }
+            finally {
+                await file.close();
+            }
+            await rename(temporary, this.path(task.id, context));
+            // Windows cannot open directory handles through fs.open.
+            if (process.platform !== 'win32') {
+                const dir = await open(directory, 'r');
+                try {
+                    await dir.sync();
+                }
+                finally {
+                    await dir.close();
+                }
+            }
+        }
+        finally {
+            await rm(temporary, { force: true });
+        }
+    }
+    async load(id, context) {
+        try {
+            return Task.fromJSON(JSON.parse(await readFile(this.path(id, context), 'utf8')));
+        }
+        catch (error) {
+            if (error.code === 'ENOENT')
+                return;
+            throw error;
+        }
+    }
+    async delete(id, context) {
+        await rm(this.path(id, context), { force: true });
+    }
+    async list(params, context) {
+        let files;
+        try {
+            files = await readdir(this.directory(context));
+        }
+        catch (error) {
+            if (error.code !== 'ENOENT')
+                throw error;
+            files = [];
+        }
+        const tasks = [];
+        for (const file of files) {
+            if (!/^[a-f0-9]{64}\.json$/.test(file))
+                continue;
+            try {
+                tasks.push(Task.fromJSON(JSON.parse(await readFile(join(this.directory(context), file), 'utf8'))));
+            }
+            catch (error) {
+                if (error.code !== 'ENOENT')
+                    throw error;
+            }
+        }
+        return listShells(tasks, params);
+    }
+}

package/lib/types/bridge.d.ts

@@ -102,7 +102,7 @@ export declare class A2aBridge {
     };
     private findApproval;
     waitForTurn(entry: TaskEntry): Promise<void>;
-    /** The native inbox selects task ownership before assembling its first prompt. */
+    /** The official inbox claim selects the task that owns the next model step. */
     bindInboxTask(entry: TaskEntry, taskId: string, translator: SessionTranslator, bus: ExecutionEventBus, completion: Promise<void>, controller: AbortController): void;
     /** Inspect a message for a live task before the SDK starts its next request. */
     beforeWorkingTaskMessage(a2aMessage: Message, requestHeaders: unknown): Promise<void>;

package/lib/types/inbox.d.ts

@@ -2,7 +2,8 @@ import { Message } from '@a2a-js/sdk';
 import { type ExecutionEventBus, type RequestContext, ServerCallContext } from '@a2a-js/sdk/server';
 import type { Context } from '@deepseek-ai/cordis';
 import type { Agent, AssistantStreamFrame, InboxTarget } from '@deepseek-ai/dsh-agent';
-import type { ContentBlock, UserMessage } from '@deepseek-ai/dsh-llm/types';
+import type { GoalMessageSource } from '@deepseek-ai/dsh-goal';
+import type { ContentBlock } from '@deepseek-ai/dsh-llm/types';
 import type { Session, SessionEvent } from '@deepseek-ai/dsh-session';
 import type { A2aBridge } from './bridge.js';
 import type { A2aTurnContext } from './index.js';
@@ -17,7 +18,6 @@ export interface A2aInboxEvent {
     target?: 'next-turn' | 'next-step';
     input?: string;
     position?: number;
-    paused?: boolean;
     agentStatus?: string;
     taskId?: string;
     taskIds?: string[];
@@ -36,32 +36,21 @@ interface InboxSource {
     message: string;
     target: InboxTarget;
     queuedAt?: number;
+    promotedFrom?: string;
+    promotionId?: string;
 }
 declare module '@deepseek-ai/dsh-llm/types' {
     interface MessageSourceMap {
         a2a: InboxSource;
-    }
-}
-declare module '@deepseek-ai/dsh-session/types' {
-    interface SessionEventMap {
-        'agent/inbox/paused': {
-            paused: boolean;
-        };
+        goal: GoalMessageSource;
     }
 }
 declare module '@deepseek-ai/cordis' {
     interface Events {
         /** Native inbox lifecycle; content consumers must honor their capture settings. */
         'a2a/inbox'(detail: A2aInboxEvent): void;
-        'agent/before-assembly'(detail: {
-            agent: Agent;
-            messages: UserMessage[];
-            turn: number;
-            step: number;
-            signal: AbortSignal;
-        }): void | Promise<void>;
-        /** Selected input, before system-prompt assembly; restored input has no original headers. */
-        'a2a/before-assembly'(detail: A2aTurnContext): void | Promise<void>;
+        /** Selected input at the official pre-step boundary, after system-prompt assembly. */
+        'a2a/before-step'(detail: A2aTurnContext): void | Promise<void>;
     }
 }
 /** Same-process queue control; wire messages and task subscriptions remain standard A2A. */
@@ -73,23 +62,11 @@ export interface A2aInbox {
         target?: InboxTarget;
         wakeup?: boolean;
     }): Promise<void>;
-    pause(contextId: string): Promise<void>;
-    /** Cancellation is terminal; retained pending input stays paused until explicit resume. */
-    cancel(taskId: string, options?: {
-        retainInbox?: boolean;
-    }): Promise<string | undefined>;
-    /** Recovery does not override a persisted pause unless resume is explicitly true. */
-    wake(contextId: string, options?: {
-        resume?: boolean;
-        context?: ServerCallContext;
-    }): Promise<string[]>;
+    /** Transfer one unclaimed independent input into the active task. */
+    promote(contextId: string, messageId: string, taskId: string): Promise<void>;
+    /** Standard cancellation is terminal and removes only this task's pending input. */
+    cancel(taskId: string): Promise<string | undefined>;
 }
-/** Fold native input mutations; a claimed input is recoverable only before user/message. */
-export declare function recoverInbox(events: readonly SessionEvent[]): {
-    paused: boolean;
-    pending: UserMessage[];
-    committed: Set<string>;
-};
 export declare class NativeInbox implements A2aInbox {
     private readonly ctx;
     private readonly bridge;
@@ -98,7 +75,6 @@ export declare class NativeInbox implements A2aInbox {
     private readonly resolving;
     private stopping;
     private shutdownPromise?;
-    private readonly waking;
     private readonly preadmitted;
     server?: A2aServer;
     constructor(ctx: Context, bridge: A2aBridge, store: ManagedTaskStore);
@@ -108,6 +84,11 @@ export declare class NativeInbox implements A2aInbox {
         target?: InboxTarget;
         wakeup?: boolean;
     }): Promise<void>;
+    private moveInput;
+    promote(contextId: string, messageId: string, taskId: string): Promise<void>;
+    private promoteInput;
+    /** Repair only an incomplete ownership move, never an ordinary DSH claim. */
+    private recoverPromotions;
     private context;
     private observe;
     private observeInput;
@@ -125,22 +106,17 @@ export declare class NativeInbox implements A2aInbox {
     private admit;
     execute(request: RequestContext, bus: ExecutionEventBus): Promise<void>;
     private restoreTask;
-    private drive;
+    private select;
+    private protocolMessage;
+    private owner;
     private prepare;
     private publish;
     onSessionEvent(session: Session, event: SessionEvent): boolean;
     private settle;
     onAssistantStream(agent: Agent, frame: AssistantStreamFrame): boolean;
     private fail;
-    pause(contextId: string): Promise<void>;
-    wake(contextId: string, options?: {
-        resume?: boolean;
-        context?: ServerCallContext;
-    }): Promise<string[]>;
-    private wakeInner;
-    cancel(taskId: string, options?: {
-        retainInbox?: boolean;
-    }): Promise<string | undefined>;
+    private discard;
+    cancel(taskId: string): Promise<string | undefined>;
     private cancelTask;
     clear(contextId: string): Promise<void>;
     onDisposed(session: Session): void;

package/lib/types/index.d.ts

@@ -131,7 +131,12 @@ export declare const Config: Schema<Schemastery.ObjectS<{
      * A2A task snapshots, including protocol history. dsh-storage separately
      * owns the full conversation log. 'memory' loses tasks on restart.
      */
-    taskStore: Schema<"memory" | "redis" | "gcs", "memory" | "redis" | "gcs">;
+    taskStore: Schema<"memory" | "filesystem" | "redis" | "gcs", "memory" | "filesystem" | "redis" | "gcs">;
+    filesystem: Schema<Schemastery.ObjectS<{
+        root: Schema<string, string>;
+    }>, Schemastery.ObjectT<{
+        root: Schema<string, string>;
+    }>>;
     redis: Schema<Schemastery.ObjectS<{
         url: Schema<string, string>;
         keyPrefix: Schema<string, string>;
@@ -213,7 +218,12 @@ export declare const Config: Schema<Schemastery.ObjectS<{
      * A2A task snapshots, including protocol history. dsh-storage separately
      * owns the full conversation log. 'memory' loses tasks on restart.
      */
-    taskStore: Schema<"memory" | "redis" | "gcs", "memory" | "redis" | "gcs">;
+    taskStore: Schema<"memory" | "filesystem" | "redis" | "gcs", "memory" | "filesystem" | "redis" | "gcs">;
+    filesystem: Schema<Schemastery.ObjectS<{
+        root: Schema<string, string>;
+    }>, Schemastery.ObjectT<{
+        root: Schema<string, string>;
+    }>>;
     redis: Schema<Schemastery.ObjectS<{
         url: Schema<string, string>;
         keyPrefix: Schema<string, string>;
@@ -261,7 +271,10 @@ export interface A2aPluginConfig {
         version: string;
         publicUrl: string;
     };
-    taskStore: 'memory' | 'redis' | 'gcs';
+    taskStore: 'memory' | 'filesystem' | 'redis' | 'gcs';
+    filesystem?: {
+        root: string;
+    };
     redis: {
         url: string;
         keyPrefix: string;

package/lib/types/stores/filesystem.d.ts

@@ -0,0 +1,15 @@
+import { type ListTasksRequest, type ListTasksResponse, Task } from '@a2a-js/sdk';
+import type { ServerCallContext } from '@a2a-js/sdk/server';
+import { type ManagedTaskStore } from '../task-store.js';
+export declare class FilesystemTaskStore implements ManagedTaskStore {
+    private readonly root;
+    constructor(config: {
+        root: string;
+    });
+    private directory;
+    private path;
+    save(task: Task, context: ServerCallContext): Promise<void>;
+    load(id: string, context: ServerCallContext): Promise<Task | undefined>;
+    delete(id: string, context: ServerCallContext): Promise<void>;
+    list(params: ListTasksRequest, context: ServerCallContext): Promise<ListTasksResponse>;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/dsh-a2a",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "A2A protocol (JSON-RPC + SSE) server plugin for DeepSeek Harness: expose dsh agents as A2A agents.",
   "type": "module",
   "main": "lib/index.js",
@@ -38,14 +38,15 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-agent": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1",
-    "@deepseek-ai/dsh-attachment": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1",
-    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1",
-    "@deepseek-ai/dsh-session": ">=0.2.0-rc.1",
-    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1",
-    "@deepseek-ai/dsh-user-approval": ">=0.1.6-alpha.2 || >=0.1.7-alpha.1 || >=0.2.0-rc.1",
+    "@deepseek-ai/dsh-agent": ">=0.2.0-rc.2 || >=0.2.1-alpha.1",
+    "@deepseek-ai/dsh-attachment": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1 || >=0.2.1-rc.1",
+    "@deepseek-ai/dsh-llm": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1 || >=0.2.1-rc.1",
+    "@deepseek-ai/dsh-session": ">=0.2.0-rc.1 || >=0.2.1-rc.1",
+    "@deepseek-ai/dsh-tools": ">=0.1.5-rc.1 || >=0.1.6-alpha.1 || >=0.1.7-alpha.1 || >=0.2.0-rc.1 || >=0.2.1-rc.1",
+    "@deepseek-ai/dsh-user-approval": ">=0.1.6-alpha.2 || >=0.1.7-alpha.1 || >=0.2.0-rc.1 || >=0.2.1-rc.1",
     "@google-cloud/storage": "^7.0.0",
-    "ioredis": "^5.0.0"
+    "ioredis": "^5.0.0",
+    "@deepseek-ai/dsh-goal": ">=0.2.0-rc.2 || >=0.2.1-alpha.1"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh-attachment": {
@@ -59,24 +60,28 @@
     },
     "ioredis": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-goal": {
+      "optional": true
     }
   },
   "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",
-    "@deepseek-ai/dsh-llm": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-session": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-session-projection": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-tools": "0.2.0-rc.2",
-    "@deepseek-ai/dsh-user-approval": "0.2.0-rc.2",
+    "@deepseek-ai/cordis": "4.0.5",
+    "@deepseek-ai/dsh-agent": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-attachment": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-llm": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-session": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-tools": "0.2.1-rc.2",
+    "@deepseek-ai/dsh-user-approval": "0.2.1-rc.2",
     "@google-cloud/storage": "^7.0.0",
     "@types/express": "^4.17.21",
     "@types/node": "^22.0.0",
     "ioredis": "^5.0.0",
     "typescript": "^5.6.3",
-    "vitest": "^4.1.11"
+    "vitest": "^4.1.11",
+    "@deepseek-ai/dsh-goal": "0.2.1-rc.2"
   },
   "engines": {
     "node": "^20.19 || ^22.12 || >=24.0"