@jxgame2020/dsh-token-quota 0.1.24 → 0.1.26

package/lib/index.js

@@ -27,7 +27,8 @@ const TOKEN_QUOTA_EXCEEDED_CODE = "TOKEN_QUOTA_EXCEEDED";
 const TOKEN_QUOTA_DEFAULT_MUSIC = {
 	enabled: false,
 	volume: .5,
-	style: "major"
+	style: "major",
+	onlyCurrentSession: true
 };
 /** Build the stable per-model key shared by the counter, settings, and snapshot. */
 function tokenQuotaKey(provider, model) {
@@ -221,7 +222,8 @@ const TOKEN_QUOTA_SETTINGS_SCHEMA = z.object({
 			"major",
 			"minor",
 			"pentatonic"
-		]).default(TOKEN_QUOTA_DEFAULT_MUSIC.style)
+		]).default(TOKEN_QUOTA_DEFAULT_MUSIC.style),
+		onlyCurrentSession: z.boolean().default(TOKEN_QUOTA_DEFAULT_MUSIC.onlyCurrentSession)
 	}).default({ ...TOKEN_QUOTA_DEFAULT_MUSIC })
 });
 /** Two-digit zero-pad helper. */
@@ -336,7 +338,8 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 							music: {
 								enabled: doc.music?.enabled ?? TOKEN_QUOTA_DEFAULT_MUSIC.enabled,
 								volume: doc.music?.volume ?? TOKEN_QUOTA_DEFAULT_MUSIC.volume,
-								style: doc.music?.style ?? TOKEN_QUOTA_DEFAULT_MUSIC.style
+								style: doc.music?.style ?? TOKEN_QUOTA_DEFAULT_MUSIC.style,
+								onlyCurrentSession: doc.music?.onlyCurrentSession ?? TOKEN_QUOTA_DEFAULT_MUSIC.onlyCurrentSession
 							}
 						};
 					};
@@ -504,7 +507,7 @@ var TokenQuotaService = class TokenQuotaService extends Service {
 		return this.upgradeCheck;
 	}
 	async doRefreshUpgrade() {
-		const current = "0.1.24";
+		const current = "0.1.26";
 		let latest;
 		try {
 			const response = await fetch(REGISTRY_LATEST_URL, {

package/lib/types/client/TokenQuotaPanel.d.ts

@@ -26,6 +26,8 @@ export interface TokenQuotaPanelInjected {
     setMusicVolume: (volume: number) => void;
     /** Change the live-music harmonic style. */
     setMusicStyle: (style: TokenQuotaMusicStyle) => void;
+    /** Toggle whether the soundtrack follows only the current session. */
+    setMusicOnlyCurrentSession: (only: boolean) => void;
     /** Ask the Host to check the registry right now, then refresh the snapshot. */
     checkUpdatesNow: () => void;
     /** Ask the Host to clear log entries before a date, then refresh the log. */
@@ -38,5 +40,5 @@ export type TokenQuotaPanelComponentProps = PropsRuntime<'shell.overlay'> & Prop
  * @param props - composed slot props.
  * @returns the panel element tree.
  */
-export declare function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored, setOnFull, setReset, setCheckUpdates, checkUpdatesNow, clearLogBefore, setDimWhenIdle, setMusicEnabled, setMusicVolume, setMusicStyle, useStore, actions, useSessions, }: TokenQuotaPanelComponentProps): import("react").JSX.Element;
+export declare function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored, setOnFull, setReset, setCheckUpdates, checkUpdatesNow, clearLogBefore, setDimWhenIdle, setMusicEnabled, setMusicVolume, setMusicStyle, setMusicOnlyCurrentSession, useStore, actions, useSessions, }: TokenQuotaPanelComponentProps): import("react").JSX.Element;
 //# sourceMappingURL=TokenQuotaPanel.d.ts.map

package/lib/types/client/TokenQuotaPanel.js

@@ -86,7 +86,7 @@ function loadPanelPos() {
  * @param props - composed slot props.
  * @returns the panel element tree.
  */
-export function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored, setOnFull, setReset, setCheckUpdates, checkUpdatesNow, clearLogBefore, setDimWhenIdle, setMusicEnabled, setMusicVolume, setMusicStyle, useStore, actions, useSessions, }) {
+export function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored, setOnFull, setReset, setCheckUpdates, checkUpdatesNow, clearLogBefore, setDimWhenIdle, setMusicEnabled, setMusicVolume, setMusicStyle, setMusicOnlyCurrentSession, useStore, actions, useSessions, }) {
     const [collapsed, setCollapsed] = useState(false);
     const [drafts, setDrafts] = useState({});
     const [editingKey, setEditingKey] = useState(null);
@@ -132,6 +132,7 @@ export function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored,
     const musicEnabled = useStore(s => s.musicEnabled);
     const musicVolume = useStore(s => s.musicVolume);
     const musicStyle = useStore(s => s.musicStyle);
+    const musicOnlyCurrentSession = useStore(s => s.musicOnlyCurrentSession);
     const upgrade = useStore(s => s.upgrade);
     const upgradeDismissed = useStore(s => s.upgradeDismissed);
     const checkingUpdates = useStore(s => s.checkingUpdates);
@@ -337,7 +338,7 @@ export function TokenQuotaPanel({ t, load, setLimit, selectModel, setMonitored,
                                                 hour: reset?.hour ?? 0,
                                                 minute: Number(event.target.value),
                                             });
-                                        }, children: Array.from({ length: 12 }, (_, i) => i * 5).map(minute => (_jsxs("option", { value: minute, children: [String(minute).padStart(2, '0'), " \u5206"] }, minute))) })] })] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: dimWhenIdle, onChange: (event) => { setDimWhenIdle(event.target.checked); } }), _jsx("span", { children: t('dimWhenIdleLabel') })] }), _jsx("div", { className: css.dialogHint, children: t('dimWhenIdleHint') })] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: musicEnabled, onChange: (event) => { setMusicEnabled(event.target.checked); } }), _jsx("span", { children: t('musicLabel') })] }), _jsx("div", { className: css.dialogHint, children: t('musicHint') }), musicEnabled && (_jsxs(_Fragment, { children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("span", { children: t('musicVolume') }), _jsx("input", { type: "range", min: 0, max: 1, step: 0.05, value: musicVolume, onChange: (event) => { setMusicVolume(Number(event.target.value)); } })] }), _jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("span", { children: t('musicStyle') }), _jsxs("select", { value: musicStyle, onChange: (event) => { setMusicStyle(event.target.value); }, children: [_jsx("option", { value: "major", children: t('musicStyleMajor') }), _jsx("option", { value: "minor", children: t('musicStyleMinor') }), _jsx("option", { value: "pentatonic", children: t('musicStylePentatonic') })] })] })] }))] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("div", { className: css.checkUpdatesRow, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: checkUpdates, onChange: (event) => { setCheckUpdates(event.target.checked); } }), _jsx("span", { children: t('checkUpdatesLabel') })] }), _jsx("button", { type: "button", className: css.checkBtn, disabled: checkingUpdates, onClick: checkUpdatesNow, children: checkingUpdates
+                                        }, children: Array.from({ length: 12 }, (_, i) => i * 5).map(minute => (_jsxs("option", { value: minute, children: [String(minute).padStart(2, '0'), " \u5206"] }, minute))) })] })] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: dimWhenIdle, onChange: (event) => { setDimWhenIdle(event.target.checked); } }), _jsx("span", { children: t('dimWhenIdleLabel') })] }), _jsx("div", { className: css.dialogHint, children: t('dimWhenIdleHint') })] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: musicEnabled, onChange: (event) => { setMusicEnabled(event.target.checked); } }), _jsx("span", { children: t('musicLabel') })] }), _jsx("div", { className: css.dialogHint, children: t('musicHint') }), musicEnabled && (_jsxs(_Fragment, { children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("span", { children: t('musicVolume') }), _jsx("input", { type: "range", min: 0, max: 1, step: 0.05, value: musicVolume, onChange: (event) => { setMusicVolume(Number(event.target.value)); } })] }), _jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("span", { children: t('musicStyle') }), _jsxs("select", { value: musicStyle, onChange: (event) => { setMusicStyle(event.target.value); }, children: [_jsx("option", { value: "major", children: t('musicStyleMajor') }), _jsx("option", { value: "minor", children: t('musicStyleMinor') }), _jsx("option", { value: "pentatonic", children: t('musicStylePentatonic') })] })] }), _jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: musicOnlyCurrentSession, onChange: (event) => { setMusicOnlyCurrentSession(event.target.checked); } }), _jsx("span", { children: t('musicOnlyCurrentSessionLabel') })] }), _jsx("div", { className: css.dialogHint, children: t('musicOnlyCurrentSessionHint') })] }))] }), _jsxs("div", { className: css.dialogSection, children: [_jsxs("div", { className: css.checkUpdatesRow, children: [_jsxs("label", { className: css.checkUpdatesLabel, children: [_jsx("input", { type: "checkbox", checked: checkUpdates, onChange: (event) => { setCheckUpdates(event.target.checked); } }), _jsx("span", { children: t('checkUpdatesLabel') })] }), _jsx("button", { type: "button", className: css.checkBtn, disabled: checkingUpdates, onClick: checkUpdatesNow, children: checkingUpdates
                                             ? t('checkingUpdates')
                                             : lastCheckResult === 'up-to-date'
                                                 ? t('checkUpToDate')

package/lib/types/client/index.js

@@ -36,6 +36,8 @@ export function apply(ctx) {
     let lastMonitored = null;
     let lastOnFull = 'stop';
     let lastReset = null;
+    // Whether the soundtrack is scoped to the currently-visible session only.
+    let lastOnlyCurrentSession = true;
     // Live music engine: subscribes to the plugin's SSE action stream and
     // composes from host events. Web Audio plays by default; a detected MIDI
     // output is driven simultaneously.
@@ -49,15 +51,23 @@ export function apply(ctx) {
         catch {
             return;
         }
-        // Only play actions for the currently-visible session; a root overlay
-        // panel isn't bound to a specific session, but its display tracks
+        // When scoped, only play actions for the currently-visible session; a root
+        // overlay panel isn't bound to a specific session, but its display tracks
         // useSessions(s => s.current), so keeping the soundtrack on the same
         // session avoids a cacophony from background conversations.
-        if (lastSessionId !== undefined && action.sessionId !== String(lastSessionId))
+        if (lastOnlyCurrentSession && lastSessionId !== undefined
+            && action.sessionId !== String(lastSessionId))
             return;
         music.onAction(action);
     });
     ctx.effect(() => () => { sse.close(); }, 'token-quota-ui: music SSE');
+    /** Build a writable music-settings clone with defaults applied. */
+    const musicDefaults = (raw) => ({
+        enabled: raw?.enabled ?? false,
+        volume: raw?.volume ?? 0.5,
+        style: raw?.style ?? 'major',
+        onlyCurrentSession: raw?.onlyCurrentSession ?? true,
+    });
     const keyOf = (selection) => {
         if (selection === null)
             return undefined;
@@ -213,13 +223,15 @@ export function apply(ctx) {
         bound?.setCheckUpdates(doc?.checkUpdates ?? true);
         bound?.setDimWhenIdle(doc?.dimWhenIdle ?? false);
         bound?.setReset(lastReset);
-        const musicSettings = { ...{ enabled: false, volume: 0.5, style: 'major' }, ...(doc?.music ?? {}) };
+        const musicSettings = musicDefaults(doc?.music);
+        lastOnlyCurrentSession = musicSettings.onlyCurrentSession;
         music.setEnabled(musicSettings.enabled);
         music.setVolume(musicSettings.volume);
         music.setStyle(musicSettings.style);
         bound?.setMusicEnabled(musicSettings.enabled);
         bound?.setMusicVolume(musicSettings.volume);
         bound?.setMusicStyle(musicSettings.style);
+        bound?.setMusicOnlyCurrentSession(musicSettings.onlyCurrentSession);
         void fetch('/token-quota', { headers: { accept: 'application/json' } }).then((response) => {
             if (!response.ok) {
                 bound?.setError(`quota route: ${String(response.status)}`);
@@ -289,7 +301,7 @@ export function apply(ctx) {
     };
     const setMusicEnabled = (enabled) => {
         const doc = scope.getSnapshot().value;
-        const current = { ...{ enabled: false, volume: 0.5, style: 'major' }, ...(doc?.music ?? {}) };
+        const current = musicDefaults(doc?.music);
         current.enabled = enabled;
         void scope.set('music', current);
         // First enable: start audio inside this user gesture (the panel switch
@@ -300,16 +312,22 @@ export function apply(ctx) {
     };
     const setMusicVolume = (volume) => {
         const doc = scope.getSnapshot().value;
-        const current = { ...{ enabled: false, volume: 0.5, style: 'major' }, ...(doc?.music ?? {}) };
+        const current = musicDefaults(doc?.music);
         current.volume = Math.max(0, Math.min(1, volume));
         void scope.set('music', current);
     };
     const setMusicStyle = (style) => {
         const doc = scope.getSnapshot().value;
-        const current = { ...{ enabled: false, volume: 0.5, style: 'major' }, ...(doc?.music ?? {}) };
+        const current = musicDefaults(doc?.music);
         current.style = style;
         void scope.set('music', current);
     };
+    const setMusicOnlyCurrentSession = (only) => {
+        const doc = scope.getSnapshot().value;
+        const current = musicDefaults(doc?.music);
+        current.onlyCurrentSession = only;
+        void scope.set('music', current);
+    };
     /** Ask the Host to check the registry right now, then refresh the snapshot. */
     const checkUpdatesNow = () => {
         bound?.setCheckingUpdates(true);
@@ -397,7 +415,7 @@ export function apply(ctx) {
         return {
             load, setLimit, selectModel, setMonitored, setOnFull, setReset,
             setCheckUpdates, checkUpdatesNow, clearLogBefore, setDimWhenIdle,
-            setMusicEnabled, setMusicVolume, setMusicStyle,
+            setMusicEnabled, setMusicVolume, setMusicStyle, setMusicOnlyCurrentSession,
         };
     };
     ctx.slots.inject('shell.overlay', () => ctx.slots.register({

package/lib/types/client/locales.d.ts

@@ -73,6 +73,8 @@ export declare const zh: {
     musicStyleMajor: string;
     musicStyleMinor: string;
     musicStylePentatonic: string;
+    musicOnlyCurrentSessionLabel: string;
+    musicOnlyCurrentSessionHint: string;
     checkUpdatesNow: string;
     checkingUpdates: string;
     checkUpToDate: string;
@@ -149,6 +151,8 @@ export declare const en: {
     musicStyleMajor: string;
     musicStyleMinor: string;
     musicStylePentatonic: string;
+    musicOnlyCurrentSessionLabel: string;
+    musicOnlyCurrentSessionHint: string;
     checkUpdatesNow: string;
     checkingUpdates: string;
     checkUpToDate: string;

package/lib/types/client/locales.js

@@ -73,6 +73,8 @@ export const zh = {
     musicStyleMajor: '大调',
     musicStyleMinor: '小调',
     musicStylePentatonic: '五声',
+    musicOnlyCurrentSessionLabel: '只播当前会话',
+    musicOnlyCurrentSessionHint: '开启后仅当前窗口的会话有音乐，后台子任务静音；关闭则所有会话都参与作曲',
     checkUpdatesNow: '立即检查',
     checkingUpdates: '检查中…',
     checkUpToDate: '已是最新',
@@ -147,6 +149,8 @@ export const en = {
     musicStyleMajor: 'Major',
     musicStyleMinor: 'Minor',
     musicStylePentatonic: 'Pentatonic',
+    musicOnlyCurrentSessionLabel: 'Current session only',
+    musicOnlyCurrentSessionHint: 'When on, only the visible session drives the soundtrack (background tasks stay silent); when off, every session contributes.',
     checkUpdatesNow: 'Check now',
     checkingUpdates: 'Checking…',
     checkUpToDate: 'Up to date',

package/lib/types/client/music.d.ts

@@ -1,19 +1,29 @@
 /**
- * Live-composed soundtrack driven by host actions (turns, steps, tool calls,
- * etc.). Outputs through Web Audio (built-in synthesis) by default, and also
- * sends MIDI NoteOn/NoteOff to the first available MIDI output when one is
- * detected (both play simultaneously when MIDI is present — use the panel
- * volume for overall level, the MIDI output has its own gain on the receiver).
+ * Live-composed ambient soundtrack driven by host actions (turns, steps,
+ * tool calls, etc.). Three layers:
  *
- * The composition is intentionally simple: a fixed chord progression under a
- * scale-constrained melody, with one short musical gesture per host action.
- * It is meant as gentle ambience while waiting for LLM responses, not as a
- * full piece — everything stays in key so you can never hit a wrong note.
+ *  - **Pad**: a sustained three-note chord (triangle waves) that fades in when
+ *    a request starts and crossfades to the next chord on every step.
+ *  - **Bass**: one long root note per beat (lower octave), keeps the pulse.
+ *  - **Melody**: an eighth-note scale line that dances inside the current
+ *    chord — always in key, never a wrong note.
+ *
+ * Outputs through Web Audio (built-in synthesis) by default, and also sends
+ * MIDI NoteOn/NoteOff to the first available MIDI output when one is detected
+ * (both play simultaneously when MIDI is present — use the panel volume for
+ * overall level, the MIDI output has its own gain on the receiver).
  *
  * @module @jxgame2020/dsh-token-quota/music
  */
 import type { TokenQuotaMusicAction, TokenQuotaMusicStyle } from '../types.ts';
-/** Live-composed music engine driven by host actions. */
+/**
+ * Live-composed music engine driven by host actions.
+ *
+ * The engine is idle until `ensureStarted()` is called from a user gesture
+ * (the panel switch), and only produces sound while `enabled` is true AND a
+ * request is in flight (pad + bass + melody are gated by `startPad` /
+ * `stopPad`).
+ */
 export declare class TokenQuotaMusic {
     private audio;
     private midiOutput;
@@ -21,26 +31,23 @@ export declare class TokenQuotaMusic {
     private enabled;
     private volume;
     private style;
-    /** Current position in the chord progression (advances per step). */
     private chordIndex;
-    /** Step counter — used for melody degree selection. */
     private stepCount;
-    /** Tool counter — used for tool-note pitch. */
     private toolCount;
-    /**
-     * Progress layer: while a request is in flight (thinking + streaming) the
-     * engine ticks a quiet scale-walking background note every tick so the wait
-     * is audible. Cleared on assistant/message, assistant/attempt or turn/end.
-     */
-    private progressTimer;
-    /** Direction of the progress walk: +1 up the scale, -1 down. */
-    private progressDir;
-    /** Scale degree of the next progress note. */
-    private progressDegree;
-    /** Base MIDI note of the current key. C4 = middle C. */
+    private padOscs;
+    private padGain;
+    private padTarget;
+    private padActive;
+    private beatTimer;
+    private beatIndex;
+    private melodyDirection;
+    private melodyDegree;
+    private currentRoot;
+    private currentQuality;
+    /** Base MIDI note of the key. C4 = middle C. */
     private static readonly BASE_MIDI;
-    /** Tick interval of the progress layer (ms). */
-    private static readonly PROGRESS_TICK_MS;
+    /** Beat length in ms — eighth note = beat / 2. */
+    private static readonly BEAT_MS;
     /** True once the audio context has been started (needs a user gesture). */
     get started(): boolean;
     /**
@@ -52,16 +59,18 @@ export declare class TokenQuotaMusic {
     setEnabled(value: boolean): void;
     setVolume(value: number): void;
     setStyle(value: TokenQuotaMusicStyle): void;
-    /** Start the quiet in-flight background loop (idempotent). */
-    private startProgress;
-    /** Stop the in-flight background loop. */
-    private stopProgress;
     /** Handle one incoming host action and turn it into sound. */
     onAction(action: TokenQuotaMusicAction): void;
-    private currentChordRoot;
-    private currentChordQuality;
-    /** Intervals of an ascending arpeggio from the chord root. */
-    private arpeggioDegrees;
+    /** Start the pad from silence, fading in to the target level. */
+    private startPad;
+    /** Smoothly morph the pad to a new root + quality. */
+    private crossfadePad;
+    /** Fade the pad to silence, then stop the oscillators. */
+    private stopPad;
+    /** Start the per-beat clock that drives bass and melody. */
+    private startBeatClock;
+    private stopBeatClock;
+    private stopAll;
     /** Play one note: Web Audio + MIDI simultaneously when available. */
     private playNote;
     /** Play a three-note chord plus a bass octave below. */