@dudousxd/nestjs-agent-opencode 0.2.0 → 0.2.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { d as OpenCodeClient, e as OpenCodeEvent, f as OpenCodeForm, g as OpenCodeFormValue, h as OpenCodeFormField, i as OpenCodeMcpEndpoint, O as OpenCodeTurns, a as OpenCodeEngineSettings } from './engine-JnBbcRxh.cjs';
-export { I as InMemoryOpenCodeSessionStore, M as Milestone, j as OpenCodeAmendment, k as OpenCodeCallContext, c as OpenCodeEngineOptions, b as OpenCodeHost, l as OpenCodeKeyValue, m as OpenCodeModelRef, n as OpenCodePermissionRequest, o as OpenCodePermissionRule, p as OpenCodeReplyMismatchError, q as OpenCodeRunResult, r as OpenCodeServer, s as OpenCodeSessionCreate, t as OpenCodeSessionRef, u as OpenCodeSessionStore, v as OpenCodeToolCall, w as OpenCodeToolRefusedError, x as OpenCodeToolsClaims, y as OpenCodeToolsOptions, z as OpenCodeToolsTokens, A as OpenCodeTurn, B as OpenCodeTurnContext, C as OpenCodeUsage, P as PendingAsk, S as SessionHandle, D as StepCost, E as StepModel, T as TurnOutcome, F as addUsage, G as emptyUsage, H as keyValueOpenCodeSessionStore, J as openCode, K as openCodeControllers, L as openCodeProviders, N as usageOf } from './engine-JnBbcRxh.cjs';
+import { d as OpenCodeClient, e as OpenCodeEvent, f as OpenCodeForm, g as OpenCodeFormValue, h as OpenCodeFormField, i as OpenCodeMcpEndpoint, O as OpenCodeTurns, a as OpenCodeEngineSettings } from './engine-0YkBLWZR.cjs';
+export { I as InMemoryOpenCodeSessionStore, M as Milestone, j as OpenCodeAmendment, k as OpenCodeCallContext, c as OpenCodeEngineOptions, b as OpenCodeHost, l as OpenCodeKeyValue, m as OpenCodeModelRef, n as OpenCodePermissionRequest, o as OpenCodePermissionRule, p as OpenCodeReplyMismatchError, q as OpenCodeRunResult, r as OpenCodeServer, s as OpenCodeSessionCreate, t as OpenCodeSessionRef, u as OpenCodeSessionStore, v as OpenCodeToolCall, w as OpenCodeToolRefusedError, x as OpenCodeToolsClaims, y as OpenCodeToolsOptions, z as OpenCodeToolsTokens, A as OpenCodeTurn, B as OpenCodeTurnContext, C as OpenCodeUsage, P as PendingAsk, S as SessionHandle, D as StepCost, E as StepModel, T as TurnOutcome, F as addUsage, G as emptyUsage, H as keyValueOpenCodeSessionStore, J as openCode, K as openCodeControllers, L as openCodeProviders, N as usageOf } from './engine-0YkBLWZR.cjs';
 import { ElicitationRequest, ElicitationQuestion, AgentRunner, AgentRunInput, AgentRunStartOptions, HumanReply } from '@dudousxd/nestjs-agent-core';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import '@dudousxd/nestjs-agent';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { d as OpenCodeClient, e as OpenCodeEvent, f as OpenCodeForm, g as OpenCodeFormValue, h as OpenCodeFormField, i as OpenCodeMcpEndpoint, O as OpenCodeTurns, a as OpenCodeEngineSettings } from './engine-JnBbcRxh.js';
-export { I as InMemoryOpenCodeSessionStore, M as Milestone, j as OpenCodeAmendment, k as OpenCodeCallContext, c as OpenCodeEngineOptions, b as OpenCodeHost, l as OpenCodeKeyValue, m as OpenCodeModelRef, n as OpenCodePermissionRequest, o as OpenCodePermissionRule, p as OpenCodeReplyMismatchError, q as OpenCodeRunResult, r as OpenCodeServer, s as OpenCodeSessionCreate, t as OpenCodeSessionRef, u as OpenCodeSessionStore, v as OpenCodeToolCall, w as OpenCodeToolRefusedError, x as OpenCodeToolsClaims, y as OpenCodeToolsOptions, z as OpenCodeToolsTokens, A as OpenCodeTurn, B as OpenCodeTurnContext, C as OpenCodeUsage, P as PendingAsk, S as SessionHandle, D as StepCost, E as StepModel, T as TurnOutcome, F as addUsage, G as emptyUsage, H as keyValueOpenCodeSessionStore, J as openCode, K as openCodeControllers, L as openCodeProviders, N as usageOf } from './engine-JnBbcRxh.js';
+import { d as OpenCodeClient, e as OpenCodeEvent, f as OpenCodeForm, g as OpenCodeFormValue, h as OpenCodeFormField, i as OpenCodeMcpEndpoint, O as OpenCodeTurns, a as OpenCodeEngineSettings } from './engine-0YkBLWZR.js';
+export { I as InMemoryOpenCodeSessionStore, M as Milestone, j as OpenCodeAmendment, k as OpenCodeCallContext, c as OpenCodeEngineOptions, b as OpenCodeHost, l as OpenCodeKeyValue, m as OpenCodeModelRef, n as OpenCodePermissionRequest, o as OpenCodePermissionRule, p as OpenCodeReplyMismatchError, q as OpenCodeRunResult, r as OpenCodeServer, s as OpenCodeSessionCreate, t as OpenCodeSessionRef, u as OpenCodeSessionStore, v as OpenCodeToolCall, w as OpenCodeToolRefusedError, x as OpenCodeToolsClaims, y as OpenCodeToolsOptions, z as OpenCodeToolsTokens, A as OpenCodeTurn, B as OpenCodeTurnContext, C as OpenCodeUsage, P as PendingAsk, S as SessionHandle, D as StepCost, E as StepModel, T as TurnOutcome, F as addUsage, G as emptyUsage, H as keyValueOpenCodeSessionStore, J as openCode, K as openCodeControllers, L as openCodeProviders, N as usageOf } from './engine-0YkBLWZR.js';
 import { ElicitationRequest, ElicitationQuestion, AgentRunner, AgentRunInput, AgentRunStartOptions, HumanReply } from '@dudousxd/nestjs-agent-core';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import '@dudousxd/nestjs-agent';

package/dist/index.js

@@ -344,6 +344,17 @@ var OpenCodeTurn = class {
   reported = emptyUsage();
   priced = false;
   model;
+  /** What the session had spent when this turn prompted it; what OpenCode reported since. */
+  baseline;
+  seen = {
+    cost: 0,
+    input: 0,
+    output: 0,
+    reasoning: 0,
+    read: 0,
+    write: 0
+  };
+  compacted = false;
   stepOpen = false;
   sawText = false;
   separator = false;
@@ -355,6 +366,19 @@ var OpenCodeTurn = class {
     this.a = a;
     this.model = modelOfLabel(a.input.model);
   }
+  /**
+  * What the session had spent before this turn prompted it (`session.get`). When the execution
+  * ends, what the session spent since that this turn's events did not report — the title OpenCode
+  * generates, a compaction: OpenCode records those calls on the session without streaming them — is
+  * recorded as a usage row of its own.
+  */
+  setBaseline(info) {
+    if (info?.tokens === void 0) return;
+    this.baseline = {
+      cost: Number(info.cost) || 0,
+      tokens: info.tokens
+    };
+  }
   /** What the run spent so far: carried from before this turn object, plus what it saw. */
   totalUsage() {
     return addUsage(this.a.carried, this.spent);
@@ -611,6 +635,10 @@ var OpenCodeTurn = class {
     }
     if (this.ended) return;
     switch (e.type) {
+      case "session.compaction.started":
+      case "session.compaction.ended":
+        this.compacted = true;
+        return;
       case "session.step.started":
       case "session.model.selected": {
         const model = d.model;
@@ -780,6 +808,13 @@ ${delta}` : delta;
   async spend(d, purpose) {
     const usage = usageOf(d.tokens);
     const reportedCostUsd = typeof d.cost === "number" && Number.isFinite(d.cost) && d.cost >= 0 ? d.cost : void 0;
+    const n = /* @__PURE__ */ __name((v) => typeof v === "number" && Number.isFinite(v) && v > 0 ? v : 0, "n");
+    this.seen.cost += reportedCostUsd ?? 0;
+    this.seen.input += n(d.tokens?.input);
+    this.seen.output += n(d.tokens?.output);
+    this.seen.reasoning += n(d.tokens?.reasoning);
+    this.seen.read += n(d.tokens?.cache?.read);
+    this.seen.write += n(d.tokens?.cache?.write);
     const fallback = reportedCostUsd !== void 0 ? {
       costUsd: reportedCostUsd,
       costSource: "provider"
@@ -1247,9 +1282,39 @@ ${delta}` : delta;
     this.messageResults.set(messageId, results);
     await this.a.store.setMessageToolResults(messageId, results);
   }
+  /** What the session spent since the baseline that no event of this turn reported. */
+  async unreported() {
+    const baseline = this.baseline;
+    if (baseline === void 0) return;
+    this.baseline = void 0;
+    const info = await this.a.client.session.get?.({
+      sessionID: this.a.sessionId
+    }).catch(() => void 0);
+    const after = info?.tokens;
+    if (after === void 0) return;
+    const before = baseline.tokens;
+    const left = /* @__PURE__ */ __name((now, then, seen) => Math.max(0, (Number(now) || 0) - (Number(then) || 0) - seen), "left");
+    const tokens = {
+      input: left(after.input, before.input, this.seen.input),
+      output: left(after.output, before.output, this.seen.output),
+      reasoning: left(after.reasoning, before.reasoning, this.seen.reasoning),
+      cache: {
+        read: left(after.cache?.read, before.cache?.read, this.seen.read),
+        write: left(after.cache?.write, before.cache?.write, this.seen.write)
+      }
+    };
+    const total = tokens.input + tokens.output + tokens.reasoning + tokens.cache.read + tokens.cache.write;
+    if (total === 0) return;
+    const cost = left(info?.cost, baseline.cost, this.seen.cost);
+    await this.spend({
+      tokens,
+      cost: cost < 1e-9 ? 0 : cost
+    }, this.compacted ? "history_summary" : "title");
+  }
   async end(outcome) {
     if (this.ended) return;
     this.ended = true;
+    await this.unreported().catch((error) => this.a.logger.warn(`run ${this.a.runId}: ${errorText(error, "could not read the session usage")}`));
     if (outcome.status !== "failed" || this.segment.text || this.segment.calls.length > 0 || this.segment.ui.length > 0) {
       await this.flush(true);
     }
@@ -2366,6 +2431,7 @@ ${body}
           })
         } : {}
       };
+      live.turn.setBaseline(await this.sessionUsage(live.client, handle.sessionId));
       await live.client.session.prompt({
         sessionID: handle.sessionId,
         text: prompt.text,
@@ -2445,12 +2511,23 @@ ${body}
     await live.turn.decide(ask, reply, {
       tellOpenCode: false
     });
+    live.turn.setBaseline(await this.sessionUsage(live.client, handle.sessionId));
     await live.client.session.prompt({
       sessionID: handle.sessionId,
       text: note
     });
     return handle;
   }
+  /** What a session spent so far (`session.get`), or nothing when OpenCode does not say. */
+  async sessionUsage(client, sessionId) {
+    try {
+      return await client.session.get?.({
+        sessionID: sessionId
+      });
+    } catch {
+      return void 0;
+    }
+  }
   /** Interrupt the thread's session (cancel). */
   async interrupt(input) {
     const known = await this.sessions.get(input.threadId);