osai-agent 4.2.22 → 4.2.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "osai-agent",
-  "version": "4.2.22",
+  "version": "4.2.24",
   "type": "module",
   "description": "OS AI Agent - YOUR AI AGENT",
   "main": "src/index.js",

package/src/agent/loop/local.js

@@ -5,6 +5,7 @@ import { mcpClientManager } from '../../tools/mcp-client.js';
 import { memory } from '../../memory/store.js';
 import { DEFAULTS, COMPLETION_SIGNALS } from '../../utils/constants.js';
 import { logger } from '../../utils/logger.js';
+import { stripSystemPrompt } from '../../utils/helpers.js';
 
 export default {
   async _callWorkerLocal() {
@@ -181,7 +182,7 @@ const systemPrompt = buildSystemPrompt(this._userOS, this.mode, {
           return null;
         }
         if (attempt >= maxAttempts - 1) {
-          this.onError(error.message);
+          this.onError(stripSystemPrompt(error.message));
           return null;
         }
         retrying = true;

package/src/agent/react-loop.js

@@ -22,7 +22,7 @@ import fs from 'fs';
 import { DEFAULTS, TOOLS, COMPLETION_SIGNALS, SAFETY_TIERS, MODES, EXECUTION_MODES, READ_ONLY_TOOLS, CODING_TOOLS, CRITICAL_ENV_FILENAMES, CRITICAL_ENV_FILENAME_PATTERNS, CRITICAL_ENV_PATH_SEGMENTS, CRITICAL_ENV_EXCLUDE, MAX_ITERATIONS, AUTO_CONTINUE_LIMIT, READ_FRESHNESS_INTERACTIONS, TOOL_SEQUENCE_WINDOW_SIZE, CONTEXT_SUMMARY_TAG, SUBAGENT_MAX_ITERATIONS } from '../utils/constants.js';
 import { discoverSkills } from '../skills/loader.js';
 import { logger } from '../utils/logger.js';
-import { sleep, cancellableSleep } from '../utils/helpers.js';
+import { sleep, cancellableSleep, stripSystemPrompt } from '../utils/helpers.js';
 
 import contextSummaryMethods from './loop/context-summary.js';
 import loopDetectionMethods from './loop/loop-detection.js';
@@ -336,13 +336,13 @@ export class AgentLoop {
         if (this.iteration <= 1 && !this._shouldCancel()) {
           logger.info('Retrying iteration after error...');
           iterationRetrying = true;
-          this.onRetryStatus(`Retrying after error: ${error.message}`);
+          this.onRetryStatus(`Retrying after error: ${stripSystemPrompt(error.message)}`);
           this.iteration--;
           const slept = await this._cancellableSleep(DEFAULTS.API_RETRY_DELAY);
           if (!slept || this._shouldCancel()) break;
           continue;
         }
-        this.onError(error.message);
+        this.onError(stripSystemPrompt(error.message));
         break;
       }
     }
@@ -616,7 +616,7 @@ export class AgentLoop {
           } catch {}
 
           if (!isRetryableStatus(response.status) || attempt >= maxAttempts - 1) {
-            this.onError(errorMsg);
+            this.onError(stripSystemPrompt(errorMsg));
             return null;
           }
 
@@ -646,7 +646,7 @@ export class AgentLoop {
           }
           if (json.error) {
             if (attempt >= maxAttempts - 1) {
-              this.onError(json.error);
+              this.onError(stripSystemPrompt(json.error));
               return null;
             }
             retrying = true;
@@ -667,7 +667,7 @@ export class AgentLoop {
           return null;
         }
         if (attempt >= maxAttempts - 1) {
-          this.onError(error.message);
+          this.onError(stripSystemPrompt(error.message));
           return null;
         }
         retrying = true;

package/src/llm/direct.js

@@ -268,13 +268,16 @@ export function streamLocalCompletion({
         } else if (provider.type === 'gemini') {
           const genAI = new GoogleGenerativeAI(provider.apiKey);
           const geminiModel = genAI.getGenerativeModel({ model: effectiveModel });
-          const geminiHistory = messages
+          let geminiHistory = messages
             .filter(m => m.role !== 'system')
             .slice(0, -1)
             .map(m => ({
               role: m.role === 'assistant' ? 'model' : 'user',
               parts: [{ text: m.content }],
             }));
+          while (geminiHistory.length > 0 && geminiHistory[0].role === 'model') {
+            geminiHistory.shift();
+          }
           const chat = geminiModel.startChat({
             history: geminiHistory,
             systemInstruction: { parts: [{ text: systemPrompt }] },

package/src/tools/local.js

@@ -15,6 +15,13 @@ const COMMAND_TIMEOUT = parseInt(process.env.OSAI_COMMAND_TIMEOUT) || DEFAULTS.C
 const FETCH_TIMEOUT = parseInt(process.env.OSAI_FETCH_TIMEOUT) || DEFAULTS.FETCH_TIMEOUT;
 const MAX_COMMAND_OUTPUT_CHARS = parseInt(process.env.OSAI_MAX_COMMAND_OUTPUT_CHARS || '40000', 10);
 
+const SAFE_ENV_KEYS = new Set([
+  'PATH', 'HOME', 'USER', 'USERNAME', 'HOSTNAME', 'HOST',
+  'LANG', 'LC_ALL', 'LC_CTYPE', 'TERM', 'SHELL',
+  'TMPDIR', 'TMP', 'TEMP', 'XDG_*', 'DISPLAY', 'WAYLAND_DISPLAY',
+  'NODE_ENV', 'PYTHONIOENCODING', 'LANG',
+]);
+
 /** Commands that spawn interactive shells — must be blocked */
 const INTERACTIVE_COMMANDS = [
   /^cmd(\s+\/k)?$/i, /^powershell(\s+-noexit)?$/i, /^bash$/i, /^sh$/i,
@@ -211,6 +218,12 @@ export const executeLocal = async (command, sudoPassword = null) => {
     }
   }
 
+  // Block dangerous patterns
+  const safety = validateLocalCommand(trimmedCmd);
+  if (!safety.safe) {
+    return { success: false, output: '', error: safety.reason };
+  }
+
   logger.debug('Executing local command', { cmd: trimmedCmd, timeout: COMMAND_TIMEOUT });
 
   const isWindows = detectOS() === 'windows';
@@ -220,6 +233,12 @@ export const executeLocal = async (command, sudoPassword = null) => {
     finalCommand = finalCommand.replace(/^sudo\b/, 'sudo -S');
   }
 
+  // Apply resource limits via shell (non-Windows)
+  if (!isWindows) {
+    const cpuSecs = Math.ceil(COMMAND_TIMEOUT / 1000);
+    finalCommand = `ulimit -t ${cpuSecs} -v 524288 2>/dev/null; ${finalCommand}`;
+  }
+
   return await new Promise((resolve) => {
     let output = '';
     let truncatedChars = 0;
@@ -233,10 +252,20 @@ export const executeLocal = async (command, sudoPassword = null) => {
       if (text.length > remaining) truncatedChars += text.length - remaining;
     };
 
+    const filteredEnv = Object.fromEntries(
+      Object.entries(process.env).filter(([key]) => {
+        if (SAFE_ENV_KEYS.has(key)) return true;
+        if (key.startsWith('XDG_')) return true;
+        return false;
+      })
+    );
+    filteredEnv.PYTHONIOENCODING = 'utf-8';
+    filteredEnv.LANG = 'en_US.UTF-8';
+
     const child = spawn(finalCommand, {
       shell: isWindows ? 'cmd.exe' : '/bin/sh',
       windowsHide: true,
-      env: { ...process.env, PYTHONIOENCODING: 'utf-8', LANG: 'en_US.UTF-8' },
+      env: filteredEnv,
     });
 
     if (sudoPassword) {
@@ -761,12 +790,18 @@ export const getFileInfo = async (filePath) => {
  * Fetch content from a URL (for documentation, API data, etc.)
  * {"tool":"FETCH_URL","url":"<url>","description":"<why>"}
  */
+const PRIVATE_IP_RE = /^(https?:\/\/)(127\.|10\.|172\.(1[6-9]|2\d|3[01])\.|192\.168\.|169\.254\.|0\.|::1|fc00:|fe80:)/i;
+
 export const fetchUrl = async (url, description = '') => {
   try {
     if (!url || !url.startsWith('http')) {
       return { success: false, output: '', error: 'Invalid URL. Must start with http:// or https://' };
     }
 
+    if (PRIVATE_IP_RE.test(url)) {
+      return { success: false, output: '', error: 'Blocked: URL points to a private/internal network address' };
+    }
+
     const controller = new AbortController();
     const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT);
 

package/src/ui/App.js

@@ -81,6 +81,14 @@ const INTERNAL_SSE_LINE_RE = /^\s*(data|event|id|retry):\s.*$/gim;
 const INTERNAL_TOOL_JSON_LINE_RE = /^\s*\{(?:\\")?tool(?:\\")?\s*:\s*.*$/gim;
 const INTERNAL_TOOL_XML_LINE_RE = /<tool\b[^>]*>[\s\S]*?<\/tool\s*>|<tool\b[^>]*\/>/gim;
 
+const UI_SYSTEM_PROMPT_MARKERS = [
+  'You are OS AI Agent',
+  '## TOOLS \u2014',
+  '## EXECUTION MODE',
+  '## CUSTOM INSTRUCTIONS',
+  '### System Commands',
+];
+
 function sanitizeUiText(input) {
   let text = String(input || '');
   if (!text) return '';
@@ -93,6 +101,15 @@ function sanitizeUiText(input) {
     .replace(/(?:^|\n)\s*```json\s*(?=\n|$)/gi, '\n')
     .replace(/\n{3,}/g, '\n\n');
 
+  for (const marker of UI_SYSTEM_PROMPT_MARKERS) {
+    const idx = text.indexOf(marker);
+    if (idx !== -1) {
+      text = text.slice(0, idx).trim();
+      if (text.length > 300) text = text.slice(0, 300) + '...';
+      break;
+    }
+  }
+
   return text;
 }
 
@@ -1025,7 +1042,7 @@ export function App({ createAgentLoop, agentConfig, initialSession = null, onExi
         }
         agentLoopActiveRef.current = false;
         cancelRequestedRef.current = false;
-        finishTaskUi({ success: false, output: String(err || 'Error') });
+        finishTaskUi({ success: false, output: sanitizeUiText(String(err || 'Error')) });
         setState('error');
         badgeInfoRef.current = { signal: 'ERROR', message: err };
         addEvent({ type: 'badge', signal: 'ERROR', elapsed: null });

package/src/utils/helpers.js

@@ -87,6 +87,28 @@ export const categorizeError = (error) => {
   return { category: 'recoverable', recoverable: true, userMessage: error.message };
 };
 
+const SYSTEM_PROMPT_MARKERS = [
+  'You are OS AI Agent',
+  '## TOOLS \u2014',
+  '## EXECUTION MODE',
+  '## CUSTOM INSTRUCTIONS',
+  '### System Commands',
+];
+
+export const stripSystemPrompt = (str) => {
+  if (!str) return str;
+  const s = String(str);
+  for (const marker of SYSTEM_PROMPT_MARKERS) {
+    const idx = s.indexOf(marker);
+    if (idx !== -1) {
+      let trimmed = s.slice(0, idx).trim();
+      if (trimmed.length > 300) trimmed = trimmed.slice(0, 300) + '...';
+      return trimmed;
+    }
+  }
+  return s;
+};
+
 /**
  * Sanitize a string for safe shell usage (basic escaping)
  */