@danypops/jittor 0.14.0 → 0.16.0

package/src/cli-commands/router.ts

@@ -1,8 +1,8 @@
 import { CLI_AVAILABLE_ROUTES_MAX } from "../constants.ts";
 import type { PolicyDecision, Route } from "../policy.ts";
 import type { RouteOverride, RouterStatus, TelemetryPollResult } from "../ports/router-controller.ts";
-import { callAndPrint, humanField, type CliDependencies } from "./support.ts";
 import { parseRoute } from "./route-args.ts";
+import { type CliDependencies, callAndPrint, humanField } from "./support.ts";
 
 export const ROUTER_USAGE_LINES = [
 	"  telemetry poll [--json]",
@@ -13,13 +13,19 @@ export const ROUTER_USAGE_LINES = [
 	"  router available-routes [--route <provider/model@thinking> ...] [--session-id <id>] [--session-secret <secret>] [--json]",
 ];
 
-interface SessionScope { session_id?: string; session_secret?: string }
+interface SessionScope {
+	session_id?: string;
+	session_secret?: string;
+}
 
 function sessionScopeInput(sessionId: string | undefined, sessionSecret: string | undefined): SessionScope {
 	return { ...(sessionId ? { session_id: sessionId } : {}), ...(sessionSecret ? { session_secret: sessionSecret } : {}) };
 }
 
-interface RouterOverrideArgs { input: RouteOverride & SessionScope; json: boolean }
+interface RouterOverrideArgs {
+	input: RouteOverride & SessionScope;
+	json: boolean;
+}
 
 function parseRouterOverrideArgs(args: string[]): RouterOverrideArgs | null {
 	let json = false;
@@ -29,7 +35,10 @@ function parseRouterOverrideArgs(args: string[]): RouterOverrideArgs | null {
 	let sessionSecret: string | undefined;
 	for (let index = 0; index < args.length; index += 1) {
 		const argument = args[index];
-		if (argument === "--json") { json = true; continue; }
+		if (argument === "--json") {
+			json = true;
+			continue;
+		}
 		if (!["--route", "--expires-at", "--session-id", "--session-secret"].includes(argument ?? "")) return null;
 		const raw = args[++index];
 		if (raw === undefined || raw.length === 0) return null;
@@ -48,7 +57,10 @@ function parseRouterOverrideArgs(args: string[]): RouterOverrideArgs | null {
 	return { input: { route, expiresAt, ...sessionScopeInput(sessionId, sessionSecret) }, json };
 }
 
-interface RouterRouteArgs { input: Route & SessionScope; json: boolean }
+interface RouterRouteArgs {
+	input: Route & SessionScope;
+	json: boolean;
+}
 
 function parseRouterRouteArgs(args: string[]): RouterRouteArgs | null {
 	let json = false;
@@ -57,7 +69,10 @@ function parseRouterRouteArgs(args: string[]): RouterRouteArgs | null {
 	let sessionSecret: string | undefined;
 	for (let index = 0; index < args.length; index += 1) {
 		const argument = args[index];
-		if (argument === "--json") { json = true; continue; }
+		if (argument === "--json") {
+			json = true;
+			continue;
+		}
 		if (!["--route", "--session-id", "--session-secret"].includes(argument ?? "")) return null;
 		const raw = args[++index];
 		if (raw === undefined || raw.length === 0) return null;
@@ -72,7 +87,10 @@ function parseRouterRouteArgs(args: string[]): RouterRouteArgs | null {
 	return { input: { ...route, ...sessionScopeInput(sessionId, sessionSecret) }, json };
 }
 
-interface RouterAvailableRoutesArgs { input: { routes: Route[] } & SessionScope; json: boolean }
+interface RouterAvailableRoutesArgs {
+	input: { routes: Route[] } & SessionScope;
+	json: boolean;
+}
 
 function parseRouterAvailableRoutesArgs(args: string[]): RouterAvailableRoutesArgs | null {
 	let json = false;
@@ -81,7 +99,10 @@ function parseRouterAvailableRoutesArgs(args: string[]): RouterAvailableRoutesAr
 	const routes: Route[] = [];
 	for (let index = 0; index < args.length; index += 1) {
 		const argument = args[index];
-		if (argument === "--json") { json = true; continue; }
+		if (argument === "--json") {
+			json = true;
+			continue;
+		}
 		if (!["--route", "--session-id", "--session-secret"].includes(argument ?? "")) return null;
 		const raw = args[++index];
 		if (raw === undefined || raw.length === 0) return null;
@@ -103,7 +124,10 @@ function parseRouterScopeArgs(args: string[]): { input: SessionScope; json: bool
 	let sessionSecret: string | undefined;
 	for (let index = 0; index < args.length; index += 1) {
 		const argument = args[index];
-		if (argument === "--json") { json = true; continue; }
+		if (argument === "--json") {
+			json = true;
+			continue;
+		}
 		if (!["--session-id", "--session-secret"].includes(argument ?? "")) return null;
 		const raw = args[++index];
 		if (raw === undefined || raw.length === 0) return null;
@@ -128,10 +152,13 @@ function formatRoute(route: Route): string {
 
 export function formatTelemetryPoll(result: TelemetryPollResult): string {
 	if (result.sources.length === 0) return "Telemetry: no sources configured";
-	return ["Telemetry:", ...result.sources.map((source) => {
-		const freshness = !source.ok ? `failed${source.error ? ` (${humanField(source.error)})` : ""}` : "ok";
-		return `- ${humanField(source.id)} (${humanField(source.provider)}): ${freshness} · ${source.metrics} metric(s)`;
-	})].join("\n");
+	return [
+		"Telemetry:",
+		...result.sources.map((source) => {
+			const freshness = !source.ok ? `failed${source.error ? ` (${humanField(source.error)})` : ""}` : "ok";
+			return `- ${humanField(source.id)} (${humanField(source.provider)}): ${freshness} · ${source.metrics} metric(s)`;
+		}),
+	].join("\n");
 }
 
 export function formatRouterStatus(status: RouterStatus): string {
@@ -141,26 +168,41 @@ export function formatRouterStatus(status: RouterStatus): string {
 		`Available routes: ${status.availableRoutes.length.toLocaleString()}`,
 		`Override: ${status.override ? `${formatRoute(status.override.route)}${status.override.expiresAt === null ? "" : ` (expires ${new Date(status.override.expiresAt).toISOString()})`}` : "none"}`,
 	];
-	if (status.lastDecision) lines.push(`Last decision: ${status.lastDecision.action} · pressure ${Number.isFinite(status.lastDecision.pressure) ? status.lastDecision.pressure.toFixed(3) : "∞"} · ${humanField(status.lastDecision.reason)}`);
+	if (status.lastDecision)
+		lines.push(
+			`Last decision: ${status.lastDecision.action} · pressure ${Number.isFinite(status.lastDecision.pressure) ? status.lastDecision.pressure.toFixed(3) : "∞"} · ${humanField(status.lastDecision.reason)}`,
+		);
 	lines.push(formatTelemetryPoll({ sources: status.sources, observedAt: Date.now() }));
 	return lines.join("\n");
 }
 
 export function formatPolicyDecision(decision: PolicyDecision): string {
-	const lines = [`Decision: ${decision.action} · pressure ${Number.isFinite(decision.pressure) ? decision.pressure.toFixed(3) : "∞"} · ${humanField(decision.reason)}`];
+	const lines = [
+		`Decision: ${decision.action} · pressure ${Number.isFinite(decision.pressure) ? decision.pressure.toFixed(3) : "∞"} · ${humanField(decision.reason)}`,
+	];
 	if (decision.route) lines.push(`Route: ${formatRoute(decision.route)}`);
 	if (decision.delayMs !== undefined) lines.push(`Delay: ${decision.delayMs}ms`);
 	return lines.join("\n");
 }
 
-export async function runTelemetryCommand(action: string | undefined, rest: string[], deps: CliDependencies, usage: () => number): Promise<number> {
+export async function runTelemetryCommand(
+	action: string | undefined,
+	rest: string[],
+	deps: CliDependencies,
+	usage: () => number,
+): Promise<number> {
 	if (action !== "poll") return usage();
 	const parsed = parseJsonOnlyArgs(rest);
 	if (!parsed) return usage();
 	return callAndPrint(deps, "telemetry.poll", {}, parsed.json, formatTelemetryPoll);
 }
 
-export async function runRouterCommand(action: string | undefined, rest: string[], deps: CliDependencies, usage: () => number): Promise<number> {
+export async function runRouterCommand(
+	action: string | undefined,
+	rest: string[],
+	deps: CliDependencies,
+	usage: () => number,
+): Promise<number> {
 	switch (action) {
 		case "status": {
 			const parsed = parseRouterScopeArgs(rest);
@@ -202,6 +244,7 @@ export async function runRouterCommand(action: string | undefined, rest: string[
 			if (!parsed) return usage();
 			return callAndPrint(deps, "router.available_routes", parsed.input, parsed.json, formatRouterStatus);
 		}
-		default: return usage();
+		default:
+			return usage();
 	}
 }

package/src/cli-commands/service-daemon.ts

@@ -5,8 +5,9 @@ import { join } from "node:path";
 import { createNodeServiceInstallDeps, generateSystemdUnit, installUserService, type ServiceSpec } from "@danypops/vehicle-server/service";
 import { SYSTEMD_UNIT_NAME } from "../constants.ts";
 import { resolveJittorPaths } from "../state.ts";
-import { callAndPrint, type CliDependencies } from "./support.ts";
+import { VERSION } from "../version.ts";
 import { parseJsonOnlyArgs } from "./router.ts";
+import { type CliDependencies, callAndPrint } from "./support.ts";
 
 export const SERVICE_USAGE_LINES = ["  service <install|start|stop|restart|status|checkpoint>"];
 
@@ -19,15 +20,16 @@ export interface SystemdUnitOptions {
 
 function jittorServiceSpec(options: SystemdUnitOptions): ServiceSpec {
 	const env: Record<string, string> = {};
-	if (options.codexAuthFile) env["JITTOR_CODEX_AUTH_FILE"] = options.codexAuthFile;
-	if (options.openRouterBenchmarks) env["JITTOR_OPENROUTER_BENCHMARKS"] = "1";
+	if (options.codexAuthFile) env.JITTOR_CODEX_AUTH_FILE = options.codexAuthFile;
+	if (options.openRouterBenchmarks) env.JITTOR_OPENROUTER_BENCHMARKS = "1";
 	return {
 		name: "jittor",
 		displayName: "Jittor token optimizing router",
+		version: VERSION,
 		binPath: options.bunBin,
 		args: [options.cliPath, "serve"],
 		env,
-		descriptorPath: resolveJittorPaths().serviceDescriptor,
+		handlePath: resolveJittorPaths().handle,
 		// Jittor's own client (connectJittorClient) never auto-spawns -- systemd's own
 		// supervision is this daemon's only recovery path, same as Lector's.
 		restartOnFailure: true,
@@ -49,12 +51,12 @@ export function systemctl(...args: string[]): void {
 
 /** cliPath is the caller's own entrypoint file -- resolved from the real CLI script's `import.meta.url`, never this module's own, so the installed unit's ExecStart always points at the actual runnable CLI. */
 export function installService(cliPath: string): void {
-	const codexAuthFile = join(process.env["CODEX_HOME"] ?? join(homedir(), ".codex"), "auth.json");
+	const codexAuthFile = join(process.env.CODEX_HOME ?? join(homedir(), ".codex"), "auth.json");
 	const spec = jittorServiceSpec({
 		bunBin: process.execPath,
 		cliPath,
 		...(existsSync(codexAuthFile) ? { codexAuthFile } : {}),
-		openRouterBenchmarks: process.env["JITTOR_OPENROUTER_BENCHMARKS"] === "1",
+		openRouterBenchmarks: process.env.JITTOR_OPENROUTER_BENCHMARKS === "1",
 	});
 	const result = installUserService(spec, createNodeServiceInstallDeps());
 	if (!result.installed) throw new Error(`failed to install the Jittor service: ${result.reason}`);
@@ -64,18 +66,34 @@ export function installService(cliPath: string): void {
 	systemctl("restart", SYSTEMD_UNIT_NAME);
 }
 
-export async function runServiceCommand(action: string | undefined, rest: string[], deps: CliDependencies, usage: () => number): Promise<number> {
+export async function runServiceCommand(
+	action: string | undefined,
+	rest: string[],
+	deps: CliDependencies,
+	usage: () => number,
+): Promise<number> {
 	switch (action) {
-		case "install": deps.installService(); return 0;
-		case "start": deps.systemctl("start", SYSTEMD_UNIT_NAME); return 0;
-		case "stop": deps.systemctl("stop", SYSTEMD_UNIT_NAME); return 0;
-		case "restart": deps.systemctl("restart", SYSTEMD_UNIT_NAME); return 0;
-		case "status": deps.systemctl("status", SYSTEMD_UNIT_NAME); return 0;
+		case "install":
+			deps.installService();
+			return 0;
+		case "start":
+			deps.systemctl("start", SYSTEMD_UNIT_NAME);
+			return 0;
+		case "stop":
+			deps.systemctl("stop", SYSTEMD_UNIT_NAME);
+			return 0;
+		case "restart":
+			deps.systemctl("restart", SYSTEMD_UNIT_NAME);
+			return 0;
+		case "status":
+			deps.systemctl("status", SYSTEMD_UNIT_NAME);
+			return 0;
 		case "checkpoint": {
 			const parsed = parseJsonOnlyArgs(rest);
 			if (!parsed) return usage();
 			return callAndPrint(deps, "service.checkpoint", {}, parsed.json, () => "Checkpoint complete");
 		}
-		default: return usage();
+		default:
+			return usage();
 	}
 }

package/src/cli-commands/session.ts

@@ -1,11 +1,14 @@
-import { callAndPrint, humanField, type CliDependencies } from "./support.ts";
+import { type CliDependencies, callAndPrint, humanField } from "./support.ts";
 
 export const SESSION_USAGE_LINES = [
 	"  session register --session-id <id> [--json]",
 	"  session release --session-id <id> [--session-secret <secret>] [--json]",
 ];
 
-interface SessionArgs { input: { session_id: string; session_secret?: string }; json: boolean }
+interface SessionArgs {
+	input: { session_id: string; session_secret?: string };
+	json: boolean;
+}
 
 function parseSessionArgs(args: string[]): SessionArgs | null {
 	let json = false;
@@ -13,7 +16,10 @@ function parseSessionArgs(args: string[]): SessionArgs | null {
 	let sessionSecret: string | undefined;
 	for (let index = 0; index < args.length; index += 1) {
 		const argument = args[index];
-		if (argument === "--json") { json = true; continue; }
+		if (argument === "--json") {
+			json = true;
+			continue;
+		}
 		if (!["--session-id", "--session-secret"].includes(argument ?? "")) return null;
 		const raw = args[++index];
 		if (raw === undefined || raw.length === 0) return null;
@@ -32,7 +38,12 @@ export function formatSessionRelease(result: { released: boolean }): string {
 	return result.released ? "Session released" : "Session was not registered, or the secret did not match";
 }
 
-export async function runSessionCommand(action: string | undefined, rest: string[], deps: CliDependencies, usage: () => number): Promise<number> {
+export async function runSessionCommand(
+	action: string | undefined,
+	rest: string[],
+	deps: CliDependencies,
+	usage: () => number,
+): Promise<number> {
 	if (action !== "register" && action !== "release") return usage();
 	const parsed = parseSessionArgs(rest);
 	if (!parsed) return usage();

package/src/cli-commands/support.ts

@@ -1,5 +1,5 @@
-import { HUMAN_TEXT_FIELD_MAX_CHARACTERS } from "../constants.ts";
 import type { JittorClient } from "../client.ts";
+import { HUMAN_TEXT_FIELD_MAX_CHARACTERS } from "../constants.ts";
 import type { OperationInputs, OperationName, OperationOutputs } from "../service.ts";
 
 export interface CliDependencies {

package/src/cli.ts

@@ -1,24 +1,26 @@
 #!/usr/bin/env bun
 import { fileURLToPath } from "node:url";
+import { BENCHMARKS_USAGE_LINES, runBenchmarksCommand } from "./cli-commands/benchmarks.ts";
+import { runCompactionCommand } from "./cli-commands/compaction.ts";
+import { CONTEXT_USAGE_LINES, formatContextAssessment, runContextCommand } from "./cli-commands/context.ts";
+import { formatCostByTask, formatMetricsQuery, METRICS_USAGE_LINES, runMetricsCommand } from "./cli-commands/metrics.ts";
+import { OP_USAGE_LINES, runOpCommand } from "./cli-commands/op.ts";
+import { formatRouterStatus, ROUTER_USAGE_LINES, runRouterCommand, runTelemetryCommand } from "./cli-commands/router.ts";
+import { installService, renderSystemdUnit, runServiceCommand, SERVICE_USAGE_LINES, systemctl } from "./cli-commands/service-daemon.ts";
+import { runSessionCommand, SESSION_USAGE_LINES } from "./cli-commands/session.ts";
+import type { CliDependencies } from "./cli-commands/support.ts";
 import { connectJittorClient } from "./client.ts";
 import { serveMain } from "./daemon.ts";
-import type { CliDependencies } from "./cli-commands/support.ts";
-import { installService, renderSystemdUnit, systemctl, runServiceCommand, SERVICE_USAGE_LINES } from "./cli-commands/service-daemon.ts";
-import { runSessionCommand, SESSION_USAGE_LINES } from "./cli-commands/session.ts";
-import { runMetricsCommand, METRICS_USAGE_LINES, formatMetricsQuery, formatCostByTask } from "./cli-commands/metrics.ts";
-import { runTelemetryCommand, runRouterCommand, ROUTER_USAGE_LINES, formatRouterStatus } from "./cli-commands/router.ts";
-import { runCompactionCommand } from "./cli-commands/compaction.ts";
-import { runOpCommand, OP_USAGE_LINES } from "./cli-commands/op.ts";
-import { runBenchmarksCommand, BENCHMARKS_USAGE_LINES } from "./cli-commands/benchmarks.ts";
-import { runContextCommand, CONTEXT_USAGE_LINES, formatContextAssessment } from "./cli-commands/context.ts";
 
 // Re-exported for external callers (tests, daemon.ts's systemd-unit test) that import these
 // directly from cli.ts rather than reaching into src/cli-commands/*.
 export type { CliDependencies };
-export { renderSystemdUnit, formatMetricsQuery, formatCostByTask, formatRouterStatus, formatContextAssessment };
+export { formatContextAssessment, formatCostByTask, formatMetricsQuery, formatRouterStatus, renderSystemdUnit };
 
 const DEFAULT_DEPENDENCIES: CliDependencies = {
-	get client() { return connectJittorClient(); },
+	get client() {
+		return connectJittorClient();
+	},
 	stdout: console.log,
 	stderr: console.error,
 	systemctl,
@@ -27,17 +29,19 @@ const DEFAULT_DEPENDENCIES: CliDependencies = {
 };
 
 function usage(stderr: (line: string) => void): number {
-	stderr([
-		"Usage: jittor <command> [options]",
-		"  serve",
-		...SERVICE_USAGE_LINES,
-		...CONTEXT_USAGE_LINES,
-		...BENCHMARKS_USAGE_LINES,
-		...METRICS_USAGE_LINES,
-		...ROUTER_USAGE_LINES,
-		...SESSION_USAGE_LINES,
-		...OP_USAGE_LINES,
-	].join("\n"));
+	stderr(
+		[
+			"Usage: jittor <command> [options]",
+			"  serve",
+			...SERVICE_USAGE_LINES,
+			...CONTEXT_USAGE_LINES,
+			...BENCHMARKS_USAGE_LINES,
+			...METRICS_USAGE_LINES,
+			...ROUTER_USAGE_LINES,
+			...SESSION_USAGE_LINES,
+			...OP_USAGE_LINES,
+		].join("\n"),
+	);
 	return 2;
 }
 
@@ -52,7 +56,10 @@ function usage(stderr: (line: string) => void): number {
 export async function runCli(args: string[], deps: CliDependencies = DEFAULT_DEPENDENCIES): Promise<number> {
 	const [command, action, ...rest] = args;
 	const fail = () => usage(deps.stderr);
-	if (command === "serve") { await deps.serve(); return 0; }
+	if (command === "serve") {
+		await deps.serve();
+		return 0;
+	}
 	if (command === "session") return runSessionCommand(action, rest, deps, fail);
 	if (command === "metrics") return runMetricsCommand(action, rest, deps, fail);
 	if (command === "telemetry") return runTelemetryCommand(action, rest, deps, fail);

package/src/client.ts

@@ -1,6 +1,6 @@
 import { AuthenticatedRpcClient, type FetchTransport } from "@danypops/vehicle-client/rpc-client";
 import type { OperationInputs, OperationName, OperationOutputs } from "./service.ts";
-import { ensureAuthToken, readDaemonHandle, resolveJittorPaths, type JittorPaths } from "./state.ts";
+import { ensureAuthToken, type JittorPaths, readDaemonHandle, resolveJittorPaths } from "./state.ts";
 
 export type { FetchTransport };
 

package/src/constants.ts

@@ -10,7 +10,7 @@ export const BENCHMARK_IDENTITY_MAX_CHARACTERS = 160;
 export const BENCHMARK_MAX_TEXT_CHARACTERS = 2_048;
 export const BENCHMARK_MAX_MODELS_PER_SOURCE = 250;
 export const BENCHMARK_MAX_OBSERVATIONS_PER_SNAPSHOT = 2_000;
-export const BENCHMARK_STORE_QUERY_LIMIT = (BENCHMARK_MAX_OBSERVATIONS_PER_SNAPSHOT * 2) + 1;
+export const BENCHMARK_STORE_QUERY_LIMIT = BENCHMARK_MAX_OBSERVATIONS_PER_SNAPSHOT * 2 + 1;
 export const BENCHMARK_DEFAULT_QUERY_LIMIT = 100;
 export const BENCHMARK_TUI_MAX_CANDIDATES = 20;
 export const BENCHMARK_TUI_MAX_PROVENANCE_PER_CANDIDATE = 2;

package/src/daemon.ts

@@ -1,27 +1,27 @@
-import { startDaemon as startDaemonKit, type RunningDaemon } from "@danypops/vehicle-server/daemon";
-import { MAINTENANCE_INTERVAL_MS, TELEMETRY_POLL_INTERVAL_MS } from "./constants.ts";
-import { DEFAULT_POLICY, UNCONFIGURED_ROUTE } from "./config.ts";
-import { SQLiteMetricStore } from "./adapters/sqlite-metric-store.ts";
+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 { LmArenaHfSource } from "./adapters/lmarena-hf-source.ts";
-import { ArtificialAnalysisDirectSource } from "./adapters/artificial-analysis-direct-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 { 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 { createApp, JittorService } from "./service.ts";
-import { JittorRouter } from "./router.ts";
-import { SQLiteSessionIdentityStore } from "./adapters/sqlite-session-identity-store.ts";
-import { SessionIdentity } from "./session-identity-service.ts";
+import { logEvent, logger } from "./log.ts";
 import type { BenchmarkSource } from "./ports/benchmark-source.ts";
 import type { TelemetrySource } from "./ports/telemetry-source.ts";
-import { CodexTelemetrySource, GoogleVertexBudgetTelemetrySource, OpenRouterTelemetrySource } from "./providers/telemetry-sources.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 { ensureAuthToken, resolveJittorPaths, type JittorPaths } from "./state.ts";
-import { logEvent, logger } from "./log.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 { ensureAuthToken, type JittorPaths, resolveJittorPaths } from "./state.ts";
 
 export type { RunningDaemon } from "@danypops/vehicle-server/daemon";
 
@@ -32,12 +32,12 @@ export function reportMaintenanceFailure(event: string, error: unknown): void {
 // Flag name predates non-OpenRouter sources; kept as the one "opt into online benchmark
 // ingestion" toggle rather than adding a second flag for the same decision.
 export function benchmarkSourcesFromEnvironment(env: Record<string, string | undefined> = process.env): BenchmarkSource[] {
-	if (env["JITTOR_OPENROUTER_BENCHMARKS"] !== "1") return [];
+	if (env.JITTOR_OPENROUTER_BENCHMARKS !== "1") return [];
 	const sources: BenchmarkSource[] = [new OpenRouterBenchmarkSource(), new LmArenaHfSource()];
 	// Design Arena's own API needs manual approval, unlike Artificial Analysis's instant signup --
 	// no direct alternative exists yet, so the OpenRouter passthrough stays.
-	if (env["OPENROUTER_API_KEY"]) sources.push(new OpenRouterDesignArenaSource(env["OPENROUTER_API_KEY"]));
-	if (env["ARTIFICIAL_ANALYSIS_API_KEY"]) sources.push(new ArtificialAnalysisDirectSource(env["ARTIFICIAL_ANALYSIS_API_KEY"]));
+	if (env.OPENROUTER_API_KEY) sources.push(new OpenRouterDesignArenaSource(env.OPENROUTER_API_KEY));
+	if (env.ARTIFICIAL_ANALYSIS_API_KEY) sources.push(new ArtificialAnalysisDirectSource(env.ARTIFICIAL_ANALYSIS_API_KEY));
 	return sources;
 }
 
@@ -49,15 +49,15 @@ function googleVertexMetricSource(value: string | undefined): GoogleVertexMetric
 
 export function telemetrySourcesFromEnvironment(env: Record<string, string | undefined> = process.env): TelemetrySource[] {
 	const sources: TelemetrySource[] = [];
-	const codexAuthFile = env["JITTOR_CODEX_AUTH_FILE"];
+	const codexAuthFile = env.JITTOR_CODEX_AUTH_FILE;
 	if (codexAuthFile) sources.push(new CodexTelemetrySource(codexAuthFile));
-	const openRouterKey = env["OPENROUTER_API_KEY"];
+	const openRouterKey = env.OPENROUTER_API_KEY;
 	if (openRouterKey) sources.push(new OpenRouterTelemetrySource(openRouterKey));
 	// Opt-in only: the Pub/Sub subscription is one-time GCP console/CLI setup outside Jittor (see
 	// docs/PROVIDER_RESEARCH.md), so its absence must never attempt ADC discovery or a network call.
-	const vertexBudgetSubscription = env["JITTOR_GOOGLE_VERTEX_BUDGET_SUBSCRIPTION"];
+	const vertexBudgetSubscription = env.JITTOR_GOOGLE_VERTEX_BUDGET_SUBSCRIPTION;
 	if (vertexBudgetSubscription) {
-		const source = googleVertexMetricSource(env["JITTOR_GOOGLE_VERTEX_BUDGET_SOURCE"]);
+		const source = googleVertexMetricSource(env.JITTOR_GOOGLE_VERTEX_BUDGET_SOURCE);
 		const tokenProvider = createGoogleAdcTokenProvider([GOOGLE_PUBSUB_READONLY_SCOPE]);
 		sources.push(new GoogleVertexBudgetTelemetrySource(vertexBudgetSubscription, tokenProvider, Date.now, fetch, source));
 	}
@@ -102,11 +102,31 @@ export async function startDaemon(
 		logger,
 		buildApp: () => createApp({ service, token }),
 		maintenanceTasks: [
-			{ name: "checkpoint", intervalMs: MAINTENANCE_INTERVAL_MS, run: async () => { await service.execute("service.checkpoint", {}).catch((error) => reportMaintenanceFailure("checkpoint_failed", error)); } },
-			{ name: "benchmark-refresh", intervalMs: MAINTENANCE_INTERVAL_MS, run: async () => { await benchmarks.refresh().catch((error) => reportMaintenanceFailure("benchmark_refresh_failed", error)); } },
-			{ name: "telemetry-poll", intervalMs: TELEMETRY_POLL_INTERVAL_MS, run: async () => { await router.poll().catch((error) => reportMaintenanceFailure("telemetry_poll_failed", error)); } },
+			{
+				name: "checkpoint",
+				intervalMs: MAINTENANCE_INTERVAL_MS,
+				run: async () => {
+					await service.execute("service.checkpoint", {}).catch((error) => reportMaintenanceFailure("checkpoint_failed", error));
+				},
+			},
+			{
+				name: "benchmark-refresh",
+				intervalMs: MAINTENANCE_INTERVAL_MS,
+				run: async () => {
+					await benchmarks.refresh().catch((error) => reportMaintenanceFailure("benchmark_refresh_failed", error));
+				},
+			},
+			{
+				name: "telemetry-poll",
+				intervalMs: TELEMETRY_POLL_INTERVAL_MS,
+				run: async () => {
+					await router.poll().catch((error) => reportMaintenanceFailure("telemetry_poll_failed", error));
+				},
+			},
 		],
-		onShutdown: () => { service.close(); },
+		onShutdown: () => {
+			service.close();
+		},
 	});
 
 	if (sources.length > 0) router.poll().catch((error) => reportMaintenanceFailure("telemetry_poll_failed", error));