dsh-pictor 0.2.2 → 0.2.3

package/README.md

@@ -22,7 +22,7 @@ Replace `<profile>` with the target profile name (e.g. `desktop`, `web`) and sta
 
 ## Supported dsh version
 
-Pictor is built and tested against **DSH Desktop 0.7.2** (bundled Harness **0.1.2-alpha.1**). The DeepSeek Harness client API moves quickly — the workspace/session services it exposes keep changing — so this plugin intentionally tracks one harness generation. Other versions (older or newer) may work or may break without notice, and are outside our support scope. If something stops working after a DSH update, update dsh to the version above rather than debugging the mismatch.
+Pictor is built and tested against **DSH Desktop 0.9.0** (bundled Harness **0.1.5-rc.2**). The DeepSeek Harness client API moves quickly — the workspace/session services it exposes keep changing — so this plugin intentionally tracks one harness generation. Other versions (older or newer) may work or may break without notice, and are outside our support scope. If something stops working after a DSH update, update dsh to the version above rather than debugging the mismatch.
 
 ## Usage
 

package/lib/client.js

@@ -398,9 +398,14 @@ function t(key, vars) {
 
 // ---------- 工具 ----------
 
+// RPC 走 webServer 的 /pictor/rpc/* prefix 路由（同源 HTTP，不再经 connection.rpc.call）。
 function rpc(ctx, endpoint, payload) {
   // 服务端 schema 要求 payload 字段必须存在（对象）；缺省补 {}，否则序列化丢键被拒。
-  return ctx.connection.rpc.call(RPC, endpoint, payload === undefined ? {} : payload).then((result) => {
+  return fetch(RPC + '/rpc/' + encodeURIComponent(endpoint), {
+    method: 'POST',
+    headers: { 'content-type': 'application/json' },
+    body: JSON.stringify(payload === undefined ? {} : payload),
+  }).then((r) => r.json()).then((result) => {
     if (result && result.ok === false) {
       const msg = result.error && result.error.message ? result.error.message : String(result.error || 'RPC 调用失败')
       throw new Error(msg)
@@ -490,14 +495,27 @@ function sanitizePaste(html) {
 // 在就调哪个，老版本前端不受影响。
 function sessionConnectFn(ctx, ws) {
   let uiWs = null
-  try { uiWs = ctx.uiWorkspace || ((ctx.get && ctx.get('uiWorkspace')) || null) } catch { /* ignore */ }
+  try { uiWs = (ctx.get && ctx.get('uiWorkspace')) || null } catch { /* ignore */ }
   return (uiWs && typeof uiWs.connectWorkspace === 'function')
     ? uiWs.connectWorkspace.bind(uiWs)
     : (ws && typeof ws.connectWorkspace === 'function') ? ws.connectWorkspace.bind(ws) : null
 }
 
+/**
+ * 从 workspaces.connectWorkspace / sessions.create 的返回里取 sessionId。
+ * 0.1.5 起 create/connectWorkspace 返回 {ok, value:{sessionId}} 信封；
+ * 早版本直接返回 id 字符串或 {id}。这里全兼容。
+ */
+function extractSid(created) {
+  if (!created) return null
+  if (typeof created === 'string') return created
+  return created.sessionId || created.id
+    || (created.value && (created.value.sessionId || created.value.id))
+    || null
+}
+
 async function pictorWorkspace(ctx) {
-  const ws = ctx.workspaces || (ctx.get && ctx.get('workspaces'))
+  const ws = (ctx.get && ctx.get('workspaces'))
   const base = await rpc(ctx, 'config.get').then((c) => (c && c.dataRoot) || '')
   // 这里只用 list/create/delete/rename，新旧 services 都有；connectWorkspace
   // 的可用性由 driveProjectSession 检查。
@@ -540,13 +558,13 @@ async function pictorWorkspace(ctx) {
 }
 
 async function driveProjectSession(ctx, prompt) {
-  const ws = ctx.workspaces || (ctx.get && ctx.get('workspaces'))
-  const sessionsSvc = ctx.sessions || (ctx.get && ctx.get('sessions'))
+  const ws = (ctx.get && ctx.get('workspaces'))
+  const sessionsSvc = (ctx.get && ctx.get('sessions'))
   const connect = sessionConnectFn(ctx, ws)
   const canCreate = !!(sessionsSvc && typeof sessionsSvc.create === 'function')
   if (!(connect || canCreate) || !(sessionsSvc && typeof sessionsSvc.binding === 'function')) {
     let uiWs = null
-    try { uiWs = ctx.uiWorkspace || ((ctx.get && ctx.get('uiWorkspace')) || null) } catch { /* ignore */ }
+    try { uiWs = (ctx.get && ctx.get('uiWorkspace')) || null } catch { /* ignore */ }
     const diag = { ws: !!ws, ses: !!sessionsSvc && typeof sessionsSvc.binding === 'function', uiws: !!uiWs, conn: !!connect, create: canCreate }
     console.warn('[pictor] session services unavailable', diag)
     try { window.__pictor_diag = diag } catch { /* ignore */ }
@@ -557,7 +575,7 @@ async function driveProjectSession(ctx, prompt) {
   let sessionId
   try {
     const created = connect ? await connect(wid) : await sessionsSvc.create({ workspaceId: wid })
-    sessionId = created && typeof created === 'object' && created.id ? created.id : created
+    sessionId = extractSid(created)
   }
   catch (e) { throw new Error('创建会话失败：' + String((e && e.message) || e)) }
   const bound = sessionsSvc && typeof sessionsSvc.binding === 'function' ? sessionsSvc.binding(sessionId) : null
@@ -573,7 +591,7 @@ async function driveProjectSession(ctx, prompt) {
 async function drivePrompt(ctx, id, message) {
   const p = await rpc(ctx, 'project.prompt', { id, message })
   if (p && p.sessionId) {
-    const sessionsSvc = ctx.sessions || (ctx.get && ctx.get('sessions'))
+    const sessionsSvc = (ctx.get && ctx.get('sessions'))
     if (sessionsSvc && typeof sessionsSvc.binding === 'function') {
       try {
         const bound = sessionsSvc.binding(p.sessionId)
@@ -1710,9 +1728,9 @@ function selectedLabel(ids) {
 // 调整了客户端 API），host 落盘 ~/.pictor/diag.jsonl，无需 DevTools 即可排查。
 function pictorDiag(ctx, phase) {
   let ws = null, ses = null, ui = null
-  try { ws = ctx && (ctx.workspaces || (ctx.get && ctx.get('workspaces'))) } catch { /* ignore */ }
-  try { ses = ctx && (ctx.sessions || (ctx.get && ctx.get('sessions'))) } catch { /* ignore */ }
-  try { ui = ctx && (ctx.uiWorkspace || (ctx.get && ctx.get('uiWorkspace'))) } catch { /* ignore */ }
+  try { ws = ctx && (ctx.get && ctx.get('workspaces')) } catch { /* ignore */ }
+  try { ses = ctx && (ctx.get && ctx.get('sessions')) } catch { /* ignore */ }
+  try { ui = ctx && (ctx.get && ctx.get('uiWorkspace')) } catch { /* ignore */ }
   const body = {
     phase,
     ws: !!ws, ses: !!ses, ui: !!ui,
@@ -1730,7 +1748,7 @@ function pictorDiag(ctx, phase) {
 
 function apply(ctx) {
   try { pictorDiag(ctx, 'apply') } catch { /* ignore */ }
-  console.info('[dsh-pictor] apply 被调用', { hasSlots: Boolean(ctx && ctx.slots) })
+  console.info('[dsh-pictor] apply 被调用', { hasSlots: Boolean(ctx.get && ctx.get('slots')) })
   if (typeof document !== 'undefined') {
     const styleId = 'dsh-pictor-style'
     if (!document.getElementById(styleId)) {
@@ -1740,7 +1758,7 @@ function apply(ctx) {
       document.head.appendChild(style)
     }
   }
-  const slots = ctx.slots || (ctx.get && ctx.get('slots'))
+  const slots = (ctx.get && ctx.get('slots'))
   if (!slots) return
 
   const panel = { open: false, subs: new Set() }

package/lib/index.js

@@ -106,7 +106,7 @@ function initialPrompt(dir) {
   return prompts.join("\n");
 }
 function apply(ctx, config = {}) {
-  const connection = ctx.connection;
+  const connection = ctx.get?.("connection");
   const base = config.dataDir || process.env.PICTOR_HOME || join(homedir(), ".pictor");
   const INDEX_JSON = join(base, "index.json");
   const CONFIG_JSON = join(base, "pictor-config.json");
@@ -171,7 +171,7 @@ function apply(ctx, config = {}) {
   }
   function credentialsService() {
     try {
-      return ctx.credentials || ctx.get?.("credentials");
+      return ctx.get?.("credentials");
     } catch {
       return null;
     }
@@ -676,20 +676,36 @@ function apply(ctx, config = {}) {
         throw new Error(`dsh-pictor: \u672A\u77E5\u7AEF\u70B9 ${endpoint}`);
     }
   }
-  if (connection && connection.rpc && connection.rpc.handle) {
-    connection.rpc.handle("/pictor", async (endpoint, payload) => {
-      try {
-        return { ok: true, value: await handle(endpoint, payload || {}) };
-      } catch (e) {
-        logError(`rpc:${endpoint}`, e);
-        return { ok: false, error: { code: "internal", message: String(e?.message || e), details: {} } };
-      }
-    }, { authority: "loopback" });
-  }
-  const wsA = ctx.webServer || ctx.get?.("webServer");
+  const wsA = ctx.get?.("webServer");
   if (wsA && typeof wsA.register === "function") {
     const IMG_CACHE = { "content-type": "image/png", "cache-control": "public, max-age=3600" };
     const WEBP_CACHE = { "content-type": "image/webp", "cache-control": "public, max-age=3600" };
+    const RPC_PREFIX = "/pictor/rpc";
+    wsA.register({ kind: "prefix", path: RPC_PREFIX, handler: async (req, res) => {
+      try {
+        const pathname = new URL(req.url || "/", "http://x").pathname;
+        const endpoint = decodeURIComponent(pathname.slice(RPC_PREFIX.length + 1));
+        let payload = {};
+        if (req.method === "POST" || req.method === "PUT") {
+          const chunks = [];
+          for await (const c of req) chunks.push(Buffer.isBuffer(c) ? c : Buffer.from(c));
+          const raw = Buffer.concat(chunks).toString("utf8");
+          if (raw) payload = JSON.parse(raw);
+        }
+        try {
+          const value = await handle(endpoint, payload || {});
+          res.writeHead(200, { "content-type": "application/json" });
+          res.end(JSON.stringify({ ok: true, value }));
+        } catch (e) {
+          logError(`rpc:${endpoint}`, e);
+          res.writeHead(200, { "content-type": "application/json" });
+          res.end(JSON.stringify({ ok: false, error: { code: "internal", message: String(e?.message || e), details: {} } }));
+        }
+      } catch {
+        res.writeHead(400);
+        res.end("bad request");
+      }
+    } });
     wsA.register({ kind: "exact", path: "/pictor/asset/empty-state.png", handler: (_req, res) => {
       res.writeHead(200, IMG_CACHE);
       res.end(readFileSync(join(PLUGIN_ROOT, "assets", "empty-state.png")));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-pictor",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Pictor：文档转信息图工作台。每项目一个连贯 dsh 会话，GUI 为 shell.overlay 工作台（左栏项目、右栏三步：提取/方案/渲染），行为全部交给 DSH 智能运行时。",
   "type": "module",
   "repository": {
@@ -30,10 +30,10 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-ui-theme",
         "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-settings"
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-workspace"
       ],
       "platform": "web"
     }
@@ -65,10 +65,11 @@
     "dsh-app-dock": "^0.1.2"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.6",
+    "@deepseek-ai/cordis": "^4.0.2",
     "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-theme": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-workspace": "^0.1.0-rc.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -84,4 +85,4 @@
     "@playwright/test": "^1.62.1",
     "esbuild": "^0.28.2"
   }
-}
+}