auto-model-router 0.15.0 → 0.17.0

package/test/scope.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { SCOPE_ENV, acceptScope, isScopeSlug } from "../src/context/scope.ts";
+import { ORIGIN_ENV, SCOPE_ENV, acceptOrigin, acceptScope, isOrigin, isScopeSlug, normalizeOrigin } from "../src/context/scope.ts";
 import { parseChatRequest } from "../src/wire/openai/request.ts";
 
 describe("the scope a request may name", () => {
@@ -28,4 +28,77 @@ describe("the scope a request may name", () => {
 		expect(parse("omp-router").agentdoxScope).toBe("omp-router");
 		expect(parse(SCOPE_ENV).agentdoxScope).toBe("");
 	});
+
+	test("the wire parser reads X-Agentdox-Group and X-Agentdox-Personal by the same rule", () => {
+		// A team front door names the group-context and personal scopes; a
+		// lone router never sees the headers and must end up with empties, so
+		// nothing new is sent to agentdox.
+		const body = { model: "auto", messages: [{ role: "user", content: "hi" }] };
+		const parse = (h: Record<string, string>) => parseChatRequest(body, new Headers(h));
+		const none = parse({ "x-agentdox-scope": "omp-router" });
+		expect(none.agentdoxGroup).toBe("");
+		expect(none.agentdoxPersonal).toBe("");
+		const both = parse({ "x-agentdox-scope": "omp-router", "x-agentdox-group": " group.g1 ", "x-agentdox-personal": "omp-router.u.u_ada" });
+		expect(both.agentdoxGroup).toBe("group.g1");
+		expect(both.agentdoxPersonal).toBe("omp-router.u.u_ada");
+		// Not slugs: dropped, never passed through.
+		const bad = parse({ "x-agentdox-group": "Has Spaces", "x-agentdox-personal": SCOPE_ENV });
+		expect(bad.agentdoxGroup).toBe("");
+		expect(bad.agentdoxPersonal).toBe("");
+		// Layers without a project scope are still parsed; the turn decides what to do.
+		expect(parse({ "x-agentdox-group": "group.g1" }).agentdoxGroup).toBe("group.g1");
+	});
+});
+
+describe("the origin a request may name", () => {
+	test("normalizeOrigin reduces every remote form to host/path, and a local path to nothing", () => {
+		// The same repository over https and ssh is one fingerprint.
+		expect(normalizeOrigin("https://github.com/DrewAppling/omp-router.git")).toBe("github.com/drewappling/omp-router");
+		expect(normalizeOrigin("git@github.com:drewappling/omp-router.git")).toBe("github.com/drewappling/omp-router");
+		expect(normalizeOrigin("ssh://git@gitlab.example.com:2222/team/api/")).toBe("gitlab.example.com/team/api");
+		// Credentials and the port never reach the value.
+		expect(normalizeOrigin("https://user:p4ss@host.example:8443/a/b.git")).toBe("host.example/a/b");
+		expect(normalizeOrigin("host.example:repo")).toBe("host.example/repo");
+		expect(normalizeOrigin(" https://github.com/a/b/.git ")).toBe("github.com/a/b");
+		// No host, no fingerprint: a local clone says nothing about the project.
+		expect(normalizeOrigin("file:///e/projects/x")).toBe("");
+		expect(normalizeOrigin("/local/path")).toBe("");
+		expect(normalizeOrigin("C:\\path")).toBe("");
+		expect(normalizeOrigin("C:\\Users\\drew\\repo")).toBe("");
+		expect(normalizeOrigin("C:/path")).toBe("");
+		expect(normalizeOrigin("https://github.com/")).toBe("");
+		expect(normalizeOrigin("")).toBe("");
+	});
+
+	test("isOrigin: host/path only; the env-var sentinel never passes", () => {
+		expect(isOrigin("github.com/drewappling/omp-router")).toBe(true);
+		expect(isOrigin("gitlab.example.com/team/sub/api")).toBe(true);
+		// omp sends the header's literal value when the variable it names is
+		// unset: the NAME must never become a fingerprint.
+		expect(isOrigin(ORIGIN_ENV)).toBe(false);
+		expect(isOrigin("github.com")).toBe(false);
+		expect(isOrigin("GitHub.com/a/b")).toBe(false);
+		expect(isOrigin("https://github.com/a/b")).toBe(false);
+		expect(isOrigin("github.com/a/b/")).toBe(false);
+		expect(isOrigin("")).toBe(false);
+	});
+
+	test("acceptOrigin trims and rejects", () => {
+		expect(acceptOrigin(" github.com/a/b ")).toBe("github.com/a/b");
+		expect(acceptOrigin(ORIGIN_ENV)).toBe("");
+		expect(acceptOrigin("https://github.com/a/b")).toBe("");
+		expect(acceptOrigin(null)).toBe("");
+	});
+
+	test("the wire parser reads X-Agentdox-Origin by that rule and nothing else changes", () => {
+		const body = { model: "auto", messages: [{ role: "user", content: "hi" }] };
+		const parse = (h: Record<string, string>) => parseChatRequest(body, new Headers(h));
+		expect(parse({ "x-agentdox-scope": "omp-router" }).agentdoxOrigin).toBe("");
+		const both = parse({ "x-agentdox-scope": "omp-router", "x-agentdox-origin": "github.com/drewappling/omp-router" });
+		expect(both.agentdoxScope).toBe("omp-router");
+		expect(both.agentdoxOrigin).toBe("github.com/drewappling/omp-router");
+		// The sentinel and a raw URL are dropped, never passed through.
+		expect(parse({ "x-agentdox-origin": ORIGIN_ENV }).agentdoxOrigin).toBe("");
+		expect(parse({ "x-agentdox-origin": "https://github.com/a/b" }).agentdoxOrigin).toBe("");
+	});
 });

package/test/turn.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { createDisabledBridge } from "../src/context/bridge.ts";
-import type { ContextBridge, TurnRecord } from "../src/context/types.ts";
+import type { ContextBridge, ContextResolveInput, TurnRecord } from "../src/context/types.ts";
 import type { CatalogModel, CatalogSource } from "../src/catalog/types.ts";
 import type { EscalationConfig, RouterConfig } from "../src/config/types.ts";
 import { EMPTY_USAGE, type Ledger, type LedgerEntry, type UsageCounts } from "../src/cost/types.ts";
@@ -74,7 +74,7 @@ function mkConfig(escalation: Partial<EscalationConfig> = {}): RouterConfig {
 		hysteresis: { holdTurns: 2, holdTurnsAfterEscalation: 4, switchMargin: 1.5, cacheWarmTtlMs: 600_000, maxDowngradePerTurn: 1, breakHoldOnMechanical: false, switchHorizonTurns: 1, confirmUpgradesBelowConfidence: 0.6 },
 		exploration: { enabled: false, rates: {}, stickyPolicy: "never", holdTurns: { enabled: false, values: [2, 3, 4] } },
 		cache: { injectBreakpoints: true, maxBreakpoints: 4, minPromptTokens: 1024, milestoneTokens: 20_000 },
-		context: { enabled: false, baseUrl: "", token: "", defaultScope: "", timeoutMs: 3_000, maxStalenessMs: 900_000, maxBlockChars: 24_000, memoryLimit: 8, docsLimit: 2, sessionLimit: 6, briefChars: 0, recordTurns: false, injectWithoutTools: false, maxQueue: 64 },
+		context: { enabled: false, baseUrl: "", token: "", defaultScope: "", timeoutMs: 3_000, maxStalenessMs: 900_000, maxBlockChars: 24_000, memoryLimit: 8, docsLimit: 2, sessionLimit: 6, briefChars: 0, layers: true, recordTurns: false, injectWithoutTools: false, maxQueue: 64 },
 		compaction: { enabled: false, budgetTokens: 40_000, floorRatio: 1, fitToWindow: true, protectRecentTurns: 4, maxToolResultBytes: 4_096, keepHeadBytes: 512, keepTailBytes: 512, elideSupersededReads: true, collapseDuplicateResults: true, replanGrowthRatio: 1, digestToolResults: false, digestMaxPerTurn: 2 },
 		budget: { onExceeded: "downgrade" },
 		report: { baselines: [], dailySummary: false },
@@ -96,6 +96,9 @@ function mkReq(): NormRequest {
 		harnessId: "",
 		ompSessionId: "",
 		agentdoxScope: "",
+		agentdoxGroup: "",
+		agentdoxPersonal: "",
+		agentdoxOrigin: "",
 		isSubagent: false,
 		requestedModel: "auto",
 		messages: [{ role: "user", text: "hi", images: 0, textBytes: 2, toolCalls: [] }],
@@ -722,6 +725,41 @@ describe("agentdox injection sees the shape of the turn", () => {
 		expect(store.load(req.conversationKey).contextVersion).toBe("v1");
 	});
 
+	test("the layer headers and the harness id reach resolve, and the harness id reaches the record", async () => {
+		// The team front door names the group and personal scopes in headers and
+		// the member in X-Omp-Harness; the turn carries all three through
+		// unchanged. A router without a team passes empties (see the other tests
+		// in this file, whose mkReq has none).
+		const { router, upstream, ledger, store, sink, errors } = oneDispatch();
+		const inputs: ContextResolveInput[] = [];
+		const records: TurnRecord[] = [];
+		const bridge: ContextBridge = {
+			enabled: true,
+			resolve: (input) => {
+				inputs.push(input);
+				return Promise.resolve(null);
+			},
+			recordTurn: (rec) => {
+				records.push(rec);
+			},
+			flush: () => Promise.resolve(),
+			pruneBlocks: () => 0,
+			close: () => {},
+		};
+		const req: NormRequest = { ...mkReq(), harnessId: "u_ada", agentdoxScope: "proj", agentdoxGroup: "group.g1", agentdoxPersonal: "proj.u.u_ada", tools: [AGENT_TOOL] };
+
+		await runTurn(req, sink, { config: mkConfig({ enabled: false }), router, upstream, ledger, conversations: store, catalog, context: bridge }, new AbortController().signal);
+
+		expect(errors).toHaveLength(0);
+		expect(inputs).toHaveLength(1);
+		expect(inputs[0]?.scope).toBe("proj");
+		expect(inputs[0]?.group).toBe("group.g1");
+		expect(inputs[0]?.personal).toBe("proj.u.u_ada");
+		expect(inputs[0]?.user).toBe("u_ada");
+		expect(records).toHaveLength(1);
+		expect(records[0]?.harnessId).toBe("u_ada");
+	});
+
 	test("context.injectWithoutTools restores injection into tool-less calls", async () => {
 		const { router, upstream, ledger, store, sink, errors } = oneDispatch();
 		const { bridge, resolves } = mkServingBridge();

package/tools/agentdox-e2e.ts

@@ -44,6 +44,7 @@ const bridge = createContextBridge({
 	docsLimit: 0,
 	sessionLimit: 6,
 	briefChars: 12_000,
+	layers: true,
 	recordTurns: true,
 	maxQueue: 64,
 });
@@ -58,6 +59,9 @@ function input(over: Partial<ContextResolveInput> = {}): ContextResolveInput {
 		modelSwitching: false,
 		retrying: false,
 		query: "cache prompt context injection",
+		group: "",
+		personal: "",
+		user: "",
 		firstFetch: true,
 		...over,
 	};
@@ -93,6 +97,7 @@ check(
 bridge.recordTurn({
 	scope,
 	conversationKey,
+	harnessId: "",
 	title: `bridge e2e ${conversationKey}`,
 	userText: "does the bridge record which model served this turn?",
 	assistantText: "yes - refs carry model: and tier:.",
@@ -135,6 +140,7 @@ function loopDispatch(assistantText: string, turnEnded: boolean): void {
 	bridge.recordTurn({
 		scope,
 		conversationKey: loopKey,
+		harnessId: "",
 		title: loopTitle,
 		userText: "why did cache read fall?",
 		assistantText,

package/tools/replay.ts

@@ -197,6 +197,9 @@ function requestOf(row: Row, f: Features): NormRequest {
 		harnessId: row.harness_id,
 		ompSessionId: "",
 		agentdoxScope: "",
+		agentdoxGroup: "",
+		agentdoxPersonal: "",
+		agentdoxOrigin: "",
 		isSubagent: false,
 		requestedModel: row.requested_model,
 		messages,