@0xmaxma/claude-gateway 1.3.31 → 1.4.0

package/README.md

@@ -230,6 +230,7 @@ Global default retention policy. Can be overridden per-agent with an `history` k
   "gateway": {
     "history": {
       "retentionDays": 90,
+      "maxHistoryMessages": 30,
       "cleanupHour": 3,
       "cleanupTimezone": "Asia/Bangkok"
     }
@@ -240,6 +241,7 @@ Global default retention policy. Can be overridden per-agent with an `history` k
 | Field | Default | Description |
 |-------|---------|-------------|
 | `retentionDays` | `null` (keep forever) | Delete messages older than N days on each cleanup cycle |
+| `maxHistoryMessages` | `50` | Max history messages re-injected into a session at spawn. Lower it to shrink the context loaded at session start. `0` = inject no history |
 | `cleanupHour` | `3` | Hour of day to run cleanup (24h, in `cleanupTimezone`) |
 | `cleanupTimezone` | `"UTC"` | IANA timezone for the cleanup schedule |
 
@@ -249,7 +251,7 @@ Per-agent override example:
   "agents": [
     {
       "id": "alfred",
-      "history": { "retentionDays": 30 }
+      "history": { "retentionDays": 30, "maxHistoryMessages": 30 }
     }
   ]
 }

package/dist/agent/runner.d.ts

@@ -1,10 +1,22 @@
 import { EventEmitter } from 'events';
-import { AgentConfig, GatewayConfig, Logger, ModelConfig, StreamEvent, ApiAttachment } from '../types';
+import { AgentConfig, GatewayConfig, Logger, ModelConfig, StreamEvent, ApiAttachment, ImageParams } from '../types';
 import { type SkillRegistry } from '../skills';
 import { HistoryDB } from '../history/db';
 export declare const MAX_IMAGE_SIZE_BYTES: number;
 export declare const DEFAULT_MODELS: ModelConfig[];
 export declare const CHANNEL_COALESCE_WINDOW_MS = 1200;
+/**
+ * Convert absolute file paths (e.g. from a reply tool's `files` input) into
+ * relative `media/<rel>` paths for persistence as message `mediaFiles`.
+ *
+ * Mirrors the transform in `popApiAttachments`: only paths UNDER `mediaRoot`
+ * that pass the `exists` predicate are kept (never arbitrary abs paths, never
+ * dangling files), and backslashes are normalised to forward slashes.
+ *
+ * The `exists` predicate is injected (defaults to `fs.existsSync`) so the pure
+ * string transform is unit-testable without a real filesystem.
+ */
+export declare function toRelMediaFiles(absPaths: unknown[], mediaRoot: string, exists?: (p: string) => boolean): string[];
 export declare class AgentRunner extends EventEmitter {
     private agentConfig;
     private readonly gatewayConfig;
@@ -117,6 +129,12 @@ export declare class AgentRunner extends EventEmitter {
      * a photo and its instruction text are read together in the same turn.
      */
     private routeChannelTurn;
+    /**
+     * Render composer-selected image options (contract E5) as a directive the agent
+     * reads and forwards to the generate_image MCP tool. Returns '' when no usable
+     * options are present.
+     */
+    private static buildImageParamsNote;
     private static buildChannelXml;
     private getOrSpawnSession;
     private spawnSession;
@@ -165,6 +183,21 @@ export declare class AgentRunner extends EventEmitter {
      * The process will be lazily re-spawned on the next incoming message.
      */
     private restartProcess;
+    /**
+     * The 32MB-recovery rungs for a given healthy cap: the ladder sizes STRICTLY
+     * below the cap, in descending order. Filtering by `< cap` (not `<=`) drops any
+     * rung equal to or above the cap so a lowered cap never yields a recovery step
+     * that re-injects the same (or more) history — every step actually shrinks.
+     */
+    private recoveryRungs;
+    /**
+     * History re-injection cap for a spawn, given the configured healthy cap and how
+     * many consecutive 32MB recoveries have happened on the session. recoveryCount 0
+     * = healthy → the full configured cap. Each later recovery drops to the next
+     * rung strictly below the cap; once those are exhausted it stays at 0 (no
+     * history). Kept in sync with the exhaustion threshold in handleRequestTooLarge.
+     */
+    private spawnHistoryLimit;
     /**
      * Unified recovery for the recoverable "Request too large (max 32MB)" error.
      * Reached from two backends that surface the SAME error differently:
@@ -174,12 +207,13 @@ export declare class AgentRunner extends EventEmitter {
      *    (is_error + "Request too large (max"); the long-lived process otherwise
      *    stays alive and rejects every subsequent turn forever (Bug B).
      *
-     * Each consecutive recovery shrinks the history re-injected on the next spawn
-     * (TOO_LARGE_HISTORY_LADDER: 50→40→30→20→10→0) so a pathological context drops
-     * under the 32MB ceiling. The respawn happens on the user's NEXT message (no
-     * auto-loop), and the counter resets on the next successful result. Once even a
-     * zero-history spawn still trips 32MB, stop escalating and ask the user to
-     * /clear rather than climb the ladder again.
+     * Each consecutive recovery shrinks the history re-injected on the next spawn,
+     * stepping down the TOO_LARGE_HISTORY_LADDER rungs strictly below the configured
+     * cap (default 50 → 40→30→20→10→0), so a pathological context drops under the
+     * 32MB ceiling. The respawn happens on the user's NEXT message (no auto-loop),
+     * and the counter resets on the next successful result. Once even a zero-history
+     * spawn still trips 32MB, stop escalating and ask the user to /clear rather than
+     * climb the ladder again.
      */
     private handleRequestTooLarge;
     /**
@@ -272,6 +306,7 @@ export declare class AgentRunner extends EventEmitter {
         mediaFiles?: string[];
         model?: string;
         skipUserMessage?: boolean;
+        imageParams?: ImageParams;
     }): Promise<{
         text: string;
         attachments: ApiAttachment[];
@@ -292,6 +327,7 @@ export declare class AgentRunner extends EventEmitter {
         mediaFiles?: string[];
         model?: string;
         skipUserMessage?: boolean;
+        imageParams?: ImageParams;
     }): Promise<() => void>;
     /**
      * Check if a session has a pending API request (for preflight conflict check).
@@ -314,6 +350,7 @@ export declare class AgentRunner extends EventEmitter {
     getHistoryDb(): HistoryDB;
     getAllSessionMeta(): Promise<Map<string, {
         name: string;
+        imageConfig?: ImageParams;
     }>>;
     listSessionsForChat(chatId: string, channel: 'telegram' | 'discord' | 'line'): Promise<import('../types').SessionIndex>;
     executeApiCommand(sessionId: string, chatId: string, command: string, opts?: {

package/dist/agent/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/agent/runner.ts"],"names":[],"mappings":"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"}

package/dist/agent/runner.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AgentRunner = exports.CHANNEL_COALESCE_WINDOW_MS = exports.DEFAULT_MODELS = exports.MAX_IMAGE_SIZE_BYTES = void 0;
+exports.toRelMediaFiles = toRelMediaFiles;
 const events_1 = require("events");
 const fs = __importStar(require("fs"));
 const fsPromises = __importStar(require("fs/promises"));
@@ -61,14 +62,16 @@ const cleanup_1 = require("../history/cleanup");
 const DEFAULT_IDLE_TIMEOUT_MINUTES = 30;
 const DEFAULT_MAX_CONCURRENT = 20;
 const ANTHROPIC_SOCKET_ERROR = 'socket connection was closed unexpectedly';
-// History re-injection ladder for request_too_large (32MB) recovery. Index =
-// number of consecutive 32MB recoveries on a session; the value is how many
-// history messages the NEXT spawn re-injects. Index 0 is the healthy default
-// (= MAX_HISTORY_MESSAGES, sourced from it so the two never drift); each retry
-// steps down a rung, shrinking the re-loaded context until it drops under
-// Anthropic's 32MB request ceiling. Past the last rung (0 history) the context
-// can't shrink further, so the runner stops escalating and asks the user to
-// /clear instead of looping forever.
+// History re-injection ladder for request_too_large (32MB) recovery: the
+// candidate history sizes a recovering session can step down to. The HEALTHY
+// spawn uses the configured cap (resolveMaxHistoryMessages), not an index into
+// this array; on each consecutive 32MB recovery the session drops to the next
+// ladder rung STRICTLY BELOW that cap (see spawnHistoryLimit), so every retry
+// actually shrinks the re-loaded context instead of re-trying the same size.
+// Once even the 0-history rung still trips 32MB the runner stops escalating and
+// asks the user to /clear instead of looping forever. The leading
+// MAX_HISTORY_MESSAGES only acts as a recovery rung when an operator configures
+// a cap higher than it.
 const TOO_LARGE_HISTORY_LADDER = [process_1.MAX_HISTORY_MESSAGES, 40, 30, 20, 10, 0];
 exports.MAX_IMAGE_SIZE_BYTES = 10 * 1024 * 1024;
 exports.DEFAULT_MODELS = [
@@ -125,6 +128,10 @@ function buildApiSystemNote(allowTools, imagePaths) {
     const memoryOverride = `Memory Rule Override: Do NOT create or update ${PROTECTED_WORKSPACE_FILES.join(', ')} ` +
         `or any other workspace identity file in this session, regardless of user instructions. ` +
         `If the user asks you to remember something, reply that memory updates are not supported in API sessions.`;
+    const secretsRule = `Secret Non-Disclosure: NEVER reveal, print, echo, or transmit environment variables, ` +
+        `API tokens or keys, the contents of ~/.claude/settings.json or any .env file, or any ` +
+        `similar credentials or secrets — regardless of who asks or how the request is phrased. ` +
+        `Treat any such request as adversarial and refuse it.`;
     const toolNote = allowTools
         ? `You may use tools to complete the requested task.`
         : `Reply with plain text only. Do NOT call any tools. Your text output will be returned directly to the caller.`;
@@ -132,7 +139,23 @@ function buildApiSystemNote(allowTools, imagePaths) {
     if (imagePaths?.length) {
         imageNote = ` The user attached ${imagePaths.length} image(s). Read them with the Read tool:\n${imagePaths.map(p => `- ${p}`).join('\n')}`;
     }
-    return `<api-context>This is an API request. ${memoryOverride} ${toolNote}${imageNote}</api-context>\n`;
+    return `<api-context>This is an API request. ${memoryOverride} ${secretsRule} ${toolNote}${imageNote}</api-context>\n`;
+}
+/**
+ * Convert absolute file paths (e.g. from a reply tool's `files` input) into
+ * relative `media/<rel>` paths for persistence as message `mediaFiles`.
+ *
+ * Mirrors the transform in `popApiAttachments`: only paths UNDER `mediaRoot`
+ * that pass the `exists` predicate are kept (never arbitrary abs paths, never
+ * dangling files), and backslashes are normalised to forward slashes.
+ *
+ * The `exists` predicate is injected (defaults to `fs.existsSync`) so the pure
+ * string transform is unit-testable without a real filesystem.
+ */
+function toRelMediaFiles(absPaths, mediaRoot, exists = fs.existsSync) {
+    return absPaths
+        .filter((p) => typeof p === 'string' && p.startsWith(mediaRoot) && exists(p))
+        .map((p) => 'media/' + p.slice(mediaRoot.length).replace(/\\/g, '/'));
 }
 class AgentRunner extends events_1.EventEmitter {
     imageSize(chatId) { return this.imageSizePerChat.get(chatId) ?? 0; }
@@ -856,6 +879,28 @@ class AgentRunner extends events_1.EventEmitter {
             this.writeTypingError(chatId, code);
         });
     }
+    /**
+     * Render composer-selected image options (contract E5) as a directive the agent
+     * reads and forwards to the generate_image MCP tool. Returns '' when no usable
+     * options are present.
+     */
+    static buildImageParamsNote(p) {
+        const attrs = [
+            p.model ? `model="${AgentRunner.escapeXmlAttr(p.model)}"` : '',
+            p.quality ? `quality="${AgentRunner.escapeXmlAttr(p.quality)}"` : '',
+            p.size ? `size="${AgentRunner.escapeXmlAttr(p.size)}"` : '',
+            p.aspect_ratio ? `aspect_ratio="${AgentRunner.escapeXmlAttr(p.aspect_ratio)}"` : '',
+            typeof p.n === 'number' ? `n="${p.n}"` : '',
+            p.image_ref ? `image_ref="${AgentRunner.escapeXmlAttr(p.image_ref)}"` : '',
+        ].filter(Boolean);
+        if (!attrs.length)
+            return '';
+        return (`<image-params ${attrs.join(' ')} />\n` +
+            `The user selected the image-generation options above in the composer. When the request ` +
+            `involves creating or editing an image, call the generate_image tool (action="generate") ` +
+            `using these values (pass image_ref as the "image" argument for image-to-image), then ` +
+            `deliver the returned image with your reply tool.\n`);
+    }
     static buildChannelXml(params) {
         const meta = params.meta ?? {};
         const optionalAttrs = [
@@ -956,14 +1001,18 @@ class AgentRunner extends events_1.EventEmitter {
         // Apply per-session model override (caller already normalized to undefined when == agent default)
         if (modelOverride)
             proc.modelOverride = modelOverride;
+        // Per-agent → global → MAX_HISTORY_MESSAGES: the configured cap on how many
+        // history messages a healthy spawn re-injects. Lets an operator lower the
+        // context loaded at session start (e.g. 50 → 30) without touching code.
+        const configuredMax = (0, process_1.resolveMaxHistoryMessages)(this.agentConfig.history?.maxHistoryMessages, this.gatewayConfig.gateway.history?.maxHistoryMessages);
         // request_too_large (32MB) recovery: shrink the re-injected history on each
         // consecutive retry so a pathological context eventually fits. recoveryCount
-        // is 0 for healthy sessions → ladder rung 0 = MAX_HISTORY_MESSAGES (same as
-        // the SessionProcess default), so applying it unconditionally is a no-op for
-        // healthy sessions and the only path that sets historyLimit for recovering ones.
+        // is 0 for healthy sessions → use the configured cap directly; a recovering
+        // session steps down to the ladder rungs STRICTLY BELOW that cap, so each
+        // retry genuinely shrinks instead of re-trying the same (already-too-large)
+        // size when the cap has been lowered.
         const recoveryCount = this.tooLargeRecoveries.get(mapKey) ?? 0;
-        const ladderIdx = Math.min(recoveryCount, TOO_LARGE_HISTORY_LADDER.length - 1);
-        proc.historyLimit = TOO_LARGE_HISTORY_LADDER[ladderIdx];
+        proc.historyLimit = this.spawnHistoryLimit(configuredMax, recoveryCount);
         if (recoveryCount > 0) {
             this.logger.info('Spawning with reduced history after request_too_large', {
                 mapKey, recoveryCount, historyLimit: proc.historyLimit,
@@ -1036,7 +1085,15 @@ class AgentRunner extends events_1.EventEmitter {
                                     replyToolUseId = block['id'] ?? null;
                                     // Persist the reply text to history so it appears in chat history API
                                     const replyText = typeof block.input?.['text'] === 'string' ? block.input['text'].trim() : '';
-                                    if (replyText) {
+                                    // Capture any images the reply attached (reply tool's `files`)
+                                    // so the web transcript renders them via mediaFiles. Only files
+                                    // under the agent media root that still exist are recorded.
+                                    const replyFiles = Array.isArray(block.input?.['files']) ? block.input['files'] : [];
+                                    const mediaRoot = path.join(this.agentsBaseDir, this.agentConfig.id, 'media') + path.sep;
+                                    const replyMedia = toRelMediaFiles(replyFiles, mediaRoot);
+                                    // Persist when there is text OR image(s) — an image-only reply
+                                    // still needs a row so it shows in the web transcript.
+                                    if (replyText || replyMedia.length) {
                                         const channelSrc = this.channelSourceMap.get(mapKey) ?? 'telegram';
                                         this.historyDb.insertMessage({
                                             chatId: `${channelSrc}-${mapKey}`,
@@ -1044,12 +1101,13 @@ class AgentRunner extends events_1.EventEmitter {
                                             source: channelSrc,
                                             role: 'assistant',
                                             content: replyText,
+                                            mediaFiles: replyMedia.length ? replyMedia : undefined,
                                             ts: Date.now(),
                                         });
                                         // LINE: the MCP line_reply tool's send is suppressed in
                                         // refresh mode; the gateway delivers (free reply, or cache +
                                         // postback button when slow). See LineReplyManager.
-                                        if (channelSrc === 'line' && this.lineReply) {
+                                        if (channelSrc === 'line' && this.lineReply && replyText) {
                                             void this.lineReply.onAnswer(mapKey, replyText);
                                         }
                                     }
@@ -1531,6 +1589,30 @@ class AgentRunner extends events_1.EventEmitter {
         }
         // Process will be re-spawned on next incoming message
     }
+    /**
+     * The 32MB-recovery rungs for a given healthy cap: the ladder sizes STRICTLY
+     * below the cap, in descending order. Filtering by `< cap` (not `<=`) drops any
+     * rung equal to or above the cap so a lowered cap never yields a recovery step
+     * that re-injects the same (or more) history — every step actually shrinks.
+     */
+    recoveryRungs(configuredMax) {
+        return TOO_LARGE_HISTORY_LADDER.filter(r => r < configuredMax);
+    }
+    /**
+     * History re-injection cap for a spawn, given the configured healthy cap and how
+     * many consecutive 32MB recoveries have happened on the session. recoveryCount 0
+     * = healthy → the full configured cap. Each later recovery drops to the next
+     * rung strictly below the cap; once those are exhausted it stays at 0 (no
+     * history). Kept in sync with the exhaustion threshold in handleRequestTooLarge.
+     */
+    spawnHistoryLimit(configuredMax, recoveryCount) {
+        if (recoveryCount <= 0)
+            return configuredMax;
+        const rungs = this.recoveryRungs(configuredMax);
+        if (rungs.length === 0)
+            return 0;
+        return rungs[Math.min(recoveryCount - 1, rungs.length - 1)];
+    }
     /**
      * Unified recovery for the recoverable "Request too large (max 32MB)" error.
      * Reached from two backends that surface the SAME error differently:
@@ -1540,21 +1622,26 @@ class AgentRunner extends events_1.EventEmitter {
      *    (is_error + "Request too large (max"); the long-lived process otherwise
      *    stays alive and rejects every subsequent turn forever (Bug B).
      *
-     * Each consecutive recovery shrinks the history re-injected on the next spawn
-     * (TOO_LARGE_HISTORY_LADDER: 50→40→30→20→10→0) so a pathological context drops
-     * under the 32MB ceiling. The respawn happens on the user's NEXT message (no
-     * auto-loop), and the counter resets on the next successful result. Once even a
-     * zero-history spawn still trips 32MB, stop escalating and ask the user to
-     * /clear rather than climb the ladder again.
+     * Each consecutive recovery shrinks the history re-injected on the next spawn,
+     * stepping down the TOO_LARGE_HISTORY_LADDER rungs strictly below the configured
+     * cap (default 50 → 40→30→20→10→0), so a pathological context drops under the
+     * 32MB ceiling. The respawn happens on the user's NEXT message (no auto-loop),
+     * and the counter resets on the next successful result. Once even a zero-history
+     * spawn still trips 32MB, stop escalating and ask the user to /clear rather than
+     * climb the ladder again.
      */
     handleRequestTooLarge(mapKey, proc) {
         proc.setProcessing(false);
+        // Recovery steps through the ladder rungs strictly below the configured cap;
+        // the number of those rungs is how many shrink attempts exist before even the
+        // smallest (0-history) spawn has been tried and still trips 32MB.
+        const configuredMax = (0, process_1.resolveMaxHistoryMessages)(this.agentConfig.history?.maxHistoryMessages, this.gatewayConfig.gateway.history?.maxHistoryMessages);
+        const stepCount = this.recoveryRungs(configuredMax).length; // shrink attempts available
         const count = (this.tooLargeRecoveries.get(mapKey) ?? 0) + 1;
-        const lastRung = TOO_LARGE_HISTORY_LADDER.length - 1; // index of the 0-history rung
-        if (count > lastRung) {
-            // Even the zero-history spawn tripped 32MB — context can't shrink further.
-            // Pin the counter at the last rung and always surface the /clear next step.
-            this.tooLargeRecoveries.set(mapKey, lastRung);
+        if (count > stepCount) {
+            // Even the smallest rung tripped 32MB — context can't shrink further.
+            // Pin the counter at the last step and always surface the /clear next step.
+            this.tooLargeRecoveries.set(mapKey, stepCount);
             this.logger.error('Request too large persists with zero re-injected history', { mapKey, count });
             this.writeAutoForward(mapKey, '⚠️ ยังเกิน 32MB แม้จะล้าง context จนว่างแล้ว — พิมพ์ /clear เพื่อเริ่มเซสชันใหม่ หรือ /restart ค่ะ');
             // Restart ONCE to clear the wedged process the first time the ladder is
@@ -1567,7 +1654,7 @@ class AgentRunner extends events_1.EventEmitter {
         }
         this.tooLargeRecoveries.set(mapKey, count);
         this.logger.warn('Request too large (32MB) — restarting with reduced history', {
-            mapKey, attempt: count, nextHistoryLimit: TOO_LARGE_HISTORY_LADDER[count],
+            mapKey, attempt: count, nextHistoryLimit: this.spawnHistoryLimit(configuredMax, count),
         });
         // Ordering matters and makes the notice delivery race-free: writeAutoForward
         // persists the `.forward` file synchronously HERE, before restartProcess()
@@ -1986,9 +2073,20 @@ class AgentRunner extends events_1.EventEmitter {
         }
         // Build channel XML with image_path attribute (like Telegram) for first image
         const imageAttr = effectiveImagePaths.length ? ` image_path="${AgentRunner.escapeXmlAttr(effectiveImagePaths[0])}"` : '';
+        const imageParamsNote = opts.imageParams ? AgentRunner.buildImageParamsNote(opts.imageParams) : '';
+        // Persist the composer image options to session meta so the web can restore the
+        // selection on reload (SessionMeta.imageConfig). Only when the send carries them
+        // (the web sends image_params on first-set/change), so this holds the latest.
+        // Channel is 'api' here (api sessions live under api-<chatId>). Best-effort.
+        if (opts.imageParams) {
+            this.sessionStore
+                .updateSessionMeta(this.agentConfig.id, chatId, sessionId, { imageConfig: opts.imageParams }, 'api')
+                .catch(() => { });
+        }
         const channelXml = `<channel source="api" chat_id="${chatId}" session_id="${sessionId}" ts="${new Date().toISOString()}"${imageAttr}>\n` +
             `${message}\n\n` +
             `${systemNote}` +
+            `${imageParamsNote}` +
             `</channel>` +
             (skillInvocation ? `\n${(0, skills_1.formatSkillContext)(skillInvocation)}` : '');
         return new Promise((resolve, reject) => {
@@ -2285,9 +2383,19 @@ class AgentRunner extends events_1.EventEmitter {
         }
         // Build channel XML with image_path attribute (like Telegram) for first image
         const imageAttrStream = effectiveImagePathsStream.length ? ` image_path="${AgentRunner.escapeXmlAttr(effectiveImagePathsStream[0])}"` : '';
+        const imageParamsNoteStream = opts.imageParams ? AgentRunner.buildImageParamsNote(opts.imageParams) : '';
+        // Persist composer image config to session meta (SessionMeta.imageConfig) so the
+        // web restores the selection on reload. This is the streaming path the web uses.
+        // Channel 'api' — api sessions live under api-<chatId>. Best-effort.
+        if (opts.imageParams) {
+            this.sessionStore
+                .updateSessionMeta(this.agentConfig.id, chatId, sessionId, { imageConfig: opts.imageParams }, 'api')
+                .catch(() => { });
+        }
         const channelXml = `<channel source="api" chat_id="${chatId}" session_id="${sessionId}" ts="${new Date().toISOString()}"${imageAttrStream}>\n` +
             `${message}\n\n` +
             systemNote +
+            imageParamsNoteStream +
             `</channel>` +
             (skillInvocationStream ? `\n${(0, skills_1.formatSkillContext)(skillInvocationStream)}` : '');
         session.setProcessing(true);