morpheus-cli 0.6.6 → 0.6.8

package/dist/runtime/tools/morpheus-tools.js

@@ -7,8 +7,58 @@ import { homedir } from "os";
 import Database from "better-sqlite3";
 import { TaskRepository } from "../tasks/repository.js";
 import { TaskRequestContext } from "../tasks/context.js";
+import { isEnvVarSet } from "../../config/precedence.js";
 // ─── Shared ───────────────────────────────────────────────────────────────────
 const shortMemoryDbPath = path.join(homedir(), ".morpheus", "memory", "short-memory.db");
+/**
+ * Map of config paths to their corresponding environment variable names.
+ * Used to check if a config field is being overridden by an env var.
+ */
+const CONFIG_TO_ENV_MAP = {
+    'llm.provider': ['MORPHEUS_LLM_PROVIDER'],
+    'llm.model': ['MORPHEUS_LLM_MODEL'],
+    'llm.temperature': ['MORPHEUS_LLM_TEMPERATURE'],
+    'llm.max_tokens': ['MORPHEUS_LLM_MAX_TOKENS'],
+    'llm.api_key': ['MORPHEUS_LLM_API_KEY', 'OPENAI_API_KEY', 'ANTHROPIC_API_KEY', 'GOOGLE_API_KEY', 'OPENROUTER_API_KEY'],
+    'llm.context_window': ['MORPHEUS_LLM_CONTEXT_WINDOW'],
+    'sati.provider': ['MORPHEUS_SATI_PROVIDER'],
+    'sati.model': ['MORPHEUS_SATI_MODEL'],
+    'sati.temperature': ['MORPHEUS_SATI_TEMPERATURE'],
+    'sati.api_key': ['MORPHEUS_SATI_API_KEY'],
+    'neo.provider': ['MORPHEUS_NEO_PROVIDER'],
+    'neo.model': ['MORPHEUS_NEO_MODEL'],
+    'neo.temperature': ['MORPHEUS_NEO_TEMPERATURE'],
+    'neo.api_key': ['MORPHEUS_NEO_API_KEY'],
+    'apoc.provider': ['MORPHEUS_APOC_PROVIDER'],
+    'apoc.model': ['MORPHEUS_APOC_MODEL'],
+    'apoc.temperature': ['MORPHEUS_APOC_TEMPERATURE'],
+    'apoc.api_key': ['MORPHEUS_APOC_API_KEY'],
+    'apoc.working_dir': ['MORPHEUS_APOC_WORKING_DIR'],
+    'apoc.timeout_ms': ['MORPHEUS_APOC_TIMEOUT_MS'],
+    'trinity.provider': ['MORPHEUS_TRINITY_PROVIDER'],
+    'trinity.model': ['MORPHEUS_TRINITY_MODEL'],
+    'trinity.temperature': ['MORPHEUS_TRINITY_TEMPERATURE'],
+    'trinity.api_key': ['MORPHEUS_TRINITY_API_KEY'],
+    'audio.provider': ['MORPHEUS_AUDIO_PROVIDER'],
+    'audio.model': ['MORPHEUS_AUDIO_MODEL'],
+    'audio.apiKey': ['MORPHEUS_AUDIO_API_KEY'],
+    'audio.maxDurationSeconds': ['MORPHEUS_AUDIO_MAX_DURATION'],
+};
+/**
+ * Checks if a config field is overridden by an environment variable.
+ */
+function isFieldOverriddenByEnv(fieldPath) {
+    const envVars = CONFIG_TO_ENV_MAP[fieldPath];
+    if (!envVars)
+        return false;
+    return envVars.some(envVar => isEnvVarSet(envVar));
+}
+/**
+ * Gets all fields that are overridden by environment variables.
+ */
+function getOverriddenFields() {
+    return Object.keys(CONFIG_TO_ENV_MAP).filter(isFieldOverriddenByEnv);
+}
 // ─── Config ───────────────────────────────────────────────────────────────────
 function setNestedValue(obj, dotPath, value) {
     const keys = dotPath.split(".");
@@ -43,23 +93,37 @@ export const ConfigQueryTool = tool(async ({ key }) => {
     }),
 });
 export const ConfigUpdateTool = tool(async ({ updates }) => {
-    try {
-        const configManager = ConfigManager.getInstance();
-        await configManager.load();
-        const currentConfig = configManager.get();
-        const newConfig = { ...currentConfig };
-        for (const key in updates) {
-            setNestedValue(newConfig, key, updates[key]);
+    const configManager = ConfigManager.getInstance();
+    await configManager.load();
+    // Check if any fields are overridden by environment variables
+    const overriddenFields = [];
+    for (const key in updates) {
+        if (isFieldOverriddenByEnv(key)) {
+            overriddenFields.push(key);
         }
-        await configManager.save(newConfig);
-        return JSON.stringify({ success: true, message: "Configuration updated successfully" });
     }
-    catch (error) {
-        return JSON.stringify({ error: `Failed to update configuration: ${error.message}` });
+    if (overriddenFields.length > 0) {
+        const envVarNames = overriddenFields
+            .flatMap(field => CONFIG_TO_ENV_MAP[field] || [])
+            .filter((v, i, arr) => arr.indexOf(v) === i) // Remove duplicates
+            .join(', ');
+        const errorMsg = `BLOCKED_BY_ENV: Cannot update ${overriddenFields.join(', ')} because these fields are controlled by environment variables (${envVarNames}). To change them, edit your .env file and restart Morpheus.`;
+        throw new Error(errorMsg);
+    }
+    const currentConfig = configManager.get();
+    const newConfig = { ...currentConfig };
+    for (const key in updates) {
+        setNestedValue(newConfig, key, updates[key]);
     }
+    await configManager.save(newConfig);
+    return JSON.stringify({
+        success: true,
+        message: "Configuration updated successfully",
+        updatedFields: Object.keys(updates),
+    });
 }, {
     name: "morpheus_config_update",
-    description: "Updates configuration values with validation. Accepts an 'updates' object containing key-value pairs to update. Supports dot notation for nested fields (e.g. 'llm.model').",
+    description: "Updates configuration values with validation. Accepts an 'updates' object containing key-value pairs to update. Supports dot notation for nested fields (e.g. 'llm.model'). Note: Fields overridden by environment variables cannot be updated.",
     schema: z.object({
         updates: z.object({}).passthrough(),
     }),
@@ -77,30 +141,39 @@ export const DiagnosticTool = tool(async () => {
             const config = configManager.get();
             const requiredFields = ["llm", "logging", "ui"];
             const missingFields = requiredFields.filter((field) => !(field in config));
+            // Check MORPHEUS_SECRET
+            const hasSecret = !!process.env.MORPHEUS_SECRET;
             if (missingFields.length === 0) {
                 const sati = config.sati;
                 const apoc = config.apoc;
+                const details = {
+                    oracleProvider: config.llm?.provider,
+                    oracleModel: config.llm?.model,
+                    satiProvider: sati?.provider ?? `${config.llm?.provider} (inherited)`,
+                    satiModel: sati?.model ?? `${config.llm?.model} (inherited)`,
+                    apocProvider: apoc?.provider ?? `${config.llm?.provider} (inherited)`,
+                    apocModel: apoc?.model ?? `${config.llm?.model} (inherited)`,
+                    apocWorkingDir: apoc?.working_dir ?? "not set",
+                    uiEnabled: config.ui?.enabled,
+                    uiPort: config.ui?.port,
+                    morpheusSecret: hasSecret ? "configured ✓" : "NOT SET ⚠️",
+                };
                 components.config = {
-                    status: "healthy",
-                    message: "Configuration is valid and complete",
-                    details: {
-                        oracleProvider: config.llm?.provider,
-                        oracleModel: config.llm?.model,
-                        satiProvider: sati?.provider ?? `${config.llm?.provider} (inherited)`,
-                        satiModel: sati?.model ?? `${config.llm?.model} (inherited)`,
-                        apocProvider: apoc?.provider ?? `${config.llm?.provider} (inherited)`,
-                        apocModel: apoc?.model ?? `${config.llm?.model} (inherited)`,
-                        apocWorkingDir: apoc?.working_dir ?? "not set",
-                        uiEnabled: config.ui?.enabled,
-                        uiPort: config.ui?.port,
-                    },
+                    status: hasSecret ? "healthy" : "warning",
+                    message: hasSecret
+                        ? "Configuration is valid and complete"
+                        : "Configuration is valid but MORPHEUS_SECRET is not set. API keys and database passwords will be stored in plaintext.",
+                    details,
                 };
             }
             else {
                 components.config = {
                     status: "warning",
                     message: `Missing required configuration fields: ${missingFields.join(", ")}`,
-                    details: { missingFields },
+                    details: {
+                        missingFields,
+                        morpheusSecret: hasSecret ? "configured ✓" : "NOT SET ⚠️",
+                    },
                 };
             }
         }

package/dist/runtime/tools/time-verify-tools.js

@@ -16,6 +16,27 @@ const casualChrono = new chrono.Chrono({
         ...chrono.es.casual.refiners,
     ],
 });
+/**
+ * Formats a Date as ISO string with timezone offset (not UTC).
+ * Example: "2026-02-25T17:25:00-03:00" instead of "2026-02-25T17:25:00.000Z"
+ */
+function formatDateWithTimezone(date, timezone) {
+    // Get the offset for the given timezone
+    const offsetMinutes = -new Date(date.toLocaleString('en-US', { timeZone: timezone, timeZoneName: 'longOffset' })).getTimezoneOffset();
+    // Format date without timezone
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    // Calculate offset string
+    const offsetHours = Math.floor(Math.abs(offsetMinutes) / 60);
+    const offsetMins = Math.abs(offsetMinutes) % 60;
+    const offsetSign = offsetMinutes >= 0 ? '+' : '-';
+    const offsetStr = `${offsetSign}${String(offsetHours).padStart(2, '0')}:${String(offsetMins).padStart(2, '0')}`;
+    return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}${offsetStr}`;
+}
 export const timeVerifierTool = tool(async ({ text, timezone }) => {
     // If a timezone is provided, use it for parsing context. 
     // Otherwise, use the configured system timezone from Chronos.
@@ -36,12 +57,17 @@ export const timeVerifierTool = tool(async ({ text, timezone }) => {
     const parsed = results.map((result) => {
         const startDate = result.start.date();
         const endDate = result.end?.date();
+        // Format the date in the user's timezone for clarity
+        const formatted = startDate.toLocaleString('pt-BR', { timeZone: effectiveTimezone, timeZoneName: 'short' });
+        // Convert to ISO string WITH timezone offset (not UTC)
+        // This ensures Chronos schedules at the correct local time
+        const isoStart = formatDateWithTimezone(startDate, effectiveTimezone);
+        const isoEnd = endDate ? formatDateWithTimezone(endDate, effectiveTimezone) : null;
         return {
             expression: result.text,
-            isoStart: startDate.toISOString(),
-            isoEnd: endDate ? endDate.toISOString() : null,
-            // Format the date in the user's timezone for clarity
-            formatted: startDate.toLocaleString('pt-BR', { timeZone: effectiveTimezone, timeZoneName: 'short' }),
+            isoStart,
+            isoEnd,
+            formatted,
             isRange: !!endDate,
         };
     });