@wwkit/opm 1.0.18 → 1.0.20

package/src/tools/share/index.js

@@ -1,12 +1,12 @@
 /**
  * opm share 命令组 — 文本分享服务
  *
- * 命令：upload / zip / get / view / open / list / delete / clear / config / server / help
+ * 命令：upload / zip / get / unzip / sync / open / list / delete / clear / config / server / help
  * 服务地址由 config.share.server.active 解析（不支持命令行 -s 参数）。
  * 需要服务调用的命令执行前先 ping 验证可达性；
  * 若 active=local 且服务未启动，自动后台启动后再执行。
  * server 子命令：start（后台启动）/ stop（停止）/ status（查询状态）。
- * zip 上传文件/文件夹（压缩为 zip 后 base64 上传），get -d 下载并解压。
+ * 未设 -i 时 id 默认 opm_share（临时槽，下次无 -i 上传即覆盖）；zip 上传后用 unzip/sync 取回。
  */
 
 import fs from 'node:fs'
@@ -14,23 +14,46 @@ import path from 'node:path'
 import os from 'node:os'
 import { spawn, spawnSync } from 'node:child_process'
 import { parseFlags } from '../../cli/helpers/args.js'
+import { JSON5 } from '@wwkit/shared'
 import { getConfig, getSection, getUserConfigDir } from '../../config.js'
 import { output } from '../../formatter.js'
-import { getShareServer, pingServer, uploadShare, getShare, getLatestShare, getHtmlUrl, listShares, deleteShare, clearShares } from './client.js'
+import { getShareServer, pingServer, uploadShare, getShare, getHtmlUrl, listShares, deleteShare, clearShares } from './client.js'
 import { startServer } from './server.js'
+import { readClipboard, writeClipboard } from '../clipboard.js'
 
 const DEFAULT_PASSWORD = '0000'
 const ZIP_TMP_PREFIX = 'opm-share-'
+const CLIPBOARD_ID = 'clipboard'
+const DEFAULT_TEMP_ID = 'opm_share'
 
 /**
- * 生成默认标题（内容前 30 字符折叠空白 + ...，≤30 用原文）
+ * 将 content 美化为可读字符串：若为 JSON5 可解析文本则返回 2 空格缩进的 JSON，否则原样返回
+ * 用于默认输出（直接打印到 stdout，保留真实换行）
  * @param {string} content
  * @returns {string}
  */
-function defaultTitle(content) {
-  const folded = content.replace(/\s+/g, ' ').trim()
-  if (folded.length <= 30) return folded
-  return folded.slice(0, 30) + '...'
+function formatContent(content) {
+  if (typeof content !== 'string' || !content.trim()) return content || ''
+  try {
+    return JSON.stringify(JSON5.parse(content), null, 2)
+  } catch {
+    return content
+  }
+}
+
+/**
+ * 将 content 解析为结构化值：若为 JSON5 可解析则返回解析后的对象/数组，否则返回原字符串
+ * 用于 --detail 模式，使 JSON content 在 dict 中以嵌套结构显示而非转义字符串
+ * @param {string} content
+ * @returns {*}
+ */
+function parseContentJson(content) {
+  if (typeof content !== 'string' || !content.trim()) return content
+  try {
+    return JSON5.parse(content)
+  } catch {
+    return content
+  }
 }
 
 /**
@@ -45,6 +68,25 @@ function expandTilde(p) {
   return p
 }
 
+/**
+ * 计算跨系统可还原的 sourcePath：保留 ~ 锚点
+ *  - 入参以 ~/ 开头（用户引号保留）→ 原样
+ *  - 解析后绝对路径落在 home 下 → 反推 ~
+ *  - home 之外（绝对/相对）→ 存绝对路径（无 ~ 锚点，sync 回退默认目录）
+ * @param {string} inputPath - 原始入参
+ * @param {string} resolved - path.resolve 后的绝对路径
+ * @returns {string}
+ */
+function tildefy(inputPath, resolved) {
+  if (inputPath.startsWith('~/')) return inputPath
+  const home = os.homedir()
+  if (home && resolved.startsWith(home)) {
+    const rest = resolved.slice(home.length)
+    return '~' + rest
+  }
+  return resolved
+}
+
 /**
  * 浏览器打开 URL
  * @param {string} url
@@ -102,16 +144,19 @@ function isProcessAlive(pid) {
 }
 
 const ACTIONS = {
-  upload: { desc: 'Upload text content (positional, -f file, or stdin; -i for custom id)' },
-  zip:    { desc: 'Upload file/folder as compressed zip (get -d to extract; -i for custom id)' },
-  get:    { desc: 'Get shared content (id optional; defaults to latest; -d to extract zip)' },
-  view:   { desc: 'View shared content (id optional; defaults to latest)' },
-  open:   { desc: 'Open shared content in browser (id optional; defaults to latest)' },
+  upload: { desc: 'Upload text (positional string OR existing file path, auto-detected; -f file; stdin; -i for custom id; default id=opm_share)' },
+  zip:    { desc: 'Upload file/folder as zip (preserves ~ -anchored sourcePath; -i for custom id; default id=opm_share)' },
+  get:    { desc: 'Get text content (id optional; defaults to opm_share; --detail for full dict; -o file to save)' },
+  unzip:  { desc: 'Download and extract a zip share <id> (dir optional, default ~/.config/opm/share/<id>/; --dry-run to preview)' },
+  sync:   { desc: 'Sync a zip share <id> to its original ~ -anchored path (--dry-run to preview; fallback to default dir)' },
+  open:   { desc: 'Open shared content in browser (id optional; defaults to opm_share)' },
   list:   { desc: 'List recent shares (-n count, default 10)' },
   delete: { desc: 'Delete a share by id' },
-  clear:  { desc: 'Clean up shares by days and/or keep count' },
+  clear:  { desc: 'Keep shares by days and/or count (--days n keeps last n days, --keep n keeps n most recent)' },
   config: { desc: 'Show current share config section' },
   server:  { desc: 'Manage local server (start/stop/status)' },
+  copy:   { desc: 'Copy system clipboard to server (id=clipboard; skips when clipboard is empty)' },
+  paste:  { desc: 'Fetch server clipboard (id=clipboard) back into system clipboard and print' },
   help:   { desc: 'Show this help' },
 }
 
@@ -129,7 +174,7 @@ export class ShareGroup {
       return
     }
 
-    const parsed = parseFlags(rest)
+    const parsed = parseFlags(rest, { booleans: ['detail'] })
 
     switch (action) {
       case 'upload':
@@ -138,8 +183,10 @@ export class ShareGroup {
         return this._zip(parsed)
       case 'get':
         return this._get(parsed)
-      case 'view':
-        return this._view(parsed)
+      case 'unzip':
+        return this._unzip(parsed)
+      case 'sync':
+        return this._sync(parsed)
       case 'open':
         return this._open(parsed)
       case 'list':
@@ -152,6 +199,10 @@ export class ShareGroup {
         return this._config(parsed)
       case 'server':
         return this._server(parsed)
+      case 'copy':
+        return this._copy(parsed)
+      case 'paste':
+        return this._paste(parsed)
       default:
         return this._upload(parseFlags([action, ...rest]))
     }
@@ -182,17 +233,18 @@ export class ShareGroup {
   }
 
   /**
-   * 解析密码：-p/--password 参数 > 配置 share.password > 位置参数（get/open）> 默认 0000
+   * 解析密码：-p/--password 参数 > 位置参数（get/open）> 配置 share.password > 默认 0000
    * @param {object} parsed - parseFlags 结果
    * @param {string} [positional] - 位置参数密码（get/open 的第二个位置参数）
    * @returns {string}
    */
   _resolvePassword(parsed, positional = '') {
-    const flag = parsed.flags.p || parsed.flags.password || ''
+    const flag = parsed.flags.password || parsed.flags.p || ''
     if (flag && flag !== 'true') return flag
+    if (positional) return positional
     const cfgPassword = this._getShareConfig().password
     if (cfgPassword) return cfgPassword
-    return positional || DEFAULT_PASSWORD
+    return DEFAULT_PASSWORD
   }
 
   /**
@@ -233,9 +285,8 @@ export class ShareGroup {
   }
 
   async _upload(parsed) {
-    const title = parsed.flags.t || parsed.flags.title || ''
-    const file = parsed.flags.f || parsed.flags.file || ''
-    const id = parsed.flags.i || parsed.flags.id || ''
+    const file = parsed.flags.file || parsed.flags.f || ''
+    const id = parsed.flags.i || parsed.flags.id || DEFAULT_TEMP_ID
     const password = this._resolvePassword(parsed)
 
     let content = ''
@@ -243,47 +294,60 @@ export class ShareGroup {
     if (file) {
       const resolved = path.resolve(file)
       if (!fs.existsSync(resolved)) {
-        console.error(`File not found: ${resolved}`)
+        console.error(`[opm share] File not found: ${resolved}`)
         process.exit(1)
       }
       content = fs.readFileSync(resolved, 'utf8')
     } else if (parsed.positional.length > 0) {
-      content = parsed.positional.join(' ')
+      const first = parsed.positional[0]
+      const expandedFirst = expandTilde(first)
+      if (parsed.positional.length === 1 && fs.existsSync(expandedFirst)) {
+        const stat = fs.statSync(expandedFirst)
+        if (stat.isFile()) {
+          content = fs.readFileSync(expandedFirst, 'utf8')
+        } else if (stat.isDirectory()) {
+          console.error(`[opm share] "${first}" is a directory. Use "opm share zip ${first}" to upload as zip.`)
+          process.exit(1)
+        }
+      }
+      if (!content) {
+        content = parsed.positional.join(' ')
+      }
     } else if (!process.stdin.isTTY) {
       content = fs.readFileSync(0, 'utf8')
     }
 
     if (!content) {
-      console.error('Usage: opm share upload "<content>" [-t title] [-f file] [-i id] [-p password]')
-      console.error('  Or: echo "..." | opm share upload [-t title] [-i id] [-p password]')
-      console.error('  Or: opm share "<content>" [-t title] [-i id] [-p password]  (shorthand without "upload")')
+      console.error('Usage: opm share upload "<content>" [-f file] [-i id] [-p password]')
+      console.error('  Or: echo "..." | opm share upload [-i id] [-p password]')
+      console.error('  Or: opm share "<content>" [-i id] [-p password]  (shorthand without "upload")')
+      console.error('  No -i → id defaults to "opm_share" (temporary slot, overwritten on next upload without -i)')
       process.exit(1)
     }
 
     const baseUrl = await this._ensureReachable()
     const result = await uploadShare(baseUrl, {
-      title: title || defaultTitle(content),
       content,
       password,
-      ...(id ? { id } : {}),
+      id,
     })
     output(result)
   }
 
   async _zip(parsed) {
-    const inputPath = parsed.positional[0] || parsed.flags.f || parsed.flags.file || ''
-    const title = parsed.flags.t || parsed.flags.title || ''
-    const id = parsed.flags.i || parsed.flags.id || ''
+    const inputPath = parsed.positional[0] || parsed.flags.file || parsed.flags.f || ''
+    const id = parsed.flags.i || parsed.flags.id || DEFAULT_TEMP_ID
     const password = this._resolvePassword(parsed)
 
     if (!inputPath) {
-      console.error('Usage: opm share zip <path> [-t title] [-i id] [-p password]')
+      console.error('Usage: opm share zip <path> [-i id] [-p password]')
+      console.error('  No -i → id defaults to "opm_share" (temporary slot, overwritten on next upload without -i)')
       process.exit(1)
     }
 
-    const resolved = path.resolve(inputPath)
+    const resolved = path.resolve(expandTilde(inputPath))
     if (!fs.existsSync(resolved)) {
-      console.error(`Path not found: ${resolved}`)
+      console.error(`[opm share] Path not found: ${resolved}`)
       process.exit(1)
     }
 
@@ -292,11 +356,13 @@ export class ShareGroup {
     if (isDir) {
       const entries = fs.readdirSync(resolved)
       if (entries.length === 0) {
-        console.error(`Directory is empty: ${resolved}`)
+        console.error(`[opm share] Directory is empty: ${resolved}`)
         process.exit(1)
       }
     }
 
+    const sourcePath = tildefy(inputPath, resolved)
+
     const baseName = path.basename(resolved)
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), ZIP_TMP_PREFIX))
     const zipPath = path.join(tmpDir, `${baseName}.zip`)
@@ -309,7 +375,7 @@ export class ShareGroup {
 
     if (zipResult.status !== 0) {
       const stderr = zipResult.stderr ? zipResult.stderr.toString().trim() : 'unknown error'
-      console.error(`Zip failed: ${stderr}`)
+      console.error(`[opm share] Zip failed: ${stderr}`)
       fs.rmSync(tmpDir, { recursive: true, force: true })
       process.exit(1)
     }
@@ -321,64 +387,178 @@ export class ShareGroup {
 
     const baseUrl = await this._ensureReachable()
     const result = await uploadShare(baseUrl, {
-      title: title || `${baseName}.zip`,
+      title: `${baseName}.zip`,
       content,
       password,
       type: 'zip',
       filename: `${baseName}.zip`,
-      ...(id ? { id } : {}),
+      sourcePath,
+      id,
     })
     output(result)
   }
 
   async _get(parsed) {
-    const id = parsed.positional[0] || ''
+    const id = parsed.positional[0] || DEFAULT_TEMP_ID
     const password = this._resolvePassword(parsed, parsed.positional[1] || '')
+    const detail = parsed.flags.detail === 'true' || !!parsed.flags.detail
+    const outputFile = parsed.flags.output || parsed.flags.o || ''
     const extractDir = parsed.flags.d || parsed.flags.dir || ''
 
+    if (extractDir) {
+      console.error('[opm share] "get -d/--dir" is deprecated. Use "opm share unzip <id> <dir>" instead.')
+      process.exit(1)
+    }
+
     const baseUrl = await this._ensureReachable()
-    const result = id
-      ? await getShare(baseUrl, id, password)
-      : await getLatestShare(baseUrl, password)
+    const result = await getShare(baseUrl, id, password)
 
-    if (result.type === 'zip' && extractDir) {
-      await this._extractZip(result, extractDir)
+    if (detail) {
+      output({ ...result, content: parseContentJson(result.content) })
       return
     }
 
-    output(result)
-  }
+    if ((result.type || 'text') === 'zip') {
+      console.error(`[opm share] This is a zip share. Use "opm share unzip ${id || result.id}" to extract, or "opm share get ${id || result.id} --detail" for metadata.`)
+      process.exit(1)
+    }
 
-  async _extractZip(result, dir) {
-    const resolvedDir = path.resolve(dir)
-    fs.mkdirSync(resolvedDir, { recursive: true })
+    if (outputFile) {
+      const resolved = path.resolve(expandTilde(outputFile))
+      fs.mkdirSync(path.dirname(resolved), { recursive: true })
+      const buf = Buffer.from(formatContent(result.content || ''), 'utf8')
+      fs.writeFileSync(resolved, buf)
+      console.error(`[opm share] Wrote ${resolved} (${buf.length} bytes)`)
+      return
+    }
+
+    const formatted = formatContent(result.content || '')
+    process.stdout.write(formatted)
+    if (!formatted.endsWith('\n')) {
+      process.stdout.write('\n')
+    }
+  }
 
+  /**
+   * 解码 zip content 并解压到目标目录（或 dry-run 时解压到临时目录仅列条目）
+   * @param {object} result - getShare 返回的 share 对象
+   * @param {string} targetDir - 解压目标目录（绝对路径）
+   * @param {boolean} dryRun - 仅预览，不落盘
+   * @returns {Promise<{files: Array, targetDir: string, extracted: boolean}>}
+   */
+  async _extractZipTo(result, targetDir, dryRun) {
     const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), ZIP_TMP_PREFIX))
     const zipPath = path.join(tmpDir, result.filename || `${result.id}.zip`)
+    try {
+      fs.writeFileSync(zipPath, Buffer.from(result.content, 'base64'))
+      const { default: extractZip } = await import('extract-zip')
+      const extractTarget = dryRun ? tmpDir : targetDir
+      if (!dryRun) fs.mkdirSync(targetDir, { recursive: true })
+      await extractZip(zipPath, { dir: extractTarget })
+      fs.unlinkSync(zipPath)
+      const files = this._listTopLevel(extractTarget)
+      return { files, targetDir, extracted: !dryRun }
+    } catch (err) {
+      throw new Error(`Extract failed: ${err.message}`)
+    } finally {
+      fs.rmSync(tmpDir, { recursive: true, force: true })
+    }
+  }
+
+  async _unzip(parsed) {
+    const id = parsed.positional[0] || ''
+    const dir = parsed.positional[1] || ''
+    const password = this._resolvePassword(parsed)
+    const dryRun = parsed.flags['dry-run'] === 'true'
+
+    if (!id) {
+      console.error('Usage: opm share unzip <id> [dir] [--dry-run] [-p password]')
+      console.error('  <id> is required (zip share id to extract). Default dir: ~/.config/opm/share/<id>/')
+      process.exit(1)
+    }
+
+    const baseUrl = await this._ensureReachable()
+    const result = await getShare(baseUrl, id, password)
+
+    if ((result.type || 'text') !== 'zip') {
+      console.error(`[opm share] Not a zip share (type=${result.type || 'text'}). Use "opm share get ${id || result.id}" for text content.`)
+      process.exit(1)
+    }
+
+    const targetDir = dir
+      ? path.resolve(expandTilde(dir))
+      : path.join(getUserConfigDir(), 'share', id || result.id)
 
     try {
-      const buf = Buffer.from(result.content, 'base64')
-      fs.writeFileSync(zipPath, buf)
+      const { files, targetDir: target, extracted } = await this._extractZipTo(result, targetDir, dryRun)
+      output({
+        id: result.id,
+        title: result.title,
+        type: 'zip',
+        filename: result.filename,
+        sourcePath: result.sourcePath || '',
+        created: result.created,
+        dryRun,
+        extracted,
+        dir: target,
+        files,
+      })
+    } catch (err) {
+      console.error(`[opm share] ${err.message}`)
+      process.exit(1)
+    }
+  }
 
-      const { default: extractZip } = await import('extract-zip')
-      await extractZip(zipPath, { dir: resolvedDir })
+  async _sync(parsed) {
+    const id = parsed.positional[0] || ''
+    const password = this._resolvePassword(parsed)
+    const dryRun = parsed.flags['dry-run'] === 'true'
 
-      const files = this._listTopLevel(resolvedDir)
+    if (!id) {
+      console.error('Usage: opm share sync <id> [--dry-run] [-p password]')
+      console.error('  <id> is required (zip share id to sync to its original ~ -anchored path)')
+      process.exit(1)
+    }
+
+    const baseUrl = await this._ensureReachable()
+    const result = await getShare(baseUrl, id, password)
+
+    if ((result.type || 'text') !== 'zip') {
+      console.error(`[opm share] Not a zip share (type=${result.type || 'text'}). Use "opm share get ${id || result.id}" for text content.`)
+      process.exit(1)
+    }
+
+    const sourcePath = result.sourcePath || ''
+    const defaultDir = path.join(getUserConfigDir(), 'share', id || result.id)
+    let targetDir
+    let mode
+    if (sourcePath.startsWith('~/')) {
+      const expanded = expandTilde(sourcePath)
+      targetDir = path.dirname(expanded)
+      mode = `sync → ${sourcePath} (expanded: ${expanded})`
+    } else {
+      targetDir = defaultDir
+      mode = `fallback (no ~ anchor; sourcePath=${sourcePath || '<none>'}) → default dir`
+    }
+
+    try {
+      const { files, targetDir: target, extracted } = await this._extractZipTo(result, targetDir, dryRun)
       output({
         id: result.id,
         title: result.title,
         type: 'zip',
         filename: result.filename,
+        sourcePath,
         created: result.created,
-        extracted: true,
-        dir: resolvedDir,
+        dryRun,
+        extracted,
+        mode,
+        dir: target,
         files,
       })
     } catch (err) {
-      console.error(`Extract failed: ${err.message}`)
+      console.error(`[opm share] ${err.message}`)
       process.exit(1)
-    } finally {
-      fs.rmSync(tmpDir, { recursive: true, force: true })
     }
   }
 
@@ -398,62 +578,14 @@ export class ShareGroup {
     }
   }
 
-  async _view(parsed) {
-    const id = parsed.positional[0] || ''
-    const password = this._resolvePassword(parsed, parsed.positional[1] || '')
-
-    const baseUrl = await this._ensureReachable()
-    const result = id
-      ? await getShare(baseUrl, id, password)
-      : await getLatestShare(baseUrl, password)
-
-    if (result.type === 'zip') {
-      const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), ZIP_TMP_PREFIX))
-      try {
-        const zipPath = path.join(tmpDir, result.filename || `${result.id}.zip`)
-        const buf = Buffer.from(result.content, 'base64')
-        fs.writeFileSync(zipPath, buf)
-
-        const { default: extractZip } = await import('extract-zip')
-        await extractZip(zipPath, { dir: tmpDir })
-
-        fs.unlinkSync(zipPath)
-
-        const files = this._listTopLevel(tmpDir)
-        for (const f of files) {
-          console.log(`${f.type === 'dir' ? 'd' : 'f'}  ${f.name}`)
-        }
-      } catch (err) {
-        console.error(`View zip failed: ${err.message}`)
-        process.exit(1)
-      } finally {
-        fs.rmSync(tmpDir, { recursive: true, force: true })
-      }
-      return
-    }
-
-    process.stdout.write(result.content || '')
-    if (!(result.content || '').endsWith('\n')) {
-      process.stdout.write('\n')
-    }
-  }
-
   async _open(parsed) {
-    const id = parsed.positional[0] || ''
+    const id = parsed.positional[0] || DEFAULT_TEMP_ID
     const password = this._resolvePassword(parsed, parsed.positional[1] || '')
 
     const baseUrl = await this._ensureReachable()
-
-    if (id) {
-      const htmlUrl = getHtmlUrl(baseUrl, id, password)
-      openBrowser(htmlUrl)
-      output({ opened: true, url: htmlUrl })
-    } else {
-      const result = await getLatestShare(baseUrl, password)
-      const htmlUrl = getHtmlUrl(baseUrl, result.id, password)
-      openBrowser(htmlUrl)
-      output({ opened: true, id: result.id, url: htmlUrl })
-    }
+    const htmlUrl = getHtmlUrl(baseUrl, id, password)
+    openBrowser(htmlUrl)
+    output({ opened: true, id, url: htmlUrl })
   }
 
   async _list(parsed) {
@@ -477,12 +609,12 @@ export class ShareGroup {
   }
 
   async _clear(parsed) {
-    const days = parseInt(parsed.flags.days || '0', 10) || 0
+    const days = parseFloat(parsed.flags.days || '0') || 0
     const keep = parseInt(parsed.flags.keep || parsed.flags.n || '0', 10) || 0
 
     if (!days && !keep) {
       console.error('Usage: opm share clear [--days <n>] [--keep <n>]')
-      console.error('  --days <n>  Delete shares older than n days')
+      console.error('  --days <n>  Keep shares from the last n days (integer = aligned to local midnight, fraction = hour window; default keeps today)')
       console.error('  --keep <n>  Keep only the most recent n shares')
       console.error('  Both can be combined: clear --days 7 --keep 50')
       process.exit(1)
@@ -515,7 +647,7 @@ export class ShareGroup {
       return
     }
 
-    console.error(`Unknown server subcommand: ${sub}`)
+    console.error(`[opm share] Unknown server subcommand: ${sub}`)
     console.error('Usage: opm share server [start|stop|status|help]')
     process.exit(1)
   }
@@ -667,6 +799,49 @@ Environment variables (for server.js direct execution):
     output({ running: true, ...pidInfo })
   }
 
+  /**
+   * opm copy — 将系统剪切板内容以 id=clipboard 上传到服务器
+   * 剪切板为空（trim 后）时提示并停止。
+   * @param {object} parsed
+   */
+  async _copy(parsed) {
+    const content = readClipboard()
+    if (!content.trim()) {
+      console.error('[opm share] Clipboard is empty, nothing to upload.')
+      process.exit(1)
+    }
+
+    const password = this._resolvePassword(parsed)
+    const baseUrl = await this._ensureReachable()
+    const result = await uploadShare(baseUrl, {
+      content,
+      password,
+      id: CLIPBOARD_ID,
+    })
+    output({ ...result, copied: true })
+  }
+
+  /**
+   * opm paste — 取回服务器上 id=clipboard 的内容，写回系统剪切板并显示
+   * @param {object} parsed
+   */
+  async _paste(parsed) {
+    const password = this._resolvePassword(parsed, parsed.positional[0] || '')
+    const baseUrl = await this._ensureReachable()
+    const result = await getShare(baseUrl, CLIPBOARD_ID, password)
+
+    const content = result.content || ''
+    writeClipboard(content)
+    output({
+      pasted: true,
+      id: result.id,
+      title: result.title,
+      created: result.created,
+      length: content.length,
+      content,
+    })
+  }
+
   printHelp() {
     const actionLines = Object.entries(ACTIONS)
       .map(([sig, { desc }]) => `  ${sig.padEnd(12)} ${desc}`)
@@ -684,17 +859,22 @@ Server subcommands:
   server status                Check local server status
 
 Shorthand:
-  opm share "<content>" [-t title]     Upload (without "upload" keyword)
-  opm share -f <file>                  Upload file content (title auto-generated)
-  echo "..." | opm share [-t title]    Upload from stdin
+  opm share "<content>"                 Upload text (without "upload" keyword)
+  opm share <file>                      Upload existing file content (auto-detected)
+  opm share -f <file>                   Upload file content (explicit)
+  echo "..." | opm share                Upload from stdin
+
+  Without -i, id defaults to "opm_share" — a temporary slot overwritten on the next
+  upload/zip without -i. Use -i <id> for a persistent, named share.
 
 Options:
-  -t, --title <title>                  Title (default: first 30 chars of content)
   -f, --file <path>                    Read content from file
-  -i, --id <id>                        Custom share id (upload/zip; easier to remember)
+  -i, --id <id>                        Custom share id (default: opm_share, overwritten on next no-id upload)
   -p, --password <password>            Password (default: config share.password, fallback 0000)
   -n, --count <n>                      Number of items (list, default: 10)
-  -d, --dir <dir>                      Extract zip to this directory (get)
+  -o, --output <file>                  Write text content to file instead of stdout (get)
+  --detail                             Show full dict (get); default prints content only, JSON pretty-printed
+  --dry-run                            Preview only, do not write to disk (unzip/sync)
   -h, --help                           Show this help
 
 Server config (config.json5):
@@ -703,33 +883,41 @@ Server config (config.json5):
   share.serve.host / .port / .dataDir  Local serve parameters
 
 Examples:
+  opm share copy                        Copy system clipboard to server (id=clipboard)
+  opm share paste                       Fetch server clipboard back to system clipboard
+  opm scopy                             Top-level shortcut for "opm share copy"
+  opm spaste                            Top-level shortcut for "opm share paste"
+  opm sget / szip / sunzip / ssync / sopen   Other share top-level shortcuts
   opm share config                     Show current share config
   opm share server start                Start local server (background)
   opm share server status               Check if server is running
   opm share server stop                 Stop local server
-  opm share "hello world" -t test      Upload text
-  opm share "hello world" -i myid      Upload text with custom id "myid"
-  opm share "hello world" -p 1234      Upload text with password override
-  opm share -f doc.md                  Upload file (title auto from content)
-  opm share -f doc.md -t "README"      Upload file with custom title
+  opm share "hello world"             Upload text (id=opm_share, overwritten on next no-id upload)
+  opm share "hello world" -i myid      Upload text with custom id "myid" (persistent)
+  opm share "hello world" --password 1234      Upload text with password override
+  opm share doc.md                      Upload existing file content (auto-detected)
+  opm share -f doc.md                   Upload file content
   echo "hello" | opm share             Upload from stdin
-  opm share zip ./src                  Upload folder as zip
-  opm share zip ./config.json5         Upload file as zip
-  opm share get                        Get the latest share (JSON)
-  opm share get myid                   Get share by custom id
-  opm share get abc12345               Get share by random id
-  opm share get abc12345 -p 1234       Get with password override
-  opm share get abc12345 -d ./out      Download and extract zip to ./out
-  opm share view                       View the latest share content
-  opm share view myid                  View share by custom id
-  opm share open                       Open the latest share in browser
+  opm share zip ~/Projects/foo         Upload folder as zip (sourcePath preserved as ~/Projects/foo)
+  opm share zip './src' -i mysrc       Upload folder; quote ~ to preserve literal, or rely on auto re-tilde-ify
+  opm share get                        Get text share id=opm_share (content only; JSON pretty-printed if parseable)
+  opm share get myid                   Get text share by custom id (content only)
+  opm share get myid --detail          Get share showing the full dict (content parsed as JSON if parseable)
+  opm share get myid -o out.json       Write text content to out.json (no stdout)
+  opm share get myid --password 1234   Get with password override
+  opm share unzip myid                 Extract zip share myid → ~/.config/opm/share/myid/
+  opm share unzip myid ./out           Extract zip share myid → ./out/
+  opm share unzip myid --dry-run       Preview zip entries without extracting
+  opm share sync myid                  Sync zip share to its original ~ -anchored path (e.g. ~/Projects/foo)
+  opm share sync myid --dry-run        Preview sync target path without extracting
+  opm share open                       Open share id=opm_share in browser
   opm share open myid                  Open share by custom id in browser
   opm share list                       List recent 10 shares
   opm share list -n 5                  List recent 5 shares
   opm share delete abc12345            Delete a share by id
-  opm share clear --days 7             Delete shares older than 7 days
+  opm share clear --days 7             Keep shares from the last 7 days
   opm share clear --keep 50            Keep only the most recent 50 shares
   opm share clear --days 7 --keep 50   Both combined
-`)
+ `)
   }
 }