better-dsh 0.3.0 → 0.3.1-a

package/lib/url-schemes/index.d.ts

@@ -1,6 +1,6 @@
-import { t as Schema } from "../index-DTDXUe6m.js";
 import { Context } from "@deepseek-ai/cordis";
 import { ToolDefinition } from "@deepseek-ai/dsh-tools";
+import * as _deepseek_ai_schemastery11 from "@deepseek-ai/schemastery";
 
 //#region src/url-schemes/tools/write.d.ts
 
@@ -50,12 +50,12 @@ declare const inject: string[];
  * real patch-line config. Schema-level defaults (both ON — the service is
  * opt-out) survive every overlay layer, per the v0.2.2a ruling.
  */
-declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
-  urlSchemes: Schema<boolean, boolean, "defined">;
-  hashline: Schema<boolean, boolean, "defined">;
+declare const Config: _deepseek_ai_schemastery11.default<Schemastery.ObjectS<NoInfer<{
+  urlSchemes: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
+  hashline: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
-  urlSchemes: Schema<boolean, boolean, "defined">;
-  hashline: Schema<boolean, boolean, "defined">;
+  urlSchemes: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
+  hashline: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
 }>>, "plain">;
 /** Register the four URL-aware tools on one agent's own scope layer. */
 /**
@@ -75,12 +75,12 @@ declare function apply(ctx: Context, config: UrlSchemesConfig | undefined): void
 declare const _default: {
   name: string;
   inject: string[];
-  Config: Schema<Schemastery.ObjectS<NoInfer<{
-    urlSchemes: Schema<boolean, boolean, "defined">;
-    hashline: Schema<boolean, boolean, "defined">;
+  Config: _deepseek_ai_schemastery11.default<Schemastery.ObjectS<NoInfer<{
+    urlSchemes: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
+    hashline: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
   }>>, Schemastery.ObjectT<NoInfer<{
-    urlSchemes: Schema<boolean, boolean, "defined">;
-    hashline: Schema<boolean, boolean, "defined">;
+    urlSchemes: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
+    hashline: _deepseek_ai_schemastery11.default<boolean, boolean, "defined">;
   }>>, "plain">;
   apply: typeof apply;
 };

package/lib/url-schemes/index.js

@@ -1,28 +1,28 @@
 import { r as __toESM, t as __commonJS } from "../chunk-DQxbwPpZ.js";
 import { t as Schema } from "../lib-C8_jXvwA.js";
-import { a as PACKAGE_ROOT } from "../kernel-env-D8UOWeji.js";
+import { t as PACKAGE_ROOT } from "../kernel-env-x_WkG6Fr.js";
 import { n as captureNativeTools } from "../native-capture-BEByDXYM.js";
-import { a as createHttpHandler, c as listDvcDevices, d as UrlResolver, f as UrlSchemesError, h as SCHEME_NAMES, i as HTTP_SCHEMES, l as registerDvcDevice, m as parseUrl, n as wrapFsWithSchemes, o as createDvcHandler, p as applySelector, r as resolveDocsDir, s as dispatchDvcWrite, u as createDshHandler } from "../wrap-T4I0nfPM.js";
+import { a as createHttpHandler, c as listDvcDevices, d as UrlResolver, f as UrlSchemesError, h as SCHEME_NAMES, i as HTTP_SCHEMES, l as registerDvcDevice, m as parseUrl, n as wrapFsWithSchemes, o as createDvcHandler, p as applySelector, r as resolveDocsDir, s as dispatchDvcWrite, u as createDshHandler } from "../wrap-0VA0uFx8.js";
 import { n as Parser } from "../web-tree-sitter-CPrPD4J2.js";
-import { a as primaryServerForFile, c as serversForFile, n as findWorkspaceRoot, o as resolveCommandPath, r as installHintFor, s as serverByName } from "../lsp-server-registry-CH9WNFFt.js";
+import { a as primaryServerForFile, c as serversForFile, n as findWorkspaceRoot, o as resolveCommandPath, r as installHintFor, s as serverByName } from "../lsp-server-registry-D4VLs1Sm.js";
 import { createRequire } from "node:module";
 import { createHash, randomUUID } from "node:crypto";
-import { spawn } from "node:child_process";
-import * as fsPromises from "node:fs/promises";
-import { mkdir, mkdtemp, readFile, readdir, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
+import { accessSync, constants, existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import * as path$1 from "node:path";
 import { dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
+import { spawn } from "node:child_process";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { AsyncLocalStorage } from "node:async_hooks";
-import { accessSync, constants, existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
 import { defineTool } from "@deepseek-ai/dsh-tools";
+import * as fsPromises from "node:fs/promises";
+import { lstat, mkdir, mkdtemp, readFile, readdir, readlink, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { FsError } from "@deepseek-ai/dsh-fs";
 import { ESCALATION_TARGETS, approveEscalation, escalationHintMarker, sandboxDenialMarker, validateEscalationArgs } from "@deepseek-ai/dsh-sandbox";
 import { gunzipSync } from "node:zlib";
 import { SessionId } from "@deepseek-ai/dsh-session";
 import { resolveDshHome } from "@deepseek-ai/dsh-home-paths";
 import { DatabaseSync } from "node:sqlite";
+import { AsyncLocalStorage } from "node:async_hooks";
 
 //#region src/devices/ast/engine/grammar-manifest.mjs
 /**
@@ -1435,7 +1435,7 @@ const PUPPETEER_CORE_VERSION = "25.3.0";
 */
 async function loadPuppeteer() {
 	if (puppeteerModule === void 0) try {
-		puppeteerModule = await import("../puppeteer-core-CSk2PtSm.js");
+		puppeteerModule = await import("../puppeteer-core-C-4NyOpY.js");
 	} catch {
 		try {
 			puppeteerModule = await import(pathToFileURL((await ensureVendored({
@@ -2500,7 +2500,7 @@ function ensureMustHave(gate, language) {
 	if (!MUST_HAVE.has(language) || gate.installTried.has(language)) return;
 	gate.installTried.add(language);
 	(async () => {
-		const registry = await import("../lsp-server-registry-BXvUTBY7.js");
+		const registry = await import("../lsp-server-registry-BcdkHROD.js");
 		const probePath = `/tmp/x.${language === "python" ? "py" : "ts"}`;
 		const primary = registry.primaryServerForFile(probePath);
 		if (primary === null) return;
@@ -3189,7 +3189,7 @@ async function lspDeviceRead(subpath, session) {
 	if (parsed === void 0) return `unknown read path dvc://lsp/${subpath} — reads: status | diagnostics?file=…[&all=1] | definition?file=&line=[&character=|&symbol=] | references?… | hover?…`;
 	if (parsed.action === "status") {
 		const availability = {};
-		const registry = await import("../lsp-server-registry-BXvUTBY7.js");
+		const registry = await import("../lsp-server-registry-BcdkHROD.js");
 		for (const language of [
 			"python",
 			"typescript",

package/lib/web-password.d.ts

@@ -1,7 +1,7 @@
-import { t as Schema } from "./index-DTDXUe6m.js";
 import { Context } from "@deepseek-ai/cordis";
-import { CredentialRecord } from "@deepseek-ai/dsh-credentials";
 import { IncomingMessage } from "node:http";
+import { CredentialRecord } from "@deepseek-ai/dsh-credentials";
+import * as _deepseek_ai_schemastery21 from "@deepseek-ai/schemastery";
 
 //#region src/web-password.d.ts
 
@@ -123,10 +123,10 @@ interface WebPasswordConfig {
   /** Absolute browser-session lifetime in days. Default: 30 (the native default). */
   cookieMaxAgeDays?: number;
 }
-declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
-  cookieMaxAgeDays: Schema<number, number, "defined">;
+declare const Config: _deepseek_ai_schemastery21.default<Schemastery.ObjectS<NoInfer<{
+  cookieMaxAgeDays: _deepseek_ai_schemastery21.default<number, number, "defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
-  cookieMaxAgeDays: Schema<number, number, "defined">;
+  cookieMaxAgeDays: _deepseek_ai_schemastery21.default<number, number, "defined">;
 }>>, "plain">;
 /** Cordis plugin name; also the scope of this row's credential record. */
 declare const name = "dashr-web-password";
@@ -145,10 +145,10 @@ declare function apply(ctx: Context, config?: WebPasswordConfig): void;
 declare const _default: {
   name: string;
   inject: string[];
-  Config: Schema<Schemastery.ObjectS<NoInfer<{
-    cookieMaxAgeDays: Schema<number, number, "defined">;
+  Config: _deepseek_ai_schemastery21.default<Schemastery.ObjectS<NoInfer<{
+    cookieMaxAgeDays: _deepseek_ai_schemastery21.default<number, number, "defined">;
   }>>, Schemastery.ObjectT<NoInfer<{
-    cookieMaxAgeDays: Schema<number, number, "defined">;
+    cookieMaxAgeDays: _deepseek_ai_schemastery21.default<number, number, "defined">;
   }>>, "plain">;
   apply: typeof apply;
 };

package/lib/web-password.js

@@ -335,7 +335,7 @@ async function resolveDistIndex() {
 * @returns the markup with `<base href="./">` after the head open tag.
 */
 function withBaseHref(html) {
-	return html.replace(/<head(?:\s[^>]*)?>/i, (open) => `${open}<base href="./">`);
+	return html.replace(/<head(?:\s[^>]*)?>/i, (open$1) => `${open$1}<base href="./">`);
 }
 /**
 * The root-route gate: one exact `/` handler owning the door, and the only
@@ -388,6 +388,10 @@ var PasswordGate = class {
 	*/
 	async handle(req, res) {
 		try {
+			if (this.ctx.get("profileContext")?.name === "desktop" && req.method === "GET" && new URL(req.url ?? "/", "http://dsh.invalid").searchParams.has("token")) {
+				this.ctx.connection.authorizeIndex(req, res);
+				return;
+			}
 			const state = await this.gateState();
 			if (req.method === "POST") {
 				await this.handleLogin(req, res, state);

package/lib/{web-trust-Dej_RI2B.d.ts → web-trust-C_Y6o8Z2.d.ts}

@@ -1,5 +1,5 @@
-import { t as Schema } from "./index-DTDXUe6m.js";
 import { Context } from "@deepseek-ai/cordis";
+import * as _deepseek_ai_schemastery0 from "@deepseek-ai/schemastery";
 
 //#region src/web-trust.d.ts
 
@@ -76,12 +76,12 @@ interface TrustConfig {
   trustedPageAuthorities?: readonly string[];
 }
 /** Row config schema (schema-level default derives from `DSH_TRUSTED_HOSTS`). */
-declare const Config: Schema<Schemastery.ObjectS<NoInfer<{
-  trustAllHosts: Schema<boolean, boolean, "defined">;
-  trustedPageAuthorities: Schema<string[], string[], "defined">;
+declare const Config: _deepseek_ai_schemastery0.default<Schemastery.ObjectS<NoInfer<{
+  trustAllHosts: _deepseek_ai_schemastery0.default<boolean, boolean, "defined">;
+  trustedPageAuthorities: _deepseek_ai_schemastery0.default<string[], string[], "defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
-  trustAllHosts: Schema<boolean, boolean, "defined">;
-  trustedPageAuthorities: Schema<string[], string[], "defined">;
+  trustAllHosts: _deepseek_ai_schemastery0.default<boolean, boolean, "defined">;
+  trustedPageAuthorities: _deepseek_ai_schemastery0.default<string[], string[], "defined">;
 }>>, "plain">;
 /** Cordis plugin name. */
 declare const name = "dashr-web-trust";
@@ -100,12 +100,12 @@ declare function apply(ctx: Context, config: TrustConfig | undefined): void;
 declare const _default: {
   name: string;
   inject: string[];
-  Config: Schema<Schemastery.ObjectS<NoInfer<{
-    trustAllHosts: Schema<boolean, boolean, "defined">;
-    trustedPageAuthorities: Schema<string[], string[], "defined">;
+  Config: _deepseek_ai_schemastery0.default<Schemastery.ObjectS<NoInfer<{
+    trustAllHosts: _deepseek_ai_schemastery0.default<boolean, boolean, "defined">;
+    trustedPageAuthorities: _deepseek_ai_schemastery0.default<string[], string[], "defined">;
   }>>, Schemastery.ObjectT<NoInfer<{
-    trustAllHosts: Schema<boolean, boolean, "defined">;
-    trustedPageAuthorities: Schema<string[], string[], "defined">;
+    trustAllHosts: _deepseek_ai_schemastery0.default<boolean, boolean, "defined">;
+    trustedPageAuthorities: _deepseek_ai_schemastery0.default<string[], string[], "defined">;
   }>>, "plain">;
   apply: typeof apply;
 };

package/lib/web-trust.d.ts

@@ -1,3 +1,2 @@
-import "./index-DTDXUe6m.js";
-import { a as _default, c as buildTrustScript, d as name, i as TrustConfig, l as deriveDefaultPageAuthorities, n as Config, o as apply, r as MobileConfig, s as buildMobileScript, t as BootScriptRow, u as inject } from "./web-trust-Dej_RI2B.js";
+import { a as _default, c as buildTrustScript, d as name, i as TrustConfig, l as deriveDefaultPageAuthorities, n as Config, o as apply, r as MobileConfig, s as buildMobileScript, t as BootScriptRow, u as inject } from "./web-trust-C_Y6o8Z2.js";
 export { BootScriptRow, Config, MobileConfig, TrustConfig, apply, buildMobileScript, buildTrustScript, _default as default, deriveDefaultPageAuthorities, inject, name };

package/lib/welcome-notice.d.ts

@@ -1,18 +1,16 @@
 import { Context } from "@deepseek-ai/cordis";
+import * as _deepseek_ai_schemastery9 from "@deepseek-ai/schemastery";
 
 //#region src/welcome-notice.d.ts
 declare const name = "dashr-welcome-notice";
 declare const inject: string[];
-/** The private upstream constant has no Host export; reject changed layouts rather than guess. */
-declare function parseWelcomeVersion(client: string): string;
-/** Resolve from the owning DSH installation, never from this plugin's build dependencies. */
-declare function readHostWelcomeVersion(installAnchor: string): string;
-/** Keep the original settings namespace and native UI; project policy before startup settles. */
-declare function apply(ctx: Context): Promise<(() => Promise<void>) | undefined>;
+declare const Config: _deepseek_ai_schemastery9.default<NoInfer<Schemastery.ObjectS<{}>>, NoInfer<Schemastery.ObjectT<{}>>, "volatile">;
+declare function apply(ctx: Context): void;
 declare const _default: {
   name: string;
   inject: string[];
+  Config: _deepseek_ai_schemastery9.default<NoInfer<Schemastery.ObjectS<{}>>, NoInfer<Schemastery.ObjectT<{}>>, "volatile">;
   apply: typeof apply;
 };
 //#endregion
-export { apply, _default as default, inject, name, parseWelcomeVersion, readHostWelcomeVersion };
+export { Config, apply, _default as default, inject, name };

package/lib/welcome-notice.js

@@ -1,59 +1,20 @@
-import { createRequire } from "node:module";
-import { readFileSync } from "node:fs";
+import { t as Schema } from "./lib-C8_jXvwA.js";
 
 //#region src/welcome-notice.ts
 const name = "dashr-welcome-notice";
-const inject = ["loader", "profileContext"];
-const NAMESPACE = "ui-settings-general";
-const FIELD = "welcomeNoticeVersion";
-/** The private upstream constant has no Host export; reject changed layouts rather than guess. */
-function parseWelcomeVersion(client) {
-	const values = [...client.matchAll(/\b(?:const|let|var)\s+WELCOME_NOTICE_VERSION\s*=\s*(['"])([^'"\\\r\n]+)\1\s*[;,]/g)];
-	if (values.length !== 1) throw new Error("dashr-welcome-notice: expected one WELCOME_NOTICE_VERSION in the installed Models client; check the upstream bundle layout or disable this entry");
-	return values[0][2];
-}
-/** Resolve from the owning DSH installation, never from this plugin's build dependencies. */
-function readHostWelcomeVersion(installAnchor) {
-	return parseWelcomeVersion(readFileSync(createRequire(createRequire(installAnchor).resolve("@deepseek-ai/dsh-web-app/package.json")).resolve("@deepseek-ai/dsh-client-ui-settings-models/client"), "utf8"));
-}
-/** Keep the original settings namespace and native UI; project policy before startup settles. */
-async function apply(ctx) {
-	const entry = [...ctx.loader.entries()].find((entry$1) => entry$1.options.id === NAMESPACE);
-	if (entry === void 0 || entry.disabled) return;
-	const version = readHostWelcomeVersion(ctx.profileContext.installAnchor);
-	const original = { ...entry.options.config ?? {} };
-	const unhook = ctx.on("internal/config", function(_raw, next) {
-		const config = next();
-		return this.entry?.options.id === NAMESPACE ? {
-			...config,
-			[FIELD]: version
-		} : config;
-	}, { global: true });
-	try {
-		if (entry.fiber === void 0) await entry.init();
-		await entry.fiber?.await();
-		await entry.update({ config: {
-			...original,
-			[FIELD]: version
-		} });
-	} catch (error) {
-		unhook();
-		throw error;
-	}
-	return async () => {
-		unhook();
-		if (entry.fiber === void 0 || entry.disabled) return;
-		const config = { ...entry.options.config ?? {} };
-		if (Object.hasOwn(original, FIELD)) config[FIELD] = original[FIELD];
-		else delete config[FIELD];
-		await entry.update({ config });
-	};
+const inject = [];
+const Config = Schema.object({}).volatile();
+function apply(ctx) {
+	ctx.inject(["settings"], (child) => {
+		child.effect(() => child.settings.configure({ auto: false }, ctx.fiber));
+	});
 }
 var welcome_notice_default = {
 	name,
 	inject,
+	Config,
 	apply
 };
 
 //#endregion
-export { apply, welcome_notice_default as default, inject, name, parseWelcomeVersion, readHostWelcomeVersion };
+export { Config, apply, welcome_notice_default as default, inject, name };

package/lib/{wrap-T4I0nfPM.js → wrap-0VA0uFx8.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
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "better-dsh",
-  "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.",
+  "version": "0.3.1-a",
+  "description": "Make your dsh ready for serious coding tasks. (Tools x Schemas)^REPL. `skill://`, `ctx://`, `agent://`, `dvc://`, `dsh://`, Python 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",
   "types": "lib/index.d.ts",
@@ -55,18 +55,6 @@
     "./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": {
@@ -83,8 +71,7 @@
     "cordis.patch.yml",
     "eval-description.md",
     "url-schemes-instruction.md",
-    "scripts/kernel-provision.mjs",
-    "scripts/register-bundle.mjs"
+    "scripts/kernel-check.mjs"
   ],
   "scripts": {
     "prebuild": "node scripts/copy-docs.mjs",
@@ -94,7 +81,7 @@
     "typecheck:client": "tsc -p tsconfig.client.json",
     "test": "vitest --run",
     "test:watch": "vitest",
-    "kernel:venv": "node scripts/kernel-provision.mjs",
+    "kernel:check": "node scripts/kernel-check.mjs",
     "build-client": "tsx scripts/build-client.ts"
   },
   "license": "MIT",
@@ -144,7 +131,6 @@
     "@deepseek-ai/dsh-fs-local": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-home-paths": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-host-webserver": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-invariants": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-llm": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-llm-retry": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-persona": ">=0.1.5-0 <0.3.0-0",
@@ -180,7 +166,7 @@
     "@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"
+    "@deepseek-ai/dsh-jobs": ">=0.1.5-0 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -228,9 +214,6 @@
     "@deepseek-ai/dsh-home-paths": {
       "optional": true
     },
-    "@deepseek-ai/dsh-invariants": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-llm": {
       "optional": true
     },
@@ -372,7 +355,7 @@
     "@deepseek-ai/dsh-plugin-manager": {
       "optional": true
     },
-    "@deepseek-ai/dsh-hmr": {
+    "@deepseek-ai/dsh-jobs": {
       "optional": true
     }
   },
@@ -418,7 +401,7 @@
     "deepseek-harness",
     "repl",
     "eval",
-    "ipython",
+    "python",
     "kernel",
     "agent",
     "plugin"

package/scripts/kernel-check.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+/** Check an existing interpreter; never install Python or create an environment. */
+const { resolveKernelEnv } = await import(new URL('../lib/kernel-env.js', import.meta.url).href)
+const env = await resolveKernelEnv({ python: process.env.DASHR_KERNEL_PYTHON })
+console.log(`Better Python REPL ready: Python ${env.version} at ${env.python}`)

package/lib/LaunchOptions-B874eBu2.js

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

package/lib/bundle-delivery.d.ts

@@ -1,20 +0,0 @@
-import { Context } from "@deepseek-ai/cordis";
-import { ProfileContext } from "@deepseek-ai/dsh-app-boot";
-
-//#region src/bundle-delivery.d.ts
-declare const name = "dashr-bundle-delivery";
-declare const inject: string[];
-interface DeliveryResult {
-  installed: string[];
-  restartRequired: boolean;
-}
-/** First registration enables a companion; native reconciliation preserves retained disablement. */
-declare function reconcileBundledDelivery(profile: ProfileContext, signal?: AbortSignal): Promise<DeliveryResult>;
-declare function apply(ctx: Context): void;
-declare const _default: {
-  name: string;
-  inject: string[];
-  apply: typeof apply;
-};
-//#endregion
-export { apply, _default as default, inject, name, reconcileBundledDelivery };

package/lib/bundle-delivery.js

@@ -1,209 +0,0 @@
-import { createHash, randomUUID } from "node:crypto";
-import { spawn } from "node:child_process";
-import { mkdir, readFile, realpath, rename, rm, writeFile } from "node:fs/promises";
-import { dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { withFileLock, writeFileAtomic } from "@deepseek-ai/dsh-atomic-write";
-
-//#region src/bundle-delivery.ts
-const name = "dashr-bundle-delivery";
-const inject = ["profileContext", "appReady"];
-const hash = (bytes) => createHash("sha256").update(bytes).digest("hex");
-const json = async (path$1) => JSON.parse(await readFile(path$1, "utf8"));
-async function optionalJson(path$1) {
-	try {
-		return await json(path$1);
-	} catch (error) {
-		if (error.code === "ENOENT") return void 0;
-		throw error;
-	}
-}
-async function contained(root, path$1) {
-	if (isAbsolute(path$1)) throw new Error("Pack delivery path must be relative");
-	const base = await realpath(root), file = await realpath(resolve(base, path$1));
-	const rel = relative(base, file);
-	if (rel === ".." || rel.startsWith(`..${process.platform === "win32" ? "\\" : "/"}`) || isAbsolute(rel)) throw new Error("Pack delivery path escapes its owner");
-	return file;
-}
-/** A child process avoids inheriting a running HMR transaction's AsyncLocalStorage. */
-async function installNative(profile, archive, expected, signal) {
-	signal?.throwIfAborted();
-	const childScript = fileURLToPath(new URL("../scripts/register-bundle.mjs", import.meta.url));
-	return new Promise((done, fail) => {
-		const child = spawn(process.execPath, [childScript], {
-			stdio: [
-				"pipe",
-				"pipe",
-				"pipe"
-			],
-			cwd: profile.dir
-		});
-		let output = "", diagnostic = "";
-		const abort = () => {
-			child.kill("SIGTERM");
-		};
-		const timeout = setTimeout(abort, 36e4);
-		signal?.addEventListener("abort", abort, { once: true });
-		child.stdout.setEncoding("utf8").on("data", (chunk) => {
-			output = (output + chunk).slice(-32768);
-		});
-		child.stderr.setEncoding("utf8").on("data", (chunk) => {
-			diagnostic = (diagnostic + chunk).slice(-4096);
-		});
-		child.on("error", fail);
-		child.on("close", (code) => {
-			clearTimeout(timeout);
-			signal?.removeEventListener("abort", abort);
-			if (signal?.aborted) {
-				fail(signal.reason);
-				return;
-			}
-			if (code !== 0) {
-				fail(/* @__PURE__ */ new Error(`Native companion registration failed (${code}): ${diagnostic.trim() || output.trim()}`));
-				return;
-			}
-			try {
-				const result = JSON.parse(output);
-				if (result.exitCode !== 0) fail(/* @__PURE__ */ new Error(`Native companion registration failed (${result.exitCode}); diagnostics: ${result.logPath ?? "unavailable"}`));
-				else if (![
-					"installed",
-					"owner-changed",
-					"companion-changed",
-					"companion-removed"
-				].includes(result.disposition)) fail(/* @__PURE__ */ new Error("Native companion registration returned an invalid disposition"));
-				else done(result.disposition);
-			} catch (error) {
-				fail(error);
-			}
-		});
-		child.stdin.on("error", () => {});
-		child.stdin.end(JSON.stringify({
-			profile,
-			archive,
-			expected
-		}));
-	});
-}
-/** First registration enables a companion; native reconciliation preserves retained disablement. */
-async function reconcileBundledDelivery(profile, signal) {
-	const directory = join(profile.home, "bundle-artifacts");
-	await mkdir(directory, {
-		recursive: true,
-		mode: 448
-	});
-	const key = hash(profile.dir);
-	return withFileLock(join(directory, key + ".delivery"), async () => {
-		signal?.throwIfAborted();
-		const receiptPath = join(directory, key + ".json");
-		const receipts = await optionalJson(receiptPath) ?? {};
-		const manifest = await json(join(profile.dir, "package.json"));
-		const result = {
-			installed: [],
-			restartRequired: false
-		};
-		for (const owner of Object.keys(manifest.dependencies ?? {})) {
-			const ownerDir = join(profile.dir, "node_modules", owner);
-			const ownerManifest = await optionalJson(join(ownerDir, "package.json"));
-			if (ownerManifest?.superd?.delivery === void 0) continue;
-			const descriptorPath = await contained(ownerDir, ownerManifest.superd.delivery);
-			const descriptor = await json(descriptorPath);
-			if (!Array.isArray(descriptor.companions)) throw new Error("Invalid pack delivery descriptor");
-			for (const item of descriptor.companions) {
-				if (item.name !== "better-dsh" || item.version !== ownerManifest.dependencies?.[item.name] || !/^[a-f0-9]{64}$/.test(item.sha256)) throw new Error("Invalid companion identity/version/digest");
-				const bytes = await readFile(await contained(dirname(descriptorPath), item.tarball));
-				if (hash(bytes) !== item.sha256) throw new Error(`Pack companion SHA256 mismatch: ${item.name}`);
-				const archive = join(directory, `${item.name}-${item.sha256}.tgz`);
-				const cached = await optionalJson(join(profile.dir, "node_modules", item.name, "package.json"));
-				const current = await json(join(profile.dir, "package.json"));
-				const ownerSpec = current.dependencies?.[owner];
-				if (ownerSpec === void 0) continue;
-				const priorSpec = current.dependencies?.[item.name];
-				const receiptKey = `${owner}:${item.name}`;
-				if (priorSpec === void 0 && receipts[receiptKey] === item.sha256) continue;
-				if (priorSpec === "file:" + archive && cached?.name === item.name && cached.version === item.version) {
-					receipts[receiptKey] = item.sha256;
-					await writeFileAtomic(receiptPath, JSON.stringify(receipts) + "\n", { mode: 384 });
-					continue;
-				}
-				try {
-					if (hash(await readFile(archive)) !== item.sha256) throw new Error(`Cached companion SHA256 mismatch: ${item.name}`);
-				} catch (error) {
-					if (error.code !== "ENOENT") throw error;
-					const temporary = archive + "." + randomUUID() + ".tmp";
-					try {
-						await writeFile(temporary, bytes, {
-							flag: "wx",
-							mode: 384
-						});
-						await rename(temporary, archive);
-					} finally {
-						await rm(temporary, { force: true });
-					}
-				}
-				signal?.throwIfAborted();
-				const disposition = await installNative(profile, archive, {
-					owner,
-					ownerSpec,
-					companion: item,
-					...priorSpec === void 0 ? {} : { priorSpec }
-				}, signal);
-				if (disposition === "owner-changed" || disposition === "companion-changed") continue;
-				receipts[receiptKey] = item.sha256;
-				await writeFileAtomic(receiptPath, JSON.stringify(receipts) + "\n", { mode: 384 });
-				if (disposition === "companion-removed") continue;
-				result.installed.push(`${item.name}@${item.version}`);
-				result.restartRequired ||= priorSpec !== void 0;
-			}
-		}
-		return result;
-	}, { waitMs: 12e4 });
-}
-function apply(ctx) {
-	const signal = new AbortController();
-	let started = false, running = false, again = false;
-	const reconcile = async () => {
-		if (!started || signal.signal.aborted) return;
-		if (running) {
-			again = true;
-			return;
-		}
-		running = true;
-		try {
-			const result = await reconcileBundledDelivery(ctx.profileContext, signal.signal);
-			if (result.installed.length) {
-				ctx.logger.info(`Registered ${result.installed.join(", ")} from its containing local pack${result.restartRequired ? "; restart DSH to use the updated code" : ""}`);
-				ctx.emit("plugin-manager/changed", { reason: "install" });
-			}
-		} catch (error) {
-			if (!signal.signal.aborted) ctx.logger.error("Local pack companion registration failed; retry by re-enabling the bundle", error);
-		} finally {
-			running = false;
-			if (again && !signal.signal.aborted) {
-				again = false;
-				reconcile();
-			}
-		}
-	};
-	ctx.effect(() => {
-		const offReady = ctx.appReady.onReady(() => {
-			started = true;
-			reconcile();
-		});
-		const offChange = ctx.on("plugin-manager/changed", () => {
-			reconcile();
-		});
-		return () => {
-			offReady();
-			offChange();
-			signal.abort();
-		};
-	}, "bundle-delivery: native registration");
-}
-var bundle_delivery_default = {
-	name,
-	inject,
-	apply
-};
-
-//#endregion
-export { apply, bundle_delivery_default as default, inject, name, reconcileBundledDelivery };