@ninkch/dsh-artcraft 0.1.1 → 0.2.1

package/README.md

@@ -280,6 +280,11 @@ The three places that must agree on the package name are the profile `package.js
 GitHub: this repository is self-contained; `README.md` is English-first with a
 [简体中文](README.zh-CN.md) companion.
 
+**Releases run through npm Trusted Publishing** (GitHub Actions OIDC — no tokens, no OTP):
+`.github/workflows/publish.yml` fires on `v*` tags; the trusted publisher on the npm package
+points at `NINKCH/dsh-artcraft` / `publish.yml`. To cut a release: bump `version`, commit,
+`git tag v0.x.y && git push origin v0.x.y`.
+
 ## License
 
 **This plugin (`@ninkch/dsh-artcraft`): Apache-2.0** — see [LICENSE](LICENSE). It ships none of the

package/README.zh-CN.md

@@ -263,6 +263,10 @@ HTTP 面无鉴权，挂在 Harness Web 服务之下（仅回环监听）——
 GitHub 上传本仓库即可：`README.md` 英文优先，附
 [简体中文](README.zh-CN.md) 对照。
 
+**发版走 npm Trusted Publishing**（GitHub Actions OIDC —— 无令牌、无 OTP）：
+`.github/workflows/publish.yml` 在 `v*` 标签推送时触发；npm 包侧的可信发布指向
+`NINKCH/dsh-artcraft` / `publish.yml`。发版流程：改 `version` → 提交 → `git tag v0.x.y && git push origin v0.x.y`。
+
 ## 许可
 
 **本插件（`@ninkch/dsh-artcraft`）：Apache-2.0**（见 [LICENSE](LICENSE)）。不包含 ArtCraft 应用的任何代码 —— 只调用其公开自动化面

package/client.js

@@ -0,0 +1,189 @@
+// @ninkch/dsh-artcraft — client half.
+// 不占侧栏/主面板：状态与「检查更新」挂在 插件页 → 本插件详情卡 上
+// （plugins.detail.badge / plugins.detail.section）。
+window.__ModuleLoader__.load({
+  id: '@ninkch/dsh-artcraft',
+  factory(require) {
+    const React = require('react');
+    const h = React.createElement;
+    const { useState, useEffect, useCallback, useRef } = React;
+
+    const NS = 'artcraft';
+    const API = '/artcraft/api';
+
+    const CSS = `
+.dshac-card { border: 1px solid var(--dsw-border-primary, rgba(128,128,128,.35)); border-radius: 10px; padding: 12px; font-size: 13px; line-height: 1.5; }
+.dshac-title { font-weight: 600; margin-bottom: 8px; display: flex; justify-content: space-between; align-items: center; gap: 8px; }
+.dshac-row { display: flex; align-items: center; gap: 8px; margin: 4px 0; flex-wrap: wrap; }
+.dshac-dot { width: 9px; height: 9px; border-radius: 50%; flex: none; display: inline-block; }
+.dshac-dot.ok { background: #34c759; } .dshac-dot.bad { background: #ff5f57; } .dshac-dot.unknown { background: #8e8e93; }
+.dshac-mono { font-family: ui-monospace, Consolas, monospace; font-size: 12px; word-break: break-all; }
+.dshac-muted { opacity: .65; font-size: 12px; }
+.dshac-btn { border: 1px solid var(--dsw-border-primary, rgba(128,128,128,.4)); background: transparent; color: inherit;
+  border-radius: 7px; padding: 3px 10px; font-size: 12px; cursor: pointer; }
+.dshac-btn:hover:not(:disabled) { background: rgba(128,128,128,.15); }
+.dshac-btn:disabled { opacity: .5; cursor: default; }
+.dshac-btn.primary { background: rgba(80,120,255,.25); }
+.dshac-out { white-space: pre-wrap; font-family: ui-monospace, Consolas, monospace; font-size: 11px;
+  background: rgba(128,128,128,.12); border-radius: 7px; padding: 8px; margin-top: 8px; max-height: 160px; overflow: auto; }
+.dshac-note { margin-top: 8px; color: var(--dsw-alias-state-warning-primary, #d69e2e); font-size: 12px; }
+.dshac-ok { color: var(--dsw-alias-state-success-primary, #34c759); }
+.dshac-chip { display: inline-flex; align-items: center; border: 1px solid rgba(80,120,255,.5); color: inherit;
+  background: rgba(80,120,255,.18); border-radius: 999px; padding: 1px 9px; font-size: 11px; }
+`;
+
+    async function api(path, opts) {
+      const ctrl = typeof AbortController !== 'undefined' ? new AbortController() : null;
+      const timer = ctrl ? setTimeout(() => ctrl.abort(), 30000) : null;
+      try {
+        const res = await fetch(API + path, { ...(opts || {}), signal: ctrl ? ctrl.signal : undefined });
+        const j = await res.json().catch(() => ({}));
+        if (!res.ok) throw new Error(j.error || ('HTTP ' + res.status));
+        return j;
+      } finally { if (timer) clearTimeout(timer); }
+    }
+
+    /** 详情页 subject 兼容提取：判断当前详情页是否本插件 */
+    function isOurPage(props) {
+      const sub = props && props.subject ? props.subject : props;
+      if (!sub) return false;
+      const name = sub.packageName ?? sub.name ?? sub.moduleName ?? sub.id ?? (typeof sub === 'string' ? sub : '');
+      return typeof name === 'string' && name.includes('dsh-artcraft');
+    }
+
+    function Dot({ ok }) {
+      return h('span', { className: 'dshac-dot ' + (ok === true ? 'ok' : ok === false ? 'bad' : 'unknown') });
+    }
+
+    /** 详情页标题旁的徽标：有新版本时出现 */
+    function UpdateBadge(props) {
+      const [latest, setLatest] = useState(null);
+      useEffect(() => {
+        if (!isOurPage(props)) return;
+        let ok = true;
+        api('/update/check').then((u) => { if (ok && u?.updateAvailable) setLatest(u.latest); }).catch(() => {});
+        return () => { ok = false; };
+      }, []);
+      if (!isOurPage(props) || !latest) return null;
+      return h('span', { className: 'dshac-chip', title: 'npm 上有新版本，到本页一键更新' }, '有新版本 v' + latest);
+    }
+
+    /** 详情页内容区：工具链状态 + 更新 */
+    function StatusSection(props) {
+      const [status, setStatus] = useState(null);
+      const [statusErr, setStatusErr] = useState(null);
+      const [upd, setUpd] = useState(null);
+      const [busy, setBusy] = useState('');
+      const [out, setOut] = useState('');
+      const [needRestart, setNeedRestart] = useState(false);
+      const ours = isOurPage(props);
+      const alive = useRef(true);
+      useEffect(() => () => { alive.current = false; }, []);
+
+      const loadStatus = useCallback(async () => {
+        try {
+          const s = await api('/status');
+          if (!alive.current) return;
+          setStatus(s); setStatusErr(null);
+        } catch (e) { if (alive.current) setStatusErr(String(e.message || e)); }
+      }, []);
+      const checkUpdate = useCallback(async () => {
+        setBusy('check'); setOut('');
+        try {
+          const u = await api('/update/check');
+          if (!alive.current) return;
+          setUpd(u);
+          setOut(u.updateAvailable
+            ? `有新版本：${u.latest}（当前 ${u.current}），安装方式：${u.mode === 'git' ? 'git 仓库' : 'npm 安装'}`
+            : `已是最新${u.latest ? '（npm latest ' + u.latest + '）' : ''}${u.note ? ' · ' + u.note : ''}`);
+        } catch (e) { if (alive.current) setOut('检查失败：' + String(e.message || e)); }
+        finally { if (alive.current) setBusy(''); }
+      }, []);
+      const applyUpdate = useCallback(async () => {
+        setBusy('apply'); setOut('');
+        try {
+          const r = await api('/update/apply', { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' });
+          if (!alive.current) return;
+          setOut((r.output || String(r.message || '')) + (r.needRestart ? '\n\n✅ 更新完成 —— 请重启 DeepSeek Harness 后生效。' : ''));
+          if (r.needRestart) setNeedRestart(true);
+        } catch (e) { if (alive.current) setOut('更新失败：' + String(e.message || e)); }
+        finally { if (alive.current) setBusy(''); }
+      }, []);
+
+      useEffect(() => {
+        if (!ours) return;
+        loadStatus(); checkUpdate();
+      }, [ours, loadStatus, checkUpdate]);
+
+      if (!ours) return null;
+
+      const bins = status?.bins ?? {};
+      const binRow = (key, label) => {
+        const b = bins[key];
+        return h('div', { className: 'dshac-row' },
+          h(Dot, { ok: b ? b.found : null }),
+          h('span', null, label),
+          b?.found ? null : h('span', { className: 'dshac-muted' }, b?.note || '未配置'),
+        );
+      };
+
+      return h('div', { className: 'dshac-card' },
+        h('div', { className: 'dshac-title' }, 'ArtCraft 工具链与更新',
+          h('button', { className: 'dshac-btn', onClick: loadStatus, disabled: busy !== '' }, '刷新')),
+        statusErr
+          ? h('div', { className: 'dshac-muted' }, '未连接：' + statusErr + '（插件可能未注册或 Harness 需要重启）')
+          : h('div', null,
+              binRow('photocraft', 'PhotoCraft (CLI)'),
+              binRow('filmcraft', 'FilmCraft (CLI)'),
+              binRow('effectcraft', 'EffectCraft (CLI)'),
+              status?.dataRoot ? h('div', { className: 'dshac-row dshac-muted' },
+                '数据目录：', h('span', { className: 'dshac-mono' }, status.dataRoot.path)) : null),
+        h('div', { className: 'dshac-row', style: { marginTop: '10px' } },
+          h('span', { className: 'dshac-muted' },
+            '当前 v' + (status?.version ?? upd?.current ?? '?') +
+            (upd ? ' · npm latest v' + (upd.latest ?? '—') : '') +
+            (upd?.mode ? '（' + (upd.mode === 'git' ? 'git 仓库' + (upd.gitClean === false ? ' · 有本地改动' : '') : 'npm 安装') + '）' : '')),
+          h('button', { className: 'dshac-btn primary', onClick: checkUpdate, disabled: busy !== '' },
+            busy === 'check' ? '检查中…' : '检查更新'),
+          h('button', {
+            className: 'dshac-btn',
+            onClick: applyUpdate,
+            disabled: busy !== '' || !upd?.updateAvailable,
+            title: upd?.updateAvailable ? '' : '有新版本时才可应用',
+          }, busy === 'apply' ? '更新中…' : '一键更新')),
+        needRestart ? h('div', { className: 'dshac-note' }, '更新已写入 —— 重启 DeepSeek Harness 后生效。') : null,
+        out ? h('div', { className: 'dshac-out' }, out) : null,
+      );
+    }
+
+    return {
+      inject: ['slots', 'locale'],
+      apply(ctx) {
+        ctx.effect(() => ctx.locale.register(NS, { zh: { artcraft: 'ArtCraft' }, en: { artcraft: 'ArtCraft' } }), 'artcraft: dictionaries');
+        ctx.effect(() => {
+          const el = document.createElement('style');
+          el.id = 'dshac-styles';
+          el.textContent = CSS;
+          document.head.appendChild(el);
+          return () => el.remove();
+        }, 'artcraft: styles');
+        // 插件页 → 本插件详情卡：标题旁徽标（有新版本时）
+        ctx.slots.inject('plugins.detail.badge', () => ctx.slots.register({
+          name: 'plugins.detail.badge',
+          id: 'artcraft-update-badge',
+          order: 50,
+          label: () => 'ArtCraft 更新',
+          locale: NS,
+        }, UpdateBadge));
+        // 插件页 → 本插件详情卡：内容区（工具链状态 + 检测更新 + 一键更新）
+        ctx.slots.inject('plugins.detail.section', () => ctx.slots.register({
+          name: 'plugins.detail.section',
+          id: 'artcraft-status',
+          order: 50,
+          label: () => 'ArtCraft 工具链与更新',
+          locale: NS,
+        }, StatusSection));
+      },
+    };
+  },
+});

package/index.js

@@ -39,10 +39,11 @@ import crypto from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 
 const NAME = 'artcraft';
-const VERSION = '0.1.1';
+const VERSION = '0.2.0';
 const HERE = path.dirname(fileURLToPath(import.meta.url));
 
 const BINS = ['photocraft', 'filmcraft', 'effectcraft'];
+const PKG_NAME = '@ninkch/dsh-artcraft';
 const DEFAULT_PORTS = { filmcraft: 9876, effectcraft: 9877 };
 
 const BODY_CAP = 2 * 1024 * 1024;            // 普通 JSON 请求体上限
@@ -152,14 +153,14 @@ function pushTail(arr, chunk) {
 }
 
 /** 运行子进程到结束；返回 {ok, code, signal, stdout, stderr, ms} */
-function runProcess(exe, args, { cwd, timeoutMs = 15 * 60_000 } = {}) {
+function runProcess(exe, args, { cwd, timeoutMs = 15 * 60_000, shell = false } = {}) {
   return new Promise((resolve) => {
     const started = Date.now();
     const stdout = [];
     const stderr = [];
     let child;
     try {
-      child = spawn(String(exe), (args ?? []).map(String), { cwd, windowsHide: true });
+      child = spawn(String(exe), (args ?? []).map(String), { cwd, windowsHide: true, shell });
     } catch (e) {
       resolve({ ok: false, code: -1, signal: null, stdout: '', stderr: String(e?.message ?? e), ms: 0 });
       return;
@@ -442,6 +443,131 @@ function makeRoute(path, handler) {
   };
 }
 
+/* ============================ 自更新（检查 / 应用） ============================ */
+
+function semverGt(a, b) {
+  const p = (s) => String(s ?? '').trim().replace(/^v/, '').split('.').map((n) => parseInt(n, 10) || 0);
+  const [a1, a2, a3] = p(a), [b1, b2, b3] = p(b);
+  return a1 !== b1 ? a1 > b1 : a2 !== b2 ? a2 > b2 : a3 > b3;
+}
+
+/** 探测本插件的安装形态：git 仓库（link 开发）还是 npm 安装 */
+async function detectInstall() {
+  const here = path.dirname(fileURLToPath(import.meta.url));
+  const real = await fs.realpath(here);
+  let dir = real;
+  let repoDir = null;
+  while (true) {
+    try {
+      const st = await fs.stat(path.join(dir, '.git'));
+      if (st.isDirectory() || st.isFile()) { repoDir = dir; break; }
+    } catch { /* 继续 */ }
+    const parent = path.dirname(dir);
+    if (parent === dir) break;
+    dir = parent;
+  }
+  let profileDir = null;
+  if (!repoDir) {
+    dir = path.dirname(here);
+    while (true) {
+      try {
+        const txt = await fs.readFile(path.join(dir, 'package.json'), 'utf8');
+        if (txt.includes('"dsh"')) { profileDir = dir; break; }
+      } catch { /* 继续 */ }
+      const parent = path.dirname(dir);
+      if (parent === dir) break;
+      dir = parent;
+    }
+  }
+  let gitClean = null;
+  let branch = null;
+  if (repoDir) {
+    const st = await runProcess('git', ['status', '--porcelain'], { cwd: repoDir, timeoutMs: 20000 });
+    gitClean = st.ok && st.stdout.trim() === '';
+    const b = await runProcess('git', ['branch', '--show-current'], { cwd: repoDir, timeoutMs: 20000 });
+    branch = (b.stdout || '').trim() || null;
+  }
+  return { mode: repoDir ? 'git' : 'npm', here, real, repoDir, profileDir, gitClean, branch };
+}
+
+async function fetchLatestVersion() {
+  const url = `https://registry.npmjs.org/${PKG_NAME.replace('/', '%2f')}/latest`;
+  try {
+    const res = await fetch(url, { signal: AbortSignal.timeout(12000) });
+    if (res.status === 404) return { latest: null, note: 'npm 上还没有这个包' };
+    if (!res.ok) throw new Error('registry 返回 ' + res.status);
+    const j = await res.json();
+    return { latest: j.version ?? null };
+  } catch (e) {
+    return { latest: null, note: '查询 npm 失败: ' + String(e?.cause?.message || e?.message || e) };
+  }
+}
+
+async function updateCheck() {
+  const current = VERSION;
+  const { latest, note } = await fetchLatestVersion();
+  const info = await detectInstall();
+  return {
+    current,
+    latest,
+    updateAvailable: !!(latest && semverGt(latest, current)),
+    mode: info.mode,
+    repoDir: info.repoDir,
+    gitClean: info.gitClean,
+    branch: info.branch,
+    note,
+  };
+}
+
+async function findRuntimeTools() {
+  const isWin = process.platform === 'win32';
+  const pnCmd = isWin ? 'pnpm.cmd' : 'pnpm';
+  const probe = await runProcess(pnCmd, ['--version'], { timeoutMs: 20000 });
+  if (probe.ok) return { pnpmCmd: pnCmd };
+  try {
+    const rtRoot = path.join(os.homedir(), '.dsh', 'dsh-runtimes');
+    const entries = await fs.readdir(rtRoot, { withFileTypes: true });
+    for (const e of entries) {
+      if (!e.isDirectory()) continue;
+      const pnpmMjs = path.join(rtRoot, e.name, 'dependencies', 'pnpm', 'bin', 'pnpm.mjs');
+      const nodeExe = path.join(rtRoot, e.name, 'dependencies', 'node', 'bin', isWin ? 'node.exe' : 'node');
+      if ((await fileExists(pnpmMjs)) && (await fileExists(nodeExe))) {
+        return { nodeExe, pnpmMjs };
+      }
+    }
+  } catch { /* ignore */ }
+  return {};
+}
+
+async function updateApply() {
+  const info = await detectInstall();
+  const { latest } = await fetchLatestVersion();
+  if (!latest) throw new Error('npm 上没有可用的发布版本');
+  if (!semverGt(latest, VERSION)) return { ok: true, message: `已是最新（${VERSION}）`, needRestart: false };
+
+  if (info.mode === 'git') {
+    if (info.gitClean === false) {
+      throw new Error('插件目录有未提交的本地改动，为避免覆盖请先 git commit / stash，再执行更新');
+    }
+    const r = await runProcess('git', ['pull', '--ff-only'], { cwd: info.repoDir, timeoutMs: 120000 });
+    return { ok: r.ok, output: (r.stdout + '\n' + r.stderr).trim(), needRestart: r.ok, latest };
+  }
+
+  // npm 安装模式
+  if (!info.profileDir) throw new Error('未定位到 Harness profile 目录，无法自动更新');
+  const tools = await findRuntimeTools();
+  let cmd, args;
+  if (tools.pnpmCmd) {
+    cmd = tools.pnpmCmd; args = ['add', `${PKG_NAME}@latest`, '--dir', info.profileDir];
+  } else if (tools.pnpmMjs) {
+    cmd = tools.nodeExe; args = [tools.pnpmMjs, 'add', `${PKG_NAME}@latest`, '--dir', info.profileDir];
+  } else {
+    throw new Error('未找到 pnpm（PATH 与 ~/.dsh/dsh-runtimes 均未命中），请手动在 profile 目录执行 pnpm add');
+  }
+  const r = await runProcess(cmd, args, { cwd: info.profileDir, timeoutMs: 300000, shell: !!tools.pnpmCmd });
+  return { ok: r.ok, output: (r.stdout + '\n' + r.stderr).trim(), needRestart: r.ok, latest };
+}
+
 /* ============================ 插件入口 ============================ */
 
 const toolNames = [];
@@ -584,6 +710,23 @@ export function apply(ctx) {
       },
     });
 
+    attempt({
+      name: 'artcraft_update',
+      description: '检查/应用 @ninkch/dsh-artcraft 插件自身的更新：action=check 对比本地与 npm latest；action=apply 执行更新（git pull 或 pnpm add，按安装形态自动选择），完成后需重启 Harness 生效。',
+      schema: {
+        type: 'object',
+        properties: {
+          action: { type: 'string', enum: ['check', 'apply'] },
+        },
+        required: ['action'],
+        additionalProperties: false,
+      },
+      async execute(args) {
+        if (String(args.action) === 'apply') return updateApply();
+        return updateCheck();
+      },
+    });
+
     return () => {
       for (const d of disposers) { try { d(); } catch { /* ignore */ } }
     };
@@ -739,6 +882,15 @@ export function apply(ctx) {
         }
       }),
 
+      makeRoute(`/${NAME}/api/update/check`, async (req, res) => {
+        sendJson(res, 200, await updateCheck());
+      }),
+
+      makeRoute(`/${NAME}/api/update/apply`, async (req, res) => {
+        if (req.method !== 'POST') throw new Error('仅支持 POST');
+        sendJson(res, 200, await updateApply());
+      }),
+
       makeRoute(`/${NAME}/api/control`, async (req, res) => {
         if (req.method !== 'POST') throw new Error('仅支持 POST');
         const cfg = await loadConfig();

package/package.json

@@ -1,8 +1,8 @@
-{
+{
   "name": "@ninkch/dsh-artcraft",
-  "version": "0.1.1",
+  "version": "0.2.1",
   "type": "module",
-  "description": "Drive the open-source ArtCraft studio apps (PhotoCraft / FilmCraft / EffectCraft) from DeepSeek Harness — agent tools + a same-origin HTTP API for headless CLI runs and the JSON control channel.",
+  "description": "Drive the open-source ArtCraft studio apps (PhotoCraft / FilmCraft / EffectCraft) from DeepSeek Harness — agent tools, a same-origin HTTP API, and a sidebar panel with toolchain status and self-update.",
   "keywords": [
     "deepseek-harness",
     "dsh-plugin",
@@ -14,15 +14,25 @@
     "ai-agents"
   ],
   "license": "Apache-2.0",
+  "author": "NINKCH",
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/NINKCH/dsh-artcraft.git"
+  },
   "engines": {
     "node": ">=18"
   },
   "exports": {
     ".": "./index.js",
+    "./client": "./client.js",
     "./package.json": "./package.json"
   },
   "files": [
     "index.js",
+    "client.js",
     "cordis.patch.yml",
     "artcraft.config.json.example",
     "README.md",
@@ -32,6 +42,10 @@
   "dsh": {
     "bundle": {
       "patch": "./cordis.patch.yml"
+    },
+    "client": {
+      "platform": "web",
+      "immediately": true
     }
   }
 }