chatccc 0.2.197 → 0.2.199

package/src/builtin/session-select.ts

@@ -1,48 +1,48 @@
-import {
-  DEFAULT_BUILTIN_CONTEXT_DIR,
-  getBuiltinContextSession,
-  latestBuiltinSessionForCwd,
-  newBuiltinSessionId,
-  normalizeBuiltinSessionId,
-} from "./context.js";
-
-export type BuiltinResumeRequest = true | string | undefined;
-
-export interface ResolveBuiltinSessionOptions {
-  cwd: string;
-  contextDir?: string;
-  resume?: BuiltinResumeRequest;
-  now?: Date;
-  randomSuffix?: string;
-}
-
-export interface ResolvedBuiltinSession {
-  mode: "new" | "resumed";
-  sessionId: string;
-}
-
-export function resolveBuiltinSession(options: ResolveBuiltinSessionOptions): ResolvedBuiltinSession {
-  const contextDir = options.contextDir ?? DEFAULT_BUILTIN_CONTEXT_DIR;
-
-  if (options.resume === true) {
-    const latest = latestBuiltinSessionForCwd(options.cwd, contextDir);
-    if (!latest) {
-      throw new Error(`未找到当前目录可恢复的 ccc 会话: ${options.cwd}`);
-    }
-    return { mode: "resumed", sessionId: latest.sessionId };
-  }
-
-  if (typeof options.resume === "string") {
-    const sessionId = normalizeBuiltinSessionId(options.resume);
-    const existing = getBuiltinContextSession(sessionId, contextDir);
-    if (!existing) {
-      throw new Error(`未找到 ccc 会话: ${sessionId}`);
-    }
-    return { mode: "resumed", sessionId };
-  }
-
-  return {
-    mode: "new",
-    sessionId: newBuiltinSessionId(options.now, options.randomSuffix),
-  };
-}
+import {
+  DEFAULT_BUILTIN_CONTEXT_DIR,
+  getBuiltinContextSession,
+  latestBuiltinSessionForCwd,
+  newBuiltinSessionId,
+  normalizeBuiltinSessionId,
+} from "./context.js";
+
+export type BuiltinResumeRequest = true | string | undefined;
+
+export interface ResolveBuiltinSessionOptions {
+  cwd: string;
+  contextDir?: string;
+  resume?: BuiltinResumeRequest;
+  now?: Date;
+  randomSuffix?: string;
+}
+
+export interface ResolvedBuiltinSession {
+  mode: "new" | "resumed";
+  sessionId: string;
+}
+
+export function resolveBuiltinSession(options: ResolveBuiltinSessionOptions): ResolvedBuiltinSession {
+  const contextDir = options.contextDir ?? DEFAULT_BUILTIN_CONTEXT_DIR;
+
+  if (options.resume === true) {
+    const latest = latestBuiltinSessionForCwd(options.cwd, contextDir);
+    if (!latest) {
+      throw new Error(`未找到当前目录可恢复的 ccc 会话: ${options.cwd}`);
+    }
+    return { mode: "resumed", sessionId: latest.sessionId };
+  }
+
+  if (typeof options.resume === "string") {
+    const sessionId = normalizeBuiltinSessionId(options.resume);
+    const existing = getBuiltinContextSession(sessionId, contextDir);
+    if (!existing) {
+      throw new Error(`未找到 ccc 会话: ${sessionId}`);
+    }
+    return { mode: "resumed", sessionId };
+  }
+
+  return {
+    mode: "new",
+    sessionId: newBuiltinSessionId(options.now, options.randomSuffix),
+  };
+}

package/src/builtin/sigint.ts

@@ -1,50 +1,50 @@
-export const CTRL_C_CONFIRM_WINDOW_MS = 2000;
-
-export type CtrlCAction =
-  | "arm-interrupt"
-  | "interrupt"
-  | "arm-exit"
-  | "exit";
-
-type PendingCtrlCAction = "interrupt" | "exit";
-
-export interface CtrlCStateOptions {
-  windowMs?: number;
-  now?: () => number;
-}
-
-export interface CtrlCState {
-  press(isGenerating: boolean): CtrlCAction;
-  reset(): void;
-}
-
-export function createCtrlCState(options: CtrlCStateOptions = {}): CtrlCState {
-  const windowMs = options.windowMs ?? CTRL_C_CONFIRM_WINDOW_MS;
-  const now = options.now ?? Date.now;
-
-  let pending: PendingCtrlCAction | null = null;
-  let lastPressAt = 0;
-
-  return {
-    press(isGenerating: boolean): CtrlCAction {
-      const action: PendingCtrlCAction = isGenerating ? "interrupt" : "exit";
-      const current = now();
-      const isConfirmed = pending === action && current - lastPressAt <= windowMs;
-
-      if (isConfirmed) {
-        pending = null;
-        lastPressAt = 0;
-        return action;
-      }
-
-      pending = action;
-      lastPressAt = current;
-      return isGenerating ? "arm-interrupt" : "arm-exit";
-    },
-
-    reset(): void {
-      pending = null;
-      lastPressAt = 0;
-    },
-  };
-}
+export const CTRL_C_CONFIRM_WINDOW_MS = 2000;
+
+export type CtrlCAction =
+  | "arm-interrupt"
+  | "interrupt"
+  | "arm-exit"
+  | "exit";
+
+type PendingCtrlCAction = "interrupt" | "exit";
+
+export interface CtrlCStateOptions {
+  windowMs?: number;
+  now?: () => number;
+}
+
+export interface CtrlCState {
+  press(isGenerating: boolean): CtrlCAction;
+  reset(): void;
+}
+
+export function createCtrlCState(options: CtrlCStateOptions = {}): CtrlCState {
+  const windowMs = options.windowMs ?? CTRL_C_CONFIRM_WINDOW_MS;
+  const now = options.now ?? Date.now;
+
+  let pending: PendingCtrlCAction | null = null;
+  let lastPressAt = 0;
+
+  return {
+    press(isGenerating: boolean): CtrlCAction {
+      const action: PendingCtrlCAction = isGenerating ? "interrupt" : "exit";
+      const current = now();
+      const isConfirmed = pending === action && current - lastPressAt <= windowMs;
+
+      if (isConfirmed) {
+        pending = null;
+        lastPressAt = 0;
+        return action;
+      }
+
+      pending = action;
+      lastPressAt = current;
+      return isGenerating ? "arm-interrupt" : "arm-exit";
+    },
+
+    reset(): void {
+      pending = null;
+      lastPressAt = 0;
+    },
+  };
+}

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" } },
@@ -274,48 +274,48 @@ 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<{
+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;
@@ -325,16 +325,16 @@ export function buildSessionsCard(sessions: Array<{
   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;
+  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;
 
   if (sessions.length === 0) {
     return JSON.stringify({
@@ -357,18 +357,18 @@ 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_") ? " (群聊)" : "";
     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 },
@@ -433,11 +433,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 +449,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 +558,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),
+    ],
+  });
+}