@bzenky/spoti 0.3.0 → 0.5.0

package/dist/app.js

@@ -1,8 +1,11 @@
 import { Command } from 'commander';
 import { UPDATE_COMMAND, } from './services/update.service.js';
 import { CONFIG_KEYS, parseConfigValue, } from './storage/config.js';
-import { formatAlbumDetail, formatArtistDetail, formatPlayback, formatPlaylist, formatPlaylistOverview, formatRecentlyPlayed, formatSavedTrack, formatTrack, } from './ui/output.js';
-import { confirmUpdate, promptSpotifyClientId, selectAlbum, selectAlbumAction, selectArtist, selectArtistAction, selectPlaylist, selectPlaylistAction, selectTrack, } from './ui/prompts.js';
+import { formatAlbumDetail, formatArtistDetail, formatPlayback, formatPlaylist, formatPlaylistOverview, formatRecentlyPlayed, formatSavedTrack, formatTrack, plainOutputStyles, sanitizeOneLineText, } from './ui/output.js';
+import { confirmUpdate, promptSpotifyClientId, selectAlbum, selectAlbumAction, selectArtist, selectArtistAction, selectLikedTrack, selectListedPlaylist, selectPlaylist, selectPlaylistAction, selectRecentTrack, selectTrack, } from './ui/prompts.js';
+import { generateCompletionScript } from './ui/completions.js';
+import { withProgress } from './ui/progress.js';
+import { runInteractiveSearch, } from './ui/interactive-search.js';
 import { watchPlayback } from './ui/watch.js';
 import { ConfigurationError } from './utils/errors.js';
 import { formatDuration } from './utils/time.js';
@@ -13,19 +16,33 @@ export function createProgram(dependencies) {
     const chooseAlbum = dependencies.chooseAlbum ?? selectAlbum;
     const chooseArtist = dependencies.chooseArtist ?? selectArtist;
     const choosePlaylist = dependencies.choosePlaylist ?? selectPlaylist;
+    const chooseListedPlaylist = dependencies.chooseListedPlaylist ?? selectListedPlaylist;
     const chooseAlbumAction = dependencies.chooseAlbumAction ?? selectAlbumAction;
     const chooseArtistAction = dependencies.chooseArtistAction ?? selectArtistAction;
     const choosePlaylistAction = dependencies.choosePlaylistAction ?? selectPlaylistAction;
+    const chooseLikedTrack = dependencies.chooseLikedTrack ?? selectLikedTrack;
+    const chooseRecentTrack = dependencies.chooseRecentTrack ?? selectRecentTrack;
     const requestClientId = dependencies.requestSpotifyClientId ?? promptSpotifyClientId;
     const requestUpdateConfirmation = dependencies.confirmUpdate ?? confirmUpdate;
+    const styles = dependencies.styles ?? plainOutputStyles;
+    const safe = sanitizeOneLineText;
+    const safeArtists = (artists) => artists.map(safe).join(', ');
+    const startInteractiveSearch = dependencies.interactiveSearch ??
+        (() => runInteractiveSearch({
+            search: dependencies.search,
+            player: dependencies.player,
+            styles,
+        }));
+    const showProgress = dependencies.progress ?? withProgress;
+    const runTask = (label, task) => showProgress(label, task);
     const startWatching = dependencies.watchPlayback ?? watchPlayback;
     const runAlbumAction = async (album) => {
-        const detail = await dependencies.catalog.getAlbum(album.id);
-        dependencies.output.log(formatAlbumDetail(detail));
+        const detail = await runTask('Loading album…', () => dependencies.catalog.getAlbum(album.id));
+        dependencies.output.log(formatAlbumDetail(detail, styles));
         const action = await chooseAlbumAction();
         if (action === 'play-album') {
             await dependencies.player.playContext(detail.uri);
-            dependencies.output.log(`▶ Playing album ${detail.name}`);
+            dependencies.output.log(`▶ Playing album ${safe(detail.name)}`);
             return;
         }
         if (action === 'play-track') {
@@ -33,13 +50,33 @@ export function createProgram(dependencies) {
             if (!track)
                 return;
             await dependencies.player.playTrack(track.uri);
-            dependencies.output.log(`▶ Playing ${track.name} — ${track.artists.join(', ')}`);
+            dependencies.output.log(`▶ Playing ${safe(track.name)} — ${safeArtists(track.artists)}`);
         }
     };
     program
         .name('spoti')
         .description('Control Spotify from your terminal')
-        .version(VERSION);
+        .version(VERSION)
+        .allowExcessArguments()
+        .action(() => {
+        const unknownCommand = program.args[0];
+        if (unknownCommand) {
+            throw new ConfigurationError(`Unknown command "${sanitizeOneLineText(unknownCommand)}".\n\nRun: spoti --help`);
+        }
+        program.outputHelp();
+    });
+    const interactiveCommand = program
+        .command('interactive')
+        .alias('i')
+        .description('Open the keyboard-driven Spotify search')
+        .action(async () => {
+        const result = await startInteractiveSearch();
+        if (result.status === 'not-interactive')
+            interactiveCommand.outputHelp();
+        else if (result.status === 'played') {
+            dependencies.output.log(`▶ Playing ${styles.name(safe(result.label))}`);
+        }
+    });
     program
         .command('setup')
         .description('Save your Spotify application client ID')
@@ -59,7 +96,7 @@ export function createProgram(dependencies) {
         .action(async () => {
         dependencies.output.log('Opening Spotify authorization in your browser…');
         const user = await dependencies.auth.login();
-        dependencies.output.log(`✓ Logged in as ${user.displayName}`);
+        dependencies.output.log(`✓ Logged in as ${safe(user.displayName)}`);
     });
     program
         .command('logout')
@@ -77,13 +114,14 @@ export function createProgram(dependencies) {
             return;
         }
         const user = await dependencies.auth.getCurrentUser();
-        dependencies.output.log(`✓ Logged in as ${user.displayName}`);
+        dependencies.output.log(`✓ Logged in as ${safe(user.displayName)}`);
     });
     const configCommand = program
         .command('config')
         .description('View and update spoti configuration')
         .action(async () => {
-        dependencies.output.log(formatConfig(await dependencies.config.read()));
+        const config = await dependencies.config.read();
+        dependencies.output.log(formatConfig(config));
     });
     configCommand
         .command('get')
@@ -105,6 +143,24 @@ export function createProgram(dependencies) {
         await dependencies.config.set(key, value);
         dependencies.output.log(`✓ ${key} = ${String(value)}`);
     });
+    configCommand
+        .command('unset')
+        .description('Reset one configuration value to its default')
+        .argument('<key>', 'configuration key')
+        .action(async (keyName) => {
+        const key = parseConfigKey(keyName);
+        await dependencies.config.resetKey(key);
+        dependencies.output.log(`✓ ${key} reset`);
+    });
+    configCommand
+        .command('path')
+        .description('Print the configuration file path')
+        .action(() => {
+        if (!dependencies.config.path) {
+            throw new ConfigurationError('The active configuration store has no file path.');
+        }
+        dependencies.output.log(dependencies.config.path);
+    });
     configCommand
         .command('reset')
         .description('Reset configuration to defaults')
@@ -114,6 +170,7 @@ export function createProgram(dependencies) {
     });
     program
         .command('now')
+        .alias('np')
         .description('Show the current Spotify playback')
         .option('-w, --watch', 'continuously refresh playback information')
         .action(async (options) => {
@@ -126,10 +183,11 @@ export function createProgram(dependencies) {
             return;
         }
         const playback = await dependencies.player.getCurrentPlayback();
-        dependencies.output.log(playback ? formatPlayback(playback) : 'Nothing is currently playing.');
+        dependencies.output.log(playback ? formatPlayback(playback, styles) : 'Nothing is currently playing.');
     });
     program
         .command('pause')
+        .alias('pa')
         .description('Pause playback')
         .action(async () => {
         await dependencies.player.pause();
@@ -137,6 +195,7 @@ export function createProgram(dependencies) {
     });
     program
         .command('resume')
+        .alias('r')
         .description('Resume playback')
         .action(async () => {
         await dependencies.player.resume();
@@ -160,27 +219,30 @@ export function createProgram(dependencies) {
     });
     program
         .command('devices')
+        .alias('devs')
         .description('List available Spotify Connect devices')
         .action(async () => {
-        const devices = await dependencies.device.getDevices();
-        if (devices.length === 0) {
-            dependencies.output.log('No Spotify devices are available. Open Spotify on a device and try again.');
-            return;
-        }
-        dependencies.output.log(devices
-            .map((device, index) => {
-            const state = device.isActive
-                ? 'active'
-                : device.isRestricted
-                    ? 'restricted'
-                    : 'available';
-            const volume = device.volumePercent === null ? '' : ` · ${device.volumePercent}%`;
-            return `${index + 1}. ${device.name} · ${device.type} · ${state}${volume}`;
-        })
-            .join('\n'));
+        const devices = await runTask('Loading devices…', () => dependencies.device.getDevices());
+        const formatted = devices.length === 0
+            ? 'No Spotify devices are available. Open Spotify on a device and try again.'
+            : devices
+                .map((device, index) => {
+                const state = device.isActive
+                    ? 'active'
+                    : device.isRestricted
+                        ? 'restricted'
+                        : 'available';
+                const volume = device.volumePercent === null ? '' : ` · ${device.volumePercent}%`;
+                const name = styles.name(sanitizeOneLineText(device.name));
+                const metadata = styles.metadata(`${sanitizeOneLineText(device.type)} · ${state}${volume}`);
+                return `${index + 1}. ${name} · ${metadata}`;
+            })
+                .join('\n');
+        dependencies.output.log(formatted);
     });
     program
         .command('device')
+        .alias('dev')
         .description('Transfer playback to a Spotify Connect device')
         .argument('<number-name-or-id...>', 'displayed number, exact device name, or ID')
         .action(async (nameOrIdParts) => {
@@ -188,7 +250,7 @@ export function createProgram(dependencies) {
         if (!device.id)
             throw new ConfigurationError('The selected device has no usable ID.');
         await dependencies.device.transferPlayback(device.id);
-        dependencies.output.log(`✓ Active device: ${device.name}`);
+        dependencies.output.log(`✓ Active device: ${safe(device.name)}`);
     });
     program
         .command('seek')
@@ -204,6 +266,7 @@ export function createProgram(dependencies) {
     });
     program
         .command('volume')
+        .alias('vol')
         .description('Set or adjust the active device volume')
         .argument('<value>', 'volume from 0-100, or a relative change such as +10 or -10')
         .allowUnknownOption()
@@ -216,31 +279,32 @@ export function createProgram(dependencies) {
     });
     program
         .command('queue')
+        .alias('q')
         .description('Show the playback queue or add a searched track')
         .argument('[query...]', 'track name to add')
         .option('--first', 'queue the first search result without prompting')
         .action(async (queryParts, options) => {
         const query = queryParts.join(' ').trim();
         if (!query) {
-            const playbackQueue = await dependencies.queue.getQueue();
+            const playbackQueue = await runTask('Loading queue…', () => dependencies.queue.getQueue());
             const lines = playbackQueue.currentlyPlaying
                 ? [
-                    `Now: ${formatQueueItem(playbackQueue.currentlyPlaying)}`,
+                    `${styles.heading('Now:')} ${formatQueueItem(playbackQueue.currentlyPlaying, styles)}`,
                     '',
-                    'Up next:',
+                    styles.heading('Up next:'),
                 ]
-                : ['Up next:'];
+                : [styles.heading('Up next:')];
             if (playbackQueue.queue.length === 0)
                 lines.push('Queue is empty.');
             else {
-                lines.push(...playbackQueue.queue.map((item, index) => `${index + 1}. ${formatQueueItem(item)}`));
+                lines.push(...playbackQueue.queue.map((item, index) => `${index + 1}. ${formatQueueItem(item, styles)}`));
             }
             dependencies.output.log(lines.join('\n'));
             return;
         }
         const tracks = await dependencies.search.searchTracks(query);
         if (tracks.length === 0) {
-            dependencies.output.log(`No tracks found for "${query}".`);
+            dependencies.output.log(`No tracks found for "${safe(query)}".`);
             return;
         }
         const track = options.first ? tracks[0] : await chooseTrack(tracks);
@@ -249,13 +313,18 @@ export function createProgram(dependencies) {
             return;
         }
         await dependencies.queue.addItem(track.uri);
-        dependencies.output.log(`✓ Queued ${track.name} — ${track.artists.join(', ')}`);
+        dependencies.output.log(`✓ Queued ${safe(track.name)} — ${safeArtists(track.artists)}`);
     });
     program
         .command('shuffle')
-        .description('Turn playback shuffle on or off')
-        .argument('<state>', 'on or off')
+        .description('Show or change the playback shuffle state')
+        .argument('[state]', 'on or off')
         .action(async (state) => {
+        if (state === undefined) {
+            const enabled = await dependencies.player.getShuffleState();
+            dependencies.output.log(`🔀 Shuffle: ${enabled ? 'on' : 'off'}`);
+            return;
+        }
         if (state !== 'on' && state !== 'off') {
             throw new ConfigurationError('Shuffle state must be either "on" or "off".');
         }
@@ -264,9 +333,15 @@ export function createProgram(dependencies) {
     });
     program
         .command('repeat')
-        .description('Set the playback repeat mode')
-        .argument('<mode>', 'off, track, or context')
+        .alias('rep')
+        .description('Show or change the playback repeat mode')
+        .argument('[mode]', 'off, track, or context')
         .action(async (mode) => {
+        if (mode === undefined) {
+            const currentMode = await dependencies.player.getRepeatState();
+            dependencies.output.log(`🔁 Repeat: ${currentMode}`);
+            return;
+        }
         if (mode !== 'off' && mode !== 'track' && mode !== 'context') {
             throw new ConfigurationError('Repeat mode must be "off", "track", or "context".');
         }
@@ -280,9 +355,9 @@ export function createProgram(dependencies) {
         .option('--first', 'select the first result without prompting')
         .action(async (queryParts, options) => {
         const query = queryParts.join(' ').trim();
-        const albums = await dependencies.search.searchAlbums(query);
+        const albums = await runTask('Searching albums…', () => dependencies.search.searchAlbums(query));
         if (albums.length === 0) {
-            dependencies.output.log(`No albums found for "${query}".`);
+            dependencies.output.log(`No albums found for "${safe(query)}".`);
             return;
         }
         const album = options.first ? albums[0] : await chooseAlbum(albums);
@@ -299,9 +374,9 @@ export function createProgram(dependencies) {
         .option('--first', 'select the first result without prompting')
         .action(async (queryParts, options) => {
         const query = queryParts.join(' ').trim();
-        const artists = await dependencies.search.searchArtists(query);
+        const artists = await runTask('Searching artists…', () => dependencies.search.searchArtists(query));
         if (artists.length === 0) {
-            dependencies.output.log(`No artists found for "${query}".`);
+            dependencies.output.log(`No artists found for "${safe(query)}".`);
             return;
         }
         const artist = options.first ? artists[0] : await chooseArtist(artists);
@@ -309,18 +384,18 @@ export function createProgram(dependencies) {
             dependencies.output.log('Selection cancelled.');
             return;
         }
-        const detail = await dependencies.catalog.getArtist(artist.id);
-        dependencies.output.log(formatArtistDetail(detail));
+        const detail = await runTask('Loading artist…', () => dependencies.catalog.getArtist(artist.id));
+        dependencies.output.log(formatArtistDetail(detail, styles));
         const action = await chooseArtistAction();
         if (action === 'play-artist') {
             await dependencies.player.playContext(detail.uri);
-            dependencies.output.log(`▶ Playing artist ${detail.name}`);
+            dependencies.output.log(`▶ Playing artist ${safe(detail.name)}`);
             return;
         }
         if (action === 'select-album') {
-            const albums = await dependencies.catalog.getArtistAlbums(detail.id);
+            const albums = await runTask('Loading artist albums…', () => dependencies.catalog.getArtistAlbums(detail.id));
             if (albums.length === 0) {
-                dependencies.output.log(`No albums found for ${detail.name}.`);
+                dependencies.output.log(`No albums found for ${safe(detail.name)}.`);
                 return;
             }
             const album = await chooseAlbum(albums);
@@ -330,22 +405,33 @@ export function createProgram(dependencies) {
     });
     program
         .command('playlists')
-        .description('List your Spotify playlists')
+        .alias('pls')
+        .description('List and optionally play your Spotify playlists')
         .option('-l, --limit <number>', 'maximum number of playlists', parseCollectionLimit, 50)
         .action(async (options) => {
-        const playlists = await dependencies.playlist.listPlaylists(options.limit);
-        dependencies.output.log(playlists.length === 0
-            ? 'No playlists found.'
-            : playlists.map((playlist, index) => formatPlaylist(playlist, index)).join('\n'));
+        const playlists = await runTask('Loading playlists…', () => dependencies.playlist.listPlaylists(options.limit));
+        if (playlists.length === 0) {
+            dependencies.output.log('No playlists found.');
+            return;
+        }
+        dependencies.output.log(playlists
+            .map((playlist, index) => formatPlaylist(playlist, index, styles))
+            .join('\n'));
+        const selected = await chooseListedPlaylist(playlists);
+        if (!selected)
+            return;
+        await dependencies.player.playContext(selected.uri);
+        dependencies.output.log(`▶ Playing playlist ${safe(selected.name)}`);
     });
     program
         .command('playlist')
+        .alias('pl')
         .description('Show one of your Spotify playlists')
         .argument('<query...>', 'playlist name')
         .option('--first', 'select the first match without prompting')
         .action(async (queryParts, options) => {
         const query = queryParts.join(' ').trim();
-        const allPlaylists = await dependencies.playlist.listPlaylists(50);
+        const allPlaylists = await runTask('Loading playlists…', () => dependencies.playlist.listPlaylists(50));
         let playlist;
         if (/^\d+$/.test(query)) {
             playlist = findNumberedPlaylist(allPlaylists, query);
@@ -353,7 +439,7 @@ export function createProgram(dependencies) {
         else {
             const matches = allPlaylists.filter((playlist) => playlist.name.toLocaleLowerCase().includes(query.toLocaleLowerCase()));
             if (matches.length === 0) {
-                dependencies.output.log(`No playlists found for "${query}".`);
+                dependencies.output.log(`No playlists found for "${safe(query)}".`);
                 return;
             }
             playlist = options.first ? matches[0] : await choosePlaylist(matches);
@@ -362,21 +448,28 @@ export function createProgram(dependencies) {
             dependencies.output.log('Selection cancelled.');
             return;
         }
-        dependencies.output.log(formatPlaylistOverview(playlist));
+        dependencies.output.log(formatPlaylistOverview(playlist, styles));
         if ((await choosePlaylistAction()) === 'play-playlist') {
             await dependencies.player.playContext(playlist.uri);
-            dependencies.output.log(`▶ Playing playlist ${playlist.name}`);
+            dependencies.output.log(`▶ Playing playlist ${safe(playlist.name)}`);
         }
     });
     program
         .command('liked')
-        .description('List your liked tracks')
+        .description('List and optionally play your liked tracks')
         .option('-l, --limit <number>', 'maximum number of tracks', parseCollectionLimit, 20)
         .action(async (options) => {
-        const tracks = await dependencies.library.getLikedTracks(options.limit);
-        dependencies.output.log(tracks.length === 0
-            ? 'No liked tracks found.'
-            : tracks.map((item, index) => formatSavedTrack(item, index)).join('\n'));
+        const tracks = await runTask('Loading liked tracks…', () => dependencies.library.getLikedTracks(options.limit));
+        if (tracks.length === 0) {
+            dependencies.output.log('No liked tracks found.');
+            return;
+        }
+        dependencies.output.log(tracks.map((item, index) => formatSavedTrack(item, index, styles)).join('\n'));
+        const selected = await chooseLikedTrack(tracks);
+        if (!selected)
+            return;
+        await dependencies.player.playTrack(selected.uri);
+        dependencies.output.log(`▶ Playing ${safe(selected.name)} — ${safeArtists(selected.artists)}`);
     });
     program
         .command('like')
@@ -384,7 +477,7 @@ export function createProgram(dependencies) {
         .action(async () => {
         const track = await dependencies.library.likeCurrentTrack();
         dependencies.output.log(track
-            ? `♥ Liked ${track.name} — ${track.artists.join(', ')}`
+            ? `♥ Liked ${safe(track.name)} — ${safeArtists(track.artists)}`
             : 'No playable track is currently selected.');
     });
     program
@@ -393,18 +486,26 @@ export function createProgram(dependencies) {
         .action(async () => {
         const track = await dependencies.library.unlikeCurrentTrack();
         dependencies.output.log(track
-            ? `♡ Unliked ${track.name} — ${track.artists.join(', ')}`
+            ? `♡ Unliked ${safe(track.name)} — ${safeArtists(track.artists)}`
             : 'No playable track is currently selected.');
     });
     program
         .command('recent')
-        .description('Show recently played tracks')
+        .alias('rec')
+        .description('Show and optionally play recently played tracks')
         .option('-l, --limit <number>', 'maximum number of tracks', parseCollectionLimit, 20)
         .action(async (options) => {
-        const tracks = await dependencies.recent.getRecentlyPlayed(options.limit);
-        dependencies.output.log(tracks.length === 0
-            ? 'No recently played tracks found.'
-            : tracks.map((item, index) => formatRecentlyPlayed(item, index)).join('\n'));
+        const tracks = await runTask('Loading recent tracks…', () => dependencies.recent.getRecentlyPlayed(options.limit));
+        if (tracks.length === 0) {
+            dependencies.output.log('No recently played tracks found.');
+            return;
+        }
+        dependencies.output.log(tracks.map((item, index) => formatRecentlyPlayed(item, index, styles)).join('\n'));
+        const selected = await chooseRecentTrack(tracks);
+        if (!selected)
+            return;
+        await dependencies.player.playTrack(selected.uri);
+        dependencies.output.log(`▶ Playing ${safe(selected.name)} — ${safeArtists(selected.artists)}`);
     });
     program
         .command('update')
@@ -429,22 +530,31 @@ export function createProgram(dependencies) {
         await dependencies.update.installLatest(true, result.latestVersion);
         dependencies.output.log(`✓ Updated spoti to ${result.latestVersion}.`);
     });
+    program
+        .command('completion')
+        .description('Generate a shell completion script')
+        .argument('<shell>', 'bash, zsh, or fish')
+        .action((shellName) => {
+        dependencies.output.log(generateCompletionScript(parseCompletionShell(shellName)));
+    });
     program
         .command('search')
+        .alias('s')
         .description('Search Spotify tracks')
         .argument('<query...>', 'track name to search for')
         .option('-l, --limit <number>', 'maximum number of results', parseLimit, 10)
         .action(async (queryParts, options) => {
         const query = queryParts.join(' ');
-        const tracks = await dependencies.search.searchTracks(query, options.limit);
+        const tracks = await runTask('Searching tracks…', () => dependencies.search.searchTracks(query, options.limit));
         if (tracks.length === 0) {
-            dependencies.output.log(`No tracks found for "${query}".`);
+            dependencies.output.log(`No tracks found for "${safe(query)}".`);
             return;
         }
-        dependencies.output.log(tracks.map((track, index) => formatTrack(track, index)).join('\n'));
+        dependencies.output.log(tracks.map((track, index) => formatTrack(track, index, styles)).join('\n'));
     });
     program
         .command('play')
+        .alias('p')
         .description('Play a track or an explicit album, artist, or playlist context')
         .argument('[query...]', 'track query, or: track|album|artist|playlist <query>')
         .option('--first', 'play the first search result without prompting')
@@ -487,7 +597,7 @@ export function createProgram(dependencies) {
             await dependencies.player.playTrack(selection.uri);
         else
             await dependencies.player.playContext(selection.uri);
-        dependencies.output.log(`▶ Playing ${selection.label}`);
+        dependencies.output.log(`▶ Playing ${safe(selection.label)}`);
         if (shouldWatch) {
             await startWatching({
                 player: dependencies.player,
@@ -502,20 +612,23 @@ async function selectPlaybackItem(options) {
     let selected;
     if (options.type === 'track') {
         const items = await dependencies.search.searchTracks(query);
-        if (items.length === 0)
+        if (items.length === 0) {
             return reportNoResults(dependencies.output, 'tracks', query);
+        }
         selected = first ? items[0] : await options.chooseTrack(items);
     }
     else if (options.type === 'album') {
         const items = await dependencies.search.searchAlbums(query);
-        if (items.length === 0)
+        if (items.length === 0) {
             return reportNoResults(dependencies.output, 'albums', query);
+        }
         selected = first ? items[0] : await options.chooseAlbum(items);
     }
     else if (options.type === 'artist') {
         const items = await dependencies.search.searchArtists(query);
-        if (items.length === 0)
+        if (items.length === 0) {
             return reportNoResults(dependencies.output, 'artists', query);
+        }
         selected = first ? items[0] : await options.chooseArtist(items);
     }
     else {
@@ -524,8 +637,9 @@ async function selectPlaybackItem(options) {
         }
         else {
             const items = await dependencies.search.searchPlaylists(query);
-            if (items.length === 0)
+            if (items.length === 0) {
                 return reportNoResults(dependencies.output, 'playlists', query);
+            }
             selected = first ? items[0] : await options.choosePlaylist(items);
         }
     }
@@ -538,10 +652,14 @@ async function selectPlaybackItem(options) {
         return {
             type: 'track',
             uri: track.uri,
-            label: `${track.name} — ${track.artists.join(', ')}`,
+            label: `${sanitizeOneLineText(track.name)} — ${track.artists.map(sanitizeOneLineText).join(', ')}`,
         };
     }
-    return { type: options.type, uri: selected.uri, label: selected.name };
+    return {
+        type: options.type,
+        uri: selected.uri,
+        label: sanitizeOneLineText(selected.name),
+    };
 }
 function findNumberedPlaylist(playlists, number) {
     const index = Number(number) - 1;
@@ -552,7 +670,7 @@ function findNumberedPlaylist(playlists, number) {
     return playlist;
 }
 function reportNoResults(output, type, query) {
-    output.log(`No ${type} found for "${query}".`);
+    output.log(`No ${type} found for "${sanitizeOneLineText(query)}".`);
     return null;
 }
 function isSpotifyPlayableType(value) {
@@ -576,8 +694,10 @@ function parseSeekInput(value) {
         milliseconds: sign * (minutes * 60 + seconds) * 1_000,
     };
 }
-function formatQueueItem(item) {
-    return `${item.name} — ${item.subtitle} · ${formatDuration(item.durationMs)}`;
+function formatQueueItem(item, styles) {
+    const name = styles.name(sanitizeOneLineText(item.name));
+    const metadata = styles.metadata(`${sanitizeOneLineText(item.subtitle)} · ${formatDuration(item.durationMs)}`);
+    return `${name} — ${metadata}`;
 }
 function parseVolumeInput(value) {
     if (/^[+-]\d+$/.test(value)) {
@@ -603,6 +723,11 @@ function parseConfigKey(value) {
 function formatConfig(config) {
     return CONFIG_KEYS.map((key) => `${key}: ${String(config[key])}`).join('\n');
 }
+function parseCompletionShell(value) {
+    if (value === 'bash' || value === 'zsh' || value === 'fish')
+        return value;
+    throw new ConfigurationError('Completion shell must be "bash", "zsh", or "fish".');
+}
 function parseLimit(value) {
     const limit = /^\d+$/.test(value) ? Number(value) : Number.NaN;
     if (!Number.isInteger(limit) || limit < 1 || limit > 10) {