Merge main into feat/extend-models-support

Resolved conflicts:
- feature_list.json: Merged all features from both branches
- feature-loader.js: Included both model/thinkingLevel and error fields
- board-view.tsx: Merged model/thinkingLevel and error fields, kept currentProject check
- settings-view.tsx: Merged CLI status checks with navigation/scroll code
- app-store.ts: Included both model/thinkingLevel and error fields in Feature interface

Fixed linting errors in settings-view.tsx

app/electron/services/feature-loader.js

@@ -36,8 +36,9 @@ class FeatureLoader {
    * @param {string} status - The new status
    * @param {string} projectPath - Path to the project
    * @param {string} [summary] - Optional summary of what was done
+   * @param {string} [error] - Optional error message if feature errored
    */
-  async updateFeatureStatus(featureId, status, projectPath, summary) {
+  async updateFeatureStatus(featureId, status, projectPath, summary, error) {
     const featuresPath = path.join(
       projectPath,
       ".automaker",
@@ -98,6 +99,14 @@ class FeatureLoader {
       feature.summary = summary;
     }
 
+    // Update the error field (set or clear)
+    if (error) {
+      feature.error = error;
+    } else {
+      // Clear any previous error when status changes without error
+      delete feature.error;
+    }
+
     // Save back to file
     const toSave = features.map((f) => {
       const featureData = {
@@ -129,6 +138,9 @@ class FeatureLoader {
       if (f.thinkingLevel !== undefined) {
         featureData.thinkingLevel = f.thinkingLevel;
       }
+      if (f.error !== undefined) {
+        featureData.error = f.error;
+      }
       return featureData;
     });