@michengai/dsh-codex-suite 0.1.14 → 0.1.16

package/README.md

@@ -1,6 +1,6 @@
 # DSH Codex Suite
 
-`@michengai/dsh-codex-suite` is a one-click installer that adds Codex UI, expert management, skill management, archive management, IM Assistant, and scheduled tasks to one profile as six **direct dependencies**.
+`@michengai/dsh-codex-suite` remains the compatibility aggregate for profiles installed with the old `dsh plugin add` command. For new installs and migration, use the lightweight `@michengai/dsh-codex-suite-installer`; it adds the six members as **direct dependencies**.
 
 ## Plugin combo
 
@@ -13,7 +13,7 @@
 | IM Assistant | `@michengai/dsh-im-connect` |
 | Scheduled tasks | `@michengai/dsh-automation` |
 
-Each Suite release pins one exact, verified member set. Making the members direct dependencies lets **Settings → About** detect, install, and update them independently. `dshmarket` remains optional.
+Each Suite release pins one exact, verified member set. The separate installer has no member runtime dependency tree of its own, so `npx` can start immediately and let DSH install the members directly. `dshmarket` and `dsh-find-plugin` remain optional and can be installed separately from About.
 
 ## One-click installation
 
@@ -22,7 +22,7 @@ Node.js 22+ is required, and the current DSH `dsh` command must be on PATH. Run
 ```powershell
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 $OutputEncoding = [System.Text.Encoding]::UTF8
-npx --yes @michengai/dsh-codex-suite@latest --profile web
+npx --yes @michengai/dsh-codex-suite-installer@latest --profile web
 ```
 
 The installer:
@@ -39,7 +39,7 @@ Restart DSH Web and hard-refresh the browser afterwards. Set `DSH_BIN` when `dsh
 Keep the same `DSH_HOME` and choose another profile name:
 
 ```powershell
-npx --yes @michengai/dsh-codex-suite@latest --profile codex
+npx --yes @michengai/dsh-codex-suite-installer@latest --profile codex
 ```
 
 DSH supplies `@deepseek-ai/dsh-base` when it creates a custom profile. The installer places DSH's built-in `@deepseek-ai/dsh-web-app` before the six member bundles without creating a separate Home or reinstalling the official Web package from npm.

package/README.zh-CN.md

@@ -1,6 +1,6 @@
 # DSH Codex Suite
 
-`@michengai/dsh-codex-suite` 是一键安装器：把 Codex UI、专家、技能、归档、IM 助理和定时任务作为目标 profile 的六个**直接依赖**安装。
+`@michengai/dsh-codex-suite` 保留为兼容旧版 `dsh plugin add` 的聚合包。新安装和旧版迁移请使用轻量的 `@michengai/dsh-codex-suite-installer`，它会把六个成员写成目标 profile 的**直接依赖**。
 
 ## 插件组合
 
@@ -13,7 +13,7 @@
 | IM 助理 | `@michengai/dsh-im-connect` |
 | 定时任务 | `@michengai/dsh-automation` |
 
-每个 Suite 版本锁定一组经过验证的成员精确版本。成员成为直接依赖后，「设置 → 关于」可以分别检测、安装和升级它们。`dshmarket` 不在套件内，需要时单独安装。
+每个 Suite 版本锁定一组经过验证的成员精确版本。独立安装器自身不携带成员运行时依赖树，因此 `npx` 可以立即启动，再交给 DSH 直接安装成员。`dshmarket` 和 `dsh-find-plugin` 不在套件内，需要时可在「设置 → 关于」中单独安装。
 
 ## 一键安装
 
@@ -22,7 +22,7 @@
 ```powershell
 [Console]::OutputEncoding = [System.Text.Encoding]::UTF8
 $OutputEncoding = [System.Text.Encoding]::UTF8
-npx --yes @michengai/dsh-codex-suite@latest --profile web
+npx --yes @michengai/dsh-codex-suite-installer@latest --profile web
 ```
 
 安装器会：
@@ -39,7 +39,7 @@ npx --yes @michengai/dsh-codex-suite@latest --profile web
 保持同一个 `DSH_HOME`，只需换一个 profile 名：
 
 ```powershell
-npx --yes @michengai/dsh-codex-suite@latest --profile codex
+npx --yes @michengai/dsh-codex-suite-installer@latest --profile codex
 ```
 
 DSH 创建自定义 profile 时会提供 `@deepseek-ai/dsh-base`。安装器会再把 DSH 自带的 `@deepseek-ai/dsh-web-app` 放到六个成员 bundle 之前，不会创建独立 Home，也不会通过 npm 重装官方 Web 包。

package/package.json

@@ -1,22 +1,14 @@
 {
   "name": "@michengai/dsh-codex-suite",
-  "version": "0.1.14",
-  "description": "DSH Codex UI 一键安装器：将侧栏、专家、技能、归档、IM 助理和定时任务装为直接插件",
+  "version": "0.1.16",
+  "description": "DSH Codex UI 兼容聚合包：保留旧版 dsh plugin add 安装方式",
   "license": "Apache-2.0",
   "type": "module",
-  "engines": {
-    "node": ">=22"
-  },
   "files": [
-    "bin.mjs",
-    "installer.mjs",
     "cordis.patch.yml",
     "README.md",
     "README.zh-CN.md"
   ],
-  "bin": {
-    "dsh-codex-suite": "./bin.mjs"
-  },
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
@@ -32,6 +24,6 @@
     "@michengai/dsh-automation": "0.1.14",
     "@michengai/dsh-im-connect": "0.1.23",
     "@michengai/dsh-skills-manager": "0.1.24",
-    "@michengai/dsh-codex-ui": "0.2.82"
+    "@michengai/dsh-codex-ui": "0.2.84"
   }
 }

package/bin.mjs

@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-import { installSuite } from './installer.mjs'
-
-try {
-  installSuite()
-} catch (error) {
-  process.stderr.write(`dsh-codex-suite: ${error instanceof Error ? error.message : String(error)}\n`)
-  process.exitCode = 1
-}

package/installer.mjs

@@ -1,169 +0,0 @@
-import { spawnSync } from 'node:child_process'
-import { existsSync, readFileSync, writeFileSync } from 'node:fs'
-import { homedir } from 'node:os'
-import { resolve } from 'node:path'
-
-export const SUITE_PACKAGE = '@michengai/dsh-codex-suite'
-export const BASE_BUNDLE = '@deepseek-ai/dsh-base'
-export const WEB_BUNDLE = '@deepseek-ai/dsh-web-app'
-
-const suiteManifest = JSON.parse(readFileSync(new URL('./package.json', import.meta.url), 'utf8'))
-
-/** Keep the same layer order as the legacy aggregate patch. */
-export const MEMBER_PACKAGES = [
-  '@michengai/dsh-archive-manager',
-  '@michengai/dsh-codex-ui',
-  '@michengai/dsh-skills-manager',
-  '@michengai/dsh-agency-agents',
-  '@michengai/dsh-im-connect',
-  '@michengai/dsh-automation',
-]
-
-export function memberSpecs(manifest = suiteManifest) {
-  return MEMBER_PACKAGES.map((packageName) => {
-    let version = manifest.dependencies?.[packageName]
-    if (version?.startsWith('workspace:') === true && packageName === '@michengai/dsh-codex-ui') {
-      version = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url), 'utf8')).version
-    }
-    if (typeof version !== 'string' || version === '' || version.startsWith('workspace:')) {
-      throw new Error(`Suite manifest does not contain a published version for ${packageName}.`)
-    }
-    return `${packageName}@${version}`
-  })
-}
-
-export function parseArgs(argv) {
-  const options = {
-    profile: 'web',
-    registry: 'https://registry.npmjs.org/',
-    dryRun: false,
-    help: false,
-  }
-  for (let index = 0; index < argv.length; index += 1) {
-    const argument = argv[index]
-    if (argument === '--help' || argument === '-h') options.help = true
-    else if (argument === '--dry-run') options.dryRun = true
-    else if (argument === '--profile') options.profile = argv[++index]
-    else if (argument.startsWith('--profile=')) options.profile = argument.slice('--profile='.length)
-    else if (argument === '--registry') options.registry = argv[++index]
-    else if (argument.startsWith('--registry=')) options.registry = argument.slice('--registry='.length)
-    else throw new Error(`Unknown argument: ${argument}`)
-  }
-  if (typeof options.profile !== 'string' || !/^[0-9A-Za-z][0-9A-Za-z._-]*$/.test(options.profile) || options.profile === 'node_modules') {
-    throw new Error(`Invalid DSH profile name: ${JSON.stringify(options.profile)}`)
-  }
-  let registry
-  try {
-    registry = new URL(options.registry)
-  } catch {
-    throw new Error(`Invalid npm registry URL: ${JSON.stringify(options.registry)}`)
-  }
-  if (registry.protocol !== 'https:' && registry.protocol !== 'http:') throw new Error('npm registry must use HTTP or HTTPS.')
-  if (registry.username !== '' || registry.password !== '' || registry.search !== '' || registry.hash !== '' || !/^[0-9A-Za-z._~/-]*$/.test(registry.pathname)) {
-    throw new Error('npm registry URL contains unsupported characters.')
-  }
-  options.registry = registry.href
-  return options
-}
-
-export function profileDirectory(profile, env = process.env, home = homedir()) {
-  const dshHome = env.DSH_HOME === undefined || env.DSH_HOME === '' ? resolve(home, '.dsh') : resolve(env.DSH_HOME)
-  return resolve(dshHome, 'profiles', profile)
-}
-
-export function normalizeBundles(bundles = []) {
-  const managed = new Set([BASE_BUNDLE, WEB_BUNDLE, SUITE_PACKAGE, ...MEMBER_PACKAGES])
-  const unrelated = bundles.filter((name, index) => typeof name === 'string' && !managed.has(name) && bundles.indexOf(name) === index)
-  return [BASE_BUNDLE, WEB_BUNDLE, ...unrelated, ...MEMBER_PACKAGES]
-}
-
-export function allowRequiredBuilds(source) {
-  const eol = source.includes('\r\n') ? '\r\n' : '\n'
-  const lines = source.split(/\r?\n/)
-  const start = lines.findIndex(line => line === 'allowBuilds:')
-  if (start === -1) return `${source}${source === '' || source.endsWith('\n') ? '' : eol}allowBuilds:${eol}  protobufjs: false${eol}  koffi: false${eol}`
-  let end = start + 1
-  while (end < lines.length && (lines[end] === '' || /^\s/.test(lines[end]))) end += 1
-  const body = lines.slice(start + 1, end).filter(line => !/^\s{2}(?:protobufjs|koffi):/.test(line))
-  lines.splice(start + 1, end - start - 1, '  protobufjs: false', '  koffi: false', ...body)
-  return lines.join(eol)
-}
-
-export function directInstallArgs(profile, registry, manifest = suiteManifest) {
-  return ['plugin', '--profile', profile, 'add', ...memberSpecs(manifest), '--save-exact', `--registry=${registry}`]
-}
-
-export function helpText() {
-  return `Usage: dsh-codex-suite [options]\n\nInstall every Codex Suite member as a direct dependency of one DSH profile.\n\nOptions:\n  --profile <name>    target profile (default: web)\n  --registry <url>    npm registry (default: https://registry.npmjs.org/)\n  --dry-run           print commands without changing the profile\n  -h, --help          show this help\n`
-}
-
-function quote(argument) {
-  return /[\s"']/u.test(argument) ? JSON.stringify(argument) : argument
-}
-
-function runDsh(args, { dryRun = false, command = process.env.DSH_BIN || 'dsh' } = {}) {
-  process.stdout.write(`> dsh ${args.map(quote).join(' ')}\n`)
-  if (dryRun) return
-  const result = process.platform === 'win32'
-    ? spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', `call ${/\s/.test(command) ? `"${command.replaceAll('"', '""')}"` : command} ${args.join(' ')}`], { encoding: 'utf8', stdio: 'inherit', windowsHide: true })
-    : spawnSync(command, args, { encoding: 'utf8', stdio: 'inherit' })
-  if (result.error !== undefined) throw new Error(`Unable to run dsh: ${result.error.message}`)
-  if (result.status !== 0) throw new Error(`dsh exited with code ${result.status ?? 1}.`)
-}
-
-function readProfileManifest(path) {
-  return JSON.parse(readFileSync(path, 'utf8'))
-}
-
-function suiteDeclared(manifest) {
-  return manifest.dependencies?.[SUITE_PACKAGE] !== undefined
-    || manifest.devDependencies?.[SUITE_PACKAGE] !== undefined
-    || manifest.dsh?.profile?.bundles?.includes(SUITE_PACKAGE) === true
-}
-
-function legacyDirectPackages(manifest) {
-  const declared = { ...manifest.devDependencies, ...manifest.dependencies }
-  return [
-    ...(suiteDeclared(manifest) ? [SUITE_PACKAGE] : []),
-    ...(declared[WEB_BUNDLE] !== undefined ? [WEB_BUNDLE] : []),
-  ]
-}
-
-function writeNormalizedManifest(path) {
-  const manifest = readProfileManifest(path)
-  manifest.dsh ??= {}
-  manifest.dsh.profile ??= {}
-  manifest.dsh.profile.bundles = normalizeBundles(manifest.dsh.profile.bundles)
-  writeFileSync(path, `${JSON.stringify(manifest, undefined, 2)}\n`, 'utf8')
-}
-
-export function installSuite(argv = process.argv.slice(2)) {
-  const options = parseArgs(argv)
-  if (options.help) {
-    process.stdout.write(helpText())
-    return
-  }
-  const profilePath = profileDirectory(options.profile)
-  const manifestPath = resolve(profilePath, 'package.json')
-  const workspacePath = resolve(profilePath, 'pnpm-workspace.yaml')
-  if (!existsSync(manifestPath)) runDsh(['plugin', '--profile', options.profile, 'install', '--lockfile-only', '--ignore-scripts'], options)
-  if (options.dryRun) {
-    process.stdout.write(`> ensure protobufjs build scripts stay explicitly disabled in ${workspacePath}\n`)
-  } else {
-    const workspace = existsSync(workspacePath) ? readFileSync(workspacePath, 'utf8') : ''
-    const nextWorkspace = allowRequiredBuilds(workspace)
-    if (nextWorkspace !== workspace) writeFileSync(workspacePath, nextWorkspace, 'utf8')
-  }
-  runDsh(directInstallArgs(options.profile, options.registry), options)
-  if (options.dryRun) {
-    process.stdout.write(`> ensure ${WEB_BUNDLE} precedes the six member bundles in ${manifestPath}\n`)
-    process.stdout.write(`> remove legacy ${SUITE_PACKAGE} and redundant direct ${WEB_BUNDLE} dependencies when present\n`)
-    return
-  }
-  const installedManifest = readProfileManifest(manifestPath)
-  const legacyPackages = legacyDirectPackages(installedManifest)
-  if (legacyPackages.length > 0) runDsh(['plugin', '--profile', options.profile, 'remove', ...legacyPackages], options)
-  writeNormalizedManifest(manifestPath)
-  runDsh(['--profile', options.profile, '--dump-config'], options)
-  process.stdout.write(`\nCodex Suite members are direct plugins in profile ${options.profile}. Restart DSH and hard-refresh the browser.\n`)
-}