comisai 1.0.5 → 1.0.6

package/node_modules/@comis/agent/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/agent",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "AI agent executor, budget control, and session management for Comis",

package/node_modules/@comis/channels/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/channels",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Chat platform adapters — Discord, Telegram, Slack, WhatsApp, Signal, iMessage, IRC, LINE",

package/node_modules/@comis/cli/dist/client/rpc-client.js

@@ -11,16 +11,48 @@
 import { existsSync, readFileSync } from "node:fs";
 import os from "node:os";
 import WebSocket from "ws";
+import { loadEnvFile } from "@comis/core";
 /** Default connection timeout in milliseconds. */
 const CONNECTION_TIMEOUT_MS = 2000;
 /** Fallback gateway WebSocket URL when no config is found. */
 const FALLBACK_GATEWAY_URL = "ws://localhost:4766/ws";
+/** Whether we have already loaded ~/.comis/.env into process.env. */
+let envFileLoaded = false;
+/**
+ * Ensure ~/.comis/.env is loaded into process.env (once).
+ *
+ * The daemon calls loadEnvFile() at startup, but the CLI does not.
+ * Config values like `${COMIS_GATEWAY_TOKEN}` reference env vars that
+ * live in the .env file, so the CLI must load it too before resolving.
+ */
+function ensureEnvFileLoaded() {
+    if (envFileLoaded)
+        return;
+    envFileLoaded = true;
+    const envPath = os.homedir() + "/.comis/.env";
+    loadEnvFile(envPath);
+}
+/**
+ * Resolve `${VAR}` references in a string using process.env.
+ *
+ * Returns the original string if it contains no references or if the
+ * referenced variable is not set.
+ */
+function resolveEnvRef(value) {
+    const match = value.match(/^\$\{([A-Z_][A-Z0-9_]*)\}$/);
+    if (!match)
+        return value;
+    // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+    const resolved = process.env[match[1]];
+    return resolved ?? value;
+}
 /**
  * Resolve gateway URL, token, and TLS status from config file on disk.
  *
  * Reads ~/.comis/config.yaml (matching daemon defaults) to extract
  * gateway.host, gateway.port, TLS configuration, and the first token secret.
  * Uses a minimal line-based parser to avoid importing the full YAML library.
+ * Resolves `${VAR}` references in token values via ~/.comis/.env.
  */
 function resolveFromConfig() {
     const configPath = os.homedir() + "/.comis/config.yaml";
@@ -86,6 +118,15 @@ function resolveFromConfig() {
                 }
             }
         }
+        // Resolve ${VAR} references in the token (e.g. ${COMIS_GATEWAY_TOKEN})
+        if (token && token.startsWith("${")) {
+            ensureEnvFileLoaded();
+            token = resolveEnvRef(token);
+            // If still unresolved, treat as no token
+            if (token.startsWith("${")) {
+                token = undefined;
+            }
+        }
         const protocol = tls ? "wss" : "ws";
         return { url: `${protocol}://${host}:${port}/ws`, token, tls };
     }
@@ -161,6 +202,7 @@ export async function createRpcClient(url, token) {
         }
         const ws = new WebSocket(url, { headers });
         let nextId = 1;
+        let closed = false;
         const pending = new Map();
         const notificationHandlers = [];
         // Connection timeout
@@ -172,6 +214,9 @@ export async function createRpcClient(url, token) {
             clearTimeout(timeout);
             resolve({
                 call(method, params) {
+                    if (closed) {
+                        return Promise.reject(new Error("Connection closed unexpectedly"));
+                    }
                     const id = nextId++;
                     return new Promise((res, rej) => {
                         pending.set(id, { resolve: res, reject: rej });
@@ -179,6 +224,7 @@ export async function createRpcClient(url, token) {
                     });
                 },
                 close() {
+                    closed = true;
                     // Reject all pending requests
                     for (const [, p] of pending) {
                         p.reject(new Error("Client closed"));
@@ -237,6 +283,7 @@ export async function createRpcClient(url, token) {
         });
         ws.on("close", () => {
             clearTimeout(timeout);
+            closed = true;
             // Reject all pending requests on unexpected close
             for (const [, p] of pending) {
                 p.reject(new Error("Connection closed unexpectedly"));
@@ -255,6 +302,7 @@ export async function createRpcClient(url, token) {
  * @returns The result of fn
  */
 export async function withClient(fn) {
+    ensureEnvFileLoaded();
     const configDefaults = resolveFromConfig();
     // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
     const url = process.env["COMIS_GATEWAY_URL"] ?? configDefaults.url;

package/node_modules/@comis/cli/dist/commands/config.js

@@ -8,14 +8,46 @@
  *
  * @module
  */
+import * as os from "node:os";
 import chalk from "chalk";
-import { loadConfigFile, validateConfig, deepMerge } from "@comis/core";
+import { loadConfigFile, validateConfig, deepMerge, loadEnvFile } from "@comis/core";
 import { withClient } from "../client/rpc-client.js";
 import { success, error, info, warn, json } from "../output/format.js";
 import { withSpinner } from "../output/spinner.js";
 import { renderTable, renderKeyValue } from "../output/table.js";
 /** Default config paths to check (matching daemon defaults). */
-const DEFAULT_CONFIG_PATHS = ["/etc/comis/config.yaml", "/etc/comis/config.local.yaml"];
+const DEFAULT_CONFIG_PATHS = [
+    os.homedir() + "/.comis/config.yaml",
+    os.homedir() + "/.comis/config.local.yaml",
+    "/etc/comis/config.yaml",
+    "/etc/comis/config.local.yaml",
+];
+/** Pattern matching `${VAR_NAME}` env var references. */
+const ENV_REF_RE = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
+/**
+ * Deep-walk an object and resolve `${VAR}` references using process.env.
+ * Mutates in place for efficiency since the input is a transient merge result.
+ */
+function resolveEnvRefs(obj) {
+    for (const [key, value] of Object.entries(obj)) {
+        if (typeof value === "string" && value.includes("${")) {
+            obj[key] = value.replace(ENV_REF_RE, (match, varName) => {
+                // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+                return process.env[varName] ?? match;
+            });
+        }
+        else if (value && typeof value === "object" && !Array.isArray(value)) {
+            resolveEnvRefs(value);
+        }
+        else if (Array.isArray(value)) {
+            for (const item of value) {
+                if (item && typeof item === "object") {
+                    resolveEnvRefs(item);
+                }
+            }
+        }
+    }
+}
 /**
  * Register the `config` subcommand group on the program.
  *
@@ -56,6 +88,9 @@ export function registerConfigCommand(program) {
         if (!anyFound) {
             info("No config files found. Validating with defaults only.");
         }
+        // Load .env so ${VAR} references resolve before validation
+        loadEnvFile(os.homedir() + "/.comis/.env");
+        resolveEnvRefs(merged);
         // Validate merged config
         const validation = validateConfig(merged);
         if (validation.ok) {

package/node_modules/@comis/cli/dist/commands/daemon.js

@@ -181,6 +181,19 @@ async function detectServiceManager() {
 function systemctlArgs(manager, ...rest) {
     return manager === "systemd-user" ? ["--user", ...rest] : rest;
 }
+/**
+ * Execute a systemctl command, auto-escalating to sudo for system-scope
+ * services when running as a non-root user.
+ */
+async function execSystemctl(manager, ...args) {
+    const fullArgs = systemctlArgs(manager, ...args);
+    // System-scope systemd requires root; escalate via sudo if we're not root
+    // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+    if (manager === "systemd" && process.getuid?.() !== 0) {
+        return exec("sudo", ["systemctl", ...fullArgs], { timeout: 15_000 });
+    }
+    return exec("systemctl", fullArgs, { timeout: 15_000 });
+}
 // ---------- Subcommand handlers ----------
 /**
  * Start the daemon in direct mode (no systemd).
@@ -242,7 +255,7 @@ async function handleDaemonStart() {
             case "systemd-user": {
                 const scope = manager === "systemd-user" ? "systemd (user scope)" : "systemd";
                 info(`Starting daemon via ${scope}...`);
-                await exec("systemctl", systemctlArgs(manager, "start", "comis"), { timeout: 10_000 });
+                await execSystemctl(manager, "start", "comis");
                 success("Daemon started");
                 return;
             }
@@ -273,7 +286,7 @@ async function handleDaemonStop() {
             case "systemd-user": {
                 const scope = manager === "systemd-user" ? "systemd (user scope)" : "systemd";
                 info(`Stopping daemon via ${scope}...`);
-                await exec("systemctl", systemctlArgs(manager, "stop", "comis"), { timeout: 15_000 });
+                await execSystemctl(manager, "stop", "comis");
                 success("Daemon stopped");
                 return;
             }
@@ -477,24 +490,44 @@ async function handleDaemonLogs(options) {
     }
 }
 async function streamSystemdLogs(scope, options) {
-    const args = ["--unit=comis", "--no-pager", `-n${options.lines}`];
+    const jArgs = ["--unit=comis", "--no-pager", `-n${options.lines}`];
     if (scope === "systemd-user")
-        args.push("--user");
+        jArgs.push("--user");
+    if (options.follow)
+        jArgs.push("--follow");
     if (options.follow) {
-        args.push("--follow");
-        const child = spawn("journalctl", args, { stdio: "inherit" });
+        const child = spawn("journalctl", jArgs, { stdio: "inherit" });
         child.on("error", (err) => {
             error(`Failed to read logs: ${err.message}`);
             process.exit(1);
         });
         return;
     }
-    const { stdout } = await exec("journalctl", args, { timeout: 10_000 });
-    if (stdout.trim()) {
-        console.log(stdout);
+    // Try journalctl directly first (works when user is in systemd-journal group),
+    // then fall back to sudo for system-scope journals.
+    try {
+        const { stdout } = await exec("journalctl", jArgs, { timeout: 10_000 });
+        if (stdout.trim()) {
+            console.log(stdout);
+        }
+        else {
+            info("No logs found");
+        }
     }
-    else {
-        info("No logs found");
+    catch {
+        // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+        if (scope === "systemd" && process.getuid?.() !== 0) {
+            const { stdout } = await exec("sudo", ["journalctl", ...jArgs], { timeout: 10_000 });
+            if (stdout.trim()) {
+                console.log(stdout);
+            }
+            else {
+                info("No logs found");
+            }
+        }
+        else {
+            throw new Error("Failed to read journal logs");
+        }
     }
 }
 function streamPm2Logs(options) {

package/node_modules/@comis/cli/dist/commands/doctor.js

@@ -9,7 +9,7 @@
  * @module
  */
 import * as os from "node:os";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { loadConfigFile, validateConfig } from "@comis/core";
 import { success, error, info } from "../output/format.js";
 import { withSpinner } from "../output/spinner.js";
@@ -31,6 +31,23 @@ const ALL_CHECKS = [
     channelHealthCheck,
     workspaceHealthCheck,
 ];
+/**
+ * Resolve default config paths from COMIS_CONFIG_PATHS env var or standard locations.
+ */
+function resolveDefaultConfigPaths() {
+    // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+    const envPaths = process.env["COMIS_CONFIG_PATHS"];
+    if (envPaths) {
+        return envPaths.split(":").filter((p) => p.length > 0);
+    }
+    const candidates = [
+        os.homedir() + "/.comis/config.yaml",
+        os.homedir() + "/.comis/config.local.yaml",
+        "/etc/comis/config.yaml",
+        "/etc/comis/config.local.yaml",
+    ];
+    return candidates.filter((p) => existsSync(p));
+}
 /**
  * Build a DoctorContext from CLI options.
  *
@@ -93,7 +110,7 @@ export function registerDoctorCommand(program) {
         .option("-c, --config <paths...>", "Config file paths to check")
         .option("--format <format>", 'Output format: "table" or "json"', "table")
         .action(async (options) => {
-        const configPaths = options.config ?? [];
+        const configPaths = options.config ?? resolveDefaultConfigPaths();
         const context = buildDoctorContext(configPaths);
         const result = await withSpinner("Running diagnostics...", () => runDoctorChecks(ALL_CHECKS, context));
         // Render results

package/node_modules/@comis/cli/dist/commands/health.js

@@ -10,7 +10,7 @@
  * @module
  */
 import * as os from "node:os";
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { loadConfigFile, validateConfig } from "@comis/core";
 import chalk from "chalk";
 import { json } from "../output/format.js";
@@ -29,6 +29,23 @@ const ALL_CHECKS = [
     channelHealthCheck,
     workspaceHealthCheck,
 ];
+/**
+ * Resolve default config paths from COMIS_CONFIG_PATHS env var or standard locations.
+ */
+function resolveDefaultConfigPaths() {
+    // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+    const envPaths = process.env["COMIS_CONFIG_PATHS"];
+    if (envPaths) {
+        return envPaths.split(":").filter((p) => p.length > 0);
+    }
+    const candidates = [
+        os.homedir() + "/.comis/config.yaml",
+        os.homedir() + "/.comis/config.local.yaml",
+        "/etc/comis/config.yaml",
+        "/etc/comis/config.local.yaml",
+    ];
+    return candidates.filter((p) => existsSync(p));
+}
 /**
  * Build a DoctorContext from CLI config paths.
  *
@@ -136,7 +153,7 @@ export function registerHealthCommand(program) {
         .option("--format <format>", 'Output format: "table" or "json"', "table")
         .option("--all", "Show all findings including passing checks", false)
         .action(async (options) => {
-        const configPaths = options.config ?? [];
+        const configPaths = options.config ?? resolveDefaultConfigPaths();
         const context = buildHealthContext(configPaths);
         const result = await withSpinner("Checking health...", () => runDoctorChecks(ALL_CHECKS, context));
         // Filter findings: by default only fail/warn

package/node_modules/@comis/cli/dist/commands/models.js

@@ -9,6 +9,7 @@
  * @module
  */
 import * as fs from "node:fs";
+import * as os from "node:os";
 import chalk from "chalk";
 import { parseDocument } from "yaml";
 import { createModelCatalog } from "@comis/agent";
@@ -16,8 +17,10 @@ import { withClient } from "../client/rpc-client.js";
 import { success, error, info, json } from "../output/format.js";
 import { withSpinner } from "../output/spinner.js";
 import { renderTable } from "../output/table.js";
-/** Default config paths to check (matching daemon defaults). */
+/** Default config paths to check (matching daemon and CLI defaults). */
 const DEFAULT_CONFIG_PATHS = [
+    os.homedir() + "/.comis/config.yaml",
+    os.homedir() + "/.comis/config.local.yaml",
     "/etc/comis/config.yaml",
     "/etc/comis/config.local.yaml",
 ];
@@ -201,11 +204,10 @@ export function registerModelsCommand(program) {
                 process.exit(1);
             }
             // Get old model value for display
-            const oldModel = doc.getIn([...agentsPath, agent, "defaultModel"]);
+            const oldModel = doc.getIn([...agentsPath, agent, "model"]);
             const oldModelStr = typeof oldModel === "string" ? oldModel : "(not set)";
             // Update the model field
-            const fullModelId = `${entry.provider}/${entry.modelId}`;
-            doc.setIn([...agentsPath, agent, "defaultModel"], fullModelId);
+            doc.setIn([...agentsPath, agent, "model"], entry.modelId);
             // Write config back preserving format
             const dir = configPath.substring(0, configPath.lastIndexOf("/"));
             if (dir) {
@@ -213,7 +215,7 @@ export function registerModelsCommand(program) {
             }
             fs.writeFileSync(configPath, doc.toString(), { mode: 0o600 });
             success(`Model updated for agent "${agent}"`);
-            console.log(`  ${chalk.gray(oldModelStr)} ${chalk.white("->")} ${chalk.cyan(fullModelId)}`);
+            console.log(`  ${chalk.gray(oldModelStr)} ${chalk.white("->")} ${chalk.cyan(entry.modelId)}`);
             info("Daemon will restart to apply the change");
         }
         catch (err) {

package/node_modules/@comis/cli/dist/doctor/checks/config-health.js

@@ -9,8 +9,28 @@
  * @module
  */
 import { readFileSync } from "node:fs";
+import os from "node:os";
 import { parse as parseYaml } from "yaml";
-import { AppConfigSchema } from "@comis/core";
+import { AppConfigSchema, loadEnvFile } from "@comis/core";
+const ENV_REF_RE = /\$\{([A-Z_][A-Z0-9_]*)\}/g;
+/** Deep-walk an object and resolve `${VAR}` references using process.env. */
+function resolveEnvRefs(obj) {
+    for (const [key, value] of Object.entries(obj)) {
+        if (typeof value === "string" && value.includes("${")) {
+            // eslint-disable-next-line no-restricted-syntax -- CLI bootstrap before SecretManager
+            obj[key] = value.replace(ENV_REF_RE, (match, varName) => process.env[varName] ?? match);
+        }
+        else if (value && typeof value === "object" && !Array.isArray(value)) {
+            resolveEnvRefs(value);
+        }
+        else if (Array.isArray(value)) {
+            for (const item of value) {
+                if (item && typeof item === "object")
+                    resolveEnvRefs(item);
+            }
+        }
+    }
+}
 const CATEGORY = "config";
 /**
  * Doctor check: config file health.
@@ -89,6 +109,9 @@ export const configHealthCheck = {
             });
             return findings;
         }
+        // Resolve ${VAR} references before validation (mirrors daemon startup)
+        loadEnvFile(os.homedir() + "/.comis/.env");
+        resolveEnvRefs(parsed);
         // Validate against schema
         const result = AppConfigSchema.safeParse(parsed);
         if (!result.success) {

package/node_modules/@comis/cli/dist/doctor/repairs/repair-config.js

@@ -71,6 +71,11 @@ export async function repairConfig(findings, configPaths) {
             }
             else if (finding.message.includes("not found") || finding.message.includes("No config")) {
                 // Config missing -- create directory and write defaults
+                // Guard: never overwrite an existing config file
+                if (existsSync(targetPath)) {
+                    actions.push(`Config already exists at ${targetPath} (skipped overwrite). Use -c ${targetPath} to check it.`);
+                    continue;
+                }
                 const lastSlash = targetPath.lastIndexOf("/");
                 if (lastSlash > 0) {
                     const dir = targetPath.slice(0, lastSlash);

package/node_modules/@comis/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/cli",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Command-line interface for the Comis AI agent platform",

package/node_modules/@comis/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/core",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Core domain types, ports, event bus, security, and config for Comis",

package/node_modules/@comis/daemon/dist/wiring/setup-gateway-rpc.js

@@ -135,6 +135,7 @@ export function registerRpcMethods(deps) {
     registerRpcPassthrough(dynamicRouter, rpcCall, [
         "agents.list", "agents.create", "agents.get", "agents.update",
         "agents.delete", "agents.suspend", "agents.resume",
+        "agent.getOperationModels",
     ], "admin");
     // -------------------------------------------------------------------------
     // Session management admin methods

package/node_modules/@comis/daemon/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/daemon",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Background daemon and orchestrator for the Comis platform",

package/node_modules/@comis/gateway/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/gateway",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "HTTP, JSON-RPC, and WebSocket gateway for Comis",

package/node_modules/@comis/infra/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/infra",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Structured logging infrastructure for Comis",

package/node_modules/@comis/memory/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/memory",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "SQLite memory, embeddings, and RAG storage for Comis agents",

package/node_modules/@comis/scheduler/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/scheduler",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Task scheduling and cron management for Comis",

package/node_modules/@comis/shared/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/shared",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Shared types and utilities for the Comis platform",

package/node_modules/@comis/skills/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@comis/skills",
   "private": true,
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Skill system, MCP integration, and tool sandbox for Comis agents",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "comisai",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "author": "Moshe Anconina",
   "license": "Apache-2.0",
   "description": "Security-first AI agent platform — connects AI agents to Discord, Telegram, Slack, WhatsApp, and more",
@@ -115,17 +115,17 @@
     "@comis/daemon"
   ],
   "dependencies": {
-    "@comis/shared": "1.0.5",
-    "@comis/core": "1.0.5",
-    "@comis/infra": "1.0.5",
-    "@comis/memory": "1.0.5",
-    "@comis/gateway": "1.0.5",
-    "@comis/skills": "1.0.5",
-    "@comis/scheduler": "1.0.5",
-    "@comis/agent": "1.0.5",
-    "@comis/channels": "1.0.5",
-    "@comis/cli": "1.0.5",
-    "@comis/daemon": "1.0.5",
+    "@comis/shared": "1.0.6",
+    "@comis/core": "1.0.6",
+    "@comis/infra": "1.0.6",
+    "@comis/memory": "1.0.6",
+    "@comis/gateway": "1.0.6",
+    "@comis/skills": "1.0.6",
+    "@comis/scheduler": "1.0.6",
+    "@comis/agent": "1.0.6",
+    "@comis/channels": "1.0.6",
+    "@comis/cli": "1.0.6",
+    "@comis/daemon": "1.0.6",
     "@agentclientprotocol/sdk": "^0.15.0",
     "@clack/core": "^1.1.0",
     "@clack/prompts": "^1.1.0",