forkit-connect 0.1.5 → 0.1.7

package/dist/launcher.js

@@ -500,6 +500,74 @@ function safeStringRecordValue(record, keys) {
     }
     return null;
 }
+function normalizeDiscoveryRegistrationFailure(message) {
+    const normalized = String(message || '').trim();
+    if (!normalized) {
+        return {
+            code: null,
+            message: 'Registration failed.',
+        };
+    }
+    if (normalized === 'GOVERNED_PASSPORT_CAPACITY_REACHED') {
+        return {
+            code: normalized,
+            message: 'Governed passport capacity is full for this account.',
+            nextActions: [
+                'Use an existing published passport for runtime review or C2 work.',
+                'Free capacity or upgrade before creating another governed registration.',
+                'If you only need local observation for now, keep the item in review instead of registering it yet.',
+            ],
+        };
+    }
+    if (normalized === 'DRAFT_LIMIT_REACHED') {
+        return {
+            code: normalized,
+            message: 'Draft capacity is full for this account.',
+            nextActions: [
+                'Clear an old draft or upgrade before creating another draft.',
+                'Use an existing passport if you only need runtime review or C2 testing.',
+            ],
+        };
+    }
+    if (normalized === 'SIMILAR_PASSPORT_EXISTS') {
+        return {
+            code: normalized,
+            message: 'A similar passport already exists in Forkit. Review existing records before creating a new one.',
+        };
+    }
+    if (normalized === 'INVALID_DRAFT_VISIBILITY') {
+        return {
+            code: normalized,
+            message: 'This registration needs to start as a private draft before it can be published.',
+            nextActions: [
+                'Keep the item in review or open the draft path first.',
+                'Choose publish only when Forkit is ready to finish the passport.',
+            ],
+        };
+    }
+    if (normalized === 'WORKSPACE_PROJECT_BINDING_REQUIRED') {
+        return {
+            code: normalized,
+            message: 'Choose a governed workspace and project before registering this item.',
+        };
+    }
+    if (normalized === 'DRAFT_CREATION_NOT_ALLOWED_BY_BINDING') {
+        return {
+            code: normalized,
+            message: 'This binding does not currently allow draft creation. Update consent or switch scope first.',
+        };
+    }
+    if (normalized.startsWith('DRAFT_CREATE_FAILED:')) {
+        return {
+            code: normalized,
+            message: 'Forkit could not create the draft on the backend right now. Retry in a moment.',
+        };
+    }
+    return {
+        code: null,
+        message: normalized,
+    };
+}
 function buildPassportHistory(binding, events) {
     const modelParts = parseModelKeyParts(binding.modelKey);
     const modelName = (0, heartbeat_1.readBoundModelName)(binding.modelKey);
@@ -1949,6 +2017,34 @@ function renderLauncherHtml(launcherToken) {
       align-items: start;
     }
 
+    .review-resolution-actions {
+      display: grid;
+      grid-template-columns: repeat(2, minmax(0, 1fr));
+      gap: 10px;
+    }
+
+    .review-resolution-actions[hidden] {
+      display: none;
+    }
+
+    .review-resolution-button {
+      min-height: 44px;
+      border-radius: 14px;
+      border: 1px solid rgba(241, 235, 223, 0.12);
+      background: rgba(255,255,255,0.04);
+      color: #fff8ef;
+      font-size: 0.88rem;
+      font-weight: 600;
+      cursor: pointer;
+      padding: 0 12px;
+      transition: background 160ms ease, border-color 160ms ease;
+    }
+
+    .review-resolution-button:hover {
+      background: rgba(255,255,255,0.08);
+      border-color: rgba(157, 238, 245, 0.18);
+    }
+
     .quick-review-primary {
       min-height: 52px;
       border: 1px solid rgba(157, 238, 245, 0.2);
@@ -6391,6 +6487,10 @@ function renderLauncherHtml(launcherToken) {
                     </div>
                   </div>
                 </div>
+                <div class="review-resolution-actions" id="quick-review-resolution" hidden>
+                  <button class="review-resolution-button" id="quick-review-resolution-primary" type="button" hidden></button>
+                  <button class="review-resolution-button" id="quick-review-resolution-secondary" type="button" hidden></button>
+                </div>
               </section>
             </div>
           </div>
@@ -6770,6 +6870,10 @@ function renderLauncherHtml(launcherToken) {
                 <button class="secondary" id="discovery-review-defer" type="button" disabled>Defer 24h</button>
                 <button class="danger" id="discovery-review-ignore" type="button" disabled>Ignore</button>
               </div>
+              <div class="review-resolution-actions" id="discovery-review-resolution" hidden>
+                <button class="review-resolution-button" id="discovery-review-resolution-primary" type="button" hidden></button>
+                <button class="review-resolution-button" id="discovery-review-resolution-secondary" type="button" hidden></button>
+              </div>
             </section>
 
             <ul class="discovery-note-list">
@@ -7274,6 +7378,9 @@ function renderLauncherHtml(launcherToken) {
       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' } : {}) });
@@ -7298,6 +7405,29 @@ function renderLauncherHtml(launcherToken) {
       return false;
     }
 
+    async function completeRegistrationSuccess(item, result) {
+      const message = result && typeof result.message === 'string' && result.message.trim()
+        ? result.message.trim()
+        : 'Registration updated.';
+      await refreshAll();
+      const preferredPassportGaid = String(result && (result.passportGaid || result.gaid) || '').trim();
+      if (preferredPassportGaid && focusPassportByGaid(preferredPassportGaid, { showHistory: false })) {
+        setActivityMessage(message, 'ok');
+        return true;
+      }
+      if (item && await openDiscoveryContext({
+        ...item,
+        passportGaid: preferredPassportGaid || item.passportGaid,
+        matchedPassportGaid: preferredPassportGaid || item.matchedPassportGaid,
+      })) {
+        setActivityMessage(message, 'ok');
+        return true;
+      }
+      setView('passports');
+      setActivityMessage(message, 'ok');
+      return false;
+    }
+
     function getSelectedDiscoveryItem(itemsOverride) {
       const items = Array.isArray(itemsOverride)
         ? itemsOverride
@@ -7357,6 +7487,206 @@ function renderLauncherHtml(launcherToken) {
       status.className = 'quick-review-status' + (tone ? ' ' + tone : '');
     }
 
+    function resetReviewResolutionActions(prefix) {
+      setReviewResolutionActions(prefix, []);
+    }
+
+    function derivePassportResolutionQuery(item) {
+      if (!item || typeof item !== 'object') return '';
+      return [
+        item.modelName,
+        item.name,
+        item.selector,
+        item.sourceMeta,
+      ].map((value) => String(value || '').trim()).find(Boolean) || '';
+    }
+
+    function getReviewPrimaryLabel(item) {
+      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 (item.passportGaid) {
+        return 'Open passport';
+      }
+      if (item.matchedPassportGaid) {
+        return 'Use existing passport';
+      }
+      if (item.actionLabel === 'Retry') {
+        return 'Retry registration';
+      }
+      if (item.actionLabel === 'Open' || item.actionLabel === 'Review') {
+        return 'Review in context';
+      }
+      return 'Approve & register';
+    }
+
+    function getReviewActionSummary(item) {
+      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 (item.passportGaid) {
+        return 'Open the linked passport';
+      }
+      if (item.matchedPassportGaid) {
+        return 'Use the matching passport';
+      }
+      if (item.actionLabel === 'Retry') {
+        return 'Retry registration here';
+      }
+      if (item.actionLabel === 'Open' || item.actionLabel === 'Review') {
+        return 'Open full review';
+      }
+      return 'Approve and register here';
+    }
+
+    function getReviewDetailText(item) {
+      if (!item) return 'Review local metadata, then decide what happens next.';
+      if (item.kind === 'runtime') {
+        return item.statusTone === 'error'
+          ? '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.matchedPassportGaid && !item.passportGaid) {
+        return 'Forkit Connect found a matching passport. Reuse it before creating anything new.';
+      }
+      if (item.passportGaid) {
+        return 'This item is already linked. Open the passport to inspect lineage, scope, and runtime state.';
+      }
+      if (item.actionLabel === 'Retry') {
+        return 'Registration failed earlier. Review the latest local metadata and retry when the scope is ready.';
+      }
+      return item.detailSummary || item.statusMeta || 'Review local metadata, then decide what happens next.';
+    }
+
+    function formatLauncherActionFeedback(result, fallbackMessage) {
+      const base = result && typeof result.message === 'string' && result.message.trim()
+        ? result.message.trim()
+        : fallbackMessage;
+      const nextActions = result && Array.isArray(result.nextActions)
+        ? result.nextActions.map((item) => String(item || '').trim()).filter(Boolean)
+        : [];
+      const resolutionActions = result && result.code === 'GOVERNED_PASSPORT_CAPACITY_REACHED'
+        ? [{ id: 'passports', label: 'Use existing passport' }]
+        : result && result.code === 'DRAFT_LIMIT_REACHED'
+        ? [{ id: 'passports', label: 'Review existing drafts' }]
+        : result && (result.code === 'WORKSPACE_PROJECT_BINDING_REQUIRED' || result.code === 'DRAFT_CREATION_NOT_ALLOWED_BY_BINDING')
+        ? [{ id: 'scope', label: 'Set workspace' }]
+        : result && result.code === 'SIMILAR_PASSPORT_EXISTS'
+        ? [{ id: 'passports', label: 'Open matching passport' }]
+        : [];
+      return {
+        message: nextActions.length ? (base + ' Next: ' + nextActions[0]) : base,
+        activity: nextActions.length ? (base + ' Next: ' + nextActions.join(' ')) : base,
+        actionSummary: result && result.code === 'GOVERNED_PASSPORT_CAPACITY_REACHED'
+          ? 'Capacity full · use an existing passport or free space'
+          : result && result.code === 'DRAFT_LIMIT_REACHED'
+        ? 'Draft capacity full · use an existing passport, clear a draft, or upgrade'
+          : 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'
+          : result && (result.code === 'WORKSPACE_PROJECT_BINDING_REQUIRED' || result.code === 'DRAFT_CREATION_NOT_ALLOWED_BY_BINDING')
+          ? 'Scope required · choose workspace and project'
+          : null,
+        resolutionActions,
+      };
+    }
+
+    function setReviewResolutionActions(prefix, actions) {
+      const wrapper = document.getElementById(prefix + '-resolution');
+      const primary = document.getElementById(prefix + '-resolution-primary');
+      const secondary = document.getElementById(prefix + '-resolution-secondary');
+      if (!wrapper || !primary || !secondary) return;
+      const normalized = Array.isArray(actions) ? actions.slice(0, 2) : [];
+      [primary, secondary].forEach((button, index) => {
+        const action = normalized[index];
+        if (!action) {
+          button.hidden = true;
+          button.dataset.action = '';
+          button.textContent = '';
+          return;
+        }
+        button.hidden = false;
+        button.dataset.action = String(action.id || '').trim();
+        button.textContent = String(action.label || '').trim();
+      });
+      wrapper.hidden = normalized.length === 0;
+    }
+
+    async function handleReviewResolutionAction(prefix, action) {
+      const item = prefix === 'quick-review' ? getQuickReviewItem() : getSelectedDiscoveryItem();
+      if (action === 'passports') {
+        if (!latestPassports) {
+          await refreshPassports();
+        }
+        const preferredPassportGaid = String(item && (item.passportGaid || item.matchedPassportGaid) || '').trim();
+        if (preferredPassportGaid && focusPassportByGaid(preferredPassportGaid, { showHistory: true })) {
+          if (prefix === 'quick-review') {
+            setQuickReviewPanelOpen(false);
+          }
+          setActivityMessage('Opened the matching local passport for review.', 'ok');
+          return;
+        }
+        const query = derivePassportResolutionQuery(item);
+        const searchInput = document.getElementById('passports-search');
+        const statusFilter = document.getElementById('passports-status-filter');
+        if (searchInput) {
+          searchInput.value = query;
+        }
+        if (statusFilter) {
+          statusFilter.value = '';
+        }
+        selectedWorkspaceScope = ALL_SCOPE_VALUE;
+        selectedProjectScope = ALL_SCOPE_VALUE;
+        renderGlobalLaunchHeaderAndCards();
+        setView('passports');
+        renderPassportsRows();
+        const filtered = getPassportItemsFiltered();
+        if (filtered.length > 0) {
+          selectedPassportId = filtered[0].id;
+          renderPassportsRows();
+          setActivityMessage(
+            query
+              ? ('Showing local passports that match ' + query + '.')
+              : 'Showing available local passports for reuse.',
+            'ok',
+          );
+        } else {
+          setActivityMessage(
+            query
+              ? ('No local passport matches ' + query + ' yet. Check existing Forkit.dev records or free local capacity first.')
+              : 'No local passports are available yet. Check existing Forkit.dev records or free local capacity first.',
+            'warn',
+          );
+        }
+        if (searchInput) {
+          searchInput.focus();
+          searchInput.select();
+        }
+        if (prefix === 'quick-review') {
+          setQuickReviewPanelOpen(false);
+        }
+        return;
+      }
+      if (action === 'scope' && item) {
+        if (prefix === 'quick-review') {
+          setQuickReviewPanelOpen(false);
+        }
+        await openRegistrationScopeDialog(item);
+      }
+    }
+
     function setQuickReviewOptionsOpen(open) {
       const button = document.getElementById('quick-review-options');
       const menu = document.getElementById('quick-review-options-menu');
@@ -7459,6 +7789,7 @@ function renderLauncherHtml(launcherToken) {
         anchor.hidden = true;
         setQuickReviewPanelOpen(false);
         quickReviewScopeCacheKey = null;
+        resetReviewResolutionActions('quick-review');
         return;
       }
 
@@ -7470,22 +7801,14 @@ function renderLauncherHtml(launcherToken) {
       setText('quick-review-title', item.name);
       setText('quick-review-badge', item.kind === 'runtime' ? 'Runtime' : item.kind === 'agent' ? 'Agent' : 'Model');
       setText('quick-review-meta', item.subtitle + ' · ' + item.source);
-      setText('quick-review-detail', item.detailSummary || item.statusMeta || 'Review local metadata, then decide what happens next.');
+      setText('quick-review-detail', getReviewDetailText(item));
       setQuickReviewStatus(item.statusLabel + (item.statusMeta ? ' · ' + item.statusMeta : ''), item.statusTone === 'muted' ? '' : item.statusTone);
+      resetReviewResolutionActions('quick-review');
 
-      const opensExisting = item.kind === 'runtime' || item.actionLabel === 'Open' || item.actionLabel === 'Review';
-      const primaryLabel = item.kind === 'runtime'
-        ? 'Open runtime review'
-        : opensExisting
-        ? (item.passportGaid || item.matchedPassportGaid ? 'Open passport' : 'Review in context')
-        : 'Approve & register';
+      const primaryLabel = getReviewPrimaryLabel(item);
       setText(
         'quick-review-action-summary',
-        item.kind === 'runtime'
-          ? 'Open runtime lane'
-          : opensExisting
-          ? (item.passportGaid || item.matchedPassportGaid ? 'Open linked passport' : 'Open full review')
-          : 'Approve and register here',
+        getReviewActionSummary(item),
       );
       if (primaryButton) {
         primaryButton.textContent = primaryLabel;
@@ -7594,17 +7917,19 @@ function renderLauncherHtml(launcherToken) {
       });
       if (primaryButton) primaryButton.disabled = false;
       if (!result.ok) {
-        setQuickReviewStatus(result.message || 'Registration failed.', 'warn');
-        setActivityMessage(result.message || 'Registration failed.', 'warn');
+        const feedback = formatLauncherActionFeedback(result, 'Registration failed.');
+        setQuickReviewStatus(feedback.message, 'warn');
+        setActivityMessage(feedback.activity, 'warn');
+        if (feedback.actionSummary) {
+          setText('quick-review-action-summary', feedback.actionSummary);
+        }
+        setReviewResolutionActions('quick-review', feedback.resolutionActions || []);
         return;
       }
+      resetReviewResolutionActions('quick-review');
       setQuickReviewStatus(result.message || 'Registration updated.', 'ok');
-      setActivityMessage(result.message || 'Registration updated.', 'ok');
-      await refreshAll();
       setQuickReviewPanelOpen(false);
-      if (result.gaid || result.passportGaid) {
-        await openDiscoveryContext(item);
-      }
+      await completeRegistrationSuccess(item, result);
     }
 
     async function submitQuickReviewDefer() {
@@ -7620,6 +7945,7 @@ function renderLauncherHtml(launcherToken) {
       setQuickReviewStatus(result.message || 'Review deferred.', result.ok ? 'ok' : 'warn');
       setActivityMessage(result.message || 'Review deferred.', result.ok ? 'ok' : 'warn');
       await refreshAll();
+      resetReviewResolutionActions('quick-review');
       setQuickReviewOptionsOpen(false);
     }
 
@@ -7636,6 +7962,7 @@ function renderLauncherHtml(launcherToken) {
       setQuickReviewStatus(result.message || 'Item ignored locally.', result.ok ? 'ok' : 'warn');
       setActivityMessage(result.message || 'Item ignored locally.', result.ok ? 'ok' : 'warn');
       await refreshAll();
+      resetReviewResolutionActions('quick-review');
       setQuickReviewOptionsOpen(false);
     }
 
@@ -7703,26 +8030,23 @@ function renderLauncherHtml(launcherToken) {
         setText('discovery-review-detail', 'Registering creates or updates a Forkit Passport. Nothing is published automatically.');
         if (scopeWrap) scopeWrap.hidden = true;
         setDiscoveryReviewStatus('Select an item to continue.', '');
+        resetReviewResolutionActions('discovery-review');
         setDiscoveryReviewButtons({ primaryLabel: 'Review', primaryEnabled: false, deferEnabled: false, ignoreEnabled: false });
         return;
       }
 
       const typeLabel = item.typeLabel || item.kind;
       const needsScope = canReviewRegister(item);
-      const opensExisting = item.actionLabel === 'Open' || item.actionLabel === 'Review';
-      const primaryLabel = item.kind === 'runtime'
-        ? 'Open runtime review'
-        : opensExisting
-        ? (item.passportGaid || item.matchedPassportGaid ? 'Open passport' : 'Review in context')
-        : 'Approve and register';
+      const primaryLabel = getReviewPrimaryLabel(item);
 
       setText('discovery-review-kicker', typeLabel);
       setText('discovery-review-title', item.name);
       setText('discovery-review-meta', item.subtitle + ' · ' + item.source);
-      setText('discovery-review-detail', item.detailSummary || item.statusMeta || 'Review local metadata, then decide what happens next.');
+      setText('discovery-review-detail', getReviewDetailText(item));
       setDiscoveryReviewStatus(item.statusLabel + (item.statusMeta ? ' · ' + item.statusMeta : ''), item.statusTone === 'muted' ? '' : item.statusTone);
+      resetReviewResolutionActions('discovery-review');
       setDiscoveryReviewButtons({
-        primaryLabel,
+        primaryLabel: getReviewPrimaryLabel(item),
         primaryEnabled: item.inboxGroup !== 'ignored',
         deferEnabled: canReviewDefer(item),
         ignoreEnabled: canReviewIgnore(item),
@@ -7812,16 +8136,15 @@ function renderLauncherHtml(launcherToken) {
       });
       if (primaryButton) primaryButton.disabled = false;
       if (!result.ok) {
-        setDiscoveryReviewStatus(result.message || 'Registration failed.', 'warn');
-        setActivityMessage(result.message || 'Registration failed.', 'warn');
+        const feedback = formatLauncherActionFeedback(result, 'Registration failed.');
+        setDiscoveryReviewStatus(feedback.message, 'warn');
+        setActivityMessage(feedback.activity, 'warn');
+        setReviewResolutionActions('discovery-review', feedback.resolutionActions || []);
         return;
       }
+      resetReviewResolutionActions('discovery-review');
       setDiscoveryReviewStatus(result.message || 'Registration updated.', 'ok');
-      setActivityMessage(result.message || 'Registration updated.', 'ok');
-      await refreshAll();
-      if (result.gaid || result.passportGaid) {
-        await openDiscoveryContext(item);
-      }
+      await completeRegistrationSuccess(item, result);
     }
 
     async function submitDiscoveryReviewDefer() {
@@ -7837,6 +8160,7 @@ function renderLauncherHtml(launcherToken) {
       setDiscoveryReviewStatus(result.message || 'Review deferred.', result.ok ? 'ok' : 'warn');
       setActivityMessage(result.message || 'Review deferred.', result.ok ? 'ok' : 'warn');
       await refreshAll();
+      resetReviewResolutionActions('discovery-review');
     }
 
     async function submitDiscoveryReviewIgnore() {
@@ -7852,6 +8176,7 @@ function renderLauncherHtml(launcherToken) {
       setDiscoveryReviewStatus(result.message || 'Item ignored locally.', result.ok ? 'ok' : 'warn');
       setActivityMessage(result.message || 'Item ignored locally.', result.ok ? 'ok' : 'warn');
       await refreshAll();
+      resetReviewResolutionActions('discovery-review');
     }
 
     function setProfileAvatar(rootId, imageId, initialsId, initials, avatarUrl) {
@@ -8562,6 +8887,30 @@ function renderLauncherHtml(launcherToken) {
       });
     }
 
+    function focusScopeField(fieldId) {
+      const field = document.getElementById(fieldId);
+      if (field && typeof field.focus === 'function') {
+        window.setTimeout(() => {
+          field.focus();
+          if (typeof field.select === 'function') {
+            field.select();
+          }
+        }, 0);
+      }
+    }
+
+    function openScopeCreateWorkspaceFlow(statusMessage, tone) {
+      toggleScopeCreatePanel('scope-create-workspace-panel', true);
+      setScopeStatus(statusMessage || 'Create a governed workspace for this registration flow.', tone || '');
+      focusScopeField('scope-create-workspace-name');
+    }
+
+    function openScopeCreateProjectFlow(statusMessage, tone) {
+      toggleScopeCreatePanel('scope-create-project-panel', true);
+      setScopeStatus(statusMessage || 'Create a governed project inside the selected workspace.', tone || '');
+      focusScopeField('scope-create-project-only-name');
+    }
+
     function setScopeCreateButtonsEnabled(enabled) {
       ['scope-open-create-workspace', 'scope-open-create-project'].forEach((id) => {
         const button = document.getElementById(id);
@@ -8574,11 +8923,11 @@ function renderLauncherHtml(launcherToken) {
     async function loadScopeProjects(workspaceId, selectedProjectId) {
       const projectSelect = document.getElementById('scope-project-select');
       const registerButton = document.getElementById('scope-register-button');
-      if (!projectSelect) return;
+      if (!projectSelect) return false;
       if (!workspaceId) {
         setScopeOptions(projectSelect, [{ id: '', label: 'Account scope / no project' }], '');
         if (registerButton) registerButton.disabled = false;
-        return;
+        return true;
       }
       setScopeOptions(projectSelect, [{ id: '', label: 'Loading projects...' }], '');
       try {
@@ -8591,21 +8940,37 @@ function renderLauncherHtml(launcherToken) {
         setScopeOptions(projectSelect, options, selectedProjectId || (options[0] && options[0].id) || '');
         if (!payload.ok) {
           setScopeStatus(payload.message || 'Project list unavailable. Create a project here, then retry.', 'warn');
+          return false;
         } else if (!projects.length) {
-          setScopeStatus('No governed project exists in this workspace yet. Create one here to continue.', 'warn');
+          openScopeCreateProjectFlow('No governed project exists in this workspace yet. Create one here to continue.', 'warn');
+          return false;
         }
         if (registerButton) {
           registerButton.disabled = !projects.length;
         }
+        return projects.length > 0;
       } catch {
         setScopeOptions(projectSelect, [{ id: '', label: 'Project list unavailable' }], '');
         setScopeStatus('Project list unavailable. Create a project here, then retry.', 'warn');
         if (registerButton) {
           registerButton.disabled = true;
         }
+        return false;
       }
     }
 
+    async function continuePendingScopeRegistration(statusMessage) {
+      const item = pendingDiscoveryRegistration;
+      if (!item) return false;
+      const workspaceSelect = document.getElementById('scope-workspace-select');
+      const projectSelect = document.getElementById('scope-project-select');
+      const workspaceId = workspaceSelect ? String(workspaceSelect.value || '').trim() : '';
+      const projectId = projectSelect ? String(projectSelect.value || '').trim() : '';
+      if (!workspaceId || !projectId) return false;
+      setScopeStatus(statusMessage || 'Continuing registration…', 'warn');
+      return submitRegistrationScopeDialog();
+    }
+
     async function createScopeWorkspace() {
       const nameInput = document.getElementById('scope-create-workspace-name');
       const descriptionInput = document.getElementById('scope-create-workspace-description');
@@ -8638,12 +9003,20 @@ function renderLauncherHtml(launcherToken) {
       if (firstProjectInput) firstProjectInput.value = '';
       toggleScopeCreatePanel(null, false);
       const workspaceSelect = document.getElementById('scope-workspace-select');
+      const projectSelect = document.getElementById('scope-project-select');
       const createdWorkspaceId = result.workspace && result.workspace.id ? result.workspace.id : '';
+      const createdProjectId = result.project && result.project.id ? result.project.id : '';
       scopeAccessSnapshot = result.scope || scopeAccessSnapshot;
       if (workspaceSelect && createdWorkspaceId) {
         await openRegistrationScopeDialog(pendingDiscoveryRegistration);
         workspaceSelect.value = createdWorkspaceId;
-        await loadScopeProjects(createdWorkspaceId, result.project && result.project.id ? result.project.id : '');
+        const hasProjects = await loadScopeProjects(createdWorkspaceId, createdProjectId);
+        if (projectSelect && createdProjectId) {
+          projectSelect.value = createdProjectId;
+        }
+        if (hasProjects && createdProjectId && await continuePendingScopeRegistration('Workspace and project created. Continuing registration...')) {
+          return;
+        }
       }
       setScopeStatus(result.message || 'Workspace created.', 'ok');
     }
@@ -8681,10 +9054,14 @@ function renderLauncherHtml(launcherToken) {
       if (nameInput) nameInput.value = '';
       if (descriptionInput) descriptionInput.value = '';
       toggleScopeCreatePanel(null, false);
-      await loadScopeProjects(workspaceId, result.project && result.project.id ? result.project.id : '');
+      const createdProjectId = result.project && result.project.id ? result.project.id : '';
+      const hasProjects = await loadScopeProjects(workspaceId, createdProjectId);
       const projectSelect = document.getElementById('scope-project-select');
-      if (projectSelect && result.project && result.project.id) {
-        projectSelect.value = result.project.id;
+      if (projectSelect && createdProjectId) {
+        projectSelect.value = createdProjectId;
+      }
+      if (hasProjects && createdProjectId && await continuePendingScopeRegistration('Project created. Continuing registration...')) {
+        return;
       }
       setScopeStatus(result.message || 'Project created.', 'ok');
     }
@@ -8730,18 +9107,20 @@ function renderLauncherHtml(launcherToken) {
         if (governedMode && !options.length) {
           options.push({ id: '', label: 'No governed workspaces yet' });
           registerButton.disabled = true;
-          setScopeStatus('No governed workspace exists yet. Create one here to continue.', 'warn');
+          openScopeCreateWorkspaceFlow('No governed workspace exists yet. Create one here to continue.', 'warn');
         }
         const selectedWorkspace = payload.currentWorkspaceId || (options[0] && options[0].id) || '';
         setScopeOptions(workspaceSelect, options, selectedWorkspace);
-        await loadScopeProjects(workspaceSelect.value, payload.currentProjectId || '');
-        registerButton.disabled = !payload.ok || (governedMode && !String(workspaceSelect.value || '').trim());
-        setScopeStatus(
-          payload.ok
-            ? (governedMode ? 'Ready to register in governed scope.' : 'Ready to register.')
-            : (payload.message || (governedMode ? 'Workspace list unavailable.' : 'Workspace list unavailable. Account scope is still available.')),
-          payload.ok ? '' : 'warn',
-        );
+        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.', '');
+        } else if (!payload.ok) {
+          setScopeStatus(
+            payload.message || (governedMode ? 'Workspace list unavailable.' : 'Workspace list unavailable. Account scope is still available.'),
+            'warn',
+          );
+        }
       } catch {
         setScopeOptions(workspaceSelect, governedMode ? [] : [{ id: '', label: 'Account scope / no workspace' }], '');
         await loadScopeProjects(governedMode ? (workspaceSelect.value || '') : '', '');
@@ -8761,7 +9140,7 @@ function renderLauncherHtml(launcherToken) {
 
     async function submitRegistrationScopeDialog() {
       const item = pendingDiscoveryRegistration;
-      if (!item) return;
+      if (!item) return false;
       const workspaceSelect = document.getElementById('scope-workspace-select');
       const projectSelect = document.getElementById('scope-project-select');
       const registerButton = document.getElementById('scope-register-button');
@@ -8769,7 +9148,7 @@ function renderLauncherHtml(launcherToken) {
       const projectId = projectSelect ? projectSelect.value : '';
       if (workspaceId && !projectId) {
         setScopeStatus('Select a project for the chosen workspace, or use account scope.', 'warn');
-        return;
+        return false;
       }
       if (registerButton) registerButton.disabled = true;
       const endpoint = item.kind === 'agent' ? '/api/discovery/connect-agent' : '/api/discovery/connect-model';
@@ -8781,14 +9160,14 @@ function renderLauncherHtml(launcherToken) {
       });
       if (registerButton) registerButton.disabled = false;
       if (!result.ok) {
-        setScopeStatus(result.message || 'Registration failed.', 'warn');
-        setActivityMessage(result.message || 'Registration failed.', 'warn');
-        return;
+        const feedback = formatLauncherActionFeedback(result, 'Registration failed.');
+        setScopeStatus(feedback.message, 'warn');
+        setActivityMessage(feedback.activity, 'warn');
+        return false;
       }
       closeRegistrationScopeDialog();
-      setActivityMessage(result.message || 'Registration updated.', 'ok');
-      await refreshAll();
-      setView('passports');
+      await completeRegistrationSuccess(item, result);
+      return true;
     }
 
     const VIEW_TITLES = {
@@ -9640,6 +10019,18 @@ function renderLauncherHtml(launcherToken) {
         void submitQuickReviewPrimary();
       });
     }
+    const quickReviewResolutionPrimary = document.getElementById('quick-review-resolution-primary');
+    if (quickReviewResolutionPrimary) {
+      quickReviewResolutionPrimary.addEventListener('click', () => {
+        void handleReviewResolutionAction('quick-review', String(quickReviewResolutionPrimary.dataset.action || '').trim());
+      });
+    }
+    const quickReviewResolutionSecondary = document.getElementById('quick-review-resolution-secondary');
+    if (quickReviewResolutionSecondary) {
+      quickReviewResolutionSecondary.addEventListener('click', () => {
+        void handleReviewResolutionAction('quick-review', String(quickReviewResolutionSecondary.dataset.action || '').trim());
+      });
+    }
     const quickReviewOptionsButton = document.getElementById('quick-review-options');
     if (quickReviewOptionsButton) {
       quickReviewOptionsButton.addEventListener('click', (event) => {
@@ -9706,6 +10097,18 @@ function renderLauncherHtml(launcherToken) {
         void submitDiscoveryReviewPrimary();
       });
     }
+    const discoveryReviewResolutionPrimary = document.getElementById('discovery-review-resolution-primary');
+    if (discoveryReviewResolutionPrimary) {
+      discoveryReviewResolutionPrimary.addEventListener('click', () => {
+        void handleReviewResolutionAction('discovery-review', String(discoveryReviewResolutionPrimary.dataset.action || '').trim());
+      });
+    }
+    const discoveryReviewResolutionSecondary = document.getElementById('discovery-review-resolution-secondary');
+    if (discoveryReviewResolutionSecondary) {
+      discoveryReviewResolutionSecondary.addEventListener('click', () => {
+        void handleReviewResolutionAction('discovery-review', String(discoveryReviewResolutionSecondary.dataset.action || '').trim());
+      });
+    }
     const discoveryReviewDeferBtn = document.getElementById('discovery-review-defer');
     if (discoveryReviewDeferBtn) {
       discoveryReviewDeferBtn.addEventListener('click', () => {
@@ -9896,12 +10299,10 @@ function renderLauncherHtml(launcherToken) {
       });
     });
     document.getElementById('scope-open-create-workspace').addEventListener('click', () => {
-      toggleScopeCreatePanel('scope-create-workspace-panel', true);
-      setScopeStatus('Create a governed workspace for this registration flow.', '');
+      openScopeCreateWorkspaceFlow('Create a governed workspace for this registration flow.', '');
     });
     document.getElementById('scope-open-create-project').addEventListener('click', () => {
-      toggleScopeCreatePanel('scope-create-project-panel', true);
-      setScopeStatus('Create a governed project inside the selected workspace.', '');
+      openScopeCreateProjectFlow('Create a governed project inside the selected workspace.', '');
     });
     document.getElementById('scope-cancel-create-workspace').addEventListener('click', () => {
       toggleScopeCreatePanel(null, false);
@@ -10411,8 +10812,13 @@ function createLauncherApp(options) {
             });
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : 'model_connect_failed';
-            response.status(400).json({ ok: false, message });
+            const normalizedFailure = normalizeDiscoveryRegistrationFailure(error instanceof Error ? error.message : 'model_connect_failed');
+            response.status(400).json({
+                ok: false,
+                code: normalizedFailure.code,
+                message: normalizedFailure.message,
+                nextActions: normalizedFailure.nextActions ?? [],
+            });
         }
     });
     app.post('/api/discovery/connect-agent', async (request, response) => {
@@ -10445,15 +10851,14 @@ function createLauncherApp(options) {
                 ? String(agentMetadata.registration_error_status)
                 : safeStringRecordValue(agentMetadata, ['registration_error_status', 'registrationErrorStatus']);
             if (trackingStatus === 'registration_failed') {
-                const message = registrationErrorMessage
-                    || (registrationErrorCode
-                        ? ('Agent registration failed: ' + registrationErrorCode + '.')
-                        : registrationErrorStatus
-                            ? ('Agent registration failed with backend status ' + registrationErrorStatus + '.')
-                            : 'Agent registration failed.');
+                const normalizedFailure = normalizeDiscoveryRegistrationFailure(registrationErrorCode
+                    || registrationErrorMessage
+                    || (registrationErrorStatus ? `DRAFT_CREATE_FAILED:${registrationErrorStatus}` : 'agent_connect_failed'));
                 response.json({
                     ok: false,
-                    message,
+                    code: normalizedFailure.code,
+                    message: normalizedFailure.message,
+                    nextActions: normalizedFailure.nextActions ?? [],
                     agentId: agent.agent_id,
                     agentName: agent.agent_name,
                     action: 'retry',
@@ -10480,8 +10885,13 @@ function createLauncherApp(options) {
             });
         }
         catch (error) {
-            const message = error instanceof Error ? error.message : 'agent_connect_failed';
-            response.status(400).json({ ok: false, message });
+            const normalizedFailure = normalizeDiscoveryRegistrationFailure(error instanceof Error ? error.message : 'agent_connect_failed');
+            response.status(400).json({
+                ok: false,
+                code: normalizedFailure.code,
+                message: normalizedFailure.message,
+                nextActions: normalizedFailure.nextActions ?? [],
+            });
         }
     });
     app.post('/api/discovery/review/defer', (request, response) => {