@namzu/sdk 43.0.0 → 44.1.0

package/dist/bridge/a2a/mapper.js

@@ -21,17 +21,17 @@ function artifactEvent(taskId, contextId, artifact) {
 const MAPPING = {
     // Internal cumulative admission ledger, not a public UI event.
     tool_calls_admitted: null,
-    // Hosted activity is retained in the run log; A2A exposes the resulting answer.
+    // Hosted activity is retained in the session log; A2A exposes the resulting answer.
     hosted_tool: null,
-    run_started: (e, ctx) => statusEvent(e.runId, 'running', false, ctx),
-    run_completed: (e, ctx) => {
-        const completedEvent = statusEvent(e.runId, 'completed', true, ctx, {
+    turn_started: (e, ctx) => statusEvent(e.turnId, 'running', false, ctx),
+    turn_completed: (e, ctx) => {
+        const completedEvent = statusEvent(e.turnId, 'completed', true, ctx, {
             role: 'agent',
             parts: [{ kind: 'text', text: e.result }],
         });
         return completedEvent;
     },
-    run_failed: (e, ctx) => statusEvent(e.runId, 'failed', true, ctx, {
+    turn_failed: (e, ctx) => statusEvent(e.turnId, 'failed', true, ctx, {
         role: 'agent',
         parts: [{ kind: 'text', text: e.error }],
     }, 
@@ -57,7 +57,7 @@ const MAPPING = {
     // tell a remote caller how loosely its work is being supervised, which
     // is not the peer's business.
     approval_policy_changed: null,
-    iteration_started: (e, ctx) => statusEvent(e.runId, 'running', false, ctx, {
+    iteration_started: (e, ctx) => statusEvent(e.turnId, 'running', false, ctx, {
         role: 'agent',
         parts: [{ kind: 'text', text: `Iteration ${e.iteration} started` }],
     }),
@@ -67,7 +67,7 @@ const MAPPING = {
     // A retry IS a task-status transition in A2A's model — the task is
     // still running and this says why nothing is arriving. Reported as
     // working rather than failed: the call has not given up.
-    provider_retry: (e, ctx) => statusEvent(e.runId, 'running', false, ctx, {
+    provider_retry: (e, ctx) => statusEvent(e.turnId, 'running', false, ctx, {
         role: 'agent',
         parts: [
             {
@@ -78,8 +78,8 @@ const MAPPING = {
     }),
     // A swap is news for a remote peer for the same reason it is news for a
     // local operator: the answer arriving next was produced by a provider the
-    // peer did not ask for. Still `running` — the run did not fail, it moved.
-    provider_fallback: (e, ctx) => statusEvent(e.runId, 'running', false, ctx, {
+    // peer did not ask for. Still `running` — the turn did not fail, it moved.
+    provider_fallback: (e, ctx) => statusEvent(e.turnId, 'running', false, ctx, {
         role: 'agent',
         parts: [
             {
@@ -89,7 +89,7 @@ const MAPPING = {
             },
         ],
     }),
-    tool_completed: (e, ctx) => artifactEvent(e.runId, ctx, {
+    tool_completed: (e, ctx) => artifactEvent(e.turnId, ctx, {
         artifactId: `tool-${e.toolName}-${Date.now()}`,
         name: `${e.toolName} result`,
         parts: [{ kind: 'text', text: e.result }],
@@ -99,7 +99,7 @@ const MAPPING = {
             isError: e.isError,
         },
     }),
-    user_question_asked: (e, ctx) => statusEvent(e.runId, 'input-required', false, ctx, {
+    user_question_asked: (e, ctx) => statusEvent(e.turnId, 'input-required', false, ctx, {
         role: 'agent',
         parts: [
             { kind: 'text', text: e.question },
@@ -111,11 +111,11 @@ const MAPPING = {
         ],
     }),
     // The task leaves `input-required` by the next status event it emits;
-    // a second one here would only restate what the resumed run says.
+    // a second one here would only restate what the resumed turn says.
     user_question_answered: null,
     tool_review_requested: (e, ctx) => {
         const toolNames = e.toolCalls.map((tc) => tc.name).join(', ');
-        return statusEvent(e.runId, 'input-required', false, ctx, {
+        return statusEvent(e.turnId, 'input-required', false, ctx, {
             role: 'agent',
             parts: [
                 { kind: 'text', text: `Review requested for tools: ${toolNames}` },
@@ -133,7 +133,7 @@ const MAPPING = {
             ],
         });
     },
-    plan_ready: (e, ctx) => statusEvent(e.runId, 'input-required', false, ctx, {
+    plan_ready: (e, ctx) => statusEvent(e.turnId, 'input-required', false, ctx, {
         role: 'agent',
         parts: [
             { kind: 'text', text: `Plan ready: ${e.title}` },
@@ -153,9 +153,9 @@ const MAPPING = {
             },
         ],
     }),
-    run_paused: (e, ctx) => statusEvent(e.runId, 'input-required', false, ctx, {
+    turn_paused: (e, ctx) => statusEvent(e.turnId, 'input-required', false, ctx, {
         role: 'agent',
-        parts: [{ kind: 'text', text: `Run paused: ${e.reason}` }],
+        parts: [{ kind: 'text', text: `Turn paused: ${e.reason}` }],
     }, 
     // A remote host has the same recovery decision as a local one. The
     // checkpoint is the address of that recovery; the classification tells
@@ -177,7 +177,7 @@ const MAPPING = {
     // is tracking, and it is the largest single payload the kernel emits.
     request_envelope: null,
     // Declined. This carries whole message bodies including tool output, and
-    // a peer models a task lifecycle — shipping a run's deleted history over
+    // a peer models a task lifecycle — shipping a session's deleted history over
     // an external wire by default is a disclosure nobody asked for.
     compaction_shed: null,
     compaction_completed: null,
@@ -185,7 +185,7 @@ const MAPPING = {
     // strategies fired is a property of how it manages its own window, and a
     // peer modelling a task lifecycle can act on none of them.
     compaction_tool_results_cleared: null,
-    // What the run wrote to its own memory store is this runtime's business;
+    // What the turn wrote to its own memory store is this runtime's business;
     // a peer sees the task's outcome, not its housekeeping.
     memory_consolidated: null,
     // A job's exit is housekeeping of this runtime's host; the peer sees the
@@ -195,7 +195,7 @@ const MAPPING = {
     // manages its own context. A peer models a task lifecycle and cannot act on
     // either outcome.
     compaction_failed: null,
-    // A refusal is the run's own policy decision; the peer sees it in the
+    // A refusal is the turn's own policy decision; the peer sees it in the
     // terminal task state, not as a separate signal.
     guardrail_triggered: null,
     // Reasoning is kernel-internal: an A2A peer models a task lifecycle,
@@ -206,7 +206,7 @@ const MAPPING = {
     tool_executing: null,
     tool_review_completed: null,
     checkpoint_created: null,
-    run_resuming: null,
+    turn_resuming: null,
     token_usage_updated: null,
     activity_created: null,
     activity_updated: null,
@@ -234,12 +234,11 @@ const MAPPING = {
     sandbox_created: null,
     sandbox_exec: null,
     sandbox_destroyed: null,
-    // Sub-session lifecycle events (session-hierarchy.md §10.4). These are
-    // in-flight visibility signals for the kernel bus; the A2A bridge does not
-    // surface them today.
-    subsession_spawned: null,
-    subsession_messaged: null,
-    subsession_idled: null,
+    // Child-session lifecycle events: this runtime's division of labour, for
+    // the same reason as `agent_pending` above.
+    child_session_spawned: null,
+    child_session_messaged: null,
+    child_session_idled: null,
     // v3 message + tool-input lifecycle (ses_001-tool-stream-events). A2A's
     // status-update model is coarse-grained, so per-delta events are dropped
     // at this layer. `message_completed` carries the aggregated assistant
@@ -250,7 +249,7 @@ const MAPPING = {
     message_completed: (e, ctx) => {
         if (!e.content)
             return null;
-        return statusEvent(e.runId, 'running', false, ctx, {
+        return statusEvent(e.turnId, 'running', false, ctx, {
             role: 'agent',
             parts: [{ kind: 'text', text: e.content }],
         });
@@ -259,12 +258,20 @@ const MAPPING = {
     tool_input_delta: null,
     tool_input_completed: null,
 };
-export function mapRunToA2AEvent(event, contextId) {
+/**
+ * One session event as an A2A stream event, or `null` for the events a peer
+ * modelling a task lifecycle has no use for.
+ *
+ * `taskId` is the event's turn. `contextId` is the session as the peer knows
+ * it: pass the peer's own context id when the session was reached through
+ * one; absent, the event's `sessionId` is used.
+ */
+export function mapTurnToA2AEvent(event, contextId) {
     const transform = MAPPING[event.type];
     if (!transform)
         return null;
-    return transform(event, contextId);
+    return transform(event, contextId ?? event.sessionId);
 }
-/** @deprecated Use mapRunToA2AEvent */
-export const mapSessionToA2AEvent = mapRunToA2AEvent;
+/** @deprecated Use mapTurnToA2AEvent */
+export const mapSessionToA2AEvent = mapTurnToA2AEvent;
 //# sourceMappingURL=mapper.js.map

package/dist/bridge/a2a/mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../../src/bridge/a2a/mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mapper.js","sourceRoot":"","sources":["../../../src/bridge/a2a/mapper.ts"],"names":[],"mappings":"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"}

package/dist/bridge/a2a/task.d.ts

@@ -1,14 +1,46 @@
-import type { RunConfig, WireRun, WireRunStatus } from '../../contracts/index.js';
+import type { WireTurnStatus } from '../../contracts/session/turn-status.js';
+import type { WireTurn, WireTurnConfig } from '../../contracts/session/turn.js';
 import type { A2AMessageSendParams, A2ATask, A2ATaskState } from '../../types/a2a/index.js';
 import type { Message } from '../../types/message/index.js';
+import type { ExternalRef, Origin } from '../../types/session/turn.js';
 export declare function isTerminalState(state: A2ATaskState): boolean;
-export declare function runStatusToA2AState(status: WireRunStatus): A2ATaskState;
-export declare function runToA2ATask(run: WireRun, messages?: readonly Message[]): A2ATask;
-export interface CreateRunFromA2A {
+export declare function turnStatusToA2AState(status: WireTurnStatus): A2ATaskState;
+export interface MapTurnToA2ATaskOptions {
+    /**
+     * The context id the peer addressed this session by, echoed back verbatim.
+     * Defaults to the turn's `session_id`. Pass the peer's own id when the
+     * session was reached through it, so the peer sees the id it sent.
+     */
+    readonly contextId?: string;
+}
+/**
+ * One turn as an A2A task: `id` is the turn, `contextId` the session.
+ *
+ * The context is never the project. A host that serves `tasks/get` or
+ * `tasks/list` reads the turns from `SessionIndex.listTurns` and hands each
+ * one here with the session's messages.
+ */
+export declare function mapTurnToA2ATask(turn: WireTurn, messages?: readonly Message[], options?: MapTurnToA2ATaskOptions): A2ATask;
+/**
+ * What an incoming `message/send` asks for: a new turn of one session.
+ *
+ * `contextId` is the peer's own name for the session, verbatim. It is any
+ * string and is never read as a namzu id or a project id: the project comes
+ * from the host's configuration. A host resolves it with
+ * `resolveA2AContext` (an existing session, or a new one), and starts the turn
+ * with `origin`, which is how the mapping reaches the session log and so
+ * survives an index rebuild.
+ */
+export interface CreateTurnFromA2A {
     readonly agentId: string;
     readonly input: string;
-    readonly projectId?: string;
-    readonly config: RunConfig;
+    /** The peer's context id, when it sent one. Absent means a new session. */
+    readonly contextId?: string;
+    /** The ref the index resolves `contextId` through: `a2a` / `context`. */
+    readonly externalRef?: ExternalRef;
+    /** Recorded on the turn (and on the session when the turn creates it). */
+    readonly origin: Origin;
+    readonly config: WireTurnConfig;
 }
-export declare function a2aMessageToCreateRun(agentId: string, params: A2AMessageSendParams): CreateRunFromA2A;
+export declare function a2aMessageToCreateTurn(agentId: string, params: A2AMessageSendParams): CreateTurnFromA2A;
 //# sourceMappingURL=task.d.ts.map

package/dist/bridge/a2a/task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../../src/bridge/a2a/task.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AACjF,OAAO,KAAK,EAGX,oBAAoB,EACpB,OAAO,EACP,YAAY,EAEZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAG3D,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAE5D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,aAAa,GAAG,YAAY,CAEvE;AAqCD,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,CAajF;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;CAC1B;AAED,wBAAgB,qBAAqB,CACpC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,oBAAoB,GAC1B,gBAAgB,CAwBlB"}
+{"version":3,"file":"task.d.ts","sourceRoot":"","sources":["../../../src/bridge/a2a/task.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAC5E,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAC/E,OAAO,KAAK,EAGX,oBAAoB,EACpB,OAAO,EACP,YAAY,EAEZ,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAOtE,wBAAgB,eAAe,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAE5D;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,YAAY,CAEzE;AAqCD,MAAM,WAAW,uBAAuB;IACvC;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC3B;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC/B,IAAI,EAAE,QAAQ,EACd,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,EAC7B,OAAO,GAAE,uBAA4B,GACnC,OAAO,CAaT;AAED;;;;;;;;;GASG;AACH,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,2EAA2E;IAC3E,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,yEAAyE;IACzE,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAA;IAClC,0EAA0E;IAC1E,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAA;CAC/B;AAED,wBAAgB,sBAAsB,CACrC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,oBAAoB,GAC1B,iBAAiB,CAqCnB"}

package/dist/bridge/a2a/task.js

@@ -1,57 +1,67 @@
-import { RUN_STATUS_TO_A2A, TERMINAL_STATES } from '../../constants/a2a/index.js';
+import { TERMINAL_STATES, TURN_STATUS_TO_A2A } from '../../constants/a2a/index.js';
 import { extractTextFromA2AMessage, messageToA2A } from './message.js';
+// An A2A task is one namzu turn, and an A2A context is one namzu session. The
+// task's `id` is the turn id; its `contextId` names the session, either as the
+// session id itself or as the caller's own context id that was mapped onto it.
 export function isTerminalState(state) {
     return TERMINAL_STATES.has(state);
 }
-export function runStatusToA2AState(status) {
-    return RUN_STATUS_TO_A2A[status];
+export function turnStatusToA2AState(status) {
+    return TURN_STATUS_TO_A2A[status];
 }
-function buildTaskStatus(run) {
-    const state = runStatusToA2AState(run.status);
-    const timestamp = run.completed_at ?? run.started_at ?? run.created_at;
-    const message = run.result
-        ? { role: 'agent', parts: [{ kind: 'text', text: run.result }] }
-        : run.last_error
-            ? { role: 'agent', parts: [{ kind: 'text', text: run.last_error }] }
+function buildTaskStatus(turn) {
+    const state = turnStatusToA2AState(turn.status);
+    const timestamp = turn.completed_at ?? turn.started_at ?? turn.created_at;
+    const message = turn.result
+        ? { role: 'agent', parts: [{ kind: 'text', text: turn.result }] }
+        : turn.last_error
+            ? { role: 'agent', parts: [{ kind: 'text', text: turn.last_error }] }
             : undefined;
     return { state, message, timestamp };
 }
-function buildArtifacts(run) {
-    if (!run.result)
+function buildArtifacts(turn) {
+    if (!turn.result)
         return undefined;
     return [
         {
-            artifactId: `${run.id}-result`,
+            artifactId: `${turn.turn_id}-result`,
             name: 'Agent Response',
-            parts: [{ kind: 'text', text: run.result }],
+            parts: [{ kind: 'text', text: turn.result }],
             metadata: {
-                model: run.model,
-                iterations: run.iterations,
-                duration_ms: run.duration_ms,
-                ...(run.usage && {
-                    input_tokens: run.usage.input_tokens,
-                    output_tokens: run.usage.output_tokens,
-                    total_cost_usd: run.usage.total_cost_usd,
+                model: turn.model,
+                iterations: turn.iterations,
+                duration_ms: turn.duration_ms,
+                ...(turn.usage && {
+                    input_tokens: turn.usage.input_tokens,
+                    output_tokens: turn.usage.output_tokens,
+                    total_cost_usd: turn.usage.total_cost_usd,
                 }),
             },
         },
     ];
 }
-export function runToA2ATask(run, messages) {
+/**
+ * One turn as an A2A task: `id` is the turn, `contextId` the session.
+ *
+ * The context is never the project. A host that serves `tasks/get` or
+ * `tasks/list` reads the turns from `SessionIndex.listTurns` and hands each
+ * one here with the session's messages.
+ */
+export function mapTurnToA2ATask(turn, messages, options = {}) {
     return {
-        id: run.id,
-        contextId: run.project_id ?? undefined,
-        status: buildTaskStatus(run),
+        id: turn.turn_id,
+        contextId: options.contextId ?? turn.session_id,
+        status: buildTaskStatus(turn),
         history: messages?.map(messageToA2A),
-        artifacts: buildArtifacts(run),
+        artifacts: buildArtifacts(turn),
         metadata: {
-            agent_id: run.agent_id,
-            agent_name: run.agent_name,
-            stop_reason: run.stop_reason,
+            agent_id: turn.agent_id,
+            agent_name: turn.agent_name,
+            stop_reason: turn.stop_reason,
         },
     };
 }
-export function a2aMessageToCreateRun(agentId, params) {
+export function a2aMessageToCreateTurn(agentId, params) {
     const input = extractTextFromA2AMessage(params.message);
     const meta = params.metadata ?? {};
     const config = {
@@ -67,10 +77,21 @@ export function a2aMessageToCreateRun(agentId, params) {
         }),
         ...(typeof meta.systemPrompt === 'string' && { systemPrompt: meta.systemPrompt }),
     };
+    const contextId = typeof params.contextId === 'string' && params.contextId.length > 0
+        ? params.contextId
+        : undefined;
     return {
         agentId,
         input,
-        projectId: params.contextId,
+        ...(contextId !== undefined && {
+            contextId,
+            externalRef: { protocol: 'a2a', kind: 'context', externalId: contextId },
+        }),
+        origin: {
+            protocol: 'a2a',
+            kind: 'prompt',
+            ...(contextId !== undefined && { externalSessionId: contextId }),
+        },
         config,
     };
 }

package/dist/bridge/a2a/task.js.map

@@ -1 +1 @@
-{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/bridge/a2a/task.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task.js","sourceRoot":"","sources":["../../../src/bridge/a2a/task.ts"],"names":[],"mappings":"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"}

package/dist/bridge/acp/permission.d.ts

@@ -5,7 +5,7 @@ import type { HITLResumeDecision, ToolCallSummary } from '../../types/hitl/index
  * The kernel's own `ToolCallSummary`, not a re-declared one: this is the
  * shape the HITL path already produces, and a copy would be a second
  * definition of "which calls am I being asked about" that can drift from the
- * one the run actually parked on.
+ * one the turn actually parked on.
  */
 export interface AcpPermissionRequest {
     readonly sessionId: string;
@@ -17,7 +17,7 @@ export interface AcpPermissionRequest {
  * Three outcomes, matching what a human can actually mean about a batch of
  * calls: run it, run it and stop asking, or do not run it and here is why.
  * `reject` carries optional feedback because a denial with a reason is the
- * one a model can act on — "no, use the staging bucket" redirects a run,
+ * one a model can act on — "no, use the staging bucket" redirects a turn,
  * where a bare denial only ends it.
  */
 export type AcpPermissionOutcome = {

package/dist/bridge/acp/server.d.ts

@@ -1,7 +1,7 @@
 import type { HostCommandRegistry } from '../../registry/command/index.js';
 import type { ToolPresenter } from '../../registry/tool/presentation.js';
 import type { MCPTransport } from '../../types/connector/mcp.js';
-import type { RunEvent } from '../../types/run/events.js';
+import type { SessionEvent } from '../../types/session/events.js';
 import { type Logger } from '../../utils/logger.js';
 import type { AcpClientFilesystem } from './filesystem.js';
 import type { AcpPermissionAsker } from './permission.js';
@@ -30,7 +30,13 @@ import type { AcpPermissionAsker } from './permission.js';
 /** What the bridge needs from the runtime, taken as an interface. */
 export interface AcpAgentGateway {
     /**
-     * Run one prompt, streaming events, and resolve with the stop reason.
+     * Run one prompt as one turn of the session, streaming its events, and
+     * resolve with the stop reason.
+     *
+     * A session has one active turn at a time. A gateway whose session log
+     * refuses the turn because another is active (in this process or another)
+     * throws the `TurnInProgressError`; the bridge answers the prompt with
+     * `INVALID_REQUEST` naming the active turn.
      *
      * Deliberately not `AgentManagerContract` itself. This bridge needs one
      * verb, and a session front end holding the whole manager could cancel
@@ -42,7 +48,7 @@ export interface AcpAgentGateway {
         readonly sessionId: string;
         readonly prompt: string;
         readonly cwd: string;
-        readonly onEvent: (event: RunEvent) => void;
+        readonly onEvent: (event: SessionEvent) => void;
         readonly signal: AbortSignal;
         /**
          * Ask the human in front of the client about a tool batch.
@@ -64,7 +70,7 @@ export interface AcpAgentGateway {
     }): Promise<{
         readonly stopReason?: string;
         /**
-         * The exact conversation to use for the next prompt, after the run has
+         * The exact conversation to use for the next prompt, after the turn has
          * settled. Omit it when the gateway does not own durable history.
          */
         readonly history?: readonly unknown[];
@@ -75,8 +81,13 @@ export interface AcpAgentGateway {
      * Optional: a gateway with no session store cannot resume, and saying so
      * by not implementing this is better than returning an empty history that
      * a client cannot tell apart from a session that really had no turns.
+     *
+     * Resolves `undefined` when the store has no session by that id, which
+     * the bridge answers with `INVALID_PARAMS` naming the id. The id is the
+     * client's and may be any string: a namzu session id, or one the gateway
+     * maps to a session through the index's `acp` / `session` refs.
      */
-    load?(sessionId: string): Promise<readonly unknown[]>;
+    load?(sessionId: string): Promise<readonly unknown[] | undefined>;
 }
 export interface AcpServerOptions {
     readonly transport: MCPTransport;
@@ -94,7 +105,11 @@ export interface AcpServerOptions {
         readonly name: string;
         readonly version: string;
     };
-    /** Injectable so a test does not depend on a random id. */
+    /**
+     * The id `session/new` answers with. Defaults to a new namzu session id
+     * (UUIDv7). A host may return any string; the bridge treats it as opaque,
+     * and injecting it also keeps a test off a random id.
+     */
     readonly newSessionId?: () => string;
     readonly log?: Logger;
 }
@@ -107,7 +122,6 @@ export declare class ACPServer {
     private initialized;
     private stopped;
     private clientCapabilities;
-    private sessionSeq;
     /**
      * The method table, authored INDEPENDENTLY of `ACP_METHODS`.
      *
@@ -129,7 +143,7 @@ export declare class ACPServer {
      * Ask the client something and wait for its answer.
      *
      * The direction this bridge did not have. A notification is fire and
-     * forget; a permission prompt is a question the run cannot proceed past,
+     * forget; a permission prompt is a question the turn cannot proceed past,
      * so it needs an id, a place to park the promise, and a `dispatch` that
      * recognises a response frame.
      */

package/dist/bridge/acp/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/bridge/acp/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/bridge/acp/server.ts"],"names":[],"mappings":"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"}

package/dist/bridge/acp/server.js

@@ -1,5 +1,7 @@
 import { isAbsolute } from 'node:path';
 import { ACP_CLIENT_NOTIFICATIONS, ACP_CLIENT_REQUESTS, ACP_ERROR_CODES, ACP_FILESYSTEM_CAPABILITY, ACP_METHODS, ACP_PERMISSION_CAPABILITY, ACP_PROTOCOL_VERSION, } from '../../constants/acp/index.js';
+import { isTurnInProgressError } from '../../types/session/turn.js';
+import { generateSessionId } from '../../utils/id.js';
 import { resolveLogger } from '../../utils/logger.js';
 import { toAcpSessionUpdate, toAcpStopReason } from './update.js';
 /** A JSON-RPC error this bridge answers with, rather than throwing out. */
@@ -20,7 +22,6 @@ export class ACPServer {
     initialized = false;
     stopped = false;
     clientCapabilities = [];
-    sessionSeq = 0;
     /**
      * The method table, authored INDEPENDENTLY of `ACP_METHODS`.
      *
@@ -74,7 +75,7 @@ export class ACPServer {
      * Ask the client something and wait for its answer.
      *
      * The direction this bridge did not have. A notification is fire and
-     * forget; a permission prompt is a question the run cannot proceed past,
+     * forget; a permission prompt is a question the turn cannot proceed past,
      * so it needs an id, a place to park the promise, and a `dispatch` that
      * recognises a response frame.
      */
@@ -117,7 +118,7 @@ export class ACPServer {
             // A frame with no method is the client ANSWERING something this side
             // asked. Before permission requests existed there was nothing out on
             // the wire, so ignoring it was right; now dropping it would leave the
-            // asker waiting forever and the run parked with nobody coming.
+            // asker waiting forever and the turn parked with nobody coming.
             if (message.id !== undefined && this.pending.has(message.id)) {
                 const waiting = this.pending.get(message.id);
                 if (message.error) {
@@ -226,6 +227,9 @@ export class ACPServer {
         const token = this.reserveSessionId(params.sessionId);
         try {
             const history = await this.options.gateway.load(params.sessionId);
+            if (history === undefined) {
+                throw new AcpError(ACP_ERROR_CODES.INVALID_PARAMS, `There is no session "${params.sessionId}" to load. Create a new session instead.`);
+            }
             if (!Array.isArray(history)) {
                 throw new AcpError(ACP_ERROR_CODES.INTERNAL_ERROR, `The session store returned an invalid history for "${params.sessionId}".`);
             }
@@ -251,9 +255,12 @@ export class ACPServer {
             const sessionId = this.options.newSessionId();
             return { sessionId, token: this.reserveSessionId(sessionId) };
         }
+        // A namzu session id, so the gateway can open the session log under the
+        // very id the client holds. A collision with an open or reserved id is
+        // astronomically unlikely, and minting again is cheaper than reasoning
+        // about it.
         for (;;) {
-            this.sessionSeq += 1;
-            const sessionId = `acp_${this.sessionSeq}`;
+            const sessionId = generateSessionId();
             if (this.sessions.has(sessionId) || this.reservedSessionIds.has(sessionId))
                 continue;
             return { sessionId, token: this.reserveSessionId(sessionId) };
@@ -340,6 +347,12 @@ export class ACPServer {
         catch (error) {
             if (controller.signal.aborted)
                 return { stopReason: 'cancelled' };
+            // The session log refused the turn: another one is active, perhaps
+            // started by another process on the same session. A client error, not
+            // an internal one, and it says what to do.
+            if (isTurnInProgressError(error)) {
+                throw new AcpError(ACP_ERROR_CODES.INVALID_REQUEST, `Session "${params.sessionId}" already has an active turn (${error.activeTurnId}, ${error.state}). Wait for it to settle, or resume or abandon it, before sending another prompt.`);
+            }
             throw error;
         }
         finally {