neoagent 1.1.3 → 1.3.0

package/.env.example

@@ -1,9 +1,9 @@
-PORT=3060
+PORT=3333
 NODE_ENV=development
 SESSION_SECRET=change-this-to-a-random-secret-in-production
 
 # Comma-separated list of allowed CORS origins (leave empty to block all cross-origin requests)
-# Example: ALLOWED_ORIGINS=http://localhost:3060,https://yourdomain.com
+# Example: ALLOWED_ORIGINS=http://localhost:3333,https://yourdomain.com
 ALLOWED_ORIGINS=
 
 # xAI API key — used for:

package/docs/configuration.md

@@ -8,7 +8,7 @@ All settings live in `.env` at the project root. Run `neoagent setup` to regener
 
 | Variable | Default | Description |
 |---|---|---|
-| `PORT` | `3060` | HTTP port |
+| `PORT` | `3333` | HTTP port |
 | `SESSION_SECRET` | *(required)* | Random string for session signing — generate with `openssl rand -hex 32` |
 | `NODE_ENV` | `production` | Set to `development` to enable verbose logs |
 | `SECURE_COOKIES` | `false` | Set `true` when behind a TLS-terminating proxy |
@@ -39,7 +39,7 @@ Telegram, Discord, and WhatsApp tokens are stored in the database via the web UI
 ## Minimal `.env` example
 
 ```dotenv
-PORT=3060
+PORT=3333
 SESSION_SECRET=change-me-to-something-random
 ANTHROPIC_API_KEY=sk-ant-...
 ```

package/lib/manager.js

@@ -58,15 +58,67 @@ function loadEnvPort() {
   try {
     const env = fs.readFileSync(ENV_FILE, 'utf8');
     const line = env.split('\n').find((entry) => entry.startsWith('PORT='));
-    if (!line) return 3060;
+    if (!line) return 3333;
     const raw = line.split('=')[1]?.trim();
     const num = Number(raw);
-    return Number.isFinite(num) && num > 0 ? num : 3060;
+    return Number.isFinite(num) && num > 0 ? num : 3333;
   } catch {
-    return 3060;
+    return 3333;
   }
 }
 
+function readEnvFileRaw() {
+  if (!fs.existsSync(ENV_FILE)) return '';
+  return fs.readFileSync(ENV_FILE, 'utf8');
+}
+
+function parseEnv(raw) {
+  const lines = raw.split('\n');
+  const map = new Map();
+  for (const line of lines) {
+    if (!line || line.startsWith('#') || !line.includes('=')) continue;
+    const idx = line.indexOf('=');
+    const key = line.slice(0, idx).trim();
+    const value = line.slice(idx + 1);
+    if (key) map.set(key, value);
+  }
+  return map;
+}
+
+function upsertEnvValue(key, value) {
+  const raw = readEnvFileRaw();
+  const lines = raw ? raw.split('\n') : [];
+  let replaced = false;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (lines[i].startsWith(`${key}=`)) {
+      lines[i] = `${key}=${value}`;
+      replaced = true;
+      break;
+    }
+  }
+
+  if (!replaced) lines.push(`${key}=${value}`);
+  const output = lines.filter((_, idx, arr) => idx !== arr.length - 1 || arr[idx] !== '').join('\n') + '\n';
+  fs.writeFileSync(ENV_FILE, output, { mode: 0o600 });
+}
+
+function removeEnvValue(key) {
+  const raw = readEnvFileRaw();
+  if (!raw) return false;
+  const lines = raw.split('\n').filter((line) => !line.startsWith(`${key}=`));
+  const output = lines.filter((_, idx, arr) => idx !== arr.length - 1 || arr[idx] !== '').join('\n') + '\n';
+  fs.writeFileSync(ENV_FILE, output, { mode: 0o600 });
+  return true;
+}
+
+function maskEnvValue(key, value) {
+  if (!/(KEY|TOKEN|SECRET|PASSWORD)/i.test(key)) return value;
+  const text = String(value || '');
+  if (text.length <= 8) return '********';
+  return `${text.slice(0, 4)}...${text.slice(-4)}`;
+}
+
 function runOrThrow(cmd, args, options = {}) {
   const res = spawnSync(cmd, args, { stdio: 'inherit', cwd: APP_DIR, ...options });
   if (res.status !== 0) {
@@ -159,7 +211,7 @@ async function cmdSetup() {
     }
   }
 
-  const port = await ask('Server port', current.PORT || '3060');
+  const port = await ask('Server port', current.PORT || '3333');
   const sessionSecret = await ask('Session secret', current.SESSION_SECRET || randomSecret());
   const anthropic = await ask('Anthropic API key', current.ANTHROPIC_API_KEY || '');
   const openai = await ask('OpenAI API key', current.OPENAI_API_KEY || '');
@@ -419,10 +471,61 @@ function cmdUpdate() {
   cmdRestart();
 }
 
+async function cmdEnv(args = []) {
+  heading('Environment Variables');
+  let action = args[0];
+
+  if (!action) {
+    const picked = await ask('Action (list/get/set/unset)', 'list');
+    action = (picked || 'list').trim().toLowerCase();
+  }
+
+  if (action === 'list') {
+    const env = parseEnv(readEnvFileRaw());
+    if (env.size === 0) {
+      logWarn(`No .env found at ${ENV_FILE}`);
+      return;
+    }
+    for (const [k, v] of [...env.entries()].sort((a, b) => a[0].localeCompare(b[0]))) {
+      console.log(`${k}=${maskEnvValue(k, v)}`);
+    }
+    return;
+  }
+
+  if (action === 'get') {
+    const key = args[1] || await ask('Key', 'PORT');
+    if (!key) throw new Error('Usage: neoagent env get <KEY>');
+    const env = parseEnv(readEnvFileRaw());
+    if (!env.has(key)) throw new Error(`Key not found: ${key}`);
+    console.log(env.get(key));
+    return;
+  }
+
+  if (action === 'set') {
+    const key = args[1] || await ask('Key', 'PORT');
+    const value = args.slice(2).join(' ') || await ask('Value', key === 'PORT' ? '3333' : '');
+    if (!key || !value) throw new Error('Usage: neoagent env set <KEY> <VALUE>');
+    upsertEnvValue(key, value);
+    logOk(`Set ${key} in ${ENV_FILE}`);
+    return;
+  }
+
+  if (action === 'unset') {
+    const key = args[1] || await ask('Key', 'PORT');
+    if (!key) throw new Error('Usage: neoagent env unset <KEY>');
+    removeEnvValue(key);
+    logOk(`Removed ${key} from ${ENV_FILE}`);
+    return;
+  }
+
+  throw new Error('Usage: neoagent env [list|get|set|unset] ...');
+}
+
 function printHelp() {
   console.log(`${APP_NAME} manager`);
   console.log('Usage: neoagent <command>');
-  console.log('Commands: install | setup | update | restart | start | stop | status | logs | uninstall');
+  console.log('Commands: install | setup | env | update | restart | start | stop | status | logs | uninstall');
+  console.log('Env usage: neoagent env list | neoagent env get PORT | neoagent env set PORT 3333 | neoagent env unset PORT');
 }
 
 async function runCLI(argv) {
@@ -435,6 +538,9 @@ async function runCLI(argv) {
     case 'setup':
       await cmdSetup();
       break;
+    case 'env':
+      await cmdEnv(argv.slice(1));
+      break;
     case 'update':
       cmdUpdate();
       break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "1.1.3",
+  "version": "1.3.0",
   "description": "Proactive personal AI agent with no limits",
   "license": "MIT",
   "main": "server/index.js",

package/server/index.js

@@ -16,6 +16,7 @@ const { sanitizeError } = require('./utils/security');
 const { setupConsoleInterceptor } = require('./utils/logger');
 const { setupTelnyxWebhook } = require('./routes/telnyx');
 const { startServices } = require('./services/manager');
+const packageJson = require('../package.json');
 
 const app = express();
 const httpServer = createServer(app);
@@ -33,7 +34,7 @@ if (!process.env.SESSION_SECRET) {
   console.warn('WARNING: SESSION_SECRET not set — using insecure default. Set it in .env before exposing this server.');
 }
 
-const PORT = process.env.PORT || 3060;
+const PORT = process.env.PORT || 3333;
 const DATA_DIR = path.join(__dirname, '../data');
 if (!fs.existsSync(DATA_DIR)) fs.mkdirSync(DATA_DIR, { recursive: true });
 
@@ -53,7 +54,7 @@ app.use(helmet({
   contentSecurityPolicy: {
     directives: {
       defaultSrc: ["'self'"],
-      scriptSrc: ["'self'", "'unsafe-inline'"],
+      scriptSrc: ["'self'", "'unsafe-inline'", "https://cdn.jsdelivr.net"],
       scriptSrcAttr: ["'unsafe-inline'"],
       styleSrc: ["'self'", "'unsafe-inline'", "https://fonts.googleapis.com"],
       imgSrc: ["'self'", "data:", "blob:", "https://api.qrserver.com"],
@@ -153,6 +154,26 @@ app.get('/api/health', requireAuth, (req, res) => {
   res.json({ status: 'ok', timestamp: new Date().toISOString() });
 });
 
+app.get('/api/version', requireAuth, (req, res) => {
+  let gitSha = null;
+  try {
+    const { execSync } = require('child_process');
+    gitSha = execSync('git rev-parse --short HEAD', {
+      cwd: path.join(__dirname, '..'),
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore']
+    }).trim();
+  } catch {
+    gitSha = process.env.GIT_SHA || null;
+  }
+
+  res.json({
+    name: packageJson.name,
+    version: packageJson.version,
+    gitSha
+  });
+});
+
 // ── Service Initialization ──
 // Handled by services/manager.js
 

package/server/public/js/app.js

@@ -44,9 +44,22 @@ async function api(path, opts = {}) {
     ...opts,
     body: opts.body ? JSON.stringify(opts.body) : undefined,
   });
-  const data = await res.json();
-  if (!res.ok) throw new Error(data.error || "Request failed");
-  return data;
+
+  const contentType = (res.headers.get("content-type") || "").toLowerCase();
+  let data = null;
+  if (contentType.includes("application/json")) {
+    data = await res.json();
+  } else {
+    const text = await res.text();
+    data = { error: text || `Request failed (${res.status})` };
+  }
+
+  if (!res.ok) {
+    const err = new Error(data?.error || `Request failed (${res.status})`);
+    err.status = res.status;
+    throw err;
+  }
+  return data || {};
 }
 
 function escapeHtml(str) {
@@ -1178,6 +1191,7 @@ if (copyLogsBtn) {
 
 let updateStatusPollTimer = null;
 let updateFinishNotifiedAt = null;
+let backendVersionLabel = null;
 
 function clearUpdatePoll() {
   if (updateStatusPollTimer) {
@@ -1217,7 +1231,9 @@ function renderUpdateStatus(status) {
 
   const before = status?.versionBefore || "—";
   const after = status?.versionAfter || "—";
-  $("#updateVersionMeta").textContent = `Version: ${before}${after !== "—" ? ` -> ${after}` : ""}`;
+  const updateVersionLabel = `${before}${after !== "—" ? ` -> ${after}` : ""}`;
+  const backendLabel = backendVersionLabel ? ` | Backend: ${backendVersionLabel}` : "";
+  $("#updateVersionMeta").textContent = `Update Version: ${updateVersionLabel}${backendLabel}`;
 
   const changelog = $("#updateChangelog");
   changelog.innerHTML = "";
@@ -1265,7 +1281,17 @@ async function refreshUpdateStatus() {
       clearUpdatePoll();
     }
   } catch (err) {
-    // During restart window, polling can fail briefly; keep trying.
+    // During restart window this can fail briefly; keep trying.
+    // If endpoint is unavailable (older backend), stop polling to avoid console spam.
+    if (err?.status === 404) {
+      clearUpdatePoll();
+      $("#updatePhaseLabel").textContent = "Update status unavailable on this server version.";
+      $("#updatePercentLabel").textContent = "—";
+      setUpdateBadgeState("idle");
+      const btn = $("#updateAppBtn");
+      if (btn) btn.disabled = false;
+      return;
+    }
     $("#updatePhaseLabel").textContent = "Reconnecting to server…";
     setUpdateBadgeState("running");
   }
@@ -1295,12 +1321,25 @@ function renderTokenUsageSummary(summary) {
 
 $("#settingsBtn").addEventListener("click", async () => {
   try {
-    const [meta, settings, tokenUsage] = await Promise.all([
+    const [meta, settings] = await Promise.all([
       api("/settings/meta/models"),
-      api("/settings"),
-      api("/settings/token-usage/summary")
+      api("/settings")
     ]);
-    renderTokenUsageSummary(tokenUsage);
+
+    try {
+      const backendVersion = await api("/version");
+      backendVersionLabel = `${backendVersion?.version || "unknown"}${backendVersion?.gitSha ? ` (${backendVersion.gitSha})` : ""}`;
+    } catch {
+      backendVersionLabel = "unavailable";
+    }
+
+    try {
+      const tokenUsage = await api("/settings/token-usage/summary");
+      renderTokenUsageSummary(tokenUsage);
+    } catch (err) {
+      const tokenBox = $("#tokenUsageSummary");
+      if (tokenBox) tokenBox.textContent = "Token usage unavailable on this server version.";
+    }
 
     $("#settingHeartbeat").checked =
       settings.heartbeat_enabled === true ||
@@ -1373,6 +1412,7 @@ $("#settingsBtn").addEventListener("click", async () => {
     $("#settingHeadlessBrowser").checked = true; // default headless
     const tokenBox = $("#tokenUsageSummary");
     if (tokenBox) tokenBox.textContent = "Token usage unavailable.";
+    backendVersionLabel = "unavailable";
   }
   await refreshUpdateStatus();
   ensureUpdatePolling(true);