Add Nav-I dashboard section with restore-as conflict resolution

- Create Nav-I top-level section in dashboard navigation
- Move Deleted Contacts from Knowledge subnav to Nav-I
- Add Nav-I landing page with card grid (deleted count, API keys stub)
- Add /nav-i/api-keys placeholder page
- Add restore-as endpoint for Home/Work conflict resolution
- Conflict modal in deleted contacts template for label rename on restore

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

lib/api.py

@@ -82,7 +82,6 @@ KNOWLEDGE_SUBNAV = [
     {'href': '/upload', 'label': 'Upload'},
     {'href': '/web-ingest', 'label': 'Web Ingest'},
     {'href': '/failures', 'label': 'Failures'},
-    {'href': '/deleted-contacts', 'label': 'Deleted Contacts'},
 ]
 
 PEERTUBE_SUBNAV = [
@@ -102,6 +101,12 @@ SETTINGS_SUBNAV = [
     {'href': '/settings/health', 'label': 'Service Health'},
 ]
 
+NAVI_SUBNAV = [
+    {'href': '/nav-i', 'label': 'Overview'},
+    {'href': '/deleted-contacts', 'label': 'Deleted Contacts'},
+    {'href': '/nav-i/api-keys', 'label': 'API Keys'},
+]
+
 
 def _format_source_citation(payload):
     """Format a human-readable citation from a search result payload."""
@@ -335,11 +340,29 @@ def deleted_contacts_page():
     user_id = get_user_id() or "anonymous"
     db = ContactsDB()
     contacts = db.list_deleted(user_id)
-    return render_template("knowledge/deleted_contacts.html",
-                           domain="knowledge", subnav=KNOWLEDGE_SUBNAV, active_page="/deleted-contacts",
+    return render_template("navi/deleted_contacts.html",
+                           domain="navi", subnav=NAVI_SUBNAV, active_page="/deleted-contacts",
                            contacts=contacts)
 
 
+@app.route("/nav-i")
+def navi_landing_page():
+    from .auth import get_user_id
+    from .contacts import ContactsDB
+    user_id = get_user_id() or "anonymous"
+    db = ContactsDB()
+    deleted_count = len(db.list_deleted(user_id))
+    return render_template("navi/landing.html",
+                           domain="navi", subnav=NAVI_SUBNAV, active_page="/nav-i",
+                           deleted_count=deleted_count)
+
+
+@app.route("/nav-i/api-keys")
+def navi_api_keys_page():
+    return render_template("navi/api_keys.html",
+                           domain="navi", subnav=NAVI_SUBNAV, active_page="/nav-i/api-keys")
+
+
 @app.route('/peertube')
 def peertube_dashboard():
     return render_template('peertube/dashboard.html',

lib/contacts.py

@@ -178,6 +178,25 @@ class ContactsDB:
         conn.commit()
         return self.get(user_id, contact_id), None
 
+    def restore_as(self, user_id, contact_id, new_label):
+        """Restore a soft-deleted contact with a new label (for Home/Work conflict resolution)."""
+        conn = self._get_conn()
+        row = self.get(user_id, contact_id, include_deleted=True)
+        if not row or not row.get('deleted_at'):
+            return None, 'not_found'
+        if not new_label or not new_label.strip():
+            return None, 'invalid_label'
+        now = datetime.now(timezone.utc).strftime('%Y-%m-%dT%H:%M:%fZ')
+        try:
+            conn.execute(
+                "UPDATE contacts SET deleted_at = NULL, deleted_by = NULL, label = ?, updated_at = ? WHERE id = ? AND user_id = ?",
+                (new_label.strip(), now, contact_id, user_id)
+            )
+            conn.commit()
+        except sqlite3.IntegrityError:
+            return None, 'conflict'
+        return self.get(user_id, contact_id), None
+
     def purge(self, user_id, contact_id):
         conn = self._get_conn()
         row = self.get(user_id, contact_id, include_deleted=True)

lib/contacts_api.py

@@ -102,6 +102,24 @@ def restore_contact(contact_id):
     return jsonify(contact)
 
 
+@contacts_bp.route('/api/contacts/<int:contact_id>/restore-as', methods=['POST'])
+@require_auth
+def restore_as_contact(contact_id):
+    db = _get_db()
+    data = request.get_json(force=True)
+    new_label = data.get('label', '').strip()
+    if not new_label:
+        return jsonify({'error': 'label is required'}), 400
+    contact, err = db.restore_as(request.user_id, contact_id, new_label)
+    if err == 'not_found':
+        return jsonify({'error': 'Not found'}), 404
+    if err == 'invalid_label':
+        return jsonify({'error': 'Invalid label'}), 400
+    if err == 'conflict':
+        return jsonify({'error': 'Label conflict'}), 409
+    return jsonify(contact)
+
+
 @contacts_bp.route('/api/contacts/<int:contact_id>/purge', methods=['DELETE'])
 @require_auth
 def purge_contact(contact_id):