lark-remote 0.5.12 → 0.5.14

package/dist/connector/index.d.ts

@@ -7,9 +7,9 @@ import type { AppConfig } from '../config/index.js';
  * - SDK 的 cardAction dedup eventId = `card:{messageId}:{operator.openId}:{actionId}`
  * - actionId = `tag|name|option|JSON.stringify(value)`，不含时间戳/事件序号
  * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上重复触发
- *   固定 value 的按钮（如 config.toggle）：
+ *   固定 value 的按钮（如 config.save）：
  *   messageId / operator / value 三段都相同 → eventId 完全相同 → 第二次点击被
- *   seenCache drop，toggle 不可逆（第二次点击静默失效）。
+ *   seenCache drop，按钮不可逆（第二次点击静默失效）。
  *
  * SDK 默认 12h 太长；60s 仍会误伤连击。300ms 挡飞书瞬时重投递（<100ms 级），
  * 放过用户连击（慢点两次通常 >500ms）。代价：削弱 message 秒级重投递防护——
@@ -166,8 +166,6 @@ export declare class FeishuConnector {
      * `rawClient` 缺失（测试 mock）时回退 SDK 入口，行为退化为「看不见业务码」。
      */
     updateCard(messageId: string, card: object): Promise<void>;
-    /** Format error for logging without causing circular serialization */
-    private formatError;
     addReaction(messageId: string, emoji: string): Promise<void>;
     /**
      * Remove a reaction by emoji (e.g. retract the Typing indicator).

package/dist/connector/index.js

@@ -33,9 +33,9 @@ const noKeepAliveAgent = new https.Agent({ keepAlive: false });
  * - SDK 的 cardAction dedup eventId = `card:{messageId}:{operator.openId}:{actionId}`
  * - actionId = `tag|name|option|JSON.stringify(value)`，不含时间戳/事件序号
  * - config 卡片原地更新（updateCardInPlace），用户在同一张卡上重复触发
- *   固定 value 的按钮（如 config.toggle）：
+ *   固定 value 的按钮（如 config.save）：
  *   messageId / operator / value 三段都相同 → eventId 完全相同 → 第二次点击被
- *   seenCache drop，toggle 不可逆（第二次点击静默失效）。
+ *   seenCache drop，按钮不可逆（第二次点击静默失效）。
  *
  * SDK 默认 12h 太长；60s 仍会误伤连击。300ms 挡飞书瞬时重投递（<100ms 级），
  * 放过用户连击（慢点两次通常 >500ms）。代价：削弱 message 秒级重投递防护——
@@ -520,7 +520,7 @@ export class FeishuConnector {
         catch (err) {
             // 抛出去前先落一条格式化日志（调用方只看到包装后的 message）。
             // 抛普通 Error 而不是原 err：axios 错误对象跨层序列化会丢信息。
-            const errorInfo = this.formatError(err);
+            const errorInfo = formatErrorForLog(err);
             getLogger().error('[feishu] streamCard failed:', errorInfo);
             throw new Error(`streamCard failed: ${errorInfo}`, { cause: err });
         }
@@ -554,7 +554,7 @@ export class FeishuConnector {
         catch (err) {
             // Log the error but don't swallow it - a plain error avoids axios
             // serialization issues in the logger.
-            const errorInfo = this.formatError(err);
+            const errorInfo = formatErrorForLog(err);
             getLogger().error('[feishu] updateCard failed:', errorInfo);
             throw new Error(`updateCard failed: ${errorInfo}`, { cause: err });
         }
@@ -562,16 +562,12 @@ export class FeishuConnector {
             throw new Error(`updateCard failed: Feishu rejected the card (code=${rejection.code} msg=${rejection.msg ?? ''})`, { cause: rejection });
         }
     }
-    /** Format error for logging without causing circular serialization */
-    formatError(err) {
-        return formatErrorForLog(err);
-    }
     async addReaction(messageId, emoji) {
         try {
             await this.channel.addReaction(messageId, emoji);
         }
         catch (err) {
-            getLogger().error('[feishu] addReaction failed:', this.formatError(err));
+            getLogger().error('[feishu] addReaction failed:', formatErrorForLog(err));
         }
     }
     /**
@@ -583,7 +579,7 @@ export class FeishuConnector {
             await this.channel.removeReactionByEmoji(messageId, emoji);
         }
         catch (err) {
-            getLogger().error('[feishu] removeReactionByEmoji failed:', this.formatError(err));
+            getLogger().error('[feishu] removeReactionByEmoji failed:', formatErrorForLog(err));
         }
     }
     /**
@@ -635,7 +631,7 @@ export class FeishuConnector {
             }
         }
         catch (err) {
-            const errorInfo = this.formatError(err);
+            const errorInfo = formatErrorForLog(err);
             getLogger().error(`[feishu] ${label} failed:`, errorInfo);
             throw new Error(`${label} failed: ${errorInfo}`, { cause: err });
         }

package/dist/{runner/dsh → dsh}/auth.js

@@ -10,10 +10,10 @@
  */
 import { createHash, createHmac } from 'node:crypto';
 import fs from 'node:fs';
-import os from 'node:os';
 import path from 'node:path';
 import YAML from 'yaml';
-import { isWin32 } from '../../platform/select.js';
+import { isWin32 } from '../platform/select.js';
+import { resolveDshHome } from './home.js';
 /** Credential record that owns the browser-cookie signing secret. */
 export const DSH_BROWSER_CREDENTIAL_KEY = 'client-connection/browser-session';
 /** Short lifetime keeps every request safely inside DSH's configurable max age. */
@@ -29,8 +29,7 @@ function isRecord(value) {
  * file matches the `DSH_HOME` lark-remote passes to a process it starts.
  */
 export function resolveDshCredentialsFile(env = process.env, configuredHome) {
-    const home = configuredHome?.trim() || env.DSH_HOME?.trim();
-    return path.join(home && home.length > 0 ? home : path.join(os.homedir(), '.dsh'), '.credentials.yaml');
+    return path.join(resolveDshHome(configuredHome, env), '.credentials.yaml');
 }
 /** Whether a filesystem error means the credentials file is absent. */
 export function isDshCredentialsNotFound(error) {

package/dist/dsh/home.d.ts

@@ -0,0 +1,2 @@
+/** Resolve the same DSH home DSH itself uses: configured, env, then ~/.dsh. */
+export declare function resolveDshHome(configured?: string, env?: NodeJS.ProcessEnv): string;

package/dist/dsh/home.js

@@ -0,0 +1,8 @@
+import os from 'node:os';
+import path from 'node:path';
+/** Resolve the same DSH home DSH itself uses: configured, env, then ~/.dsh. */
+export function resolveDshHome(configured, env = process.env) {
+    const value = configured?.trim() || env.DSH_HOME?.trim();
+    return path.resolve(value && value.length > 0 ? value : path.join(os.homedir(), '.dsh'));
+}
+//# sourceMappingURL=home.js.map

package/dist/dsh/protocol.d.ts

@@ -0,0 +1,9 @@
+/**
+ * DSH 远程调用的线格式助手（中立层，runner 与 session 共用）。
+ *
+ * 这两个函数原先住在 `runner/dsh/client.ts`，于是 session/dsh 为了拼一个
+ * `args` 信封要 import 上层 runner —— 与 AgentSessionReader 同一类反向依赖。
+ */
+/** Extract the `token` query parameter from a pasted `dsh web` URL. */
+export declare function extractDshToken(raw: string | undefined): string;
+export declare function dshArgs(method: string, payload: unknown): Record<string, unknown>;

package/dist/dsh/protocol.js

@@ -0,0 +1,61 @@
+/**
+ * DSH 远程调用的线格式助手（中立层，runner 与 session 共用）。
+ *
+ * 这两个函数原先住在 `runner/dsh/client.ts`，于是 session/dsh 为了拼一个
+ * `args` 信封要 import 上层 runner —— 与 AgentSessionReader 同一类反向依赖。
+ */
+/** Extract the `token` query parameter from a pasted `dsh web` URL. */
+export function extractDshToken(raw) {
+    const value = (raw ?? '').trim();
+    if (!value)
+        return '';
+    if (!value.includes('token=') && !value.includes('://'))
+        return value;
+    try {
+        const url = new URL(value.startsWith('?') ? `http://dsh.invalid/${value}` : value);
+        const token = url.searchParams.get('token');
+        if (token)
+            return token;
+        // 带 scheme 却没有 token 参数的输入是误贴的 host URL（如
+        // `http://127.0.0.1:3080`）：整串不是合法 token，参与握手只会得到
+        // 指向性缺失的 401。返回空串让上游走「token 缺失」的诊断路径。
+        if (value.includes('://'))
+            return '';
+        return value;
+    }
+    catch {
+        return value;
+    }
+}
+/**
+ * Remote methods take named parameters. Most session methods call their single
+ * argument `request`; `session/list` reserves `_request`; catalog methods take
+ * no arguments. `commands/*` address the receiving agent by its wire field
+ * `agentId`, so their payload is already in wire shape (pass-through).
+ * The gateway rejects any other `args` shape.
+ */
+const DSH_ARGS_KEY = {
+    'session/list': '_request',
+    'session/create': 'request',
+    'session/prompt': 'request',
+    'session/cancel': 'request',
+    'session/selectModel': 'request',
+    'session/projections': 'request',
+    'session/page': 'request',
+    'session/follow': 'request',
+    'session/updateQueue': 'request',
+    'job/list': 'request',
+    'job/kill': 'request',
+    'session/modelCatalog': null,
+    'agentPresets/list': null,
+    'permissionPresets/catalog': null,
+};
+export function dshArgs(method, payload) {
+    const key = DSH_ARGS_KEY[method];
+    if (key === null)
+        return {};
+    if (key === undefined)
+        return payload;
+    return { [key]: payload };
+}
+//# sourceMappingURL=protocol.js.map

package/dist/inbound/turn-assembler.js

@@ -227,6 +227,12 @@ export class InboundTurnAssembler {
         }
         catch (err) {
             getLogger().error('[inbound] turn commit failed:', err?.message ?? String(err));
+            try {
+                await this.deps.onReceipt?.(ctx, '⚠️ 消息处理失败，请重试；若持续失败请查看 lark-remote 日志。');
+            }
+            catch (receiptErr) {
+                getLogger().error('[inbound] failed to report turn commit failure:', receiptErr?.message ?? String(receiptErr));
+            }
         }
     }
 }