better-dsh 0.2.5 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-dsh",
-  "version": "0.2.5",
+  "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,20 +51,44 @@
     "./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": {
+    "#schemastery": {
+      "types": "./third_party/schemastery/lib/index.d.mts",
+      "default": "./third_party/schemastery/lib/index.mjs"
     }
   },
   "files": [
     "lib",
+    "THIRD_PARTY_NOTICES.md",
     "docs",
     "dsh-docs",
     "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",
-    "build": "tsdown && npm run build-client",
+    "build": "tsdown && npm run build-client && node scripts/copy-kernel-bridge.mjs && node scripts/copy-ast-assets.mjs",
     "typecheck": "npm run typecheck:host && npm run typecheck:client",
     "typecheck:host": "tsc --noEmit",
     "typecheck:client": "tsc -p tsconfig.client.json",
@@ -102,12 +126,24 @@
     "@deepseek-ai/dsh-agent-loop": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-agent-presets": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-agent-tool-presentation": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-api-gateway": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-api-remotes": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-connection": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-locale": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-code-runtime": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-code-runtime-worker-thread": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-command-compact": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-commands": ">=0.1.5-0 <0.3.0-0",
+    "@deepseek-ai/dsh-credentials": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-fs": ">=0.1.5-0 <0.3.0-0",
     "@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",
@@ -134,25 +170,17 @@
     "@deepseek-ai/dsh-tool-web": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-tool-workflow": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-tools": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-user-approval": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-workflow-worker-thread": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/dsh-api-gateway": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-api-remotes": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-connection": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-locale": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-ui-conversation": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-client-ui-slots": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-commands": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-credentials": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-host-webserver": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-typert-protocol": ">=0.1.5-0 <0.3.0-0",
-    "@deepseek-ai/dsh-web-app": ">=0.1.5-0 <0.3.0-0",
     "@deepseek-ai/dsh-typert-registry": ">=0.1.5-0 <0.3.0-0",
-    "react": "^18.2.0"
+    "@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",
+    "@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": {
@@ -284,9 +312,6 @@
     "@deepseek-ai/dsh-workflow-worker-thread": {
       "optional": true
     },
-    "@deepseek-ai/schemastery": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-api-gateway": {
       "optional": true
     },
@@ -334,37 +359,59 @@
     },
     "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
     }
   },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "diff": "^8.0.2",
-    "file-type": "^21.3.0",
-    "puppeteer-core": "25.3.0",
-    "xxhash-wasm": "^1.1.0",
-    "zeromq": "^6.6.0",
-    "use-sync-external-store": "^1.6.0"
-  },
-  "optionalDependencies": {
-    "@oh-my-pi/pi-natives-linux-x64": "18.0.6",
-    "@oh-my-pi/pi-natives-linux-arm64": "18.0.6",
-    "@oh-my-pi/pi-natives-darwin-x64": "18.0.6",
-    "@oh-my-pi/pi-natives-darwin-arm64": "18.0.6",
-    "@oh-my-pi/pi-natives-win32-x64": "18.0.6"
-  },
   "devDependencies": {
+    "@ast-grep/wasm": "^0.45.3",
+    "@lumis-sh/wasm-bash": "^0.26.6",
+    "@lumis-sh/wasm-c": "^0.26.3",
+    "@lumis-sh/wasm-cpp": "^0.26.2",
+    "@lumis-sh/wasm-css": "^0.26.4",
+    "@lumis-sh/wasm-go": "^0.26.3",
+    "@lumis-sh/wasm-html": "^0.26.4",
+    "@lumis-sh/wasm-javascript": "^0.26.4",
+    "@lumis-sh/wasm-json": "^0.26.5",
+    "@lumis-sh/wasm-python": "^0.26.5",
+    "@lumis-sh/wasm-ruby": "^0.26.4",
+    "@lumis-sh/wasm-rust": "^0.26.5",
+    "@lumis-sh/wasm-tsx": "^0.26.3",
+    "@lumis-sh/wasm-typescript": "^0.26.3",
+    "@lumis-sh/wasm-yaml": "^0.26.3",
     "@types/node": "^22.10.5",
     "@types/react": "~18.3.31",
+    "diff": "^8.0.4",
+    "file-type": "21.3.4",
+    "ignore": "^7.0.12",
     "node-addon-require-builtin": "^0.1.5",
+    "puppeteer-core": "^25.3.0",
     "react": "^18.3.1",
     "tsdown": "^0.15.7",
     "tsx": "^4.22.4",
     "typescript": "^5.9.3",
-    "vitest": "^4.1.10"
+    "use-sync-external-store": "^1.7.0",
+    "vitest": "^4.1.10",
+    "web-tree-sitter": "^0.26.12",
+    "xxhash-wasm": "1.1.0"
   },
   "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",
@@ -375,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/docs/80_upstream-docs-and-skills/dsh-dev-skill/pi-and-omp/.tools/MdxPage-CTY7atqe.js

@@ -1,11 +0,0 @@
-// Stub of the site's MdxPage module.
-export function n() { return {}; }   // default component map (base tags are string literals in content chunks)
-export function t(page, meta) {
-  const C = (props) => {
-    let tree = null;
-    try { tree = typeof page === 'function' ? page(props || {}) : null; } catch (e) { tree = null; }
-    return { kind: 'doc', meta: meta || {}, tree };
-  };
-  return C;
-}
-export default t;

package/docs/80_upstream-docs-and-skills/dsh-dev-skill/pi-and-omp/.tools/extract_omp.mjs

@@ -1,42 +0,0 @@
-import { writeFileSync } from "fs";
-
-const chunks = [
-  "start-Dj2bs0Kq",
-  "capabilities-Cqy7s-PF",
-  "customization-okh9xJ8M",
-  "models-DZr7pp6i",
-  "programmatic-D_fLU-fi",
-  "reference-BWFEeAhZ",
-];
-
-const all = {};
-for (const c of chunks) {
-  let mod;
-  try {
-    mod = await import("./chunk_" + c + ".js");
-  } catch (err) {
-    console.error("IMPORT FAIL", c, String(err));
-    continue;
-  }
-  for (const [k, v] of Object.entries(mod)) {
-    if (typeof v !== "function") continue;
-    let res;
-    try {
-      res = v({});
-    } catch (err) {
-      continue; // not a doc-page component
-    }
-    if (res && res.kind === "doc") {
-      const slug = (res.meta && res.meta.slug) || k;
-      all[slug] = {
-        group: (res.meta && res.meta.group) || "",
-        title: (res.meta && res.meta.title) || k,
-        lede: (res.meta && res.meta.lede) || "",
-        tree: res.tree,
-      };
-    }
-  }
-}
-writeFileSync(new URL("./omp_extracted.json", import.meta.url), JSON.stringify(all));
-console.log("pages extracted:", Object.keys(all).length);
-for (const s of Object.keys(all)) console.log(" ", s);

package/docs/80_upstream-docs-and-skills/dsh-dev-skill/pi-and-omp/.tools/fetch_pi.py

@@ -1,52 +0,0 @@
-#!/usr/bin/env python3
-"""Fetch + convert all pi.dev docs pages (30) into ../pi-and-omp/pi/*.md"""
-import os, re, sys, time, urllib.request, datetime
-from concurrent.futures import ThreadPoolExecutor, as_completed
-import pi_convert
-
-HERE = os.path.dirname(os.path.abspath(__file__))
-OUT = os.path.join(os.path.dirname(HERE), "pi")   # HERE=pi-and-omp/.tools -> pi-and-omp/pi
-os.makedirs(OUT, exist_ok=True)
-TODAY = datetime.date.today().isoformat()
-
-def slug(url):
-    if url.rstrip("/").endswith("/docs/latest"):
-        return "index"
-    return url.rstrip("/").rsplit("/", 1)[-1]
-
-def fetch(url):
-    req = urllib.request.Request(url, headers={"User-Agent": "Mozilla/5.0"})
-    for a in range(4):
-        try:
-            with urllib.request.urlopen(req, timeout=40) as r:
-                return r.read().decode("utf-8", "replace")
-        except Exception:
-            if a == 3:
-                return None
-            time.sleep(1.5)
-
-def one(url):
-    raw = fetch(url)
-    if raw is None:
-        return url, None
-    body = pi_convert.html_to_md(raw)
-    name = slug(url)
-    header = f"<!--\nsource: {url}\nfetched: {TODAY}\n-->\n\n"
-    with open(os.path.join(OUT, name + ".md"), "w", encoding="utf-8") as f:
-        f.write(header + body)
-    return url, name
-
-urls = [l.strip() for l in open(os.path.join(HERE, "pi_pages.txt")) if l.strip()]
-print("pi pages to fetch:", len(urls))
-ok, fail = [], []
-with ThreadPoolExecutor(max_workers=8) as ex:
-    futs = {ex.submit(one, u): u for u in urls}
-    for fut in as_completed(futs):
-        u, name = fut.result()
-        if name is None:
-            fail.append(u)
-        else:
-            ok.append(name)
-print("OK:", len(ok), " FAIL:", len(fail))
-for u in fail:
-    print("  MISSING:", u)

package/docs/80_upstream-docs-and-skills/dsh-dev-skill/pi-and-omp/.tools/jsx-runtime-BHwPObl3.js

@@ -1,13 +0,0 @@
-// Stub of the site's jsx-runtime: records element trees as plain JSON.
-export const i = undefined, n = undefined, o = undefined;
-export function t() {
-  return {
-    Fragment: '@@FRAGMENT@@',
-    jsx: el,
-    jsxs: el,
-  };
-}
-function el(type, props) {
-  return { t: type, p: props || {} };
-}
-export default t;