chatccc 0.2.200 → 0.2.202

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/7天用量窗口，以及查询/使用主动重置卡",
-    "发送 **/restart** 重启 ChatCCC 进程",
-    "发送 **/update** 更新并重启（仅 npm 全局安装可用）",
-    ABD_HELP_LINE,
-  ].join("\n");
+    "发送 **/usage** 查看 Codex 实际存在的 5h/7天用量窗口，以及查询/使用主动重置卡",
+    "发送 **/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" } },
@@ -177,9 +177,9 @@ export function buildCdContent(
     ? `**当前会话工作路径:** \`${currentCwd}\``
     : "";
 
-  const statusLine = isUpdate
-    ? `**本会话默认工作路径（已切换）:** \`${dirPath}\``
-    : `**本会话默认工作路径:** \`${dirPath}\``;
+  const statusLine = isUpdate
+    ? `**后续新建会话默认工作路径（已切换）:** \`${dirPath}\``
+    : `**后续新建会话默认工作路径:** \`${dirPath}\``;
 
   const lines: string[] = [];
   if (currentLine) lines.push(currentLine, "");
@@ -226,10 +226,10 @@ export function buildCdCard(
       text: { tag: "lark_md", content: `**当前会话工作路径:** \`${sessionCwd}\`` },
     });
   }
-  elements.push({
-    tag: "div",
-    text: { tag: "lark_md", content: `**本会话默认工作路径:** \`${dirPath}\`` },
-  });
+  elements.push({
+    tag: "div",
+    text: { tag: "lark_md", content: `**后续新建会话默认工作路径:** \`${dirPath}\`` },
+  });
 
   if (recentDirs.length > 0) {
     elements.push({ tag: "hr" });
@@ -274,74 +274,78 @@ export function buildCdCard(
   });
 }
 
-function sessionToolLabel(tool: string): string {
-  if (tool === "cursor") return "Cursor";
-  if (tool === "codex") return "Codex";
-  if (tool === "ccc") return "CCC Agent";
-  return "Claude Code";
-}
-
-function pushSessionGroup(
-  lines: string[],
-  title: string,
-  sessions: Array<{
-    sessionId: string;
-    chatName: string;
-    chatId: string;
-    active: boolean;
-    turnCount: number;
-    elapsedSeconds: number | null;
-    model: string;
-    tool: string;
-  }>,
-  formatSession: (session: {
-    sessionId: string;
-    chatName: string;
-    chatId: string;
-    active: boolean;
-    turnCount: number;
-    elapsedSeconds: number | null;
-    model: string;
-    tool: string;
-  }, index: number) => string,
-  index: { value: number },
-): void {
-  if (sessions.length === 0) return;
-  if (index.value > 0) lines.push("", `**${title}:**`, "");
-  else lines.push(`**${title}:**`, "");
-  for (const session of sessions) {
-    lines.push(formatSession(session, index.value++));
-  }
-}
-
-// 所有会话列表卡片（Claude Code 优先，然后 Cursor）
-export function buildSessionsCard(sessions: Array<{
-  sessionId: string;
-  chatName: string;
-  chatId: string;
-  active: boolean;
+function sessionToolLabel(tool: string): string {
+  if (tool === "cursor") return "Cursor";
+  if (tool === "codex") return "Codex";
+  if (tool === "ccc") return "CCC Agent";
+  return "Claude Code";
+}
+
+function pushSessionGroup(
+  lines: string[],
+  title: string,
+  sessions: Array<{
+    sessionId: string;
+    chatName: string;
+    chatId: string;
+    active: boolean;
+    turnCount: number;
+    elapsedSeconds: number | null;
+    model: string;
+    tool: string;
+  }>,
+  formatSession: (session: {
+    sessionId: string;
+    chatName: string;
+    chatId: string;
+    active: boolean;
+    turnCount: number;
+    elapsedSeconds: number | null;
+    model: string;
+    tool: string;
+  }, index: number) => string,
+  index: { value: number },
+): void {
+  if (sessions.length === 0) return;
+  if (index.value > 0) lines.push("", `**${title}:**`, "");
+  else lines.push(`**${title}:**`, "");
+  for (const session of sessions) {
+    lines.push(formatSession(session, index.value++));
+  }
+}
+
+// 所有会话列表卡片（Claude Code 优先，然后 Cursor）
+export function buildSessionsCard(sessions: Array<{
+  sessionId: string;
+  chatName: string;
+  chatId: string;
+  chatType?: string;
+  active: boolean;
   turnCount: number;
   elapsedSeconds: number | null;
   model: string;
   tool: string;
-}>, opts: { defaultToolLabel?: string } = {}): string {
-  const defaultToolLabel = opts.defaultToolLabel ?? "Claude Code";
-  // 按 tool 分组排序：Claude Code 在前，Cursor 其次，Codex 最后
-  const claudeCodeSessions = sessions.filter(s => s.tool !== "cursor" && s.tool !== "codex" && s.tool !== "ccc");
-  const cursorSessions = sessions.filter(s => s.tool === "cursor");
-  const codexSessions = sessions.filter(s => s.tool === "codex");
-  const cccSessions = sessions.filter(s => s.tool === "ccc");
-  const hasClaudeCode = claudeCodeSessions.length > 0;
-  const hasCursor = cursorSessions.length > 0;
-  const hasCodex = codexSessions.length > 0;
-  const hasCcc = cccSessions.length > 0;
+}>, opts: { defaultToolLabel?: string; fixedPrivateSession?: boolean } = {}): string {
+  const defaultToolLabel = opts.defaultToolLabel ?? "Claude Code";
+  const fixedPrivateSession = opts.fixedPrivateSession ?? false;
+  // 按 tool 分组排序：Claude Code 在前，Cursor 其次，Codex 最后
+  const claudeCodeSessions = sessions.filter(s => s.tool !== "cursor" && s.tool !== "codex" && s.tool !== "ccc");
+  const cursorSessions = sessions.filter(s => s.tool === "cursor");
+  const codexSessions = sessions.filter(s => s.tool === "codex");
+  const cccSessions = sessions.filter(s => s.tool === "ccc");
+  const hasClaudeCode = claudeCodeSessions.length > 0;
+  const hasCursor = cursorSessions.length > 0;
+  const hasCodex = codexSessions.length > 0;
+  const hasCcc = cccSessions.length > 0;
 
   if (sessions.length === 0) {
     return JSON.stringify({
       config: { wide_screen_mode: true },
       header: { template: "blue", title: { content: "所有会话", tag: "plain_text" } },
       elements: [
-        { tag: "div", text: { tag: "lark_md", content: `当前没有会话记录。\n\n使用 **/new**（默认 ${defaultToolLabel}）、**/new claude**、**/new cursor** 或 **/new codex** 创建新会话。\n创建后可在任意会话群内发送 **/sessions** 查看列表，用 **/session 数字** 切换会话。` } },
+        { tag: "div", text: { tag: "lark_md", content: fixedPrivateSession
+          ? `当前没有会话记录。\n\n直接发送普通消息即可创建飞书私聊专属 ${defaultToolLabel} 会话；发送 **/new**、**/new claude**、**/new cursor** 或 **/new codex** 会另外创建会话群。`
+          : `当前没有会话记录。\n\n使用 **/new**（默认 ${defaultToolLabel}）、**/new claude**、**/new cursor** 或 **/new codex** 创建新会话。\n创建后可在任意会话群内发送 **/sessions** 查看列表，用 **/session 数字** 切换会话。` } },
         { tag: "hr" },
         { tag: "action", actions: [{ tag: "button", text: { tag: "plain_text", content: "收起" }, type: "default", value: { action: "close" } }] },
       ],
@@ -357,18 +361,24 @@ export function buildSessionsCard(sessions: Array<{
       const secs = s.elapsedSeconds % 60;
       extra = ` | 本轮: ${mins}分${secs}秒`;
     }
-    const toolLabel = sessionToolLabel(s.tool);
+    const toolLabel = sessionToolLabel(s.tool);
     const namePart = s.chatName ? `**${s.chatName}** ` : "";
-    const chatTag = !s.chatId ? " (chat id缺失)" : s.chatId.startsWith("oc_") ? " (群聊)" : "";
+    const chatTag = !s.chatId
+      ? " (chat id缺失)"
+      : s.chatType === "p2p"
+        ? " (私聊)"
+        : s.chatType === "group" || (s.chatType == null && s.chatId.startsWith("oc_"))
+          ? " (群聊)"
+          : "";
     return `**${i + 1}.** ${namePart}${chatTag} \`${shortId}\` ${status} | 工具: ${toolLabel} | 轮数: ${s.turnCount} | ${s.model}${extra}`;
   };
 
   const lines: string[] = [`共 **${sessions.length}** 个会话:`, ""];
-  const idx = { value: 0 };
-  if (hasClaudeCode) pushSessionGroup(lines, "Claude Code 会话", claudeCodeSessions, formatSession, idx);
-  if (hasCursor) pushSessionGroup(lines, "Cursor 会话", cursorSessions, formatSession, idx);
-  if (hasCodex) pushSessionGroup(lines, "Codex 会话", codexSessions, formatSession, idx);
-  if (hasCcc) pushSessionGroup(lines, "CCC Agent 会话", cccSessions, formatSession, idx);
+  const idx = { value: 0 };
+  if (hasClaudeCode) pushSessionGroup(lines, "Claude Code 会话", claudeCodeSessions, formatSession, idx);
+  if (hasCursor) pushSessionGroup(lines, "Cursor 会话", cursorSessions, formatSession, idx);
+  if (hasCodex) pushSessionGroup(lines, "Codex 会话", codexSessions, formatSession, idx);
+  if (hasCcc) pushSessionGroup(lines, "CCC Agent 会话", cccSessions, formatSession, idx);
 
   return JSON.stringify({
     config: { wide_screen_mode: true },
@@ -376,7 +386,9 @@ export function buildSessionsCard(sessions: Array<{
     elements: [
       { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
       { tag: "hr" },
-      { tag: "div", text: { tag: "lark_md", content: "在会话群内发送 **/newh** 可重置当前会话（创建新 Session，保留工作目录和群聊）。\n发送 **/session 数字**（如 `/session 1`）可将当前群聊切换到列表中对应编号的会话。" } },
+      { tag: "div", text: { tag: "lark_md", content: fixedPrivateSession
+        ? "当前飞书私聊使用固定的专属会话；发送 **/newh** 可在私聊中原地重置。群聊会话请回到对应群聊继续，私聊不支持 **/session** 切换。"
+        : "在会话群内发送 **/newh** 可重置当前会话（创建新 Session，保留工作目录和群聊）。\n发送 **/session 数字**（如 `/session 1`）可将当前群聊切换到列表中对应编号的会话。" } },
       { tag: "hr" },
       {
         tag: "action",
@@ -433,11 +445,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" },
       {
@@ -449,82 +461,82 @@ 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(
-  currentModel: string,
-  models: string[],
-  tool?: string,
-): string {
+    ],
+  });
+}
+
+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,
+): string {
   const toolLabel = tool ? ` (${tool})` : "";
   const currentLine = currentModel
     ? `**当前模型:** \`${currentModel}\``
@@ -558,48 +570,48 @@ export function buildModelCard(
       { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
       { tag: "hr" },
       buildButtons(buttons),
-    ],
-  });
-}
-
-export function buildEffortCard(
-  currentEffort: string,
-  efforts: string[],
-  tool?: string,
-): string {
-  const toolLabel = tool ? ` (${tool})` : "";
-  const currentLine = currentEffort
-    ? `**当前 effort:** \`${currentEffort}\``
-    : "**当前 effort:** 未指定";
-
-  const lines: string[] = [currentLine];
-  if (efforts.length > 0) {
-    lines.push("", "**可切换 effort**");
-    for (const effort of efforts) {
-      lines.push(`- \`${effort}\``);
-    }
-    lines.push("", "点击按钮切换 effort，或输入 `/effort clear` 恢复默认");
-  } else {
-    lines.push("", "当前 agent 不支持 effort 切换。");
-  }
-
-  const buttons: ButtonDef[] = [];
-  for (const effort of efforts.slice(0, 20)) {
-    buttons.push({
-      text: `/effort ${effort}`,
-      value: JSON.stringify({ cmd: `/effort ${effort}` }),
-      type: "primary",
-    });
-  }
-
-  return JSON.stringify({
-    config: { wide_screen_mode: true },
-    header: { template: "blue", title: { content: `Effort 切换${toolLabel}`, tag: "plain_text" } },
-    elements: [
-      { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
-      { tag: "hr" },
-      buildButtons(buttons),
-    ],
-  });
-}
+    ],
+  });
+}
+
+export function buildEffortCard(
+  currentEffort: string,
+  efforts: string[],
+  tool?: string,
+): string {
+  const toolLabel = tool ? ` (${tool})` : "";
+  const currentLine = currentEffort
+    ? `**当前 effort:** \`${currentEffort}\``
+    : "**当前 effort:** 未指定";
+
+  const lines: string[] = [currentLine];
+  if (efforts.length > 0) {
+    lines.push("", "**可切换 effort**");
+    for (const effort of efforts) {
+      lines.push(`- \`${effort}\``);
+    }
+    lines.push("", "点击按钮切换 effort，或输入 `/effort clear` 恢复默认");
+  } else {
+    lines.push("", "当前 agent 不支持 effort 切换。");
+  }
+
+  const buttons: ButtonDef[] = [];
+  for (const effort of efforts.slice(0, 20)) {
+    buttons.push({
+      text: `/effort ${effort}`,
+      value: JSON.stringify({ cmd: `/effort ${effort}` }),
+      type: "primary",
+    });
+  }
+
+  return JSON.stringify({
+    config: { wide_screen_mode: true },
+    header: { template: "blue", title: { content: `Effort 切换${toolLabel}`, tag: "plain_text" } },
+    elements: [
+      { tag: "div", text: { tag: "lark_md", content: lines.join("\n") } },
+      { tag: "hr" },
+      buildButtons(buttons),
+    ],
+  });
+}
 

package/src/chatgpt-subscription-rpc.ts

@@ -1,27 +1,27 @@
-import type { IncomingMessage, ServerResponse } from "node:http";
-
-import { getChatGptSubscriptionStatus } from "./chatgpt-subscription.ts";
-
-export const CHATGPT_SUBSCRIPTION_PATH = "/api/chatgpt/subscription";
-
-function jsonReply(res: ServerResponse, code: number, data: unknown): void {
-  res.writeHead(code, { "Content-Type": "application/json; charset=utf-8" });
-  res.end(JSON.stringify(data));
-}
-
-export async function handleChatGptSubscriptionRequest(
-  req: IncomingMessage,
-  res: ServerResponse,
-): Promise<boolean> {
-  const method = req.method ?? "GET";
-  const url = new URL(req.url ?? "/", "http://127.0.0.1");
-  if (url.pathname !== CHATGPT_SUBSCRIPTION_PATH) return false;
-
-  if (method !== "POST") {
-    jsonReply(res, 405, { ok: false, code: "method_not_allowed", reason: "Use POST." });
-    return true;
-  }
-
-  jsonReply(res, 200, await getChatGptSubscriptionStatus());
-  return true;
-}
+import type { IncomingMessage, ServerResponse } from "node:http";
+
+import { getChatGptSubscriptionStatus } from "./chatgpt-subscription.ts";
+
+export const CHATGPT_SUBSCRIPTION_PATH = "/api/chatgpt/subscription";
+
+function jsonReply(res: ServerResponse, code: number, data: unknown): void {
+  res.writeHead(code, { "Content-Type": "application/json; charset=utf-8" });
+  res.end(JSON.stringify(data));
+}
+
+export async function handleChatGptSubscriptionRequest(
+  req: IncomingMessage,
+  res: ServerResponse,
+): Promise<boolean> {
+  const method = req.method ?? "GET";
+  const url = new URL(req.url ?? "/", "http://127.0.0.1");
+  if (url.pathname !== CHATGPT_SUBSCRIPTION_PATH) return false;
+
+  if (method !== "POST") {
+    jsonReply(res, 405, { ok: false, code: "method_not_allowed", reason: "Use POST." });
+    return true;
+  }
+
+  jsonReply(res, 200, await getChatGptSubscriptionStatus());
+  return true;
+}