Fix pre-existing CI failures (deps, lint, whitespace)

CI on main was already red before the crdt_sync migration. Make the
pre-commit --all-files run and the test job green:

- requirements.txt: add crdt-sync (now a runtime dep) and mcp so CI's
  `pip install -r requirements.txt` can import diet_guard._sync and
  collect test_mcp.py (both were ModuleNotFoundError in CI).
- .pre-commit-config.yaml: add mcp + pydantic to the pylint hook deps so
  it can resolve diet_guard._mcp's imports (was E0401).
- pyproject.toml: raise pylint min-similarity-lines to 8 — the shared
  nutrition-field keys in _foodbank/_mcp mirror one domain schema, not
  real duplicate code.
- scripts/setup_mcp.sh: split declare/assign for SCRIPT_DIR/REPO_DIR
  (shellcheck SC2155).
- codespell: fix "packge"/"unparseable" typos; trailing-whitespace
  auto-fixes across app/.agents/skills docs.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017RRCdR4D8SaVrN2xraMQxM

.pre-commit-config.yaml

@@ -94,6 +94,8 @@ repos:
           - requests
           - gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.1.0#subdirectory=gatelock
           - crdt-sync @ git+https://github.com/kuhyx/utils@crdt-sync-v0.1.0#subdirectory=crdt-sync
+          - mcp
+          - pydantic
         # Test suites intentionally use patterns (protected-access, magic-value
         # comparisons) that don't belong in the source-code 10/10 gate.
         exclude: ^(\.venv/)|(^|/)(tests/|conftest\.py)

app/.agents/skills/dart-collect-coverage/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: dart-collect-coverage
-description: Collect coverage using the coverage packge and create an LCOV report
+description: Collect coverage using the coverage package and create an LCOV report
 metadata:
   model: models/gemini-3.1-pro-preview
   last_modified: Fri, 24 Apr 2026 15:14:32 GMT

app/.agents/skills/dart-run-static-analysis/SKILL.md

@@ -98,7 +98,7 @@ void processData() {
   // Suppress for a specific line
   // ignore: invalid_assignment
   int x = '';
-  
+
   const y = 10; // ignore: constant_identifier_names
 }
 ```

app/.agents/skills/dart-setup-ffi-assets/SKILL.md

@@ -281,19 +281,19 @@ Future<File> downloadAsset(
 ) async {
   final fileName = targetOS.dylibFileName('native_add_${targetOS.name}_${targetArchitecture.name}');
   final uri = downloadUri(fileName);
-  
+
   final client = HttpClient()..findProxy = HttpClient.findProxyFromEnvironment;
   final request = await client.getUrl(uri);
   final response = await request.close();
-  
+
   if (response.statusCode != 200) {
     throw ArgumentError('Download target $uri failed: Code ${response.statusCode}');
   }
-  
+
   final targetFile = File.fromUri(outputDir.uri.resolve(fileName));
   await targetFile.create(recursive: true);
   await response.pipe(targetFile.openWrite());
-  
+
   return targetFile;
 }
 

app/.agents/skills/flutter-add-integration-test/SKILL.md

@@ -41,7 +41,7 @@ Use the Dart/Flutter MCP server tools to interactively explore and manipulate th
 
 ## Test Authoring Guidelines
 
-Structure integration tests using the `flutter_test` API paradigm. 
+Structure integration tests using the `flutter_test` API paradigm.
 
 - Create a dedicated `integration_test/` directory at the project root.
 - Name all test files using the `<name>_test.dart` convention.
@@ -63,7 +63,7 @@ Execute tests using the `flutter drive` command. Require a host driver script lo
   `flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart -d chrome`
 - **If testing headless web:** Run with `-d web-server`.
 - **If testing on Android (Local):** Run `flutter drive --driver=test_driver/integration_test.dart --target=integration_test/app_test.dart`.
-- **If testing on Firebase Test Lab (Android):** 
+- **If testing on Firebase Test Lab (Android):**
   1. Build debug APK: `flutter build apk --debug`
   2. Build test APK: `./gradlew app:assembleAndroidTest`
   3. Upload both APKs to the Firebase Test Lab console.

app/.agents/skills/flutter-add-widget-preview/SKILL.md

@@ -15,7 +15,7 @@ metadata:
 
 ## Preview Guidelines
 
-Use the Flutter Widget Previewer to render widgets in real-time, isolated from the full application context. 
+Use the Flutter Widget Previewer to render widgets in real-time, isolated from the full application context.
 
 - **Target Elements:** Apply the `@Preview` annotation to top-level functions, static methods within a class, or public widget constructors/factories that have no required arguments and return a `Widget` or `WidgetBuilder`.
 - **Imports:** Always import `package:flutter/widget_previews.dart` to access the preview annotations.
@@ -98,7 +98,7 @@ final class TransformativePreview extends Preview {
   Preview transform() {
     final originalPreview = super.transform();
     final builder = originalPreview.toBuilder();
-    
+
     builder
       ..name = 'Transformed - ${originalPreview.name}'
       ..theme = _themeBuilder;

app/.agents/skills/flutter-add-widget-test/SKILL.md

@@ -50,10 +50,10 @@ Copy the following checklist to track progress when implementing a new widget te
 Apply the following conditional logic based on the type of interaction or state change being tested:
 
 *   **If testing static rendering:** Call `await tester.pumpWidget()` once, then immediately run `expect()` assertions.
-*   **If testing standard state changes (e.g., button taps):** 
+*   **If testing standard state changes (e.g., button taps):**
     1. Call `await tester.tap(finder)`.
     2. Call `await tester.pump()` to trigger a single frame rebuild.
-*   **If testing animations, transitions, or asynchronous UI updates:** 
+*   **If testing animations, transitions, or asynchronous UI updates:**
     1. Trigger the action (e.g., `await tester.drag(finder, Offset(500, 0))`).
     2. Call `await tester.pumpAndSettle()` to repeatedly pump frames until no more frames are scheduled (animation completes).
 *   **If testing text input:** Call `await tester.enterText(textFieldFinder, 'Input string')`.

app/.agents/skills/flutter-apply-architecture-best-practices/SKILL.md

@@ -83,13 +83,13 @@ class ApiClient {
 // 2. Repository (Single source of truth, returns Domain Model)
 class UserRepository {
   UserRepository({required ApiClient apiClient}) : _apiClient = apiClient;
-  
+
   final ApiClient _apiClient;
   User? _cachedUser;
 
   Future<User> getUser(String id) async {
     if (_cachedUser != null) return _cachedUser!;
-    
+
     final apiModel = await _apiClient.fetchUser(id);
     _cachedUser = User(id: apiModel.id, name: apiModel.fullName); // Transform to Domain Model
     return _cachedUser!;
@@ -102,7 +102,7 @@ class UserRepository {
 ```dart
 // 3. ViewModel (State management and presentation logic)
 class ProfileViewModel extends ChangeNotifier {
-  ProfileViewModel({required UserRepository userRepository}) 
+  ProfileViewModel({required UserRepository userRepository})
       : _userRepository = userRepository;
 
   final UserRepository _userRepository;
@@ -140,7 +140,7 @@ class ProfileView extends StatelessWidget {
         if (viewModel.isLoading) {
           return const Center(child: CircularProgressIndicator());
         }
-        
+
         final user = viewModel.user;
         if (user == null) {
           return const Center(child: Text('User not found'));

app/.agents/skills/flutter-fix-layout-issues/SKILL.md

@@ -14,7 +14,7 @@ metadata:
 
 ## Constraint Violation Diagnostics
 
-Flutter layout operates on a strict rule: **Constraints go down. Sizes go up. Parent sets position.** Layout errors occur when this negotiation fails, typically due to unbounded constraints or unconstrained children. 
+Flutter layout operates on a strict rule: **Constraints go down. Sizes go up. Parent sets position.** Layout errors occur when this negotiation fails, typically due to unbounded constraints or unconstrained children.
 
 Diagnose layout failures using the following error signatures:
 
@@ -85,7 +85,7 @@ Column(
 Row(
   children: [
     const Icon(Icons.search),
-    TextField(), 
+    TextField(),
   ],
 )
 ```

app/.agents/skills/flutter-implement-json-serialization/SKILL.md

@@ -48,7 +48,7 @@ Use this conditional workflow when retrieving and parsing JSON from a network re
 - [ ] Decode and map the JSON to the model.
 
 1. **Execute Request**: Use the `http` package to perform the network call.
-2. **Validate Response**: 
+2. **Validate Response**:
    - If `response.statusCode == 200` (or 201 for POST), proceed to parsing.
    - If the status code indicates failure, throw an `Exception`.
 3. **Determine Parsing Strategy**:
@@ -81,7 +81,7 @@ class User {
         'id': int id,
         'name': String name,
         'email': String email,
-      } => 
+      } =>
         User(
           id: id,
           name: name,

app/.agents/skills/flutter-setup-declarative-routing/SKILL.md

@@ -16,7 +16,7 @@ metadata:
 
 ## Core Concepts
 
-Use the `go_router` package for declarative routing in Flutter. It provides a robust API for complex routing scenarios, deep linking, and nested navigation. 
+Use the `go_router` package for declarative routing in Flutter. It provides a robust API for complex routing scenarios, deep linking, and nested navigation.
 
 - **GoRouter**: The central configuration object defining the application's route tree.
 - **GoRoute**: A standard route mapping a URL path to a Flutter screen.
@@ -120,7 +120,7 @@ Configure the native platforms to intercept specific URLs and route them into th
 ```
 
 ### If configuring for iOS:
-1. **Modify `Info.plist`**: Opt-in to Flutter's default deep link handler. 
+1. **Modify `Info.plist`**: Opt-in to Flutter's default deep link handler.
 *Note: If using a third-party deep linking plugin (e.g., `app_links`), set this to `NO` to prevent conflicts.*
 ```xml
 <key>FlutterDeepLinkingEnabled</key>

app/.agents/skills/flutter-setup-localization/SKILL.md

@@ -190,8 +190,8 @@ class GreetingWidget extends StatelessWidget {
   final int notificationCount;
 
   const GreetingWidget({
-    super.key, 
-    required this.userName, 
+    super.key,
+    required this.userName,
     required this.notificationCount,
   });
 

app/.agents/skills/flutter-use-http-package/SKILL.md

@@ -43,7 +43,7 @@ Execute HTTP operations and map responses to strongly typed Dart objects.
 *   **URIs:** Always parse URL strings using `Uri.parse('your_url')`.
 *   **Headers:** Inject authorization and content-type headers via the `headers` parameter map. Use `HttpHeaders.authorizationHeader` for auth tokens.
 *   **Payloads:** For POST and PUT requests, encode the body using `jsonEncode()` from `dart:convert`.
-*   **Status Validation:** Evaluate `response.statusCode`. Treat `200 OK` (GET/PUT/DELETE) and `201 CREATED` (POST) as success. 
+*   **Status Validation:** Evaluate `response.statusCode`. Treat `200 OK` (GET/PUT/DELETE) and `201 CREATED` (POST) as success.
 *   **Error Handling:** Throw explicit exceptions for non-success status codes. Never return `null` on failure, as this prevents `FutureBuilder` from triggering its error state and causes infinite loading indicators.
 *   **Deserialization:** Parse the raw string using `jsonDecode(response.body)` and map it to a custom Dart object using a factory constructor (e.g., `fromJson`).
 
@@ -164,7 +164,7 @@ class _PhotoGalleryState extends State<PhotoGallery> {
         } else if (snapshot.hasError) {
           return Center(child: Text('Error: ${snapshot.error}'));
         }
-        
+
         // Default loading state
         return const Center(child: CircularProgressIndicator());
       },

app/test/screens/history_screen_test.dart

@@ -976,7 +976,7 @@ void main() {
   );
 
   testWidgets(
-    '_formatDay falls back to raw key for an unparseable date (line 245)',
+    '_formatDay falls back to raw key for an unparsable date (line 245)',
     (tester) async {
       await tester.runAsync(() async {
         // The day key is e.time.substring(0, 10). Writing an entry whose

app/test/services/app_settings_service_test.dart

@@ -82,7 +82,7 @@ void main() {
       expect(AppSettingsService.dailyKcalGoal, 2200);
     });
 
-    test('keeps default 2200 on unparseable JSON', () async {
+    test('keeps default 2200 on unparsable JSON', () async {
       await File(
         '${tempDir.path}/app_settings.json',
       ).writeAsString('not json at all');

pyproject.toml

@@ -127,6 +127,13 @@ min-public-methods = 0
 max-module-lines = 1000
 max-attributes = 10
 
+[tool.pylint.similarities]
+# _foodbank's BankRecord and _mcp's response dict both list the same five
+# nutrition fields (kcal/protein_g/carbs_g/fat_g/grams) because they mirror the
+# same domain schema, then diverge (desc/count vs source). Raise the threshold
+# so pylint doesn't flag this intentional structural overlap as duplicate-code.
+min-similarity-lines = 8
+
 [tool.pylint.typecheck]
 generated-members = [
     ".*\\.assert_called_once_with",

requirements.txt

@@ -3,7 +3,9 @@
 bandit>=1.7.0
 codespell>=2.2.0
 coverage>=7.4.0
+crdt-sync @ git+https://github.com/kuhyx/utils@crdt-sync-v0.1.0#subdirectory=crdt-sync
 gatelock @ git+https://github.com/kuhyx/utils@gatelock-v0.1.0#subdirectory=gatelock
+mcp>=1.9
 mypy>=1.8.0
 pre-commit>=3.6.0
 pylint>=3.0.0

scripts/setup_mcp.sh

@@ -17,8 +17,10 @@
 
 set -euo pipefail
 
-readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+readonly SCRIPT_DIR
+REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
+readonly REPO_DIR
 readonly VENV_DIR="${HOME}/.venvs/diet-guard-mcp"
 
 main() {