dshmarket 1.66.21 → 1.66.23

package/src/net.ts

@@ -32,6 +32,40 @@
 
 import { Agent, EnvHttpProxyAgent, fetch as undiciFetch } from 'undici'
 
+/**
+ * Hand the host's own undici the dispatcher our import took (#861).
+ *
+ * undici's `lib/global.js` runs at import time, and when its symbol is unset
+ * it installs an Agent on BOTH global dispatcher symbols: `.1`, which Node's
+ * built-in fetch reads, and `.2`, which undici 8's `getGlobalDispatcher()`
+ * reads. `setGlobalDispatcher` defines them non-configurable, so the value
+ * cannot be taken back — but it is writable, and undici 8 only ever READS
+ * `.2`, so hiding ours there is enough for it to install its own dispatcher
+ * and wrap it onto `.1` for the legacy consumers.
+ *
+ * Measured on Node 24.20 and 25.6 (undici 7.29 as the market's copy, 8.12 as
+ * the host's): with this, a host importing undici 8 after the market gets
+ * `getGlobalDispatcher() instanceof its own Agent` — without it, it is handed
+ * the market's undici 7 Agent (`instanceof` its own Agent: false) and never
+ * installs one, which is the state #861 reports as the host's own LLM and
+ * model-list requests failing once the market is loaded.
+ *
+ * `.1` is deliberately left alone: Node's built-in fetch reads it and asserts
+ * it is set, so clearing it breaks global fetch outright (measured: the same
+ * probe that makes `.2` undefined fails `assert(dispatcher)` when `.1` is
+ * cleared too). Our own requests are unaffected either way — every one of
+ * them carries a dispatcher this module created.
+ */
+export function releaseHostUndiciDispatcher(
+  global: Record<symbol, unknown> = globalThis as unknown as Record<symbol, unknown>,
+  ownAgent: abstract new (...args: never[]) => unknown = Agent,
+): void {
+  const symbol = Symbol.for('undici.globalDispatcher.2')
+  if (global[symbol] instanceof ownAgent) global[symbol] = undefined
+}
+
+releaseHostUndiciDispatcher()
+
 /**
  * The proxy this process would use for the catalog, if any.
  *

package/src/official-desktop.ts

@@ -2,6 +2,7 @@
 
 import { randomUUID } from 'node:crypto'
 import { progress, TARGET_RE, type DesktopPluginRuntime, type InstallResult } from './dsh-cli.ts'
+import { activeRegion, DEFAULT_NPM_REGISTRY, routesFor } from './regions.ts'
 
 interface ManagedResult {
   application: string
@@ -10,7 +11,7 @@ interface ManagedResult {
 }
 
 export interface OfficialPluginManagerLike {
-  installBundle(spec: string, options?: { requestId?: string }): Promise<ManagedResult>
+  installBundle(spec: string, options?: { requestId?: string; registry?: string }): Promise<ManagedResult>
   removeBundle(name: string): Promise<ManagedResult>
   cancelInstall(requestId: string): Promise<unknown>
 }
@@ -103,9 +104,12 @@ export function createOfficialDesktopRuntime(
     progress.cancelling = false
     let operation: Promise<ManagedResult>
     try {
+      // Read at each operation so region switches apply without a restart.
+      // The default route leaves the host's own npm configuration in charge.
+      const registry = routesFor(activeRegion()).npmRegistry
       operation = command === 'remove'
         ? manager.removeBundle(target)
-        : manager.installBundle(spec, { requestId })
+        : manager.installBundle(spec, { requestId, ...(registry === DEFAULT_NPM_REGISTRY ? {} : { registry }) })
     } catch (error) {
       progress.active = false
       return Promise.resolve(failure(detail(error), 127))

package/src/profile.ts

@@ -894,7 +894,8 @@ export function parsePatchRows(text: string): { names: string[]; ids: string[];
     // `insert:` indentation closes the block — those target OTHER plugins.
     let insertIndent: number | null = null
     // Indent of a `config:` key whose value is payload, not more rows.
-    // Everything deeper than it is data, and its `id:` keys live in another
+    // Everything deeper than it — and a `- ` at its own column, a sequence
+    // YAML lets sit unindented under its key — is data, and its `id:` keys live in another
     // namespace (#841): a preset row writes `config.plugins[].id` for the
     // entries it will instantiate, so two bundles that instantiate the same
     // official plugins read as two bundles inserting the same entry ids —
@@ -947,17 +948,22 @@ export function parsePatchRows(text: string): { names: string[]; ids: string[];
       }
       return false
     }
-    /** Whether the key at `keyIndent` holds a block sequence. */
+    /**
+     * Whether the key at `keyIndent` holds a block sequence. YAML lets that
+     * sequence sit at the key's own column (`config:` then `- id:` without
+     * further indent), so a `- ` there is the value, not a sibling.
+     */
     const valueIsList = (from: number, keyIndent: number): boolean => {
-      for (let j = from + 1; j < rows.length; j++) {
-        if (rows[j].indent <= keyIndent) return false
-        return rows[j].trimmed === '-' || rows[j].trimmed.startsWith('- ')
-      }
-      return false
+      const next = from + 1
+      if (next >= rows.length || rows[next].indent < keyIndent) return false
+      return isDash(next)
     }
     for (let i = 0; i < rows.length; i++) {
       const { line, trimmed, indent } = rows[i]
-      if (payloadIndent !== null && indent <= payloadIndent) payloadIndent = null
+      // A `- ` at the payload key's own column is still that key's value.
+      if (payloadIndent !== null && indent <= payloadIndent && !(indent === payloadIndent && isDash(i))) {
+        payloadIndent = null
+      }
       if (insertIndent !== null && indent <= insertIndent && !/^\s*-?\s*(id|name|config):/u.test(line)) {
         insertIndent = null
       }

package/src/trial.ts

@@ -27,7 +27,7 @@
 import { existsSync, readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import {
-  buildBundleLayers, composeLayers, findDshInstallDir, parsePatchFile,
+  buildBundleLayers, composeLayers, duplicateEntryIdsAreFatal, findDshInstallDir, parsePatchFile,
   type DuplicateId, type LayerInput, type OrphanRow, type OverrideRow,
 } from './check.ts'
 import { resolveDshHome } from './home-paths.ts'
@@ -126,8 +126,15 @@ export function trialValidate(
     if (bundle.error !== null) errors.push({ layer: bundle.name, message: bundle.error })
     if (bundle.parseError !== null) errors.push({ layer: bundle.name, message: bundle.parseError })
   }
+  // Same version gate as the check report (#853): on a loader that folds one
+  // id into one entry (1.0.4+) this is an override, not a refusal. Making it
+  // fatal here is what rolled back every update for a profile that already
+  // had a package row and a user-patch row on one id.
+  const duplicateFatal = duplicateEntryIdsAreFatal(profileDir)
   for (const dup of composed.duplicates) {
-    errors.push({ layer: dup.layers.join(' / '), message: `duplicate loader entry id ${JSON.stringify(dup.id)} (${dup.count} rows) / 重复的 loader 条目 id ${JSON.stringify(dup.id)}` })
+    const message = `duplicate loader entry id ${JSON.stringify(dup.id)} (${dup.count} rows) / 重复的 loader 条目 id ${JSON.stringify(dup.id)}`
+    if (duplicateFatal) errors.push({ layer: dup.layers.join(' / '), message })
+    else warnings.push({ layer: dup.layers.join(' / '), message: `${message} — 当前宿主会让后一层覆盖前一层，启动不受影响 / this host lets the later layer win, so the boot is unaffected` })
   }
   for (const orphan of composed.orphans) {
     warnings.push({ layer: orphan.layer, message: `${orphan.id}: ${orphan.reason}` })