dsh-gitbash-shell 0.31.0 → 0.32.0

package/src/index.js

@@ -55,6 +55,25 @@ import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 import { PRESET_META, minimalPluginsFor, pluginsFor } from './compositions.js'
+import { loadSchemastery } from './schemastery.js'
+
+/**
+ * The executor base class's own Config schema, when this deployment has it.
+ *
+ * Dynamic and optional on purpose: `@deepseek-ai/dsh-bash-sandbox` belongs to
+ * another row of THIS plugin, and a deployment that cannot resolve it must
+ * still mount every other face (the static-peer-import lesson, v0.24.3). What
+ * we need it for is the host's OWN behavioural answer to "do you read your
+ * shell limits through `.get()`?" — see src/schemastery.js.
+ */
+async function executorConfigSchema() {
+  try {
+    const mod = await import('@deepseek-ai/dsh-bash-sandbox')
+    return (mod.SandboxBashExecutor ?? mod.default)?.Config
+  } catch {
+    return undefined
+  }
+}
 
 /**
  * The schemastery module, resolved LAZILY (v0.24.3): `@deepseek-ai/schemastery`
@@ -69,10 +88,15 @@ import { PRESET_META, minimalPluginsFor, pluginsFor } from './compositions.js'
  * verified with a fixture plugin whose only difference was the static peer
  * import. Deferring the import hides the schema where the module is absent
  * instead of killing the row.
+ *
+ * WHICH copy is resolved is no longer left to our own resolution order
+ * (v0.31.1, issue #12): src/schemastery.js asks the host what it expects and
+ * picks a copy that agrees with it. Both call sites share the one cached
+ * answer, so the settings namespace and the executor can never disagree.
  */
 let Schema = null
 try {
-  Schema = (await import('@deepseek-ai/schemastery')).default
+  Schema = (await loadSchemastery({ parentConfig: await executorConfigSchema() })).z ?? null
 } catch (error) {
   Schema = null
   console.warn(
@@ -261,7 +285,6 @@ import {
 } from './tool-runner.js'
 
 /** The shipped preset whose skills/ dir seeds cordis-gitbash. */
-const SKILLS_SOURCE_PRESET = 'cordis'
 
 const here = dirname(fileURLToPath(import.meta.url))
 const pkgDir = join(here, '..')
@@ -329,465 +352,6 @@ function skillsHashes(source) {
   return out
 }
 
-// ── built-in era detection (dsh 0.1.2 renamed the `code` preset to `ptc`) ──
-
-/**
- * Which built-in PTC preset does the installed dsh ship? dsh 0.1.2 renamed
- * the preset id `code` to `ptc` with no compatibility alias, so the variant
- * compositions are era-specific where the built-in changed. The roster probe
- * is the version-agnostic signal. Pure companion of `detectBase`; 'ptc' wins
- * if both ids somehow exist, and an unknown roster conservatively maps to
- * 'code' — the era text the stable release accepted.
- */
-function baseForRoster(ids) {
-  const set = new Set(ids)
-  if (set.has('ptc')) return 'ptc'
-  return 'code'
-}
-
-/** Async probe against the live roster; never throws. */
-async function detectBase(agentPresets) {
-  try {
-    const list = await agentPresets.list()
-    return baseForRoster((Array.isArray(list) ? list : []).map((p) => p && p.id))
-  } catch (error) {
-    console.log(`${TAG} built-in preset probe failed (${error?.message ?? error}) — assuming the 'code' era`)
-    return 'code'
-  }
-}
-
-/** Era suffix for committed composition assets: ptc-era files carry `.ptc`. */
-function eraSuffix(base) {
-  return base === 'ptc' ? '.ptc' : ''
-}
-
-// ── persona-form detection (dsh 0.1.3-alpha.2 split the persona row) ──────
-
-/**
- * Which persona config shape does one composition text use? 0.1.3-alpha.2
- * (40792330c0) split dsh-persona's single `text` key into `prefix:` +
- * `suffix:` with no compatibility alias, so compositions carrying a persona
- * row are persona-form-specific. Pure companion of `detectPersonaEra`.
- */
-export function personaEraForText(text) {
-  return /- id:\s*persona[\s\S]{0,600}?\bprefix:/.test(text) ? 'split' : 'text'
-}
-
-/**
- * Async probe of a SHIPPED preset's composition through the live roster;
- * never throws. Built-in ids only — this plugin's own variants sit on the
- * roster too and would echo whichever form they were materialized with. The
- * roster entry path is the preset file (or its directory); either way we
- * read agent.cordis.yml. A missing probe conservatively maps to 'text'.
- */
-export async function detectPersonaEra(agentPresets) {
-  try {
-    const list = await agentPresets.list()
-    const entries = Array.isArray(list) ? list : []
-    const entry = ['ptc', 'standard', 'cordis', 'minimal']
-      .map((id) => entries.find((p) => p && p.id === id && typeof p.path === 'string'))
-      .find(Boolean)
-    if (!entry) return 'text'
-    const file = /\.yml$/.test(entry.path) ? entry.path : join(entry.path, 'agent.cordis.yml')
-    return personaEraForText(readFileSync(file, 'utf8'))
-  } catch (error) {
-    console.log(`${TAG} persona-form probe failed (${error?.message ?? error}) — assuming the pre-split 'text' form`)
-    return 'text'
-  }
-}
-
-/**
- * Does the SHIPPED composition already carry the official `present` row? The
- * row (`@deepseek-ai/dsh-tool-present`, immutable file-delivery download
- * cards) first shipped with dsh 0.1.5-alpha.2, and a composition row that
- * cannot be imported rejects the WHOLE preset mount — so the row is injected
- * only on hosts whose own shipped presets have it. The live roster is the
- * authority: package resolution alone would lie on CLI installs (first-party
- * packages live outside the profile) and on linked development trees.
- * `minimal` never gains the row (single-tool preset). Never throws.
- */
-async function detectPresentSupport(agentPresets) {
-  try {
-    const list = await agentPresets.list()
-    const entries = Array.isArray(list) ? list : []
-    const entry = ['ptc', 'standard', 'cordis']
-      .map((id) => entries.find((p) => p && p.id === id && typeof p.path === 'string'))
-      .find(Boolean)
-    if (!entry) return false
-    const file = /\.yml$/.test(entry.path) ? entry.path : join(entry.path, 'agent.cordis.yml')
-    return readFileSync(file, 'utf8').includes("'@deepseek-ai/dsh-tool-present'")
-  } catch (error) {
-    console.log(`${TAG} present-row probe failed (${error?.message ?? error}) — not injecting the row`)
-    return false
-  }
-}
-
-/** Row ids the shipped workflow-engine row has answered to (dsh 0.1.6 renamed it). */
-const ENGINE_ROW_IDS = ['workflow-worker-thread', 'workflow-ptc']
-
-/** Which built-in preset each of this plugin's variants mirrors, for row-form lookup. */
-export const ROW_SOURCE = {
-  'standard-gitbash': 'standard',
-  'cordis-gitbash': 'cordis',
-  'code-gitbash': 'ptc',
-}
-
-/** Leading whitespace of one line (pure). */
-function indentOf(line) {
-  return line.slice(0, line.length - line.trimStart().length)
-}
-
-/** The unquoted value of a name line, or undefined when the line is not one (pure). */
-function quotedName(line) {
-  const trimmed = line.trim()
-  if (!trimmed.startsWith('name: ')) return undefined
-  const raw = trimmed.slice(6).trim()
-  if (raw.length > 1 && raw.charAt(0) === "'" && raw.charAt(raw.length - 1) === "'") return raw.slice(1, -1)
-  return raw
-}
-
-/**
- * Read ONE row's spelling out of a composition text (pure): the name value
- * that follows its id line and whether the row's own block turns it off before
- * the next row starts. Returns undefined when the row is absent, and never
- * throws, so a composition that legitimately lacks the row (minimal) is simply
- * left alone.
- * @param text - composition text.
- * @param rowId - exact id value to locate.
- * @returns the row's spelling, or undefined.
- */
-export function rowFormOf(text, rowId) {
-  const lines = text.split('\n')
-  for (let i = 0; i < lines.length; i += 1) {
-    if (lines[i].trim() !== '- id: ' + rowId) continue
-    const nameLine = i + 1 < lines.length ? lines[i + 1] : ''
-    const name = quotedName(nameLine)
-    if (name === undefined) continue
-    let disabled = false
-    let disabledIndent = indentOf(nameLine)
-    for (let j = i + 2; j < lines.length; j += 1) {
-      if (lines[j].trim().startsWith('- id: ')) break
-      if (lines[j].trim() === 'disabled: true') {
-        disabled = true
-        disabledIndent = indentOf(lines[j])
-        break
-      }
-    }
-    return { id: rowId, name, indent: indentOf(lines[i]), nameIndent: indentOf(nameLine), disabled, disabledIndent }
-  }
-  return undefined
-}
-
-/**
- * Read the two rows this plugin's committed compositions must track out of a
- * SHIPPED composition text (pure). The built-in preset is the authority: it
- * mounts on this host by construction, so whatever it spells is mountable
- * here, on every era, without shipping one asset variant per rename.
- * @param text - a shipped agent.cordis.yml.
- * @returns an object with the engine row and the tool-ralph row; either may be undefined.
- */
-export function rowFormsOf(text) {
-  let engine
-  for (const id of ENGINE_ROW_IDS) {
-    engine = rowFormOf(text, id)
-    if (engine !== undefined) break
-  }
-  return { engine, ralph: rowFormOf(text, 'tool-ralph') }
-}
-
-/**
- * Align the workflow-engine row with the host's own spelling (pure,
- * idempotent, plain string surgery — never a YAML round-trip, so !!js literals
- * survive).
- *
- * dsh 0.1.6-alpha.1 renamed this row workflow-worker-thread to workflow-ptc
- * AND deleted the old package. A composition row whose module fails to import
- * rejects the WHOLE preset mount (agent-presets mount.ts), so a committed old
- * spelling breaks every Git Bash preset on the new host while the new spelling
- * breaks them on hosts that still ship only the old package. The materializer
- * therefore copies the row out of the host's own built-in preset instead of
- * pinning either spelling.
- * @param text - composition text.
- * @param form - the host's engine row from rowFormsOf, or undefined to leave the text alone.
- * @param options - engineEnabled forces the row on regardless of the host's own state.
- * @returns the aligned text.
- */
-export function alignEngineRow(text, form, options) {
-  if (!form) return text
-  const engineEnabled = Boolean(options && options.engineEnabled)
-  let current
-  for (const id of ENGINE_ROW_IDS) {
-    current = rowFormOf(text, id)
-    if (current !== undefined) break
-  }
-  if (current === undefined) return text
-  const head = '- id: ' + current.id + '\n' + current.nameIndent + "name: '" + current.name + "'"
-  const wanted = '- id: ' + form.id + '\n' + current.nameIndent + "name: '" + form.name + "'"
-  const wantOff = engineEnabled ? false : form.disabled
-  let out = text.replace(head, wanted)
-  if (wantOff && !current.disabled) {
-    out = out.replace(wanted + '\n', wanted + '\n' + current.nameIndent + 'disabled: true\n')
-  } else if (!wantOff && current.disabled) {
-    out = out.replace(wanted + '\n' + current.disabledIndent + 'disabled: true\n', wanted + '\n')
-  }
-  return out
-}
-
-/**
- * Align the tool-ralph row with the host's own default (pure, idempotent).
- * dsh 0.1.6-alpha.1 ships ralph disabled in every built-in preset: its tool
- * description restricts it to runs the human explicitly asked for. The row
- * still imports on older hosts, so this is a semantics alignment rather than a
- * mount fix — but a composition claiming to mirror the built-in preset should
- * not silently re-enable a tool the deployment turned off.
- * @param text - composition text.
- * @param form - the host's tool-ralph row from rowFormsOf, or undefined.
- * @returns the aligned text.
- */
-export function alignRalphRow(text, form) {
-  if (!form) return text
-  const current = rowFormOf(text, 'tool-ralph')
-  if (current === undefined) return text
-  const head = '- id: tool-ralph\n' + current.nameIndent + "name: '" + current.name + "'"
-  if (form.disabled && !current.disabled) {
-    return text.replace(head + '\n', head + '\n' + current.nameIndent + 'disabled: true\n')
-  }
-  if (!form.disabled && current.disabled) {
-    return text.replace(head + '\n' + current.disabledIndent + 'disabled: true\n', head + '\n')
-  }
-  return text
-}
-
-/**
- * Probe every built-in preset this plugin's variants mirror for those row
- * spellings (never throws). The live roster is the authority — package
- * resolution alone would lie on linked development trees and on CLI installs
- * whose first-party packages live outside the profile.
- * @param agentPresets - the roster service.
- * @returns a map of row forms per available built-in id, or undefined.
- */
-async function detectRowForms(agentPresets) {
-  try {
-    const list = await agentPresets.list()
-    const entries = Array.isArray(list) ? list : []
-    const out = {}
-    for (const id of ['ptc', 'standard', 'cordis']) {
-      const entry = entries.find((p) => p && p.id === id && typeof p.path === 'string')
-      if (!entry) continue
-      const file = /\.yml$/.test(entry.path) ? entry.path : join(entry.path, 'agent.cordis.yml')
-      out[id] = rowFormsOf(readFileSync(file, 'utf8'))
-    }
-    return Object.keys(out).length > 0 ? out : undefined
-  } catch (error) {
-    console.log(TAG + ' row-form probe failed (' + (error && error.message ? error.message : error) + ') — keeping the committed spellings')
-    return undefined
-  }
-}
-
-/**
- * Marker fingerprint of the row spellings one variant is aligned to, so a host
- * that renames (or re-defaults) them re-materializes on the next boot.
- * @param rows - detectRowForms result.
- * @param presetId - the variant being materialized.
- * @returns a short stable string, '' when nothing was probed.
- */
-function rowFingerprint(rows, presetId) {
-  const source = ROW_SOURCE[presetId]
-  const form = rows && source ? rows[source] : undefined
-  if (!form || !form.engine) return ''
-  const ralph = form.ralph === undefined ? 'na' : (form.ralph.disabled ? 'off' : 'on')
-  return form.engine.id + ':' + (form.engine.disabled ? 'off' : 'on') + ':' + ralph
-}
-
-/**
- * Pick the committed composition asset inside one variant directory (pure).
- * The ptc-era twin is preferred when the roster says `ptc`; the persona-split
- * twin (`.ps`, v0.12.0) is preferred when the shipped persona row carries the
- * split keys; variants without a twin fall back down the chain (minimal never
- * had a ptc twin and gained its `.ps` twin instead). Every candidate is a
- * committed file — no runtime text synthesis.
- */
-function pickComposition(base, persona, available) {
-  const era = eraSuffix(base)
-  const ps = persona === 'split' ? '.ps' : ''
-  const candidates = base === 'ptc'
-    ? [`agent.cordis${era}${ps}.yml`, `agent.cordis${era}.yml`, ...(ps ? ['agent.cordis.ps.yml'] : []), 'agent.cordis.yml']
-    : ['agent.cordis.yml']
-  for (const file of candidates) if (available.includes(file)) return file
-  return 'agent.cordis.yml'
-}
-
-/** Startup decision for an existing unmodified tree: 'refresh' or 'idle'. */
-function syncDecision({ state, marker, version, sourceHashes, base = 'code', persona = 'text', present = false, pluginManager = false, rows = '' }) {
-  if (state !== 'unmodified' || !marker) return 'refresh'
-  if (marker.version !== version) return 'refresh'
-  if (marker.base !== base) return 'refresh'
-  if ((marker.persona ?? 'text') !== persona) return 'refresh'
-  // Host row-form flip: dsh 0.1.6-alpha.1 renamed the workflow-engine row and
-  // deleted the package behind the old spelling. A composition row that cannot
-  // be imported rejects the WHOLE preset mount, so a host reporting a
-  // different spelling must re-materialize (same marker-dimension pattern as
-  // persona and present).
-  if ((marker.rows ?? '') !== rows) return 'refresh'
-  // Host-capability flip: @deepseek-ai/dsh-tool-present first shipped with dsh
-  // 0.1.5-alpha.2. A preset composed with the row on a host that lacks the
-  // package REJECTS THE WHOLE MOUNT (mount.ts: a row whose module failed to
-  // import already rejects the mount), so the row is injected only when the
-  // host resolves it — and a host upgrade past that point must re-materialize
-  // to gain it (same marker-dimension pattern as persona).
-  if ((marker.present ?? false) !== present) return 'refresh'
-  // Host-capability flip: @deepseek-ai/dsh-plugin-manager/tools first shipped
-  // with dsh 0.1.6-alpha.2 — same mount-rejection stakes and the same marker
-  // dimension pattern as present above.
-  if ((marker.pluginManager ?? false) !== pluginManager) return 'refresh'
-  const recorded = {}
-  for (const k of Object.keys(marker.files)) if (k.startsWith('skills/')) recorded[k] = marker.files[k]
-  if (sourceHashes === null) return Object.keys(recorded).length === 0 ? 'idle' : 'refresh'
-  const live = Object.keys(sourceHashes)
-  const seen = Object.keys(recorded)
-  if (live.length !== seen.length) return 'refresh'
-  for (const k of live) if (recorded[k] !== sourceHashes[k]) return 'refresh'
-  return 'idle'
-}
-
-// ── materialization ─────────────────────────────────────────────────────────
-
-/*
- * Conditional present-row injection (v0.13.0, dsh 0.1.5-alpha.2 sync). The
- * official ptc/standard/cordis compositions appended `- id: present / name:
- * '@deepseek-ai/dsh-tool-present'` (immutable file-delivery download cards).
- * The row is NOT committed into the ptc-era twin files: a host older than
- * 0.1.5-alpha.2 lacks the package, and a composition row that fails to
- * import rejects the WHOLE preset mount. Instead the materializer probes the
- * host (hostHasToolPresent) and splices the row in as PLAIN TEXT — anchor
- * string surgery only, never a YAML round-trip, so !!js literals survive.
- * Placement mirrors the official compositions: right after the
- * tool-presentation block when the composition has one (all ptc-derived
- * twins), otherwise appended at the tail (cordis/standard twins). Only
- * `.ptc.` files are ever touched: code-era (<= 0.1.1) snapshots and the
- * minimal variants are frozen history (official minimal never gained the
- * row — it is the single-tool preset).
- */
-const PRESENT_ROW = "\n- id: present\n  name: '@deepseek-ai/dsh-tool-present'\n"
-const PRESENT_ANCHOR = "  name: '@deepseek-ai/dsh-agent-tool-presentation'\n  config:\n    mode: ptc\n"
-
-function injectPresentRow(text) {
-  if (text.includes("'@deepseek-ai/dsh-tool-present'")) return text
-  const at = text.indexOf(PRESENT_ANCHOR)
-  if (at !== -1) return text.slice(0, at + PRESENT_ANCHOR.length) + PRESENT_ROW + text.slice(at + PRESENT_ANCHOR.length)
-  return text.endsWith('\n') ? text + PRESENT_ROW : text + '\n' + PRESENT_ROW
-}
-
-let toolPresentCache
-/** Probe whether THIS host can resolve the present package (cached per boot). */
-async function hostHasToolPresent() {
-  if (toolPresentCache !== undefined) return toolPresentCache
-  try {
-    const { createRequire } = await import('node:module')
-    createRequire(import.meta.url).resolve('@deepseek-ai/dsh-tool-present')
-    toolPresentCache = true
-  } catch {
-    toolPresentCache = false
-  }
-  return toolPresentCache
-}
-
-/*
- * Conditional plugin-manager-row injection (v0.15.0, dsh 0.1.6-alpha.2 sync).
- * Official ptc/standard/cordis gained `- id: tool-plugin-manager / name:
- * '@deepseek-ai/dsh-plugin-manager/tools'` (persistent plugin management;
- * the official ptc preset carries it DISABLED, Creation keeps it on). The
- * package only exists from 0.1.6-alpha.2 on, so the row is injected as plain
- * text behind a host probe — never committed into the assets — anchored
- * after the present row when there is one, else at the tail, mirroring the
- * official order (tool-presentation → present → tool-plugin-manager).
- * Per-variant shape mirrors each variant's official base: code-gitbash (ptc
- * base) DISABLED, standard/cordis-gitbash ENABLED, minimal untouched
- * (official minimal never gained the row), code-era files frozen history.
- */
-const PLUGIN_MANAGER_ROW_ON = "- id: tool-plugin-manager\n  name: '@deepseek-ai/dsh-plugin-manager/tools'\n"
-const PLUGIN_MANAGER_ROW_OFF = "- id: tool-plugin-manager\n  name: '@deepseek-ai/dsh-plugin-manager/tools'\n  disabled: true\n"
-const PRESENT_ROW_FULL = "\n- id: present\n  name: '@deepseek-ai/dsh-tool-present'\n"
-
-function injectPluginManagerRow(text, { enabled }) {
-  if (text.includes("'@deepseek-ai/dsh-plugin-manager/tools'")) return text
-  const body = enabled ? PLUGIN_MANAGER_ROW_ON : PLUGIN_MANAGER_ROW_OFF
-  const at = text.indexOf(PRESENT_ROW_FULL)
-  if (at !== -1) return text.slice(0, at + PRESENT_ROW_FULL.length) + body + text.slice(at + PRESENT_ROW_FULL.length)
-  return text.endsWith('\n') ? text + body : text + '\n' + body
-}
-
-
-let pluginManagerToolsCache
-/** Probe whether THIS host can resolve the plugin-manager tools package (cached per boot). */
-async function hostHasPluginManagerTools() {
-  if (pluginManagerToolsCache !== undefined) return pluginManagerToolsCache
-  try {
-    const { createRequire } = await import('node:module')
-    createRequire(import.meta.url).resolve('@deepseek-ai/dsh-plugin-manager/tools')
-    pluginManagerToolsCache = true
-  } catch {
-    pluginManagerToolsCache = false
-  }
-  return pluginManagerToolsCache
-}
-
-/** Write one preset directory from scratch. Returns 'ok' or 'no-skills-source'. */
-function materialize({ target, presetId, skillsSource, version, base = 'code', persona = 'text', present = false, pluginManager = false, rows }) {
-  rmSync(target, { recursive: true, force: true })
-  mkdirSync(target, { recursive: true })
-
-  const available = readdirSync(join(pkgDir, 'assets', presetId)).filter((f) => f.endsWith('.yml'))
-  const compositionFile = pickComposition(base, persona, available)
-  let composition = readFileSync(join(pkgDir, 'assets', presetId, compositionFile), 'utf8')
-  if (present && compositionFile.includes('.ptc.')) composition = injectPresentRow(composition)
-  // v0.15.0: ptc-era files only; the ptc-based variant mirrors the official
-  // ptc DISABLED form, standard/cordis mirror their ENABLED bases, minimal is
-  // untouched (official minimal never gained the row).
-  if (pluginManager && compositionFile.includes('.ptc.') && presetId !== 'minimal-gitbash') {
-    composition = injectPluginManagerRow(composition, { enabled: presetId !== 'code-gitbash' })
-  }
-  // Row-form alignment (v0.14.0): the committed assets pin one spelling of the
-  // workflow-engine row, but a host renames it out from under them (dsh
-  // 0.1.6-alpha.1) and a row whose module fails to import rejects the whole
-  // mount. Copy the host's own spelling rather than shipping a third asset
-  // variant per era. Absent probe = leave the frozen history untouched.
-  const rowSource = ROW_SOURCE[presetId]
-  const rowForm = rows && rowSource ? rows[rowSource] : undefined
-  if (rowForm) {
-    composition = alignEngineRow(composition, rowForm.engine)
-    composition = alignRalphRow(composition, rowForm.ralph)
-  }
-  writeFileSync(join(target, 'agent.cordis.yml'), composition)
-  writeFileSync(join(target, 'preset.yml'), readFileSync(join(pkgDir, 'assets', presetId, 'preset.yml')))
-
-  let skills = 'none'
-  if (presetId === 'cordis-gitbash') {
-    if (skillsSource && existsSync(skillsSource)) {
-      cpSync(skillsSource, join(target, 'skills'), { recursive: true, force: true, dereference: true })
-      skills = 'copied'
-    } else {
-      mkdirSync(join(target, 'skills'), { recursive: true })
-      skills = 'missing-source'
-    }
-  }
-
-  const marker = { managedBy: MANAGED_BY, version, presetId, base, persona, present, pluginManager, rows: rowFingerprint(rows, presetId), files: hashTree(target) }
-  writeFileSync(join(target, MARKER_FILE), JSON.stringify(marker, null, 2) + '\n')
-  return skills
-}
-
-/** Disposal-time cleanup for one preset. */
-function cleanupOnDispose({ target, packageJsonExists }) {
-  if (packageJsonExists) return 'kept-package-intact'
-  const state = classify(target)
-  if (state === 'unmodified') {
-    rmSync(target, { recursive: true, force: true })
-    return 'removed'
-  }
-  return `kept-${state}`
-}
-
 // ── inspect-registry compatibility shim ─────────────────────────────────────
 //
 // The host-plane runner's inspect registry is a process-global singleton and
@@ -1076,36 +640,6 @@ export function readSuppressPeerCordis(ctxLike) {
   }
 }
 
-/**
- * Bounded probe for dsh-ptc-cordis-preset's coverage capability. The OLD era
- * has no registration registry to watch, and rows mount concurrently, so poll
- * briefly when the service is not there yet; a short absence means the peer is
- * not installed (or is older than 0.14.0) and every configured variant stays.
- * @param {object} ctx - the plugin's mounting context.
- * @param {number} [timeoutMs] - total wait before giving up.
- * @param {number} [intervalMs] - poll interval.
- * @returns {Promise<boolean>} the peer's `gitBashActive`, false when unknown.
- */
-export async function detectPeerCoverage(ctx, timeoutMs = 1000, intervalMs = 25) {
-  try {
-    const probe = () => {
-      const capability = ctx.get(PEER_CAPABILITY)
-      return capability === null || capability === undefined ? undefined : capability
-    }
-    let capability = probe()
-    if (capability === undefined) {
-      const deadline = Date.now() + timeoutMs
-      while (Date.now() < deadline) {
-        await new Promise((resolve) => setTimeout(resolve, intervalMs))
-        capability = probe()
-        if (capability !== undefined) break
-      }
-    }
-    return capability?.gitBashActive === true
-  } catch {
-    return false
-  }
-}
 
 // Windows absolute path -> MSYS drive-root form, for rewriting PROSE in place
 // (v0.10.0). Quoted spaced paths ("C:\Program Files\Git") are matched whole; a bare
@@ -2072,10 +1606,6 @@ function adoptSidebarShell(ctx, bashPath, readAdopt) {
 // ── plugin ──────────────────────────────────────────────────────────────────
 
 /** First user-trust root: the roster's authoring target. */
-function firstUserRoot(roots) {
-  for (const r of roots) if (r && r.trust === 'user' && typeof r.path === 'string') return r
-  return undefined
-}
 
 /** Directory of skills inside the installed shipped `cordis` preset, if any. */
 async function findSkillsSource(agentPresets) {
@@ -2415,11 +1945,14 @@ export async function apply(ctx, config = {}) {
   })()
   if (legacySettings) try {
     ctx.inject(['settings'], (sctx) => {
-      Promise.all([import('@deepseek-ai/dsh-settings'), import('@deepseek-ai/schemastery')])
-        .then(([ds, sm]) => {
+      Promise.resolve(import('@deepseek-ai/dsh-settings'))
+        .then((ds) => {
           const settings = sctx && sctx.settings
           if (!settings || typeof settings.register !== 'function') return
-          const Schema = sm.default
+          // The SAME copy the executor and the row Config were built from
+          // (issue #12): one resolution per process, so the two faces of this
+          // plugin can never disagree about the schema vocabulary.
+          if (!Schema) return
           // Era probe: newer dsh register() takes a plain string; the older
           // one accepted the branded helper — one call satisfies both.
           const ns = typeof ds.settingsNamespace === 'function'
@@ -2981,92 +2514,6 @@ export async function apply(ctx, config = {}) {
     return
   }
 
-  const roots = ctx.agentPresets?.roots ?? []
-  const userRoot = firstUserRoot(roots)
-  if (!userRoot) {
-    console.log(`${TAG} no user-trust preset root configured — nothing to materialize`)
-    return
-  }
-
-  let version = '0.0.0'
-  try {
-    version = JSON.parse(readFileSync(join(pkgDir, 'package.json'), 'utf8')).version ?? version
-  } catch {
-    /* fall back to the placeholder */
-  }
-
-  const skillsSource = await findSkillsSource(ctx.agentPresets)
-  const base = await detectBase(ctx.agentPresets)
-  const persona = await detectPersonaEra(ctx.agentPresets)
-  // Two independent signals, either of which is sufficient: the shipped
-  // composition text (authoritative on every install layout) and the package
-  // resolving from this plugin's own tree (covers hosts where the roster
-  // probe is unavailable).
-  const present = (await detectPresentSupport(ctx.agentPresets)) || (await hostHasToolPresent())
-  // v0.15.0 (dsh 0.1.6-alpha.2): official ptc/standard/cordis gained the
-  // tool-plugin-manager row; inject behind the same host-package probe as
-  // present (resolve-only is sufficient — the package cannot exist on an
-  // older host, so a roster text probe adds nothing).
-  const pluginManager = await hostHasPluginManagerTools()
-  // Row spellings of the built-in presets these variants mirror: the
-  // workflow-engine row was renamed and its old package deleted in dsh
-  // 0.1.6-alpha.1, so the materializer copies whatever the host itself ships.
-  const rows = await detectRowForms(ctx.agentPresets)
-  const userRootPath = userRoot.path
-  // Same dedupe decision as the declarative era, taken once at startup here:
-  // this host has no roster registry to watch and no live Config writes, so the
-  // switch is read per boot (documented in the README). `purgeOrphans` retires
-  // a copy an earlier boot materialized, and flipping the switch back
-  // re-materializes it on the next start.
-  const suppressPeer = liveSettings.suppressPeerCordis()
-  const peerGitBash = suppressPeer ? await detectPeerCoverage(ctx) : false
-  const effectiveIds = effectivePresetIds(presetIds, { suppress: suppressPeer, peerGitBash })
-  if (effectiveIds.length !== presetIds.length) {
-    const skipped = presetIds.filter((presetId) => !effectiveIds.includes(presetId))
-    console.log(`${TAG} dsh-ptc-cordis-preset covers Creation mode on Git Bash — not materializing: ${skipped.join(', ')}`)
-  }
-  purgeOrphans(userRootPath, effectiveIds)
-
-  for (const presetId of effectiveIds) {
-    const target = join(userRootPath, presetId)
-    const state = classify(target)
-    if (state === 'foreign') {
-      console.log(`${TAG} a preset not written by this plugin already exists at ${target} — leaving it alone`)
-      continue
-    }
-    if (state === 'user-modified') {
-      console.log(`${TAG} preset at ${target} was modified after materialization — keeping the user's version (delete the directory to re-materialize)`)
-      continue
-    }
-
-    // Reversible side effect, registered BEFORE the idle check so a quiet
-    // startup keeps uninstall hygiene.
-    ctx.effect(() => () => {
-      try {
-        const result = cleanupOnDispose({ target, packageJsonExists: existsSync(join(pkgDir, 'package.json')) })
-        if (result === 'removed') console.log(`${TAG} package uninstalled — removed the unmodified '${presetId}' preset`)
-        else if (result !== 'kept-package-intact' && result !== 'kept-absent') console.log(`${TAG} preset ${result} on disposal — kept`)
-      } catch (error) {
-        console.log(`${TAG} cleanup skipped: ${error?.message ?? error}`)
-      }
-    }, `dsh-gitbash-shell: preset materialization (${presetId})`)
-
-    const sourceHashes = presetId === 'cordis-gitbash' ? skillsHashes(skillsSource) : null
-    const marker = readMarker(target)
-    const markerRows = rowFingerprint(rows, presetId)
-    if (state === 'unmodified' && syncDecision({ state, marker, version, sourceHashes, base, persona, present, pluginManager, rows: markerRows }) === 'idle') {
-      ctx.logger?.('gitbash-shell')?.debug?.( `preset '${presetId}' up to date (v${version}, ${base}-era${persona === 'split' ? ', persona-split' : ''}) — idle`)
-      continue
-    }
-
-    const skills = materialize({ target, presetId, skillsSource, version, base, persona, present, pluginManager, rows })
-    const verb = state === 'absent' ? 'materialized' : 'refreshed'
-    console.log(
-      `${TAG} ${verb} preset '${presetId}' into ${userRootPath} (v${version}, ${base}-era composition${persona === 'split' ? ', persona-split' : ''})` +
-        (skills === 'copied' ? " (skills copied from the installed 'cordis' preset)" : '')
-    )
-  }
 }
-
 // Test surface: pure helpers, no Cordis context required.
-export const _internal = { PRESET_IDS, PEER_COVERED_PRESET_ID, PEER_CAPABILITY, isDelegatedAgent, dialectApplies, PEER_PYTHON_FIELD, PEER_PYTHON_BACKEND_FIELD, peerFact, peerBackend, pythonBackendActive, effectivePresetIds, detectPeerCoverage, readSuppressPeerCordis, translateDispatch, translateMsysPath, translatePathArguments, rewriteCodePaths, scanCodeLiterals, programPrelude, translateGlobArguments, buildTranslateEnv, rewriteErrorContent, rewriteErrorMessage, rewriteFailureMessage, msysEcho, driveToMsys, pathEcho, ERROR_CONTENT_TOOLS, readPosixPaths, readAdoptSidebar, readDialectSettings, windowsToMsys, rewriteResultPaths, adoptSidebarShell, MARKER_FILE, classify, materialize, cleanupOnDispose, firstUserRoot, hashTree, skillsHashes, syncDecision, installRegisterShim, baseForRoster, detectBase, pickComposition, personaEraForText, detectPersonaEra, injectPresentRow, hostHasToolPresent, detectPresentSupport, injectPluginManagerRow, hostHasPluginManagerTools, rowFormOf, rowFormsOf, alignEngineRow, alignRalphRow, ROW_SOURCE }
+export const _internal = { PRESET_IDS, PEER_COVERED_PRESET_ID, PEER_CAPABILITY, isDelegatedAgent, dialectApplies, PEER_PYTHON_FIELD, PEER_PYTHON_BACKEND_FIELD, peerFact, peerBackend, pythonBackendActive, effectivePresetIds, readSuppressPeerCordis, translateDispatch, translateMsysPath, translatePathArguments, rewriteCodePaths, scanCodeLiterals, programPrelude, translateGlobArguments, buildTranslateEnv, rewriteErrorContent, rewriteErrorMessage, rewriteFailureMessage, msysEcho, driveToMsys, pathEcho, ERROR_CONTENT_TOOLS, readPosixPaths, readAdoptSidebar, readDialectSettings, windowsToMsys, rewriteResultPaths, adoptSidebarShell, MARKER_FILE, classify, hashTree, installRegisterShim }