@zogien/native-sdk 0.11.0-fork.4 → 0.11.0-fork.5

package/src/runtime/flow.zig

@@ -382,6 +382,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                     const state = event_value.window_frame_changed;
                     if (host_flow.gate(policy, 1, @intFromBool(was_open), @intFromBool(state.open)) != 0) {
                         const label = if (WindowViewMethods().findWindowIndexById(self, state.id)) |index| self.windows[index].info.label else state.label;
+                        self.cancelDialogsForWindow(state.id);
                         try dispatchEvent(self, app, .{ .window_closed = .{ .window_id = state.id, .label = label } });
                     }
                 },
@@ -449,6 +450,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                     emitFileDropEvent(self, drop) catch |err| log(self, "drop.files.emit_failed", @errorName(err), &.{trace.uint("window_id", drop.window_id)});
                 },
                 .lifecycle_stop => {
+                    self.abandonDialogs();
                     try dispatchEvent(self, app, .{ .lifecycle = .stop });
                 },
                 .extensions_stop => {
@@ -529,6 +531,10 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                     try dispatchEvent(self, app, .{ .video = event_value.video });
                 },
                 .event_wake => {
+                    // Finished dialogs ride the same nudge the effects
+                    // channel uses; their completions run before the app
+                    // drains its own work.
+                    self.adoptDialogResults();
                     try dispatchEvent(self, app, .effects_wake);
                 },
                 .capability_gpu_surface_frame => {
@@ -1206,19 +1212,20 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                 self.invalidateFor(.command, null);
                 return true;
             }
-            const response = switch (plan.family()) {
+            const response: ?[]const u8 = switch (plan.family()) {
                 .none => unreachable,
                 .command => dispatchCommandBridgeCommand(self, app, request, message.window_id, message.webview_label, &result_buffer, &response_buffer),
                 .window => dispatchWindowBridgeCommand(self, request, &result_buffer, &response_buffer),
                 .view => dispatchViewBridgeCommand(self, request, message.window_id, &result_buffer, &response_buffer),
                 .webview => dispatchWebViewBridgeCommand(self, request, message.window_id, &result_buffer, &response_buffer),
                 .platform => dispatchPlatformBridgeCommand(self, request, &result_buffer, &response_buffer),
-                .dialog => dispatchDialogBridgeCommand(self, request, &result_buffer, &response_buffer),
+                .dialog => dispatchDialogBridgeCommand(self, request, message, &result_buffer, &response_buffer),
                 .os => dispatchOsBridgeCommand(self, request, message.origin, &result_buffer, &response_buffer),
                 .clipboard => dispatchClipboardBridgeCommand(self, request, &result_buffer, &response_buffer),
                 .credentials => dispatchCredentialBridgeCommand(self, request, &result_buffer, &response_buffer),
             };
-            try completeBridgeResponse(self, message.window_id, message.webview_label, response);
+            // Dialogs answer later, when they finish.
+            if (response) |bytes| try completeBridgeResponse(self, message.window_id, message.webview_label, bytes);
             self.invalidateFor(.command, null);
             return true;
         }
@@ -1271,7 +1278,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                 self.invalidateFor(.command, null);
                 return true;
             }
-            const result = if (is_command)
+            const result: ?[]const u8 = if (is_command)
                 dispatchCommandBridgeCommand(self, app, request, message.window_id, message.webview_label, &result_buffer, &response_buffer)
             else if (is_window)
                 dispatchWindowBridgeCommand(self, request, &result_buffer, &response_buffer)
@@ -1282,7 +1289,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
             else if (is_platform)
                 dispatchPlatformBridgeCommand(self, request, &result_buffer, &response_buffer)
             else if (is_dialog)
-                dispatchDialogBridgeCommand(self, request, &result_buffer, &response_buffer)
+                dispatchDialogBridgeCommand(self, request, message, &result_buffer, &response_buffer)
             else if (is_clipboard)
                 dispatchClipboardBridgeCommand(self, request, &result_buffer, &response_buffer)
             else if (is_credentials)
@@ -1290,7 +1297,8 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
             else
                 dispatchOsBridgeCommand(self, request, message.origin, &result_buffer, &response_buffer);
 
-            try completeBridgeResponse(self, message.window_id, message.webview_label, result);
+            // Dialogs answer later, when they finish.
+            if (result) |bytes| try completeBridgeResponse(self, message.window_id, message.webview_label, bytes);
             self.invalidateFor(.command, null);
             return true;
         }

package/src/runtime/flow_reference.zig

@@ -369,6 +369,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                         // comes from runtime storage, which outlives the
                         // event's transient slices.
                         const label = if (WindowViewMethods().findWindowIndexById(self, state.id)) |index| self.windows[index].info.label else state.label;
+                        self.cancelDialogsForWindow(state.id);
                         try dispatchEvent(self, app, .{ .window_closed = .{ .window_id = state.id, .label = label } });
                     }
                 },
@@ -505,6 +506,10 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                     try dispatchEvent(self, app, .{ .video = video_event });
                 },
                 .wake => {
+                    // Finished dialogs ride the same nudge the effects
+                    // channel uses; their completions run before the app
+                    // drains its own work.
+                    self.adoptDialogResults();
                     try dispatchEvent(self, app, .effects_wake);
                 },
                 .files_dropped => |drop| {
@@ -523,6 +528,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                     self.invalidateFor(.command, null);
                 },
                 .app_shutdown => {
+                    self.abandonDialogs();
                     try dispatchEvent(self, app, .{ .lifecycle = .stop });
                     if (self.options.extensions) |registry| try registry.stopAll(extensionContext(self));
                     // A release the app staged but did not restart into
@@ -1214,19 +1220,20 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                 self.invalidateFor(.command, null);
                 return true;
             }
-            const response = switch (plan.family()) {
+            const response: ?[]const u8 = switch (plan.family()) {
                 .none => unreachable,
                 .command => dispatchCommandBridgeCommand(self, app, request, message.window_id, message.webview_label, &result_buffer, &response_buffer),
                 .window => dispatchWindowBridgeCommand(self, request, &result_buffer, &response_buffer),
                 .view => dispatchViewBridgeCommand(self, request, message.window_id, &result_buffer, &response_buffer),
                 .webview => dispatchWebViewBridgeCommand(self, request, message.window_id, &result_buffer, &response_buffer),
                 .platform => dispatchPlatformBridgeCommand(self, request, &result_buffer, &response_buffer),
-                .dialog => dispatchDialogBridgeCommand(self, request, &result_buffer, &response_buffer),
+                .dialog => dispatchDialogBridgeCommand(self, request, message, &result_buffer, &response_buffer),
                 .os => dispatchOsBridgeCommand(self, request, message.origin, &result_buffer, &response_buffer),
                 .clipboard => dispatchClipboardBridgeCommand(self, request, &result_buffer, &response_buffer),
                 .credentials => dispatchCredentialBridgeCommand(self, request, &result_buffer, &response_buffer),
             };
-            try completeBridgeResponse(self, message.window_id, message.webview_label, response);
+            // Dialogs answer later, when they finish.
+            if (response) |bytes| try completeBridgeResponse(self, message.window_id, message.webview_label, bytes);
             self.invalidateFor(.command, null);
             return true;
         }
@@ -1279,7 +1286,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                 self.invalidateFor(.command, null);
                 return true;
             }
-            const result = if (is_command)
+            const result: ?[]const u8 = if (is_command)
                 dispatchCommandBridgeCommand(self, app, request, message.window_id, message.webview_label, &result_buffer, &response_buffer)
             else if (is_window)
                 dispatchWindowBridgeCommand(self, request, &result_buffer, &response_buffer)
@@ -1290,7 +1297,7 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
             else if (is_platform)
                 dispatchPlatformBridgeCommand(self, request, &result_buffer, &response_buffer)
             else if (is_dialog)
-                dispatchDialogBridgeCommand(self, request, &result_buffer, &response_buffer)
+                dispatchDialogBridgeCommand(self, request, message, &result_buffer, &response_buffer)
             else if (is_clipboard)
                 dispatchClipboardBridgeCommand(self, request, &result_buffer, &response_buffer)
             else if (is_credentials)
@@ -1298,7 +1305,8 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
             else
                 dispatchOsBridgeCommand(self, request, message.origin, &result_buffer, &response_buffer);
 
-            try completeBridgeResponse(self, message.window_id, message.webview_label, result);
+            // Dialogs answer later, when they finish.
+            if (result) |bytes| try completeBridgeResponse(self, message.window_id, message.webview_label, bytes);
             self.invalidateFor(.command, null);
             return true;
         }

package/src/runtime/platform_bridge_tests.zig

@@ -6,4 +6,5 @@ test {
     _ = @import("webview_view_bridge_tests.zig");
     _ = @import("web_layer_gate_tests.zig");
     _ = @import("bridge_permission_tests.zig");
+    _ = @import("dialog_tests.zig");
 }

package/src/runtime/root.zig

@@ -40,6 +40,10 @@ pub const Event = core.Event;
 pub const App = core.App;
 pub const Options = core.Options;
 pub const Runtime = core.Runtime;
+pub const DialogCompletion = core.DialogCompletion;
+pub const DialogRequestOptions = core.DialogRequestOptions;
+pub const max_dialog_requests = core.max_dialog_requests;
+pub const max_dialog_tag_bytes = core.max_dialog_tag_bytes;
 pub const TestHarness = core.TestHarness;
 pub const DispatchError = core.DispatchError;
 pub const max_dispatch_errors = core.max_dispatch_errors;
@@ -165,6 +169,7 @@ pub const max_effect_pty_chunk_bytes = runtime_effects.max_effect_pty_chunk_byte
 pub const max_effect_pty_write_bytes = runtime_effects.max_effect_pty_write_bytes;
 pub const max_effect_pty_term_bytes = runtime_effects.max_effect_pty_term_bytes;
 pub const EffectHostResult = runtime_effects.EffectHostResult;
+pub const DesktopCapabilityCompletion = runtime_effects.DesktopCapabilityCompletion;
 pub const HostCallBinding = runtime_effects.HostCallBinding;
 pub const HostCallCompletion = runtime_effects.HostCallCompletion;
 pub const ServiceHost = @import("service_host.zig").ServiceHost;

package/src/runtime/system_services.zig

@@ -404,95 +404,77 @@ pub fn RuntimeSystemServices(comptime Runtime: type) type {
             return writeTrueJson(output);
         }
 
-        pub fn openFileDialogFromJson(self: *Runtime, payload: []const u8, output: []u8) ![]const u8 {
-            var storage = json.StringStorage.init(output);
-            const title = jsonStringField(payload, "title", &storage) orelse "";
-            const default_path = jsonStringField(payload, "defaultPath", &storage) orelse "";
-            const allow_dirs = jsonBoolField(payload, "allowDirectories") orelse false;
-            const allow_multi = jsonBoolField(payload, "allowMultiple") orelse false;
-            var dialog_buffer: [platform.max_dialog_paths_bytes]u8 = undefined;
-            const result = try self.showOpenDialog(.{
-                .title = title,
-                .default_path = default_path,
-                .allow_directories = allow_dirs,
-                .allow_multiple = allow_multi,
-            }, &dialog_buffer);
-
-            var writer = std.Io.Writer.fixed(output);
-            if (result.count == 0) {
-                try writer.writeAll("null");
-            } else {
-                try writer.writeByte('[');
-                var start: usize = 0;
-                var i: usize = 0;
-                for (result.paths, 0..) |ch, pos| {
-                    if (ch == '\n') {
-                        if (i > 0) try writer.writeByte(',');
-                        try json.writeString(&writer, result.paths[start..pos]);
-                        start = pos + 1;
-                        i += 1;
-                    }
-                }
-                if (start < result.paths.len) {
-                    if (i > 0) try writer.writeByte(',');
-                    try json.writeString(&writer, result.paths[start..]);
-                }
-                try writer.writeByte(']');
+        /// Read a `native-sdk.dialog.*` bridge payload. Strings land in
+        /// `storage` and borrow it.
+        pub fn dialogOptionsFromJson(kind: platform.DialogKind, payload: []const u8, storage: *json.StringStorage) !platform.DialogOptions {
+            switch (kind) {
+                .open => return .{ .open = .{
+                    .title = jsonStringField(payload, "title", storage) orelse "",
+                    .default_path = jsonStringField(payload, "defaultPath", storage) orelse "",
+                    .allow_directories = jsonBoolField(payload, "allowDirectories") orelse false,
+                    .allow_multiple = jsonBoolField(payload, "allowMultiple") orelse false,
+                } },
+                .save => return .{ .save = .{
+                    .title = jsonStringField(payload, "title", storage) orelse "",
+                    .default_path = jsonStringField(payload, "defaultPath", storage) orelse "",
+                    .default_name = jsonStringField(payload, "defaultName", storage) orelse "",
+                } },
+                .message => {
+                    const title = jsonStringField(payload, "title", storage) orelse "";
+                    const message = jsonStringField(payload, "message", storage) orelse "";
+                    const informative = jsonStringField(payload, "informativeText", storage) orelse "";
+                    const primary = jsonStringField(payload, "primaryButton", storage) orelse "OK";
+                    const secondary = jsonStringField(payload, "secondaryButton", storage) orelse "";
+                    const tertiary = jsonStringField(payload, "tertiaryButton", storage) orelse "";
+                    const style_str = jsonStringField(payload, "style", storage) orelse "info";
+                    const style: platform.MessageDialogStyle = if (std.mem.eql(u8, style_str, "warning"))
+                        .warning
+                    else if (std.mem.eql(u8, style_str, "critical"))
+                        .critical
+                    else
+                        .info;
+                    return .{ .message = .{
+                        .style = style,
+                        .title = title,
+                        .message = message,
+                        .informative_text = informative,
+                        .primary_button = primary,
+                        .secondary_button = secondary,
+                        .tertiary_button = tertiary,
+                    } };
+                },
             }
-            return writer.buffered();
         }
 
-        pub fn saveFileDialogFromJson(self: *Runtime, payload: []const u8, output: []u8) ![]const u8 {
-            var storage = json.StringStorage.init(output);
-            const title = jsonStringField(payload, "title", &storage) orelse "";
-            const default_path = jsonStringField(payload, "defaultPath", &storage) orelse "";
-            const default_name = jsonStringField(payload, "defaultName", &storage) orelse "";
-            var dialog_buffer: [platform.max_dialog_path_bytes]u8 = undefined;
-            const path = try self.showSaveDialog(.{
-                .title = title,
-                .default_path = default_path,
-                .default_name = default_name,
-            }, &dialog_buffer);
-
+        /// The bridge result for a finished dialog: open dialogs answer an
+        /// array of paths, save dialogs a path, message dialogs the
+        /// pressed button's name. A dialog closed without a choice answers
+        /// `null` (open, save) or `"dismissed"` (message).
+        pub fn writeDialogResultJson(kind: platform.DialogKind, result: platform.DialogResult, output: []u8) ![]const u8 {
             var writer = std.Io.Writer.fixed(output);
-            if (path) |p| {
-                try json.writeString(&writer, p);
-            } else {
-                try writer.writeAll("null");
+            const chosen = result.outcome == .selected;
+            switch (kind) {
+                .open => {
+                    if (!chosen or result.count == 0) {
+                        try writer.writeAll("null");
+                        return writer.buffered();
+                    }
+                    try writer.writeByte('[');
+                    var paths = std.mem.splitScalar(u8, result.paths, '\n');
+                    var first = true;
+                    while (paths.next()) |path| {
+                        if (path.len == 0) continue;
+                        if (!first) try writer.writeByte(',');
+                        first = false;
+                        try json.writeString(&writer, path);
+                    }
+                    try writer.writeByte(']');
+                },
+                .save => if (chosen and result.paths.len > 0) try json.writeString(&writer, result.paths) else try writer.writeAll("null"),
+                .message => try json.writeString(&writer, if (chosen) @tagName(result.button) else "dismissed"),
             }
             return writer.buffered();
         }
-
-        pub fn showMessageDialogFromJson(self: *Runtime, payload: []const u8, output: []u8) ![]const u8 {
-            var storage = json.StringStorage.init(output);
-            const title = jsonStringField(payload, "title", &storage) orelse "";
-            const message = jsonStringField(payload, "message", &storage) orelse "";
-            const informative = jsonStringField(payload, "informativeText", &storage) orelse "";
-            const primary = jsonStringField(payload, "primaryButton", &storage) orelse "OK";
-            const secondary = jsonStringField(payload, "secondaryButton", &storage) orelse "";
-            const tertiary = jsonStringField(payload, "tertiaryButton", &storage) orelse "";
-            const style_str = jsonStringField(payload, "style", &storage) orelse "info";
-            const style: platform.MessageDialogStyle = if (std.mem.eql(u8, style_str, "warning"))
-                .warning
-            else if (std.mem.eql(u8, style_str, "critical"))
-                .critical
-            else
-                .info;
-
-            const result = try self.showMessageDialog(.{
-                .style = style,
-                .title = title,
-                .message = message,
-                .informative_text = informative,
-                .primary_button = primary,
-                .secondary_button = secondary,
-                .tertiary_button = tertiary,
-            });
-
-            var writer = std.Io.Writer.fixed(output);
-            try json.writeString(&writer, @tagName(result));
-            return writer.buffered();
-        }
     };
 }
 

package/src/runtime/ui_app.zig

@@ -47,6 +47,7 @@ const component_policy = @import("component_policy.zig");
 const hover_policy = @import("canvas_hover_policy.zig");
 const launch_timing = @import("launch_timing.zig");
 const runtime_effects = @import("effects.zig");
+const runtime_dialogs = @import("dialogs.zig");
 const terminal_session = @import("terminal_session.zig");
 const ui_app_provenance = @import("ui_app_provenance.zig");
 const markup_development = @import("markup_development_policy.zig");
@@ -1684,6 +1685,8 @@ pub fn UiAppWithFeatures(comptime ModelT: type, comptime MsgT: type, comptime fe
                 .reveal_path_fn = effectsRevealPath,
                 .format_local_time_fn = effectsFormatLocalTime,
                 .execute_capability_fn = effectsExecuteCapability,
+                .start_capability_fn = effectsStartCapability,
+                .cancel_capability_fn = effectsCancelCapability,
                 .replay_window_result_fn = effectsRestoreWindowResult,
             });
             if (runtime.options.session_recorder) |recorder| {
@@ -7025,6 +7028,70 @@ fn effectsRestoreWindowResult(context: *anyopaque, label: []const u8, closed: bo
     runtime.restoreWindowCapabilityResult(label, closed);
 }
 
+/// What a directory picker needs to answer its capability request, kept in
+/// the dialog's completion tag until the picker finishes.
+const DirectoryPickerRequest = struct {
+    completion: runtime_effects.DesktopCapabilityCompletion,
+    /// The request's correlation prefix, echoed in the reply header.
+    prefix: [36]u8,
+    prefix_len: u8,
+};
+
+comptime {
+    std.debug.assert(@sizeOf(DirectoryPickerRequest) <= runtime_dialogs.max_dialog_tag_bytes);
+}
+
+/// `native-sdk.dialog.openDirectory` opens a native folder picker without
+/// blocking the event loop; the reply follows when the picker finishes.
+/// Other capabilities, and the picker on a platform without asynchronous
+/// dialogs, keep the synchronous `effectsExecuteCapability` and its
+/// replies.
+fn effectsStartCapability(context: *anyopaque, name: []const u8, payload: []const u8, completion: runtime_effects.DesktopCapabilityCompletion) anyerror!?u64 {
+    if (!std.mem.eql(u8, name, "native-sdk.dialog.openDirectory")) return null;
+    const runtime: *Runtime = @ptrCast(@alignCast(context));
+    if (!runtime.options.platform.services.supportsAsyncDialogs()) return null;
+    const desktop_files = @import("desktop_files.zig");
+    if (!authorization.hasPermission(runtime.authorization_policy, runtime.options.security.permissions, security.permission_dialog)) return error.PermissionDenied;
+    var reader = try desktop_files.request(payload);
+    const prefix_len = reader.at;
+    const title = try reader.field();
+    const path = try reader.field();
+    try reader.finish();
+    if (title.len > 255 or path.len > desktop_files.max_path_bytes or std.mem.indexOfScalar(u8, path, 0) != null) return error.InvalidRequest;
+    var request: DirectoryPickerRequest = .{ .completion = completion, .prefix = undefined, .prefix_len = @intCast(prefix_len) };
+    @memcpy(request.prefix[0..prefix_len], payload[0..prefix_len]);
+    return try runtime.requestOpenDialog(.{ .title = title, .default_path = path, .allow_directories = true, .allow_multiple = false }, null, .{
+        .context = completion.context,
+        .tag = std.mem.asBytes(&request),
+        .on_result = directoryPickerFinished,
+    });
+}
+
+fn effectsCancelCapability(context: *anyopaque, handle: u64) void {
+    const runtime: *Runtime = @ptrCast(@alignCast(context));
+    runtime.cancelDialog(handle);
+}
+
+fn directoryPickerFinished(context: *anyopaque, runtime: *Runtime, tag: []const u8, result: platform.DialogResult) anyerror!void {
+    _ = .{ context, runtime };
+    const desktop_files = @import("desktop_files.zig");
+    var request: DirectoryPickerRequest = undefined;
+    @memcpy(std.mem.asBytes(&request), tag[0..@sizeOf(DirectoryPickerRequest)]);
+    const prefix = request.prefix[0..request.prefix_len];
+    var output: [64 + 2 + platform.max_dialog_path_bytes]u8 = undefined;
+    if (result.outcome == .failed) {
+        request.completion.complete(true, output[0..try desktop_files.replyHeaderFor(&output, prefix, "DialogFailed")]);
+        return;
+    }
+    // A cancelled picker answers an empty selection, as it always has.
+    const selected = if (result.outcome == .selected and result.count > 0) result.paths else "";
+    const header = try desktop_files.replyHeaderFor(&output, prefix, "");
+    if (selected.len > 65535 or output.len - header < 2 or selected.len > output.len - header - 2) return error.OverBound;
+    std.mem.writeInt(u16, output[header..][0..2], @intCast(selected.len), .little);
+    @memcpy(output[header + 2 ..][0..selected.len], selected);
+    request.completion.complete(true, output[0 .. header + 2 + selected.len]);
+}
+
 fn effectsExecuteCapability(context: *anyopaque, name: []const u8, payload: []const u8, output: []u8) anyerror![]const u8 {
     const runtime: *Runtime = @ptrCast(@alignCast(context));
     const desktop_files = @import("desktop_files.zig");

package/tools/native-sdk/main.zig

@@ -6,7 +6,7 @@ const tooling = @import("tooling");
 const automation_protocol = @import("automation_protocol");
 const cli_build_info = @import("cli_build_info");
 
-const version = "0.11.0-fork.4";
+const version = "0.11.0-fork.5";
 
 pub fn main(init: std.process.Init) !void {
     const allocator = init.arena.allocator();