dsh-crossdesk 0.0.0-stage → 0.1.0

package/README.md

@@ -1,3 +1,23 @@
-# Temporary Holding Version
+# dsh-crossdesk
 
-This version is a temporary placeholder for this package. An operational version to replace this has been submitted for review and is awaiting a staged release.
+把 **DSH 的一个会话**共享到另一台设备，通过你自己部署的 relay 转发。两端的连接都是出站的，所以不需要 VPN、端口转发或同一局域网；执行始终留在会话原来那台机器上。
+
+完整说明见[根目录 README](../../README.md)。这里只放最短路径。
+
+```bash
+npm install -g dsh-crossdesk
+dsh-crossdesk enable                 # 改 profile、装依赖、写 patch（可重复执行）
+dsh-crossdesk status                 # 看当前状态
+dsh-crossdesk doctor --relay https://relay.example.com   # 连通性诊断
+dsh-crossdesk disable --remove-deps  # 彻底还原 profile
+```
+
+`enable` 只做三件事：往 profile 的 `package.json` 加依赖、装依赖、往 `cordis.patch.yml` 插一段带 `# >>> dsh-crossdesk` / `# <<< dsh-crossdesk` 标记的配置。它不修改 DSH 自身、不碰全局配置，`disable` 按标记整体移除。
+
+改完需要**重启 DSH**。之后在会话的分享入口填一次 relay 地址并完成浏览器登录授权（PKCE），凭据存在本机 `$DSH_HOME`，之后不用重复。
+
+要求：DSH `>= 0.2.2-rc.1 < 0.3`，Node `>= 22`（DSH 桌面端自带的 runtime 即可）。
+
+## License
+
+MIT

package/bin/cli.mjs

@@ -0,0 +1,248 @@
+#!/usr/bin/env node
+/**
+ * `dsh-crossdesk` — one command that turns a DSH profile into a publishable host, and checks the
+ * relay it will point at.
+ *
+ * It never patches DSH itself: it edits the profile's own dependency block and user patch file,
+ * which is the documented way to mount the shipped Liveshare owner bundle.
+ */
+import { existsSync } from 'node:fs'
+import { join } from 'node:path'
+import {
+  DEFAULT_LIVESHARE_VERSION,
+  LIVESHARE_PACKAGE,
+  addDependencies,
+  dshHome,
+  enablePatch,
+  inspectProfile,
+  installProfileDependencies,
+  machineSubject,
+  profileDir,
+  readProfileManifest,
+  readProfilePatch,
+  stripManagedBlock,
+  writeProfileManifest,
+  writeProfilePatch,
+} from '../src/profile.mjs'
+
+const HELP = `dsh-crossdesk — share one DeepSeek Harness session with another device
+
+Usage
+  dsh-crossdesk enable  [--profile desktop] [--relay <url>] [--no-install] [--dry-run]
+  dsh-crossdesk disable [--profile desktop] [--remove-deps]
+  dsh-crossdesk status  [--profile desktop]
+  dsh-crossdesk doctor  [--profile desktop] [--relay <url>]
+  dsh-crossdesk relay   [relay flags...]        (runs the bundled relay)
+
+What enable does
+  1. adds ${LIVESHARE_PACKAGE}@${DEFAULT_LIVESHARE_VERSION} to the profile's dependencies
+  2. installs it in the profile with pnpm (or npm)
+  3. inserts the bundle's two loader entries into the profile's cordis.patch.yml
+
+Then restart DeepSeek Harness, open a session's share action, and enter your relay URL once.
+`
+
+const args = process.argv.slice(2)
+const command = args[0] ?? 'help'
+const flags = parseFlags(args.slice(1))
+
+main().catch((error) => {
+  console.error(`dsh-crossdesk: ${error instanceof Error ? error.message : String(error)}`)
+  process.exitCode = 1
+})
+
+async function main() {
+  switch (command) {
+    case 'enable':
+      await enable()
+      return
+    case 'disable':
+      await disable()
+      return
+    case 'status':
+      await status()
+      return
+    case 'doctor':
+      await doctor()
+      return
+    case 'relay': {
+      process.argv = [process.argv[0], 'dsh-crossdesk-relay', ...args.slice(1)]
+      // Installed layout: the relay is a dependency. Repo layout: it sits next door in the workspace.
+      try {
+        await import('dsh-crossdesk-relay/bin/relay.mjs')
+      } catch (error) {
+        if (error?.code !== 'ERR_MODULE_NOT_FOUND' && error?.code !== 'MODULE_NOT_FOUND') throw error
+        await import('../../relay/bin/relay.mjs')
+      }
+      return
+    }
+    case 'help':
+    case '--help':
+    case '-h':
+      process.stdout.write(HELP)
+      return
+    case 'version':
+    case '--version':
+    case '-V': {
+      const { readFile } = await import('node:fs/promises')
+      const raw = await readFile(new URL('../package.json', import.meta.url), 'utf8')
+      process.stdout.write(`${JSON.parse(raw).version}\n`)
+      return
+    }
+    default:
+      process.stderr.write(`unknown command: ${command}\n\n${HELP}`)
+      process.exitCode = 1
+  }
+}
+
+async function enable() {
+  const profile = flags.profile ?? 'desktop'
+  const dir = profileDir(profile)
+  if (!existsSync(dir)) {
+    throw new Error(`profile ${profile} not found at ${dir}; start DeepSeek Harness once so it creates the profile, or pass --profile`)
+  }
+
+  const { manifest } = await readProfileManifest(profile)
+  const next = addDependencies(manifest, flags['liveshare-version'] ?? DEFAULT_LIVESHARE_VERSION)
+  const depsChanged = JSON.stringify(next.dependencies) !== JSON.stringify(manifest.dependencies)
+  if (depsChanged) {
+    if (flags['dry-run'] !== true) await writeProfileManifest(profile, next)
+    console.log(`dependencies  ${depsChanged ? 'updated' : 'already declared'} in ${profile}/package.json`)
+  }
+
+  if (flags['no-install'] !== true) {
+    const outcome = await installProfileDependencies(profile, { dryRun: flags['dry-run'] === true })
+    console.log(`install       ${outcome.ran ? outcome.command : `would run ${outcome.command}`}`)
+  } else {
+    console.log('install       skipped (--no-install)')
+  }
+
+  const { file, text } = await readProfilePatch(profile)
+  const patched = enablePatch(text, { subject: flags.subject ?? machineSubject() })
+  if (patched.changed && flags['dry-run'] !== true) await writeProfilePatch(profile, patched.after)
+  console.log(`patch         ${patched.changed ? 'inserted managed block' : 'already present'} in ${file}`)
+
+  const relay = flags.relay ?? '<your relay URL>'
+  console.log(
+    [
+      '',
+      'Next:',
+      `  1. restart DeepSeek Harness (profile: ${profile})`,
+      `  2. open a session → share action → relay URL: ${relay}`,
+      '  3. sign in once in the popup; the host stores the relay credential',
+      '  4. on the other device, open the share link and sign in to the same relay',
+      '',
+      'Docs: https://github.com/vector985/dsh-crossdesk#readme',
+    ].join('\n'),
+  )
+}
+
+async function disable() {
+  const profile = flags.profile ?? 'desktop'
+  const { file, text } = await readProfilePatch(profile)
+  const stripped = stripManagedBlock(text)
+  await writeProfilePatch(profile, stripped)
+  console.log(`patch         managed block removed from ${file}`)
+  if (flags['remove-deps'] === true) {
+    const { manifest } = await readProfileManifest(profile)
+    if (manifest.dependencies !== undefined) {
+      delete manifest.dependencies[LIVESHARE_PACKAGE]
+      delete manifest.dependencies['@deepseek-ai/dsh-experimental-liveshare-protocol']
+      await writeProfileManifest(profile, manifest)
+      console.log('dependencies  removed')
+    }
+  }
+  console.log('\nRestart DeepSeek Harness to drop the share surface.')
+}
+
+async function status() {
+  const profile = flags.profile ?? 'desktop'
+  const state = await inspectProfile(profile)
+  const row = (label, value) => `  ${label.padEnd(14)} ${value}`
+  console.log(
+    [
+      `profile ${profile}`,
+      row('home', state.home),
+      row('directory', state.dir),
+      row('declared', state.declared ? 'yes' : 'no'),
+      row('installed', state.installed ? 'yes' : 'no'),
+      row('patch entry', state.patchHasEntry ? 'yes' : 'no'),
+      row('managed block', state.patchHasBlock ? 'yes' : 'no'),
+      '',
+      state.declared && state.installed && state.patchHasEntry
+        ? 'Ready: restart DeepSeek Harness, then use the session share action.'
+        : `Not ready: run dsh-crossdesk enable --profile ${profile}`,
+    ].join('\n'),
+  )
+}
+
+async function doctor() {
+  const profile = flags.profile ?? 'desktop'
+  const state = await inspectProfile(profile)
+  const checks = []
+  checks.push(['node >= 22', Number(process.versions.node.split('.')[0]) >= 22, process.versions.node])
+  checks.push(['profile exists', existsSync(state.dir), state.dir])
+  checks.push(['bundle declared', state.declared, `${LIVESHARE_PACKAGE}`])
+  checks.push(['bundle installed', state.installed, state.installed ? 'node_modules present' : 'run enable'])
+  checks.push(['patch entry', state.patchHasEntry, state.patchFile])
+
+  const relay = flags.relay ?? process.env.CROSSDESK_RELAY
+  if (relay !== undefined && relay !== '') {
+    checks.push(...(await relayChecks(relay)))
+  } else {
+    checks.push(['relay url', false, 'pass --relay <url> or set CROSSDESK_RELAY'])
+  }
+
+  const width = Math.max(...checks.map(([name]) => name.length))
+  for (const [name, ok, detail] of checks) {
+    console.log(`  ${ok ? 'ok  ' : 'FAIL'}  ${name.padEnd(width)}  ${detail}`)
+  }
+  const failed = checks.filter(([, ok]) => !ok).length
+  console.log(failed === 0 ? '\nAll checks passed.' : `\n${failed} check(s) need attention.`)
+  if (failed > 0) process.exitCode = 1
+}
+
+async function relayChecks(relay) {
+  const base = relay.replace(/\/+$/, '')
+  const out = []
+  try {
+    const health = await fetch(`${base}/__liveshare/health`, { signal: AbortSignal.timeout(8000) })
+    const body = await health.json().catch(() => ({}))
+    out.push(['relay health', health.ok === true, `${health.status} protocol ${body.protocolVersion ?? '?'}`])
+  } catch (error) {
+    out.push(['relay health', false, `unreachable: ${error instanceof Error ? error.message : String(error)}`])
+    return out
+  }
+  try {
+    const probe = await fetch(`${base}/__liveshare/owner-credential`, { signal: AbortSignal.timeout(8000) })
+    const body = await probe.json().catch(() => ({}))
+    out.push(['relay credentials', body.supported === true, body.supported === true ? 'supported' : 'relay is too old'])
+  } catch (error) {
+    out.push(['relay credentials', false, `probe failed: ${error instanceof Error ? error.message : String(error)}`])
+  }
+  return out
+}
+
+function parseFlags(argv) {
+  const out = {}
+  for (let i = 0; i < argv.length; i += 1) {
+    const arg = argv[i]
+    if (!arg.startsWith('--')) continue
+    const eq = arg.indexOf('=')
+    if (eq !== -1) {
+      out[arg.slice(2, eq)] = coerce(arg.slice(eq + 1))
+    } else if (i + 1 < argv.length && !argv[i + 1].startsWith('--')) {
+      out[arg.slice(2)] = coerce(argv[i + 1])
+      i += 1
+    } else {
+      out[arg.slice(2)] = true
+    }
+  }
+  return out
+}
+
+function coerce(value) {
+  if (value === 'true') return true
+  if (value === 'false') return false
+  return value
+}

package/package.json

@@ -1,6 +1,25 @@
 {
   "name": "dsh-crossdesk",
-  "version": "0.0.0-stage",
-  "stub": true,
-  "description": "Temporary package placeholder for staged publishing"
+  "version": "0.1.0",
+  "description": "Share one DeepSeek Harness session with another device through your own relay: no VPN, no port forwarding, no source patches.",
+  "type": "module",
+  "license": "MIT",
+  "main": "src/profile.mjs",
+  "bin": {
+    "dsh-crossdesk": "bin/cli.mjs"
+  },
+  "files": [
+    "bin",
+    "src",
+    "README.md"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "dependencies": {
+    "dsh-crossdesk-relay": "0.1.0"
+  },
+  "scripts": {
+    "test": "node --test test/*.test.mjs"
+  }
 }

package/src/profile.mjs

@@ -0,0 +1,168 @@
+/**
+ * Profile surgery for `dsh-crossdesk enable`: install the shipped Liveshare owner bundle into a DSH
+ * profile and insert its two loader entries into that profile's user patch file.
+ *
+ * The relay is ours; the host half is the bundle DSH already ships. This module only edits the
+ * profile layer, which is exactly what the bundle's README documents, so nothing here can drift
+ * from the host's own wiring.
+ */
+import { execFile } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import { readFile, writeFile } from 'node:fs/promises'
+import { homedir, hostname, userInfo } from 'node:os'
+import { join } from 'node:path'
+import { promisify } from 'node:util'
+import { createHash } from 'node:crypto'
+
+const run = promisify(execFile)
+
+export const LIVESHARE_PACKAGE = '@deepseek-ai/dsh-experimental-liveshare'
+export const LIVESHARE_PROTOCOL_PACKAGE = '@deepseek-ai/dsh-experimental-liveshare-protocol'
+export const DEFAULT_LIVESHARE_VERSION = '0.2.2-rc.1'
+
+const MARK_START = '# >>> dsh-crossdesk: managed block, edit above or below this pair >>>'
+const MARK_END = '# <<< dsh-crossdesk <<<'
+
+export function dshHome() {
+  return process.env.DSH_HOME ?? join(homedir(), '.dsh')
+}
+
+export function profileDir(name = 'desktop') {
+  return join(dshHome(), 'profiles', name)
+}
+
+/** A stable, non-secret subject for this machine, so one install keeps one identity. */
+export function machineSubject() {
+  const name = safeHostname()
+  return `host-${createHash('sha256').update(`${name}:${safeUser()}`).digest('hex').slice(0, 12)}`
+}
+
+function safeHostname() {
+  try {
+    return hostname()
+  } catch {
+    return 'dsh-host'
+  }
+}
+
+function safeUser() {
+  try {
+    return userInfo().username
+  } catch {
+    return 'user'
+  }
+}
+
+/** The two loader entries, mirroring the bundle's own patch with literal values. */
+export function managedPatchBlock({ subject = machineSubject(), displayName = safeHostname(), allowedSubjectIds = [] } = {}) {
+  return [
+    MARK_START,
+    '- insert:',
+    '    - id: liveshare-viewer-declarations',
+    `      name: '${LIVESHARE_PACKAGE}/viewer-declarations'`,
+    '    - id: liveshare-share-host',
+    `      name: '${LIVESHARE_PACKAGE}'`,
+    '      config:',
+    '        ownerIdentityProvider: crossdesk',
+    '        ownerIdentityTenant: default',
+    `        ownerIdentitySubject: '${subject}'`,
+    `        ownerIdentityDisplayName: '${displayName}'`,
+    `        allowedSubjectIds: [${allowedSubjectIds.map((value) => `'${value}'`).join(', ')}]`,
+    MARK_END,
+    '',
+  ].join('\n')
+}
+
+export function stripManagedBlock(text) {
+  const lines = text.split('\n')
+  const start = lines.findIndex((line) => line.trim() === MARK_START)
+  if (start === -1) return text
+  const end = lines.findIndex((line, index) => index > start && line.trim() === MARK_END)
+  if (end === -1) return lines.slice(0, start).join('\n')
+  const kept = [...lines.slice(0, start), ...lines.slice(end + 1)]
+  return kept.join('\n').replace(/\n{3,}/gu, '\n\n')
+}
+
+/** @returns {{before: string, after: string, changed: boolean}} */
+export function enablePatch(text, options = {}) {
+  const original = text ?? ''
+  const clean = stripManagedBlock(original).replace(/\s+$/u, '')
+  const after = clean === '' ? managedPatchBlock(options) : `${clean}\n\n${managedPatchBlock(options)}`
+  return { before: clean, after, changed: after !== original }
+}
+
+export async function readProfilePatch(name) {
+  const file = join(profileDir(name), 'cordis.patch.yml')
+  return { file, text: existsSync(file) ? await readFile(file, 'utf8') : '' }
+}
+
+export async function writeProfilePatch(name, text) {
+  const file = join(profileDir(name), 'cordis.patch.yml')
+  await writeFile(file, text, 'utf8')
+  return file
+}
+
+/** Add the bundle to the profile's dependency block without reformatting the rest of the file. */
+export function addDependencies(manifest, version = DEFAULT_LIVESHARE_VERSION) {
+  const next = structuredClone(manifest)
+  next.dependencies = next.dependencies ?? {}
+  next.dependencies[LIVESHARE_PACKAGE] = version
+  next.dependencies[LIVESHARE_PROTOCOL_PACKAGE] = version
+  return next
+}
+
+export async function readProfileManifest(name) {
+  const file = join(profileDir(name), 'package.json')
+  if (!existsSync(file)) {
+    return { file, manifest: { name: `dsh-profile-${name}`, private: true, type: 'module', dependencies: {} } }
+  }
+  return { file, manifest: JSON.parse(await readFile(file, 'utf8')) }
+}
+
+export async function writeProfileManifest(name, manifest) {
+  const file = join(profileDir(name), 'package.json')
+  await writeFile(file, `${JSON.stringify(manifest, null, 2)}\n`, 'utf8')
+  return file
+}
+
+/** Run the profile's package manager; returns a description of what ran. */
+export async function installProfileDependencies(name, { dryRun = false } = {}) {
+  const dir = profileDir(name)
+  if (!existsSync(dir)) throw new Error(`profile directory not found: ${dir}`)
+  const manager = await detectPackageManager(dir)
+  if (dryRun) return { manager, command: `${manager} install`, ran: false }
+  const args = manager === 'pnpm' ? ['install'] : ['install', '--no-audit', '--no-fund']
+  await run(manager, args, { cwd: dir, shell: process.platform === 'win32', windowsHide: true, timeout: 10 * 60_000 })
+  return { manager, command: `${manager} ${args.join(' ')}`, ran: true }
+}
+
+async function detectPackageManager(dir) {
+  for (const candidate of ['pnpm', 'npm']) {
+    try {
+      await run(candidate, ['--version'], { shell: process.platform === 'win32', windowsHide: true, timeout: 30_000 })
+      return candidate
+    } catch {
+      /* try the next one */
+    }
+  }
+  throw new Error(`no package manager found for ${dir}; install ${LIVESHARE_PACKAGE} manually`)
+}
+
+/** Everything `status`/`doctor` reports about one profile. */
+export async function inspectProfile(name = 'desktop') {
+  const { file: patchFile, text } = await readProfilePatch(name)
+  const { file: manifestFile, manifest } = await readProfileManifest(name)
+  const installed = existsSync(join(profileDir(name), 'node_modules', LIVESHARE_PACKAGE, 'package.json'))
+  return {
+    profile: name,
+    home: dshHome(),
+    dir: profileDir(name),
+    patchFile,
+    manifestFile,
+    patchHasEntry: text.includes('liveshare-share-host'),
+    patchHasBlock: text.includes(MARK_START),
+    declared: Boolean(manifest.dependencies?.[LIVESHARE_PACKAGE]),
+    installed,
+    manifest,
+  }
+}