@xgjktech/xg_cwork_im 1.10.2 → 1.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xgjktech/xg_cwork_im",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "XG CWork IM channel plugin for OpenClaw",
   "keywords": [
     "bot",
@@ -21,7 +21,8 @@
   "scripts": {
     "type-check": "tsc -p tsconfig.json --noEmit",
     "lint": "tsc -p tsconfig.json --noEmit",
-    "install:prod": "npm install --omit=dev"
+    "install:prod": "npm install --omit=dev",
+    "prepublishOnly": "npm run type-check"
   },
   "dependencies": {
     "@sinclair/typebox": "^0.32.0",

package/src/channel.ts

@@ -57,6 +57,7 @@ const XgImAccountConfigSchema = z.object({
     inboundMediaWorkspaceSubdir: z.string().optional(),
     inboundMediaOpenClawPath: z.enum(["workspaceRelative", "absoluteFileUrl"]).optional(),
     inboundMediaSandboxRootPrefix: z.string().optional(),
+    systemPrompt: z.string().optional(),
 });
 
 const XgImConfigSchema = z.object({
@@ -83,6 +84,8 @@ const XgImConfigSchema = z.object({
     inboundMediaOpenClawPath: z.enum(["workspaceRelative", "absoluteFileUrl"]).optional(),
     /** 沙箱内 workspace 挂载根，如 `/workspace`；与 workspaceRelative 组合生成绝对引用 */
     inboundMediaSandboxRootPrefix: z.string().optional(),
+    /** 群聊入站时写入 OpenClaw `GroupSystemPrompt`（与 accounts 内字段合并规则见 getXgImConfig） */
+    systemPrompt: z.string().optional(),
     // 多账户：对象 map（key 为 accountId）
     accounts: z.record(z.string(), XgImAccountConfigSchema).optional(),
 }).superRefine((val, ctx) => {
@@ -171,6 +174,31 @@ function getXgImConfig(cfg: OpenClawConfig, accountId?: string | null): XgImConf
     return raw;
 }
 
+/**
+ * 合并 `channels.xg_cwork_im` 顶层、`accounts.default`、以及 `accounts.<accountId>` 后的 `systemPrompt`，
+ * 写入 OpenClaw 入站 `GroupSystemPrompt`（与 getXgImConfig 的非 default 账户合并方式一致；对 default 账户会合并 default 片段）。
+ */
+function resolveXgImGroupSystemPrompt(cfg: OpenClawConfig, accountId: string): string | undefined {
+    try {
+        const raw = (cfg as Record<string, Record<string, unknown>>)?.channels?.xg_cwork_im as XgImConfig | undefined;
+        if (!raw) return undefined;
+        const accountMap =
+            raw.accounts && typeof raw.accounts === "object" && !Array.isArray(raw.accounts)
+                ? (raw.accounts as Record<string, Partial<XgImConfig> | undefined>)
+                : undefined;
+        const defaults = accountMap?.default ? { ...accountMap.default } : {};
+        const base: XgImConfig = { ...raw, ...defaults };
+        let merged: XgImConfig = base;
+        if (accountId && accountId !== "default" && accountMap?.[accountId]) {
+            merged = { ...base, ...accountMap[accountId] };
+        }
+        const t = merged.systemPrompt?.trim();
+        return t || undefined;
+    } catch {
+        return undefined;
+    }
+}
+
 function isConfigured(cfg: OpenClawConfig): boolean {
     try {
         const c = getXgImConfig(cfg);
@@ -257,8 +285,7 @@ function buildInboundDisplayText(msgContent: WsMessageContent | undefined, fileI
     if (fileItems.length > 0) {
         const lines = fileItems.map((f) => {
             const name = f.name?.trim() || f.fileId || "未命名文件";
-            const mime = imFormatToMimeType(f.format);
-            return mime ? `- \`${name}\` (${mime})` : `- \`${name}\``;
+            return `- \`${name}\``;
         });
         const block = `**附件（${fileItems.length}）**\n${lines.join("\n")}`;
         rawText = rawText.trim() ? `${rawText.trim()}\n\n${block}` : block;
@@ -275,6 +302,11 @@ function buildInboundDisplayText(msgContent: WsMessageContent | undefined, fileI
             const parsedBlock = `**附件解析内容**\n\n${parsedParts.join("\n\n")}`;
             rawText = `${rawText.trim()}\n\n${parsedBlock}`;
         }
+
+        const urlGuard =
+            "**附件 URL 使用约束**\n" +
+            "处理附件时必须逐字原样使用消息中提供的完整 URL；禁止修改、删除或重排任何 query 参数。";
+        rawText = `${rawText.trim()}\n\n${urlGuard}`;
     }
     return rawText;
 }
@@ -297,20 +329,15 @@ function isActuallyMentioned(
 
 function mediaFieldsFromFileItems(fileItems: MsgFileVO[]): Record<string, unknown> {
     if (fileItems.length === 0) return {};
-    const mimes = fileItems.map(
-        (f) => imFormatToMimeType(f.format) ?? "application/octet-stream",
-    );
-    // OpenClaw 入站展示与媒体拉取以 MediaPath(s) 为准；[media attached: …] 依赖 Path，仅写 MediaUrl 时该段不出现。
-    // 不要同时写 Path 与 Url（同链接会被拼成两段，出现 `url | url`）。
+    // 只传 MediaPath(s)，不传 MediaType(s)。
+    // 预签名 URL 的 query 中常含 response-content-type；若额外给 MediaType，模型/工具更容易“改写 URL”导致签名失效。
     if (fileItems.length === 1) {
         return {
             MediaPath: fileItems[0]!.url,
-            MediaType: mimes[0],
         };
     }
     return {
         MediaPaths: fileItems.map((f) => f.url),
-        MediaTypes: mimes,
     };
 }
 
@@ -760,6 +787,16 @@ export const xgCworkImChannelPlugin: XgImChannelPlugin = {
                         config,
                     });
 
+                    const groupSystemPromptResolved = resolveXgImGroupSystemPrompt(ctx.cfg, account.accountId);
+                    if (config.debug) {
+                        log.info(
+                            `${logPrefix} [GroupSystemPrompt] ` +
+                                (groupSystemPromptResolved
+                                    ? `active len=${groupSystemPromptResolved.length} preview=${JSON.stringify(groupSystemPromptResolved.slice(0, 96))}`
+                                    : "(empty — 若已配置 systemPrompt：检查网关是否加载了含本字段的插件构建，或把 systemPrompt 写到 accounts.<id> 再试)"),
+                        );
+                    }
+
                     const inboundCtx = rt.channel.reply.finalizeInboundContext({
                         Body: body,
                         RawBody: text,
@@ -772,6 +809,7 @@ export const xgCworkImChannelPlugin: XgImChannelPlugin = {
                         ChatType: "group",
                         ConversationLabel: fromLabel,
                         GroupSubject: params.groupId,
+                        GroupSystemPrompt: groupSystemPromptResolved,
                         SenderName: senderName,
                         SenderId: senderId ?? "",
                         Provider: "xg_cwork_im",

package/src/types.ts

@@ -54,6 +54,11 @@ export interface XgImAccountConfig {
      * `{inboundMediaSandboxRootPrefix}/xg_im_inbound/...`，避免 `./` 被工具按 cwd 解析而报「不可访问」。
      */
     inboundMediaSandboxRootPrefix?: string;
+    /**
+     * 可选：本账户在群聊中追加给 Agent 的补充说明（映射为 OpenClaw 入站 `GroupSystemPrompt`）。
+     * 与顶层 `systemPrompt` 的合并规则见 `getXgImConfig`（`accounts.default` 与具体账户覆盖）。
+     */
+    systemPrompt?: string;
 }
 
 export interface XgImConfig extends OpenClawConfig {
@@ -115,6 +120,11 @@ export interface XgImConfig extends OpenClawConfig {
     inboundMediaOpenClawPath?: "workspaceRelative" | "absoluteFileUrl";
     /** 见 {@link XgImAccountConfig.inboundMediaSandboxRootPrefix} */
     inboundMediaSandboxRootPrefix?: string;
+    /**
+     * 可选：本通道在群聊中追加给 Agent 的补充说明（映射为 OpenClaw 入站 `GroupSystemPrompt`）。
+     * 多账户时可与 `accounts.<id>.systemPrompt` 及 `accounts.default.systemPrompt` 组合覆盖，见插件内 `getXgImConfig`。
+     */
+    systemPrompt?: string;
 }
 
 // ─── IM 接口 Request / Response ─────────────────────────────────────────────