dsh-auto-model-routing 0.4.1 → 0.4.2

package/lib/client.js

@@ -140,6 +140,7 @@ window.__ModuleLoader__.load({
 			const [view, setView] = (0, react.useState)(void 0);
 			const [open, setOpen] = (0, react.useState)(false);
 			const [error, setError] = (0, react.useState)("");
+			const exposureTarget = (0, react.useRef)(null);
 			const alive = (0, react.useRef)(true);
 			(0, react.useEffect)(() => () => {
 				alive.current = false;
@@ -158,6 +159,44 @@ window.__ModuleLoader__.load({
 				sessionId,
 				messageId
 			]);
+			(0, react.useEffect)(() => {
+				const target = exposureTarget.current;
+				if (view?.policy !== "policy-v2" || !target || typeof IntersectionObserver === "undefined") return;
+				let visible = false, sent = false;
+				let timer;
+				const update = () => {
+					clearTimeout(timer);
+					timer = void 0;
+					if (!sent && visible && document.visibilityState === "visible" && document.hasFocus()) timer = setTimeout(() => {
+						if (!visible || document.visibilityState !== "visible" || !document.hasFocus()) return;
+						sent = true;
+						rpc.call("/api", "auto-model-routing.observe", {
+							sessionId,
+							messageId
+						}).catch(() => {});
+					}, 3e3);
+				};
+				const observer = new IntersectionObserver((entries) => {
+					visible = entries.some((entry) => entry.isIntersecting && entry.intersectionRatio >= 1);
+					update();
+				}, { threshold: 1 });
+				observer.observe(target);
+				document.addEventListener("visibilitychange", update);
+				window.addEventListener("focus", update);
+				window.addEventListener("blur", update);
+				return () => {
+					clearTimeout(timer);
+					observer.disconnect();
+					document.removeEventListener("visibilitychange", update);
+					window.removeEventListener("focus", update);
+					window.removeEventListener("blur", update);
+				};
+			}, [
+				view?.policy,
+				rpc,
+				sessionId,
+				messageId
+			]);
 			if (!view) return null;
 			const choose = (label) => {
 				setOpen(false);
@@ -181,7 +220,7 @@ window.__ModuleLoader__.load({
 				"aria-label": tooltipText(view),
 				onClick: () => setOpen((value) => !value)
 			}, (0, react.createElement)(ui.Icon));
-			return (0, react.createElement)("span", null, (0, react.createElement)("style", null, CSS$3), (0, react.createElement)(ui.Menu, {
+			return (0, react.createElement)("span", { ref: exposureTarget }, (0, react.createElement)("style", null, CSS$3), (0, react.createElement)(ui.Menu, {
 				open,
 				side: "top",
 				portal: true,
@@ -1083,6 +1122,7 @@ window.__ModuleLoader__.load({
 		// src/client/index.ts
 		const name = "dsh-auto-model-routing/client";
 		const inject = ["slots", "connection"];
+		const REPO_URL = "https://github.com/prgrmrwy/dsh-auto-model-routing";
 		const CSS = `
 .amr-root{position:relative;min-width:0;display:inline-flex}
 .amr-trigger{display:flex;align-items:center;gap:4px;height:28px;padding:0 4px 0 8px;border:none;outline:none;background:0 0;border-radius:var(--dsw-radius-sm);color:var(--dsw-alias-label-secondary);font-size:13px;font-weight:400;line-height:20px;cursor:pointer;white-space:nowrap}
@@ -1090,6 +1130,11 @@ window.__ModuleLoader__.load({
 .amr-trigger:focus-visible{box-shadow:0 0 0 2px var(--dsw-focus-ring-color,var(--dsw-alias-state-business-primary))}
 .amr-trigger:disabled{color:var(--dsw-alias-label-dimmed);cursor:default}
 .amr-icon{flex:none;color:var(--dsw-alias-label-caption)}
+.amr-trigger[data-locked=true]{color:var(--dsw-alias-label-dimmed);cursor:default}
+.amr-trigger[data-locked=true]:hover{background:0 0}
+.amr-info{color:var(--dsw-alias-label-caption)}
+.amr-card a{color:var(--dsw-alias-state-business-primary);text-decoration:none;overflow-wrap:anywhere}
+.amr-card a:hover{text-decoration:underline}
 .amr-trigger[data-disabled=true],.amr-trigger[data-disabled=true] .amr-icon{color:var(--dsw-alias-state-error-primary)}
 .amr-panel{position:absolute;z-index:1100;bottom:100%;left:0;padding-bottom:6px}
 .amr-card{width:280px;padding:10px 12px;border-radius:var(--dsw-radius-md);background:var(--dsw-alias-bg,#fff);color:var(--dsw-alias-label-primary);box-shadow:var(--dsw-elevation-prominent);font-size:12px;line-height:18px}
@@ -1101,7 +1146,7 @@ window.__ModuleLoader__.load({
 `;
 		function SwapIcon() {
 			return (0, react.createElement)("svg", {
-				className: "amr-icon",
+				className: "amr-icon amr-swap",
 				width: 14,
 				height: 14,
 				viewBox: "0 0 16 16",
@@ -1113,7 +1158,7 @@ window.__ModuleLoader__.load({
 				"aria-hidden": true
 			}, (0, react.createElement)("path", { d: "M3 5.5h9.5M10 3l2.5 2.5L10 8" }), (0, react.createElement)("path", { d: "M13 10.5H3.5M6 8l-2.5 2.5L6 13" }));
 		}
-		function RoutingChip({ sessionId, rpc, initialView, initiallyOpen = false, initialToast }) {
+		function RoutingChip({ sessionId, rpc, initialView, initiallyOpen = false, initialToast, subscribeSelection }) {
 			const [view, setView] = (0, react.useState)(initialView);
 			const [open, setOpen] = (0, react.useState)(initiallyOpen);
 			const [busy, setBusy] = (0, react.useState)(false);
@@ -1152,6 +1197,32 @@ window.__ModuleLoader__.load({
 				const hide = setTimeout(() => setToast(void 0), TOAST_MS);
 				return () => clearTimeout(hide);
 			}, [toast]);
+			const refreshRef = (0, react.useRef)(() => {});
+			const subscription = (0, react.useRef)(void 0);
+			const subscribeRef = (0, react.useRef)(void 0);
+			subscribeRef.current = subscribeSelection;
+			const ensureSubscription = () => {
+				const subscribe = subscribeRef.current;
+				if (!subscribe || subscription.current?.sessionId === sessionId) return;
+				subscription.current?.stop();
+				subscription.current = void 0;
+				let handle;
+				try {
+					const stop = subscribe(sessionId, () => {
+						if (handle) clearTimeout(handle);
+						handle = setTimeout(() => refreshRef.current(), 80);
+					});
+					subscription.current = {
+						sessionId,
+						stop: () => {
+							stop();
+							if (handle) clearTimeout(handle);
+						}
+					};
+				} catch {
+					subscription.current = void 0;
+				}
+			};
 			(0, react.useEffect)(() => {
 				let active = true;
 				primed.current = false;
@@ -1164,17 +1235,22 @@ window.__ModuleLoader__.load({
 							viewSession.current = sessionId;
 							setView(value);
 							setError("");
+							ensureSubscription();
 						}
 					}, (reason) => {
 						if (active) setError(String(reason));
 					});
 				};
+				refreshRef.current = refresh;
 				refresh();
 				const poll = setInterval(refresh, 3e3);
 				return () => {
 					active = false;
 					clearInterval(poll);
 					clearTimeout(timer.current);
+					subscription.current?.stop();
+					subscription.current = void 0;
+					refreshRef.current = () => {};
 				};
 			}, [rpc, sessionId]);
 			const on = (event) => () => {
@@ -1198,10 +1274,60 @@ window.__ModuleLoader__.load({
 			};
 			const off = view?.disabled;
 			const hint = off ? CATEGORY_HINTS[off.category] ?? off.category : void 0;
+			const locked = view?.autoSupport?.supported === false;
+			const support = view?.autoSupport;
+			const lockedModel = `${support?.provider ?? "未知 provider"} / ${support?.model ?? "未知模型"}`;
 			const place = anchor.current ?? {
 				left: typeof window === "undefined" ? 0 : window.innerWidth / 2,
 				top: (typeof window === "undefined" ? 0 : window.innerHeight) - 96
 			};
+			const panel = locked ? [
+				(0, react.createElement)("p", { key: "locked-title" }, (0, react.createElement)("strong", null, "AUTO 不支持当前模型")),
+				(0, react.createElement)("p", { key: "locked-model" }, `${lockedModel} 不在自动路由支持范围，已切换为 MANUAL。`),
+				(0, react.createElement)("p", { key: "locked-note" }, "目前仅支持 Claude / GPT 系列模型；其他模型策略欢迎提交 issue 或 PR："),
+				(0, react.createElement)("p", { key: "locked-link" }, (0, react.createElement)("a", {
+					href: REPO_URL,
+					target: "_blank",
+					rel: "noopener noreferrer"
+				}, REPO_URL)),
+				(0, react.createElement)("p", {
+					key: "locked-hint",
+					className: "amr-muted"
+				}, "切回 Claude / GPT 系列模型后，可重新点击启用 AUTO。"),
+				error && (0, react.createElement)("p", {
+					key: "error",
+					role: "alert",
+					className: "amr-error"
+				}, error)
+			] : [
+				(0, react.createElement)("p", { key: "title" }, (0, react.createElement)("strong", null, view?.mode === "AUTO" ? "自动调整推理强度" : "手动：不自动调整")),
+				(0, react.createElement)("p", { key: "output" }, `本回合插件输出：${view?.effort ?? "未改写"} · ${view?.reason ?? "尚无决定"}`),
+				view?.decision && (0, react.createElement)("div", {
+					key: "latest",
+					className: "amr-latest"
+				}, (0, react.createElement)("p", null, (0, react.createElement)("strong", null, "最近决策")), ...toastText(view.decision).map((line, index) => (0, react.createElement)("p", {
+					key: index,
+					className: index ? "amr-muted" : void 0
+				}, line))),
+				(0, react.createElement)("p", {
+					key: "policy",
+					className: "amr-muted"
+				}, view?.policy === "policy-v2" ? `AUTO · ${view.depth ?? "尚无判断"}；主模型不变，推理投入按请求应用；子任务自动选配。` : "AUTO 的决定会同步到右侧模型选择；要手动指定 effort，请先切到 MANUAL。"),
+				off && (0, react.createElement)("p", {
+					key: "disabled",
+					role: "status",
+					className: "amr-error"
+				}, `Jev 停用（${off.category}）：${hint}。${new Date(off.at).toLocaleString()}。点击 AUTO 重试。`),
+				(0, react.createElement)("p", {
+					key: "data",
+					className: "amr-muted"
+				}, "AUTO 会把脱敏任务文本发送给设置中所选的决策服务判档。"),
+				error && (0, react.createElement)("p", {
+					key: "error",
+					role: "alert",
+					className: "amr-error"
+				}, error)
+			];
 			return (0, react.createElement)("span", {
 				ref: (el) => {
 					rootRef.current = el;
@@ -1217,13 +1343,19 @@ window.__ModuleLoader__.load({
 				className: "amr-trigger",
 				disabled: busy || !view,
 				onClick: () => {
+					if (locked) return;
 					toggle();
 				},
 				"data-disabled": off ? "true" : void 0,
+				"data-locked": locked ? "true" : void 0,
+				"aria-disabled": locked ? "true" : void 0,
 				style: { border: "none" },
-				title: off ? `Jev 判档已停用：${hint}。点击 AUTO 重试` : "点击切换自动推理强度",
-				"aria-label": `推理强度模式：${view?.mode ?? "加载中"}，点击切换`
-			}, (0, react.createElement)("span", null, off ? `${view?.mode} · Jev 停用` : view?.mode ?? "…"), (0, react.createElement)(SwapIcon)), toast && !open && (typeof document === "undefined" ? (0, react.createElement)("div", {
+				title: locked ? "AUTO 仅支持 Claude / GPT 系列模型；悬停查看说明" : off ? `Jev 判档已停用：${hint}。点击 AUTO 重试` : "点击切换自动推理强度",
+				"aria-label": locked ? `推理强度模式：${view?.mode ?? "MANUAL"}（AUTO 不支持当前模型，不可切换）` : `推理强度模式：${view?.mode ?? "加载中"}，点击切换`
+			}, (0, react.createElement)("span", null, locked ? view?.mode ?? "MANUAL" : off ? `${view?.mode} · Jev 停用` : view?.mode ?? "…"), locked ? (0, react.createElement)(_deepseek_ai_dsh_client_ui_primitives.IconInfoOutlineRegular, {
+				size: 14,
+				className: "amr-icon amr-info"
+			}) : (0, react.createElement)(SwapIcon)), toast && !open && (typeof document === "undefined" ? (0, react.createElement)("div", {
 				className: "amr-toast",
 				role: "status",
 				style: { pointerEvents: "none" }
@@ -1244,16 +1376,7 @@ window.__ModuleLoader__.load({
 			}, line))), document.body)), open && (0, react.createElement)("section", {
 				className: "amr-panel",
 				"aria-label": "自动路由状态"
-			}, (0, react.createElement)("div", { className: "amr-card" }, (0, react.createElement)("p", null, (0, react.createElement)("strong", null, view?.mode === "AUTO" ? "自动调整推理强度" : "手动：不自动调整")), (0, react.createElement)("p", null, `本回合插件输出：${view?.effort ?? "未改写"} · ${view?.reason ?? "尚无决定"}`), view?.decision && (0, react.createElement)("div", { className: "amr-latest" }, (0, react.createElement)("p", null, (0, react.createElement)("strong", null, "最近决策")), ...toastText(view.decision).map((line, index) => (0, react.createElement)("p", {
-				key: index,
-				className: index ? "amr-muted" : void 0
-			}, line))), (0, react.createElement)("p", { className: "amr-muted" }, view?.policy === "policy-v2" ? `AUTO · ${view.depth ?? "尚无判断"}；主模型不变，推理投入按请求应用；子任务自动选配。` : "AUTO 的决定会同步到右侧模型选择；要手动指定 effort，请先切到 MANUAL。"), off && (0, react.createElement)("p", {
-				role: "status",
-				className: "amr-error"
-			}, `Jev 停用（${off.category}）：${hint}。${new Date(off.at).toLocaleString()}。点击 AUTO 重试。`), (0, react.createElement)("p", { className: "amr-muted" }, "AUTO 会把脱敏任务文本发送给设置中所选的决策服务判档。"), error && (0, react.createElement)("p", {
-				role: "alert",
-				className: "amr-error"
-			}, error))));
+			}, (0, react.createElement)("div", { className: "amr-card" }, ...panel)));
 		}
 		const labelUi = {
 			Tooltip: _deepseek_ai_dsh_client_ui_primitives.Tooltip,
@@ -1261,6 +1384,25 @@ window.__ModuleLoader__.load({
 			Icon: _deepseek_ai_dsh_client_ui_primitives.IconGaugeOutlineRegular
 		};
 		function apply(ctx) {
+			const pickerSubscriber = { current: void 0 };
+			const subscribeSelection = (id, onChange) => pickerSubscriber.current ? pickerSubscriber.current(id, onChange) : () => {};
+			try {
+				const inject = ctx.inject;
+				if (typeof inject === "function") inject.call(ctx, ["modelDirectories"], (scope) => {
+					const service = scope.modelDirectories;
+					if (!service) return;
+					pickerSubscriber.current = (id, onChange) => {
+						try {
+							return service.directoryFor(id).store.subscribe(onChange);
+						} catch {
+							return () => {};
+						}
+					};
+					return () => {
+						pickerSubscriber.current = void 0;
+					};
+				});
+			} catch {}
 			ctx.slots.inject("settings.section", () => ctx.slots.register({
 				name: "settings.section",
 				id: "auto-model-routing",
@@ -1288,7 +1430,8 @@ window.__ModuleLoader__.load({
 				order: -10,
 				inject: (sessionId) => ({
 					sessionId,
-					rpc: ctx.connection.rpc
+					rpc: ctx.connection.rpc,
+					subscribeSelection
 				})
 			}, RoutingChip));
 		}

package/lib/endpoints.d.ts

@@ -4,6 +4,7 @@ import type { RoutingState } from './state.js';
 import { type Tier } from './effort.js';
 import type { TurnRecord } from './judgements.js';
 export declare function endpoint(operation: 'state' | 'setMode', body: unknown, resolveAgent: (id: string) => Promise<AgentRef | undefined>, router: Router, state: RoutingState, toastOn?: () => boolean): Promise<Response>;
+export declare function observeEndpoint(body: unknown, resolveAgent: (id: string) => Promise<AgentRef | undefined>, book: FeedbackBook, warn: () => void): Promise<Response>;
 export interface LabelBook {
     lookup(sessionId: string, messageId: string): TurnRecord | undefined;
     label(sessionId: string, turn: number, label: Tier): void;

package/lib/endpoints.js

@@ -15,6 +15,25 @@ export async function endpoint(operation, body, resolveAgent, router, state, toa
     const decision = router.judgement(sessionId);
     return Response.json({ ...state.read(sessionId), ...router.status(agent), ...(decision ? { decision } : {}), ...(toastOn() ? { decisionToast: true } : {}) });
 }
+export async function observeEndpoint(body, resolveAgent, book, warn) {
+    if (typeof body !== 'object' || body === null)
+        return Response.json({ error: 'invalid request' }, { status: 400 });
+    const { sessionId, messageId } = body;
+    if (typeof sessionId !== 'string' || !sessionId || typeof messageId !== 'string' || !messageId)
+        return Response.json({ error: 'invalid request' }, { status: 400 });
+    const agent = await resolveAgent(sessionId);
+    if (!agent || agent.origin === 'subagent')
+        return Response.json({ error: 'unknown ordinary session' }, { status: 404 });
+    const binding = book.lookup(sessionId, messageId);
+    if (binding)
+        try {
+            book.fact(sessionId, binding.decisionId, 'exposed');
+        }
+        catch {
+            warn();
+        }
+    return Response.json({});
+}
 /** Query (no `label`) or label the judged turn a reply belongs to (design D13). */
 export async function labelEndpoint(body, resolveAgent, book, feedbackBook) {
     if (typeof body !== 'object' || body === null)

package/lib/feedback.d.ts

@@ -30,11 +30,24 @@ declare const schema: z.ZodObject<{
     }>>>;
     feedbackAt: z.ZodOptional<z.ZodNumber>;
 }, z.core.$strict>;
+declare const factEvent: z.ZodObject<{
+    type: z.ZodLiteral<"fact">;
+    version: z.ZodLiteral<1>;
+    sessionId: z.ZodString;
+    decisionId: z.ZodNumber;
+    fact: z.ZodEnum<{
+        exposed: "exposed";
+        "manual-switch": "manual-switch";
+    }>;
+    at: z.ZodNumber;
+}, z.core.$strict>;
+export type FeedbackFact = z.infer<typeof factEvent>['fact'];
 export type FeedbackRecord = z.infer<typeof schema>;
 /** Immutable decision bindings and separate feedback events; never includes task text or credentials. */
 export declare class FeedbackBook {
     private file;
     private records;
+    private factRecords;
     constructor(file: string);
     private key;
     lookup(sessionId: string, messageId: string): {
@@ -90,6 +103,11 @@ export declare class FeedbackBook {
     }[];
     bind(record: FeedbackRecord): void;
     set(sessionId: string, messageId: string, feedback: typeof allocationFeedback[number] | null): void;
+    facts(sessionId: string, decisionId: number): {
+        exposed?: number;
+        "manual-switch"?: number;
+    };
+    fact(sessionId: string, decisionId: number, fact: FeedbackFact): void;
     private append;
 }
 export {};

package/lib/feedback.js

@@ -11,10 +11,12 @@ const snapshot = z.object({
 }).strict();
 const schema = z.object({ sessionId: z.string(), messageId: z.string(), decisionId: z.number(), depth: z.string(), model: z.string(), effort: z.string(), snapshot: snapshot.optional(), boundAt: z.number().optional(), feedback: z.enum(allocationFeedback).nullable().optional(), feedbackAt: z.number().optional() }).strict();
 const feedbackEvent = z.object({ type: z.literal('feedback'), version: z.literal(2), sessionId: z.string(), messageId: z.string(), decisionId: z.number(), at: z.number(), feedback: z.enum(allocationFeedback).nullable() }).strict();
+const factEvent = z.object({ type: z.literal('fact'), version: z.literal(1), sessionId: z.string().min(1), decisionId: z.number(), fact: z.enum(['exposed', 'manual-switch']), at: z.number().finite() }).strict();
 /** Immutable decision bindings and separate feedback events; never includes task text or credentials. */
 export class FeedbackBook {
     file;
     records = new Map();
+    factRecords = new Map();
     constructor(file) {
         this.file = file;
         let text;
@@ -29,6 +31,15 @@ export class FeedbackBook {
         for (const line of text.split('\n'))
             try {
                 const raw = JSON.parse(line);
+                const fact = factEvent.safeParse(raw);
+                if (fact.success) {
+                    const e = fact.data;
+                    const key = JSON.stringify([e.sessionId, e.decisionId]);
+                    const facts = this.factRecords.get(key) ?? {};
+                    facts[e.fact] ??= e.at;
+                    this.factRecords.set(key, facts);
+                    continue;
+                }
                 const event = feedbackEvent.safeParse(raw);
                 if (event.success) {
                     const e = event.data;
@@ -63,5 +74,15 @@ export class FeedbackBook {
         this.append(event);
         this.records.set(this.key(sessionId, messageId), { ...r, feedback, feedbackAt: event.at });
     }
+    facts(sessionId, decisionId) { return { ...this.factRecords.get(JSON.stringify([sessionId, decisionId])) }; }
+    fact(sessionId, decisionId, fact) {
+        const key = JSON.stringify([sessionId, decisionId]);
+        const facts = this.factRecords.get(key) ?? {};
+        if (facts[fact] !== undefined)
+            return;
+        const event = factEvent.parse({ type: 'fact', version: 1, sessionId, decisionId, fact, at: Date.now() });
+        this.append(event);
+        this.factRecords.set(key, { ...facts, [fact]: event.at });
+    }
     append(record) { mkdirSync(dirname(this.file), { recursive: true }); appendFileSync(this.file, JSON.stringify(record) + '\n', { mode: 0o600 }); }
 }

package/lib/index.js

@@ -4,7 +4,7 @@ import { settingsHost } from './settings-host.js';
 import { homedir } from 'node:os';
 import { FileStateStore, RoutingState } from './state.js';
 import { Router } from './router.js';
-import { endpoint, labelEndpoint } from './endpoints.js';
+import { endpoint, labelEndpoint, observeEndpoint } from './endpoints.js';
 import { FeedbackBook } from './feedback.js';
 import { JudgementBook } from './judgements.js';
 import { userInput } from './input.js';
@@ -13,6 +13,7 @@ import { routeSubagentTool } from './subagent-tool.js';
 import { buildState, previousTurn } from './context.js';
 import { policyHost } from './policy-host.js';
 import { PolicyStore } from './policy-store.js';
+import { currentMainSelection, mainSupported } from './support.js';
 export const name = 'dsh-auto-model-routing';
 export const inject = ['llm', 'agents', 'tools'];
 const knownEfforts = new Set(['low', 'medium', 'high', 'xhigh', 'max']);
@@ -36,15 +37,22 @@ export function apply(ctx, config = {}) {
         }
     }, () => settings.read().settings);
     const feedback = new FeedbackBook(resolve(home, 'state/auto-model-routing/allocation-feedback.jsonl'));
-    const policy = policyHost(ctx, { feedback, jev, state, store: new PolicyStore(resolve(home, 'state/auto-model-routing/policy-v2')), settings: () => settings.read().settings, catalog: () => hostSettings.catalog(true) });
+    // Official writer is available only while the session controller is mounted.
+    let selectModel;
+    const policy = policyHost(ctx, { feedback, jev, state, selectModel: async (request) => { if (!selectModel)
+            throw new Error('session controller is unavailable'); await selectModel(request); }, store: new PolicyStore(resolve(home, 'state/auto-model-routing/policy-v2')), settings: () => settings.read().settings, catalog: () => hostSettings.catalog(true) });
     const toastOn = () => settings.read().settings.decisionToast;
     ctx.effect(() => ctx.tools.register(routeSubagentTool(jev, { agents: ctx.agents, state, readSettings: () => settings.read().settings, catalog: hostSettings.catalog, judged: (sessionId, value) => router.judged(sessionId, value) })));
     ctx.on('agent/created', ({ agent, source }) => {
         // Factory resume announces `resume`; a nonzero initial seed also excludes restored/forked histories.
         if (source !== 'startup' || agent.session.header.origin === 'subagent' || agent.session.firstLiveSeq !== 0 || agent.session.header.isSeeded || agent.session.snapshotEvents().some(event => event.type === 'session/end-seed') || stateFiles.get(agent.id))
             return;
-        if (settings.read().settings.defaultMode === 'AUTO')
-            state.setMode(agent.id, 'AUTO');
+        if (settings.read().settings.defaultMode !== 'AUTO')
+            return;
+        // A new session whose default main model is outside AUTO's Claude/GPT scope starts in MANUAL.
+        if (!mainSupported(currentMainSelection(ctx, agent)))
+            return;
+        state.setMode(agent.id, 'AUTO');
         return undefined;
     });
     // Agent is the WeakMap identity; origin stays on the immutable session header.
@@ -89,7 +97,6 @@ export function apply(ctx, config = {}) {
         book.assistant(session.id, data.message.id, data.turn);
     });
     // Official selection writer, set while the session controller is available.
-    let selectModel;
     const inflight = new Map();
     ctx.on('agent/request', async (payload, next) => {
         const config = await next();
@@ -119,7 +126,7 @@ export function apply(ctx, config = {}) {
         child.effect(() => () => { selectModel = undefined; });
     });
     ctx.inject(['connection', 'sessionController'], child => {
-        for (const operation of ['state', 'setMode', 'label', 'settings', 'saveSettings', 'setKey', 'testDecision', 'childRouting']) {
+        for (const operation of ['state', 'setMode', 'label', 'observe', 'settings', 'saveSettings', 'setKey', 'testDecision', 'childRouting']) {
             child.effect(() => child.connection.fetch.register({
                 path: `/api/auto-model-routing.${operation}`,
                 methods: ['POST'], requestBody: 'buffered',
@@ -139,12 +146,21 @@ export function apply(ctx, config = {}) {
                         const result = await child.sessionController.resolveAgent(id);
                         return 'agent' in result ? ref(result.agent) : undefined;
                     };
+                    const resolveSessionAgent = async (id) => {
+                        const result = await child.sessionController.resolveAgent(id);
+                        return 'agent' in result ? result.agent : undefined;
+                    };
                     const payload = enveloped ? wire.payload : body;
+                    let manualDecision;
                     if (operation === 'setMode' && typeof payload?.sessionId === 'string') {
                         const id = payload.sessionId;
                         const mode = payload.mode;
-                        if ((mode === 'AUTO' || mode === 'MANUAL') && state.read(id).mode !== mode && await resolveAgent(id))
+                        if ((mode === 'AUTO' || mode === 'MANUAL') && state.read(id).mode !== mode && await resolveAgent(id)) {
+                            const decisionId = policy.appliedDecision(id);
+                            if (mode === 'MANUAL' && decisionId !== undefined)
+                                manualDecision = { sessionId: id, decisionId };
                             policy.invalidate(id);
+                        }
                     }
                     const response = operation === 'childRouting'
                         ? (typeof payload?.sessionId === 'string'
@@ -152,12 +168,30 @@ export function apply(ctx, config = {}) {
                             : Response.json({ error: 'invalid request' }, { status: 400 }))
                         : operation === 'settings' || operation === 'saveSettings' || operation === 'setKey' || operation === 'testDecision'
                             ? await hostSettings.endpoint(operation, payload)
-                            : operation === 'label' ? await labelEndpoint(payload, resolveAgent, book, feedback) : await endpoint(operation, payload, resolveAgent, router, state, toastOn);
+                            : operation === 'observe' ? await observeEndpoint(payload, resolveAgent, feedback, () => ctx.logger.warn('auto-model-routing: could not record exposure'))
+                                : operation === 'label' ? await labelEndpoint(payload, resolveAgent, book, feedback) : await endpoint(operation, payload, resolveAgent, router, state, toastOn);
+                    if (manualDecision && response.ok) {
+                        try {
+                            feedback.fact(manualDecision.sessionId, manualDecision.decisionId, 'manual-switch');
+                        }
+                        catch {
+                            ctx.logger.warn('auto-model-routing: could not record MANUAL switch');
+                        }
+                    }
                     if ((operation === 'state' || operation === 'setMode') && response.ok && settings.read().settings.policy === 'policy-v2') {
+                        const sessionId = payload.sessionId;
+                        const agent = await resolveSessionAgent(sessionId).catch(() => undefined);
+                        const selection = agent ? currentMainSelection(ctx, agent) : undefined;
+                        const supported = mainSupported(selection);
+                        // Leaving AUTO is persisted: a pick outside the Claude/GPT scope must not keep judging turns.
+                        if (!supported && state.read(sessionId).mode === 'AUTO') {
+                            state.setMode(sessionId, 'MANUAL');
+                            policy.invalidate(sessionId);
+                        }
                         const value = await response.json();
-                        const main = policy.mainStatus(payload.sessionId);
+                        const main = policy.mainStatus(sessionId);
                         const { decision: _legacyDecision, effort: _legacyEffort, reason: _legacyReason, history: _legacyHistory, ...base } = value;
-                        const result = { ...base, history: [], policy: 'policy-v2', ...main };
+                        const result = { ...base, mode: state.read(sessionId).mode, history: [], policy: 'policy-v2', ...main, autoSupport: { supported, ...(selection ? { provider: selection.provider, model: selection.model } : {}) } };
                         return Response.json(enveloped ? { type: 'server-response', rpcId: wire.rpcId, result: { ok: true, value: result } } : result);
                     }
                     if (!enveloped)

package/lib/policy-host.d.ts

@@ -5,6 +5,12 @@ import { PolicyStore, type ChildDecision } from './policy-store.js';
 import type { RoutingState } from './state.js';
 import type { RoutingCatalog, Settings } from './settings-contract.js';
 export declare function policyHost(ctx: Context, deps: {
+    selectModel: (request: {
+        sessionId: string;
+        provider: string;
+        model: string;
+        reasoningEffort: string;
+    }) => Promise<unknown>;
     feedback: FeedbackBook;
     jev: JevClient;
     state: RoutingState;
@@ -12,6 +18,7 @@ export declare function policyHost(ctx: Context, deps: {
     settings: () => Settings;
     catalog: () => Promise<RoutingCatalog>;
 }): {
+    appliedDecision: (id: string) => number | undefined;
     invalidate: (id: string) => void;
     status: (id: string) => {
         version: 1;
@@ -23,7 +30,7 @@ export declare function policyHost(ctx: Context, deps: {
         status: "failed" | "recommended" | "unsupported" | "needs-context" | "applied";
         path: "ordinary" | "fork" | "teammate";
         explicit: {
-            provider: "claude" | "codex" | "dsh-magpie-connect";
+            provider: "claude" | "codex" | "dsh-magpie-connect" | "dsh-magpie-connector";
             model?: string | undefined;
             reasoningEffort?: string | undefined;
         };
@@ -47,12 +54,12 @@ export declare function policyHost(ctx: Context, deps: {
             capabilityProbabilities?: Record<string, number> | undefined;
         } | undefined;
         route?: {
-            provider: "claude" | "codex" | "dsh-magpie-connect";
+            provider: "claude" | "codex" | "dsh-magpie-connect" | "dsh-magpie-connector";
             model: string;
             reasoningEffort: "low" | "medium" | "high" | "xhigh";
         } | undefined;
         actual?: {
-            provider: "claude" | "codex" | "dsh-magpie-connect";
+            provider: "claude" | "codex" | "dsh-magpie-connect" | "dsh-magpie-connector";
             model: string;
             reasoningEffort: "low" | "medium" | "high" | "xhigh";
         } | undefined;