omnikey-cli 1.0.37 → 1.0.39

package/backend-dist/ai-client.js

@@ -16,9 +16,9 @@ const config_1 = require("./config");
 // Default model mapping
 // ---------------------------------------------------------------------------
 const DEFAULT_MODELS = {
-    openai: { fast: 'gpt-4o-mini', smart: 'gpt-5.1' },
+    openai: { fast: 'gpt-4o-mini', smart: 'gpt-5.5' },
     gemini: { fast: 'gemini-2.5-flash', smart: 'gemini-2.5-pro' },
-    anthropic: { fast: 'claude-haiku-4-5-20251001', smart: 'claude-sonnet-4-6' },
+    anthropic: { fast: 'claude-haiku-4-5-20251001', smart: 'claude-opus-4-7' },
 };
 function getDefaultModel(provider, tier) {
     return DEFAULT_MODELS[provider][tier];
@@ -29,7 +29,7 @@ function getDefaultModel(provider, tier) {
  * - anthropic: hard API-enforced string limit of 10,485,760 chars; we stay
  *              just below it with a small safety buffer.
  * - openai:    no documented per-string limit; bounded by the context window
- *              (~272K tokens for GPT-5.1 ≈ ~1M chars). Use the history cap.
+ *              (~272K tokens for GPT-5.5 ≈ ~1M chars). Use the history cap.
  * - gemini:    no documented per-string limit; bounded by the 1M-token
  *              context window (~4M chars). Use the history cap.
  */
@@ -43,9 +43,9 @@ const MAX_MESSAGE_CONTENT_LENGTH_BY_PROVIDER = {
  * history, derived from each provider's context-window size minus headroom
  * for the system prompt and max output tokens.
  *
- * - anthropic: Claude Sonnet 4.6 — 1M token ctx, 64K max output
+ * - anthropic: Claude Opus 4.7 — 1M token ctx, 64K max output
  *              ≈ (1,000,000 - 64,000 - 10,000) tokens × 4 chars ≈ 3.7M chars
- * - openai:    GPT-5.1 — ~272K token ctx, ~32K max output
+ * - openai:    GPT-5.5 — ~272K token ctx, ~32K max output
  *              ≈ (272,000 - 32,000 - 5,000) tokens × 4 chars ≈ 940K chars
  * - gemini:    Gemini 2.5 Pro — 1M token ctx, ~32K max output
  *              ≈ (1,000,000 - 32,000 - 10,000) tokens × 4 chars ≈ 3.8M chars
@@ -75,7 +75,7 @@ class OpenAIAdapter {
             model,
             messages: oaiMessages,
             tools: tools?.length ? tools : undefined,
-            temperature: options.temperature ?? 0.2,
+            temperature: model === 'gpt-5.5' ? 1 : (options.temperature ?? 0.2),
             max_tokens: options.maxTokens,
         });
         const choice = completion.choices[0];
@@ -175,7 +175,7 @@ class AnthropicAdapter {
             ...(system ? { system } : {}),
             messages: anthropicMessages,
             ...(tools?.length ? { tools } : {}),
-            temperature: options.temperature ?? 0.2,
+            ...(model === 'claude-opus-4-7' ? {} : { temperature: options.temperature ?? 0.2 }),
         });
         const textContent = response.content
             .filter((b) => b.type === 'text')

package/backend-dist/featureRoutes.js

@@ -58,9 +58,9 @@ async function getPromptForCommand(logger, cmd, subscription) {
 function getModelForCommand(cmd) {
     const tier = cmd === 'task' ? 'smart' : 'fast';
     const models = {
-        openai: { fast: 'gpt-4o-mini', smart: 'gpt-5.1' },
+        openai: { fast: 'gpt-4o-mini', smart: 'gpt-5.5' },
         gemini: { fast: 'gemini-2.5-flash', smart: 'gemini-2.5-pro' },
-        anthropic: { fast: 'claude-haiku-4-5-20251001', smart: 'claude-sonnet-4-6' },
+        anthropic: { fast: 'claude-haiku-4-5-20251001', smart: 'claude-opus-4-7' },
     };
     return models[config_1.config.aiProvider]?.[tier] ?? 'gpt-4o-mini';
 }

package/backend-dist/index.js

@@ -74,8 +74,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 = '25';
-    const shortVersion = '1.0.24';
+    const bundleVersion = '26';
+    const shortVersion = '1.0.25';
     const xml = `<?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0"
      xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle"

package/backend-dist/scheduledJobExecutor.js

@@ -23,9 +23,9 @@ const SHELL_SCRIPT_RE = /<shell_script>([\s\S]*?)<\/shell_script>/;
 const FINAL_ANSWER_RE = /<final_answer>/;
 // Maximum time a single job may run before it is forcibly cancelled.
 const JOB_TIMEOUT_MS = 10 * 60 * 1000;
-// Cron jobs get more turns than interactive sessions so multi-step tasks
-// (web research → shell commands → final answer) can complete unattended.
-const MAX_CRON_TURNS = 30;
+const MAX_AGENT_ERROR_RECOVERY_ATTEMPTS = 4;
+// Single-process guard to avoid running the same job concurrently.
+const RUNNING_JOB_IDS = new Set();
 function computeNextRunAt(cronExpression, runAt) {
     if (cronExpression) {
         try {
@@ -104,6 +104,7 @@ async function runScript(script) {
 }
 function runCronJob(job, subscription, sessionId) {
     return new Promise((resolve, reject) => {
+        let agentErrorRecoveryAttempts = 0;
         let settled = false;
         const settle = (err) => {
             if (settled)
@@ -119,11 +120,27 @@ function runCronJob(job, subscription, sessionId) {
             void (async () => {
                 const content = msg.content ?? '';
                 if (msg.is_error) {
-                    logger_1.logger.error('Cron job: agent returned error.', {
+                    agentErrorRecoveryAttempts += 1;
+                    logger_1.logger.warn('Cron job: agent returned error; attempting recovery.', {
                         jobId: job.id,
+                        attempt: agentErrorRecoveryAttempts,
                         content: content.slice(0, 300),
                     });
-                    settle(new Error(`Agent error: ${content.slice(0, 200)}`));
+                    const shouldFailNow = FINAL_ANSWER_RE.test(content) ||
+                        agentErrorRecoveryAttempts > MAX_AGENT_ERROR_RECOVERY_ATTEMPTS;
+                    if (shouldFailNow) {
+                        settle(new Error(`Agent error: ${content.slice(0, 200)}`));
+                        return;
+                    }
+                    (0, agentServer_1.runAgentTurn)(sessionId, subscription, {
+                        session_id: sessionId,
+                        sender: 'user',
+                        content: `Agent turn failed while processing this cron job. ` +
+                            `Recover from the latest state and return the next ` +
+                            `<shell_script> or a <final_answer>.\n\n` +
+                            `Error details:\n${content}`,
+                        is_error: true,
+                    }, send, logger_1.logger, { isCronJob: true }).catch((err) => settle(err instanceof Error ? err : new Error(String(err))));
                     return;
                 }
                 const scriptMatch = SHELL_SCRIPT_RE.exec(content);
@@ -147,10 +164,28 @@ function runCronJob(job, subscription, sessionId) {
                     }, send, logger_1.logger, { isCronJob: true }).catch((err) => settle(err instanceof Error ? err : new Error(String(err))));
                     return;
                 }
+                if (msg.is_web_call || msg.is_image_rendering) {
+                    logger_1.logger.debug('Cron job: received progress notification; waiting for next message.', {
+                        jobId: job.id,
+                        isWebCall: !!msg.is_web_call,
+                        isImageRendering: !!msg.is_image_rendering,
+                    });
+                    return;
+                }
                 if (FINAL_ANSWER_RE.test(content)) {
                     logger_1.logger.info('Cron job: received final answer.', { jobId: job.id });
                     settle();
+                    return;
                 }
+                if (content.trim()) {
+                    logger_1.logger.warn('Cron job: received untagged agent content; treating as final answer.', {
+                        jobId: job.id,
+                        content: content.slice(0, 300),
+                    });
+                    settle();
+                    return;
+                }
+                settle(new Error('Agent returned empty response with no shell script or final answer.'));
             })();
         };
         (0, agentServer_1.runAgentTurn)(sessionId, subscription, {
@@ -162,38 +197,51 @@ function runCronJob(job, subscription, sessionId) {
     });
 }
 async function executeJob(job) {
-    logger_1.logger.info('Executing scheduled job.', { jobId: job.id, label: job.label });
-    const subscription = await subscription_1.Subscription.findByPk(job.subscriptionId);
-    if (!subscription) {
-        logger_1.logger.error('Subscription not found for scheduled job; skipping.', {
+    if (RUNNING_JOB_IDS.has(job.id)) {
+        logger_1.logger.warn('Scheduled job is already running; skipping duplicate execution.', {
             jobId: job.id,
-            subscriptionId: job.subscriptionId,
+            label: job.label,
         });
         return;
     }
-    const sessionId = (0, cuid_1.default)();
+    RUNNING_JOB_IDS.add(job.id);
+    logger_1.logger.info('Executing scheduled job.', { jobId: job.id, label: job.label });
     try {
-        await runCronJob(job, subscription, sessionId);
-        logger_1.logger.info('Scheduled job completed.', { jobId: job.id, label: job.label });
-    }
-    catch (err) {
-        logger_1.logger.error('Scheduled job failed.', { jobId: job.id, label: job.label, error: err });
-        // Fall through — always update lastRunAt so the next poll does not re-run immediately.
-    }
-    const now = new Date();
-    if (job.cronExpression) {
-        await job.update({
-            lastRunAt: now,
-            nextRunAt: computeNextRunAt(job.cronExpression, null),
-            lastRunSessionId: sessionId,
-        });
+        const subscription = await subscription_1.Subscription.findByPk(job.subscriptionId);
+        if (!subscription) {
+            logger_1.logger.error('Subscription not found for scheduled job; skipping.', {
+                jobId: job.id,
+                subscriptionId: job.subscriptionId,
+            });
+            return;
+        }
+        const sessionId = (0, cuid_1.default)();
+        try {
+            await runCronJob(job, subscription, sessionId);
+            logger_1.logger.info('Scheduled job completed.', { jobId: job.id, label: job.label });
+        }
+        catch (err) {
+            logger_1.logger.error('Scheduled job failed.', { jobId: job.id, label: job.label, error: err });
+            // Fall through — always update lastRunAt so the next poll does not re-run immediately.
+        }
+        const now = new Date();
+        if (job.cronExpression) {
+            await job.update({
+                lastRunAt: now,
+                nextRunAt: computeNextRunAt(job.cronExpression, null),
+                lastRunSessionId: sessionId,
+            });
+        }
+        else {
+            await job.update({
+                lastRunAt: now,
+                isActive: false,
+                nextRunAt: null,
+                lastRunSessionId: sessionId,
+            });
+        }
     }
-    else {
-        await job.update({
-            lastRunAt: now,
-            isActive: false,
-            nextRunAt: null,
-            lastRunSessionId: sessionId,
-        });
+    finally {
+        RUNNING_JOB_IDS.delete(job.id);
     }
 }

package/dist/onboard.js

@@ -9,8 +9,8 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const utils_1 = require("./utils");
 const AI_PROVIDERS = [
-    { name: 'OpenAI (gpt-4o-mini / gpt-5.1)', value: 'openai' },
-    { name: 'Anthropic — Claude (claude-haiku / claude-sonnet)', value: 'anthropic' },
+    { name: 'OpenAI (gpt-4o-mini / gpt-5.5)', value: 'openai' },
+    { name: 'Anthropic — Claude (claude-haiku / claude-opus)', value: 'anthropic' },
     { name: 'Google Gemini (gemini-2.5-flash / gemini-2.5-pro)', value: 'gemini' },
 ];
 const SEARCH_PROVIDERS = [

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.0.37",
+  "version": "1.0.39",
   "description": "CLI for onboarding users to Omnikey AI and configuring OPENAI_API_KEY. Use Yarn for install/build.",
   "engines": {
     "node": ">=14.0.0",
@@ -27,7 +27,7 @@
   "author": "Gurinder Rawala",
   "license": "MIT",
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.80.0",
+    "@anthropic-ai/sdk": "^0.96.0",
     "@google-cloud/storage": "^7.19.0",
     "@google/genai": "^1.46.0",
     "axios": "^1.13.5",
@@ -38,7 +38,7 @@
     "express": "^4.21.2",
     "inquirer": "^9.0.0",
     "jsonwebtoken": "^9.0.3",
-    "openai": "^6.16.0",
+    "openai": "^6.37.0",
     "pg": "^8.18.0",
     "pg-hstore": "^2.3.4",
     "playwright-core": "^1.50.0",

package/src/onboard.ts

@@ -4,8 +4,8 @@ import path from 'path';
 import { getConfigDir, getConfigPath } from './utils';
 
 const AI_PROVIDERS = [
-  { name: 'OpenAI (gpt-4o-mini / gpt-5.1)', value: 'openai' },
-  { name: 'Anthropic — Claude (claude-haiku / claude-sonnet)', value: 'anthropic' },
+  { name: 'OpenAI (gpt-4o-mini / gpt-5.5)', value: 'openai' },
+  { name: 'Anthropic — Claude (claude-haiku / claude-opus)', value: 'anthropic' },
   { name: 'Google Gemini (gemini-2.5-flash / gemini-2.5-pro)', value: 'gemini' },
 ];