@deadragdoll/tellymcp 0.0.11 → 0.0.12

package/dist/services/features/telegram-mcp/src/shared/lib/terminalPromptDetection.js

@@ -16,6 +16,11 @@ const STRONG_PATTERNS = [
         score: 5,
         reason: "press_enter_prompt",
     },
+    {
+        pattern: /press\s+enter\s+to\s+confirm\b.*\besc\s+to\s+cancel/iu,
+        score: 5,
+        reason: "confirm_cancel_prompt",
+    },
     {
         pattern: /waiting\s+for\s+(?:user\s+)?input|awaiting\s+(?:user\s+)?(?:input|confirmation)|requires?\s+approval|need\s+your\s+(?:input|permission|approval)|cannot\s+continue\s+without/iu,
         score: 4,
@@ -46,6 +51,11 @@ const STRONG_PATTERNS = [
         score: 4,
         reason: "tool_continue_prompt",
     },
+    {
+        pattern: /\bwould\s+you\s+like\s+to\s+run\s+the\s+following\s+command\b/iu,
+        score: 5,
+        reason: "command_approval_prompt",
+    },
 ];
 const MEDIUM_PATTERNS = [
     {
@@ -64,6 +74,17 @@ const MEDIUM_PATTERNS = [
         reason: "tool_choice_keyword",
     },
 ];
+const NUMBERED_CHOICE_LINE_PATTERN = /^(?:[>›*•-]\s*)?\d+\.\s+.+$/u;
+const CONFIRM_CANCEL_FOOTER_PATTERN = /\b(?:press\s+enter\s+to\s+confirm|enter\s+to\s+submit)\b.*\besc\s+to\s+cancel\b/iu;
+const SUBMIT_CANCEL_FOOTER_PATTERN = /\benter\s+to\s+submit\b.*\besc\s+to\s+cancel\b/iu;
+const CONTINUE_FOOTER_PATTERN = /\b(?:press\s+enter\s+to\s+continue|hit\s+enter\s+to\s+continue)\b/iu;
+const NUMBERED_HOTKEY_FOOTER_PATTERN = /\bpress\s+(?:(?:\d+\s*,\s*)+\s*(?:or\s+)?\d+\s*,?\s*)?(?:enter\b.*\besc|esc\b.*\benter|\d+\b.*\benter|\d+\b.*\besc).*\b(?:quit|continue|cancel|confirm|submit)\b/iu;
+const POSITIVE_CHOICE_PATTERN = /\b(?:yes|allow|approve|proceed|continue)\b/iu;
+const NEGATIVE_CHOICE_PATTERN = /\b(?:no|cancel|deny|reject)\b/iu;
+const STICKY_CHOICE_PATTERN = /\bdon'?t\s+ask\s+again|always\s+allow|for\s+this\s+session\b/iu;
+const SKIP_CHOICE_PATTERN = /\bskip\b/iu;
+const LEADING_SELECTION_MARKER_PATTERN = /^(?:[>›*•-]\s*)(?=\d+\.\s)/u;
+const ACTION_HINT_PATTERN = /\b(?:press|input|choose|choice|select|option|enter|esc(?:ape)?|accept|decline|confirm|cancel|continue|proceed|yes|no)\b|(?:\[[Yy](?:es)?\/[Nn](?:o)?\])|(?:\([Yy](?:es)?\/[Nn](?:o)?\))/u;
 function normalizeLine(line) {
     return line
         .replaceAll("\r", "")
@@ -119,25 +140,6 @@ function scoreMediumLine(line, strategy) {
 function isStrongReason(reason) {
     return STRONG_PATTERNS.some((candidate) => candidate.reason === reason);
 }
-function detectGroupedSignals(candidateLines, strategy) {
-    const signals = [];
-    const hasPrimaryAllowChoice = candidateLines.some((line) => /^>?[\s\d.]*allow\b/iu.test(line));
-    const hasSecondaryApprovalChoice = candidateLines.some((line) => /\b(?:allow\s+once|allow\s+for\s+this\s+session|always\s+allow|cancel)\b/iu.test(line));
-    const hasSubmitCancelHint = candidateLines.some((line) => /\benter\s+to\s+submit\b.*\besc\s+to\s+cancel\b/iu.test(line));
-    if (hasPrimaryAllowChoice && hasSecondaryApprovalChoice) {
-        signals.push({
-            score: 5,
-            reason: "approval_choice_group",
-        });
-    }
-    if (hasSubmitCancelHint) {
-        signals.push({
-            score: strategy === "balanced" ? 2 : 3,
-            reason: "submit_cancel_hint",
-        });
-    }
-    return signals;
-}
 function collectCandidateLines(rawText, maxLines) {
     const normalized = rawText
         .split("\n")
@@ -145,6 +147,168 @@ function collectCandidateLines(rawText, maxLines) {
         .filter((line) => line.length > 0);
     return normalized.slice(-Math.max(1, maxLines));
 }
+function normalizeFingerprintLine(line) {
+    return normalizeLine(line)
+        .replace(LEADING_SELECTION_MARKER_PATTERN, "")
+        .replace(/\s+/gu, " ")
+        .trim();
+}
+function buildDetectionFingerprint(strategy, matchedLines) {
+    const normalizedExcerpt = matchedLines
+        .map(normalizeFingerprintLine)
+        .join("\n");
+    return (0, node_crypto_1.createHash)("sha1")
+        .update(`${strategy}\n${normalizedExcerpt}`)
+        .digest("hex");
+}
+function buildExcerptWithContext(candidateLines, matchedLines) {
+    if (matchedLines.length === 0) {
+        return "";
+    }
+    const firstMatchedIndex = candidateLines.findIndex((line) => line === matchedLines[0]);
+    const lastMatchedIndex = matchedLines.length === 1
+        ? firstMatchedIndex
+        : candidateLines.findIndex((line, index) => index >= Math.max(0, firstMatchedIndex) &&
+            line === matchedLines[matchedLines.length - 1]);
+    if (firstMatchedIndex < 0 || lastMatchedIndex < 0) {
+        return matchedLines.slice(-8).join("\n");
+    }
+    const excerptStart = Math.max(0, firstMatchedIndex - 2);
+    const excerptEnd = Math.min(candidateLines.length, lastMatchedIndex + 1);
+    return candidateLines.slice(excerptStart, excerptEnd).slice(-8).join("\n");
+}
+function findChoiceActionBlock(candidateLines) {
+    for (let startIndex = candidateLines.length - 1; startIndex >= 0; startIndex -= 1) {
+        const line = candidateLines[startIndex] ?? "";
+        if (!NUMBERED_CHOICE_LINE_PATTERN.test(line)) {
+            continue;
+        }
+        const choiceLines = [];
+        let firstChoiceIndex = startIndex;
+        while (firstChoiceIndex >= 0) {
+            const currentLine = candidateLines[firstChoiceIndex] ?? "";
+            if (!NUMBERED_CHOICE_LINE_PATTERN.test(currentLine)) {
+                break;
+            }
+            choiceLines.unshift(currentLine);
+            firstChoiceIndex -= 1;
+        }
+        firstChoiceIndex += 1;
+        if (choiceLines.length < 2) {
+            continue;
+        }
+        const lastChoiceIndex = firstChoiceIndex + choiceLines.length - 1;
+        const headerLines = candidateLines.slice(Math.max(0, firstChoiceIndex - 5), firstChoiceIndex);
+        const tailLines = candidateLines.slice(lastChoiceIndex + 1, Math.min(candidateLines.length, lastChoiceIndex + 4));
+        const footerLine = tailLines[0] ?? null;
+        const nearbyLines = [...headerLines, ...tailLines];
+        const hasActionHint = nearbyLines.some((candidate) => ACTION_HINT_PATTERN.test(candidate));
+        const hasChoiceSemantics = POSITIVE_CHOICE_PATTERN.test(choiceLines.join("\n")) ||
+            NEGATIVE_CHOICE_PATTERN.test(choiceLines.join("\n")) ||
+            STICKY_CHOICE_PATTERN.test(choiceLines.join("\n")) ||
+            SKIP_CHOICE_PATTERN.test(choiceLines.join("\n"));
+        if (!hasActionHint && !hasChoiceSemantics) {
+            continue;
+        }
+        return {
+            footerLine,
+            choiceLines,
+            headerLines,
+            tailLines,
+        };
+    }
+    return null;
+}
+function detectChoiceFooterSignals(candidateLines, strategy) {
+    const block = findChoiceActionBlock(candidateLines);
+    if (!block) {
+        return null;
+    }
+    const choiceText = block.choiceLines.join("\n");
+    const contextLines = [
+        ...block.headerLines,
+        ...block.choiceLines,
+        ...(block.footerLine ? [block.footerLine] : []),
+        ...block.tailLines,
+    ];
+    const reasons = new Set(["numbered_choice_group"]);
+    const matchedLines = [
+        ...block.choiceLines,
+        ...(block.footerLine ? [block.footerLine] : []),
+        ...block.tailLines,
+    ];
+    let score = strategy === "balanced" ? 5 : 6;
+    const footerLine = block.footerLine ?? "";
+    if (CONFIRM_CANCEL_FOOTER_PATTERN.test(footerLine)) {
+        reasons.add("confirm_cancel_footer");
+        score += strategy === "balanced" ? 2 : 3;
+    }
+    if (CONTINUE_FOOTER_PATTERN.test(footerLine)) {
+        reasons.add("continue_footer");
+        score += strategy === "balanced" ? 2 : 3;
+    }
+    if (NUMBERED_HOTKEY_FOOTER_PATTERN.test(footerLine)) {
+        reasons.add("numbered_hotkey_footer");
+        score += strategy === "balanced" ? 2 : 3;
+    }
+    if (SUBMIT_CANCEL_FOOTER_PATTERN.test(footerLine)) {
+        reasons.add("submit_cancel_hint");
+    }
+    if (/press\s+enter\s+to\s+confirm\b/iu.test(footerLine)) {
+        reasons.add("confirm_cancel_hint");
+    }
+    if (contextLines.some((line) => ACTION_HINT_PATTERN.test(line))) {
+        reasons.add("action_hint_present");
+        score += 2;
+    }
+    if (POSITIVE_CHOICE_PATTERN.test(choiceText)) {
+        reasons.add("positive_choice_present");
+        score += 2;
+    }
+    if (NEGATIVE_CHOICE_PATTERN.test(choiceText)) {
+        reasons.add("negative_choice_present");
+        score += 2;
+    }
+    if (STICKY_CHOICE_PATTERN.test(choiceText)) {
+        reasons.add("sticky_choice_present");
+        score += 2;
+    }
+    if (SKIP_CHOICE_PATTERN.test(choiceText)) {
+        reasons.add("skip_choice_present");
+        score += 2;
+    }
+    if (reasons.has("positive_choice_present") && reasons.has("negative_choice_present")) {
+        reasons.add("yes_no_choice_group");
+        reasons.add("approval_choice_group");
+        score += 3;
+    }
+    if (reasons.has("positive_choice_present") && reasons.has("skip_choice_present")) {
+        reasons.add("choice_update_group");
+        score += 2;
+    }
+    if (/^(?:[>›*•-]\s*)?(?:\d+\.\s+)?yes,\s+proceed\b/imu.test(choiceText) &&
+        reasons.has("sticky_choice_present")) {
+        reasons.add("proceed_choice_group");
+    }
+    for (const line of contextLines) {
+        for (const contribution of scoreStrongLine(line)) {
+            reasons.add(contribution.reason);
+            score += contribution.score;
+        }
+    }
+    return {
+        score,
+        reasons: Array.from(reasons),
+        matchedLines,
+        promptActions: {
+            numberedOptions: block.choiceLines
+                .map((line) => line.match(/^(?:[>›*•-]\s*)?(\d+)\.\s+/u)?.[1] ?? null)
+                .filter((value) => Boolean(value)),
+            hasEnter: contextLines.some((line) => /\benter\b/iu.test(line)),
+            hasEscape: contextLines.some((line) => /\besc(?:ape)?\b/iu.test(line)),
+        },
+    };
+}
 function detectTerminalInteractivePrompt(rawText, options = {}) {
     const strategy = options.strategy ?? "strict";
     const minScore = options.minScore ?? (strategy === "balanced" ? 4 : 5);
@@ -152,6 +316,20 @@ function detectTerminalInteractivePrompt(rawText, options = {}) {
     if (candidateLines.length === 0) {
         return null;
     }
+    const choiceFooterDetection = detectChoiceFooterSignals(candidateLines, strategy);
+    if (choiceFooterDetection && choiceFooterDetection.score >= minScore) {
+        const matchedLines = choiceFooterDetection.matchedLines.slice(-6);
+        const excerpt = buildExcerptWithContext(candidateLines, matchedLines);
+        const fingerprint = buildDetectionFingerprint(strategy, matchedLines);
+        return {
+            score: choiceFooterDetection.score,
+            fingerprint,
+            excerpt,
+            matchedLines,
+            reasons: choiceFooterDetection.reasons,
+            promptActions: choiceFooterDetection.promptActions,
+        };
+    }
     const scoredLines = [];
     let score = 0;
     const reasons = new Set();
@@ -174,12 +352,8 @@ function detectTerminalInteractivePrompt(rawText, options = {}) {
         score += 3;
         reasons.add("multiple_options");
     }
-    for (const signal of detectGroupedSignals(candidateLines, strategy)) {
-        score += signal.score;
-        reasons.add(signal.reason);
-    }
     const hasStrongReason = Array.from(reasons).some(isStrongReason);
-    const hasGroupedReason = reasons.has("approval_choice_group") || reasons.has("submit_cancel_hint");
+    const hasGroupedReason = reasons.has("multiple_options");
     const hasOnlyQuestionMarkReason = reasons.size === 1 && reasons.has("question_mark");
     if (strategy === "strict") {
         if (hasOnlyQuestionMarkReason) {
@@ -223,10 +397,8 @@ function detectTerminalInteractivePrompt(rawText, options = {}) {
     const matchedLines = scoredLines
         .map((entry) => entry.line)
         .slice(-6);
-    const excerpt = matchedLines.join("\n");
-    const fingerprint = (0, node_crypto_1.createHash)("sha1")
-        .update(`${strategy}\n${excerpt}`)
-        .digest("hex");
+    const excerpt = buildExcerptWithContext(candidateLines, matchedLines);
+    const fingerprint = buildDetectionFingerprint(strategy, matchedLines);
     return {
         score,
         fingerprint,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deadragdoll/tellymcp",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "TellyMCP - Telegram control plane for MCP-connected coding agents",
   "main": "dist/services/features/telegram-mcp/runtime.service.js",
   "bin": {