dsh-plugin-maoxuan-pet 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 0.3.2（2026-11-01）
+
+### 桌宠壳
+
+- **新增：点击真穿透（窗口随内容收缩）**——原 hitTest 白名单只能在 AppKit 层丢事件，WindowServer 已把点击判给壳窗口（640×720 的透明玻璃），后面 App 点不到。曾试过 CGS 窗口形状（`CGSSetWindowShape`）：坐标约定对不上且**连渲染一起裁**（小毛活着但隐形），弃用。最终方案：壳窗口随页面报告的可点区域收缩（右下角锚定，stage 定位固定 ⇒ 小毛纹丝不动），卡片高度与视口解耦（固定 480px）防止窗口伸缩反馈回路；窗口外点击天然直达下层。
+- **修复：恢复的窗口位置会把小毛放回屏幕外**——保存的位置 {{1218,-19}} 挂在屏幕右缘外（屏幕 1512pt 宽，窗口右缘 1858pt），她本人活着但站在不可见区域，看起来就是「放出去没了」。现在恢复前校验小毛站立处（窗口右下 220×300）是否整块在屏内，不在就回退默认位置并留日志。
+- **新增：跟随宿主换端口**——桌面版重启会换 web 端口，壳还指着旧 origin 就是反复出现的「连接中断」。连续 3 次拉取失败后扫 `$DSH_HOME/agent-tree-dock-*.json`（文件名带端口，取最新），用公开路由探活成功即自动跟随；约 30 秒内自愈。`--token` 模式不自动跟随（token 按次发放），日志提示重新放她到桌面。
+- **修复：立绘「下载成功但画面不换装」（蓝色大脑袋）**——立绘/状态注入是单次 `evaluate`，若那一刻 WKWebView 还没加载完 `pet.html`，注入落在即将被丢弃的上下文里，数据永久丢失；而立绘只在下载完成时注入一次，错过就永远停在壳内置占位形象。0.3.1 的 `--public` 模式无鉴权流程、轮询极快，把窗口期放大成必现。现在：注入前先落页面全局 `__petSpriteData` / `__petStateData`（页面脚本就绪时自取），并且壳以页面 rects 上报为「活着」心跳，发现立绘/首份 state 尚未送达就补发——时序无论怎么排都能收敛。新增恒落盘诊断日志 `$DSH_HOME/storages/dsh-maoxuan-pet.shell.log`（256KB 自动截断；宿主按钮拉起时 stdio 被丢弃，这份日志是唯一黑盒透视）。
+
 ## 0.3.1 — 2026-11-01
 
 修复：预设面板上 maoxuan-pet 显示「加载失败 / Failed to load」；桌宠壳补上宿主鉴权支持。

package/client.js

@@ -530,15 +530,24 @@ window.__ModuleLoader__.load({
       if (shell?.running) {
         return h('button', {
           className: 'mp-dock-chip', type: 'button', onClick: toggleShell,
+          title: '收回桌面上的小毛',
           style: {
-            position: 'fixed', right: 18, bottom: 18, zIndex: 2147483000,
-            border: '1px solid #ffd9a855', borderRadius: 999, cursor: 'pointer',
-            padding: '6px 14px', font: '12px/1.6 -apple-system, sans-serif',
-            color: '#ffe9c8', background: 'linear-gradient(180deg,#8f1d22,#6d1418)',
-            boxShadow: '0 4px 14px rgba(0,0,0,.28)',
+            position: 'fixed', right: 16, bottom: 16, zIndex: 2147483000,
+            display: 'flex', alignItems: 'center', gap: 5,
+            border: '1px solid rgba(255,217,168,.35)', borderRadius: 999, cursor: 'pointer',
+            padding: '3px 8px 3px 4px', font: '11px/1.4 -apple-system, sans-serif',
+            color: '#ffe9c8', background: 'rgba(109,20,24,.92)',
+            boxShadow: '0 2px 8px rgba(0,0,0,.24)',
           },
           'aria-label': '收回桌面上的小毛',
-        }, shellBusy ? '收回中…' : '小毛在桌面上 · 点此收回');
+        },
+          h('svg', { width: 14, height: 14, viewBox: '0 0 512 512', 'aria-hidden': true },
+            h('rect', { x: 0, y: 0, width: 512, height: 512, rx: 116, fill: '#FFF6E9' }),
+            h('rect', { x: 120, y: 104, width: 232, height: 304, rx: 26, fill: '#B3271E' }),
+            h('rect', { x: 120, y: 104, width: 46, height: 304, rx: 22, fill: '#8F1E17' }),
+            h('polygon', { fill: '#E8C36A', points: '263,150 273.32,181.76 306.72,181.76 279.7,201.74 289.02,234.5 263,214.25 236.98,234.5 246.3,201.74 219.28,181.76 252.68,181.76' }),
+            h('rect', { x: 215, y: 272, width: 96, height: 16, rx: 8, fill: '#E8C36A' })),
+          shellBusy ? '收回中…' : '收回');
       }
 
       return h('div', { style, 'data-maoxuan-pet': true },

package/desktop/maoxuan-pet.swift

@@ -18,6 +18,7 @@
 import AppKit
 import WebKit
 
+
 // MARK: - 配置
 
 enum Shell {
@@ -40,10 +41,45 @@ enum Shell {
     static let defaults = UserDefaults(suiteName: "dsh-maoxuan-pet.window")!
 
     static func log(_ message: String) {
+        let line = "[maoxuan-pet] \(message)\n"
+        if verbose {
+            FileHandle.standardError.write(Data(line.utf8))
+        }
+        // 恒落文件：按钮拉起的壳 stdio 被宿主丢弃（stdio: 'ignore'），
+        // 没有这份日志，出问题就是黑盒。256KB 自动截断。
+        Self.appendToFile(line)
+    }
+
+    /// 高频日志（每秒多次的 input rects 等）只进 stderr，不刷文件。
+    static func debug(_ message: String) {
         guard verbose else { return }
         FileHandle.standardError.write(Data("[maoxuan-pet] \(message)\n".utf8))
     }
 
+    /// 关键诊断恒落一份到文件：按钮拉起的壳 stdio 被宿主丢弃（stdio: 'ignore'），
+    /// 没有这份日志，出问题就是黑盒。超过 256KB 从头截断，避免无限增长。
+    private static func appendToFile(_ line: String) {
+        let home = ProcessInfo.processInfo.environment["DSH_HOME"] ?? NSHomeDirectory() + "/.dsh"
+        let path = home + "/storages/dsh-maoxuan-pet.shell.log"
+        let dir = (path as NSString).deletingLastPathComponent
+        try? FileManager.default.createDirectory(atPath: dir, withIntermediateDirectories: true)
+        let formatter = DateFormatter()
+        formatter.dateFormat = "HH:mm:ss"
+        let stamped = "[" + formatter.string(from: Date()) + "] " + line
+        guard let data = stamped.data(using: .utf8) else { return }
+        if let handle = FileHandle(forWritingAtPath: path) {
+            if let attrs = try? FileManager.default.attributesOfItem(atPath: path),
+               let size = attrs[.size] as? NSNumber, size.intValue > 262_144 {
+                try? handle.truncate(atOffset: 0)
+            }
+            try? handle.seekToEndOfFile()
+            try? handle.write(contentsOf: data)
+            try? handle.close()
+        } else {
+            FileManager.default.createFile(atPath: path, contents: data)
+        }
+    }
+
     static func jsonString(_ value: Any) -> String {
         guard JSONSerialization.isValidJSONObject([value]),
               let data = try? JSONSerialization.data(withJSONObject: [value]),
@@ -104,6 +140,76 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
     /// 精灵图 name → data URL：WebKit 的 ATS 会拦 file:// 页面直挂的 http 图，
     /// 所以素材也由原生层拉取后转 base64 注入，WebKit 全程零网络请求。
     private var spriteDataURLs: [String: String] = [:]
+    /// 页面就绪回放：WKWebView 加载完成前 evaluate 会落在将被丢弃的上下文里
+    /// （立绘/状态一次性注入从此丢失，页面永远停在占位形象）。页面第一次上报
+    /// rects 即「活着」，此时把手里已有的 state 与立绘重放一次，时序就无关紧要了。
+    private var replayedSpriteCount = 0
+    private var consecutiveFailures = 0
+    private var everSucceeded = false
+    private var rediscoveryCooldown = Date.distantPast
+    private var rediscoverHintShown = false
+    private var lastRegionDesc = ""
+    /// 穿透问题的釜底抽薪：窗口收缩到只有小毛（+展开的卡片）那么大，
+    /// 挡住后面 App 的区域天然就只有那一块——不用任何私有 API，渲染永远完整。
+    /// 右下角锚定缩放：stage 定位 right:44 bottom:56 固定，小毛本人纹丝不动。
+    private func syncWindowFrame(to union: CGRect) {
+        guard let window, union.width > 0 else { return }
+        // 只用 union 的「尺寸」、不用它的「位置」：位置随窗口高度 relayout 漂移，
+        // 尺寸稳定——这样窗口缩放没有反馈回路。右下角锚定 + stage right:44
+        // bottom:56 固定 ⇒ 小毛的屏幕位置纹丝不动。
+        let pad: CGFloat = 14
+        let width = max(union.width + 44 + pad, 160)
+        let height = max(union.height + 56 + pad, 220)
+        let frame = window.frame
+        guard abs(frame.width - width) > 1 || abs(frame.height - height) > 1 else { return }
+        window.setFrame(NSRect(x: frame.maxX - width, y: frame.minY, width: width, height: height), display: true)
+        Shell.log("window → \(Int(width))x\(Int(height)) @右下角锚定")
+    }
+
+
+    /// 宿主重启会换端口，壳却还指着旧 origin——这正是「连接中断」反复出现的原因。
+    /// 连续失败后扫 ~/.dsh/agent-tree-dock-*.json（文件名带端口，取最新修改的那个），
+    /// 用公开路由探活成功就跟随过去。--token 模式不自动跟随（token 是按次发放的）。
+    private func tryRediscover() {
+        guard Shell.token == nil else {
+            if !rediscoverHintShown {
+                rediscoverHintShown = true
+                Shell.log("宿主可能换了端口；token 模式不自动跟随——请点「收回」后重新放她到桌面")
+            }
+            return
+        }
+        let home = ProcessInfo.processInfo.environment["DSH_HOME"] ?? NSHomeDirectory() + "/.dsh"
+        guard let names = try? FileManager.default.contentsOfDirectory(atPath: home) else { return }
+        let newest = names
+            .filter { $0.hasPrefix("agent-tree-dock-") && $0.hasSuffix(".json") }
+            .compactMap { name -> (port: String, mtime: Date)? in
+                guard let start = name.range(of: "agent-tree-dock-")?.upperBound,
+                      let end = name.range(of: ".json")?.lowerBound, start < end else { return nil }
+                let port = String(name[start..<end])
+                let path = home + "/" + name
+                guard let attrs = try? FileManager.default.attributesOfItem(atPath: path),
+                      let mtime = attrs[.modificationDate] as? Date else { return nil }
+                return (port, mtime)
+            }
+            .max { $0.mtime < $1.mtime }
+        guard let newest, let port = Int(newest.port), (1024..<65536).contains(port) else { return }
+        let candidate = "http://127.0.0.1:\(port)"
+        guard candidate != Shell.origin, let url = URL(string: candidate + Shell.statePath) else { return }
+        var request = URLRequest(url: url, cachePolicy: .reloadIgnoringLocalCacheData, timeoutInterval: 4)
+        request.httpMethod = "GET"
+        http.dataTask(with: request) { [weak self] _, response, _ in
+            guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return }
+            DispatchQueue.main.async {
+                guard let self, Shell.origin != candidate else { return }
+                Shell.log("DSH 换了端口 → 跟随 \(candidate)（公开路由探活 200）")
+                Shell.origin = candidate
+                self.consecutiveFailures = 0
+                self.pollNow()
+            }
+        }.resume()
+    }
+    private var stateReplayed = false
+    private var lastStateJSON: String?
     private var spritePending = Set<String>()
     private var authed = false
     private var authInFlight = false
@@ -120,7 +226,12 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
     private func readLivePid() -> Int32? {
         guard let raw = try? String(contentsOfFile: pidFilePath(), encoding: .utf8),
               let pid = Int32(raw.trimmingCharacters(in: .whitespacesAndNewlines)), pid > 1 else { return nil }
-        return kill(pid, 0) == 0 ? pid : nil
+        guard kill(pid, 0) == 0 else { return nil }
+        // pid 会被系统复用：文件里的编号活着 ≠ 还是我们的小毛。校验进程身份。
+        var buffer = [CChar](repeating: 0, count: Int(MAXPATHLEN))
+        guard proc_pidpath(pid, &buffer, UInt32(MAXPATHLEN)) > 0,
+              String(cString: buffer).hasSuffix("maoxuan-pet") else { return nil }
+        return pid
     }
 
     private func writePid() {
@@ -191,6 +302,21 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
         self.webView = webView
         self.clickView = container
 
+        // 被谁杀的要有案底：SIGTERM/SIGINT/SIGHUP 落日志再走（SIGKILL 无法捕获）。
+        for name in [SIGTERM, SIGINT, SIGHUP] {
+            signal(name) { code in
+                Shell.log("收到信号 \(code)，退出")
+                exit(0)
+            }
+        }
+        DispatchQueue.main.async { [weak self] in
+            guard let self else { return }
+            let start = Date()
+            Timer.scheduledTimer(withTimeInterval: 30, repeats: true) { _ in
+                Shell.log("heartbeat up=\(Int(-start.timeIntervalSinceNow))s origin=\(Shell.origin)")
+            }
+        }
+
         if let html = locateHTML() {
             webView.loadFileURL(html, allowingReadAccessTo: html.deletingLastPathComponent())
         } else {
@@ -205,6 +331,7 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
         else if Shell.token != nil { authNote = "，带 launch token（自动换 dsh-auth cookie）" }
         else { authNote = "，无 token（宿主开鉴权时会是离线模式）" }
         FileHandle.standardError.write(Data("[maoxuan-pet] 小毛已站上桌面 — \(Shell.origin)\(authNote)（独立进程，DSH 最小化不影响她）\n".utf8))
+        Shell.log("started pid=\(ProcessInfo.processInfo.processIdentifier) ppid=\(getppid()) origin=\(Shell.origin) auth=\(Shell.token == nil ? "public" : "token")")
     }
 
     func applicationWillTerminate(_ notification: Notification) {
@@ -236,8 +363,14 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
         guard ProcessInfo.processInfo.arguments.contains("--reset") == false,
               let raw = Shell.defaults.string(forKey: "frame") else { return nil }
         let frame = NSRectFromString(raw)
-        let onScreen = NSScreen.screens.contains { $0.visibleFrame.intersects(frame) }
-        guard onScreen, frame.width > 100, frame.height > 100 else { return nil }
+        guard frame.width > 100, frame.height > 100 else { return nil }
+        // 小毛站在窗口右下角（stage right:44 bottom:56）：那一块必须在屏内。
+        // 只判「窗口与屏幕相交」会恢复出人在屏外的幽灵窗口——看起来就是丢了。
+        let petCorner = NSRect(x: frame.maxX - 220, y: frame.minY, width: 220, height: 300)
+        guard NSScreen.screens.contains(where: { $0.visibleFrame.intersection(petCorner) == petCorner }) else {
+            Shell.log("保存的位置会让小毛站在屏幕外（\(NSStringFromRect(frame))），改用默认位置")
+            return nil
+        }
         return frame
     }
 
@@ -292,7 +425,7 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
                 self.authInFlight = false
                 if let error {
                     Shell.log("auth failed: \(error.localizedDescription)")
-                    self.evaluate("window.__petOffline && window.__petOffline();")
+                    self.evaluate("window.__petOfflineSeen=true;if (window.__petOffline) window.__petOffline();")
                     self.schedulePoll(after: 30)
                     return
                 }
@@ -301,7 +434,7 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
                 let hasAuthCookie = jar?.cookies?.contains { $0.name.hasPrefix("dsh-auth-") } ?? false
                 guard (200..<400).contains(status), hasAuthCookie else {
                     Shell.log("auth HTTP \(status)，没换到 dsh-auth cookie——token 要来自同一个宿主进程（dsh web 启动日志里的 ?token=）")
-                    self.evaluate("window.__petOffline && window.__petOffline();")
+                    self.evaluate("window.__petOfflineSeen=true;if (window.__petOffline) window.__petOffline();")
                     self.schedulePoll(after: 30)
                     return
                 }
@@ -332,29 +465,44 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
                 guard let self else { return }
                 if let error {
                     Shell.log("state failed: \(error.localizedDescription)")
-                    self.evaluate("window.__petOffline && window.__petOffline();")
+                    self.evaluate("window.__petOfflineSeen=true;if (window.__petOffline) window.__petOffline();")
+                    self.consecutiveFailures += 1
+                    if self.consecutiveFailures >= 3 || (self.consecutiveFailures >= 1 && !self.everSucceeded), Date() >= self.rediscoveryCooldown {
+                        self.rediscoveryCooldown = Date().addingTimeInterval(20)
+                        self.tryRediscover()
+                    }
                     self.schedulePoll(after: 8)
                     return
                 }
                 if let http = response as? HTTPURLResponse, http.statusCode != 200 {
-                    Shell.log("state HTTP \(http.statusCode)")
-                    self.evaluate("window.__petOffline && window.__petOffline();")
+                    let snippet = String(data: (data ?? Data()).prefix(160), encoding: .utf8) ?? "-"
+                    Shell.log("state HTTP \(http.statusCode) url=\(url.absoluteString) body=\(snippet)")
+                    self.evaluate("window.__petOfflineSeen=true;if (window.__petOffline) window.__petOffline();")
                     // 401 = jar 里的 cookie 失效了（宿主重启换了 launch token、或 30 天过期）：
                     // 置回未鉴权，下一轮先用 --token 重新换一次 cookie 再拉。
                     if http.statusCode == 401, Shell.token != nil { self.authed = false }
+                    self.consecutiveFailures += 1
+                    if self.consecutiveFailures >= 3 || (self.consecutiveFailures >= 1 && !self.everSucceeded), Date() >= self.rediscoveryCooldown {
+                        self.rediscoveryCooldown = Date().addingTimeInterval(20)
+                        self.tryRediscover()
+                    }
                     self.schedulePoll(after: 8)
                     return
                 }
                 guard let data, let text = String(data: data, encoding: .utf8) else {
-                    self.evaluate("window.__petOffline && window.__petOffline();")
+                    self.evaluate("window.__petOfflineSeen=true;if (window.__petOffline) window.__petOffline();")
                     self.schedulePoll(after: 8)
                     return
                 }
+                self.consecutiveFailures = 0
+                self.everSucceeded = true
                 // 生成中的话 3s 后紧跟下一条，让气泡尽快落地
                 let running = (text.contains("\"running\":true") || text.contains("\"running\" : true"))
                 self.lastInterval = running ? 3 : 20
                 self.ensureSprites(from: data)
-                self.evaluate("window.__petState && window.__petState(\(self.sanitized(text)));")
+                let payload = self.sanitized(text)
+                self.lastStateJSON = payload
+                self.evaluate("window.__petStateData=\(payload);if (window.__petState) window.__petState(window.__petStateData);")
                 self.schedulePoll(after: self.lastInterval)
             }
         }.resume()
@@ -393,7 +541,7 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
                         self.spriteDataURLs[entry.name] = "data:\(mime);base64,\(data.base64EncodedString())"
                         Shell.log("sprite \(entry.name) ready (\(data.count) bytes)")
                     }
-                    self.evaluate("window.__petSprites && window.__petSprites(\(Shell.jsonString(self.spriteDataURLs)));")
+                    self.evaluate("window.__petSpriteData=\(Shell.jsonString(self.spriteDataURLs));if (window.__petSprites) window.__petSprites(window.__petSpriteData);")
                 }
             }.resume()
         }
@@ -460,6 +608,15 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
         case "input":
             // 页面上报的可交互矩形（CSS px，左上原点）→ 容器本地坐标（左下原点）
             guard let rects = body["rects"] as? [[String: Any]] else { return }
+            // 原始页面坐标（top-left）正是 CGS 形状要的坐标系
+            let raw: [CGRect] = rects.compactMap { dict in
+                guard let x = (dict["x"] as? NSNumber)?.doubleValue,
+                      let y = (dict["y"] as? NSNumber)?.doubleValue,
+                      let w = (dict["w"] as? NSNumber)?.doubleValue,
+                      let h = (dict["h"] as? NSNumber)?.doubleValue,
+                      w > 0, h > 0 else { return nil }
+                return CGRect(x: x, y: y, width: w, height: h)
+            }
             let contentHeight = webView.bounds.height
             let converted: [CGRect] = rects.compactMap { dict in
                 guard let x = (dict["x"] as? NSNumber)?.doubleValue,
@@ -470,7 +627,30 @@ final class ShellController: NSObject, NSApplicationDelegate, WKNavigationDelega
                 return CGRect(x: x, y: contentHeight - (y + h), width: w, height: h)
             }
             clickView.passRects = converted
-            Shell.log("input rects: \(converted.count)")
+            Shell.debug("input rects: \(converted.count)")
+            // 可点区域的并集写进日志：用户体感「隐形区域大」时，拿这行对账
+            let union = converted.reduce(CGRect.null) { $0.union($1) }
+            syncWindowFrame(to: union)
+            let desc = String(format: "input region: x=%.0f y=%.0f w=%.0f h=%.0f（窗口 %.0fx%.0f）",
+                              union.minX, union.minY, union.width, union.height,
+                              webView.bounds.width, webView.bounds.height)
+            if desc != lastRegionDesc {
+                lastRegionDesc = desc
+                Shell.log(desc)
+            }
+            // 页面就绪补发：立绘/首份 state 可能比页面加载完成更晚/更早到达，
+            // 一次性 evaluate 会落在将被丢弃的上下文里。rects 是页面「活着」的
+            // 心跳，数据比上次补发多就再补一轮——最终一定补齐。
+            if !stateReplayed, let payload = lastStateJSON {
+                stateReplayed = true
+                self.evaluate("window.__petStateData=\(payload);if (window.__petState) window.__petState(window.__petStateData);")
+                Shell.log("page ready → 补发 state")
+            }
+            if spriteDataURLs.count > replayedSpriteCount {
+                replayedSpriteCount = spriteDataURLs.count
+                self.evaluate("window.__petSpriteData=\(Shell.jsonString(spriteDataURLs));if (window.__petSprites) window.__petSprites(window.__petSpriteData);")
+                Shell.log("page ready → 补发立绘 \(replayedSpriteCount) 张")
+            }
 
         case "dragstart":
             dragBaseOrigin = window.frame.origin

package/desktop/pet.html

@@ -21,12 +21,12 @@
   .mp-pet:hover{transform:translateY(-3px)}
   .mp-img{display:block;height:132px;width:auto;max-width:140px;object-fit:contain;filter:drop-shadow(0 10px 16px #050b14aa)}
   .mp-img[data-talking="on"]{animation:mp-bob 1.6s ease-in-out infinite}
-  .mp-fallback{height:132px;width:100px;filter:drop-shadow(0 10px 16px #050b14aa)}
+  .mp-fallback{height:118px;width:118px;filter:drop-shadow(0 10px 16px #050b14aa)}
   .mp-tag{margin-top:2px;font-size:10px;font-weight:700;letter-spacing:.06em;color:#ffe2bd;background:#5c0f0fd9;border:1px solid #ffd9a833;border-radius:999px;padding:2px 8px;white-space:nowrap;backdrop-filter:blur(8px)}
   .mp-dot{display:inline-block;width:6px;height:6px;border-radius:50%;margin-right:5px;background:#f6cf9a;box-shadow:0 0 6px #f6cf9aaa;vertical-align:1px}
   .mp-dot[data-off="off"]{background:#fca5a5;box-shadow:0 0 6px #fca5a5aa}
   .mp-bubble{position:absolute;z-index:2;right:calc(100% + 12px);bottom:30px;width:340px;animation:mp-in .16s ease-out}
-  .mp-card{position:relative;max-height:min(58vh,480px);overflow-y:auto;overflow-x:hidden;overscroll-behavior:contain;scrollbar-width:thin;scrollbar-color:#f6cf9a #5f1010dd;color:#fff3e4;border:1px solid #8f1616;border-radius:12px;background:linear-gradient(155deg,#b32323 0%,#941a1a 46%,#771111 100%);box-shadow:0 22px 54px #35040466,0 0 0 1px #ffd9a814 inset}
+  .mp-card{position:relative;max-height:480px;overflow-y:auto;overflow-x:hidden;overscroll-behavior:contain;scrollbar-width:thin;scrollbar-color:#f6cf9a #5f1010dd;color:#fff3e4;border:1px solid #8f1616;border-radius:12px;background:linear-gradient(155deg,#b32323 0%,#941a1a 46%,#771111 100%);box-shadow:0 22px 54px #35040466,0 0 0 1px #ffd9a814 inset}
   .mp-card::-webkit-scrollbar{width:8px;height:8px}
   .mp-card::-webkit-scrollbar-track{background:#5f1010cc;border-radius:8px}
   .mp-card::-webkit-scrollbar-thumb{background:linear-gradient(180deg,#f7d9a4,#d09a3f);border-radius:8px;border:1px solid #5f1010}
@@ -147,13 +147,21 @@ function current() {
 }
 
 // --- 渲染：宠物本体（一次性搭好，之后只改动态位） ----------------------------
-const FALLBACK_SVG = `<svg class="mp-fallback" viewBox="0 0 104 112" role="img" aria-label="鲸鱼娘占位图">
-  <ellipse cx="52" cy="62" rx="34" ry="30" fill="#2f6fd0"/><ellipse cx="43" cy="82" rx="22" ry="14" fill="#dbeafe"/>
-  <circle cx="41" cy="55" r="5" fill="#0b1220"/><circle cx="63" cy="55" r="5" fill="#0b1220"/>
-  <circle cx="43" cy="53" r="1.6" fill="#fff"/><circle cx="65" cy="53" r="1.6" fill="#fff"/>
-  <path d="M46 68 q6 5 12 0" stroke="#0b1220" stroke-width="2" fill="none" stroke-linecap="round"/>
-  <path d="M52 24 C 74 14, 92 26, 90 44 C 82 34, 68 34, 52 40 Z" fill="#2f6fd0"/>
-  <path d="M78 6 l4 10 10 4 -10 4 -4 10 -4 -10 -10 -4 10 -4 z" fill="#ef4444"/></svg>`;
+const FALLBACK_SVG = `<svg class="mp-fallback" viewBox="0 0 512 512" role="img" aria-label="鲸鱼娘·小毛 图标：红皮书《毛泽东选集》">
+  <rect x="0" y="0" width="512" height="512" rx="116" fill="#FFF6E9"/>
+  <rect x="14" y="14" width="484" height="484" rx="104" fill="none" stroke="#C1342B" stroke-width="6" stroke-opacity="0.16"/>
+  <g opacity="0.22"><rect x="132" y="112" width="286" height="308" rx="28" fill="#7A1410"/></g>
+  <g transform="translate(252,256) scale(1.08) translate(-258,-256)">
+    <path d="M330 118 h78 a14 14 0 0 1 14 14 v248 a14 14 0 0 1 -14 14 h-78 z" fill="#EFDFC4"/>
+    <path d="M356 138 v236 M382 138 v236" stroke="#D9C4A2" stroke-width="5" stroke-linecap="round" fill="none"/>
+    <rect x="120" y="104" width="232" height="304" rx="26" fill="#B3271E"/>
+    <rect x="120" y="104" width="46" height="304" rx="22" fill="#8F1E17"/>
+    <path d="M143 148 v216" stroke="#E8C36A" stroke-width="7" stroke-linecap="round" opacity="0.9" fill="none"/>
+    <rect x="192" y="126" width="142" height="260" rx="14" fill="none" stroke="#E8C36A" stroke-width="5" stroke-opacity="0.55"/>
+    <polygon fill="#E8C36A" points="263,150 273.32,181.76 306.72,181.76 279.7,201.74 289.02,234.5 263,214.25 236.98,234.5 246.3,201.74 219.28,181.76 252.68,181.76"/>
+    <g fill="#E8C36A"><rect x="215" y="272" width="96" height="16" rx="8"/><rect x="232" y="304" width="62" height="13" rx="6.5" opacity="0.78"/></g>
+  </g>
+</svg>`;
 
 PET_TAG.innerHTML = `
   <span id="pet-visual"></span>
@@ -381,6 +389,8 @@ window.__petSprites = (map) => {
   renderPetVisual();
   reportRects();
 };
+// 壳可能在当前脚本执行前就注入了立绘（--public 模式轮询极快）——这里回放
+if (window.__petSpriteData) window.__petSprites(window.__petSpriteData);
 window.__petState = (json) => {
   offline = false;
   state = json;
@@ -402,6 +412,9 @@ window.__petState = (json) => {
   renderAll();
 };
 window.__petOffline = () => { offline = true; busy = false; renderMeta(); renderCard(); };
+// 状态/离线标记可能早于本脚本到达（--public 轮询极快）——回放
+if (window.__petStateData) window.__petState(window.__petStateData);
+else if (window.__petOfflineSeen) window.__petOffline();
 window.__petActionDone = () => { busy = false; cardKey = ''; renderCard(); renderMeta(); };
 
 // 时钟：倒计时文案每秒刷新

package/index.js

@@ -17,7 +17,7 @@
  */
 import { readFile, writeFile, rename, mkdir, stat } from 'node:fs/promises';
 import { existsSync, readFileSync } from 'node:fs';
-import { spawn } from 'node:child_process';
+import { spawn, execFileSync } from 'node:child_process';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
@@ -1175,6 +1175,11 @@ export function apply(ctx, config) {
       const pid = Number(readFileSync(shellPidPath, 'utf8').trim());
       if (!Number.isInteger(pid) || pid <= 1) return null;
       process.kill(pid, 0);
+      // pid 会被系统复用：编号活着 ≠ 还是小毛。校验进程名，防止徽章状态失真。
+      if (shellPlatform) {
+        const comm = execFileSync('ps', ['-p', String(pid), '-o', 'comm='], { encoding: 'utf8' });
+        if (!comm.trim().endsWith('maoxuan-pet')) return null;
+      }
       return pid;
     } catch { return null; }
   };
@@ -1218,7 +1223,8 @@ export function apply(ctx, config) {
       }
       const args = ['--public'];
       // 只接受 loopback origin：这个值来自浏览器 location.origin，别让它带去别处
-      if (typeof origin === 'string' && /^http:\/\/127\.0\.0\.1:\d{2,5}$/.test(origin)) {
+      if (typeof origin === 'string' && /^http:\/\/(127\.0\.0\.1|localhost|\[::1\]):\d{2,5}$/.test(origin)) {
+        origin = origin.replace('localhost', '127.0.0.1').replace('[::1]', '127.0.0.1');
         args.push(`--origin=${origin}`);
       }
       const child = spawn(shellBin, args, { detached: true, stdio: 'ignore' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-maoxuan-pet",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "DSH 悬浮宠物「鲸鱼娘·小毛」：每小时读一篇毛选，给创业中的你说一句能动手的督促；内置毛选公开语料与 maoxuan-pet preset。",
   "keywords": [
     "dsh",