dsh-bce 0.1.0 → 0.1.1

package/README.md

@@ -6,7 +6,7 @@
 
 **Context-aware prompt enhancement for the DeepSeek Harness composer, powered by your Better Context Engine MCP.**
 
-[![Version](https://img.shields.io/badge/version-0.1.0-4D6BFE)](package.json) [![License](https://img.shields.io/badge/license-MIT-3DA639)](#license) [![Node.js](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-339933?logo=node.js&logoColor=white)](#requirements) [![Platform](https://img.shields.io/badge/DeepSeek%20Harness-web%20%7C%20Desktop-1F2937)](https://github.com/deepseek-ai/deepseek-harness)
+[![npm](https://img.shields.io/npm/v/dsh-bce?color=4D6BFE)](https://www.npmjs.com/package/dsh-bce) [![License](https://img.shields.io/badge/license-MIT-3DA639)](#license) [![Node.js](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-339933?logo=node.js&logoColor=white)](#requirements) [![Platform](https://img.shields.io/badge/DeepSeek%20Harness-web%20%7C%20Desktop-1F2937)](https://github.com/deepseek-ai/deepseek-harness)
 
 English · [简体中文](README.zh.md)
 
@@ -19,7 +19,7 @@ English · [简体中文](README.zh.md)
 `dsh-bce` adds an enhance icon next to the composer's attach button. One click incrementally indexes the current workspace through the Better Context Engine (BCE) MCP server already configured in your profile, then rewrites the draft into a context-rich prompt.
 
 > [!NOTE]
-> The plugin stores no BCE base URL or token. Credentials stay on the MCP entry of the active profile and never reach the browser.
+> The plugin stores no BCE base URL or token. Credentials live only in the active profile's MCP entry and are used by bce-tool on the host; they are never sent to the UI (the web page or the Desktop window).
 
 ## Demo
 
@@ -175,7 +175,7 @@ dsh plugin --profile web add "$(pwd)"
 | Cmd/Ctrl+Z does not revert | `setDraft` is outside the composer undo stack | Use **Restore original**. |
 | Markdown is not rendered in the composer | The composer is a plain-text draft with file-reference chips | Keep enhancer output as plain text. |
 
-**Why not call BCE from the browser?** The BCE service has no CORS layer, and the token must stay on the host. The enhance icon calls the host RPC, which executes the configured MCP tools.
+**Why doesn't the UI call BCE directly?** The BCE service has no CORS layer, and the token must stay on the host. The enhance icon calls the host RPC, which executes the configured MCP tools.
 
 ## License
 

package/README.zh.md

@@ -6,7 +6,7 @@
 
 **为 DeepSeek Harness Composer 提供基于工作区上下文的提示增强，复用你已配置的 Better Context Engine MCP。**
 
-[![Version](https://img.shields.io/badge/version-0.1.0-4D6BFE)](package.json) [![License](https://img.shields.io/badge/license-MIT-3DA639)](#许可) [![Node.js](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-339933?logo=node.js&logoColor=white)](#环境要求) [![Platform](https://img.shields.io/badge/DeepSeek%20Harness-web%20%7C%20Desktop-1F2937)](https://github.com/deepseek-ai/deepseek-harness)
+[![npm](https://img.shields.io/npm/v/dsh-bce?color=4D6BFE)](https://www.npmjs.com/package/dsh-bce) [![License](https://img.shields.io/badge/license-MIT-3DA639)](#许可) [![Node.js](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-339933?logo=node.js&logoColor=white)](#环境要求) [![Platform](https://img.shields.io/badge/DeepSeek%20Harness-web%20%7C%20Desktop-1F2937)](https://github.com/deepseek-ai/deepseek-harness)
 
 [English](README.md) · 简体中文
 
@@ -19,7 +19,7 @@
 `dsh-bce` 在 Composer 附件按钮旁增加一个增强图标。点击后，插件通过当前 profile 已配置的 Better Context Engine（BCE）MCP 对工作区做增量索引，再把草稿重写为带有上下文的提示词。
 
 > [!NOTE]
-> 插件不保存 BCE 服务地址或 Token。凭证仅存在于当前 profile 的 MCP 配置中，不会进入浏览器。
+> 插件不保存 BCE 服务地址或 Token。凭证只保存在当前 profile 的 MCP 配置中，仅由 Host 端的 bce-tool 使用，不会下发到前端界面（web 页面或 Desktop 窗口）。
 
 ## 演示
 
@@ -175,7 +175,7 @@ dsh plugin --profile web add "$(pwd)"
 | Cmd/Ctrl+Z 无法撤销 | `setDraft` 不进入 Composer 撤销栈 | 使用 **还原**。 |
 | 输入框不渲染 Markdown | Composer 是纯文本草稿加文件引用 chip | 增强结果使用纯文本。 |
 
-**为什么不从浏览器直连 BCE？** BCE 服务端没有 CORS，且 Token 不能进入浏览器。增强图标通过 Host RPC 调用已配置的 MCP 工具。
+**为什么前端不直连 BCE？** BCE 服务端没有 CORS，而且 Token 只能留在 Host 端。增强图标通过 Host RPC 调用已配置的 MCP 工具。
 
 ## 许可
 

package/lib/client.js

@@ -40,8 +40,10 @@ window.__ModuleLoader__.load({
 			"wand.mcpMissing": "BCE MCP was not found. Add bce-tool to this profile with --no-webbrowser-enhance-prompt.",
 			"wand.notGit": "This folder is not a Git repository. bce-tool only indexes Git projects.",
 			"wand.tooLarge": "This project is too large to index. Trim it with .gitignore or .bceignore.",
-			"wand.timeout": "Enhancement timed out (90s). Add --no-webbrowser-enhance-prompt to the bce-tool MCP args.",
+			"wand.timeout": "Enhancement timed out (90s). Add --no-webbrowser-enhance-prompt to the bce-tool MCP args, or switch to a faster enhancement model in BCE.",
 			"wand.indexFailed": "Indexing failed. Check the bce-tool MCP logs.",
+			"wand.indexTimeout": "Indexing timed out. Raise toolCallTimeoutMs on the bce-tool MCP entry.",
+			"wand.draftChanged": "The draft changed while enhancing, so it was not replaced.",
 			"wand.upstream": "Enhancement failed. Check MCP tool permissions and bce-tool logs.",
 			"wand.noIndex": "Enhanced without a fresh index (search_context was not found).",
 			"wand.done": "Prompt enhanced.",
@@ -56,8 +58,10 @@ window.__ModuleLoader__.load({
 			"wand.mcpMissing": "未检测到 BCE MCP。请在当前 profile 配置 bce-tool，并加上 --no-webbrowser-enhance-prompt。",
 			"wand.notGit": "当前目录不是 Git 仓库。bce-tool 默认只索引 Git 项目。",
 			"wand.tooLarge": "项目过大，无法索引。请用 .gitignore 或 .bceignore 排除大目录后再试。",
-			"wand.timeout": "增强超时（90 秒）。请确认 MCP 启动参数包含 --no-webbrowser-enhance-prompt。",
+			"wand.timeout": "增强超时（90 秒）。请确认 MCP 启动参数包含 --no-webbrowser-enhance-prompt，或在 BCE 中换用更快的增强模型。",
 			"wand.indexFailed": "索引失败。请查看 bce-tool MCP 日志。",
+			"wand.indexTimeout": "索引超时。请在 bce-tool MCP 配置中调大 toolCallTimeoutMs。",
+			"wand.draftChanged": "增强期间草稿已修改，未覆盖。",
 			"wand.upstream": "增强失败。请检查 MCP 工具权限和 bce-tool 日志。",
 			"wand.noIndex": "已增强，但未做索引（未找到 search_context）。",
 			"wand.done": "提示已增强。",
@@ -263,50 +267,27 @@ window.__ModuleLoader__.load({
 				return;
 			}
 		}
-		function hookValue(props, name) {
-			const hook = props[name];
-			if (typeof hook !== "function") return void 0;
-			try {
-				return hook((state) => state);
-			} catch {
-				return;
-			}
+		function sessionsPath(sessions, sessionId) {
+			const id = sessionId ?? nonEmpty(sessions?.current);
+			return id === void 0 ? void 0 : cwdOf(sessions?.byId?.[id]);
 		}
-		function resolveWorkspace(props, extras) {
-			const session = hookValue(props, "useSession") ?? props.session;
-			const sessions = hookValue(props, "useSessions") ?? snapshotOf(extras.sessions);
-			const workspaces = hookValue(props, "useWorkspaces") ?? snapshotOf(extras.workspaces);
-			const sessionId = nonEmpty(props.sessionId) ?? nonEmpty(sessions?.current);
-			const fromSession = cwdOf(session);
-			if (fromSession !== void 0) return {
-				path: fromSession,
-				sessionId
-			};
-			if (sessionId !== void 0) {
-				const rowCwd = cwdOf(sessions?.byId?.[sessionId]);
-				if (rowCwd !== void 0) return {
-					path: rowCwd,
-					sessionId
-				};
-			}
+		function workspacesPath(workspaces, sessionId) {
 			const items = workspaces?.items ?? [];
 			if (sessionId !== void 0) {
-				const ownedPath = nonEmpty(items.find((item) => item.sessionIds?.includes(sessionId))?.path);
-				if (ownedPath !== void 0) return {
-					path: ownedPath,
-					sessionId
-				};
+				const owned = nonEmpty(items.find((item) => item.sessionIds?.includes(sessionId))?.path);
+				if (owned !== void 0) return owned;
 			}
 			const recentId = nonEmpty(workspaces?.recentWorkspaceId);
-			if (recentId !== void 0) {
-				const recentPath = nonEmpty(items.find((item) => item.workspaceId === recentId || item.id === recentId)?.path);
-				if (recentPath !== void 0) return {
-					path: recentPath,
-					sessionId
-				};
-			}
+			if (recentId === void 0) return void 0;
+			return nonEmpty(items.find((item) => item.workspaceId === recentId || item.id === recentId)?.path);
+		}
+		/** Reads store snapshots only; hook values must be captured during render. */
+		function resolveWorkspace(props, hooked, extras) {
+			const sessions = snapshotOf(extras.sessions);
+			const workspaces = snapshotOf(extras.workspaces);
+			const sessionId = nonEmpty(props.sessionId) ?? nonEmpty(sessions?.current);
 			return {
-				path: void 0,
+				path: hooked.session ?? cwdOf(props.session) ?? hooked.sessions ?? sessionsPath(sessions, sessionId) ?? hooked.workspaces ?? workspacesPath(workspaces, sessionId),
 				sessionId
 			};
 		}
@@ -319,6 +300,7 @@ window.__ModuleLoader__.load({
 				case "too_large": return t("wand.tooLarge");
 				case "timeout": return t("wand.timeout");
 				case "index_failed": return t("wand.indexFailed");
+				case "index_timeout": return t("wand.indexTimeout");
 				case "no_rpc": return t("wand.noRpc");
 				default: return t("wand.upstream");
 			}
@@ -383,11 +365,18 @@ window.__ModuleLoader__.load({
 			const lock = react.default.useRef(false);
 			const draftFromHook = props.useInput?.((state) => state.draft);
 			const draft = typeof draftFromHook === "string" ? draftFromHook : props.input?.draft ?? "";
+			const draftRef = react.default.useRef(draft);
+			draftRef.current = draft;
 			const extras = {
 				sessions: sessionsStore,
 				workspaces: workspacesStore
 			};
 			const sessionId = nonEmpty(props.sessionId);
+			const hooked = {
+				session: props.useSession?.((state) => cwdOf(state)),
+				sessions: props.useSessions?.((state) => sessionsPath(state, sessionId)),
+				workspaces: props.useWorkspaces?.((state) => workspacesPath(state, sessionId))
+			};
 			const empty = draft.trim().length === 0;
 			const disabled = busy || empty;
 			const title = empty ? t("wand.empty") : status.length > 0 ? status : t("wand.label");
@@ -411,7 +400,7 @@ window.__ModuleLoader__.load({
 				setBusy(true);
 				announce("busy", t("wand.enhancing"));
 				const prompt = draft.trim();
-				const workspace = resolveWorkspace(props, extras);
+				const workspace = resolveWorkspace(props, hooked, extras);
 				try {
 					if (workspace.path === void 0 && workspace.sessionId === void 0) {
 						announce("error", t("wand.noWorkspace"));
@@ -428,6 +417,10 @@ window.__ModuleLoader__.load({
 						sessionId: workspace.sessionId ?? sessionId
 					}));
 					if (parsed?.ok === true) {
+						if (draftRef.current.trim() !== prompt) {
+							announce("error", t("wand.draftChanged"));
+							return;
+						}
 						inputActions?.setDraft(parsed.value.text);
 						const previous = getRestore();
 						const original = (previous === void 0 || previous.sessionId === void 0 || previous.sessionId === sessionId) && previous !== void 0 && prompt === previous.enhanced ? previous.original : prompt;

package/lib/index.js

@@ -95,13 +95,19 @@ function resolveWorkspacePath(ctx, record) {
 	if (sessionId === void 0) return void 0;
 	return workspacePathFromRegistry(ctx, sessionId);
 }
-function classifyToolText(text, isError) {
+/** `ctx.tools.execute` reports tool failures and aborts as results, never by throwing. */
+function isFailure(result, text) {
+	return result.isError || text.startsWith("Error:");
+}
+/** Only meaningful for failed results: successful text may quote these phrases. */
+function classifyFailure(text) {
 	const lower = text.toLowerCase();
 	if (lower.includes("not managed by git") || lower.includes("not a git repository")) return "not_git";
 	if (lower.includes("too large to index") || lower.includes("exceeds the") && lower.includes("mb")) return "too_large";
-	if (text.startsWith("Error:") || isError) return "index_failed";
-	if (lower.includes("tool unavailable")) return "upstream";
+	if (lower.includes("timed out") || lower.includes("timeout") || lower.includes("tool call aborted")) return "timeout";
 }
+const INDEX_TIMEOUT_MESSAGE = "Indexing timed out. Raise toolCallTimeoutMs on the bce-tool MCP entry.";
+const ENHANCE_TIMEOUT_MESSAGE = `Enhancement timed out (${ENHANCE_TIMEOUT_MS / 1e3}s). Add --no-webbrowser-enhance-prompt to the bce-tool MCP args if the review page is blocking.`;
 function isAbortError(error) {
 	if (error instanceof Error && error.name === "AbortError") return true;
 	if (typeof error === "object" && error !== null && "name" in error && error.name === "AbortError") return true;
@@ -134,19 +140,26 @@ async function enhancePrompt(ctx, payload, signal) {
 				query: prompt
 			}, signal);
 		} catch (error) {
-			if (isAbortError(error)) return fail("timeout", "Indexing timed out. Raise toolCallTimeoutMs on the bce-tool MCP entry.");
+			if (isAbortError(error)) return fail("index_timeout", INDEX_TIMEOUT_MESSAGE);
 			return fail("index_failed", error instanceof Error ? error.message : String(error));
 		}
 		const searchText = contentText(searchResult);
-		const searchCode = classifyToolText(searchText, searchResult.isError);
-		if (searchCode === "not_git" || searchCode === "too_large") return fail(searchCode, searchText || searchCode);
-		if (searchCode !== void 0) return fail("index_failed", searchText || "search_context failed");
+		if (isFailure(searchResult, searchText)) {
+			const searchCode = classifyFailure(searchText);
+			if (searchCode === "timeout") return fail("index_timeout", INDEX_TIMEOUT_MESSAGE);
+			if (searchCode !== void 0) return fail(searchCode, searchText);
+			return fail("index_failed", searchText || "search_context failed");
+		}
 	} else warning = "no_index";
 	const enhanceAbort = new AbortController();
 	const onParentAbort = () => enhanceAbort.abort();
 	if (signal.aborted) enhanceAbort.abort();
 	else signal.addEventListener("abort", onParentAbort, { once: true });
-	const timer = setTimeout(() => enhanceAbort.abort(), ENHANCE_TIMEOUT_MS);
+	let timedOut = false;
+	const timer = setTimeout(() => {
+		timedOut = true;
+		enhanceAbort.abort();
+	}, ENHANCE_TIMEOUT_MS);
 	let enhanceResult;
 	try {
 		enhanceResult = await callTool(ctx, tools.enhance, {
@@ -155,16 +168,20 @@ async function enhancePrompt(ctx, payload, signal) {
 			conversation_history: ""
 		}, enhanceAbort.signal);
 	} catch (error) {
-		if (isAbortError(error) || enhanceAbort.signal.aborted) return fail("timeout", `Enhancement timed out (${ENHANCE_TIMEOUT_MS / 1e3}s). Add --no-webbrowser-enhance-prompt to the bce-tool MCP args if the review page is blocking.`);
+		if (timedOut || isAbortError(error)) return fail("timeout", ENHANCE_TIMEOUT_MESSAGE);
 		return fail("upstream", error instanceof Error ? error.message : String(error));
 	} finally {
 		clearTimeout(timer);
 		signal.removeEventListener("abort", onParentAbort);
 	}
+	if (timedOut) return fail("timeout", ENHANCE_TIMEOUT_MESSAGE);
 	const text = contentText(enhanceResult);
-	const enhanceCode = classifyToolText(text, enhanceResult.isError);
-	if (enhanceCode === "not_git" || enhanceCode === "too_large" || enhanceCode === "timeout") return fail(enhanceCode, text || enhanceCode);
-	if (enhanceCode !== void 0) return fail("upstream", text || "enhance_prompt failed");
+	if (isFailure(enhanceResult, text)) {
+		const enhanceCode = classifyFailure(text);
+		if (enhanceCode === "timeout") return fail("timeout", ENHANCE_TIMEOUT_MESSAGE);
+		if (enhanceCode !== void 0) return fail(enhanceCode, text);
+		return fail("upstream", text || "enhance_prompt failed");
+	}
 	if (text.length === 0) return fail("upstream", "enhance_prompt returned empty text");
 	return ok(warning === void 0 ? { text } : {
 		text,
@@ -235,7 +252,20 @@ function fetchRouteFor(handler) {
 function registerEnhanceRpc(ctx) {
 	ctx.inject(["connection"], (wired) => {
 		const connection = wired.get("connection");
-		const handler = (payload, signal) => enhancePrompt(ctx, payload, signal);
+		const handler = async (payload, signal) => {
+			try {
+				return await enhancePrompt(ctx, payload, signal);
+			} catch (error) {
+				return {
+					ok: false,
+					error: {
+						code: "upstream",
+						message: error instanceof Error ? error.message : String(error),
+						details: {}
+					}
+				};
+			}
+		};
 		const register = connection.fetch?.register;
 		if (typeof register === "function") {
 			wired.effect(() => register(fetchRouteFor(handler)), "dsh-bce: /api/dsh-bce.enhance fetch route");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-bce",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "DeepSeek Harness plugin that incrementally indexes the current workspace via the configured BCE MCP and enhances composer prompts.",
   "keywords": [
     "deepseek-harness",