zyn-ai 1.3.4 → 1.3.6

package/README.md

@@ -31,7 +31,6 @@ Zyn is a local AI agent designed for terminal and web usage. It supports persist
 - Node.js 18+
 - npm
 - Internet connection for remote providers
-- Optional: Ollama for local models
 
 ---
 
@@ -133,6 +132,9 @@ Commands:
 |---|---|
 | `/tools` | List tools |
 | `/skills` | List skills |
+| `/gmail connect` | Connect Gmail with Google OAuth + PKCE |
+| `/gmail status` | Show Gmail connection status |
+| `/gmail disconnect` | Remove saved Gmail tokens |
 | `/cwd` | Show working directory |
 
 ### Web & Export
@@ -164,16 +166,10 @@ Example:
 ```json
 {
   "models": {
-    "my-local-model": {
-      "label": "My local model",
-      "provider": "ollama",
-      "ollamaModel": "llama3.1:8b"
-    },
-    "my-remote-model": {
-      "label": "My remote model",
-      "provider": "openai-compatible",
-      "openaiModel": "gpt-4o-mini",
-      "baseUrl": "https://api.example.com/v1"
+    "my-gemini-flash": {
+      "label": "Gemini Flash",
+      "provider": "gemini",
+      "geminiModel": "gemini-flash"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zyn-ai",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Production-ready AI agent for CLI and web with real tool execution and automation",
   "author": "Maycol",
   "keywords": [

package/src/cli/commands.js

@@ -4,14 +4,35 @@ const { spawn } = require('child_process');
 
 const fsp = fs.promises;
 const { listSkills, SKILLS_DIR } = require('../core/skills');
-const { DEFAULT_LANGUAGE, DEFAULT_MODEL_KEY, MODELS, listProvidersFromModels } = require('../config');
+const { DEFAULT_LANGUAGE, DEFAULT_MODEL_KEY, GEMINI_MODEL_WARNING, MODELS, listProvidersFromModels } = require('../config');
 const { languageLabel, normalizeLanguage, t } = require('../i18n');
 const { createNewSessionState, listSessions, loadSessionState, saveState } = require('../utils/sessionStorage');
 const { listGitSecrets, removeGitSecret, upsertGitSecret } = require('../utils/secretStorage');
+const { clearGmailAuth, getGmailAuthStatus, startGmailOAuthFlow } = require('../utils/gmailAuth');
 const { exportTranscriptText, formatTranscriptPreview } = require('../utils/transcriptStorage');
 const { resolveInputPath } = require('../utils/pathUtils');
 const { printTools } = require('../tools');
 
+
+function getModelWarning(key) {
+  const model = MODELS[key];
+  return model?.provider === 'gemini' ? GEMINI_MODEL_WARNING : '';
+}
+
+function printModelChanged(key) {
+  const warning = getModelWarning(key);
+  console.log(`Model: ${MODELS[key].label}`);
+  if (warning) console.log(`Warning: ${warning}`);
+}
+
+function printLanguageChanged(language) {
+  const normalized = normalizeLanguage(language);
+  const label = languageLabel(normalized);
+  console.log(normalized === 'es'
+    ? `Actualizado al idioma ${label} (${normalized})`
+    : `Updated to language ${label} (${normalized})`);
+}
+
 const SLASH_COMMANDS = [
   { name: 'help', desc: 'full help', descEs: 'ayuda completa' },
   { name: 'status', desc: 'current status', descEs: 'estado actual' },
@@ -28,6 +49,7 @@ const SLASH_COMMANDS = [
   { name: 'models', desc: 'list models', descEs: 'listar modelos' },
   { name: 'providers', desc: 'list providers', descEs: 'listar proveedores' },
   { name: 'git', desc: 'configure git credentials', descEs: 'configurar credenciales git' },
+  { name: 'gmail', desc: 'connect Gmail account', descEs: 'conectar cuenta Gmail' },
   { name: 'persona', desc: 'set response tone/personality', descEs: 'definir tono/persona' },
   { name: 'lang', desc: 'change language', descEs: 'cambiar idioma' },
   { name: 'language', desc: 'change language', descEs: 'cambiar idioma' },
@@ -121,6 +143,9 @@ function printHelp(state = {}) {
   console.log(`    ${b('/git set <provider> <token> [user] [apiBaseUrl:URL] [cloneBaseUrl:URL] [name:X]')}`);
   console.log(`    ${b('/git list')}                    List configured git profiles`);
   console.log(`    ${b('/git remove <provider> [name]')} Remove git credentials`);
+  console.log(`    ${b('/gmail connect')}               Connect Gmail with Google OAuth + PKCE`);
+  console.log(`    ${b('/gmail status')}                Show Gmail connection status`);
+  console.log(`    ${b('/gmail disconnect')}            Remove saved Gmail tokens`);
   console.log(`    ${b('/cwd')}                         Show current working directory`);
   console.log(`    ${b('/cwd <path>')}                  Change working directory`);
   console.log('');
@@ -261,7 +286,7 @@ async function handleLocalCommand(input, state, deps) {
 
     state.language = nextLanguage;
     await saveState(state);
-    console.log(`${t(state.language, 'langChanged')}: ${languageLabel(nextLanguage)} (${nextLanguage})`);
+    printLanguageChanged(nextLanguage);
     return true;
   }
 
@@ -401,7 +426,7 @@ async function handleLocalCommand(input, state, deps) {
       }
       state.language = nextLanguage;
       await saveState(state);
-      console.log(`${t(state.language, 'langChanged')}: ${languageLabel(nextLanguage)} (${nextLanguage})`);
+      printLanguageChanged(nextLanguage);
       return true;
     }
 
@@ -416,9 +441,9 @@ async function handleLocalCommand(input, state, deps) {
       await saveState(state);
       await appendTranscriptEntry(state.sessionId, {
         type: 'system',
-        content: `Model switched to: ${MODELS[key].label}`,
+        content: `Model switched to: ${MODELS[key].label}${getModelWarning(key) ? `\nWarning: ${getModelWarning(key)}` : ''}`,
       });
-      console.log(`Model: ${MODELS[key].label}`);
+      printModelChanged(key);
       return true;
     }
 
@@ -479,9 +504,9 @@ async function handleLocalCommand(input, state, deps) {
     await saveState(state);
     await appendTranscriptEntry(state.sessionId, {
       type: 'system',
-      content: `Model switched to: ${MODELS[key].label}`,
+      content: `Model switched to: ${MODELS[key].label}${getModelWarning(key) ? `\nWarning: ${getModelWarning(key)}` : ''}`,
     });
-    console.log(`Model: ${MODELS[key].label}`);
+    printModelChanged(key);
     return true;
   }
 
@@ -541,6 +566,51 @@ async function handleLocalCommand(input, state, deps) {
     return true;
   }
 
+
+  if (commandName === 'gmail') {
+    const [subRaw, ...rest] = String(args || 'status').trim().split(/\s+/).filter(Boolean);
+    const sub = (subRaw || 'status').toLowerCase();
+
+    if (sub === 'connect' || sub === 'login') {
+      const portArg = rest.find(part => /^\d{2,5}$/.test(part));
+      const flow = await startGmailOAuthFlow({ port: portArg ? Number(portArg) : 0, flow: 'code' });
+      console.log(flow.authUrl);
+      if (flow.flow === 'device') {
+        console.log(`Código: ${flow.userCode}`);
+        console.log('Abre el link, ingresa el código y autoriza Gmail.');
+      } else {
+        console.log('Abre el link, inicia sesión y vuelve aquí.');
+      }
+      flow.done
+        .then(auth => {
+          const email = auth?.profile?.email || 'cuenta conectada';
+          console.error(`Gmail conectado: ${email}`);
+        })
+        .catch(err => console.error(`Gmail OAuth fallo: ${err.message}`));
+      return true;
+    }
+
+    if (sub === 'status') {
+      const status = await getGmailAuthStatus();
+      if (!status.connected) {
+        console.log('Gmail: no conectado. Usa /gmail connect.');
+      } else {
+        console.log(`Gmail: conectado${status.email ? ` (${status.email})` : ''}`);
+        console.log(`Scopes: ${status.scopes.join(', ') || '-'}`);
+        console.log(`Expira: ${status.expiryDate ? new Date(status.expiryDate).toISOString() : '-'}`);
+      }
+      return true;
+    }
+
+    if (sub === 'disconnect' || sub === 'logout' || sub === 'remove') {
+      await clearGmailAuth();
+      console.log('Gmail desconectado.');
+      return true;
+    }
+
+    throw new Error('Use /gmail connect|status|disconnect');
+  }
+
   if (commandName === 'web') {
     let host = '127.0.0.1';
     let port = 3000;

package/src/cli/print.js

@@ -112,11 +112,11 @@ function pushAction(state, kind, title, detail = '') {
 }
 
 const EVENT_SYMBOLS = {
-  info:  { sym: '·', color: C.gray },
+  info:  { sym: 'ⓘ', color: C.gray },
   think: { sym: '○', color: C.gray },
-  tool:  { sym: '⤳', color: C.purple },
+  tool:  { sym: '⚒', color: C.purple },
   ok:    { sym: '✓', color: C.green },
-  warn:  { sym: '▲', color: C.yellow },
+  warn:  { sym: '⚠', color: C.yellow },
   error: { sym: '✗', color: C.red },
 };
 

package/src/config.js

@@ -34,23 +34,16 @@ const BUILTIN_MODELS = {
     provider: 'zen',
     zenModel: 'trinity-large-preview-free',
   },
-  'ollama-qwen': {
-    label: 'Ollama Qwen 2.5',
-    provider: 'ollama',
-    ollamaModel: 'qwen2.5:latest',
-  },
-  'ollama-gemma': {
-    label: 'Ollama Gemma 3',
-    provider: 'ollama',
-    ollamaModel: 'gemma3:latest',
-  },
-  'openai-mini': {
-    label: 'OpenAI Compatible Mini',
-    provider: 'openai-compatible',
-    openaiModel: 'gpt-4o-mini',
+  'gemini-flash': {
+    label: 'Gemini Flash',
+    provider: 'gemini',
+    geminiModel: 'gemini-flash',
   },
 };
 
+const SUPPORTED_MODEL_PROVIDERS = new Set(['qwen', 'zen', 'gemini']);
+const GEMINI_MODEL_WARNING = 'It is not recommended for use in production; it is unstable and ineffective.';
+
 function readJsonFile(filePath) {
   try {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'));
@@ -66,7 +59,7 @@ function loadExternalModels() {
   if (Array.isArray(raw)) {
     const output = {};
     for (const item of raw) {
-      if (!item?.key || !item?.provider) continue;
+      if (!item?.key || !item?.provider || !SUPPORTED_MODEL_PROVIDERS.has(item.provider)) continue;
       output[item.key] = {
         label: item.label || item.key,
         provider: item.provider,
@@ -76,11 +69,13 @@ function loadExternalModels() {
     return output;
   }
 
-  if (raw && typeof raw === 'object' && raw.models && typeof raw.models === 'object') {
-    return raw.models;
-  }
+  const rawModels = raw && typeof raw === 'object' && raw.models && typeof raw.models === 'object'
+    ? raw.models
+    : (raw && typeof raw === 'object' ? raw : {});
 
-  return raw && typeof raw === 'object' ? raw : {};
+  return Object.fromEntries(
+    Object.entries(rawModels).filter(([, model]) => SUPPORTED_MODEL_PROVIDERS.has(model?.provider)),
+  );
 }
 
 const MODELS = {
@@ -99,8 +94,10 @@ const MAX_OUTPUT_CHARS = 12000;
 const MAX_FILE_LINES = 5000;
 const ACTION_LOG_LIMIT = 40;
 const REQUEST_TIMEOUT_MS = Number(process.env.ZYN_REQUEST_TIMEOUT_MS || 180000);
-const MAX_HISTORY_CHARS = 24000;
-const KEEP_RECENT_MESSAGES = 12;
+const MAX_HISTORY_CHARS = 60000;
+const KEEP_RECENT_MESSAGES = 50;
+const PROVIDER_TIMEOUT_RETRY_DELAY_MS = Number(process.env.ZYN_PROVIDER_TIMEOUT_RETRY_DELAY_MS || 600000);
+const PROVIDER_TIMEOUT_MAX_ATTEMPTS = 3;
 const SESSION_ROOT = path.join(DATA_ROOT, 'chat');
 const SESSIONS_DIR = path.join(SESSION_ROOT, 'sessions');
 const CURRENT_SESSION_FILE = path.join(SESSION_ROOT, 'current-session.json');
@@ -110,6 +107,9 @@ const EXPORTS_DIR = path.join(SESSION_ROOT, 'exports');
 const THINK_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const USER_DATA_ROOT = path.join(os.homedir(), '.zyn');
 const TASKS_FILE = path.join(USER_DATA_ROOT, 'tasks.json');
+const GMAIL_CLIENT_ID = '871944347395-rnpsjsqgbnvlfb05hqk4dc9283olgnh2.apps.googleusercontent.com';
+const GMAIL_CLIENT_SECRET = process.env.ZYN_GMAIL_CLIENT_SECRET || '';
+const GMAIL_AUTH_FILE = path.join(USER_DATA_ROOT, 'gmail-auth.json');
 const PROVIDERS_FILE = path.join(DATA_ROOT, 'providers.json');
 
 function listProvidersFromModels(models = MODELS) {
@@ -142,6 +142,10 @@ module.exports = {
   DATA_ROOT,
   DEFAULT_LANGUAGE,
   DEFAULT_MODEL_KEY,
+  GEMINI_MODEL_WARNING,
+  GMAIL_AUTH_FILE,
+  GMAIL_CLIENT_ID,
+  GMAIL_CLIENT_SECRET,
   EXPORTS_DIR,
   HOME_DIR,
   KEEP_RECENT_MESSAGES,
@@ -152,6 +156,9 @@ module.exports = {
   MODELS,
   MODELS_FILE,
   PROVIDERS_FILE,
+  SUPPORTED_MODEL_PROVIDERS,
+  PROVIDER_TIMEOUT_MAX_ATTEMPTS,
+  PROVIDER_TIMEOUT_RETRY_DELAY_MS,
   QWEN_EMAIL,
   QWEN_PASSWORD,
   REQUEST_TIMEOUT_MS,

package/src/core/agent.js

@@ -4,6 +4,8 @@ const {
   MAX_HISTORY_CHARS,
   MAX_TOOL_STEPS,
   MODELS,
+  PROVIDER_TIMEOUT_MAX_ATTEMPTS,
+  PROVIDER_TIMEOUT_RETRY_DELAY_MS,
   REQUEST_TIMEOUT_MS,
 } = require('../config');
 const { chat, chatSilent } = require('../providers/scraperClient');
@@ -25,6 +27,29 @@ const { normalizeText, shortText } = require('../utils/text');
 const { detectLanguage } = require('../i18n');
 
 
+
+function waitForRetry(ms, signal) {
+  if (!ms || ms <= 0) return Promise.resolve();
+  if (signal?.aborted) return Promise.reject(new Error('aborted'));
+
+  return new Promise((resolve, reject) => {
+    const timeout = setTimeout(cleanupAndResolve, ms);
+    const onAbort = () => {
+      clearTimeout(timeout);
+      cleanup();
+      reject(new Error('aborted'));
+    };
+    function cleanup() {
+      if (signal) signal.removeEventListener('abort', onAbort);
+    }
+    function cleanupAndResolve() {
+      cleanup();
+      resolve();
+    }
+    if (signal) signal.addEventListener('abort', onAbort, { once: true });
+  });
+}
+
 function looksLikeActionRequest(text) {
   const sample = normalizeText(String(text || '')).toLowerCase();
   if (!sample) return false;
@@ -38,7 +63,7 @@ async function requestModel(messages, state, ui, options = {}) {
     signal,
   } = options;
 
-  for (let attempt = 0; attempt < 2; attempt += 1) {
+  for (let attempt = 0; attempt < PROVIDER_TIMEOUT_MAX_ATTEMPTS; attempt += 1) {
     if (signal?.aborted) {
       throw new Error(state.language === 'es' ? 'Agente detenido por el usuario (ESC x2)' : 'Agent stopped by the user (ESC x2)');
     }
@@ -96,8 +121,21 @@ async function requestModel(messages, state, ui, options = {}) {
     } catch (err) {
       const externalAbort = Boolean(signal?.aborted);
       const aborted = controller.signal.aborted || err?.name === 'AbortError';
-      if (aborted && timedOut && !externalAbort && attempt === 0) {
-        ui.logEvent(state, 'warn', state.language === 'es' ? 'Proveedor lento, reenviando mensaje' : 'Provider stalled, resending message');
+      if (aborted && timedOut && !externalAbort && attempt < PROVIDER_TIMEOUT_MAX_ATTEMPTS - 1) {
+        const waitMinutes = Math.round(PROVIDER_TIMEOUT_RETRY_DELAY_MS / 60000);
+        ui.logEvent(
+          state,
+          'warn',
+          state.language === 'es' ? 'Tiempo agotado del proveedor' : 'Provider timeout',
+          state.language === 'es'
+            ? `Esperando ${waitMinutes} minutos antes de reenviar (${attempt + 2}/${PROVIDER_TIMEOUT_MAX_ATTEMPTS})`
+            : `Waiting ${waitMinutes} minutes before resending (${attempt + 2}/${PROVIDER_TIMEOUT_MAX_ATTEMPTS})`,
+        );
+        try {
+          await waitForRetry(PROVIDER_TIMEOUT_RETRY_DELAY_MS, signal);
+        } catch {
+          throw new Error(state.language === 'es' ? 'Agente detenido por el usuario (ESC x2)' : 'Agent stopped by the user (ESC x2)');
+        }
         continue;
       }
       if (aborted) {
@@ -106,7 +144,7 @@ async function requestModel(messages, state, ui, options = {}) {
         }
         throw new Error(state.language === 'es' ? 'Tiempo agotado del proveedor' : 'Provider timeout exceeded');
       }
-      if (!externalAbort && attempt === 0) {
+      if (!externalAbort && attempt < PROVIDER_TIMEOUT_MAX_ATTEMPTS - 1) {
         ui.logEvent(state, 'warn', state.language === 'es' ? 'Error transitorio, reenviando contexto y skills' : 'Transient error, resending context and skills');
         continue;
       }
@@ -131,10 +169,13 @@ async function summarizeMessages(state, ui, messages) {
     {
       role: 'system',
       content: [
-        state.language === 'es' ? 'Resume la conversacion para memoria persistente.' : 'Summarize the conversation for persistent memory.',
-        state.language === 'es' ? 'Escribe en espanol.' : 'Write in English.',
-        state.language === 'es' ? 'Incluye objetivos, decisiones, archivos, comandos, restricciones y pendientes importantes.' : 'Include goals, decisions, files, commands, constraints, and important pending items.',
-        'Max 12 lines.',
+        state.language === 'es' ? 'Compacta la conversacion para memoria persistente del agente.' : 'Compact the conversation for the agent persistent memory.',
+        state.language === 'es' ? 'Escribe en español y conserva los idiomas/preferencias indicados por el usuario.' : 'Write in English and preserve any languages/preferences requested by the user.',
+        state.language === 'es'
+          ? 'Resume sin perder detalles críticos: objetivo del proyecto, progreso exacto, decisiones, archivos/rutas tocadas, comandos ejecutados, resultados, errores, credenciales/configuraciones no secretas, restricciones, próximos pasos y preferencias de idioma.'
+          : 'Summarize without losing critical details: project goal, exact progress, decisions, touched files/paths, executed commands, results, errors, non-secret credentials/configuration, constraints, next steps, and language preferences.',
+        state.language === 'es' ? 'No inventes; si algo está pendiente márcalo como Pendiente. Mantén nombres propios, rutas, APIs, límites y valores numéricos intactos.' : 'Do not invent; if something is pending mark it as Pending. Keep proper nouns, paths, APIs, limits, and numeric values intact.',
+        'Format: compact bullet list with sections Contexto/Progreso/Archivos/Comandos/Pendiente/Preferencias. Max 20 lines.',
       ].join('\n'),
     },
     {
@@ -205,9 +246,9 @@ async function answerFromToolResult(input, call, result, state, ui) {
 
   const output = await requestModel(messages, state, ui, {
     label: state.language === 'es' ? 'Resumiendo resultado' : 'Summarizing result',
-    streamOutput: true,
   });
-  return normalizeText(output);
+  const parsed = parseAgentResponse(output);
+  return parsed.type === 'final' ? normalizeText(parsed.content) : normalizeText(output);
 }
 
 async function runAgentTurn(input, state, ui, options = {}) {
@@ -241,7 +282,7 @@ async function runAgentTurn(input, state, ui, options = {}) {
     });
     ui.logEvent(state, 'ok', state.language === 'es' ? 'Respuesta lista' : 'Response ready');
     await persistSessionState(state, ui);
-    return { content: finalAnswer, rendered: true };
+    return { content: finalAnswer, rendered: false };
   }
 
   const turnMessages = [{ role: 'user', content: input }];

package/src/core/prompts.js

@@ -44,6 +44,23 @@ function getPlatformInfo() {
   return osName;
 }
 
+
+const TOOL_ALIASES = {
+  bash: 'run_command',
+  shell: 'run_command',
+  terminal: 'run_command',
+  execute_command: 'run_command',
+  command: 'run_command',
+  run_terminal_command: 'run_command',
+};
+
+function normalizeToolName(name) {
+  const raw = String(name || '').trim();
+  if (!raw) return raw;
+  const lower = raw.toLowerCase();
+  return TOOL_ALIASES[lower] || lower;
+}
+
 const KNOWN_TOOLS = new Set([
   ...TOOL_DEFINITIONS.map(tool => tool.name),
   'task_create', 'task_list', 'task_update', 'task_complete', 'task_delete', 'task_clear',
@@ -66,7 +83,7 @@ function buildSystemPrompt(cwd, state = {}, options = {}) {
 
   const languageInstructions = language === 'es'
     ? [
-        'Responde siempre en español.',
+        'Responde en el idioma del ultimo mensaje del usuario (si es ambiguo, usa la preferencia de sesion).',
         'Ejecuta la tarea directamente. No des tutoriales ni instrucciones al usuario cuando puedas actuar tú mismo.',
         'Si hace falta, usa herramientas sin pedir permiso extra.',
         'Responde solo con el resultado final o con la siguiente accion concreta.',
@@ -76,12 +93,13 @@ function buildSystemPrompt(cwd, state = {}, options = {}) {
         'No cierres con una conclusion si todavia no has probado nada.',
         'Si una tarea dura demasiado, usa run_command con un timeoutMs adecuado y confirma el resultado real.',
         'Para operaciones de Git usa la herramienta git con action="api" o action="clone".',
-        'Para proyectos, usa combinaciones de tools según la fase: descubrir (list_dir/search_text), leer (read_file/fetch/webfetch), cambiar (write/replace), validar (run_command), documentar (final).',
+        'Para proyectos, usa combinaciones de tools según la fase: descubrir (list_dir/search_text), leer (read_file/fetch/webfetch), cambiar (write/replace), validar (run_command), subir artefactos si hace falta (upload_file), documentar (final).',
+        'Antes de elegir una herramienta revisa su nombre exacto, argumentos requeridos y resultado esperado; usa read/search/list antes de editar y run_command para validar cambios.',
         'No te limites a una sola tool por costumbre; elige la mejor secuencia técnica para el objetivo.',
         'Si el usuario pide logos, mockups o piezas visuales para un proyecto/frontend, usa create_canvas_image cuando corresponda, junto al resto de tools del flujo.',
       ]
     : [
-        'Always respond in English.',
+        'Respond in the language of the user\'s latest message (if ambiguous, use the session preference).',
         'Execute the task directly. Do not give tutorials or instructions when you can act yourself.',
         'Use tools when needed without asking for extra permission.',
         'Reply only with the final result or the next concrete action.',
@@ -91,9 +109,11 @@ function buildSystemPrompt(cwd, state = {}, options = {}) {
         'Do not end with a conclusion if you have not tested anything yet.',
         'If a task takes long, use run_command with an appropriate timeoutMs and verify the real result.',
         'For Git operations use the git tool with action="api" or action="clone".',
-        'For project work, combine tools by phase: discover (list_dir/search_text), read (read_file/fetch/webfetch), change (write/replace), validate (run_command), then report.',
+        'For project work, combine tools by phase: discover (list_dir/search_text), read (read_file/fetch/webfetch), change (write/replace), validate (run_command), upload artifacts if needed (upload_file), then report.',
+        'Before choosing a tool, verify its exact name, required args, and expected result; use read/search/list before editing and run_command to validate changes.',
         'Do not over-focus on a single tool by habit; choose the best technical sequence for the goal.',
         'If the user asks for logos, mockups, or visual assets for a project/frontend, use create_canvas_image when appropriate together with the rest of the workflow.',
+        'Prioritize and reuse explicit user-provided context (requirements, constraints, repo instructions, preferences) across the full task; do not ignore it.',
       ];
 
   const toolUseEnforcement = language === 'es'
@@ -235,7 +255,7 @@ function extractXmlTool(text) {
   );
   if (!invokeMatch) return null;
 
-  const tool = invokeMatch[1];
+  const tool = normalizeToolName(invokeMatch[1]);
   if (!KNOWN_TOOLS.has(tool)) return null;
 
   const rawArgs = invokeMatch[2].trim();
@@ -254,13 +274,15 @@ function extractXmlTool(text) {
 
 function classifyParsed(parsed) {
   if (parsed?.type === 'tool' && parsed.tool) {
-    return { type: 'tool', tool: parsed.tool, args: parsed.args ?? {} };
+    const normalized = normalizeToolName(parsed.tool);
+    if (KNOWN_TOOLS.has(normalized)) return { type: 'tool', tool: normalized, args: parsed.args ?? {} };
   }
   if (parsed?.type === 'final') {
     return { type: 'final', content: typeof parsed.content === 'string' ? parsed.content : '' };
   }
-  if (parsed?.tool && KNOWN_TOOLS.has(parsed.tool)) {
-    return { type: 'tool', tool: parsed.tool, args: parsed.args ?? {} };
+  if (parsed?.tool) {
+    const normalized = normalizeToolName(parsed.tool);
+    if (KNOWN_TOOLS.has(normalized)) return { type: 'tool', tool: normalized, args: parsed.args ?? {} };
   }
   return null;
 }
@@ -283,6 +305,8 @@ const TOOL_ARG_KEYS = {
   scrape_site: ['url', 'selectors', 'limit', 'headers'],
   web_search: ['query', 'lang', 'limit'],
   web_read: ['url'],
+  upload_file: ['path', 'field', 'name', 'type'],
+  gmail: ['action', 'query', 'maxResults', 'id', 'to', 'subject', 'body'],
   create_canvas_image: ['width', 'height', 'background', 'elements', 'format', 'outputPath'],
   git: ['provider', 'action', 'method', 'path', 'body', 'headers', 'name', 'repoUrl', 'destination', 'branch', 'timeoutMs'],
 };
@@ -294,11 +318,43 @@ const LONG_VALUE_ARG = {
   replace_in_file: 'replace',
 };
 
+
+function extractMalformedFinalContent(text) {
+  const typeMatch = text.match(/(?:["'])type(?:["'])\s*:\s*(?:["'])final(?:["'])/i);
+  if (!typeMatch) return null;
+
+  const contentMatch = text.match(/(?:["'])content(?:["'])\s*:\s*(["'])/i);
+  if (!contentMatch) return null;
+
+  const quote = contentMatch[1];
+  const start = contentMatch.index + contentMatch[0].length;
+  let esc = false;
+
+  for (let i = start; i < text.length; i += 1) {
+    const ch = text[i];
+    if (esc) { esc = false; continue; }
+    if (ch === '\\') { esc = true; continue; }
+    if (ch !== quote) continue;
+
+    const tail = text.slice(i + 1).trim();
+    if (!tail || /^}\s*$/.test(tail) || /^,\s*(["']\w+["']\s*:|})/.test(tail)) {
+      return unescapeJsonString(text.slice(start, i)).trim();
+    }
+  }
+
+  const lastQuote = text.lastIndexOf(quote);
+  if (lastQuote > start) {
+    return unescapeJsonString(text.slice(start, lastQuote)).trim();
+  }
+
+  return null;
+}
+
 function fuzzyExtractTool(text) {
   const toolMatch = text.match(/(?:"|')?tool(?:"|')?\s*:\s*"(\w+)"/i);
   if (!toolMatch) return null;
 
-  const tool = toolMatch[1];
+  const tool = normalizeToolName(toolMatch[1]);
   if (!KNOWN_TOOLS.has(tool)) return null;
 
   const longArg = LONG_VALUE_ARG[tool];
@@ -422,6 +478,13 @@ function parseAgentResponse(raw) {
   const tool = extractToolJson(text);
   if (tool) return { type: 'tool', tool: tool.tool, args: tool.args ?? {} };
 
+  const malformedFinalContent = extractMalformedFinalContent(text);
+  if (malformedFinalContent !== null) {
+    const embedded = extractToolJson(malformedFinalContent);
+    if (embedded) return { type: 'tool', tool: embedded.tool, args: embedded.args ?? {} };
+    return { type: 'final', content: malformedFinalContent };
+  }
+
   const xmlTool = extractXmlTool(text);
   if (xmlTool) return xmlTool;
 
@@ -485,7 +548,7 @@ function buildToolResultMessage(parsed, result) {
 
 function buildToolErrorMessage(parsed, errorMessage) {
   return [
-    `La herramienta "${parsed.tool}" NO existe.`,
+    `La herramienta "${parsed.tool}" no se pudo ejecutar (nombre inválido o no disponible en este modo).`,
     `Error: ${errorMessage}`,
     `Las unicas herramientas disponibles son: ${TOOL_DEFINITIONS.map(t => t.name).join(', ')}.`,
     'Elige UNA de esas herramientas. Usa el formato exacto del nombre. No inventes herramientas.',

package/src/i18n.js

@@ -30,7 +30,7 @@ const STRINGS = {
     webUrl: 'Web URL',
     chooseLanguage: 'Choose language from commands: /lang en or /lang es',
     langCurrent: 'Current language',
-    langChanged: 'Language updated',
+    langChanged: 'Updated to language',
     langInvalid: 'Unsupported language. Available: en, es',
     noSavedSessions: 'No saved sessions.',
     noMemory: 'No compacted memory.',
@@ -75,7 +75,7 @@ const STRINGS = {
     webUrl: 'URL web',
     chooseLanguage: 'Elige idioma con /lang en o /lang es',
     langCurrent: 'Idioma actual',
-    langChanged: 'Idioma actualizado',
+    langChanged: 'Actualizado al idioma',
     langInvalid: 'Idioma no soportado. Disponibles: en, es',
     noSavedSessions: 'No hay sesiones guardadas.',
     noMemory: 'Sin memoria compactada.',