@danypops/jittor 0.16.2 → 0.17.0

package/src/daemon.ts

@@ -1,27 +1,37 @@
+import { join } from "node:path";
 import { type RunningDaemon, startDaemon as startDaemonKit } from "@danypops/vehicle-server/daemon";
-import { ArtificialAnalysisDirectSource } from "./adapters/artificial-analysis-direct-source.ts";
-import { LmArenaHfSource } from "./adapters/lmarena-hf-source.ts";
-import { MetricBenchmarkStore } from "./adapters/metric-benchmark-store.ts";
-import { OpenRouterBenchmarkSource } from "./adapters/openrouter-benchmark-source.ts";
-import { OpenRouterDesignArenaSource } from "./adapters/openrouter-design-arena-source.ts";
-import { SQLiteMetricStore } from "./adapters/sqlite-metric-store.ts";
-import { SQLiteSessionIdentityStore } from "./adapters/sqlite-session-identity-store.ts";
-import { DEFAULT_POLICY, UNCONFIGURED_ROUTE } from "./config.ts";
+import { ArtificialAnalysisDirectSource } from "./artificial-analysis/benchmark-source.ts";
+import { CodexTelemetrySource } from "./codex/source.ts";
 import { MAINTENANCE_INTERVAL_MS, TELEMETRY_POLL_INTERVAL_MS } from "./constants.ts";
-import { openJittorDb } from "./db.ts";
-import { BenchmarkCatalog } from "./domain/benchmark.ts";
-import { EvidenceModelRanker } from "./domain/model-ranking-service.ts";
+import { createGoogleAdcTokenProvider } from "./google-vertex/auth.ts";
+import { GOOGLE_PUBSUB_READONLY_SCOPE } from "./google-vertex/budget-telemetry.ts";
+import type { GoogleVertexMetricSource } from "./google-vertex/failures.ts";
+import { GoogleVertexBudgetTelemetrySource } from "./google-vertex/source.ts";
+import { LmArenaHfSource } from "./lmarena/benchmark-source.ts";
 import { logEvent, logger } from "./log.ts";
-import type { BenchmarkSource } from "./ports/benchmark-source.ts";
-import type { TelemetrySource } from "./ports/telemetry-source.ts";
-import { createGoogleAdcTokenProvider } from "./providers/google-adc-auth.ts";
-import { GOOGLE_PUBSUB_READONLY_SCOPE } from "./providers/google-vertex-budget.ts";
-import type { GoogleVertexMetricSource } from "./providers/google-vertex-contracts.ts";
-import { CodexTelemetrySource, GoogleVertexBudgetTelemetrySource, OpenRouterTelemetrySource } from "./providers/telemetry-sources.ts";
-import { JittorRouter } from "./router.ts";
-import { createApp, JittorService } from "./service.ts";
-import { SessionIdentity } from "./session-identity-service.ts";
+import type { TelemetrySource } from "./observability/telemetry-source.ts";
+import { HistoricalUsageImporter } from "./observability/usage-import.ts";
+import { OpenRouterBenchmarkSource } from "./openrouter/benchmark-source.ts";
+import { OpenRouterDesignArenaSource } from "./openrouter/design-arena-source.ts";
+import { OpenRouterTelemetrySource } from "./openrouter/source.ts";
+import { BenchmarkCatalog } from "./optimization/model-selection/benchmark.ts";
+import { ModelCatalog, type ModelCatalogSource, ModelsDevCatalogSource } from "./optimization/model-selection/catalog.ts";
+import { MetricModelCatalogStore } from "./optimization/model-selection/catalog-store.ts";
+import { MetricBenchmarkStore } from "./optimization/model-selection/observation-store.ts";
+import { EvidenceModelRanker } from "./optimization/model-selection/ranker.ts";
+import type { BenchmarkSource } from "./optimization/model-selection/source.ts";
+import { DEFAULT_POLICY, UNCONFIGURED_ROUTE } from "./optimization/routing/config.ts";
+import { JittorRouter } from "./optimization/routing/router.ts";
+import { otlpExporterFromEnvironment } from "./otlp/exporter.ts";
+import { PiSessionUsageSource } from "./pi/session-usage-source.ts";
+import { SessionIdentity } from "./sessions/identity.ts";
+import { openJittorDb } from "./sqlite/database.ts";
+import { SQLiteMetricStore } from "./sqlite/metric-store.ts";
+import { SQLiteSessionIdentityStore } from "./sqlite/session-store.ts";
+import { SQLiteUsageImportStore } from "./sqlite/usage-import-store.ts";
 import { ensureAuthToken, type JittorPaths, resolveJittorPaths } from "./state.ts";
+import { DisabledObservationExporter, ExportingMetricStore } from "./telemetry-export/exporter.ts";
+import { createApp, JittorService } from "./vehicle/service.ts";
 
 export type { RunningDaemon } from "@danypops/vehicle-server/daemon";
 
@@ -47,6 +57,11 @@ function googleVertexMetricSource(value: string | undefined): GoogleVertexMetric
 	throw new Error("JITTOR_GOOGLE_VERTEX_BUDGET_SOURCE must be google-vertex or anthropic-vertex");
 }
 
+export function modelCatalogSourceFromEnvironment(env: Record<string, string | undefined> = process.env): ModelCatalogSource | undefined {
+	if (env.JITTOR_MODELS_DEV_CATALOG !== "1") return undefined;
+	return new ModelsDevCatalogSource({ sourceUrl: env.JITTOR_MODELS_DEV_CATALOG_URL });
+}
+
 export function telemetrySourcesFromEnvironment(env: Record<string, string | undefined> = process.env): TelemetrySource[] {
 	const sources: TelemetrySource[] = [];
 	const codexAuthFile = env.JITTOR_CODEX_AUTH_FILE;
@@ -80,13 +95,19 @@ export async function startDaemon(
 ): Promise<RunningDaemon> {
 	const token = ensureAuthToken(paths);
 	const db = openJittorDb(paths.database);
-	const metrics = new SQLiteMetricStore(db);
+	const localMetrics = new SQLiteMetricStore(db);
+	const exporter = otlpExporterFromEnvironment(env) ?? new DisabledObservationExporter();
+	const metrics = new ExportingMetricStore(localMetrics, exporter);
 	const sessionIdentity = new SessionIdentity(new SQLiteSessionIdentityStore(db));
 	const sources = telemetrySourcesFromEnvironment(env);
 	const benchmarkSources = benchmarkSourcesFromEnvironment(env);
 	const benchmarkStore = new MetricBenchmarkStore(metrics);
 	const benchmarks = new BenchmarkCatalog(benchmarkStore, benchmarkSources);
+	const catalogSource = modelCatalogSourceFromEnvironment(env);
+	const catalog = new ModelCatalog(new MetricModelCatalogStore(localMetrics), catalogSource);
 	const modelRanker = new EvidenceModelRanker(benchmarkStore, metrics);
+	const sessionsRoot = env.JITTOR_PI_SESSIONS_DIR ?? join(env.HOME ?? process.env.HOME ?? "", ".pi", "agent", "sessions");
+	const usageImporter = new HistoricalUsageImporter(new PiSessionUsageSource(sessionsRoot), new SQLiteUsageImportStore(db));
 	const router = new JittorRouter({
 		metrics,
 		sources,
@@ -94,7 +115,7 @@ export async function startDaemon(
 		routes: [],
 		currentRoute: UNCONFIGURED_ROUTE,
 	});
-	const service = new JittorService(metrics, router, benchmarks, modelRanker, sessionIdentity);
+	const service = new JittorService(metrics, router, benchmarks, modelRanker, sessionIdentity, undefined, catalog, usageImporter, exporter);
 
 	const daemon = await startDaemonKit({
 		daemonLabel: "Jittor",
@@ -116,6 +137,13 @@ export async function startDaemon(
 					await benchmarks.refresh().catch((error) => reportMaintenanceFailure("benchmark_refresh_failed", error));
 				},
 			},
+			{
+				name: "catalog-refresh",
+				intervalMs: MAINTENANCE_INTERVAL_MS,
+				run: async () => {
+					await catalog.refresh().catch((error) => reportMaintenanceFailure("catalog_refresh_failed", error));
+				},
+			},
 			{
 				name: "telemetry-poll",
 				intervalMs: TELEMETRY_POLL_INTERVAL_MS,
@@ -124,13 +152,15 @@ export async function startDaemon(
 				},
 			},
 		],
-		onShutdown: () => {
+		onShutdown: async () => {
+			await exporter.shutdown();
 			service.close();
 		},
 	});
 
 	if (sources.length > 0) router.poll().catch((error) => reportMaintenanceFailure("telemetry_poll_failed", error));
 	if (benchmarkSources.length > 0) benchmarks.refresh().catch((error) => reportMaintenanceFailure("benchmark_refresh_failed", error));
+	if (catalogSource) catalog.refresh().catch((error) => reportMaintenanceFailure("catalog_refresh_failed", error));
 
 	return daemon;
 }

package/src/{providers/google-vertex-budget-contracts.ts → google-vertex/budget-contracts.ts}

@@ -3,9 +3,9 @@ import {
 	GOOGLE_VERTEX_BUDGET_DISPLAY_NAME_MAX_CHARACTERS,
 	MILLISECONDS_PER_SECOND,
 } from "../constants.ts";
-import type { MetricObservation } from "../domain/metric.ts";
-import type { BudgetWindow } from "../policy.ts";
-import type { GoogleVertexMetricSource } from "./google-vertex-contracts.ts";
+import type { BudgetWindow } from "../observability/budget.ts";
+import type { MetricObservation } from "../observability/metric.ts";
+import type { GoogleVertexMetricSource } from "./failures.ts";
 
 /**
  * Cloud Billing's programmatic budget notification schema (Pub/Sub attributes + base64 JSON data

package/src/{providers/google-vertex-budget.ts → google-vertex/budget-telemetry.ts}

@@ -1,14 +1,14 @@
 import { GOOGLE_VERTEX_BUDGET_MAX_MESSAGES_PER_PULL } from "../constants.ts";
-import type { MetricObservation } from "../domain/metric.ts";
-import type { BudgetWindow } from "../policy.ts";
-import type { GoogleAdcTokenProvider } from "./google-adc-auth.ts";
+import type { BudgetWindow } from "../observability/budget.ts";
+import type { MetricObservation } from "../observability/metric.ts";
+import type { GoogleAdcTokenProvider } from "./auth.ts";
 import {
 	type GoogleVertexBudgetNotification,
 	googleVertexBudgetMetrics,
 	googleVertexBudgetWindow,
 	parseGoogleVertexBudgetNotification,
-} from "./google-vertex-budget-contracts.ts";
-import type { GoogleVertexMetricSource } from "./google-vertex-contracts.ts";
+} from "./budget-contracts.ts";
+import type { GoogleVertexMetricSource } from "./failures.ts";
 
 export {
 	type GoogleVertexBudgetAmountType,
@@ -16,7 +16,7 @@ export {
 	googleVertexBudgetMetrics,
 	googleVertexBudgetWindow,
 	parseGoogleVertexBudgetNotification,
-} from "./google-vertex-budget-contracts.ts";
+} from "./budget-contracts.ts";
 
 const PUBSUB_BASE_URL = "https://pubsub.googleapis.com/v1";
 export const GOOGLE_PUBSUB_READONLY_SCOPE = "https://www.googleapis.com/auth/pubsub";

package/src/{providers/google-vertex-contracts.ts → google-vertex/failures.ts}

@@ -1,5 +1,5 @@
 import { MILLISECONDS_PER_MINUTE, MILLISECONDS_PER_SECOND } from "../constants.ts";
-import type { MetricObservation } from "../domain/metric.ts";
+import type { MetricObservation } from "../observability/metric.ts";
 
 /**
  * Google Vertex AI has no documented per-response rate-limit or remaining-quota header, and no

package/src/google-vertex/source.ts

@@ -0,0 +1,35 @@
+import type { TelemetryBatch, TelemetrySource } from "../observability/telemetry-source.ts";
+import type { GoogleAdcTokenProvider } from "./auth.ts";
+import { GoogleVertexBudgetTelemetryAdapter, type GoogleVertexBudgetTransport } from "./budget-telemetry.ts";
+import type { GoogleVertexMetricSource } from "./failures.ts";
+
+/**
+ * Optional because project budget notification setup happens outside Jittor; its absence cannot
+ * block unrelated routes.
+ */
+export class GoogleVertexBudgetTelemetrySource implements TelemetrySource {
+	readonly id: string;
+	readonly provider: GoogleVertexMetricSource;
+	readonly required = false;
+
+	private readonly adapter: GoogleVertexBudgetTelemetryAdapter;
+
+	constructor(
+		subscription: string,
+		tokenProvider: GoogleAdcTokenProvider,
+		private readonly clock: () => number = Date.now,
+		transport: GoogleVertexBudgetTransport = fetch,
+		source: GoogleVertexMetricSource = "google-vertex",
+	) {
+		this.id = `google-vertex-budget:${source}`;
+		this.provider = source;
+		this.adapter = new GoogleVertexBudgetTelemetryAdapter(subscription, tokenProvider, transport, source);
+	}
+
+	async poll(): Promise<TelemetryBatch> {
+		const observedAt = this.clock();
+		const snapshot = await this.adapter.pull(observedAt);
+		if (!snapshot) return { observedAt, metrics: [], windows: [] };
+		return { observedAt, metrics: snapshot.metrics, windows: snapshot.window ? [snapshot.window] : [] };
+	}
+}

package/src/index.ts

@@ -1,19 +1,38 @@
 export {
-	connectJittorClient,
-	type FetchTransport,
-	JittorClient,
-} from "./client.ts";
+	type AnthropicMetricSource,
+	type AnthropicRateLimitSnapshot,
+	type AnthropicRateLimitWindow,
+	hasAnthropicRateLimitHeaders,
+	parseAnthropicRateLimitHeaders,
+} from "./anthropic/rate-limits.ts";
+export { parseCodexRateLimitHeaders } from "./codex/telemetry.ts";
 export * from "./constants.ts";
 export {
-	type CodexFailure,
-	type CodexFailureKind,
-	type CodexFailureMetadata,
-	type CodexRecoveryAttempt,
-	type CodexRecoveryOptions,
-	type CodexRecoveryPlan,
-	CodexRecoveryPolicy,
-	classifyCodexFailure,
-} from "./domain/codex-recovery.ts";
+	classifyGoogleVertexFailure,
+	type GoogleVertexFailure,
+	type GoogleVertexFailureKind,
+	type GoogleVertexFailureMetadata,
+	type GoogleVertexMetricSource,
+	googleVertexFailureMetrics,
+} from "./google-vertex/failures.ts";
+export {
+	CONTEXT_SEGMENT_SOURCES,
+	CONTEXT_SEGMENT_STATES,
+	CONTEXT_SNAPSHOT_MAX_SEGMENTS,
+	type ContextDelta,
+	type ContextFingerprinter,
+	type ContextPrefixResetReason,
+	type ContextSegmentChange,
+	type ContextSegmentLifecycle,
+	type ContextSegmentSource,
+	type ContextSegmentState,
+	type ContextSnapshot,
+	type ContextSnapshotSegment,
+	type ContextSourceGrowth,
+	compareContextSnapshots,
+	HmacContextFingerprinter,
+	validateContextSnapshot,
+} from "./observability/context-delta.ts";
 export {
 	type ContextConfidenceTier,
 	type ContextContribution,
@@ -27,7 +46,11 @@ export {
 	toolLedgerSegment,
 	validateContextContribution,
 	validateContextSegment,
-} from "./domain/context-hub.ts";
+} from "./observability/context-hub.ts";
+export {
+	type ContextSnapshotHistory,
+	MetricContextSnapshotHistory,
+} from "./observability/context-snapshot-history.ts";
 export {
 	assessContextTelemetry,
 	type CompactionDurationEstimate,
@@ -38,7 +61,7 @@ export {
 	type PapyrusContextInjection,
 	papyrusContextMetric,
 	validatePapyrusContextInjection,
-} from "./domain/context-telemetry.ts";
+} from "./observability/context-telemetry.ts";
 export {
 	METRIC_UNITS,
 	type MetricObservation,
@@ -46,7 +69,7 @@ export {
 	type MetricUnit,
 	type StoredMetricObservation,
 	validateMetricObservation,
-} from "./domain/metric.ts";
+} from "./observability/metric.ts";
 export {
 	aggregateModelMetrics,
 	classifyTaskFromTools,
@@ -61,25 +84,29 @@ export {
 	TASK_DOMAINS,
 	TASK_TYPES,
 	validateModelRunObservation,
-} from "./domain/model-observation.ts";
-export {
-	type ModelCandidate,
-	type ModelRankingInput,
-	type ModelRankingResult,
-	type RankedModel,
-	type RankingProvenance,
-	rankModelCandidates,
-	type ScopeAuthority,
-	type UtilityComponent,
-	type UtilityComponentName,
-	type UtilityWeights,
-} from "./domain/model-ranking.ts";
+} from "./observability/model-observation.ts";
+export type { DistinctScopesFilter, MetricStore, UsageAggregateFilter } from "./observability/store.ts";
 export {
 	applyTaskFocusEvent,
 	type TaskFocusEvent,
 	type TaskFocusStatus,
 	validateTaskFocusEvent,
-} from "./domain/task-focus.ts";
+} from "./observability/task-focus.ts";
+export {
+	countTextWithFallback,
+	type RequestTokenReconciliation,
+	reconcileRequestTokens,
+	StructuralTextTokenCounter,
+	type TextTokenCounter,
+	type TextTokenCountInput,
+	TOKEN_MEASUREMENT_PROVENANCES,
+	TOKEN_MEASUREMENT_SCOPES,
+	type TokenMeasurement,
+	type TokenMeasurementProvenance,
+	type TokenMeasurementScope,
+	validateRequestTokenReconciliation,
+	validateTokenMeasurement,
+} from "./observability/token-measurement.ts";
 export {
 	buildCostGraph,
 	buildUsageGraph,
@@ -100,7 +127,62 @@ export {
 	usageBucketIndex,
 	usagePeriod,
 	usagePeriodStart,
-} from "./domain/usage.ts";
+} from "./observability/usage.ts";
+export {
+	HistoricalUsageImporter,
+	type HistoricalUsageRecord,
+	type HistoricalUsageScan,
+	type HistoricalUsageSource,
+	type UsageImportController,
+	type UsageImportResult,
+	type UsageImportStatus,
+	type UsageImportStore,
+} from "./observability/usage-import.ts";
+export { loadOpenAiTextTokenCounter, OpenAiTextTokenCounter } from "./openai/token-counter.ts";
+export {
+	ModelCatalog,
+	type ModelCatalogAuthority,
+	type ModelCatalogController,
+	type ModelCatalogEntry,
+	type ModelCatalogFieldAuthority,
+	type ModelCatalogPricing,
+	type ModelCatalogProvenance,
+	type ModelCatalogQuery,
+	type ModelCatalogQueryResult,
+	type ModelCatalogSource,
+	type ModelCatalogStatus,
+	ModelsDevCatalogSource,
+	translateModelsDevCatalog,
+} from "./optimization/model-selection/catalog.ts";
+export {
+	type ModelCandidate,
+	type ModelRankingInput,
+	type ModelRankingResult,
+	type RankedModel,
+	type RankingProvenance,
+	rankModelCandidates,
+	type ScopeAuthority,
+	type UtilityComponent,
+	type UtilityComponentName,
+	type UtilityWeights,
+} from "./optimization/model-selection/ranking.ts";
+export {
+	type CodexFailure,
+	type CodexFailureKind,
+	type CodexFailureMetadata,
+	type CodexRecoveryAttempt,
+	type CodexRecoveryOptions,
+	type CodexRecoveryPlan,
+	CodexRecoveryPolicy,
+	classifyCodexFailure,
+} from "./optimization/recovery/codex.ts";
+export type {
+	RouteOverride,
+	RouterController,
+	RouterStatus,
+	TelemetryPollResult,
+	TelemetrySourceStatus,
+} from "./optimization/routing/controller.ts";
 export {
 	type BudgetWindow,
 	evaluateRoutingPolicy,
@@ -112,31 +194,29 @@ export {
 	type PreviousDecision,
 	type Route,
 	type TelemetryFreshness,
-} from "./policy.ts";
-export type { DistinctScopesFilter, MetricStore, UsageAggregateFilter } from "./ports/metric-store.ts";
-export type {
-	RouteOverride,
-	RouterController,
-	RouterStatus,
-	TelemetryPollResult,
-	TelemetrySourceStatus,
-} from "./ports/router-controller.ts";
+} from "./optimization/routing/policy.ts";
 export {
-	type AnthropicMetricSource,
-	type AnthropicRateLimitSnapshot,
-	type AnthropicRateLimitWindow,
-	hasAnthropicRateLimitHeaders,
-	parseAnthropicRateLimitHeaders,
-} from "./providers/anthropic-contracts.ts";
-export { parseCodexRateLimitHeaders } from "./providers/codex.ts";
+	buildOtlpMetricsRequest,
+	mapObservationToOtlp,
+	OTLP_GENAI_SEMANTIC_CONVENTIONS,
+	type OtlpMetricPoint,
+	OtlpObservationExporter,
+	type OtlpObservationExporterOptions,
+	type OtlpTransport,
+	otlpExporterFromEnvironment,
+} from "./otlp/exporter.ts";
+export { PiSessionUsageSource, type PiSessionUsageSourceOptions } from "./pi/session-usage-source.ts";
 export {
-	classifyGoogleVertexFailure,
-	type GoogleVertexFailure,
-	type GoogleVertexFailureKind,
-	type GoogleVertexFailureMetadata,
-	type GoogleVertexMetricSource,
-	googleVertexFailureMetrics,
-} from "./providers/google-vertex-contracts.ts";
+	DisabledObservationExporter,
+	ExportingMetricStore,
+	type ObservationExporter,
+	type ObservationExportStatus,
+} from "./telemetry-export/exporter.ts";
+export {
+	connectJittorClient,
+	type FetchTransport,
+	JittorClient,
+} from "./vehicle/client.ts";
 export {
 	createApp,
 	EXPECTED_OPERATION_NAMES,
@@ -147,5 +227,5 @@ export {
 	type OperationName,
 	type OperationOutputs,
 	UnknownOperationError,
-} from "./service.ts";
+} from "./vehicle/service.ts";
 export { VERSION as jittorVersion } from "./version.ts";

package/src/{adapters/lmarena-hf-source.ts → lmarena/benchmark-source.ts}

@@ -1,12 +1,12 @@
 import { BENCHMARK_MAX_MODELS_PER_SOURCE, BENCHMARK_REFRESH_INTERVAL_MS, BENCHMARK_SOURCE_MAX_RESPONSE_BYTES } from "../constants.ts";
+import { contractRecord } from "../openrouter/contracts.ts";
 import {
 	type BenchmarkObservation,
 	type BenchmarkSourceSnapshot,
 	normalizeModelIdentity,
 	validateBenchmarkObservation,
-} from "../domain/benchmark.ts";
-import type { BenchmarkSource } from "../ports/benchmark-source.ts";
-import { contractRecord } from "../providers/openrouter-contracts.ts";
+} from "../optimization/model-selection/benchmark.ts";
+import type { BenchmarkSource } from "../optimization/model-selection/source.ts";
 
 const SOURCE_ID = "lmarena-hf";
 const BASE_URL = "https://datasets-server.huggingface.co/rows";

package/src/observability/budget.ts

@@ -0,0 +1,14 @@
+export type TelemetryFreshness = "fresh" | "stale" | "failed";
+
+export interface BudgetWindow {
+	id: string;
+	source: string;
+	scope: string;
+	usedFraction: number;
+	windowSeconds: number;
+	resetsAt: number;
+	observedAt: number;
+	freshness: TelemetryFreshness;
+	confidence: number;
+	observedBurnPerSecond?: number;
+}