clearai-dsh 0.3.1 → 0.5.0

package/bin/clearai.mjs

@@ -5,27 +5,23 @@
  * 分包的三样东西落在三个平面:
  *   · 宿主半(`lib/host.js`)—— 由包自带的 `cordis.patch.yml` 在 profile 层插一行,`dsh plugin add` 自动生效;
  *   · 浏览器半(`lib/client.js`)—— 同一份清单里的 `dsh.client`,浏览器 Loader 自己扫;
- *   · agent 预设(`presets/clearai/`)—— **名册(roster)只从 root 目录扫**,包没法直接声明,
- *     所以要么把 root 指进包里,要么把它播种到用户根。这一件就是本工具存在的理由。
+ *   · agent 预设(`presets/clearai/clearai.patch.yml`)—— 一条 `- id: preset-clearai` 声明行,
+ *     经清单的 `dsh.bundle.patch` 挂进组合;名册(`agent-preset-registry`)读的就是它。
  *
- * 处理方式(前四个默认只**打印**不改;默认动词仍是 `doctor` —— 一个安装侧工具不该在
- * 你没说要装的时候动你的部署):
- *   doctor      看现状:包在哪、预设在哪、名册能不能看见它、探测到的 dsh / profile 是什么
+ * 宿主 ≥0.2.0 的名册**不扫目录、不收预设路径**(`@deepseek-ai/dsh-agent-preset-registry` 的 README:
+ * "the registry neither scans directories nor accepts preset paths"),所以旧的 root 目录那几个动词
+ * (`root-yaml` / `seed` / `unseed`)已经删掉:它们写出去的东西在这些宿主上没人读。
+ *
+ * 两个动词(默认是 `doctor` —— 一个安装侧工具不该在你没说要装的时候动你的部署):
+ *   doctor      看现状:包在哪、预设在哪、组合里有没有宿主行与预设声明行、探测到的 dsh / profile 是什么
  *   install     把包装进 profile —— `dsh plugin --profile <p> add <spec>` 的一层**前置解析**
  *               (读者不必知道 profile 叫什么、CLI 从哪来、包名怎么写),装完给读数与下一步
- *   root-yaml   打印**可以直接粘进 profile 的 `cordis.patch.yml`** 的那一行(路径已算成绝对路径)
- *   seed        把预设**播种**到用户根 `~/.dsh/.agent-presets/<id>`(带哈希记账:改过的不覆盖)
- *   unseed      撤掉播种:只删「我们播的、且没被改过」的文件;用户 fork 的 id 一律不碰
- *
- * 纪律(与内核播种模板技能同一条):**改过的东西不覆盖,只如实报漂移**;删东西之前先看哈希。
- * 不改用户的 `cordis.patch.yml` —— 那一行的内容由人自己粘(工具只负责把绝对路径算对)。
  */
 
-import { createHash } from 'node:crypto'
 import { spawnSync } from 'node:child_process'
-import { cpSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, statSync } from 'node:fs'
 import { homedir } from 'node:os'
-import { delimiter, dirname, join, relative, resolve } from 'node:path'
+import { delimiter, dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const HERE = dirname(fileURLToPath(import.meta.url))
@@ -33,7 +29,6 @@ const PKG_DIR = resolve(HERE, '..')
 const PRESET_ID = 'clearai'
 const PRESET_SRC = join(PKG_DIR, 'presets', PRESET_ID)
 const DSH_HOME = process.env.DSH_HOME ?? join(homedir(), '.dsh')
-const LEDGER = join(DSH_HOME, '.clearai-dsh.json')
 
 const argv = process.argv.slice(2)
 const command = argv[0] ?? 'doctor'
@@ -67,13 +62,9 @@ const TEXT = {
 	zh: {
 		pkgDir: '包目录        ',
 		presetSrc: '预设源        ',
-		presetOk: '(agent.cordis.yml ✓)',
-		presetMissing: '(缺 agent.cordis.yml ✗)',
+		presetOk: '(clearai.patch.yml ✓)',
+		presetMissing: '(缺 clearai.patch.yml ✗)',
 		dshHome: 'DSH_HOME      ',
-		userRoot: '用户根        ',
-		rosterVisible: '✓ 名册看得见',
-		rosterAbsent: '✗ 还没有(用 seed 播种,或把 root-yaml 那一行粘进 profile)',
-		shadowCopy: '  ⚠️ 影子副本     {path} 与包里的那份**不一致**,而它被包的 root 遮住、永远不会被读到(自检却会优先读它)。删掉它,或用它来承载你自己的改动并换一个 id。',
 		profileRow: 'profile       ',
 		profileAbsent: '(不存在:先跑一次 dsh --profile {profile})',
 		composeRow: '组合          ',
@@ -81,13 +72,10 @@ const TEXT = {
 		hostRow: '宿主行        ',
 		hostIn: '在组合里 ✓',
 		hostOut: '不在组合里(先 dsh plugin --profile {profile} add <本包>)',
-		rosterRootRow: '名册 root     ',
-		rosterNoRoots: '组合里没看到 roots(这个部署可能不挂名册)',
-		rosterExpr: '{expr}(dump 打的是表达式原文,求值在装载时)',
-		seedLedgerRow: '播种记账      ',
-		ledgerEmpty: '(空)',
-		ledgerCount: '{count} 个条目 · {path}',
-		doctorHint: '\n提示:doctor 只读;它不会替你改 profile,也不会替你播种。',
+		presetRow: '预设声明行    ',
+		presetIn: '在组合里 ✓(preset-clearai)',
+		presetOut: '不在组合里:名册里不会有 ClearAI(这个 profile 可能没挂 agent-preset-registry,或宿主早于 0.2.0)',
+		doctorHint: '\n提示:doctor 只读;它不会替你改 profile。',
 		installHeader: '【安装】{name}@{version}',
 		installWhat: '装什么      ',
 		installWhere: '装到哪      ',
@@ -104,30 +92,15 @@ const TEXT = {
 		hostAbsent: '**不在组合里** —— 装是装上了,但组合里没看到它(用 doctor 查)',
 		nextStep: '\n  下一步      重启 dsh web(两半都在进程里按模块 URL 缓存,只刷新浏览器不够),然后在预设选择器里选 ClearAI。',
 		uninstall: '  卸载        dsh plugin --profile {profile} remove {name}(同样可以冠 npx)',
-		rootYamlComment1: '# ClearAI 预设的 root(由 clearai-dsh 的 bin 打印,路径已算成绝对路径)',
-		rootYamlComment2: '    # ⚠️ 补丁层会**替换整份 config**:下面这些键必须与你部署里那份一致,否则会丢。',
-		rootYamlComment3: '    #    先 `dsh --profile <p> --dump-config | grep -A 20 agent-presets` 看一眼当前值再粘。',
-		noPresetInPackage: '✗ 包里没有预设:{path}',
-		seededTo: '  播种到        {dest}',
-		seedCounts: '  新增 {seeded} · 刷新 {refreshed}',
-		seedDrifted: ' · **你改过、没覆盖** {count}({list})',
-		seedNext: '  下一步:重启 dsh(或刷新页面)后,预设选择器里应出现「ClearAI」。',
-		noSeedLedger: '  没有播种记账:什么都不做(不知道哪些是我们播的,就不删)。',
-		unseedRemoved: '  删掉 {count} 个「我们播的、没被改过」的文件',
-		unseedKept: '  **保留** {count} 个你改过的文件(它们现在是你的):{list}',
 		unknownCommand: 'unknown command: {command}',
-		usage: '用法:clearai-dsh [doctor|install|root-yaml|seed|unseed] [--profile web] [--home <dir>] [--lang zh|en]\n     install 还可以:--dist <dir> | --tarball <tgz> | --spec <spec>',
+		usage: '用法:clearai-dsh [doctor|install|version] [--profile web] [--home <dir>] [--lang zh|en]\n     install 还可以:--dist <dir> | --tarball <tgz> | --spec <spec>',
 	},
 	en: {
 		pkgDir: 'package       ',
 		presetSrc: 'preset src    ',
-		presetOk: '(agent.cordis.yml ✓)',
-		presetMissing: '(no agent.cordis.yml ✗)',
+		presetOk: '(clearai.patch.yml ✓)',
+		presetMissing: '(no clearai.patch.yml ✗)',
 		dshHome: 'DSH_HOME      ',
-		userRoot: 'user root     ',
-		rosterVisible: '✓ visible to the roster',
-		rosterAbsent: '✗ not there yet (seed it, or paste the root-yaml line into the profile)',
-		shadowCopy: '  ⚠️ shadow copy  {path} differs from the copy in the package, and the package root shadows it — it will never be read (while the self-check reads it first). Delete it, or keep your changes there under a different id.',
 		profileRow: 'profile       ',
 		profileAbsent: '(does not exist yet: run dsh --profile {profile} once)',
 		composeRow: 'composition   ',
@@ -135,13 +108,10 @@ const TEXT = {
 		hostRow: 'host row      ',
 		hostIn: 'is in the composition ✓',
 		hostOut: 'is NOT in the composition (run dsh plugin --profile {profile} add <this package>)',
-		rosterRootRow: 'roster root   ',
-		rosterNoRoots: 'no roots in the composition (this deployment may not mount the roster)',
-		rosterExpr: '{expr}(the dump prints the expression verbatim; it is evaluated at load time)',
-		seedLedgerRow: 'seed ledger   ',
-		ledgerEmpty: '(empty)',
-		ledgerCount: '{count} entries · {path}',
-		doctorHint: '\ndoctor only reads. It will not change your profile and will not seed anything for you.',
+		presetRow: 'preset row    ',
+		presetIn: 'is in the composition ✓ (preset-clearai)',
+		presetOut: 'is NOT in the composition: the roster will not offer ClearAI (this profile may not mount agent-preset-registry, or the host predates 0.2.0)',
+		doctorHint: '\ndoctor only reads. It will not change your profile.',
 		installHeader: '[install] {name}@{version}',
 		installWhat: 'what        ',
 		installWhere: 'where       ',
@@ -158,73 +128,18 @@ const TEXT = {
 		hostAbsent: '**NOT in the composition** — it installed, but the composition does not show it (run doctor)',
 		nextStep: '\n  next        restart dsh web (both halves are cached in the running process by module URL, so a browser refresh is not enough), then pick ClearAI in the preset picker.',
 		uninstall: '  uninstall   dsh plugin --profile {profile} remove {name}(npx works too)',
-		rootYamlComment1: '# ClearAI preset root (printed by clearai-dsh; the path is already absolute)',
-		rootYamlComment2: '    # ⚠️ a patch layer **replaces the whole config**: these keys must match the ones in your deployment, or they are lost.',
-		rootYamlComment3: '    #    Run `dsh --profile <p> --dump-config | grep -A 20 agent-presets` first and paste over the current values.',
-		noPresetInPackage: '✗ no preset in the package: {path}',
-		seededTo: '  seeded to   {dest}',
-		seedCounts: '  added {seeded} · refreshed {refreshed}',
-		seedDrifted: ' · **kept your edits** {count}({list})',
-		seedNext: '  next: restart dsh (or refresh the page) — ClearAI should now appear in the preset picker.',
-		noSeedLedger: '  nothing was seeded: doing nothing (without the ledger there is no way to tell which files are ours, so nothing is deleted).',
-		unseedRemoved: '  removed {count} file(s) we seeded and you did not edit',
-		unseedKept: '  **kept** {count} file(s) you edited (they are yours now): {list}',
 		unknownCommand: 'unknown command: {command}',
-		usage: 'usage: clearai-dsh [doctor|install|root-yaml|seed|unseed] [--profile web] [--home <dir>] [--lang zh|en]\n       install also takes: --dist <dir> | --tarball <tgz> | --spec <spec>',
+		usage: 'usage: clearai-dsh [doctor|install|version] [--profile web] [--home <dir>] [--lang zh|en]\n       install also takes: --dist <dir> | --tarball <tgz> | --spec <spec>',
 	},
 }
 
-/** `{name}` 是占位符;需要拼计数与列表的句子写成函数(见 doctor / seed / unseed)。 */
+/** `{name}` 是占位符。 */
 function t(key, params) {
 	const text = TEXT[lang][key] ?? TEXT.zh[key]
 	if (text === undefined) throw new Error(`missing text: ${key}`)
 	return typeof text === 'function' ? text(params ?? {}) : text.replace(/\{(\w+)\}/g, (_, name) => String(params?.[name] ?? ''))
 }
 
-/** 递归列出文件(相对路径 → sha256 前 16 位)。只为记账,不为校验完整性。 */
-function hashTree(root) {
-	const out = {}
-	const walk = (dir) => {
-		let entries = []
-		try {
-			entries = readdirSync(dir, { withFileTypes: true })
-		} catch {
-			return
-		}
-		for (const entry of entries) {
-			const full = join(dir, entry.name)
-			if (entry.isDirectory()) walk(full)
-			else if (entry.isFile()) out[relative(root, full)] = createHash('sha256').update(readFileSync(full)).digest('hex').slice(0, 16)
-		}
-	}
-	walk(root)
-	return out
-}
-
-function readLedger() {
-	try {
-		const parsed = JSON.parse(readFileSync(LEDGER, 'utf8'))
-		return parsed !== null && typeof parsed === 'object' ? parsed : {}
-	} catch {
-		return {}
-	}
-}
-
-function writeLedger(next) {
-	try {
-		mkdirSync(dirname(LEDGER), { recursive: true })
-		writeFileSync(LEDGER, `${JSON.stringify(next, null, 2)}\n`, 'utf8')
-		return true
-	} catch {
-		return false
-	}
-}
-
-/** 名册会扫哪些 root —— 与 `@deepseek-ai/dsh-agent-presets` 的规则同形(自带 → 配置 → 用户根)。 */
-function rosterRoots() {
-	return [join(DSH_HOME, '.agent-presets')]
-}
-
 /**
  * 在 PATH 上找一个可执行文件,找到就返回全路径。
  *
@@ -266,35 +181,12 @@ function composeQuery(profileName, env) {
 function doctor() {
 	const rows = []
 	rows.push(`${t('pkgDir')}${PKG_DIR}`)
-	rows.push(`${t('presetSrc')}${PRESET_SRC}${existsSync(join(PRESET_SRC, 'agent.cordis.yml')) ? t('presetOk') : t('presetMissing')}`)
+	rows.push(`${t('presetSrc')}${PRESET_SRC}${existsSync(join(PRESET_SRC, 'clearai.patch.yml')) ? t('presetOk') : t('presetMissing')}`)
 	rows.push(`${t('dshHome')}${DSH_HOME}`)
-	const roots = rosterRoots()
-	for (const root of roots) {
-		const dir = join(root, PRESET_ID)
-		const present = existsSync(join(dir, 'agent.cordis.yml'))
-		rows.push(`${t('userRoot')}${dir} ${present ? t('rosterVisible') : t('rosterAbsent')}`)
-		/**
-		 * 用户根里那份**会不会被包的 root 遮住**。
-		 *
-		 * 名册按 root 顺序先到先得(自带 root → 配置 root → 用户根),所以包一装,用户根里
-		 * 同 id 的那份副本就**再也读不到**——它会安静地烂在那里,还会把「部署出去的那份」的
-		 * 自检引到你手改过的旧副本上。判据只取事实:两份 `preset.yml` 的字节是否一致。
-		 */
-		const mine = join(PRESET_SRC, 'preset.yml')
-		const theirs = join(dir, 'preset.yml')
-		if (!present || !existsSync(mine) || !existsSync(theirs)) continue
-		let same = false
-		try {
-			same = readFileSync(mine).equals(readFileSync(theirs))
-		} catch {
-			same = false
-		}
-		if (!same) rows.push(t('shadowCopy', { path: theirs }))
-	}
 	const profileDir = join(DSH_HOME, 'profiles', profile)
 	rows.push(`${t('profileRow')}${profileDir}${existsSync(profileDir) ? '' : t('profileAbsent', { profile })}`)
 	/**
-	 * 宿主行与名册 root **问组合**,不问某个文件(2026-09-11 修:装出来的形态下这两行来自
+	 * 宿主行与预设声明行**问组合**,不问某个文件(2026-09-11 修:装出来的形态下这两行来自
 	 * **包的补丁层**,不在 profile 的 cordis.patch.yml 里 —— 读文件的写法会误报「还没挂」)。
 	 * 事实在组合里;问不到就如实说问不到,不猜。
 	 */
@@ -304,12 +196,9 @@ function doctor() {
 	} else {
 		const rowIds = [...composed.matchAll(/^- id: (\S+)$/gm)].map((match) => match[1])
 		rows.push(`${t('hostRow')}${rowIds.includes('clearai-host') ? t('hostIn') : t('hostOut', { profile })}`)
-		const roster = /- id: agent-presets[\s\S]{0,600}?\n\s*- path:[^\n]*/.exec(composed)
-		const expr = roster === null ? null : roster[0].split('\n').pop().trim()
-		rows.push(`${t('rosterRootRow')}${expr === null ? t('rosterNoRoots') : t('rosterExpr', { expr })}`)
+		/** 名册读的是组合里的 `preset-clearai` 声明行(由包的 `dsh.bundle.patch` 挂进来),不是某个目录。 */
+		rows.push(`${t('presetRow')}${rowIds.includes('preset-clearai') ? t('presetIn') : t('presetOut')}`)
 	}
-	const ledger = readLedger()
-	rows.push(`${t('seedLedgerRow')}${Object.keys(ledger).length === 0 ? t('ledgerEmpty') : t('ledgerCount', { count: Object.keys(ledger).length, path: LEDGER })}`)
 	for (const row of rows) console.log(`  ${row}`)
 	console.log(t('doctorHint'))
 }
@@ -386,99 +275,8 @@ function install() {
 	console.log(t('uninstall', { profile, name: manifest.name }))
 }
 
-function rootYaml() {
-	const line = [
-		t('rootYamlComment1'),
-		'- id: \'@deepseek-ai/dsh-agent-presets\'',
-		'  config:',
-		t('rootYamlComment2'),
-		t('rootYamlComment3'),
-		'    default: standard',
-		'    includeShippedRoot: true',
-		'    includeUserRoot: true',
-		'    roots:',
-		`      - path: '${join(PKG_DIR, 'presets')}'`,
-		'        trust: system',
-	].join('\n')
-	console.log(line)
-}
-
-function seed() {
-	if (!existsSync(join(PRESET_SRC, 'agent.cordis.yml'))) {
-		console.error(t('noPresetInPackage', { path: PRESET_SRC }))
-		process.exit(1)
-	}
-	const root = value('root', rosterRoots()[0])
-	const dest = join(root, PRESET_ID)
-	const next = hashTree(PRESET_SRC)
-	const before = readLedger()
-	const previous = before[PRESET_ID]?.files ?? {}
-	const seeded = []
-	const refreshed = []
-	const drifted = []
-	for (const [rel, hash] of Object.entries(next)) {
-		const target = join(dest, rel)
-		const onDisk = existsSync(target) ? createHash('sha256').update(readFileSync(target)).digest('hex').slice(0, 16) : null
-		if (onDisk === null) {
-			mkdirSync(dirname(target), { recursive: true })
-			cpSync(join(PRESET_SRC, rel), target)
-			seeded.push(rel)
-			continue
-		}
-		if (onDisk === hash) continue
-		// 改过的不覆盖:与内核播种模板技能同一条纪律
-		if (previous[rel] !== undefined && onDisk !== previous[rel]) {
-			drifted.push(rel)
-			continue
-		}
-		cpSync(join(PRESET_SRC, rel), target)
-		refreshed.push(rel)
-	}
-	before[PRESET_ID] = { files: next, at: new Date().toISOString(), dest }
-	writeLedger(before)
-	console.log(t('seededTo', { dest }))
-	console.log(`${t('seedCounts', { seeded: seeded.length, refreshed: refreshed.length })}${drifted.length === 0 ? '' : t('seedDrifted', { count: drifted.length, list: drifted.slice(0, 5).join(lang === 'zh' ? '、' : ', ') })}`)
-	console.log(t('seedNext'))
-}
-
-function unseed() {
-	const ledger = readLedger()
-	const entry = ledger[PRESET_ID]
-	if (entry === undefined) {
-		console.log(t('noSeedLedger'))
-		return
-	}
-	const dest = entry.dest ?? join(rosterRoots()[0], PRESET_ID)
-	const removed = []
-	const kept = []
-	for (const [rel, hash] of Object.entries(entry.files ?? {})) {
-		const target = join(dest, rel)
-		if (!existsSync(target)) continue
-		const onDisk = createHash('sha256').update(readFileSync(target)).digest('hex').slice(0, 16)
-		if (onDisk === hash) {
-			rmSync(target)
-			removed.push(rel)
-		} else {
-			kept.push(rel)
-		}
-	}
-	delete ledger[PRESET_ID]
-	writeLedger(ledger)
-	console.log(t('unseedRemoved', { count: removed.length }))
-	if (kept.length > 0) console.log(t('unseedKept', { count: kept.length, list: kept.slice(0, 5).join(lang === 'zh' ? '、' : ', ') }))
-	// 空目录收掉(只收我们知道的那些;非空绝不动)
-	try {
-		if (existsSync(dest) && readdirSync(dest).length === 0) rmSync(dest, { recursive: true })
-	} catch {
-		/* 收不掉就算了,不影响判定 */
-	}
-}
-
 if (command === 'doctor') doctor()
 else if (command === 'install') install()
-else if (command === 'root-yaml') rootYaml()
-else if (command === 'seed') seed()
-else if (command === 'unseed') unseed()
 else if (command === 'version' || flag('version')) console.log(JSON.parse(readFileSync(join(PKG_DIR, 'package.json'), 'utf8')).version)
 else {
 	console.error(`${t('unknownCommand', { command })}\n${t('usage')}`)

package/cordis.patch.yml

@@ -12,7 +12,7 @@
     - id: clearai-host
       name: 'clearai-dsh'
 
-# ── 预设不在这里声明 root:宿主 ≥0.1.7-alpha.1 起名册不再扫目录 ────────────────
+# ── 预设不在这里声明 root:宿主的名册不扫目录(本包要求宿主 ≥0.2.0-rc.2)──────────
 #
 # 0.2.3 及以前走的是「root 目录」机制:宿主自带 `- id: agent-presets` 行,本文件覆盖它的
 # config,把 root 指到包内 presets/,归属落在 system 信任层。
@@ -28,5 +28,5 @@
 # 依据与实测:`lab/release/0.2.3-release-blocker.md`、`lab/adapter/0.2.4-design.md`。
 #
 # 预设本体现在由 `presets/clearai/clearai.patch.yml` 承载(构建期由 preset/agent.cordis.yml
-# 生成,经 package.json 的 `dsh.bundle.patch` 数组挂上)。想改预设的人仍有两条路:
-# `clearai-dsh seed`(播种到用户根,可改可回滚)或复制成新 id。
+# 生成,经 package.json 的 `dsh.bundle.patch` 数组挂上)。想改预设的人:把声明行复制一份、
+# 换一个 id,作为自己的 bundle patch 装(`clearai-dsh seed` 那条播种到用户根的路已随旧名册删掉)。