@naxodev/opencode-music-player 0.1.3 → 0.1.5

package/index.tsx

@@ -1,12 +1,11 @@
 /** @jsxImportSource @opentui/solid */
 import { Plugin } from "@opencode-ai/plugin/tui"
-import { createStore, produce } from "solid-js/store"
 import { createSessionSystemMedia, openNowPlayingApp } from "./system-media.ts"
 import { isMac, mergeArtworkCompletion, type SessionMedia } from "./types.ts"
 import { CompactPlayer, SidebarPlayer, type UiState } from "./ui.tsx"
 
 type Context = Plugin.Context
-type SessionStore = UiState
+type SessionStore = UiState & { loadingOwners?: string[] }
 type SeekIntent = {
   positionMs: number
   resolves: Array<() => void>
@@ -83,14 +82,18 @@ export function createController(
   context: Context,
   dependencies: ControllerDependencies = controllerDependencies,
 ): Controller {
-  // Host storage may use another Solid runtime when this plugin comes from npm.
-  const [session, setSessionStore] = createStore<SessionStore>({
-    loading: false,
-    error: null,
-    player: null,
-  })
-  const setSession = (update: (draft: SessionStore) => void) =>
-    setSessionStore(produce(update))
+  const [session, setSession] = context.storage.memory<SessionStore>(
+    "music-player.session.v6",
+    {
+      initial: {
+        loading: false,
+        loadingOwners: [],
+        error: null,
+        player: null,
+      },
+    },
+  )
+  const loadingOwner = crypto.randomUUID()
   const media = dependencies.createSessionMedia()
   let disposed = false
   let lifecycleGeneration = 0
@@ -132,12 +135,18 @@ export function createController(
     transportError = message
     publishError()
   }
-  const updateLoading = () => {
-    if (!isActive()) return
+  const setLoadingOwner = (active: boolean) => {
     setSession((draft) => {
-      draft.loading = pending.size > 0
+      const owners = new Set(draft.loadingOwners ?? [])
+      if (active) owners.add(loadingOwner)
+      else owners.delete(loadingOwner)
+      draft.loadingOwners = [...owners]
+      draft.loading = owners.size > 0
     })
   }
+  const updateLoading = () => {
+    if (isActive()) setLoadingOwner(pending.size > 0)
+  }
   const settle = (resolve: () => void) => {
     if (!pending.delete(resolve)) return
     resolve()
@@ -319,11 +328,7 @@ export function createController(
       activeSeek = null
       for (const resolve of [...pending]) settle(resolve)
       void media.dispose().catch(() => {})
-      if (session.loading) {
-        setSession((draft) => {
-          draft.loading = false
-        })
-      }
+      setLoadingOwner(false)
     },
   }
 }
@@ -404,22 +409,34 @@ export function createMusicPlayerPlugin(options?: {
               }
             : controllerDependencies,
         )
+      // Slot renderers must observe host-owned state before package components run.
+      const observeSession = () => {
+        void ctrl.session.loading
+        void ctrl.session.error
+        void ctrl.session.player
+      }
       const unsubApp = context.ui.slot({
         append: "session.composer.top",
-        render: () => <AppHost context={context} ctrl={ctrl} />,
+        render: () => {
+          observeSession()
+          return <AppHost context={context} ctrl={ctrl} />
+        },
       })
       const unsubSidebar = context.ui.slot({
         append: "sidebar.content",
-        render: () => (
-          <SidebarPlayer
-            context={context}
-            state={ctrl.session}
-            onPlayPause={() => void ctrl.playPause()}
-            onNext={() => void ctrl.next()}
-            onPrev={() => void ctrl.prev()}
-            onSeek={(positionMs) => void ctrl.seek(positionMs)}
-          />
-        ),
+        render: () => {
+          observeSession()
+          return (
+            <SidebarPlayer
+              context={context}
+              state={ctrl.session}
+              onPlayPause={() => void ctrl.playPause()}
+              onNext={() => void ctrl.next()}
+              onPrev={() => void ctrl.prev()}
+              onSeek={(positionMs) => void ctrl.seek(positionMs)}
+            />
+          )
+        },
       })
       return () => {
         unsubApp()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naxodev/opencode-music-player",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "macOS system Now Playing controls for the OpenCode 2 TUI",
   "license": "MIT",
   "author": {