auto-model-router 0.16.0 → 0.18.0

package/test/models-yml.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, test } from "bun:test";
 import { parse as parseYaml } from "yaml";
 
 import { loadConfig } from "../src/config/load.ts";
+import { ORIGIN_ENV, SCOPE_ENV } from "../src/context/scope.ts";
 import {
 	BEGIN_GUARD,
 	END_GUARD,
@@ -68,6 +69,15 @@ describe("renderProviderBlock", () => {
 		expect(BLOCK).toContain("auth: none");
 		expect(BLOCK).toContain("/v1");
 	});
+
+	test("with the bridge on, the scope and origin headers name the variables the extension sets", () => {
+		// The file is machine-wide, so neither can be a literal: omp resolves a
+		// header value that names an env var per request (src/context/scope.ts).
+		const bridged = renderProviderBlock(loadConfig({ overrides: { context: { enabled: true, baseUrl: "http://agentdox:3003", token: "t" } } }), null);
+		expect(bridged).toContain(`X-Agentdox-Scope: ${SCOPE_ENV}`);
+		expect(bridged).toContain(`X-Agentdox-Origin: ${ORIGIN_ENV}`);
+		expect(BLOCK).not.toContain("X-Agentdox-");
+	});
 });
 
 describe("spliceProviderBlock", () => {

package/test/remote.test.ts

@@ -6,7 +6,7 @@ import { join } from "node:path";
 import { addExtensions, codexBlock, connectRemote, setDotenv, type ConnectOptions } from "../src/cli/connect.ts";
 import { parseRemoteRouter, readRemoteRouter, remoteProviderRegistration } from "../omp-extension/remote-logic.ts";
 import { existingBlockScope, hasForeignRouterProvider, mergeModelsYml, renderRemoteModelsYml } from "../src/cli/connect.ts";
-import { SCOPE_ENV } from "../src/context/scope.ts";
+import { ORIGIN_ENV, SCOPE_ENV } from "../src/context/scope.ts";
 import { refreshAndRewrite, refreshCredential, RefreshError, resolveRefreshToken, shouldRefresh } from "../src/cli/refresh.ts";
 import { loadRefreshToken, pickStore, removeRefreshToken, saveRefreshToken } from "../src/cli/credential-store.ts";
 import { hasRefresh, refreshAccountOf } from "../omp-extension/remote-logic.ts";
@@ -31,6 +31,9 @@ describe("remote-logic", () => {
 		// the machine with the right context; the remote may still override it.
 		expect(reg.headers["X-Agentdox-Scope"]).toBeUndefined();
 		expect(remoteProviderRegistration(t, "", false, { inputPerMtok: 1, outputPerMtok: 4 }, "omp-router").headers).toEqual({ "X-Agentdox-Scope": "omp-router" });
+		// The repository fingerprint rides beside the scope, and only when there is one.
+		expect(remoteProviderRegistration(t, "", false, { inputPerMtok: 1, outputPerMtok: 4 }, "omp-router", "github.com/drewappling/omp-router").headers).toEqual({ "X-Agentdox-Scope": "omp-router", "X-Agentdox-Origin": "github.com/drewappling/omp-router" });
+		expect(remoteProviderRegistration(t, "", false, { inputPerMtok: 1, outputPerMtok: 4 }, "", "github.com/drewappling/omp-router").headers).toEqual({ "X-Agentdox-Origin": "github.com/drewappling/omp-router" });
 		const dir = mkdtempSync(join(tmpdir(), "amr-remote-"));
 		expect(readRemoteRouter(dir)).toBeNull();
 		writeFileSync(join(dir, "remote.json"), JSON.stringify({ url: "https://t", key: "k" }));
@@ -126,12 +129,16 @@ describe("omp models.yml for a remote router", () => {
 		// Machine-wide file: the header names the env var the extension sets per
 		// workspace, so the MAIN model's turns carry each repo's own scope.
 		expect(block).toContain(`X-Agentdox-Scope: ${SCOPE_ENV}`);
+		// The origin names its own variable the same way, on every block.
+		expect(block).toContain(`X-Agentdox-Origin: ${ORIGIN_ENV}`);
 		expect(existingBlockScope(mergeModelsYml("", block))).toBe("");
 		// --scope pins one slug for the whole machine.
 		const pinned = renderRemoteModelsYml("https://team.example", "k", BLEND, "omp-router");
 		expect(pinned).toContain("X-Agentdox-Scope: omp-router");
 		expect(pinned).not.toContain(SCOPE_ENV);
 		expect(existingBlockScope(mergeModelsYml("", pinned))).toBe("omp-router");
+		// A pinned scope does not pin an origin: the repository is still the workspace's.
+		expect(pinned).toContain(`X-Agentdox-Origin: ${ORIGIN_ENV}`);
 	});
 
 	test("merging keeps other providers, replaces our own block, and is idempotent", () => {

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", () => {
@@ -49,3 +49,56 @@ describe("the scope a request may name", () => {
 		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

@@ -98,6 +98,7 @@ function mkReq(): NormRequest {
 		agentdoxScope: "",
 		agentdoxGroup: "",
 		agentdoxPersonal: "",
+		agentdoxOrigin: "",
 		isSubagent: false,
 		requestedModel: "auto",
 		messages: [{ role: "user", text: "hi", images: 0, textBytes: 2, toolCalls: [] }],

package/tools/replay.ts

@@ -199,6 +199,7 @@ function requestOf(row: Row, f: Features): NormRequest {
 		agentdoxScope: "",
 		agentdoxGroup: "",
 		agentdoxPersonal: "",
+		agentdoxOrigin: "",
 		isSubagent: false,
 		requestedModel: row.requested_model,
 		messages,