chatccc 0.2.181 → 0.2.183

package/src/orchestrator.ts

@@ -38,14 +38,14 @@ import {
 import {
   buildHelpCard,
   buildModelCard,
-  buildStatusCard,
-  buildCdContent,
-  buildCdCard,
-  buildSessionsCard,
-  buildQueuedCard,
-  buildQueueFullCard,
-  buildCodexUsageCard,
-} from "./cards.ts";
+  buildStatusCard,
+  buildCdContent,
+  buildCdCard,
+  buildSessionsCard,
+  buildQueuedCard,
+  buildQueueFullCard,
+  buildCodexUsageCard,
+} from "./cards.ts";
 import {
   formatGitResult,
   gitResultHeaderTemplate,
@@ -79,10 +79,10 @@ import {
   enqueueMessage,
   cancelQueuedMessage,
 } from "./session-chat-binding.ts";
-import { getCodexUsageSummary, getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
-import { getCursorUsageSummary, type CursorUsageSummary } from "./cursor-usage.ts";
-import { applySharedPrefix } from "./shared-prefix.ts";
-export { type PlatformAdapter } from "./platform-adapter.ts";
+import { getCodexUsageSummary, getTenantAccessToken, sendPostMessage } from "./feishu-platform.ts";
+import { getCursorUsageSummary, type CursorUsageSummary } from "./cursor-usage.ts";
+import { applySharedPrefix } from "./shared-prefix.ts";
+export { type PlatformAdapter } from "./platform-adapter.ts";
 import type { PlatformAdapter } from "./platform-adapter.ts";
 import type { CodexUsageSummary } from "./feishu-api.ts";
 
@@ -114,7 +114,7 @@ function findModelMatch(input: string, models: string[]): string | null {
   return candidates[0] ?? null;
 }
 
-function formatCodexUsageSummary(usage: CodexUsageSummary): string {
+function formatCodexUsageSummary(usage: CodexUsageSummary): string {
   const progressBar = (usedPercent: number) => {
     const width = 20;
     const usedBlocks = Math.max(0, Math.min(width, Math.round((usedPercent / 100) * width)));
@@ -153,54 +153,54 @@ function formatCodexUsageSummary(usage: CodexUsageSummary): string {
     return `${absolute}${formatDuration(balance.resetAfterSeconds)}`;
   };
 
-  const formatWindow = (label: string, balance: CodexUsageSummary["fiveHour"] | null) => {
-    if (!balance) return `**${label}:** 暂无数据`;
-    return [
-      `**${label}:** 已用 ${balance.usedPercent}%，剩余 ${balance.remainingPercent}%，重置: ${formatResetTime(balance)}`,
-      progressBar(balance.usedPercent),
-    ].join("\n");
-  };
-
-  const formatResetCredits = () => {
-    if (usage.rateLimitResetCreditsAvailable === null) return "**主动重置:** 暂无数据";
-    const lines = [`**主动重置:** 剩余 ${usage.rateLimitResetCreditsAvailable} 次`];
-    const credits = usage.rateLimitResetCredits ?? [];
-    if (credits.length > 0) {
-      const pad = (value: number) => String(value).padStart(2, "0");
-      const formatExpiresAt = (value: string) => {
-        const date = new Date(value);
-        if (!Number.isFinite(date.getTime())) return value;
-        return [
-          date.getFullYear(),
-          "-",
-          pad(date.getMonth() + 1),
-          "-",
-          pad(date.getDate()),
-          " ",
-          pad(date.getHours()),
-          ":",
-          pad(date.getMinutes()),
-          ":",
-          pad(date.getSeconds()),
-        ].join("");
-      };
-      lines.push("**过期时间:**");
-      for (const credit of credits) {
-        lines.push(`- ${formatExpiresAt(credit.expiresAt)}`);
-      }
-    }
-    return lines.join("\n");
-  };
-
-  return [
-    "Codex 用量：",
-    "",
-    formatResetCredits(),
-    "",
-    formatWindow("5h", usage.fiveHour),
-    formatWindow("周", usage.weekly),
-  ].join("\n");
-}
+  const formatWindow = (label: string, balance: CodexUsageSummary["fiveHour"] | null) => {
+    if (!balance) return `**${label}:** 暂无数据`;
+    return [
+      `**${label}:** 已用 ${balance.usedPercent}%，剩余 ${balance.remainingPercent}%，重置: ${formatResetTime(balance)}`,
+      progressBar(balance.usedPercent),
+    ].join("\n");
+  };
+
+  const formatResetCredits = () => {
+    if (usage.rateLimitResetCreditsAvailable === null) return "**主动重置:** 暂无数据";
+    const lines = [`**主动重置:** 剩余 ${usage.rateLimitResetCreditsAvailable} 次`];
+    const credits = usage.rateLimitResetCredits ?? [];
+    if (credits.length > 0) {
+      const pad = (value: number) => String(value).padStart(2, "0");
+      const formatExpiresAt = (value: string) => {
+        const date = new Date(value);
+        if (!Number.isFinite(date.getTime())) return value;
+        return [
+          date.getFullYear(),
+          "-",
+          pad(date.getMonth() + 1),
+          "-",
+          pad(date.getDate()),
+          " ",
+          pad(date.getHours()),
+          ":",
+          pad(date.getMinutes()),
+          ":",
+          pad(date.getSeconds()),
+        ].join("");
+      };
+      lines.push("**过期时间:**");
+      for (const credit of credits) {
+        lines.push(`- ${formatExpiresAt(credit.expiresAt)}`);
+      }
+    }
+    return lines.join("\n");
+  };
+
+  return [
+    "Codex 用量：",
+    "",
+    formatResetCredits(),
+    "",
+    formatWindow("5h", usage.fiveHour),
+    formatWindow("周", usage.weekly),
+  ].join("\n");
+}
 
 function formatCursorUsageSummary(usage: CursorUsageSummary): string {
   const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
@@ -259,7 +259,7 @@ function formatCursorUsageSummary(usage: CursorUsageSummary): string {
 }
 
 function usageHelpLine(tool: string): string {
-  if (tool === "codex") return "\n发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡。";
+  if (tool === "codex") return "\n发送 **/usage** 查看 Codex 5h/周用量，以及查询/使用主动重置卡。";
   if (tool === "cursor") return "\n发送 **/usage** 查看 Cursor 用量。";
   return "";
 }
@@ -284,16 +284,16 @@ async function sendUsageSummary(platform: PlatformAdapter, chatId: string, tool:
     return;
   }
 
-  const usage = await getCodexUsageSummary();
-  const content = formatCodexUsageSummary(usage);
-  if (platform.kind === "wechat") {
-    await platform.sendText(chatId, content).catch(() => {});
-  } else if (platform.kind === "feishu") {
-    await platform.sendRawCard(chatId, buildCodexUsageCard(content, usage.rateLimitResetCreditsAvailable));
-  } else {
-    await platform.sendCard(chatId, "Codex Usage", content, "blue");
-  }
-}
+  const usage = await getCodexUsageSummary();
+  const content = formatCodexUsageSummary(usage);
+  if (platform.kind === "wechat") {
+    await platform.sendText(chatId, content).catch(() => {});
+  } else if (platform.kind === "feishu") {
+    await platform.sendRawCard(chatId, buildCodexUsageCard(content, usage.rateLimitResetCreditsAvailable));
+  } else {
+    await platform.sendCard(chatId, "Codex Usage", content, "blue");
+  }
+}
 
 async function sendUsageError(platform: PlatformAdapter, chatId: string, tool: "codex" | "cursor", err: unknown): Promise<void> {
   const toolLabel = tool === "cursor" ? "Cursor" : "Codex";
@@ -309,13 +309,13 @@ function isUntitledSessionChatName(name: string): boolean {
   return name === "新会话" || name.startsWith("新会话-");
 }
 
-function shouldSendWechatProcessingAck(
-  platform: PlatformAdapter,
-  isCommandText: boolean,
-  chatType: string,
-): boolean {
-  return platform.kind === "wechat" && chatType === "p2p" && !isCommandText;
-}
+function shouldSendWechatProcessingAck(
+  platform: PlatformAdapter,
+  isCommandText: boolean,
+  chatType: string,
+): boolean {
+  return platform.kind === "wechat" && chatType === "p2p" && !isCommandText;
+}
 
 function isNonWechatP2p(platform: PlatformAdapter, chatType: string): boolean {
   return chatType === "p2p" && platform.kind !== "wechat";
@@ -445,17 +445,17 @@ export async function handleCommand(
   msgTimestamp: number,
   chatType = "group",
   traceId?: string,
-): Promise<void> {
-  const tid = traceId ?? makeTraceId();
-  const sharedPrefix = applySharedPrefix(text);
-  const promptText = sharedPrefix.text;
-  text = sharedPrefix.body;
-  const textLower = text.toLowerCase();
-  const isCommandText = !sharedPrefix.matched && textLower.startsWith("/");
-  recordChatPlatform(chatId, platform);
+): Promise<void> {
+  const tid = traceId ?? makeTraceId();
+  const sharedPrefix = applySharedPrefix(text);
+  const promptText = sharedPrefix.text;
+  text = sharedPrefix.body;
+  const textLower = text.toLowerCase();
+  const isCommandText = !sharedPrefix.matched && textLower.startsWith("/");
+  recordChatPlatform(chatId, platform);
   await cleanupNonWechatP2pBinding(platform, chatId, chatType, tid);
 
-  if (isCommandText && textLower === "/restart") {
+  if (isCommandText && textLower === "/restart") {
     logTrace(tid, "BRANCH", { cmd: "/restart" });
     await platform.sendText(chatId, "重启中...请几秒后发消息唤醒我").catch(() => {});
     logTrace(tid, "DONE", { outcome: "restart" });
@@ -490,7 +490,7 @@ export async function handleCommand(
     return;
   }
 
-  if (isCommandText && textLower === "/update") {
+  if (isCommandText && textLower === "/update") {
     logTrace(tid, "BRANCH", { cmd: "/update" });
     const isGlobal = isRunningFromGlobalNpm();
     appendStartupTrace("update: command received", { isGlobal, chatId });
@@ -507,7 +507,7 @@ export async function handleCommand(
     return;
   }
 
-  if (isCommandText && textLower === "/usage") {
+  if (isCommandText && textLower === "/usage") {
     const usageTool = await resolveUsageTool(chatId);
     logTrace(tid, "BRANCH", { cmd: "/usage", tool: usageTool });
     try {
@@ -520,7 +520,7 @@ export async function handleCommand(
     return;
   }
 
-  if (isCommandText && (textLower === "/cd" || textLower.startsWith("/cd "))) {
+  if (isCommandText && (textLower === "/cd" || textLower.startsWith("/cd "))) {
     logTrace(tid, "BRANCH", {
       cmd: "/cd",
       arg: text.slice(3).trim() || "(none)",
@@ -643,7 +643,7 @@ export async function handleCommand(
     return;
   }
 
-  if (isCommandText && (textLower === "/new" || textLower.startsWith("/new "))) {
+  if (isCommandText && (textLower === "/new" || textLower.startsWith("/new "))) {
     const toolArg = text.slice(5).trim().toLowerCase();
     const tool = toolArg || resolveDefaultAgentTool();
     logTrace(tid, "BRANCH", { cmd: "/new", tool });
@@ -904,7 +904,7 @@ export async function handleCommand(
   if (sessionId && descriptionTool && toolLabel) {
     // 有会话上下文 — 路由到命令处理或 prompt
     logTrace(tid, "BRANCH", { sessionId, tool: descriptionTool });
-    const routeKind = isCommandText ? "command" : "prompt";
+    const routeKind = isCommandText ? "command" : "prompt";
     const chatKind = chatType === "p2p" ? "p2p chat" : "session group";
     console.log(
       `[${ts()}] [ROUTE] ${toolLabel} ${chatKind} ${routeKind} detected, session=${sessionId} tool=${descriptionTool}`,
@@ -913,7 +913,7 @@ export async function handleCommand(
     if (
       chatType !== "p2p" &&
       isUntitledSessionChatName(chatInfo!.name) &&
-      !isCommandText
+      !isCommandText
     ) {
       const MAX_PREFIX = 10;
       const prefix = text.slice(0, MAX_PREFIX);
@@ -948,7 +948,7 @@ export async function handleCommand(
     if (
       chatType === "p2p" &&
       platform.kind === "wechat" &&
-      !isCommandText
+      !isCommandText
     ) {
       try {
         const reg = await loadSessionRegistryForBinding();
@@ -987,7 +987,7 @@ export async function handleCommand(
       }
     }
 
-    if (isCommandText && textLower === "/stop") {
+    if (isCommandText && textLower === "/stop") {
       logTrace(tid, "BRANCH", { cmd: "/stop" });
       if (stopSession(sessionId)) {
         console.log(`[${ts()}] [STOP] User sent /stop, session=${sessionId}`);
@@ -1001,7 +1001,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/cancel") {
+    if (isCommandText && textLower === "/cancel") {
       logTrace(tid, "BRANCH", { cmd: "/cancel" });
       if (cancelQueuedMessage(sessionId)) {
         console.log(`[${ts()}] [CANCEL] Queue cancelled for session=${sessionId}`);
@@ -1014,7 +1014,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/test") {
+    if (isCommandText && textLower === "/test") {
       logTrace(tid, "BRANCH", { cmd: "/test" });
       const tableHeaders = ["名称", "版本", "状态"];
       const tableRows = [
@@ -1051,7 +1051,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/state") {
+    if (isCommandText && textLower === "/state") {
       logTrace(tid, "BRANCH", { cmd: "/state" });
       const status = await getSessionStatus(chatId);
       const isActive = isSessionRunning(sessionId);
@@ -1090,7 +1090,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/sessions") {
+    if (isCommandText && textLower === "/sessions") {
       logTrace(tid, "BRANCH", { cmd: "/sessions" });
       const allSessions = await getAllSessionsStatus();
       const now = Date.now();
@@ -1115,7 +1115,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/newh") {
+    if (isCommandText && textLower === "/newh") {
       logTrace(tid, "BRANCH", { cmd: "/newh" });
       const adapter = getAdapterForTool(descriptionTool, sessionId);
       let cwd: string;
@@ -1202,7 +1202,7 @@ export async function handleCommand(
       return;
     }
 
-    if (isCommandText && textLower === "/deleteg") {
+    if (isCommandText && textLower === "/deleteg") {
       logTrace(tid, "BRANCH", { cmd: "/deleteg" });
       if (chatType === "p2p") {
         await platform
@@ -1240,7 +1240,7 @@ export async function handleCommand(
     }
 
     // /session <number>：切换到 /sessions 列表中的指定会话
-    const sessionMatch = isCommandText ? textLower.match(/^\/session\s+(\d+)$/) : null;
+    const sessionMatch = isCommandText ? textLower.match(/^\/session\s+(\d+)$/) : null;
     if (sessionMatch) {
       const index = parseInt(sessionMatch[1], 10) - 1;
       logTrace(tid, "BRANCH", { cmd: "/session", index: index + 1 });
@@ -1366,7 +1366,7 @@ export async function handleCommand(
     }
 
     // /model clear — 清除当前 session 的模型覆盖
-    if (isCommandText && textLower === "/model clear") {
+    if (isCommandText && textLower === "/model clear") {
       logTrace(tid, "BRANCH", { cmd: "/model clear", sessionId });
       clearSessionModelOverride(sessionId);
       const defaultModel = getEffectiveModelForTool(descriptionTool);
@@ -1381,7 +1381,7 @@ export async function handleCommand(
     }
 
     // /model <name> — 切换当前 session 的模型（支持所有 agent，模糊匹配）
-    if (isCommandText && textLower.startsWith("/model ")) {
+    if (isCommandText && textLower.startsWith("/model ")) {
       const modelArg = text.slice(7).trim();
       if (!modelArg) return; // 纯 "/model " 不处理，交给上面的 /model 分支
       logTrace(tid, "BRANCH", { cmd: "/model", arg: modelArg, sessionId, tool: descriptionTool });
@@ -1415,7 +1415,7 @@ export async function handleCommand(
     }
 
     // /model — 查看当前会话的可用模型（根据会话 Agent 类型）
-    if (isCommandText && textLower === "/model") {
+    if (isCommandText && textLower === "/model") {
       logTrace(tid, "BRANCH", { cmd: "/model", sessionId, tool: descriptionTool });
       const models = getAllModelsForTool(descriptionTool as AgentTool);
       const currentModel = getEffectiveModelForTool(descriptionTool, sessionId);
@@ -1439,7 +1439,7 @@ export async function handleCommand(
     }
 
     // /git <args>：在「当前会话工作目录」执行 git 命令
-    if (isCommandText && (textLower.startsWith("/git ") || textLower === "/git")) {
+    if (isCommandText && (textLower.startsWith("/git ") || textLower === "/git")) {
       const args = text === "/git" ? "" : text.slice(5).trim();
       logTrace(tid, "BRANCH", { cmd: "/git", args: args || "(none)" });
       if (!args) {
@@ -1508,9 +1508,9 @@ export async function handleCommand(
 
     // 并发检查：同一 session 只能有一个活跃 prompt，多余消息进入队列
     if (isSessionRunning(sessionId)) {
-      const queued = enqueueMessage(sessionId, {
-        text: promptText, chatId, openId, msgTimestamp, chatType, traceId: tid,
-      });
+      const queued = enqueueMessage(sessionId, {
+        text: promptText, chatId, openId, msgTimestamp, chatType, traceId: tid,
+      });
       if (queued) {
         logTrace(tid, "QUEUED", { sessionId });
         console.log(
@@ -1535,16 +1535,16 @@ export async function handleCommand(
       return;
     }
 
-    if (shouldSendWechatProcessingAck(platform, isCommandText, chatType)) {
+    if (shouldSendWechatProcessingAck(platform, isCommandText, chatType)) {
       await platform.sendText(chatId, "生成中...").catch(() => {});
     }
 
     try {
       logTrace(tid, "RESUME", { sessionId, tool: descriptionTool });
       await resumeAndPrompt(
-        sessionId,
-        promptText,
-        platform,
+        sessionId,
+        promptText,
+        platform,
         chatId,
         msgTimestamp,
         descriptionTool,
@@ -1570,7 +1570,7 @@ export async function handleCommand(
   }
 
   // 无会话上下文 → 检查是否是 /model 查询
-  if (isCommandText && textLower === "/model") {
+  if (isCommandText && textLower === "/model") {
     const defaultTool = resolveDefaultAgentTool();
     const models = getAllModelsForTool(defaultTool);
     let currentModel = "";
@@ -1597,7 +1597,7 @@ export async function handleCommand(
   }
 
   // 无会话上下文 → /sessions 仍是有效指令，不触发飞书私聊自动建群。
-  if (isCommandText && textLower === "/sessions") {
+  if (isCommandText && textLower === "/sessions") {
     logTrace(tid, "BRANCH", { cmd: "/sessions", scope: "global" });
     const allSessions = await getAllSessionsStatus();
     const now = Date.now();
@@ -1623,7 +1623,7 @@ export async function handleCommand(
   }
 
   // 飞书私聊普通消息：不再绑定私聊本身，而是自动创建会话群并把私聊内容作为首轮 prompt。
-  if (isNonWechatP2p(platform, chatType) && !isCommandText) {
+  if (isNonWechatP2p(platform, chatType) && !isCommandText) {
     const tool = resolveDefaultAgentTool();
     const toolLabel = toolDisplayName(tool);
     logTrace(tid, "BRANCH", { cmd: "auto_new_from_p2p", tool });
@@ -1741,9 +1741,9 @@ export async function handleCommand(
     try {
       logTrace(tid, "RESUME", { sessionId, tool, trigger: "auto_new_from_p2p" });
       await resumeAndPrompt(
-        sessionId,
-        promptText,
-        platform,
+        sessionId,
+        promptText,
+        platform,
         newChatId,
         msgTimestamp,
         tool,

package/src/shared-prefix.ts

@@ -1,29 +1,29 @@
-export const ABD_PREFIX = "/abd";
-
-export const ABD_APPEND_PROMPT =
-  "请从第一性原理出发挖掘我的真实需求。你觉得我的需求合理吗？开始实现之前有什么问题要问我的？";
-
-export const ABD_HELP_LINE =
-  `发送 **${ABD_PREFIX}** 前缀消息，将以第一性原理追问真实需求、合理性和实现前问题`;
-
-export interface SharedPrefixResult {
-  matched: boolean;
-  text: string;
-  body: string;
-  prefix?: typeof ABD_PREFIX;
-}
-
-export function applySharedPrefix(text: string): SharedPrefixResult {
-  if (!text.toLowerCase().startsWith(ABD_PREFIX)) {
-    return { matched: false, text, body: text };
-  }
-
-  const body = text.slice(ABD_PREFIX.length).replace(/^\s+/, "");
-  const appendix = ["---", ABD_APPEND_PROMPT].join("\n");
-  return {
-    matched: true,
-    prefix: ABD_PREFIX,
-    body,
-    text: body ? [body, appendix].join("\n\n") : appendix,
-  };
-}
+export const ABD_PREFIX = "/abd";
+
+export const ABD_APPEND_PROMPT =
+  "请从第一性原理出发挖掘我的真实需求。你觉得我的需求合理吗？开始实现之前有什么问题要问我的？";
+
+export const ABD_HELP_LINE =
+  `发送 **${ABD_PREFIX}** 前缀消息，将以第一性原理追问真实需求、合理性和实现前问题`;
+
+export interface SharedPrefixResult {
+  matched: boolean;
+  text: string;
+  body: string;
+  prefix?: typeof ABD_PREFIX;
+}
+
+export function applySharedPrefix(text: string): SharedPrefixResult {
+  if (!text.toLowerCase().startsWith(ABD_PREFIX)) {
+    return { matched: false, text, body: text };
+  }
+
+  const body = text.slice(ABD_PREFIX.length).replace(/^\s+/, "");
+  const appendix = ["---", ABD_APPEND_PROMPT].join("\n");
+  return {
+    matched: true,
+    prefix: ABD_PREFIX,
+    body,
+    text: body ? [body, appendix].join("\n\n") : appendix,
+  };
+}

package/src/sim-platform.ts

@@ -123,25 +123,25 @@ export const SimulatedPlatform: FeishuPlatform = {
   },
 
   // ---- 头像 ----
-  async setChatAvatar(_token, _chatId, _tool, _status) {
-    // 模拟模式不需要头像
-  },
-
-  async getCodexUsageSummary() {
-    return {
-      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
-      rateLimitResetCreditsAvailable: null,
-      rateLimitResetCredits: null,
-    };
-  },
-
-  async consumeCodexRateLimitResetCredit(_redeemRequestId) {
-    return { code: "no_credit" as const, windowsReset: 0 };
-  },
-
-  // ---- 图片下载 ----
-  async getOrDownloadImage(_token, _messageId, fileKey) {
+  async setChatAvatar(_token, _chatId, _tool, _status) {
+    // 模拟模式不需要头像
+  },
+
+  async getCodexUsageSummary() {
+    return {
+      fiveHour: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      weekly: { usedPercent: 0, remainingPercent: 100, resetAtEpochSeconds: null, resetAfterSeconds: null },
+      rateLimitResetCreditsAvailable: null,
+      rateLimitResetCredits: null,
+    };
+  },
+
+  async consumeCodexRateLimitResetCredit(_redeemRequestId) {
+    return { code: "no_credit" as const, windowsReset: 0 };
+  },
+
+  // ---- 图片下载 ----
+  async getOrDownloadImage(_token, _messageId, fileKey) {
     return join(SIM_DIR, "images", fileKey);
   },
 
@@ -174,4 +174,4 @@ export const SimulatedPlatform: FeishuPlatform = {
 };
 
 /** 模拟模式下的默认 chat_id（重新导出以保持向后兼容） */
-export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";
+export { SIM_DEFAULT_CHAT_ID } from "./sim-store.ts";