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

package/src/runtime/flow.zig

@@ -30,6 +30,7 @@ const app_manifest = @import("app_manifest");
 const platform = @import("../platform/root.zig");
 const host_flow = @import("host_flow_policy.zig");
 const native_reference = @import("flow_reference.zig");
+const update_engine = @import("../updater/engine.zig");
 const HostEventPump = @import("host_event_pump.zig").HostEventPump;
 const security = @import("../security/root.zig");
 
@@ -381,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 } });
                     }
                 },
@@ -448,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 => {
@@ -455,6 +458,11 @@ pub fn RuntimeFlow(comptime Runtime: type) type {
                 },
                 .mark_stop => {
                     self.app_stop_delivered = true;
+                    // A release the app staged but did not restart into
+                    // installs as the app quits, where the platform
+                    // installs on exit (macOS); hosts may exit the process
+                    // right after this event, so it cannot wait for run().
+                    update_engine.finish();
                 },
                 .stop => {
                     try app.stop(self);
@@ -523,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 => {
@@ -1200,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;
         }
@@ -1265,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)
@@ -1276,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)
@@ -1284,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

@@ -12,6 +12,7 @@ const runtime_automation_snapshot = @import("automation_snapshot.zig");
 const runtime_automation_widget_dispatch = @import("automation_widget_dispatch.zig");
 const automation_commands = @import("automation_command_policy.zig");
 const launch_timing = @import("launch_timing.zig");
+const update_engine = @import("../updater/engine.zig");
 const runtime_clock = @import("clock.zig");
 const runtime_state = @import("state.zig");
 const shell_layout = @import("shell_layout.zig");
@@ -368,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 } });
                     }
                 },
@@ -504,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| {
@@ -522,8 +528,14 @@ 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
+                    // installs as the app quits, where the platform
+                    // installs on exit (macOS); hosts may exit the process
+                    // right after this event, so it cannot wait for run().
+                    update_engine.finish();
                     // Marked delivered BEFORE the call: if the hook itself
                     // errors, the run loop's exit path must not invoke it a
                     // second time (the hook contract is exactly-once).
@@ -1208,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;
         }
@@ -1273,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)
@@ -1284,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)
@@ -1292,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;
@@ -241,6 +246,10 @@ pub const max_session_journal_bytes = runtime_session_journal.max_session_journa
 pub const max_session_record_bytes = runtime_session_journal.max_session_record_bytes;
 pub const max_session_event_bytes = runtime_session_journal.max_session_event_bytes;
 
+/// Manifest `single_instance` ownership; the launcher claims it before
+/// startup and the `native-sdk.app.launches` source delivers launches.
+pub const single_instance = @import("single_instance.zig");
+
 const runtime_clock = @import("clock.zig");
 pub const Clock = runtime_clock.Clock;
 pub const TestClock = runtime_clock.TestClock;