vigthoria-cli 1.9.5 → 1.9.8

package/dist/utils/api.js

@@ -100,6 +100,38 @@ function sanitizeUserFacingErrorText(input) {
     const withoutTags = raw.replace(/<[^>]+>/g, ' ');
     return withoutTags.replace(/\s+/g, ' ').trim();
 }
+const TRUSTED_TOKEN_HOST_PATTERN = /(^|\.)vigthoria\.io$/i;
+function isLoopbackHost(hostname) {
+    const host = String(hostname || '').toLowerCase();
+    return host === 'localhost' || host === '127.0.0.1';
+}
+function isTrustedTokenDestination(rawUrl) {
+    try {
+        const parsed = new URL(rawUrl);
+        const host = parsed.hostname.toLowerCase();
+        return TRUSTED_TOKEN_HOST_PATTERN.test(host) || isLoopbackHost(host);
+    }
+    catch {
+        return false;
+    }
+}
+function resolveAxiosRequestUrl(req) {
+    const direct = String(req?.url || '').trim();
+    const base = String(req?.baseURL || '').trim();
+    if (!direct && !base)
+        return '';
+    if (/^https?:\/\//i.test(direct))
+        return direct;
+    if (base) {
+        try {
+            return new URL(direct || '', base).toString();
+        }
+        catch {
+            return base;
+        }
+    }
+    return direct;
+}
 function isServerRuntime() {
     if (process.env.VIGTHORIA_ALLOW_LOCAL_SERVICES === '1') {
         return true;
@@ -146,9 +178,12 @@ function propagateError(err) {
     };
 }
 const DEFAULT_V3_AGENT_TIMEOUT_MS = (() => {
-    const rawValue = process.env.VIGTHORIA_AGENT_TIMEOUT_MS || process.env.V3_AGENT_TIMEOUT_MS || '1200000';
+    const rawValue = process.env.VIGTHORIA_AGENT_TIMEOUT_MS || process.env.V3_AGENT_TIMEOUT_MS;
+    if (!rawValue) {
+        return 0;
+    }
     const parsed = Number.parseInt(rawValue, 10);
-    return Number.isFinite(parsed) && parsed > 0 ? parsed : 1200000;
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
 })();
 const DEFAULT_V3_AGENT_IDLE_TIMEOUT_MS = (() => {
     const rawValue = process.env.VIGTHORIA_AGENT_IDLE_TIMEOUT_MS || process.env.V3_AGENT_IDLE_TIMEOUT_MS || '90000';
@@ -156,9 +191,12 @@ const DEFAULT_V3_AGENT_IDLE_TIMEOUT_MS = (() => {
     return Number.isFinite(parsed) && parsed > 0 ? parsed : 90000;
 })();
 const DEFAULT_OPERATOR_TIMEOUT_MS = (() => {
-    const rawValue = process.env.VIGTHORIA_OPERATOR_TIMEOUT_MS || process.env.OPERATOR_TIMEOUT_MS || '300000';
+    const rawValue = process.env.VIGTHORIA_OPERATOR_TIMEOUT_MS || process.env.OPERATOR_TIMEOUT_MS;
+    if (!rawValue) {
+        return 0;
+    }
     const parsed = Number.parseInt(rawValue, 10);
-    return Number.isFinite(parsed) && parsed > 0 ? parsed : 300000;
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : 0;
 })();
 class APIClient {
     client;
@@ -212,24 +250,27 @@ class APIClient {
         }) : null;
         // Add auth interceptor
         this.client.interceptors.request.use((req) => {
-            const token = this.config.get('authToken');
-            if (token) {
+            const token = this.getAccessToken();
+            const destination = resolveAxiosRequestUrl(req);
+            if (token && isTrustedTokenDestination(destination)) {
                 req.headers.Authorization = `Bearer ${token}`;
                 req.headers.Cookie = `vigthoria-auth-token=${token}`;
             }
             return req;
         });
         this.modelRouterClient.interceptors.request.use((req) => {
-            const token = this.config.get('authToken');
-            if (token) {
+            const token = this.getAccessToken();
+            const destination = resolveAxiosRequestUrl(req);
+            if (token && isTrustedTokenDestination(destination)) {
                 req.headers.Authorization = `Bearer ${token}`;
                 req.headers.Cookie = `vigthoria-auth-token=${token}`;
             }
             return req;
         });
         this.selfHostedModelRouterClient?.interceptors.request.use((req) => {
-            const token = this.config.get('authToken');
-            if (token) {
+            const token = this.getAccessToken();
+            const destination = resolveAxiosRequestUrl(req);
+            if (token && isTrustedTokenDestination(destination)) {
                 req.headers.Authorization = `Bearer ${token}`;
             }
             return req;
@@ -430,18 +471,22 @@ class APIClient {
         if (!token) {
             return { valid: false, error: 'No auth token configured. Run: vigthoria login' };
         }
-        // Probe both endpoints in parallel.  If EITHER succeeds the token is
-        // valid.  Only if both return 401/403 is the token truly invalid.
-        // If both are unreachable assume the token is fine (offline scenario).
+        const explicitEnvToken = Boolean(process.env.VIGTHORIA_TOKEN || process.env.VIGTHORIA_AUTH_TOKEN);
+        const headers = {
+            Authorization: `Bearer ${token}`,
+            Cookie: `vigthoria-auth-token=${token}`,
+        };
+        const canonicalBaseUrl = String(this.config.get('apiUrl') || 'https://coder.vigthoria.io').replace(/\/$/, '');
+        // Probe protected canonical endpoints in parallel so stale local endpoint overrides
+        // cannot mask an invalid gateway token during preflight.
         const results = await Promise.allSettled([
-            this.modelRouterClient.get('/v1/models', { timeout: 5000 }),
-            this.client.get('/api/user/profile', { timeout: 5000 }),
+            axios_1.default.get(`${canonicalBaseUrl}/api/user/profile`, { timeout: 5000, headers, httpsAgent: this._httpsAgent ?? undefined }),
+            axios_1.default.get(`${canonicalBaseUrl}/api/user/subscription`, { timeout: 5000, headers, httpsAgent: this._httpsAgent ?? undefined }),
         ]);
         for (const r of results) {
             if (r.status === 'fulfilled')
                 return { valid: true };
         }
-        // Both failed — check why
         for (const r of results) {
             if (r.status === 'rejected') {
                 const err = r.reason;
@@ -453,7 +498,10 @@ class APIClient {
                 }
             }
         }
-        // Both unreachable — don't assume token is bad
+        if (explicitEnvToken) {
+            return { valid: false, error: 'Auth token expired or invalid. Run: vigthoria login' };
+        }
+        // Both unreachable — don't assume the stored token is bad when running offline.
         return { valid: true };
     }
     getV3AgentBaseUrls(preferLocal = false) {
@@ -464,6 +512,7 @@ class APIClient {
             process.env.V3_AGENT_URL,
             ...(allowLocalV3Agent ? ['http://127.0.0.1:8030'] : []),
             configuredApiUrl,
+            'https://coder.vigthoria.io',
         ].filter(Boolean).map((url) => String(url).replace(/\/$/, ''));
         return [...new Set(urls)];
     }
@@ -486,6 +535,7 @@ class APIClient {
             process.env.OPERATOR_URL,
             'http://127.0.0.1:4009',
             configuredModelsApiUrl,
+            'https://api.vigthoria.io',
         ].filter(Boolean).map((url) => String(url).replace(/\/$/, ''));
         return [...new Set(urls)];
     }
@@ -2769,7 +2819,8 @@ document.addEventListener('DOMContentLoaded', () => {
     }
     async runV3AgentWorkflow(message, context = {}) {
         const executionContext = await this.bindExecutionContext(context);
-        const baseTimeoutMs = executionContext.agentTimeoutMs || DEFAULT_V3_AGENT_TIMEOUT_MS;
+        const requestedTimeoutMs = Number(executionContext.agentTimeoutMs ?? DEFAULT_V3_AGENT_TIMEOUT_MS);
+        const baseTimeoutMs = Number.isFinite(requestedTimeoutMs) && requestedTimeoutMs > 0 ? requestedTimeoutMs : 0;
         const expectedFiles = this.extractExpectedWorkspaceFiles(message, executionContext);
         const requestedModel = String(executionContext.model || executionContext.requestedModel || 'agent');
         const resolvedModel = this.resolvePermittedModelId(requestedModel);
@@ -2777,7 +2828,7 @@ document.addEventListener('DOMContentLoaded', () => {
             && context.localMachineCapable !== false;
         const rescueEligibleSaaS = preferLocalV3
             && /(saas|dashboard|analytics|billing|team management|activity feed|login screen)/i.test(message);
-        const timeoutMs = rescueEligibleSaaS ? Math.min(baseTimeoutMs, 210000) : baseTimeoutMs;
+        const timeoutMs = baseTimeoutMs > 0 && rescueEligibleSaaS ? Math.min(baseTimeoutMs, 210000) : baseTimeoutMs;
         const maxAttempts = preferLocalV3 ? 2 : 1;
         let lastErrors = [];
         for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
@@ -2811,7 +2862,7 @@ document.addEventListener('DOMContentLoaded', () => {
             };
             for (const baseUrl of this.getV3AgentBaseUrls(preferLocalV3)) {
                 const controller = new AbortController();
-                const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+                const timeoutId = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
                 try {
                     const response = await this.executeV3AgentRunRequest(baseUrl, requestBody, requestExecutionContext, controller.signal);
                     if (!response.ok) {
@@ -2843,7 +2894,7 @@ document.addEventListener('DOMContentLoaded', () => {
                                 stream: true,
                             };
                             const continueController = new AbortController();
-                            const continueTimeoutId = setTimeout(() => continueController.abort(), timeoutMs);
+                            const continueTimeoutId = timeoutMs > 0 ? setTimeout(() => continueController.abort(), timeoutMs) : null;
                             try {
                                 const continueHeaders = await this.getV3AgentHeaders();
                                 const continueResponse = await fetch(this.getV3AgentContinueUrl(baseUrl), {
@@ -2861,7 +2912,8 @@ document.addEventListener('DOMContentLoaded', () => {
                                 break; // Fall through to normal completion with partial data
                             }
                             finally {
-                                clearTimeout(continueTimeoutId);
+                                if (continueTimeoutId)
+                                    clearTimeout(continueTimeoutId);
                             }
                         }
                         // Use the final continuation data for workspace recovery
@@ -2915,7 +2967,8 @@ document.addEventListener('DOMContentLoaded', () => {
                     errors.push(`${baseUrl}: ${error?.message || String(error)}`);
                 }
                 finally {
-                    clearTimeout(timeoutId);
+                    if (timeoutId)
+                        clearTimeout(timeoutId);
                 }
             }
             lastErrors = errors;
@@ -2982,7 +3035,10 @@ document.addEventListener('DOMContentLoaded', () => {
     }
     async runOperatorWorkflow(message, context = {}) {
         const executionContext = await this.bindExecutionContext(context);
-        const timeoutMs = context.operatorTimeoutMs || DEFAULT_OPERATOR_TIMEOUT_MS;
+        const requestedOperatorTimeoutMs = Number(context.operatorTimeoutMs ?? DEFAULT_OPERATOR_TIMEOUT_MS);
+        const timeoutMs = Number.isFinite(requestedOperatorTimeoutMs) && requestedOperatorTimeoutMs > 0
+            ? requestedOperatorTimeoutMs
+            : 0;
         const errors = [];
         const authToken = this.config.get('authToken');
         // Collect a lightweight workspace file listing so the operator can
@@ -2991,7 +3047,7 @@ document.addEventListener('DOMContentLoaded', () => {
         const workspaceSummary = this.buildLocalWorkspaceSummary(workspacePath);
         for (const baseUrl of this.getOperatorBaseUrls()) {
             const controller = new AbortController();
-            const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
+            const timeoutId = timeoutMs > 0 ? setTimeout(() => controller.abort(), timeoutMs) : null;
             try {
                 const response = await fetch(this.getOperatorStreamUrl(baseUrl), {
                     method: 'POST',
@@ -3138,7 +3194,8 @@ document.addEventListener('DOMContentLoaded', () => {
                 errors.push(`${baseUrl}: ${error?.message || String(error)}`);
             }
             finally {
-                clearTimeout(timeoutId);
+                if (timeoutId)
+                    clearTimeout(timeoutId);
             }
         }
         throw new CLIError(`Operator workflow failed on all endpoints: ${errors.join(' | ')}`, 'model_backend');
@@ -3190,7 +3247,7 @@ document.addEventListener('DOMContentLoaded', () => {
         if (!this.shouldSkipCloudRoutes(resolvedModel)) {
             try {
                 this.logger.debug(`Direct Vigthoria Models API: ${resolvedModel}`);
-                const token = this.config.get('authToken');
+                const token = this.getAccessToken();
                 const response = await this.modelRouterClient.post('/v1/chat/completions', {
                     model: resolvedModel,
                     messages,
@@ -3254,6 +3311,35 @@ document.addEventListener('DOMContentLoaded', () => {
                 const errMsg = error.response?.data?.error || error.message || 'Unknown error';
                 this.logger.debug(`Vigthoria Cloud API failed for ${resolvedModel}: ${errMsg}`);
             }
+            try {
+                this.logger.debug(`Canonical Vigthoria Cloud fallback: ${resolvedModel}`);
+                const token = this.getAccessToken();
+                const response = await axios_1.default.post('https://coder.vigthoria.io/api/ai/chat', {
+                    messages,
+                    model: resolvedModel,
+                    maxTokens: this.config.get('preferences').maxTokens,
+                    temperature: 0.7,
+                }, {
+                    timeout: 180000,
+                    httpsAgent: this._httpsAgent ?? undefined,
+                    headers: token ? { Authorization: `Bearer ${token}`, Cookie: `vigthoria-auth-token=${token}` } : {},
+                });
+                if (response.data?.success !== false) {
+                    const content = response.data.response || response.data.message || response.data.content;
+                    if (typeof content === 'string' && content.trim()) {
+                        return {
+                            id: response.data.id || `vigthoria-coder-canonical-${Date.now()}`,
+                            message: content,
+                            model: response.data.model || resolvedModel || requestedModel,
+                            usage: response.data.usage,
+                        };
+                    }
+                }
+            }
+            catch (error) {
+                const errMsg = error.response?.data?.error || error.message || 'Unknown error';
+                this.logger.debug(`Canonical Vigthoria Cloud fallback failed for ${resolvedModel}: ${errMsg}`);
+            }
         }
         if (!preferSelfHostedFirst) {
             const selfHostedResponse = await this.trySelfHostedChatWithModel(messages, resolvedModel, requestedModel);
@@ -3311,7 +3397,7 @@ document.addEventListener('DOMContentLoaded', () => {
             'vigthoria-cloud-ultra',
         ]);
         if (cloudModels.has(resolvedModel)) {
-            return 'vigthoria-v3-code-30b';
+            return 'vigthoria-v3-code-35b';
         }
         return null;
     }
@@ -3326,6 +3412,12 @@ document.addEventListener('DOMContentLoaded', () => {
         return this.config.hasCloudAccess();
     }
     resolvePermittedModelId(shortName) {
+        const normalizedRequested = String(shortName || '').trim().toLowerCase();
+        const blockedModels = new Set(['fast', 'mini', 'creative', 'creative-v3', 'creative-v4']);
+        if (blockedModels.has(normalizedRequested)) {
+            this.logger.debug(`Blocked governed model ${shortName}; using fallback vigthoria-v3-code-35b`);
+            return 'vigthoria-v3-code-35b';
+        }
         const resolvedModel = this.resolveModelId(shortName);
         if (this.isCloudModelId(resolvedModel) && !this.canUseCloudModel()) {
             const fallbackModel = this.getSelfHostedFallbackModelId(resolvedModel, shortName);
@@ -3350,8 +3442,8 @@ document.addEventListener('DOMContentLoaded', () => {
     isSelfHostedPreferredModel(resolvedModel, requestedModel) {
         const normalizedRequested = String(requestedModel || '').toLowerCase();
         const selfHostedModels = new Set([
-            'vigthoria-v3-code-30b',
-            'vigthoria-v3-code-30b:latest',
+            'vigthoria-v3-code-35b',
+            'vigthoria-v3-code-35b:latest',
             'qwen3-coder:latest',
             'vigthoria-v2-code-8b',
         ]);
@@ -3363,9 +3455,9 @@ document.addEventListener('DOMContentLoaded', () => {
     }
     getSelfHostedFallbackModelId(resolvedModel, requestedModel) {
         if (this.isSelfHostedPreferredModel(resolvedModel, requestedModel)) {
-            return resolvedModel === 'qwen3-coder:latest' ? 'vigthoria-v3-code-30b' : resolvedModel;
+            return resolvedModel === 'qwen3-coder:latest' ? 'vigthoria-v3-code-35b' : resolvedModel;
         }
-        return 'vigthoria-v3-code-30b';
+        return 'vigthoria-v3-code-35b';
     }
     // Streaming chat
     async *chatStream(messages, model) {
@@ -3448,7 +3540,7 @@ document.addEventListener('DOMContentLoaded', () => {
     // (/v1/chat/completions on api.vigthoria.io) which is the only
     // backend that reliably accepts our auth token.
     async chatComplete(systemPrompt, userPrompt, model, maxTokens) {
-        const resolvedModel = model ? this.resolvePermittedModelId(model) : 'vigthoria-v3-code-30b';
+        const resolvedModel = model ? this.resolvePermittedModelId(model) : 'vigthoria-v3-code-35b';
         const response = await this.modelRouterClient.post('/v1/chat/completions', {
             model: resolvedModel,
             messages: [
@@ -4301,15 +4393,16 @@ document.addEventListener('DOMContentLoaded', () => {
             'fast': 'vigthoria-fast-1.7b',
             'mini': 'vigthoria-mini-0.6b',
             'balanced': 'vigthoria-balanced-4b',
+            'balanced-4b': 'vigthoria-balanced-4b',
             'creative': 'vigthoria-creative-9b-v4',
             // Code Models - 30B is the default powerhouse
-            'code': 'vigthoria-v3-code-30b', // Internal: self-hosted 30B on Blackwell
-            'code-30b': 'vigthoria-v3-code-30b',
+            'code': 'vigthoria-v3-code-35b', // Internal: self-hosted 35B on Blackwell
+            'code-30b': 'vigthoria-v3-code-35b',
             'code-8b': 'vigthoria-v2-code-8b',
-            'pro': 'vigthoria-v3-code-30b',
-            'agent': 'vigthoria-v3-code-30b',
-            'vigthoria-code': 'vigthoria-v3-code-30b',
-            'vigthoria-agent': 'vigthoria-v3-code-30b',
+            'pro': 'vigthoria-v3-code-35b',
+            'agent': 'vigthoria-v3-code-35b',
+            'vigthoria-code': 'vigthoria-v3-code-35b',
+            'vigthoria-agent': 'vigthoria-v3-code-35b',
             // ═══════════════════════════════════════════════════════════════
             // VIGTHORIA CLOUD - Premium cloud models (internal routing)
             // ═══════════════════════════════════════════════════════════════
@@ -4324,7 +4417,7 @@ document.addEventListener('DOMContentLoaded', () => {
             }
             return shortName;
         }
-        return modelMap[shortName] || 'vigthoria-v3-code-30b';
+        return modelMap[shortName] || 'vigthoria-v3-code-35b';
     }
     async getCoderHealth() {
         try {

package/dist/utils/config.js

@@ -47,7 +47,7 @@ const defaultConfig = {
 };
 class Config {
     store;
-    static OPERATOR_PLANS = new Set(['enterprise', 'admin', 'master_admin']);
+    static OPERATOR_PLANS = new Set(['pro', 'professional', 'ultra', 'enterprise', 'admin', 'master_admin']);
     static CLOUD_PLANS = new Set(['pro', 'professional', 'ultra', 'enterprise', 'master_admin', 'admin']);
     constructor() {
         this.store = new conf_1.default({

package/dist/utils/tools.js

@@ -61,6 +61,17 @@ const chalk_1 = __importDefault(require("chalk"));
 const logger_js_1 = require("./logger.js");
 const api_js_1 = require("./api.js");
 const STREAM_RESPONSE_MAX_YIELD_CHARS = 32 * 1024;
+const POWERSHELL_SAFE_PATH_PATTERN = /^[A-Za-z0-9_:\\/.\-\s]+$/;
+const POWERSHELL_SAFE_INCLUDE_PATTERN = /^[A-Za-z0-9_*?.\-]+$/;
+const SSH_SAFE_HOST_PATTERN = /^[A-Za-z0-9.-]+$/;
+function getSshAllowedHosts() {
+    const configured = String(process.env.VIGTHORIA_SSH_ALLOWED_HOSTS || '')
+        .split(',')
+        .map((v) => v.trim().toLowerCase())
+        .filter(Boolean);
+    const defaults = ['vigthoria-server', 'localhost', '127.0.0.1'];
+    return new Set([...defaults, ...configured]);
+}
 function isNodeError(error) {
     return error instanceof Error && 'code' in error;
 }
@@ -1798,9 +1809,14 @@ class AgenticTools {
     grepWithSelectString(args, searchPath) {
         // Normalize path for PowerShell
         const psPath = searchPath.replace(/\//g, '\\');
-        const includeFilter = args.include
-            ? `-Include "${args.include}"`
-            : `-Include *`;
+        if (!POWERSHELL_SAFE_PATH_PATTERN.test(psPath)) {
+            return this.createErrorResult(ToolErrorType.INVALID_ARGS, 'Unsafe search path for PowerShell backend', 'Use a normal workspace path containing only letters, numbers, separators, dot, dash, and spaces.');
+        }
+        const includeArg = args.include ? String(args.include) : '*';
+        if (!POWERSHELL_SAFE_INCLUDE_PATTERN.test(includeArg)) {
+            return this.createErrorResult(ToolErrorType.INVALID_ARGS, 'Unsafe include filter for PowerShell backend', 'Use simple wildcard filters like *.ts or *.py.');
+        }
+        const includeFilter = `-Include "${includeArg}"`;
         const escapedPattern = args.pattern.replace(/'/g, "''");
         const cmd = `powershell -NoProfile -Command "Get-ChildItem -Path '${psPath}' -Recurse -File ${includeFilter} | Select-String -Pattern '${escapedPattern}' | ForEach-Object { $_.Path + ':' + $_.LineNumber + ':' + $_.Line }"`;
         try {
@@ -2453,6 +2469,14 @@ class AgenticTools {
         const command = args.command;
         const host = args.host || 'vigthoria-server';
         const timeout = args.timeout ? parseInt(args.timeout) * 1000 : 60000;
+        const normalizedHost = String(host).trim().toLowerCase();
+        if (!SSH_SAFE_HOST_PATTERN.test(normalizedHost)) {
+            return this.createErrorResult(ToolErrorType.INVALID_ARGS, 'Invalid SSH host format', 'Host can only include letters, numbers, dots, and dashes.');
+        }
+        const allowedHosts = getSshAllowedHosts();
+        if (!allowedHosts.has(normalizedHost)) {
+            return this.createErrorResult(ToolErrorType.PERMISSION_DENIED, `SSH host is not allowlisted: ${host}`, 'Add the host to VIGTHORIA_SSH_ALLOWED_HOSTS to permit access.');
+        }
         // Security checks for SSH commands
         const blockedPatterns = [
             /\brm\s+-rf?\s+\//i, // Dangerous rm commands
@@ -2478,12 +2502,12 @@ class AgenticTools {
             };
             if (platform === 'win32') {
                 // On Windows, use the ssh command from OpenSSH
-                sshCommand = `ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${host} "${command.replace(/"/g, '\\"')}"`;
+                sshCommand = `ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -o ConnectTimeout=10 ${host} "${command.replace(/"/g, '\\"')}"`;
                 execOptions.shell = true;
             }
             else {
                 // On Unix-like systems
-                sshCommand = `ssh -o BatchMode=yes -o StrictHostKeyChecking=no -o ConnectTimeout=10 ${host} '${command.replace(/'/g, "'\\''")}'`;
+                sshCommand = `ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new -o ConnectTimeout=10 ${host} '${command.replace(/'/g, "'\\''")}'`;
                 execOptions.shell = '/bin/sh';
             }
             const output = (0, child_process_1.execSync)(sshCommand, execOptions);