better-dsh 0.2.5-e → 0.3.0

package/lib/{wrap-kTohEeis.js → wrap-T4I0nfPM.js}

@@ -1,6 +1,6 @@
-import { promises, statSync } from "node:fs";
 import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
+import { promises, statSync } from "node:fs";
 
 //#region src/url-schemes/catalog.ts
 /**
@@ -242,120 +242,6 @@ function stringifyNode(node) {
 	}
 }
 
-//#endregion
-//#region src/url-schemes/handlers/dvc.ts
-/** Module-level device registry: insertion-ordered, shared by every handler instance. */
-const devices = /* @__PURE__ */ new Map();
-/** Register (or replace) the device mounted under `name`. */
-function registerDvcDevice(name, device) {
-	devices.set(name, device);
-}
-/** Read-only view of the registered devices, in registration order. */
-function listDvcDevices() {
-	return devices;
-}
-/**
-* The first path segment is the device name (`dvc://name`, `dvc://name/sub`).
-* A leading `dvc://` is tolerated so callers may pass either the parsed path
-* (the write tool's contract) or the full URL.
-*/
-/** Subpath after the device name (`status`, `diagnostics?file=…`), or undefined. */
-function subpathOf(path$1) {
-	const trimmed = (path$1.startsWith("dvc://") ? path$1.slice(6) : path$1).replace(/^\/+/, "");
-	const slash = trimmed.indexOf("/");
-	if (slash === -1) return void 0;
-	const sub = trimmed.slice(slash + 1);
-	return sub === "" ? void 0 : sub;
-}
-function deviceNameFromPath(path$1) {
-	const trimmed = (path$1.startsWith("dvc://") ? path$1.slice(6) : path$1).replace(/^\/+/, "");
-	const slash = trimmed.indexOf("/");
-	return slash === -1 ? trimmed : trimmed.slice(0, slash);
-}
-/** Uniform `unknown`-error rendering for structured error messages. */
-function messageOf(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-/**
-* Build the `dvc://` scheme handler over the module-level device registry.
-* Bare `dvc://` yields the roster (`no devices mounted` while empty); a
-* registered `<device>` yields its summary plus a usage hint; an unregistered
-* name keeps the `unknown device` placeholder text.
-*/
-function createDvcHandler(_deps = {}) {
-	return {
-		selectorAware: true,
-		async resolve(_env, path$1, selector) {
-			const name = deviceNameFromPath(path$1);
-			if (name === "") {
-				if (devices.size === 0) return "no devices mounted";
-				return applySelector([...devices].map(([n, device$1]) => `${n}\t${device$1.summary}`).join("\n"), selector ?? null);
-			}
-			const device = devices.get(name);
-			if (device === void 0) return `unknown device: ${name}`;
-			const subpath = subpathOf(path$1);
-			if (subpath !== void 0 && device.read !== void 0) {
-				const query = selector?.kind === "query" ? `?${selector.q}` : "";
-				let text;
-				try {
-					text = await device.read(`${subpath}${query}`, _env.agent?.id);
-				} catch (error) {
-					return `Error: ${error instanceof Error ? error.message : String(error)}`;
-				}
-				return selector !== void 0 && selector !== null && selector.kind !== "query" ? applySelector(text, selector) : text;
-			}
-			if (subpath !== void 0) return `unknown read path dvc://${name}/${subpath} (device serves doc only)`;
-			return applySelector(`${device.summary}\nusage: write dvc://${name} with a JSON args object to execute this device`, selector ?? null);
-		}
-	};
-}
-/**
-* Write dispatch for `dvc://` URLs — called by the write tool's URL branch.
-* `path` addresses the device (parsed path or full `dvc://` URL); `content`
-* must be the JSON args payload.
-*
-* Routing and args failures (`DVC_NO_DEVICE`, `DVC_UNKNOWN_DEVICE`,
-* `DVC_BAD_ARGS`) throw synchronously — the placeholder wave's observable
-* contract — while a device-reported failure rejects the returned promise as
-* `DVC_DEVICE_ERROR` carrying the device name.
-*/
-function dispatchDvcWrite(path$1, content, session, cwd) {
-	if (devices.size === 0) throw new UrlSchemesError("DVC_NO_DEVICE", "dvc:// write dispatch: no devices mounted to route the write to");
-	const name = deviceNameFromPath(path$1);
-	const device = devices.get(name);
-	if (device === void 0) throw new UrlSchemesError("DVC_UNKNOWN_DEVICE", `dvc:// write dispatch: no device named "${name}" (registered: ${[...devices.keys()].sort().join(", ")})`);
-	let args;
-	try {
-		args = JSON.parse(content);
-	} catch (error) {
-		throw new UrlSchemesError("DVC_BAD_ARGS", `dvc:// write dispatch: device "${name}" requires a JSON args payload (${messageOf(error)})`);
-	}
-	if (session !== void 0 && args !== null && typeof args === "object" && !Array.isArray(args)) args = { ...args };
-	return Promise.resolve().then(() => device.execute(args, {
-		session,
-		...cwd === void 0 ? {} : { cwd }
-	})).catch((error) => {
-		throw new UrlSchemesError("DVC_DEVICE_ERROR", `dvc:// device "${name}" execute failed: ${messageOf(error)}`);
-	});
-}
-
-//#endregion
-//#region src/url-schemes/docs-dir.ts
-function resolveDocsDir() {
-	let dir = dirname(fileURLToPath(import.meta.url));
-	for (;;) {
-		for (const name of ["dsh-docs", "docs"]) {
-			const candidate = join(dir, name);
-			try {
-				if (statSync(candidate).isDirectory()) return candidate;
-			} catch {}
-		}
-		const parent = dirname(dir);
-		if (parent === dir) return void 0;
-		dir = parent;
-	}
-}
-
 //#endregion
 //#region src/url-schemes/resolver.ts
 /** Scheme→handler registry that resolves `scheme://` URLs end-to-end. */
@@ -541,6 +427,103 @@ function createDshHandler(deps) {
 	};
 }
 
+//#endregion
+//#region src/url-schemes/handlers/dvc.ts
+/** Module-level device registry: insertion-ordered, shared by every handler instance. */
+const devices = /* @__PURE__ */ new Map();
+/** Register (or replace) the device mounted under `name`. */
+function registerDvcDevice(name, device) {
+	devices.set(name, device);
+}
+/** Read-only view of the registered devices, in registration order. */
+function listDvcDevices() {
+	return devices;
+}
+/**
+* The first path segment is the device name (`dvc://name`, `dvc://name/sub`).
+* A leading `dvc://` is tolerated so callers may pass either the parsed path
+* (the write tool's contract) or the full URL.
+*/
+/** Subpath after the device name (`status`, `diagnostics?file=…`), or undefined. */
+function subpathOf(path$1) {
+	const trimmed = (path$1.startsWith("dvc://") ? path$1.slice(6) : path$1).replace(/^\/+/, "");
+	const slash = trimmed.indexOf("/");
+	if (slash === -1) return void 0;
+	const sub = trimmed.slice(slash + 1);
+	return sub === "" ? void 0 : sub;
+}
+function deviceNameFromPath(path$1) {
+	const trimmed = (path$1.startsWith("dvc://") ? path$1.slice(6) : path$1).replace(/^\/+/, "");
+	const slash = trimmed.indexOf("/");
+	return slash === -1 ? trimmed : trimmed.slice(0, slash);
+}
+/** Uniform `unknown`-error rendering for structured error messages. */
+function messageOf(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+/**
+* Build the `dvc://` scheme handler over the module-level device registry.
+* Bare `dvc://` yields the roster (`no devices mounted` while empty); a
+* registered `<device>` yields its summary plus a usage hint; an unregistered
+* name keeps the `unknown device` placeholder text.
+*/
+function createDvcHandler(_deps = {}) {
+	return {
+		selectorAware: true,
+		async resolve(_env, path$1, selector) {
+			const name = deviceNameFromPath(path$1);
+			if (name === "") {
+				if (devices.size === 0) return "no devices mounted";
+				return applySelector([...devices].map(([n, device$1]) => `${n}\t${device$1.summary}`).join("\n"), selector ?? null);
+			}
+			const device = devices.get(name);
+			if (device === void 0) return `unknown device: ${name}`;
+			const subpath = subpathOf(path$1);
+			if (subpath !== void 0 && device.read !== void 0) {
+				const query = selector?.kind === "query" ? `?${selector.q}` : "";
+				let text;
+				try {
+					text = await device.read(`${subpath}${query}`, _env.agent?.id);
+				} catch (error) {
+					return `Error: ${error instanceof Error ? error.message : String(error)}`;
+				}
+				return selector !== void 0 && selector !== null && selector.kind !== "query" ? applySelector(text, selector) : text;
+			}
+			if (subpath !== void 0) return `unknown read path dvc://${name}/${subpath} (device serves doc only)`;
+			return applySelector(`${device.summary}\nusage: write dvc://${name} with a JSON args object to execute this device`, selector ?? null);
+		}
+	};
+}
+/**
+* Write dispatch for `dvc://` URLs — called by the write tool's URL branch.
+* `path` addresses the device (parsed path or full `dvc://` URL); `content`
+* must be the JSON args payload.
+*
+* Routing and args failures (`DVC_NO_DEVICE`, `DVC_UNKNOWN_DEVICE`,
+* `DVC_BAD_ARGS`) throw synchronously — the placeholder wave's observable
+* contract — while a device-reported failure rejects the returned promise as
+* `DVC_DEVICE_ERROR` carrying the device name.
+*/
+function dispatchDvcWrite(path$1, content, session, cwd) {
+	if (devices.size === 0) throw new UrlSchemesError("DVC_NO_DEVICE", "dvc:// write dispatch: no devices mounted to route the write to");
+	const name = deviceNameFromPath(path$1);
+	const device = devices.get(name);
+	if (device === void 0) throw new UrlSchemesError("DVC_UNKNOWN_DEVICE", `dvc:// write dispatch: no device named "${name}" (registered: ${[...devices.keys()].sort().join(", ")})`);
+	let args;
+	try {
+		args = JSON.parse(content);
+	} catch (error) {
+		throw new UrlSchemesError("DVC_BAD_ARGS", `dvc:// write dispatch: device "${name}" requires a JSON args payload (${messageOf(error)})`);
+	}
+	if (session !== void 0 && args !== null && typeof args === "object" && !Array.isArray(args)) args = { ...args };
+	return Promise.resolve().then(() => device.execute(args, {
+		session,
+		...cwd === void 0 ? {} : { cwd }
+	})).catch((error) => {
+		throw new UrlSchemesError("DVC_DEVICE_ERROR", `dvc:// device "${name}" execute failed: ${messageOf(error)}`);
+	});
+}
+
 //#endregion
 //#region src/url-schemes/handlers/http.ts
 /** The schemes one handler instance serves; register it under each of these. */
@@ -660,6 +643,23 @@ function createHttpHandler() {
 	} };
 }
 
+//#endregion
+//#region src/url-schemes/docs-dir.ts
+function resolveDocsDir() {
+	let dir = dirname(fileURLToPath(import.meta.url));
+	for (;;) {
+		for (const name of ["dsh-docs", "docs"]) {
+			const candidate = join(dir, name);
+			try {
+				if (statSync(candidate).isDirectory()) return candidate;
+			} catch {}
+		}
+		const parent = dirname(dir);
+		if (parent === dir) return void 0;
+		dir = parent;
+	}
+}
+
 //#endregion
 //#region src/fs-aware/wrap.ts
 const WRAPPED = Symbol("dsh-url-schemes.fs-wrap");
@@ -747,4 +747,4 @@ function wrapFsWithSchemes(fs$1, services) {
 }
 
 //#endregion
-export { createDshHandler as a, createDvcHandler as c, registerDvcDevice as d, UrlSchemesError as f, SCHEME_NAMES as h, createHttpHandler as i, dispatchDvcWrite as l, parseUrl as m, wrapFsWithSchemes as n, UrlResolver as o, applySelector as p, HTTP_SCHEMES as r, resolveDocsDir as s, buildFsLayerResolver as t, listDvcDevices as u };
+export { createHttpHandler as a, listDvcDevices as c, UrlResolver as d, UrlSchemesError as f, SCHEME_NAMES as h, HTTP_SCHEMES as i, registerDvcDevice as l, parseUrl as m, wrapFsWithSchemes as n, createDvcHandler as o, applySelector as p, resolveDocsDir as r, dispatchDvcWrite as s, buildFsLayerResolver as t, createDshHandler as u };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-dsh",
-  "version": "0.2.5-e",
+  "version": "0.3.0",
   "description": "Make your dsh ready for serious coding tasks. (Tools x Schemas)^REPL. `skill://`, `ctx://`, `agent://`, `dvc://`, `dsh://`, IPython REPL, Context as Variables, cross compactions recallable, full context revive. `hash-edit`, `dvc://browser`, subagent as function, workflow as function.",
   "type": "module",
   "main": "lib/index.js",
@@ -51,6 +51,22 @@
     "./client": {
       "types": "./lib/client/index.d.ts",
       "default": "./lib/client/index.js"
+    },
+    "./welcome-notice": {
+      "types": "./lib/welcome-notice.d.ts",
+      "default": "./lib/welcome-notice.js"
+    },
+    "./webserver": {
+      "types": "./lib/webserver.d.ts",
+      "default": "./lib/webserver.js"
+    },
+    "./bundle-delivery": {
+      "types": "./lib/bundle-delivery.d.ts",
+      "default": "./lib/bundle-delivery.js"
+    },
+    "./hmr": {
+      "types": "./lib/hmr.d.ts",
+      "default": "./lib/hmr.js"
     }
   },
   "imports": {
@@ -67,7 +83,8 @@
     "cordis.patch.yml",
     "eval-description.md",
     "url-schemes-instruction.md",
-    "scripts/kernel-provision.mjs"
+    "scripts/kernel-provision.mjs",
+    "scripts/register-bundle.mjs"
   ],
   "scripts": {
     "prebuild": "node scripts/copy-docs.mjs",
@@ -158,7 +175,12 @@
     "@deepseek-ai/dsh-user-approval": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-web-app": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-workflow-worker-thread": ">=0.1.5-0 <0.3.0-0",
-    "react": "^18.2.0"
+    "react": "^18.2.0",
+    "@deepseek-ai/dsh-app-boot": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-atomic-write": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-cmdline": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-plugin-manager": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-hmr": ">=0.1.5-0 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -337,6 +359,21 @@
     },
     "react": {
       "optional": true
+    },
+    "@deepseek-ai/dsh-app-boot": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-atomic-write": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-cmdline": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-plugin-manager": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-hmr": {
+      "optional": true
     }
   },
   "devDependencies": {
@@ -373,7 +410,8 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pgmi-builds/better-dsh.git"
+    "url": "git+https://github.com/pgmi-builds/super-dsh.git",
+    "directory": "better-dsh"
   },
   "keywords": [
     "dsh",
@@ -384,5 +422,9 @@
     "kernel",
     "agent",
     "plugin"
-  ]
+  ],
+  "homepage": "https://github.com/pgmi-builds/super-dsh/tree/master/better-dsh",
+  "bugs": {
+    "url": "https://github.com/pgmi-builds/super-dsh/issues"
+  }
 }

package/scripts/register-bundle.mjs

@@ -0,0 +1,80 @@
+// Separate-process entry for the SAME native package operations used by dsh plugin.
+// No shell interpolation, package scripts, upstream edits, or companion registry lookup.
+import { createRequire } from 'node:module'
+import { createHash } from 'node:crypto'
+import { readFile, realpath } from 'node:fs/promises'
+import { dirname, join, relative, resolve, isAbsolute, sep } from 'node:path'
+import { pathToFileURL } from 'node:url'
+let input = ''
+for await (const bytes of process.stdin) input += bytes
+const {profile,archive,expected} = JSON.parse(input)
+const require = createRequire(profile.installAnchor)
+const {runProfilePnpm} = await import(pathToFileURL(require.resolve('@deepseek-ai/dsh-plugin-manager/operations')).href)
+const {withFileLock} = 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'))
+const hash = bytes => createHash('sha256').update(bytes).digest('hex')
+async function contained(root, path) {
+  if (typeof path !== 'string' || isAbsolute(path)) throw new Error('Pack delivery path must be relative')
+  const base = await realpath(root), file = await realpath(resolve(base, path)), rel = relative(base, file)
+  if (rel === '..' || rel.startsWith('..' + sep) || isAbsolute(rel)) throw new Error('Pack delivery path escapes its owner')
+  return file
+}
+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, descriptorPath, descriptor
+  try {
+    owner = await json(join(ownerDir, 'package.json'))
+    if (owner.dependencies?.[expected.companion.name] !== expected.companion.version || owner.superd?.delivery === undefined) return skipped('owner-changed')
+    descriptorPath = await contained(ownerDir, owner.superd.delivery)
+    descriptor = await json(descriptorPath)
+  } catch (error) {
+    if (error.code === 'ENOENT') return skipped('owner-changed')
+    throw error
+  }
+  const item = descriptor.companions?.find(item => item.name === expected.companion.name)
+  if (item?.version !== expected.companion.version || item.sha256 !== expected.companion.sha256
+    || hash(await readFile(await contained(dirname(descriptorPath), item.tarball))) !== expected.companion.sha256) return skipped('owner-changed')
+  const prior = current.dependencies?.[item.name]
+  if (prior !== expected.priorSpec) return skipped(prior === undefined && expected.priorSpec !== undefined ? 'companion-removed' : 'companion-changed')
+  if (hash(await readFile(archive)) !== item.sha256) throw new Error('Cached companion SHA256 mismatch')
+  abort.signal.throwIfAborted()
+  // Same public operation and writer lock used by the native Plugin Manager;
+  // intent is checked after acquisition, before a queued install can undo removal.
+  const operation = await runProfilePnpm({profile:profile.name,dir:profile.dir,installAnchor:profile.installAnchor,cwd:profile.dir,home:profile.home}, ['add','file:'+archive,'--ignore-scripts'], {
+    ...profile.packageManager, execution:'service', signal:abort.signal, outputBytes:16384,
+    lookupTimeoutMs:120000, idleTimeoutMs:120000,
+  })
+  if (operation.exitCode === 0) {
+    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] !== 'file:' + archive) throw new Error('Native companion registration did not install the exact local artifact')
+  }
+  return { exitCode: operation.exitCode, logPath: operation.logPath, disposition: 'installed' }
+})
+process.stdout.write(JSON.stringify(result)+'\n')

package/lib/LaunchOptions-3peHoOAx.js

@@ -1,4 +0,0 @@
-import "./main-CKFNYpqT.js";
-import { t as convertPuppeteerChannelToBrowsersChannel } from "./LaunchOptions-DXdeJis3.js";
-
-export { convertPuppeteerChannelToBrowsersChannel };