scalix 1.5.1 → 1.6.0

package/dist/headless.js

@@ -1,15 +1,16 @@
 import readline from 'node:readline';
 import fs from 'node:fs/promises';
 import { execSync } from 'node:child_process';
-import { createAgent } from './agent.js';
+import { createAgent, REPORTED_ERROR } 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';
@@ -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) {
@@ -214,6 +214,12 @@ 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();
@@ -235,7 +241,9 @@ async function runSinglePrompt(prompt, output, format, outputSchemaPath, beforeE
         fullResponse = await agent.send(prompt);
     }
     catch (err) {
-        console.error(`Error: ${err.message}`);
+        // The agent's 'error' event already printed this — don't print twice.
+        if (!err?.[REPORTED_ERROR])
+            console.error(`Error: ${err.message}`);
         if (beforeExit)
             await beforeExit();
         process.exit(1);
@@ -271,6 +279,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);
@@ -329,7 +338,6 @@ async function runInteractive() {
     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()) : [];
@@ -337,7 +345,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,
@@ -353,7 +361,11 @@ async function runInteractive() {
             return Promise.resolve('/exit');
         return new Promise((resolve) => rl.question(question, resolve));
     }
-    const customCmds = await loadCustomCommands(process.cwd());
+    // Command templates can carry !`cmd` inline-bash — trust-gate like plugins.
+    const customCmds = isWorkspaceTrusted() ? await loadCustomCommands(process.cwd()) : [];
+    if (!isWorkspaceTrusted()) {
+        process.stderr.write('Project custom commands skipped (untrusted workspace).\n');
+    }
     const agent = createAgent({
         apiKey,
         baseUrl,
@@ -383,6 +395,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) => {
@@ -413,6 +428,9 @@ 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();
@@ -445,6 +463,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)); });
@@ -610,6 +629,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;
         }
@@ -626,7 +649,18 @@ async function runInteractive() {
             const cheapModel = pickCheapestModel(agent.getModels());
             console.log(`\nDelegating to sub-agent (${shortModel(cheapModel)})...`);
             try {
-                const result = await spawnSubAgent({ apiKey: apiKey, baseUrl, models: agent.getModels() }, prompt, { model: cheapModel, tools: 'read-only', maxSteps: 10 });
+                const result = await spawnSubAgent({
+                    apiKey: apiKey,
+                    baseUrl,
+                    // Inherit the parent's provider + cloud credentials so a BYOK
+                    // session delegates through the same endpoint dialect it runs on;
+                    // without `provider` the sub-agent defaults to the Scalix client
+                    // and 404s on every request against a third-party base URL.
+                    provider: active.provider,
+                    cloudApiKey: active.cloudApiKey,
+                    cloudBaseUrl: active.cloudBaseUrl,
+                    models: agent.getModels(),
+                }, prompt, { model: cheapModel, tools: 'read-only', maxSteps: 10 });
                 console.log(`\n${result.response}\n`);
                 console.log(`\x1b[36mSub-agent: ${result.steps} steps, ~${result.tokenEstimate} tokens\x1b[0m\n`);
             }