@feralfile/cli 2.0.3 → 2.1.0

package/config.json.example

@@ -19,13 +19,16 @@
     "privateKey": "YOUR_ED25519_PRIVATE_KEY__base64_PKCS8_DER_recommended__or_32byte_raw_seed_as_hex_or_base64__run_ff-cli_setup_to_generate",
     "role": "agent"
   },
+  "ff1Relayer": {
+    "baseUrl": "https://tv-cast-coordination.autonomy-system.workers.dev"
+  },
   "ff1Devices": {
     "devices": [
       {
         "name": "DISPLAY_NAME_FOR_YOUR_FF1_DEVICE",
+        "id": "FF1-DEVICE_ID",
         "host": "http://YOUR_FF1_IP_ADDRESS:1111",
-        "apiKey": "YOUR_FF1_DEVICE_API_KEY_FROM_DEVICE_SETTINGS",
-        "topicID": "YOUR_FF1_DEVICE_TOPIC_ID_FROM_DEVICE_SETTINGS"
+        "apiKey": "YOUR_FF1_DEVICE_API_KEY_FROM_DEVICE_SETTINGS"
       }
     ]
   }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@feralfile/cli",
-    "version": "2.0.3",
+    "version": "2.1.0",
     "description": "CLI for building, signing, and playing DP-1 playlists of digital art on Feral File devices",
     "repository": {
         "type": "git",
@@ -32,7 +32,8 @@
         "start": "node dist/index.js",
         "dev": "tsx index.ts",
         "smoke": "npm run build && node dist/index.js validate examples/sample-playlist-v11.json && node dist/index.js config validate",
-        "check": "npm run format:check && npm run lint && npm run test",
+        "check": "npm run format:check && npm run lint && npm run check:copy && npm run test",
+        "check:copy": "node scripts/check-copy.js",
         "verify": "npm run check && npm run smoke",
         "prepublishOnly": "npm run verify",
         "test": "node scripts/run-tests.js",
@@ -57,6 +58,8 @@
     "author": "",
     "license": "MIT",
     "dependencies": {
+        "@napi-rs/keyring": "1.3.0",
+        "@feralfile/source-resolver": "git+https://github.com/feral-file/ff-source-resolver.git#54be943014c8cf7860114510257cdd713bbf4e79",
         "axios": "^1.6.2",
         "bonjour-service": "^1.3.0",
         "chalk": "^4.1.2",

package/dist/src/commands/device.js

@@ -14,8 +14,57 @@ const device_default_1 = require("../utilities/device-default");
 const config_files_1 = require("./helpers/config-files");
 const device_discovery_1 = require("./helpers/device-discovery");
 const prompt_1 = require("./helpers/prompt");
+const ff1_compatibility_1 = require("../utilities/ff1-compatibility");
+const handoff_client_1 = require("../utilities/handoff-client");
+const topic_store_1 = require("../utilities/topic-store");
+const device_removal_1 = require("./helpers/device-removal");
 const deviceCommand = new commander_1.Command('device').description('Manage configured FF1 devices');
 exports.deviceCommand = deviceCommand;
+deviceCommand
+    .command('pair')
+    .description('Securely receive relayer access for a configured FF1 from the mobile app')
+    .argument('[name]', 'Configured device name (uses the default device when omitted)')
+    .action(async (name) => {
+    let receiver;
+    try {
+        const selected = (0, ff1_compatibility_1.resolveConfiguredDevice)(name);
+        if (!selected.success || !selected.device) {
+            throw new Error(selected.error || 'FF1 device is not configured correctly');
+        }
+        const device = selected.device;
+        if (!device.id) {
+            throw new Error(`Device "${device.name || device.host}" has no stable device ID. Re-add it with ff-cli device add before pairing.`);
+        }
+        receiver = await handoff_client_1.TopicHandoffReceiver.create();
+        console.log(chalk_1.default.blue('\nPair ff-cli with Feral File mobile\n'));
+        console.log(`  Device: ${chalk_1.default.bold(device.name || device.id)}`);
+        console.log(`  Device ID: ${chalk_1.default.dim(device.id)}`);
+        console.log("\nIn the mobile app, open this Art Computer's options and choose");
+        console.log(chalk_1.default.bold('“Pair with ff-cli”'), 'then enter:');
+        console.log(`\n  ${chalk_1.default.bold(receiver.shortCode)}\n`);
+        console.log('Before sharing, confirm the mobile security check matches:');
+        console.log(`\n  ${chalk_1.default.bold(receiver.verificationCode)}\n`);
+        console.log(chalk_1.default.dim(`This one-time code expires at ${receiver.expiresAt}. Waiting...`));
+        const payload = await receiver.receiveTopic({ expectedDeviceId: device.id });
+        (0, topic_store_1.storeTopicId)(device.id, payload.topicId);
+        console.log(chalk_1.default.green('\n✓ Relayer access stored in the operating system secure storage.\n'));
+    }
+    catch (error) {
+        console.error(chalk_1.default.red('\nPairing failed:'), error.message);
+        process.exitCode = 1;
+    }
+    finally {
+        if (receiver) {
+            try {
+                await receiver.close();
+            }
+            catch {
+                // The channel is short-lived and expires automatically. A close
+                // failure must not erase or misreport an already stored credential.
+            }
+        }
+    }
+});
 deviceCommand
     .command('list')
     .description('List all configured FF1 devices')
@@ -45,8 +94,8 @@ deviceCommand
             if (device.apiKey) {
                 console.log(`    API key: ${chalk_1.default.green('Set')}`);
             }
-            if (device.topicID) {
-                console.log(`    Topic: ${chalk_1.default.dim(device.topicID)}`);
+            if (device.id) {
+                console.log(`    Device ID: ${chalk_1.default.dim(device.id)}`);
             }
             if (isFirst) {
                 console.log(`    ${chalk_1.default.dim('(default)')}`);
@@ -64,6 +113,7 @@ deviceCommand
     .description('Add a new FF1 device (with mDNS discovery)')
     .option('--host <host>', 'Device host (skip discovery)')
     .option('--name <name>', 'Device name')
+    .option('--id <id>', 'Stable FF1 device ID (required for manual relayer pairing)')
     .action(async (options) => {
     // Lazy prompt: non-interactive paths (--host + --name) must never block on stdin.
     let prompt = null;
@@ -89,7 +139,14 @@ deviceCommand
         const existingDevices = config.ff1Devices?.devices || [];
         let hostValue = '';
         let discoveredName = '';
-        let discoveredId;
+        const suppliedId = options.id?.trim().toUpperCase();
+        if (suppliedId && !/^FF1-[A-Z0-9]{4,}$/.test(suppliedId)) {
+            throw new Error('Device ID must use the FF1-XXXXXXXX format');
+        }
+        if (suppliedId && !options.host) {
+            throw new Error('--id is only needed with --host; discovered devices provide their ID');
+        }
+        let discoveredId = suppliedId;
         let discoveredAddresses;
         if (options.host) {
             hostValue = (0, device_normalize_1.normalizeDeviceHost)(options.host);
@@ -220,10 +277,12 @@ deviceCommand
             }
             process.exit(1);
         }
-        const removed = existingDevices[deviceIndex];
-        const updatedDevices = existingDevices.filter((_, i) => i !== deviceIndex);
-        config.ff1Devices = { devices: updatedDevices };
-        await fs_1.promises.writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, 'utf-8');
+        const { removed, updatedDevices } = await (0, device_removal_1.persistDeviceRemoval)(config, deviceIndex, {
+            persistConfig: async (updatedConfig) => {
+                await fs_1.promises.writeFile(configPath, `${JSON.stringify(updatedConfig, null, 2)}\n`, 'utf-8');
+            },
+            warn: (message) => console.warn(chalk_1.default.yellow(message)),
+        });
         console.log(chalk_1.default.green(`\nRemoved device: ${removed.name || removed.host}`));
         console.log(chalk_1.default.dim(`Remaining devices: ${updatedDevices.length}\n`));
     }

package/dist/src/commands/find.js

@@ -43,8 +43,8 @@ exports.decideActions = decideActions;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
 const fs_1 = require("fs");
+const source_resolver_1 = require("@feralfile/source-resolver");
 const prompt_1 = require("./helpers/prompt");
-const marketplace_url_1 = require("../utilities/marketplace-url");
 const ff_marketplace_1 = require("../utilities/ff-marketplace");
 const objkt_marketplace_1 = require("../utilities/objkt-marketplace");
 const ab_marketplace_1 = require("../utilities/ab-marketplace");
@@ -81,7 +81,7 @@ exports.findCommand = new commander_1.Command('find')
     .action(async (input, options) => {
     try {
         console.log(chalk_1.default.blue('\nFind on Feral File CLI\n'));
-        const parsed = (0, marketplace_url_1.parseFindInput)(input);
+        const parsed = (0, source_resolver_1.parseFindInput)(input);
         if (!parsed) {
             console.error(chalk_1.default.red('Could not understand input.'));
             console.error(chalk_1.default.dim('Supported URLs: Objkt, fxhash, Art Blocks, OpenSea, SuperRare, Feral File, Neort, Verse, Raster. ' +
@@ -90,6 +90,11 @@ exports.findCommand = new commander_1.Command('find')
             process.exit(1);
         }
         if (parsed.kind === 'unsupported') {
+            const resolved = await resolveTokenListInput(input, resolverLimitFromOption(options.limit));
+            if (resolved) {
+                await runResolvedTarget(resolved, options);
+                return;
+            }
             console.error(chalk_1.default.red(parsed.reason));
             process.exit(1);
         }
@@ -99,112 +104,132 @@ exports.findCommand = new commander_1.Command('find')
             await runNeortFind(parsed.id, options);
             return;
         }
-        const target = await resolveTarget(parsed, !!options.yes);
-        if (target.kind === 'series') {
-            console.log(chalk_1.default.cyan((0, raster_client_1.formatSummaryLine)(target.summary)));
-        }
-        else {
-            const { chain, contract, tokenId } = target.coords;
-            console.log(chalk_1.default.cyan(`Single token — ${chain} ${contract}:${tokenId}`));
-            console.log(chalk_1.default.dim("  (Raster doesn't index this series — building a one-item playlist.)"));
-        }
-        console.log();
-        const userLimit = parseLimitOption(options.limit);
-        // Implicit cap: no --limit + series > 1024 → cap to DP-1 max with a
-        // clear warning. Explicit `--limit > 1024` was already rejected by
-        // parseLimitOption, so reaching here means either capped-by-default or
-        // the user picked a value within spec.
-        const limit = Math.min(userLimit, DP1_MAX_ITEMS);
-        // Raster's GraphQL API exposes no series token counts, so enumerate
-        // tokens first (up to the effective limit) and confirm with the real
-        // number afterward. `hasMore` means the series continues past `limit`.
-        let tokens;
-        let seriesHasMore = false;
-        if (target.kind === 'series') {
-            const fetched = await fetchTokens(target.summary, limit);
-            tokens = fetched.tokens;
-            seriesHasMore = fetched.hasMore;
-        }
-        else {
-            tokens = [{ ...target.coords, mediaUrl: null, mediaType: null }];
-        }
-        if (tokens.length === 0) {
-            console.error(chalk_1.default.red('Series has no tokens on supported chains (Ethereum + Tezos mainnet).'));
-            process.exit(1);
-        }
-        if (userLimit === Number.POSITIVE_INFINITY && seriesHasMore) {
-            console.log(chalk_1.default.yellow(`Series has more than ${DP1_MAX_ITEMS} tokens; DP-1 caps playlists at ${DP1_MAX_ITEMS}. ` +
-                `Building with the first ${DP1_MAX_ITEMS} — pass \`--limit N\` (≤ ${DP1_MAX_ITEMS}) for fewer.`));
-            console.log();
-        }
-        const shouldBuild = !!options.yes ||
-            !!options.output ||
-            (await confirmMakePlaylist(tokens.length, seriesHasMore));
-        if (!shouldBuild) {
-            console.log(chalk_1.default.dim('Cancelled.'));
-            return;
-        }
-        console.log(chalk_1.default.dim(`Indexing ${tokens.length} token${tokens.length === 1 ? '' : 's'} via FF indexer...`));
-        // Second positional arg on getNFTTokenInfoBatch is `duration` (DP-1 item
-        // display seconds), not concurrency — concurrency is hardcoded inside.
-        // Omit it for auto timing: video/audio items carry no duration and play
-        // their natural length (DP-1 §4.1); static items get the config default.
-        let items = await getNFTTokenInfoBatch(tokens.map((t) => ({
-            chain: t.chain,
-            contractAddress: t.contract,
-            tokenId: t.tokenId,
-        })));
-        // FF-indexer bypass for Raster-minted tokens. The indexer doesn't carry
-        // Raster's tokens, so it returns nothing — but Raster handed us each
-        // token's playable `media.contentUrl`. Build DP-1 items straight from
-        // that (off-chain provenance, same shape as the Neort path), so the
-        // series still builds into a signable, verifiable playlist instead of
-        // failing the way it did before. The indexer is tried first so tokens
-        // it *can* resolve keep their richer on-chain provenance.
-        if (!Array.isArray(items) || items.length === 0) {
-            const rasterItems = buildRasterMediaItems(tokens, target);
-            if (rasterItems.length > 0) {
-                console.log(chalk_1.default.dim(`  FF indexer returned nothing; building ${rasterItems.length} item${rasterItems.length === 1 ? '' : 's'} directly from Raster media.`));
-                items = rasterItems;
-            }
-        }
-        if (!Array.isArray(items) || items.length === 0) {
-            console.error(chalk_1.default.red('No tokens could be indexed; cannot build playlist.'));
-            console.error(chalk_1.default.dim('  The FF indexer may be under load when warming a series of previously-unseen tokens.'));
-            console.error(chalk_1.default.dim('  Try `--limit 5` first to warm the cache, then re-run without --limit.'));
-            process.exit(1);
-        }
-        const title = playlistTitleFor(target, items);
-        const playlist = await buildDP1Playlist({ items, title });
-        const outputPath = options.output ?? `${playlist.slug || 'playlist'}.json`;
-        await fs_1.promises.writeFile(outputPath, JSON.stringify(playlist, null, 2));
-        console.log(chalk_1.default.green(`✓ Playlist saved to ${outputPath}`));
-        console.log(chalk_1.default.dim(`  ${items.length} item${items.length === 1 ? '' : 's'}`));
-        const dropped = tokens.length - items.length;
-        if (dropped > 0) {
-            console.log(chalk_1.default.dim(`  ${dropped} token${dropped === 1 ? '' : 's'} dropped during indexing`));
-        }
-        console.log();
-        const actions = await decideActions(options);
-        for (const action of actions) {
-            if (action === 'play') {
-                await doPlay(playlist, options.device, !!options.skipVerify);
-            }
-            else if (action === 'publish') {
-                await doPublish(outputPath, options.server, !!options.yes);
-            }
-        }
+        const target = await resolveTarget(input, parsed, !!options.yes, options.limit);
+        await runResolvedTarget(target, options);
     }
     catch (error) {
         console.error(chalk_1.default.red('\nError:'), error.message);
         process.exit(1);
     }
 });
-async function resolveTarget(parsed, skipPrompt) {
+async function runResolvedTarget(target, options) {
+    if (target.kind === 'series') {
+        console.log(chalk_1.default.cyan((0, raster_client_1.formatSummaryLine)(target.summary)));
+    }
+    else if (target.kind === 'token-list') {
+        console.log(chalk_1.default.cyan(target.title));
+    }
+    else {
+        const { chain, contract, tokenId } = target.coords;
+        console.log(chalk_1.default.cyan(`Single token — ${chain} ${contract}:${tokenId}`));
+        console.log(chalk_1.default.dim("  (Raster doesn't index this series — building a one-item playlist.)"));
+    }
+    console.log();
+    const userLimit = parseLimitOption(options.limit);
+    // Implicit cap: no --limit + series > 1024 → cap to DP-1 max with a
+    // clear warning. Explicit `--limit > 1024` was already rejected by
+    // parseLimitOption, so reaching here means either capped-by-default or
+    // the user picked a value within spec.
+    const limit = Math.min(userLimit, DP1_MAX_ITEMS);
+    // Raster's GraphQL API exposes no series token counts, so enumerate
+    // tokens first (up to the effective limit) and confirm with the real
+    // number afterward. `hasMore` means the series continues past `limit`.
+    let tokens;
+    let seriesHasMore = false;
+    if (target.kind === 'series') {
+        const fetched = await fetchTokens(target.summary, limit);
+        tokens = fetched.tokens;
+        seriesHasMore = fetched.hasMore;
+    }
+    else if (target.kind === 'token-list') {
+        const allTokens = target.coords.map((coords) => ({
+            ...coords,
+            mediaUrl: null,
+            mediaType: null,
+        }));
+        tokens = allTokens.slice(0, limit);
+        seriesHasMore = allTokens.length > limit || !!target.hasMore;
+    }
+    else {
+        tokens = [{ ...target.coords, mediaUrl: null, mediaType: null }];
+    }
+    if (tokens.length === 0) {
+        console.error(chalk_1.default.red('Series has no tokens on supported chains (Ethereum + Tezos mainnet).'));
+        process.exit(1);
+    }
+    if (userLimit === Number.POSITIVE_INFINITY && seriesHasMore) {
+        console.log(chalk_1.default.yellow(`Series has more than ${DP1_MAX_ITEMS} tokens; DP-1 caps playlists at ${DP1_MAX_ITEMS}. ` +
+            `Building with the first ${DP1_MAX_ITEMS} — pass \`--limit N\` (≤ ${DP1_MAX_ITEMS}) for fewer.`));
+        console.log();
+    }
+    const shouldBuild = !!options.yes || !!options.output || (await confirmMakePlaylist(tokens.length, seriesHasMore));
+    if (!shouldBuild) {
+        console.log(chalk_1.default.dim('Cancelled.'));
+        return;
+    }
+    console.log(chalk_1.default.dim(`Indexing ${tokens.length} token${tokens.length === 1 ? '' : 's'} via FF indexer...`));
+    // Second positional arg on getNFTTokenInfoBatch is `duration` (DP-1 item
+    // display seconds), not concurrency — concurrency is hardcoded inside.
+    // Omit it for auto timing: video/audio items carry no duration and play
+    // their natural length (DP-1 §4.1); static items get the config default.
+    let items = await getNFTTokenInfoBatch(tokens.map((t) => ({
+        chain: t.chain,
+        contractAddress: t.contract,
+        tokenId: t.tokenId,
+    })));
+    // FF-indexer bypass for Raster-minted tokens. The indexer doesn't carry
+    // Raster's tokens, so it returns nothing — but Raster handed us each
+    // token's playable `media.contentUrl`. Build DP-1 items straight from
+    // that (off-chain provenance, same shape as the Neort path), so the
+    // series still builds into a signable, verifiable playlist instead of
+    // failing the way it did before. The indexer is tried first so tokens
+    // it *can* resolve keep their richer on-chain provenance.
+    if (!Array.isArray(items) || items.length === 0) {
+        const rasterItems = buildRasterMediaItems(tokens, target);
+        if (rasterItems.length > 0) {
+            console.log(chalk_1.default.dim(`  FF indexer returned nothing; building ${rasterItems.length} item${rasterItems.length === 1 ? '' : 's'} directly from Raster media.`));
+            items = rasterItems;
+        }
+    }
+    if (!Array.isArray(items) || items.length === 0) {
+        console.error(chalk_1.default.red('No tokens could be indexed; cannot build playlist.'));
+        console.error(chalk_1.default.dim('  The FF indexer may be under load when warming a series of previously-unseen tokens.'));
+        console.error(chalk_1.default.dim('  Try `--limit 5` first to warm the cache, then re-run without --limit.'));
+        process.exit(1);
+    }
+    const title = playlistTitleFor(target, items);
+    const playlist = await buildDP1Playlist({ items, title });
+    const outputPath = options.output ?? `${playlist.slug || 'playlist'}.json`;
+    await fs_1.promises.writeFile(outputPath, JSON.stringify(playlist, null, 2));
+    console.log(chalk_1.default.green(`✓ Playlist saved to ${outputPath}`));
+    console.log(chalk_1.default.dim(`  ${items.length} item${items.length === 1 ? '' : 's'}`));
+    const dropped = tokens.length - items.length;
+    if (dropped > 0) {
+        console.log(chalk_1.default.dim(`  ${dropped} token${dropped === 1 ? '' : 's'} dropped during indexing`));
+    }
+    console.log();
+    const actions = await decideActions(options);
+    for (const action of actions) {
+        if (action === 'play') {
+            await doPlay(playlist, options.device, !!options.skipVerify);
+        }
+        else if (action === 'publish') {
+            await doPublish(outputPath, options.server, !!options.yes);
+        }
+    }
+}
+async function resolveTarget(input, parsed, skipPrompt, limitOption) {
     if (parsed.kind === 'token') {
         return resolveCoords(parsed.coords);
     }
     if (parsed.kind === 'ff-url') {
+        if (parsed.urlKind === 'show') {
+            const target = await resolveTokenListInput(input, resolverLimitFromOption(limitOption), `Feral File show ${parsed.identifier}`);
+            if (target === null) {
+                throw new Error(`Feral File: no supported tokens found for show "${parsed.identifier}".`);
+            }
+            return target;
+        }
         const coords = await (0, ff_marketplace_1.resolveFeralFileToken)(parsed);
         return resolveCoords(coords);
     }
@@ -212,6 +237,13 @@ async function resolveTarget(parsed, skipPrompt) {
         const contract = await (0, objkt_marketplace_1.resolveObjktAlias)(parsed.alias);
         return resolveCoords({ chain: 'tezos', contract, tokenId: parsed.tokenId });
     }
+    if (parsed.kind === 'objkt-collection') {
+        const target = await resolveTokenListInput(input, resolverLimitFromOption(limitOption), `Objkt collection ${parsed.slug}`);
+        if (target === null) {
+            throw new Error(`Objkt: no supported tokens found for collection "${parsed.slug}".`);
+        }
+        return target;
+    }
     if (parsed.kind === 'ab-collection') {
         const coords = await (0, ab_marketplace_1.resolveArtBlocksCollection)(parsed.slug);
         return resolveCoords(coords);
@@ -229,6 +261,10 @@ async function resolveTarget(parsed, skipPrompt) {
         return resolveCoords(coords);
     }
     if (parsed.kind === 'verse-series') {
+        const target = await resolveTokenListInput(input, resolverLimitFromOption(limitOption), `Verse series ${parsed.slug}`);
+        if (target !== null) {
+            return target;
+        }
         const coords = await (0, verse_marketplace_1.resolveVerseSeries)(parsed.slug);
         return resolveCoords(coords);
     }
@@ -259,6 +295,34 @@ async function resolveTarget(parsed, skipPrompt) {
     // `unsupported` is handled upstream; this branch keeps the type narrowing honest.
     throw new Error(`Unsupported parse result: ${parsed.kind}`);
 }
+/**
+ * resolverLimitFromOption returns the exact bound to give source-resolver
+ * before any collection-like network fetch starts. The CLI still slices
+ * locally in `runResolvedTarget`, but passing this value early keeps large
+ * marketplace catalogs from being over-resolved when the user requested a
+ * smaller playlist.
+ */
+function resolverLimitFromOption(limitStr) {
+    return Math.min(parseLimitOption(limitStr), DP1_MAX_ITEMS);
+}
+/**
+ * Resolve collection-like URLs through the source-resolver package when its
+ * committed support goes beyond the synchronous parser marker. This keeps the
+ * CLI aligned with the library without duplicating every marketplace API and
+ * DOM extraction fallback locally.
+ */
+async function resolveTokenListInput(input, limit, fallbackTitle = 'Resolved source') {
+    const result = await (0, source_resolver_1.resolveTokenInfos)(input, { limit });
+    if (result.kind !== 'tokens') {
+        return null;
+    }
+    return {
+        kind: 'token-list',
+        title: result.title ?? fallbackTitle,
+        coords: result.coords,
+        hasMore: result.hasMore,
+    };
+}
 /**
  * Resolve on-chain coords to a target. If Raster doesn't index this token,
  * fall back to single-token mode so we still build something playable.
@@ -280,6 +344,9 @@ function playlistTitleFor(target, items) {
         const artistLabel = target.summary.artists.map((a) => a.name).join(', ') || 'Unknown artist';
         return `${artistLabel} — ${target.summary.title}`;
     }
+    if (target.kind === 'token-list') {
+        return target.title;
+    }
     return items[0]?.title ?? `Token ${target.coords.tokenId}`;
 }
 /**

package/dist/src/commands/helpers/device-discovery.js

@@ -3,11 +3,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveManualDeviceInput = resolveManualDeviceInput;
 exports.discoverAndSelectDevice = discoverAndSelectDevice;
 const chalk_1 = __importDefault(require("chalk"));
 const ff1_discovery_1 = require("../../utilities/ff1-discovery");
 const device_lookup_1 = require("../../utilities/device-lookup");
 const device_normalize_1 = require("../../utilities/device-normalize");
+/** Resolve manual input while retaining a stable ID for later relayer pairing. */
+function resolveManualDeviceInput(rawInput) {
+    const trimmed = rawInput.trim();
+    if (!trimmed) {
+        return { hostValue: '', discoveredName: '', skipped: false };
+    }
+    const lower = trimmed.toLowerCase();
+    const looksLikeHost = lower.includes('.') || lower.includes(':') || lower.startsWith('http');
+    const discoveredId = looksLikeHost
+        ? undefined
+        : (lower.startsWith('ff1-') ? lower : `ff1-${lower}`).toUpperCase();
+    return {
+        hostValue: (0, device_normalize_1.normalizeDeviceIdToHost)(trimmed),
+        discoveredName: '',
+        discoveredId,
+        skipped: false,
+    };
+}
 /**
  * Run mDNS discovery and prompt the user to pick a device, fall back to
  * manual entry, or skip when an existing device is already configured.
@@ -25,7 +44,7 @@ async function discoverAndSelectDevice(ask, existingDevices, options) {
             : `${discoveryResult.error}.`;
         console.log(chalk_1.default.dim(`mDNS discovery failed: ${errorMessage} Continuing with manual entry.`));
         console.log(chalk_1.default.dim('  Tip: you can skip discovery entirely with ' +
-            'ff-cli device add --host http://<device-ip>:1111 --name <name>'));
+            'ff-cli device add --host http://<device-ip>:1111 --name <name> --id FF1-XXXXXXXX'));
     }
     else if (discoveryResult.error) {
         console.log(chalk_1.default.dim(`mDNS discovery warning: ${discoveryResult.error}`));
@@ -107,12 +126,13 @@ async function discoverAndSelectDevice(ask, existingDevices, options) {
         // with mesh routers that put wired and Wi-Fi clients on different /24s).
         // Point users at the reliable fallback.
         console.log(chalk_1.default.dim('  Tip: mDNS often does not cross subnets. If the device is reachable by IP, ' +
-            'add it directly: ff-cli device add --host http://<device-ip>:1111 --name <name>'));
+            'add it directly: ff-cli device add --host http://<device-ip>:1111 ' +
+            '--name <name> --id FF1-XXXXXXXX'));
     }
     // Manual entry fallback
     const idAnswer = await ask('Device ID or host (e.g. ff1-ABCD1234): ');
     if (!idAnswer) {
         return { hostValue: '', discoveredName: '', skipped: false };
     }
-    return { hostValue: (0, device_normalize_1.normalizeDeviceIdToHost)(idAnswer), discoveredName: '', skipped: false };
+    return resolveManualDeviceInput(idAnswer);
 }

package/dist/src/commands/helpers/device-removal.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.persistDeviceRemoval = persistDeviceRemoval;
+const topic_store_1 = require("../../utilities/topic-store");
+/**
+ * persistDeviceRemoval saves the authoritative config change before attempting
+ * best-effort credential cleanup.
+ *
+ * The operating-system credential vault can be locked or temporarily
+ * unavailable. That must not trap a stale device in config.json; the user can
+ * remove the orphaned credential later after the vault becomes available.
+ *
+ * @param {Config} config - Parsed CLI configuration to update
+ * @param {number} deviceIndex - Index of the configured device to remove
+ * @param {DeviceRemovalDependencies} dependencies - Persistence and credential operations
+ * @returns {Promise<DeviceRemovalResult>} Removed device and remaining device list
+ */
+async function persistDeviceRemoval(config, deviceIndex, dependencies) {
+    const existingDevices = config.ff1Devices?.devices ?? [];
+    const removed = existingDevices[deviceIndex];
+    if (!removed) {
+        throw new Error('Configured FF1 device no longer exists');
+    }
+    const updatedDevices = existingDevices.filter((_, index) => index !== deviceIndex);
+    config.ff1Devices = { devices: updatedDevices };
+    await dependencies.persistConfig(config);
+    if (removed.id) {
+        try {
+            const readTopic = dependencies.getTopicId ?? topic_store_1.getTopicId;
+            const deleteTopic = dependencies.deleteTopicId ?? topic_store_1.deleteTopicId;
+            if (readTopic(removed.id)) {
+                deleteTopic(removed.id);
+            }
+        }
+        catch {
+            (dependencies.warn ?? console.warn)('Warning: device was removed, but its secure topic credential could not be deleted.');
+        }
+    }
+    return { removed, updatedDevices };
+}

package/dist/src/commands/play.js

@@ -7,9 +7,9 @@ exports.playCommand = void 0;
 exports.describeDiscoveryInput = describeDiscoveryInput;
 const commander_1 = require("commander");
 const chalk_1 = __importDefault(require("chalk"));
+const source_resolver_1 = require("@feralfile/source-resolver");
 const config_1 = require("../config");
 const playlist_source_1 = require("../utilities/playlist-source");
-const marketplace_url_1 = require("../utilities/marketplace-url");
 const playlist_cast_1 = require("../utilities/playlist-cast");
 const playlist_display_1 = require("./helpers/playlist-display");
 /**
@@ -29,7 +29,7 @@ const playlist_display_1 = require("./helpers/playlist-display");
  * redirected to `find` too, which surfaces the specific reason.
  */
 function describeDiscoveryInput(source) {
-    const parsed = (0, marketplace_url_1.parseFindInput)(source);
+    const parsed = (0, source_resolver_1.parseFindInput)(source);
     if (!parsed) {
         return null;
     }
@@ -75,7 +75,7 @@ exports.playCommand = new commander_1.Command('play')
         const discovery = describeDiscoveryInput(source);
         if (discovery) {
             console.error(chalk_1.default.red('\n`play` casts an exact playlist or media URL — it does not search marketplaces.'));
-            console.error(chalk_1.default.dim(`  "${source}" looks like ${discovery} to resolve first.`));
+            console.error(chalk_1.default.dim(`  "${source}" looks like ${discovery}, which needs to be resolved first.`));
             const deviceFlag = options.device ? ` -d "${options.device}"` : '';
             console.log(chalk_1.default.yellow(`\nTry:  ff-cli find "${source}" --play${deviceFlag}`));
             process.exit(1);

package/dist/src/commands/sign.js

@@ -10,7 +10,7 @@ const chalk_1 = __importDefault(require("chalk"));
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const { signPlaylistFile } = require('../utilities/playlist-signer');
 exports.signCommand = new commander_1.Command('sign')
-    .description('Sign a DP1 playlist file with a DP-1 signature envelope')
+    .description('Sign a DP-1 playlist file with a DP-1 signature envelope')
     .argument('<file>', 'Path to the playlist file to sign')
     .option('-k, --key <privateKey>', 'Ed25519 private key in base64 format (overrides config)')
     .option('-r, --role <role>', 'DP-1 signing role (overrides config)')