@dudousxd/nestjs-agent-opencode 0.2.1 → 0.4.0

package/dist/{engine-0YkBLWZR.d.cts → engine-BNNxQAFV.d.cts}

@@ -1,6 +1,6 @@
 import { AgentDepsFactory, ChatQueueService, AgentEngine } from '@dudousxd/nestjs-agent';
 import { ConflictException, Logger, OnApplicationShutdown, Type, InjectionToken, Provider } from '@nestjs/common';
-import { ElicitationRequest, CostSource, AgentRunInput, SinkWriter, AgentStore, ApprovalRequirement, MessageUsage, AgentUiComponent, HumanReply, Actor, StoredMessage, ToolRegistry, TokenStreamSink, SkillsConfig, MemoryConfig, AgentPricingStore, PriceCatalogOptions, RolesPolicy, RememberToolInput, AiToolCtx } from '@dudousxd/nestjs-agent-core';
+import { ElicitationRequest, CostSource, AgentRunInput, SinkWriter, AgentStore, ApprovalRequirement, ToolPresentation, MessageUsage, AgentUiComponent, HumanReply, Actor, StoredMessage, ToolRegistry, TokenStreamSink, SkillsConfig, MemoryConfig, AgentPricingStore, PriceCatalogOptions, RolesPolicy, RememberToolInput, AiToolCtx } from '@dudousxd/nestjs-agent-core';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
@@ -297,6 +297,15 @@ interface OpenCodeTurnArgs {
     store: AgentStore;
     /** What an action needs before it runs (the module's `ApprovalPolicy`). */
     approvalFor: (action: string) => Promise<ApprovalRequirement>;
+    /**
+     * The app tool a permission `action` names, with its presentation: its `confirm` templates (filled
+     * from the call's arguments) word the approval card. `undefined` (or omitted) → an OpenCode
+     * built-in, worded from its name.
+     */
+    approvalPresentation?: (action: string) => {
+        name: string;
+        presentation?: ToolPresentation;
+    } | undefined;
     /** The model label usage is recorded under until OpenCode names the step's model. */
     modelLabel: string;
     /**
@@ -676,6 +685,8 @@ declare class OpenCodeToolRefusedError extends Error {
 declare class OpenCodeMcpEndpoint {
     private readonly turns;
     private readonly tokens;
+    /** Genui telemetry of the UI calls OpenCode makes (its code mode calls tools here, not in the loop). */
+    private readonly genui;
     constructor(turns: OpenCodeTurns, tokens: OpenCodeToolsTokens);
     /** The claims of a request's bearer token, or `null`. */
     authenticate(authorization: string | string[] | undefined): OpenCodeToolsClaims | null;
@@ -787,7 +798,8 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     private readonly host;
     private readonly sessions;
     private readonly settings;
-    private readonly store;
+    /** Read by the MCP endpoint too (genui telemetry of the calls OpenCode makes). */
+    readonly store: AgentStore;
     private readonly sink;
     private readonly deps;
     readonly registry: ToolRegistry;
@@ -803,7 +815,9 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     private readonly spent;
     /** When the tools endpoint was last registered for a location (`server|boot|directory|actor`). */
     private readonly toolsIssued;
-    constructor(host: OpenCodeHost, sessions: OpenCodeSessionStore, settings: OpenCodeEngineSettings, store: AgentStore, sink: TokenStreamSink, deps: AgentDepsFactory, registry: ToolRegistry, skills?: SkillsConfig | undefined, memory?: MemoryConfig | undefined, queue?: ChatQueueService | undefined, toolsTokens?: (OpenCodeToolsTokens | null) | undefined, pricingStore?: AgentPricingStore, agentOptions?: {
+    constructor(host: OpenCodeHost, sessions: OpenCodeSessionStore, settings: OpenCodeEngineSettings, 
+    /** Read by the MCP endpoint too (genui telemetry of the calls OpenCode makes). */
+    store: AgentStore, sink: TokenStreamSink, deps: AgentDepsFactory, registry: ToolRegistry, skills?: SkillsConfig | undefined, memory?: MemoryConfig | undefined, queue?: ChatQueueService | undefined, toolsTokens?: (OpenCodeToolsTokens | null) | undefined, pricingStore?: AgentPricingStore, agentOptions?: {
         priceCatalog?: PriceCatalogOptions | false;
     });
     private readonly prices;
@@ -819,6 +833,11 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     }): Promise<StepCost>;
     /** The tools server's name in OpenCode. */
     get toolsServer(): string;
+    /** The app tool an OpenCode permission `action` names, and its presentation — `undefined` for a built-in. */
+    presentationOf(action: string): {
+        name: string;
+        presentation?: ToolPresentation;
+    } | undefined;
     /** The roles policy a turn's tools are gated by (the agent's own). */
     rolesPolicyFor(input: Pick<AgentRunInput, 'agentName'>): RolesPolicy;
     /** The tools a turn may reach: the agent's allow-list, narrowed by its persona's. */

package/dist/{engine-0YkBLWZR.d.ts → engine-BNNxQAFV.d.ts}

@@ -1,6 +1,6 @@
 import { AgentDepsFactory, ChatQueueService, AgentEngine } from '@dudousxd/nestjs-agent';
 import { ConflictException, Logger, OnApplicationShutdown, Type, InjectionToken, Provider } from '@nestjs/common';
-import { ElicitationRequest, CostSource, AgentRunInput, SinkWriter, AgentStore, ApprovalRequirement, MessageUsage, AgentUiComponent, HumanReply, Actor, StoredMessage, ToolRegistry, TokenStreamSink, SkillsConfig, MemoryConfig, AgentPricingStore, PriceCatalogOptions, RolesPolicy, RememberToolInput, AiToolCtx } from '@dudousxd/nestjs-agent-core';
+import { ElicitationRequest, CostSource, AgentRunInput, SinkWriter, AgentStore, ApprovalRequirement, ToolPresentation, MessageUsage, AgentUiComponent, HumanReply, Actor, StoredMessage, ToolRegistry, TokenStreamSink, SkillsConfig, MemoryConfig, AgentPricingStore, PriceCatalogOptions, RolesPolicy, RememberToolInput, AiToolCtx } from '@dudousxd/nestjs-agent-core';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 
@@ -297,6 +297,15 @@ interface OpenCodeTurnArgs {
     store: AgentStore;
     /** What an action needs before it runs (the module's `ApprovalPolicy`). */
     approvalFor: (action: string) => Promise<ApprovalRequirement>;
+    /**
+     * The app tool a permission `action` names, with its presentation: its `confirm` templates (filled
+     * from the call's arguments) word the approval card. `undefined` (or omitted) → an OpenCode
+     * built-in, worded from its name.
+     */
+    approvalPresentation?: (action: string) => {
+        name: string;
+        presentation?: ToolPresentation;
+    } | undefined;
     /** The model label usage is recorded under until OpenCode names the step's model. */
     modelLabel: string;
     /**
@@ -676,6 +685,8 @@ declare class OpenCodeToolRefusedError extends Error {
 declare class OpenCodeMcpEndpoint {
     private readonly turns;
     private readonly tokens;
+    /** Genui telemetry of the UI calls OpenCode makes (its code mode calls tools here, not in the loop). */
+    private readonly genui;
     constructor(turns: OpenCodeTurns, tokens: OpenCodeToolsTokens);
     /** The claims of a request's bearer token, or `null`. */
     authenticate(authorization: string | string[] | undefined): OpenCodeToolsClaims | null;
@@ -787,7 +798,8 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     private readonly host;
     private readonly sessions;
     private readonly settings;
-    private readonly store;
+    /** Read by the MCP endpoint too (genui telemetry of the calls OpenCode makes). */
+    readonly store: AgentStore;
     private readonly sink;
     private readonly deps;
     readonly registry: ToolRegistry;
@@ -803,7 +815,9 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     private readonly spent;
     /** When the tools endpoint was last registered for a location (`server|boot|directory|actor`). */
     private readonly toolsIssued;
-    constructor(host: OpenCodeHost, sessions: OpenCodeSessionStore, settings: OpenCodeEngineSettings, store: AgentStore, sink: TokenStreamSink, deps: AgentDepsFactory, registry: ToolRegistry, skills?: SkillsConfig | undefined, memory?: MemoryConfig | undefined, queue?: ChatQueueService | undefined, toolsTokens?: (OpenCodeToolsTokens | null) | undefined, pricingStore?: AgentPricingStore, agentOptions?: {
+    constructor(host: OpenCodeHost, sessions: OpenCodeSessionStore, settings: OpenCodeEngineSettings, 
+    /** Read by the MCP endpoint too (genui telemetry of the calls OpenCode makes). */
+    store: AgentStore, sink: TokenStreamSink, deps: AgentDepsFactory, registry: ToolRegistry, skills?: SkillsConfig | undefined, memory?: MemoryConfig | undefined, queue?: ChatQueueService | undefined, toolsTokens?: (OpenCodeToolsTokens | null) | undefined, pricingStore?: AgentPricingStore, agentOptions?: {
         priceCatalog?: PriceCatalogOptions | false;
     });
     private readonly prices;
@@ -819,6 +833,11 @@ declare class OpenCodeTurns implements OnApplicationShutdown {
     }): Promise<StepCost>;
     /** The tools server's name in OpenCode. */
     get toolsServer(): string;
+    /** The app tool an OpenCode permission `action` names, and its presentation — `undefined` for a built-in. */
+    presentationOf(action: string): {
+        name: string;
+        presentation?: ToolPresentation;
+    } | undefined;
     /** The roles policy a turn's tools are gated by (the agent's own). */
     rolesPolicyFor(input: Pick<AgentRunInput, 'agentName'>): RolesPolicy;
     /** The tools a turn may reach: the agent's allow-list, narrowed by its persona's. */

package/dist/index.cjs

@@ -195,6 +195,7 @@ OpenCodeMcpController = _ts_decorate([
 // src/mcp.ts
 var import_node_crypto = require("crypto");
 var import_nestjs_agent_core3 = require("@dudousxd/nestjs-agent-core");
+var import_genui = require("@dudousxd/nestjs-agent-core/genui");
 var import_server = require("@modelcontextprotocol/sdk/server/index.js");
 var import_streamableHttp = require("@modelcontextprotocol/sdk/server/streamableHttp.js");
 var import_zod_json_schema_compat = require("@modelcontextprotocol/sdk/server/zod-json-schema-compat.js");
@@ -1071,6 +1072,8 @@ ${delta}` : delta;
     }
     const ttlMs = requirement.ttlMs !== void 0 && Number.isFinite(requirement.ttlMs) && requirement.ttlMs > 0 ? Math.floor(requirement.ttlMs) : void 0;
     const expiresAt = ttlMs !== void 0 ? new Date(Date.now() + ttlMs).toISOString() : void 0;
+    const tool = this.a.approvalPresentation?.(action);
+    const confirmation = tool !== void 0 ? (0, import_nestjs_agent_core2.resolveToolConfirmation)(tool.name, args, tool.presentation) : void 0;
     this.segment.calls.push({
       id: req.id,
       name: action,
@@ -1085,6 +1088,9 @@ ${delta}` : delta;
       toolType: "action",
       input: args,
       status: "pending_approval",
+      ...confirmation !== void 0 ? {
+        confirmation
+      } : {},
       runId: this.a.runId,
       approver: requirement.approver,
       ...expiresAt !== void 0 ? {
@@ -1102,6 +1108,9 @@ ${delta}` : delta;
       kind: "approval-requested",
       id: req.id,
       approver: requirement.approver,
+      ...confirmation !== void 0 ? {
+        confirmation
+      } : {},
       ...expiresAt !== void 0 ? {
         expiresAt
       } : {}
@@ -1507,6 +1516,8 @@ var OpenCodeMcpEndpoint2 = class {
   }
   turns;
   tokens;
+  /** Genui telemetry of the UI calls OpenCode makes (its code mode calls tools here, not in the loop). */
+  genui = new import_nestjs_agent_core3.GenuiRunRecorder();
   constructor(turns, tokens) {
     this.turns = turns;
     this.tokens = tokens;
@@ -1638,7 +1649,7 @@ var OpenCodeMcpEndpoint2 = class {
     if (spec.kind === "action" && !await this.turns.spendApproval(turn.runId, name, turn.input)) {
       throw new OpenCodeToolRefusedError(`"${name}" is an action and nobody approved this call; ask for the permission first.`);
     }
-    return registry.invoke(name, args ?? {}, {
+    const invoke = /* @__PURE__ */ __name(() => registry.invoke(name, args ?? {}, {
       actor,
       threadId: turn.ctx.threadId,
       runId: turn.runId,
@@ -1655,7 +1666,24 @@ var OpenCodeMcpEndpoint2 = class {
       } : {}
     }, this.turns.rolesPolicyFor(turn.input), allowed !== void 0 ? {
       allowedTools: allowed
-    } : {});
+    } : {}), "invoke");
+    return this.genui.track({
+      store: this.turns.store,
+      marker: spec.genui,
+      runId: turn.runId,
+      threadId: turn.ctx.threadId,
+      actorRef: actor.id,
+      ...turn.input.agentName !== void 0 ? {
+        agentName: turn.input.agentName
+      } : {},
+      channel: (0, import_genui.turnChannel)(turn.input.pageContext),
+      modelId: turn.input.model ?? "opencode",
+      call: {
+        id: `mcp:${turn.runId}:${requestId}`,
+        name,
+        input: args ?? {}
+      }
+    }, invoke);
   }
   /** `remember`: one fact, at the actor's own scope only — as the loop serves it. */
   async remember(turn, args) {
@@ -1882,6 +1910,25 @@ var OpenCodeTurns = class {
   get toolsServer() {
     return this.settings.tools?.server ?? "aviary";
   }
+  /** The app tool an OpenCode permission `action` names, and its presentation — `undefined` for a built-in. */
+  presentationOf(action) {
+    if (this.settings.tools === void 0) return void 0;
+    const server = this.toolsServer;
+    for (const prefix of [
+      `${server}.`,
+      `${server}_`
+    ]) {
+      if (!action.startsWith(prefix)) continue;
+      const spec = this.registry.spec(action.slice(prefix.length));
+      if (spec !== void 0) return {
+        name: spec.name,
+        ...spec.presentation !== void 0 ? {
+          presentation: spec.presentation
+        } : {}
+      };
+    }
+    return void 0;
+  }
   /** The roles policy a turn's tools are gated by (the agent's own). */
   rolesPolicyFor(input) {
     return this.deps.forAgent(input.agentName).rolesPolicy;
@@ -2614,6 +2661,9 @@ ${body}
           agentName: input.agentName
         } : {}
       }), "approvalFor"),
+      // An app tool reaches OpenCode as `<server>.<name>` / `<server>_<name>`: its own presentation
+      // words the approval card. OpenCode's built-ins (`bash`, `edit`) have none.
+      approvalPresentation: /* @__PURE__ */ __name((action) => this.presentationOf(action), "approvalPresentation"),
       modelLabel: input.model ?? "opencode",
       priceStep: /* @__PURE__ */ __name((step) => this.priceStep(step), "priceStep"),
       ...spent !== void 0 ? {