dsh-background-by-model 0.7.1 → 0.7.2

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 
-> The full release history lives here; the two most recent releases (v0.7.1 / v0.7.0) are also listed in [README.md](./README.md#recent-optimizations).
+> The full release history lives here; the two most recent releases (v0.7.2 / v0.7.1) are also listed in [README.md](./README.md#recent-optimizations).
+
+## v0.7.2
+
+- **The filmstrip IS the control: drag to reorder, double-click to show** — the order used to be reachable only through a pair of ↑ / ↓ arrows and a "make first" button in the row below, which is a second and worse way to say "put this one there" when the five thumbnails already show the order they are in. Grab any tile and drop it where it belongs: the drop point is a 2px bar drawn INSIDE the tile it precedes, because a bar that took up room would push around the very tiles the pointer is being measured against. Which picture is on screen is the strip's OTHER gesture, and it changes no order and writes nothing at all — the image being shown is runtime state, not a setting, so it is not saved and the next boot starts at the rule's first image again. A double-click on a tile of a rule that is not painting says why (reusing "only the active rule can step the background") instead of leaving a double-click that looks broken, and both gestures are named in the tile's tooltip.
+- **The order and "which one is on screen" no longer interfere with each other (this one is a fix)** — both old actions (`moveRuleImage`, `setCurrentImage`) ended by moving the image index onto the image they had just moved, so tidying the list swapped the wallpaper as well: with the rotation off the index is sticky, which is exactly the state this was met in ("even with the rotation off, the background can change when I adjust the order, and it can happen by dragging or by the buttons"). `moveRuleImageTo(id, slot, to)` replaces both of them: it remembers the SLOT being painted before the splice and puts the index back on it afterwards. A reorder is not a change of subject — the three buttons left with the two uncalled actions behind them, and `check:repaint`'s list follows.
+- **The tile that is on screen lost its ring and kept its dot** — `.is-sel` already rings the tile that is open for editing, so a second ring put two "selected" tiles in a row of near-identical thumbnails, which is the one question a filmstrip must not leave open. Being on screen is the dot, and nothing else.
+- **Every image of a batch upload gets its own color** — a theme color belongs to an IMAGE, so an upload carrying several pictures has several palettes to fill, and the extraction was addressed by POSITION: `addRuleImages` appended the whole batch and then asked for a color for `rule.images[rule.images.length - 1]` alone. That is the right answer for the one-file upload this action grew up with, and silently the wrong one for every batch — the pictures before the last kept no color of their own and stayed on the system theme, with nothing in the interface to say why. It is now addressed by the slots the batch itself just appended, so which pictures get themed no longer depends on where they landed in the rule, nor on which one the card happens to select.
+- **Copy trimmed, and the framing button moved** — the "Rules" heading and the priority sentence under it, and the sentence explaining the automatic extraction, are gone (the panel's title introduces the rules and the `fallback` badge on the first card states the priority; the switch and its own label stay). The labels lost their nouns: `Image 1 / 5` for `当前第 1 / 5`, and `Add` / `Replace` / `Remove` for `添加图片` / `替换这张` / `移除图片`. `Edit position` (`编辑位置`) moved out of the image-action row to the end of the layout row — what it opens edits how the picture fills the area, which is what those five modes are about — and it stays last rather than between two chips because the modes are mutually exclusive and it is not a sixth one. It still appears only in **fit**, because dragging the framing is what fit means.
+- **Gates** — `check:repaint` gained the batch section (the batch form must walk every slot it was handed, an upload must record the slots of its own batch and theme all of them, and the positional `maybeAutoExtract(id, rule.images[…])` must not come back), and `moveRuleImageTo` joins the actions required to sample the winner and close with `repaintIfMoved` while the two deleted actions leave it. `check:ui` covers the new strings and the new class (`.dab-strip-bar`, plus the `is-dragging` state), and requires the three keys nothing renders any more to leave both dictionaries in the same commit.
 
 ## v0.7.1
 

package/CHANGELOG.zh.md

@@ -1,6 +1,15 @@
 # 更新日志
 
-> 这里保留完整的历史记录；最近两个版本（v0.7.1 / v0.7.0）同时列在 [README.zh.md](./README.zh.md#近期优化) 里。
+> 这里保留完整的历史记录；最近两个版本（v0.7.2 / v0.7.1）同时列在 [README.zh.md](./README.zh.md#近期优化) 里。
+
+## v0.7.2
+
+- **胶片条自己就是控件：拖拽排顺序，双击换画面** —— 顺序以前只能靠下面那排 ↑ / ↓ 和一个「设为第一张」按钮改，而五个缩略图本来就把顺序摆在那里，那对箭头是同一件事的第二种、更差的说法。现在抓住任意一张拖到新位置：落点画成一根 2px 竖条，画在目标格子**内部**，因为一块占位的竖条会把指针正在测量的那些格子推走。而「哪张在屏上」是胶片条的**另一个**手势 —— 双击它。它不改顺序，也**不写任何配置**：在屏哪张是运行时状态而不是设置，所以它不会被保存，下次启动照旧从规则的第一张开始。在非生效规则的格子上双击会说明原因（复用现成的那句「只有正在生效的规则能换画面上的图」），而不是留下一个看起来坏了的双击；两个手势都写在格子的悬停提示里。
+- **顺序和在屏的是哪张，从此互不干涉（这一条是修复）** —— 旧的两个动作（`moveRuleImage`、`setCurrentImage`）都以「把图片下标挪到刚被移动的那张图上」结尾，于是整理列表会把壁纸一起换掉：轮换关着的时候下标是粘住的，而这正是最容易撞见它的状态（「我调整顺序时，即便关了轮换，当前背景也可能会变，拖拽或点按钮调整顺序都有可能发生」）。新的 `moveRuleImageTo(id, slot, to)` 取代了它们两个：摘出之前先记下**正在画的那个槽位**，插回去之后把下标放回它身上。重排不是换主题 —— 三个按钮连同它们背后两个不再被调用的动作一起删掉了，`check:repaint` 的清单同步。
+- **在屏那张不再有边框，只留圆点** —— `.is-sel` 已经给「正在编辑的那张」画了圈，再给「正在显示的那张」画一个，就成了一排几乎一样的缩略图里同时有两个「选中」，而这是胶片条唯一不能留给人猜的问题。现在在屏 = 右上角那个圆点，仅此而已。
+- **一次上传的多张图，每一张都会各自取色** —— 主题色属于**图片**，所以一次带多张的上传有好几个调色板要填，而取色是**按下标**寻址的：`addRuleImages` 先把整批追加完，然后只对 `rule.images[rule.images.length - 1]` 取色。这对它长大时面对的单张上传是对的，对批量则静默地错 —— 最后一张之前的那些图没有自己的颜色、留在系统主题上，而界面上什么都不会说。现在按**这一批自己刚追加的那些槽位**寻址，所以「哪些图会被取色」不再取决于它们落在规则的哪个位置，也不取决于卡片当时选中了哪一张。
+- **卡片文案精简，「编辑位置」换了位置** —— 「规则列表」标题和它下面那句优先级说明、以及自动取色旁边那句解释都删了（面板标题已经介绍了规则，第一张卡上的 `兜底` 徽章说明了优先级；开关和它自己的标签留着）。标签去掉多余的名词：`当前第 1 / 5` → `第 1 / 5`，`添加图片` / `替换这张` / `移除图片` → `添加` / `替换` / `移除`，英文同步。`编辑位置` 从「图片动作」那一行移到**布局模式那一行的末尾**：它打开的东西编辑的是图片如何填满这块区域，正是那一行五个模式在说的事；它留在末尾而不是插在两个模式之间，因为那五个是互斥的，它不是第六个。它仍然只在**适应**下出现 —— 拖拽构图就是适应在做的事。
+- **门禁** —— `check:repaint` 新增一节钉住批量取色：批量形式必须遍历它拿到的每一个槽位、上传必须记录自己这批的槽位并给它们全部取色、按下标寻址的 `maybeAutoExtract(id, rule.images[…])` 不许回来；`moveRuleImageTo` 进入「每个写入路径都必须先采样 winner、再以 `repaintIfMoved` 收尾」的清单，两个被删掉的动作则从中移出。`check:ui` 覆盖新文案与新类（`.dab-strip-bar`，以及 `is-dragging` 状态），并且要求不再有调用者的那三个字典键在同一个提交里离开两份字典。
 
 ## v0.7.1
 

package/README.md

@@ -253,7 +253,15 @@ The other half of the same hole: while it owns a color the plugin **forces** `bo
 
 ## Recent Optimizations
 
-> Only the two most recent releases are listed here; older ones (v0.6.0 and earlier) live in [CHANGELOG.md](./CHANGELOG.md).
+> Only the two most recent releases are listed here; older ones (v0.7.0 and earlier) live in [CHANGELOG.md](./CHANGELOG.md).
+
+### v0.7.2
+
+- **The filmstrip IS the control: drag to reorder, double-click to show** — the order used to be reachable only through a pair of ↑ / ↓ arrows and a "make first" button in the row below, when the five thumbnails already show the order they are in. Grab any tile and drop it where it belongs (the drop point is a 2px bar), and give "which picture is on screen" to the strip's other gesture: a double-click, which changes no order and **writes nothing at all** — the image being shown is runtime state, not a setting, so the next boot starts at the rule's first image again.
+- **The order and "which one is on screen" no longer interfere (a fix)** — both old actions ended by moving the image index onto the image they had just moved, so tidying the list swapped the wallpaper with it (most visible with the rotation off, where the index is sticky: "even with the rotation off, the background can change when I adjust the order"). `moveRuleImageTo` replaces both: it remembers the SLOT being painted before the splice and puts the index back on it afterwards. The three buttons left with the two uncalled actions behind them.
+- **The tile on screen keeps its dot and loses its ring** — the tile open for editing already has `.is-sel`'s ring, and a second one put two "selected" tiles in a row of near-identical thumbnails; being on screen is the dot, and nothing else.
+- **Every image of a batch upload gets its own color** — the extraction was addressed by POSITION (it only asked about `rule.images[length - 1]`), which is right for a one-file upload and silently wrong for a batch: the pictures before the last kept no color of their own and stayed on the system theme. It is now addressed by the slots the batch itself just appended, so which pictures get themed depends on neither where they landed nor which one the card selects.
+- **Copy trimmed** — the "Rules" heading, its priority sentence and the automatic-extraction sentence are gone (the panel's title and the `fallback` badge already say both), `Add images` / `Replace this image` / `Remove image` lose the noun they were repeating, and `Edit position` moved to the end of the layout row (it edits how the picture fills the area, and still appears in **fit** only).
 
 ### v0.7.1
 
@@ -266,21 +274,6 @@ The other half of the same hole: while it owns a color the plugin **forces** `bo
 - **The config shape moved to 4, and an older host still cannot eat a profile** — `images[].color` is unknown to a schema-3 sanitizer, which rebuilds each image entry from the keys it knows: the color would survive in memory until the next reload and then be gone, with nothing in the log to explain it. The version check is a plain `>=`, so a host announcing less holds every write and says so in the panel until DSH is restarted.
 - **The gates cover it** — `check:node` now pins the lift in both directions (an absent key inherits the rule's color, an explicit `null` does not), per-image independence through the file, holidays forcing both colors, and that a `null` is written as an explicit key rather than as an absent one (writing it as absent would silently re-inherit the rule's color on every load). `check:repaint` additionally fails if a rotation step ever stops re-emitting the palette.
 
-### v0.7.0
-
-- **Multi-image rotation, per rule** — a rule now owns an ordered list of images and can cycle them on its own rhythm: 10 s / 30 s / 1 min / 5 min / 30 min / 1 h or a custom dwell, **in order** or **shuffle** (which never lands on the image already on screen, because that is indistinguishable from a missed tick). Off by default, because rotating spends bandwidth, memory and battery and no default should decide that quietly.
-- **A second trigger: a model switch** — with *also step on a model switch* on, stepping has nothing to do with time at all: every model change that lands on the rule shows its next image. A rule can then read as "a different picture every time" with no timer scheduled.
-- **One timer, aimed at the active rule** — it is armed by a signature of exactly the inputs the schedule depends on (rule, interval, order, image count, visibility), so a slider drag re-runs the whole apply dozens of times a second without ever restarting the dwell. A hidden tab stops the rotation instead of painting three times into the void.
-- **What follows the image is nothing** — theme color, layout mode, opacity and blur stay the rule's; only the picture changes, through the cross-fade a model switch already used. A rule can ask for a slower blend than a switch (or 0 for a hard cut).
-- **Storyboard, not a form** — the rule card's single thumbnail became a filmstrip: add several images at once (multi-select, drop, or one URL per line), click one to edit it, reorder it, promote it to first, replace it in place, remove it. The big preview above the strip shows the selected image, and the one on screen carries a live dot.
-- **An empty rule is a state, not a dead end** — the first cut refused to remove a rule's last picture and cleared its bytes "instead", which left the entry itself behind: a blank tile at position 1 that could never be deleted, so the next upload landed at position 2 and the rule kept painting nothing while the preview showed an empty frame. Removing the last image now empties the list, a brand-new rule starts empty (no slot is allocated until the first picture), the picture you add becomes the one you are looking at, and a hand-edited list whose entries are all unusable lands in the same state instead of being conjured back into a broken slot.
-- **Empty is not off: the theme color keeps working** — the first cut read "has an image" as "is usable", so a rule whose pictures had all been removed **stopped matching and stopped being the fallback**: its own theme color, the wheel, the swatches and the clear-to-system-theme button became decoration (the symptom is "the theme color does nothing") and the models it used to own were handed to the next rule. A rule now counts while it has **an image, or a theme color of its own** (`ruleCanPaint`) — no wallpaper, just the interface painted from that color. The card's copy names which of the three real states it is in (no image but a color / neither / an image whose bytes have not arrived) instead of covering all three with one sentence.
-- **Editing a rule that is not the active one takes effect at once** — `color`, `enabled` and `match` all feed which rule wins, but the write path only re-ran the resolution when the edited rule was already the winner: picking the first color for an empty rule, or typing a match string into a rule that had not won yet, changed nothing on screen until some unrelated event re-ran it.
-- **Only the images that are needed are loaded** — boot hydrates each rule's FIRST image (exactly what it hydrated per rule before multi-image), the rest arrive when a card is expanded or when the rotation is about to need one. Twenty pictures across five rules therefore do not mean twenty full-size data URLs before the first frame.
-- **A stale host can no longer eat a profile** — the node half publishes the config shape it writes, and a client that finds a host announcing an older version (`SCHEMA_VERSION`, where 3 is the first that means "an empty image list is legal") **holds every config write** and says so in the panel. Without it, updating the package and merely refreshing the page would let the previous sanitizer drop every rule on the next slider drag.
-- **Old configs still load, and old exports still import** — a rule's single `slot`/`bgState` pair is lifted into `images: [{ slot, bgState }]` on read; theme files (version 4 now, version 3 and earlier still accepted) carry, and restore, every image of every rule rather than just the first.
-- **A fourth static gate: `pnpm check:rotation`** — the rotation's decisions are pure (`nextIndex` / `isRotating`) and are now pinned down: no walking off the end of a list, shuffle never repeating the current image (checked across the whole support of the roll, not one sample), and "rotating" never being claimed for a rule with nothing to rotate. `check:node` covers the new shape through the real RPC handler: legacy lifting, per-image framing, dedupe, clamping, nested-drift warnings and per-image slot independence.
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/chart?repos=HarmlessFunny/dsh-background-by-model&type=timeline&legend=bottom-right)](https://www.star-history.com/?repos=HarmlessFunny%2Fdsh-background-by-model&type=timeline&legend=bottom-right)

package/README.zh.md

@@ -253,7 +253,15 @@ pnpm run typecheck
 
 ## 近期优化
 
-> 这里只列最近两个版本；更早的版本（v0.6.0 及以前）见 [CHANGELOG.zh.md](./CHANGELOG.zh.md)。
+> 这里只列最近两个版本；更早的版本（v0.7.0 及以前）见 [CHANGELOG.zh.md](./CHANGELOG.zh.md)。
+
+### v0.7.2
+
+- **胶片条自己就是控件：拖拽排顺序，双击换画面** — 顺序以前只能靠下面那排 ↑ / ↓ 和「设为第一张」改，而五个缩略图本来就把顺序摆在那里。现在抓住任意一张拖到新位置即可，落点是一根 2px 竖条；而「哪张在屏上」交给了双击 —— 它不改顺序，也**不写任何配置**：在屏哪张是运行时状态而不是设置，所以下次启动照旧从第一张开始。
+- **顺序和在屏的是哪张，从此互不干涉（修复）** — 旧的两个动作都以「把下标挪到刚被移动的那张图上」结尾，于是整理列表会把壁纸一起换掉（轮换关着、下标粘住时最容易撞见：「我调整顺序时，即便关了轮换，当前背景也可能会变」）。新的 `moveRuleImageTo` 取代了它们：摘出之前先记下**正在画的槽位**，插回去后把下标放回它身上；三个按钮和背后两个不再被调用的动作一起删掉。
+- **在屏那张只留圆点，不再有边框** — 「正在编辑」已经有 `.is-sel` 的圈了，再给「正在显示」画一个，一排几乎一样的缩略图里就同时有两个「选中」；这是在屏状态唯一不能留给人猜的地方。
+- **一次上传的多张图，每张都会各自取色** — 取色原本是**按下标**寻址的（只问 `rule.images[length - 1]`），对单张上传正确、对批量静默地错：最后一张之前的图没有自己的颜色、留在系统主题上。现在按**这一批自己刚追加的槽位**寻址，与它们落在哪个位置、卡片选中了哪张都无关。
+- **卡片文案精简** — 「规则列表」标题、优先级那句、自动取色旁边那句解释都删了（面板标题与 `兜底` 徽章已经说过）；`添加图片` / `替换这张` / `移除图片` 收成 `添加` / `替换` / `移除`；`编辑位置` 移到**布局模式那一行的末尾**（它编辑的是图片如何填满这块区域，仍只在「适应」下出现）。
 
 ### v0.7.1
 
@@ -266,21 +274,6 @@ pnpm run typecheck
 - **配置格式升到 4，旧宿主依旧吃不掉配置** — `images[].color` 对 schema 3 的 sanitizer 是未知字段，而它会**按自己认识的键重建**每个图片条目：颜色会一直在内存里活到下一次重新加载，然后悄无声息地消失，日志里还什么都不会说。版本判断是简单的 `>=`，所以报出更低版本的宿主会让所有写入被扣住、面板里说明，直到重启 DSH。
 - **门禁覆盖到它** — `check:node` 现在双向钉住抬升（缺键继承规则色、显式 `null` 不继承）、逐图颜色经过文件往返后各自独立、节日两处颜色都被强制，以及 `null` 是**写出键**而不是省略键（写成省略就是每次加载都悄悄把规则色继承回来）。`check:repaint` 还会在轮换步骤不再重发调色板时报错。
 
-### v0.7.0
-
-- **每条规则多图轮换** — 规则现在持有一组有序图片，可以按自己的节奏循环：10 秒 / 30 秒 / 1 分钟 / 5 分钟 / 30 分钟 / 1 小时，或自定义停留时长；顺序可选**按顺序**或**随机**（随机绝不会抽到当前正在显示的那张，因为那看起来就跟这一次没生效完全一样）。默认关闭 —— 轮换真的要花流量、内存和电，不该由默认值替你决定。
-- **第二种触发：切换模型** — 打开「切换模型时也换一张」之后，换图就与时间无关了：每次切换模型落到这条规则上，就显示它的下一张。这样一条规则可以是「每次都不一样」，而完全不需要挂定时器。
-- **只有一个定时器，且始终对准生效规则** — 它的重排条件是「排期真正依赖的那些输入」（规则、间隔、顺序、图片数量、标签页可见性）组成的签名，所以拖动滑块导致每秒重跑几十次 apply 也不会把停留计时反复清零；标签页隐藏时轮换直接停下，而不是对着空屏画三次。
-- **换的只有图本身** — 主题色、布局模式、透明度、模糊度都留在规则上；只有画面在变，用的就是切换模型时那套交叉淡入。还能单独设淡入时长（0 就是硬切）。
-- **是分镜条，不是表单** — 规则卡里那张单图缩略图变成了胶片条：可一次加多张（多选、拖放、一行一个网址）、点选要编辑的那张、排序、设为第一张、原地替换、删除。上方大预览显示选中的那张，正在显示的那张带一个跳动的圆点。
-- **空规则是一个状态，不是死路** — 这个功能的第一版拒绝删除最后一张，转而「清空它的字节」，结果把条目本身留了下来：胶片条第 1 位一块永远删不掉的空白图，于是下一次上传只能排到第 2 位，规则继续什么都不画、预览一直停在空帧。现在删除最后一张就是把列表清空；新建规则从空列表开始（第一张图到达时才分配槽位）；你加进去的那张就是你正在看的那张；手改导致「每一项都不可用」的列表也落到这个状态，而不是被硬塞回一个坏槽位。
-- **空规则不等于失效：主题色继续生效** — 第一版把「有没有图」当成了「这条规则是否可用」，于是把图片删光的规则**既不再匹配、也不再当兜底**：它自己那份主题色、色轮、灵感色板、「跟随系统主题」全部变成摆设（现象就是「主题色无效」），而它原本负责的模型被悄悄交给下一条规则。现在只要是**有图、或者有自己的主题色**（`ruleCanPaint`）就仍然生效 —— 不铺壁纸，只给界面配色。面板上的说明也按三种真实状态分开说（无图有颜色 / 无图无颜色 / 有图但还没取到内容），不再拿同一句话覆盖三种情况。
-- **改一条没在生效的规则也会立刻生效** — `color` / `enabled` / `match` 都影响「哪条规则赢」，但以前只有编辑当前生效规则时才会重新解析：给空规则选上第一个颜色、或往一条还没赢的规则里输入匹配串，界面上都不会有反应，要等某个无关事件顺手重跑一次解析。
-- **只加载用得到的图** — 启动时只灌每条规则的**第一张**（跟多图出现之前每条规则灌一张完全一致），其余的在展开卡片时、或轮换即将用到时再取。于是「五条规则二十张图」不等于首帧之前先传二十张全尺寸 data URL。
-- **旧宿主再也不可能吃掉一份配置** — node 半边现在会公布自己写入的配置格式，客户端发现宿主报出的版本低于自己（`SCHEMA_VERSION`，2 → 3 起表示「空图片列表合法」）时会**扣住所有配置写入**并在面板里说明。没有这道闸门，更新包之后只刷新一次页面，上一个版本的 sanitizer 就会在下一次拖动滑块时把全部规则丢掉。
-- **老配置照常读，老导出照常导入** — 规则里那对单图字段（`slot` / `bgState`）会在读取时被提升成 `images: [{ slot, bgState }]`；主题文件升到版本 4（版本 3 及更早仍可导入），导出与还原的是每条规则的全部图片，而不只是第一张。
-- **第四道静态门禁：`pnpm check:rotation`** — 轮换的判定是纯函数（`nextIndex` / `isRotating`），现在被钉住了：不会走越界、随机不会重复当前这张（在整个随机取值范围内穷举，不是抽一次样本）、也不会把只有一张图的规则报成「正在轮换」。`check:node` 则通过真实 RPC 处理器覆盖新形状：旧配置提升、逐图取景、去重、钳位、嵌套字段漂移告警，以及各图槽位互不干扰。
-
 ## Star History
 
 [![Star History Chart](https://api.star-history.com/chart?repos=HarmlessFunny/dsh-background-by-model&type=timeline&legend=bottom-right)](https://www.star-history.com/?repos=HarmlessFunny%2Fdsh-background-by-model&type=timeline&legend=bottom-right)

package/lib/client.js

@@ -44,8 +44,6 @@ window.__ModuleLoader__.load({
 			statusNoteNoSession: "会话服务已就绪，但还没有当前会话 id",
 			statusNoteNoProjection: "拿不到本会话的模型选择投影（binding / projections 不可用）",
 			statusNoteEmptySelection: "本会话的模型选择投影还没有值（切一次模型即可写入）",
-			rulesTitle: "规则列表",
-			rulesHint: "从上到下即为优先级。规则 1 同时兼任兜底：所有匹配串都没命中时使用它",
 			hostStaleHint: "检测到 DSH 主进程仍在运行旧版插件：新版配置格式它还读不懂，为避免丢规则，本次只改界面不写入配置。重启 DSH 后多图与轮换即可正常保存",
 			tryoutTitle: "匹配试跑",
 			tryoutPlaceholder: "输入模型名，如 deepseek-flash",
@@ -55,7 +53,6 @@ window.__ModuleLoader__.load({
 			tryoutNone: "没有可用规则（规则需要启用，并且有图片或主题色）",
 			tryoutEmpty: "输入模型名即可试跑",
 			autoExtract: "选图后自动取主题色",
-			autoExtractHint: "只在图片还没有自己的颜色时自动取色，绝不覆盖你手动选的颜色",
 			ruleAdd: "新增规则",
 			ruleFallbackBadge: "兜底",
 			ruleMatchPlaceholder: "如 flash / glm（忽略大小写，留空则不参与匹配）",
@@ -71,7 +68,7 @@ window.__ModuleLoader__.load({
 			ruleUrlApplying: "加载中…",
 			ruleUrlBadHttp: "仅支持 http/https 图片网址",
 			ruleUrlFail: "获取图片失败",
-			ruleImageRemove: "移除图片",
+			ruleImageRemove: "移除",
 			ruleEmptyHint: "这条规则还没有图片，也没有自己的主题色：没有可显示的内容，匹配和兜底都会跳过它",
 			ruleColorOnlyHint: "这条规则还没有图片：不会铺壁纸，界面只用这个主题色",
 			ruleImagePendingHint: "这张图片还没有取到内容，稍后会自己出现（也可以直接替换它）",
@@ -102,13 +99,12 @@ window.__ModuleLoader__.load({
 			rotOnSwitch: "切换模型时也换一张",
 			rotNext: "下一张",
 			rotNextInactive: "只有正在生效的规则能换画面上的图",
-			rotPos: "当前第",
+			rotPos: "第",
 			rotShowing: "正在显示",
-			rotAddImage: "添加图片",
-			rotReplaceImage: "替换这张",
-			rotImageEarlier: "前移一张",
-			rotImageLater: "后移一张",
-			rotMakeFirst: "设为第一张",
+			rotAddImage: "添加",
+			rotReplaceImage: "替换",
+			rotDragHint: "拖动排序",
+			rotDblHint: "双击切换",
 			rotEvery10s: "10 秒",
 			rotEvery30s: "30 秒",
 			rotEvery1m: "1 分钟",
@@ -174,8 +170,6 @@ window.__ModuleLoader__.load({
 			statusNoteNoSession: "The sessions service is up but reports no current session yet",
 			statusNoteNoProjection: "This session's model-selection projection is unreachable (no binding / projections)",
 			statusNoteEmptySelection: "The model-selection projection exists but carries no value yet (selecting a model once writes it)",
-			rulesTitle: "Rules",
-			rulesHint: "Top to bottom is the priority. Rule 1 doubles as the fallback — it is used when no match string hits",
 			hostStaleHint: "The DSH host process is still running the older plugin, which cannot read the new config shape. To avoid dropping rules, this session changes the interface but holds every config write — restart DSH and multi-image plus rotation will save normally",
 			tryoutTitle: "Match test",
 			tryoutPlaceholder: "Type a model name, e.g. deepseek-flash",
@@ -185,7 +179,6 @@ window.__ModuleLoader__.load({
 			tryoutNone: "No usable rule (a rule needs to be enabled and carry an image or a theme color)",
 			tryoutEmpty: "Type a model name to test the list",
 			autoExtract: "Extract the theme color when an image is chosen",
-			autoExtractHint: "Only fills an image that has no color of its own yet — a color you picked is never overwritten",
 			ruleAdd: "Add rule",
 			ruleFallbackBadge: "fallback",
 			ruleMatchPlaceholder: "e.g. flash / glm (case-insensitive, empty never matches)",
@@ -201,7 +194,7 @@ window.__ModuleLoader__.load({
 			ruleUrlApplying: "Loading…",
 			ruleUrlBadHttp: "Only http/https image URLs are supported",
 			ruleUrlFail: "Could not fetch the image",
-			ruleImageRemove: "Remove image",
+			ruleImageRemove: "Remove",
 			ruleEmptyHint: "This rule has no image and no theme color of its own: it has nothing to show, so matching and the fallback both skip it",
 			ruleColorOnlyHint: "No image in this rule yet: no wallpaper is shown, and the interface is painted from this theme color alone",
 			ruleImagePendingHint: "This image has no content yet — it appears once it loads; you can also replace it",
@@ -234,11 +227,10 @@ window.__ModuleLoader__.load({
 			rotNextInactive: "Only the active rule can step the background",
 			rotPos: "Image",
 			rotShowing: "On screen",
-			rotAddImage: "Add images",
-			rotReplaceImage: "Replace this image",
-			rotImageEarlier: "Move earlier",
-			rotImageLater: "Move later",
-			rotMakeFirst: "Make first",
+			rotAddImage: "Add",
+			rotReplaceImage: "Replace",
+			rotDragHint: "drag to reorder",
+			rotDblHint: "double-click to show",
 			rotEvery10s: "10 s",
 			rotEvery30s: "30 s",
 			rotEvery1m: "1 min",
@@ -1956,16 +1948,28 @@ window.__ModuleLoader__.load({
 .dab-rule-section-title{font-size:12px;font-weight:600;margin-bottom:9px;color:var(--dsw-alias-label-secondary,var(--dsw-alias-label-tertiary))}
 
 /* ── image strip (multi-image rules) ─────────────────────────────────────── */
-/* A horizontally scrolling row of thumbnails: the edited one is ringed, the one
-   the wallpaper is actually painting carries a live dot. Drops land here, which
-   is why the border reacts to a drag rather than to hover. */
+/* A horizontally scrolling row of thumbnails: the one open for editing is
+   ringed, and the one the wallpaper is actually painting carries a live dot —
+   but deliberately NO ring of its own. Two tiles ringed at once read as "two
+   things are selected", which is the one question a row of near-identical
+   thumbnails must not leave open: being on screen is the dot, and nothing
+   else. FILES dropped here are added, which is why the container's border
+   reacts to a drag; a TILE dragged across the row reorders it instead, and that
+   is what the is-dragging / dab-strip-bar pair below is for. */
 .dab-strip{display:flex;gap:7px;margin-top:9px;padding:7px;border-radius:12px;border:1.5px dashed var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-2);overflow-x:auto;scrollbar-width:thin}
 .dab-strip.is-over{border-color:var(--dsw-alias-brand-primary);background:color-mix(in srgb,var(--dsw-alias-brand-primary) 8%,transparent)}
-.dab-strip-item{position:relative;flex:none;width:62px;height:44px;padding:0;border-radius:8px;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);cursor:pointer;transition:border-color .2s,box-shadow .2s,transform .18s}
+.dab-strip-item{position:relative;flex:none;width:62px;height:44px;padding:0;border-radius:8px;overflow:hidden;border:1px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-layer-1);cursor:grab;user-select:none;transition:border-color .2s,box-shadow .2s,transform .18s}
 .dab-strip-item img{position:absolute;inset:0;width:100%;height:100%;object-fit:cover}
 .dab-strip-item:hover{transform:translateY(-1px);border-color:var(--dsw-alias-brand-primary)}
 .dab-strip-item.is-sel{border-color:var(--dsw-alias-brand-primary);box-shadow:0 0 0 2px color-mix(in srgb,var(--dsw-alias-brand-primary) 40%,transparent)}
-.dab-strip-item.is-live{box-shadow:0 0 0 2px var(--dsw-alias-brand-primary)}
+/* The tile being dragged out of the row, and the 2px bar that says where it will
+   land. The bar is drawn INSIDE the tile it precedes (at its left edge) or inside
+   the last tile (at its right edge, for a drop past the end): a bar as its own flex
+   item would push the tiles sideways, and a target that slides away as the pointer
+   approaches it is how a drop ends up one slot off. */
+.dab-strip-item.is-dragging{cursor:grabbing;opacity:.45;transform:none;border-style:dashed}
+.dab-strip-bar{position:absolute;left:0;top:0;bottom:0;width:2px;background:var(--dsw-alias-brand-primary);z-index:2}
+.dab-strip-bar.is-end{left:auto;right:0}
 .dab-strip-wait{position:absolute;inset:0;background:repeating-linear-gradient(45deg,transparent 0 4px,color-mix(in srgb,var(--dsw-alias-label-tertiary) 14%,transparent) 4px 8px)}
 .dab-strip-num{position:absolute;left:3px;bottom:2px;font-family:var(--dab-mono);font-size:9.5px;line-height:1;padding:1px 4px;border-radius:5px;background:rgba(0,0,0,.45);color:#fff}
 .dab-strip-live{position:absolute;right:3px;top:3px;width:7px;height:7px;border-radius:50%;background:var(--dsw-alias-brand-primary);box-shadow:0 0 0 2px rgba(0,0,0,.35);animation:dab-pulse 1.8s ease-in-out infinite}
@@ -4772,15 +4776,6 @@ window.__ModuleLoader__.load({
 					className: "dab-rise",
 					style: { "--d": 2 },
 					children: [
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-							className: "dab-swatch-title",
-							children: t("rulesTitle")
-						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: "dab-hint",
-							style: { marginBottom: 11 },
-							children: t("rulesHint")
-						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 							className: "dab-chip-row",
 							style: {
@@ -4800,11 +4795,6 @@ window.__ModuleLoader__.load({
 								children: t("autoExtract")
 							})]
 						}),
-						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("p", {
-							className: "dab-hint",
-							style: { marginBottom: 11 },
-							children: t("autoExtractHint")
-						}),
 						/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 							className: "dab-rules",
 							children: rules.map((rule, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RuleCard, {
@@ -4834,6 +4824,12 @@ window.__ModuleLoader__.load({
 			const { t } = p;
 			const [open, setOpen] = (0, react.useState)(active);
 			const [dragOver, setDragOver] = (0, react.useState)(false);
+			const pendingDrag = (0, react.useRef)(null);
+			/** Insertion slot of the drag in flight (index of the tile it goes BEFORE). */
+			const dragAt = (0, react.useRef)(null);
+			const [drop, setDrop] = (0, react.useState)(null);
+			/** Set while a drag is real, so the click that ends it is not also a selection. */
+			const draggedRef = (0, react.useRef)(false);
 			const [urlOpen, setUrlOpen] = (0, react.useState)(false);
 			const [urlVal, setUrlVal] = (0, react.useState)("");
 			const [urlBusy, setUrlBusy] = (0, react.useState)(false);
@@ -4961,8 +4957,61 @@ window.__ModuleLoader__.load({
 			const rotatable = rule.images.length >= 2;
 			const preset = ROTATE_PRESETS.find((x) => x.ms === rule.rotate.intervalMs);
 			const selSlot = image?.slot ?? null;
-			const moveSel = (dir) => {
-				if (selSlot !== null) p.moveRuleImage(rule.id, selSlot, dir);
+			/** How far the pointer must travel before a click turns into a drag. */
+			const DRAG_SLOP = 5;
+			const tileDown = (i, slot) => (e) => {
+				if (e.button !== 0 || e.pointerType === "touch") return;
+				e.currentTarget.setPointerCapture(e.pointerId);
+				pendingDrag.current = {
+					x: e.clientX,
+					y: e.clientY,
+					from: i,
+					slot,
+					id: e.pointerId
+				};
+				draggedRef.current = false;
+			};
+			const tileMove = (e) => {
+				const pen = pendingDrag.current;
+				if (pen === null || pen.id !== e.pointerId) return;
+				const cur = dragAt.current;
+				if (cur === null) {
+					if (Math.abs(e.clientX - pen.x) + Math.abs(e.clientY - pen.y) < DRAG_SLOP) return;
+					draggedRef.current = true;
+				}
+				const strip = e.currentTarget.parentElement;
+				const list = strip === null ? [] : [...strip.querySelectorAll(".dab-strip-item")];
+				let at = list.length;
+				for (let i = 0; i < list.length; i++) {
+					const box = list[i].getBoundingClientRect();
+					if (e.clientX < box.left + box.width / 2) {
+						at = i;
+						break;
+					}
+				}
+				if (cur !== null && cur.at === at) return;
+				dragAt.current = {
+					from: pen.from,
+					at
+				};
+				setDrop({
+					from: pen.from,
+					at
+				});
+			};
+			/** End a drag: commit the new order, or just forget it on a cancel. */
+			const tileUp = (commit) => (e) => {
+				const pen = pendingDrag.current;
+				pendingDrag.current = null;
+				if (pen !== null && e.currentTarget.hasPointerCapture(pen.id)) e.currentTarget.releasePointerCapture(pen.id);
+				const end = dragAt.current;
+				dragAt.current = null;
+				setDrop(null);
+				if (!commit || pen === null || end === null) return;
+				const to = end.at > pen.from ? end.at - 1 : end.at;
+				if (to === pen.from) return;
+				p.moveRuleImageTo(rule.id, pen.slot, to);
+				setSel(to);
 			};
 			const removeSel = () => {
 				if (selSlot === null) return;
@@ -5089,9 +5138,26 @@ window.__ModuleLoader__.load({
 										const thumb = p.imageOf(img.slot);
 										return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 											type: "button",
-											className: `dab-strip-item${i === selIdx ? " is-sel" : ""}${liveIndex === i ? " is-live" : ""}`,
-											title: `${i + 1} / ${rule.images.length}`,
-											onClick: () => setSel(i),
+											className: `dab-strip-item${i === selIdx ? " is-sel" : ""}${drop !== null && drop.from === i ? " is-dragging" : ""}`,
+											title: `${i + 1} / ${rule.images.length} · ${t("rotDragHint")} · ${t("rotDblHint")}`,
+											onPointerDown: tileDown(i, img.slot),
+											onPointerMove: tileMove,
+											onPointerUp: tileUp(true),
+											onPointerCancel: tileUp(false),
+											onClick: () => {
+												if (draggedRef.current) {
+													draggedRef.current = false;
+													return;
+												}
+												setSel(i);
+											},
+											onDoubleClick: () => {
+												if (!active) {
+													notify(t("rotNextInactive"));
+													return;
+												}
+												p.showRuleImage(rule.id, img.slot);
+											},
 											children: [
 												thumb !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("img", {
 													src: thumb,
@@ -5102,6 +5168,8 @@ window.__ModuleLoader__.load({
 													className: "dab-strip-num",
 													children: i + 1
 												}),
+												drop !== null && drop.at === i ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "dab-strip-bar" }) : null,
+												drop !== null && drop.at === rule.images.length && i === rule.images.length - 1 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { className: "dab-strip-bar is-end" }) : null,
 												img.color !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 													className: "dab-strip-dot",
 													title: toHex(hslToRgb(img.color[0], img.color[1], img.color[2])).toUpperCase(),
@@ -5162,38 +5230,6 @@ window.__ModuleLoader__.load({
 											},
 											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(UploadIcon, { size: 13 }), t("rotReplaceImage")]
 										}) : null,
-										url !== null && rule.bgMode === "fit" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
-											type: "button",
-											className: "dab-btn",
-											onClick: () => setEditorOpen(true),
-											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(EditIcon, { size: 13 }), t("ruleFramingEdit")]
-										}) : null,
-										rule.images.length >= 2 ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-												type: "button",
-												className: "dab-icon-btn",
-												disabled: selIdx === 0,
-												title: t("rotImageEarlier"),
-												onClick: () => moveSel(-1),
-												children: "↑"
-											}),
-											/* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-												type: "button",
-												className: "dab-icon-btn",
-												disabled: selIdx === rule.images.length - 1,
-												title: t("rotImageLater"),
-												onClick: () => moveSel(1),
-												children: "↓"
-											}),
-											selIdx !== 0 ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
-												type: "button",
-												className: "dab-btn dab-btn-ghost",
-												onClick: () => {
-													if (selSlot !== null) p.setCurrentImage(rule.id, selSlot);
-												},
-												children: t("rotMakeFirst")
-											}) : null
-										] }) : null,
 										selSlot !== null ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
 											type: "button",
 											className: "dab-btn dab-btn-ghost dab-btn-danger",
@@ -5401,14 +5437,19 @@ window.__ModuleLoader__.load({
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 										className: "dab-rule-section-title",
 										children: t("ruleLayout")
-									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+									}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "dab-chip-row",
-										children: BG_MODES.map((m) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
+										children: [BG_MODES.map((m) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)("button", {
 											type: "button",
 											className: `dab-chip${rule.bgMode === m.mode ? " is-active" : ""}`,
 											onClick: () => p.setRule(rule.id, { bgMode: m.mode }),
 											children: t(m.key)
-										}, m.mode))
+										}, m.mode)), url !== null && rule.bgMode === "fit" ? /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("button", {
+											type: "button",
+											className: "dab-btn",
+											onClick: () => setEditorOpen(true),
+											children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(EditIcon, { size: 13 }), t("ruleFramingEdit")]
+										}) : null]
 									})]
 								})
 							] }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", { children: [
@@ -6314,6 +6355,23 @@ window.__ModuleLoader__.load({
 				saveConfig();
 				repaintIfMoved(id, winner);
 			};
+			/**
+			* The batch form, for one upload that carried several pictures.
+			*
+			* EVERY picture that arrived is themed from its own bytes, the first ones
+			* included. The single-slot reading of an upload ("the last image added is the
+			* one being looked at") is true of the CARD's selection and false of the
+			* palette: since a theme color belongs to an image, a batch that themed only
+			* its last file left the rest of a fresh rotation on the system theme, with
+			* nothing in the interface to say why.
+			*
+			* Sequential on purpose: a batch is a handful of full-size photos, and ten
+			* parallel decodes buy nothing the user can see, while landing the colors in
+			* list order does (the card fills in from its first picture).
+			*/
+			const maybeAutoExtractEach = async (id, slots) => {
+				for (const slot of slots) await maybeAutoExtract(id, slot);
+			};
 			const activeLang = () => {
 				try {
 					const snapshot = ctx.locale.getSnapshot();
@@ -6390,6 +6448,8 @@ window.__ModuleLoader__.load({
 						const rule = ruleById(id);
 						if (rule === null || dataUrls.length === 0) return;
 						const winner = winnerId();
+						/** Slots of THIS batch, in list order — the extraction below is per slot. */
+						const added = [];
 						for (const dataUrl of dataUrls) {
 							const slot = nextSlot();
 							const image = {
@@ -6398,13 +6458,14 @@ window.__ModuleLoader__.load({
 								color: null
 							};
 							rule.images.push(image);
+							added.push(slot);
 							setImage(slot, dataUrl);
 							writeImage(slot, dataUrl);
 						}
 						rulesRev++;
 						persistConfig();
 						repaintIfMoved(id, winner);
-						maybeAutoExtract(id, rule.images[rule.images.length - 1]?.slot);
+						maybeAutoExtractEach(id, added);
 					},
 					removeRuleImage: (id, slot) => {
 						const rule = ruleById(id);
@@ -6422,34 +6483,21 @@ window.__ModuleLoader__.load({
 						}
 						repaintIfMoved(id, winner);
 					},
-					moveRuleImage: (id, slot, dir) => {
-						const rule = ruleById(id);
-						if (rule === null) return;
-						const idx = rule.images.findIndex((i) => i.slot === slot);
-						const to = idx + dir;
-						if (idx < 0 || to < 0 || to >= rule.images.length) return;
-						const winner = winnerId();
-						const [image] = rule.images.splice(idx, 1);
-						rule.images.splice(to, 0, image);
-						rulesRev++;
-						if (id === activeRuleId) {
-							setRotIndex(Math.max(0, to));
-							scheduleRotation(true);
-						}
-						persistConfig();
-						repaintIfMoved(id, winner);
-					},
-					setCurrentImage: (id, slot) => {
+					moveRuleImageTo: (id, slot, to) => {
 						const rule = ruleById(id);
 						if (rule === null) return;
 						const idx = rule.images.findIndex((i) => i.slot === slot);
 						if (idx < 0) return;
+						const at = Math.max(0, Math.min(rule.images.length - 1, Math.trunc(to)));
+						if (at === idx) return;
 						const winner = winnerId();
+						const painted = id === activeRuleId ? rule.images[imageIndexOf(rule)]?.slot ?? null : null;
 						const [image] = rule.images.splice(idx, 1);
-						rule.images.unshift(image);
+						rule.images.splice(at, 0, image);
 						rulesRev++;
 						if (id === activeRuleId) {
-							setRotIndex(0);
+							const keep = painted === null ? -1 : rule.images.findIndex((i) => i.slot === painted);
+							setRotIndex(keep < 0 ? Math.min(at, rule.images.length - 1) : keep);
 							scheduleRotation(true);
 						}
 						persistConfig();
@@ -6484,6 +6532,15 @@ window.__ModuleLoader__.load({
 						paintImage(rule, next);
 						scheduleRotation(true);
 					},
+					showRuleImage: (id, slot) => {
+						const rule = ruleById(id);
+						if (rule === null || id !== activeRuleId) return;
+						const idx = rule.images.findIndex((i) => i.slot === slot);
+						if (idx < 0) return;
+						setRotIndex(idx);
+						paintImage(rule, idx);
+						scheduleRotation(true);
+					},
 					loadRuleImages: async (id) => {
 						const rule = ruleById(id);
 						if (rule === null) return;