@cat-factory/app 0.157.0 → 0.158.1

package/app/composables/api/notifications.ts

@@ -3,6 +3,7 @@ import {
   dismissNotificationContract,
   listNotificationsContract,
 } from '@cat-factory/contracts'
+import type { ReviewEffort } from '~/types/merge'
 import type { ApiContext } from './context'
 
 /** The human-actionable notification inbox (act / dismiss). */
@@ -12,11 +13,14 @@ export function notificationsApi({ send, ws }: ApiContext) {
     listNotifications: (workspaceId: string) =>
       send(listNotificationsContract, { pathPrefix: ws(workspaceId) }),
 
-    // Act on a notification (merge the PR / confirm / retry), then resolve it.
-    actNotification: (workspaceId: string, id: string) =>
+    // Act on a notification (merge the PR / confirm / retry), then resolve it. On a merge card,
+    // `reviewEffort` records how much review the PR actually needed onto the run's merge track
+    // record in the SAME request — always optional (an untagged merge records a null tag).
+    actNotification: (workspaceId: string, id: string, reviewEffort?: ReviewEffort | null) =>
       send(actNotificationContract, {
         pathPrefix: ws(workspaceId),
         pathParams: { notificationId: id },
+        body: reviewEffort === undefined ? {} : { reviewEffort },
       }),
 
     // Dismiss a notification without acting.

package/app/composables/api/presets.ts

@@ -1,5 +1,7 @@
 import {
   createRiskPolicyContract,
+  listMergeClassRollupsContract,
+  tagMergeReviewEffortContract,
   createModelPresetContract,
   deleteRiskPolicyContract,
   deleteModelPresetContract,
@@ -10,7 +12,7 @@ import {
   updateRiskPolicyContract,
   updateModelPresetContract,
 } from '@cat-factory/contracts'
-import type { UpdateRiskPolicyInput } from '~/types/merge'
+import type { ReviewEffort, UpdateRiskPolicyInput } from '~/types/merge'
 import type { CreateModelPresetInput, UpdateModelPresetInput } from '~/types/model-presets'
 import type { SendParams } from './client'
 import type { ApiContext } from './context'
@@ -45,6 +47,24 @@ export function presetsApi({ send, ws }: ApiContext) {
     reseedRiskPolicy: (workspaceId: string, presetId: string) =>
       send(reseedRiskPolicyContract, { pathPrefix: ws(workspaceId), pathParams: { presetId } }),
 
+    // ---- merge track record (the per-class evidence behind the policy) -----
+    // Every class in ONE request (a single SQL aggregate server-side), so the preset editor can
+    // show each class's rule next to the numbers that justify widening it without fanning out.
+    listMergeClassRollups: (workspaceId: string) =>
+      send(listMergeClassRollupsContract, { pathPrefix: ws(workspaceId) }),
+
+    // Tag (or clear) how much review a merged PR actually needed.
+    tagMergeReviewEffort: (
+      workspaceId: string,
+      recordId: string,
+      reviewEffort: ReviewEffort | null,
+    ) =>
+      send(tagMergeReviewEffortContract, {
+        pathPrefix: ws(workspaceId),
+        pathParams: { recordId },
+        body: { reviewEffort },
+      }),
+
     // ---- model presets (per-task model->agent mapping library) ------------
     listModelPresets: (workspaceId: string) =>
       send(listModelPresetsContract, { pathPrefix: ws(workspaceId) }),

package/app/stores/execution/commands.ts

@@ -2,6 +2,7 @@ import type { Ref } from 'vue'
 import type { ExecutionInstance, Pipeline } from '~/types/domain'
 import type { RequestStepChangesInput } from '@cat-factory/contracts'
 import type { IterationCapChoice } from '~/types/execution'
+import type { ReviewEffort } from '~/types/merge'
 import { useWorkspaceStore } from '~/stores/workspace'
 
 /**
@@ -125,11 +126,15 @@ export function createExecutionCommands(ctx: ExecutionCommandContext) {
     })
   }
 
-  /** Merge an open PR (a task in `pr_ready`) — the server completes the task. */
-  async function mergePr(blockId: string) {
+  /**
+   * Merge an open PR (a task in `pr_ready`) — the server completes the task. `reviewEffort` records
+   * how much review the PR actually needed onto its merge track record in the same request; always
+   * optional (an untagged merge records a null tag and nothing downstream breaks).
+   */
+  async function mergePr(blockId: string, reviewEffort?: ReviewEffort | null) {
     const ws = useWorkspaceStore()
     try {
-      await api.mergeBlock(ws.requireId(), blockId)
+      await api.mergeBlock(ws.requireId(), blockId, reviewEffort)
       await ws.refresh()
     } catch (e) {
       runErrors.present(e, 'errors.action.mergeFailed')

package/app/stores/mergeTrackRecords.ts

@@ -0,0 +1,61 @@
+import { CHANGE_CLASSES, emptyMergeClassRollup } from '@cat-factory/contracts'
+import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
+import type { ChangeClass, MergeClassRollup, ReviewEffort } from '~/types/merge'
+import { useWorkspaceStore } from '~/stores/workspace'
+
+/**
+ * The merge track record's per-change-class rollups — the accumulated evidence a workspace widens
+ * its per-class auto-merge rules against, plus the reviewer-effort tag surface.
+ *
+ * Loaded on demand (NOT from the workspace snapshot): the rollups are a settings-screen and
+ * merge-card concern, not board state, and they change only when a merge settles. The whole set
+ * arrives in ONE request — a single SQL aggregate server-side — so the preset editor never fans
+ * out per class.
+ */
+export const useMergeTrackRecordsStore = defineStore('mergeTrackRecords', () => {
+  const api = useApi()
+
+  const rollups = ref<MergeClassRollup[]>([])
+  const loading = ref(false)
+  /** Whether a load has completed at least once, so the UI can tell "empty" from "not yet". */
+  const loaded = ref(false)
+
+  /**
+   * Every class keyed for lookup, filled in with zeros for a class the workspace has no records
+   * for. The backend already returns the full set; this keeps the UI total even before the first
+   * load resolves.
+   */
+  const byClass = computed<Record<ChangeClass, MergeClassRollup>>(() => {
+    const found = new Map(rollups.value.map((r) => [r.changeClass, r]))
+    return Object.fromEntries(
+      CHANGE_CLASSES.map((c) => [c, found.get(c) ?? emptyMergeClassRollup(c)]),
+    ) as Record<ChangeClass, MergeClassRollup>
+  })
+
+  /** Whether the workspace has ANY track record yet (drives the "no data yet" hint). */
+  const hasData = computed(() => rollups.value.some((r) => r.total > 0))
+
+  async function load(): Promise<void> {
+    const ws = useWorkspaceStore()
+    loading.value = true
+    try {
+      rollups.value = await api.listMergeClassRollups(ws.requireId())
+      loaded.value = true
+    } finally {
+      loading.value = false
+    }
+  }
+
+  /**
+   * Tag (or clear) how much review a merged PR needed, then refresh the rollups so the class's
+   * effort distribution reflects it immediately.
+   */
+  async function tag(recordId: string, reviewEffort: ReviewEffort | null): Promise<void> {
+    const ws = useWorkspaceStore()
+    await api.tagMergeReviewEffort(ws.requireId(), recordId, reviewEffort)
+    if (loaded.value) await load()
+  }
+
+  return { rollups, byClass, hasData, loading, loaded, load, tag }
+})

package/app/stores/notifications.ts

@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { computed } from 'vue'
 import type { Notification } from '~/types/domain'
+import type { ReviewEffort } from '~/types/merge'
 import { useUpsertList } from '~/composables/useUpsertList'
 import { useWorkspaceStore } from '~/stores/workspace'
 
@@ -53,10 +54,16 @@ export const useNotificationsStore = defineStore('notifications', () => {
   /** Total open count, for the toolbar badge. */
   const count = computed(() => open.value.length)
 
-  /** Act on a notification (merge / confirm / retry); the board patches via the event. */
-  async function act(id: string) {
+  /**
+   * Act on a notification (merge / confirm / retry); the board patches via the event.
+   *
+   * `reviewEffort` is the merge card's one-tap "how much review did this need?" answer, recorded
+   * onto the run's merge track record in the same request. Always optional: acting without it
+   * merges exactly as before and leaves the record's tag null.
+   */
+  async function act(id: string, reviewEffort?: ReviewEffort | null) {
     const ws = useWorkspaceStore()
-    const resolved = await api.actNotification(ws.requireId(), id)
+    const resolved = await api.actNotification(ws.requireId(), id, reviewEffort)
     upsert(resolved)
     // The action (merge/confirm/retry) changed block/run state — reconcile fully.
     await ws.refresh()

package/app/types/merge.ts

@@ -6,6 +6,13 @@
 
 export type {
   MergeAssessment,
+  // Merge track record — the per-class human evidence behind the auto-merge policy.
+  ChangeClass,
+  MergeClassRollup,
+  MergeClassRule,
+  MergeClassRules,
+  MergeTrackRecord,
+  ReviewEffort,
   RequirementConcernLevel,
   RiskPolicy,
   CreateRiskPolicyInput,

package/i18n/locales/de.json

@@ -455,6 +455,19 @@
           "run": "Trotzdem vorschlagen",
           "skip": "Überspringen"
         }
+      },
+      "classRules": {
+        "heading": "Regeln je Änderungskategorie",
+        "help": "Jeder Pull Request wird anhand der geänderten Dateien klassifiziert. Eine Kategorie kann immer automatisch zusammengeführt werden, immer ein Review verlangen oder auf die Schwellenwerte oben zurückfallen. Die Zahlen zeigen, was diese Kategorie bisher gebraucht hat.",
+        "autoMergeOffWarning": "Für diese Vorlage ist das automatische Zusammenführen aus, daher geht jeder Pull Request weiterhin an einen Menschen. Eine Kategorieregel kann das nicht überschreiben.",
+        "noData": "Noch keine Historie",
+        "record": "{merged} zusammengeführt, {autoShare} automatisch",
+        "frictionless": "{share} ohne Anmerkungen",
+        "rule": {
+          "thresholds": "Schwellenwerte verwenden",
+          "always": "Immer automatisch zusammenführen",
+          "never": "Immer Review verlangen"
+        }
       }
     },
     "observabilityConnection": {
@@ -1406,7 +1419,9 @@
         "no_rationale": "Der Merger hat den PR bewertet, aber keine Begründung gegeben, daher konnte dem Urteil zum automatischen Mergen nicht vertraut werden; der PR wartet darauf, dass ein Mensch mergt.",
         "no_assessment": "Der Merger hat keine parsbare Bewertung zurückgegeben, daher wartet der PR darauf, dass ein Mensch mergt.",
         "merge_failed": "Die Bewertungen lagen innerhalb der {preset}-Schwellenwerte, aber der automatische Merge konnte nicht abgeschlossen werden (zum Beispiel Branch-Schutz oder ein Konflikt), daher wartet der PR darauf, dass ein Mensch mergt.",
-        "merge_partial": "Einige der Pull Requests der Aufgabe wurden gemergt, aber ein späterer nicht, daher wartet die Änderung darauf, dass ein Mensch den Multi-Repo-Merge abschließt oder zurückrollt."
+        "merge_partial": "Einige der Pull Requests der Aufgabe wurden gemergt, aber ein späterer nicht, daher wartet die Änderung darauf, dass ein Mensch den Multi-Repo-Merge abschließt oder zurückrollt.",
+        "class_auto_merge": "Diese Vorlage führt diese Änderungskategorie immer automatisch zusammen, daher wurden die Bewertungen nicht verglichen.",
+        "class_requires_review": "Diese Vorlage gibt diese Änderungskategorie unabhängig von den Bewertungen immer an einen Menschen."
       },
       "scores": "Bewertungen",
       "axis": {
@@ -1818,7 +1833,8 @@
         "fork_decision_pending": "Als gelesen markieren",
         "pr_review_ready": "Als gelesen markieren",
         "budget_paused": "Als gelesen markieren",
-        "key_drift": "Veraltete Zugangsdaten entfernen"
+        "key_drift": "Veraltete Zugangsdaten entfernen",
+        "merge_tag_request": "Aufwand erfassen"
       }
     },
     "aiProvidersBanner": {
@@ -4247,7 +4263,8 @@
       "human_test_ready": "Bereit für manuelle Tests",
       "visual_confirmation_ready": "Bereit für visuelle Bestätigung",
       "pr_review_ready": "PR-Review-Befunde",
-      "initiative": "Initiativen-Updates"
+      "initiative": "Initiativen-Updates",
+      "merge_tag_request": "Review-Aufwand angefragt"
     },
     "role": {
       "engineering": "Engineering",
@@ -5188,6 +5205,24 @@
       "unlinkSourceFailed": "Quelle konnte nicht getrennt werden"
     }
   },
+  "merge": {
+    "changeClass": {
+      "docs": "Doku & Texte",
+      "test": "Tests",
+      "dependency": "Abhängigkeits-Update",
+      "config": "Konfiguration & CI",
+      "source": "Quellcode",
+      "schema": "Schema & Migrationen",
+      "unknown": "Nicht klassifiziert"
+    },
+    "effort": {
+      "prompt": "Review-Aufwand",
+      "none": "Keine Anmerkungen",
+      "minor": "Kleine Anmerkungen",
+      "major": "Echte Nacharbeit",
+      "classHistory": "{merged} in dieser Kategorie zusammengeführt, {autoShare} automatisch"
+    }
+  },
   "vcs": {
     "panel": {
       "title": "Quellcodeverwaltung",

package/i18n/locales/en.json

@@ -1173,7 +1173,9 @@
         "no_rationale": "The merger scored the PR but gave no rationale, so the verdict could not be trusted to auto-merge; the PR is waiting for a human to merge.",
         "no_assessment": "The merger did not return a parseable assessment, so the PR is waiting for a human to merge.",
         "merge_failed": "The scores were within the {preset} thresholds, but the automatic merge could not complete (for example branch protection or a conflict), so the PR is waiting for a human to merge.",
-        "merge_partial": "Some of the task's pull requests merged, but a later one could not, so the change is waiting for a human to finish or revert the multi-repo merge."
+        "merge_partial": "Some of the task's pull requests merged, but a later one could not, so the change is waiting for a human to finish or revert the multi-repo merge.",
+        "class_auto_merge": "This preset always auto-merges this class of change, so the scores were not compared.",
+        "class_requires_review": "This preset always sends this class of change to a human, whatever the scores."
       },
       "scores": "Scores",
       "axis": {
@@ -1790,7 +1792,8 @@
         "fork_decision_pending": "Mark read",
         "pr_review_ready": "Mark read",
         "budget_paused": "Mark read",
-        "key_drift": "Drop stale credentials"
+        "key_drift": "Drop stale credentials",
+        "merge_tag_request": "Record effort"
       }
     },
     "aiProvidersBanner": {
@@ -2522,6 +2525,25 @@
           "run": "Propose anyway",
           "skip": "Skip"
         }
+      },
+      "classRules": {
+        "heading": "Rules per change class",
+        "help": "Each pull request is classified from the files it changed. A class can always auto-merge, always require review, or fall back to the score ceilings above. The counts show what that class has needed so far.",
+        "autoMergeOffWarning": "Auto-merge is off for this preset, so every pull request still goes to a human. A class rule cannot override that.",
+        "noData": "No history yet",
+        "record": "{merged} merged, {autoShare} automatically",
+        "@record": {
+          "description": "'{autoShare}' is already a formatted percentage; do not add a % sign."
+        },
+        "frictionless": "{share} needed no comments",
+        "@frictionless": {
+          "description": "'{share}' is already a formatted percentage; do not add a % sign."
+        },
+        "rule": {
+          "thresholds": "Use score ceilings",
+          "always": "Always auto-merge",
+          "never": "Always require review"
+        }
       }
     },
     "observabilityConnection": {
@@ -3352,7 +3374,8 @@
       "human_test_ready": "Ready for human testing",
       "visual_confirmation_ready": "Ready for visual confirmation",
       "pr_review_ready": "PR review findings",
-      "initiative": "Initiative updates"
+      "initiative": "Initiative updates",
+      "merge_tag_request": "Review-effort tag requested"
     },
     "role": {
       "engineering": "Engineering",
@@ -5317,6 +5340,36 @@
       "unlinkSourceFailed": "Could not unlink source"
     }
   },
+  "merge": {
+    "changeClass": {
+      "docs": "Docs & copy",
+      "test": "Tests",
+      "dependency": "Dependency bump",
+      "@dependency": {
+        "description": "A change that only bumps third-party package versions (a 'dependency bump'), not a change that depends on something."
+      },
+      "config": "Config & CI",
+      "source": "Source code",
+      "@source": {
+        "description": "'Source' here means program source code (as opposed to docs/config/tests), NOT the origin of something."
+      },
+      "schema": "Schema & migrations",
+      "unknown": "Unclassified"
+    },
+    "effort": {
+      "prompt": "Review effort",
+      "none": "No comments",
+      "@none": {
+        "description": "Answer to 'how much review effort did this PR need?': means the reviewer had NOTHING to say, not that no review happened."
+      },
+      "minor": "Minor notes",
+      "major": "Real rework",
+      "classHistory": "{merged} merged in this class, {autoShare} auto-merged",
+      "@classHistory": {
+        "description": "'{autoShare}' is already a formatted percentage; do not add a % sign."
+      }
+    }
+  },
   "vcs": {
     "panel": {
       "title": "Source control",

package/i18n/locales/es.json

@@ -1116,7 +1116,9 @@
         "no_rationale": "El fusionador puntuó el PR pero no dio ninguna justificación, así que no se pudo confiar en el veredicto para fusionar automáticamente; el PR espera a que una persona lo fusione.",
         "no_assessment": "El fusionador no devolvió una evaluación analizable, por lo que el PR espera a que una persona lo fusione.",
         "merge_failed": "Las puntuaciones estaban dentro de los umbrales de {preset}, pero la fusión automática no pudo completarse (por ejemplo, protección de rama o un conflicto), por lo que el PR espera a que una persona lo fusione.",
-        "merge_partial": "Algunas de las solicitudes de incorporación de la tarea se fusionaron, pero una posterior no pudo, por lo que el cambio espera a que una persona termine o revierta la fusión multirrepositorio."
+        "merge_partial": "Algunas de las solicitudes de incorporación de la tarea se fusionaron, pero una posterior no pudo, por lo que el cambio espera a que una persona termine o revierta la fusión multirrepositorio.",
+        "class_auto_merge": "Este preajuste fusiona siempre esta categoría de cambio de forma automática, así que no se compararon las puntuaciones.",
+        "class_requires_review": "Este preajuste envía siempre esta categoría de cambio a una persona, sean cuales sean las puntuaciones."
       },
       "scores": "Puntuaciones",
       "axis": {
@@ -1721,7 +1723,8 @@
         "fork_decision_pending": "Marcar como leído",
         "pr_review_ready": "Marcar como leída",
         "budget_paused": "Marcar como leída",
-        "key_drift": "Descartar credenciales obsoletas"
+        "key_drift": "Descartar credenciales obsoletas",
+        "merge_tag_request": "Registrar esfuerzo"
       },
       "toast": {
         "acted": "Marcado como resuelto",
@@ -2334,6 +2337,19 @@
           "run": "Proponer igualmente",
           "skip": "Omitir"
         }
+      },
+      "classRules": {
+        "heading": "Reglas por categoría de cambio",
+        "help": "Cada pull request se clasifica a partir de los archivos que modificó. Una categoría puede fusionarse siempre de forma automática, exigir siempre revisión, o usar los umbrales de arriba. Los recuentos muestran lo que esa categoría ha necesitado hasta ahora.",
+        "autoMergeOffWarning": "El auto-merge está desactivado en este preajuste, así que cada pull request sigue pasando por una persona. Una regla de categoría no puede anular eso.",
+        "noData": "Aún sin historial",
+        "record": "{merged} fusionados, {autoShare} automáticamente",
+        "frictionless": "{share} no necesitó comentarios",
+        "rule": {
+          "thresholds": "Usar los umbrales",
+          "always": "Fusionar siempre automáticamente",
+          "never": "Exigir siempre revisión"
+        }
       }
     },
     "observabilityConnection": {
@@ -3256,7 +3272,8 @@
       "human_test_ready": "Listo para pruebas humanas",
       "visual_confirmation_ready": "Listo para confirmacion visual",
       "pr_review_ready": "Hallazgos de revisión de PR",
-      "initiative": "Actualizaciones de la iniciativa"
+      "initiative": "Actualizaciones de la iniciativa",
+      "merge_tag_request": "Solicitud de esfuerzo de revisión"
     },
     "role": {
       "engineering": "Ingenieria",
@@ -5176,6 +5193,24 @@
       "unlinkSourceFailed": "No se pudo desvincular la fuente"
     }
   },
+  "merge": {
+    "changeClass": {
+      "docs": "Documentación y textos",
+      "test": "Pruebas",
+      "dependency": "Actualización de dependencias",
+      "config": "Configuración y CI",
+      "source": "Código fuente",
+      "schema": "Esquema y migraciones",
+      "unknown": "Sin clasificar"
+    },
+    "effort": {
+      "prompt": "Esfuerzo de revisión",
+      "none": "Sin comentarios",
+      "minor": "Comentarios menores",
+      "major": "Retrabajo real",
+      "classHistory": "{merged} fusionados en esta categoría, {autoShare} de forma automática"
+    }
+  },
   "vcs": {
     "panel": {
       "title": "Control de código fuente",

package/i18n/locales/fr.json

@@ -1116,7 +1116,9 @@
         "no_rationale": "Le fusionneur a évalué la PR mais n'a donné aucune justification, le verdict n'a donc pas pu être approuvé pour une fusion automatique ; la PR attend une fusion par une personne.",
         "no_assessment": "Le fusionneur n'a pas renvoyé d'évaluation exploitable, la PR attend donc une fusion par une personne.",
         "merge_failed": "Les scores étaient dans les seuils de {preset}, mais la fusion automatique n'a pas pu aboutir (par exemple protection de branche ou conflit), la PR attend donc une fusion par une personne.",
-        "merge_partial": "Certaines des pull requests de la tâche ont été fusionnées, mais une suivante n'a pas pu l'être, le changement attend donc qu'une personne termine ou annule la fusion multi-dépôt."
+        "merge_partial": "Certaines des pull requests de la tâche ont été fusionnées, mais une suivante n'a pas pu l'être, le changement attend donc qu'une personne termine ou annule la fusion multi-dépôt.",
+        "class_auto_merge": "Ce préréglage fusionne toujours automatiquement cette catégorie de changement : les scores n’ont donc pas été comparés.",
+        "class_requires_review": "Ce préréglage envoie toujours cette catégorie de changement à un humain, quels que soient les scores."
       },
       "scores": "Scores",
       "axis": {
@@ -1721,7 +1723,8 @@
         "fork_decision_pending": "Marquer comme lu",
         "pr_review_ready": "Marquer comme lu",
         "budget_paused": "Marquer comme lu",
-        "key_drift": "Supprimer les identifiants obsolètes"
+        "key_drift": "Supprimer les identifiants obsolètes",
+        "merge_tag_request": "Enregistrer l’effort"
       },
       "toast": {
         "acted": "Marqué comme traité",
@@ -2334,6 +2337,19 @@
           "run": "Proposer quand même",
           "skip": "Ignorer"
         }
+      },
+      "classRules": {
+        "heading": "Règles par catégorie de changement",
+        "help": "Chaque pull request est classée d’après les fichiers qu’elle modifie. Une catégorie peut toujours être fusionnée automatiquement, toujours exiger une revue, ou retomber sur les seuils ci-dessus. Les compteurs montrent ce que cette catégorie a demandé jusqu’ici.",
+        "autoMergeOffWarning": "La fusion automatique est désactivée pour ce préréglage : chaque pull request passe toujours par un humain. Une règle de catégorie ne peut pas outrepasser cela.",
+        "noData": "Pas encore d’historique",
+        "record": "{merged} fusionnés, {autoShare} automatiquement",
+        "frictionless": "{share} sans aucun commentaire",
+        "rule": {
+          "thresholds": "Utiliser les seuils",
+          "always": "Toujours fusionner automatiquement",
+          "never": "Toujours exiger une revue"
+        }
       }
     },
     "observabilityConnection": {
@@ -3256,7 +3272,8 @@
       "human_test_ready": "Pret pour les tests humains",
       "visual_confirmation_ready": "Pret pour la confirmation visuelle",
       "pr_review_ready": "Points de revue de PR",
-      "initiative": "Mises a jour de l'initiative"
+      "initiative": "Mises a jour de l'initiative",
+      "merge_tag_request": "Effort de revue demandé"
     },
     "role": {
       "engineering": "Ingenierie",
@@ -5176,6 +5193,24 @@
       "unlinkSourceFailed": "Impossible de dissocier la source"
     }
   },
+  "merge": {
+    "changeClass": {
+      "docs": "Documentation et libellés",
+      "test": "Tests",
+      "dependency": "Mise à jour de dépendances",
+      "config": "Configuration et CI",
+      "source": "Code source",
+      "schema": "Schéma et migrations",
+      "unknown": "Non classé"
+    },
+    "effort": {
+      "prompt": "Effort de revue",
+      "none": "Aucun commentaire",
+      "minor": "Remarques mineures",
+      "major": "Reprise importante",
+      "classHistory": "{merged} fusionnés dans cette catégorie, dont {autoShare} automatiquement"
+    }
+  },
   "vcs": {
     "panel": {
       "title": "Gestion de code source",

package/i18n/locales/he.json

@@ -1116,7 +1116,9 @@
         "no_rationale": "הממזג נתן ציון ל-PR אך לא סיפק נימוק, ולכן לא ניתן היה לסמוך על ההכרעה למיזוג אוטומטי; ה-PR ממתין למיזוג ידני.",
         "no_assessment": "הממזג לא החזיר הערכה שניתן לפענח, ולכן ה-PR ממתין למיזוג ידני.",
         "merge_failed": "הציונים היו בתוך ספי {preset}, אך המיזוג האוטומטי לא הושלם (למשל הגנת ענף או התנגשות), ולכן ה-PR ממתין למיזוג ידני.",
-        "merge_partial": "חלק מבקשות המשיכה של המשימה מוזגו, אך אחת מאוחרת יותר נכשלה, ולכן השינוי ממתין שאדם ישלים או יבטל את המיזוג הרב-מאגרי."
+        "merge_partial": "חלק מבקשות המשיכה של המשימה מוזגו, אך אחת מאוחרת יותר נכשלה, ולכן השינוי ממתין שאדם ישלים או יבטל את המיזוג הרב-מאגרי.",
+        "class_auto_merge": "ההגדרה הזאת ממזגת תמיד אוטומטית שינויים מהסוג הזה, ולכן הניקוד לא הושווה.",
+        "class_requires_review": "ההגדרה הזאת מעבירה תמיד שינויים מהסוג הזה לאדם, בלי קשר לניקוד."
       },
       "scores": "ציונים",
       "axis": {
@@ -1721,7 +1723,8 @@
         "fork_decision_pending": "סמן כנקרא",
         "pr_review_ready": "סמן כנקרא",
         "budget_paused": "סמן כנקרא",
-        "key_drift": "מחק אישורים מיושנים"
+        "key_drift": "מחק אישורים מיושנים",
+        "merge_tag_request": "לתעד את המאמץ"
       },
       "toast": {
         "acted": "סומן כטופל",
@@ -2455,6 +2458,19 @@
           "run": "הצע בכל זאת",
           "skip": "דלג"
         }
+      },
+      "classRules": {
+        "heading": "כללים לפי סוג השינוי",
+        "help": "כל בקשת מיזוג מסווגת לפי הקבצים שהיא שינתה. קטגוריה יכולה להתמזג תמיד אוטומטית, לדרוש תמיד סקירה, או לחזור לסף הניקוד שלמעלה. המספרים מראים מה הקטגוריה הזאת דרשה עד כה.",
+        "autoMergeOffWarning": "המיזוג האוטומטי כבוי בהגדרה הזאת, ולכן כל בקשת מיזוג עוברת לאדם. כלל של קטגוריה לא יכול לעקוף את זה.",
+        "noData": "אין עוד היסטוריה",
+        "record": "{merged} מוזגו, {autoShare} אוטומטית",
+        "frictionless": "{share} לא דרשו הערות",
+        "rule": {
+          "thresholds": "לפי סף הניקוד",
+          "always": "למזג תמיד אוטומטית",
+          "never": "לדרוש תמיד סקירה"
+        }
       }
     },
     "observabilityConnection": {
@@ -3267,7 +3283,8 @@
       "human_test_ready": "מוכן לבדיקה אנושית",
       "visual_confirmation_ready": "מוכן לאישור חזותי",
       "pr_review_ready": "ממצאי בדיקת PR",
-      "initiative": "עדכוני יוזמה"
+      "initiative": "עדכוני יוזמה",
+      "merge_tag_request": "בקשה לתיוג מאמץ הסקירה"
     },
     "role": {
       "engineering": "הנדסה",
@@ -5187,6 +5204,24 @@
       "unlinkSourceFailed": "לא ניתן לבטל את קישור המקור"
     }
   },
+  "merge": {
+    "changeClass": {
+      "docs": "תיעוד וטקסטים",
+      "test": "בדיקות",
+      "dependency": "עדכון תלויות",
+      "config": "תצורה ו-CI",
+      "source": "קוד מקור",
+      "schema": "סכמה והגירות",
+      "unknown": "לא מסווג"
+    },
+    "effort": {
+      "prompt": "מאמץ הסקירה",
+      "none": "בלי הערות",
+      "minor": "הערות קטנות",
+      "major": "עבודה מחדש משמעותית",
+      "classHistory": "{merged} מוזגו בקטגוריה הזאת, {autoShare} מוזגו אוטומטית"
+    }
+  },
   "vcs": {
     "panel": {
       "title": "ניהול קוד מקור",