forkit-connect 0.1.10 → 0.1.12

package/dist/cli.js

@@ -942,7 +942,7 @@ function buildInteractiveOverviewSections(service, sessionState, accountLimits)
         sections.push({
             title: 'Inbox',
             lines: [
-                shellLine('Draft-first review', overview.draft_first_count),
+                shellLine('Private review', overview.draft_first_count),
                 shellLine('Ready to connect', otherReadyCount),
                 shellLine('Needs confirmation', overview.needs_confirmation_count),
                 shellLine('Connected', overview.connected_count),
@@ -972,7 +972,7 @@ function buildInteractiveOverviewSections(service, sessionState, accountLimits)
             lines: [
                 shellLine('Workspace', formatScopeReferenceLabel(preparedWorkspace || null, 'workspace')),
                 shellLine('Project', formatScopeReferenceLabel(preparedProject || null, 'project')),
-                shellLine('Draft-first review', overview.draft_first_count),
+                shellLine('Private review', overview.draft_first_count),
                 shellLine('Ready to connect', otherReadyCount),
                 shellLine('Needs confirmation', overview.needs_confirmation_count),
             ],
@@ -1433,7 +1433,7 @@ function formatSmartInboxActionLabel(item) {
     if (item.item_type === 'model'
         && item.recommended_action === 'create_passport_draft'
         && String(item.details_received_automatically.registration_flow_state || '').trim() === 'private_draft_required') {
-        return 'Open Draft Path';
+        return 'Continue Registration';
     }
     return formatSmartInboxActionValue(item.recommended_action, item.item_type, String(item.details_received_automatically.connectable_model_name || '').trim());
 }
@@ -1488,7 +1488,7 @@ function printPublicStatusOverview(status) {
     console.log(`- scope=${status.workspace_id && status.project_id ? `${status.workspace_id} / ${status.project_id}` : 'not selected'}`);
     console.log(`- daemon=${status.daemon_status}`);
     console.log(`- local inventory=models ${status.models_discovered} · agents ${status.agents_discovered} · runtimes ${status.runtimes_discovered}`);
-    console.log(`- review queue=draft first ${status.draft_first_count} · ready ${otherReadyCount} · needs review ${status.needs_confirmation_count}`);
+    console.log(`- review queue=private review ${status.draft_first_count} · ready ${otherReadyCount} · needs review ${status.needs_confirmation_count}`);
     console.log(`- connected records=${status.connected_count}`);
     console.log(`- pending runtime sync=${status.c2_sync_pending}`);
     console.log(`- privacy=${status.privacy_mode}`);
@@ -2131,7 +2131,7 @@ async function run() {
                 {
                     title: 'Queue',
                     lines: [
-                        shellLine('Draft-first review', payload.draft_first_count),
+                        shellLine('Private review', payload.draft_first_count),
                         shellLine('Ready to connect', otherReadyCount),
                         shellLine('Needs confirmation', payload.needs_confirmation_count),
                         shellLine('Connected', payload.connected_count),
@@ -3892,11 +3892,11 @@ async function run() {
             if (raw === 'MODEL_SELECTION_AMBIGUOUS')
                 return 'Model selection is ambiguous. Use a full discoveryHash.';
             if (raw === 'DRAFT_ALREADY_EXISTS')
-                return 'A backend draft already exists for this model. No duplicate draft created.';
+                return 'Registration is already started privately for this model. No duplicate registration was created.';
             if (raw === 'SIMILAR_PASSPORT_EXISTS')
-                return 'A similar or existing passport already exists in your Forkit.dev account. Review existing records before creating a new draft.';
+                return 'A similar or existing passport already exists in your Forkit.dev account. Review existing records before creating another registration.';
             if (raw === 'INVALID_DRAFT_VISIBILITY')
-                return 'This registration must start as a private draft. Review it in inbox/start first, or choose publish only when Forkit is ready to finish the passport.';
+                return 'Forkit needs one private review step before this passport can finish publishing. Continue the registration from inbox/start first.';
             if (raw === 'WORKSPACE_PROJECT_BINDING_REQUIRED')
                 return 'No governed workspace/project scope is linked yet. Select or create scope first.';
             if (raw === 'DRAFT_CREATION_NOT_ALLOWED_BY_BINDING')
@@ -3907,13 +3907,13 @@ async function run() {
             if (action === 'already_bound')
                 return 'Model is already connected to an existing passport.';
             if (action === 'already_pending')
-                return 'Model already has a pending draft. No duplicate draft created.';
+                return 'Registration already started privately. No duplicate registration was created.';
             if (action === 'passport_registered')
-                return 'Passport published successfully.';
+                return 'Passport registered successfully.';
             if (action === 'draft_created')
-                return 'Draft created successfully.';
+                return 'Private review started. Continue registration from inbox/start.';
             if (action === 'draft_queued')
-                return 'Draft queued locally and will sync when backend access is available.';
+                return 'Registration saved locally and will sync when backend access is available.';
             return action;
         };
         const accountLimits = await loadCliAccountLimits().catch(() => null);
@@ -3937,7 +3937,9 @@ async function run() {
         });
         const runRegisterOne = async (targetModelSelector, displayNameHint) => {
             try {
-                const result = await service.connectDetectedModel(targetModelSelector);
+                const result = await service.connectDetectedModel(targetModelSelector, hasFlag('--draft-only')
+                    ? { destination: 'draft', visibility: 'private' }
+                    : { destination: 'passport', visibility: 'public' });
                 return {
                     ok: true,
                     model: result.model.model,
@@ -4501,7 +4503,10 @@ async function run() {
             return;
         }
         try {
-            const result = await service.connectDetectedModel(selector);
+            const result = await service.connectDetectedModel(selector, {
+                destination: 'passport',
+                visibility: 'public',
+            });
             if (result.action === 'already_bound') {
                 console.log('Model is already bound to a Passport.');
                 if (result.gaid) {
@@ -4510,14 +4515,22 @@ async function run() {
                 return;
             }
             if (result.action === 'already_pending') {
-                console.log('Model already has a pending Passport draft.');
+                console.log('Registration already started privately for this model.');
                 if (result.draftId) {
                     console.log(`Draft ID: ${result.draftId}`);
                 }
                 return;
             }
+            if (result.action === 'passport_registered') {
+                console.log('Passport registered successfully.');
+                console.log(`Model: ${result.model.model}`);
+                if (result.gaid) {
+                    console.log(`Passport GAID: ${result.gaid}`);
+                }
+                return;
+            }
             if (result.action === 'draft_created') {
-                console.log('Passport draft created from detected model.');
+                console.log('Registration started privately for review.');
                 console.log(`Model: ${result.model.model}`);
                 if (result.draftId) {
                     console.log(`Draft ID: ${result.draftId}`);
@@ -4527,9 +4540,9 @@ async function run() {
                 }
                 return;
             }
-            console.log('Passport draft queued locally from detected model.');
+            console.log('Registration saved locally and will sync when Forkit Connect can reach Forkit.dev.');
             console.log(`Model: ${result.model.model}`);
-            console.log('Complete login later and run scan or queue processing to sync it.');
+            console.log('Complete login later and run scan or queue processing to continue it.');
             return;
         }
         catch (error) {

package/dist/launcher.js

@@ -434,7 +434,7 @@ function formatBindingStatusLabel(status) {
         return { label: 'Published', meta: 'Live on Forkit.dev', tone: 'ok' };
     }
     if (normalized === 'pending') {
-        return { label: 'Draft', meta: 'In progress', tone: 'warn' };
+        return { label: 'Private review', meta: 'In progress', tone: 'warn' };
     }
     if (normalized === 'ignored') {
         return { label: 'Archived', meta: 'Not active locally', tone: 'muted' };
@@ -449,7 +449,7 @@ function formatPassportHistoryLabel(type) {
             return { label: 'Passport linked', tone: 'ok' };
         case 'model_draft_created':
         case 'model_draft_synced':
-            return { label: 'Draft created', tone: 'warn' };
+            return { label: 'Private review started', tone: 'warn' };
         case 'passport_draft_requested':
         case 'model_draft_queued':
             return { label: 'Registration queued', tone: 'warn' };
@@ -538,10 +538,10 @@ function normalizeDiscoveryRegistrationFailure(message) {
     if (normalized === 'INVALID_DRAFT_VISIBILITY') {
         return {
             code: normalized,
-            message: 'This registration needs to start as a private draft before it can be published.',
+            message: 'Forkit needs one private review step before this passport can finish publishing.',
             nextActions: [
-                'Keep the item in review or open the draft path first.',
-                'Choose publish only when Forkit is ready to finish the passport.',
+                'Continue registration privately first.',
+                'Publish only after Forkit has finished the private review step.',
             ],
         };
     }
@@ -694,17 +694,17 @@ function buildDiscovery(service) {
             actionTone = 'muted';
         }
         else if (draftPending) {
-            statusLabel = 'Draft created';
-            statusMeta = 'Registration draft is already waiting in Passports.';
+            statusLabel = 'Registration in progress';
+            statusMeta = 'Forkit already started this privately. Continue it in Passports instead of starting over.';
             statusTone = 'warn';
-            actionLabel = 'Review';
+            actionLabel = 'Continue';
             actionTone = 'accent';
         }
         else if (registrationState === 'private_draft_required') {
-            statusLabel = 'Draft first';
-            statusMeta = registrationGuidance ?? 'This model needs to go through the private draft path before publishing.';
+            statusLabel = 'Finish privately first';
+            statusMeta = registrationGuidance ?? 'Forkit needs one private review step before this passport can finish publishing.';
             statusTone = 'warn';
-            actionLabel = 'Review';
+            actionLabel = 'Continue';
             actionTone = 'accent';
         }
         else if (group === 'connected') {
@@ -741,6 +741,7 @@ function buildDiscovery(service) {
             recommendedAction: entry.recommended_action,
             workspaceId: entry.workspaceId,
             projectId: entry.projectId,
+            draftId: binding?.draftId ?? null,
             passportGaid: entry.passport_gaid,
             matchedPassportGaid: entry.matched_passport_gaid,
             detailSummary: verificationSummary ?? scopeSuggestion ?? matchReason,
@@ -791,10 +792,10 @@ function buildDiscovery(service) {
             actionTone = 'accent';
         }
         else if (draftId || trackingStatus === 'draft_created') {
-            statusLabel = 'Draft created';
-            statusMeta = 'Pending review in Passports.';
+            statusLabel = 'Registration in progress';
+            statusMeta = 'Forkit already started this privately. Continue it in Passports.';
             statusTone = 'warn';
-            actionLabel = 'Review';
+            actionLabel = 'Continue';
             actionTone = 'accent';
         }
         else if (group === 'connected' || linkedPassportGaid) {
@@ -835,6 +836,7 @@ function buildDiscovery(service) {
             recommendedAction: entry.recommended_action,
             workspaceId: entry.workspaceId,
             projectId: entry.projectId,
+            draftId,
             passportGaid: linkedPassportGaid,
             matchedPassportGaid: entry.matched_passport_gaid,
             detailSummary: statusMeta,
@@ -929,7 +931,7 @@ function buildDiscovery(service) {
             localDetection: state.detected_runtimes.length > 0 || state.detected_models.length > 0 ? 'active' : 'attention',
             metadataExtraction: state.detected_models.length > 0 ? 'active' : 'attention',
             duplicateMatching: inbox.existing_passport_match_candidates.length > 0 || state.model_bindings.length > 0 ? 'active' : 'attention',
-            passportReadiness: `${draftFirstCount} draft-first · ${otherReadyCount} ready · ${inbox.summary.needs_confirmation_count} review · ${inbox.summary.connected_count} linked`,
+            passportReadiness: `${draftFirstCount} private review · ${otherReadyCount} ready · ${inbox.summary.needs_confirmation_count} review · ${inbox.summary.connected_count} linked`,
         },
         groups: {
             ready_to_connect: inbox.groups.ready_to_connect.length,
@@ -1799,7 +1801,9 @@ function renderLauncherHtml(launcherToken) {
     .quick-review-chip:focus-visible,
     .quick-review-primary:focus-visible,
     .quick-review-options-button:focus-visible,
+    .review-mode-button:focus-visible,
     .quick-review-field select:focus-visible,
+    .discovery-review-field select:focus-visible,
     .quick-review-options-menu button:focus-visible {
       outline: 2px solid rgba(157, 238, 245, 0.72);
       outline-offset: 2px;
@@ -1991,12 +1995,66 @@ function renderLauncherHtml(launcherToken) {
       gap: 10px;
     }
 
+    .review-mode-group {
+      display: grid;
+      gap: 8px;
+    }
+
+    .review-mode-label {
+      font-size: 0.74rem;
+      text-transform: uppercase;
+      letter-spacing: 0.12em;
+      font-weight: 700;
+      color: rgba(241, 235, 223, 0.62);
+    }
+
+    .review-mode-toggle {
+      display: inline-grid;
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+      gap: 8px;
+      padding: 6px;
+      border-radius: 18px;
+      border: 1px solid rgba(241, 235, 223, 0.08);
+      background: rgba(255,255,255,0.04);
+    }
+
+    .review-mode-button {
+      min-height: 42px;
+      border: 1px solid rgba(241, 235, 223, 0.08);
+      border-radius: 14px;
+      background: transparent;
+      color: rgba(241, 235, 223, 0.72);
+      font: inherit;
+      font-size: 0.88rem;
+      font-weight: 600;
+      cursor: pointer;
+      transition: border-color 160ms ease, background 160ms ease, color 160ms ease, transform 160ms ease;
+    }
+
+    .review-mode-button:hover {
+      border-color: rgba(157, 238, 245, 0.26);
+      color: #fff8ef;
+      transform: translateY(-1px);
+    }
+
+    .review-mode-button.active {
+      border-color: rgba(157, 238, 245, 0.34);
+      background: linear-gradient(135deg, rgba(55, 68, 86, 0.62), rgba(31, 36, 56, 0.92));
+      color: #fff8ef;
+      box-shadow: inset 0 1px 0 rgba(255,255,255,0.06);
+    }
+
     .quick-review-scope-grid {
       display: grid;
       grid-template-columns: 1fr 1fr;
       gap: 10px;
     }
 
+    .quick-review-scope-grid[hidden],
+    .discovery-review-scope-grid[hidden] {
+      display: none;
+    }
+
     .quick-review-field {
       display: grid;
       gap: 6px;
@@ -6454,7 +6512,7 @@ function renderLauncherHtml(launcherToken) {
                 <div class="quick-review-summary-grid">
                   <div class="quick-review-summary-pill">
                     <span class="quick-review-summary-label">Action</span>
-                    <span class="quick-review-summary-value" id="quick-review-action-summary">Approve and register</span>
+                    <span class="quick-review-summary-value" id="quick-review-action-summary">Register on this account now</span>
                   </div>
                   <div class="quick-review-summary-pill">
                     <span class="quick-review-summary-label">Scope</span>
@@ -6463,7 +6521,14 @@ function renderLauncherHtml(launcherToken) {
                 </div>
                 <div class="quick-review-status" id="quick-review-status">Waiting for review.</div>
                 <div class="quick-review-scope" id="quick-review-scope" hidden>
-                  <div class="quick-review-scope-grid">
+                  <div class="review-mode-group" id="quick-review-mode">
+                    <span class="review-mode-label">Register as</span>
+                    <div class="review-mode-toggle" role="group" aria-label="Quick review registration path">
+                      <button class="review-mode-button active" id="quick-review-mode-solo" type="button" aria-pressed="true">Solo</button>
+                      <button class="review-mode-button" id="quick-review-mode-workspace" type="button" aria-pressed="false">Governed workspace</button>
+                    </div>
+                  </div>
+                  <div class="quick-review-scope-grid" id="quick-review-scope-grid" hidden>
                     <div class="quick-review-field">
                       <label for="quick-review-workspace">Workspace</label>
                       <select id="quick-review-workspace"></select>
@@ -6867,7 +6932,14 @@ function renderLauncherHtml(launcherToken) {
               <p class="discovery-review-detail" id="discovery-review-detail">Registering creates or updates a Forkit Passport. Nothing is published automatically.</p>
               <div class="discovery-review-status" id="discovery-review-status">Select an item to continue.</div>
               <div class="discovery-review-scope" id="discovery-review-scope" hidden>
-                <div class="discovery-review-scope-grid">
+                <div class="review-mode-group" id="discovery-review-mode">
+                  <span class="review-mode-label">Register as</span>
+                  <div class="review-mode-toggle" role="group" aria-label="Discovery review registration path">
+                    <button class="review-mode-button active" id="discovery-review-mode-solo" type="button" aria-pressed="true">Solo</button>
+                    <button class="review-mode-button" id="discovery-review-mode-workspace" type="button" aria-pressed="false">Governed workspace</button>
+                  </div>
+                </div>
+                <div class="discovery-review-scope-grid" id="discovery-review-scope-grid" hidden>
                   <div class="discovery-review-field">
                     <label for="discovery-review-workspace">Workspace</label>
                     <select id="discovery-review-workspace"></select>
@@ -7252,7 +7324,7 @@ function renderLauncherHtml(launcherToken) {
   <div class="scope-modal-backdrop" id="scope-modal" hidden>
     <div class="scope-modal" role="dialog" aria-modal="true" aria-labelledby="scope-modal-title">
       <h3 id="scope-modal-title">Choose registration scope</h3>
-      <p id="scope-modal-copy">Select the workspace and project that should own this Passport registration.</p>
+      <p id="scope-modal-copy">Register on your account now, or choose a governed workspace/project when you need governed ownership.</p>
       <div class="scope-field-grid">
         <div class="scope-field">
           <label for="scope-workspace-select">Workspace</label>
@@ -7400,9 +7472,53 @@ function renderLauncherHtml(launcherToken) {
       return true;
     }
 
+    function focusPassportByDraftId(draftId, options) {
+      const normalizedDraftId = String(draftId || '').trim();
+      if (!normalizedDraftId) return false;
+      const passports = latestPassports && Array.isArray(latestPassports.items) ? latestPassports.items : [];
+      const match = passports.find((entry) => String(entry.draftId || '').trim() === normalizedDraftId);
+      if (!match) return false;
+      selectedPassportId = match.id;
+      passportHistoryVisible = Boolean(options && options.showHistory);
+      selectedWorkspaceScope = ALL_SCOPE_VALUE;
+      selectedProjectScope = ALL_SCOPE_VALUE;
+      renderGlobalLaunchHeaderAndCards();
+      setView('passports', { skipRouteUpdate: true });
+      renderPassportsRows();
+      updateRoute('passports', { passport: match.gaid || match.id, ...(passportHistoryVisible ? { focus: 'history' } : {}) });
+      return true;
+    }
+
+    function getReviewScopeMode(workspaceId, projectId) {
+      return String(workspaceId || '').trim() && String(projectId || '').trim() ? 'workspace' : 'solo';
+    }
+
+    function isContinuationReviewItem(item) {
+      return Boolean(item && (
+        item.actionLabel === 'Continue'
+        || item.statusLabel === 'Registration in progress'
+        || item.statusLabel === 'Finish privately first'
+      ));
+    }
+
+    function shouldOpenReviewContext(item) {
+      return Boolean(
+        item
+        && (
+          item.kind === 'runtime'
+          || item.passportGaid
+          || item.matchedPassportGaid
+          || item.actionLabel === 'Open'
+          || item.actionLabel === 'Review'
+          || isContinuationReviewItem(item)
+        )
+      );
+    }
+
     async function openDiscoveryContext(item) {
       if (!item) return false;
       const preferredPassportGaid = String(item.passportGaid || item.matchedPassportGaid || '').trim();
+      const preferredDraftId = String(item.draftId || '').trim();
       if (preferredPassportGaid) {
         if (!latestPassports) {
           await refreshPassports();
@@ -7411,6 +7527,14 @@ function renderLauncherHtml(launcherToken) {
           return true;
         }
       }
+      if (preferredDraftId) {
+        if (!latestPassports) {
+          await refreshPassports();
+        }
+        if (focusPassportByDraftId(preferredDraftId, { showHistory: true })) {
+          return true;
+        }
+      }
       if (item.kind === 'model' || item.kind === 'agent') {
         await openRegistrationScopeDialog(item);
         return true;
@@ -7500,6 +7624,53 @@ function renderLauncherHtml(launcherToken) {
       status.className = 'quick-review-status' + (tone ? ' ' + tone : '');
     }
 
+    function canChooseReviewScope(item) {
+      return Boolean(canReviewRegister(item) && !shouldOpenReviewContext(item));
+    }
+
+    function getReviewRegistrationMode(prefix) {
+      const scope = document.getElementById(prefix + '-scope');
+      if (!scope) return 'solo';
+      return String(scope.dataset.mode || '').trim() === 'workspace' ? 'workspace' : 'solo';
+    }
+
+    function setReviewRegistrationMode(prefix, mode) {
+      const normalized = mode === 'workspace' ? 'workspace' : 'solo';
+      const scope = document.getElementById(prefix + '-scope');
+      const scopeGrid = document.getElementById(prefix + '-scope-grid');
+      if (scope) {
+        scope.dataset.mode = normalized;
+      }
+      if (scopeGrid) {
+        scopeGrid.hidden = normalized !== 'workspace';
+      }
+      ['solo', 'workspace'].forEach((candidate) => {
+        const button = document.getElementById(prefix + '-mode-' + candidate);
+        if (!button) return;
+        const active = candidate === normalized;
+        button.classList.toggle('active', active);
+        button.setAttribute('aria-pressed', active ? 'true' : 'false');
+      });
+      return normalized;
+    }
+
+    function getPassiveReviewScopeSummary(item) {
+      if (!item) return 'Review';
+      if (item.kind === 'runtime') {
+        return item.statusTone === 'error' ? 'Runtime fix' : 'Runtime review';
+      }
+      if (isContinuationReviewItem(item)) {
+        return 'Private review';
+      }
+      if (item.passportGaid) {
+        return 'Linked passport';
+      }
+      if (item.matchedPassportGaid) {
+        return 'Existing passport';
+      }
+      return 'Full review';
+    }
+
     function resetReviewResolutionActions(prefix) {
       setReviewResolutionActions(prefix, []);
     }
@@ -7514,13 +7685,14 @@ function renderLauncherHtml(launcherToken) {
       ].map((value) => String(value || '').trim()).find(Boolean) || '';
     }
 
-    function getReviewPrimaryLabel(item) {
+    function getReviewPrimaryLabel(item, scopeMode) {
+      const effectiveScopeMode = scopeMode === 'workspace' ? 'workspace' : 'solo';
       if (!item) return 'Review';
       if (item.kind === 'runtime') {
         return item.statusTone === 'error' ? 'Open runtime fix' : 'Open runtime review';
       }
-      if (item.statusLabel === 'Draft created') {
-        return 'Open draft';
+      if (isContinuationReviewItem(item)) {
+        return 'Continue registration';
       }
       if (item.passportGaid) {
         return 'Open passport';
@@ -7534,16 +7706,17 @@ function renderLauncherHtml(launcherToken) {
       if (item.actionLabel === 'Open' || item.actionLabel === 'Review') {
         return 'Review in context';
       }
-      return 'Approve & register';
+      return effectiveScopeMode === 'workspace' ? 'Register in workspace' : 'Register solo';
     }
 
-    function getReviewActionSummary(item) {
+    function getReviewActionSummary(item, scopeMode) {
+      const effectiveScopeMode = scopeMode === 'workspace' ? 'workspace' : 'solo';
       if (!item) return 'Review';
       if (item.kind === 'runtime') {
         return item.statusTone === 'error' ? 'Resolve runtime attention' : 'Open runtime lane';
       }
-      if (item.statusLabel === 'Draft created') {
-        return 'Continue the existing draft';
+      if (isContinuationReviewItem(item)) {
+        return 'Continue the private review step before this passport finishes publishing';
       }
       if (item.passportGaid) {
         return 'Open the linked passport';
@@ -7557,7 +7730,9 @@ function renderLauncherHtml(launcherToken) {
       if (item.actionLabel === 'Open' || item.actionLabel === 'Review') {
         return 'Open full review';
       }
-      return 'Approve and register here';
+      return effectiveScopeMode === 'workspace'
+        ? 'Register this item in the selected workspace'
+        : 'Register this item on your account now';
     }
 
     function getReviewDetailText(item) {
@@ -7567,8 +7742,11 @@ function renderLauncherHtml(launcherToken) {
           ? 'Runtime attention is required before linked models can keep registering cleanly.'
           : 'Open runtime review to confirm health, scope, and connected models.';
       }
-      if (item.statusLabel === 'Draft created') {
-        return 'A draft already exists. Continue it in Passports instead of creating another one.';
+      if (item.statusLabel === 'Registration in progress') {
+        return 'Forkit already started this registration privately. Continue it in Passports instead of creating a second record.';
+      }
+      if (item.statusLabel === 'Finish privately first') {
+        return 'Forkit needs one private review step before it can publish this passport. Continue registration and finish the private step first.';
       }
       if (item.matchedPassportGaid && !item.passportGaid) {
         return 'Forkit Connect found a matching passport. Reuse it before creating anything new.';
@@ -7608,7 +7786,7 @@ function renderLauncherHtml(launcherToken) {
           : result && result.code === 'SIMILAR_PASSPORT_EXISTS'
           ? 'Matching passport exists · reuse it instead of creating another'
           : result && result.code === 'INVALID_DRAFT_VISIBILITY'
-          ? 'Draft first · keep this registration private until it is ready to publish'
+          ? 'Private review first · continue registration privately before publishing'
           : result && (result.code === 'WORKSPACE_PROJECT_BINDING_REQUIRED' || result.code === 'DRAFT_CREATION_NOT_ALLOWED_BY_BINDING')
           ? 'Scope required · choose workspace and project'
           : null,
@@ -7728,15 +7906,19 @@ function renderLauncherHtml(launcherToken) {
       }
     }
 
-    function updateQuickReviewScopeSummary(governedMode) {
+    function updateQuickReviewScopeSummary(scopeMode) {
       const workspaceSelect = document.getElementById('quick-review-workspace');
       const projectSelect = document.getElementById('quick-review-project');
       const workspaceId = workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
       const projectId = projectSelect ? String(projectSelect.value || '').trim() : '';
       const workspaceLabel = readSelectedOptionLabel(workspaceSelect);
       const projectLabel = readSelectedOptionLabel(projectSelect);
+      if (scopeMode !== 'workspace') {
+        setText('quick-review-scope-summary', 'Account scope');
+        return;
+      }
       if (!workspaceId) {
-        setText('quick-review-scope-summary', governedMode ? 'Choose governed scope' : 'Account scope');
+        setText('quick-review-scope-summary', 'Choose governed workspace');
         return;
       }
       if (!projectId) {
@@ -7746,14 +7928,41 @@ function renderLauncherHtml(launcherToken) {
       setText('quick-review-scope-summary', [workspaceLabel, projectLabel].filter(Boolean).join(' · ') || 'Governed project');
     }
 
-    async function loadQuickReviewProjects(workspaceId, selectedProjectId, governedMode) {
+    function syncQuickReviewRegistrationMode(item, mode) {
+      const reviewScopeMode = setReviewRegistrationMode('quick-review', mode);
+      const workspaceSelect = document.getElementById('quick-review-workspace');
+      const projectSelect = document.getElementById('quick-review-project');
+      const primaryButton = document.getElementById('quick-review-primary');
+      const workspaceId = reviewScopeMode === 'workspace' && workspaceSelect
+        ? String(workspaceSelect.value || '').trim()
+        : '';
+      const projectId = reviewScopeMode === 'workspace' && projectSelect
+        ? String(projectSelect.value || '').trim()
+        : '';
+      if (primaryButton && item) {
+        primaryButton.textContent = getReviewPrimaryLabel(item, reviewScopeMode);
+        primaryButton.disabled = item.inboxGroup === 'ignored' || (reviewScopeMode === 'workspace' && (!workspaceId || !projectId));
+      }
+      if (item) {
+        setText('quick-review-action-summary', getReviewActionSummary(item, reviewScopeMode));
+      }
+      updateQuickReviewScopeSummary(reviewScopeMode);
+      return reviewScopeMode;
+    }
+
+    async function loadQuickReviewProjects(workspaceId, selectedProjectId, scopeMode) {
       const projectSelect = document.getElementById('quick-review-project');
       const primaryButton = document.getElementById('quick-review-primary');
       if (!projectSelect) return;
       if (!workspaceId) {
-        setScopeOptions(projectSelect, [{ id: '', label: governedMode ? 'Choose workspace first' : 'Account scope / no project' }], '');
-        if (primaryButton) primaryButton.disabled = governedMode;
-        updateQuickReviewScopeSummary(governedMode);
+        if (scopeMode === 'workspace') {
+          setScopeOptions(projectSelect, [{ id: '', label: 'Choose a workspace first' }], '');
+          if (primaryButton) primaryButton.disabled = true;
+        } else {
+          setScopeOptions(projectSelect, [{ id: '', label: 'Solo registration / no project' }], '');
+          if (primaryButton) primaryButton.disabled = false;
+        }
+        updateQuickReviewScopeSummary(scopeMode);
         return;
       }
       setScopeOptions(projectSelect, [{ id: '', label: 'Loading projects...' }], '');
@@ -7773,14 +7982,14 @@ function renderLauncherHtml(launcherToken) {
         if (primaryButton) {
           primaryButton.disabled = !projects.length;
         }
-        updateQuickReviewScopeSummary(governedMode);
+        updateQuickReviewScopeSummary(scopeMode);
       } catch {
         setScopeOptions(projectSelect, [{ id: '', label: 'Project list unavailable' }], '');
         setQuickReviewStatus('Project list is unavailable right now.', 'warn');
         if (primaryButton) {
           primaryButton.disabled = true;
         }
-        updateQuickReviewScopeSummary(governedMode);
+        updateQuickReviewScopeSummary(scopeMode);
       }
     }
 
@@ -7818,10 +8027,10 @@ function renderLauncherHtml(launcherToken) {
       setQuickReviewStatus(item.statusLabel + (item.statusMeta ? ' · ' + item.statusMeta : ''), item.statusTone === 'muted' ? '' : item.statusTone);
       resetReviewResolutionActions('quick-review');
 
-      const primaryLabel = getReviewPrimaryLabel(item);
+      const primaryLabel = getReviewPrimaryLabel(item, 'solo');
       setText(
         'quick-review-action-summary',
-        getReviewActionSummary(item),
+        getReviewActionSummary(item, 'solo'),
       );
       if (primaryButton) {
         primaryButton.textContent = primaryLabel;
@@ -7840,17 +8049,22 @@ function renderLauncherHtml(launcherToken) {
         ignoreButton.hidden = !canReviewIgnore(item);
       }
 
-      const needsScope = canReviewRegister(item);
-      if (!needsScope) {
+      const showScopeChoice = canChooseReviewScope(item);
+      if (!showScopeChoice) {
         if (scopeWrap) scopeWrap.hidden = true;
+        setReviewRegistrationMode('quick-review', 'solo');
         quickReviewScopeCacheKey = null;
-        setText('quick-review-scope-summary', item.kind === 'runtime' ? 'Open runtime review' : 'Full review available');
+        setText('quick-review-scope-summary', getPassiveReviewScopeSummary(item));
         return;
       }
 
       if (scopeWrap) scopeWrap.hidden = false;
       if (!workspaceSelect || !projectSelect) return;
       const cacheKey = item.id + ':' + String(item.workspaceId || '') + ':' + String(item.projectId || '');
+      syncQuickReviewRegistrationMode(
+        item,
+        quickReviewScopeCacheKey === cacheKey ? getReviewRegistrationMode('quick-review') : 'solo',
+      );
       if (quickReviewScopeCacheKey === cacheKey) {
         return;
       }
@@ -7863,35 +8077,43 @@ function renderLauncherHtml(launcherToken) {
         const response = await apiFetch('/api/scope/access');
         const payload = await response.json();
         scopeAccessSnapshot = payload;
-        const governedMode = payload && payload.operatingMode === 'governed';
         const workspaces = payload.ok && Array.isArray(payload.workspaces) ? payload.workspaces : [];
         const options = [
-          ...(governedMode ? [] : [{ id: '', label: 'Account scope / no workspace' }]),
+          { id: '', label: 'Register solo / account scope' },
           ...workspaces.map((workspace) => ({ id: workspace.id, label: workspace.name || workspace.id })),
         ];
-        if (governedMode && !options.length) {
-          options.push({ id: '', label: 'No governed workspaces yet' });
-        }
-        const selectedWorkspace = item.workspaceId || payload.currentWorkspaceId || (options[0] && options[0].id) || '';
+        const selectedWorkspace = item.workspaceId || payload.currentWorkspaceId || '';
+        const selectedProject = item.projectId || payload.currentProjectId || '';
         setScopeOptions(workspaceSelect, options, selectedWorkspace);
-        await loadQuickReviewProjects(selectedWorkspace, item.projectId || payload.currentProjectId || '', governedMode);
+        await loadQuickReviewProjects(selectedWorkspace, selectedProject, getReviewRegistrationMode('quick-review'));
+        const reviewScopeMode = syncQuickReviewRegistrationMode(item, getReviewRegistrationMode('quick-review'));
         setQuickReviewStatus(
           payload.ok
-            ? (governedMode
-              ? 'Choose the governed workspace and project for this registration.'
-              : 'Account scope stays available. Choose governed scope only when needed.')
-            : (payload.message || 'Workspace access is unavailable right now.'),
+            ? (reviewScopeMode === 'workspace'
+              ? (selectedWorkspace
+                ? 'Choose the governed workspace and project for this registration.'
+                : workspaces.length
+                ? 'Choose a workspace and project for governed registration.'
+                : 'No governed workspaces are available yet. Switch back to solo or create one first.')
+              : 'Solo registration is ready. Choose governed workspace only when needed.')
+            : (reviewScopeMode === 'workspace'
+              ? (payload.message || 'Workspace access is unavailable right now. Switch to solo registration or retry later.')
+              : 'Solo registration is still available. Governed workspace access is unavailable right now.'),
           payload.ok ? '' : 'warn',
         );
-        updateQuickReviewScopeSummary(governedMode);
       } catch {
         setScopeOptions(workspaceSelect, [{ id: '', label: 'Workspace list unavailable' }], '');
         setScopeOptions(projectSelect, [{ id: '', label: 'Project list unavailable' }], '');
-        setQuickReviewStatus('Workspace access is unavailable right now.', 'warn');
-        if (primaryButton) {
-          primaryButton.disabled = true;
+        const reviewScopeMode = syncQuickReviewRegistrationMode(item, getReviewRegistrationMode('quick-review'));
+        setQuickReviewStatus(
+          reviewScopeMode === 'workspace'
+            ? 'Workspace access is unavailable right now. Switch to solo registration or retry later.'
+            : 'Solo registration is still available. Governed workspace access is unavailable right now.',
+          'warn',
+        );
+        if (reviewScopeMode === 'workspace') {
+          setText('quick-review-scope-summary', 'Scope unavailable');
         }
-        setText('quick-review-scope-summary', 'Scope unavailable');
       }
     }
 
@@ -7899,7 +8121,7 @@ function renderLauncherHtml(launcherToken) {
       const item = getQuickReviewItem();
       if (!item) return;
       selectedDiscoveryId = item.id;
-      if (item.kind === 'runtime' || item.actionLabel === 'Open' || item.actionLabel === 'Review') {
+      if (shouldOpenReviewContext(item)) {
         await openDiscoveryContext(item);
         setQuickReviewPanelOpen(false);
         return;
@@ -7911,17 +8133,13 @@ function renderLauncherHtml(launcherToken) {
       const workspaceSelect = document.getElementById('quick-review-workspace');
       const projectSelect = document.getElementById('quick-review-project');
       const primaryButton = document.getElementById('quick-review-primary');
-      const workspaceId = workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
-      const projectId = projectSelect ? String(projectSelect.value || '').trim() : '';
-      const governedMode = scopeAccessSnapshot && scopeAccessSnapshot.operatingMode === 'governed';
-      if (workspaceId && !projectId) {
+      const reviewScopeMode = getReviewRegistrationMode('quick-review');
+      const workspaceId = reviewScopeMode === 'workspace' && workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
+      const projectId = reviewScopeMode === 'workspace' && projectSelect ? String(projectSelect.value || '').trim() : '';
+      if (reviewScopeMode === 'workspace' && (!workspaceId || !projectId)) {
         setQuickReviewStatus('Select a project for the chosen workspace, or switch back to account scope.', 'warn');
         return;
       }
-      if (!workspaceId && governedMode) {
-        setQuickReviewStatus('Choose the governed workspace and project before registering here.', 'warn');
-        return;
-      }
       if (primaryButton) primaryButton.disabled = true;
       const endpoint = item.kind === 'agent' ? '/api/discovery/connect-agent' : '/api/discovery/connect-model';
       const result = await postAction(endpoint, 'Registering with Forkit Connect...', {
@@ -7995,13 +8213,39 @@ function renderLauncherHtml(launcherToken) {
       }
     }
 
-    async function loadDiscoveryReviewProjects(workspaceId, selectedProjectId, governedMode) {
+    function syncDiscoveryReviewRegistrationMode(item, mode) {
+      const reviewScopeMode = setReviewRegistrationMode('discovery-review', mode);
+      const workspaceSelect = document.getElementById('discovery-review-workspace');
+      const projectSelect = document.getElementById('discovery-review-project');
+      const workspaceId = reviewScopeMode === 'workspace' && workspaceSelect
+        ? String(workspaceSelect.value || '').trim()
+        : '';
+      const projectId = reviewScopeMode === 'workspace' && projectSelect
+        ? String(projectSelect.value || '').trim()
+        : '';
+      if (item) {
+        setDiscoveryReviewButtons({
+          primaryLabel: getReviewPrimaryLabel(item, reviewScopeMode),
+          primaryEnabled: item.inboxGroup !== 'ignored' && !(reviewScopeMode === 'workspace' && (!workspaceId || !projectId)),
+          deferEnabled: canReviewDefer(item),
+          ignoreEnabled: canReviewIgnore(item),
+        });
+      }
+      return reviewScopeMode;
+    }
+
+    async function loadDiscoveryReviewProjects(workspaceId, selectedProjectId, scopeMode) {
       const projectSelect = document.getElementById('discovery-review-project');
       const primaryButton = document.getElementById('discovery-review-primary');
       if (!projectSelect) return;
       if (!workspaceId) {
-        setScopeOptions(projectSelect, [{ id: '', label: governedMode ? 'Choose workspace first' : 'Account scope / no project' }], '');
-        if (primaryButton) primaryButton.disabled = governedMode;
+        if (scopeMode === 'workspace') {
+          setScopeOptions(projectSelect, [{ id: '', label: 'Choose a workspace first' }], '');
+          if (primaryButton) primaryButton.disabled = true;
+        } else {
+          setScopeOptions(projectSelect, [{ id: '', label: 'Solo registration / no project' }], '');
+          if (primaryButton) primaryButton.disabled = false;
+        }
         return;
       }
       setScopeOptions(projectSelect, [{ id: '', label: 'Loading projects...' }], '');
@@ -8042,6 +8286,7 @@ function renderLauncherHtml(launcherToken) {
         setText('discovery-review-meta', 'Choose a model, agent, or runtime to review it here.');
         setText('discovery-review-detail', 'Registering creates or updates a Forkit Passport. Nothing is published automatically.');
         if (scopeWrap) scopeWrap.hidden = true;
+        setReviewRegistrationMode('discovery-review', 'solo');
         setDiscoveryReviewStatus('Select an item to continue.', '');
         resetReviewResolutionActions('discovery-review');
         setDiscoveryReviewButtons({ primaryLabel: 'Review', primaryEnabled: false, deferEnabled: false, ignoreEnabled: false });
@@ -8049,8 +8294,7 @@ function renderLauncherHtml(launcherToken) {
       }
 
       const typeLabel = item.typeLabel || item.kind;
-      const needsScope = canReviewRegister(item);
-      const primaryLabel = getReviewPrimaryLabel(item);
+      const showScopeChoice = canChooseReviewScope(item);
 
       setText('discovery-review-kicker', typeLabel);
       setText('discovery-review-title', item.name);
@@ -8059,14 +8303,15 @@ function renderLauncherHtml(launcherToken) {
       setDiscoveryReviewStatus(item.statusLabel + (item.statusMeta ? ' · ' + item.statusMeta : ''), item.statusTone === 'muted' ? '' : item.statusTone);
       resetReviewResolutionActions('discovery-review');
       setDiscoveryReviewButtons({
-        primaryLabel: getReviewPrimaryLabel(item),
+        primaryLabel: getReviewPrimaryLabel(item, 'solo'),
         primaryEnabled: item.inboxGroup !== 'ignored',
         deferEnabled: canReviewDefer(item),
         ignoreEnabled: canReviewIgnore(item),
       });
 
-      if (!needsScope) {
+      if (!showScopeChoice) {
         if (scopeWrap) scopeWrap.hidden = true;
+        setReviewRegistrationMode('discovery-review', 'solo');
         reviewScopeCacheKey = null;
         return;
       }
@@ -8075,6 +8320,10 @@ function renderLauncherHtml(launcherToken) {
       if (!workspaceSelect || !projectSelect) return;
 
       const cacheKey = item.id + ':' + String(item.workspaceId || '') + ':' + String(item.projectId || '');
+      syncDiscoveryReviewRegistrationMode(
+        item,
+        reviewScopeCacheKey === cacheKey ? getReviewRegistrationMode('discovery-review') : 'solo',
+      );
       if (reviewScopeCacheKey === cacheKey) {
         return;
       }
@@ -8088,43 +8337,47 @@ function renderLauncherHtml(launcherToken) {
         const response = await apiFetch('/api/scope/access');
         const payload = await response.json();
         scopeAccessSnapshot = payload;
-        const governedMode = payload && payload.operatingMode === 'governed';
         const workspaces = payload.ok && Array.isArray(payload.workspaces) ? payload.workspaces : [];
         const options = [
-          ...(governedMode ? [] : [{ id: '', label: 'Account scope / no workspace' }]),
+          { id: '', label: 'Register solo / account scope' },
           ...workspaces.map((workspace) => ({ id: workspace.id, label: workspace.name || workspace.id })),
         ];
-        if (governedMode && !options.length) {
-          options.push({ id: '', label: 'No governed workspaces yet' });
-        }
-        const selectedWorkspace = item.workspaceId || payload.currentWorkspaceId || (options[0] && options[0].id) || '';
+        const selectedWorkspace = item.workspaceId || payload.currentWorkspaceId || '';
+        const selectedProject = item.projectId || payload.currentProjectId || '';
         setScopeOptions(workspaceSelect, options, selectedWorkspace);
-        await loadDiscoveryReviewProjects(selectedWorkspace, item.projectId || payload.currentProjectId || '', governedMode);
+        await loadDiscoveryReviewProjects(selectedWorkspace, selectedProject, getReviewRegistrationMode('discovery-review'));
+        const reviewScopeMode = syncDiscoveryReviewRegistrationMode(item, getReviewRegistrationMode('discovery-review'));
         setDiscoveryReviewStatus(
           payload.ok
-            ? (governedMode
-              ? 'Choose the governed workspace and project for this registration.'
-              : 'Account scope stays available. Choose governed scope only when needed.')
-            : (payload.message || 'Workspace access is unavailable right now.'),
+            ? (reviewScopeMode === 'workspace'
+              ? (selectedWorkspace
+                ? 'Choose the governed workspace and project for this registration.'
+                : workspaces.length
+                ? 'Choose a workspace and project for governed registration.'
+                : 'No governed workspaces are available yet. Switch back to solo or create one first.')
+              : 'Solo registration is ready. Choose governed workspace only when needed.')
+            : (reviewScopeMode === 'workspace'
+              ? (payload.message || 'Workspace access is unavailable right now. Switch to solo registration or retry later.')
+              : 'Solo registration is still available. Governed workspace access is unavailable right now.'),
           payload.ok ? '' : 'warn',
         );
       } catch {
         setScopeOptions(workspaceSelect, [{ id: '', label: 'Workspace list unavailable' }], '');
         setScopeOptions(projectSelect, [{ id: '', label: 'Project list unavailable' }], '');
-        setDiscoveryReviewStatus('Workspace access is unavailable right now.', 'warn');
-        setDiscoveryReviewButtons({
-          primaryLabel,
-          primaryEnabled: false,
-          deferEnabled: canReviewDefer(item),
-          ignoreEnabled: canReviewIgnore(item),
-        });
+        const reviewScopeMode = syncDiscoveryReviewRegistrationMode(item, getReviewRegistrationMode('discovery-review'));
+        setDiscoveryReviewStatus(
+          reviewScopeMode === 'workspace'
+            ? 'Workspace access is unavailable right now. Switch to solo registration or retry later.'
+            : 'Solo registration is still available. Governed workspace access is unavailable right now.',
+          'warn',
+        );
       }
     }
 
     async function submitDiscoveryReviewPrimary() {
       const item = getSelectedDiscoveryItem();
       if (!item) return;
-      if (item.kind === 'runtime' || item.actionLabel === 'Open' || item.actionLabel === 'Review') {
+      if (shouldOpenReviewContext(item)) {
         await openDiscoveryContext(item);
         return;
       }
@@ -8135,9 +8388,10 @@ function renderLauncherHtml(launcherToken) {
       const workspaceSelect = document.getElementById('discovery-review-workspace');
       const projectSelect = document.getElementById('discovery-review-project');
       const primaryButton = document.getElementById('discovery-review-primary');
-      const workspaceId = workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
-      const projectId = projectSelect ? String(projectSelect.value || '').trim() : '';
-      if (workspaceId && !projectId) {
+      const reviewScopeMode = getReviewRegistrationMode('discovery-review');
+      const workspaceId = reviewScopeMode === 'workspace' && workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
+      const projectId = reviewScopeMode === 'workspace' && projectSelect ? String(projectSelect.value || '').trim() : '';
+      if (reviewScopeMode === 'workspace' && (!workspaceId || !projectId)) {
         setDiscoveryReviewStatus('Select a project for the chosen workspace, or switch back to account scope.', 'warn');
         return;
       }
@@ -9091,7 +9345,7 @@ function renderLauncherHtml(launcherToken) {
       registerButton.disabled = true;
       setText('scope-modal-title', 'Register ' + item.name);
       let governedMode = latestSummary && latestSummary.operatingMode === 'governed';
-      setText('scope-modal-copy', 'Checking account scope and available governed workspaces...');
+      setText('scope-modal-copy', 'Checking account scope and any governed workspace options...');
       if (createWorkspaceButton) createWorkspaceButton.hidden = true;
       if (createProjectButton) createProjectButton.hidden = true;
       setScopeCreateButtonsEnabled(false);
@@ -9106,40 +9360,38 @@ function renderLauncherHtml(launcherToken) {
         setText(
           'scope-modal-copy',
           governedMode
-            ? 'Select the governed workspace and project that should own this Passport. You can create missing scope here.'
-            : 'Account scope remains available on Origin. Choose a governed workspace/project only when you want governed operations.',
+            ? 'Register on your account now, or choose a governed workspace/project when you want governed ownership. You can create missing scope here.'
+            : 'Solo registration is available now. Choose a governed workspace/project only when you want governed operations.',
         );
         if (createWorkspaceButton) createWorkspaceButton.hidden = !governedMode;
         if (createProjectButton) createProjectButton.hidden = !governedMode;
         setScopeCreateButtonsEnabled(governedMode);
         const workspaces = payload.ok && Array.isArray(payload.workspaces) ? payload.workspaces : [];
         const options = [
-          ...(governedMode ? [] : [{ id: '', label: 'Account scope / no workspace' }]),
+          { id: '', label: 'Register solo / account scope' },
           ...workspaces.map((workspace) => ({ id: workspace.id, label: workspace.name || workspace.id })),
         ];
-        if (governedMode && !options.length) {
-          options.push({ id: '', label: 'No governed workspaces yet' });
-          registerButton.disabled = true;
+        if (governedMode && workspaces.length === 0) {
           openScopeCreateWorkspaceFlow('No governed workspace exists yet. Create one here to continue.', 'warn');
         }
-        const selectedWorkspace = payload.currentWorkspaceId || (options[0] && options[0].id) || '';
+        const selectedWorkspace = item.workspaceId || '';
         setScopeOptions(workspaceSelect, options, selectedWorkspace);
         const hasProjects = await loadScopeProjects(workspaceSelect.value, payload.currentProjectId || '');
-        registerButton.disabled = !payload.ok || (governedMode && (!String(workspaceSelect.value || '').trim() || !hasProjects));
-        if (payload.ok && (!governedMode || hasProjects)) {
-          setScopeStatus(governedMode ? 'Ready to register in governed scope.' : 'Ready to register.', '');
+        registerButton.disabled = !payload.ok || (Boolean(String(workspaceSelect.value || '').trim()) && !hasProjects);
+        if (payload.ok && (!String(workspaceSelect.value || '').trim() || hasProjects)) {
+          setScopeStatus(String(workspaceSelect.value || '').trim() ? 'Ready to register in governed scope.' : 'Ready to register solo.', '');
         } else if (!payload.ok) {
           setScopeStatus(
-            payload.message || (governedMode ? 'Workspace list unavailable.' : 'Workspace list unavailable. Account scope is still available.'),
+            payload.message || 'Workspace list unavailable. Solo registration is still available.',
             'warn',
           );
         }
       } catch {
-        setScopeOptions(workspaceSelect, governedMode ? [] : [{ id: '', label: 'Account scope / no workspace' }], '');
-        await loadScopeProjects(governedMode ? (workspaceSelect.value || '') : '', '');
-        registerButton.disabled = true;
+        setScopeOptions(workspaceSelect, [{ id: '', label: 'Register solo / account scope' }], '');
+        await loadScopeProjects('', '');
+        registerButton.disabled = false;
         setScopeCreateButtonsEnabled(false);
-        setScopeStatus(governedMode ? 'Workspace list unavailable.' : 'Workspace list unavailable. Account scope is still available.', 'warn');
+        setScopeStatus('Workspace list unavailable. Solo registration is still available.', 'warn');
       }
     }
 
@@ -9165,7 +9417,7 @@ function renderLauncherHtml(launcherToken) {
       }
       if (registerButton) registerButton.disabled = true;
       const endpoint = item.kind === 'agent' ? '/api/discovery/connect-agent' : '/api/discovery/connect-model';
-      const pendingMessage = item.kind === 'agent' ? 'Registering agent...' : 'Creating Passport draft...';
+      const pendingMessage = item.kind === 'agent' ? 'Registering agent...' : 'Registering model...';
       setScopeStatus('Registering with Forkit Connect...', 'warn');
       const result = await postAction(endpoint, pendingMessage, {
         method: 'POST',
@@ -10073,34 +10325,62 @@ function renderLauncherHtml(launcherToken) {
         void submitQuickReviewIgnore();
       });
     }
+    const quickReviewModeSolo = document.getElementById('quick-review-mode-solo');
+    if (quickReviewModeSolo) {
+      quickReviewModeSolo.addEventListener('click', () => {
+        const item = getQuickReviewItem();
+        if (!item || !canChooseReviewScope(item)) return;
+        syncQuickReviewRegistrationMode(item, 'solo');
+        setQuickReviewStatus('Solo registration is ready. Choose governed workspace only when needed.', '');
+      });
+    }
+    const quickReviewModeWorkspace = document.getElementById('quick-review-mode-workspace');
+    if (quickReviewModeWorkspace) {
+      quickReviewModeWorkspace.addEventListener('click', () => {
+        const item = getQuickReviewItem();
+        if (!item || !canChooseReviewScope(item)) return;
+        syncQuickReviewRegistrationMode(item, 'workspace');
+        const selectedWorkspaceId = quickReviewWorkspaceSelect
+          ? String(quickReviewWorkspaceSelect.value || '').trim()
+          : '';
+        const selectedProjectId = quickReviewProjectSelect
+          ? String(quickReviewProjectSelect.value || '').trim()
+          : '';
+        void loadQuickReviewProjects(selectedWorkspaceId, selectedProjectId, 'workspace');
+        setQuickReviewStatus(
+          selectedWorkspaceId
+            ? 'Choose the governed project for this registration.'
+            : 'Choose a workspace and project for governed registration.',
+          '',
+        );
+      });
+    }
     const quickReviewWorkspaceSelect = document.getElementById('quick-review-workspace');
     if (quickReviewWorkspaceSelect) {
       quickReviewWorkspaceSelect.addEventListener('change', () => {
+        const item = getQuickReviewItem();
         const selectedWorkspaceId = String(quickReviewWorkspaceSelect.value || '').trim();
-        const governedMode = scopeAccessSnapshot && scopeAccessSnapshot.operatingMode === 'governed';
-        quickReviewScopeCacheKey = null;
-        void loadQuickReviewProjects(selectedWorkspaceId, '', governedMode);
-        updateQuickReviewScopeSummary(governedMode);
+        const reviewScopeMode = getReviewRegistrationMode('quick-review');
+        void loadQuickReviewProjects(selectedWorkspaceId, '', reviewScopeMode);
         setQuickReviewStatus(
-          selectedWorkspaceId
-            ? 'Choose the governed project for this registration.'
-            : 'Account scope stays available. Choose governed scope only when needed.',
+          reviewScopeMode === 'workspace'
+            ? (selectedWorkspaceId
+              ? 'Choose the governed project for this registration.'
+              : 'Choose a workspace and project for governed registration.')
+            : 'Solo registration stays available. Choose governed scope only when needed.',
           '',
         );
+        if (item) {
+          syncQuickReviewRegistrationMode(item, reviewScopeMode);
+        }
       });
     }
     const quickReviewProjectSelect = document.getElementById('quick-review-project');
     if (quickReviewProjectSelect) {
       quickReviewProjectSelect.addEventListener('change', () => {
-        const primaryButton = document.getElementById('quick-review-primary');
-        const selectedWorkspaceId = quickReviewWorkspaceSelect
-          ? String(quickReviewWorkspaceSelect.value || '').trim()
-          : '';
-        const selectedProjectId = String(quickReviewProjectSelect.value || '').trim();
-        const governedMode = scopeAccessSnapshot && scopeAccessSnapshot.operatingMode === 'governed';
-        updateQuickReviewScopeSummary(governedMode);
-        if (primaryButton) {
-          primaryButton.disabled = Boolean(selectedWorkspaceId && !selectedProjectId && governedMode);
+        const item = getQuickReviewItem();
+        if (item) {
+          syncQuickReviewRegistrationMode(item, getReviewRegistrationMode('quick-review'));
         }
       });
     }
@@ -10134,20 +10414,53 @@ function renderLauncherHtml(launcherToken) {
         void submitDiscoveryReviewIgnore();
       });
     }
+    const discoveryReviewModeSolo = document.getElementById('discovery-review-mode-solo');
+    if (discoveryReviewModeSolo) {
+      discoveryReviewModeSolo.addEventListener('click', () => {
+        const selectedItem = getSelectedDiscoveryItem();
+        if (!selectedItem || !canChooseReviewScope(selectedItem)) return;
+        syncDiscoveryReviewRegistrationMode(selectedItem, 'solo');
+        setDiscoveryReviewStatus('Solo registration is ready. Choose governed workspace only when needed.', '');
+      });
+    }
+    const discoveryReviewModeWorkspace = document.getElementById('discovery-review-mode-workspace');
+    if (discoveryReviewModeWorkspace) {
+      discoveryReviewModeWorkspace.addEventListener('click', () => {
+        const selectedItem = getSelectedDiscoveryItem();
+        if (!selectedItem || !canChooseReviewScope(selectedItem)) return;
+        syncDiscoveryReviewRegistrationMode(selectedItem, 'workspace');
+        const selectedWorkspaceId = discoveryReviewWorkspaceSelect
+          ? String(discoveryReviewWorkspaceSelect.value || '').trim()
+          : '';
+        const selectedProjectId = discoveryReviewProjectSelect
+          ? String(discoveryReviewProjectSelect.value || '').trim()
+          : '';
+        void loadDiscoveryReviewProjects(selectedWorkspaceId, selectedProjectId, 'workspace');
+        setDiscoveryReviewStatus(
+          selectedWorkspaceId
+            ? 'Choose the governed project for this registration.'
+            : 'Choose a workspace and project for governed registration.',
+          '',
+        );
+      });
+    }
     const discoveryReviewWorkspaceSelect = document.getElementById('discovery-review-workspace');
     if (discoveryReviewWorkspaceSelect) {
       discoveryReviewWorkspaceSelect.addEventListener('change', () => {
         const selectedItem = getSelectedDiscoveryItem();
         const selectedWorkspaceId = String(discoveryReviewWorkspaceSelect.value || '').trim();
-        const governedMode = scopeAccessSnapshot && scopeAccessSnapshot.operatingMode === 'governed';
-        void loadDiscoveryReviewProjects(selectedWorkspaceId, '', governedMode);
+        const reviewScopeMode = getReviewRegistrationMode('discovery-review');
+        void loadDiscoveryReviewProjects(selectedWorkspaceId, '', reviewScopeMode);
         if (selectedItem && canReviewRegister(selectedItem)) {
           setDiscoveryReviewStatus(
-            selectedWorkspaceId
-              ? 'Choose the governed project for this registration.'
-              : 'Account scope stays available. Choose governed scope only when needed.',
+            reviewScopeMode === 'workspace'
+              ? (selectedWorkspaceId
+                ? 'Choose the governed project for this registration.'
+                : 'Choose a workspace and project for governed registration.')
+              : 'Solo registration stays available. Choose governed scope only when needed.',
             '',
           );
+          syncDiscoveryReviewRegistrationMode(selectedItem, reviewScopeMode);
         }
       });
     }
@@ -10155,14 +10468,8 @@ function renderLauncherHtml(launcherToken) {
     if (discoveryReviewProjectSelect) {
       discoveryReviewProjectSelect.addEventListener('change', () => {
         const selectedItem = getSelectedDiscoveryItem();
-        const primaryButton = document.getElementById('discovery-review-primary');
-        const selectedWorkspaceId = discoveryReviewWorkspaceSelect
-          ? String(discoveryReviewWorkspaceSelect.value || '').trim()
-          : '';
-        const selectedProjectId = String(discoveryReviewProjectSelect.value || '').trim();
-        const governedMode = scopeAccessSnapshot && scopeAccessSnapshot.operatingMode === 'governed';
-        if (primaryButton && selectedItem && canReviewRegister(selectedItem)) {
-          primaryButton.disabled = Boolean(selectedWorkspaceId && !selectedProjectId && governedMode);
+        if (selectedItem && canReviewRegister(selectedItem)) {
+          syncDiscoveryReviewRegistrationMode(selectedItem, getReviewRegistrationMode('discovery-review'));
         }
       });
     }
@@ -10806,16 +11113,19 @@ function createLauncherApp(options) {
             else {
                 await options.service.bindWorkspaceProject(null, null);
             }
-            const result = await options.service.connectDetectedModel(selector);
+            const result = await options.service.connectDetectedModel(selector, {
+                destination: 'passport',
+                visibility: 'public',
+            });
             const message = result.action === 'already_bound'
                 ? 'Model is already connected to a Passport.'
                 : result.action === 'already_pending'
-                    ? 'Model already has a pending Passport draft.'
+                    ? 'Registration is already in progress for this model.'
                     : result.action === 'passport_registered'
-                        ? 'Passport registered from detected model.'
+                        ? 'Passport registered successfully.'
                         : result.action === 'draft_created'
-                            ? 'Passport draft created from detected model.'
-                            : 'Passport draft queued locally from detected model.';
+                            ? 'Registration started privately for review before publishing.'
+                            : 'Registration was saved locally and will continue when Forkit Connect can sync again.';
             response.json({
                 ok: true,
                 message,
@@ -10885,7 +11195,7 @@ function createLauncherApp(options) {
                 : passportGaid
                     ? 'Agent is already registered.'
                     : draftId
-                        ? 'Agent registration draft created.'
+                        ? 'Agent registration started privately for review.'
                         : 'Agent connected locally. Registration is still available.';
             response.json({
                 ok: true,

package/dist/v1/service.d.ts

@@ -742,6 +742,7 @@ export declare class ConnectV1Service {
     connectDetectedModel(selector: string, options?: {
         visibility?: 'private' | 'public';
         destination?: 'draft' | 'passport';
+        allowPrivateFallback?: boolean;
     }): Promise<ConnectSelectionResult>;
     private resolveRuntimePassportSelection;
     connectRuntimeSuggestion(selector: string): Promise<ConnectSelectionResult>;

package/dist/v1/service.js

@@ -7834,10 +7834,13 @@ class ConnectV1Service {
         const soloDraftAllowed = draftBindingStatus.allowed && draftBindingStatus.reasonCode === 'solo_passport_draft_allowed';
         const localScopedDraftAllowed = draftBindingStatus.allowed && draftBindingStatus.reasonCode === 'local_workspace_project_draft_allowed';
         const model = this.resolveModelSelection(selector, state);
-        const requestedDestination = options?.destination === 'passport' ? 'passport' : 'draft';
-        const requestedVisibility = options?.visibility === 'public' && requestedDestination === 'passport'
-            ? 'public'
-            : 'private';
+        const requestedDestination = options?.destination === 'draft' ? 'draft' : 'passport';
+        const requestedVisibility = options?.visibility === 'private'
+            ? 'private'
+            : requestedDestination === 'passport'
+                ? 'public'
+                : 'private';
+        const allowPrivateFallback = options?.allowPrivateFallback !== false;
         this.clearModelReviewDeferral(model);
         this.updateDetectedModelRegistrationHint(model, {
             trackingStatus: null,
@@ -7992,10 +7995,17 @@ class ConnectV1Service {
                     this.updateDetectedModelRegistrationHint(model, {
                         trackingStatus: 'private_draft_required',
                         errorCode: backendCode,
-                        errorMessage: 'This registration must start as a private draft before it can be published.',
+                        errorMessage: 'Forkit needs one private review step before this passport can finish publishing.',
                         errorStatus: result.status,
-                        guidance: 'Open the review flow and continue through the private draft path first.',
+                        guidance: 'Forkit is continuing this registration privately first. Finish the review step there before publishing.',
                     });
+                    if (allowPrivateFallback && requestedDestination === 'passport' && requestedVisibility === 'public') {
+                        return this.connectDetectedModel(selector, {
+                            destination: 'draft',
+                            visibility: 'private',
+                            allowPrivateFallback: false,
+                        });
+                    }
                 }
                 this.observeBackendCommunicationState({
                     passportGaid: bindingWithRuntime?.gaid ?? null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "forkit-connect",
-  "version": "0.1.10",
+  "version": "0.1.12",
   "description": "Forkit Connect Local Engine - The Global AI Governance Fabric",
   "license": "MIT",
   "main": "dist/index.js",