dsh-claude-compat 0.9.0 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-claude-compat",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "DeepSeek Harness plugin: bridge Claude Code's .claude/ directories (project and ~/.claude: skills, commands, rules) into DSH native skill registry and message-stream rules injection.",
   "type": "module",
   "main": "src/index.js",
@@ -17,7 +17,10 @@
     "README.md",
     "README.zh-CN.md",
     "cordis.patch.yml",
-    "scripts"
+    "scripts/cc-resume.mjs",
+    "scripts/cc-export.mjs",
+    "scripts/zstd-compat.mjs",
+    "scripts/dsh-restart.sh"
   ],
   "keywords": [
     "dsh",

package/src/index.js

@@ -121,6 +121,21 @@ const STAR_URL = 'https://github.com/biedongbin/dsh-claude-compat';
 // is the intended "did this help? star it" cadence without spamming.
 let starNudged = false;
 
+// Body of the reload-cc-plugins / reload-skills skills. Inline skill bodies
+// travel in the locator (`{ kind: 'inline', body }`) — the DSH registry loads
+// definitions exclusively through `provider.get(candidate)`, so the body must
+// be reachable from the candidate itself, never from a closure or disk.
+const RELOAD_BODY = `# Catalog reloaded ✅
+
+The DSH skill catalog cache was just dropped and observers notified.
+Freshly installed/removed skills are now visible in this session (the skill
+picker refreshes automatically on the next catalog read).
+
+Notes:
+- New skills from \`/plugin install\` or edits under \`.claude\` are live now.
+- MCP servers shipped by plugins still require a DSH restart (process-lifetime mount).
+- \`/reload-cc-plugins\` and \`/reload-skills\` are aliases.`;
+
 export function apply(ctx, config = {}) {
   // One-shot "found this useful? star it" nudge, surfaced exactly where the
   // value lands: the first profile activation of this process.
@@ -236,45 +251,22 @@ class ClaudeCompatSkillProvider {
   // Invalidate fires when the definition is actually loaded (get()), not at
   // list() time — loading the reload skill IS the reload.
   reloadSkillDef(name, description) {
-    return {
-      name,
-      description,
-      invocation: { modelInvocable: true, userInvocable: true },
-      provider: 'claude-compat',
-      source: 'claude-compat-manager',
-      rank: this.config.pluginManagerRank ?? 40,
-      locator: { kind: 'inline', path: import.meta.url },
-      get: async () => {
-        try { this.control?.invalidate?.(); } catch { /* best-effort */ }
-        return {
-          name,
-          description,
-          body: `# Catalog reloaded ✅
-
-The DSH skill catalog cache was just dropped and observers notified.
-Freshly installed/removed skills are now visible in this session (the skill
-picker refreshes automatically on the next catalog read).
-
-Notes:
-- New skills from \`/plugin install\` or edits under \`.claude\` are live now.
-- MCP servers shipped by plugins still require a DSH restart (process-lifetime mount).
-- \`/reload-cc-plugins\` and \`/reload-skills\` are aliases.`,
-        };
-      },
-    };
+    return this.managerSkillCandidate(name, description, undefined, RELOAD_BODY, { invalidate: true });
   }
 
-  managerSkillCandidate(name, description, whenToUse, body) {
+  managerSkillCandidate(name, description, whenToUse, body, { invalidate = false } = {}) {
     return {
       name,
       description,
-      whenToUse,
+      ...(whenToUse !== undefined ? { whenToUse } : {}),
       invocation: { modelInvocable: true, userInvocable: true },
-      provider: 'claude-compat',
+      provider: this.name,
       source: 'claude-compat-manager',
       rank: this.config.pluginManagerRank ?? 40,
-      locator: { kind: 'inline', path: import.meta.url },
-      get: async () => ({ name, description, body }),
+      // kind: 'inline' makes provider.get() serve `body` directly instead of
+      // reading a path from disk. No `path` — import.meta.url is a file:// URL
+      // and the module source is not the skill body.
+      locator: { kind: 'inline', body, invalidate },
     };
   }
 
@@ -294,6 +286,25 @@ Notes:
 
   async get(candidate) {
     const locator = candidate.locator;
+    if (locator?.kind === 'inline') {
+      // Inline manager skills (cc-plugin, reload-*, cc-resume, cc-export):
+      // the body ships in the locator. Loading a reload skill IS the reload —
+      // drop the catalog cache so the next list() recollects fresh state.
+      // (Not in list(): that would fire on every catalog collection and
+      // defeat the cache entirely.)
+      if (locator.invalidate) {
+        try { this.control?.invalidate?.(); } catch { /* best-effort */ }
+      }
+      return {
+        name: candidate.name,
+        description: candidate.description,
+        ...(candidate.whenToUse !== undefined ? { whenToUse: candidate.whenToUse } : {}),
+        invocation: candidate.invocation,
+        source: candidate.source,
+        provider: this.name,
+        content: locator.body,
+      };
+    }
     const raw = await readTextSafe(locator.path);
     if (raw === undefined) return undefined;
     const parsed = parseFrontmatter(raw);

package/src/plugin-manager.js

@@ -7,16 +7,16 @@
 // Claude-native locations (~/.claude/plugins/*, settings.json enabledPlugins)
 // so both Claude Code and this plugin's discovery bridge read the same truth.
 //
-// Commands (mirroring `claude plugin` semantics):
-//   /plugin                                  — list installed (status incl. enabled/disabled)
-//   /plugin <name>[@market]                  — one-shot install
-//   /plugin install <name>[@market]
-//   /plugin uninstall|remove <name>
-//   /plugin enable <name>
-//   /plugin disable <name>
-//   /plugin update [name]                    — one or all
-//   /plugin search <term>                    — scan known marketplaces
-//   /plugin marketplace list|add|remove|update [...]
+// Commands (mirroring `claude plugin` semantics, invoked as /cc-plugin):
+//   /cc-plugin                                  — list installed (status incl. enabled/disabled)
+//   /cc-plugin <name>[@market]                  — one-shot install
+//   /cc-plugin install <name>[@market]
+//   /cc-plugin uninstall|remove <name>
+//   /cc-plugin enable <name>
+//   /cc-plugin disable <name>
+//   /cc-plugin update [name]                    — one or all
+//   /cc-plugin search <term>                    — scan known marketplaces
+//   /cc-plugin marketplace list|add|remove|update [...]
 //
 // Safety: never mutates installed_plugins.json / known_marketplaces.json /
 // settings.json directly without a timestamped backup beside the file; the
@@ -38,22 +38,23 @@ Claude Code and DSH see the same plugins. Newly installed plugin content
 appears in the DSH skill catalog on next reconcile (MCP servers need a DSH restart).
 
 ## Commands (invoked as /cc-plugin <args>)
-- \`/plugin\` — list installed plugins with enable/disable status
-- \`/plugin <name>[@marketplace]\` — one-shot install (e.g. \`/plugin ralph@omc\`)
-- \`/plugin install <name>[@marketplace]\`
-- \`/plugin uninstall <name>\` (alias: remove)
-- \`/plugin enable <name>\` / \`/plugin disable <name>\`
-- \`/plugin update [name]\` — update one plugin or all
-- \`/plugin search <term>\` — search all known marketplaces
-- \`/plugin marketplace list\`
-- \`/plugin marketplace add <github-repo-or-url>\`
-- \`/plugin marketplace remove <name>\`
-- \`/plugin marketplace update [name]\`
+- \`/cc-plugin\` — list installed plugins with enable/disable status
+- \`/cc-plugin <name>[@marketplace]\` — one-shot install (e.g. \`/cc-plugin ralph@omc\`)
+- \`/cc-plugin install <name>[@marketplace]\`
+- \`/cc-plugin uninstall <name>\` (alias: remove)
+- \`/cc-plugin enable <name>\` / \`/cc-plugin disable <name>\`
+- \`/cc-plugin update [name]\` — update one plugin or all
+- \`/cc-plugin search <term>\` — search all known marketplaces
+- \`/cc-plugin marketplace list\`
+- \`/cc-plugin marketplace add <github-repo-or-url>\`
+- \`/cc-plugin marketplace remove <name>\`
+- \`/cc-plugin marketplace update [name]\`
 
 ## Execution
-Prefers the \`claude plugin\` CLI when available; falls back to direct
-JSON/git manipulation (with automatic timestamped backups of every file it
-touches). Report which engine ran in the result.`;
+Run \`claude plugin <args>\` via bash (e.g. \`claude plugin install ralph@omc\`).
+If the CLI is unavailable, fall back to direct JSON/git manipulation (with
+automatic timestamped backups of every file it touches). Report which engine
+ran in the result.`;
 
 /** Run `claude plugin ...` args; resolve {ok, stdout} or {ok:false, error}. */
 async function claudePlugin(args, timeoutMs = 120_000) {

package/scripts/deploy-local.sh

@@ -1,71 +0,0 @@
-#!/usr/bin/env bash
-# Deploy this checkout into the local DSH profile.
-#
-# Editing ~/src/dsh-claude-compat does NOT change what DSH runs: DSH imports the
-# copy under the profile's node_modules, and only at process start. This script
-# copies the source over that copy and reminds you to restart.
-#
-#   bash scripts/deploy-local.sh                 # default profile: desktop
-#   bash scripts/deploy-local.sh --profile web
-#   bash scripts/deploy-local.sh --no-backup
-#
-# Environment: DSH_HOME (default ~/.dsh), DSH_PROFILE (default desktop).
-set -euo pipefail
-
-SRC_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-DSH_HOME="${DSH_HOME:-$HOME/.dsh}"
-PROFILE="${DSH_PROFILE:-desktop}"
-BACKUP=1
-
-usage() {
-  sed -n '2,12p' "${BASH_SOURCE[0]}" | sed 's/^# \{0,1\}//'
-}
-
-while [[ $# -gt 0 ]]; do
-  case "$1" in
-    --profile)   PROFILE="${2:?--profile 需要参数}"; shift 2 ;;
-    --no-backup) BACKUP=0; shift ;;
-    -h|--help)   usage; exit 0 ;;
-    *) echo "未知参数: $1（用 --help 看用法）" >&2; exit 1 ;;
-  esac
-done
-
-TARGET="$DSH_HOME/profiles/$PROFILE/node_modules/dsh-claude-compat"
-if [[ ! -d "$TARGET" ]]; then
-  cat >&2 <<EOF
-找不到已安装的插件：
-  $TARGET
-
-先把它装进 profile：
-  "/Applications/DeepSeek Harness.app/Contents/Resources/runtime/cli/bin/dsh" \\
-    plugin --profile $PROFILE add dsh-claude-compat@latest
-EOF
-  exit 1
-fi
-
-# A deployed copy older than the checkout is the exact failure this script
-# exists to prevent; say what is being overwritten so it is recoverable.
-if [[ $BACKUP -eq 1 ]]; then
-  BK="$DSH_HOME/backups/dsh-claude-compat-$(date +%Y%m%d-%H%M%S)"
-  mkdir -p "$BK"
-  cp -a "$TARGET"/. "$BK"/
-  echo "备份 → $BK"
-fi
-
-# --delete keeps the deployed src an exact mirror (stale modules would otherwise
-# linger and get imported).
-rsync -a --delete "$SRC_DIR/src/" "$TARGET/src/"
-for f in README.md README.zh-CN.md CHANGELOG.md CHANGELOG.zh-CN.md; do
-  [[ -f "$SRC_DIR/$f" ]] && cp -a "$SRC_DIR/$f" "$TARGET/"
-done
-
-if diff -r "$SRC_DIR/src" "$TARGET/src" >/dev/null; then
-  echo "✓ src 已同步 → $TARGET"
-else
-  echo "✗ 复制后校验不一致，请检查权限" >&2
-  exit 1
-fi
-
-echo
-echo "⚠ 插件在 DSH 启动时 import，改完必须重启 DSH 进程才生效（不是刷新窗口）。"
-echo "  配置项（cordis.patch.yml）同理。"

package/scripts/gen-downloads-chart.mjs

@@ -1,36 +0,0 @@
-// gen-downloads-chart.mjs — fetch last 30 days of npm downloads and render a
-// simple SVG bar chart to .github/assets/downloads.svg. Run by CI daily.
-import { writeFileSync, mkdirSync } from 'node:fs';
-import { dirname } from 'node:path';
-
-const PKG = 'dsh-claude-compat';
-const DAYS = 30;
-const iso = (d) => d.toISOString().slice(0, 10);
-const end = new Date();
-const start = new Date(Date.now() - (DAYS - 1) * 86400000);
-const res = await fetch(`https://api.npmjs.org/downloads/range/${iso(start)}:${iso(end)}/${PKG}`);
-if (!res.ok) throw new Error(`npm API ${res.status}`);
-const { downloads } = await res.json();
-const days = downloads.map((d) => ({ date: d.day, n: d.downloads }));
-const total = days.reduce((s, d) => s + d.n, 0);
-const max = Math.max(1, ...days.map((d) => d.n));
-
-const W = 760, H = 180, PAD = 30, CW = (W - PAD * 2) / days.length;
-const bars = days.map((d, i) => {
-  const h = Math.round((d.n / max) * (H - 70));
-  const x = PAD + i * CW, y = H - 40 - h;
-  return `<rect x="${x.toFixed(1)}" y="${y}" width="${(CW - 2).toFixed(1)}" height="${h}" rx="2" fill="#22c55e"><title>${d.date}: ${d.n}</title></rect>`;
-}).join('\n  ');
-
-const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${W}" height="${H}" viewBox="0 0 ${W} ${H}" font-family="-apple-system,Segoe UI,Helvetica,Arial,sans-serif">
-  <text x="${PAD}" y="24" font-size="15" font-weight="600" fill="#1f2937">${PKG} — npm downloads (last ${DAYS} days)</text>
-  <text x="${W - PAD}" y="24" font-size="13" text-anchor="end" fill="#374151">total ${total.toLocaleString()} · max ${max.toLocaleString()}/day</text>
-  ${bars}
-  <text x="${PAD}" y="${H - 15}" font-size="11" fill="#6b7280">${days[0].date}</text>
-  <text x="${W - PAD}" y="${H - 15}" font-size="11" text-anchor="end" fill="#6b7280">${days[days.length - 1].date}</text>
-</svg>\n`;
-
-const out = new URL('../.github/assets/downloads.svg', import.meta.url);
-mkdirSync(dirname(out.pathname), { recursive: true });
-writeFileSync(out.pathname, svg);
-console.log(`chart written: total=${total} max=${max}`);