chatccc 0.2.181 → 0.2.182

package/src/__tests__/shared-prefix.test.ts

@@ -1,36 +1,36 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  ABD_APPEND_PROMPT,
-  applySharedPrefix,
-} from "../shared-prefix.ts";
-
-describe("applySharedPrefix", () => {
-  it("leaves normal messages unchanged", () => {
-    expect(applySharedPrefix("帮我分析")).toEqual({
-      matched: false,
-      text: "帮我分析",
-      body: "帮我分析",
-    });
-  });
-
-  it("removes /abd without requiring a space", () => {
-    const result = applySharedPrefix("/abd帮我分析");
-
-    expect(result.matched).toBe(true);
-    expect(result.body).toBe("帮我分析");
-    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
-  });
-
-  it("removes whitespace after /abd", () => {
-    const result = applySharedPrefix("/abd   帮我分析");
-
-    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
-  });
-
-  it("keeps the appendix when the user body is empty", () => {
-    const result = applySharedPrefix("/abd   ");
-
-    expect(result.text).toBe(`---\n${ABD_APPEND_PROMPT}`);
-  });
-});
+import { describe, expect, it } from "vitest";
+
+import {
+  ABD_APPEND_PROMPT,
+  applySharedPrefix,
+} from "../shared-prefix.ts";
+
+describe("applySharedPrefix", () => {
+  it("leaves normal messages unchanged", () => {
+    expect(applySharedPrefix("帮我分析")).toEqual({
+      matched: false,
+      text: "帮我分析",
+      body: "帮我分析",
+    });
+  });
+
+  it("removes /abd without requiring a space", () => {
+    const result = applySharedPrefix("/abd帮我分析");
+
+    expect(result.matched).toBe(true);
+    expect(result.body).toBe("帮我分析");
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("removes whitespace after /abd", () => {
+    const result = applySharedPrefix("/abd   帮我分析");
+
+    expect(result.text).toBe(`帮我分析\n\n---\n${ABD_APPEND_PROMPT}`);
+  });
+
+  it("keeps the appendix when the user body is empty", () => {
+    const result = applySharedPrefix("/abd   ");
+
+    expect(result.text).toBe(`---\n${ABD_APPEND_PROMPT}`);
+  });
+});

package/src/cards.ts

@@ -1,10 +1,10 @@
-// ---------------------------------------------------------------------------
-// Button helpers
-// ---------------------------------------------------------------------------
-
-import { ABD_HELP_LINE } from "./shared-prefix.ts";
-
-export interface ButtonDef {
+// ---------------------------------------------------------------------------
+// Button helpers
+// ---------------------------------------------------------------------------
+
+import { ABD_HELP_LINE } from "./shared-prefix.ts";
+
+export interface ButtonDef {
   text: string;
   value: string;
   type?: "primary" | "default" | "danger";
@@ -137,11 +137,11 @@ export function buildHelpCard(
     "发送 **/newh** 重置当前会话（沿用当前工作目录，不切换）",
     "发送 **/plan** 以规划模式提问（只读，不执行写操作）",
     "发送 **/ask** 以问答模式提问（只读，不执行写操作）",
-    "发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡",
-    "发送 **/restart** 重启 ChatCCC 进程",
-    "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
-    ABD_HELP_LINE,
-  ].join("\n");
+    "发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡",
+    "发送 **/restart** 重启 ChatCCC 进程",
+    "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
+    ABD_HELP_LINE,
+  ].join("\n");
   return JSON.stringify({
     config: { wide_screen_mode: true },
     header: { template: "blue", title: { content: "ChatCCC", tag: "plain_text" } },
@@ -410,11 +410,11 @@ export function buildQueueFullCard(): string {
 }
 
 // 状态卡片（带关闭按钮）
-export function buildStatusCard(statusText: string, template = "blue"): string {
-  return JSON.stringify({
-    config: { wide_screen_mode: true },
-    header: { template, title: { content: "会话状态", tag: "plain_text" } },
-    elements: [
+export function buildStatusCard(statusText: string, template = "blue"): string {
+  return JSON.stringify({
+    config: { wide_screen_mode: true },
+    header: { template, title: { content: "会话状态", tag: "plain_text" } },
+    elements: [
       { tag: "div", text: { tag: "lark_md", content: statusText } },
       { tag: "hr" },
       {
@@ -426,78 +426,78 @@ export function buildStatusCard(statusText: string, template = "blue"): string {
           value: { action: "close" },
         }],
       },
-    ],
-  });
-}
-
-export function buildCodexUsageCard(content: string, resetCreditsAvailable: number | null): string {
-  const elements: object[] = [
-    { tag: "div", text: { tag: "lark_md", content } },
-  ];
-  if (resetCreditsAvailable !== null && resetCreditsAvailable > 0) {
-    elements.push({ tag: "hr" });
-    elements.push({
-      tag: "action",
-      actions: [{
-        tag: "button",
-        text: { tag: "plain_text", content: "发起重置" },
-        type: "primary",
-        value: { action: "codex_reset_request", availableCount: resetCreditsAvailable },
-      }],
-    });
-  }
-
-  return JSON.stringify({
-    config: { wide_screen_mode: true },
-    header: { template: "blue", title: { content: "Codex Usage", tag: "plain_text" } },
-    elements,
-  });
-}
-
-export function buildCodexResetConfirmCard(params: {
-  availableCount: number;
-  parentMessageId: string;
-  requestId: string;
-}): string {
-  const valueBase = {
-    parentMessageId: params.parentMessageId,
-    requestId: params.requestId,
-  };
-  return JSON.stringify({
-    config: { wide_screen_mode: true },
-    header: { template: "yellow", title: { content: "确认 Codex 主动重置", tag: "plain_text" } },
-    elements: [
-      {
-        tag: "div",
-        text: {
-          tag: "lark_md",
-          content: `当前可用主动重置次数：**${params.availableCount}**。\n\n确认后会消耗 1 次主动重置，并重置当前可重置的 Codex 用量窗口。`,
-        },
-      },
-      { tag: "hr" },
-      {
-        tag: "action",
-        actions: [
-          {
-            tag: "button",
-            text: { tag: "plain_text", content: "是，发起重置" },
-            type: "danger",
-            value: { action: "codex_reset_confirm", decision: "yes", ...valueBase },
-          },
-          {
-            tag: "button",
-            text: { tag: "plain_text", content: "否" },
-            type: "default",
-            value: { action: "codex_reset_confirm", decision: "no", ...valueBase },
-          },
-        ],
-      },
-    ],
-  });
-}
-
-/** 模型切换卡片（/model 命令，飞书专用，含切换按钮） */
-export function buildModelCard(
+    ],
+  });
+}
+
+export function buildCodexUsageCard(content: string, resetCreditsAvailable: number | null): string {
+  const elements: object[] = [
+    { tag: "div", text: { tag: "lark_md", content } },
+  ];
+  if (resetCreditsAvailable !== null && resetCreditsAvailable > 0) {
+    elements.push({ tag: "hr" });
+    elements.push({
+      tag: "action",
+      actions: [{
+        tag: "button",
+        text: { tag: "plain_text", content: "发起重置" },
+        type: "primary",
+        value: { action: "codex_reset_request", availableCount: resetCreditsAvailable },
+      }],
+    });
+  }
+
+  return JSON.stringify({
+    config: { wide_screen_mode: true },
+    header: { template: "blue", title: { content: "Codex Usage", tag: "plain_text" } },
+    elements,
+  });
+}
+
+export function buildCodexResetConfirmCard(params: {
+  availableCount: number;
+  parentMessageId: string;
+  requestId: string;
+}): string {
+  const valueBase = {
+    parentMessageId: params.parentMessageId,
+    requestId: params.requestId,
+  };
+  return JSON.stringify({
+    config: { wide_screen_mode: true },
+    header: { template: "yellow", title: { content: "确认 Codex 主动重置", tag: "plain_text" } },
+    elements: [
+      {
+        tag: "div",
+        text: {
+          tag: "lark_md",
+          content: `当前可用主动重置次数：**${params.availableCount}**。\n\n确认后会消耗 1 次主动重置，并重置当前可重置的 Codex 用量窗口。`,
+        },
+      },
+      { tag: "hr" },
+      {
+        tag: "action",
+        actions: [
+          {
+            tag: "button",
+            text: { tag: "plain_text", content: "是，发起重置" },
+            type: "danger",
+            value: { action: "codex_reset_confirm", decision: "yes", ...valueBase },
+          },
+          {
+            tag: "button",
+            text: { tag: "plain_text", content: "否" },
+            type: "default",
+            value: { action: "codex_reset_confirm", decision: "no", ...valueBase },
+          },
+        ],
+      },
+    ],
+  });
+}
+
+/** 模型切换卡片（/model 命令，飞书专用，含切换按钮） */
+export function buildModelCard(
   currentModel: string,
   models: string[],
   tool?: string,

package/src/codex-reset-actions.ts

@@ -14,8 +14,10 @@ interface PendingCodexResetRequest {
 export interface CodexResetActionDeps {
   getTenantAccessToken(): Promise<string>;
   sendRawCard(token: string, chatId: string, cardJson: string): Promise<boolean>;
+  sendTextReply(token: string, chatId: string, text: string): Promise<boolean>;
   sendCardReply(token: string, chatId: string, title: string, content: string, template?: string): Promise<boolean>;
   updateCardMessage(token: string, messageId: string, content: string): Promise<boolean>;
+  recallMessage(token: string, messageId: string): Promise<boolean>;
   consumeCodexRateLimitResetCredit(redeemRequestId: string): Promise<CodexResetConsumeResult>;
   createRequestId?: () => string;
 }
@@ -38,7 +40,13 @@ function eventMessageId(raw: Record<string, unknown>): string {
     ? raw.open_message_id
     : typeof (raw.context as Record<string, unknown> | undefined)?.open_message_id === "string"
       ? (raw.context as Record<string, string>).open_message_id
-      : "";
+      : typeof raw.message_id === "string"
+        ? raw.message_id
+        : typeof (raw.context as Record<string, unknown> | undefined)?.message_id === "string"
+          ? (raw.context as Record<string, string>).message_id
+          : typeof (raw.message as Record<string, unknown> | undefined)?.message_id === "string"
+            ? (raw.message as Record<string, string>).message_id
+            : "";
 }
 
 function eventChatId(raw: Record<string, unknown>): string {
@@ -124,7 +132,12 @@ async function handleResetConfirmation(
   const token = await deps.getTenantAccessToken();
   const confirmMessageId = eventMessageId(raw);
   if (confirmMessageId) {
-    await deps.updateCardMessage(token, confirmMessageId, collapsedCard());
+    const collapsed = await deps.updateCardMessage(token, confirmMessageId, collapsedCard());
+    console.log(`[Codex Reset] collapse confirmation card ${collapsed ? "OK" : "FAILED"}: messageId=${confirmMessageId}`);
+    const recalled = await deps.recallMessage(token, confirmMessageId);
+    console.log(`[Codex Reset] recall confirmation card ${recalled ? "OK" : "FAILED"}: messageId=${confirmMessageId}`);
+  } else {
+    console.error("[Codex Reset] missing confirmation card message id; cannot collapse");
   }
 
   const pending = pendingCodexResetRequests.get(requestId);
@@ -132,22 +145,22 @@ async function handleResetConfirmation(
   if (!chatId) return true;
 
   if (!pending || pending.status !== "pending" || pending.parentMessageId !== parentMessageId) {
-    await deps.sendCardReply(token, chatId, "Codex 主动重置", "这张确认卡片已经失效或已处理。", "yellow");
+    await deps.sendTextReply(token, chatId, "Codex 主动重置：这张确认卡片已经失效或已处理。");
     return true;
   }
   pending.status = "handled";
 
   if (decision === "no") {
-    await deps.sendCardReply(token, chatId, "Codex 主动重置", "用户取消了重置。", "grey");
+    await deps.sendTextReply(token, chatId, "Codex 主动重置：用户取消了重置。");
     return true;
   }
 
   try {
     const result = await deps.consumeCodexRateLimitResetCredit(requestId);
     const message = resetResultMessage(result);
-    await deps.sendCardReply(token, chatId, "Codex 主动重置", message.content, message.template);
+    await deps.sendTextReply(token, chatId, `Codex 主动重置：${message.content}`);
   } catch (err) {
-    await deps.sendCardReply(token, chatId, "Codex 主动重置", `重置失败：${(err as Error).message}`, "red");
+    await deps.sendTextReply(token, chatId, `Codex 主动重置失败：${(err as Error).message}`);
   }
   return true;
 }