Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/CursorAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,6 +54,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -867,6 +868,18 @@ export function makeCursorAdapter(
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp: yield* makeEventStamp(),
provider: PROVIDER,
threadId: ctx.threadId,
turnId: ctx.activeTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/GrokAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -1413,6 +1414,18 @@ export function makeGrokAdapter(grokSettings: GrokSettings, options?: GrokAdapte
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
13 changes: 13 additions & 0 deletions apps/server/src/provider/Layers/JcodeAdapter.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ import type * as AcpSessionRuntime from "../acp/AcpSessionRuntime.ts";
import {
makeAcpAssistantItemEvent,
makeAcpContentDeltaEvent,
makeAcpTokenUsageEvent,
makeAcpPlanUpdatedEvent,
makeAcpRequestOpenedEvent,
makeAcpRequestResolvedEvent,
Expand DownExpand Up@@ -924,6 +925,18 @@ export function makeJcodeAdapter(jcodeSettings: JcodeSettings, options?: JcodeAd
}),
);
return;
case "TokenUsageUpdated":
yield* offerRuntimeEvent(
makeAcpTokenUsageEvent({
stamp,
provider: PROVIDER,
threadId: ctx.threadId,
turnId: notificationTurnId,
usage: event.usage,
rawPayload: event.rawPayload,
}),
);
return;
}
}),
),
Expand Down
26 changes: 26 additions & 0 deletions apps/server/src/provider/acp/AcpCoreRuntimeEvents.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@ import {
type ProviderRuntimeEvent,
type RuntimeRequestId,
type ThreadId,
type ThreadTokenUsageSnapshot,
type ToolLifecycleItemType,
type TurnId,
} from "@t3tools/contracts";
Expand DownExpand Up@@ -240,3 +241,28 @@ export function makeAcpContentDeltaEvent(input: {
},
};
}

export function makeAcpTokenUsageEvent(input: {
readonly stamp: AcpEventStamp;
readonly provider: ProviderDriverKind;
readonly threadId: ThreadId;
readonly turnId: TurnId | undefined;
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
}): ProviderRuntimeEvent {
return {
type: "thread.token-usage.updated",
...input.stamp,
provider: input.provider,
threadId: input.threadId,
turnId: input.turnId,
payload: {
usage: input.usage,
},
raw: {
source: "acp.jsonrpc",
method: "session/update",
payload: input.rawPayload,
},
};
}
16 changes: 14 additions & 2 deletions apps/server/src/provider/acp/AcpRuntimeModel.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,9 @@ import * as Option from "effect/Option";
import * as Ref from "effect/Ref";
import type * as EffectAcpSchema from "effect-acp/schema";
import { deriveToolActivityPresentation } from "@t3tools/shared/toolActivity";
import type { ToolLifecycleItemType } from "@t3tools/contracts";
import type { ThreadTokenUsageSnapshot, ToolLifecycleItemType } from "@t3tools/contracts";

import { tokenUsageEventFromAcpSessionUpdate } from "./acpTokenUsage.ts";

function isRecord(value: unknown): value is Record<string, unknown> {
return typeof value === "object" && value !== null && !Array.isArray(value);
Expand DownExpand Up@@ -108,6 +110,11 @@ export type AcpParsedSessionEvent =
readonly itemId?: string;
readonly text: string;
readonly rawPayload: unknown;
}
| {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

type AcpSessionSetupResponse =
Expand DownExpand Up@@ -823,8 +830,13 @@ export function parseSessionUpdateEvent(params: EffectAcpSchema.SessionNotificat
}
break;
}
default:
default: {
const tokenUsage = tokenUsageEventFromAcpSessionUpdate(params);
if (tokenUsage) {
events.push(tokenUsage);
}
break;
}
}

return { ...(modeId !== undefined ? { modeId } : {}), events };
Expand Down
5 changes: 5 additions & 0 deletions apps/server/src/provider/acp/AcpSessionRuntime.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,6 +21,7 @@ import type * as EffectAcpSchema from "effect-acp/schema";
import type * as EffectAcpProtocol from "effect-acp/protocol";
import { resolveSpawnCommand } from "@t3tools/shared/shell";

import { tokenUsageEventFromAcpPromptResponse } from "./acpTokenUsage.ts";
import {
collectSessionConfigOptionValues,
decideToolCallUpdateEmission,
Expand DownExpand Up@@ -772,6 +773,10 @@ export const make = (
assistantSegmentRef,
}),
),
Effect.tap((result) => {
const event = tokenUsageEventFromAcpPromptResponse(result);
return event ? Queue.offer(eventQueue, event) : Effect.void;
}),
);
}),
),
Expand Down
80 changes: 80 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.test.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
import { describe, expect, it } from "vite-plus/test";

import { parseSessionUpdateEvent } from "./AcpRuntimeModel.ts";
import {
snapshotFromAcpPromptUsage,
snapshotFromAcpUsageUpdate,
tokenUsageEventFromAcpPromptResponse,
tokenUsageEventFromAcpSessionUpdate,
} from "./acpTokenUsage.ts";

describe("acpTokenUsage", () => {
it("maps usage_update into a context-window snapshot the chat can render", () => {
expect(snapshotFromAcpUsageUpdate({ used: 12_400, size: 200_000 })).toEqual({
usedTokens: 12_400,
lastUsedTokens: 12_400,
maxTokens: 200_000,
});
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
})?._tag,
).toBe("TokenUsageUpdated");
expect(
parseSessionUpdateEvent({
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
}).events,
).toEqual([
{
_tag: "TokenUsageUpdated",
usage: { usedTokens: 12_400, lastUsedTokens: 12_400, maxTokens: 200_000 },
rawPayload: {
sessionId: "session-1",
update: { sessionUpdate: "usage_update", used: 12_400, size: 200_000 },
},
},
]);
});

it("maps prompt usage into last-turn token counts", () => {
expect(
snapshotFromAcpPromptUsage({
inputTokens: 800,
outputTokens: 200,
totalTokens: 1_050,
cachedReadTokens: 50,
thoughtTokens: 0,
}),
).toEqual({
usedTokens: 1_050,
lastUsedTokens: 1_050,
inputTokens: 800,
lastInputTokens: 800,
outputTokens: 200,
lastOutputTokens: 200,
cachedInputTokens: 50,
lastCachedInputTokens: 50,
});
expect(
tokenUsageEventFromAcpPromptResponse({
stopReason: "end_turn",
usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 },
})?.usage.lastUsedTokens,
).toBe(15);
});

it("ignores empty usage payloads", () => {
expect(snapshotFromAcpUsageUpdate({ used: 0, size: 200_000 })).toBeUndefined();
expect(
snapshotFromAcpPromptUsage({ inputTokens: 0, outputTokens: 0, totalTokens: 0 }),
).toBeUndefined();
expect(
tokenUsageEventFromAcpSessionUpdate({
sessionId: "session-1",
update: { sessionUpdate: "agent_message_chunk", content: { type: "text", text: "hi" } },
}),
).toBeUndefined();
});
});
90 changes: 90 additions & 0 deletions apps/server/src/provider/acp/acpTokenUsage.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
import type { ThreadTokenUsageSnapshot } from "@t3tools/contracts";
import type * as EffectAcpSchema from "effect-acp/schema";

export type AcpTokenUsageSessionEvent = {
readonly _tag: "TokenUsageUpdated";
readonly usage: ThreadTokenUsageSnapshot;
readonly rawPayload: unknown;
};

function asCount(value: unknown): number | undefined {
return typeof value === "number" && Number.isFinite(value) && value >= 0
? Math.trunc(value)
: undefined;
}

export function snapshotFromAcpUsageUpdate(update: {
readonly used: number;
readonly size: number;
}): ThreadTokenUsageSnapshot | undefined {
const usedTokens = asCount(update.used);
if (usedTokens === undefined || usedTokens <= 0) {
return undefined;
}
const maxTokens = asCount(update.size);
return {
usedTokens,
lastUsedTokens: usedTokens,
...(maxTokens !== undefined && maxTokens > 0 ? { maxTokens } : {}),
};
}

export function snapshotFromAcpPromptUsage(
usage: EffectAcpSchema.Usage | null | undefined,
): ThreadTokenUsageSnapshot | undefined {
if (!usage) {
return undefined;
}
const inputTokens = asCount(usage.inputTokens);
const outputTokens = asCount(usage.outputTokens);
const totalTokens = asCount(usage.totalTokens);
const lastUsedTokens =
totalTokens !== undefined && totalTokens > 0
? totalTokens
: (inputTokens ?? 0) + (outputTokens ?? 0);
if (lastUsedTokens <= 0) {
return undefined;
}
const cachedInputTokens = asCount(usage.cachedReadTokens ?? undefined);
const reasoningOutputTokens = asCount(usage.thoughtTokens ?? undefined);
return {
usedTokens: lastUsedTokens,
lastUsedTokens,
...(inputTokens !== undefined && inputTokens > 0
? { inputTokens, lastInputTokens: inputTokens }
: {}),
...(outputTokens !== undefined && outputTokens > 0
? { outputTokens, lastOutputTokens: outputTokens }
: {}),
...(cachedInputTokens !== undefined && cachedInputTokens > 0
? { cachedInputTokens, lastCachedInputTokens: cachedInputTokens }
: {}),
...(reasoningOutputTokens !== undefined && reasoningOutputTokens > 0
? { reasoningOutputTokens, lastReasoningOutputTokens: reasoningOutputTokens }
: {}),
};
}

export function tokenUsageEventFromAcpSessionUpdate(
params: EffectAcpSchema.SessionNotification,
): AcpTokenUsageSessionEvent | undefined {
const update = params.update;
if (update.sessionUpdate !== "usage_update") {
return undefined;
}
const usage = snapshotFromAcpUsageUpdate(update);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: params };
}

export function tokenUsageEventFromAcpPromptResponse(
result: EffectAcpSchema.PromptResponse,
): AcpTokenUsageSessionEvent | undefined {
const usage = snapshotFromAcpPromptUsage(result.usage);
if (!usage) {
return undefined;
}
return { _tag: "TokenUsageUpdated", usage, rawPayload: result };
}
Loading