tauri-agent-tools 0.7.0 → 0.8.0

package/dist/platform/macos.js

@@ -8,22 +8,42 @@ async function runJxa(script) {
     const { stdout } = await exec('osascript', ['-l', 'JavaScript', '-e', script]);
     return stdout.toString().trim();
 }
-async function getWindowList() {
-    const script = `
+// JXA reads window info by iterating the CFArray element-by-element. We avoid
+// ObjC.deepUnwrap (and ObjC.unwrap on the CFDictionary elements) because both
+// are broken on recent macOS for CGWindowListCopyWindowInfo's CFArray result —
+// deepUnwrap returns a non-array ("list.map is not a function") and unwrap loses
+// all keys. Iterating with CFArrayGetCount/CFArrayGetValueAtIndex and reading
+// each key via objectForKey().js works on every supported macOS version and
+// keeps this path 100% dependency-free (osascript is built in).
+const WINDOW_LIST_SCRIPT = `
 ObjC.import('CoreGraphics');
-var list = ObjC.deepUnwrap(
-  $.CGWindowListCopyWindowInfo($.kCGWindowListOptionOnScreenOnly, 0)
-);
-JSON.stringify(list.map(function(w) {
-  return {
-    kCGWindowNumber: w.kCGWindowNumber,
-    kCGWindowOwnerPID: w.kCGWindowOwnerPID || 0,
-    kCGWindowName: w.kCGWindowName || '',
-    kCGWindowOwnerName: w.kCGWindowOwnerName || '',
-    kCGWindowBounds: w.kCGWindowBounds
-  };
-}));`;
-    const raw = await runJxa(script);
+ObjC.import('Foundation');
+function val(dict, key) {
+  var ref = dict.objectForKey(key);
+  return ref ? ref.js : null;
+}
+var cfList = $.CGWindowListCopyWindowInfo($.kCGWindowListOptionOnScreenOnly, 0);
+var count = $.CFArrayGetCount(cfList);
+var out = [];
+for (var i = 0; i < count; i++) {
+  var w = ObjC.castRefToObject($.CFArrayGetValueAtIndex(cfList, i));
+  var bounds = w.objectForKey('kCGWindowBounds');
+  out.push({
+    kCGWindowNumber: val(w, 'kCGWindowNumber') || 0,
+    kCGWindowOwnerPID: val(w, 'kCGWindowOwnerPID') || 0,
+    kCGWindowName: val(w, 'kCGWindowName') || '',
+    kCGWindowOwnerName: val(w, 'kCGWindowOwnerName') || '',
+    kCGWindowBounds: {
+      X: (bounds ? val(bounds, 'X') : 0) || 0,
+      Y: (bounds ? val(bounds, 'Y') : 0) || 0,
+      Width: (bounds ? val(bounds, 'Width') : 0) || 0,
+      Height: (bounds ? val(bounds, 'Height') : 0) || 0,
+    },
+  });
+}
+JSON.stringify(out);`;
+async function getWindowList() {
+    const raw = await runJxa(WINDOW_LIST_SCRIPT);
     const windows = z.array(CGWindowInfoSchema).parse(JSON.parse(raw));
     // Detect Screen Recording permission issue: all names empty
     const hasAnyName = windows.some((w) => (w.kCGWindowName && w.kCGWindowName.length > 0) ||

package/dist/platform/macos.js.map

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

package/dist/util/logMerge.d.ts

@@ -0,0 +1,42 @@
+import type { OsLogLevel } from '../schemas/osLog.js';
+import type { RustLogEntry } from '../schemas/bridge.js';
+/**
+ * One entry in a merged, cross-source log timeline. Superset of the normalized
+ * `os-logs` shape (kept local so the shared `NormalizedLogEntry` schema — and
+ * the commands validated against it — are untouched).
+ */
+export interface MergedLogEntry {
+    /** ISO-8601 timestamp, or '' when unknown. */
+    ts: string;
+    level: OsLogLevel;
+    /** 'rust' | 'sidecar:<name>' (bridge) or 'file:<basename>' (disk). */
+    source: string;
+    /** Target/module path, best-effort. */
+    subsystem: string;
+    message: string;
+    origin: 'bridge' | 'file';
+    correlation?: Record<string, string>;
+    raw?: unknown;
+}
+export declare const LEVEL_RANK: Record<OsLogLevel, number>;
+export interface ParsedLine {
+    ts: string;
+    level: OsLogLevel;
+    subsystem: string;
+    message: string;
+}
+/**
+ * Best-effort parse of one on-disk log line. Pulls leading bracketed tokens
+ * (`[ts][target][LEVEL]` in any order) when present; otherwise treats the whole
+ * line as the message and infers the level from inline text. Never throws — an
+ * unrecognized line still yields a usable entry (ts='', level='info').
+ */
+export declare function parseLogLine(line: string): ParsedLine;
+/** Normalize a bridge /logs ring-buffer entry into a MergedLogEntry. */
+export declare function normalizeRustLog(e: RustLogEntry): MergedLogEntry;
+/**
+ * Best-effort correlation-id inference from a message (e.g. `run_id=abc`,
+ * `requestId: xyz`, `block-id=42`). Keys shorter than 4 chars (like `pid`) are
+ * ignored to cut noise. Returns undefined when nothing is found.
+ */
+export declare function inferCorrelation(message: string): Record<string, string> | undefined;

package/dist/util/logMerge.js

@@ -0,0 +1,133 @@
+export const LEVEL_RANK = { debug: 0, info: 1, warn: 2, error: 3 };
+const LEVEL_ALIASES = {
+    trace: 'debug',
+    debug: 'debug',
+    dbg: 'debug',
+    info: 'info',
+    information: 'info',
+    warn: 'warn',
+    warning: 'warn',
+    error: 'error',
+    err: 'error',
+    fatal: 'error',
+    crit: 'error',
+    critical: 'error',
+};
+function looksLikeTimestampPart(token) {
+    return (/\d{4}-\d{2}-\d{2}/.test(token) ||
+        /\d{1,2}:\d{2}:\d{2}/.test(token) ||
+        /^\d{10,13}$/.test(token));
+}
+/**
+ * Normalize a timestamp candidate so `Date.parse` reads it deterministically:
+ * unify "date time" → "dateTtime" and, when a time component has no explicit
+ * timezone, treat it as UTC (append `Z`). This keeps cross-source ordering — and
+ * the emitted ISO output — independent of the host machine's timezone.
+ */
+function normalizeForParse(s) {
+    let v = s.trim();
+    v = v.replace(/^(\d{4}-\d{2}-\d{2})[ ](\d{2}:\d{2})/, '$1T$2');
+    const hasTime = /T\d{2}:\d{2}/.test(v) || /^\d{1,2}:\d{2}:\d{2}/.test(v);
+    const hasTz = /[zZ]$/.test(v) || /[+-]\d{2}:?\d{2}$/.test(v);
+    if (hasTime && !hasTz)
+        v += 'Z';
+    return v;
+}
+function combineTimestamp(parts) {
+    if (parts.length === 0)
+        return '';
+    if (parts.length === 1 && /^\d{10,13}$/.test(parts[0])) {
+        const raw = parts[0];
+        const ms = raw.length <= 10 ? Number(raw) * 1000 : Number(raw);
+        const d = new Date(ms);
+        return Number.isNaN(d.getTime()) ? '' : d.toISOString();
+    }
+    const candidates = [parts.join('T'), parts.join(' '), parts.join(''), ...parts];
+    for (const c of candidates) {
+        const t = Date.parse(normalizeForParse(c));
+        if (!Number.isNaN(t))
+            return new Date(t).toISOString();
+    }
+    return '';
+}
+function inferInlineLevel(text) {
+    const m = /\b(TRACE|DEBUG|INFO|WARN(?:ING)?|ERROR|FATAL)\b/i.exec(text);
+    if (!m)
+        return 'info';
+    return LEVEL_ALIASES[m[1].toLowerCase()] ?? 'info';
+}
+/**
+ * Best-effort parse of one on-disk log line. Pulls leading bracketed tokens
+ * (`[ts][target][LEVEL]` in any order) when present; otherwise treats the whole
+ * line as the message and infers the level from inline text. Never throws — an
+ * unrecognized line still yields a usable entry (ts='', level='info').
+ */
+export function parseLogLine(line) {
+    const m = /^\s*((?:\[[^\]]*\]\s*)+)(.*)$/.exec(line);
+    if (!m) {
+        return { ts: '', level: inferInlineLevel(line), subsystem: '', message: line.trim() };
+    }
+    const tokens = [...m[1].matchAll(/\[([^\]]*)\]/g)]
+        .map((x) => x[1].trim())
+        .filter(Boolean);
+    const message = (m[2] ?? '').trim();
+    let level = 'info';
+    let levelFound = false;
+    let subsystem = '';
+    const tsParts = [];
+    for (const tok of tokens) {
+        const lower = tok.toLowerCase();
+        if (!levelFound && lower in LEVEL_ALIASES) {
+            level = LEVEL_ALIASES[lower];
+            levelFound = true;
+            continue;
+        }
+        if (looksLikeTimestampPart(tok)) {
+            tsParts.push(tok);
+            continue;
+        }
+        if (!subsystem)
+            subsystem = tok;
+    }
+    if (!levelFound)
+        level = inferInlineLevel(message);
+    return {
+        ts: combineTimestamp(tsParts),
+        level,
+        subsystem,
+        message: message || line.trim(),
+    };
+}
+/** Normalize a bridge /logs ring-buffer entry into a MergedLogEntry. */
+export function normalizeRustLog(e) {
+    return {
+        ts: new Date(e.timestamp).toISOString(),
+        level: e.level === 'trace' ? 'debug' : e.level,
+        source: e.source,
+        subsystem: e.target,
+        message: e.message,
+        origin: 'bridge',
+        raw: e,
+    };
+}
+const ID_RE = /\b([a-zA-Z][\w]*?(?:[_-]?id))\s*[=:]\s*["']?([\w.\-/]+)/gi;
+/**
+ * Best-effort correlation-id inference from a message (e.g. `run_id=abc`,
+ * `requestId: xyz`, `block-id=42`). Keys shorter than 4 chars (like `pid`) are
+ * ignored to cut noise. Returns undefined when nothing is found.
+ */
+export function inferCorrelation(message) {
+    const out = {};
+    ID_RE.lastIndex = 0;
+    let m;
+    while ((m = ID_RE.exec(message)) !== null) {
+        const rawKey = m[1];
+        if (rawKey.length < 4)
+            continue;
+        const key = rawKey.replace(/[_-]?id$/i, 'Id');
+        if (!(key in out))
+            out[key] = m[2];
+    }
+    return Object.keys(out).length ? out : undefined;
+}
+//# sourceMappingURL=logMerge.js.map

package/dist/util/logMerge.js.map

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

package/dist/util/mergeByTimestamp.d.ts

@@ -0,0 +1,18 @@
+/** Minimal shape needed to merge: an ISO-ish timestamp string. */
+export interface HasTs {
+    ts: string;
+}
+/**
+ * Stable-merge multiple log arrays into one ascending-by-timestamp stream.
+ *
+ * Entries whose `ts` is unparseable sort after all parseable entries (treated
+ * as +∞) but keep their relative input order. Stability is guaranteed via an
+ * insertion-order tiebreaker, so two entries with the same millisecond — or two
+ * unparseable entries — keep a deterministic, source-interleaved order.
+ *
+ * A flat stable sort (rather than a k-way heap) is intentional: the inputs here
+ * are bounded (a ring buffer of ≤1000 plus a handful of log files), so O(n log n)
+ * on the merged set is simpler and just as fast, with no per-source pre-sort
+ * requirement.
+ */
+export declare function mergeByTimestamp<T extends HasTs>(sources: T[][]): T[];

package/dist/util/mergeByTimestamp.js

@@ -0,0 +1,30 @@
+/**
+ * Stable-merge multiple log arrays into one ascending-by-timestamp stream.
+ *
+ * Entries whose `ts` is unparseable sort after all parseable entries (treated
+ * as +∞) but keep their relative input order. Stability is guaranteed via an
+ * insertion-order tiebreaker, so two entries with the same millisecond — or two
+ * unparseable entries — keep a deterministic, source-interleaved order.
+ *
+ * A flat stable sort (rather than a k-way heap) is intentional: the inputs here
+ * are bounded (a ring buffer of ≤1000 plus a handful of log files), so O(n log n)
+ * on the merged set is simpler and just as fast, with no per-source pre-sort
+ * requirement.
+ */
+export function mergeByTimestamp(sources) {
+    const tagged = [];
+    let order = 0;
+    for (const src of sources) {
+        for (const item of src) {
+            const parsed = Date.parse(item.ts);
+            tagged.push({
+                item,
+                key: Number.isNaN(parsed) ? Number.POSITIVE_INFINITY : parsed,
+                order: order++,
+            });
+        }
+    }
+    tagged.sort((a, b) => a.key - b.key || a.order - b.order);
+    return tagged.map((t) => t.item);
+}
+//# sourceMappingURL=mergeByTimestamp.js.map

package/dist/util/mergeByTimestamp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergeByTimestamp.js","sourceRoot":"","sources":["../../src/util/mergeByTimestamp.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAAkB,OAAc;IAC9D,MAAM,MAAM,GAAmD,EAAE,CAAC;IAClE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI;gBACJ,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM;gBAC7D,KAAK,EAAE,KAAK,EAAE;aACf,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AACnC,CAAC"}

package/dist/util/psTree.d.ts

@@ -0,0 +1,28 @@
+/** A single process row from a `ps` snapshot. */
+export interface PsProc {
+    pid: number;
+    ppid: number;
+    command: string;
+}
+/** A node in a descendant process tree. */
+export interface PsTreeNode extends PsProc {
+    children: PsTreeNode[];
+}
+/**
+ * Snapshot all running processes via `ps` (Unix only: macOS + Linux).
+ * Columns are pid, ppid, and the full command line. Returns `[]` on Windows
+ * (callers degrade gracefully) and never throws on parse — only the `ps`
+ * invocation itself can reject.
+ */
+export declare function snapshotProcesses(timeoutMs?: number): Promise<PsProc[]>;
+/**
+ * Build the descendant subtree rooted at `rootPid` from a flat process list.
+ * Returns null if `rootPid` is absent from the snapshot. Cycle-safe: a node is
+ * never visited twice, so pid-reuse anomalies can't cause infinite recursion.
+ * Children are sorted by pid for deterministic output.
+ */
+export declare function buildDescendantTree(procs: PsProc[], rootPid: number): PsTreeNode | null;
+/** Flatten a tree depth-first (root first). Cycle-safe. */
+export declare function flattenTree(root: PsTreeNode): PsTreeNode[];
+/** Number of descendants of `root` (the root itself excluded). */
+export declare function countDescendants(root: PsTreeNode): number;

package/dist/util/psTree.js

@@ -0,0 +1,76 @@
+import { exec } from './exec.js';
+/**
+ * Snapshot all running processes via `ps` (Unix only: macOS + Linux).
+ * Columns are pid, ppid, and the full command line. Returns `[]` on Windows
+ * (callers degrade gracefully) and never throws on parse — only the `ps`
+ * invocation itself can reject.
+ */
+export async function snapshotProcesses(timeoutMs = 5000) {
+    if (process.platform === 'win32')
+        return [];
+    // `-axo pid=,ppid=,command=` works on both BSD (macOS) and procps (Linux);
+    // the trailing `=` on each column suppresses the header row.
+    const res = await exec('ps', ['-axo', 'pid=,ppid=,command='], { timeout: timeoutMs });
+    const out = [];
+    for (const line of res.stdout.toString('utf-8').split('\n')) {
+        const m = /^\s*(\d+)\s+(\d+)\s+(.*)$/.exec(line);
+        if (!m)
+            continue;
+        out.push({ pid: Number(m[1]), ppid: Number(m[2]), command: (m[3] ?? '').trim() });
+    }
+    return out;
+}
+/**
+ * Build the descendant subtree rooted at `rootPid` from a flat process list.
+ * Returns null if `rootPid` is absent from the snapshot. Cycle-safe: a node is
+ * never visited twice, so pid-reuse anomalies can't cause infinite recursion.
+ * Children are sorted by pid for deterministic output.
+ */
+export function buildDescendantTree(procs, rootPid) {
+    const byPid = new Map();
+    for (const p of procs)
+        byPid.set(p.pid, { ...p, children: [] });
+    for (const node of byPid.values()) {
+        if (node.ppid === node.pid)
+            continue; // guard self-parenting
+        const parent = byPid.get(node.ppid);
+        if (parent)
+            parent.children.push(node);
+    }
+    const root = byPid.get(rootPid);
+    if (!root)
+        return null;
+    const seen = new Set();
+    const sortRec = (n) => {
+        if (seen.has(n.pid)) {
+            n.children = [];
+            return;
+        }
+        seen.add(n.pid);
+        n.children.sort((a, b) => a.pid - b.pid);
+        for (const c of n.children)
+            sortRec(c);
+    };
+    sortRec(root);
+    return root;
+}
+/** Flatten a tree depth-first (root first). Cycle-safe. */
+export function flattenTree(root) {
+    const out = [];
+    const seen = new Set();
+    const walk = (n) => {
+        if (seen.has(n.pid))
+            return;
+        seen.add(n.pid);
+        out.push(n);
+        for (const c of n.children)
+            walk(c);
+    };
+    walk(root);
+    return out;
+}
+/** Number of descendants of `root` (the root itself excluded). */
+export function countDescendants(root) {
+    return Math.max(0, flattenTree(root).length - 1);
+}
+//# sourceMappingURL=psTree.js.map

package/dist/util/psTree.js.map

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

package/examples/tauri-bridge/src/dev_bridge.rs

@@ -430,6 +430,57 @@ pub fn __dev_bridge_result(
     state.notify.notify_all();
 }
 
+const EVAL_TIMEOUT_MESSAGE: &str = "Eval timeout: no result callback received. Re-copy examples/tauri-bridge/src/dev_bridge.rs from tauri-agent-tools 0.7.0+ and verify Tauri IPC is available.";
+
+fn build_eval_callback_js(js: &str, request_id: &str) -> String {
+    format!(
+        r#"
+                    (async () => {{
+                        const __getDevBridgeInvoke = () => {{
+                            if (window.__TAURI_INTERNALS__ && typeof window.__TAURI_INTERNALS__.invoke === "function") {{
+                                return window.__TAURI_INTERNALS__.invoke.bind(window.__TAURI_INTERNALS__);
+                            }}
+                            if (window.__TAURI__ && window.__TAURI__.core && typeof window.__TAURI__.core.invoke === "function") {{
+                                return window.__TAURI__.core.invoke.bind(window.__TAURI__.core);
+                            }}
+                            return null;
+                        }};
+
+                        let __devBridgeInvoke = __getDevBridgeInvoke();
+                        try {{
+                            if (!__devBridgeInvoke) {{
+                                throw new Error("Tauri invoke API not found: expected window.__TAURI_INTERNALS__.invoke or window.__TAURI__.core.invoke");
+                            }}
+                            let __result = await eval({js});
+                            if (typeof __result === "undefined") {{
+                                __result = null;
+                            }} else if (typeof __result === "object" && __result !== null) {{
+                                __result = JSON.stringify(__result);
+                            }} else if (typeof __result !== "string") {{
+                                __result = String(__result);
+                            }}
+                            await __devBridgeInvoke("__dev_bridge_result", {{
+                                id: {id},
+                                value: __result
+                            }});
+                        }} catch(e) {{
+                            __devBridgeInvoke = __devBridgeInvoke || __getDevBridgeInvoke();
+                            if (!__devBridgeInvoke) {{
+                                throw e;
+                            }}
+                            const __message = e && e.message ? e.message : String(e);
+                            await __devBridgeInvoke("__dev_bridge_result", {{
+                                id: {id},
+                                value: "ERROR: " + __message
+                            }});
+                        }}
+                    }})();
+                    "#,
+        js = serde_json::to_string(js).unwrap(),
+        id = serde_json::to_string(request_id).unwrap(),
+    )
+}
+
 /// Start the development bridge HTTP server.
 ///
 /// Returns the bound port, a shared log buffer, and a sidecar registry. Both
@@ -747,36 +798,18 @@ pub fn start_bridge(
             let window_label = eval_req.window.as_deref().unwrap_or("main");
             if let Some(window) = app_handle.get_webview_window(window_label) {
                 // Build JS that evaluates the expression, then calls back into Rust
-                // via __TAURI__.core.invoke() to deliver the result.
-                let callback_js = format!(
-                    r#"
-                    (async () => {{
-                        try {{
-                            let __result = await eval({js});
-                            if (typeof __result === "undefined") {{
-                                __result = null;
-                            }} else if (typeof __result === "object" && __result !== null) {{
-                                __result = JSON.stringify(__result);
-                            }} else if (typeof __result !== "string") {{
-                                __result = String(__result);
-                            }}
-                            await window.__TAURI__.core.invoke("__dev_bridge_result", {{
-                                id: {id},
-                                value: __result
-                            }});
-                        }} catch(e) {{
-                            await window.__TAURI__.core.invoke("__dev_bridge_result", {{
-                                id: {id},
-                                value: "ERROR: " + e.message
-                            }});
-                        }}
-                    }})();
-                    "#,
-                    js = serde_json::to_string(&eval_req.js).unwrap(),
-                    id = serde_json::to_string(&request_id).unwrap(),
-                );
-
-                let _ = window.eval(&callback_js);
+                // via Tauri's invoke API to deliver the result. Prefer the
+                // internal global because Tauri 2 does not expose __TAURI__
+                // unless app.withGlobalTauri is enabled.
+                let callback_js = build_eval_callback_js(&eval_req.js, &request_id);
+
+                if let Err(e) = window.eval(&callback_js) {
+                    let _ = request.respond(
+                        Response::from_string(format!("Eval injection failed: {e}"))
+                            .with_status_code(500),
+                    );
+                    continue;
+                }
 
                 // Wait for the result with a 5-second timeout
                 let mut results = pending.results.lock().unwrap();
@@ -799,7 +832,7 @@ pub fn start_bridge(
                         // Timeout — clean up and respond with 504
                         results.remove(&request_id);
                         let _ = request.respond(
-                            Response::from_string("Eval timeout").with_status_code(504),
+                            Response::from_string(EVAL_TIMEOUT_MESSAGE).with_status_code(504),
                         );
                         break;
                     }
@@ -812,7 +845,7 @@ pub fn start_bridge(
                     if timeout_result.timed_out() && !results.contains_key(&request_id) {
                         results.remove(&request_id);
                         let _ = request.respond(
-                            Response::from_string("Eval timeout").with_status_code(504),
+                            Response::from_string(EVAL_TIMEOUT_MESSAGE).with_status_code(504),
                         );
                         break;
                     }
@@ -834,6 +867,53 @@ pub fn start_bridge(
     Ok((port, log_buffer, sidecar_registry))
 }
 
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn eval_callback_prefers_tauri_internals() {
+        let script = build_eval_callback_js("document.title", "request-1");
+        let internals = script.find("window.__TAURI_INTERNALS__.invoke").unwrap();
+        let global = script.find("window.__TAURI__.core.invoke").unwrap();
+
+        assert!(internals < global);
+    }
+
+    #[test]
+    fn eval_callback_keeps_global_tauri_fallback() {
+        let script = build_eval_callback_js("document.title", "request-1");
+
+        assert!(script.contains("window.__TAURI__.core.invoke"));
+        assert!(!script.contains("app.withGlobalTauri"));
+    }
+
+    #[test]
+    fn eval_callback_safely_embeds_js_and_request_id() {
+        let js = r#"document.querySelector("[data-name=\"x\"]").textContent"#;
+        let request_id = r#"request-"quoted""#;
+        let script = build_eval_callback_js(js, request_id);
+
+        assert!(script.contains(&serde_json::to_string(js).unwrap()));
+        assert!(script.contains(&serde_json::to_string(request_id).unwrap()));
+    }
+
+    #[test]
+    fn eval_callback_uses_dev_bridge_result_command() {
+        let script = build_eval_callback_js("1 + 1", "request-1");
+
+        assert!(script.contains("__dev_bridge_result"));
+        assert!(!script.contains("await window.__TAURI__.core.invoke"));
+    }
+
+    #[test]
+    fn eval_timeout_message_is_actionable() {
+        assert!(EVAL_TIMEOUT_MESSAGE.contains("no result callback received"));
+        assert!(EVAL_TIMEOUT_MESSAGE.contains("Re-copy"));
+        assert!(EVAL_TIMEOUT_MESSAGE.contains("dev_bridge.rs"));
+    }
+}
+
 /// Read declared capabilities from tauri.conf.json via `app.config()`. Returns
 /// a flat list of capability entries. Tauri 2 lets capabilities be either bare
 /// permission identifiers (strings) or full inline definitions; we surface

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tauri-agent-tools",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Agent-driven inspection toolkit for Tauri desktop apps",
   "type": "module",
   "bin": {

package/rust-bridge/README.md

@@ -16,6 +16,9 @@ rand = "0.8"
 uuid = { version = "1", features = ["v4"] }
 tracing = "0.1"
 tracing-subscriber = "0.3"
+
+[target.'cfg(unix)'.dependencies]
+libc = "0.2"
 ```
 
 ### 2. Copy the bridge module
@@ -84,7 +87,7 @@ tauri-agent-tools eval "document.title"
 3. `tauri-agent-tools` discovers the token file and authenticates via the token
 4. The bridge exposes four endpoints: `POST /eval` (JS evaluation), `POST /logs` (Rust log retrieval), `POST /describe` (bridge metadata), and `GET /version` (unauthenticated health check)
 5. `/eval` accepts an optional `window` field to target specific webview windows (defaults to `"main"`)
-6. The injected JS evaluates the expression, then calls back into Rust via `window.__TAURI__.core.invoke("__dev_bridge_result", { id, value })` to deliver the result
+6. The injected JS evaluates the expression, then calls back into Rust via `window.__TAURI_INTERNALS__.invoke("__dev_bridge_result", { id, value })` to deliver the result, falling back to `window.__TAURI__.core.invoke()` for older/global-enabled apps
 7. The HTTP handler thread waits for the result (up to 5 seconds) and returns it as JSON
 8. `/logs` drains the ring buffer of captured `tracing` events and returns them as JSON
 9. `/describe` returns PID, window labels, and capabilities
@@ -98,6 +101,12 @@ tauri-agent-tools eval "document.title"
 - **Inspection is read-only** — inspection commands only read DOM state
 - **Interaction is debug-only** — interaction commands use eval-based DOM dispatch, sandboxed to the webview
 
+## Troubleshooting
+
+### `Eval timeout: no result callback received`
+
+Re-copy `examples/tauri-bridge/src/dev_bridge.rs` from the latest package. Current bridge code uses Tauri 2's always-present `window.__TAURI_INTERNALS__.invoke()` callback path and does **not** require `app.withGlobalTauri: true`. Older copied bridge files used `window.__TAURI__.core.invoke()` and can time out in apps that keep Tauri's global API disabled.
+
 ## Agent-Assisted Setup
 
 If you're using an AI coding agent (Claude Code, Codex, Cursor, etc.), the `tauri-bridge-setup` skill can guide automated setup. See `.agents/skills/tauri-bridge-setup/SKILL.md` or run: