super-dsh 0.3.0-e → 0.3.0-g

package/superd-hub/lib/client/index.js

@@ -2198,6 +2198,145 @@ async function removeProvider(agentKey, namespace, id, doFetch) {
 	return requireProvidersView(await callRuntimeSettings(agentKey, namespace, "remove", { request: { id } }, doFetch));
 }
 
+//#endregion
+//#region src/client/companion-api.ts
+async function callCompanion(operation, doFetch) {
+	const method = `superdCompanions/${operation}`;
+	const response = await (doFetch ?? ((path, init) => fetch(path, init)))(`/api/${method}`, {
+		method: "POST",
+		credentials: "same-origin",
+		headers: { "content-type": "application/json" },
+		body: JSON.stringify({
+			type: "client-request",
+			rpcId: mintRpcId(),
+			method,
+			payload: { args: {} }
+		})
+	});
+	if (!response.ok) throw new Error(`Better Dash: HTTP ${response.status}`);
+	let body;
+	try {
+		body = JSON.parse(await response.text());
+	} catch {
+		throw new Error("Better Dash: unreadable response");
+	}
+	const result = body?.result;
+	if (result?.ok !== true) throw new Error(result?.error?.message ?? "Better Dash: request failed");
+	const value = result.value;
+	if (value === null || typeof value !== "object" || typeof value.installed !== "boolean" || typeof value.installing !== "boolean" || typeof value.requestedVersion !== "string" || value.version !== void 0 && typeof value.version !== "string" || value.enabled !== void 0 && typeof value.enabled !== "boolean" || value.error !== void 0 && typeof value.error !== "string") throw new Error("Better Dash: invalid status");
+	return value;
+}
+
+//#endregion
+//#region src/client/CompanionSettings.tsx
+/** Native plugin switches remain in Plugin Manager; this row provides explicit recovery. */
+function CompanionSettings() {
+	const [status, setStatus] = react.default.useState();
+	const [error, setError] = react.default.useState();
+	const [busy, setBusy] = react.default.useState(false);
+	const live = react.default.useRef(false);
+	const operation = react.default.useRef(false);
+	react.default.useEffect(() => {
+		live.current = true;
+		let reading = false;
+		const refresh = async () => {
+			if (reading || operation.current) return;
+			reading = true;
+			try {
+				const next = await callCompanion("getBetterDash");
+				if (live.current) {
+					setStatus(next);
+					setError(next.error);
+				}
+			} catch (cause) {
+				if (live.current) setError(cause instanceof Error ? cause.message : String(cause));
+			} finally {
+				reading = false;
+			}
+		};
+		refresh();
+		const timer = window.setInterval(() => {
+			refresh();
+		}, 5e3);
+		return () => {
+			live.current = false;
+			window.clearInterval(timer);
+		};
+	}, []);
+	const install = async () => {
+		if (operation.current) return;
+		operation.current = true;
+		setBusy(true);
+		setError(void 0);
+		try {
+			const next = await callCompanion("installBetterDash");
+			if (live.current) {
+				setStatus(next);
+				setError(next.error);
+			}
+		} catch (cause) {
+			if (live.current) setError(cause instanceof Error ? cause.message : String(cause));
+		} finally {
+			operation.current = false;
+			if (live.current) setBusy(false);
+		}
+	};
+	const installing = busy || status?.installing === true;
+	const label = status === void 0 ? "Loading…" : status.installed ? `Installed${status.version ? " · " + status.version : ""}${status.enabled === false ? " · Disabled" : ""}` : "Not installed";
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+		style: {
+			borderRadius: 12,
+			padding: "12px 14px",
+			background: "var(--dsw-alias-interactive-bg-hover)"
+		},
+		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			style: {
+				display: "flex",
+				alignItems: "center",
+				gap: 16
+			},
+			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				style: { flex: 1 },
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					style: {
+						fontSize: 14,
+						fontWeight: 600
+					},
+					children: "Better Dash"
+				}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+					role: "status",
+					style: {
+						fontSize: 12,
+						color: "var(--dsw-alias-label-secondary)",
+						marginTop: 4
+					},
+					children: installing ? "Installing…" : label
+				})]
+			}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+				type: "button",
+				disabled: installing || status?.installed === true,
+				onClick: () => {
+					install();
+				},
+				style: {
+					padding: "6px 12px",
+					borderRadius: 8,
+					cursor: installing || status?.installed ? "default" : "pointer"
+				},
+				children: installing ? "Installing…" : status?.installed ? "Installed" : "Install"
+			})]
+		}), error && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
+			role: "alert",
+			style: {
+				fontSize: 12,
+				margin: "8px 0 0",
+				color: "var(--dsw-alias-state-error-primary)"
+			},
+			children: error
+		})]
+	});
+}
+
 //#endregion
 //#region src/client/HubPage.tsx
 const EMPTY_DRAFT = {
@@ -3415,16 +3554,8 @@ function HubPage() {
 					},
 					children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(GroupHead, {
 						title: "Settings",
-						count: 0
-					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-						style: {
-							margin: 0,
-							fontSize: 13,
-							lineHeight: "20px",
-							color: "var(--dsw-alias-label-tertiary)"
-						},
-						children: "Hub preferences — pairing, runtime visibility, and orchestration defaults land with the hub service."
-					})]
+						count: 1
+					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(CompanionSettings, {})]
 				}),
 				tab === "home" && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 					style: {

package/superd-hub/package.json

@@ -18,8 +18,7 @@
     "dist",
     "lib",
     "assets",
-    "cordis.patch.yml",
-    "scripts/register-companion.mjs"
+    "cordis.patch.yml"
   ],
   "dsh": {
     "bundle": {

package/superd-hub/scripts/register-companion.mjs

@@ -1,100 +0,0 @@
-// Separate-process entry for the SAME native package operations used by dsh plugin.
-// No shell interpolation, package scripts, upstream edits, or online companion lookup.
-import { createRequire } from 'node:module'
-import { readFile } from 'node:fs/promises'
-import { join } from 'node:path'
-import { pathToFileURL } from 'node:url'
-let input = ''
-for await (const bytes of process.stdin) input += bytes
-const {profile,expected} = JSON.parse(input)
-const require = createRequire(profile.installAnchor)
-const {runProfilePnpm,saveManifest} = await import(pathToFileURL(require.resolve('@deepseek-ai/dsh-plugin-manager/operations')).href)
-const {withFileLock,writeFileAtomic} = await import(pathToFileURL(require.resolve('@deepseek-ai/dsh-atomic-write')).href)
-const abort = new AbortController()
-process.once('SIGTERM', () => abort.abort())
-const json = async path => JSON.parse(await readFile(path, 'utf8'))
-async function optionalJson(path) { try { return await json(path) } catch(error) { if(error.code === 'ENOENT') return undefined; throw error } }
-const skipped = disposition => ({ exitCode: 0, disposition })
-// Complete each native acquisition/release before observing cancellation;
-// exiting during its async lock-file write can strand incomplete lock metadata.
-async function withCancellableProfileLock(operation) {
-  const path = join(profile.dir, 'package.json'), deadline = Date.now() + 120000
-  for (;;) {
-    abort.signal.throwIfAborted()
-    let acquired = false
-    try {
-      return await withFileLock(path, async () => {
-        acquired = true
-        abort.signal.throwIfAborted()
-        return operation()
-      }, { waitMs: Math.min(250, Math.max(0, deadline - Date.now())) })
-    } catch (error) {
-      abort.signal.throwIfAborted()
-      if (acquired || Date.now() >= deadline
-        || error.message !== `atomic-write: timed out waiting for the writer lock at ${path}.lock`) throw error
-    }
-  }
-}
-const result = await withCancellableProfileLock(async () => {
-  abort.signal.throwIfAborted()
-  const current = await json(join(profile.dir, 'package.json'))
-  if (typeof expected.ownerSpec !== 'string' || current.dependencies?.[expected.owner] !== expected.ownerSpec) return skipped('owner-changed')
-  const ownerDir = join(profile.dir, 'node_modules', expected.owner)
-  let owner
-  try { owner = await json(join(ownerDir, 'package.json')) }
-  catch (error) { if (error.code === 'ENOENT') return skipped('owner-changed'); throw error }
-  const item=expected.companion
-  if(owner.name !== 'super-dsh' || owner.version !== item.version || owner.dependencies?.[item.name] !== item.version) return skipped('owner-changed')
-  // Resolve from the owner: a retained older direct Better may coexist with the new transitive version.
-  const ownerRequire=createRequire(join(ownerDir,'package.json'))
-  const downloaded=await json(ownerRequire.resolve(item.name+'/package.json'))
-  if(downloaded.name !== item.name || downloaded.version !== item.version) throw new Error('The user installation did not fetch the exact companion dependency')
-  const prior = current.dependencies?.[item.name]
-  if (prior !== expected.priorSpec) return skipped(prior === undefined && expected.priorSpec !== undefined ? 'companion-removed' : 'companion-changed')
-  abort.signal.throwIfAborted()
-  // A plain npm consumer already has the exact transitive files but not a pnpm
-  // store. Fresh hoisted registration changes metadata only, preserving npm ci.
-  const npmLockPath=join(profile.dir,'package-lock.json')
-  const npmLock=await optionalJson(npmLockPath)
-  const staged=structuredClone(current)
-  staged.dependencies={...staged.dependencies,[item.name]:item.version}
-  const selectNew=manifest=>{
-    if(prior !== undefined)return
-    const bundles=manifest.dsh?.profile?.bundles??[]
-    manifest.dsh={...manifest.dsh,profile:{...manifest.dsh?.profile,bundles:[...bundles,...bundles.includes(item.name)?[]:[item.name]]}}
-  }
-  const installedBefore=await optionalJson(join(profile.dir,'node_modules',item.name,'package.json'))
-  if(npmLock?.packages?.[''] && installedBefore?.version === item.version) {
-    const beforeLock=await readFile(npmLockPath,'utf8')
-    npmLock.packages[''].dependencies={...npmLock.packages[''].dependencies,[item.name]:item.version}
-    try {
-      selectNew(staged)
-      await writeFileAtomic(npmLockPath,JSON.stringify(npmLock,null,2)+'\n',{mode:0o600})
-      await saveManifest(profile.dir,staged)
-    } catch(error) { await writeFileAtomic(npmLockPath,beforeLock,{mode:0o600});await saveManifest(profile.dir,current);throw error }
-    return {exitCode:0,disposition:'installed'}
-  }
-  // No named spec: native add --offline still does online pnpm view preflight.
-  // Stage the exact dependency under the same lock, then re-layout cached files
-  // with the package manager that actually produced the consumer's lockfile.
-  await saveManifest(profile.dir,staged)
-  let operation
-  try {
-    operation=await runProfilePnpm({profile:profile.name,dir:profile.dir,installAnchor:profile.installAnchor,cwd:profile.dir,home:profile.home},
-      npmLock ? ['install','--offline','--ignore-scripts','--no-audit','--no-fund'] : ['install','--offline','--ignore-scripts','--no-frozen-lockfile'], {
-      ...profile.packageManager, ...npmLock?{command:'npm',args:[]}: {},
-      execution:'service', signal:abort.signal, outputBytes:16384,
-      lookupTimeoutMs:120000, idleTimeoutMs:120000,
-    })
-    if(operation.exitCode !== 0) { await saveManifest(profile.dir,current) }
-    else {
-      const installed=await json(join(profile.dir,'node_modules',item.name,'package.json'))
-      const after=await json(join(profile.dir,'package.json'))
-      if(installed.name !== item.name || installed.version !== item.version || after.dependencies?.[item.name] !== item.version) throw new Error('Native companion registration did not resolve the exact cached registry version')
-      selectNew(after)
-      await saveManifest(profile.dir,after)
-    }
-  } catch(error) { await saveManifest(profile.dir,current);throw error }
-  return { exitCode: operation.exitCode, logPath: operation.logPath, disposition: 'installed' }
-})
-process.stdout.write(JSON.stringify(result)+'\n')