@l22-io/orchard-mcp 0.6.1 → 0.6.3

package/build/bridge.js

@@ -106,14 +106,8 @@ function runBridgeProcess(bin, args, timeoutMs) {
         const MAX_BYTES = 10 * 1024 * 1024;
         let settled = false;
         let timedOut = false;
-        const settle = (result) => {
-            if (settled)
-                return;
-            settled = true;
-            clearTimeout(timer);
-            clearTimeout(sigkillTimer);
-            resolvePromise(result);
-        };
+        let killEscalated = false;
+        let sigkillTimer = null;
         const killGroup = (signal) => {
             try {
                 process.kill(-pid, signal);
@@ -122,17 +116,40 @@ function runBridgeProcess(bin, args, timeoutMs) {
                 // Group may already be gone; nothing to do.
             }
         };
-        let sigkillTimer = setTimeout(() => { }, 0);
-        clearTimeout(sigkillTimer);
-        const timer = setTimeout(() => {
-            timedOut = true;
+        // Reason: Swift's apple-bridge has no SIGTERM handler and dies on the first
+        // signal, which causes Node's "close" event to fire almost immediately.
+        // If we cleared sigkillTimer at that point, any osascript grandchild
+        // wedged in an Apple Event RPC to Mail.app / Notes.app would be orphaned
+        // (PPID=1) and continue to hold Mail.app's event queue hostage. So once
+        // we have committed to escalating, the SIGKILL must fire regardless of
+        // when the bridge process itself closes.
+        const escalateKill = () => {
+            if (killEscalated)
+                return;
+            killEscalated = true;
             killGroup("SIGTERM");
             sigkillTimer = setTimeout(() => killGroup("SIGKILL"), SIGKILL_GRACE_MS);
+            sigkillTimer.unref();
+        };
+        const settle = (result) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            if (!killEscalated && sigkillTimer)
+                clearTimeout(sigkillTimer);
+            // When escalation is in flight, leave the SIGKILL timer alone so it
+            // can reap any grandchildren the bridge spawned (see escalateKill).
+            resolvePromise(result);
+        };
+        const timer = setTimeout(() => {
+            timedOut = true;
+            escalateKill();
         }, timeoutMs);
         child.stdout?.on("data", (d) => {
             totalBytes += d.length;
             if (totalBytes > MAX_BYTES) {
-                killGroup("SIGTERM");
+                escalateKill();
                 settle({
                     status: "error",
                     spawnError: `apple-bridge output exceeded ${MAX_BYTES} bytes`,

package/build/bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bridge.js","sourceRoot":"","sources":["../src/bridge.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@l22-io/orchard-mcp",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "MCP server for Apple Calendar, Mail, Reminders, and Files on macOS using native EventKit",
   "publishConfig": {
     "access": "public"

package/swift/.build/AppleBridge.app.sha256

@@ -1 +1 @@
-853d524532c723fcd5c9f0c00a5895e3b384653a6d0b3e39c85e655bb4034602  apple-bridge
+8362b4b7635f775e1847b883917e1839bb8e0f3522b2b497ce471150d0ddaba4  apple-bridge

package/swift/Sources/AppleBridge/AppleBridge.swift

@@ -7,6 +7,11 @@ struct AppleBridge: AsyncParsableCommand {
     // This allows any subcommand to write to a file instead of stdout,
     // needed for .app bundle mode on macOS Sequoia where stdout is not capturable.
     static func main() async {
+        // Install before parsing so a SIGTERM during arg parsing (rare, but
+        // possible if node tears us down before we finish startup) still
+        // reaps any osascript spawned by a partial subcommand.
+        OsascriptRunner.installSignalHandlers()
+
         var args = Array(CommandLine.arguments.dropFirst())
         if let idx = args.firstIndex(of: "--output"), idx + 1 < args.count {
             JSONOutput.outputPath = args[idx + 1]
@@ -28,7 +33,7 @@ struct AppleBridge: AsyncParsableCommand {
     static let configuration = CommandConfiguration(
         commandName: "apple-bridge",
         abstract: "Native macOS bridge for Apple Calendar, Mail, Reminders, Numbers, Pages, and Keynote.",
-        version: "0.5.0",
+        version: "0.6.3",
         subcommands: [
             Calendars.self,
             Events.self,

package/swift/Sources/AppleBridge/Doctor.swift

@@ -9,7 +9,7 @@ import Foundation
 enum DoctorBridge {
     static func run() async {
         var report: [String: Any] = [
-            "version": "0.5.0",
+            "version": "0.6.3",
             "platform": "macOS",
             "systemVersion": ProcessInfo.processInfo.operatingSystemVersionString
         ]
@@ -147,30 +147,20 @@ enum DoctorBridge {
     }
 
     private static func checkIWorkApp(_ appName: String) -> [String: Any] {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", "tell application \"\(appName)\" to return name"]
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-            if task.terminationStatus == 0 {
-                return ["installed": true, "accessible": true]
-            } else {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                if errStr.contains("-600") || errStr.contains("not running") {
-                    return ["installed": true, "accessible": false, "note": "\(appName) is not running."]
-                }
-                return ["installed": false, "accessible": false, "note": "\(appName) may not be installed."]
-            }
-        } catch {
-            return ["installed": false, "accessible": false, "note": "Could not check \(appName): \(error.localizedDescription)"]
+        let script = "tell application \"\(appName)\" to return name"
+        guard let result = OsascriptRunner.runRaw(script: script, timeout: doctorAppleScriptTimeout) else {
+            return ["installed": false, "accessible": false, "note": "Could not spawn osascript to check \(appName)."]
         }
+        if result.timedOut {
+            return ["installed": true, "accessible": false, "note": "\(appName) did not respond within \(Int(doctorAppleScriptTimeout))s."]
+        }
+        if result.status == 0 {
+            return ["installed": true, "accessible": true]
+        }
+        if result.stderr.contains("-600") || result.stderr.contains("not running") {
+            return ["installed": true, "accessible": false, "note": "\(appName) is not running."]
+        }
+        return ["installed": false, "accessible": false, "note": "\(appName) may not be installed."]
     }
 
     private static func contactsAuthName(_ status: CNAuthorizationStatus) -> String {
@@ -185,68 +175,44 @@ enum DoctorBridge {
     }
 
     private static func checkNotesAccess() -> [String: Any] {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", "tell application \"Notes\" to count of accounts"]
-        let pipe = Pipe()
-        task.standardOutput = pipe
-        task.standardError = Pipe()
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-            if task.terminationStatus == 0 {
-                let data = pipe.fileHandleForReading.readDataToEndOfFile()
-                let output = String(data: data, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines)
-                return [
-                    "accessible": true,
-                    "accountCount": Int(output ?? "0") ?? 0
-                ]
-            }
+        return checkAppAccess(appName: "Notes")
+    }
+
+    private static func checkMailAccess() -> [String: Any] {
+        // Reason: Try a minimal AppleScript to see if Mail.app is accessible.
+        // This doesn't send the permission prompt -- it just checks if we can talk to Mail.
+        return checkAppAccess(appName: "Mail")
+    }
+
+    private static func checkAppAccess(appName: String) -> [String: Any] {
+        let script = "tell application \"\(appName)\" to count of accounts"
+        guard let result = OsascriptRunner.runRaw(script: script, timeout: doctorAppleScriptTimeout) else {
             return [
                 "accessible": false,
-                "note": "Notes automation permission not yet granted or Notes.app not running."
+                "note": "Failed to spawn osascript to probe \(appName)."
             ]
-        } catch {
+        }
+        if result.timedOut {
             return [
                 "accessible": false,
-                "note": "Could not run osascript: \(error.localizedDescription)"
+                "note": "\(appName).app did not respond within \(Int(doctorAppleScriptTimeout))s. It may be busy or unresponsive; system_doctor refuses to wait longer to avoid orphaning osascript."
             ]
         }
-    }
-
-    private static func checkMailAccess() -> [String: Any] {
-        // Reason: Try a minimal AppleScript to see if Mail.app is accessible.
-        // This doesn't send the permission prompt -- it just checks if we can talk to Mail.
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", "tell application \"Mail\" to count of accounts"]
-        let pipe = Pipe()
-        task.standardOutput = pipe
-        task.standardError = Pipe()
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-            if task.terminationStatus == 0 {
-                let data = pipe.fileHandleForReading.readDataToEndOfFile()
-                let output = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines)
-                return [
-                    "accessible": true,
-                    "accountCount": Int(output ?? "0") ?? 0
-                ]
-            } else {
-                return [
-                    "accessible": false,
-                    "note": "Mail automation permission not yet granted or Mail.app not running."
-                ]
-            }
-        } catch {
+        if result.status == 0 {
             return [
-                "accessible": false,
-                "note": "Could not run osascript: \(error.localizedDescription)"
+                "accessible": true,
+                "accountCount": Int(result.stdout) ?? 0
             ]
         }
+        return [
+            "accessible": false,
+            "note": "\(appName) automation permission not yet granted or \(appName).app not running."
+        ]
     }
+
+    /// Hard timeout for any AppleScript invocation issued by the doctor. The
+    /// doctor's job is to report state quickly; if Mail.app or Notes.app
+    /// cannot answer "count of accounts" in this window they are by definition
+    /// not accessible.
+    private static let doctorAppleScriptTimeout: TimeInterval = 5
 }

package/swift/Sources/AppleBridge/Keynote.swift

@@ -530,41 +530,7 @@ enum KeynoteBridge {
     // MARK: - AppleScript Execution
 
     private static func runAppleScript(_ script: String) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-
-                if errStr.contains("-1743") || errStr.contains("not allowed") {
-                    JSONOutput.error("Keynote automation permission denied. Grant access in System Settings > Privacy & Security > Automation.")
-                } else if errStr.contains("-600") || errStr.contains("not running") {
-                    JSONOutput.error("Keynote is not running. It will be launched automatically on next attempt.")
-                } else {
-                    JSONOutput.error("AppleScript error: \(errStr)")
-                }
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
+        return OsascriptRunner.run(script: script, appName: "Keynote")
     }
 
     private static func escapeForAppleScript(_ str: String) -> String {

package/swift/Sources/AppleBridge/Mail.swift

@@ -637,85 +637,20 @@ enum MailBridge {
 
     // MARK: - AppleScript Execution
 
-    /// Default osascript timeout: long enough for legitimate per-account or
-    /// per-mailbox searches on large accounts, short enough that a hung
-    /// script returns control to the caller before Mail.app appears frozen
-    /// from the user's perspective. The scope guard in `search()` already
-    /// rejects the worst combinations; this is belt-and-braces.
-    private static let defaultAppleScriptTimeout: TimeInterval = 90
-
-    private static func runAppleScript(_ script: String, timeoutSeconds: TimeInterval = defaultAppleScriptTimeout) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-
-            // Watchdog: terminate osascript if it exceeds the timeout. SIGTERM
-            // first so the script gets a chance to clean up; SIGKILL after a
-            // short grace period if it ignores SIGTERM (Apple Events held by
-            // Mail.app can keep an osascript subprocess unresponsive to TERM).
-            let pid = task.processIdentifier
-            let didTimeOut = TimeoutFlag()
-            let watchdog = DispatchWorkItem {
-                guard task.isRunning else { return }
-                didTimeOut.set()
-                task.terminate()
-                DispatchQueue.global().asyncAfter(deadline: .now() + 2) {
-                    if task.isRunning { kill(pid, SIGKILL) }
-                }
-            }
-            DispatchQueue.global().asyncAfter(deadline: .now() + timeoutSeconds, execute: watchdog)
-
-            task.waitUntilExit()
-            watchdog.cancel()
-
-            if didTimeOut.value {
-                JSONOutput.error(
-                    "Mail AppleScript exceeded \(Int(timeoutSeconds))s timeout — killed to free Mail.app. " +
-                    "Narrow the search scope (specific --account or --mailbox) or use --search-in subject."
-                )
-                return nil
-            }
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-
-                if errStr.contains("-1743") || errStr.contains("not allowed") {
-                    JSONOutput.error("Mail automation permission denied. Grant access in System Settings > Privacy & Security > Automation > apple-bridge > Mail.")
-                } else if errStr.contains("-600") || errStr.contains("not running") {
-                    JSONOutput.error("Mail.app is not running. Open Mail.app and try again.")
-                } else {
-                    JSONOutput.error("AppleScript error: \(errStr)")
-                }
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
-    }
-
-    /// Tiny actor-like flag so the watchdog closure can signal the main
-    /// thread that it fired, without racing with `task.terminationReason`
-    /// (which is only set after the kernel reaps the child).
-    private final class TimeoutFlag {
-        private let lock = NSLock()
-        private var fired = false
-        func set() { lock.lock(); fired = true; lock.unlock() }
-        var value: Bool { lock.lock(); defer { lock.unlock() }; return fired }
+    /// Mail.app's per-account/per-mailbox fallback can iterate large folders;
+    /// 90s is long enough for legitimate searches on big accounts but short
+    /// enough that node's default 30s timeout (which fires first) plus our
+    /// signal handler still reap osascript before it wedges Mail.app for
+    /// other concurrent apple-bridge instances.
+    private static let mailAppleScriptTimeout: TimeInterval = 90
+
+    private static func runAppleScript(_ script: String) -> String? {
+        return OsascriptRunner.run(
+            script: script,
+            timeout: mailAppleScriptTimeout,
+            appName: "Mail",
+            timeoutHint: "Narrow the search scope (specific --account or --mailbox) or use --search-in subject."
+        )
     }
 
     private static func escapeForAppleScript(_ str: String) -> String {

package/swift/Sources/AppleBridge/Notes.swift

@@ -184,41 +184,7 @@ enum NotesBridge {
     // MARK: - AppleScript plumbing
 
     private static func runAppleScript(_ script: String) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-
-                if errStr.contains("-1743") || errStr.contains("not allowed") {
-                    JSONOutput.error("Notes automation permission denied. Grant access in System Settings > Privacy & Security > Automation > apple-bridge > Notes.")
-                } else if errStr.contains("-600") || errStr.contains("not running") {
-                    JSONOutput.error("Notes.app is not running. Open Notes.app and try again.")
-                } else {
-                    JSONOutput.error("AppleScript error: \(errStr)")
-                }
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
+        return OsascriptRunner.run(script: script, appName: "Notes")
     }
 
     private static func escapeForAppleScript(_ str: String) -> String {

package/swift/Sources/AppleBridge/Numbers.swift

@@ -444,74 +444,13 @@ enum NumbersBridge {
     // MARK: - AppleScript Execution
 
     private static func runAppleScript(_ script: String) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-
-                if errStr.contains("-1743") || errStr.contains("not allowed") {
-                    JSONOutput.error("Numbers automation permission denied. Grant access in System Settings > Privacy & Security > Automation.")
-                } else if errStr.contains("-600") || errStr.contains("not running") {
-                    JSONOutput.error("Numbers is not running. It will be launched automatically on next attempt.")
-                } else {
-                    JSONOutput.error("AppleScript error: \(errStr)")
-                }
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
+        return OsascriptRunner.run(script: script, appName: "Numbers")
     }
 
     // MARK: - JXA Execution
 
     private static func runJXA(_ script: String) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-l", "JavaScript", "-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-                JSONOutput.error("JXA error: \(errStr)")
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
+        return OsascriptRunner.run(script: script, language: .javaScript, appName: "Numbers")
     }
 
     private static func escapeForAppleScript(_ str: String) -> String {

package/swift/Sources/AppleBridge/OsascriptRunner.swift

@@ -0,0 +1,171 @@
+import Foundation
+import Darwin
+
+// Reason: Single PID slot for the currently-running osascript child. apple-bridge
+// runs one subcommand per invocation and each runOsascript call is synchronous,
+// so at most one osascript is alive at any moment. Stored as sig_atomic_t so
+// the C-convention signal handler can read it without locks (async-signal-safe).
+// File-scope is required: @convention(c) closures cannot capture Swift state, so
+// the handler reaches it as a C global.
+private var currentChildPid: sig_atomic_t = 0
+
+/// Language flavour passed to `osascript`. AppleScript is the default; JXA is
+/// used by Numbers for native JSON output via JavaScript for Automation.
+enum OsascriptLanguage {
+    case appleScript
+    case javaScript
+}
+
+/// Raw result of an osascript invocation. Used by callers that need to inspect
+/// status without emitting a JSON error envelope (e.g. Doctor's probes).
+struct OsascriptResult {
+    let status: Int32
+    let stdout: String
+    let stderr: String
+    let timedOut: Bool
+}
+
+enum OsascriptRunner {
+
+    /// Default watchdog window. Long enough for typical iWork/Notes/Mail
+    /// operations under load; short enough that the Swift watchdog fires
+    /// before node's per-call timeout under default conditions.
+    static let defaultTimeout: TimeInterval = 120
+
+    /// SIGKILL grace period after the initial SIGTERM. Apple Events held by
+    /// host apps (Mail, Notes) can keep osascript unresponsive to SIGTERM for
+    /// a moment; SIGKILL is uncatchable so the second signal always wins.
+    private static let sigkillGrace: TimeInterval = 2
+
+    /// Install signal handlers that kill the currently-running osascript child
+    /// before apple-bridge dies from SIGTERM/SIGINT/SIGHUP. Required because
+    /// Foundation.Process on macOS spawns its child into a new process group,
+    /// so the node-side group-kill in src/bridge.ts only hits apple-bridge --
+    /// the osascript grandchild gets orphaned (PPID=1) and keeps holding
+    /// Mail.app's Apple Event queue hostage. The handler is async-signal-safe:
+    /// it only reads currentChildPid (sig_atomic_t) and calls kill/signal/raise,
+    /// all of which are listed as signal-safe by POSIX.
+    static func installSignalHandlers() {
+        let handler: @convention(c) (Int32) -> Void = { signo in
+            let pid = pid_t(currentChildPid)
+            if pid > 0 {
+                _ = kill(pid, SIGKILL)
+            }
+            // Restore default disposition and re-raise so we exit with the
+            // standard signal status (and any system-level cleanup runs).
+            signal(signo, SIG_DFL)
+            raise(signo)
+        }
+        signal(SIGTERM, handler)
+        signal(SIGINT, handler)
+        signal(SIGHUP, handler)
+    }
+
+    /// Convenience entry point that emits a `JSONOutput.error` and returns nil
+    /// on any failure (timeout, non-zero exit, spawn failure). On success
+    /// returns the trimmed stdout. `appName` is used to build the standard
+    /// permission-denied / not-running messages that every iWork module emits;
+    /// `timeoutHint` is an optional sentence appended to the timeout message
+    /// (used by Mail to suggest narrowing the search scope).
+    static func run(
+        script: String,
+        language: OsascriptLanguage = .appleScript,
+        timeout: TimeInterval = defaultTimeout,
+        appName: String,
+        timeoutHint: String? = nil
+    ) -> String? {
+        guard let result = runRaw(script: script, language: language, timeout: timeout) else {
+            JSONOutput.error("Failed to spawn osascript")
+            return nil
+        }
+        if result.timedOut {
+            var msg = "\(appName) AppleScript exceeded \(Int(timeout))s timeout - killed to free \(appName)."
+            if let hint = timeoutHint {
+                msg += " \(hint)"
+            }
+            JSONOutput.error(msg)
+            return nil
+        }
+        if result.status != 0 {
+            let errStr = result.stderr.isEmpty ? "Unknown error" : result.stderr
+            if errStr.contains("-1743") || errStr.contains("not allowed") {
+                JSONOutput.error("\(appName) automation permission denied. Grant access in System Settings > Privacy & Security > Automation > apple-bridge > \(appName).")
+            } else if errStr.contains("-600") || errStr.contains("not running") {
+                JSONOutput.error("\(appName) is not running. Open \(appName) and try again.")
+            } else {
+                JSONOutput.error("AppleScript error: \(errStr)")
+            }
+            return nil
+        }
+        return result.stdout
+    }
+
+    /// Raw runner that returns status + stdout + stderr without side effects on
+    /// the JSON envelope. Returns nil only on spawn failure. Used by callers
+    /// that need to inspect status (e.g. Doctor probing "is Notes accessible").
+    static func runRaw(
+        script: String,
+        language: OsascriptLanguage = .appleScript,
+        timeout: TimeInterval = defaultTimeout
+    ) -> OsascriptResult? {
+        let task = Process()
+        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
+        switch language {
+        case .appleScript:
+            task.arguments = ["-e", script]
+        case .javaScript:
+            task.arguments = ["-l", "JavaScript", "-e", script]
+        }
+
+        let outPipe = Pipe()
+        let errPipe = Pipe()
+        task.standardOutput = outPipe
+        task.standardError = errPipe
+
+        do {
+            try task.run()
+        } catch {
+            return nil
+        }
+
+        let pid = task.processIdentifier
+        currentChildPid = sig_atomic_t(pid)
+        defer { currentChildPid = 0 }
+
+        let timeoutLock = NSLock()
+        var didTimeOut = false
+
+        let watchdog = DispatchWorkItem {
+            guard task.isRunning else { return }
+            timeoutLock.lock()
+            didTimeOut = true
+            timeoutLock.unlock()
+            task.terminate()
+            DispatchQueue.global().asyncAfter(deadline: .now() + sigkillGrace) {
+                if task.isRunning { kill(pid, SIGKILL) }
+            }
+        }
+        DispatchQueue.global().asyncAfter(deadline: .now() + timeout, execute: watchdog)
+
+        task.waitUntilExit()
+        watchdog.cancel()
+
+        let outData = outPipe.fileHandleForReading.readDataToEndOfFile()
+        let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
+        let stdout = String(data: outData, encoding: .utf8)?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let stderr = String(data: errData, encoding: .utf8)?
+            .trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+
+        timeoutLock.lock()
+        let timedOut = didTimeOut
+        timeoutLock.unlock()
+
+        return OsascriptResult(
+            status: task.terminationStatus,
+            stdout: stdout,
+            stderr: stderr,
+            timedOut: timedOut
+        )
+    }
+}

package/swift/Sources/AppleBridge/Pages.swift

@@ -403,41 +403,7 @@ enum PagesBridge {
     // MARK: - AppleScript Execution
 
     private static func runAppleScript(_ script: String) -> String? {
-        let task = Process()
-        task.executableURL = URL(fileURLWithPath: "/usr/bin/osascript")
-        task.arguments = ["-e", script]
-
-        let outPipe = Pipe()
-        let errPipe = Pipe()
-        task.standardOutput = outPipe
-        task.standardError = errPipe
-
-        do {
-            try task.run()
-            task.waitUntilExit()
-
-            if task.terminationStatus != 0 {
-                let errData = errPipe.fileHandleForReading.readDataToEndOfFile()
-                let errStr = String(data: errData, encoding: .utf8)?
-                    .trimmingCharacters(in: .whitespacesAndNewlines) ?? "Unknown error"
-
-                if errStr.contains("-1743") || errStr.contains("not allowed") {
-                    JSONOutput.error("Pages automation permission denied. Grant access in System Settings > Privacy & Security > Automation.")
-                } else if errStr.contains("-600") || errStr.contains("not running") {
-                    JSONOutput.error("Pages is not running. It will be launched automatically on next attempt.")
-                } else {
-                    JSONOutput.error("AppleScript error: \(errStr)")
-                }
-                return nil
-            }
-
-            let data = outPipe.fileHandleForReading.readDataToEndOfFile()
-            return String(data: data, encoding: .utf8)?
-                .trimmingCharacters(in: .whitespacesAndNewlines)
-        } catch {
-            JSONOutput.error("Failed to run osascript: \(error.localizedDescription)")
-            return nil
-        }
+        return OsascriptRunner.run(script: script, appName: "Pages")
     }
 
     private static func escapeForAppleScript(_ str: String) -> String {