neoagent 3.2.1-beta.1 → 3.2.1-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "3.2.1-beta.1",
+  "version": "3.2.1-beta.2",
   "description": "Self-hosted AI agent for long-running tasks, automation, messaging, device control, and local memory",
   "license": "AGPL-3.0-only",
   "main": "server/index.js",

package/server/public/.last_build_id

@@ -1 +1 @@
-93bc60f11ff8c552f052d374db0c2c06
+1c5d94e505331e4ad70cf059dc621b70

package/server/public/flutter_bootstrap.js

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

package/server/public/main.dart.js

@@ -143689,7 +143689,7 @@ if(r){r=s.d
 r===$&&A.b()
 p.push(A.jt(q,A.jw(!1,new A.Y(B.wO,A.cS(new A.cF(B.kE,new A.acS(r,q),q),q,q),q),!1,B.I,!0),q,q,0,0,0,q))}if(!s.ay){r=s.e
 r===$&&A.b()
-r=B.b.t("mrwbc2ah-7309fe8").length!==0&&r.b}else r=!1
+r=B.b.t("mrwc4gsw-5a86a62").length!==0&&r.b}else r=!1
 if(r){r=s.d
 r===$&&A.b()
 r=r.aU&&!r.ag?84:0
@@ -149556,7 +149556,7 @@ $S:0}
 A.a3g.prototype={}
 A.WA.prototype={
 r6(a){var s=this
-if(B.b.t("mrwbc2ah-7309fe8").length===0||s.a!=null)return
+if(B.b.t("mrwc4gsw-5a86a62").length===0||s.a!=null)return
 s.Cn()
 s.a=A.mJ(B.Y6,new A.bmI(s))},
 Cn(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f
@@ -149574,7 +149574,7 @@ if(!t.f.b(k)){s=1
 break}i=J.a3(k,"buildId")
 h=i==null?null:B.b.t(J.q(i))
 j=h==null?"":h
-if(J.br(j)===0||J.e(j,"mrwbc2ah-7309fe8")){s=1
+if(J.br(j)===0||J.e(j,"mrwc4gsw-5a86a62")){s=1
 break}n.b=!0
 n.H()
 p=2
@@ -149591,7 +149591,7 @@ case 2:return A.i(o.at(-1),r)}})
 return A.k($async$Cn,r)},
 wV(){var s=0,r=A.l(t.H),q,p=2,o=[],n=this,m,l,k,j,i,h,g,f,e,d,c,b,a,a0,a1
 var $async$wV=A.h(function(a2,a3){if(a2===1){o.push(a3)
-s=p}for(;;)switch(s){case 0:if(B.b.t("mrwbc2ah-7309fe8").length===0||n.c){s=1
+s=p}for(;;)switch(s){case 0:if(B.b.t("mrwc4gsw-5a86a62").length===0||n.c){s=1
 break}n.c=!0
 n.H()
 p=4

package/server/services/ai/loop/agent_engine_core.js

@@ -1119,6 +1119,15 @@ class AgentEngine {
 
     await new Promise((resolve) => { runMeta.resumeRun = resolve; });
     runMeta.resumeRun = null;
+    if (runMeta.status === 'stopped' || runMeta.status === 'interrupted') {
+      return { action: runMeta.status === 'interrupted' ? 'interrupt' : 'stop' };
+    }
+    const persistedStatus = db.prepare('SELECT status FROM agent_runs WHERE id = ?').get(runId)?.status;
+    if (persistedStatus !== 'running') {
+      const action = persistedStatus === 'interrupted' ? 'interrupt' : 'stop';
+      runMeta.status = persistedStatus || 'stopped';
+      return { action };
+    }
     runMeta.abortController = new AbortController();
     runMeta.status = 'running';
     this.startMessagingProgressSupervisor(runId);
@@ -1665,6 +1674,7 @@ class AgentEngine {
       runMeta.stopReason = reason;
       runMeta.aborted = true;
       runMeta.abortController?.abort(reason);
+      runMeta.resumeRun?.();
       this.emit(runMeta.userId, 'run:stopping', { runId });
       for (const pid of runMeta.toolPids) {
         if (this.runtimeManager && typeof this.runtimeManager.killCommand === 'function') {
@@ -1708,6 +1718,7 @@ class AgentEngine {
       runMeta.status = 'stopped';
       runMeta.aborted = true;
       runMeta.abortController?.abort('Run stopped.');
+      runMeta.resumeRun?.();
       this.emit(runMeta.userId, 'run:stopping', { runId });
       for (const pid of runMeta.toolPids) {
         if (this.runtimeManager && typeof this.runtimeManager.killCommand === 'function') {

package/server/services/ai/loop/model_io.js

@@ -62,7 +62,11 @@ async function requestStructuredJson(engine, {
 }) {
   const startedAt = Date.now();
   const structuredStep = `model:${phase}`;
-  const signal = telemetry?.signal;
+  const modelAbortController = new AbortController();
+  const parentSignal = telemetry?.signal;
+  const abortFromParent = () => modelAbortController.abort(parentSignal?.reason);
+  if (parentSignal?.aborted) abortFromParent();
+  else parentSignal?.addEventListener('abort', abortFromParent, { once: true });
   if (telemetry?.runId) {
     engine.updateRunProgress(telemetry.runId, {
       currentPhase: 'model',
@@ -86,13 +90,16 @@ async function requestStructuredJson(engine, {
             model,
             maxTokens,
             reasoningEffort: reasoningEffort || engine.getReasoningEffort(providerName, {}),
-            signal,
+            signal: modelAbortController.signal,
           }
         ),
-        telemetry || {},
+        { ...(telemetry || {}), modelAbortController },
         `${phase} model call`,
       ),
-      { label: `Engine ${model} (structured)` }
+      {
+        label: `Engine ${model} (structured)`,
+        isRetryable: (err) => !modelAbortController.signal.aborted && isTransientError(err),
+      }
     );
     completed = true;
     if (telemetry?.runId && telemetry?.userId) {
@@ -117,6 +124,7 @@ async function requestStructuredJson(engine, {
       usage: normalizedUsage?.totalTokens || 0,
     };
   } finally {
+    parentSignal?.removeEventListener('abort', abortFromParent);
     const runMeta = telemetry?.runId ? engine.getRunMeta(telemetry.runId) : null;
     if (runMeta?.progressLedger?.currentStep === structuredStep) {
       engine.updateRunProgress(telemetry.runId, {

package/server/services/ai/providers/claudeCode.js

@@ -102,7 +102,7 @@ function persistEnvValue(key, value) {
   } catch { }
 }
 
-async function refreshClaudeCodeAccessToken(refreshToken, fetchImpl = fetch) {
+async function refreshClaudeCodeAccessToken(refreshToken, fetchImpl = fetch, signal = null) {
   if (!refreshToken) return null;
   const response = await fetchImpl(CLAUDE_CODE_TOKEN_URL, {
     method: 'POST',
@@ -116,6 +116,7 @@ async function refreshClaudeCodeAccessToken(refreshToken, fetchImpl = fetch) {
       refresh_token: refreshToken,
       client_id: CLAUDE_CODE_CLIENT_ID,
     }),
+    signal,
   });
 
   const text = await response.text();
@@ -209,8 +210,8 @@ class ClaudeCodeProvider extends AnthropicProvider {
     });
   }
 
-  async refreshClient() {
-    const refreshed = await refreshClaudeCodeAccessToken(this.refreshToken, this.fetchImpl);
+  async refreshClient(signal = null) {
+    const refreshed = await refreshClaudeCodeAccessToken(this.refreshToken, this.fetchImpl, signal);
     if (!refreshed?.access) return false;
     this.authToken = refreshed.access;
     this.refreshToken = refreshed.refresh || this.refreshToken;
@@ -244,7 +245,7 @@ class ClaudeCodeProvider extends AnthropicProvider {
       if ((!isAuthenticationError(err) && !isInferenceScopeError(err)) || !this.refreshToken) {
         throw formatClaudeCodeCredentialError(err);
       }
-      await this.refreshClient();
+      await this.refreshClient(options.signal);
       try {
         return await super.chat(messages, tools, options);
       } catch (retryErr) {
@@ -260,7 +261,7 @@ class ClaudeCodeProvider extends AnthropicProvider {
       if ((!isAuthenticationError(err) && !isInferenceScopeError(err)) || !this.refreshToken) {
         throw formatClaudeCodeCredentialError(err);
       }
-      await this.refreshClient();
+      await this.refreshClient(options.signal);
       try {
         yield* super.stream(messages, tools, options);
       } catch (retryErr) {

package/server/services/ai/providers/githubCopilot.js

@@ -26,7 +26,7 @@ class GithubCopilotProvider extends OpenAIProvider {
     this._refreshPromise = null;
   }
 
-  async _refreshCopilotToken() {
+  async _refreshCopilotToken(signal = null) {
     if (this._refreshPromise) return this._refreshPromise;
 
     const now = Math.floor(Date.now() / 1000);
@@ -46,7 +46,8 @@ class GithubCopilotProvider extends OpenAIProvider {
             'Authorization': `token ${this.githubToken}`,
             'Accept': 'application/json',
             'User-Agent': 'NeoAgent/1.0.0'
-          }
+          },
+          signal,
         });
 
         if (!res.ok) {
@@ -79,17 +80,17 @@ class GithubCopilotProvider extends OpenAIProvider {
   }
 
   async chat(messages, tools = [], options = {}) {
-    await this._refreshCopilotToken();
+    await this._refreshCopilotToken(options.signal);
     return super.chat(messages, tools, options);
   }
 
   async *stream(messages, tools = [], options = {}) {
-    await this._refreshCopilotToken();
+    await this._refreshCopilotToken(options.signal);
     yield* super.stream(messages, tools, options);
   }
 
   async analyzeImage(options = {}) {
-    await this._refreshCopilotToken();
+    await this._refreshCopilotToken(options.signal);
     return super.analyzeImage(options);
   }
 }

package/server/services/ai/providers/grokOauth.js

@@ -41,7 +41,7 @@ function persistEnvValue(key, value) {
   } catch { }
 }
 
-async function refreshGrokOAuthAccessToken(refreshToken, fetchImpl = fetch) {
+async function refreshGrokOAuthAccessToken(refreshToken, fetchImpl = fetch, signal = null) {
   if (!refreshToken) return null;
   const response = await fetchImpl(GROK_OAUTH_TOKEN_URL, {
     method: 'POST',
@@ -54,6 +54,7 @@ async function refreshGrokOAuthAccessToken(refreshToken, fetchImpl = fetch) {
       refresh_token: refreshToken,
       client_id: GROK_OAUTH_CLIENT_ID,
     }),
+    signal,
   });
 
   const text = await response.text();
@@ -102,8 +103,8 @@ class GrokOAuthProvider extends GrokProvider {
     this.fetchImpl = config.fetch || fetch;
   }
 
-  async refreshClient() {
-    const refreshed = await refreshGrokOAuthAccessToken(this.refreshToken, this.fetchImpl);
+  async refreshClient(signal = null) {
+    const refreshed = await refreshGrokOAuthAccessToken(this.refreshToken, this.fetchImpl, signal);
     if (!refreshed?.access) return false;
     this.authToken = refreshed.access;
     this.refreshToken = refreshed.refresh || this.refreshToken;
@@ -122,7 +123,7 @@ class GrokOAuthProvider extends GrokProvider {
       return await super.chat(messages, tools, options);
     } catch (err) {
       if (err?.status !== 401 || !this.refreshToken) throw err;
-      await this.refreshClient();
+      await this.refreshClient(options.signal);
       return await super.chat(messages, tools, options);
     }
   }
@@ -132,7 +133,7 @@ class GrokOAuthProvider extends GrokProvider {
       yield* super.stream(messages, tools, options);
     } catch (err) {
       if (err?.status !== 401 || !this.refreshToken) throw err;
-      await this.refreshClient();
+      await this.refreshClient(options.signal);
       yield* super.stream(messages, tools, options);
     }
   }

package/server/services/ai/providers/ollama.js

@@ -8,22 +8,28 @@ class OllamaProvider extends BaseProvider {
     this.models = [];
   }
 
-  async listModels() {
+  async listModels(signal = null) {
+    const controller = new AbortController();
+    const abortFromParent = () => controller.abort(signal?.reason);
+    if (signal?.aborted) abortFromParent();
+    else signal?.addEventListener('abort', abortFromParent, { once: true });
+    const timer = setTimeout(() => controller.abort(), 5000);
     try {
-      const controller = new AbortController();
-      const timer = setTimeout(() => controller.abort(), 5000);
       const res = await fetch(`${this.baseUrl}/api/tags`, { signal: controller.signal });
-      clearTimeout(timer);
       const data = await res.json();
       this.models = (data.models || []).map(m => m.name);
       return this.models;
-    } catch {
+    } catch (err) {
+      if (signal?.aborted) throw err;
       return [];
+    } finally {
+      clearTimeout(timer);
+      signal?.removeEventListener('abort', abortFromParent);
     }
   }
 
-  async ensureModel(model) {
-    const models = await this.listModels();
+  async ensureModel(model, signal = null) {
+    const models = await this.listModels(signal);
     // Normalization: Ollama often adds :latest if no tag is specified
     const normalizedModel = model.includes(':') ? model : `${model}:latest`;
     const found = models.some(m => m === model || m === normalizedModel);
@@ -42,7 +48,8 @@ class OllamaProvider extends BaseProvider {
       const res = await fetch(`${this.baseUrl}/api/pull`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ name: model, stream: false })
+        body: JSON.stringify({ name: model, stream: false }),
+        signal,
       });
       if (!res.ok) throw new Error(`Pull failed: ${res.statusText}`);
       console.log(`[Ollama] Model '${model}' pulled successfully.`);
@@ -54,7 +61,7 @@ class OllamaProvider extends BaseProvider {
         message: `Local Ollama model '${model}' is ready.`
       });
       // Refresh local model list
-      await this.listModels();
+      await this.listModels(signal);
       return true;
     } catch (e) {
       this.onStatus?.({
@@ -144,7 +151,7 @@ class OllamaProvider extends BaseProvider {
 
   async chat(messages, tools = [], options = {}) {
     const model = options.model || this.config.model || 'llama3.1';
-    await this.ensureModel(model);
+    await this.ensureModel(model, options.signal);
 
     let res;
     try {
@@ -183,7 +190,7 @@ class OllamaProvider extends BaseProvider {
 
   async *stream(messages, tools = [], options = {}) {
     const model = options.model || this.config.model || 'llama3.1';
-    await this.ensureModel(model);
+    await this.ensureModel(model, options.signal);
 
     let res;
     try {