@klarkxy/dsh-current-title 0.1.5 → 0.1.7

package/lib/index.js

@@ -1,5 +1,7 @@
-import { PLUGIN_NAME, PROMPT_VERSION, PROVIDER_ID, PURPOSE_ID, RPC_CHANNEL, SCHEMA_VERSION, SETTINGS_KEY, defaultGenerateConfig, isTitleLocaleMode } from "./contracts.js";
-import { registerHostRpc } from "@klarkxy/dsh-ai-services/host-rpc";
+import { PLUGIN_NAME, PROVIDER_ID, RPC_CHANNEL, SETTINGS_KEY, defaultGenerateConfig, defaultModelRoute, isTitleLocaleMode, normalizeCadence, normalizeModelRoute, normalizePrompt } from "./contracts.js";
+import { registerHostRpc } from "@klarkxy/dsh-plugin-kit/host-rpc";
+import { isSubagentSession } from "@klarkxy/dsh-plugin-kit/contracts";
+import { callLlmText, resolveFeatureModel } from "@klarkxy/dsh-plugin-kit";
 import { defineDomain, domainTable } from "@deepseek-ai/dsh-storage-domain";
 import { z } from "zod";
 //#region src/input.ts
@@ -135,22 +137,36 @@ function truncateSummary(value, targetWords, targetCjkCharacters) {
 	if (/[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}]/u.test(value)) return Array.from(value.replace(/\s+/gu, "")).slice(0, targetCjkCharacters).join("");
 	return value.split(/\s+/u).filter(Boolean).slice(0, targetWords).join(" ");
 }
-function parseModelTitle(raw, targetWords, targetCjkCharacters) {
-	let value;
+function unwrapModelText(raw) {
+	const trimmed = raw.trim();
+	return (/^```(?:json)?\s*([\s\S]*?)\s*```$/iu.exec(trimmed)?.[1] ?? trimmed).trim();
+}
+function readJsonObject(raw) {
+	const text = unwrapModelText(raw);
+	const start = text.indexOf("{");
+	const end = text.lastIndexOf("}");
+	if (start === -1 || end <= start) return void 0;
 	try {
-		value = JSON.parse(raw.trim());
-	} catch (cause) {
-		throw new Error("dsh-current-title: title model returned invalid JSON", { cause });
+		const value = JSON.parse(text.slice(start, end + 1));
+		if (value && typeof value === "object" && !Array.isArray(value)) return value;
+	} catch {
+		return;
 	}
-	if (value === null || typeof value !== "object" || Array.isArray(value)) throw new Error("dsh-current-title: title model response must be an object");
-	const candidate = value;
-	if (Object.keys(candidate).sort().join(",") !== "summary,type") throw new Error("dsh-current-title: title model response must contain only type and summary");
-	if (typeof candidate.type !== "string" || !isTitleType(candidate.type)) throw new Error("dsh-current-title: title model returned an unsupported type");
-	if (typeof candidate.summary !== "string") throw new Error("dsh-current-title: title model summary must be a string");
-	const summary = truncateSummary(normalizeSessionTitle(removeTitleSyntax(candidate.summary), Number.MAX_SAFE_INTEGER), targetWords, targetCjkCharacters);
+}
+/**
+* Accept the required JSON shape, including a code fence or a short preface.
+* Extra keys are ignored. A plain one-line title still becomes a title so a
+* chatty model does not leave the session on the built-in fallback.
+*/
+function parseModelTitle(raw, targetWords, targetCjkCharacters) {
+	const candidate = readJsonObject(raw);
+	const typeValue = typeof candidate?.type === "string" ? candidate.type.trim().toLowerCase() : "";
+	const summaryValue = typeof candidate?.summary === "string" ? candidate.summary : "";
+	const type = isTitleType(typeValue) ? typeValue : "discuss";
+	const summary = truncateSummary(normalizeSessionTitle(removeTitleSyntax(summaryValue || (candidate ? "" : unwrapModelText(raw).replace(/^["'`]+|["'`]+$/gu, ""))), Number.MAX_SAFE_INTEGER), targetWords, targetCjkCharacters);
 	if (summary.length === 0) throw new Error("dsh-current-title: title model returned an empty summary");
 	return {
-		type: candidate.type,
+		type,
 		summary
 	};
 }
@@ -187,9 +203,9 @@ function sourceVersionOf(sessionId, messages) {
 }
 //#endregion
 //#region src/generate.ts
-function systemPrompt(config) {
+function systemPrompt(config, customPrompt = "") {
 	return [
-		"Name the current task in an AI coding-assistant session.",
+		customPrompt.trim() || "Name the current task in an AI coding-assistant session.",
 		"Prioritize the newest human messages. Older messages are context only and must not keep a completed task in the title.",
 		"Allowed type values: feature, fix, optimize, refactor, test, docs, release, config, explore, discuss.",
 		"Return exactly one JSON object: {\"type\":\"<type>\",\"summary\":\"<summary>\"}.",
@@ -198,68 +214,53 @@ function systemPrompt(config) {
 		`Aim for at most ${config.targetWords} non-CJK words or ${config.targetCjkCharacters} CJK characters.`
 	].join("\n");
 }
-function registerTitlePurpose(scope) {
-	return scope.registerPurpose({
-		id: PURPOSE_ID,
-		label: "自动标题",
-		defaultTarget: {
-			kind: "role",
-			role: "weak"
-		},
-		maxOutputTokens: 64
-	});
+function titleModelRoute(route) {
+	if (!route?.provider || !route.model) return void 0;
+	return route.reasoningEffort ? {
+		provider: route.provider,
+		model: route.model,
+		reasoningEffort: route.reasoningEffort
+	} : {
+		provider: route.provider,
+		model: route.model
+	};
 }
 async function generateCurrentTitle(options) {
 	options.signal.throwIfAborted();
-	if (!options.scope.active || !options.isCurrent()) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation is no longer current"), { code: "superseded" });
+	if (!options.isCurrent()) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation is no longer current"), { code: "superseded" });
 	const selected = selectRecentMessages(options.messages, options.config.maxRecentMessages, options.config.maxInputBytes);
 	if (selected.length === 0) throw new Error("dsh-current-title: at least one source message is required");
+	const route = resolveFeatureModel(options.host, titleModelRoute(options.model), options.sessionId);
+	if (!route) throw new Error("dsh-current-title: 请在插件页选择模型，或设置宿主默认对话模型。");
+	const callRoute = {
+		provider: route.provider,
+		model: route.model
+	};
 	const framedInput = frameMessages(selected);
 	const locale = resolveTitleLocale(options.localeMode ?? options.config.locale, selected.map((message) => message.text), options.localePreference);
 	const sourceVersion = sourceVersionOf(options.sessionId, selected);
-	let settled = false;
-	const aborted = new Promise((_, reject) => {
-		const fail = () => {
-			if (settled) return;
-			reject(options.signal.reason ?? /* @__PURE__ */ new Error("dsh-current-title: generation cancelled"));
-		};
-		if (options.signal.aborted) {
-			fail();
-			return;
-		}
-		options.signal.addEventListener("abort", fail, { once: true });
+	const result = await callLlmText(options.llm, {
+		plugin: PLUGIN_NAME,
+		route: callRoute,
+		system: systemPrompt(options.config, options.prompt),
+		text: framedInput,
+		maxTokens: options.config.maxOutputTokens,
+		purpose: "session-title",
+		signal: options.signal,
+		sessionId: options.sessionId,
+		isCurrent: options.isCurrent
 	});
-	let result;
-	try {
-		result = await Promise.race([options.scope.run({
-			purpose: PURPOSE_ID,
-			sessionId: options.sessionId,
-			input: framedInput,
-			system: systemPrompt(options.config),
-			sourceVersion,
-			contractVersion: 1,
-			promptVersion: PROMPT_VERSION,
-			schemaVersion: SCHEMA_VERSION,
-			signal: options.signal,
-			isCurrent: () => options.scope.active && options.isCurrent(),
-			priority: "background"
-		}), aborted]);
-	} finally {
-		settled = true;
-	}
 	options.signal.throwIfAborted();
-	if (!options.scope.active || !options.isCurrent()) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation is no longer current"), { code: "superseded" });
-	if (result.receipt.status === "cancelled" || result.receipt.status === "superseded") throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation did not complete"), { code: result.receipt.status });
+	if (!options.isCurrent()) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: generation is no longer current"), { code: "superseded" });
 	const title = normalizeSessionTitle(formatTitle(parseModelTitle(result.text, options.config.targetWords, options.config.targetCjkCharacters), locale, options.now ?? /* @__PURE__ */ new Date()), options.config.maxTitleBytes);
 	if (!title) throw new Error("dsh-current-title: title model returned an empty summary");
-	const route = result.receipt.route;
 	return {
 		title,
 		messageSeqs: selected.map((message) => message.seq),
-		...route?.provider && route.model ? { model: {
-			provider: route.provider,
-			model: route.model
-		} } : {},
+		model: {
+			provider: result.provider,
+			model: result.model
+		},
 		sourceVersion
 	};
 }
@@ -343,7 +344,7 @@ function createNativeTitleSlot(options) {
 		async occupy(id) {
 			const provider = {
 				id: PROVIDER_ID,
-				automatic: "all-prompts",
+				automatic: options.automatic(),
 				generate: options.generate
 			};
 			try {
@@ -381,29 +382,69 @@ function createNativeTitleSlot(options) {
 }
 //#endregion
 //#region src/storage.ts
+const localeSchema = z.enum([
+	"auto",
+	"zh",
+	"en"
+]);
+/** Version 1 stored only the locale. Prompt and model are filled as defaults. */
+const legacySettingsSchema = z.object({
+	revision: z.number().int().nonnegative(),
+	locale: localeSchema
+}).strict();
+const modelRouteSchema = z.object({
+	provider: z.string(),
+	model: z.string(),
+	reasoningEffort: z.string().optional()
+}).strict();
 const titleSettingsSchema = z.object({
 	revision: z.number().int().nonnegative(),
-	locale: z.enum([
-		"auto",
-		"zh",
-		"en"
-	])
+	locale: localeSchema,
+	prompt: z.string(),
+	model: modelRouteSchema,
+	/** Defaulted so rows stored before the cadence switch existed still parse. */
+	cadence: z.enum(["all-prompts", "first-prompt"]).default("all-prompts")
 }).strict();
 const titleDomain = defineDomain({
 	name: "dsh_editor_current_title",
-	version: 1,
+	version: 2,
 	tables: { settings: domainTable(titleSettingsSchema) }
 });
 function parseTitleSettings(value) {
-	const parsed = titleSettingsSchema.safeParse(value);
-	if (!parsed.success) return void 0;
-	if (!isTitleLocaleMode(parsed.data.locale)) return void 0;
-	return parsed.data;
+	const current = titleSettingsSchema.safeParse(value);
+	if (current.success) return {
+		revision: current.data.revision,
+		locale: isTitleLocaleMode(current.data.locale) ? current.data.locale : "auto",
+		prompt: normalizePrompt(current.data.prompt),
+		model: normalizeModelRoute(current.data.model),
+		cadence: normalizeCadence(current.data.cadence)
+	};
+	const legacy = legacySettingsSchema.safeParse(value);
+	if (!legacy.success || !isTitleLocaleMode(legacy.data.locale)) return void 0;
+	return {
+		revision: legacy.data.revision,
+		locale: legacy.data.locale,
+		prompt: "",
+		model: defaultModelRoute(),
+		cadence: "all-prompts"
+	};
 }
 function storedSettings(value, _fallbackLocale = "auto") {
+	const parsed = parseTitleSettings(value);
 	return {
-		revision: parseTitleSettings(value)?.revision ?? 0,
-		locale: "auto"
+		revision: parsed?.revision ?? 0,
+		locale: "auto",
+		prompt: parsed?.prompt ?? "",
+		model: parsed?.model ?? defaultModelRoute(),
+		cadence: parsed?.cadence ?? "all-prompts"
+	};
+}
+function settingsPatch(current, patch) {
+	return {
+		locale: "auto",
+		prompt: patch.prompt === void 0 ? current.prompt : normalizePrompt(patch.prompt),
+		model: patch.model === void 0 ? current.model : normalizeModelRoute(patch.model),
+		cadence: patch.cadence === void 0 ? current.cadence : normalizeCadence(patch.cadence)
 	};
 }
 //#endregion
@@ -412,11 +453,11 @@ var CurrentTitleService = class {
 	options;
 	settings;
 	config;
-	scope;
-	unregisterPurpose;
 	claim;
 	nativeSlot;
 	generation = 0;
+	settingsPending = Promise.resolve();
+	disposed = false;
 	inFlight = /* @__PURE__ */ new Map();
 	support;
 	constructor(options) {
@@ -430,17 +471,16 @@ var CurrentTitleService = class {
 		};
 	}
 	async start() {
-		const { ai, sessionTitle, loader, sessions } = this.options;
-		if (!ai || !sessionTitle?.register || !sessions || !loader) {
+		const { llm, sessionTitle, loader, sessions } = this.options;
+		if (!llm || !sessionTitle?.register || !sessions || !loader) {
 			this.support.weOwn = false;
 			this.support.limitation = "required host services are missing";
 			return;
 		}
-		this.scope = ai.activate(this.options.plugin);
-		this.unregisterPurpose = registerTitlePurpose(this.scope);
 		this.nativeSlot = createNativeTitleSlot({
 			sessionTitle,
 			loader,
+			automatic: () => this.settings.cadence,
 			generate: (request) => this.nativeGenerate(request)
 		});
 		try {
@@ -455,9 +495,11 @@ var CurrentTitleService = class {
 		}
 	}
 	async dispose() {
+		this.disposed = true;
 		this.generation += 1;
 		for (const controller of this.inFlight.values()) controller.abort(/* @__PURE__ */ new Error("current-title disabled"));
 		this.inFlight.clear();
+		await this.settingsPending;
 		const snapshot = this.nativeSlot?.displacement;
 		const outcome = await releaseTitleSlot(this.nativeSlot ?? {
 			owner: () => void 0,
@@ -468,16 +510,15 @@ var CurrentTitleService = class {
 		this.support.weOwn = false;
 		this.support.nativeOwner = this.nativeSlot?.owner() ?? null;
 		if (outcome === "left-other-owner") this.support.limitation = "another title provider owns the slot; previous owner was not restored";
-		this.unregisterPurpose?.();
-		this.unregisterPurpose = void 0;
-		this.scope?.dispose();
-		this.scope = void 0;
 	}
 	status(sessionId) {
 		const session = sessionId && this.options.sessions ? this.options.sessions.get(sessionId) : void 0;
 		const snapshot = session ? this.read(session) : void 0;
 		return {
-			settings: { ...this.settings },
+			settings: {
+				...this.settings,
+				model: { ...this.settings.model }
+			},
 			support: {
 				...this.support,
 				nativeOwner: this.nativeSlot?.owner() ?? this.support.nativeOwner
@@ -491,19 +532,54 @@ var CurrentTitleService = class {
 			} } : {}
 		};
 	}
+	async updateSettings(patch) {
+		patch = structuredClone(patch);
+		const result = this.settingsPending.then(async () => {
+			if (this.disposed) throw Object.assign(/* @__PURE__ */ new Error("current-title disabled"), { code: "unavailable" });
+			if (this.settings.revision !== patch.expectedRevision) throw Object.assign(/* @__PURE__ */ new Error("current-title settings changed"), { code: "revision" });
+			const previous = this.settings;
+			const next = {
+				revision: this.settings.revision + 1,
+				...settingsPatch(this.settings, patch)
+			};
+			if (this.options.store) await this.options.store.save(next);
+			this.settings = next;
+			this.config = {
+				...this.config,
+				locale: "auto"
+			};
+			if (!this.disposed && next.cadence !== previous.cadence) await this.reclaimWithCadence();
+			return {
+				revision: next.revision,
+				locale: next.locale,
+				prompt: next.prompt,
+				model: { ...next.model },
+				cadence: next.cadence
+			};
+		});
+		this.settingsPending = result.then(() => {}, () => {});
+		return result;
+	}
+	/** Re-register the provider so a cadence change takes effect without a restart. */
+	async reclaimWithCadence() {
+		if (!this.claim || !this.nativeSlot) return;
+		const stale = this.claim;
+		this.claim = void 0;
+		await stale.dispose();
+		try {
+			this.claim = await claimTitleSlot(this.nativeSlot, PROVIDER_ID);
+			this.support.weOwn = true;
+			this.support.nativeOwner = PROVIDER_ID;
+			delete this.support.limitation;
+		} catch (error) {
+			this.support.weOwn = false;
+			this.support.nativeOwner = this.nativeSlot.owner() ?? null;
+			this.support.limitation = error instanceof Error ? error.message : "native title provider slot is occupied";
+		}
+	}
+	/** @deprecated Locale is always auto. Kept so older clients still save a revision. */
 	async updateLocale(_locale, expectedRevision) {
-		if (this.settings.revision !== expectedRevision) throw Object.assign(/* @__PURE__ */ new Error("current-title settings changed"), { code: "revision" });
-		const next = {
-			revision: this.settings.revision + 1,
-			locale: "auto"
-		};
-		if (this.options.store) await this.options.store.save(next);
-		this.settings = next;
-		this.config = {
-			...this.config,
-			locale: "auto"
-		};
-		return { ...this.settings };
+		return this.updateSettings({ expectedRevision });
 	}
 	async regenerate(sessionId, signal) {
 		if (!this.support.weOwn) throw Object.assign(/* @__PURE__ */ new Error("title provider is inactive"), { code: "unavailable" });
@@ -528,19 +604,16 @@ var CurrentTitleService = class {
 		};
 	}
 	async nativeGenerate(request) {
-		const scope = this.scope;
-		if (!scope) throw new Error("dsh-current-title: aiServices is not available");
+		const llm = this.options.llm;
+		if (!llm) throw new Error("dsh-current-title: llm is not available");
 		const generation = this.generation;
 		const controller = new AbortController();
 		this.inFlight.get(request.session.id)?.abort(/* @__PURE__ */ new Error("newer title generation superseded older work"));
 		this.inFlight.set(request.session.id, controller);
 		try {
-			const combined = AbortSignal.any([
-				request.signal,
-				controller.signal,
-				scope.signal
-			]);
+			const combined = AbortSignal.any([request.signal, controller.signal]);
 			const session = this.options.sessions?.get(request.session.id);
+			if (isSubagentSession(session)) throw Object.assign(/* @__PURE__ */ new Error("dsh-current-title: delegated child thread keeps the host fallback title"), { code: "subagent-session" });
 			const messages = collectHumanMessages(request.messages.map((message) => ({
 				type: "user/message",
 				seq: message.seq,
@@ -553,13 +626,16 @@ var CurrentTitleService = class {
 				}
 			})));
 			const generated = await generateCurrentTitle({
-				scope,
+				llm,
+				host: this.options.host ?? {},
 				config: this.config,
 				sessionId: request.session.id,
 				messages: messages.length > 0 ? messages : [...request.messages],
+				prompt: this.settings.prompt,
+				model: this.settings.model,
 				localePreference: this.options.localePreference?.(),
 				signal: combined,
-				isCurrent: () => this.generation === generation && scope.active && this.support.weOwn && (!session || this.options.sessions?.get(request.session.id) === session),
+				isCurrent: () => this.generation === generation && this.support.weOwn && (!session || this.options.sessions?.get(request.session.id) === session),
 				now: this.options.now?.()
 			});
 			return {
@@ -590,17 +666,22 @@ async function handleRpc(service, endpoint, payload, signal) {
 		value: service.status(typeof body.sessionId === "string" ? body.sessionId : void 0)
 	};
 	if (endpoint === "settings") {
-		if (!isTitleLocaleMode(body.locale) || typeof body.expectedRevision !== "number") return {
+		if (typeof body.expectedRevision !== "number") return {
 			ok: false,
 			error: {
 				code: "bad-request",
-				message: "标题语言设置无效。"
+				message: "标题设置无效。"
 			}
 		};
 		try {
 			return {
 				ok: true,
-				value: await service.updateLocale(body.locale, body.expectedRevision)
+				value: await service.updateSettings({
+					...body.prompt !== void 0 ? { prompt: body.prompt } : {},
+					...body.model !== void 0 ? { model: body.model } : {},
+					...body.cadence !== void 0 ? { cadence: body.cadence } : {},
+					expectedRevision: body.expectedRevision
+				})
 			};
 		} catch (error) {
 			const code = error instanceof Error && "code" in error ? String(error.code) : "failed";
@@ -678,7 +759,7 @@ async function handleRpc(service, endpoint, payload, signal) {
 const name = PLUGIN_NAME;
 const inject = [
 	"sessionTitle",
-	"aiServices",
+	"llm",
 	"sessions",
 	"loader",
 	"storageDomain",
@@ -692,7 +773,8 @@ async function apply(ctx, config = {}) {
 	const locale = isTitleLocaleMode(config.locale) ? config.locale : "auto";
 	const service = new CurrentTitleService({
 		plugin: PLUGIN_NAME,
-		ai: host.aiServices,
+		llm: host.llm,
+		host,
 		sessionTitle: host.sessionTitle,
 		loader: host.loader,
 		sessions: host.sessions,