auto-model-router 0.2.9 → 0.2.11

package/.omp-plugin/marketplace.json

@@ -7,14 +7,14 @@
   },
   "metadata": {
     "description": "auto-model-router: a local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter",
-    "version": "0.2.9",
+    "version": "0.2.11",
     "pluginRoot": "."
   },
   "plugins": [
     {
       "name": "auto-model-router",
       "description": "Local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter. Runs in-process, routes per turn by price and task complexity, with budget caps, mid-stream escalation, and cache-aware hysteresis.",
-      "version": "0.2.9",
+      "version": "0.2.11",
       "author": {
         "name": "drewappling",
         "email": "drewappling@gmail.com"

package/README.md

@@ -580,11 +580,19 @@ and brief:
 ```bash
 export AGENTDOX_URL=http://localhost:3003
 export AGENTDOX_TOKEN=<pat with read+write on the scope>
-export AGENTDOX_SCOPE=ashlands        # optional; the omp extension derives it from the workspace
+export AGENTDOX_SCOPE=ashlands        # fallback only; see below
 ```
 
 Setting a URL and a token is enough to turn it on.
 
+The scope is **derived per workspace** from the directory basename
+(`E:/projects/ashlands` → `ashlands`), and that derivation wins. `AGENTDOX_SCOPE` /
+`context.defaultScope` is only a fallback for workspaces it cannot resolve, because one router
+install serves every project on the machine — a slug pinned there would be sent for all of
+them, injecting one project's context into another's work. A single configured token also
+grants only the scopes it was minted for; for any other project the bridge degrades to inert
+rather than writing somewhere wrong.
+
 ### It does not cost you a cache miss per turn
 
 The context block sits at the front of the prompt, so re-fetching it every turn
@@ -620,6 +628,13 @@ shows which model produced which turn. Those messages feed back into the next
 `context_assemble`, so the model you switch *to* inherits what the model you
 switched *from* actually did.
 
+A recorded turn is the whole **user-visible** turn, not one record per upstream
+request. An agentic turn is a loop of dispatches — each tool round-trip finishes
+with `tool_calls` and emits almost no text, and the last user message does not
+move while the loop runs. So the router buffers the assistant's narration across
+the loop and writes it once, together with the closing synthesis, when the
+assistant actually yields back to the user.
+
 Write-backs are queued, bounded, and never awaited: agentdox is an enrichment,
 not a dependency. If it is unreachable the turn routes and dispatches normally,
 and a pinned block keeps being served.

package/docs/AGENTDOX-BRIDGE.md

@@ -1,7 +1,7 @@
 # agentdox bridge — handoff
 
-**Status:** implemented, typechecks clean, 409 tests pass, injection verified end-to-end
-through omp. **One open bug** in the write-back path (§5). Pick up there.
+**Status:** implemented, typechecks clean, 439 tests pass, injection verified end-to-end
+through omp. The write-back faults in §5 and §6 are **fixed**; `context.recordTurns` is on.
 
 Design rationale (why it is built this way):
 `E:/projects/agentdox/docs/architecture/router-context-bridge.md`.
@@ -86,44 +86,96 @@ Two more traps hit during this work:
 - Long-running interactive omp sessions hold their own embedded routers from whenever they
   started. Check `Get-Process omp` before trusting a result.
 
-## 5. OPEN BUG — assistant text is under-captured on the omp path
-
-**Verified working:** injection reaches the model through omp. The dispatched system message
-was confirmed to contain the block (`containsBlock=true`), and on a direct
-`/v1/chat/completions` dispatch the model answered *from* the injected memory, verbatim:
-
-> "The router pins one agentdox context block per conversation, refreshing it only on model
-> switches, retries, or TTL."
-
-**Broken:** through omp, the recorded assistant turn is near-empty — `assistantChars=4`
-(literally `" high"`) while omp displayed several paragraphs. The session and the model
-attribution (`refs: ["model:…", "tier:…"]`) are written correctly; only the assistant
-*content* is wrong.
-
-`assistantText` is accumulated in `src/server/turn.ts` from `ev.type === "text"` deltas
-inside the chunk loop. Leads, roughly in order of suspicion:
-
-1. **omp issues more than one upstream request per visible turn** (e.g. a title/summary call
-   on the `smol` role, which also resolves to `auto` → the router). The 4-char record may be
-   an auxiliary request, with the real answer on a different conversation key. Check by
-   logging `conversationKey` alongside the record line and counting turns per omp invocation.
-2. **Content arrives as `reasoning` deltas, not `text`**, for reasoning-capable models — the
-   accumulator deliberately ignores `reasoning`. If so, decide whether the transcript should
-   capture reasoning (probably not) or whether `text` is arriving under a chunk shape the
-   interpreter is not mapping to a `text` event.
-3. **Escalation resets the buffer.** `assistantText` is declared per attempt; if a turn
-   commits on a later attempt the earlier text is correctly dropped, but verify the committed
-   attempt is the one being recorded.
-
-Start by adding `conversationKey` and `attempt` to the `agentdox record turn` debug line and
-running one omp invocation — that distinguishes lead 1 from the others immediately.
-
-## 6. Also worth doing
-
-- **Context pollution.** `context_assemble` includes recent session messages, so recorded
-  test turns feed back into the next block (already observed: the block contained
-  `assistant:: high` from a prior run). Real usage is fine, but noisy test turns compound.
-  Consider a `sessionLimit` override for the bridge, or excluding router-authored sessions.
+## 5. FIXED — one record per dispatch, not per turn
+
+**Symptom:** through omp the recorded assistant turn was near-empty —
+`assistantChars=4` (literally `" high"`) while omp displayed several paragraphs. Session and
+model attribution (`refs: ["model:…", "tier:…"]`) were always correct; only the assistant
+*content* was wrong.
+
+**Root cause — none of the three leads originally listed here.** The text was not
+under-captured; the *wrong requests* were being recorded. A user-visible turn is not one
+upstream request, it is a whole tool loop of them. Live ledger proof, one conversation key,
+`wasted=0` and `attempt=0` on every row:
+
+| dispatch | `finish_reason` | `toolLoopDepth` | completion tokens |
+| --- | --- | --- | --- |
+| 1 | `tool_calls` | 0 | 339 |
+| 2–6 | `tool_calls` | 2, 4, 6, 8, 10 | 91, 68, 198, 78, 44 |
+| 7 | **`stop`** | 12 | **596** |
+| 8 | `tool_calls` | 0 *(next turn)* | 167 |
+
+Each tool round-trip is its own dispatch, finishing with `tool_calls` and emitting almost no
+`text` — the payload is tool calls. `" high"` was a stray word of preamble, a *complete*
+record of a fragment rather than a truncated answer. Only the final `stop` dispatch carries
+the synthesis. `recordTurn` fired on all ~13, and the last writer won.
+
+The same root cause explains half the duplication in §7: `lastUserText` walks back to the last
+`user` message, which does **not** move while a tool loop runs, so the identical user text was
+appended once per round-trip too.
+
+**Fix.** `TurnRecord` gained `turnEnded` (`finishReason !== "tool_calls"`, set in
+`src/server/turn.ts`). The bridge buffers assistant fragments per conversation in a
+process-local map and flushes **once**, when the assistant yields back to the user, writing
+the loop's narration plus the closing synthesis as one message. Bounded by
+`MAX_PENDING_CHARS` / `MAX_PENDING_CONVERSATIONS`, since a turn that dies without a terminal
+dispatch never flushes. The terminal dispatch is appended past the char cap, so the model's
+actual answer is never what gets dropped.
+
+Covered by `test/context-bridge.test.ts` (loop records one turn; a running loop writes
+nothing; interleaved conversations buffer independently) and `test/turn.test.ts` (the
+`tool_calls` → `turnEnded=false` wiring). All four were verified to FAIL against the old
+behavior. `tools/agentdox-e2e.ts` step 6 proves it against a live server: four dispatches →
+exactly one user and one assistant message.
+
+## 6. FIXED — harness utility calls, and the scope that leaked across projects
+
+Two further faults surfaced the moment `recordTurns` was first switched on, both found by
+reading what actually landed in agentdox.
+
+**Utility calls were recorded as turns.** omp drives more than the agent through this
+provider: it asks for a conversation title and a complexity rating, with `model: auto`, over
+the same embedded router. Those answer *about* a conversation rather than participating in
+one, and they finish with `stop`, so `turnEnded` alone does not exclude them. Three junk
+sessions appeared immediately:
+
+| recorded assistant text | what it really was |
+| --- | --- |
+| `high` | omp's complexity rating — **this is the original `" high"`** |
+| `<title>Read memory and resume work</title>` | omp's title generation |
+| `<title>Resume settlement 2D slice 3 streaming</title>` | omp's title generation |
+
+The discriminator is the tool array: an agent always ships its tool schemas (`toolCount` 12,
+prompts of 60k–90k), while utility calls ship none (`toolCount` 0, prompts of 222–841,
+`task=chat`). `src/server/turn.ts` therefore records only when `req.tools.length > 0`. A
+deliberately tool-less session is not transcribed — silence beats garbage, because every junk
+record is re-injected into every later turn.
+
+**`defaultScope` leaked one project's slug to all of them.** `omp-extension/embed-logic.ts`
+resolved the header as `defaultScope !== "" ? defaultScope : derive(cwd)`, so a *scope-agnostic
+global* overrode the *per-workspace* derivation. One router install serves every workspace, so
+with `defaultScope: omp-router` set, an **ashlands** session shipped
+`X-Agentdox-Scope: omp-router`: it injected omp-router's context into ashlands work and filed
+ashlands turns under omp-router. The server always treated the field as a fallback ("the
+configured default covers harnesses that send none"), so the two sides disagreed about the same
+field. Now the workspace derivation wins and `defaultScope` is its fallback, matching the name
+and the server. Same failure class as the `.mcp.json` lesson: a scope-specific value must never
+live in a scope-agnostic file.
+
+One consequence worth knowing: `context.token` is a single PAT, but a machine-wide router
+serves N scopes. The omp-router PAT gets `403 no read access to scope "ashlands"`, so with the
+scope now correct the bridge degrades to **inert** for other projects. Correct and safe, but it
+means the bridge only helps projects the configured token actually grants. A multi-scope token
+would fix that, at the cost of one credential reaching every project.
+
+## 7. Also worth doing
+
+- **Context pollution from test turns.** `context_assemble` includes recent session messages,
+  so router test turns feed back into the next block. The omp-router scope had accumulated 19
+  sessions of which 18 were noise (`hi`, `say hello`, `Reply with exactly the word: PONG`,
+  injection probes, `bridge e2e …`); they were deleted, and `tools/agentdox-e2e.ts` writes two
+  more every run. Consider a `sessionLimit` override for the bridge, or excluding
+  router-authored sessions.
 - **`context.timeoutMs` is 3000ms** and failures degrade silently at `debug` level by design.
   If agentdox is cold this can no-op invisibly. Consider logging the first failure at `warn`.
 - **Four copies of this project exist** on this machine: this repo, the research checkout,

package/omp-extension/embed-logic.ts

@@ -65,8 +65,9 @@ export interface EmbedConfig {
  *
  * The workspace basename is the one identifier that is already stable, already
  * per-project, and requires no configuration — the same convention agentdox's
- * own `project_ensure` slugs follow. An explicitly configured
- * `context.defaultScope` always wins over this.
+ * own `project_ensure` slugs follow. It WINS over `context.defaultScope`,
+ * which is a fallback for workspaces it cannot resolve; see
+ * `buildProviderConfig`.
  */
 export function deriveAgentdoxScope(cwd: string): string {
 	// Both separators: omp reports a Windows cwd with backslashes.
@@ -165,7 +166,16 @@ export function buildProviderConfig(
 		out.harnessId = cfg.server.harnessId;
 	}
 	if (cfg.context?.enabled === true) {
-		const scope = cfg.context.defaultScope !== "" ? cfg.context.defaultScope : deriveAgentdoxScope(cwd ?? "");
+		// The WORKSPACE wins. `defaultScope` is a scope-agnostic global — one
+		// router install serves every project on the machine — so letting it
+		// override the per-workspace derivation sends one project's slug for all
+		// of them: an ashlands session shipped `X-Agentdox-Scope: omp-router`,
+		// which both injected the wrong project's context and filed its turns
+		// under the wrong scope. The server treats this field as a fallback too
+		// ("the configured default covers harnesses that send none"), so the two
+		// sides now agree: most specific signal first.
+		const derived = deriveAgentdoxScope(cwd ?? "");
+		const scope = derived !== "" ? derived : cfg.context.defaultScope;
 		if (scope !== "") out.agentdoxScope = scope;
 	}
 	return out;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auto-model-router",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "private": false,
   "description": "Local cost/complexity-aware model router for Oh My Pi, backed by OpenRouter",
   "type": "module",

package/src/context/bridge.ts

@@ -49,6 +49,29 @@ function renderBlock(raw: string, maxChars: number): string {
 	].join("\n");
 }
 
+/**
+ * Cap on assistant text buffered for one in-flight turn, chars. A memory guard
+ * only, not a quality knob: a 200-round-trip loop must not buffer without
+ * limit. The dispatch that ENDS the turn is appended past this cap, so the
+ * model's actual answer is never the thing that gets dropped.
+ */
+const MAX_PENDING_CHARS = 64_000;
+
+/**
+ * Cap on conversations buffering fragments at once. A turn that dies without a
+ * terminal dispatch (client disconnect, upstream error) leaves its buffer
+ * behind, so this map is bounded rather than trusted to drain.
+ */
+const MAX_PENDING_CONVERSATIONS = 64;
+
+/** Appends a mid-loop fragment, bounded. Blank-line joined: separate thoughts. */
+function appendFragment(prior: string, next: string): string {
+	if (next === "") return prior;
+	if (prior === "") return next.slice(0, MAX_PENDING_CHARS);
+	if (prior.length >= MAX_PENDING_CHARS) return prior;
+	return `${prior}\n\n${next}`.slice(0, MAX_PENDING_CHARS);
+}
+
 export function createContextBridge(opts: BridgeOptions): ContextBridge {
 	const { client, store, log, maxStalenessMs, maxBlockChars, recordTurns, maxQueue } = opts;
 
@@ -57,6 +80,10 @@ export function createContextBridge(opts: BridgeOptions): ContextBridge {
 	let queue: Promise<void> = Promise.resolve();
 	let queued = 0;
 	let closed = false;
+	// Assistant text buffered across an in-flight tool loop, keyed by
+	// conversation. Process-local by design: a turn never spans a restart, and
+	// losing a buffer whose turn already died costs nothing.
+	const pending = new Map<string, string>();
 
 	const shouldRefresh = (input: ContextResolveInput, pin: ContextPin | null): boolean => {
 		if (pin === null) return true;
@@ -115,7 +142,34 @@ export function createContextBridge(opts: BridgeOptions): ContextBridge {
 
 		recordTurn(rec: TurnRecord) {
 			if (!recordTurns || closed || rec.scope === "") return;
-			if (rec.userText === "" && rec.assistantText === "") return;
+
+			// Mid-loop dispatch: keep the fragment and wait for the turn to end.
+			// Writing here is what produced ~13 near-empty assistant messages per
+			// turn plus ~13 copies of an unchanged user message, which both lost
+			// the real answer and poisoned later context assembly.
+			if (!rec.turnEnded) {
+				if (rec.assistantText === "") return;
+				const prior = pending.get(rec.conversationKey);
+				if (prior === undefined && pending.size >= MAX_PENDING_CONVERSATIONS) {
+					log.debug("agentdox pending transcript budget full; dropping fragment", { conversations: pending.size });
+					return;
+				}
+				pending.set(rec.conversationKey, appendFragment(prior ?? "", rec.assistantText));
+				return;
+			}
+
+			// Turn over. Flush the whole loop's narration plus this dispatch's
+			// synthesis as ONE assistant message, attributed to the served model.
+			const buffered = pending.get(rec.conversationKey) ?? "";
+			pending.delete(rec.conversationKey);
+			const assistantText =
+				buffered === ""
+					? rec.assistantText
+					: rec.assistantText === ""
+						? buffered
+						: `${buffered}\n\n${rec.assistantText}`;
+
+			if (rec.userText === "" && assistantText === "") return;
 			if (queued >= maxQueue) {
 				log.debug("agentdox write-back queue full; dropping turn record", { queued });
 				return;
@@ -134,7 +188,7 @@ export function createContextBridge(opts: BridgeOptions): ContextBridge {
 					// every turn shows WHICH model produced it.
 					const refs = [`model:${rec.slug}`, `tier:${rec.tier}`];
 					if (rec.userText !== "") await client.append(sessionId, "user", rec.userText, []);
-					if (rec.assistantText !== "") await client.append(sessionId, "assistant", rec.assistantText, refs);
+					if (assistantText !== "") await client.append(sessionId, "assistant", assistantText, refs);
 				})
 				.catch((err: unknown) => {
 					log.debug("agentdox write-back failed", { error: err instanceof Error ? err.message : String(err) });
@@ -150,6 +204,7 @@ export function createContextBridge(opts: BridgeOptions): ContextBridge {
 
 		close() {
 			closed = true;
+			pending.clear();
 		},
 	};
 }

package/src/context/types.ts

@@ -49,10 +49,23 @@ export interface TurnRecord {
 	/** Title used if this is the first turn and a session must be created. */
 	title: string;
 	userText: string;
+	/** Text THIS dispatch produced. Fragments are joined across a tool loop. */
 	assistantText: string;
 	/** The slug that actually served the turn — the model attribution. */
 	slug: string;
 	tier: string;
+	/**
+	 * Whether the assistant yielded control back to the user — i.e. the upstream
+	 * finish reason was NOT `tool_calls`.
+	 *
+	 * A user-visible turn is many dispatches: every tool round-trip is its own
+	 * request, and only the last carries the model's synthesis. The intermediate
+	 * ones are almost pure tool calls with a few stray words of text, and the
+	 * last *user* message does not move while the loop runs. False therefore
+	 * means "buffer this fragment, the turn is still running" — recording it as
+	 * a turn would write a near-empty answer and re-append the same user text.
+	 */
+	turnEnded: boolean;
 }
 
 export interface ContextBridge {

package/src/server/turn.ts

@@ -448,22 +448,38 @@ export async function runTurn(
 
 		// Record the settled turn into agentdox, attributed to the model that
 		// actually served it. Queued and never awaited: the transcript is an
-		// artifact of the turn, not a precondition for finishing it.
-		if (doxActive) {
+		// artifact of the turn, not a precondition for finishing it. A
+		// `tool_calls` finish means the assistant is still working, so the bridge
+		// buffers the fragment rather than writing a near-empty turn.
+		//
+		// Only the agent's WORKING conversation is transcribed. A harness also
+		// drives utility calls through this same provider with `model: auto` —
+		// omp asks for a conversation title and a complexity rating — and those
+		// answer ABOUT a conversation instead of participating in one, which is
+		// where the junk records (`high`, `<title>…</title>`) came from. They are
+		// single-shot and carry NO tool schemas, while an agent always ships its
+		// tools, so the tool array is the discriminator. A deliberately
+		// tool-less session is therefore not transcribed: silence beats garbage,
+		// because every junk record is re-injected into every later turn.
+		if (doxActive && req.tools.length > 0) {
+			const userText = lastUserText(req);
+			const turnEnded = finishReason !== "tool_calls";
 			log.debug("agentdox record turn", {
-				userChars: lastUserText(req).length,
+				conversationKey: req.conversationKey.slice(0, 8),
+				userChars: userText.length,
 				assistantChars: assistantText.length,
-				messages: req.messages.length,
-				roles: req.messages.map((m) => m.role).join(","),
+				finishReason,
+				turnEnded,
 			});
 			bridge.recordTurn({
 				scope: doxScope,
 				conversationKey: req.conversationKey,
 				title: sessionTitle(req),
-				userText: lastUserText(req),
+				userText,
 				assistantText,
 				slug: servedSlug ?? decision.slug,
 				tier: decision.tier,
+				turnEnded,
 			});
 		}
 

package/test/context-bridge.test.ts

@@ -3,7 +3,7 @@ import { describe, expect, test } from "bun:test";
 import type { AgentDoxClient } from "../src/context/agentdox.ts";
 import { createContextBridge } from "../src/context/bridge.ts";
 import { createContextStore } from "../src/context/store.ts";
-import type { ContextResolveInput } from "../src/context/types.ts";
+import type { ContextResolveInput, TurnRecord } from "../src/context/types.ts";
 import { createLogger } from "../src/util/log.ts";
 import { openDb } from "../src/util/sqlite.ts";
 import { injectForTest } from "./helpers/inject.ts";
@@ -246,6 +246,7 @@ describe("context bridge write-back", () => {
 				assistantText: "done",
 				slug: "anthropic/claude-haiku-4.5",
 				tier: "simple",
+				turnEnded: true,
 			});
 			bridge.recordTurn({
 				scope: "ashlands",
@@ -255,6 +256,7 @@ describe("context bridge write-back", () => {
 				assistantText: "ok",
 				slug: "anthropic/claude-opus-4.5",
 				tier: "hard",
+				turnEnded: true,
 			});
 			await bridge.flush();
 
@@ -280,6 +282,7 @@ describe("context bridge write-back", () => {
 				assistantText: "a",
 				slug: "x",
 				tier: "simple",
+				turnEnded: true,
 			});
 			await bridge.flush();
 			expect(client.appended).toHaveLength(0);
@@ -287,6 +290,96 @@ describe("context bridge write-back", () => {
 			db.close();
 		}
 	});
+
+	/** One dispatch of a turn; `turnEnded` marks the one that yields to the user. */
+	function mkRecord(over: Partial<TurnRecord> & { turnEnded: boolean }): TurnRecord {
+		return {
+			scope: "ashlands",
+			conversationKey: "k1",
+			title: "movement fix",
+			userText: "fix movement",
+			assistantText: "",
+			slug: "z-ai/glm-5.3-flash",
+			tier: "simple",
+			...over,
+		};
+	}
+
+	test("a tool loop records one turn, not one record per dispatch", async () => {
+		const client = mkClient();
+		const { bridge, db } = mkBridge(client);
+		try {
+			// One user-visible turn: five tool round-trips, then the synthesis.
+			// Every dispatch carries the SAME unchanged user text — recording per
+			// dispatch appended it once per round-trip and buried the real answer
+			// under near-empty assistant messages.
+			for (const assistantText of ["let me look", "", "checking the ledger", "", "almost there"]) {
+				bridge.recordTurn(mkRecord({ assistantText, turnEnded: false }));
+			}
+			bridge.recordTurn(mkRecord({ assistantText: "fixed: the damping was inverted.", turnEnded: true }));
+			await bridge.flush();
+
+			expect(client.sessionsCreated).toBe(1);
+			const users = client.appended.filter((m) => m.role === "user");
+			const assistants = client.appended.filter((m) => m.role === "assistant");
+			expect(users).toHaveLength(1);
+			expect(assistants).toHaveLength(1);
+			// The loop's narration AND the closing synthesis survive, in order.
+			expect(assistants[0]?.content).toBe(
+				"let me look\n\nchecking the ledger\n\nalmost there\n\nfixed: the damping was inverted.",
+			);
+			expect(assistants[0]?.refs).toEqual(["model:z-ai/glm-5.3-flash", "tier:simple"]);
+		} finally {
+			db.close();
+		}
+	});
+
+	test("a tool loop still running writes nothing", async () => {
+		const client = mkClient();
+		const { bridge, db } = mkBridge(client);
+		try {
+			bridge.recordTurn(mkRecord({ assistantText: "let me look", turnEnded: false }));
+			await bridge.flush();
+			// The assistant has not answered yet. Writing here is what produced the
+			// 4-char transcripts, so mid-loop must stay silent.
+			expect(client.appended).toHaveLength(0);
+			expect(client.sessionsCreated).toBe(0);
+		} finally {
+			db.close();
+		}
+	});
+
+	test("interleaved conversations buffer independently", async () => {
+		const client = mkClient();
+		const { bridge, db } = mkBridge(client);
+		try {
+			bridge.recordTurn(mkRecord({ conversationKey: "k1", assistantText: "k1 narration", turnEnded: false }));
+			bridge.recordTurn(mkRecord({ conversationKey: "k2", assistantText: "k2 narration", turnEnded: false }));
+			bridge.recordTurn(mkRecord({ conversationKey: "k2", assistantText: "k2 answer", turnEnded: true }));
+			bridge.recordTurn(mkRecord({ conversationKey: "k1", assistantText: "k1 answer", turnEnded: true }));
+			await bridge.flush();
+
+			const assistants = client.appended.filter((m) => m.role === "assistant");
+			expect(assistants).toHaveLength(2);
+			expect(assistants[0]?.content).toBe("k2 narration\n\nk2 answer");
+			expect(assistants[1]?.content).toBe("k1 narration\n\nk1 answer");
+		} finally {
+			db.close();
+		}
+	});
+
+	test("a silent turn still records the user message", async () => {
+		const client = mkClient();
+		const { bridge, db } = mkBridge(client);
+		try {
+			bridge.recordTurn(mkRecord({ assistantText: "", turnEnded: true }));
+			await bridge.flush();
+			expect(client.appended.filter((m) => m.role === "user")).toHaveLength(1);
+			expect(client.appended.filter((m) => m.role === "assistant")).toHaveLength(0);
+		} finally {
+			db.close();
+		}
+	});
 });
 
 describe("context injection into the wire body", () => {

package/test/embed-logic.test.ts

@@ -115,7 +115,11 @@ describe("agentdox scope", () => {
 		expect(deriveAgentdoxScope("")).toBe("");
 	});
 
-	test("an explicit defaultScope wins over the derived one", () => {
+	test("the workspace derivation wins over the scope-agnostic defaultScope", () => {
+		// Regression: one router install serves every project on the machine, so a
+		// global `defaultScope` overriding the derivation made an ashlands session
+		// ship `X-Agentdox-Scope: omp-router` — wrong context injected, turns
+		// filed under the wrong project.
 		const base = {
 			server: { host: "127.0.0.1" },
 			profiles: [],
@@ -123,8 +127,11 @@ describe("agentdox scope", () => {
 		};
 		const derived = buildProviderConfig(1234, { ...base, context: { enabled: true, defaultScope: "" } }, "/x/ashlands");
 		expect(derived.agentdoxScope).toBe("ashlands");
-		const explicit = buildProviderConfig(1234, { ...base, context: { enabled: true, defaultScope: "pinned" } }, "/x/ashlands");
-		expect(explicit.agentdoxScope).toBe("pinned");
+		const both = buildProviderConfig(1234, { ...base, context: { enabled: true, defaultScope: "omp-router" } }, "/x/ashlands");
+		expect(both.agentdoxScope).toBe("ashlands");
+		// The default only applies when the workspace yields nothing.
+		const fallback = buildProviderConfig(1234, { ...base, context: { enabled: true, defaultScope: "pinned" } }, "");
+		expect(fallback.agentdoxScope).toBe("pinned");
 	});
 
 	test("no scope header when the bridge is off", () => {

package/test/turn.test.ts

@@ -1,5 +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 { 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";
@@ -553,3 +554,80 @@ describe("exploration reaches the ledger", () => {
 		expect(entries[0]?.exploredFrom).toBeNull();
 	});
 });
+
+describe("agentdox write-back sees the shape of the turn", () => {
+	/** An agent ships its tool schemas; a harness utility call does not. */
+	const AGENT_TOOL = { name: "read", description: "read a file", schemaBytes: 128 };
+
+	function mkRecordingBridge(): { bridge: ContextBridge; records: TurnRecord[] } {
+		const records: TurnRecord[] = [];
+		return {
+			records,
+			bridge: {
+				enabled: true,
+				resolve: () => Promise.resolve(null),
+				recordTurn: (rec) => {
+					records.push(rec);
+				},
+				flush: () => Promise.resolve(),
+				close: () => {},
+			},
+		};
+	}
+
+	test("a tool_calls finish is a fragment; only a yielding finish ends the turn", async () => {
+		// A user-visible turn is many dispatches. The orchestrator must tell the
+		// bridge which one actually handed control back, or the transcript records
+		// a near-empty answer per tool round-trip and re-appends the same user
+		// text every time.
+		const { router } = mkRouter([
+			mkDecision("simple", "cheap/model", { escalateTo: null }),
+			mkDecision("simple", "cheap/model", { escalateTo: null }),
+		]);
+		const { upstream } = mkUpstream([
+			{ kind: "chunks", chunks: [startChunk("cheap/model"), textChunk("let me look"), finishChunk("tool_calls"), usageChunk({}, 0.0001)] },
+			{ kind: "chunks", chunks: [startChunk("cheap/model"), textChunk("all done"), finishChunk("stop"), usageChunk({}, 0.0001)] },
+		]);
+		const { ledger } = mkLedger();
+		const { store } = mkConversations();
+		const { sink, errors } = mkSink();
+		const { bridge, records } = mkRecordingBridge();
+		// doxActive needs a scope; the request header supplies it. The tool
+		// schemas mark this as the agent's working conversation.
+		const req: NormRequest = { ...mkReq(), agentdoxScope: "proj", tools: [AGENT_TOOL] };
+		const deps = { config: mkConfig({ enabled: false }), router, upstream, ledger, conversations: store, catalog, context: bridge };
+
+		await runTurn(req, sink, deps, new AbortController().signal);
+		await runTurn(req, sink, deps, new AbortController().signal);
+
+		expect(errors).toHaveLength(0);
+		expect(records).toHaveLength(2);
+		expect(records[0]?.turnEnded).toBe(false);
+		expect(records[0]?.assistantText).toBe("let me look");
+		expect(records[1]?.turnEnded).toBe(true);
+		expect(records[1]?.assistantText).toBe("all done");
+	});
+
+	test("a harness utility call is never transcribed", async () => {
+		// omp drives title generation and complexity rating through this same
+		// provider with `model: auto`. They answer ABOUT the conversation
+		// ("high", "<title>…</title>") and carry NO tool schemas. Recording them
+		// created junk agentdox sessions that then fed back into every later
+		// context block.
+		const { router } = mkRouter([mkDecision("trivial", "cheap/model", { escalateTo: null })]);
+		const { upstream } = mkUpstream([
+			{ kind: "chunks", chunks: [startChunk("cheap/model"), textChunk("high"), finishChunk("stop"), usageChunk({}, 0.0001)] },
+		]);
+		const { ledger } = mkLedger();
+		const { store } = mkConversations();
+		const { sink, errors } = mkSink();
+		const { bridge, records } = mkRecordingBridge();
+		// Same scope, same provider — only the absent tool array differs.
+		const req: NormRequest = { ...mkReq(), agentdoxScope: "proj", tools: [] };
+
+		await runTurn(req, sink, { config: mkConfig({ enabled: false }), router, upstream, ledger, conversations: store, catalog, context: bridge }, new AbortController().signal);
+
+		expect(errors).toHaveLength(0);
+		expect(records).toHaveLength(0);
+	});
+});

package/tools/agentdox-e2e.ts

@@ -93,6 +93,7 @@ bridge.recordTurn({
 	assistantText: "yes - refs carry model: and tier:.",
 	slug: "anthropic/claude-haiku-4.5",
 	tier: "simple",
+	turnEnded: true,
 });
 await bridge.flush();
 
@@ -118,6 +119,52 @@ if (mine !== undefined) {
 	);
 }
 
+// 6. A tool loop must record ONE turn, not one record per dispatch. This is the
+//    regression that made transcripts useless: every tool round-trip is its own
+//    dispatch, finishing with `tool_calls` and carrying an UNCHANGED last user
+//    message, so recording per dispatch wrote a near-empty assistant message
+//    and a duplicate user message per round-trip.
+const loopKey = `${conversationKey}-loop`;
+const loopTitle = `bridge e2e loop ${loopKey}`;
+function loopDispatch(assistantText: string, turnEnded: boolean): void {
+	bridge.recordTurn({
+		scope,
+		conversationKey: loopKey,
+		title: loopTitle,
+		userText: "why did cache read fall?",
+		assistantText,
+		slug: "z-ai/glm-5.3-flash",
+		tier: "simple",
+		turnEnded,
+	});
+}
+for (const fragment of ["reading the ledger", "", "checking the cache column"]) loopDispatch(fragment, false);
+loopDispatch("the breakpoint index drifted every turn.", true);
+await bridge.flush();
+
+const loopRes = await fetch(`${baseUrl}/sessions?scope=${encodeURIComponent(scope)}`, {
+	headers: { authorization: `Bearer ${token}` },
+});
+const loopSessions = (await loopRes.json()) as { id: string; title: string }[];
+const loopSession = loopSessions.find((s) => s.title === loopTitle);
+check("tool loop created a session", loopSession !== undefined, loopSession?.id ?? "not found");
+
+if (loopSession !== undefined) {
+	const full = await fetch(`${baseUrl}/sessions/${loopSession.id}`, {
+		headers: { authorization: `Bearer ${token}` },
+	});
+	const session = (await full.json()) as { messages: { role: string; content: string }[] };
+	const users = session.messages.filter((m) => m.role === "user");
+	const assistants = session.messages.filter((m) => m.role === "assistant");
+	check("four dispatches wrote exactly one user message", users.length === 1, `${users.length} user messages`);
+	check("four dispatches wrote exactly one assistant message", assistants.length === 1, `${assistants.length} assistant messages`);
+	check(
+		"the loop's narration and the closing synthesis both survive",
+		assistants[0]?.content === "reading the ledger\n\nchecking the cache column\n\nthe breakpoint index drifted every turn.",
+		JSON.stringify(assistants[0]?.content ?? ""),
+	);
+}
+
 db.close();
 console.log(failures === 0 ? "\nAll bridge e2e checks passed." : `\n${failures} check(s) failed.`);
 process.exit(failures === 0 ? 0 : 1);