neoagent 2.1.15 → 2.1.16

package/README.md

@@ -1,24 +1,33 @@
-<div align="center">
+<h1 align="center">NeoAgent</h1>
 
-# NeoAgent
+<p align="center"><strong>Your agent. Your server. Your rules.</strong></p>
 
-**Your agent. Your server. Your rules.**
+<p align="center">
+  <a href="https://nodejs.org"><img src="https://img.shields.io/badge/Node.js-18+-5fa04e?style=flat-square&logo=node.js&logoColor=white" alt="Node.js"></a>
+  <a href="https://sqlite.org"><img src="https://img.shields.io/badge/SQLite-WAL-003b57?style=flat-square&logo=sqlite&logoColor=white" alt="SQLite"></a>
+  <a href="https://flutter.dev"><img src="https://img.shields.io/badge/Flutter-web%20%2B%20android-02569B?style=flat-square&logo=flutter&logoColor=white" alt="Flutter"></a>
+  <a href="LICENSE"><img src="https://img.shields.io/badge/License-MIT-a855f7?style=flat-square" alt="License"></a>
+</p>
 
-[![Node.js](https://img.shields.io/badge/Node.js-18+-5fa04e?style=flat-square&logo=node.js&logoColor=white)](https://nodejs.org)
-[![SQLite](https://img.shields.io/badge/SQLite-WAL-003b57?style=flat-square&logo=sqlite&logoColor=white)](https://sqlite.org)
-[![Flutter](https://img.shields.io/badge/Flutter-web%20%2B%20android-02569B?style=flat-square&logo=flutter&logoColor=white)](https://flutter.dev)
-[![License](https://img.shields.io/badge/License-MIT-a855f7?style=flat-square)](LICENSE)
+<p align="center">
+  A self-hosted, proactive AI agent with a Flutter client for web and Android.<br>
+  Connects to OpenAI, xAI, Google, MiniMax Code, and local Ollama.<br>
+  Runs tasks on a schedule, controls a browser, manages files, and talks to you over Telegram, Discord, or WhatsApp.
+</p>
 
-A self-hosted, proactive AI agent with a Flutter client for web and Android.  
-Connects to OpenAI, xAI, Google, MiniMax Code, and local Ollama.  
-Runs tasks on a schedule, controls a browser, manages files, and talks to you over Telegram, Discord, or WhatsApp.
+| | |
+| --- | --- |
+| <img alt="WebUI" src="https://github.com/user-attachments/assets/3c76d59a-b6e3-4698-929b-9c94741ccf1e" height="420"> | <img alt="Mobile Telegram" src="https://github.com/user-attachments/assets/1fd41a9b-5452-4aa4-9478-888c8ad7363a" height="420"> |
+
+## Install
 
 ```bash
 npm install -g neoagent
 neoagent install
 ```
 
-Manage the service:
+## Manage the Service
+
 ```bash
 neoagent status
 neoagent channel beta
@@ -28,12 +37,13 @@ neoagent logs
 ```
 
 Use `neoagent fix` if a self-edit or broken local install leaves NeoAgent in a bad state. On git installs it backs up runtime data, saves local tracked changes, resets tracked source files, reinstalls dependencies, and restarts the service.
----
+
+## Links
 
 [⚙️ Configuration](docs/configuration.md) · [🧰 Skills](docs/skills.md) · [🐛 Issues](https://github.com/NeoLabs-Systems/NeoAgent/issues)
 
 ---
 
-*Made with ❤️ by [Neo](https://github.com/neooriginal) · [NeoLabs Systems](https://github.com/NeoLabs-Systems)*
-
-</div>
+<p align="center">
+  Made with ❤️ by <a href="https://github.com/neooriginal">Neo</a> · <a href="https://github.com/NeoLabs-Systems">NeoLabs Systems</a>
+</p>

package/lib/manager.js

@@ -25,9 +25,11 @@ const {
   parseReleaseChannel,
   getReleaseChannelBranch,
   getReleaseChannelDistTag,
-  getReleaseChannelLabel,
   readConfiguredReleaseChannel,
   writeReleaseChannelToEnvFile,
+  describeReleaseChannelPolicy,
+  choosePreferredBranchForChannel,
+  choosePreferredNpmTagForChannel,
 } = require('../runtime/release_channel');
 
 const APP_NAME = 'NeoAgent';
@@ -197,8 +199,7 @@ function currentReleaseChannel() {
 }
 
 function releaseChannelSummary(channel) {
-  const normalized = parseReleaseChannel(channel) || currentReleaseChannel();
-  return `${getReleaseChannelLabel(normalized)} (branch ${getReleaseChannelBranch(normalized)}, npm ${getReleaseChannelDistTag(normalized)})`;
+  return describeReleaseChannelPolicy(parseReleaseChannel(channel) || currentReleaseChannel());
 }
 
 function gitWorkingTreeDirty() {
@@ -214,6 +215,62 @@ function gitRemoteBranchExists(branch) {
   return runQuiet('git', ['ls-remote', '--exit-code', '--heads', 'origin', branch]).status === 0;
 }
 
+function latestGitTagVersion(pattern) {
+  const res = runQuiet('git', ['tag', '--list', pattern, '--sort=-v:refname']);
+  if (res.status !== 0) return null;
+  const tag = res.stdout
+    .split('\n')
+    .map((value) => value.trim())
+    .find(Boolean);
+  return tag ? tag.replace(/^v/, '') : null;
+}
+
+function resolvePreferredGitBranch(channel) {
+  const normalized = parseReleaseChannel(channel) || currentReleaseChannel();
+  if (normalized === 'stable') {
+    return getReleaseChannelBranch(normalized);
+  }
+
+  const stableVersion = latestGitTagVersion('v[0-9]*.[0-9]*.[0-9]*');
+  const betaVersion = latestGitTagVersion('v[0-9]*.[0-9]*.[0-9]*-beta.*');
+  const preferred = choosePreferredBranchForChannel(normalized, {
+    stable: stableVersion,
+    beta: betaVersion,
+  });
+
+  if (preferred === 'beta' && !gitRemoteBranchExists('beta')) {
+    return 'main';
+  }
+  return preferred;
+}
+
+function resolvePreferredNpmTag(channel) {
+  const normalized = parseReleaseChannel(channel) || currentReleaseChannel();
+  if (normalized === 'stable') {
+    return getReleaseChannelDistTag(normalized);
+  }
+
+  const distTags = {};
+  const tagsRes = runQuiet('npm', ['view', 'neoagent', 'dist-tags', '--json'], {
+    env: withInstallEnv(),
+  });
+  if (tagsRes.status === 0) {
+    try {
+      const parsed = JSON.parse(tagsRes.stdout || '{}');
+      if (parsed && typeof parsed === 'object') {
+        Object.assign(distTags, parsed);
+      }
+    } catch {
+      // Ignore parse failures and fall back to the beta tag.
+    }
+  }
+
+  return choosePreferredNpmTagForChannel(normalized, {
+    latest: distTags.latest,
+    beta: distTags.beta,
+  });
+}
+
 function ensureGitBranchForReleaseChannel(targetBranch) {
   const branchRes = runQuiet('git', ['rev-parse', '--abbrev-ref', 'HEAD']);
   const currentBranch = branchRes.status === 0 ? branchRes.stdout.trim() : '';
@@ -692,15 +749,15 @@ function cmdUpdate(args = []) {
     process.env.NEOAGENT_RELEASE_CHANNEL = releaseChannel;
     logOk(`Release channel set to ${releaseChannelSummary(releaseChannel)}`);
   }
-  const targetBranch = getReleaseChannelBranch(releaseChannel);
-  const npmTag = getReleaseChannelDistTag(releaseChannel);
   const versionBefore = currentInstalledVersionLabel();
   let versionAfter = versionBefore;
 
   if (fs.existsSync(path.join(APP_DIR, '.git')) && commandExists('git')) {
     const current = runQuiet('git', ['rev-parse', '--short', 'HEAD']);
 
-    runOrThrow('git', ['fetch', 'origin', targetBranch]);
+    runOrThrow('git', ['fetch', 'origin', '--tags']);
+    const targetBranch = resolvePreferredGitBranch(releaseChannel);
+    logInfo(`Using git branch ${targetBranch} for the ${releaseChannel} channel.`);
     ensureGitBranchForReleaseChannel(targetBranch);
     runOrThrow('git', ['pull', '--rebase', '--autostash', 'origin', targetBranch]);
 
@@ -714,6 +771,7 @@ function cmdUpdate(args = []) {
       buildBundledWebClientIfPossible();
     }
   } else {
+    const npmTag = resolvePreferredNpmTag(releaseChannel);
     logWarn(`No git repo detected; attempting npm global update from ${npmTag}.`);
     if (commandExists('npm')) {
       try {

package/package.json

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

package/runtime/release_channel.js

@@ -14,6 +14,14 @@ const RELEASE_CHANNEL_DIST_TAGS = Object.freeze({
   stable: 'latest',
   beta: 'beta',
 });
+const RELEASE_CHANNEL_BRANCH_POLICIES = Object.freeze({
+  stable: 'main only',
+  beta: 'newest of beta or main',
+});
+const RELEASE_CHANNEL_NPM_POLICIES = Object.freeze({
+  stable: 'latest only',
+  beta: 'newest of beta or latest',
+});
 
 function parseEnv(raw) {
   const map = new Map();
@@ -62,6 +70,116 @@ function getReleaseChannelLabel(channel) {
   return normalizeReleaseChannel(channel) === 'beta' ? 'Beta' : 'Stable';
 }
 
+function parseSemver(version) {
+  const match = String(version || '')
+    .trim()
+    .replace(/^v/, '')
+    .match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/);
+  if (!match) {
+    return null;
+  }
+
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    prerelease: match[4] ? match[4].split('.') : [],
+    raw: match[0],
+  };
+}
+
+function comparePrereleasePart(left, right) {
+  const leftNumeric = /^\d+$/.test(left);
+  const rightNumeric = /^\d+$/.test(right);
+
+  if (leftNumeric && rightNumeric) {
+    return Number(left) - Number(right);
+  }
+  if (leftNumeric) return -1;
+  if (rightNumeric) return 1;
+  return left.localeCompare(right);
+}
+
+function compareVersions(leftVersion, rightVersion) {
+  const left = parseSemver(leftVersion);
+  const right = parseSemver(rightVersion);
+
+  if (!left && !right) return 0;
+  if (!left) return -1;
+  if (!right) return 1;
+
+  for (const key of ['major', 'minor', 'patch']) {
+    if (left[key] !== right[key]) {
+      return left[key] - right[key];
+    }
+  }
+
+  const leftPre = left.prerelease;
+  const rightPre = right.prerelease;
+  if (leftPre.length === 0 && rightPre.length === 0) return 0;
+  if (leftPre.length === 0) return 1;
+  if (rightPre.length === 0) return -1;
+
+  const length = Math.max(leftPre.length, rightPre.length);
+  for (let i = 0; i < length; i++) {
+    const leftPart = leftPre[i];
+    const rightPart = rightPre[i];
+    if (leftPart == null) return -1;
+    if (rightPart == null) return 1;
+    const diff = comparePrereleasePart(leftPart, rightPart);
+    if (diff !== 0) {
+      return diff;
+    }
+  }
+
+  return 0;
+}
+
+function maxVersion(leftVersion, rightVersion) {
+  return compareVersions(leftVersion, rightVersion) >= 0 ? leftVersion : rightVersion;
+}
+
+function describeReleaseChannelPolicy(channel) {
+  const normalized = normalizeReleaseChannel(channel);
+  return `${getReleaseChannelLabel(normalized)} (git ${RELEASE_CHANNEL_BRANCH_POLICIES[normalized]}, npm ${RELEASE_CHANNEL_NPM_POLICIES[normalized]})`;
+}
+
+function getReleaseChannelBranchPolicy(channel) {
+  return RELEASE_CHANNEL_BRANCH_POLICIES[normalizeReleaseChannel(channel)];
+}
+
+function getReleaseChannelNpmPolicy(channel) {
+  return RELEASE_CHANNEL_NPM_POLICIES[normalizeReleaseChannel(channel)];
+}
+
+function choosePreferredBranchForChannel(channel, versions = {}) {
+  const normalized = normalizeReleaseChannel(channel);
+  if (normalized === 'stable') {
+    return 'main';
+  }
+
+  const stableVersion = versions.stable;
+  const betaVersion = versions.beta;
+  if (compareVersions(betaVersion, stableVersion) > 0) {
+    return 'beta';
+  }
+  return 'main';
+}
+
+function choosePreferredNpmTagForChannel(channel, versions = {}) {
+  const normalized = normalizeReleaseChannel(channel);
+  if (normalized === 'stable') {
+    return 'latest';
+  }
+
+  const stableVersion = versions.latest;
+  const betaVersion = versions.beta;
+  if (compareVersions(betaVersion, stableVersion) > 0) {
+    return 'beta';
+  }
+  return 'latest';
+}
+
 function readReleaseChannelFromRaw(raw) {
   const env = parseEnv(raw);
   return normalizeReleaseChannel(env.get(RELEASE_CHANNEL_ENV_KEY));
@@ -116,6 +234,14 @@ module.exports = {
   getReleaseChannelBranch,
   getReleaseChannelDistTag,
   getReleaseChannelLabel,
+  parseSemver,
+  compareVersions,
+  maxVersion,
+  describeReleaseChannelPolicy,
+  getReleaseChannelBranchPolicy,
+  getReleaseChannelNpmPolicy,
+  choosePreferredBranchForChannel,
+  choosePreferredNpmTagForChannel,
   readReleaseChannelFromRaw,
   readReleaseChannelFromEnvFile,
   readConfiguredReleaseChannel,

package/server/db/database.js

@@ -40,6 +40,7 @@ db.exec(`
     total_tokens INTEGER DEFAULT 0,
     prompt_metrics TEXT,
     error TEXT,
+    final_response TEXT,
     created_at TEXT DEFAULT (datetime('now')),
     updated_at TEXT DEFAULT (datetime('now')),
     completed_at TEXT,
@@ -389,6 +390,7 @@ for (const col of [
   "ALTER TABLE scheduled_tasks ADD COLUMN run_at TEXT",
   "ALTER TABLE scheduled_tasks ADD COLUMN one_time INTEGER DEFAULT 0",
   "ALTER TABLE agent_runs ADD COLUMN prompt_metrics TEXT",
+  "ALTER TABLE agent_runs ADD COLUMN final_response TEXT",
   "ALTER TABLE conversations ADD COLUMN summary TEXT",
   "ALTER TABLE conversations ADD COLUMN summary_message_count INTEGER DEFAULT 0",
   "ALTER TABLE conversations ADD COLUMN last_summary TEXT",

package/server/public/flutter_bootstrap.js

@@ -37,6 +37,6 @@ _flutter.buildConfig = {"engineRevision":"052f31d115eceda8cbff1b3481fcde4330c4ae
 
 _flutter.loader.load({
   serviceWorkerSettings: {
-    serviceWorkerVersion: "1964138140" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
+    serviceWorkerVersion: "4059413374" /* Flutter's service worker is deprecated and will be removed in a future Flutter release. */
   }
 });