diff --git a/packages/ai-tools/dist/lib/tools/fs.js b/packages/ai-tools/dist/lib/tools/fs.js index a51fa1a5..27ceacea 100644 --- a/packages/ai-tools/dist/lib/tools/fs.js +++ b/packages/ai-tools/dist/lib/tools/fs.js @@ -6,6 +6,7 @@ import { sync as write } from '@polymech/fs/write'; import { sync as read } from '@polymech/fs/read'; import { sync as rename } from '@polymech/fs/rename'; import { sync as exists } from '@polymech/fs/exists'; +import { sanitize } from "@polymech/fs/utils"; import { filesEx } from '@polymech/commons'; import { toolLogger } from '../../index.js'; import { EXCLUDE_GLOB } from '../../constants.js'; @@ -43,6 +44,45 @@ export const decode_base64 = (base64) => { throw new Error('Failed to decode base64 string'); } }; +// Helper function for smart Base64 decoding +const decodeContentSmart = (content, logger, identifier) => { + if (!content || typeof content !== 'string') { + return content; // Return original content if null, undefined, or not a string + } + const lines = content.split(/\r?\n/); + const processedLines = lines.map(line => { + const trimmedLine = line.trim(); + if (!trimmedLine) { + return ''; // Preserve empty lines between potential blocks but decode the blocks themselves + } + try { + // Attempt to decode Base64 + const decodedLine = Buffer.from(trimmedLine, 'base64').toString('utf-8'); + // Validate if it was actually Base64 by re-encoding + const reEncodedLine = Buffer.from(decodedLine, 'utf-8').toString('base64'); + // Revised Validation Check: + // Compare original trimmed line with re-encoded line. + // Allow for potential padding differences by checking both exact match and no-pad match. + const originalNoPad = trimmedLine.replace(/={1,2}$/, ''); + const reEncodedNoPad = reEncodedLine.replace(/={1,2}$/, ''); + if (reEncodedLine === trimmedLine || reEncodedNoPad === originalNoPad) { + logger.debug(`Successfully decoded Base64 line for ${identifier}`); + return decodedLine; + } + // If validation fails, treat as plain text + logger.debug(`Re-encoding mismatch for ${identifier}. Original: '${trimmedLine}', Re-encoded: '${reEncodedLine}', using original trimmed line.`); + return trimmedLine; + } + catch (decodeError) { + // If decoding throws an error, assume it's plain text + // Use debug level as this is expected for non-base64 lines + logger.debug(`Base64 decoding failed for line in ${identifier}, assuming plain text. Line: ${trimmedLine}`); + return trimmedLine; // Return original trimmed line + } + }); + // Join the processed lines back together + return processedLines.join('\n'); +}; export const tools = (target, options) => { const logger = toolLogger('fs', options); const category = 'fs'; @@ -62,7 +102,7 @@ export const tools = (target, options) => { }, function: async (params) => { try { - const directory = path.join(target, params.directory); + const directory = path.join(target, sanitize(params.directory)); if (!exists(directory)) { logger.debug(`Tool::ListFiles Directory ${directory} does not exist`); return []; @@ -144,7 +184,7 @@ export const tools = (target, options) => { }, function: async (params) => { try { - const filePath = path.join(target, params.path); + const filePath = path.join(target, sanitize(params.path)); logger.debug(`Tool::RemoveFile Removing file ${filePath}`); rm(filePath); return true; @@ -172,9 +212,10 @@ export const tools = (target, options) => { }, function: async (params) => { try { - const src = path.join(target, params.src); - logger.debug(`Tool::Rename file ${src} to ${params.dst}`); - rename(src, params.dst); + const src = path.join(target, sanitize(params.src)); + const dst = path.join(target, sanitize(params.dst)); + logger.debug(`Tool::Rename file ${src} to ${dst}`); + rename(src, dst); rm(src); return true; } @@ -221,19 +262,26 @@ export const tools = (target, options) => { } catch (error) { logger.error(`Tool::modify_project_files : Structure Error parsing files`, error, ret); - write(path.join(target, 'tools-output.json'), files); + // Consider writing the raw input for debugging if JSON parsing fails + // write(path.join(target, 'tools-output-error.json'), files) return error.message; } } for (const file of files) { - const filePath = path.join(target, file.path); + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath); logger.debug(`Tool:modify_project_files writing file ${filePath}`); try { - let content = decode_base64(file.content); - await write(filePath, content); + const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); + try { + await write(filePath, contentToWrite); + } + catch (writeError) { + logger.error(`Tool:modify_project_files Error writing file ${filePath}`, writeError); + } } catch (error) { - logger.error(`Tool:modify_project_files Error writing file`, error); + logger.error(`Tool:modify_project_files Error processing file content for ${filePath}`, error); } } } @@ -263,30 +311,40 @@ export const tools = (target, options) => { required: ["file"], }, function: async (params) => { + let fileInfo; try { if (isString(params)) { try { params = JSON.parse(params); } catch (error) { - logger.error(`Tool::create_file : Structure Error parsing files`, error, params); + logger.error(`Tool::write_file : Structure Error parsing JSON`, error, params); return error.message; } } - let { file } = params; - if (!target || !file.path || !file.content) { - logger.error(`Tool::create_file : Path/Target/Content are required to create file`, params); - return; + fileInfo = params.file; // Keep fileInfo accessible + if (!target || !fileInfo || !fileInfo.path || typeof fileInfo.content === 'undefined') { + logger.error(`Tool::write_file : Path/Target/Content are required`, fileInfo); + return false; // Indicate failure + } + const sanitizedPath = sanitize(fileInfo.path); + const filePath = path.join(target, sanitizedPath); + logger.debug(`Tool::write_file Writing file ${filePath}`); + try { + // Use the smart decoding helper function + const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); + await write(filePath, contentToWrite); + return true; + } + catch (error) { + // Log error related to processing or writing the file + logger.error(`Tool:write_file Error processing or writing file ${sanitizedPath}`, error); + return false; // Indicate failure } - let content = decode_base64(file.content); - logger.debug(`Tool::create_file Writing file ${file.path} in ${target}`); - const filePath = path.join(target, file.path); - write(filePath, content); - return true; } catch (error) { - logger.error(`Tool:create_file Error writing file`, error); - return false; + logger.error(`Tool:write_file Error writing file ${fileInfo?.path ? sanitize(fileInfo.path) : 'unknown'}`, error); + return false; // Indicate failure } }, parse: JSON.parse, @@ -322,10 +380,11 @@ export const tools = (target, options) => { } const { file } = ret; if (!target || !file.path) { - logger.error(`Tool::file_exists : Path is required to `, ret); + logger.error(`Tool::file_exists : Path is required`, ret); return; } - const filePath = path.join(target, file.path); + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath); const res = exists(filePath); logger.debug(`Tool::file_exists ${filePath} exists: ${res}`); return res ? true : false; @@ -358,7 +417,8 @@ export const tools = (target, options) => { function: async (ret) => { try { const { file } = ret; - const filePath = path.join(target, file.path); + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath); logger.debug(`Tool::ReadFile Reading file ${filePath}`); return read(filePath, 'string'); } @@ -371,4 +431,4 @@ export const tools = (target, options) => { } ]; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/lib/tools/fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"fs.js","sourceRoot":"","sources":["../../../src/lib/tools/fs.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/ai-tools/dist/types_kbot.d.ts b/packages/ai-tools/dist/types_kbot.d.ts index 1c12f76f..f7a0a0e5 100644 --- a/packages/ai-tools/dist/types_kbot.d.ts +++ b/packages/ai-tools/dist/types_kbot.d.ts @@ -25,6 +25,7 @@ export interface IKBotOptions {  01-ai/yi-large | paid aetherwiing/mn-starcannon-12b | paid + agentica-org/deepcoder-14b-preview:free | free ai21/jamba-1-5-large | paid ai21/jamba-1-5-mini | paid ai21/jamba-1.6-large | paid @@ -34,8 +35,8 @@ export interface IKBotOptions { aion-labs/aion-1.0-mini | paid aion-labs/aion-rp-llama-3.1-8b | paid jondurbin/airoboros-l2-70b | paid + alfredpros/codellama-7b-instruct-solidity | paid allenai/molmo-7b-d:free | free - allenai/olmo-2-0325-32b-instruct | paid amazon/nova-lite-v1 | paid amazon/nova-micro-v1 | paid amazon/nova-pro-v1 | paid @@ -62,6 +63,7 @@ export interface IKBotOptions { anthropic/claude-2.0:beta | paid anthropic/claude-2.1 | paid anthropic/claude-2.1:beta | paid + arliai/qwq-32b-arliai-rpr-v1:free | free openrouter/auto | paid bytedance-research/ui-tars-72b:free | free cohere/command | paid @@ -93,23 +95,26 @@ export interface IKBotOptions { cognitivecomputations/dolphin-mixtral-8x22b | paid cognitivecomputations/dolphin3.0-mistral-24b:free | free cognitivecomputations/dolphin3.0-r1-mistral-24b:free | free + eleutherai/llemma_7b | paid eva-unit-01/eva-llama-3.33-70b | paid eva-unit-01/eva-qwen-2.5-32b | paid eva-unit-01/eva-qwen-2.5-72b | paid sao10k/fimbulvetr-11b-v2 | paid alpindale/goliath-120b | paid - google/gemini-2.0-flash-lite-001 | paid - google/gemini-2.0-flash-thinking-exp-1219:free | free - google/gemini-2.0-flash-thinking-exp:free | free google/gemini-flash-1.5 | paid google/gemini-flash-1.5-8b | paid google/gemini-flash-1.5-8b-exp | paid + google/gemini-pro-1.5 | paid google/gemini-2.0-flash-001 | paid google/gemini-2.0-flash-exp:free | free - google/gemini-pro | paid - google/gemini-pro-1.5 | paid - google/gemini-2.0-pro-exp-02-05:free | free + google/gemini-2.0-flash-lite-001 | paid + google/gemini-2.0-flash-thinking-exp-1219:free | free + google/gemini-2.0-flash-thinking-exp:free | free + google/gemini-2.5-flash-preview | paid + google/gemini-2.5-flash-preview:thinking | paid google/gemini-2.5-pro-exp-03-25:free | free + google/gemini-2.5-pro-preview-03-25 | paid + google/gemini-pro | paid google/gemini-pro-vision | paid google/gemma-2-27b-it | paid google/gemma-2-9b-it | paid @@ -121,7 +126,6 @@ export interface IKBotOptions { google/gemma-3-27b-it:free | free google/gemma-3-4b-it | paid google/gemma-3-4b-it:free | free - google/gemma-7b-it | paid google/learnlm-1.5-pro-experimental:free | free google/palm-2-chat-bison | paid google/palm-2-chat-bison-32k | paid @@ -144,7 +148,6 @@ export interface IKBotOptions { meta-llama/llama-2-70b-chat | paid meta-llama/llama-3-70b-instruct | paid meta-llama/llama-3-8b-instruct | paid - meta-llama/llama-3-8b-instruct:free | free meta-llama/llama-3.1-405b | paid meta-llama/llama-3.1-405b-instruct | paid meta-llama/llama-3.1-70b-instruct | paid @@ -159,13 +162,15 @@ export interface IKBotOptions { meta-llama/llama-3.2-90b-vision-instruct | paid meta-llama/llama-3.3-70b-instruct | paid meta-llama/llama-3.3-70b-instruct:free | free + meta-llama/llama-4-maverick | paid + meta-llama/llama-4-maverick:free | free + meta-llama/llama-4-scout | paid + meta-llama/llama-4-scout:free | free meta-llama/llama-guard-2-8b | paid microsoft/phi-4 | paid microsoft/phi-4-multimodal-instruct | paid microsoft/phi-3-medium-128k-instruct | paid - microsoft/phi-3-medium-128k-instruct:free | free microsoft/phi-3-mini-128k-instruct | paid - microsoft/phi-3-mini-128k-instruct:free | free microsoft/phi-3.5-mini-128k-instruct | paid sophosympatheia/midnight-rose-70b | paid minimax/minimax-01 | paid @@ -193,14 +198,13 @@ export interface IKBotOptions { mistralai/mistral-small-3.1-24b-instruct | paid mistralai/mistral-small-3.1-24b-instruct:free | free mistralai/mixtral-8x22b-instruct | paid - mistralai/mixtral-8x7b | paid mistralai/mixtral-8x7b-instruct | paid mistralai/pixtral-12b | paid mistralai/pixtral-large-2411 | paid mistralai/mistral-saba | paid + moonshotai/kimi-vl-a3b-thinking:free | free moonshotai/moonlight-16b-a3b-instruct:free | free gryphe/mythomax-l2-13b | paid - gryphe/mythomax-l2-13b:free | free neversleep/llama-3-lumimaid-70b | paid neversleep/llama-3-lumimaid-8b | paid neversleep/llama-3-lumimaid-8b:extended | paid @@ -215,6 +219,9 @@ export interface IKBotOptions { nousresearch/hermes-2-pro-llama-3-8b | paid nvidia/llama-3.1-nemotron-70b-instruct | paid nvidia/llama-3.1-nemotron-70b-instruct:free | free + nvidia/llama-3.1-nemotron-nano-8b-v1:free | free + nvidia/llama-3.1-nemotron-ultra-253b-v1:free | free + nvidia/llama-3.3-nemotron-super-49b-v1:free | free open-r1/olympiccoder-32b:free | free open-r1/olympiccoder-7b:free | free openai/chatgpt-4o-latest | paid @@ -231,6 +238,9 @@ export interface IKBotOptions { openai/gpt-4-turbo | paid openai/gpt-4-1106-preview | paid openai/gpt-4-turbo-preview | paid + openai/gpt-4.1 | paid + openai/gpt-4.1-mini | paid + openai/gpt-4.1-nano | paid openai/gpt-4.5-preview | paid openai/gpt-4o | paid openai/gpt-4o-2024-05-13 | paid @@ -247,11 +257,13 @@ export interface IKBotOptions { openai/o1-preview | paid openai/o1-preview-2024-09-12 | paid openai/o1-pro | paid + openai/o3 | paid openai/o3-mini | paid openai/o3-mini-high | paid + openai/o4-mini | paid + openai/o4-mini-high | paid openchat/openchat-7b | paid - openchat/openchat-7b:free | free - teknium/openhermes-2.5-mistral-7b | paid + all-hands/openhands-lm-32b-v0.1 | paid perplexity/llama-3.1-sonar-large-128k-online | paid perplexity/llama-3.1-sonar-small-128k-online | paid perplexity/r1-1776 | paid @@ -262,14 +274,13 @@ export interface IKBotOptions { perplexity/sonar-reasoning-pro | paid pygmalionai/mythalion-13b | paid qwen/qwen-2-72b-instruct | paid - qwen/qwen-2-7b-instruct | paid - qwen/qwen-2-7b-instruct:free | free qwen/qwen-vl-max | paid qwen/qwen-vl-plus | paid qwen/qwen-max | paid qwen/qwen-plus | paid qwen/qwen-turbo | paid - qwen/qwen2.5-32b-instruct | paid + qwen/qwen2.5-coder-7b-instruct | paid + qwen/qwen2.5-vl-32b-instruct | paid qwen/qwen2.5-vl-32b-instruct:free | free qwen/qwen2.5-vl-3b-instruct:free | free qwen/qwen2.5-vl-72b-instruct | paid @@ -284,6 +295,7 @@ export interface IKBotOptions { qwen/qwen-2.5-72b-instruct | paid qwen/qwen-2.5-72b-instruct:free | free qwen/qwen-2.5-7b-instruct | paid + qwen/qwen-2.5-7b-instruct:free | free qwen/qwen-2.5-coder-32b-instruct | paid qwen/qwen-2.5-coder-32b-instruct:free | free featherless/qwerky-72b:free | free @@ -296,13 +308,14 @@ export interface IKBotOptions { sao10k/l3.1-70b-hanami-x1 | paid sao10k/l3.1-euryale-70b | paid sao10k/l3.3-euryale-70b | paid + shisa-ai/shisa-v2-llama3.3-70b:free | free raifle/sorcererlm-8x22b | paid steelskull/l3.3-electra-r1-70b | paid - tokyotech-llm/llama-3.1-swallow-70b-instruct-v0.3 | paid thedrummer/anubis-pro-105b-v1 | paid thedrummer/skyfall-36b-v2 | paid + thudm/glm-4-32b:free | free + thudm/glm-z1-32b:free | free undi95/toppy-m-7b | paid - undi95/toppy-m-7b:free | free scb10x/llama3.1-typhoon2-70b-instruct | paid scb10x/llama3.1-typhoon2-8b-instruct | paid thedrummer/unslopnemo-12b | paid @@ -310,6 +323,8 @@ export interface IKBotOptions { microsoft/wizardlm-2-8x22b | paid x-ai/grok-2-1212 | paid x-ai/grok-2-vision-1212 | paid + x-ai/grok-3-beta | paid + x-ai/grok-3-mini-beta | paid x-ai/grok-beta | paid x-ai/grok-vision-beta | paid xwin-lm/xwin-lm-70b | paid @@ -334,6 +349,12 @@ export interface IKBotOptions { gpt-4-turbo gpt-4-turbo-2024-04-09 gpt-4-turbo-preview + gpt-4.1 + gpt-4.1-2025-04-14 + gpt-4.1-mini + gpt-4.1-mini-2025-04-14 + gpt-4.1-nano + gpt-4.1-nano-2025-04-14 gpt-4.5-preview gpt-4.5-preview-2025-02-27 gpt-4o @@ -369,6 +390,8 @@ export interface IKBotOptions { o1-pro-2025-03-19 o3-mini o3-mini-2025-01-31 + o4-mini + o4-mini-2025-04-16 omni-moderation-2024-09-26 omni-moderation-latest text-embedding-3-large @@ -425,6 +448,8 @@ export interface IKBotOptions { JSON,JSONUnescape,JSONPretty,AlphaSort,code,JSONParse,trim */ filters?: (string | ("JSON" | "JSONUnescape" | "JSONPretty" | "AlphaSort" | "code" | "JSONParse" | "trim")[] | string[] | ((...args_0: unknown[]) => unknown)[]); + /** JSONPath query to be used to transform input objects */ + query?: (string | null); /** Dry run - only write out parameters without making API calls */ dry?: (boolean | string); /** Format for structured outputs. Can be a Zod schema, a Zod schema string, a JSON schema string, or a path to a JSON file. */ diff --git a/packages/ai-tools/src/lib/tools/fs.ts b/packages/ai-tools/src/lib/tools/fs.ts index 955ef002..ecdfcf30 100644 --- a/packages/ai-tools/src/lib/tools/fs.ts +++ b/packages/ai-tools/src/lib/tools/fs.ts @@ -7,7 +7,8 @@ import { sync as write } from '@polymech/fs/write' import { sync as read } from '@polymech/fs/read' import { sync as rename } from '@polymech/fs/rename' import { sync as exists } from '@polymech/fs/exists' - +import { sanitizeFilename } from "@polymech/fs/utils" +import { sanitize } from "@polymech/fs/utils" import { filesEx } from '@polymech/commons' import { toolLogger } from '../../index.js' @@ -52,6 +53,51 @@ export const decode_base64 = (base64: string): string => { } }; +// Helper function for smart Base64 decoding +const decodeContentSmart = (content: string, logger: any, identifier: string): string => { + if (!content || typeof content !== 'string') { + return content; // Return original content if null, undefined, or not a string + } + + const lines = content.split(/\r?\n/); + const processedLines = lines.map(line => { + const trimmedLine = line.trim(); + if (!trimmedLine) { + return ''; // Preserve empty lines between potential blocks but decode the blocks themselves + } + + try { + // Attempt to decode Base64 + const decodedLine = Buffer.from(trimmedLine, 'base64').toString('utf-8'); + // Validate if it was actually Base64 by re-encoding + const reEncodedLine = Buffer.from(decodedLine, 'utf-8').toString('base64'); + + // Revised Validation Check: + // Compare original trimmed line with re-encoded line. + // Allow for potential padding differences by checking both exact match and no-pad match. + const originalNoPad = trimmedLine.replace(/={1,2}$/, ''); + const reEncodedNoPad = reEncodedLine.replace(/={1,2}$/, ''); + + if (reEncodedLine === trimmedLine || reEncodedNoPad === originalNoPad) { + logger.debug(`Successfully decoded Base64 line for ${identifier}`); + return decodedLine; + } + // If validation fails, treat as plain text + logger.debug(`Re-encoding mismatch for ${identifier}. Original: '${trimmedLine}', Re-encoded: '${reEncodedLine}', using original trimmed line.`); + return trimmedLine; + } catch (decodeError) { + // If decoding throws an error, assume it's plain text + // Use debug level as this is expected for non-base64 lines + logger.debug(`Base64 decoding failed for line in ${identifier}, assuming plain text. Line: ${trimmedLine}`); + return trimmedLine; // Return original trimmed line + } + }); + + + // Join the processed lines back together + return processedLines.join('\n'); +}; + export const tools = (target: string, options: IKBotTask): Array => { const logger = toolLogger('fs', options) const category = 'fs' @@ -71,7 +117,7 @@ export const tools = (target: string, options: IKBotTask): Array => { }, function: async (params: any) => { try { - const directory = path.join(target, params.directory); + const directory = path.join(target, sanitize(params.directory)); if (!exists(directory)) { logger.debug(`Tool::ListFiles Directory ${directory} does not exist`); return [] @@ -150,7 +196,7 @@ export const tools = (target: string, options: IKBotTask): Array => { }, function: async (params: any) => { try { - const filePath = path.join(target, params.path); + const filePath = path.join(target, sanitize(params.path)); logger.debug(`Tool::RemoveFile Removing file ${filePath}`); rm(filePath); return true; @@ -177,9 +223,10 @@ export const tools = (target: string, options: IKBotTask): Array => { }, function: async (params: any) => { try { - const src = path.join(target, params.src) - logger.debug(`Tool::Rename file ${src} to ${params.dst}`) - rename(src, params.dst) + const src = path.join(target, sanitize(params.src)) + const dst = path.join(target, sanitize(params.dst)) + logger.debug(`Tool::Rename file ${src} to ${dst}`) + rename(src, dst) rm(src) return true } catch (error) { @@ -224,24 +271,31 @@ export const tools = (target: string, options: IKBotTask): Array => { files = JSON.parse(files) } catch (error: any) { logger.error(`Tool::modify_project_files : Structure Error parsing files`, error, ret) - write(path.join(target, 'tools-output.json'), files) + // Consider writing the raw input for debugging if JSON parsing fails + // write(path.join(target, 'tools-output-error.json'), files) return error.message } } for (const file of files) { - const filePath = path.join(target, file.path); + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath); logger.debug(`Tool:modify_project_files writing file ${filePath}`) try { - let content = decode_base64(file.content) - await write(filePath, content) + const contentToWrite = decodeContentSmart(file.content, logger, sanitizedPath); + try { + await write(filePath, contentToWrite) + } catch (writeError) { + logger.error(`Tool:modify_project_files Error writing file ${filePath}`, writeError) + } } catch (error) { - logger.error(`Tool:modify_project_files Error writing file`, error) + logger.error(`Tool:modify_project_files Error processing file content for ${filePath}`, error) } } } catch (error) { logger.error(`Error creating project structure`, error) } }, + parse: JSON.parse, }, } as RunnableToolFunction<{ id: string }>, @@ -264,28 +318,42 @@ export const tools = (target: string, options: IKBotTask): Array => { required: ["file"], }, function: async (params) => { + let fileInfo; try { if (isString(params)) { try { params = JSON.parse(params) } catch (error: any) { - logger.error(`Tool::create_file : Structure Error parsing files`, error, params) + logger.error(`Tool::write_file : Structure Error parsing JSON`, error, params) return error.message } } - let { file } = params as any - if (!target || !file.path || !file.content) { - logger.error(`Tool::create_file : Path/Target/Content are required to create file`, params) - return + + fileInfo = (params as any).file; // Keep fileInfo accessible + + if (!target || !fileInfo || !fileInfo.path || typeof fileInfo.content === 'undefined') { + logger.error(`Tool::write_file : Path/Target/Content are required`, fileInfo) + return false; // Indicate failure + } + + const sanitizedPath = sanitize(fileInfo.path); + const filePath = path.join(target, sanitizedPath) + logger.debug(`Tool::write_file Writing file ${filePath}`) + + try { + // Use the smart decoding helper function + const contentToWrite = decodeContentSmart(fileInfo.content, logger, sanitizedPath); + + await write(filePath, contentToWrite) + return true + } catch (error) { + // Log error related to processing or writing the file + logger.error(`Tool:write_file Error processing or writing file ${sanitizedPath}`, error) + return false // Indicate failure } - let content = decode_base64(file.content) - logger.debug(`Tool::create_file Writing file ${file.path} in ${target}`) - const filePath = path.join(target, file.path) - write(filePath, content) - return true } catch (error) { - logger.error(`Tool:create_file Error writing file`, error) - return false + logger.error(`Tool:write_file Error writing file ${fileInfo?.path ? sanitize(fileInfo.path) : 'unknown'}`, error) + return false // Indicate failure } }, parse: JSON.parse, @@ -320,10 +388,11 @@ export const tools = (target: string, options: IKBotTask): Array => { } const { file } = ret as any if (!target || !file.path) { - logger.error(`Tool::file_exists : Path is required to `, ret) + logger.error(`Tool::file_exists : Path is required`, ret) return } - const filePath = path.join(target, file.path) + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath) const res = exists(filePath) logger.debug(`Tool::file_exists ${filePath} exists: ${res}`) return res ? true : false @@ -355,7 +424,8 @@ export const tools = (target: string, options: IKBotTask): Array => { function: async (ret) => { try { const { file } = ret as any - const filePath = path.join(target, file.path) + const sanitizedPath = sanitize(file.path); + const filePath = path.join(target, sanitizedPath) logger.debug(`Tool::ReadFile Reading file ${filePath}`) return read(filePath, 'string') } catch (error) { diff --git a/packages/ai-tools/src/types_kbot.ts b/packages/ai-tools/src/types_kbot.ts index f9fd90ec..011bfa63 100644 --- a/packages/ai-tools/src/types_kbot.ts +++ b/packages/ai-tools/src/types_kbot.ts @@ -25,6 +25,7 @@ export interface IKBotOptions {  01-ai/yi-large | paid aetherwiing/mn-starcannon-12b | paid + agentica-org/deepcoder-14b-preview:free | free ai21/jamba-1-5-large | paid ai21/jamba-1-5-mini | paid ai21/jamba-1.6-large | paid @@ -34,8 +35,8 @@ export interface IKBotOptions { aion-labs/aion-1.0-mini | paid aion-labs/aion-rp-llama-3.1-8b | paid jondurbin/airoboros-l2-70b | paid + alfredpros/codellama-7b-instruct-solidity | paid allenai/molmo-7b-d:free | free - allenai/olmo-2-0325-32b-instruct | paid amazon/nova-lite-v1 | paid amazon/nova-micro-v1 | paid amazon/nova-pro-v1 | paid @@ -62,6 +63,7 @@ export interface IKBotOptions { anthropic/claude-2.0:beta | paid anthropic/claude-2.1 | paid anthropic/claude-2.1:beta | paid + arliai/qwq-32b-arliai-rpr-v1:free | free openrouter/auto | paid bytedance-research/ui-tars-72b:free | free cohere/command | paid @@ -93,23 +95,26 @@ export interface IKBotOptions { cognitivecomputations/dolphin-mixtral-8x22b | paid cognitivecomputations/dolphin3.0-mistral-24b:free | free cognitivecomputations/dolphin3.0-r1-mistral-24b:free | free + eleutherai/llemma_7b | paid eva-unit-01/eva-llama-3.33-70b | paid eva-unit-01/eva-qwen-2.5-32b | paid eva-unit-01/eva-qwen-2.5-72b | paid sao10k/fimbulvetr-11b-v2 | paid alpindale/goliath-120b | paid - google/gemini-2.0-flash-lite-001 | paid - google/gemini-2.0-flash-thinking-exp-1219:free | free - google/gemini-2.0-flash-thinking-exp:free | free google/gemini-flash-1.5 | paid google/gemini-flash-1.5-8b | paid google/gemini-flash-1.5-8b-exp | paid + google/gemini-pro-1.5 | paid google/gemini-2.0-flash-001 | paid google/gemini-2.0-flash-exp:free | free - google/gemini-pro | paid - google/gemini-pro-1.5 | paid - google/gemini-2.0-pro-exp-02-05:free | free + google/gemini-2.0-flash-lite-001 | paid + google/gemini-2.0-flash-thinking-exp-1219:free | free + google/gemini-2.0-flash-thinking-exp:free | free + google/gemini-2.5-flash-preview | paid + google/gemini-2.5-flash-preview:thinking | paid google/gemini-2.5-pro-exp-03-25:free | free + google/gemini-2.5-pro-preview-03-25 | paid + google/gemini-pro | paid google/gemini-pro-vision | paid google/gemma-2-27b-it | paid google/gemma-2-9b-it | paid @@ -121,7 +126,6 @@ export interface IKBotOptions { google/gemma-3-27b-it:free | free google/gemma-3-4b-it | paid google/gemma-3-4b-it:free | free - google/gemma-7b-it | paid google/learnlm-1.5-pro-experimental:free | free google/palm-2-chat-bison | paid google/palm-2-chat-bison-32k | paid @@ -144,7 +148,6 @@ export interface IKBotOptions { meta-llama/llama-2-70b-chat | paid meta-llama/llama-3-70b-instruct | paid meta-llama/llama-3-8b-instruct | paid - meta-llama/llama-3-8b-instruct:free | free meta-llama/llama-3.1-405b | paid meta-llama/llama-3.1-405b-instruct | paid meta-llama/llama-3.1-70b-instruct | paid @@ -159,13 +162,15 @@ export interface IKBotOptions { meta-llama/llama-3.2-90b-vision-instruct | paid meta-llama/llama-3.3-70b-instruct | paid meta-llama/llama-3.3-70b-instruct:free | free + meta-llama/llama-4-maverick | paid + meta-llama/llama-4-maverick:free | free + meta-llama/llama-4-scout | paid + meta-llama/llama-4-scout:free | free meta-llama/llama-guard-2-8b | paid microsoft/phi-4 | paid microsoft/phi-4-multimodal-instruct | paid microsoft/phi-3-medium-128k-instruct | paid - microsoft/phi-3-medium-128k-instruct:free | free microsoft/phi-3-mini-128k-instruct | paid - microsoft/phi-3-mini-128k-instruct:free | free microsoft/phi-3.5-mini-128k-instruct | paid sophosympatheia/midnight-rose-70b | paid minimax/minimax-01 | paid @@ -193,14 +198,13 @@ export interface IKBotOptions { mistralai/mistral-small-3.1-24b-instruct | paid mistralai/mistral-small-3.1-24b-instruct:free | free mistralai/mixtral-8x22b-instruct | paid - mistralai/mixtral-8x7b | paid mistralai/mixtral-8x7b-instruct | paid mistralai/pixtral-12b | paid mistralai/pixtral-large-2411 | paid mistralai/mistral-saba | paid + moonshotai/kimi-vl-a3b-thinking:free | free moonshotai/moonlight-16b-a3b-instruct:free | free gryphe/mythomax-l2-13b | paid - gryphe/mythomax-l2-13b:free | free neversleep/llama-3-lumimaid-70b | paid neversleep/llama-3-lumimaid-8b | paid neversleep/llama-3-lumimaid-8b:extended | paid @@ -215,6 +219,9 @@ export interface IKBotOptions { nousresearch/hermes-2-pro-llama-3-8b | paid nvidia/llama-3.1-nemotron-70b-instruct | paid nvidia/llama-3.1-nemotron-70b-instruct:free | free + nvidia/llama-3.1-nemotron-nano-8b-v1:free | free + nvidia/llama-3.1-nemotron-ultra-253b-v1:free | free + nvidia/llama-3.3-nemotron-super-49b-v1:free | free open-r1/olympiccoder-32b:free | free open-r1/olympiccoder-7b:free | free openai/chatgpt-4o-latest | paid @@ -231,6 +238,9 @@ export interface IKBotOptions { openai/gpt-4-turbo | paid openai/gpt-4-1106-preview | paid openai/gpt-4-turbo-preview | paid + openai/gpt-4.1 | paid + openai/gpt-4.1-mini | paid + openai/gpt-4.1-nano | paid openai/gpt-4.5-preview | paid openai/gpt-4o | paid openai/gpt-4o-2024-05-13 | paid @@ -247,11 +257,13 @@ export interface IKBotOptions { openai/o1-preview | paid openai/o1-preview-2024-09-12 | paid openai/o1-pro | paid + openai/o3 | paid openai/o3-mini | paid openai/o3-mini-high | paid + openai/o4-mini | paid + openai/o4-mini-high | paid openchat/openchat-7b | paid - openchat/openchat-7b:free | free - teknium/openhermes-2.5-mistral-7b | paid + all-hands/openhands-lm-32b-v0.1 | paid perplexity/llama-3.1-sonar-large-128k-online | paid perplexity/llama-3.1-sonar-small-128k-online | paid perplexity/r1-1776 | paid @@ -262,14 +274,13 @@ export interface IKBotOptions { perplexity/sonar-reasoning-pro | paid pygmalionai/mythalion-13b | paid qwen/qwen-2-72b-instruct | paid - qwen/qwen-2-7b-instruct | paid - qwen/qwen-2-7b-instruct:free | free qwen/qwen-vl-max | paid qwen/qwen-vl-plus | paid qwen/qwen-max | paid qwen/qwen-plus | paid qwen/qwen-turbo | paid - qwen/qwen2.5-32b-instruct | paid + qwen/qwen2.5-coder-7b-instruct | paid + qwen/qwen2.5-vl-32b-instruct | paid qwen/qwen2.5-vl-32b-instruct:free | free qwen/qwen2.5-vl-3b-instruct:free | free qwen/qwen2.5-vl-72b-instruct | paid @@ -284,6 +295,7 @@ export interface IKBotOptions { qwen/qwen-2.5-72b-instruct | paid qwen/qwen-2.5-72b-instruct:free | free qwen/qwen-2.5-7b-instruct | paid + qwen/qwen-2.5-7b-instruct:free | free qwen/qwen-2.5-coder-32b-instruct | paid qwen/qwen-2.5-coder-32b-instruct:free | free featherless/qwerky-72b:free | free @@ -296,13 +308,14 @@ export interface IKBotOptions { sao10k/l3.1-70b-hanami-x1 | paid sao10k/l3.1-euryale-70b | paid sao10k/l3.3-euryale-70b | paid + shisa-ai/shisa-v2-llama3.3-70b:free | free raifle/sorcererlm-8x22b | paid steelskull/l3.3-electra-r1-70b | paid - tokyotech-llm/llama-3.1-swallow-70b-instruct-v0.3 | paid thedrummer/anubis-pro-105b-v1 | paid thedrummer/skyfall-36b-v2 | paid + thudm/glm-4-32b:free | free + thudm/glm-z1-32b:free | free undi95/toppy-m-7b | paid - undi95/toppy-m-7b:free | free scb10x/llama3.1-typhoon2-70b-instruct | paid scb10x/llama3.1-typhoon2-8b-instruct | paid thedrummer/unslopnemo-12b | paid @@ -310,6 +323,8 @@ export interface IKBotOptions { microsoft/wizardlm-2-8x22b | paid x-ai/grok-2-1212 | paid x-ai/grok-2-vision-1212 | paid + x-ai/grok-3-beta | paid + x-ai/grok-3-mini-beta | paid x-ai/grok-beta | paid x-ai/grok-vision-beta | paid xwin-lm/xwin-lm-70b | paid @@ -334,6 +349,12 @@ export interface IKBotOptions { gpt-4-turbo gpt-4-turbo-2024-04-09 gpt-4-turbo-preview + gpt-4.1 + gpt-4.1-2025-04-14 + gpt-4.1-mini + gpt-4.1-mini-2025-04-14 + gpt-4.1-nano + gpt-4.1-nano-2025-04-14 gpt-4.5-preview gpt-4.5-preview-2025-02-27 gpt-4o @@ -369,6 +390,8 @@ export interface IKBotOptions { o1-pro-2025-03-19 o3-mini o3-mini-2025-01-31 + o4-mini + o4-mini-2025-04-16 omni-moderation-2024-09-26 omni-moderation-latest text-embedding-3-large @@ -425,6 +448,8 @@ export interface IKBotOptions { JSON,JSONUnescape,JSONPretty,AlphaSort,code,JSONParse,trim */ filters?: (string | ("JSON" | "JSONUnescape" | "JSONPretty" | "AlphaSort" | "code" | "JSONParse" | "trim")[] | string[] | ((...args_0: unknown[]) => unknown)[]); + /** JSONPath query to be used to transform input objects */ + query?: (string | null); /** Dry run - only write out parameters without making API calls */ dry?: (boolean | string); /** Format for structured outputs. Can be a Zod schema, a Zod schema string, a JSON schema string, or a path to a JSON file. */