fix(rebase): post-rebase cleanup for settings, schema test, and resolver tests

Drop stale publicUrl draft load after dev-rebased gateway settings split,
bump fork reconcile migration expectation to v35, align pinned-header
resolver test with deny-by-default Unbound, and fix binding prompt test
assertions after panel UI copy change.

Signed-off-by: crimsonsunset <jsangio1@gmail.com>

Author: crimsonsunset

apps/desktop/src/features/settings/SettingsPage.tsx

@@ -210,9 +210,7 @@ export function SettingsPage() {
       const s = await getGatewayPortSettings();
       setPortSettings(s);
       setPortDraft(String(s.configuredPort ?? s.defaultPort));
-      setPublicUrlDraft(s.publicUrl ?? '');
       setPortError(null);
-      setPublicUrlError(null);
     } catch (err) {
       console.error('Failed to load gateway port settings:', err);
     }

crates/mcpmux-storage/src/database.rs

@@ -748,7 +748,7 @@ mod tests {
                 |row| row.get(0),
             )
             .unwrap();
-        assert_eq!(version, 34);
+        assert_eq!(version, 35);
 
         let v16_name: String = db
             .conn
@@ -801,7 +801,7 @@ mod tests {
                 |row| row.get(0),
             )
             .unwrap();
-        assert_eq!(version, 34);
+        assert_eq!(version, 35);
 
         let v16_name: String = db
             .conn

tests/rust/tests/integration/feature_set_resolver.rs

@@ -822,15 +822,14 @@ async fn header_takes_priority_but_reported_roots_still_map_without_one() {
 }
 
 #[tokio::test]
-async fn pinned_header_root_without_binding_falls_back_to_space_default() {
-    // A header root for an as-yet-unmapped folder still works out of the box on
-    // the Space default (upstream emits WorkspaceNeedsBinding so the user can
-    // attach an explicit mapping).
+async fn pinned_header_root_without_binding_is_unbound() {
+    // A pinned header root with no binding is Tier 1b — deny by default.
+    // Upstream emits WorkspaceNeedsBinding so the user can attach a mapping.
     let f = Fixture::new().await;
     f.session_roots.set_pinned("s", test_root());
     let r = f.resolver.resolve(Some("s"), None, None).await.unwrap();
-    assert_eq!(r.source, ResolutionSource::SpaceDefault);
-    assert_eq!(r.feature_set_ids, vec![f.starter_fs_id.clone()]);
+    assert_eq!(r.source, ResolutionSource::Unbound);
+    assert!(r.feature_set_ids.is_empty());
     assert_eq!(r.space_id, Some(f.space_id));
 }
 

tests/ts/components/WorkspaceBindingPrompt.test.tsx

@@ -70,13 +70,16 @@ vi.mock('@/lib/backend/events', () => ({
   useWorkspaceEventListener: vi.fn(),
 }));
 
+vi.mock('@/hooks/use-viewer-identity.hook', () => ({
+  useViewerIdentity: () => ({ machineId: null, isLoading: false }),
+  ViewerIdentityProvider: ({ children }: { children: React.ReactNode }) => children,
+}));
+
 import { WorkspaceBindingPanel } from '@/features/workspaces/workspace-binding-panel.component';
 import { useBindingPanelStore } from '@/stores/bindingPanelStore';
 import { updateWorkspaceBinding, validateWorkspaceRoot } from '@/lib/api/workspaceBindings';
 import type { WorkspaceBinding } from '@/lib/api/workspaceBindings';
 
-const PROMPT_COPY = /You just opened this folder in a connected app/i;
-
 const EDIT_BINDING: WorkspaceBinding = {
   id: 'b1',
   workspace_root: '/home/u/proj',
@@ -144,7 +147,7 @@ describe('WorkspaceBindingPanel – mapping prompt toggle', () => {
     renderWithI18n(<WorkspaceBindingPanel />);
     await fireNeedsBinding();
     expect(await screen.findByTestId('workspace-binding-panel')).toBeTruthy();
-    expect(await screen.findByText(PROMPT_COPY)).toBeTruthy();
+    expect(await screen.findByTestId('workspace-binding-no-tools-banner')).toBeTruthy();
   });
 
   it('does NOT show the panel when the prompt setting is disabled', async () => {