@agentproto/adapter-pi 0.3.5 → 0.3.6

package/PI-RPC.md

@@ -137,11 +137,22 @@ only the final `agent_end{willRetry:false}` emits `turn-end`.
 ## Known gaps / assumptions
 
 - **`usage_update.size` / `.used`** — pi's per-message `Usage` reports token
-  totals + cost, but **no context-window size**. The mapper surfaces
-  `usage.totalTokens` as both `size` and `used`. `tokensIn`/`tokensOut` =
+  totals + cost, but **no context-window size**. `client.ts` resolves the
+  window once per `connect()` from `@agentproto/model-catalog`'s
+  `resolveContextWindow(opts.model)` and the mapper surfaces it as `size`;
+  when the model isn't in the catalog, `size` is sent as `0` (this
+  codebase's "unknown window" sentinel — the runtime only applies `size`
+  when `> 0`, so `contextSize` is left unset rather than defaulted to a
+  token count). `used` is `usage.totalTokens`. `tokensIn`/`tokensOut` =
   `input`/`output`; `cost = { amount: usage.cost.total, currency: "USD" }`.
-  A future improvement could issue `get_session_stats` (which carries
-  `contextUsage`) for a true window size, at the cost of an extra round-trip.
+  Previously this mapper sent `usage.totalTokens` as BOTH `size` and `used`,
+  which pinned `contextPct` at 100% on every turn and tripped the
+  context-continuity hard stop immediately — fixed alongside a
+  `contextSize === contextUsed` guard in the runtime's
+  `computeContextPct` (`packages/runtime/src/context-continuity.ts`). A
+  further improvement could issue `get_session_stats` (which carries
+  `contextUsage`) for a live `used` figure straight from pi, at the cost of
+  an extra round-trip.
 - **`length` → `max_turns`** — pi's `length` stop reason is a token/context
   cap, not a turn-count cap. `max_turns` is the closest canonical "budget hit"
   reason; there is no exact equivalent in the `StreamEvent` taxonomy.

package/dist/index.d.ts

@@ -160,6 +160,11 @@ declare function mapStopReason(reason: PiStopReason | undefined): "completed" |
  * Translate one pi session event into zero or more {@link StreamEvent}s,
  * updating `state` in place. Pure aside from the state mutation.
  *
+ * `contextWindow` is the model's real context-window size (resolved by the
+ * caller from `@agentproto/model-catalog`, once per connection — pi's own
+ * per-message `Usage` carries no window figure). `undefined` when the
+ * model isn't in the catalog; threaded straight into `usageUpdate`.
+ *
  * `agent_end` (with `willRetry` false) is the turn terminator: it flushes a
  * `turn-end` whose reason reflects the stop reason accumulated over the turn.
  * An `agent_end` with `willRetry: true` (auto-retry) does NOT close the turn —
@@ -168,7 +173,7 @@ declare function mapStopReason(reason: PiStopReason | undefined): "completed" |
  * RPC stdout stream (verified empirically against pi 0.80.3), so it cannot be
  * relied on as the terminator — see PI-RPC.md.
  */
-declare function mapPiEvent(event: PiSessionEvent, sessionId: string, state: PiMapperState): StreamEvent[];
+declare function mapPiEvent(event: PiSessionEvent, sessionId: string, state: PiMapperState, contextWindow: number | undefined): StreamEvent[];
 
 /**
  * @agentproto/adapter-pi — AIP-45 adapter for **earendil-works/pi**

package/dist/index.mjs

@@ -8,6 +8,7 @@ import { tmpdir } from 'os';
 import { join } from 'path';
 import { StringDecoder } from 'string_decoder';
 import { fileURLToPath } from 'url';
+import { resolveContextWindow } from '@agentproto/model-catalog/llm';
 import process3 from 'process';
 import { PassThrough } from 'stream';
 
@@ -18518,21 +18519,25 @@ function mapStopReason(reason) {
       return "completed";
   }
 }
-function usageUpdate(sessionId, usage) {
+function usageUpdate(sessionId, usage, contextWindow) {
   return {
     kind: "usage_update",
     sessionId,
     // Pi's per-message `Usage` reports token totals but not a context-window
-    // size; `totalTokens` is surfaced as both `size` and `used` (documented
-    // gap in PI-RPC.md). Cost is pi's own computed USD figure.
-    size: usage.totalTokens,
+    // size, so the caller resolves one out-of-band (model catalog, by model
+    // id — see client.ts `connect()`). `size: 0` is this codebase's "unknown
+    // window" sentinel (mirrors the `agy` mapper in print-arm.ts): the
+    // runtime's usage_update ingestion only applies `size` when it's `> 0`,
+    // so an unresolved window leaves `contextSize` untouched rather than
+    // being defaulted to `totalTokens` (see PI-RPC.md).
+    size: contextWindow ?? 0,
     used: usage.totalTokens,
     cost: { amount: usage.cost.total, currency: "USD" },
     tokensIn: usage.input,
     tokensOut: usage.output
   };
 }
-function mapPiEvent(event, sessionId, state) {
+function mapPiEvent(event, sessionId, state, contextWindow) {
   switch (event.type) {
     case "message_update": {
       const inner = event.assistantMessageEvent;
@@ -18586,7 +18591,7 @@ function mapPiEvent(event, sessionId, state) {
         state.lastStopReason = message.stopReason;
       }
       if (message?.usage !== void 0) {
-        return [usageUpdate(sessionId, message.usage)];
+        return [usageUpdate(sessionId, message.usage, contextWindow)];
       }
       return [];
     }
@@ -18671,10 +18676,14 @@ function extractPromptText(message) {
   }
   return JSON.stringify(message);
 }
+function resolvePiContextWindow(modelId) {
+  return modelId ? resolveContextWindow(modelId)?.contextWindow : void 0;
+}
 function createAgentCliClient(definition) {
   let child;
   let piSessionId;
   let connectEffort;
+  let contextWindow;
   let onActivity;
   let bridgeTempDir;
   const pending = /* @__PURE__ */ new Map();
@@ -18735,7 +18744,7 @@ function createAgentCliClient(definition) {
     onActivity?.();
     const turn = currentTurn;
     if (!turn) return;
-    for (const mapped of mapPiEvent(event, piSessionId ?? "", mapperState)) {
+    for (const mapped of mapPiEvent(event, piSessionId ?? "", mapperState, contextWindow)) {
       turn.push(mapped);
       if (mapped.kind === "turn-end") turn.close();
     }
@@ -18784,6 +18793,7 @@ function createAgentCliClient(definition) {
     async connect(opts) {
       onActivity = opts.onActivity;
       connectEffort = opts.effort;
+      contextWindow = resolvePiContextWindow(opts.model);
       const args = ["--mode", "rpc"];
       if (opts.model) args.push("--model", opts.model);
       if (opts.resumeSessionId) args.push("--session", opts.resumeSessionId);