cli-wechat-bridge 1.1.2 → 1.1.4

package/dist/bridge/bridge-utils.js

@@ -61,45 +61,40 @@ const INLINE_VOICE_EXTENSIONS = new Set([
     ".ogg",
     ".aac",
 ]);
+// Directly executable / installer file types are never auto-uploaded from a
+// path mentioned in a reply: handing these to WeChat contacts by accident is
+// a real hazard. Everything else — source code, documents, archives, data
+// files — stays auto-sendable so common workflows keep working.
 const INLINE_REFERENCE_ONLY_FILE_EXTENSIONS = new Set([
+    // Windows binaries and installers
+    ".exe",
+    ".dll",
+    ".sys",
+    ".msi",
+    ".msp",
+    ".scr",
+    ".com",
+    ".pif",
+    ".cpl",
+    ".ocx",
+    ".hta",
+    ".jar",
+    // Windows one-click script launchers
     ".bat",
-    ".c",
-    ".cc",
-    ".cjs",
     ".cmd",
-    ".cpp",
-    ".cs",
-    ".cts",
-    ".cxx",
-    ".go",
-    ".h",
-    ".hh",
-    ".hpp",
-    ".java",
-    ".js",
-    ".jsx",
-    ".kt",
-    ".kts",
-    ".lua",
-    ".m",
-    ".mjs",
-    ".mm",
-    ".mts",
-    ".php",
-    ".pl",
     ".ps1",
-    ".psd1",
-    ".psm1",
-    ".py",
-    ".rb",
-    ".rs",
-    ".scala",
+    ".vbs",
+    ".vbe",
+    ".jse",
+    ".wsf",
+    ".wsh",
+    // Unix one-click script launchers and installable packages
     ".sh",
-    ".swift",
-    ".ts",
-    ".tsx",
-    ".vb",
-    ".zsh",
+    ".bash",
+    ".deb",
+    ".rpm",
+    ".apk",
+    ".dmg",
 ]);
 const INLINE_MAAS_URL_RE = /https?:\/\/[^\s]*?\/([A-Za-z]:\\.+?(?:\.\s*[A-Za-z0-9]{2,8})+)(?:\?[^\n]*)?/g;
 const INLINE_WINDOWS_PATH_RE = /(^|[^\w])`?([A-Za-z]:\\(?:[^\\/:*?"<>|\r\n`]+\\)*[^\\/:*?"<>|\r\n`]+?(?:\.\s*[A-Za-z0-9]{2,8})+)`?(?=$|[^\w])/gm;
@@ -451,176 +446,6 @@ export function isHighRiskShellCommand(command) {
     }
     return HIGH_RISK_PATTERNS.some((pattern) => pattern.test(normalized));
 }
-const ALWAYS_INTERACTIVE_SHELL_COMMANDS = new Set([
-    "ftp",
-    "htop",
-    "irb",
-    "less",
-    "more",
-    "mongosh",
-    "mysql",
-    "nano",
-    "nvim",
-    "psql",
-    "redis-cli",
-    "screen",
-    "sftp",
-    "sqlite3",
-    "ssh",
-    "telnet",
-    "tmux",
-    "top",
-    "vi",
-    "vim",
-    "watch",
-]);
-function tokenizeShellCommand(command, maxTokens = 16) {
-    const tokens = [];
-    let current = "";
-    let quote = null;
-    for (const char of command.trim()) {
-        if (quote) {
-            if (char === quote) {
-                quote = null;
-            }
-            else {
-                current += char;
-            }
-            continue;
-        }
-        if (char === '"' || char === "'") {
-            quote = char;
-            continue;
-        }
-        if (/\s/u.test(char)) {
-            if (current) {
-                tokens.push(current);
-                current = "";
-                if (tokens.length >= maxTokens) {
-                    return tokens;
-                }
-            }
-            continue;
-        }
-        current += char;
-    }
-    if (current) {
-        tokens.push(current);
-    }
-    return tokens;
-}
-function normalizeShellExecutableToken(token) {
-    const trimmed = token.trim().replace(/^["']|["']$/g, "");
-    if (!trimmed) {
-        return "";
-    }
-    return path.parse(trimmed).name.toLowerCase();
-}
-function findCommandFlagIndex(args, supportedFlags) {
-    return args.findIndex((arg) => supportedFlags.includes(arg.toLowerCase()));
-}
-function hasScriptLikeArg(args) {
-    return args.some((arg) => Boolean(arg) && !arg.startsWith("-") && !arg.startsWith("/"));
-}
-function hasAnyCommandFlag(args, supportedFlags) {
-    return findCommandFlagIndex(args, supportedFlags) >= 0;
-}
-function buildInteractiveShellCommandMessage(executable, suggestion) {
-    return `Interactive command "${executable}" is not supported in shell mode yet. This shell bridge currently only supports non-interactive commands and scripts. ${suggestion}`;
-}
-export function getInteractiveShellCommandRejectionMessage(command) {
-    const tokens = tokenizeShellCommand(command);
-    if (!tokens.length) {
-        return null;
-    }
-    const firstToken = tokens[0];
-    if (!firstToken) {
-        return null;
-    }
-    const executable = normalizeShellExecutableToken(firstToken);
-    const args = tokens.slice(1);
-    const lowerArgs = args.map((arg) => arg.toLowerCase());
-    if (!executable) {
-        return null;
-    }
-    if (ALWAYS_INTERACTIVE_SHELL_COMMANDS.has(executable)) {
-        return buildInteractiveShellCommandMessage(executable, "Run a non-interactive command or script instead.");
-    }
-    switch (executable) {
-        case "python":
-        case "python3":
-        case "py": {
-            if (!args.length) {
-                return buildInteractiveShellCommandMessage(executable, 'Try "python script.py" or "python -c \\"...\\"" instead.');
-            }
-            if (lowerArgs.includes("-i") || lowerArgs.includes("--interactive")) {
-                return buildInteractiveShellCommandMessage(executable, 'Try "python script.py" or "python -c \\"...\\"" instead.');
-            }
-            if (hasAnyCommandFlag(lowerArgs, ["-c", "-h", "--help", "-v", "--version"])) {
-                return null;
-            }
-            const moduleFlagIndex = findCommandFlagIndex(lowerArgs, ["-m"]);
-            if (moduleFlagIndex >= 0) {
-                return moduleFlagIndex < args.length - 1
-                    ? null
-                    : buildInteractiveShellCommandMessage(executable, 'Try "python script.py" or "python -m module_name" instead.');
-            }
-            return hasScriptLikeArg(args)
-                ? null
-                : buildInteractiveShellCommandMessage(executable, 'Try "python script.py" or "python -c \\"...\\"" instead.');
-        }
-        case "node":
-            if (!args.length || lowerArgs.includes("-i") || lowerArgs.includes("--interactive")) {
-                return buildInteractiveShellCommandMessage(executable, 'Try "node script.js" or "node -e \\"...\\"" instead.');
-            }
-            if (hasAnyCommandFlag(lowerArgs, ["-e", "--eval", "-p", "--print", "-h", "--help", "-v", "--version"])) {
-                return null;
-            }
-            return hasScriptLikeArg(args)
-                ? null
-                : buildInteractiveShellCommandMessage(executable, 'Try "node script.js" or "node -e \\"...\\"" instead.');
-        case "cmd":
-            if (lowerArgs.includes("/?")) {
-                return null;
-            }
-            if (lowerArgs.includes("/k") || !lowerArgs.includes("/c")) {
-                return buildInteractiveShellCommandMessage(executable, 'Try "cmd /c <command>" or run the command directly instead.');
-            }
-            return null;
-        case "powershell":
-        case "pwsh":
-            if (!args.length ||
-                lowerArgs.includes("-noexit") ||
-                lowerArgs.includes("-nologo") && args.length === 1) {
-                return buildInteractiveShellCommandMessage(executable, `Try "${executable} -Command \\"...\\"" or "${executable} -File script.ps1" instead.`);
-            }
-            if (hasAnyCommandFlag(lowerArgs, ["-c", "-command", "-enc", "-encodedcommand", "-f", "-file", "-h", "-help", "-v", "-version", "-?"])) {
-                return null;
-            }
-            return hasScriptLikeArg(args)
-                ? null
-                : buildInteractiveShellCommandMessage(executable, `Try "${executable} -Command \\"...\\"" or "${executable} -File script.ps1" instead.`);
-        case "bash":
-        case "dash":
-        case "ksh":
-        case "sh":
-        case "zsh":
-            if (!args.length || lowerArgs.includes("-i")) {
-                return buildInteractiveShellCommandMessage(executable, `Try "${executable} -c '...'" or "${executable} script.sh" instead.`);
-            }
-            if (findCommandFlagIndex(lowerArgs, ["-c", "-lc"]) >= 0) {
-                return null;
-            }
-            if (hasAnyCommandFlag(lowerArgs, ["-h", "--help", "--version"])) {
-                return null;
-            }
-            return hasScriptLikeArg(args)
-                ? null
-                : buildInteractiveShellCommandMessage(executable, `Try "${executable} -c '...'" or "${executable} script.sh" instead.`);
-        default:
-            return null;
-    }
-}
 export function detectCliApproval(text) {
     const normalized = normalizeOutput(text);
     const compact = normalized.replace(/\s+/g, " ").trim();
@@ -802,22 +627,19 @@ export function formatMirroredUserInputMessage(adapter, text) {
             ? "Local Claude input"
             : adapter === "opencode"
                 ? "Local OpenCode input"
-                : "Local input";
+                : adapter === "pi"
+                    ? "Local Pi input"
+                    : "Local input";
     return `${label}:\n${truncatePreview(text, 500)}`;
 }
-export function formatFinalReplyMessage(adapter, text) {
-    if (adapter === "claude" || adapter === "codex" || adapter === "opencode") {
-        return text;
-    }
-    // After the early return above, only "shell" remains.
-    const label = adapter === "codex" ? "Codex" : adapter === "claude" ? "Claude" : adapter === "opencode" ? "OpenCode" : adapter;
-    return `${label} final reply:\n${text}`;
+export function formatFinalReplyMessage(_adapter, text) {
+    return text;
 }
 const OPENCODE_WORKING_NOTICE_RE = /^OpenCode is still working on:\s*$/i;
 const OPENCODE_TRANSIENT_NOTICE_RES = [
     /^Bridge error: opencode companion is not connected\./i,
     /^OpenCode companion is not connected(?: for bridge workspace)?:?$/i,
-    /^Run "wechat-(?:bridge-opencode|opencode(?:-start)?)".*$/i,
+    /^Run "wechat-opencode".*$/i,
     /^OpenCode session switched to \S+ from the local terminal\.$/i,
     /^Local OpenCode input:\s*$/i,
 ];
@@ -912,7 +734,7 @@ export function sanitizeWechatFinalReplyText(adapter, text) {
     const resolved = tail || cleaned;
     return isOpenCodeReasoningResidue(resolved) ? "" : resolved;
 }
-function extractInlineWechatAttachments(text) {
+export function extractInlineWechatAttachments(text) {
     const sanitized = text
         .replace(/\\\n\s*/g, "\\")
         .replace(/\.\s*\n?\s*([A-Za-z0-9]{2,8})(?=\?)/g, ".$1")
@@ -1000,8 +822,9 @@ function inferInlineWechatAttachmentKind(filePath) {
     if (INLINE_VOICE_EXTENSIONS.has(extension)) {
         return "voice";
     }
-    // Keep ordinary local files auto-sendable, but avoid turning common
-    // source/script references in prose into unintended WeChat uploads.
+    // Ordinary local files stay auto-sendable; only directly executable /
+    // installer types are excluded so a path mentioned in prose cannot
+    // accidentally ship a runnable binary to a WeChat contact.
     if (!extension || INLINE_REFERENCE_ONLY_FILE_EXTENSIONS.has(extension)) {
         return null;
     }
@@ -1016,7 +839,15 @@ function cleanupVisibleWechatReplyText(text) {
         .trim();
 }
 export function formatTaskFailedMessage(adapter, text) {
-    const label = adapter === "codex" ? "Codex" : adapter === "claude" ? "Claude" : adapter === "opencode" ? "OpenCode" : adapter;
+    const label = adapter === "codex"
+        ? "Codex"
+        : adapter === "claude"
+            ? "Claude"
+            : adapter === "opencode"
+                ? "OpenCode"
+                : adapter === "pi"
+                    ? "Pi"
+                    : adapter;
     return `${label} task failed:\n${text}`;
 }
 export function formatApprovalMessage(pending, adapterState) {
@@ -1035,7 +866,7 @@ export function formatApprovalMessage(pending, adapterState) {
         ].join("\n");
     }
     return [
-        `${pending.source === "shell" ? "Shell" : "CLI"} approval is required.`,
+        "CLI approval is required.",
         `adapter: ${adapterState.kind}`,
         `summary: ${pending.summary}`,
         `target: ${pending.commandPreview}`,
@@ -1090,22 +921,35 @@ function parseSingleUserInputAnswer(question, rawValue) {
             answers: [trimmed],
         };
     }
-    const separatorIndex = trimmed.indexOf("|");
+    const customAnswerMode = question.customAnswerMode ?? "note";
+    const separatorIndex = customAnswerMode === "note" ? trimmed.indexOf("|") : -1;
     const selection = separatorIndex >= 0 ? trimmed.slice(0, separatorIndex).trim() : trimmed;
     let note = separatorIndex >= 0 ? trimmed.slice(separatorIndex + 1).trim() : "";
     const answers = [];
     if (selection) {
-        const selectedLabel = resolveUserInputOptionLabel(question, selection);
-        if (selectedLabel) {
-            answers.push(selectedLabel);
-        }
-        else if (question.isOther) {
-            note = note ? `${selection}; ${note}` : selection;
-        }
-        else {
-            return {
-                error: `Question "${question.header}" expects an option number or label.`,
-            };
+        const selections = question.multiple
+            ? selection.split(",").map((value) => value.trim()).filter(Boolean)
+            : [selection];
+        for (const value of selections) {
+            const selectedLabel = resolveUserInputOptionLabel(question, value);
+            if (selectedLabel) {
+                if (!answers.includes(selectedLabel)) {
+                    answers.push(selectedLabel);
+                }
+            }
+            else if (question.isOther && customAnswerMode === "value") {
+                if (!answers.includes(value)) {
+                    answers.push(value);
+                }
+            }
+            else if (question.isOther) {
+                note = note ? `${value}; ${note}` : value;
+            }
+            else {
+                return {
+                    error: `Question "${question.header}" expects an option number or label.`,
+                };
+            }
         }
     }
     if (note) {
@@ -1210,8 +1054,13 @@ export function formatUserInputRequestMessage(pending, adapterState) {
                 lines.push(`  ${optionIndex + 1}. ${option.label} - ${truncatePreview(option.description, 160)}`);
             });
         }
+        if (question.multiple) {
+            lines.push("multiple selections: allowed (separate values with commas)");
+        }
         if (question.isOther) {
-            lines.push("custom note: allowed");
+            lines.push(question.customAnswerMode === "value"
+                ? "custom answer: allowed"
+                : "custom note: allowed");
         }
     });
     lines.push("");
@@ -1221,8 +1070,13 @@ export function formatUserInputRequestMessage(pending, adapterState) {
             return lines.join("\n");
         }
         if (question.options?.length) {
-            lines.push("Reply with /answer <option number or exact label>.");
-            if (question.isOther) {
+            lines.push(question.multiple
+                ? "Reply with /answer <option numbers or exact labels separated by commas>."
+                : "Reply with /answer <option number or exact label>.");
+            if (question.isOther && question.customAnswerMode === "value") {
+                lines.push("You may enter a custom answer instead of an option.");
+            }
+            else if (question.isOther) {
                 lines.push('Add "| your note" to include extra context.');
             }
         }
@@ -1234,7 +1088,10 @@ export function formatUserInputRequestMessage(pending, adapterState) {
         lines.push("Reply with /answer questionId=value; questionId2=value.");
         lines.push("You can use question numbers instead of ids.");
         lines.push("For option questions, value can be the option number or exact label.");
-        lines.push('Add "| your note" after an option answer to include extra context.');
+        lines.push("For multi-select questions, separate option values with commas.");
+        if (pending.questions.some((question) => question.customAnswerMode !== "value")) {
+            lines.push('Add "| your note" after an option answer to include extra context.');
+        }
     }
     lines.push("Use /stop to interrupt the active turn instead.");
     return lines.join("\n");
@@ -1243,11 +1100,11 @@ export function formatPendingUserInputReminder(pending) {
     if (pending.questions.length === 1) {
         const question = pending.questions[0];
         if (!question) {
-            return "Codex is waiting for user input. Reply with /answer and your response, or use /stop to interrupt.";
+            return "The active CLI is waiting for user input. Reply with /answer and your response, or use /stop to interrupt.";
         }
-        return `Codex is waiting for user input for ${question.header}. Reply with /answer and your response, or use /stop to interrupt.`;
+        return `The active CLI is waiting for user input for ${question.header}. Reply with /answer and your response, or use /stop to interrupt.`;
     }
-    return `Codex is waiting for answers to ${pending.questions.length} questions. Reply with /answer questionId=value; questionId2=value, or use /stop to interrupt.`;
+    return `The active CLI is waiting for answers to ${pending.questions.length} questions. Reply with /answer questionId=value; questionId2=value, or use /stop to interrupt.`;
 }
 export class OutputBatcher {
     onFlush;