@oh-my-pi/pi-agent-core 16.3.6 → 16.3.8

package/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [16.3.7] - 2026-07-05
+
+### Fixed
+
+- Fixed an issue where provider orchestration tokens were incorrectly included in context token calculations, which could trigger premature context auto-compaction and promotion.
+
 ## [16.3.3] - 2026-07-02
 
 ### Changed

package/dist/types/agent-loop.d.ts

@@ -4,8 +4,8 @@
  */
 import { type Context, EventStream } from "@oh-my-pi/pi-ai";
 import { type Dialect } from "@oh-my-pi/pi-ai/dialect";
-import { type AgentRunCoverage, type AgentRunSummary } from "./run-collector";
-import type { AgentContext, AgentEvent, AgentLoopConfig, AgentMessage, StreamFn } from "./types";
+import { type AgentRunCoverage, type AgentRunSummary } from "./run-collector.js";
+import type { AgentContext, AgentEvent, AgentLoopConfig, AgentMessage, StreamFn } from "./types.js";
 /** Stop-details marker for a provider error after assistant content/tool args already streamed. */
 export declare const STREAM_INTERRUPTED_AFTER_CONTENT_STOP_DETAIL = "stream_interrupted_after_content";
 export declare function resolveOwnedDialectFromEnv(value: string | undefined): Dialect | undefined;

package/dist/types/agent.d.ts

@@ -1,8 +1,8 @@
 import { type ApiKey, type AssistantMessage, type AssistantMessageEvent, type Context, type CursorExecHandlers, type CursorToolResultHandler, type Effort, type ImageContent, type Message, type Model, type ProviderSessionState, type ServiceTier, type SimpleStreamOptions, type ThinkingBudgets, type ToolChoice } from "@oh-my-pi/pi-ai";
 import type { Dialect } from "@oh-my-pi/pi-ai/dialect";
 import type { HarmonyAuditEvent } from "@oh-my-pi/pi-ai/utils/harmony-leak";
-import type { AppendOnlyContextManager } from "./append-only-context";
-import type { AgentEvent, AgentLoopConfig, AgentMessage, AgentState, AgentTool, AgentToolContext, AgentTurnEndContext, AsideMessage, StreamFn, ToolCallContext, ToolChoiceDirective } from "./types";
+import type { AppendOnlyContextManager } from "./append-only-context.js";
+import type { AgentEvent, AgentLoopConfig, AgentMessage, AgentState, AgentTool, AgentToolContext, AgentTurnEndContext, AsideMessage, StreamFn, ToolCallContext, ToolChoiceDirective } from "./types.js";
 export declare class AgentBusyError extends Error {
     constructor(message?: string);
 }

package/dist/types/append-only-context.d.ts

@@ -15,7 +15,7 @@
  */
 import type { Context, Message, Tool } from "@oh-my-pi/pi-ai";
 import type { Dialect } from "@oh-my-pi/pi-ai/dialect";
-import type { AgentContext } from "./types";
+import type { AgentContext } from "./types.js";
 /** Frozen system prompt + tool spec snapshot. */
 export interface StablePrefixSnapshot {
     systemPrompt: string[];

package/dist/types/compaction/branch-summarization.d.ts

@@ -5,11 +5,11 @@
  * a summary of the branch being left so context isn't lost.
  */
 import type { Api, ApiKey, AssistantMessage, Context, Model, SimpleStreamOptions } from "@oh-my-pi/pi-ai";
-import { type AgentTelemetry } from "../telemetry";
-import type { AgentMessage } from "../types";
-import type { ReadonlySessionManager, SessionEntry } from "./entries";
-import { type ConvertToLlm } from "./messages";
-import { type FileOperations } from "./utils";
+import { type AgentTelemetry } from "../telemetry.js";
+import type { AgentMessage } from "../types.js";
+import type { ReadonlySessionManager, SessionEntry } from "./entries.js";
+import { type ConvertToLlm } from "./messages.js";
+import { type FileOperations } from "./utils.js";
 export interface BranchSummaryResult {
     summary?: string;
     readFiles?: string[];
@@ -22,7 +22,7 @@ export interface BranchSummaryDetails {
     readFiles: string[];
     modifiedFiles: string[];
 }
-export type { FileOperations } from "./utils";
+export type { FileOperations } from "./utils.js";
 export interface BranchPreparation {
     /** Messages extracted for summarization, in chronological order */
     messages: AgentMessage[];

package/dist/types/compaction/compaction.d.ts

@@ -5,12 +5,12 @@
  * and after compaction the session is reloaded.
  */
 import { type Api, type ApiKey, type AssistantMessage, type Context, type FetchImpl, type MessageAttribution, type Model, type SimpleStreamOptions, type Tool, type Usage } from "@oh-my-pi/pi-ai";
-import { type AgentTelemetry } from "../telemetry";
-import { ThinkingLevel } from "../thinking";
-import type { AgentMessage } from "../types";
-import type { SessionEntry } from "./entries";
-import { type ConvertToLlm } from "./messages";
-import { type FileOperations } from "./utils";
+import { type AgentTelemetry } from "../telemetry.js";
+import { ThinkingLevel } from "../thinking.js";
+import type { AgentMessage } from "../types.js";
+import type { SessionEntry } from "./entries.js";
+import { type ConvertToLlm } from "./messages.js";
+import { type FileOperations } from "./utils.js";
 /** Details stored in CompactionEntry.details for file tracking */
 export interface CompactionDetails {
     readFiles: string[];
@@ -56,6 +56,9 @@ export declare const DEFAULT_COMPACTION_SETTINGS: CompactionSettings;
 /**
  * Calculate total context tokens from usage.
  * Uses the native totalTokens field when available, falls back to computing from components.
+ * Provider-side orchestration tokens are billable but never replay into the
+ * conversation prefix, so they are excluded from context sizing to keep
+ * auto-compaction and context-promotion thresholds honest.
  */
 export declare function calculateContextTokens(usage: Usage): number;
 export declare function calculatePromptTokens(usage: Usage): number;

package/dist/types/compaction/entries.d.ts

@@ -1,5 +1,5 @@
 import type { ImageContent, MessageAttribution, ServiceTierByFamily, TextContent } from "@oh-my-pi/pi-ai";
-import type { AgentMessage } from "../types";
+import type { AgentMessage } from "../types.js";
 export interface SessionEntryBase {
     type: string;
     id: string;

package/dist/types/compaction/index.d.ts

@@ -1,12 +1,12 @@
 /**
  * Compaction and summarization utilities.
  */
-export * from "./branch-summarization";
-export * from "./compaction";
-export * from "./entries";
-export * from "./errors";
-export * from "./messages";
-export * from "./openai";
-export * from "./pruning";
-export * from "./shake";
-export * from "./utils";
+export * from "./branch-summarization.js";
+export * from "./compaction.js";
+export * from "./entries.js";
+export * from "./errors.js";
+export * from "./messages.js";
+export * from "./openai.js";
+export * from "./pruning.js";
+export * from "./shake.js";
+export * from "./utils.js";

package/dist/types/compaction/messages.d.ts

@@ -1,5 +1,5 @@
 import type { ImageContent, Message, MessageAttribution, ProviderPayload, TextContent } from "@oh-my-pi/pi-ai";
-import type { AgentMessage } from "../types";
+import type { AgentMessage } from "../types.js";
 export interface CustomMessage<T = unknown> {
     role: "custom";
     customType: string;
@@ -42,7 +42,7 @@ export interface CompactionSummaryMessage {
     timestamp: number;
 }
 export type CoreCompactionMessage = CustomMessage | HookMessage | BranchSummaryMessage | CompactionSummaryMessage;
-declare module "../types" {
+declare module "../types.js" {
     interface CustomAgentMessages {
         custom: CustomMessage;
         hookMessage: HookMessage;

package/dist/types/compaction/openai.d.ts

@@ -15,7 +15,7 @@
  *   with `{ summary, shortSummary? }`.
  */
 import type { FetchImpl, Message, Model } from "@oh-my-pi/pi-ai/types";
-export * from "./compaction-v2-streaming";
+export * from "./compaction-v2-streaming.js";
 export declare const OPENAI_REMOTE_COMPACTION_PRESERVE_KEY = "openaiRemoteCompaction";
 /**
  * Hard ceiling on remote compaction HTTP requests. Unlike every provider

package/dist/types/compaction/pruning.d.ts

@@ -1,8 +1,8 @@
 /**
  * Tool output pruning utilities for compaction.
  */
-import type { SessionEntry } from "./entries";
-import { type ProtectedToolMatcher } from "./tool-protection";
+import type { SessionEntry } from "./entries.js";
+import { type ProtectedToolMatcher } from "./tool-protection.js";
 export interface PruneConfig {
     /** Keep the most recent tool output tokens intact. */
     protectTokens: number;

package/dist/types/compaction/shake.d.ts

@@ -9,8 +9,8 @@
  *
  * Layering mirrors `pruning.ts`: no I/O here.
  */
-import type { CustomMessageEntry, SessionEntry, SessionMessageEntry } from "./entries";
-import { type ProtectedToolMatcher } from "./tool-protection";
+import type { CustomMessageEntry, SessionEntry, SessionMessageEntry } from "./entries.js";
+import { type ProtectedToolMatcher } from "./tool-protection.js";
 export interface ShakeConfig {
     /** Keep the most recent context tokens (across all entries) intact. */
     protectTokens: number;

package/dist/types/compaction/tool-protection.d.ts

@@ -1,6 +1,6 @@
 import type { ToolResultMessage } from "@oh-my-pi/pi-ai";
-import type { AgentToolCall } from "../types";
-import type { SessionEntry } from "./entries";
+import type { AgentToolCall } from "../types.js";
+import type { SessionEntry } from "./entries.js";
 export interface ProtectedToolContext {
     readonly toolResult: ToolResultMessage;
     readonly toolCall: AgentToolCall | undefined;

package/dist/types/compaction/utils.d.ts

@@ -3,7 +3,7 @@
  */
 import type { Message } from "@oh-my-pi/pi-ai";
 import { type Dialect } from "@oh-my-pi/pi-ai/dialect";
-import type { AgentMessage } from "../types";
+import type { AgentMessage } from "../types.js";
 export interface FileOperations {
     read: Set<string>;
     written: Set<string>;

package/dist/types/compaction.d.ts

@@ -1 +1 @@
-export * from "./compaction/index";
+export * from "./compaction/index.js";

package/dist/types/index.d.ts

@@ -1,12 +1,12 @@
-export * from "./agent";
-export * from "./agent-loop";
-export * from "./append-only-context";
-export * from "./compaction";
-export * from "./proxy";
-export * from "./replay-policy";
-export * from "./run-collector";
-export * from "./telemetry";
-export * from "./thinking";
-export * from "./tokenizer";
-export * from "./types";
-export * from "./utils/yield";
+export * from "./agent.js";
+export * from "./agent-loop.js";
+export * from "./append-only-context.js";
+export * from "./compaction.js";
+export * from "./proxy.js";
+export * from "./replay-policy.js";
+export * from "./run-collector.js";
+export * from "./telemetry.js";
+export * from "./thinking.js";
+export * from "./tokenizer.js";
+export * from "./types.js";
+export * from "./utils/yield.js";

package/dist/types/telemetry.d.ts

@@ -24,8 +24,8 @@
  */
 import { type Api, type AssistantMessage, type Context, type Message, type Model, type ServiceTier, type SimpleStreamOptions, type StopReason, type ToolChoice, type Usage } from "@oh-my-pi/pi-ai";
 import { type Attributes, type AttributeValue, type Span, SpanKind, SpanStatusCode, type Tracer, trace } from "@opentelemetry/api";
-import { AgentRunCollector, type AgentRunCoverage, type AgentRunSummary, type ToolStatus } from "./run-collector";
-import type { AgentTool } from "./types";
+import { AgentRunCollector, type AgentRunCoverage, type AgentRunSummary, type ToolStatus } from "./run-collector.js";
+import type { AgentTool } from "./types.js";
 /** Default tracer name. Override via {@link AgentTelemetryConfig.tracerName}. */
 export declare const DEFAULT_TRACER_NAME = "@oh-my-pi/pi-agent-core";
 /**

package/dist/types/types.d.ts

@@ -1,9 +1,9 @@
 import type { ApiKey, AssistantMessage, AssistantMessageEvent, AssistantMessageEventStream, Context, Effort, ImageContent, Message, Model, ServiceTier, SimpleStreamOptions, Static, streamSimple, TextContent, Tool, ToolChoice, ToolResultMessage, TSchema } from "@oh-my-pi/pi-ai";
 import type { Dialect } from "@oh-my-pi/pi-ai/dialect";
 import type { HarmonyAuditEvent } from "@oh-my-pi/pi-ai/utils/harmony-leak";
-import type { AppendOnlyContextManager } from "./append-only-context";
-import type { AgentRunCoverage, AgentRunSummary } from "./run-collector";
-import type { AgentTelemetryConfig } from "./telemetry";
+import type { AppendOnlyContextManager } from "./append-only-context.js";
+import type { AgentRunCoverage, AgentRunSummary } from "./run-collector.js";
+import type { AgentTelemetryConfig } from "./telemetry.js";
 /** Stream function - can return sync or Promise for async config lookup */
 export type StreamFn = (...args: Parameters<typeof streamSimple>) => AssistantMessageEventStream | Promise<AssistantMessageEventStream>;
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-agent-core",
-	"version": "16.3.6",
+	"version": "16.3.8",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -35,12 +35,12 @@
 		"fmt": "biome format --write ."
 	},
 	"dependencies": {
-		"@oh-my-pi/pi-ai": "16.3.6",
-		"@oh-my-pi/pi-catalog": "16.3.6",
-		"@oh-my-pi/pi-natives": "16.3.6",
-		"@oh-my-pi/pi-utils": "16.3.6",
-		"@oh-my-pi/pi-wire": "16.3.6",
-		"@oh-my-pi/snapcompact": "16.3.6",
+		"@oh-my-pi/pi-ai": "16.3.8",
+		"@oh-my-pi/pi-catalog": "16.3.8",
+		"@oh-my-pi/pi-natives": "16.3.8",
+		"@oh-my-pi/pi-utils": "16.3.8",
+		"@oh-my-pi/pi-wire": "16.3.8",
+		"@oh-my-pi/snapcompact": "16.3.8",
 		"@opentelemetry/api": "^1.9.1"
 	},
 	"devDependencies": {

package/src/compaction/compaction.ts

@@ -204,9 +204,17 @@ export const DEFAULT_COMPACTION_SETTINGS: CompactionSettings = {
 /**
  * Calculate total context tokens from usage.
  * Uses the native totalTokens field when available, falls back to computing from components.
+ * Provider-side orchestration tokens are billable but never replay into the
+ * conversation prefix, so they are excluded from context sizing to keep
+ * auto-compaction and context-promotion thresholds honest.
  */
 export function calculateContextTokens(usage: Usage): number {
-	return usage.totalTokens || usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+	const orchestration = usage.orchestration;
+	const orchestrationTotal = orchestration
+		? (orchestration.input ?? 0) + (orchestration.output ?? 0) + (orchestration.cacheRead ?? 0)
+		: 0;
+	const raw = usage.totalTokens || usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
+	return Math.max(0, raw - orchestrationTotal);
 }
 
 export function calculatePromptTokens(usage: Usage): number {