@anureo/adapter-acp 0.2.0 → 0.3.0

package/README.md

@@ -2,19 +2,26 @@
 
 Adapter connecting the Anureo SDK to agents implementing the [Agent Client Protocol](https://agentclientprotocol.com) (ACP), using the official `@agentclientprotocol/sdk` 1.4.0. ACP is an editor↔agent protocol; this adapter brings any standard ACP agent behind the AHP session model — the interoperability proof that AHP is a host-side semantic layer, not a competing agent protocol.
 
-> Part of the [Anureo SDK workspace](../../README.md). Install with `npm install @anureo/adapter-acp`.
+> Part of the [Anureo SDK workspace](../../../README.md). Install with `npm install @anureo/adapter-acp`.
 
 ## Usage
 
+This shows the revised workspace API, not the published 0.2.0 API. Root migration and local
+validation are complete.
+
 ```typescript
-import { createHarnessRuntime } from '@anureo/sdk'
+import { createClient } from '@anureo/sdk'
 import { createAcpAdapter } from '@anureo/adapter-acp'
 
-const runtime = createHarnessRuntime(createAcpAdapter({
-  command: 'my-acp-agent',        // spawn over stdio; or use connect() below
-  args: ['--stdio'],
-  cwd: '/workspace',
-}))
+const client = await createClient({
+  adapter: createAcpAdapter({
+    command: 'my-acp-agent',        // spawn over stdio; or use connect() below
+    args: ['--stdio'],
+    cwd: '/workspace',
+  }),
+  identity: { adapterId: 'acp', runtimeConfigId: 'local' },
+})
+// Use client.sessions.create(...) and session.submit(...); dispose in finally.
 
 // Remote or custom transports inject an official v1 message stream:
 // createAcpAdapter({ connect: () => openMyStream() })
@@ -28,10 +35,16 @@ ACP's core protocol covers sessions, turns, messages, and permission requests. A
 - **Client requests** — `userInput` (`_ahp/user_input`) and `dynamicTool` (`_ahp/dynamic_tool`) interactions
 - **Features** — nested subagent events and custom instructions
 
-Agents that do not advertise the extension still work: the adapter publishes only the standard ACP baseline (interrupt, approval interactions, text/image/file input). fs and terminal capabilities are announced **only** when the host injects the corresponding ports — connecting an adapter never grants filesystem or terminal permission by itself.
+Agents that do not advertise the extension still work: the adapter publishes only the standard ACP baseline (session-scoped interrupt, approval interactions, text/image/file input). fs and terminal capabilities are announced **only** when the host injects the corresponding ports — connecting an adapter never grants filesystem or terminal permission by itself.
 
 Session snapshots loaded via ACP `session/load` have no turn boundaries; they are handed to the host through `onLoadSnapshot` instead of being replayed as realtime events.
 
+Configuration patches apply one field at a time. Each confirmed field updates
+the session state immediately. If a later field fails, `CONFIG_PARTIAL` reports
+`details.appliedKeys`, `details.failedKey` and the underlying `details.cause.code`;
+confirmed changes remain applied. `outcomeUnknown` describes uncertainty about
+the failed field and requires recovery when true.
+
 ## Options
 
 | Option | Purpose |
@@ -40,22 +53,55 @@ Session snapshots loaded via ACP `session/load` have no turn boundaries; they ar
 | `connect` | Provide an official `acp.Stream` factory for remote transports or deterministic wire tests |
 | `fs` (`AcpFileSystemPort`) | Host-implemented read/write text-file callbacks |
 | `terminal` (`AcpTerminalPort`) | Host-implemented terminal lifecycle callbacks |
-| `requestTimeoutMs`, `maxFrameBytes` | Bound each request and every line (default 8 MiB; oversized frames fail with `BACKPRESSURE_EXCEEDED`) |
+| `requestTimeoutMs` | Timeout in milliseconds for ACP requests other than `session/prompt` (default 30,000; DSH preset 120,000) |
+| `maxFrameBytes` | Maximum bytes per incoming or outgoing stdio line (default 8 MiB; oversized frames fail with `BACKPRESSURE_EXCEEDED`) |
 | `onLoadSnapshot` | Receive `session/load` snapshot updates separately from the realtime event stream |
+| `stderrTailLines`, `onStderr` | Set the retained stderr line limit (default 200) and receive redacted lines; `0` disables capture and callbacks |
+| `autoRespondPermission` | Answer `session/request_permission` without an AHP interaction; undecided or unoffered kinds fall back to the human path |
+
+ACP JSON-RPC error codes map to typed SDK errors (`-32601` → `CAPABILITY_UNSUPPORTED`, `-32602` → `INVALID_PARAMS`, `-32000` → `AUTH_REQUIRED`, `-32002` → `RESOURCE_NOT_FOUND`); a dropped connection surfaces as `ACP_CONNECTION_CLOSED` with `outcomeUnknown`, never as a silent success.
+
+For spawned agents, stderr is never forwarded raw: the adapter redacts `sk-…`, bearer tokens, `key=value` secrets, and URL credentials. `stderrTailLines` controls the retained line limit (default 200; `0` disables capture and `onStderr` callbacks). The retained tail is also limited to 32,768 UTF-16 code units, counting each redacted line's length plus one for a separator, so fewer lines may be retained. The adapter attaches that tail to startup and disconnect failures as `details.diagnostics.stderrTail`.
+
+`session/prompt` stop reasons map explicitly: `end_turn` and `cancelled` keep their existing meaning, `max_tokens` / `max_turn_requests` complete the turn with an `ACP_STOP_MAX_TOKENS` / `ACP_STOP_MAX_TURN_REQUESTS` notice, `refusal` fails it, and any unclassified reason fails closed with `ACP_STOP_UNKNOWN`. A backend that stops for an unknown reason is never reported as clean success.
+
+Automatic approval decisions emit an `ACP_PERMISSION_AUTO_ANSWERED` notice carrying only the tool-call id and chosen option; the request's raw input never reaches the notice. Policies never fabricate an option id: when the agent does not offer the requested kind, the request falls back to `interaction/requested`.
+
+## Driving DeepSeek Harness
 
-ACP JSON-RPC error codes map to typed SDK errors (`-32601` → `CAPABILITY_UNSUPPORTED`, `-32602` → `INVALID_PARAMS`, `-32000` → `AUTH_REQUIRED`, `-32002` → `RESOURCE_NOT_FOUND`); a dropped connection surfaces as `ACP_CONNECTION_CLOSED` with `outcomeUnknown`, never as a silent success. Stderr from the agent is drained and discarded — raw provider output and credentials are not retained in diagnostics.
+`createDshAcpAdapter()` presets the one-liner for `dsh --profile acp` (DSH 0.2.2+, Node.js ≥ 24.9):
+
+```typescript
+import { createClient } from '@anureo/sdk'
+import { createDshAcpAdapter } from '@anureo/adapter-acp'
+
+const client = await createClient({
+  adapter: createDshAcpAdapter({ cwd: workspace, autoApprove: true }),
+  identity: { adapterId: 'dsh-acp', runtimeConfigId: 'local' },
+})
+const session = await client.sessions.create({ cwd: workspace, model: 'deepseek-v4-flash' })
+```
+
+DSH advertises the standard ACP v1 baseline only — no `_ahp` extension, no modes, `embeddedContext: false` — so `fork`, `revert`, `steer`, `history`, `goal`, `compact`, `review` and `file` prompt blocks stay unavailable, and `permissionMode` must not be passed. Model values resolve against the advertised `provider/model` enum, so a bare `deepseek-v4-flash` becomes `deepseek-official/deepseek-v4-flash` before it reaches the backend. Auto-approval is opt-in because DSH offers only `allow_once` / `reject_once`; the policy is the only way to run unattended.
 
 ## Development
 
 ```sh
-cd packages/acp
+cd packages/adapter/acp
 bun run typecheck
 bun test tests
 ```
 
-The conformance tests spawn a scripted ACP agent (implementing the standard wire protocol) as a real child process over stdio; `bun run verify:pack` at the workspace root repeats the full text, approval-rejection, and interrupt flows against clean npm installs.
+The conformance tests spawn a scripted ACP agent (implementing the standard wire protocol) as a real child process over stdio.
 
 ## Documentation
 
-- [Architecture](../../docs/architecture.md) — adapters' role in the SDK (currently in Chinese)
-- [AHP v1 protocol](../../spec/ahp-v1.md)
+- [Architecture](../../../docs/architecture.md) — adapters' role in the SDK (currently in Chinese)
+- [AHP v1 protocol](../../../spec/ahp-v1.md)
+
+## AHP v1 lifecycle revision
+
+The lifecycle design updates AHP v1 and package root entries in place.
+The root implementation and tests use the revised lifecycle; parallel versioned
+entries have been removed. Local conformance and clean-install checks have passed. Standard ACP remains limited to guarantees it can prove; overlapping input requires an explicit correlation extension, and session cancellation must not masquerade as exact-turn interrupt.
+See the [design and implementation plan](../../../docs/native-harness-lifecycle.md).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@anureo/adapter-acp",
-  "version": "0.2.0",
   "description": "Anureo SDK adapter for standard Agent Client Protocol (ACP) agents",
+  "version": "0.3.0",
   "license": "Apache-2.0",
   "keywords": [
     "anureo",
@@ -15,7 +15,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/hi-youichi/anureo-sdk.git",
-    "directory": "packages/acp"
+    "directory": "packages/adapter/acp"
   },
   "bugs": {
     "url": "https://github.com/hi-youichi/anureo-sdk/issues"
@@ -26,25 +26,24 @@
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "default": "./dist/index.js"
+      "types": "./src/index.d.ts",
+      "import": "./src/index.js",
+      "default": "./src/index.js"
     }
   },
-  "files": [
-    "dist",
-    "schema",
-    "protocol",
-    "examples",
-    "README.md",
-    "LICENSE"
-  ],
   "dependencies": {
-    "@anureo/sdk": "0.2.0",
-    "@anureo/protocol": "0.2.0",
+    "@anureo/sdk": "0.3.0",
+    "@anureo/protocol": "0.3.0",
     "@agentclientprotocol/sdk": "1.4.0"
   },
   "engines": {
     "node": ">=22"
-  }
+  },
+  "files": [
+    "src",
+    "bin",
+    "schema",
+    "protocol",
+    "examples"
+  ]
 }

package/src/adapter.d.ts

@@ -0,0 +1,214 @@
+import * as acp from '@agentclientprotocol/sdk';
+import { type HarnessAdapter, type BackendSession, type SessionEventSink, type SessionMethod } from '@anureo/sdk';
+import { type Capabilities, type SessionBinding, type SessionOpenParams, type SessionState, type InitializeParams, type InitializeResult, type AhpRequestMap, type AhpResultMap, type JsonObject } from '@anureo/protocol';
+import { type Extensions } from "./extensions.js";
+import type { AcpAdapterOptions } from "./options.js";
+/** Connect an ACP agent to the SDK adapter port. Hosts normally pass a factory result to createClient,
+ * which orders initialization, session acquisition and disposal through its output wrapper.
+ * Direct adapter users must initialize before opening and await disposal even after setup failure. */
+export declare class AcpAdapter implements HarnessAdapter {
+    readonly options: AcpAdapterOptions;
+    /** Construct the adapter without I/O; initialize acquires the transport and negotiates capabilities. */
+    constructor(options: AcpAdapterOptions);
+    /** OutputSession.open queries this after negotiation to select a locally reachable MCP output bridge.
+     * Injected transports cannot attest reachability and return undefined. */
+    outputBridgeTransport(): 'http' | 'stdio' | undefined;
+    /** Native capabilities from the initialize response when available, or an empty descriptor before negotiation. */
+    get nativeCapabilities(): acp.AgentCapabilities;
+    /** Access the connected native request context; throws ACP_CONNECTION_CLOSED before connection setup. */
+    get agent(): acp.ClientContext;
+    /** Whether the adapter has installed a connection and has yet to observe transport loss. */
+    get connected(): boolean;
+    /** Negotiate ACP and return detached AHP capabilities. Calls after a successful handshake reuse its result.
+     * Client.initialize awaits this through withStructuredOutput and retains the capabilities for later opens.
+     * Handshake request failures include a redacted stderr tail when available. Direct callers must dispose
+     * after setup failure and should finish initialization before opening sessions. */
+    initialize(params: InitializeParams): Promise<InitializeResult>;
+    /** Issue a native request with requestTimeoutMs (30 seconds by default). Rejections are translated
+     * to SDK errors. A timeout ends this wait while native work may continue. The adapter's normal
+     * session prompt path uses the native context directly because its reply may be terminal. */
+    call<M extends acp.AgentRequestMethod>(method: M, params: acp.AgentRequestParamsByMethod[M]): Promise<acp.AgentRequestResponsesByMethod[M]>;
+    /** Send a custom native method under the same deadline and error translation as standard methods. */
+    call(method: string, params: unknown): Promise<unknown>;
+    /** Open, resume/load or fork one native session. Opens run one at a time so early updates
+     * can establish the native identity. OutputSession.open supplies the sink and awaits the configured
+     * backend before attachment. Supply protocol-valid parameters, including the fork source and boundary
+     * in fork mode. Dispatch or attachment failures remove local indexes and release the open slot.
+     * Successful backends remain adapter-tracked until teardown. Their owner must dispose them. */
+    openSession(params: SessionOpenParams, sink: SessionEventSink): Promise<BackendSession>;
+    /** Attempt all tracked session releases, then close the native connection and channel, and clear indexes.
+     * Reject RESOURCE_RELEASE_FAILED after all attempts if any fail. Repeated calls after closing begins
+     * return immediately; disposal does not prove native executions stopped. */
+    dispose(): Promise<void>;
+    private connection;
+    private channel;
+    private info;
+    /** Adapter's AHP session index. Disposed sessions remain indexed until adapter teardown. */
+    readonly sessions: Map<string, AcpBackendSession>;
+    private nativeSessions;
+    private openingSession;
+    private sessionOpenQueueTail;
+    private readonly deliveries;
+    private closing;
+    private connectionLost;
+    private sourceFailure?;
+    /** Peer-negotiated features. Backend requests can withdraw a method the peer rejects as unsupported. */
+    extension: Extensions;
+    /** Negotiated baseline. Each backend clones it before applying session configuration. */
+    capabilities: Capabilities;
+    /** Install initialize's transport and handlers before sending the handshake. When the SDK reports
+     * closure, reject outstanding response deliveries and fail live sessions unless disposal is underway. */
+    private installConnection;
+    /** Return detached negotiated capabilities so callers can retain their initialization result. */
+    private initializedResult;
+    /** Notify currently indexed sessions of observation loss. A rejected sink must not stop fan-out. */
+    private failSessions;
+    /** Build openSession's native request. For resume/load, register the known ID and begin snapshot
+     * capture before dispatch so updates received before the reply reach the correct backend. */
+    private prepareSessionOpen;
+    /** Reconcile the reply with any early notification identity before openSession applies overrides.
+     * Index the backend and finish snapshot capture before invoking the host's snapshot callback. */
+    private acceptOpenResponse;
+    /** Remove the indexes that openSession may have populated before failure, including through early updates. */
+    private forgetFailedOpen;
+    /** Attach redacted channel diagnostics before initialize rejects a handshake failure or the
+     * SDK closure handler reports observation loss. Preserve the error when no tail is available. */
+    private withDiagnostics;
+    /** Resolve the native ID for SDK callbacks and routeNotification. Only a session/update may
+     * identify the current opening backend. Reject other unknown IDs as invalid native parameters. */
+    private backend;
+    /** Register a native request with the session sink after establishing standard turn correlation.
+     * The sink invokes the responder with an answer or cancellation. Resolve the native response first,
+     * but keep the responder pending until wrapStream confirms its write, so settlement cannot claim early delivery. */
+    private interaction;
+    /** Consume session updates and negotiated lifecycle events before the official SDK handles remaining frames.
+     * Await sink publication to preserve source order; routing failures end stream observation in wrapStream. */
+    private routeNotification;
+    /** Route notifications in read order before forwarding other frames to the SDK. A successful
+     * response write acknowledges delivery to the interaction responder. Stream errors fail observation. */
+    private wrapStream;
+    /** Configure the ACP SDK callbacks for installConnection before initialize advertises their
+     * capabilities. The SDK invokes them for incoming peer requests and notifications. */
+    private createClientApplication;
+    /** Handle the ACP SDK's elicitation callback. Cancel unsupported scopes or modes immediately.
+     * For a session request, keep URL details in the private payload and return the sink's answer to the peer. */
+    private requestElicitation;
+    /** Answer the ACP SDK's permission request with an offered option after publishing the policy
+     * notice. If policy declines or has no matching option, await the interactive session response. */
+    private requestPermission;
+    /** Register the filesystem and terminal callbacks supplied by the host. The ACP SDK handler
+     * validates session and terminal ownership before returning the port's response to the peer. */
+    private registerPorts;
+    /** After initialize validates the peer version, store the baseline capability projection and
+     * negotiated extension methods. Session construction clones the baseline before applying overrides. */
+    private configureCapabilities;
+    /** Handle registered _ahp user-input/tool requests only after negotiation; validate before sink registration.
+     * Native callers receive a response or cancellation; unavailable extensions reject as method-not-found. */
+    private extensionInteraction;
+}
+/** Native session implementation returned by AcpAdapter.openSession and adopted by OutputSession.open.
+ * Execution receipts and sink lifecycle events are separate observations; disposal releases handles
+ * without asserting that native execution stopped. Routing/state methods support adapter collaboration. */
+export declare class AcpBackendSession implements BackendSession {
+    readonly adapter: AcpAdapter;
+    private readonly params;
+    readonly sink: SessionEventSink;
+    /** Create session-local projection and configuration state. AcpAdapter.openSession assigns the
+     * native identity. The mapper reads this backend's current turn and applies peer metadata/config
+     * updates through configure before publishing snapshots to the supplied sink. */
+    constructor(adapter: AcpAdapter, params: SessionOpenParams, sink: SessionEventSink);
+    /** Attach the native ACP identity to the requested AHP binding; identity is established before openSession returns. */
+    get binding(): SessionBinding;
+    /** Expose the current attachment snapshot to OutputSession.open; collection fields are session-owned. */
+    get state(): SessionState;
+    /** Build state for attachment and sink publication. Configuration and capabilities are session-owned references. */
+    snapshot(): SessionState;
+    /** AcpAdapter.routeNotification forwards negotiated v2 events here. Bind submissions through the sink,
+     * flush a turn's mapper before its terminal event, and reject invalid payloads instead of publishing them. */
+    nativeEvent(raw: unknown, scope: Record<string, unknown>): Promise<void>;
+    /** Publish legacy _ahp events from AcpAdapter.routeNotification, binding review/input on native start.
+     * Release matching terminal admission before publication; conflicting execution identities reject routing. */
+    extensionEvent(raw: unknown, scope: Record<string, unknown>): Promise<void>;
+    /** Publish a standard turn start before update, interaction registration or terminal prompt handling
+     * continues. Bind after start publication, setting the guard before either await to prevent duplicate starts. */
+    ensureStandardStarted(): Promise<void>;
+    /** Merge native configuration or a session-title patch from open responses and AcpUpdateMapper callbacks.
+     * Configuration changes refresh descriptors and revision; title-only changes leave the revision unchanged. */
+    configure(data: Record<string, unknown>): void;
+    /** AcpAdapter routes session/update here: retain bounded load snapshots without replay, or await live projection.
+     * Correlated updates require an observed start; unsupported uncorrelated execution updates reject routing. */
+    update(data: Record<string, unknown>): Promise<void>;
+    /** Reject peer operations on terminal IDs not successfully created for this session or already released. */
+    requireTerminal(id: string): void;
+    /** Apply a configuration patch in key order and return the resulting session state. Reject unknown
+     * keys before dispatch. AcpAdapter.openSession awaits initial overrides before attachment, and execute
+     * returns this state for host patches. Publish each confirmed field. A later native failure rejects
+     * with CONFIG_PARTIAL and the confirmed keys, whose changes remain applied. */
+    setConfiguration(patch: JsonObject): Promise<SessionState>;
+    /** OutputSession.execute dispatches validated session operations here and consumes the native result/failure.
+     * Session cancellation only acknowledges notification delivery; completion comes from the prompt/event.
+     * Close reports executionStopped=unconfirmed, and unsupported exact-turn operations reject. */
+    execute<M extends SessionMethod>(method: M, params: AhpRequestMap[M]): Promise<AhpResultMap[M]>;
+    /**
+     * Share one cleanup promise across calls. Mark closed before attempting every retained terminal
+     * release and optional native close; clear local handles and reject aggregated release failures.
+     * OutputSession.dispose awaits this during teardown. OutputSession.open also awaits it when a
+     * backend arrives after teardown, and AcpAdapter.dispose calls it for every tracked backend.
+     */
+    dispose(): Promise<void>;
+    private readonly nativeMappers;
+    private readonly nativeStartedTurnIds;
+    private standardTurnStarted;
+    private standardSubmissionId?;
+    /** Standard/legacy lane identity; v2 executions are tracked independently. */
+    activeTurn: string | undefined;
+    private readonly mapper;
+    private releasing?;
+    private nativeClosed;
+    /** Native identity assigned by openSession, including early update correlation. */
+    nativeId: string;
+    /** While resume/load is pending, historical updates are captured instead of published. */
+    hydrating: boolean;
+    /** Bounded historical updates delivered to onLoadSnapshot after opening. */
+    readonly loadedSnapshot: JsonObject[];
+    /** Successfully created terminal IDs awaiting explicit or disposal release. */
+    readonly terminals: Set<string>;
+    /** Session-local negotiated capabilities, refreshed by native configuration and extension failures. */
+    readonly capabilities: Capabilities;
+    private config;
+    private configKeys;
+    private configurationData;
+    private capabilityRevision;
+    private sessionTitle?;
+    private closed;
+    private snapshotBytes;
+    /** Save pre-attachment updates for the host snapshot callback. Capture title as attachment metadata
+     * and bound the remaining history by count and estimated size before retaining its safe projection. */
+    private captureLoadedUpdate;
+    /** Return the per-turn mapper used by update. A native start must have been observed before
+     * projection. nativeEvent flushes and removes the mapper on completion. */
+    private correlatedMapper;
+    /** Dispatch a legacy review in the single execution lane. The receipt confirms dispatch.
+     * Native start notifications establish binding. Definite pre-start rejection releases admission;
+     * unknown outcome retains it, and method-not-found withdraws review capability before rejecting. */
+    private submitReview;
+    /** Reserve the uncorrelated ACP lane before review or prompt dispatch; reject overlapping submissions. */
+    private beginStandardSubmission;
+    /** Release only this prompt's lane: terminal observers may already have admitted its successor. */
+    private releaseStandardTurn;
+    /** Reject closed/unsupported delivery before choosing negotiated native correlation or the single standard ACP lane. */
+    private submitInput;
+    /** Return the peer's validated acceptance; v2 lifecycle notifications independently bind and complete turns. */
+    private submitCorrelatedInput;
+    /** Await the uncorrelated prompt's terminal response and publish mapped completion before returning acceptance. */
+    private submitStandardInput;
+    /** Dispatch a negotiated extension, enrich history tool file changes, and validate the native result.
+     * Method-not-found withdraws the affected live capability and publishes state before rejecting. */
+    private extension;
+    /** Remove the rejected method for future dispatch and update this session's advertised capability.
+     * The caller publishes the revised session state before surfacing the native rejection. */
+    private withdrawExtension;
+}
+/** Create an ACP adapter without starting I/O. Pass it to createClient for negotiation and owned cleanup,
+ * or initialize/open/dispose it directly in that order; connect takes precedence over command. */
+export declare function createAcpAdapter(options: AcpAdapterOptions): AcpAdapter;