From 56e3a88ef8101aa9f38ce3b44e31d530f7b913a2 Mon Sep 17 00:00:00 2001
From: Bob <bob@superuserlabs.org>
Date: Thu, 3 Sep 2026 21:49:14 +0000
Subject: [PATCH 1/2] feat(categories): expose category rule priority

Git-Session-Id: 28f3
---
 src/components/CategoryEditModal.vue    |  65 +++++++++++++-
 src/util/classes.ts                     |  20 +++--
 src/util/presetCategories.ts            |  18 ++++
 test/unit/CategoryEditModal.test.js     | 109 ++++++++++++++++++++----
 test/unit/classes.test.node.ts          |  30 +++++++
 test/unit/presetCategories.test.node.ts |  36 ++++++++
 6 files changed, 253 insertions(+), 25 deletions(-)

diff --git a/src/components/CategoryEditModal.vue b/src/components/CategoryEditModal.vue
index 986ea62af..ff866bbc8 100644
--- a/src/components/CategoryEditModal.vue
+++ b/src/components/CategoryEditModal.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
 // The category edit modal
-b-modal(id="edit" ref="edit" title="Edit category" @show="resetModal" @hidden="hidden" @ok="handleOk" @keydown.native.enter="handleEnter" :ok-disabled="editing.rule.type === 'regex' && !validPattern")
+b-modal(id="edit" ref="edit" title="Edit category" @show="resetModal" @hidden="hidden" @ok="handleOk" @keydown.native.enter="handleEnter" :ok-disabled="!canSubmit")
   div.my-1
     b-input-group.my-1(prepend="Name")
       b-form-input(v-model="editing.name")
@@ -34,6 +34,15 @@ b-modal(id="edit" ref="edit" title="Edit category" @show="resetModal" @hidden="h
             :value="key"
           ) {{ key }}
         small.text-muted Leave blank to match every string field (default).
+      b-input-group.my-1(prepend="Priority")
+        b-form-input(
+          v-model="editing.priority"
+          type="number"
+          step="1"
+          placeholder="Default"
+          :state="priorityState"
+        )
+      small.text-danger(v-if="!validPriority") Priority must be an integer.
 
   hr
   div.my-1
@@ -91,6 +100,7 @@ export default {
         inherit_score: true,
         score: null,
         match_fields: [],
+        priority: null,
       },
     };
   },
@@ -106,7 +116,13 @@ export default {
       ];
     },
     valid: function () {
-      return this.editing.rule.type !== 'none' && this.validPattern;
+      return this.canSubmit;
+    },
+    canSubmit: function () {
+      if (this.editing.rule.type === 'regex') {
+        return this.validPattern && this.validPriority;
+      }
+      return true;
     },
     validPattern: function () {
       return this.editing.rule.type === 'regex' && validateRegex(this.editing.rule.regex || '');
@@ -114,6 +130,22 @@ export default {
     broad_pattern: function () {
       return this.editing.rule.type === 'regex' && isRegexBroad(this.editing.rule.regex || '');
     },
+    validPriority: function () {
+      if (this.editing.rule.type !== 'regex') {
+        return true;
+      }
+      return this.priorityFromInput(this.editing.priority) !== undefined;
+    },
+    priorityState: function () {
+      if (
+        this.editing.priority === null ||
+        this.editing.priority === undefined ||
+        this.editing.priority === ''
+      ) {
+        return null;
+      }
+      return this.validPriority;
+    },
     fieldOptions: function () {
       const extra = (this.editing.match_fields || []).filter(
         k => !(CANONICAL_SELECT_KEYS as readonly string[]).includes(k)
@@ -146,6 +178,9 @@ export default {
       this.categoryStore.removeClass(this.categoryId);
     },
     checkFormValidity() {
+      if (this.editing.rule.type === 'regex' && !this.validPriority) {
+        return false;
+      }
       if (this.editing.rule.type === 'regex') {
         return this.validPattern;
       }
@@ -160,7 +195,7 @@ export default {
         return;
       }
       // Mirrors the :ok-disabled condition on the modal
-      if (this.editing.rule.type === 'regex' && !this.validPattern) {
+      if (!this.canSubmit) {
         return;
       }
       event.preventDefault();
@@ -204,8 +239,17 @@ export default {
         } else {
           rule.select_keys = selected;
         }
+        const priority = this.priorityFromInput(this.editing.priority);
+        delete rule.weight;
+        if (priority === null) {
+          delete rule.priority;
+        } else {
+          rule.priority = priority;
+        }
       } else {
         delete rule.select_keys;
+        delete rule.priority;
+        delete rule.weight;
       }
       const new_class = {
         id: this.editing.id,
@@ -241,8 +285,23 @@ export default {
         score,
         inherit_score,
         match_fields: storedKeys ? [...storedKeys] : [],
+        priority: this.priorityFromRule(rule),
       };
     },
+    priorityFromInput(value) {
+      if (value === null || value === undefined || value === '') {
+        return null;
+      }
+      if (typeof value === 'string' && value.trim() === '') {
+        return null;
+      }
+      const priority = Number(value);
+      return Number.isInteger(priority) ? priority : undefined;
+    },
+    priorityFromRule(rule) {
+      const value = rule.priority !== undefined ? rule.priority : rule.weight;
+      return typeof value === 'number' && Number.isInteger(value) ? value : null;
+    },
   },
 };
 </script>
diff --git a/src/util/classes.ts b/src/util/classes.ts
index 1229c19e3..ea6bba4e3 100644
--- a/src/util/classes.ts
+++ b/src/util/classes.ts
@@ -17,6 +17,8 @@ export interface Rule {
   type: 'regex' | 'none';
   regex?: string;
   ignore_case?: boolean;
+  priority?: number;
+  weight?: number;
   /** When set, only these event.data keys are tested. Absent = all string fields. */
   select_keys?: string[];
 }
@@ -361,8 +363,16 @@ export function loadCategories(): { sets: CategorySet[]; activeIds: string[] } {
   return { sets, activeIds };
 }
 
-function pickDeepest(categories: Category[]) {
-  return _.maxBy(categories, c => c.name.length);
+function categoryRank(category: Category): number {
+  const explicit = category.rule.priority ?? category.rule.weight;
+  if (typeof explicit === 'number' && Number.isInteger(explicit)) {
+    return explicit;
+  }
+  return category.name.length * 10;
+}
+
+function pickHighestRanked(categories: Category[]) {
+  return _.maxBy(categories, categoryRank);
 }
 
 export function matchString(
@@ -387,7 +397,7 @@ export function matchString(
     });
 
   // Find the matching category.
-  // If several categories match the event, the deepest category will be chosen.
+  // If several categories match, explicit priority wins; otherwise depth wins.
   const matchingCats: [Category, RegExp][] = regexes.filter(([category, re]) => {
     const selectKeys = normalizeSelectKeys(category.rule.select_keys);
     if (event && selectKeys) {
@@ -399,7 +409,7 @@ export function matchString(
     return re.test(str);
   });
   if (matchingCats.length > 0) {
-    return pickDeepest(matchingCats.map(c => c[0]));
+    return pickHighestRanked(matchingCats.map(c => c[0]));
   }
   return null;
 }
@@ -423,7 +433,7 @@ export function classifyEvents(events: IEvent[], categories: Category[]): IEvent
     });
     e.data.$category =
       matchingCats.length > 0
-        ? pickDeepest(matchingCats.map(([category]) => category)).name
+        ? pickHighestRanked(matchingCats.map(([category]) => category)).name
         : UNCATEGORIZED;
     return e;
   });
diff --git a/src/util/presetCategories.ts b/src/util/presetCategories.ts
index 0a7d0eda8..bde72f712 100644
--- a/src/util/presetCategories.ts
+++ b/src/util/presetCategories.ts
@@ -72,6 +72,9 @@ function parseRule(raw: unknown, context: string): Rule | null {
   }
   const rule: Rule = { type: 'regex', regex: raw.regex };
   if (raw.ignore_case === true) rule.ignore_case = true;
+  const priority = parsePresetPriority(raw, context);
+  if (priority === null) return null;
+  if (priority !== undefined) rule.priority = priority;
   // Inlined from classes.normalizeSelectKeys to avoid a runtime cycle
   // (classes.ts imports this module). Empty/duplicate lists are dropped so
   // the rust parser never sees `select_keys: []`.
@@ -80,6 +83,21 @@ function parseRule(raw: unknown, context: string): Rule | null {
   return rule;
 }
 
+function parsePresetPriority(
+  raw: Record<string, unknown>,
+  context: string
+): number | null | undefined {
+  const value = raw.priority !== undefined ? raw.priority : raw.weight;
+  if (value === undefined) {
+    return undefined;
+  }
+  if (typeof value !== 'number' || !Number.isInteger(value)) {
+    console.warn(`[presets] ${context}: priority/weight must be an integer, skipping`);
+    return null;
+  }
+  return value;
+}
+
 function normalizePresetSelectKeys(keys: unknown): string[] | undefined {
   if (!Array.isArray(keys) || keys.length === 0) {
     return undefined;
diff --git a/test/unit/CategoryEditModal.test.js b/test/unit/CategoryEditModal.test.js
index bd9c2cddc..b6c4626af 100644
--- a/test/unit/CategoryEditModal.test.js
+++ b/test/unit/CategoryEditModal.test.js
@@ -8,6 +8,7 @@ describe('CategoryEditModal handleEnter', () => {
     const vm = {
       editing: { rule: { type: ruleType } },
       validPattern,
+      canSubmit: ruleType !== 'regex' || validPattern,
       handleSubmit: jest.fn(),
       $emit: jest.fn(),
     };
@@ -53,24 +54,27 @@ describe('CategoryEditModal field-scoped rules', () => {
 
   function ctx(match_fields) {
     const updateClass = jest.fn();
-    return {
-      vm: {
-        editing: {
-          id: 1,
-          name: 'Browser',
-          parent: ['Work'],
-          rule: { type: 'regex', regex: 'Firefox', select_keys: ['stale'] },
-          match_fields,
-          inherit_color: true,
-          color: null,
-          inherit_score: true,
-          score: null,
-        },
-        checkFormValidity: () => true,
-        categoryStore: { updateClass },
-        $nextTick: callback => callback(),
-        $refs: { edit: { hide: jest.fn() } },
+    const vm = {
+      editing: {
+        id: 1,
+        name: 'Browser',
+        parent: ['Work'],
+        rule: { type: 'regex', regex: 'Firefox', select_keys: ['stale'] },
+        match_fields,
+        inherit_color: true,
+        color: null,
+        inherit_score: true,
+        score: null,
+        priority: null,
       },
+      checkFormValidity: () => true,
+      categoryStore: { updateClass },
+      $nextTick: callback => callback(),
+      $refs: { edit: { hide: jest.fn() } },
+      priorityFromInput: CategoryEditModal.methods.priorityFromInput,
+    };
+    return {
+      vm,
       updateClass,
     };
   }
@@ -94,3 +98,74 @@ describe('CategoryEditModal field-scoped rules', () => {
     expect(fieldOptions).toEqual(['app', 'title']);
   });
 });
+
+describe('CategoryEditModal rule priority', () => {
+  const handleSubmit = vm => CategoryEditModal.methods.handleSubmit.call(vm);
+
+  function ctx({ rule = { type: 'regex', regex: 'Firefox', weight: 7 }, priority = null } = {}) {
+    const updateClass = jest.fn();
+    const vm = {
+      editing: {
+        id: 1,
+        name: 'Browser',
+        parent: ['Work'],
+        rule,
+        match_fields: [],
+        inherit_color: true,
+        color: null,
+        inherit_score: true,
+        score: null,
+        priority,
+      },
+      checkFormValidity: () => true,
+      categoryStore: { updateClass },
+      $nextTick: callback => callback(),
+      $refs: { edit: { hide: jest.fn() } },
+      priorityFromInput: CategoryEditModal.methods.priorityFromInput,
+      priorityFromRule: CategoryEditModal.methods.priorityFromRule,
+    };
+    return { vm, updateClass };
+  }
+
+  test('saves an integer priority on regex rules', () => {
+    const { vm, updateClass } = ctx({ priority: '25' });
+    handleSubmit(vm);
+    expect(updateClass.mock.calls[0][0].rule.priority).toBe(25);
+    expect(updateClass.mock.calls[0][0].rule.weight).toBeUndefined();
+  });
+
+  test('blank priority removes existing priority aliases', () => {
+    const { vm, updateClass } = ctx({
+      rule: { type: 'regex', regex: 'Firefox', priority: 3, weight: 7 },
+      priority: '',
+    });
+    handleSubmit(vm);
+    expect(updateClass.mock.calls[0][0].rule.priority).toBeUndefined();
+    expect(updateClass.mock.calls[0][0].rule.weight).toBeUndefined();
+  });
+
+  test('resetModal shows the weight alias as priority', () => {
+    const { vm } = ctx();
+    vm.categoryId = 1;
+    vm.categoryStore.get_category_by_id = () => ({
+      id: 1,
+      subname: 'Browser',
+      parent: ['Work'],
+      rule: { type: 'regex', regex: 'Firefox', weight: 7 },
+      data: {},
+    });
+
+    CategoryEditModal.methods.resetModal.call(vm);
+
+    expect(vm.editing.priority).toBe(7);
+  });
+
+  test('decimal priorities are invalid', () => {
+    const vm = {
+      editing: { rule: { type: 'regex' }, priority: '1.5' },
+      priorityFromInput: CategoryEditModal.methods.priorityFromInput,
+    };
+
+    expect(CategoryEditModal.computed.validPriority.call(vm)).toBe(false);
+  });
+});
diff --git a/test/unit/classes.test.node.ts b/test/unit/classes.test.node.ts
index e92fbbb2c..5ec793768 100644
--- a/test/unit/classes.test.node.ts
+++ b/test/unit/classes.test.node.ts
@@ -26,6 +26,24 @@ test('matches string to category', () => {
   expect(cat).toEqual(testClasses[1]);
 });
 
+test('explicit priority can override category depth when matching strings', () => {
+  const cats: Category[] = [
+    { name: ['Shallow'], rule: { type: 'regex', regex: 'vim', priority: 25 } },
+    { name: ['Group', 'Deep'], rule: { type: 'regex', regex: 'vim' } },
+  ];
+
+  expect(classes.matchString('vim', cats)?.name).toEqual(['Shallow']);
+});
+
+test('weight is accepted as a category priority alias', () => {
+  const cats: Category[] = [
+    { name: ['Shallow'], rule: { type: 'regex', regex: 'vim', weight: 25 } },
+    { name: ['Group', 'Deep'], rule: { type: 'regex', regex: 'vim' } },
+  ];
+
+  expect(classes.matchString('vim', cats)?.name).toEqual(['Shallow']);
+});
+
 test('matches events to category', () => {
   let events: IEvent[] = [
     { timestamp: new Date().toISOString(), duration: 0, data: { title: 'subsubtest' } },
@@ -38,6 +56,18 @@ test('matches events to category', () => {
   expect(events[2].data.$category).toEqual(['Uncategorized']);
 });
 
+test('explicit priority can override category depth when classifying events', () => {
+  const cats: Category[] = [
+    { name: ['Shallow'], rule: { type: 'regex', regex: 'vim', priority: 25 } },
+    { name: ['Group', 'Deep'], rule: { type: 'regex', regex: 'vim' } },
+  ];
+  const events: IEvent[] = [
+    { timestamp: new Date().toISOString(), duration: 0, data: { title: 'vim' } },
+  ];
+
+  expect(classes.classifyEvents(events, cats)[0].data.$category).toEqual(['Shallow']);
+});
+
 test('select_keys restricts regex matching to named fields', () => {
   const cats: Category[] = [
     { name: ['AppOnly'], rule: { type: 'regex', regex: 'Firefox', select_keys: ['app'] } },
diff --git a/test/unit/presetCategories.test.node.ts b/test/unit/presetCategories.test.node.ts
index 7f0aaea1d..6acc21f6e 100644
--- a/test/unit/presetCategories.test.node.ts
+++ b/test/unit/presetCategories.test.node.ts
@@ -148,6 +148,42 @@ describe('parsePresetCategorySets', () => {
     expect(sets[0].categories[2].rule.select_keys).toEqual(['title', 'app']);
   });
 
+  test('preserves integer priority and the weight alias on regex rules', () => {
+    const sets = parsePresetCategorySets([
+      {
+        id: 'set',
+        categories: [
+          {
+            name: ['Priority'],
+            rule: { type: 'regex', regex: 'x', priority: 25 },
+          },
+          {
+            name: ['Weight'],
+            rule: { type: 'regex', regex: 'y', weight: -5 },
+          },
+        ],
+      },
+    ]);
+    expect(sets[0].categories[0].rule.priority).toBe(25);
+    expect(sets[0].categories[1].rule.priority).toBe(-5);
+    expect(sets[0].categories[1].rule.weight).toBeUndefined();
+  });
+
+  test('drops preset categories with non-integer priority values', () => {
+    const sets = parsePresetCategorySets([
+      {
+        id: 'set',
+        categories: [
+          {
+            name: ['Bad'],
+            rule: { type: 'regex', regex: 'x', priority: 1.5 },
+          },
+        ],
+      },
+    ]);
+    expect(sets).toEqual([]);
+  });
+
   test('keeps the first of duplicate set ids', () => {
     const sets = parsePresetCategorySets([
       presetSet,

From 473e74c8eaf3e2d12ca899de4c59887303e8976d Mon Sep 17 00:00:00 2001
From: Bob <bob@superuserlabs.org>
Date: Thu, 3 Sep 2026 22:06:36 +0000
Subject: [PATCH 2/2] fix(categories): localize priority controls

Git-Session-Id: f6df4e17-0dcc-5072-918b-297b6584d9da
---
 src/components/CategoryEditModal.vue | 7 ++++---
 src/i18n/locales/de.ts               | 3 +++
 src/i18n/locales/en.ts               | 3 +++
 src/i18n/locales/ru.ts               | 3 +++
 src/i18n/locales/sv.ts               | 3 +++
 src/i18n/locales/uk.ts               | 3 +++
 src/i18n/locales/zh-CN.ts            | 3 +++
 7 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/components/CategoryEditModal.vue b/src/components/CategoryEditModal.vue
index ff866bbc8..e81605f15 100644
--- a/src/components/CategoryEditModal.vue
+++ b/src/components/CategoryEditModal.vue
@@ -34,15 +34,16 @@ b-modal(id="edit" ref="edit" title="Edit category" @show="resetModal" @hidden="h
             :value="key"
           ) {{ key }}
         small.text-muted Leave blank to match every string field (default).
-      b-input-group.my-1(prepend="Priority")
+      b-input-group.my-1(:prepend="$t('settings.categorization.priority')")
         b-form-input(
           v-model="editing.priority"
           type="number"
           step="1"
-          placeholder="Default"
+          :placeholder="$t('settings.categorization.priorityDefault')"
           :state="priorityState"
         )
-      small.text-danger(v-if="!validPriority") Priority must be an integer.
+      small.text-danger(v-if="!validPriority")
+        | {{ $t('settings.categorization.priorityInteger') }}
 
   hr
   div.my-1
diff --git a/src/i18n/locales/de.ts b/src/i18n/locales/de.ts
index ef9fa3817..ee805b181 100644
--- a/src/i18n/locales/de.ts
+++ b/src/i18n/locales/de.ts
@@ -146,6 +146,9 @@ export default {
       discard: 'Verwerfen',
       addCategory: 'Kategorie hinzufügen',
       categories: 'Kategorien',
+      priority: 'Priorität',
+      priorityDefault: 'Standard',
+      priorityInteger: 'Die Priorität muss eine ganze Zahl sein.',
       builderTitle: 'Kategorie-Builder',
       builderSubtitle: 'Regeln aus unkategorisierter Aktivität erzeugen',
       openBuilder: 'Builder öffnen',
diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index cced80c7c..13939804e 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -146,6 +146,9 @@ export default {
       discard: 'Discard',
       addCategory: 'Add category',
       categories: 'Categories',
+      priority: 'Priority',
+      priorityDefault: 'Default',
+      priorityInteger: 'Priority must be an integer.',
       builderTitle: 'Category builder',
       builderSubtitle: 'Generate rules from uncategorized activity',
       openBuilder: 'Open builder',
diff --git a/src/i18n/locales/ru.ts b/src/i18n/locales/ru.ts
index 9eac8ae2a..d41be916e 100644
--- a/src/i18n/locales/ru.ts
+++ b/src/i18n/locales/ru.ts
@@ -145,6 +145,9 @@ export default {
       discard: 'Отбросить',
       addCategory: 'Добавить категорию',
       categories: 'Категории',
+      priority: 'Приоритет',
+      priorityDefault: 'По умолчанию',
+      priorityInteger: 'Приоритет должен быть целым числом.',
       builderTitle: 'Конструктор категорий',
       builderSubtitle: 'Создание правил из некатегоризированной активности',
       openBuilder: 'Открыть конструктор',
diff --git a/src/i18n/locales/sv.ts b/src/i18n/locales/sv.ts
index 4af2baf17..2a097063b 100644
--- a/src/i18n/locales/sv.ts
+++ b/src/i18n/locales/sv.ts
@@ -148,6 +148,9 @@ export default {
       discard: 'Ignorera',
       addCategory: 'Lägg till kategori',
       categories: 'Kategorier',
+      priority: 'Prioritet',
+      priorityDefault: 'Standard',
+      priorityInteger: 'Prioriteten måste vara ett heltal.',
       builderTitle: 'Kategoribyggare',
       builderSubtitle: 'Skapa regler från okategoriserad aktivitet',
       openBuilder: 'Öppna byggaren',
diff --git a/src/i18n/locales/uk.ts b/src/i18n/locales/uk.ts
index 86808d45a..54ab30059 100644
--- a/src/i18n/locales/uk.ts
+++ b/src/i18n/locales/uk.ts
@@ -145,6 +145,9 @@ export default {
       discard: 'Відкинути',
       addCategory: 'Додати категорію',
       categories: 'Категорії',
+      priority: 'Пріоритет',
+      priorityDefault: 'Типовий',
+      priorityInteger: 'Пріоритет має бути цілим числом.',
       builderTitle: 'Конструктор категорій',
       builderSubtitle: 'Створення правил із некатегоризованої активності',
       openBuilder: 'Відкрити конструктор',
diff --git a/src/i18n/locales/zh-CN.ts b/src/i18n/locales/zh-CN.ts
index 87a275101..5758bb472 100644
--- a/src/i18n/locales/zh-CN.ts
+++ b/src/i18n/locales/zh-CN.ts
@@ -131,6 +131,9 @@ export default {
       discard: '放弃',
       addCategory: '添加分类',
       categories: '分类',
+      priority: '优先级',
+      priorityDefault: '默认',
+      priorityInteger: '优先级必须是整数。',
       builderTitle: '分类构建器',
       builderSubtitle: '从未分类活动生成规则',
       openBuilder: '打开构建器',