@adonis-agora/agent 0.60.1 → 0.62.0

package/dist/src/mcp/server.js

@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { toJsonSchemaCompat } from '@modelcontextprotocol/sdk/server/zod-json-schema-compat.js';
 import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -10,11 +11,16 @@ import { createNoopEmitUi } from '../tool-ui.js';
  */
 const LOOP_SERVED_KINDS = new Set(['agent', 'ask', 'skill', 'memory']);
 /** Whether this tool may be reached over MCP at all — the same answer for listing and for calling. */
-function isExposable(kind, actions) {
-    if (LOOP_SERVED_KINDS.has(kind)) {
+function isExposable(spec, actions) {
+    if (spec === undefined || LOOP_SERVED_KINDS.has(spec.kind)) {
         return false;
     }
-    return kind !== 'action' || actions === 'execute';
+    // A tool whose result is shown elsewhere (a generative-UI `ui__show_*` / `ui__render`) only
+    // pushes a component; over MCP there is no screen, and the model would get nothing back.
+    if (spec.presentation?.result?.kind === 'elsewhere') {
+        return false;
+    }
+    return spec.kind !== 'action' || actions === 'execute';
 }
 /**
  * True for a Zod schema (tags its Standard Schema props with `vendor: 'zod'`). Narrows to the SDK's
@@ -70,33 +76,59 @@ function toJsonSchema(schema) {
 export function createMcpServer(options) {
     const { registry, policy, allowedTools, actorFromAuth, idsFromRequest } = options;
     const actions = options.actions ?? 'refuse';
-    const server = new Server({ name: options.name, version: options.version }, { capabilities: { tools: {} } });
-    const buildCtx = (authInfo, sessionId) => {
+    const server = new Server({ name: options.name, version: options.version }, {
+        capabilities: { tools: {} },
+        ...(options.instructions !== undefined ? { instructions: options.instructions } : {}),
+    });
+    const buildCtx = (authInfo, sessionId, requestId) => {
         const actor = actorFromAuth(authInfo);
         const ids = idsFromRequest
-            ? idsFromRequest(sessionId, undefined)
+            ? idsFromRequest(sessionId, requestId)
             : {
                 threadId: `mcp:${sessionId ?? actor.id}`,
                 runId: `mcp:${sessionId ?? 'run'}`,
                 requestId: `mcp:${sessionId ?? 'req'}`,
             };
-        // No conversation to push into: `emitUi` accepts the push and does nothing, so a tool that
-        // shows UI in a chat still runs over MCP.
-        return { actor, ...ids, emitUi: createNoopEmitUi(ids.requestId) };
+        // Each `tools/call` is one call of its own: no runtime replays it, so its id — and the
+        // idempotency key a tool writes with — is fresh per call.
+        const toolCallId = `mcp-call:${randomUUID()}`;
+        return {
+            actor,
+            ...ids,
+            toolCallId,
+            idempotencyKey: `${ids.runId}:${toolCallId}`,
+            // A tool can tell it is answering an MCP client, not the person in the app.
+            pageContext: { channel: 'mcp' },
+            // No conversation to push into: `emitUi` accepts the push and does nothing, so a tool that
+            // shows UI in a chat still runs over MCP.
+            emitUi: createNoopEmitUi(ids.requestId),
+        };
     };
     server.setRequestHandler(ListToolsRequestSchema, async (_request, extra) => {
         const actor = actorFromAuth(extra.authInfo);
-        const defs = (await registry.definitionsFor(actor, policy, allowedTools)).filter((definition) => isExposable(definition.kind, actions));
+        const defs = (await registry.definitionsFor(actor, policy, allowedTools)).filter((definition) => isExposable(registry.spec(definition.name), actions));
         return {
-            tools: defs.map((definition) => ({
-                name: definition.name,
-                description: definition.description,
-                inputSchema: toJsonSchema(definition.inputSchema),
+            tools: await Promise.all(defs.map(async (definition) => {
+                const described = await options.describeTool?.({
+                    name: definition.name,
+                    kind: definition.kind,
+                    description: definition.description,
+                });
+                return {
+                    name: definition.name,
+                    ...(described?.title !== undefined ? { title: described.title } : {}),
+                    description: definition.description,
+                    inputSchema: toJsonSchema(definition.inputSchema),
+                    // Clients run a read without asking and confirm a write: say which is which.
+                    annotations: described?.annotations ?? {
+                        readOnlyHint: definition.kind === 'read',
+                    },
+                };
             })),
         };
     });
     server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
-        const ctx = buildCtx(extra.authInfo, extra.sessionId);
+        const ctx = buildCtx(extra.authInfo, extra.sessionId, extra.requestId);
         const { name, arguments: args } = request.params;
         try {
             // Re-decided on the CALL, not inherited from the listing. `registry.invoke` re-checks roles
@@ -104,7 +136,7 @@ export function createMcpServer(options) {
             // stance — so a caller who guesses a name would otherwise reach a tool deliberately left off
             // the surface.
             const spec = registry.spec(name);
-            if (spec === undefined || !isExposable(spec.kind, actions)) {
+            if (!isExposable(spec, actions)) {
                 throw new ToolNotFoundError(name);
             }
             if (allowedTools !== undefined && !allowedTools.includes(name)) {

package/dist/src/mcp/server.js.map

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

package/dist/src/negotiated-tool-ui.d.ts

@@ -0,0 +1,10 @@
+import type { Catalog } from './genui/index.js';
+import type { SinkWriter } from './spi/token-stream-sink.js';
+import type { ToolDescribeScope } from './spi/tool.js';
+import { type UiCollector } from './tool-ui.js';
+export type ResolveToolUiCatalog = (scope: ToolDescribeScope) => Catalog | Promise<Catalog>;
+export interface NegotiatedUiCollector extends UiCollector {
+    text(): string;
+}
+export declare function createNegotiatedUiCollector(toolCallId: string, scope: ToolDescribeScope, resolveCatalog?: ResolveToolUiCatalog, writer?: SinkWriter): NegotiatedUiCollector;
+//# sourceMappingURL=negotiated-tool-ui.d.ts.map

package/dist/src/negotiated-tool-ui.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"negotiated-tool-ui.d.ts","sourceRoot":"","sources":["../../src/negotiated-tool-ui.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAEvD,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,cAAc,CAAC;AACnE,MAAM,MAAM,oBAAoB,GAAG,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC5F,MAAM,WAAW,qBAAsB,SAAQ,WAAW;IACxD,IAAI,IAAI,MAAM,CAAC;CAChB;AACD,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,iBAAiB,EACxB,cAAc,CAAC,EAAE,oBAAoB,EACrC,MAAM,CAAC,EAAE,UAAU,GAClB,qBAAqB,CA+DvB"}

package/dist/src/negotiated-tool-ui.js

@@ -0,0 +1,57 @@
+import { snapshotActionProposal } from './action-proposal-transitions.js';
+import { createUiCollector } from './tool-ui.js';
+export function createNegotiatedUiCollector(toolCallId, scope, resolveCatalog, writer) {
+    const collector = createUiCollector(toolCallId, writer);
+    const texts = new Map();
+    let next = 0;
+    return {
+        components: collector.components,
+        text: () => [...texts.values()].join('\n'),
+        restart: () => {
+            next = 0;
+            texts.clear();
+            collector.restart();
+        },
+        emit: async (component, props, options = {}) => {
+            if (!resolveCatalog) {
+                // No server catalog to negotiate against: the client's declaration can only narrow what is
+                // drawn. A component it does not declare degrades to its fallback text, else is left out.
+                const declared = scope.uiCapabilities === undefined ||
+                    scope.uiCapabilities.components.some((entry) => entry.name === component && entry.version === (options.version ?? 1));
+                if (declared)
+                    return collector.emit(component, props, options);
+                const id = options.id ?? `${toolCallId}:ui:${next++}`;
+                if (options.fallbackText !== undefined && options.fallbackText.length > 0) {
+                    texts.set(id, options.fallbackText);
+                    await writer?.write({ t: 'text', v: options.fallbackText });
+                }
+                return { id };
+            }
+            props = snapshotActionProposal(props);
+            options = { ...options };
+            const { prepareUiEmission } = await import('./genui/index.js');
+            const catalog = await resolveCatalog(scope);
+            const prepared = await prepareUiEmission(catalog, scope.uiCapabilities, component, props, options.version);
+            const id = options.id ?? `${toolCallId}:ui:${next++}`;
+            if (prepared.kind === 'text') {
+                texts.set(id, prepared.text);
+                await writer?.write({ t: 'text', v: prepared.text });
+                return { id };
+            }
+            const fallbackText = 'fallbackText' in prepared && typeof prepared.fallbackText === 'string'
+                ? prepared.fallbackText
+                : undefined;
+            const versions = 'componentVersions' in prepared ? prepared.componentVersions : undefined;
+            const componentVersions = versions !== null && typeof versions === 'object' && !Array.isArray(versions)
+                ? snapshotActionProposal(versions)
+                : undefined;
+            return collector.emit(prepared.component, prepared.props, {
+                id,
+                version: prepared.version,
+                ...(fallbackText !== undefined ? { fallbackText } : {}),
+                ...(componentVersions !== undefined ? { componentVersions } : {}),
+            });
+        },
+    };
+}
+//# sourceMappingURL=negotiated-tool-ui.js.map

package/dist/src/negotiated-tool-ui.js.map

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

package/dist/src/opencode/client.d.ts

@@ -0,0 +1,202 @@
+/**
+ * The part of OpenCode 2's server API (`@opencode/client`, the v2 routes `/api/session`,
+ * `/api/event`, …) this engine calls — structural, so the engine has no runtime dependency on the
+ * client package and a test can hand it a fake. A real `@opencode/client` client (2.0.18) satisfies
+ * it: `OpenCode.make({ baseUrl, headers })` from `@opencode/client` is what a host passes.
+ */
+export interface OpenCodeClient {
+    session: {
+        create(args: OpenCodeSessionCreate): Promise<{
+            id: string;
+        }>;
+        prompt(args: {
+            sessionID: string;
+            text: string;
+            files?: OpenCodePromptFile[];
+        }): Promise<unknown>;
+        /** Stops the running execution; OpenCode answers with `session.execution.interrupted`. */
+        interrupt(args: {
+            sessionID: string;
+        }): Promise<unknown>;
+        instructions: {
+            entry: {
+                put(args: {
+                    sessionID: string;
+                    key: string;
+                    value: string;
+                }): Promise<unknown>;
+            };
+        };
+        /** The session's info. Optional: finds the thread of a session (its `metadata.threadId`). */
+        get?(args: {
+            sessionID: string;
+        }): Promise<{
+            id: string;
+            metadata?: {
+                readonly [key: string]: OpenCodeJson;
+            };
+        }>;
+        /** Resolves when the session goes idle. Optional: a safety net for a missed terminal event. */
+        wait?(args: {
+            sessionID: string;
+        }): Promise<unknown>;
+        /** Rewind the session to before a message (regenerate). Optional. */
+        revert?: {
+            stage(args: {
+                sessionID: string;
+                messageID: string;
+                files?: boolean;
+            }): Promise<unknown>;
+            commit(args: {
+                sessionID: string;
+            }): Promise<unknown>;
+        };
+        form: {
+            /** The session's open forms. Optional: lets a resumed turn find questions asked while nobody listened. */
+            list?(args: {
+                sessionID: string;
+            }): Promise<OpenCodeForm[]>;
+            reply(args: {
+                sessionID: string;
+                formID: string;
+                answer: Record<string, OpenCodeFormValue>;
+            }): Promise<unknown>;
+            cancel(args: {
+                sessionID: string;
+                formID: string;
+            }): Promise<unknown>;
+        };
+    };
+    permission: {
+        /** The session's open permission requests. Optional, like `session.form.list`. */
+        list?(args: {
+            sessionID: string;
+        }): Promise<OpenCodePermissionRequest[]>;
+        reply(args: {
+            sessionID: string;
+            requestID: string;
+            decision: 'once' | 'reject';
+            message?: string;
+        }): Promise<unknown>;
+    };
+    /** The session's messages, newest first with `order: 'desc'`. Optional (regenerate). */
+    message?: {
+        list(args: {
+            sessionID: string;
+            order?: 'asc' | 'desc';
+            limit?: number;
+        }): Promise<{
+            data: Array<{
+                id: string;
+                type: string;
+            }>;
+        }>;
+    };
+    /** Register an MCP server at a location. Optional (exposing the app's tools). */
+    mcp?: {
+        add(args: {
+            server: string;
+            location?: {
+                directory: string;
+            };
+            config: {
+                type: 'remote';
+                url: string;
+                headers?: Record<string, string>;
+                /** `false`: never start OAuth for this server (the headers authenticate it). */
+                oauth?: false;
+            };
+        }): Promise<unknown>;
+    };
+    /** Write a file on the server. Optional (writing the agent's skills where OpenCode finds them). */
+    file?: {
+        write(args: {
+            location?: {
+                directory: string;
+            };
+            path: string;
+            payload: Uint8Array;
+        }): Promise<unknown>;
+    };
+    event: {
+        /** Every event of the server, for every session, until `signal` aborts. */
+        subscribe(args: {
+            signal: AbortSignal;
+        }): AsyncIterable<OpenCodeEvent>;
+    };
+}
+/** A file attached to a prompt: a URI OpenCode can read (`file://…`, `data:…`, `https://…`). */
+export interface OpenCodePromptFile {
+    uri: string;
+    name?: string;
+    description?: string;
+}
+/** A JSON value — what OpenCode stores as metadata. */
+export type OpenCodeJson = string | number | boolean | null | OpenCodeJson[] | {
+    readonly [key: string]: OpenCodeJson;
+};
+export interface OpenCodeSessionCreate {
+    /** A named OpenCode agent (`.opencode/agents/<name>`), when the location defines one. */
+    agent?: string;
+    model?: OpenCodeModelRef;
+    location?: {
+        directory: string;
+    };
+    /** OpenCode permission rules (`{ action, resource, effect: 'allow' | 'deny' | 'ask' }`). */
+    permissions?: OpenCodePermissionRule[];
+    metadata?: {
+        readonly [key: string]: OpenCodeJson;
+    };
+}
+export interface OpenCodeModelRef {
+    providerID: string;
+    id: string;
+    variant?: string;
+}
+export interface OpenCodePermissionRule {
+    action: string;
+    resource: string;
+    effect: 'allow' | 'deny' | 'ask';
+}
+/** What a form reply takes for one field. */
+export type OpenCodeFormValue = string | number | boolean | string[];
+/** One server event. `data.sessionID` (or `data.form.sessionID` on form events) names its session. */
+export interface OpenCodeEvent {
+    type: string;
+    data?: any;
+}
+/** A permission OpenCode is waiting on (`permission.asked`): an `ask` rule matched a tool call. */
+export interface OpenCodePermissionRequest {
+    id: string;
+    sessionID: string;
+    /** The rule's action, e.g. `company.send_email` or `webfetch`. */
+    action: string;
+    resources?: string[];
+    /**
+     * About the call. A built-in tool's arguments sit straight here (`webfetch` → `{ url, format }`);
+     * calls that wrap others nest them under `input` or `args`.
+     */
+    metadata?: Record<string, unknown>;
+}
+/** A form the model put to the user through OpenCode's question tool (`form.created`). */
+export interface OpenCodeForm {
+    id: string;
+    sessionID: string;
+    title?: string;
+    fields?: OpenCodeFormField[];
+}
+export interface OpenCodeFormField {
+    key: string;
+    type?: string;
+    title?: string;
+    description?: string;
+    required?: boolean;
+    options?: Array<{
+        value: string;
+        label?: string;
+        description?: string;
+    }>;
+    /** The user may type their own answer instead of picking one of `options`. */
+    custom?: boolean;
+}
+//# sourceMappingURL=client.d.ts.map

package/dist/src/opencode/client.d.ts.map

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

package/dist/src/opencode/client.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=client.js.map

package/dist/src/opencode/client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/opencode/client.ts"],"names":[],"mappings":""}

package/dist/src/opencode/durable/index.d.ts

@@ -0,0 +1,33 @@
+import * as durable from '@adonis-agora/durable';
+import type { AgentEngineContext } from '../../engine.js';
+import type { AgentRunner } from '../../spi/agent-runner.js';
+import { OpenCodeEngine, type OpenCodeEngineOptions } from '../engine.js';
+/**
+ * `@adonis-agora/agent/opencode/durable` — `openCode()` whose turns are durable workflows. Its own
+ * entry point, so `@adonis-agora/durable` (an optional peer) is loaded only by an app that asks for
+ * it.
+ */
+export interface OpenCodeDurableOptions extends OpenCodeEngineOptions {
+    /**
+     * The durable engine the turns run on. Omit → the app's (`WorkflowEngine` from the container,
+     * bound by `@adonis-agora/durable`'s provider).
+     */
+    workflowEngine?: durable.WorkflowEngine;
+}
+/** The OpenCode engine whose turns are `agora.agent.opencode.run` workflows. */
+export declare class OpenCodeDurableEngine extends OpenCodeEngine {
+    readonly options: OpenCodeDurableOptions;
+    readonly name = "opencode-durable";
+    readonly durable = true;
+    constructor(options: OpenCodeDurableOptions);
+    createRunner(context: AgentEngineContext): Promise<AgentRunner>;
+}
+/**
+ * `openCode()` whose turns are durable workflows — `engine: openCodeDurable({ host })` next to a
+ * configured `@adonis-agora/durable`. Every step of a turn is checkpointed; a turn waiting on a person
+ * survives restarts and is resumed by whichever process receives the decision.
+ */
+export declare function openCodeDurable(options: OpenCodeDurableOptions): OpenCodeDurableEngine;
+export { DurableOpenCodeAgentRunner } from './runner.js';
+export { decisionToken, OPENCODE_RUN_WORKFLOW, OpenCodeRunWorkflow } from './workflow.js';
+//# sourceMappingURL=index.d.ts.map

package/dist/src/opencode/durable/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/opencode/durable/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AACjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,KAAK,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAI1E;;;;GAIG;AACH,MAAM,WAAW,sBAAuB,SAAQ,qBAAqB;IACnE;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC;CACzC;AAED,gFAAgF;AAChF,qBAAa,qBAAsB,SAAQ,cAAc;aAIzB,OAAO,EAAE,sBAAsB;IAH7D,SAAkB,IAAI,sBAAsB;IAC5C,SAAkB,OAAO,QAAQ;IAEjC,YAA8B,OAAO,EAAE,sBAAsB,EAE5D;IAEc,YAAY,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,WAAW,CAAC,CAmB7E;CACF;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,qBAAqB,CAEtF;AAED,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}

package/dist/src/opencode/durable/index.js

@@ -0,0 +1,38 @@
+import * as durable from '@adonis-agora/durable';
+import { OpenCodeEngine } from '../engine.js';
+import { DurableOpenCodeAgentRunner } from './runner.js';
+import { OpenCodeRunWorkflow } from './workflow.js';
+/** The OpenCode engine whose turns are `agora.agent.opencode.run` workflows. */
+export class OpenCodeDurableEngine extends OpenCodeEngine {
+    options;
+    name = 'opencode-durable';
+    durable = true;
+    constructor(options) {
+        super(options);
+        this.options = options;
+    }
+    async createRunner(context) {
+        const turns = await this.buildTurns(context);
+        const engine = this.options.workflowEngine ??
+            (context.make !== undefined
+                ? await context.make(durable.WorkflowEngine)
+                : undefined);
+        if (engine === undefined) {
+            throw new Error('[@adonis-agora/agent/opencode] openCodeDurable() needs a durable engine: configure @adonis-agora/durable, or pass `workflowEngine`.');
+        }
+        await durable.registerWorkflowClass(engine, OpenCodeRunWorkflow, () => new OpenCodeRunWorkflow(turns, engine));
+        const { host } = turns;
+        return new DurableOpenCodeAgentRunner(engine, turns, host, context.store);
+    }
+}
+/**
+ * `openCode()` whose turns are durable workflows — `engine: openCodeDurable({ host })` next to a
+ * configured `@adonis-agora/durable`. Every step of a turn is checkpointed; a turn waiting on a person
+ * survives restarts and is resumed by whichever process receives the decision.
+ */
+export function openCodeDurable(options) {
+    return new OpenCodeDurableEngine(options);
+}
+export { DurableOpenCodeAgentRunner } from './runner.js';
+export { decisionToken, OPENCODE_RUN_WORKFLOW, OpenCodeRunWorkflow } from './workflow.js';
+//# sourceMappingURL=index.js.map

package/dist/src/opencode/durable/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/opencode/durable/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAC;AAGjD,OAAO,EAAE,cAAc,EAA8B,MAAM,cAAc,CAAC;AAC1E,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAepD,gFAAgF;AAChF,MAAM,OAAO,qBAAsB,SAAQ,cAAc;IAIzB,OAAO;IAHnB,IAAI,GAAG,kBAAkB,CAAC;IAC1B,OAAO,GAAG,IAAI,CAAC;IAEjC,YAA8B,OAA+B;QAC3D,KAAK,CAAC,OAAO,CAAC,CAAC;uBADa,OAAO;IAErC,CAAC;IAEQ,KAAK,CAAC,YAAY,CAAC,OAA2B;QACrD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,MAAM,GACV,IAAI,CAAC,OAAO,CAAC,cAAc;YAC3B,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS;gBACzB,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAyB,OAAO,CAAC,cAAc,CAAC;gBACpE,CAAC,CAAC,SAAS,CAAC,CAAC;QACjB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,qIAAqI,CACtI,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,CAAC,qBAAqB,CACjC,MAAM,EACN,mBAAmB,EACnB,GAAG,EAAE,CAAC,IAAI,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAC7C,CAAC;QACF,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;QACvB,OAAO,IAAI,0BAA0B,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5E,CAAC;CACF;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,OAA+B;IAC7D,OAAO,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC;AAED,OAAO,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC"}

package/dist/src/opencode/durable/runner.d.ts

@@ -0,0 +1,36 @@
+import type { WorkflowEngine } from '@adonis-agora/durable';
+import type { HumanReply } from '../../elicitation.js';
+import type { AgentRunner, AgentRunStartOptions } from '../../spi/agent-runner.js';
+import type { AgentStore } from '../../spi/agent-store.js';
+import type { AgentRunInput } from '../../types.js';
+import type { OpenCodeHost } from '../host.js';
+import type { OpenCodeTurns } from '../turns.js';
+/**
+ * Runs OpenCode turns as `@adonis-agora/durable` workflows ({@link OpenCodeRunWorkflow}): a person's
+ * decision is a durable signal, so a turn waiting on one survives restarts and is resumed by
+ * whichever process receives it. Needs a cross-process sink when more than one process serves the
+ * agent (`tokenSinks.redis()` / `tokenSinks.lucid()`).
+ */
+export declare class DurableOpenCodeAgentRunner implements AgentRunner {
+    private readonly engine;
+    private readonly turns;
+    private readonly host;
+    private readonly store;
+    constructor(engine: WorkflowEngine, turns: OpenCodeTurns, host: OpenCodeHost, store: AgentStore);
+    runIdFor(input: AgentRunInput): string;
+    start(input: AgentRunInput, options?: AgentRunStartOptions): Promise<{
+        runId: string;
+    }>;
+    /**
+     * From the engine's run row. A run it does not know yet counts as running (a queued turn is
+     * claimed before its start lands), and so does one it cannot be asked about.
+     */
+    isRunActive(runId: string): Promise<boolean>;
+    signal(runId: string, toolCallId: string, reply: HumanReply): Promise<void>;
+    /**
+     * Interrupt OpenCode, cancel the run in the runtime (a run parked on a person never runs its body
+     * again), and settle it here: the queue, the thread, the `cancelled` frame and the run row.
+     */
+    cancel(runId: string): Promise<void>;
+}
+//# sourceMappingURL=runner.d.ts.map

package/dist/src/opencode/durable/runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../../src/opencode/durable/runner.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAcjD;;;;;GAKG;AACH,qBAAa,0BAA2B,YAAW,WAAW;IAE1D,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,IAAI;IACrB,OAAO,CAAC,QAAQ,CAAC,KAAK;IAJxB,YACmB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,aAAa,EACpB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,UAAU,EAGnC;IAED,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAErC;IAEK,KAAK,CACT,KAAK,EAAE,aAAa,EACpB,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAmB5B;IAED;;;OAGG;IACG,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAOjD;IAEK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAEhF;IAED;;;OAGG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CASzC;CACF"}

package/dist/src/opencode/durable/runner.js

@@ -0,0 +1,88 @@
+import { randomUUID } from 'node:crypto';
+import { openCodeLog } from '../log.js';
+import { decisionToken, isControlFlowSignal, OpenCodeRunWorkflow } from './workflow.js';
+function isRunInput(value) {
+    return (typeof value === 'object' &&
+        value !== null &&
+        typeof value.threadId === 'string' &&
+        typeof value.actor === 'object');
+}
+const SETTLED = new Set(['completed', 'failed', 'cancelled', 'dead']);
+/**
+ * Runs OpenCode turns as `@adonis-agora/durable` workflows ({@link OpenCodeRunWorkflow}): a person's
+ * decision is a durable signal, so a turn waiting on one survives restarts and is resumed by
+ * whichever process receives it. Needs a cross-process sink when more than one process serves the
+ * agent (`tokenSinks.redis()` / `tokenSinks.lucid()`).
+ */
+export class DurableOpenCodeAgentRunner {
+    engine;
+    turns;
+    host;
+    store;
+    constructor(engine, turns, host, store) {
+        this.engine = engine;
+        this.turns = turns;
+        this.host = host;
+        this.store = store;
+        turns.startNext = (next, runId) => this.start(next, { runId });
+    }
+    runIdFor(input) {
+        return this.turns.settings.runId?.(input) ?? randomUUID();
+    }
+    async start(input, options = {}) {
+        const runId = options.runId ?? this.runIdFor(input);
+        const durable = this.turns.settings.durable;
+        const startOptions = {
+            ...((await durable?.start?.(input, runId)) ?? {}),
+            ...((await this.host.startOptions?.(input, runId)) ?? {}),
+        };
+        // Before the engine starts it: a run the engine drives synchronously could otherwise end (and
+        // clear it) before it was set.
+        await this.store.setActiveStream(input.threadId, runId);
+        try {
+            await this.engine.start(OpenCodeRunWorkflow, input, runId, startOptions);
+        }
+        catch (error) {
+            // A run that suspends on its first step under a driving dispatcher surfaces the runtime's
+            // suspend signal here: the run is persisted and will be resumed, not failed.
+            if (isControlFlowSignal(error))
+                return { runId };
+            throw this.host.startError?.(error, input) ?? durable?.startError?.(error, input) ?? error;
+        }
+        return { runId };
+    }
+    /**
+     * From the engine's run row. A run it does not know yet counts as running (a queued turn is
+     * claimed before its start lands), and so does one it cannot be asked about.
+     */
+    async isRunActive(runId) {
+        try {
+            const status = (await this.engine.getRun(runId))?.status;
+            return status === undefined || !SETTLED.has(status);
+        }
+        catch {
+            return true;
+        }
+    }
+    async signal(runId, toolCallId, reply) {
+        await this.engine.signal(decisionToken(runId, toolCallId), reply);
+    }
+    /**
+     * Interrupt OpenCode, cancel the run in the runtime (a run parked on a person never runs its body
+     * again), and settle it here: the queue, the thread, the `cancelled` frame and the run row.
+     */
+    async cancel(runId) {
+        const run = await this.engine.getRun(runId).catch(() => null);
+        if (run === null || run === undefined || SETTLED.has(run.status))
+            return;
+        const input = run.input;
+        if (isRunInput(input))
+            await this.turns.interrupt(input).catch(() => undefined);
+        await this.engine.cancel(runId).catch((error) => {
+            openCodeLog.warn(`could not cancel run ${runId}: ${error.message}`);
+        });
+        if (isRunInput(input))
+            await this.turns.settle(runId, input, { status: 'interrupted' }, 0);
+    }
+}
+//# sourceMappingURL=runner.js.map