Lightpanda: the headless browser designed for AI and automation
telemetry: recordGoto helper, id range test, drop duplicate guard
Adrià Arrufat6df1f62d3dfe
diff --git a/src/browser/tools.zig b/src/browser/tools.zigindex a58d1d444..72e3cc380 100644--- a/src/browser/tools.zig+++ b/src/browser/tools.zig@@ -21,7 +21,7 @@ const lp = @import("lightpanda");const zenai = @import("zenai");const NodeRegistry = @import("../NodeRegistry.zig");-const TelemetryEvent = @import("../telemetry/telemetry.zig").Event;+const TelemetryTool = @import("../telemetry/telemetry.zig").Event.Tool;const DOMNode = @import("webapi/Node.zig");const Selector = @import("webapi/selector/Selector.zig");@@ -932,7 +932,7 @@ pub const CallOpts = struct {record: bool = false,/// Scripts parse the text, so only model-facing callers set it.nav_note: bool = false,- source: TelemetryEvent.Tool.Source,+ source: TelemetryTool.Source,};// An inline screenshot is re-sent on every turn; keep it within what models@@ -956,12 +956,12 @@ pub fn call(return result;}-fn telemetryOutcome(result: ToolError!ToolResult) TelemetryEvent.Tool.Outcome {+fn telemetryOutcome(result: ToolError!ToolResult) TelemetryTool.Outcome {const r = result catch |err| return errorOutcome(err);return if (r.is_error) .is_error else .ok;}-pub fn errorOutcome(err: ToolError) TelemetryEvent.Tool.Outcome {+pub fn errorOutcome(err: ToolError) TelemetryTool.Outcome {return switch (err) {error.FrameNotLoaded => .frame_not_loaded,error.InvalidParams => .invalid_params,diff --git a/src/mcp/tools.zig b/src/mcp/tools.zigindex 228f42a80..b97ad5986 100644--- a/src/mcp/tools.zig+++ b/src/mcp/tools.zig@@ -333,6 +333,20 @@ fn sendToolResultText(server: *Server, id: std.json.Value, msg: []const u8, is_econst router = @import("router.zig");const testing = @import("../testing.zig");+test "MCP - tool telemetry ids are distinct" {+ var seen: std.StaticBitSet(256) = .empty;+ for (std.enums.values(BrowserTool)) |t| {+ const id = t.telemetryId();+ try testing.expect(id != 0 and id < @backingInt(ExtraTool.save));+ try testing.expect(!seen.isSet(id));+ seen.set(id);+ }+ for (std.enums.values(ExtraTool)) |t| {+ try testing.expect(!seen.isSet(@backingInt(t)));+ seen.set(@backingInt(t));+ }+}+test "MCP - tools/list carries titles and annotations" {const json = try std.json.Stringify.valueAlloc(testing.allocator, all_tools, .{});defer testing.allocator.free(json);diff --git a/src/script/Runtime.zig b/src/script/Runtime.zigindex f3411e191..54e5a6290 100644--- a/src/script/Runtime.zig+++ b/src/script/Runtime.zig@@ -511,7 +511,7 @@ fn invokeGoto(break :blk browser_tools.startGoto(arena, self.session, self.registry, args, receiver_frame_id);};const started = maybe_started catch |err| {- self.app.telemetry.recordTool(BrowserTool.goto.telemetryId(), .script, browser_tools.errorOutcome(err), started_ms);+ self.recordGoto(browser_tools.errorOutcome(err), started_ms);return self.rejectResolver(context, resolver, "navigation failed");};@@ -637,16 +637,20 @@ fn settlePending(self: *Runtime, context: *const v8.Context, pending: *PendingGo.failed => self.rejectResolver(context, resolver, "navigation failed"),.timed_out => self.rejectResolver(context, resolver, "navigation timed out"),}- self.app.telemetry.recordTool(BrowserTool.goto.telemetryId(), .script, result, pending.started_ms);+ self.recordGoto(result, pending.started_ms);pending.reset();}+fn recordGoto(self: *Runtime, outcome: TelemetryOutcome, started_ms: u64) void {+ self.app.telemetry.recordTool(BrowserTool.goto.telemetryId(), .script, outcome, started_ms);+}+/// Reject every still-pending goto and clear the list, freeing all Globals.fn failAllPending(self: *Runtime, context: *const v8.Context, message: []const u8) void {for (self.pending_gotos.items) |*pending| {const resolver: *const v8.PromiseResolver = @ptrCast(v8.v8__Global__Get(&pending.resolver, self.env.isolate.handle));self.rejectResolver(context, resolver, message);- self.app.telemetry.recordTool(BrowserTool.goto.telemetryId(), .script, .cancelled, pending.started_ms);+ self.recordGoto(.cancelled, pending.started_ms);pending.reset();}self.pending_gotos.clearRetainingCapacity();diff --git a/src/telemetry/telemetry.zig b/src/telemetry/telemetry.zigindex 1fa07c8e0..4dcb3344c 100644--- a/src/telemetry/telemetry.zig+++ b/src/telemetry/telemetry.zig@@ -61,9 +61,6 @@ fn TelemetryT(comptime P: type) type {/// `start_ms` is a `datetime.milliTimestamp(.awake)` taken before the call.pub fn recordTool(self: *Self, id: u8, source: Event.Tool.Source, outcome: Event.Tool.Outcome, start_ms: u64) void {- if (self.disabled) {- return;- }const elapsed = lp.datetime.milliTimestamp(.awake) -| start_ms;self.record(.{ .tool = .{.id = id,