qq-codex-bridge 0.1.2 → 0.1.4

package/dist/apps/bridge-daemon/src/thread-command-handler.js

@@ -1,8 +1,10 @@
 import { randomUUID } from "node:crypto";
 import { BridgeSessionStatus } from "../../../packages/domain/src/session.js";
+import { ensureAppVisible } from "../../../packages/adapters/chatgpt-desktop/src/ax-client.js";
 import { DesktopDriverError } from "../../../packages/domain/src/driver.js";
 export class ThreadCommandHandler {
     deps;
+    chatgptThreadListRefreshSessionKeys = new Set();
     constructor(deps) {
         this.deps = deps;
     }
@@ -11,9 +13,10 @@ export class ThreadCommandHandler {
             return false;
         }
         const text = message.text.trim();
-        if (!this.isSupportedCommand(text)) {
+        if (!text.startsWith("/")) {
             return false;
         }
+        const supportedCommand = this.isSupportedCommand(text);
         const alreadySeen = await this.deps.transcriptStore.hasInbound(message.messageId);
         if (alreadySeen) {
             return true;
@@ -25,15 +28,30 @@ export class ThreadCommandHandler {
             }
             await this.ensureSessionExists(message);
             await this.deps.transcriptStore.recordInbound(message);
+            if (!supportedCommand) {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.deliverControlReply(message, this.buildUnknownCommandText(text, this.currentProvider(session)));
+                return;
+            }
             if (text === "/threads" || text === "/t") {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                if (this.currentProvider(session) === "chatgpt-desktop") {
+                    await this.deliverChatgptThreads(message, session);
+                    return;
+                }
                 const threads = await this.deps.desktopDriver.listRecentThreads(20);
-                await this.deliverControlReply(message, this.formatThreads(threads));
+                await this.deliverControlReply(message, this.formatThreads(threads, session?.codexThreadRef ?? null));
                 return;
             }
             if (text === "/thread current" || text === "/tc") {
                 const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                if (this.currentProvider(session) === "chatgpt-desktop") {
+                    await this.deliverChatgptCurrentThread(message, session);
+                    return;
+                }
                 const threads = await this.deps.desktopDriver.listRecentThreads(20);
-                const current = threads.find((thread) => thread.threadRef === session?.codexThreadRef)
+                const current = threads.find((thread) => session?.codexThreadRef
+                    && areThreadRefsEquivalent(thread.threadRef, session.codexThreadRef))
                     ?? threads.find((thread) => thread.isCurrent)
                     ?? null;
                 const reply = current
@@ -42,12 +60,73 @@ export class ThreadCommandHandler {
                 await this.deliverControlReply(message, reply);
                 return;
             }
+            const sourceMatch = text.match(/^\/source\s+(codex|chatgpt)$/);
+            if (sourceMatch) {
+                const target = sourceMatch[1] === "chatgpt" ? "chatgpt-desktop" : "codex-desktop";
+                await this.deps.sessionStore.updateConversationProvider(message.sessionKey, target);
+                if (target === "chatgpt-desktop") {
+                    this.chatgptThreadListRefreshSessionKeys.add(message.sessionKey);
+                }
+                else {
+                    this.chatgptThreadListRefreshSessionKeys.delete(message.sessionKey);
+                }
+                const label = target === "chatgpt-desktop" ? "ChatGPT Desktop" : "Codex Desktop";
+                await this.deliverControlReply(message, `已切换对话源：${label}\n后续消息将通过 ${label} 回复。`);
+                return;
+            }
+            if (text === "/source") {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                const current = session?.conversationProvider ?? "codex-desktop（全局默认）";
+                await this.deliverControlReply(message, `当前对话源：${current}\n切换：/source codex 或 /source chatgpt`);
+                return;
+            }
+            if (text === "/accounts") {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.deliverControlReply(message, this.buildAccountsText(message, session));
+                return;
+            }
+            if (text === "/cgpt" || text === "/cgpt threads") {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.deliverChatgptThreads(message, session);
+                return;
+            }
+            const cgptUseMatch = text.match(/^\/cgpt\s+use\s+(\d+)$/);
+            if (cgptUseMatch) {
+                const cgDriver = this.deps.chatgptDriver;
+                if (!cgDriver) {
+                    await this.deliverControlReply(message, "ChatGPT Desktop 未启用。");
+                    return;
+                }
+                const index = Number(cgptUseMatch[1]);
+                const chats = cgDriver.listChats(20);
+                const target = chats[index - 1];
+                if (!target) {
+                    await this.deliverControlReply(message, `没有第 ${index} 条对话，请先发 /cgpt 查看列表。`);
+                    return;
+                }
+                const switched = cgDriver.switchToChat(target.title);
+                if (!switched) {
+                    await this.deliverControlReply(message, `切换失败：在侧边栏未找到「${target.title}」，请重试或刷新列表。`);
+                    return;
+                }
+                // 写入当前对话标题，下次 run() 检测到后跳过 clickNewChat
+                cgDriver.markSwitched(message.sessionKey, target.title);
+                await this.deliverControlReply(message, `已切换到 ChatGPT 对话：${target.title}\n下次消息将继续该对话。`);
+                return;
+            }
+            if (text === "/cgpt new") {
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.createChatgptThread(message, session);
+                return;
+            }
             if (text === "/help") {
-                await this.deliverControlReply(message, this.buildHelpText());
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.deliverControlReply(message, this.buildHelpText(this.currentProvider(session)));
                 return;
             }
             if (text === "/h") {
-                await this.deliverControlReply(message, this.buildHelpText());
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                await this.deliverControlReply(message, this.buildHelpText(this.currentProvider(session)));
                 return;
             }
             if (text === "/model" || text === "/m") {
@@ -58,8 +137,14 @@ export class ThreadCommandHandler {
             const switchModelMatch = text.match(/^(?:\/model\s+use|\/mu)\s+(.+)$/);
             if (switchModelMatch) {
                 const targetModel = switchModelMatch[1].trim();
-                const state = await this.deps.desktopDriver.switchModel(targetModel);
-                await this.deliverControlReply(message, this.formatModelSwitchReply(targetModel, state));
+                try {
+                    const state = await this.deps.desktopDriver.switchModel(targetModel);
+                    await this.deliverControlReply(message, this.formatModelSwitchReply(targetModel, state));
+                }
+                catch (error) {
+                    const reason = error instanceof Error ? error.message : String(error);
+                    await this.deliverControlReply(message, `切换模型失败：${reason}\n请检查模型名称是否正确，或当前 Codex Desktop 界面是否可操作。`);
+                }
                 return;
             }
             if (text === "/quota" || text === "/q") {
@@ -69,7 +154,12 @@ export class ThreadCommandHandler {
             }
             if (text === "/status" || text === "/st") {
                 const session = await this.deps.sessionStore.getSession(message.sessionKey);
-                const state = await this.deps.desktopDriver.getControlState();
+                const state = await this.deps.desktopDriver.getControlState(session
+                    ? {
+                        sessionKey: session.sessionKey,
+                        codexThreadRef: session.codexThreadRef
+                    }
+                    : null);
                 const quotaSummary = await this.deps.desktopDriver.getQuotaSummary();
                 await this.deliverControlReply(message, this.formatStatusReply(session, state, quotaSummary));
                 return;
@@ -77,6 +167,11 @@ export class ThreadCommandHandler {
             const useMatch = text.match(/^(?:\/thread\s+use|\/tu)\s+(\d+)$/);
             if (useMatch) {
                 const index = Number(useMatch[1]);
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                if (this.currentProvider(session) === "chatgpt-desktop") {
+                    await this.useChatgptThread(message, index);
+                    return;
+                }
                 const threads = await this.deps.desktopDriver.listRecentThreads(20);
                 const thread = threads[index - 1];
                 if (!thread) {
@@ -95,12 +190,22 @@ export class ThreadCommandHandler {
                     throw error;
                 }
                 await this.deps.sessionStore.updateBinding(message.sessionKey, binding.codexThreadRef);
-                await this.deliverControlReply(message, `已切换到线程：${thread.title}${thread.projectName ? `\n项目：${thread.projectName}` : ""}`);
+                await this.deps.sessionStore.updateSkillContextKey(message.sessionKey, null);
+                await this.deliverControlReply(message, [
+                    `已切换到线程：${thread.title}`,
+                    ...(thread.projectName ? [`项目：${thread.projectName}`] : []),
+                    `绑定标识：${binding.codexThreadRef ?? "未绑定"}`
+                ].join("\n"));
                 return;
             }
             const newMatch = text.match(/^(?:\/thread\s+new|\/tn)\s+(.+)$/);
             if (newMatch) {
                 const title = newMatch[1].trim();
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                if (this.currentProvider(session) === "chatgpt-desktop") {
+                    await this.createChatgptThread(message, session);
+                    return;
+                }
                 const binding = await this.deps.desktopDriver.createThread(message.sessionKey, this.buildNewThreadSeedPrompt(title));
                 await this.deps.sessionStore.updateBinding(message.sessionKey, binding.codexThreadRef);
                 await this.deliverControlReply(message, `已创建并切换到新线程：${title}`);
@@ -109,13 +214,18 @@ export class ThreadCommandHandler {
             const forkMatch = text.match(/^(?:\/thread\s+fork|\/tf)\s+(.+)$/);
             if (forkMatch) {
                 const title = forkMatch[1].trim();
+                const session = await this.deps.sessionStore.getSession(message.sessionKey);
+                if (this.currentProvider(session) === "chatgpt-desktop") {
+                    await this.createChatgptThread(message, session);
+                    return;
+                }
                 const recentConversation = await this.deps.transcriptStore.listRecentConversation(message.sessionKey, 8);
                 const binding = await this.deps.desktopDriver.createThread(message.sessionKey, this.buildForkThreadSeedPrompt(title, recentConversation));
                 await this.deps.sessionStore.updateBinding(message.sessionKey, binding.codexThreadRef);
                 await this.deliverControlReply(message, `已根据最近几轮对话 fork 新线程：${title}`);
                 return;
             }
-            await this.deliverControlReply(message, this.buildHelpText());
+            await this.deliverControlReply(message, this.buildHelpText(this.currentProvider(await this.deps.sessionStore.getSession(message.sessionKey))));
         });
         return true;
     }
@@ -131,7 +241,9 @@ export class ThreadCommandHandler {
             chatType: message.chatType,
             peerId: message.senderId,
             codexThreadRef: null,
+            lastCodexTurnId: null,
             skillContextKey: null,
+            conversationProvider: null,
             status: BridgeSessionStatus.Active,
             lastInboundAt: message.receivedAt,
             lastOutboundAt: null,
@@ -146,6 +258,7 @@ export class ThreadCommandHandler {
             text === "/tc" ||
             text === "/help" ||
             text === "/h" ||
+            text === "/accounts" ||
             text === "/model" ||
             text === "/m" ||
             text === "/quota" ||
@@ -160,9 +273,15 @@ export class ThreadCommandHandler {
             /^\/tn\s+.+$/.test(text) ||
             /^\/thread\s+fork\s+.+$/.test(text) ||
             /^\/tf\s+.+$/.test(text) ||
-            text === "/thread");
+            text === "/thread" ||
+            text === "/cgpt" ||
+            text === "/cgpt threads" ||
+            text === "/cgpt new" ||
+            /^\/cgpt\s+use\s+\d+$/.test(text) ||
+            text === "/source" ||
+            /^\/source\s+(codex|chatgpt)$/.test(text));
     }
-    formatThreads(threads) {
+    formatThreads(threads, boundThreadRef = null) {
         if (threads.length === 0) {
             return "当前没有可用的 Codex 线程。";
         }
@@ -173,7 +292,11 @@ export class ThreadCommandHandler {
             "| 序号 | 项目 | 线程标题 | 最近活动 |",
             "| --- | --- | --- | --- |",
             ...threads.map((thread) => {
-                const index = thread.isCurrent ? `👉🏻 ${thread.index}` : `${thread.index}`;
+                const isBound = Boolean(boundThreadRef
+                    && thread.threadRef
+                    && areThreadRefsEquivalent(thread.threadRef, boundThreadRef));
+                const shouldMark = boundThreadRef ? isBound : thread.isCurrent;
+                const index = shouldMark ? `👉🏻 ${thread.index}` : `${thread.index}`;
                 const project = escapeCell(thread.projectName) || "-";
                 const title = escapeCell(thread.title) || "-";
                 const time = escapeCell(thread.relativeTime) || "-";
@@ -181,6 +304,100 @@ export class ThreadCommandHandler {
             })
         ].join("\n");
     }
+    currentProvider(session) {
+        return session?.conversationProvider ?? "codex-desktop";
+    }
+    async deliverChatgptThreads(message, session) {
+        const cgDriver = this.deps.chatgptDriver;
+        if (!cgDriver) {
+            await this.deliverControlReply(message, "ChatGPT Desktop 未启用，请先 /source chatgpt 切换。");
+            return;
+        }
+        const shouldRefresh = this.chatgptThreadListRefreshSessionKeys.delete(message.sessionKey);
+        try {
+            ensureAppVisible();
+        }
+        catch { /* non-fatal */ }
+        const currentRef = session ? cgDriver.getSessionThreadRef(session.sessionKey) : null;
+        const currentWindowTitle = cgDriver.getCurrentThreadTitle();
+        const chats = this.listChatgptChats(cgDriver, shouldRefresh);
+        if (chats.length === 0) {
+            await this.deliverControlReply(message, "ChatGPT 侧边栏未读取到对话列表。请确保 ChatGPT Desktop 已启动且有历史对话。");
+            return;
+        }
+        const escapeCell = (v) => v.replace(/\|/g, "\\|").replace(/\n/g, " ").trim();
+        const lines = [
+            "最近 20 条 ChatGPT 对话：",
+            "",
+            "| 序号 | 对话标题 |",
+            "| --- | --- |",
+            ...chats.map((c) => {
+                const mark = this.isCurrentChatgptChat(c.title, currentRef, currentWindowTitle) ? "👉🏻 " : "";
+                return `| ${mark}${c.index} | ${escapeCell(c.title)} |`;
+            })
+        ];
+        await this.deliverControlReply(message, lines.join("\n"));
+    }
+    listChatgptChats(cgDriver, shouldRefresh) {
+        const chats = cgDriver.listChats(20);
+        if (!shouldRefresh && chats.length > 0) {
+            return chats;
+        }
+        const refreshedChats = cgDriver.listChats(20);
+        return refreshedChats.length > 0 ? refreshedChats : chats;
+    }
+    async deliverChatgptCurrentThread(message, session) {
+        const cgDriver = this.deps.chatgptDriver;
+        if (!cgDriver) {
+            await this.deliverControlReply(message, "ChatGPT Desktop 未启用，请先 /source chatgpt 切换。");
+            return;
+        }
+        const currentRef = session ? cgDriver.getSessionThreadRef(session.sessionKey) : null;
+        await this.deliverControlReply(message, currentRef ? `当前绑定 ChatGPT 对话：${currentRef}` : "当前私聊还没有绑定 ChatGPT 对话。");
+    }
+    async useChatgptThread(message, index) {
+        const cgDriver = this.deps.chatgptDriver;
+        if (!cgDriver) {
+            await this.deliverControlReply(message, "ChatGPT Desktop 未启用。");
+            return;
+        }
+        const chats = cgDriver.listChats(20);
+        const target = chats[index - 1];
+        if (!target) {
+            await this.deliverControlReply(message, `没有第 ${index} 条 ChatGPT 对话，请先发 /threads 查看列表。`);
+            return;
+        }
+        const switched = cgDriver.switchToChat(target.title);
+        if (!switched) {
+            await this.deliverControlReply(message, `切换失败：在 ChatGPT 侧边栏未找到「${target.title}」，请重试或刷新列表。`);
+            return;
+        }
+        cgDriver.markSwitched(message.sessionKey, target.title);
+        await this.deliverControlReply(message, `已切换到 ChatGPT 对话：${target.title}\n下次消息将继续该对话。`);
+    }
+    isCurrentChatgptChat(title, currentRef, currentWindowTitle) {
+        const normalizedTitle = normalizeChatgptTitle(title);
+        const normalizedRef = currentRef && currentRef !== "__switched__"
+            ? normalizeChatgptTitle(currentRef)
+            : "";
+        if (normalizedRef && normalizedTitle === normalizedRef) {
+            return true;
+        }
+        const normalizedWindowTitle = currentWindowTitle ? normalizeChatgptTitle(currentWindowTitle) : "";
+        return Boolean(normalizedWindowTitle
+            && normalizedTitle
+            && (normalizedWindowTitle === normalizedTitle
+                || normalizedWindowTitle.includes(normalizedTitle)));
+    }
+    async createChatgptThread(message, session) {
+        const cgDriver = this.deps.chatgptDriver;
+        if (!cgDriver) {
+            await this.deliverControlReply(message, "ChatGPT Desktop 未启用。");
+            return;
+        }
+        cgDriver.newChat(session?.sessionKey ?? message.sessionKey);
+        await this.deliverControlReply(message, "已为本会话新建 ChatGPT 对话，下条消息将从新对话开始。");
+    }
     async deliverControlReply(message, text) {
         const draft = {
             draftId: randomUUID(),
@@ -192,25 +409,72 @@ export class ThreadCommandHandler {
         await this.deps.transcriptStore.recordOutbound(draft);
         await this.deps.qqEgress.deliver(draft);
     }
-    buildHelpText() {
+    buildHelpText(provider = "codex-desktop") {
+        if (provider === "chatgpt-desktop") {
+            return [
+                "快捷命令（当前源：ChatGPT Desktop）：",
+                "",
+                "| 用途 | 完整命令 | 简写 |",
+                "| --- | --- | --- |",
+                "| 查看 ChatGPT 最近对话 | `/threads` | `/t` |",
+                "| 查看当前绑定 ChatGPT 对话 | `/thread current` | `/tc` |",
+                "| 切换 ChatGPT 对话 | `/thread use <序号>` | `/tu <序号>` |",
+                "| 新建 ChatGPT 对话 | `/thread new <标题>` | `/tn <标题>` |",
+                "| 查看当前对话源 | `/source` | - |",
+                "| 查看账号状态 | `/accounts` | - |",
+                "| 切换到 Codex Desktop | `/source codex` | - |",
+                "| 查看帮助 | `/help` | `/h` |",
+                "",
+                "建议先发 `/t` 刷新并查看 ChatGPT 对话列表，再用 `/tu 2` 切换。",
+                "模型、额度、状态和真正的 fork 命令目前只适用于 Codex Desktop。"
+            ].join("\n");
+        }
         return [
-            "快捷命令：",
+            "快捷命令（当前源：Codex Desktop）：",
             "",
             "| 用途 | 完整命令 | 简写 |",
             "| --- | --- | --- |",
-            "| 查看最近活跃线程 | `/threads` | `/t` |",
-            "| 查看当前绑定线程 | `/thread current` | `/tc` |",
-            "| 切换到指定线程 | `/thread use <序号>` | `/tu <序号>` |",
-            "| 新建线程 | `/thread new <标题>` | `/tn <标题>` |",
-            "| 基于最近对话 fork 线程 | `/thread fork <标题>` | `/tf <标题>` |",
+            "| 查看 Codex 最近线程 | `/threads` | `/t` |",
+            "| 查看当前绑定 Codex 线程 | `/thread current` | `/tc` |",
+            "| 切换 Codex 线程 | `/thread use <序号>` | `/tu <序号>` |",
+            "| 新建 Codex 线程 | `/thread new <标题>` | `/tn <标题>` |",
+            "| 基于最近对话 fork Codex 线程 | `/thread fork <标题>` | `/tf <标题>` |",
             "| 查看当前模型 | `/model` | `/m` |",
             "| 切换模型 | `/model use <名称>` | `/mu <名称>` |",
             "| 查看额度信息 | `/quota` | `/q` |",
             "| 查看当前运行状态 | `/status` | `/st` |",
             "| 查看帮助 | `/help` | `/h` |",
+            "| 查看当前对话源 | `/source` | - |",
+            "| 查看账号状态 | `/accounts` | - |",
+            "| 切换到 ChatGPT Desktop | `/source chatgpt` | - |",
+            "| 切换到 Codex Desktop | `/source codex` | - |",
+            "",
+            "所有 `/` 开头的桥接快捷指令都会先由桥接层处理，不会直接发给 Codex。",
+            "建议先用 `/source` 确认当前对话源，再发 `/t` 看列表，用 `/tu 2` 切换。",
+            "切到 ChatGPT 后，这套 `/t`、`/tu`、`/tn` 会自动操作 ChatGPT 对话。"
+        ].join("\n");
+    }
+    buildUnknownCommandText(text, provider) {
+        return [
+            `未识别的桥接快捷指令：\`${text}\``,
+            "这条 `/` 指令不会转发给当前对话源。",
             "",
-            "建议先发 `/t` 看列表，再用 `/tu 2` 这种方式切换。",
-            "模型和额度信息来自当前 Codex Desktop 界面，可见性取决于 UI 是否暴露对应信息。"
+            this.buildHelpText(provider)
+        ].join("\n");
+    }
+    buildAccountsText(message, session) {
+        const currentProvider = this.currentProvider(session);
+        const accountKeys = [...new Set(this.deps.accountKeys ?? [message.accountKey])].sort();
+        return [
+            "账号状态：",
+            "",
+            "| 项目 | 值 |",
+            "| --- | --- |",
+            `| 当前账号 | ${escapeMarkdownCell(message.accountKey)} |`,
+            `| 当前来源 | ${message.accountKey.startsWith("weixin:") ? "微信" : "QQ"} |`,
+            `| 当前会话 | ${escapeMarkdownCell(message.sessionKey)} |`,
+            `| 当前对话源 | ${currentProvider} |`,
+            `| 已接入账号 | ${accountKeys.map(escapeMarkdownCell).join(", ")} |`
         ].join("\n");
     }
     formatModelReply(state) {
@@ -232,9 +496,13 @@ export class ThreadCommandHandler {
         return `额度信息：${quotaSummary ?? "当前界面未显示明确额度，暂未识别到剩余配额。"}`;
     }
     formatStatusReply(session, state, quotaSummary) {
+        const boundThreadRef = state.threadRef ?? session?.codexThreadRef ?? null;
         return [
             "当前运行状态：",
-            `线程绑定：${session?.codexThreadRef ?? "未绑定"}`,
+            `线程绑定：${boundThreadRef ?? "未绑定"}`,
+            ...(state.threadTitle ? [`线程标题：${state.threadTitle}`] : []),
+            ...(state.threadProjectName ? [`线程项目：${state.threadProjectName}`] : []),
+            ...(state.threadRelativeTime ? [`线程最近活动：${state.threadRelativeTime}`] : []),
             `模型：${state.model ?? "未识别"}`,
             `推理强度：${state.reasoningEffort ?? "未识别"}`,
             `工作区：${state.workspace ?? "未识别"}`,
@@ -268,3 +536,32 @@ export class ThreadCommandHandler {
         ].join("\n");
     }
 }
+function areThreadRefsEquivalent(left, right) {
+    if (left === right) {
+        return true;
+    }
+    const leftAppThreadId = extractAppServerThreadId(left);
+    const rightAppThreadId = extractAppServerThreadId(right);
+    return Boolean(leftAppThreadId && rightAppThreadId && leftAppThreadId === rightAppThreadId);
+}
+function extractAppServerThreadId(threadRef) {
+    const prefix = "codex-app-thread:";
+    if (!threadRef.startsWith(prefix)) {
+        return null;
+    }
+    const payload = threadRef.slice(prefix.length);
+    const separatorIndex = payload.indexOf(":");
+    const threadId = separatorIndex >= 0 ? payload.slice(0, separatorIndex) : payload;
+    return threadId.trim() ? threadId : null;
+}
+function normalizeChatgptTitle(value) {
+    return value
+        .replace(/^chatgpt\s*[-–—:|]?\s*/i, "")
+        .replace(/\s*[-–—:|]?\s*chatgpt$/i, "")
+        .replace(/\s+/g, " ")
+        .trim()
+        .toLowerCase();
+}
+function escapeMarkdownCell(value) {
+    return value.replace(/\|/g, "\\|").replace(/\n/g, " ").trim();
+}