ff1-cli 1.0.2 → 1.0.3

package/dist/src/config.js

@@ -49,11 +49,11 @@ function loadConfig() {
                 maxTokens: parseInt(process.env.MAX_TOKENS || '4000', 10),
                 supportsFunctionCalling: true,
             },
-            chatgpt: {
+            gpt: {
                 apiKey: process.env.OPENAI_API_KEY || '',
                 baseURL: 'https://api.openai.com/v1',
-                model: 'gpt-4o',
-                availableModels: ['gpt-4o', 'gpt-4o-mini', 'gpt-4-turbo'],
+                model: 'gpt-4.1',
+                availableModels: ['gpt-4.1', 'gpt-4.1-mini', 'gpt-4o', 'gpt-4o-mini', 'gpt-4-turbo'],
                 timeout: 30000,
                 maxRetries: 3,
                 temperature: 0.3,
@@ -105,8 +105,9 @@ function loadConfig() {
                 models: mergedModels,
             };
         }
-        catch (_error) {
-            console.warn('Warning: Failed to parse config.json, using defaults');
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            console.warn(`Warning: Failed to parse config at ${configPath}. ${message}. Using defaults.`);
             return defaultConfig;
         }
     }
@@ -161,7 +162,7 @@ function getBrowserConfig() {
  * Get playlist configuration including private key for signing
  *
  * @returns {Object} Playlist configuration
- * @returns {string|null} returns.privateKey - Ed25519 private key in base64 format (null if not configured)
+ * @returns {string|null} returns.privateKey - Ed25519 private key in base64 or hex format (null if not configured)
  */
 function getPlaylistConfig() {
     const config = getConfig();
@@ -303,13 +304,12 @@ function validateConfig(modelName) {
         // Validate playlist configuration (optional, but warn if configured incorrectly)
         if (config.playlist && config.playlist.privateKey) {
             const key = config.playlist.privateKey;
-            if (key !== 'your_ed25519_private_key_base64_here' &&
-                typeof key === 'string' &&
-                key.length > 0) {
-                // Check if it looks like valid base64
+            const placeholderPattern = /your_ed25519_private_key/i;
+            if (!placeholderPattern.test(key) && typeof key === 'string' && key.length > 0) {
                 const base64Regex = /^[A-Za-z0-9+/]+=*$/;
-                if (!base64Regex.test(key)) {
-                    errors.push('playlist.privateKey must be a valid base64-encoded ed25519 private key');
+                const hexRegex = /^(0x)?[0-9a-fA-F]+$/;
+                if (!base64Regex.test(key) && !hexRegex.test(key)) {
+                    errors.push('playlist.privateKey must be a valid base64- or hex-encoded ed25519 private key');
                 }
             }
         }

package/dist/src/intent-parser/index.js

@@ -48,6 +48,7 @@ const openai_1 = __importDefault(require("openai"));
 const chalk_1 = __importDefault(require("chalk"));
 const config_1 = require("../config");
 const utils_1 = require("./utils");
+const logger = __importStar(require("../logger"));
 // Cache for AI clients
 const clientCache = new Map();
 /**
@@ -369,13 +370,13 @@ const intentParserFunctionSchemas = [
         type: 'function',
         function: {
             name: 'confirm_send_playlist',
-            description: 'Confirm the playlist file path and device name for sending. This function is called after the user mentions "send" or similar phrases.',
+            description: 'Confirm the playlist file path or hosted URL and device name for sending. This function is called after the user mentions "send" or similar phrases.',
             parameters: {
                 type: 'object',
                 properties: {
                     filePath: {
                         type: 'string',
-                        description: 'Path to the playlist file (default: "./playlist.json")',
+                        description: 'Path to playlist file or playlist URL (default: "./playlist.json")',
                     },
                     deviceName: {
                         type: 'string',
@@ -483,16 +484,67 @@ function printMarkdownContent(content) {
     const lines = content.split('\n');
     for (const line of lines) {
         if (line.trim()) {
-            console.log(formatMarkdown(line));
+            logger.verbose(formatMarkdown(line));
         }
         else if (line === '') {
-            console.log();
+            logger.verbose();
         }
     }
 }
 function sleep(ms) {
     return new Promise((resolve) => setTimeout(resolve, ms));
 }
+function extractDomains(text) {
+    if (!text) {
+        return [];
+    }
+    const matches = text.match(/[a-z0-9-]+\.(eth|tez)/gi);
+    return matches ? matches.map((match) => match.toLowerCase()) : [];
+}
+function normalizeDomainInput(address, userDomains) {
+    if (!address || userDomains.length === 0) {
+        return address;
+    }
+    const lower = address.toLowerCase();
+    if (!lower.endsWith('.eth') && !lower.endsWith('.tez')) {
+        return address;
+    }
+    const baseName = lower.replace(/\.(eth|tez)$/i, '');
+    const match = userDomains.find((domain) => domain.replace(/\.(eth|tez)$/i, '') === baseName);
+    return match || address;
+}
+function normalizeRequirementDomains(params, userDomains) {
+    if (userDomains.length === 0) {
+        return params;
+    }
+    const normalized = params.requirements.map((req) => {
+        if (req.type !== 'query_address' || typeof req.ownerAddress !== 'string') {
+            return req;
+        }
+        return {
+            ...req,
+            ownerAddress: normalizeDomainInput(req.ownerAddress, userDomains),
+        };
+    });
+    return {
+        ...params,
+        requirements: normalized,
+    };
+}
+function buildToolResponseMessages(toolCalls, responses) {
+    return toolCalls
+        .filter((toolCall) => toolCall.id)
+        .map((toolCall) => {
+        const content = toolCall.id && Object.prototype.hasOwnProperty.call(responses, toolCall.id)
+            ? responses[toolCall.id]
+            : { error: `Unknown function: ${toolCall.function.name}` };
+        return {
+            role: 'tool',
+            tool_call_id: toolCall.id,
+            content: JSON.stringify(content),
+        };
+    });
+}
 async function processNonStreamingResponse(response) {
     const message = response.choices[0]?.message;
     if (!message) {
@@ -500,7 +552,7 @@ async function processNonStreamingResponse(response) {
     }
     if (message.content) {
         printMarkdownContent(message.content);
-        console.log();
+        logger.verbose();
     }
     return { message };
 }
@@ -572,10 +624,10 @@ async function processStreamingResponse(stream) {
                     for (const line of lines) {
                         if (line.trim()) {
                             const formatted = formatMarkdown(line);
-                            console.log(formatted);
+                            logger.verbose(formatted);
                         }
                         else if (line === '') {
-                            console.log();
+                            logger.verbose();
                         }
                     }
                     printedUpTo = lastNewlineIndex + 1;
@@ -621,11 +673,11 @@ async function processStreamingResponse(stream) {
         const remainingText = contentBuffer.substring(printedUpTo);
         if (remainingText.trim()) {
             const formatted = formatMarkdown(remainingText);
-            console.log(formatted);
+            logger.verbose(formatted);
         }
     }
     if (contentBuffer.length > 0) {
-        console.log(); // Extra newline after AI response
+        logger.verbose(); // Extra newline after AI response
     }
     // Convert toolCallsMap to array
     toolCalls = Object.values(toolCallsMap).filter((tc) => tc.id);
@@ -650,6 +702,7 @@ async function processStreamingResponse(stream) {
  */
 async function processIntentParserRequest(userRequest, options = {}) {
     const { modelName, conversationContext } = options;
+    const userDomains = extractDomains(userRequest);
     const client = createIntentParserClient(modelName);
     const modelConfig = (0, config_1.getModelConfig)(modelName);
     const config = (0, config_1.getConfig)();
@@ -691,13 +744,10 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 // Get the list of configured devices
                 const { getConfiguredDevices } = await Promise.resolve().then(() => __importStar(require('../utilities/functions')));
                 const result = await getConfiguredDevices();
-                // Add tool result to messages and continue conversation
-                const toolResultMessage = {
-                    role: 'tool',
-                    tool_call_id: toolCall.id,
-                    content: JSON.stringify(result),
-                };
-                const updatedMessages = [...messages, message, toolResultMessage];
+                const toolResultMessages = buildToolResponseMessages(message.tool_calls, {
+                    [toolCall.id]: result,
+                });
+                const updatedMessages = [...messages, message, ...toolResultMessages];
                 // Continue the conversation with the device list
                 const followUpRequest = {
                     model: modelConfig.model,
@@ -723,7 +773,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 if (followUpMessage.tool_calls && followUpMessage.tool_calls.length > 0) {
                     const followUpToolCall = followUpMessage.tool_calls[0];
                     if (followUpToolCall.function.name === 'parse_requirements') {
-                        const params = JSON.parse(followUpToolCall.function.arguments);
+                        const params = normalizeRequirementDomains(JSON.parse(followUpToolCall.function.arguments), userDomains);
                         // Apply constraints and defaults
                         const validatedParams = (0, utils_1.applyConstraints)(params, config);
                         return {
@@ -741,16 +791,13 @@ async function processIntentParserRequest(userRequest, options = {}) {
                             apiKey: server.apiKey,
                         })) ||
                             feedConfig.baseURLs.map((url) => ({ baseUrl: url, apiKey: feedConfig.apiKey }));
-                        // Add tool result to messages and continue conversation
-                        const feedToolResultMessage = {
-                            role: 'tool',
-                            tool_call_id: followUpToolCall.id,
-                            content: JSON.stringify({ servers: serverList }),
-                        };
+                        const feedToolResultMessages = buildToolResponseMessages(followUpMessage.tool_calls, {
+                            [followUpToolCall.id]: { servers: serverList },
+                        });
                         const feedUpdatedMessages = [
                             ...updatedMessages,
                             followUpMessage,
-                            feedToolResultMessage,
+                            ...feedToolResultMessages,
                         ];
                         // Continue the conversation with the feed server list
                         const feedFollowUpRequest = {
@@ -778,7 +825,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                         if (feedFollowUpMessage.tool_calls && feedFollowUpMessage.tool_calls.length > 0) {
                             const feedToolCall = feedFollowUpMessage.tool_calls[0];
                             if (feedToolCall.function.name === 'parse_requirements') {
-                                const params = JSON.parse(feedToolCall.function.arguments);
+                                const params = normalizeRequirementDomains(JSON.parse(feedToolCall.function.arguments), userDomains);
                                 // Apply constraints and defaults
                                 const validatedParams = (0, utils_1.applyConstraints)(params, config);
                                 return {
@@ -886,15 +933,8 @@ async function processIntentParserRequest(userRequest, options = {}) {
                         }
                     }
                     else {
-                        // Unhandled tool call - add assistant message and tool response to messages
-                        const toolResultMessage = {
-                            role: 'tool',
-                            tool_call_id: followUpToolCall.id,
-                            content: JSON.stringify({
-                                error: `Unknown function: ${followUpToolCall.function.name}`,
-                            }),
-                        };
-                        const validMessages = [...updatedMessages, followUpMessage, toolResultMessage];
+                        const toolResultMessages = buildToolResponseMessages(followUpMessage.tool_calls, {});
+                        const validMessages = [...updatedMessages, followUpMessage, ...toolResultMessages];
                         // AI is still asking for more information after the error
                         return {
                             approved: false,
@@ -921,13 +961,10 @@ async function processIntentParserRequest(userRequest, options = {}) {
                     baseUrl: server.baseUrl,
                     apiKey: server.apiKey,
                 })) || feedConfig.baseURLs.map((url) => ({ baseUrl: url, apiKey: feedConfig.apiKey }));
-                // Add tool result to messages and continue conversation
-                const toolResultMessage = {
-                    role: 'tool',
-                    tool_call_id: toolCall.id,
-                    content: JSON.stringify({ servers: serverList }),
-                };
-                const updatedMessages = [...messages, message, toolResultMessage];
+                const toolResultMessages = buildToolResponseMessages(message.tool_calls, {
+                    [toolCall.id]: { servers: serverList },
+                });
+                const updatedMessages = [...messages, message, ...toolResultMessages];
                 // Continue the conversation with the feed server list
                 const followUpRequest = {
                     model: modelConfig.model,
@@ -953,7 +990,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 if (followUpMessage.tool_calls && followUpMessage.tool_calls.length > 0) {
                     const followUpToolCall = followUpMessage.tool_calls[0];
                     if (followUpToolCall.function.name === 'parse_requirements') {
-                        const params = JSON.parse(followUpToolCall.function.arguments);
+                        const params = normalizeRequirementDomains(JSON.parse(followUpToolCall.function.arguments), userDomains);
                         // Apply constraints and defaults
                         const validatedParams = (0, utils_1.applyConstraints)(params, config);
                         return {
@@ -1016,7 +1053,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 };
             }
             else if (toolCall.function.name === 'parse_requirements') {
-                const params = JSON.parse(toolCall.function.arguments);
+                const params = normalizeRequirementDomains(JSON.parse(toolCall.function.arguments), userDomains);
                 // Apply constraints and defaults
                 const validatedParams = (0, utils_1.applyConstraints)(params, config);
                 return {
@@ -1031,17 +1068,14 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 // Validate and confirm the playlist
                 const confirmation = await confirmPlaylistForSending(args.filePath, args.deviceName);
                 if (!confirmation.success) {
-                    // Add tool response message to make conversation valid
-                    const toolResultMessage = {
-                        role: 'tool',
-                        tool_call_id: toolCall.id,
-                        content: JSON.stringify({
+                    const toolResultMessages = buildToolResponseMessages(message.tool_calls, {
+                        [toolCall.id]: {
                             success: false,
                             error: confirmation.error,
                             message: confirmation.message,
-                        }),
-                    };
-                    const validMessages = [...messages, message, toolResultMessage];
+                        },
+                    });
+                    const validMessages = [...messages, message, ...toolResultMessages];
                     // Check if this is a device selection needed case
                     if (confirmation.needsDeviceSelection) {
                         // Multiple devices available - ask user to choose
@@ -1122,20 +1156,20 @@ async function processIntentParserRequest(userRequest, options = {}) {
             }
             else if (toolCall.function.name === 'verify_addresses') {
                 const args = JSON.parse(toolCall.function.arguments);
+                if (Array.isArray(args.addresses) && userDomains.length > 0) {
+                    args.addresses = args.addresses.map((address) => normalizeDomainInput(address, userDomains));
+                }
                 const { verifyAddresses } = await Promise.resolve().then(() => __importStar(require('../utilities/functions')));
                 const verificationResult = await verifyAddresses({ addresses: args.addresses });
                 if (!verificationResult.valid) {
-                    // Add tool response message for invalid addresses
-                    const toolResultMessage = {
-                        role: 'tool',
-                        tool_call_id: toolCall.id,
-                        content: JSON.stringify({
+                    const toolResultMessages = buildToolResponseMessages(message.tool_calls, {
+                        [toolCall.id]: {
                             valid: false,
                             errors: verificationResult.errors,
                             results: verificationResult.results,
-                        }),
-                    };
-                    const validMessages = [...messages, message, toolResultMessage];
+                        },
+                    });
+                    const validMessages = [...messages, message, ...toolResultMessages];
                     // Ask user to correct the addresses
                     return {
                         approved: false,
@@ -1144,16 +1178,13 @@ async function processIntentParserRequest(userRequest, options = {}) {
                         messages: validMessages,
                     };
                 }
-                // All addresses are valid - continue to next step
-                const toolResultMessage = {
-                    role: 'tool',
-                    tool_call_id: toolCall.id,
-                    content: JSON.stringify({
+                const toolResultMessages = buildToolResponseMessages(message.tool_calls, {
+                    [toolCall.id]: {
                         valid: true,
                         results: verificationResult.results,
-                    }),
-                };
-                const validMessages = [...messages, message, toolResultMessage];
+                    },
+                });
+                const validMessages = [...messages, message, ...toolResultMessages];
                 // Continue conversation after validation
                 const followUpRequest = {
                     model: modelConfig.model,
@@ -1179,7 +1210,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 if (followUpMessage.tool_calls && followUpMessage.tool_calls.length > 0) {
                     const followUpToolCall = followUpMessage.tool_calls[0];
                     if (followUpToolCall.function.name === 'parse_requirements') {
-                        const params = JSON.parse(followUpToolCall.function.arguments);
+                        const params = normalizeRequirementDomains(JSON.parse(followUpToolCall.function.arguments), userDomains);
                         // Apply constraints and defaults
                         const validatedParams = (0, utils_1.applyConstraints)(params, config);
                         return {
@@ -1198,12 +1229,14 @@ async function processIntentParserRequest(userRequest, options = {}) {
                         })) ||
                             feedConfig.baseURLs.map((url) => ({ baseUrl: url, apiKey: feedConfig.apiKey }));
                         // Add tool result to messages and continue conversation
-                        const feedToolResultMessage = {
-                            role: 'tool',
-                            tool_call_id: followUpToolCall.id,
-                            content: JSON.stringify({ servers: serverList }),
-                        };
-                        const feedUpdatedMessages = [...validMessages, followUpMessage, feedToolResultMessage];
+                        const feedToolResultMessages = buildToolResponseMessages(followUpMessage.tool_calls, {
+                            [followUpToolCall.id]: { servers: serverList },
+                        });
+                        const feedUpdatedMessages = [
+                            ...validMessages,
+                            followUpMessage,
+                            ...feedToolResultMessages,
+                        ];
                         // Continue the conversation with the feed server list
                         const feedFollowUpRequest = {
                             model: modelConfig.model,
@@ -1230,7 +1263,7 @@ async function processIntentParserRequest(userRequest, options = {}) {
                         if (feedFollowUpMessage.tool_calls && feedFollowUpMessage.tool_calls.length > 0) {
                             const feedToolCall = feedFollowUpMessage.tool_calls[0];
                             if (feedToolCall.function.name === 'parse_requirements') {
-                                const params = JSON.parse(feedToolCall.function.arguments);
+                                const params = normalizeRequirementDomains(JSON.parse(feedToolCall.function.arguments), userDomains);
                                 // Apply constraints and defaults
                                 const validatedParams = (0, utils_1.applyConstraints)(params, config);
                                 return {
@@ -1308,15 +1341,8 @@ async function processIntentParserRequest(userRequest, options = {}) {
                 };
             }
             else {
-                // Unhandled tool call at top level
-                const toolResultMessage = {
-                    role: 'tool',
-                    tool_call_id: toolCall.id,
-                    content: JSON.stringify({
-                        error: `Unknown function: ${toolCall.function.name}`,
-                    }),
-                };
-                const validMessages = [...messages, message, toolResultMessage];
+                const toolResultMessages = buildToolResponseMessages(message.tool_calls, {});
+                const validMessages = [...messages, message, ...toolResultMessages];
                 return {
                     approved: false,
                     needsMoreInfo: true,

package/dist/src/intent-parser/utils.js

@@ -57,8 +57,11 @@ function applyConstraints(params, config) {
         // Set default quantity if not provided
         // Allow "all" as a string value for query_address type
         let quantity;
-        if (r.quantity === 'all' || r.quantity === null || r.quantity === undefined) {
-            quantity = r.type === 'query_address' ? 'all' : 5;
+        if (r.quantity === 'all') {
+            quantity = 'all';
+        }
+        else if (r.quantity === null || r.quantity === undefined) {
+            quantity = 5;
         }
         else if (typeof r.quantity === 'string') {
             // Try to parse string numbers

package/dist/src/logger.js

@@ -10,6 +10,7 @@ exports.setVerbose = setVerbose;
 exports.debug = debug;
 exports.info = info;
 exports.warn = warn;
+exports.verbose = verbose;
 exports.error = error;
 exports.always = always;
 const chalk_1 = __importDefault(require("chalk"));
@@ -49,6 +50,15 @@ function warn(...args) {
         console.warn(chalk_1.default.yellow('[WARN]'), ...args);
     }
 }
+/**
+ * Log message only in verbose mode (no prefix)
+ * @param {...any} args - Arguments to log
+ */
+function verbose(...args) {
+    if (isVerbose) {
+        console.log(...args);
+    }
+}
 /**
  * Log error message (always shown, but with more details in verbose mode)
  * @param {...any} args - Arguments to log