dsh-think-translate 1.2.0 → 1.2.1

package/lib/client.js

@@ -23,7 +23,7 @@ window.__ModuleLoader__.load({
 		// there yet (an older process still serving the port), and the contract test
 		// pins PLUGIN_VERSION to package.json so the two can never drift.
 		var PLUGIN_NAME = "dsh-think-translate";
-		var PLUGIN_VERSION = "1.2.0";
+		var PLUGIN_VERSION = "1.2.1";
 		var PLUGIN_REPO = "https://github.com/UncleK/dsh-think-translate";
 		// The official MarkdownText contract changed in 0.1.2-alpha: it now takes a
 		// nested `labels` object and dereferences it without defaults inside its code
@@ -1984,6 +1984,18 @@ window.__ModuleLoader__.load({
 					})
 					.catch(function (e) { setMsg(t.connFail + ": " + (e && e.message ? e.message : e)); });
 			};
+			// Where the host looked for the harness settings, and what it found there:
+			// an empty scan used to be a dead end, so the panel now names the file it
+			// read (the usual cause is a home directory the plugin guessed wrong).
+			var dshScanNote = function () {
+				var d = cfg && cfg.dshScan;
+				if (!d || !d.home) return null;
+				var where = d.home + "/settings.yaml";
+				var detail = d.settingsFound
+					? (d.providers && d.providers.length ? d.providers.join(", ") : t.dshImportEmpty)
+					: (t.dshImportEmpty + " · " + where);
+				return createElement("div", { className: "xl-note", style: { marginTop: "4px" } }, detail);
+			};
 			var addAllDsh = function () {
 				var next = chain.slice();
 				dshAvailable.forEach(function (id) { if (next.indexOf(id) < 0) next.push(id); });
@@ -2127,17 +2139,15 @@ window.__ModuleLoader__.load({
 					})),
 				createElement("label", { className: "xl-form-row" },
 					createElement("span", { className: "xl-form-label" }, t.providerApiKey),
-					// The env name has no row of its own (it arrives from a preset or a
-					// DSH row), so show it here: without the badge the value is invisible
-					// and typing a key would look like it had no effect.
-					formApiKeyEnv.trim() ? createElement("span", { className: "xl-badge", title: t.providerApiKey }, "env:" + formApiKeyEnv.trim()) : null,
+					// No env badge here: the apiKeyEnv a preset fills in is an
+					// implementation detail of that endpoint, and the saved row shows an
+					// env:NAME badge anyway. Typing a key clears the env name (below), so
+					// the key the user can see is always the one that wins.
 					createElement("input", {
 						className: "xl-cfg", placeholder: t.providerApiKey, value: formApiKey,
 						onChange: function (e) {
 							var v = e.target.value;
 							setFormApiKey(v);
-							// Typing a key means "use this key": drop the env name, or the
-							// host would keep preferring the environment value.
 							if (v.trim() !== "") setFormApiKeyEnv("");
 						}
 					})),
@@ -2181,7 +2191,9 @@ window.__ModuleLoader__.load({
 						"+ " + t.dshImport + (dshAvailable.length ? " · " + dshAvailable.length : "")),
 				dshMenu ? createElement("div", { className: "xl-dsh-menu" },
 					dshAvailable.length === 0
-						? createElement("div", { className: "xl-note" }, t.dshImportEmpty)
+						? createElement("div", null,
+							createElement("div", { className: "xl-note" }, t.dshImportEmpty),
+							dshScanNote())
 						: createElement("div", null,
 							dshAvailable.length > 1 ? createElement("button", {
 								className: "xl-btn", type: "button", style: { marginBottom: "4px" }, onClick: addAllDsh
@@ -2219,6 +2231,23 @@ window.__ModuleLoader__.load({
 		// that node, and taking it out of the tree behind React's back means React
 		// can later patch or remove a detached node (NotFoundError on removeChild).
 		// A sibling in the same slot looks identical and leaves React's tree intact.
+		function shellNavIcon(btn) {
+			// The SHELL's svg, never ours: once the holder is in place it comes first
+			// in document order, so a plain querySelector('svg') returns the book — and
+			// the next pass then hides the plugin's own glyph. That is exactly how the
+			// nav icon disappeared after the first pass (fixed in 1.2.1).
+			var kids = btn.children || [];
+			for (var i = 0; i < kids.length; i++) {
+				var tag = (kids[i].tagName || "").toLowerCase();
+				if (tag === "svg" && !kids[i].hasAttribute("data-xl-nav-glyph-svg")) return kids[i];
+			}
+			var nested = btn.querySelectorAll ? btn.querySelectorAll("svg") : [];
+			for (var j = 0; j < nested.length; j++) {
+				if (!nested[j].hasAttribute("data-xl-nav-glyph-svg")) return nested[j];
+			}
+			return null;
+		}
+
 		function decorateSettingsGlyph() {
 			if (typeof document === "undefined") return;
 			var st = UI_TEXT[store.lang] || UI_TEXT.en;
@@ -2231,7 +2260,7 @@ window.__ModuleLoader__.load({
 					var btn = buttons[j];
 					var label = btn.lastElementChild;
 					if (!label || (label.textContent || "").trim() !== title) continue;
-					var svg = btn.querySelector("svg");
+					var svg = shellNavIcon(btn);
 					if (!svg || !svg.parentNode) continue;
 					if (!btn.querySelector('[data-xl-nav-glyph="1"]')) {
 						var holder = document.createElement("span");
@@ -2242,6 +2271,8 @@ window.__ModuleLoader__.load({
 						if (svgClass) holder.setAttribute("class", svgClass);
 						holder.style.display = "inline-flex";
 						holder.innerHTML = NAV_GLYPH_SVG;
+						var inner = holder.querySelector ? holder.querySelector("svg") : null;
+						if (inner) inner.setAttribute("data-xl-nav-glyph-svg", "1");
 						svg.parentNode.insertBefore(holder, svg);
 					}
 					// Self-healing: the shell may re-render its icon, and the decoration

package/lib/index.js

@@ -22,13 +22,40 @@ export const inject = ['webServer', 'subprocess', 'timer']
 const CONFIG_PATH = fileURLToPath(new URL('./config.json', import.meta.url))
 const PACKAGE_PATH = fileURLToPath(new URL('../package.json', import.meta.url))
 
-// DSH harness home directory. Used to discover service providers from the
-// user's configured llm-pi-ai providers. Falls back to platform defaults
-// when the DSH_HOME env var is not set.
-const DSH_HOME = process.env.DSH_HOME ||
-  (process.platform === 'darwin'
-    ? (process.env.HOME + '/Library/Application Support/dsh-desktop/harness')
-    : ((process.env.APPDATA || '') + '\\dsh-desktop\\harness'))
+// Where the harness keeps its settings.yaml and .credentials.yaml.
+//
+// This mirrors DSH's own resolution — `$DSH_HOME`, then `~/.dsh` (see
+// @deepseek-ai/dsh-home-paths: an explicit path, then DSH_HOME, then
+// homedir()/.dsh, with a blank DSH_HOME treated as unset) — and only then the
+// desktop-app layouts. Picking one guess was the bug: an install whose home is
+// ~/.dsh fell through to %APPDATA%\dsh-desktop\harness, which does not exist
+// there, so discovery silently reported "no provider configured" while the
+// settings file sat right there. The candidates are resolved per call and the
+// first one that actually holds a settings.yaml wins (see resolveHarnessHome).
+function harnessHomeCandidates() {
+  const out = []
+  const env = process.env.DSH_HOME
+  if (typeof env === 'string' && env.trim()) out.push(env.trim())
+  const home = process.env.HOME || process.env.USERPROFILE || ''
+  if (home) {
+    out.push(home.replace(/[\\/]+$/, '') + '/.dsh')
+    if (process.platform === 'darwin') out.push(home.replace(/[\\/]+$/, '') + '/Library/Application Support/dsh-desktop/harness')
+  }
+  if (process.env.APPDATA) out.push(process.env.APPDATA.replace(/[\\/]+$/, '') + '\\dsh-desktop\\harness')
+  return out
+}
+
+// The first candidate holding a settings.yaml, else the first candidate at all
+// (so the diagnostic can say which one was looked at).
+function pickHarnessHome(candidates, exists) {
+  for (const dir of candidates) {
+    try { if (exists(dir + '/settings.yaml')) return { home: dir, settingsFound: true } } catch (e) { /* keep looking */ }
+  }
+  return { home: candidates[0] || '', settingsFound: false }
+}
+
+// Diagnostic for the settings panel: which home was used and what was read there.
+let dshScanDiag = { home: null, settingsFound: false, credsFound: false, providers: [] }
 
 // Defaults: local model (Ollama) enabled from the start — the chain is
 // fail-open, so if Ollama is down it falls back to google/bing. `chain` is the
@@ -777,12 +804,17 @@ let dshScanOk = false
 async function discoverDshProviders() {
   const fs = await import('node:fs')
   const out = {}
+  const candidates = harnessHomeCandidates()
+  const picked = pickHarnessHome(candidates, function (p) { return fs.existsSync(p) })
+  const home = picked.home
+  const diag = { home: home, candidates: candidates, settingsFound: picked.settingsFound, credsFound: false, providers: [], error: null }
   try {
-    const settingsPath = DSH_HOME + '/settings.yaml'
-    const credsPath = DSH_HOME + '/.credentials.yaml'
+    const settingsPath = home + '/settings.yaml'
+    const credsPath = home + '/.credentials.yaml'
     let settingsTxt = '', credsTxt = ''
     try { settingsTxt = fs.readFileSync(settingsPath, 'utf8') } catch (e) {}
     try { credsTxt = fs.readFileSync(credsPath, 'utf8') } catch (e) {}
+    diag.credsFound = credsTxt.length > 0
     const providers = extractDshProviders(settingsTxt)
     const refs = extractCredRefs(credsTxt)
     dshScanOk = /llm-pi-ai:[\s\S]*?\n[ \t]{2}providers:/m.test(settingsTxt)
@@ -792,7 +824,7 @@ async function discoverDshProviders() {
     for (const k of Object.keys(refs)) credRefsCache.set(k, refs[k])
     for (const name of Object.keys(providers)) {
       const p = providers[name]
-      if (!p.baseURL || !p.model) continue
+      if (!p.baseURL || !p.model) { diag.skipped = (diag.skipped || []).concat(name); continue }
       const entry = {
         type: 'openai',
         source: 'dsh',
@@ -802,8 +834,12 @@ async function discoverDshProviders() {
       }
       if (p.apiKeyEnv) entry.apiKeyEnv = p.apiKeyEnv
       out[name] = entry
+      diag.providers.push(name)
     }
-  } catch (e) { /* silent — discovery must never block the plugin */ }
+  } catch (e) {
+    diag.error = e instanceof Error ? e.message : String(e)
+  }
+  dshScanDiag = diag
   return out
 }
 
@@ -1374,8 +1410,12 @@ export function apply(ctx) {
           const cfg = await loadConfig()
           await saveConfig(cfg)
           // The fresh merge is what fills in resolved credentials, so this route
-          // is the one that most needs the sanitizer.
-          sendJson(res, 200, stripResolvedKeys(cfg))
+          // is the one that most needs the sanitizer. `dshScan` rides along (on the
+          // response copy only, never saved) so the panel can explain an empty scan
+          // instead of just saying "no provider configured".
+          const out = stripResolvedKeys(cfg)
+          out.dshScan = dshScanDiag
+          sendJson(res, 200, out)
         } catch (e) {
           sendJson(res, 500, { error: e instanceof Error ? e.message : String(e) })
         }
@@ -1395,4 +1435,5 @@ export {
   needsTranslate, hasProse, chunkText, fnv, deepMerge,
   structuredCloneSafe, ADAPTERS,
   resolveApiKey, stripResolvedKeys, missingApiKey, clearNullFields, handleVersion,
+  harnessHomeCandidates, pickHarnessHome,
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-think-translate",
   "description": "Display-layer translation for the DSH web app: thinking chain, task cards, and optional answer text, in 8 target languages (local Ollama / any OpenAI-compatible or Anthropic endpoint / Google / Bing, fail-open)",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "type": "module",
   "main": "lib/index.js",
   "exports": {