omnikey-cli 1.5.0 → 1.5.2

package/backend-dist/agent/agentPrompts.js

@@ -26,7 +26,12 @@ function sanitizeMcpField(value, maxLength = 200) {
 function getAgentPrompt(platform, hasTaskInstructions, installedMcps = []) {
     const isWindows = config_1.config.terminalPlatform?.toLowerCase() === 'windows' || platform?.toLowerCase() === 'windows';
     return `
-You are an AI assistant with full terminal access. You reason about user requests and execute shell scripts to gather live data.
+You are an AI agent running on the user's machine with the following capabilities:
+- **Shell execution** (\`<shell_script>\` XML tag) — runs commands on the user's machine; output returns as \`TERMINAL OUTPUT:\`.
+- **Web tools** — call \`web_search\` and \`web_fetch\` via native function calling to retrieve live information from the internet.${config_1.config.aiProvider !== 'anthropic' ? '\n- **Image generation** — call `generate_image` via native function calling to produce images.' : ''}${config_1.config.browserDebugPort !== undefined ? '\n- **Browser automation** — control the user\'s running browser via Playwright scripts inside `<shell_script>` blocks.' : ''}
+${installedMcps.length > 0 ? '- **MCP tools** — native function calls for integrations; see installed servers below.' : ''}
+
+Use these capabilities to take real action. Default to doing rather than asking.
 
 **Input:**
 ${hasTaskInstructions
@@ -81,7 +86,7 @@ ${config_1.config.aiProvider === 'anthropic'
 - Use the built-in \`generate_image\` tool **only** when the user explicitly asks you to create, render, draw, design, or produce an image, picture, artwork, mockup, logo, diagram, or other visual asset.
 - Do **not** call \`generate_image\` for tasks that are about code, configuration, terminal commands, file manipulation, data extraction, web lookups, debugging, or any non-visual request — even if the user mentions words like "show", "display", "visualize", or "preview" in a non-image sense.
 - If you are unsure whether an image is required, prefer **not** to call the tool and ask the user (or proceed with a textual answer) instead.
-- Prefer the user-provided output path when available. If none is provided, save to \`~/.omniAgent/garbage/\` (e.g. \`~/.omniAgent/garbage/<descriptive-name>.png\`).
+- Use the user-provided output path when given; otherwise follow the generated file output directory above.
 - After the tool call returns, provide a \`<final_answer>\` that includes the saved file path.
   `}
 
@@ -116,18 +121,17 @@ ${installedMcps
 - No prefix — direct user message; treat as the primary request.
 
 **Response format — every response must be exactly one of:**
-1. \`<shell_script>...</shell_script>\` — to run commands and gather more data.
-2. ${config_1.config.aiProvider === 'anthropic' ? 'A `web_search` or `web_fetch`' : 'A `web_search`, `web_fetch`, or `generate_image`'} tool call — to fetch web context or generate images (use native tool calling, not XML tags).
+1. \`<shell_script>...</shell_script>\` — write this XML tag directly in your text response; the client extracts and runs it on the user's machine. **Not a function call** — calling \`shell_script\` via the function-calling API will always fail.
+2. ${config_1.config.aiProvider === 'anthropic' ? 'A `web_search` or `web_fetch`' : 'A `web_search`, `web_fetch`, or `generate_image`'} **native function call** — use the function-calling API for these only; do NOT wrap them in XML tags.${installedMcps.length > 0 ? ' Same for MCP tools (`mcp_<server>__<tool>`).' : ''}
 3. \`<final_answer>...</final_answer>\` — your conclusion once you have enough information.
 
-**Critical rule — zero tolerance for text outside tags:**
+**Critical rule — zero tolerance for text outside tags or extra wrappers:**
+- Do NOT wrap \`<shell_script>\` inside any other XML tag (e.g. \`<shell_function_calls>\`, \`<function_calls>\`, \`<invoke>\`). The \`<shell_script>\` tag must be the very first character of your response — no prefix, no envelope.
 - Your **entire response** — from the very first character to the very last — must be the tag and its contents. Nothing before the opening tag. Nothing after the closing tag.
 - Do NOT write reasoning, planning, or commentary before acting. Emit the tag immediately. If you need to reason through a step, do it as a comment inside the \`<shell_script>\` block (\`# ...\`), never as free text outside.
 - After receiving \`TERMINAL OUTPUT:\` or \`COMMAND ERROR:\`, your very next characters must be \`<shell_script>\` or \`<final_answer>\`. No exceptions.
 - If you feel you need to plan or think before writing the first script — suppress it. Emit \`<shell_script>\` for the first small step immediately. You will have the output to guide the next step.
 
-Never wrap in additional XML/JSON.
-
 **Shell script structure:**
 ${!isWindows
         ? `\`\`\`bash

package/backend-dist/agent/agentServer.js

@@ -126,6 +126,21 @@ async function runToolLoop(initialResult, session, sessionId, send, log, tools,
                 });
                 return { id: tc.id, name: tc.name, result: toolResult };
             }
+            // shell_script is not a callable tool — the model should embed commands
+            // in its text response using <shell_script>...</shell_script> XML tags.
+            // Intercept here so we don't fire a misleading "Fetching URL: undefined"
+            // web-call notification and return a clear correction instead.
+            if (tc.name === 'shell_script') {
+                log.warn('Agent attempted to call shell_script as a function; returning format-correction', {
+                    sessionId,
+                    toolIteration: toolIterations,
+                });
+                return {
+                    id: tc.id,
+                    name: tc.name,
+                    result: 'Error: "shell_script" is not a callable tool. To run shell commands, place them directly in your text response using <shell_script>...</shell_script> XML tags — do not use tool/function calling for this.',
+                };
+            }
             // Notify the frontend that a web tool call is about to execute.
             const webCallContent = tc.name === 'web_search'
                 ? `Searching the web for: "${String(args.query ?? '')}"`
@@ -195,6 +210,33 @@ async function runToolLoop(initialResult, session, sessionId, send, log, tools,
 const aiModel = (0, ai_client_1.getDefaultModel)(config_1.config.aiProvider, 'smart');
 const contextWindowSize = (0, ai_client_1.getContextWindowSize)(config_1.config.aiProvider);
 // ─── DB helpers ───────────────────────────────────────────────────────────────
+/**
+ * Sanitize LLM content before processing or forwarding to the client.
+ *
+ * Two known hallucination patterns are fixed here:
+ *
+ * 1. <shell_function_calls> wrapper — the model sometimes wraps <shell_script>
+ *    in a <shell_function_calls> envelope.  Stored verbatim it compounds on
+ *    every turn (double/triple nesting), so we strip every occurrence.
+ *
+ * 2. Mismatched closing tag — the model opens with <shell_script> but closes
+ *    with a different tag (e.g. </shell_function>, </shell>, </script>).  The
+ *    macOS client's extractor looks for </shell_script> exactly; a wrong tag
+ *    makes it treat the entire script as plain reasoning text and call
+ *    receiveNext(), while the backend waits for terminal output — a deadlock.
+ *    We normalise any </shell…> variant to </shell_script> when the correct
+ *    closing tag is absent.
+ */
+function sanitizeLLMContent(content) {
+    // 1. Strip <shell_function_calls> wrapper tags.
+    let result = content.replace(/<\/?shell_function_calls>/gi, '');
+    // 2. If <shell_script> is present but </shell_script> is missing,
+    //    replace any stray </shell…> closing tag with the correct one.
+    if (result.includes('<shell_script>') && !result.includes('</shell_script>')) {
+        result = result.replace(/<\/shell\w*>/gi, '</shell_script>');
+    }
+    return result.trim();
+}
 async function persistSessionToDB(sessionId, state) {
     try {
         const historyJson = JSON.stringify(state.history);
@@ -234,7 +276,7 @@ async function enforceSessionCap(subscriptionId, logger) {
         logger.error('Failed to enforce agent session cap', { subscriptionId, error: err });
     }
 }
-async function getOrCreateSession(sessionId, subscription, platform, log, isCronJob = false) {
+async function getOrCreateSession(sessionId, subscription, platform, log, isCronJob = false, groupName) {
     // 1. Try to resume from a persisted DB record.
     try {
         const dbSession = await agentSession_1.AgentSession.findOne({
@@ -310,6 +352,7 @@ ${prompt}
                 historyJson: JSON.stringify(entry.history),
                 turns: 0,
                 lastActiveAt: new Date(),
+                groupName: groupName ?? null,
             },
         });
         if (!created) {
@@ -349,7 +392,7 @@ ${prompt}
     };
 }
 async function runAgentTurnInternal(sessionId, subscription, clientMessage, send, log, options) {
-    const { sessionState: session, hasStoredPrompt } = await getOrCreateSession(sessionId, subscription, clientMessage.platform, log, options?.isCronJob);
+    const { sessionState: session, hasStoredPrompt } = await getOrCreateSession(sessionId, subscription, clientMessage.platform, log, options?.isCronJob, clientMessage.group_name);
     // Count this call as one agent iteration.
     session.turns += 1;
     log.info('Starting agent turn', {
@@ -513,7 +556,7 @@ async function runAgentTurnInternal(sessionId, subscription, clientMessage, send
             });
             await recordUsage(result);
         }
-        let content = result.content.trim();
+        let content = sanitizeLLMContent(result.content.trim());
         if (!content && result.finish_reason !== 'tool_calls') {
             log.warn('Agent LLM returned empty content; sending generic error to client.');
             const errorMessage = 'The agent returned an empty response. Please try again.';
@@ -530,7 +573,7 @@ async function runAgentTurnInternal(sessionId, subscription, clientMessage, send
                 turn: session.turns,
             });
             const toolLoopResult = await runToolLoop(result, session, sessionId, send, log, tools, mcpBundle.dispatch, recordUsage);
-            const toolLoopContent = toolLoopResult.content.trim();
+            const toolLoopContent = sanitizeLLMContent(toolLoopResult.content.trim());
             const toolLoopHasShell = toolLoopContent.includes('<shell_script>');
             const toolLoopHasFinal = toolLoopContent.includes('<final_answer>');
             const webToolFailed = session.history.some((msg) => msg.role === 'tool' &&

package/backend-dist/index.js

@@ -78,8 +78,8 @@ app.get('/macos/appcast', (req, res) => {
     const appcastUrl = `${baseUrl}/macos/appcast`;
     // These should match the values embedded into the macOS app
     // Info.plist in macOS/build_release_dmg.sh.
-    const bundleVersion = '36';
-    const shortVersion = '1.0.35';
+    const bundleVersion = '37';
+    const shortVersion = '1.0.36';
     const xml = `<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"
      xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",