From 0e7b857b1266912162ef7758dd8801e8f55e2ae7 Mon Sep 17 00:00:00 2001 From: arkon Date: Thu, 30 Jul 2026 22:16:31 -0400 Subject: [PATCH] chore: merge mv3-ltl into main and mark it as retired --- AGENTS.md | 15 ++++++--------- README.md | 4 ++++ RELEASE_PROCESS.md | 7 +++---- package.json | 2 ++ src/components/Message.svelte | 1 + src/components/MessageRuns.svelte | 1 - src/scripts/chat-injector.ts | 2 +- src/ts/typings/ytc.d.ts | 25 ++++++++++++++++++++----- 8 files changed, 37 insertions(+), 20 deletions(-) diff --git a/AGENTS.md b/AGENTS.md index 48554dfe..0d71df1c 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -4,17 +4,16 @@ - Make code changes on `mv2` first. - `main` is the real MV3 branch. -- `mv3` is retired. Do not use it as the normal MV3 source branch for new work or cross-repo sync. +- `mv3` and `mv3-ltl` are retired. Do not use them as MV3 source branches for new work or cross-repo sync; `main` is the MV3 line LiveTL consumes. - Do not implement feature/fix work directly on `main`. - If a task starts on another branch, switch to `mv2` before editing unless the user explicitly asks otherwise. - If a task touches both HyperChat and LiveTL, HyperChat still goes first. - Cross-repo order is mandatory: 1. HyperChat `mv2` 2. HyperChat `main` - 3. HyperChat `mv3-ltl` - 4. LiveTL `develop` - 5. LiveTL `mv3-fr` - 6. LiveTL `release` + 3. LiveTL `develop` + 4. LiveTL `mv3-fr` + 5. LiveTL `release` - Never start cross-repo work in LiveTL when the HyperChat submodule also needs to change. - If the task also requires syncing YtcFilter (YTCF), do it after HyperChat `main` is updated: - merge HyperChat `main` into YTCF `master` @@ -29,16 +28,14 @@ - `order matters` - Avoid padded scopes, issue-number prefixes, and changelog-style essays in commit subjects. - A slightly dry or funny commit is fine if it is still clear at a glance. -- Prefer proper merges when carrying `mv2` work into `main` and `mv3-ltl`. -- Carry `main` into `mv3-ltl`. Do not treat `mv3` as the normal hop between them. +- Prefer proper merges when carrying `mv2` work into `main`. - If MV3 needs follow-up adaptation, keep that as a small, explicit commit after the merge instead of rewriting history or hand-copying changes. ## Code Patterns - Prefer editing existing modules and utilities over creating one-off files for tiny helpers. - If a helper obviously belongs in an existing shared utility file, put it there. -- Put shared behavior on `mv2` first; `main` and `mv3-ltl` should usually be merge-plus-adaptation branches, not separate feature branches. -- Keep `mv3-ltl` branching from the current `main` line once `main` has the intended HC changes. +- Put shared behavior on `mv2` first; `main` should usually be a merge-plus-adaptation branch, not a separate feature branch. - Keep MV3 adaptation narrow: - preserve branch-specific build/runtime wiring - change only what is required for manifest/background/injection differences diff --git a/README.md b/README.md index c297be51..e29fe870 100644 --- a/README.md +++ b/README.md @@ -61,3 +61,7 @@ VERSION=X.Y.Z npm run build:firefox # just Firefox ``` The built ZIP files can be found in the `build` directory. + +## Release + +Release steps for `mv2` and `main` are documented in [RELEASE_PROCESS.md](./RELEASE_PROCESS.md). diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 7c80b74b..dd24c6a5 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -8,10 +8,9 @@ This repo ships from two active lines that serve different purposes. 2. Commit and push on `mv2`. 3. Merge `mv2` into `main`. 4. Validate and push `main`. -5. If LiveTL needs the MV3-tailored HC line, merge `main` into `mv3-ltl`. -6. Create releases from each branch that actually ships. +5. Create releases from each branch that actually ships. -`mv3` is historical. Do not route normal maintenance through `mv3` unless the user explicitly asks for branch archaeology. +`main` is the MV3 line LiveTL consumes. `mv3` and `mv3-ltl` are historical. Do not route normal maintenance through them unless the user explicitly asks for branch archaeology. If the same task also affects LiveTL, do not begin in LiveTL. Finish this HyperChat ladder first, then bump the LiveTL submodule chain in this order: @@ -74,4 +73,4 @@ Practical rule for `main`: bump `package.json`, commit it, then create/publish t ## Notes For LiveTL Sync -LiveTL consumes HyperChat via submodules. Keep HyperChat changes branch-aligned across `mv2`, `main`, and `mv3-ltl` so LiveTL can take them with straightforward submodule bumps in its release flow. +LiveTL consumes HyperChat via submodules. Keep HyperChat changes branch-aligned across `mv2` and `main` so LiveTL can take them with straightforward submodule bumps in its release flow. LiveTL's MV2 Firefox variant tracks `mv2`; its MV3 line tracks `main`. diff --git a/package.json b/package.json index c97827bb..b3abb41a 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,8 @@ "build:firefox": "cross-env BROWSER=firefox vite build", "dev:chrome": "cross-env MINIFY=false BROWSER=chrome vite build --watch", "dev:firefox": "cross-env MINIFY=false BROWSER=firefox vite build --watch", + "start": "npm run dev:chrome", + "start:none": "npm run dev:chrome", "start:chrome": "cross-env AUTOLAUNCH=true npm run dev:chrome", "start:firefox": "cross-env AUTOLAUNCH=true npm run dev:firefox", "lint": "npm run lint:check -- --fix", diff --git a/src/components/Message.svelte b/src/components/Message.svelte index 26ec9df8..a7039bd3 100644 --- a/src/components/Message.svelte +++ b/src/components/Message.svelte @@ -16,6 +16,7 @@ } from '../ts/storage'; import { chatUserActionsItems, ChatUserActions, Theme } from '../ts/chat-constants'; import { useBanHammer } from '../ts/chat-actions'; + import type { Chat } from '../ts/typings/chat'; import { formatAuthorName } from '../ts/component-utils'; import { mdiGift, mdiReply } from '@mdi/js'; diff --git a/src/components/MessageRuns.svelte b/src/components/MessageRuns.svelte index 103522f7..ebba114c 100644 --- a/src/components/MessageRuns.svelte +++ b/src/components/MessageRuns.svelte @@ -1,6 +1,5 @@