lume-dsh-plugin 0.7.2 → 0.7.3

package/lib/host/rpc-bridge.js

@@ -0,0 +1,122 @@
+/**
+ * Connection RPC 的**桥接协议**实现（纯函数 + 一个路由工厂）。
+ *
+ * 为什么需要它：宿主 `connection.rpc.handle(channel, handler)` 内部要求
+ * 「频道注册属于**调用方 fiber**」（见 dsh-client-connection 的 `register(owner, …)` →
+ * `owner.effect(() => owner.webServer.register(route))`），在 DSH Desktop 0.9.1 上我们的
+ * 入口 fiber 解析不到 `webServer` → 抛 `cannot get property "webServer" without inject`。
+ * 于是准备一条**不依赖 connection.rpc 的回退路径**：照宿主自己的写法把 HTTP 路由挂到
+ * `webServer` 上（宿主自带的 dsh-ppt 就是这么做的），报文与客户端 `conn.rpc.call` 完全一致：
+ *
+ *   请求  POST {channel}/{endpoint}   content-type: application/json
+ *         { type: "client-request", rpcId, method: endpoint, payload }
+ *   响应  200 { type: "server-response", rpcId, result: { ok, value|error } }
+ *
+ * 纯函数部分（解析/组装）可单测，路由工厂只做 Node req/res 的胶水。
+ */
+/** 端点段白名单，与宿主 ENDPOINT_SEGMENT_PATTERN 一致。 */
+const ENDPOINT_SEGMENT_PATTERN = /^[A-Za-z0-9_$.-]+$/;
+/** 组装一条回信（含 rpcId 与错误信封补全）。 */
+export function connectionResponse(rpcId, result) {
+    return JSON.stringify({ type: "server-response", rpcId, result: withErrorDetails(result) });
+}
+/**
+ * 补全错误信封：客户端的 `parseConnectionResponse` 要求失败时
+ * `error.details` 是对象，缺失会直接抛 "invalid server-response failure"。
+ * （这是 0.7.2 之前一直存在的隐患：任何错误路径都会让客户端调用炸掉。）
+ */
+export function withErrorDetails(result) {
+    const envelope = result;
+    if (!envelope || typeof envelope !== "object" || envelope.ok !== false)
+        return result;
+    const error = envelope.error ?? {};
+    return {
+        ok: false,
+        error: {
+            code: typeof error.code === "string" ? error.code : "bad-request",
+            message: typeof error.message === "string" ? error.message : "unknown error",
+            details: error.details && typeof error.details === "object" ? error.details : {},
+        },
+    };
+}
+/** 解析客户端请求。与宿主的 rpcFetchHandler 语义对齐（404/415/400 + 信封校验）。 */
+export function parseClientRequest(channel, request) {
+    if ((request.method ?? "GET").toUpperCase() !== "POST")
+        return { kind: "respond", status: 404, body: "not found", contentType: "text/plain" };
+    const pathname = (request.url ?? "/").split("?")[0] ?? "/";
+    if (!pathname.startsWith(`${channel}/`))
+        return { kind: "respond", status: 404, body: "not found", contentType: "text/plain" };
+    const endpoint = pathname.slice(channel.length + 1);
+    if (endpoint.split("/").some((segment) => segment === "" || segment === "." || segment === ".." || !ENDPOINT_SEGMENT_PATTERN.test(segment))) {
+        return { kind: "respond", status: 404, body: "not found", contentType: "text/plain" };
+    }
+    const mime = (request.contentType ?? "").split(";")[0]?.trim().toLowerCase();
+    if (mime !== "application/json")
+        return { kind: "respond", status: 415, body: "content type must be application/json", contentType: "text/plain" };
+    let body;
+    try {
+        body = JSON.parse(request.rawBody);
+    }
+    catch {
+        return { kind: "respond", status: 400, body: "body is not JSON", contentType: "text/plain" };
+    }
+    const envelope = body;
+    if (!envelope || typeof envelope !== "object" || envelope.type !== "client-request" || typeof envelope.rpcId !== "string" || typeof envelope.method !== "string") {
+        const rpcId = typeof envelope?.rpcId === "string" ? String(envelope.rpcId) : "invalid-request";
+        return { kind: "respond", status: 200, body: connectionResponse(rpcId, { ok: false, error: { code: "gateway/bad-request", message: "invalid client-request message" } }), contentType: "application/json" };
+    }
+    if (envelope.method !== endpoint) {
+        return { kind: "respond", status: 200, body: connectionResponse(envelope.rpcId, { ok: false, error: { code: "gateway/bad-request", message: `endpoint mismatch: ${envelope.method} vs ${endpoint}` } }), contentType: "application/json" };
+    }
+    return { kind: "dispatch", rpcId: envelope.rpcId, endpoint, payload: envelope.payload };
+}
+/**
+ * 组装可交给 `webServer.register()` 的路由（宿主自带 dsh-ppt 同形：
+ * `{ kind: "prefix", path: channel, handler(req, res) }`）。
+ *
+ * @param channel - RPC 频道（须匹配 /^\/[A-Za-z0-9._~-]+$/，且不得为 /api）
+ * @param dispatch - 业务分发（endpoint + payload → lume 信封）
+ * @param guard - 可选的浏览器信任闸（宿主 connection.requestRejection），返回状态码即拒绝
+ */
+export function makeRpcRoute(channel, dispatch, guard) {
+    return {
+        kind: "prefix",
+        path: channel,
+        handler: async (req, res) => {
+            const rejection = guard?.(req);
+            if (rejection !== undefined) {
+                res.writeHead(rejection);
+                res.end(rejection === 401 ? "unauthorized" : "forbidden");
+                return;
+            }
+            let rawBody = "";
+            try {
+                for await (const chunk of req)
+                    rawBody += typeof chunk === "string" ? chunk : String(chunk);
+            }
+            catch {
+                /* 客户端断开：下面按空 body 处理并回 400 */
+            }
+            const parsed = parseClientRequest(channel, {
+                method: req?.method,
+                url: req?.url,
+                contentType: req?.headers?.["content-type"] ?? null,
+                rawBody,
+            });
+            if (parsed.kind === "respond") {
+                res.writeHead(parsed.status, { "content-type": parsed.contentType });
+                res.end(parsed.body);
+                return;
+            }
+            let result;
+            try {
+                result = await dispatch(parsed.endpoint, parsed.payload);
+            }
+            catch (error) {
+                result = { ok: false, error: { code: "internal", message: String(error?.message ?? error) } };
+            }
+            res.writeHead(200, { "content-type": "application/json" });
+            res.end(connectionResponse(parsed.rpcId, result));
+        },
+    };
+}

package/lib/index.js

@@ -21,6 +21,7 @@ import z from "@deepseek-ai/schemastery";
 import { buildPersonaContractSection, buildPersonaRuntimeSection } from "./host/injection.js";
 import { loadPersonalities, NONE_PERSONA } from "./host/personalities.js";
 import { createLumeRpcHandler } from "./host/rpc.js";
+import { makeRpcRoute } from "./host/rpc-bridge.js";
 import { FilePersonaStore, migrateLegacyState, PersonaStore } from "./host/store.js";
 import { IdentityStore, LUME_IDENTITY_SPEC, zodLike } from "./host/identity.js";
 import { PersonaRegistry } from "./host/registry.js";
@@ -1290,22 +1291,57 @@ function applyInner(ctx, config = {}) {
      * inject 回调里调用（不包 effect）。没有 web 载体的宿主（headless）只是没有 RPC 通道。
      */
     function registerRpcChannel(scope) {
-        scope.inject(["webServer"], (webCtx) => {
+        const dispatch = async (endpoint, payload) => {
+            currentStore ??= await storesReady;
+            identity ??= await identityReady;
+            return handleEndpoint(endpoint, payload);
+        };
+        // 依赖组合与宿主自带 dsh-api-gateway 一致（["connection", "webServer"]）。
+        scope.inject(["connection", "webServer"], (webCtx) => {
+            const notes = [];
             try {
+                // ── 主路径：宿主公开 API。频道注册归属**调用方 fiber**，所以必须在注入作用域里调用。
                 webCtx.connection.rpc.handle(LUME_CHANNEL, async (endpoint, payload) => {
-                    currentStore ??= await storesReady;
-                    identity ??= await identityReady;
-                    const result = await handleEndpoint(endpoint, payload);
+                    const result = await dispatch(endpoint, payload);
                     if (endpoint !== "list" && endpoint !== "getSessionPersona") {
-                        webCtx.logger?.warn?.(`lume: rpc ${endpoint} ${JSON.stringify(payload ?? {})} → ok=${result.ok}${result.ok ? "" : ` code=${result.error.code}`}`);
+                        webCtx.logger?.warn?.(`lume: rpc ${endpoint} → ok=${result.ok}${result.ok ? "" : ` code=${result.error.code}`}`);
                     }
                     return result;
                 }, { authority: "trusted-host" });
+                notes.push("connection.rpc.handle");
             }
             catch (error) {
-                // 局部兜底：RPC 通道起不来只是菜单不可用，人设注入与工具必须照常。
-                webCtx.logger?.error?.("lume: RPC 通道注册失败（仅客户端菜单不可用，其余功能不受影响）", error);
+                notes.push(`rpc.handle 失败(${describeError(error)})`);
+                // ── 回退：自己往 webServer 注册 HTTP 路由（宿主自带 dsh-ppt 的写法）。
+                // 报文与客户端 conn.rpc.call 完全一致，见 host/rpc-bridge.ts。
+                try {
+                    const guard = typeof webCtx.connection?.requestRejection === "function"
+                        ? (req) => webCtx.connection.requestRejection(req)
+                        : undefined;
+                    webCtx.webServer.register(makeRpcRoute(LUME_CHANNEL, dispatch, guard));
+                    notes.push("webServer.register(自注册路由)");
+                }
+                catch (fallbackError) {
+                    notes.push(`webServer.register 失败(${describeError(fallbackError)})`);
+                }
             }
+            // 两条都失败时补上环境形状，便于下一轮定位（宿主 API 变更时这行就是证据）。
+            if (!notes.some((note) => !note.includes("失败"))) {
+                notes.push(`shapes: connection=${typeof webCtx.connection} rpc=${typeof webCtx.connection?.rpc} handle=${typeof webCtx.connection?.rpc?.handle} webServer=${typeof webCtx.webServer} get=${typeof webCtx.get}`);
+            }
+            webCtx.logger?.warn?.(`lume: RPC 通道 ${LUME_CHANNEL} = ${notes.join(" | ")}`);
         });
     }
+    /** 把任意抛出物变成可读的一行（宿主 logger 直接打对象会变成 `{}`，所以要自己转字符串）。 */
+    function describeError(error) {
+        if (error instanceof Error)
+            return error.message;
+        try {
+            const text = JSON.stringify(error);
+            return text && text !== "{}" ? text : String(error);
+        }
+        catch {
+            return String(error);
+        }
+    }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lume-dsh-plugin",
   "description": "微光 (Lume) — DSH Desktop 增强插件：给会话装上工程纪律与真实关系。纪律层约束「如何正确完成任务」——意图路由、阶段门控、真实工具证据、交付前复核、文档能力感知；方法层把量化需求、改动台账、假设台账与项目知识变成可检查的产出，并用行为触发器在轨迹上纠偏（撒网不收敛 / 连写不验 / 死路重撞）；人设层塑造「以何种风格表达」——从聊天记录、小说、剧本、设定文档蒸馏具名角色，长期记忆与风格随对话演进。约束按需注入，闲聊不额外付 token。",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "type": "module",
   "main": "lib/index.js",
   "exports": {