@rezti/dsh-rez-wechat 0.1.7 → 0.1.8

package/lib/web-shim.d.ts

@@ -35,9 +35,16 @@ export declare function sessionStorePath(env?: NodeJS.ProcessEnv, home?: string)
 export declare function webBaseUrl(env?: NodeJS.ProcessEnv): string;
 export declare function loadSessionStore(path: string): SessionStore;
 export declare function saveSessionStore(path: string, store: SessionStore): void;
+export declare function encodeClientRequest(method: string, payload: Record<string, unknown>, rpcId?: `${string}-${string}-${string}-${string}-${string}`): {
+    type: 'client-request';
+    rpcId: string;
+    method: string;
+    payload: Record<string, unknown>;
+};
 export declare function unwrapRpc(body: unknown): unknown;
 export declare function rpcErrorMessage(body: unknown): string | undefined;
 export declare function extractSessionId(body: unknown): string | undefined;
+export declare function extractWorkspaceId(body: unknown): string | undefined;
 export declare function historyEvents(body: unknown): unknown[];
 export declare function lastAssistantText(events: unknown[]): string;
 export declare function turnIsIdle(events: unknown[]): boolean;

package/lib/web-shim.js

@@ -7,6 +7,7 @@
  * folder is named 微信, turns continue, and the model follows the web default
  * (Kimi if that is what the user selected).
  */
+import { randomUUID } from 'node:crypto';
 import { chmodSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { basename, dirname, join } from 'node:path';
@@ -70,10 +71,19 @@ export function saveSessionStore(path, store) {
     mkdirSync(dirname(path), { recursive: true });
     writeFileSync(path, JSON.stringify(store, null, 2), 'utf8');
 }
+export function encodeClientRequest(method, payload, rpcId = randomUUID()) {
+    return { type: 'client-request', rpcId, method, payload };
+}
 export function unwrapRpc(body) {
     if (typeof body !== 'object' || body === null)
         return body;
     const rec = body;
+    if (rec.type === 'server-response' && typeof rec.result === 'object' && rec.result !== null) {
+        const result = rec.result;
+        if (result.ok === true)
+            return result.value;
+        return rec.result;
+    }
     if (rec.error !== undefined)
         return rec;
     if (typeof rec.result === 'object' && rec.result !== null)
@@ -116,6 +126,21 @@ export function extractSessionId(body) {
     }
     return undefined;
 }
+export function extractWorkspaceId(body) {
+    if (typeof body !== 'object' || body === null)
+        return undefined;
+    const rec = body;
+    if (typeof rec.workspaceId === 'string')
+        return rec.workspaceId;
+    if (typeof rec.workspace === 'object' && rec.workspace !== null) {
+        const nested = rec.workspace;
+        if (typeof nested.workspaceId === 'string')
+            return nested.workspaceId;
+        if (typeof nested.id === 'string')
+            return nested.id;
+    }
+    return undefined;
+}
 function flattenText(content) {
     if (typeof content === 'string')
         return content;
@@ -134,22 +159,25 @@ function flattenText(content) {
     })
         .join('');
 }
+function unwrapHistoryItem(item) {
+    if (typeof item !== 'object' || item === null)
+        return item;
+    const rec = item;
+    return rec.event ?? item;
+}
 export function historyEvents(body) {
     const unwrapped = unwrapRpc(body);
     if (Array.isArray(unwrapped))
-        return unwrapped;
+        return unwrapped.map(unwrapHistoryItem);
     if (typeof unwrapped !== 'object' || unwrapped === null)
         return [];
     const rec = unwrapped;
-    if (Array.isArray(rec.events))
-        return rec.events;
-    if (Array.isArray(rec.messages))
-        return rec.messages;
-    if (Array.isArray(rec.items))
-        return rec.items;
-    if (Array.isArray(rec.log))
-        return rec.log;
-    return [];
+    const raw = Array.isArray(rec.events) ? rec.events
+        : Array.isArray(rec.messages) ? rec.messages
+            : Array.isArray(rec.items) ? rec.items
+                : Array.isArray(rec.log) ? rec.log
+                    : [];
+    return raw.map(unwrapHistoryItem);
 }
 export function lastAssistantText(events) {
     let text = '';
@@ -197,12 +225,14 @@ function collectModelRows(input, out, depth = 0, inheritedProvider) {
     if (typeof input !== 'object')
         return;
     const rec = input;
+    const isGroup = Array.isArray(rec.models);
+    const groupProvider = isGroup && typeof rec.id === 'string' ? rec.id : inheritedProvider;
     const provider = typeof rec.provider === 'string' ? rec.provider
         : typeof rec.providerID === 'string' ? rec.providerID
             : typeof rec.adapter === 'string' ? rec.adapter
-                : inheritedProvider;
+                : groupProvider;
     const model = typeof rec.model === 'string' ? rec.model
-        : typeof rec.id === 'string' && !rec.id.startsWith('session') ? rec.id
+        : !isGroup && typeof rec.id === 'string' && !rec.id.startsWith('session') ? rec.id
             : undefined;
     if (model !== undefined)
         out.push(provider !== undefined ? { provider, model } : { model });
@@ -250,12 +280,9 @@ export function pickWechatModel(models, env = process.env) {
     return coding ?? kimi[0];
 }
 export function selectModelPayloads(sessionId, ref) {
-    const payloads = [
-        { sessionId, model: ref.model, ...(ref.provider !== undefined ? { provider: ref.provider } : {}) },
-        { sessionId, selection: ref },
-        { sessionId, model: ref },
-    ];
-    return payloads;
+    if (ref.provider === undefined)
+        return [];
+    return [{ sessionId, provider: ref.provider, model: ref.model }];
 }
 export function writeWeixinDshLauncher(opts) {
     mkdirSync(opts.dataDir, { recursive: true });
@@ -283,12 +310,13 @@ async function sleep(ms) {
 }
 export async function postRpc(baseUrl, method, params) {
     const url = `${baseUrl.replace(/\/$/, '')}/api/${method}`;
+    const envelope = encodeClientRequest(method, params);
     let response;
     try {
         response = await fetch(url, {
             method: 'POST',
             headers: { 'content-type': 'application/json' },
-            body: JSON.stringify(params),
+            body: JSON.stringify(envelope),
         });
     }
     catch (error) {
@@ -312,10 +340,12 @@ export async function postRpc(baseUrl, method, params) {
 }
 async function ensureWorkspace(rpc, cwd) {
     mkdirSync(cwd, { recursive: true });
-    await rpc('workspace.create', { path: cwd, title: WECHAT_WORKSPACE_NAME });
+    const created = await rpc('workspace.create', { path: cwd });
+    return extractWorkspaceId(created);
 }
-async function createSession(rpc, cwd) {
-    const created = await rpc('session.create', { cwd });
+async function createSession(rpc, cwd, workspaceId) {
+    const payload = workspaceId !== undefined ? { workspaceId } : { cwd };
+    const created = await rpc('session.create', payload);
     const id = extractSessionId(created);
     if (id === undefined)
         throw new Error('session.create 没有返回 sessionId');
@@ -348,13 +378,7 @@ async function sessionAlive(rpc, sessionId) {
         return true;
     }
     catch {
-        try {
-            await rpc('session.get', { sessionId });
-            return true;
-        }
-        catch {
-            return false;
-        }
+        return false;
     }
 }
 async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
@@ -367,12 +391,7 @@ async function waitForAssistant(rpc, sessionId, beforeText, timeoutMs) {
             events = historyEvents(await rpc('session.history', { sessionId, maxMessages: 40 }));
         }
         catch {
-            try {
-                events = historyEvents(await rpc('session.get', { sessionId }));
-            }
-            catch {
-                events = [];
-            }
+            events = [];
         }
         const text = lastAssistantText(events);
         if (text !== '')
@@ -400,7 +419,7 @@ export async function runHeadlessViaWeb(opts) {
     const key = basename(opts.cwd ?? process.cwd()) || 'default';
     const rpc = opts.rpc ?? ((method, params) => postRpc(webBaseUrl(env), method, params));
     const timeoutMs = opts.timeoutMs ?? Number(env.DSH_BRIDGE_TIMEOUT_MS ?? 10 * 60 * 1000);
-    await ensureWorkspace(rpc, workspace);
+    const workspaceId = await ensureWorkspace(rpc, workspace);
     const store = loadSessionStore(storeFile);
     let sessionId = store.sessions[key]?.sessionId;
     const fresh = isFreshBridgeTurn(opts.task);
@@ -413,7 +432,7 @@ export async function runHeadlessViaWeb(opts) {
         sessionId = undefined;
     }
     if (sessionId === undefined) {
-        sessionId = await createSession(rpc, workspace);
+        sessionId = await createSession(rpc, workspace, workspaceId);
         await maybeSelectModel(rpc, sessionId, env);
     }
     store.sessions[key] = { sessionId, updatedAt: Date.now() };
@@ -427,6 +446,7 @@ export async function runHeadlessViaWeb(opts) {
     }
     await rpc('session.prompt', {
         sessionId,
+        mode: 'queue',
         content: [{ type: 'text', text }],
     });
     return await waitForAssistant(rpc, sessionId, before, timeoutMs);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rezti/dsh-rez-wechat",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "ReZ-TI WeChat/WeCom bridges. Personal WeChat is QClaw/ClawBot scan-and-chat via dsh-wechat-bridge; WeCom group send uses wecom-mcp.",
   "type": "module",
   "engines": {