@priyanshumit/macos-terminal-mcp 0.5.0 → 0.5.1

package/dist/tools/new_tab.js

@@ -2,36 +2,52 @@ import { OsascriptError, runJxa } from "../applescript.js";
 import { appendAudit } from "../safety/audit.js";
 import { isWriteToolsEnabled, writeToolsDisabledMessage } from "../safety/confirm.js";
 export const NEW_TAB_SCRIPT = `
+var app = Application.currentApplication();
+app.includeStandardAdditions = true;
 function safe(fn) { try { return fn(); } catch (e) { return null; } }
+function snapshotTabs(terminal) {
+  // Returns { tty -> windowId } for every tab in every window.
+  const out = {};
+  const wins = terminal.windows();
+  for (let wi = 0; wi < wins.length; wi++) {
+    const winId = safe(function () { return wins[wi].id(); });
+    const tabs = wins[wi].tabs();
+    for (let ti = 0; ti < tabs.length; ti++) {
+      const t = safe(function () { return tabs[ti].tty(); });
+      if (t) out[t] = winId;
+    }
+  }
+  return out;
+}
 (function newTab() {
   const terminal = Application("Terminal");
+  const systemEvents = Application("System Events");
   terminal.activate();
-  const wins = terminal.windows();
-  // do script with empty command + no "in" → new window. With "in: front
-  // window" → new tab in that window. Prefer a new tab in the front window
-  // when one exists, otherwise let it create a new window.
-  let newTab;
-  if (wins.length > 0) {
-    newTab = terminal.doScript("", { in: wins[0] });
-  } else {
-    newTab = terminal.doScript("");
-  }
-  const tty = safe(function () { return newTab.tty(); }) || "";
-  let windowId = null;
-  try {
-    const after = terminal.windows();
-    for (let i = 0; i < after.length; i++) {
-      const ts = after[i].tabs();
-      for (let j = 0; j < ts.length; j++) {
-        if (safe(function () { return ts[j].tty(); }) === tty) {
-          windowId = safe(function () { return after[i].id(); });
-          break;
-        }
+  const before = snapshotTabs(terminal);
+  const wasEmpty = Object.keys(before).length === 0;
+  // Cmd+T opens a new tab in the front window; Cmd+N opens a new window when
+  // there are none.
+  systemEvents.keystroke(wasEmpty ? "n" : "t", { using: "command down" });
+  // Poll for the new tab's tty to appear. Each iteration waits 100ms, up to ~2s.
+  let newTty = null;
+  let newWindowId = null;
+  for (let attempt = 0; attempt < 20; attempt++) {
+    delay(0.1);
+    const after = snapshotTabs(terminal);
+    const keys = Object.keys(after);
+    for (let i = 0; i < keys.length; i++) {
+      if (!(keys[i] in before)) {
+        newTty = keys[i];
+        newWindowId = after[keys[i]];
+        break;
       }
-      if (windowId !== null) break;
     }
-  } catch (e) { /* best-effort */ }
-  return JSON.stringify({ tty, windowId });
+    if (newTty !== null) break;
+  }
+  if (newTty === null) {
+    throw new Error("terminal_new_tab: no new tab appeared after Cmd+" + (wasEmpty ? "N" : "T") + ". Accessibility permission may be missing — grant via System Settings → Privacy & Security → Accessibility.");
+  }
+  return JSON.stringify({ tty: newTty, windowId: newWindowId });
 })();
 `;
 export async function newTabHandler() {
@@ -64,7 +80,7 @@ export async function newTabHandler() {
 }
 export function register(server) {
     server.registerTool("terminal_new_tab", {
-        description: "Open a new empty tab in Terminal.app (in the frontmost window, or a new window if none are open). Returns {tty, windowId} for the new tab. Use the returned tty in subsequent terminal_read / terminal_execute calls. NOTE: this tool does NOT execute any command in the new tab — to run a command, call terminal_execute against the returned tty. Requires WRITE_TOOLS_ENABLED=1 but does NOT pop a confirmation dialog (low blast radius — the user can close an unwanted tab).",
+        description: "Open a new empty tab in Terminal.app (in the frontmost window, or a new window if none are open). Returns {tty, windowId} for the new tab. Use the returned tty in subsequent terminal_read / terminal_execute calls. NOTE: this tool does NOT execute any command in the new tab — to run a command, call terminal_execute against the returned tty. Requires WRITE_TOOLS_ENABLED=1 but does NOT pop a confirmation dialog (low blast radius — the user can close an unwanted tab). Briefly steals focus to Terminal.app to deliver a Cmd+T keystroke, so also requires Accessibility permission (System Settings → Privacy & Security → Accessibility).",
     }, newTabHandler);
 }
 //# sourceMappingURL=new_tab.js.map

package/dist/tools/new_tab.js.map

@@ -1 +1 @@
-{"version":3,"file":"new_tab.js","sourceRoot":"","sources":["../../src/tools/new_tab.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEtF,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgC7B,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;QAC3B,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAChF,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,WAAW,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACrD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,IAAI,GACR,GAAG,YAAY,cAAc,IAAI,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YACjE,CAAC,CAAC,sFAAsF;YACxF,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,WAAW,CAAC;YAChB,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,OAAO,GAAG,IAAI,EAAE,EAAE,CAAC;YAC/E,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,YAAY,CACjB,kBAAkB,EAClB;QACE,WAAW,EACT,sdAAsd;KACzd,EACD,aAAa,CACd,CAAC;AACJ,CAAC"}
+{"version":3,"file":"new_tab.js","sourceRoot":"","sources":["../../src/tools/new_tab.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEtF,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgD7B,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,aAAa;IACjC,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;QAC3B,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,yBAAyB,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAChF,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,WAAW,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC;QACpE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;IACrD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjE,MAAM,IAAI,GACR,GAAG,YAAY,cAAc,IAAI,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;YACjE,CAAC,CAAC,sFAAsF;YACxF,CAAC,CAAC,EAAE,CAAC;QACT,MAAM,WAAW,CAAC;YAChB,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,OAAO;YAChB,YAAY,EAAE,OAAO;SACtB,CAAC,CAAC;QACH,OAAO;YACL,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,4BAA4B,OAAO,GAAG,IAAI,EAAE,EAAE,CAAC;YAC/E,OAAO,EAAE,IAAI;SACd,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACxC,MAAM,CAAC,YAAY,CACjB,kBAAkB,EAClB;QACE,WAAW,EACT,2nBAA2nB;KAC9nB,EACD,aAAa,CACd,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@priyanshumit/macos-terminal-mcp",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "MCP server exposing macOS Terminal.app to AI agents via AppleScript / JXA. List windows, read scrollback, execute commands, clear buffers — with three-tier safety patterns and confirmation dialogs.",
   "type": "module",
   "bin": {