dsh-model-switch 0.4.28 → 0.4.29

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.4.29
+
+The experimental "随对话更新的标题" bundle (`dsh-experimental-session-titles-bundle`) no longer fails to enable while this plugin is active: the naming row now takes over the single provider slot the bundle's row competes for, mirrors that row's cadence, and keeps the configurable naming route working.
+
+- **What broke.** Enabling the bundle produced `1 entry did not activate optional-session-title-all-prompts (@deepseek-ai/dsh-session-title-all-prompts-llm): session-title provider "session-title-first-prompt-llm" is already registered`. DSH 0.2.1's session-title service accepts exactly one registered provider, and this row already owned that slot with its mirrored first-prompt provider. The bundle's patch inserts its all-prompts row **after** this plugin's patch layer, so the static `- id: optional-session-title-all-prompts` disable this plugin ships can never reach a row that does not exist yet when that layer applies.
+- **Fix: the row now takes the slot over instead of colliding (`src/session-title.ts`).** It mirrors the official row that exists in the tree — all-prompts winning whenever the experimental row is composed, first-prompt otherwise — and it watches `loader/patch-context`, which the loader runs inside the official entry before that entry's plugin `apply`. When an official naming row is about to register, this row yields the slot first (the service lets a registration be replaced once its disposer ran), so the official `register()` **succeeds** and the loader reports no failed activation; it then disables that row through the public `Entry.update({ disabled: true })` (which disposes the row's fiber and closes its registration) and claims the slot back under the row's cadence. A bounded retry absorbs the cases where the loader has not created the row's fiber yet, and an initial sweep handles the reverse composition order (an official row that activated before this row started). Only seams the loader already publishes are used: the `loader/patch-context` waterfall, `Entry.update`, and `sessionTitle.register` plus its disposer.
+- **User-visible behavior.** Enabling the bundle: titles now update with every prompt **and** the configured naming model / provider-group route keeps applying (the provider id recorded with each title is `session-title-all-prompts-llm`, matching what the official row would record). Disabling the bundle: the first-prompt cadence comes back with the same route override. A Host that changes activation timing degrades to "the official provider serves naming, one explicit log line" rather than a crash or a wrong route.
+- **Verification.** `pnpm run check` green (53 test files / 466 tests + pack gate). New coverage: the all-prompts row wins the mirror, the takeover yields before the official registration and reclaims the slot with the mirrored cadence, repeat patch-context events are idempotent, an already-active row is swept, and no official row keeps today's single first-prompt registration. Real published packages on `0.2.1-rc.2` (the real `dsh-session-title` service plus the real `dsh-session-title-all-prompts-llm` apply): the official row registers with **no** `already registered` error, the displaced row is disabled through `Entry.update`, the plugin owns the slot again, and the live provider is `session-title-all-prompts-llm` / `all-prompts`.
+- **Residual (honest).** The takeover choreographs released loader seams rather than a dedicated "supersede this provider" API; `docs/seam-gap.md` records the missing seam and the upstream proposal (a decorate/replace registration or a multi-provider slot). The reverse direction — disabling the bundle at runtime without a profile restart — re-claims through `loader/partial-dispose` where the loader emits it, and otherwise needs the restart DSH already asks for on bundle changes.
+
 ## v0.4.28
 
 Two fixes for the same DSH `0.2.1-rc.2` line: re-enabling the plugin on 0.2.1 made **every tool call fail before its body ran**, and the Subagent routing adapter that 0.4.26 had to fail closed is adapted to the release's activation API.

package/PRODUCT.md

@@ -33,4 +33,4 @@ Official `settings.section` has no icon field. The Settings nav glyph is a label
 
 ## Delivery architecture
 
-The package foundation and pure deep modules remain the policy/test surface. Runtime delivery disables the independent Subagent Loader row with its official name and inserts a uniquely identified replacement; the experimental auto-review row is disabled the same way and replaced by `dsh-model-switch/auto-review`, which mounts the official gate's `apply` unchanged as a plugin under a scoped `llm` shadow — the Host resolves the gate's own `inject` list (including 0.2.1's `workingDirectory`), one `registerAuto` runs, and only when the profile started with the optional auto-review bundle. Official AgentPresets stay mounted so they share the process `dsh-scope` identity. Search uses the released `ctx.web.registerSearchProvider()` seam so official tool ownership is preserved. Image uses a unique tool name and provider-owned authenticated adapters. Self-maintained Codex/Grok plugins register optional adapters through the public Model Switch service when present; standalone provider behavior is unchanged. Vision remains disabled. Replacement modules preserve the official public interfaces and fail closed when compatibility or capability validation fails.
+The package foundation and pure deep modules remain the policy/test surface. Runtime delivery disables the independent Subagent Loader row with its official name and inserts a uniquely identified replacement; the experimental auto-review row is disabled the same way and replaced by `dsh-model-switch/auto-review`, which mounts the official gate's `apply` unchanged as a plugin under a scoped `llm` shadow — the Host resolves the gate's own `inject` list (including 0.2.1's `workingDirectory`), one `registerAuto` runs, and only when the profile started with the optional auto-review bundle. Session naming replaces the official `session-title-llm` row and owns the service's single provider slot; it mirrors the official cadence the profile declares — first-prompt by default, and the all-prompts cadence whenever the experimental session-titles bundle inserts its row — so enabling that bundle keeps both the per-prompt title refresh and this plugin's configurable naming route, while disabling it restores the first-prompt cadence. The takeover only uses released loader seams (the `loader/patch-context` waterfall, `Entry.update`, and `sessionTitle.register` plus its disposer) and degrades to the official provider with one explicit log line if a future Host changes activation timing. Official AgentPresets stay mounted so they share the process `dsh-scope` identity. Search uses the released `ctx.web.registerSearchProvider()` seam so official tool ownership is preserved. Image uses a unique tool name and provider-owned authenticated adapters. Self-maintained Codex/Grok plugins register optional adapters through the public Model Switch service when present; standalone provider behavior is unchanged. Vision remains disabled. Replacement modules preserve the official public interfaces and fail closed when compatibility or capability validation fails.

package/README.zh.md

@@ -119,6 +119,8 @@ DSH 会自动为新会话起名；命名的触发节奏由 profile 的官方命
 
 路由在**每次命名请求时现读**：保存后对下一次起名立即生效、无需重启，且进行中的命名请求不会被保存打断。每次请求按顺序解析路由：该会话供应商组里的命名对，其次卡片的部署级对，其次会话自身的模型。请求经由官方命名实现发出，它会把实际使用的 provider/model 记录到该会话自己的 `session/title-llm-request` 事件里，因此持久记录与真实请求永远一致。本插件替换官方的 `session-title-llm` 行而不分叉命名逻辑（该接缝每个上下文只允许注册一个命名 provider），并镜像该行声明的节奏；profile 没有官方命名行时保持 DSH 的确定性兜底标题。
 
+0.4.29 起与实验包「随对话更新的标题」（`dsh-experimental-session-titles-bundle`，插入 all-prompts 命名行）兼容：启用该实验包时，本插件接管同一个命名 provider 槽位并镜像 all-prompts 节奏，标题随对话更新，同时命名模型路由与供应商组路由继续生效（`session/title` 记录中的 provider id 为 `session-title-all-prompts-llm`，与官方行一致）；禁用实验包即回到首条提示节奏与同样的路由覆写。实现只使用 loader 已发布的缝（`loader/patch-context` 瀑布、`Entry.update`、`sessionTitle.register` 及其 disposer），让官方行先成功注册、再被停用并由本行重占槽位，因此启用时不再出现 `already registered` 激活失败弹窗。
+
 ## 供应商配置组（Provider groups）
 
 「供应商配置组」卡片为每个供应商保存一组路由——压缩、自动审查、会话命名与子代理四条路由一起存；为供应商 X 保存的组，作用于自身供应商就是 X 的会话。组是**推导出来的，而不是写进去的**：切换某个会话的供应商不写任何东西，因此不同供应商上的多个会话并行时再也不会互相覆盖、互相改写对方的辅助路由。

package/lib/session-title.js

@@ -148,19 +148,32 @@ function selectTitleMessages(messages, firstPromptOnly) {
 	if (first === void 0) throw new Error("first-prompt title provider requires one human message");
 	return [first];
 }
+/** The id the experimental session-titles bundle inserts for all-prompts naming. */
+const ALL_PROMPTS_ROW = "optional-session-title-all-prompts";
 /**
 * Locate the official session-title provider row in the loader tree.
+*
 * Disabled entries stay in the tree, so a name-matched disable still matches.
+* The all-prompts row wins when it is present: that row only exists while the
+* experimental session-titles bundle is composed, and its presence is exactly
+* the user's choice to update titles with every prompt. The default
+* first-prompt row is the fallback when that bundle is off.
 * @param loader - the host loader, when one is reachable.
-* @returns The official entry, or undefined when this profile has no such row.
+* @returns The official entry to mirror, or undefined when this profile has no such row.
 */
 function officialTitleEntry(loader) {
 	if (!loader) return void 0;
+	const allPrompts = TITLE_CADENCES[1];
+	const firstPrompt = TITLE_CADENCES[0];
+	let fallback;
 	for (const entry of loader.entries()) {
-		if (entry.id === OFFICIAL_TITLE_ROW) return entry;
+		if (entry.id === ALL_PROMPTS_ROW) return entry;
 		const pkg = entry.options?.name;
-		if (typeof pkg === "string" && TITLE_CADENCES.some((cadence) => cadence.pkg === pkg)) return entry;
+		if (typeof pkg === "string" && allPrompts !== void 0 && pkg === allPrompts.pkg) return entry;
+		if (fallback === void 0 && entry.id === OFFICIAL_TITLE_ROW) fallback = entry;
+		else if (fallback === void 0 && firstPrompt !== void 0 && pkg === firstPrompt.pkg) fallback = entry;
 	}
+	return fallback;
 }
 /**
 * Copy the official row's stored config, ignoring non-object payloads.
@@ -517,6 +530,214 @@ function currentSettings(ctx) {
 		return;
 	}
 }
+/** Resolve the naming plan for one official row, or the shipped defaults when no row exists. */
+function planFor(ctx, module, entry) {
+	const cadence = titleCadence(entry === void 0 ? void 0 : officialTitlePackage(entry)) ?? TITLE_CADENCES[0];
+	if (cadence === void 0) return void 0;
+	const forwarded = entry === void 0 ? {} : forwardedConfig(entry);
+	let policy;
+	try {
+		policy = resolveNamingPolicy(module, forwarded);
+	} catch (cause) {
+		ctx.logger.error("model-switch: the official session-title row has no valid naming policy; naming keeps the deterministic fallback");
+		ctx.logger.error(cause);
+		return;
+	}
+	return {
+		cadence,
+		config: policy.config,
+		targets: policy.targets
+	};
+}
+/** One naming plan bound to a live route resolver. */
+function providerOf(ctx, module, plan) {
+	return {
+		id: plan.cadence.id,
+		automatic: plan.cadence.automatic,
+		generate: (request) => generateTitle(ctx, module, plan, request)
+	};
+}
+/** Timing knobs for the takeover choreography (exported for tests). */
+const TAKEOVER_RETRY_DELAY_MS = 10;
+/** How many times the takeover re-checks after disabling the official row. */
+const TAKEOVER_MAX_ATTEMPTS = 20;
+/**
+* The single naming-provider slot this row serves.
+*
+* DSH's session-title service accepts exactly one registered provider, and the
+* official rows (`session-title-llm`, and the experimental row the
+* `dsh-experimental-session-titles-bundle` inserts) compete for the same slot.
+* This row therefore mirrors one official row and owns the slot; when another
+* official row activates anyway (the experimental bundle inserts its row after
+* this plugin's patch layer, so a static `disabled` cannot reach it), it yields
+* the slot so that row's own registration succeeds — no activation warning —
+* and then disables that row and takes the slot back with its cadence mirrored.
+* Every step uses released seams: the `loader/patch-context` waterfall, the
+* public `Entry.update`, and `sessionTitle.register` plus its disposer.
+*/
+var NamingSeam = class {
+	ctx;
+	module;
+	disposer;
+	plan;
+	constructor(ctx, module, plan) {
+		this.ctx = ctx;
+		this.module = module;
+		this.plan = plan;
+	}
+	/** The cadence currently registered. */
+	get cadence() {
+		return this.plan.cadence;
+	}
+	/** Whether this row currently owns the slot. */
+	get claimed() {
+		return this.disposer !== void 0;
+	}
+	/**
+	* Register this row's provider with the given plan.
+	* @param plan - the naming plan to serve (defaults to the current one).
+	* @returns true when the slot is ours, false when another provider holds it.
+	*/
+	claim(plan = this.plan) {
+		this.plan = plan;
+		if (this.disposer !== void 0) return true;
+		try {
+			this.disposer = this.ctx.sessionTitle.register(providerOf(this.ctx, this.module, plan));
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	/** Release the slot (the service lets the next registration replace a closing one). */
+	yieldSlot() {
+		const disposer = this.disposer;
+		this.disposer = void 0;
+		if (disposer === void 0) return;
+		try {
+			disposer();
+		} catch (cause) {
+			this.ctx.logger.error("model-switch: releasing the session-title provider failed");
+			this.ctx.logger.error(cause);
+		}
+	}
+	/** Swap the served plan, re-registering only when the slot is already ours. */
+	retarget(plan) {
+		if (!this.claimed) {
+			this.plan = plan;
+			return;
+		}
+		this.yieldSlot();
+		this.claim(plan);
+	}
+};
+/** Whether one loader entry declares an official naming provider this row supersedes. */
+function isOfficialTitleRow(entry) {
+	if (entry === void 0) return false;
+	if (entry.id === OFFICIAL_TITLE_ROW || entry.id === ALL_PROMPTS_ROW) return true;
+	const pkg = entry.options?.name;
+	return typeof pkg === "string" && TITLE_CADENCES.some((cadence) => cadence.pkg === pkg);
+}
+/** The id one entry is known by (the loader's leaf id, not a nested path). */
+function leafId(entry) {
+	const raw = entry.options?.id;
+	return typeof raw === "string" ? raw : void 0;
+}
+/**
+* Install the takeover choreography for naming rows that activate after this one.
+*
+* `loader/patch-context` runs inside the official entry's own `_init`, before its
+* plugin's `apply`, and it receives that entry. At that point the entry's
+* `options` are final, so this row can yield the slot first — the official
+* `register()` then succeeds instead of throwing the "already registered"
+* activation warning — and afterwards disable that row through the public
+* `Entry.update` and take the slot back with its cadence mirrored.
+* @param ctx - this row's context.
+* @param module - the auxiliary-LLM package.
+* @param seam - the slot owner.
+* @returns Nothing; the listeners are effects of this row's fiber.
+*/
+function installTakeover(ctx, module, seam) {
+	/** Entries already handled, so a repeated patch-context does not loop. */
+	const handled = /* @__PURE__ */ new Set();
+	/** Entries with a reclaim cycle in flight, so two triggers cannot race. */
+	const reclaiming = /* @__PURE__ */ new Set();
+	/** After the yield, disable the official row and take the slot back. */
+	const reclaim = async (entry, plan) => {
+		if (reclaiming.has(entry)) return;
+		reclaiming.add(entry);
+		try {
+			for (let attempt = 0; attempt < 20; attempt += 1) {
+				await new Promise((resolve) => setTimeout(resolve, attempt === 0 ? 0 : 10));
+				try {
+					await entry.update({ disabled: true });
+				} catch (cause) {
+					ctx.logger.info("model-switch: the displaced naming row could not be persisted as disabled; the takeover repeats next startup");
+					ctx.logger.info(String(cause));
+				}
+				if (seam.claim(plan)) {
+					ctx.logger.info(`model-switch: displaced the official naming row ${String(leafId(entry) ?? "unknown")}; its ${plan.cadence.automatic} cadence and policy are mirrored by the configurable naming route`);
+					return;
+				}
+			}
+			ctx.logger.error(`model-switch: the official naming row ${String(leafId(entry) ?? "unknown")} kept the session-title provider slot; the configurable naming route is unavailable this session`);
+		} finally {
+			reclaiming.delete(entry);
+		}
+	};
+	/**
+	* The row an event names.
+	*
+	* The loader hands the emitting entry as the event's `this`, but cordis does
+	* not rebind `this` for listeners added through `ctx.on`, so a listener can
+	* also receive the payload as its first argument. Both shapes are accepted;
+	* the real Host always provides one of them.
+	*/
+	const entryOfEvent = (self, first) => {
+		const candidate = self ?? first;
+		return candidate !== null && typeof candidate === "object" && "options" in candidate ? candidate : void 0;
+	};
+	const listeners = [];
+	const listen = (event, listener) => {
+		const dispose = ctx.on?.(event, listener);
+		if (dispose !== void 0) listeners.push(dispose);
+	};
+	listen("loader/patch-context", function(first, second) {
+		const nextFn = typeof first === "function" ? first : second;
+		const entry = entryOfEvent(this, typeof first === "function" ? void 0 : first);
+		if (entry === void 0 || typeof nextFn !== "function" || !isOfficialTitleRow(entry) || handled.has(entry)) return nextFn === void 0 ? void 0 : nextFn();
+		handled.add(entry);
+		const plan = planFor(ctx, module, entry);
+		if (plan !== void 0) {
+			seam.yieldSlot();
+			reclaim(entry, plan);
+		}
+		return nextFn();
+	});
+	listen("loader/partial-dispose", function(first) {
+		const entry = entryOfEvent(this, first);
+		if (entry === void 0 || !isOfficialTitleRow(entry)) return;
+		handled.delete(entry);
+		if (seam.claimed) return;
+		const plan = planFor(ctx, module, officialTitleEntry(ctx.get("loader", false)));
+		if (plan !== void 0) seam.claim(plan);
+	});
+	const loader = ctx.get("loader", false);
+	if (typeof loader?.entries === "function") for (const candidate of loader.entries()) {
+		if (!isOfficialTitleRow(candidate)) continue;
+		if (candidate.disabled === true) continue;
+		const plan = planFor(ctx, module, candidate);
+		if (plan !== void 0) reclaim(candidate, plan);
+	}
+	const disposable = () => {
+		for (const dispose of listeners.splice(0)) dispose();
+	};
+	const effect = ctx.effect;
+	if (effect === void 0) return;
+	const registration = effect(function* () {
+		yield disposable;
+	}, "model-switch: session-title takeover");
+	if (typeof registration === "function") listeners.push(registration);
+}
 /**
 * Mount the Model Switch session-naming row for this profile.
 *
@@ -529,11 +750,7 @@ function currentSettings(ctx) {
 */
 async function apply(ctx) {
 	const entry = officialTitleEntry(ctx.get("loader", false));
-	const cadence = titleCadence(entry === void 0 ? void 0 : officialTitlePackage(entry)) ?? TITLE_CADENCES[0];
-	if (cadence === void 0) return;
 	if (entry === void 0) ctx.logger.info("model-switch: no instantiated official session-title row to mirror; naming uses the first-prompt cadence");
-	/** The displaced row's naming policy, or the shipped defaults when it is absent. */
-	const forwarded = entry === void 0 ? {} : forwardedConfig(entry);
 	let module;
 	try {
 		module = await import(__rewriteRelativeImportExtension(TITLE_LLM_PACKAGE));
@@ -542,29 +759,11 @@ async function apply(ctx) {
 		ctx.logger.error(cause);
 		return;
 	}
-	let policy;
-	try {
-		policy = resolveNamingPolicy(module, forwarded);
-	} catch (cause) {
-		ctx.logger.error("model-switch: the official session-title row has no valid naming policy; naming keeps the deterministic fallback");
-		ctx.logger.error(cause);
-		return;
-	}
-	const plan = {
-		cadence,
-		config: policy.config,
-		targets: policy.targets
-	};
-	try {
-		ctx.sessionTitle.register({
-			id: cadence.id,
-			automatic: cadence.automatic,
-			generate: (request) => generateTitle(ctx, module, plan, request)
-		});
-	} catch (cause) {
-		ctx.logger.error("model-switch: another session-title provider is already registered; the configurable naming route is unavailable");
-		ctx.logger.error(cause);
-	}
+	const plan = planFor(ctx, module, entry);
+	if (plan === void 0) return;
+	const seam = new NamingSeam(ctx, module, plan);
+	if (!seam.claim()) ctx.logger.info("model-switch: another session-title provider already owns the seam; naming follows it while it is active");
+	installTakeover(ctx, module, seam);
 }
 //#endregion
-export { TITLE_CADENCES, apply, composeTitleRoute, forwardedConfig, frameTitleInput, inject, isMaxTokensFailure, isModernTitleModule, name, normalizeTitleText, officialTitleEntry, officialTitlePackage, resolveNamingPolicy, selectTitleMessages, selectTitleReasoningEffort, shouldTryNextCandidate, splitTitlePolicy, titleCadence, titleFromOutput, titleFromResponse, titleRouteCandidates, titleSystemPrompt, widerTitleBudget };
+export { TAKEOVER_MAX_ATTEMPTS, TAKEOVER_RETRY_DELAY_MS, TITLE_CADENCES, apply, composeTitleRoute, forwardedConfig, frameTitleInput, inject, isMaxTokensFailure, isModernTitleModule, isOfficialTitleRow, name, normalizeTitleText, officialTitleEntry, officialTitlePackage, resolveNamingPolicy, selectTitleMessages, selectTitleReasoningEffort, shouldTryNextCandidate, splitTitlePolicy, titleCadence, titleFromOutput, titleFromResponse, titleRouteCandidates, titleSystemPrompt, widerTitleBudget };

package/lib/types/session-title.d.ts

@@ -138,9 +138,14 @@ export declare function composeTitleRoute(config: TitleLlmPolicy, route: Capabil
 export declare function selectTitleMessages(messages: readonly SessionTitleUserMessage[], firstPromptOnly: boolean): readonly SessionTitleUserMessage[];
 /**
  * Locate the official session-title provider row in the loader tree.
+ *
  * Disabled entries stay in the tree, so a name-matched disable still matches.
+ * The all-prompts row wins when it is present: that row only exists while the
+ * experimental session-titles bundle is composed, and its presence is exactly
+ * the user's choice to update titles with every prompt. The default
+ * first-prompt row is the fallback when that bundle is off.
  * @param loader - the host loader, when one is reachable.
- * @returns The official entry, or undefined when this profile has no such row.
+ * @returns The official entry to mirror, or undefined when this profile has no such row.
  */
 export declare function officialTitleEntry(loader: Loader | undefined): Entry | undefined;
 /**
@@ -270,6 +275,12 @@ export declare function titleSystemPrompt(targets: TitleLengthTargets, hasCurren
  * @returns The framed user input.
  */
 export declare function frameTitleInput(messages: readonly SessionTitleUserMessage[], currentTitle: string | undefined): string;
+/** Timing knobs for the takeover choreography (exported for tests). */
+export declare const TAKEOVER_RETRY_DELAY_MS = 10;
+/** How many times the takeover re-checks after disabling the official row. */
+export declare const TAKEOVER_MAX_ATTEMPTS = 20;
+/** Whether one loader entry declares an official naming provider this row supersedes. */
+export declare function isOfficialTitleRow(entry: Entry | undefined): boolean;
 /**
  * Mount the Model Switch session-naming row for this profile.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-switch",
-  "version": "0.4.28",
+  "version": "0.4.29",
   "description": "Explicit model routing plus composer/Plan picker for DeepSeek Harness",
   "repository": {
     "type": "git",