aiterm-mcp 0.7.1 → 0.8.0

package/dist/rtk.js

@@ -28,16 +28,23 @@ function truncate(s, n) {
         return "...";
     return cp.slice(0, n - 3).join("") + "...";
 }
-const PROMPT_TAIL = /[$#%>]\s*$/;
+// プロンプト行の判定（C3）: 行全体が「プロンプト前置文字(語/@ : ~ / \ [] . -)＋プロンプト記号($#%>)＋末尾空白」
+// の形のときだけプロンプトとみなす。末尾記号だけを見ると `</div>` `>>>` `echo x >` 等の本文行を誤除去する。
+const PROMPT_TAIL = /^[\w@.:~\/\\\[\]-]*[$#%>]\s*$/;
 /** 観測ログ片からエコー行と前後のプロンプト行を落とし、コマンド出力本体だけ残す（発見的）。 */
 export function stripShellFrame(text, command) {
     const lines = text.split("\n");
     const cmd = command.trim();
     let start = 0;
     if (cmd) {
-        for (let i = 0; i < lines.length; i++)
-            if (lines[i].includes(cmd))
+        // 最初の一致（＝コマンドエコー行）だけを落とす。最後の一致まで進めると、出力本体に cmd 文字列が
+        // 再出現（cat したファイル内・commit メッセージ内 等）した場合に本体を丸ごと捨ててしまう（C2）。
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].includes(cmd)) {
                 start = i + 1;
+                break;
+            }
+        }
     }
     let end = lines.length;
     while (end > start) {
@@ -77,7 +84,10 @@ export function reducePytest(output) {
             flush();
             continue;
         }
-        if (t.startsWith("===") && (t.includes("passed") || t.includes("failed") || t.includes("skipped"))) {
+        if (t.startsWith("===") &&
+            (t.includes("passed") || t.includes("failed") || t.includes("skipped") || t.includes("error"))) {
+            // 収集エラーのみ（`=== 1 error in Xs ===`）も要約行として拾う。拾わないと全ゼロ扱いで
+            // "No tests collected"（無害誤読）に潰れる。"ERRORS" セクション見出しは大文字ゆえ非該当。
             summaryLine = t;
             continue;
         }
@@ -85,7 +95,7 @@ export function reducePytest(output) {
             !t.startsWith("===") &&
             !t.startsWith("FAILED") &&
             !t.startsWith("ERROR") &&
-            (t.includes(" passed") || t.includes(" failed") || t.includes(" skipped")) &&
+            (t.includes(" passed") || t.includes(" failed") || t.includes(" skipped") || t.includes(" error")) &&
             t.includes(" in ")) {
             summaryLine = t;
             continue;
@@ -114,13 +124,16 @@ export function reducePytest(output) {
         }
     }
     flush();
-    const [p, f, s, xf, xp] = parsePytestCounts(summaryLine);
-    if (p === 0 && f === 0 && s === 0 && xf === 0 && xp === 0)
+    const [p, f, s, xf, xp, e] = parsePytestCounts(summaryLine);
+    if (p === 0 && f === 0 && s === 0 && xf === 0 && xp === 0 && e === 0)
         return "Pytest: No tests collected";
-    const extras = s > 0 || xf > 0 || xp > 0 || xfailLines.length > 0;
+    // error(収集/内部エラー)は失敗の一種＝緑扱いにしない。extras に含め、"N passed" 早期 return を止める。
+    const extras = s > 0 || xf > 0 || xp > 0 || e > 0 || xfailLines.length > 0;
     if (f === 0 && p > 0 && !extras)
         return `Pytest: ${p} passed`;
     let head = `Pytest: ${p} passed, ${f} failed`;
+    if (e > 0)
+        head += `, ${e} error${e === 1 ? "" : "s"}`;
     if (s > 0)
         head += `, ${s} skipped`;
     if (xf > 0)
@@ -183,7 +196,7 @@ export function reducePytest(output) {
     return out.join("\n").trim();
 }
 function parsePytestCounts(summary) {
-    let p = 0, f = 0, s = 0, xf = 0, xp = 0;
+    let p = 0, f = 0, s = 0, xf = 0, xp = 0, e = 0;
     for (const part of summary.split(",")) {
         const words = part.split(/\s+/).filter(Boolean);
         for (let i = 0; i < words.length; i++) {
@@ -193,6 +206,7 @@ function parsePytestCounts(summary) {
             if (Number.isNaN(n))
                 continue;
             const w = words[i];
+            // "error"/"errors" は passed/failed/skipped/xfailed/xpassed のいずれの部分文字列でもないので順不同で安全。
             if (w.includes("xpassed"))
                 xp = n;
             else if (w.includes("xfailed"))
@@ -203,9 +217,11 @@ function parsePytestCounts(summary) {
                 f = n;
             else if (w.includes("skipped"))
                 s = n;
+            else if (w.includes("error"))
+                e = n;
         }
     }
-    return [p, f, s, xf, xp];
+    return [p, f, s, xf, xp, e];
 }
 // ---------------------------------------------------------------- grep
 const GREP_LINE = /^(.*?):(\d+):(.*)$/;
@@ -310,7 +326,8 @@ export function reduceGitLog(output) {
             else if (t && !subject && (ln.startsWith("    ") || ln.startsWith("\t")))
                 subject = t;
             else if (t && (ln.startsWith("    ") || ln.startsWith("\t"))) {
-                if (!t.startsWith("Signed-off-by:") && !t.startsWith("Co-authored-by:"))
+                // trailer は大小文字が実装依存（本リポ規約は Co-Authored-By:）。大小無視で除外する（C5）。
+                if (!/^(signed-off-by|co-authored-by):/i.test(t))
                     body.push(t);
             }
         }
@@ -355,13 +372,25 @@ function applyFilter(rule, output) {
     return body;
 }
 // ---------------------------------------------------------------- ルーティング
+const WRAPPERS = new Set(["sudo", "env", "command", "exec"]);
+const RUNNERS = new Set(["uv", "poetry", "pdm", "rye", "hatch", "pipenv"]);
+// [verb, sub, stripped]。stripped は前置(ラッパー/環境代入/フラグ/ランナー run)を除いた実コマンド。
+// 誤分類は classify で null→generic に落ちるだけなので、読み飛ばしは積極的で安全（C4）。
 function basenameCmd(command) {
     const toks = command.trim().split(/\s+/).filter(Boolean);
     let i = 0;
-    while (i < toks.length && (toks[i].includes("=") || ["sudo", "env", "command", "exec"].includes(toks[i])))
+    // 前置ラッパー(sudo/env/…)・環境代入(FOO=1)・そのフラグ(-E/-i 等)を読み飛ばす
+    while (i < toks.length && (toks[i].includes("=") || WRAPPERS.has(toks[i]) || toks[i].startsWith("-")))
         i++;
+    // ランナー( uv/poetry run <cmd> )は run と共に読み飛ばして実コマンドへ
+    if (i + 1 < toks.length && RUNNERS.has(toks[i]) && toks[i + 1] === "run") {
+        i += 2;
+        while (i < toks.length && (toks[i].includes("=") || toks[i].startsWith("-")))
+            i++;
+    }
+    const stripped = toks.slice(i).join(" ");
     if (i >= toks.length)
-        return ["", ""];
+        return ["", "", ""];
     const verb = toks[i].split("/").pop();
     let sub = "";
     for (const t of toks.slice(i + 1)) {
@@ -370,10 +399,10 @@ function basenameCmd(command) {
             break;
         }
     }
-    return [verb, sub];
+    return [verb, sub, stripped];
 }
 export function classify(command) {
-    const [verb, sub] = basenameCmd(command);
+    const [verb, sub, stripped] = basenameCmd(command);
     if (verb === "git") {
         if (sub === "status")
             return "git-status";
@@ -385,10 +414,12 @@ export function classify(command) {
         return "grep";
     if (verb === "pytest" || verb === "py.test")
         return "pytest";
-    if (verb === "python" && command.includes("pytest"))
+    // python3 / python3.11 等のバージョン付きも許容（C4: `python3 -m pytest` を拾う）
+    if (/^python[0-9.]*$/.test(verb) && command.includes("pytest"))
         return "pytest";
+    // FILTERS は basename 経由の stripped で判定（C6: `sudo df` `sudo make` も分類できる）
     for (const rule of FILTERS)
-        if (rule.match.test(command.trim()))
+        if (rule.match.test(stripped))
             return rule.name;
     return null;
 }
@@ -398,7 +429,11 @@ const REDUCERS = {
     grep: reduceGrep,
     pytest: (o) => reducePytest(o),
 };
-/** コマンドに応じた reducer を観測出力へ適用。返り値 [reducedText|null, reducerName|null]。 */
+/**
+ * コマンドに応じた reducer を観測出力へ適用。返り値 [reducedText|null, reducerName|null]。
+ * 前提(C13): `output` は制御文字除去済み（ANSI/CR 等）であること。色付き/生 PTY 出力を直接渡すと
+ * 誤パースし得る。呼び手 core.readOutput は `stripShellFrame(stripControl(text), cmd)` で前処理してから渡す。
+ */
 export function reduce(command, output) {
     const name = classify(command);
     if (name === null)

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "aiterm-mcp",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "mcpName": "io.github.kitepon-rgb/aiterm-mcp",
-  "description": "AI-driven persistent terminal as a local stdio MCP server (tmux-backed). Holds one local PTY; SSH and containers are just commands you send into it. Token-reducing reads.",
+  "description": "AI-driven persistent terminal as a local stdio MCP server (tmux-backed). Holds one local PTY; SSH and containers are just commands you send into it. Also launches interactive Codex/Grok/Composer agent TUIs in a persistent terminal. Token-reducing reads.",
   "keywords": [
     "mcp",
     "mcp-server",
@@ -15,6 +15,9 @@
     "claude-code",
     "cursor",
     "ai-agent",
+    "agent",
+    "codex",
+    "grok",
     "devtools"
   ],
   "license": "MIT",