@trillboards/edge-sdk 0.2.135 → 0.2.137

package/deploy/docker/README.md

@@ -84,17 +84,6 @@ docker pull ghcr.io/trillboards/edge-sdk:openvino
 docker pull ghcr.io/trillboards/edge-sdk:auto-sense   # BYO-CCTV connector
 ```
 
-**AWS ECR (private, for production fleet):**
-
-```bash
-aws ecr get-login-password --region us-east-1 | \
-  docker login --username AWS --password-stdin 975050306809.dkr.ecr.us-east-1.amazonaws.com
-
-docker pull 975050306809.dkr.ecr.us-east-1.amazonaws.com/trillboards-edge-sdk:latest
-docker pull 975050306809.dkr.ecr.us-east-1.amazonaws.com/trillboards-edge-sdk:cuda
-docker pull 975050306809.dkr.ecr.us-east-1.amazonaws.com/trillboards-edge-sdk:openvino
-```
-
 ## Quick Start
 
 ```bash

package/deploy/macos/README.md

@@ -46,7 +46,13 @@ delivered **only by pairing** — it is never baked into the `.pkg`.
    CurrentUserHomeDirectory`.)
 3. The installer installs and verifies the connector and included local AI
    model. Only then does **Sense Anything Connector** open automatically. Select
-   **Start setup**. The app opens the signed-in Sense Anything camera wizard,
+   **Start setup**. Follow **Welcome → Account → Account setup → Plan & Payment**.
+   Sign in with Google or email, choose the account if you manage more than one,
+   accept the current agreements, then choose a plan
+   and finish secure Stripe checkout. Cancelling checkout preserves account setup;
+   use **Back to plans** in the Connector to retry. Existing subscribed accounts
+   resume at recorder setup. The Connector checks subscription access automatically
+   before opening the signed-in Sense Anything camera wizard,
    finds recorders on the local network, and validates each channel before any
    camera screens are created. Black, disconnected, and unreadable inputs are
    ignored. After the working cameras are saved, the already-installed local AI

package/deploy/macos/TrillboardsSetupApp.m

@@ -45,11 +45,37 @@ static BOOL acquireSetupInstanceLock(void) {
 @property(nonatomic, strong) NSTextField *metric;
 @property(nonatomic, strong) NSProgressIndicator *progress;
 @property(nonatomic, strong) NSButton *actionButton;
+@property(nonatomic, strong) NSButton *googleReopenButton;
 @property(nonatomic, strong) NSButton *closeButton;
 @property(nonatomic, strong) NSButton *updateButton;
 @property(nonatomic, strong) NSTextField *updateStatus;
+@property(nonatomic, strong) NSTextField *privacyLabel;
 @property(nonatomic, strong) NSArray<NSTextField *> *stepLabels;
+@property(nonatomic, strong) NSArray<NSView *> *onboardingPanels;
+@property(nonatomic, strong) NSView *accountPanel;
+@property(nonatomic, strong) NSView *termsPanel;
+@property(nonatomic, strong) NSView *chooseAccountPanel;
+@property(nonatomic, strong) NSPopUpButton *accountPicker;
+@property(nonatomic, strong) NSButton *chooseAccountSubmit;
+@property(nonatomic, strong) NSView *planPanel;
+@property(nonatomic, strong) NSTextField *nameInput;
+@property(nonatomic, strong) NSTextField *emailInput;
+@property(nonatomic, strong) NSSecureTextField *passwordInput;
+@property(nonatomic, strong) NSTextField *nameLabel;
+@property(nonatomic, strong) NSTextField *passwordLabel;
+@property(nonatomic, strong) NSButton *accountSubmit;
+@property(nonatomic, strong) NSButton *authModeButton;
+@property(nonatomic, strong) NSButton *termsCheck;
+@property(nonatomic, strong) NSTextField *termsVersion;
+@property(nonatomic, strong) NSButton *termsSubmit;
+@property(nonatomic, strong) NSButton *monthlyRadio;
+@property(nonatomic, strong) NSButton *annualRadio;
+@property(nonatomic, strong) NSButton *standardRadio;
+@property(nonatomic, strong) NSButton *multiRadio;
+@property(nonatomic, strong) NSTextField *standardPlan;
+@property(nonatomic, strong) NSTextField *multiPlan;
 @property(nonatomic, strong) NSTimer *timer;
+@property(nonatomic, strong) NSFileHandle *setupInput;
 @property(nonatomic, assign) pid_t pairProcessIdentifier;
 @property(nonatomic, strong) dispatch_source_t pairProcessSource;
 @property(nonatomic, copy) NSString *lastStage;
@@ -57,6 +83,7 @@ static BOOL acquireSetupInstanceLock(void) {
 @property(nonatomic, copy) NSString *requiredUpdateURL;
 @property(nonatomic, assign) BOOL setupStarted;
 @property(nonatomic, assign) BOOL terminating;
+@property(nonatomic, assign) BOOL signingIn;
 @end
 
 @implementation TrillboardsSetupDelegate
@@ -74,6 +101,24 @@ static BOOL acquireSetupInstanceLock(void) {
   return field;
 }
 
+- (NSTextField *)inputWithFrame:(NSRect)frame placeholder:(NSString *)placeholder secure:(BOOL)secure {
+  NSTextField *field = secure
+      ? [[NSSecureTextField alloc] initWithFrame:frame]
+      : [[NSTextField alloc] initWithFrame:frame];
+  field.placeholderString = placeholder;
+  field.font = [NSFont systemFontOfSize:14 weight:NSFontWeightRegular];
+  return field;
+}
+
+- (NSButton *)panelButton:(NSString *)title frame:(NSRect)frame action:(SEL)action {
+  NSButton *button = [[NSButton alloc] initWithFrame:frame];
+  button.title = title;
+  button.bezelStyle = NSBezelStyleRounded;
+  button.target = self;
+  button.action = action;
+  return button;
+}
+
 - (void)applicationDidFinishLaunching:(NSNotification *)notification {
   (void)notification;
   self.lastStage = @"welcome";
@@ -118,6 +163,10 @@ static BOOL acquireSetupInstanceLock(void) {
 - (void)stopPairProcess {
   pid_t pid = self.pairProcessIdentifier;
   self.pairProcessIdentifier = 0;
+  if (self.setupInput) {
+    [self.setupInput closeFile];
+    self.setupInput = nil;
+  }
   if (self.pairProcessSource) {
     dispatch_source_cancel(self.pairProcessSource);
     self.pairProcessSource = nil;
@@ -150,12 +199,22 @@ static BOOL acquireSetupInstanceLock(void) {
     return NO;
   }
 
+  int inputPipe[2];
+  if (pipe(inputPipe) != 0) {
+    close(logFd);
+    if (error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:nil];
+    return NO;
+  }
+
   posix_spawn_file_actions_t fileActions;
   posix_spawnattr_t attributes;
   posix_spawn_file_actions_init(&fileActions);
   posix_spawn_file_actions_adddup2(&fileActions, logFd, STDOUT_FILENO);
   posix_spawn_file_actions_adddup2(&fileActions, logFd, STDERR_FILENO);
+  posix_spawn_file_actions_adddup2(&fileActions, inputPipe[0], STDIN_FILENO);
   posix_spawn_file_actions_addclose(&fileActions, logFd);
+  posix_spawn_file_actions_addclose(&fileActions, inputPipe[0]);
+  posix_spawn_file_actions_addclose(&fileActions, inputPipe[1]);
   posix_spawnattr_init(&attributes);
   posix_spawnattr_setflags(&attributes, POSIX_SPAWN_SETPGROUP);
   posix_spawnattr_setpgroup(&attributes, 0);
@@ -179,11 +238,14 @@ static BOOL acquireSetupInstanceLock(void) {
   posix_spawnattr_destroy(&attributes);
   posix_spawn_file_actions_destroy(&fileActions);
   close(logFd);
+  close(inputPipe[0]);
   if (spawnError != 0) {
+    close(inputPipe[1]);
     if (error) *error = [NSError errorWithDomain:NSPOSIXErrorDomain code:spawnError userInfo:nil];
     return NO;
   }
 
+  self.setupInput = [[NSFileHandle alloc] initWithFileDescriptor:inputPipe[1] closeOnDealloc:YES];
   self.pairProcessIdentifier = pid;
   dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC,
                                                      (uintptr_t)pid,
@@ -203,6 +265,10 @@ static BOOL acquireSetupInstanceLock(void) {
   int status = 0;
   pid_t waited = waitpid(pid, &status, 0);
   self.pairProcessIdentifier = 0;
+  if (self.setupInput) {
+    [self.setupInput closeFile];
+    self.setupInput = nil;
+  }
   if (self.pairProcessSource) {
     dispatch_source_cancel(self.pairProcessSource);
     self.pairProcessSource = nil;
@@ -241,7 +307,7 @@ static BOOL acquireSetupInstanceLock(void) {
   NSTextField *brand = [self label:@"Sense Anything" size:16 weight:NSFontWeightSemibold frame:NSMakeRect(24, 480, 145, 28)];
   [sidebar addSubview:brand];
 
-  NSArray<NSString *> *names = @[@"Welcome", @"Account", @"Recorder", @"Cameras", @"Local AI", @"Ready"];
+  NSArray<NSString *> *names = @[@"Welcome", @"Account", @"Account setup", @"Plan & Payment", @"Recorder", @"Cameras", @"Local AI", @"Ready"];
   NSMutableArray<NSTextField *> *labels = [NSMutableArray array];
   for (NSUInteger index = 0; index < names.count; index++) {
     NSTextField *step = [self label:[NSString stringWithFormat:@"%lu    %@", index + 1, names[index]]
@@ -274,6 +340,14 @@ static BOOL acquireSetupInstanceLock(void) {
   self.statusValue.layer.cornerRadius = 6;
   [root addSubview:self.statusValue];
 
+  self.googleReopenButton = [[NSButton alloc] initWithFrame:NSMakeRect(360, 219, 218, 28)];
+  self.googleReopenButton.title = @"Open sign-in again";
+  self.googleReopenButton.bezelStyle = NSBezelStyleRounded;
+  self.googleReopenButton.target = self;
+  self.googleReopenButton.action = @selector(googleReopenPressed);
+  self.googleReopenButton.hidden = YES;
+  [root addSubview:self.googleReopenButton];
+
   self.metric = [self label:@"" size:13 weight:NSFontWeightRegular frame:NSMakeRect(236, 174, 465, 28)];
   self.metric.textColor = NSColor.secondaryLabelColor;
   [root addSubview:self.metric];
@@ -300,12 +374,12 @@ static BOOL acquireSetupInstanceLock(void) {
   self.updateStatus.textColor = NSColor.secondaryLabelColor;
   [root addSubview:self.updateStatus];
 
-  NSTextField *privacy = [self label:@"Camera credentials stay on this computer. Cloud inference is off by default."
+  self.privacyLabel = [self label:@"Camera credentials stay on this computer. Cloud inference is off by default."
                                       size:12
                                     weight:NSFontWeightRegular
                                      frame:NSMakeRect(236, 34, 300, 42)];
-  privacy.textColor = NSColor.secondaryLabelColor;
-  [root addSubview:privacy];
+  self.privacyLabel.textColor = NSColor.secondaryLabelColor;
+  [root addSubview:self.privacyLabel];
 
   self.actionButton = [[NSButton alloc] initWithFrame:NSMakeRect(562, 36, 139, 40)];
   self.actionButton.title = @"Start setup";
@@ -321,9 +395,234 @@ static BOOL acquireSetupInstanceLock(void) {
   self.closeButton.action = @selector(closePressed);
   self.closeButton.hidden = YES;
   [root addSubview:self.closeButton];
+
+  // Native onboarding panels. Provider-owned Google and Stripe UI opens in
+  // the system browser; every product-owned choice remains in this window.
+  self.accountPanel = [[NSView alloc] initWithFrame:NSMakeRect(236, 78, 465, 220)];
+  NSButton *google = [self panelButton:@"Continue with Google"
+                                frame:NSMakeRect(0, 178, 465, 34)
+                               action:@selector(googlePressed)];
+  [self.accountPanel addSubview:google];
+  NSTextField *orEmail = [self label:@"or use email" size:11 weight:NSFontWeightRegular frame:NSMakeRect(0, 153, 465, 18)];
+  orEmail.alignment = NSTextAlignmentCenter;
+  orEmail.textColor = NSColor.secondaryLabelColor;
+  [self.accountPanel addSubview:orEmail];
+  self.nameLabel = [self label:@"Full name" size:11 weight:NSFontWeightRegular frame:NSMakeRect(0, 132, 220, 17)];
+  [self.accountPanel addSubview:self.nameLabel];
+  self.nameInput = [self inputWithFrame:NSMakeRect(0, 103, 220, 28) placeholder:@"Maya Chen" secure:NO];
+  [self.accountPanel addSubview:self.nameInput];
+  NSTextField *emailLabel = [self label:@"Work email" size:11 weight:NSFontWeightRegular frame:NSMakeRect(235, 132, 230, 17)];
+  [self.accountPanel addSubview:emailLabel];
+  self.emailInput = [self inputWithFrame:NSMakeRect(235, 103, 230, 28) placeholder:@"maya@yourshop.com" secure:NO];
+  [self.accountPanel addSubview:self.emailInput];
+  self.passwordLabel = [self label:@"Create password" size:11 weight:NSFontWeightRegular frame:NSMakeRect(0, 78, 220, 17)];
+  [self.accountPanel addSubview:self.passwordLabel];
+  self.passwordInput = (NSSecureTextField *)[self inputWithFrame:NSMakeRect(0, 49, 220, 28) placeholder:@"At least 8 characters" secure:YES];
+  [self.accountPanel addSubview:self.passwordInput];
+  self.authModeButton = [self panelButton:@"Already have an account? Sign in"
+                                    frame:NSMakeRect(230, 49, 235, 28)
+                                   action:@selector(authModePressed)];
+  [self.accountPanel addSubview:self.authModeButton];
+  self.accountSubmit = [self panelButton:@"Create account"
+                                  frame:NSMakeRect(285, 5, 180, 34)
+                                 action:@selector(accountSubmitPressed)];
+  [self.accountPanel addSubview:self.accountSubmit];
+  [root addSubview:self.accountPanel];
+
+  self.termsPanel = [[NSView alloc] initWithFrame:NSMakeRect(236, 78, 465, 220)];
+  NSTextField *termsSummary = [self label:@"Review and accept the current Sense Anything terms, privacy notice, earner agreement, and data processing addendum for this account."
+                                         size:13 weight:NSFontWeightRegular frame:NSMakeRect(0, 150, 465, 58)];
+  termsSummary.textColor = NSColor.secondaryLabelColor;
+  [self.termsPanel addSubview:termsSummary];
+  self.termsCheck = [NSButton checkboxWithTitle:@"I reviewed and accept the current agreements shown for this account."
+                                         target:self
+                                         action:@selector(termsCheckPressed)];
+  self.termsCheck.frame = NSMakeRect(0, 103, 465, 38);
+  [self.termsPanel addSubview:self.termsCheck];
+  self.termsVersion = [self label:@"" size:11 weight:NSFontWeightRegular frame:NSMakeRect(24, 66, 430, 34)];
+  self.termsVersion.textColor = NSColor.secondaryLabelColor;
+  [self.termsPanel addSubview:self.termsVersion];
+  NSButton *reviewTerms = [self panelButton:@"Review terms"
+                                      frame:NSMakeRect(0, 39, 145, 24)
+                                     action:@selector(reviewTermsPressed)];
+  [self.termsPanel addSubview:reviewTerms];
+  NSButton *reviewPrivacy = [self panelButton:@"Review privacy"
+                                        frame:NSMakeRect(150, 39, 145, 24)
+                                       action:@selector(reviewPrivacyPressed)];
+  [self.termsPanel addSubview:reviewPrivacy];
+  NSButton *reviewDpa = [self panelButton:@"Review DPA"
+                                    frame:NSMakeRect(300, 39, 145, 24)
+                                   action:@selector(reviewDpaPressed)];
+  [self.termsPanel addSubview:reviewDpa];
+  self.termsSubmit = [self panelButton:@"Accept & continue"
+                                frame:NSMakeRect(285, 5, 180, 34)
+                               action:@selector(termsSubmitPressed)];
+  self.termsSubmit.enabled = NO;
+  [self.termsPanel addSubview:self.termsSubmit];
+  [root addSubview:self.termsPanel];
+
+  self.planPanel = [[NSView alloc] initWithFrame:NSMakeRect(236, 78, 465, 220)];
+  self.monthlyRadio = [NSButton radioButtonWithTitle:@"Monthly" target:self action:@selector(intervalPressed:)];
+  self.monthlyRadio.frame = NSMakeRect(0, 181, 100, 24);
+  self.monthlyRadio.state = NSControlStateValueOn;
+  [self.planPanel addSubview:self.monthlyRadio];
+  self.annualRadio = [NSButton radioButtonWithTitle:@"Annual" target:self action:@selector(intervalPressed:)];
+  self.annualRadio.frame = NSMakeRect(105, 181, 100, 24);
+  [self.planPanel addSubview:self.annualRadio];
+  self.standardRadio = [NSButton radioButtonWithTitle:@"" target:self action:@selector(planPressed:)];
+  self.standardRadio.frame = NSMakeRect(0, 120, 22, 24);
+  self.standardRadio.state = NSControlStateValueOn;
+  [self.planPanel addSubview:self.standardRadio];
+  self.standardPlan = [self label:@"Sense Anything" size:14 weight:NSFontWeightSemibold frame:NSMakeRect(28, 105, 195, 58)];
+  [self.planPanel addSubview:self.standardPlan];
+  self.multiRadio = [NSButton radioButtonWithTitle:@"" target:self action:@selector(planPressed:)];
+  self.multiRadio.frame = NSMakeRect(238, 120, 22, 24);
+  [self.planPanel addSubview:self.multiRadio];
+  self.multiPlan = [self label:@"Multi-site" size:14 weight:NSFontWeightSemibold frame:NSMakeRect(266, 105, 199, 58)];
+  [self.planPanel addSubview:self.multiPlan];
+  NSTextField *planNote = [self label:@"Stripe handles checkout securely in your browser. This installer resumes automatically when your plan is active."
+                                     size:11 weight:NSFontWeightRegular frame:NSMakeRect(0, 52, 465, 42)];
+  planNote.textColor = NSColor.secondaryLabelColor;
+  [self.planPanel addSubview:planNote];
+  NSButton *planSubmit = [self panelButton:@"Continue to checkout"
+                                    frame:NSMakeRect(265, 5, 200, 34)
+                                   action:@selector(planSubmitPressed)];
+  [self.planPanel addSubview:planSubmit];
+  [root addSubview:self.planPanel];
+
+  self.chooseAccountPanel = [[NSView alloc] initWithFrame:NSMakeRect(236, 78, 465, 220)];
+  self.accountPicker = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 135, 465, 32) pullsDown:NO];
+  [self.chooseAccountPanel addSubview:self.accountPicker];
+  self.chooseAccountSubmit = [self panelButton:@"Continue with this account" frame:NSMakeRect(215, 0, 250, 34) action:@selector(chooseAccountPressed)];
+  [self.chooseAccountPanel addSubview:self.chooseAccountSubmit];
+  [root addSubview:self.chooseAccountPanel];
+
+  self.onboardingPanels = @[self.accountPanel, self.termsPanel, self.planPanel, self.chooseAccountPanel];
+  [self showOnboardingPanel:nil];
+}
+
+- (void)showOnboardingPanel:(NSView *)panel {
+  for (NSView *candidate in self.onboardingPanels ?: @[]) candidate.hidden = candidate != panel;
+  BOOL showStatus = panel == nil;
+  self.statusValue.hidden = !showStatus;
+  self.metric.hidden = !showStatus;
+  self.progress.hidden = !showStatus;
+  self.updateButton.hidden = !showStatus;
+  self.updateStatus.hidden = !showStatus;
+  self.privacyLabel.hidden = !showStatus;
+  self.actionButton.hidden = !showStatus;
+  self.closeButton.hidden = YES;
+  self.googleReopenButton.hidden = YES;
+}
+
+- (void)chooseAccountPressed {
+  NSString *owner = self.accountPicker.selectedItem.representedObject;
+  if (!owner.length) return;
+  self.chooseAccountSubmit.enabled = NO;
+  [self sendOnboardingCommand:@{ @"action": @"select_account", @"ownerUserId": owner }];
+}
+
+- (void)sendOnboardingCommand:(NSDictionary *)command {
+  if (!self.setupInput || ![NSJSONSerialization isValidJSONObject:command]) return;
+  NSData *json = [NSJSONSerialization dataWithJSONObject:command options:0 error:nil];
+  if (!json) return;
+  NSMutableData *line = [json mutableCopy];
+  [line appendData:[@"\n" dataUsingEncoding:NSUTF8StringEncoding]];
+  @try {
+    [self.setupInput writeData:line];
+  } @catch (__unused NSException *exception) {
+    [self showLocalError:@"Could not continue setup"
+                 message:@"Close and reopen Sense Anything Connector, then try again."];
+  }
+}
+
+- (void)googleReopenPressed {
+  [self sendOnboardingCommand:@{ @"action": @"google_reopen" }];
+}
+
+- (void)googlePressed {
+  [self sendOnboardingCommand:@{ @"action": @"google_start" }];
+}
+
+- (void)authModePressed {
+  self.signingIn = !self.signingIn;
+  self.nameLabel.hidden = self.signingIn;
+  self.nameInput.hidden = self.signingIn;
+  self.passwordLabel.stringValue = self.signingIn ? @"Password" : @"Create password";
+  self.passwordInput.placeholderString = self.signingIn ? @"Your password" : @"At least 8 characters";
+  self.accountSubmit.title = self.signingIn ? @"Sign in & continue" : @"Create account";
+  self.authModeButton.title = self.signingIn ? @"New here? Create account" : @"Already have an account? Sign in";
+}
+
+- (void)showInputMessage:(NSString *)message {
+  NSAlert *alert = [[NSAlert alloc] init];
+  alert.messageText = @"Sense Anything";
+  alert.informativeText = message;
+  [alert addButtonWithTitle:@"OK"];
+  [alert runModal];
+}
+
+- (void)accountSubmitPressed {
+  NSString *email = [self.emailInput.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
+  NSString *password = self.passwordInput.stringValue;
+  NSString *name = [self.nameInput.stringValue stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
+  if (email.length == 0 || password.length == 0) {
+    [self showInputMessage:@"Enter your email and password to continue."];
+    return;
+  }
+  if (!self.signingIn && (name.length == 0 || password.length < 8)) {
+    [self showInputMessage:@"Enter your name and a password with at least 8 characters."];
+    return;
+  }
+  NSDictionary *command = self.signingIn
+      ? @{ @"action": @"email_sign_in", @"email": email, @"password": password }
+      : @{ @"action": @"email_sign_up", @"name": name, @"email": email, @"password": password };
+  [self sendOnboardingCommand:command];
+  self.passwordInput.stringValue = @"";
+}
+
+- (void)termsCheckPressed {
+  self.termsSubmit.enabled = self.termsCheck.state == NSControlStateValueOn;
+}
+
+- (void)reviewTermsPressed {
+  [self openURL:@"https://trillboards.com/legal/terms"];
+}
+
+- (void)reviewPrivacyPressed {
+  [self openURL:@"https://trillboards.com/legal/privacy-policy"];
+}
+
+- (void)reviewDpaPressed {
+  [self openURL:@"https://trillboards.com/legal/data-processing"];
+}
+
+- (void)termsSubmitPressed {
+  if (self.termsCheck.state != NSControlStateValueOn) return;
+  self.termsSubmit.enabled = NO;
+  [self sendOnboardingCommand:@{ @"action": @"accept_terms" }];
+}
+
+- (void)planSubmitPressed {
+  NSButton *selected = self.multiRadio.state == NSControlStateValueOn ? self.multiRadio : self.standardRadio;
+  NSString *tier = selected.identifier;
+  if (tier.length == 0) return;
+  NSString *interval = self.annualRadio.state == NSControlStateValueOn ? @"annual" : @"monthly";
+  [self sendOnboardingCommand:@{ @"action": @"select_plan", @"tier": tier, @"interval": interval }];
+}
+
+- (void)intervalPressed:(NSButton *)sender {
+  self.monthlyRadio.state = sender == self.monthlyRadio ? NSControlStateValueOn : NSControlStateValueOff;
+  self.annualRadio.state = sender == self.annualRadio ? NSControlStateValueOn : NSControlStateValueOff;
+}
+
+- (void)planPressed:(NSButton *)sender {
+  self.standardRadio.state = sender == self.standardRadio ? NSControlStateValueOn : NSControlStateValueOff;
+  self.multiRadio.state = sender == self.multiRadio ? NSControlStateValueOn : NSControlStateValueOff;
 }
 
 - (void)showWelcome {
+  [self showOnboardingPanel:nil];
   self.lastStage = @"welcome";
   self.headline.stringValue = @"Set up this computer for CCTV";
   self.detail.stringValue = @"Connect your Sense Anything account, find your recorder, and verify every camera before screens are created.";
@@ -338,6 +637,7 @@ static BOOL acquireSetupInstanceLock(void) {
 }
 
 - (void)showLocalError:(NSString *)title message:(NSString *)message {
+  [self showOnboardingPanel:nil];
   self.lastStage = @"error";
   self.headline.stringValue = title;
   self.detail.stringValue = message;
@@ -348,6 +648,7 @@ static BOOL acquireSetupInstanceLock(void) {
   self.actionButton.title = @"Try again";
   self.actionButton.enabled = YES;
   self.closeButton.hidden = YES;
+  self.googleReopenButton.hidden = YES;
 }
 
 - (void)closePressed {
@@ -450,7 +751,10 @@ static BOOL acquireSetupInstanceLock(void) {
     [self openURL:self.requiredUpdateURL];
     return;
   }
-  if ([self.lastStage isEqualToString:@"waiting_for_account"] ||
+  if ([self.lastStage isEqualToString:@"onboarding_google"] ||
+      [self.lastStage isEqualToString:@"onboarding_checkout"]) {
+    [self sendOnboardingCommand:@{ @"action": @"refresh" }];
+  } else if ([self.lastStage isEqualToString:@"waiting_for_account"] ||
       [self.lastStage isEqualToString:@"account_attention"]) {
     [self openURL:self.portalURL];
   } else if ([self.lastStage isEqualToString:@"ready"]) {
@@ -510,6 +814,7 @@ static BOOL acquireSetupInstanceLock(void) {
 - (void)renderState:(NSDictionary *)state {
   NSString *stage = [state[@"stage"] isKindOfClass:NSString.class] ? state[@"stage"] : nil;
   if (!stage) return;
+  NSString *previousStage = self.lastStage;
   self.lastStage = stage;
   if ([state[@"portalUrl"] isKindOfClass:NSString.class]) self.portalURL = state[@"portalUrl"];
   if ([state[@"title"] isKindOfClass:NSString.class]) self.headline.stringValue = state[@"title"];
@@ -519,11 +824,86 @@ static BOOL acquireSetupInstanceLock(void) {
   NSNumber *validated = state[@"validatedFeeds"];
   NSNumber *devices = state[@"devicesFound"];
   NSNumber *rejected = state[@"rejectedFeeds"];
+  if ([stage isEqualToString:@"onboarding_account"]) {
+    [self showOnboardingPanel:self.accountPanel];
+    [self updateSteps:1];
+    self.accountSubmit.enabled = YES;
+    return;
+  }
+  if ([stage isEqualToString:@"onboarding_choose_account"]) {
+    [self showOnboardingPanel:self.chooseAccountPanel];
+    [self updateSteps:2];
+    [self.accountPicker removeAllItems];
+    NSArray *accounts = [state[@"accounts"] isKindOfClass:NSArray.class] ? state[@"accounts"] : @[];
+    for (NSDictionary *account in accounts) {
+      NSString *label = [NSString stringWithFormat:@"%@ (%@)", account[@"label"] ?: @"Account", account[@"role"] ?: @""];
+      NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:label action:nil keyEquivalent:@""];
+      item.representedObject = account[@"ownerUserId"];
+      [self.accountPicker.menu addItem:item];
+    }
+    if (accounts.count) [self.accountPicker selectItemAtIndex:0];
+    self.chooseAccountSubmit.enabled = accounts.count > 0;
+    return;
+  }
+  if ([stage isEqualToString:@"onboarding_terms"]) {
+    [self showOnboardingPanel:self.termsPanel];
+    [self updateSteps:2];
+    if (![previousStage isEqualToString:@"onboarding_terms"]) {
+      self.termsCheck.state = NSControlStateValueOff;
+      self.termsSubmit.enabled = NO;
+    }
+    self.termsSubmit.enabled = self.termsCheck.state == NSControlStateValueOn;
+    NSArray *agreements = [state[@"requiredAgreements"] isKindOfClass:NSArray.class] ? state[@"requiredAgreements"] : @[];
+    NSMutableArray<NSString *> *versions = [NSMutableArray array];
+    for (NSDictionary *agreement in agreements) {
+      if (![agreement isKindOfClass:NSDictionary.class]) continue;
+      NSString *type = [agreement[@"type"] isKindOfClass:NSString.class] ? agreement[@"type"] : @"";
+      NSString *label = [agreement[@"label"] isKindOfClass:NSString.class] ? agreement[@"label"] : [type stringByReplacingOccurrencesOfString:@"_" withString:@" "];
+      NSString *version = [agreement[@"version"] isKindOfClass:NSString.class] ? agreement[@"version"] : @"";
+      if (type.length && version.length) [versions addObject:[NSString stringWithFormat:@"%@ v%@", label, version]];
+    }
+    self.termsVersion.stringValue = [versions componentsJoinedByString:@"  •  "];
+    return;
+  }
+  if ([stage isEqualToString:@"onboarding_plan"]) {
+    [self showOnboardingPanel:self.planPanel];
+    [self updateSteps:3];
+    NSArray *plans = [state[@"plans"] isKindOfClass:NSArray.class] ? state[@"plans"] : @[];
+    if (plans.count > 0) {
+      NSDictionary *first = plans[0];
+      self.standardRadio.identifier = [first[@"tier"] isKindOfClass:NSString.class] ? first[@"tier"] : @"";
+      self.standardPlan.stringValue = [NSString stringWithFormat:@"%@\n%@/month  •  %@/year",
+          first[@"label"] ?: @"Sense Anything", first[@"monthly"] ?: @"—", first[@"annual"] ?: @"—"];
+      self.standardRadio.hidden = NO;
+      self.standardPlan.hidden = NO;
+    }
+    if (plans.count > 1) {
+      NSDictionary *second = plans[1];
+      self.multiRadio.identifier = [second[@"tier"] isKindOfClass:NSString.class] ? second[@"tier"] : @"";
+      self.multiPlan.stringValue = [NSString stringWithFormat:@"%@\n%@/month  •  %@/year",
+          second[@"label"] ?: @"Multi-site", second[@"monthly"] ?: @"—", second[@"annual"] ?: @"—"];
+      self.multiRadio.hidden = NO;
+      self.multiPlan.hidden = NO;
+    } else {
+      self.multiRadio.hidden = YES;
+      self.multiPlan.hidden = YES;
+    }
+    return;
+  }
+
+  [self showOnboardingPanel:nil];
   if (([stage isEqualToString:@"waiting_for_account"] ||
        [stage isEqualToString:@"account_attention"]) &&
       [state[@"displayCode"] isKindOfClass:NSString.class]) {
     self.statusValue.font = [NSFont monospacedSystemFontOfSize:25 weight:NSFontWeightSemibold];
     self.statusValue.stringValue = state[@"displayCode"];
+  } else if ([stage isEqualToString:@"onboarding_google"]) {
+    self.statusValue.stringValue = @"Waiting for Google";
+    self.googleReopenButton.hidden = NO;
+  } else if ([stage isEqualToString:@"onboarding_checkout"]) {
+    self.statusValue.stringValue = @"Waiting for Stripe";
+  } else if ([stage isEqualToString:@"onboarding_install"]) {
+    self.statusValue.stringValue = @"Onboarding complete";
   } else if (cameraCount.integerValue > 0) {
     self.statusValue.font = [NSFont systemFontOfSize:25 weight:NSFontWeightSemibold];
     self.statusValue.stringValue = [NSString stringWithFormat:@"%ld camera%@", cameraCount.integerValue, cameraCount.integerValue == 1 ? @"" : @"s"];
@@ -566,7 +946,16 @@ static BOOL acquireSetupInstanceLock(void) {
   self.progress.doubleValue = [self progressForStage:stage];
   [self updateSteps:[self stepForStage:stage]];
   self.closeButton.hidden = ![stage isEqualToString:@"ready"];
-  if ([stage isEqualToString:@"waiting_for_account"]) {
+  if ([stage isEqualToString:@"onboarding_google"]) {
+    self.actionButton.title = @"Use another sign-in";
+    self.actionButton.enabled = YES;
+  } else if ([stage isEqualToString:@"onboarding_checkout"]) {
+    self.actionButton.title = @"Back to plans";
+    self.actionButton.enabled = YES;
+  } else if ([stage isEqualToString:@"onboarding_install"]) {
+    self.actionButton.title = @"Preparing cameras…";
+    self.actionButton.enabled = NO;
+  } else if ([stage isEqualToString:@"waiting_for_account"]) {
     self.actionButton.title = @"Open Sense Anything";
     self.actionButton.enabled = YES;
   } else if ([stage isEqualToString:@"account_attention"]) {
@@ -592,25 +981,29 @@ static BOOL acquireSetupInstanceLock(void) {
 }
 
 - (NSInteger)stepForStage:(NSString *)stage {
-  if ([@[@"waiting_for_account", @"account_attention", @"account_connected"] containsObject:stage]) return 1;
-  if ([@[@"discovering", @"devices_found"] containsObject:stage]) return 2;
-  if ([@[@"validating", @"cameras_created"] containsObject:stage]) return 3;
-  if ([@[@"local_ai", @"starting_service"] containsObject:stage]) return 4;
-  if ([stage isEqualToString:@"ready"]) return 5;
+  if ([@[@"onboarding_account", @"onboarding_google"] containsObject:stage]) return 1;
+  if ([@[@"onboarding_terms", @"onboarding_choose_account"] containsObject:stage]) return 2;
+  if ([@[@"onboarding_plan", @"onboarding_checkout"] containsObject:stage]) return 3;
+  if ([@[@"onboarding_install", @"starting", @"waiting_for_account", @"account_attention", @"account_connected", @"discovering", @"devices_found"] containsObject:stage]) return 4;
+  if ([@[@"validating", @"cameras_created"] containsObject:stage]) return 5;
+  if ([@[@"local_ai", @"local_ai_error", @"starting_service"] containsObject:stage]) return 6;
+  if ([stage isEqualToString:@"ready"]) return 7;
   return 0;
 }
 
 - (double)progressForStage:(NSString *)stage {
   NSDictionary<NSString *, NSNumber *> *values = @{
-    @"waiting_for_account": @18, @"account_attention": @18, @"account_connected": @30, @"discovering": @42,
-    @"devices_found": @50, @"validating": @68, @"cameras_created": @80,
+    @"onboarding_account": @10, @"onboarding_google": @12, @"onboarding_terms": @25,
+    @"onboarding_plan": @42, @"onboarding_checkout": @50, @"onboarding_install": @65,
+    @"waiting_for_account": @65, @"account_attention": @65, @"account_connected": @65, @"discovering": @68,
+    @"devices_found": @70, @"validating": @75, @"cameras_created": @80,
     @"local_ai": @88, @"starting_service": @94, @"ready": @100
   };
   return values[stage] ? values[stage].doubleValue : 8;
 }
 
 - (void)updateSteps:(NSInteger)active {
-  NSArray<NSString *> *names = @[@"Welcome", @"Account", @"Recorder", @"Cameras", @"Local AI", @"Ready"];
+  NSArray<NSString *> *names = @[@"Welcome", @"Account", @"Account setup", @"Plan & Payment", @"Recorder", @"Cameras", @"Local AI", @"Ready"];
   for (NSInteger index = 0; index < (NSInteger)self.stepLabels.count; index++) {
     NSTextField *field = self.stepLabels[(NSUInteger)index];
     NSString *prefix = index < active ? @"OK" : [NSString stringWithFormat:@"%ld", index + 1];

package/deploy/macos/pair.command

@@ -363,7 +363,12 @@ if [ "${SETUP_MODE:-0}" = "1" ]; then
   plog "setup: starting validate-first setup mode"
   set +e
   if is_ui; then
-    "$LAUNCHER" setup --config "$CONFIG" --status-file "$UI_STATUS_FILE"
+    # The native app owns account, legal and plan selection. This long-lived
+    # process receives commands on inherited stdin and exits only after the API
+    # says legal + entitlement are current, so cameras cannot open early.
+    # The same process keeps the authenticated session in memory through camera
+    # setup and mints a one-use signed-in browser handoff at first launch.
+    "$LAUNCHER" installer-onboarding --config "$CONFIG" --status-file "$UI_STATUS_FILE"
   else
     "$LAUNCHER" setup --config "$CONFIG"
   fi

package/deploy/windows/trillboards-pair.cmd

@@ -148,7 +148,13 @@ REM ── Validate-first setup: the CLI displays the code, keeps this window's
 REM staged progress, and exits 0 once the portal finalizes cameras and the
 REM config is written — then the SAME honest service stages below run.
 if defined UI_STATUS_FILE (
-  call "%~dp0trillboards-edge.cmd" setup --config "%CFG%" --status-file "%UI_STATUS_FILE%"
+  REM Account, current legal versions and paid entitlement are completed in
+  REM the native installer BEFORE camera setup is allowed to open the portal.
+  REM Commands arrive on inherited stdin; passwords never touch argv or disk.
+  REM The onboarding process keeps its authenticated session in memory, starts
+  REM camera setup itself, and wraps the first portal launch in a one-use login
+  REM handoff. Email users therefore do not sign in a second time in the browser.
+  call "%~dp0trillboards-edge.cmd" installer-onboarding --config "%CFG%" --status-file "%UI_STATUS_FILE%"
 ) else (
   call "%~dp0trillboards-edge.cmd" setup --config "%CFG%"
 )