@naxodev/opencode-music-player 0.3.0 → 0.4.0

package/README.md

@@ -8,7 +8,7 @@ It supports browsers, Spotify, Apple Music, Kaset, and other apps exposed throug
 
 One reconnecting music-session client supplies replayed and live state, provider status, transport, and daemon-owned native artwork bytes. The shared same-user daemon owns provider discovery, provider events and polling, the playback clock, and global transport ordering.
 
-OpenCode keeps plugin/controller lifecycle, the Solid compact and sidebar UI, optimistic transport presentation, seek coalescing, notifications, waveform projection, iTunes catalog fallback and downloads, conversion, bounded presentation cache/jobs, and Kitty or half-block rendering. Plugin disposal removes local listeners and presentation work, then disposes only its session client. Other clients keep the shared daemon alive.
+OpenCode keeps plugin/controller lifecycle, the Solid compact and sidebar UI, transport loading feedback, seek coalescing, notifications, waveform projection, iTunes catalog fallback and downloads, conversion, bounded presentation cache/jobs, and Kitty or half-block rendering. Plugin disposal removes local listeners and presentation work, then disposes only its session client. Other clients keep the shared daemon alive.
 
 Read the [music session architecture field guide](../../docs/music-session-architecture.html) for the daemon protocol, replay, reconnect, and cleanup model.
 
@@ -38,13 +38,12 @@ set -g allow-passthrough on
 ```
 
 > [!IMPORTANT]
-> This source targets stable `opencode v2.0.3`. The previous beta host is unsupported. See the [compatibility contract](../../docs/opencode-compatibility.md) for the exact dependency set and release requirements.
+> This source targets the exact stable host in the [validated compatibility metadata](../../docs/package-compatibility.md). The previous beta host is unsupported. See the [compatibility contract](../../docs/opencode-compatibility.md) for runtime ownership and release requirements.
 
 ## Requirements
 
 - macOS
-- OpenCode `v2.0.3`
-- The Bun-based OpenCode runtime; Bun 1.3.7 for workspace development
+- The exact tested OpenCode host and workspace Bun pin listed in the compatibility metadata
 - [`media-control`](https://github.com/ungive/media-control), recommended:
 
   ```sh
@@ -97,6 +96,8 @@ Start `opencode` and run `/plugins` in the TUI. The list should include `music-p
 
 ## Controls
 
+Play/pause uses the shared [playback toggle contract](../music-core/README.md#playback-toggle-contract). Each activation toggles the daemon's accepted state in queue order, even when this view's icon is stale. Rapid clicks remain separate commands.
+
 The compact bar appears below the active route whenever a current track exists, including while playback is paused. It remains visible when the session sidebar is collapsed. Wide terminals show the playback marker, title, and artist. Medium terminals omit the artist. Narrow terminals truncate the title, then keep only the playback marker when metadata cannot fit safely. The bar always stays on one row.
 
 | Input              | Action         |

package/dist/index.js

@@ -561,6 +561,9 @@ function createSessionSystemMedia(overrides = {}) {
     async play() {
       await (await activeClient()).play();
     },
+    async toggle() {
+      await (await activeClient()).toggle();
+    },
     async pause() {
       await (await activeClient()).pause();
     },
@@ -1037,6 +1040,10 @@ function AlbumArtwork(props) {
       paintPending = false;
       if (!disposed && ownership.isCurrent())
         paintNativeImage();
+    }).catch((error) => {
+      paintPending = false;
+      if (!disposed && ownership.isCurrent())
+        console.error("Failed to paint music artwork", error);
     });
   };
   onMount(() => props.context.renderer.on("frame", scheduleNativeImage));
@@ -1186,7 +1193,7 @@ var BLUE = [
 ];
 function blueFor(level, playing, theme) {
   if (!playing && level < 0.05)
-    return theme.text.subdued;
+    return theme.text.muted;
   if (level <= 0.02)
     return BLUE[1];
   const idx = Math.min(BLUE.length - 1, Math.floor(level * (BLUE.length - 1)));
@@ -1422,7 +1429,7 @@ function CompactPlayer(props) {
       _$setProp2(_el$2, "wrapMode", "none");
       _$setProp2(_el$2, "truncate", true);
       _$insert3(_el$2, renderLine);
-      _$effect2((_$p) => _$setProp2(_el$2, "fg", theme().text.action.primary.default, _$p));
+      _$effect2((_$p) => _$setProp2(_el$2, "fg", theme().text.action.primary.base, _$p));
       return _el$;
     })()
   });
@@ -1507,11 +1514,11 @@ function ProgressBar(props) {
     _$insert3(_el$7, () => rendered().right);
     _$effect2((_p$) => {
       var _v$ = width(), _v$2 = {
-        fg: props.accent ?? props.theme.text.action.primary.default
+        fg: props.accent ?? props.theme.text.action.primary.base
       }, _v$3 = {
-        fg: props.accent ?? props.theme.text.action.primary.default
+        fg: props.accent ?? props.theme.text.action.primary.base
       }, _v$4 = {
-        fg: props.theme.text.subdued
+        fg: props.theme.text.muted
       };
       _v$ !== _p$.e && (_p$.e = _$setProp2(_el$3, "width", _v$, _p$.e));
       _v$2 !== _p$.t && (_p$.t = _$setProp2(_el$5, "style", _v$2, _p$.t));
@@ -1548,7 +1555,7 @@ function LiveElapsed(props) {
     var _el$8 = _$createElement3("text");
     _$use3((element) => text = element, _el$8);
     _$insert3(_el$8, () => formatMs(liveProgress(props.source.current())));
-    _$effect2((_$p) => _$setProp2(_el$8, "fg", props.theme.text.subdued, _$p));
+    _$effect2((_$p) => _$setProp2(_el$8, "fg", props.theme.text.muted, _$p));
     return _el$8;
   })();
 }
@@ -1557,17 +1564,17 @@ function IconBtn(props) {
   const [press, setPress] = createSignal(false);
   const bg = () => {
     if (press() || props.active) {
-      return props.theme.background.action.primary.default;
+      return props.theme.background.action.primary.base;
     }
-    return props.theme.background.surface.offset;
+    return props.theme.background.raised.base;
   };
   const fg2 = () => {
     if (press() || props.active)
-      return props.accent ?? props.theme.text.action.primary.default;
+      return props.accent ?? props.theme.text.action.primary.base;
     if (props.primary) {
-      return hover() ? props.theme.text.action.primary.default : props.theme.text.default;
+      return hover() ? props.theme.text.action.primary.base : props.theme.text.base;
     }
-    return hover() ? props.theme.text.action.primary.default : props.theme.text.default;
+    return hover() ? props.theme.text.action.primary.base : props.theme.text.base;
   };
   const w = () => props.width ?? 3;
   const h = () => props.height ?? 1;
@@ -1656,7 +1663,7 @@ function SidebarPlayer(props) {
       children: (err) => (() => {
         var _el$17 = _$createElement3("text");
         _$insert3(_el$17, () => sanitizeTerminalText(err()));
-        _$effect2((_$p) => _$setProp2(_el$17, "fg", theme().text.feedback.error.default, _$p));
+        _$effect2((_$p) => _$setProp2(_el$17, "fg", theme().text.feedback.error.base, _$p));
         return _el$17;
       })()
     }), _el$10);
@@ -1682,7 +1689,7 @@ function SidebarPlayer(props) {
             var _c$ = _$memo(() => !!track());
             return () => _c$() ? track()?.artwork_loading ? "Loading artwork\u2026" : "Artwork unavailable" : "";
           })());
-          _$effect2((_$p) => _$setProp2(_el$19, "fg", theme().text.subdued, _$p));
+          _$effect2((_$p) => _$setProp2(_el$19, "fg", theme().text.muted, _$p));
           return _el$18;
         })();
       },
@@ -1703,7 +1710,7 @@ function SidebarPlayer(props) {
         return (() => {
           var _el$20 = _$createElement3("text");
           _$insert3(_el$20, () => props.state.loading ? "Syncing\u2026" : "Nothing playing");
-          _$effect2((_$p) => _$setProp2(_el$20, "fg", theme().text.subdued, _$p));
+          _$effect2((_$p) => _$setProp2(_el$20, "fg", theme().text.muted, _$p));
           return _el$20;
         })();
       },
@@ -1721,7 +1728,7 @@ function SidebarPlayer(props) {
           get children() {
             var _el$24 = _$createElement3("text");
             _$insert3(_el$24, () => sanitizeTerminalText(t2().artists));
-            _$effect2((_$p) => _$setProp2(_el$24, "fg", theme().text.subdued, _$p));
+            _$effect2((_$p) => _$setProp2(_el$24, "fg", theme().text.muted, _$p));
             return _el$24;
           }
         }), null);
@@ -1732,11 +1739,11 @@ function SidebarPlayer(props) {
           get children() {
             var _el$25 = _$createElement3("text");
             _$insert3(_el$25, () => sanitizeTerminalText(t2().album));
-            _$effect2((_$p) => _$setProp2(_el$25, "fg", theme().text.subdued, _$p));
+            _$effect2((_$p) => _$setProp2(_el$25, "fg", theme().text.muted, _$p));
             return _el$25;
           }
         }), null);
-        _$effect2((_$p) => _$setProp2(_el$22, "fg", theme().text.default, _$p));
+        _$effect2((_$p) => _$setProp2(_el$22, "fg", theme().text.base, _$p));
         return _el$21;
       })()
     }), _el$12);
@@ -1784,7 +1791,7 @@ function SidebarPlayer(props) {
           source
         }), _el$15);
         _$insert3(_el$15, () => formatMs(duration()));
-        _$effect2((_$p) => _$setProp2(_el$15, "fg", theme().text.subdued, _$p));
+        _$effect2((_$p) => _$setProp2(_el$15, "fg", theme().text.muted, _$p));
         return _el$13;
       }
     }), _el$16);
@@ -1843,7 +1850,7 @@ function SidebarPlayer(props) {
       onClick: () => props.onNext()
     }), null);
     _$effect2((_p$) => {
-      var _v$9 = playing() ? track()?.artwork?.accent ?? theme().text.action.primary.default : theme().border.default, _v$0 = TRANSPORT_LAYOUT.gap;
+      var _v$9 = playing() ? track()?.artwork?.accent ?? theme().text.action.primary.base : theme().border.base, _v$0 = TRANSPORT_LAYOUT.gap;
       _v$9 !== _p$.e && (_p$.e = _$setProp2(_el$1, "borderColor", _v$9, _p$.e));
       _v$0 !== _p$.t && (_p$.t = _$setProp2(_el$16, "gap", _v$0, _p$.t));
       return _p$;
@@ -1899,8 +1906,6 @@ function createController(context, dependencies = controllerDependencies) {
   };
   let transportError = null;
   let receivedSnapshot = false;
-  let snapshotEpoch = 0;
-  let playbackIntent;
   let activeSeek = null;
   let latestSeek = null;
   const pending = new Set;
@@ -1958,9 +1963,7 @@ function createController(context, dependencies = controllerDependencies) {
       } catch (error) {
         result = Promise.reject(error);
       }
-      let succeeded = false;
       Promise.resolve(result).then(() => {
-        succeeded = true;
         if (!isActive() || generation !== lifecycleGeneration)
           return;
         if (transportError !== null)
@@ -1977,10 +1980,12 @@ function createController(context, dependencies = controllerDependencies) {
         });
       }).finally(() => {
         try {
-          onSettled?.(succeeded);
+          onSettled?.();
         } finally {
           settle(resolve);
         }
+      }).catch((error) => {
+        console.error("Failed to settle music command", error);
       });
     });
   };
@@ -1999,6 +2004,8 @@ function createController(context, dependencies = controllerDependencies) {
         runSeek(next);
       else
         next?.resolves.splice(0).forEach((resolve) => resolve());
+    }).catch((error) => {
+      console.error("Failed to start music seek", error);
     });
   };
   const refreshAll = async () => {
@@ -2017,26 +2024,7 @@ function createController(context, dependencies = controllerDependencies) {
         setTransportError(errMsg(error));
     }
   };
-  const playPause = () => {
-    const nextPlaying = !(playbackIntent?.target ?? !!session.player?.is_playing);
-    const intent = {
-      target: nextPlaying,
-      startedAtEpoch: snapshotEpoch,
-      settled: false
-    };
-    playbackIntent = intent;
-    return runCommand(() => nextPlaying ? media.play() : media.pause(), (succeeded) => {
-      if (playbackIntent !== intent)
-        return;
-      if (!succeeded) {
-        playbackIntent = undefined;
-        return;
-      }
-      intent.settled = true;
-      if (snapshotEpoch > intent.startedAtEpoch && session.player?.is_playing === intent.target)
-        playbackIntent = undefined;
-    });
-  };
+  const playPause = () => runCommand(() => media.toggle());
   const seek = (positionMs) => {
     const target = seekTarget(positionMs, session.player?.track?.duration_ms);
     if (!session.player?.track || target === null || !isActive())
@@ -2065,18 +2053,13 @@ function createController(context, dependencies = controllerDependencies) {
       return;
     if (event?.type === "snapshot") {
       receivedSnapshot = true;
-      snapshotEpoch++;
       setSession((draft) => {
         draft.player = mergePlayerSnapshot(draft.player, event.state);
       });
-      if (playbackIntent?.settled && snapshotEpoch > playbackIntent.startedAtEpoch && event.state.is_playing === playbackIntent.target)
-        playbackIntent = undefined;
       return;
     }
     if (event?.type === "lifecycle") {
       setLifecycleError(event.message, event.source);
-      if (event.source === "connection" && event.message !== null)
-        playbackIntent = undefined;
       if (event.message !== null && latestSeek) {
         latestSeek.resolves.splice(0).forEach((resolve) => resolve());
         latestSeek = null;
@@ -2090,7 +2073,9 @@ function createController(context, dependencies = controllerDependencies) {
       draft.player = mergeArtworkCompletion(draft.player, event);
     });
   });
-  refreshAll();
+  refreshAll().catch((error) => {
+    console.error("Failed to publish initial music state", error);
+  });
   return {
     session,
     subscribe(listener) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naxodev/opencode-music-player",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "macOS system Now Playing controls for the OpenCode 2 TUI",
   "license": "MIT",
   "author": {
@@ -64,16 +64,16 @@
     "pngjs": "^7.0.0"
   },
   "peerDependencies": {
-    "@opencode/plugin": "2.0.3",
+    "@opencode/plugin": "2.0.16",
     "@opentui/core": "0.5.10",
     "@opentui/solid": "0.5.10"
   },
   "devDependencies": {
-    "@opencode/plugin": "2.0.3",
+    "@opencode/plugin": "2.0.16",
     "@opentui/core": "0.5.10",
     "@opentui/solid": "0.5.10",
     "solid-js": "1.9.15",
-    "@opencode/theme": "2.0.3",
+    "@opencode/theme": "2.0.16",
     "@types/bun": "^1.3.14",
     "@types/pngjs": "^6.0.5",
     "prettier": "3.9.6",