@tiphareth/dsh-hardssh 0.1.2 → 0.2.3

package/package.json

@@ -1,8 +1,17 @@
 {
   "name": "@tiphareth/dsh-hardssh",
-  "description": "Generic workspace base for the dsh harness (local + remote workspace providers with per-workspace routing), with SSH as one concrete provider: enter SSH mode from the session header, browse/edit remote files in a new left panel, let the local harness operate the remote server through remote_* agent tools, and manage hosts through the ssh_* tools and the SSH panel (legacy dsh-ssh merged in).",
-  "version": "0.1.2",
+  "description": "Generic workspace base for the dsh harness (local + remote workspace providers with per-workspace routing), with SSH as one concrete provider: bind a server directory as an SSH workspace so the session's file I/O and commands run on that host, manage hosts and workspaces in the GUI, and operate remote servers through the ssh_* / remote_* agent tools",
+  "version": "0.2.3",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tiphareth0/dsh-hardssh.git",
+    "directory": "packages/dsh-hardssh"
+  },
+  "homepage": "https://github.com/tiphareth0/dsh-hardssh",
+  "bugs": {
+    "url": "https://github.com/tiphareth0/dsh-hardssh/issues"
+  },
   "keywords": [
     "dsh",
     "deepseek-harness",
@@ -17,6 +26,9 @@
   },
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
+  "bin": {
+    "dsh-hardssh-export-legacy": "./scripts/export-legacy-workspaces.mjs"
+  },
   "exports": {
     ".": {
       "types": "./lib/types/index.d.ts",
@@ -30,6 +42,14 @@
       "types": "./lib/types/subprocess.d.ts",
       "default": "./lib/subprocess.js"
     },
+    "./workspace": {
+      "types": "./lib/types/workspace.d.ts",
+      "default": "./lib/workspace.js"
+    },
+    "./base": {
+      "types": "./lib/types/base/index.d.ts",
+      "default": "./lib/base/index.js"
+    },
     "./client": {
       "types": "./lib/types/client/index.d.ts",
       "default": "./lib/client.js"
@@ -45,17 +65,22 @@
       "inject": [
         "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-client-ui-sidebar-right",
         "@deepseek-ai/dsh-client-ui-settings"
       ],
       "platform": "web"
     }
   },
   "scripts": {
-    "build": "tsc -b && tsdown",
+    "clean": "node ./scripts/clean-build.mjs",
+    "build": "pnpm run clean && tsc -b && tsdown",
     "bundle": "tsdown",
     "watch": "tsdown --watch",
     "typecheck": "tsc -b --pretty false",
-    "test": "vitest run",
+    "test": "vitest run --exclude tests/ssh/vault.test.ts",
+    "test:all": "vitest run",
+    "test:vault": "vitest run tests/ssh/vault.test.ts",
+    "workspace:export-legacy": "node ./scripts/export-legacy-workspaces.mjs",
     "prepare": "tsdown"
   },
   "dependencies": {
@@ -66,22 +91,25 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-client-connection": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-locale": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-runtime": "^0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-fs": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-fs-sandbox": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-host-webserver": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-connection": "*",
+    "@deepseek-ai/dsh-client-locale": "*",
+    "@deepseek-ai/dsh-client-runtime": "*",
+    "@deepseek-ai/dsh-client-ui-settings": "*",
+    "@deepseek-ai/dsh-client-ui-sidebar": "*",
+    "@deepseek-ai/dsh-client-ui-sidebar-right": "*",
+    "@deepseek-ai/dsh-client-ui-slots": "*",
+    "@deepseek-ai/dsh-client-ui-layout": "*",
+    "@deepseek-ai/dsh-fs": "*",
+    "@deepseek-ai/dsh-fs-local": "*",
+    "@deepseek-ai/dsh-fs-sandbox": "*",
+    "@deepseek-ai/dsh-host-webserver": "*",
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@deepseek-ai/dsh-settings": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-subprocess": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-subprocess-local": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-system-prompt": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-timeout": "^0.1.2-alpha.3",
-    "@deepseek-ai/dsh-tools": "^0.1.2-alpha.3",
+    "@deepseek-ai/dsh-settings": "*",
+    "@deepseek-ai/dsh-subprocess": "*",
+    "@deepseek-ai/dsh-subprocess-local": "*",
+    "@deepseek-ai/dsh-system-prompt": "*",
+    "@deepseek-ai/dsh-timeout": "*",
+    "@deepseek-ai/dsh-tools": "*",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -90,11 +118,13 @@
     "@deepseek-ai/dsh-client-connection": "0.1.2-alpha.3",
     "@deepseek-ai/dsh-client-locale": "0.1.2-alpha.3",
     "@deepseek-ai/dsh-client-runtime": "0.1.1-rc.2",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-settings": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.2-alpha.3",
-    "@deepseek-ai/dsh-client-ui-workspace": "0.1.2-alpha.3",
+    "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-layout": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-sidebar-right": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "0.1.5-rc.1",
+    "@deepseek-ai/dsh-client-ui-workspace": "0.1.5-rc.1",
     "@deepseek-ai/dsh-fs": "0.1.2-alpha.3",
     "@deepseek-ai/dsh-fs-local": "0.1.2-alpha.3",
     "@deepseek-ai/dsh-fs-sandbox": "0.1.2-alpha.3",
@@ -125,10 +155,13 @@
   },
   "files": [
     "lib/*.js",
+    "lib/base/*.js",
     "lib/types/**/*.d.ts",
     "src",
+    "scripts/export-legacy-workspaces.mjs",
     "cordis.patch.yml",
-    "README.md"
+    "README.md",
+    "SKILLS.md"
   ],
   "license": "BSD-3-Clause"
-}
+}

package/scripts/export-legacy-workspaces.mjs

@@ -0,0 +1,136 @@
+#!/usr/bin/env node
+
+/**
+ * Offline emergency export: convert the authoritative generic workspace ledger
+ * back to the frozen legacy SSH ledger shape. This command never changes
+ * anchors and defaults to preview-only; pass --apply to write the legacy file.
+ */
+import { constants } from 'node:fs'
+import { access, mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { homedir } from 'node:os'
+import { dirname, join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+import { randomUUID } from 'node:crypto'
+
+function parseArgs(argv) {
+  const result = {
+    genericPath: join(homedir(), '.dsh', 'workspaces', 'index.v1.json'),
+    legacyPath: join(homedir(), '.dsh', 'dsh-hardssh-workspaces.json'),
+    apply: false,
+  }
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index]
+    if (arg === '--apply') {
+      result.apply = true
+    } else if (arg === '--generic' || arg === '--legacy') {
+      const value = argv[index + 1]
+      if (value === undefined || value === '') throw new Error(`${arg} requires a path`)
+      if (arg === '--generic') result.genericPath = value
+      else result.legacyPath = value
+      index += 1
+    } else if (arg === '--help' || arg === '-h') {
+      process.stdout.write('Usage: export-legacy-workspaces [--generic PATH] [--legacy PATH] [--apply]\n')
+      process.exit(0)
+    } else {
+      throw new Error(`unknown argument '${arg}'`)
+    }
+  }
+  return result
+}
+
+function requiredString(value, label) {
+  if (typeof value !== 'string' || value === '') throw new Error(`invalid generic SSH workspace: ${label} is required`)
+  return value
+}
+
+function toLegacyRecord(value) {
+  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+    throw new Error('generic workspace entries must be objects')
+  }
+  const provider = value.provider
+  const location = value.location
+  const anchor = value.anchor
+  if (typeof provider !== 'object' || provider === null || Array.isArray(provider)) throw new Error('generic workspace provider is invalid')
+  if (provider.id !== 'ssh') return undefined
+  if (typeof provider.connectionRef !== 'object' || provider.connectionRef === null || Array.isArray(provider.connectionRef)) {
+    throw new Error(`generic SSH workspace '${String(value.id)}' has no connectionRef`)
+  }
+  if (typeof location !== 'object' || location === null || Array.isArray(location)) throw new Error(`generic SSH workspace '${String(value.id)}' has no location`)
+  if (typeof anchor !== 'object' || anchor === null || Array.isArray(anchor)) throw new Error(`generic SSH workspace '${String(value.id)}' has no anchor`)
+  return {
+    id: requiredString(value.id, 'id'),
+    title: requiredString(value.title, 'title'),
+    alias: requiredString(provider.connectionRef.id, 'provider.connectionRef.id'),
+    remoteRoot: requiredString(location.root, 'location.root'),
+    anchorPath: requiredString(anchor.path, 'anchor.path'),
+    createdAt: requiredString(value.createdAt, 'createdAt'),
+  }
+}
+
+async function exists(path) {
+  try {
+    await access(path, constants.F_OK)
+    return true
+  } catch {
+    return false
+  }
+}
+
+async function atomicExport(path, bytes) {
+  await mkdir(dirname(path), { recursive: true })
+  const tempPath = `${path}.tmp-${process.pid}-${randomUUID()}`
+  const backupPath = await exists(path)
+    ? `${path}.backup-${new Date().toISOString().replace(/[:.]/g, '-')}-${randomUUID()}`
+    : undefined
+  await writeFile(tempPath, bytes, { encoding: 'utf8', mode: 0o600 })
+  try {
+    if (backupPath !== undefined) await rename(path, backupPath)
+    try {
+      await rename(tempPath, path)
+    } catch (error) {
+      if (backupPath !== undefined) await rename(backupPath, path).catch(() => undefined)
+      throw error
+    }
+  } finally {
+    await rm(tempPath, { force: true }).catch(() => undefined)
+  }
+  return backupPath
+}
+
+export async function exportLegacyWorkspaces(options) {
+  const raw = JSON.parse(await readFile(options.genericPath, 'utf8'))
+  if (!Array.isArray(raw)) throw new Error('generic workspace ledger must be a JSON array')
+  const records = []
+  const ids = new Set()
+  const anchors = new Set()
+  for (const value of raw) {
+    const mapped = toLegacyRecord(value)
+    if (mapped === undefined) continue
+    if (ids.has(mapped.id)) throw new Error(`duplicate SSH workspace id '${mapped.id}'`)
+    if (anchors.has(mapped.anchorPath)) throw new Error(`duplicate SSH workspace anchor '${mapped.anchorPath}'`)
+    ids.add(mapped.id)
+    anchors.add(mapped.anchorPath)
+    records.push(mapped)
+  }
+  const bytes = `${JSON.stringify(records, null, 2)}\n`
+  const backupPath = options.apply ? await atomicExport(options.legacyPath, bytes) : undefined
+  return {
+    mode: options.apply ? 'applied' : 'preview',
+    genericPath: options.genericPath,
+    legacyPath: options.legacyPath,
+    recordCount: records.length,
+    ids: records.map(record => record.id),
+    ...(backupPath === undefined ? {} : { backupPath }),
+  }
+}
+
+const isMain = process.argv[1] !== undefined && import.meta.url === pathToFileURL(process.argv[1]).href
+if (isMain) {
+  exportLegacyWorkspaces(parseArgs(process.argv.slice(2))).then(
+    result => { process.stdout.write(`${JSON.stringify(result)}\n`) },
+    error => {
+      process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`)
+      process.exitCode = 1
+    },
+  )
+}