scalix 1.5.0 → 1.5.2

package/dist/headless.js

@@ -4,17 +4,18 @@ import { execSync } from 'node:child_process';
 import { createAgent } from './agent.js';
 import { defaultTools } from './tools.js';
 import { extraTools } from './tools-extra.js';
+import { memoryTools } from './tools-memory.js';
 import { webTools } from './tools-web.js';
 import { advancedTools } from './tools-advanced.js';
 import { visionTools } from './tools-vision.js';
 import { voiceTools } from './tools-voice.js';
 import { browserTools, closeBrowser } from './tools-browser.js';
-import { loadMcpServices } from './mcp.js';
+import { startMcp } from './mcp.js';
 import { costTracker } from './cost-tracker.js';
 import { saveSession, loadSession, listSessions, generateSessionId } from './sessions.js';
 import { logger } from './logger.js';
-import { DEFAULT_MODELS, DEFAULT_INSTRUCTIONS, ENV_MODEL, HEADLESS_DEFAULTS, fetchModelSpecs } from './constants.js';
-import { loadConfig, resolveActiveProvider, DEFAULT_LIMITS } from './settings.js';
+import { DEFAULT_MODELS, DEFAULT_INSTRUCTIONS, ENV_MODEL, HEADLESS_DEFAULTS, fetchModelSpecs, normalizeModelId } from './constants.js';
+import { loadConfig, loadGlobalConfig, saveConfig, resolveActiveProvider, DEFAULT_LIMITS } from './settings.js';
 import { checkForUpdate, getUpdateBanner } from './update-checker.js';
 import { getModeDescription, PERMISSION_MODES, setSandboxRoot } from './sandbox.js';
 import { collectGitInfo, gitInfoToContext } from './git-context.js';
@@ -155,7 +156,7 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         }).catch(() => { });
     }
     const envModels = process.env[ENV_MODEL]
-        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean)
+        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean).map(normalizeModelId)
         : [];
     const selectedModel = envModels.length > 0 ? envModels
         : config.models.length > 0 ? config.models : DEFAULT_MODELS;
@@ -163,7 +164,6 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         console.error('Error: No models configured.\nSet SCALIX_MODEL env var or run interactive setup: scalix');
         process.exit(1);
     }
-    const mcpTools = loadMcpServices();
     // Only discover/load project-local plugins in a trusted workspace — plugins
     // dynamically import and execute code from the project directory.
     const plugins = isWorkspaceTrusted() ? await discoverPlugins(process.cwd()) : [];
@@ -171,7 +171,7 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         process.stderr.write('Project plugins skipped (untrusted workspace).\n');
     }
     const pluginTools = getPluginTools(plugins);
-    const allTools = [...defaultTools, ...extraTools, ...webTools, ...advancedTools, ...visionTools, ...voiceTools, ...browserTools, ...mcpTools, ...pluginTools];
+    const allTools = [...defaultTools, ...extraTools, ...memoryTools, ...webTools, ...advancedTools, ...visionTools, ...voiceTools, ...browserTools, ...pluginTools];
     const instructions = await buildEnhancedInstructions();
     let outputSchema;
     if (outputSchemaPath) {
@@ -194,6 +194,8 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         apiKey,
         baseUrl,
         provider: active.provider,
+        cloudApiKey: active.cloudApiKey,
+        cloudBaseUrl: active.cloudBaseUrl,
         model: selectedModel,
         instructions,
         tools: allTools,
@@ -212,11 +214,18 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         groundingCheck: true,
         contextRetrieval: true,
     });
+    if (agent.getSkippedHookCount() > 0) {
+        process.stderr.write(`Project hooks skipped (untrusted workspace): ${agent.getSkippedHookCount()}\n`);
+    }
+    // Connect configured MCP servers and register their tools. Warnings only:
+    // a server that will not start must not take the whole run down with it.
+    const mcpHub = await startMcp(agent, (m) => process.stderr.write(`\x1b[33m⚠ ${m}\x1b[0m\n`));
     // Register the account's Scalix Cloud platform tools (one attempt; failure
     // is stated once and the run continues with local tools only).
     const cloudStatus = await agent.refreshCloudTools();
     if (cloudStatus.state === 'unavailable') {
-        process.stderr.write(`\x1b[33m☁ Scalix Cloud unavailable — running with local tools only. ${cloudStatus.error ?? ''}\x1b[0m\n`);
+        const remedy = cloudStatus.remedy ? ` ${cloudStatus.remedy}` : '';
+        process.stderr.write(`\x1b[33m☁ Scalix Cloud unavailable — running with local tools only. ${cloudStatus.error ?? ''}${remedy}\x1b[0m\n`);
     }
     let fullResponse = '';
     agent.on('tool:call', (name) => process.stderr.write(`\x1b[33m▶ ${name}\x1b[0m\n`));
@@ -268,6 +277,7 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         process.stdout.write(formatted + '\n');
     }
     await closeBrowser();
+    await mcpHub.close(); // stdio servers are child processes; don't orphan them
     if (beforeExit)
         await beforeExit();
     process.exit(0);
@@ -319,14 +329,13 @@ async function runInteractive() {
     if (active.provider === 'scalix')
         fetchModelSpecs(baseUrl, apiKey).catch(() => { });
     const envModels = process.env[ENV_MODEL]
-        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean)
+        ? process.env[ENV_MODEL].split(',').map((m) => m.trim()).filter(Boolean).map(normalizeModelId)
         : [];
     const selectedModel = envModels.length > 0 ? envModels
         : config.models.length > 0 ? config.models : DEFAULT_MODELS;
     if (selectedModel.length === 0) {
         throw new Error('No models configured. Set SCALIX_MODEL env var or run interactive setup.');
     }
-    const mcpTools = loadMcpServices();
     // Only discover/load project-local plugins in a trusted workspace — plugins
     // dynamically import and execute code from the project directory.
     const plugins = isWorkspaceTrusted() ? await discoverPlugins(process.cwd()) : [];
@@ -334,7 +343,7 @@ async function runInteractive() {
         process.stderr.write('Project plugins skipped (untrusted workspace).\n');
     }
     const pluginTools = getPluginTools(plugins);
-    const allTools = [...defaultTools, ...extraTools, ...webTools, ...advancedTools, ...visionTools, ...voiceTools, ...browserTools, ...mcpTools, ...pluginTools];
+    const allTools = [...defaultTools, ...extraTools, ...memoryTools, ...webTools, ...advancedTools, ...visionTools, ...voiceTools, ...browserTools, ...pluginTools];
     const instructions = await buildEnhancedInstructions();
     const rl = readline.createInterface({
         input: process.stdin,
@@ -355,6 +364,8 @@ async function runInteractive() {
         apiKey,
         baseUrl,
         provider: active.provider,
+        cloudApiKey: active.cloudApiKey,
+        cloudBaseUrl: active.cloudBaseUrl,
         model: selectedModel,
         instructions,
         tools: allTools,
@@ -378,6 +389,9 @@ async function runInteractive() {
             return answer.trim().toLowerCase() === 'y';
         },
     });
+    if (agent.getSkippedHookCount() > 0) {
+        process.stderr.write(`Project hooks skipped (untrusted workspace): ${agent.getSkippedHookCount()}\n`);
+    }
     let sessionId = generateSessionId();
     agent.on('thinking:start', () => process.stdout.write('\n\x1b[33mThinking...\x1b[0m'));
     agent.on('tool:call', (name, args) => {
@@ -408,11 +422,15 @@ async function runInteractive() {
             console.log(`\x1b[33m\u26A0 Context usage: ${info.percentage}% (${info.tokens}/${info.maxTokens} tokens)\x1b[0m`);
         }
     });
+    // Connect configured MCP servers and register their tools. Warnings only:
+    // a server that will not start must not take the whole run down with it.
+    const mcpHub = await startMcp(agent, (m) => process.stderr.write(`\x1b[33m⚠ ${m}\x1b[0m\n`));
     // Register the account's Scalix Cloud platform tools (one attempt; failure
     // is stated once and the session continues with local tools only).
     const cloudStatus = await agent.refreshCloudTools();
     if (cloudStatus.state === 'unavailable') {
-        console.log(`\x1b[33m☁ Scalix Cloud unavailable — running with local tools only. ${cloudStatus.error ?? ''}\x1b[0m`);
+        const remedy = cloudStatus.remedy ? ` ${cloudStatus.remedy}` : '';
+        console.log(`\x1b[33m☁ Scalix Cloud unavailable — running with local tools only. ${cloudStatus.error ?? ''}${remedy}\x1b[0m`);
     }
     const toolCount = allTools.length + cloudStatus.toolCount;
     const modelDisplay = selectedModel.map(shortModel).join(' | ');
@@ -439,6 +457,7 @@ async function runInteractive() {
         console.log('Goodbye!');
         rl.close();
         await closeBrowser().catch(() => { });
+        await mcpHub.close().catch(() => { }); // stdio servers are our children
         process.exit(0);
     }
     process.on('SIGINT', () => { shutdown().catch(() => process.exit(1)); });
@@ -502,8 +521,16 @@ async function runInteractive() {
                 console.log(`\nInvalid model name: "${name}"\n`);
                 return true;
             }
-            agent.setModel(name);
-            console.log(`\nSwitched to ${shortModel(name)}\n`);
+            const chosen = normalizeModelId(name);
+            agent.setModel(chosen);
+            // Persist like the TUI does — an in-memory-only switch silently
+            // reverted on the next launch. Global config only (no project-override
+            // laundering), chain-preserving (chosen model to the front).
+            loadGlobalConfig().then((cfg) => {
+                cfg.models = [chosen, ...cfg.models.filter((m) => m !== chosen)];
+                return saveConfig(cfg);
+            }).catch(() => { });
+            console.log(`\nSwitched to ${shortModel(chosen)}${process.env[ENV_MODEL] ? '\n(note: SCALIX_MODEL is set and will override this on next launch)' : ''}\n`);
             return true;
         }
         if (cmd === '/compact') {
@@ -596,6 +623,10 @@ async function runInteractive() {
             return true;
         }
         if (cmd === '/hooks') {
+            const skipped = agent.getSkippedHookCount();
+            if (skipped > 0) {
+                console.log(`\n${skipped} project hook(s) skipped — untrusted workspace.`);
+            }
             console.log('\n' + hooksSummary(agent.getHooks()) + '\n');
             return true;
         }