codna 0.1.44__tar.gz → 0.1.46__tar.gz

{codna-0.1.44 → codna-0.1.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codna
-Version: 0.1.44
+Version: 0.1.46
 Summary: Local-first repo intelligence and agent fixing for Codna.
 Author: Thyn
 Maintainer: Thyn

{codna-0.1.44 → codna-0.1.46}/codna/__init__.py

@@ -5,4 +5,4 @@ This package is the `codna` CLI. Users never touch "algenta" directly — the en
 is an internal dependency reached over HTTP.
 """
 
-__version__ = "0.1.44"
+__version__ = "0.1.46"

{codna-0.1.44 → codna-0.1.46}/codna/agent-core/run-server.bundle.mjs

@@ -180875,8 +180875,8 @@ var require_jiti = __commonJS((exports, module) => {
           return { path: n11, config: ve4(n11, i11) };
         }
         return (a11 = Fe4(e11, t11, i11)) != null ? a11 : null;
-      }, "getTsconfig"), qe3 = /\*/g, Ge4 = r7((e11, t11) => {
-        const i11 = e11.match(qe3);
+      }, "getTsconfig"), qe4 = /\*/g, Ge4 = r7((e11, t11) => {
+        const i11 = e11.match(qe4);
         if (i11 && i11.length > 1)
           throw new Error(t11);
       }, "assertStarCount"), Ke4 = r7((e11) => {
@@ -183271,9 +183271,9 @@ Defaulting to 2020, but this will stop working in the future.`)), t11.ecmaVersio
       acorn_Parser.acorn = { Parser: acorn_Parser, version: "8.16.0", defaultOptions: X10, Position: acorn_Position, SourceLocation: acorn_SourceLocation, getLineInfo, Node: acorn_Node, TokenType: acorn_TokenType, tokTypes: O9, keywordTypes: N10, TokContext: acorn_TokContext, tokContexts: fe4, isIdentifierChar, isIdentifierStart, Token: acorn_Token, isNewLine, lineBreak: j10, lineBreakG: F10, nonASCIIwhitespace: B5 };
       var Be4 = __webpack_require__("node:module"), $e4 = __webpack_require__("node:fs");
       String.fromCharCode;
-      const qe3 = /\/$|\/\?|\/#/, Ge4 = /^\.?\//;
+      const qe4 = /\/$|\/\?|\/#/, Ge4 = /^\.?\//;
       function hasTrailingSlash(e11 = "", t11) {
-        return t11 ? qe3.test(e11) : e11.endsWith("/");
+        return t11 ? qe4.test(e11) : e11.endsWith("/");
       }
       function withTrailingSlash(e11 = "", t11) {
         if (!t11)
@@ -227289,6 +227289,9 @@ function Wn2() {
   let e7 = Array.from(vi2.keys()), t2 = Array.from(Qe3.keys()).filter((n2) => !vi2.has(n2));
   return [...e7, ...t2];
 }
+function qe3(e7) {
+  return Ve3(e7);
+}
 var jg2 = new Proxy({}, { get(e7, t2) {
   return Ve3(t2);
 }, has(e7, t2) {
@@ -228345,12 +228348,13 @@ class AgentRuntime {
     return true;
   }
   async updateUsage(usage) {
+    const totalCost = this.state.usage.totalCost !== undefined || usage.totalCost !== undefined ? (this.state.usage.totalCost ?? 0) + (usage.totalCost ?? 0) : undefined;
     this.state.usage = {
       inputTokens: this.state.usage.inputTokens + (usage.inputTokens ?? 0),
       outputTokens: this.state.usage.outputTokens + (usage.outputTokens ?? 0),
       cacheReadTokens: this.state.usage.cacheReadTokens + (usage.cacheReadTokens ?? 0),
       cacheWriteTokens: this.state.usage.cacheWriteTokens + (usage.cacheWriteTokens ?? 0),
-      totalCost: (this.state.usage.totalCost ?? 0) + (usage.totalCost ?? 0)
+      ...totalCost !== undefined ? { totalCost } : {}
     };
     await this.emit({
       type: "usage-updated",
@@ -257531,6 +257535,72 @@ async function enrichPayloadWithTelys(payload, rootDir) {
   };
 }
 
+// agent-core/vendor/cline/algenta/usage-cost.ts
+function sumUsage(a10, b11) {
+  const totalCost = a10.totalCost !== undefined || b11.totalCost !== undefined ? (a10.totalCost ?? 0) + (b11.totalCost ?? 0) : undefined;
+  return {
+    inputTokens: (a10.inputTokens ?? 0) + (b11.inputTokens ?? 0),
+    outputTokens: (a10.outputTokens ?? 0) + (b11.outputTokens ?? 0),
+    cacheReadTokens: (a10.cacheReadTokens ?? 0) + (b11.cacheReadTokens ?? 0),
+    cacheWriteTokens: (a10.cacheWriteTokens ?? 0) + (b11.cacheWriteTokens ?? 0),
+    ...totalCost !== undefined ? { totalCost } : {}
+  };
+}
+function usageWithCatalogCost(usage, providerId, modelId) {
+  if (typeof usage.totalCost === "number" && Number.isFinite(usage.totalCost) && usage.totalCost > 0) {
+    return usage;
+  }
+  const catalogCost = calculatedCatalogCost(usage, providerId, modelId);
+  if (catalogCost === undefined)
+    return usage;
+  return { ...usage, totalCost: catalogCost };
+}
+function positiveTokenCount(usage) {
+  return Math.max(0, usage.inputTokens ?? 0) + Math.max(0, usage.outputTokens ?? 0) + Math.max(0, usage.cacheReadTokens ?? 0) + Math.max(0, usage.cacheWriteTokens ?? 0);
+}
+function finitePrice(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : undefined;
+}
+function catalogPricing(providerId, modelId) {
+  if (!providerId || !modelId)
+    return;
+  const shortModelId = modelId.split("/").at(-1) ?? modelId;
+  for (const candidateProviderId of providerCatalogCandidates(providerId, modelId)) {
+    const collection = qe3(candidateProviderId);
+    const model = collection?.models[modelId] ?? collection?.models[shortModelId];
+    if (model?.pricing)
+      return model.pricing;
+  }
+  return;
+}
+function providerCatalogCandidates(providerId, modelId) {
+  const providers = [providerId];
+  const shortModelId = modelId.split("/").at(-1) ?? modelId;
+  if (providerId === "openai-compatible" && (modelId.startsWith("openai/") || shortModelId.startsWith("gpt-"))) {
+    providers.push("openai-native", "openai-codex");
+  }
+  if (modelId.startsWith("anthropic/"))
+    providers.push("anthropic");
+  if (modelId.startsWith("google/") || modelId.startsWith("gemini-")) {
+    providers.push("gemini", "google");
+  }
+  return [...new Set(providers)];
+}
+function calculatedCatalogCost(usage, providerId, modelId) {
+  if (positiveTokenCount(usage) === 0)
+    return;
+  const pricing = catalogPricing(providerId, modelId);
+  const inputPrice = finitePrice(pricing?.input);
+  const outputPrice = finitePrice(pricing?.output);
+  if (inputPrice === undefined || outputPrice === undefined)
+    return;
+  const cacheReadPrice = finitePrice(pricing?.cacheRead) ?? 0;
+  const cacheWritePrice = finitePrice(pricing?.cacheWrite) ?? inputPrice * 1.25;
+  const inputTokens = Math.max(0, (usage.inputTokens ?? 0) - (usage.cacheReadTokens ?? 0) - (usage.cacheWriteTokens ?? 0));
+  const cost = inputTokens / 1e6 * inputPrice + Math.max(0, usage.outputTokens ?? 0) / 1e6 * outputPrice + Math.max(0, usage.cacheReadTokens ?? 0) / 1e6 * cacheReadPrice + Math.max(0, usage.cacheWriteTokens ?? 0) / 1e6 * cacheWritePrice;
+  return Number.isFinite(cost) ? cost : undefined;
+}
+
 // agent-core/vendor/cline/algenta/run-server.ts
 var PORT = Number(process.env.AGENT_CORE_PORT || process.argv[2] || 0);
 var BIND_HOST = process.env.AGENT_CORE_HOST || HOST;
@@ -257558,15 +257628,6 @@ function appendTelysEvent(session, event) {
     ...event
   });
 }
-function sumUsage(a10, b11) {
-  return {
-    inputTokens: (a10.inputTokens ?? 0) + (b11.inputTokens ?? 0),
-    outputTokens: (a10.outputTokens ?? 0) + (b11.outputTokens ?? 0),
-    cacheReadTokens: (a10.cacheReadTokens ?? 0) + (b11.cacheReadTokens ?? 0),
-    cacheWriteTokens: (a10.cacheWriteTokens ?? 0) + (b11.cacheWriteTokens ?? 0),
-    totalCost: (a10.totalCost ?? 0) + (b11.totalCost ?? 0)
-  };
-}
 async function handleGetProofArtifacts(response, runId) {
   let bundle2;
   try {
@@ -257674,9 +257735,10 @@ async function handleRunCompatibility(request2, response) {
       runSession = session2;
     }
     const baseUsage = runSession.lastUsage ?? {};
-    const finalUsage = priorUsage ? sumUsage(priorUsage, baseUsage) : baseUsage;
+    const summedUsage = priorUsage ? sumUsage(priorUsage, baseUsage) : baseUsage;
     const finalResult = runSession.lastResult ?? {};
     const baseTurns = typeof finalResult.iterations === "number" ? finalResult.iterations : 0;
+    const finalUsage = usageWithCatalogCost(summedUsage, runSession.provider || null, runSession.model || null);
     const finalFrame = {
       type: "final",
       status: legacyStatusForTerminalState(runSession.terminalState ?? "failed"),

{codna-0.1.44 → codna-0.1.46}/codna/agent-core/vendor/cline/algenta/run-server.ts

@@ -26,6 +26,7 @@ import { createServerState } from "./server/state";
 import { appendSessionEvent, createIdempotencyKey, optionalString, sessionOwnerForRequest, requiredString } from "./server/utils";
 import { enrichPayloadWithTelys, type TelysLocalizeEvent } from "./telys-localize";
 import { degradedProofRuntimeContext, loadProofRuntimeContext, proofRunDir, readProofArtifacts, repoRootFromImportMeta } from "./proofs";
+import { sumUsage, usageWithCatalogCost, type AgentUsage } from "./usage-cost";
 
 const PORT = Number(process.env.AGENT_CORE_PORT || process.argv[2] || 0);
 // Bind loopback by default (safe for local dev); containers set AGENT_CORE_HOST=0.0.0.0
@@ -64,14 +65,6 @@ const EXECUTION_CONTEXT: ExecutionContext = {
 // only kicks in on a miss, so the common case keeps the fast path's speed.
 const FALLBACK_TOOL_PROFILE = process.env.AGENT_CORE_FALLBACK_TOOL_PROFILE || "explore_and_fix";
 
-type AgentUsage = {
-	inputTokens?: number;
-	outputTokens?: number;
-	cacheReadTokens?: number;
-	cacheWriteTokens?: number;
-	totalCost?: number;
-};
-
 function appendTelysEvent(session: SessionRecord, event: TelysLocalizeEvent | null): void {
 	if (!event) return;
 	appendSessionEvent(session, "telys.localize", {
@@ -80,17 +73,6 @@ function appendTelysEvent(session: SessionRecord, event: TelysLocalizeEvent | nu
 	});
 }
 
-/** Sum usage across Tier-1 + Tier-2 so reported tokens/cost reflect the WHOLE run, not just Tier-2. */
-function sumUsage(a: AgentUsage, b: AgentUsage): AgentUsage {
-	return {
-		inputTokens: (a.inputTokens ?? 0) + (b.inputTokens ?? 0),
-		outputTokens: (a.outputTokens ?? 0) + (b.outputTokens ?? 0),
-		cacheReadTokens: (a.cacheReadTokens ?? 0) + (b.cacheReadTokens ?? 0),
-		cacheWriteTokens: (a.cacheWriteTokens ?? 0) + (b.cacheWriteTokens ?? 0),
-		totalCost: (a.totalCost ?? 0) + (b.totalCost ?? 0),
-	};
-}
-
 // B9: the canonical proof artifacts (already secret-redacted by finalizeSessionArtifacts) are
 // written to <rootDir>/build/proofs/cline/runs/<runId>/ on this node's disk. This read-only,
 // auth-gated endpoint serves them so the (Python) object-store abstraction can mirror them to
@@ -228,9 +210,14 @@ async function handleRunCompatibility(
 		}
 
 		const baseUsage = (runSession.lastUsage ?? {}) as AgentUsage;
-		const finalUsage = priorUsage ? sumUsage(priorUsage, baseUsage) : baseUsage;
+		const summedUsage = priorUsage ? sumUsage(priorUsage, baseUsage) : baseUsage;
 		const finalResult = runSession.lastResult ?? {};
 		const baseTurns = typeof finalResult.iterations === "number" ? finalResult.iterations : 0;
+		const finalUsage = usageWithCatalogCost(
+			summedUsage,
+			runSession.provider || null,
+			runSession.model || null,
+		);
 		const finalFrame = {
 			type: "final",
 			status: legacyStatusForTerminalState(runSession.terminalState ?? "failed"),

codna-0.1.46/codna/agent-core/vendor/cline/algenta/usage-cost.test.ts

@@ -0,0 +1,71 @@
+import { expect, test } from "bun:test";
+import { sumUsage, usageWithCatalogCost } from "./usage-cost";
+
+test("sumUsage does not synthesize zero cost when both inputs omit cost", () => {
+	expect(
+		sumUsage(
+			{ inputTokens: 100, outputTokens: 10 },
+			{ inputTokens: 200, outputTokens: 20 },
+		),
+	).toEqual({
+		inputTokens: 300,
+		outputTokens: 30,
+		cacheReadTokens: 0,
+		cacheWriteTokens: 0,
+	});
+});
+
+test("sumUsage preserves real reported cost", () => {
+	expect(
+		sumUsage(
+			{ inputTokens: 100, outputTokens: 10, totalCost: 0.01 },
+			{ inputTokens: 200, outputTokens: 20, totalCost: 0.02 },
+		).totalCost,
+	).toBeCloseTo(0.03);
+});
+
+test("usageWithCatalogCost preserves positive provider cost", () => {
+	expect(
+		usageWithCatalogCost(
+			{ inputTokens: 1000, outputTokens: 100, totalCost: 0.5 },
+			"openai-compatible",
+			"gpt-5.4",
+		).totalCost,
+	).toBe(0.5);
+});
+
+test("usageWithCatalogCost derives gpt-5.4 cost when BYOK reports zero", () => {
+	const usage = usageWithCatalogCost(
+		{
+			inputTokens: 3850,
+			outputTokens: 84,
+			cacheReadTokens: 1664,
+			cacheWriteTokens: 0,
+			totalCost: 0,
+		},
+		"openai-compatible",
+		"gpt-5.4",
+	);
+
+	expect(usage.totalCost).toBeCloseTo(0.007141);
+});
+
+test("usageWithCatalogCost leaves unknown pricing untouched", () => {
+	expect(
+		usageWithCatalogCost(
+			{ inputTokens: 1000, outputTokens: 100, totalCost: 0 },
+			"unknown-provider",
+			"unknown-model",
+		).totalCost,
+	).toBe(0);
+});
+
+test("usageWithCatalogCost does not add cost when tokens are absent", () => {
+	expect(
+		usageWithCatalogCost(
+			{ inputTokens: 0, outputTokens: 0 },
+			"openai-compatible",
+			"gpt-5.4",
+		).totalCost,
+	).toBeUndefined();
+});

codna-0.1.46/codna/agent-core/vendor/cline/algenta/usage-cost.ts

@@ -0,0 +1,124 @@
+import { getProviderCollectionSync } from "@cline/llms";
+
+export type AgentUsage = {
+	inputTokens?: number;
+	outputTokens?: number;
+	cacheReadTokens?: number;
+	cacheWriteTokens?: number;
+	totalCost?: number;
+};
+
+type CatalogPricing = {
+	input?: number;
+	output?: number;
+	cacheRead?: number;
+	cacheWrite?: number;
+};
+
+export function sumUsage(a: AgentUsage, b: AgentUsage): AgentUsage {
+	const totalCost =
+		a.totalCost !== undefined || b.totalCost !== undefined
+			? (a.totalCost ?? 0) + (b.totalCost ?? 0)
+			: undefined;
+	return {
+		inputTokens: (a.inputTokens ?? 0) + (b.inputTokens ?? 0),
+		outputTokens: (a.outputTokens ?? 0) + (b.outputTokens ?? 0),
+		cacheReadTokens: (a.cacheReadTokens ?? 0) + (b.cacheReadTokens ?? 0),
+		cacheWriteTokens: (a.cacheWriteTokens ?? 0) + (b.cacheWriteTokens ?? 0),
+		...(totalCost !== undefined ? { totalCost } : {}),
+	};
+}
+
+export function usageWithCatalogCost(
+	usage: AgentUsage,
+	providerId: string | null | undefined,
+	modelId: string | null | undefined,
+): AgentUsage {
+	if (
+		typeof usage.totalCost === "number" &&
+		Number.isFinite(usage.totalCost) &&
+		usage.totalCost > 0
+	) {
+		return usage;
+	}
+	const catalogCost = calculatedCatalogCost(usage, providerId, modelId);
+	if (catalogCost === undefined) return usage;
+	return { ...usage, totalCost: catalogCost };
+}
+
+function positiveTokenCount(usage: AgentUsage): number {
+	return (
+		Math.max(0, usage.inputTokens ?? 0) +
+		Math.max(0, usage.outputTokens ?? 0) +
+		Math.max(0, usage.cacheReadTokens ?? 0) +
+		Math.max(0, usage.cacheWriteTokens ?? 0)
+	);
+}
+
+function finitePrice(value: unknown): number | undefined {
+	return typeof value === "number" && Number.isFinite(value) && value >= 0
+		? value
+		: undefined;
+}
+
+function catalogPricing(
+	providerId: string | null | undefined,
+	modelId: string | null | undefined,
+): CatalogPricing | undefined {
+	if (!providerId || !modelId) return undefined;
+	const shortModelId = modelId.split("/").at(-1) ?? modelId;
+	for (const candidateProviderId of providerCatalogCandidates(
+		providerId,
+		modelId,
+	)) {
+		const collection = getProviderCollectionSync(candidateProviderId);
+		const model =
+			collection?.models[modelId] ?? collection?.models[shortModelId];
+		if (model?.pricing) return model.pricing;
+	}
+	return undefined;
+}
+
+function providerCatalogCandidates(providerId: string, modelId: string): string[] {
+	const providers = [providerId];
+	const shortModelId = modelId.split("/").at(-1) ?? modelId;
+	if (
+		providerId === "openai-compatible" &&
+		(modelId.startsWith("openai/") || shortModelId.startsWith("gpt-"))
+	) {
+		providers.push("openai-native", "openai-codex");
+	}
+	if (modelId.startsWith("anthropic/")) providers.push("anthropic");
+	if (modelId.startsWith("google/") || modelId.startsWith("gemini-")) {
+		providers.push("gemini", "google");
+	}
+	return [...new Set(providers)];
+}
+
+function calculatedCatalogCost(
+	usage: AgentUsage,
+	providerId: string | null | undefined,
+	modelId: string | null | undefined,
+): number | undefined {
+	if (positiveTokenCount(usage) === 0) return undefined;
+	const pricing = catalogPricing(providerId, modelId);
+	const inputPrice = finitePrice(pricing?.input);
+	const outputPrice = finitePrice(pricing?.output);
+	if (inputPrice === undefined || outputPrice === undefined) return undefined;
+	const cacheReadPrice = finitePrice(pricing?.cacheRead) ?? 0;
+	const cacheWritePrice = finitePrice(pricing?.cacheWrite) ?? inputPrice * 1.25;
+	const inputTokens = Math.max(
+		0,
+		(usage.inputTokens ?? 0) -
+			(usage.cacheReadTokens ?? 0) -
+			(usage.cacheWriteTokens ?? 0),
+	);
+	const cost =
+		(inputTokens / 1_000_000) * inputPrice +
+		(Math.max(0, usage.outputTokens ?? 0) / 1_000_000) * outputPrice +
+		(Math.max(0, usage.cacheReadTokens ?? 0) / 1_000_000) *
+			cacheReadPrice +
+		(Math.max(0, usage.cacheWriteTokens ?? 0) / 1_000_000) *
+			cacheWritePrice;
+	return Number.isFinite(cost) ? cost : undefined;
+}

{codna-0.1.44 → codna-0.1.46}/codna/agent-core/vendor/cline/sdk/packages/agents/src/agent-runtime.test.ts

@@ -1424,4 +1424,40 @@ describe("AgentRuntime", () => {
 			totalCost: 1.0,
 		});
 	});
+
+	it("does not synthesize zero cost when usage events omit cost", async () => {
+		const model = new ScriptedModel([
+			() => [
+				{
+					type: "usage",
+					usage: { inputTokens: 100, outputTokens: 20 },
+				},
+				{ type: "text-delta", text: "first" },
+				{ type: "finish", reason: "stop" },
+			],
+			() => [
+				{
+					type: "usage",
+					usage: { inputTokens: 200, outputTokens: 40, totalCost: 1.0 },
+				},
+				{ type: "text-delta", text: "second" },
+				{ type: "finish", reason: "stop" },
+			],
+		]);
+		const runtime = new AgentRuntime({ model });
+
+		const first = await runtime.run("Turn 1");
+		expect(first.usage).toMatchObject({
+			inputTokens: 100,
+			outputTokens: 20,
+		});
+		expect(first.usage.totalCost).toBeUndefined();
+
+		const second = await runtime.continue("Turn 2");
+		expect(second.usage).toMatchObject({
+			inputTokens: 200,
+			outputTokens: 40,
+			totalCost: 1.0,
+		});
+	});
 });

{codna-0.1.44 → codna-0.1.46}/codna/agent-core/vendor/cline/sdk/packages/agents/src/agent-runtime.ts

@@ -1036,6 +1036,10 @@ export class AgentRuntime {
 	}
 
 	private async updateUsage(usage: Partial<AgentUsage>): Promise<void> {
+		const totalCost =
+			this.state.usage.totalCost !== undefined || usage.totalCost !== undefined
+				? (this.state.usage.totalCost ?? 0) + (usage.totalCost ?? 0)
+				: undefined;
 		this.state.usage = {
 			inputTokens: this.state.usage.inputTokens + (usage.inputTokens ?? 0),
 			outputTokens: this.state.usage.outputTokens + (usage.outputTokens ?? 0),
@@ -1043,7 +1047,7 @@ export class AgentRuntime {
 				this.state.usage.cacheReadTokens + (usage.cacheReadTokens ?? 0),
 			cacheWriteTokens:
 				this.state.usage.cacheWriteTokens + (usage.cacheWriteTokens ?? 0),
-			totalCost: (this.state.usage.totalCost ?? 0) + (usage.totalCost ?? 0),
+			...(totalCost !== undefined ? { totalCost } : {}),
 		};
 		await this.emit({
 			type: "usage-updated",