clementine-agent 1.18.47 → 1.18.48

package/dist/agent/assistant.d.ts

@@ -29,8 +29,6 @@ import { type ToolsetName } from './toolsets.js';
  */
 export declare function estimateTokens(text: string): number;
 export declare function looksLikeContextThrashText(value: unknown): boolean;
-export declare function contextThrashRecoveryNotice(): string;
-export declare function buildContextThrashRecoveryPrompt(userRequest: string, priorFailureText?: string): string;
 /** Format a millisecond duration as a human-friendly "X ago" string. */
 export declare function formatTimeAgo(ms: number): string;
 export declare function scrubInternalContextBlocks(text: string): string;

package/dist/agent/assistant.js

@@ -200,33 +200,6 @@ class UnleashedTaskFailedError extends Error {
         this.name = 'UnleashedTaskFailedError';
     }
 }
-export function contextThrashRecoveryNotice() {
-    return [
-        'I hit a context-size recovery issue while working on that.',
-        'I saved the request and reset the session so I can continue with smaller reads instead of repeating the same large-output path.',
-    ].join(' ');
-}
-export function buildContextThrashRecoveryPrompt(userRequest, priorFailureText = '') {
-    const parts = [
-        '[CONTEXT-THRASH RECOVERY]',
-        '',
-        'The previous interactive attempt failed because tool output filled the context window and SDK autocompact thrashed. Continue the user request, but use a small diagnostic pass.',
-        '',
-        'User request:',
-        userRequest,
-        '',
-        'Recovery rules:',
-        '- Do not repeat broad reads, full log dumps, full JSON dumps, or unbounded API/list commands.',
-        '- Prefer status files, summaries, indexes, `rg`, `tail -80`, `head -80`, and `sed -n` slices.',
-        '- For cron or unleashed jobs, inspect only `status.json`, the tail of `progress.jsonl`, and the latest run preview first. Do not read full run logs unless a short slice identifies the exact file and range.',
-        '- Preserve the user intent. Identify what failed, what you changed or verified, and the next action.',
-        '- Finish with `TASK_COMPLETE:` followed by a concise user-facing summary.',
-    ];
-    if (priorFailureText.trim()) {
-        parts.push('', 'Prior failure excerpt:', priorFailureText.trim().slice(0, 1200));
-    }
-    return parts.join('\n');
-}
 /**
  * Strip lone Unicode surrogates (U+D800–U+DFFF) from a string so it can be
  * safely serialized to JSON. Lone surrogates are valid in JS strings but
@@ -3893,7 +3866,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                             responseText = '';
                             continue;
                         }
-                        responseText = responseText || contextThrashRecoveryNotice();
+                        responseText = responseText || 'I hit a context-window issue mid-task. Try again — run `!clear` if it persists.';
                     }
                     else if (errStr.includes('prompt is too long') || errStr.includes('prompt too long') || errStr.includes('context_length')) {
                         responseText = responseText || ('The conversation got too large to process (tool responses filled the context window). ' +
@@ -3941,7 +3914,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                     responseText = '';
                     if (contextRecovery) {
                         if (contextRecoveryRetries >= 1) {
-                            responseText = contextThrashRecoveryNotice();
+                            responseText = 'I hit a context-window issue mid-task. Try again — run `!clear` if it persists.';
                             staleSession = false;
                             contextRecovery = false;
                         }
@@ -3958,7 +3931,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                     }
                 }
                 if (staleSession && contextRecovery && !responseText.trim()) {
-                    responseText = contextThrashRecoveryNotice();
+                    responseText = 'I hit a context-window issue mid-task. Try again — run `!clear` if it persists.';
                 }
                 if (hitRateLimit && attempt < PersonalAssistant.RATE_LIMIT_MAX_RETRIES) {
                     const base = rateLimitRetryAfterMs
@@ -3992,7 +3965,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                         responseText = '';
                         continue;
                     }
-                    responseText = contextThrashRecoveryNotice();
+                    responseText = 'I hit a context-window issue mid-task. Try again — run `!clear` if it persists.';
                 }
                 if (looksLikeNoResponseRequested(responseText)) {
                     logger.warn({ sessionKey, attempt }, 'SDK/model returned no-response sentinel during interactive chat');

package/dist/gateway/router.d.ts

@@ -84,7 +84,6 @@ export declare class Gateway {
      */
     private _deliverDeepResult;
     private startInteractiveBackgroundTask;
-    private startContextThrashRecovery;
     /**
      * For Clementine-owned sessions, classify whether the message should be
      * delegated to a specialist agent. Returns null when routing isn't

package/dist/gateway/router.js

@@ -7,7 +7,7 @@
 import path from 'node:path';
 import { appendFileSync, existsSync, mkdirSync, readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import pino from 'pino';
-import { buildContextThrashRecoveryPrompt, contextThrashRecoveryNotice, isAutonomousNothingOutput, looksLikeContextThrashText, looksLikeProviderApiErrorResponse, oneMillionContextRecoveryMessage, PersonalAssistant, } from '../agent/assistant.js';
+import { isAutonomousNothingOutput, looksLikeProviderApiErrorResponse, oneMillionContextRecoveryMessage, PersonalAssistant, } from '../agent/assistant.js';
 import { runWithTrace, logAuditJsonl } from '../agent/hooks.js';
 import { SelfImproveLoop } from '../agent/self-improve.js';
 import { MODELS, AGENTS_DIR, TEAM_COMMS_LOG, BASE_DIR, SEEN_CHANNELS_FILE, AUTO_DELEGATE_ENABLED, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, } from '../config.js';
@@ -59,7 +59,7 @@ export function classifyChatError(err) {
         return 'rate_limit';
     if (looksLikeClaudeOneMillionContextError(msg))
         return 'one_million_context';
-    if (looksLikeContextThrashText(msg) || /context.?length|token.?limit|maximum.?context|prompt.?too.?long/i.test(msg))
+    if (/context.?length|token.?limit|maximum.?context|prompt.?too.?long|rapid_refill_breaker|autocompact|context.?refilled/i.test(msg))
         return 'context_overflow';
     if (/\b401\b|\b403\b|auth|forbidden|invalid.?api.?key|permission|does not have access|please run \/login/i.test(msg))
         return 'auth';
@@ -839,46 +839,6 @@ export class Gateway {
         return opts.ack
             ?? `On it — running this in the background. I'll follow up when it's done. Task ${task.id}. Reply "status" to check in or "cancel" to stop.`;
     }
-    startContextThrashRecovery(sessionKey, text, priorFailureText, details = {}) {
-        const currentSess = this.getSession(sessionKey);
-        const jobName = `recovery-${Date.now()}`;
-        currentSess.deepTask = {
-            jobName,
-            taskDesc: `Recover after context overflow: ${text.slice(0, 160)}`,
-            startedAt: new Date().toISOString(),
-        };
-        const agentSlug = this._agentSlugFromSessionKey(sessionKey);
-        this.recordInteractiveFailure(sessionKey, text, priorFailureText, 'context_thrash', {
-            jobName,
-            ...details,
-        });
-        this.assistant.runUnleashedTask(jobName, buildContextThrashRecoveryPrompt(text, priorFailureText), 2, undefined, undefined, undefined, 1, agentSlug).then(async (result) => {
-            if (this.sessions.get(sessionKey)?.deepTask?.jobName !== jobName) {
-                logger.info({ sessionKey, jobName }, 'Context-thrash recovery resolved after cancellation/replacement; suppressing follow-up');
-                return;
-            }
-            logger.info({ sessionKey, jobName, resultLen: result?.length ?? 0 }, 'Context-thrash recovery completed');
-            if (result && !isAutonomousNothingOutput(result)) {
-                this.assistant.injectPendingContext(sessionKey, text, result);
-                await this._deliverDeepResult(sessionKey, `[CONTEXT_THRASH_RECOVERY_RESULT] You just completed the smaller recovery pass. Summarize the result conversationally and briefly. Lead with whether the original request is fixed, still blocked, or needs approval.\n\nOriginal request: ${text.slice(0, 500)}\n\nResult:\n${result.slice(0, 3000)}`, result);
-            }
-        }).catch(async (err) => {
-            if (this.sessions.get(sessionKey)?.deepTask?.jobName !== jobName) {
-                logger.info({ sessionKey, jobName }, 'Context-thrash recovery failed after cancellation/replacement; suppressing failure follow-up');
-                return;
-            }
-            logger.error({ err, sessionKey, jobName }, 'Context-thrash recovery failed');
-            this.recordInteractiveFailure(sessionKey, text, err, 'context_thrash_recovery_failed', { jobName });
-            const failMsg = `Recovery pass failed: ${String(err).slice(0, 200)}`;
-            this.assistant.injectPendingContext(sessionKey, text, failMsg);
-            await this._deliverDeepResult(sessionKey, `[CONTEXT_THRASH_RECOVERY_RESULT] The smaller recovery pass failed: ${failMsg}. Tell the user briefly and suggest checking status/log slices, not full logs.`, failMsg);
-        }).finally(() => {
-            const s = this.sessions.get(sessionKey);
-            if (s?.deepTask?.jobName === jobName)
-                delete s.deepTask;
-        });
-        return `${contextThrashRecoveryNotice()} I restarted it as a smaller background recovery pass and will follow up here.`;
-    }
     /**
      * For Clementine-owned sessions, classify whether the message should be
      * delegated to a specialist agent. Returns null when routing isn't
@@ -2088,20 +2048,12 @@ export class Gateway {
                     delete sessState.pendingInterrupt;
                 }
                 try {
-                    // ── Phase 2: opt-in canonical SDK chat path ──────────────────
-                    // When CLEMENTINE_USE_RUNAGENT_CHAT=1 is set, route through
-                    // the new runAgent() wrapper instead of the legacy
-                    // assistant.chat path. This is the SDK-canonical pattern
-                    // (one query() call, agents map for subagents, no
-                    // wrapper layers). Today's Phase 2 connects only the
-                    // Clementine MCP server — Composio/external integrations
-                    // come in Phase 3. Useful for testing the new path on
-                    // tool-light sessions like cron-fix or memory queries.
-                    //
-                    // The legacy path (default) keeps full Composio/external
-                    // routing + all post-response handlers, so this flag is
-                    // safe to leave off until we're ready.
-                    if (process.env.CLEMENTINE_USE_RUNAGENT_CHAT === '1'
+                    // ── Phase 5: canonical SDK chat path is now DEFAULT ──────────
+                    // The new runAgent() wrapper is the canonical path. Set
+                    // CLEMENTINE_USE_RUNAGENT_CHAT=0 to fall back to legacy.
+                    // The legacy path remains as the in-process error fallback
+                    // when runAgent throws.
+                    if (process.env.CLEMENTINE_USE_RUNAGENT_CHAT !== '0'
                         && this.isTrustedPersonalSession(sessionKey)
                         && !sessState.pendingInterrupt) {
                         const { runAgent } = await import('../agent/run-agent.js');
@@ -2351,13 +2303,6 @@ export class Gateway {
                         this.clearSession(effectiveSessionKey);
                         return "Claude returned a provider API error instead of a normal answer. I've reset this session so the error does not get replayed into future context. Please try that question again.";
                     }
-                    if (response && looksLikeContextThrashText(response)) {
-                        logger.warn({ sessionKey, responsePreview: response.slice(0, 200) }, 'Context-thrash text returned from assistant — starting recovery pass');
-                        return this.startContextThrashRecovery(sessionKey, text, response, {
-                            toolActivityCount,
-                            source: 'assistant_response',
-                        });
-                    }
                     // ── Auto-plan detection ──────────────────────────────────────
                     // If the agent signals a complex task, auto-route to the orchestrator
                     const planMatch = response?.match(/^\[PLAN_NEEDED:\s*(.+?)\]\s*/);
@@ -2480,13 +2425,6 @@ export class Gateway {
                     if (chatAc.signal.aborted) {
                         return "Stopped. What would you like to do instead?";
                     }
-                    if (looksLikeContextThrashText(err)) {
-                        logger.warn({ sessionKey, err: String(err).slice(0, 300) }, 'Context-thrash exception — starting recovery pass');
-                        return this.startContextThrashRecovery(sessionKey, text, String(err), {
-                            toolActivityCount,
-                            source: 'exception',
-                        });
-                    }
                     // ── Max turns hit — auto-escalate to deep mode instead of failing silently ──
                     // This is the #1 cause of "agent stops responding": it ran out of turns
                     // exploring files, the SDK throws, and the user gets nothing.
@@ -2578,11 +2516,11 @@ export class Gateway {
             events.emit('heartbeat:start', { agent, timestamp: Date.now() });
             const hbStart = Date.now();
             try {
-                // ── Phase 4: opt-in canonical SDK heartbeat path ──────────────
-                // CLEMENTINE_USE_RUNAGENT_HEARTBEAT=1 routes through
-                // runAgentHeartbeat (no tools, Haiku, single turn). Default OFF;
-                // falls back to legacy on error.
-                const useRunAgentHeartbeat = process.env.CLEMENTINE_USE_RUNAGENT_HEARTBEAT === '1';
+                // ── Phase 5: canonical SDK heartbeat path is now DEFAULT ──────
+                // runAgentHeartbeat is the canonical path (no tools, Haiku,
+                // single turn). Set CLEMENTINE_USE_RUNAGENT_HEARTBEAT=0 to
+                // fall back to legacy.
+                const useRunAgentHeartbeat = process.env.CLEMENTINE_USE_RUNAGENT_HEARTBEAT !== '0';
                 if (useRunAgentHeartbeat) {
                     try {
                         const { runAgentHeartbeat } = await import('../agent/run-agent-heartbeat.js');
@@ -2638,11 +2576,10 @@ export class Gateway {
             const cronStart = Date.now();
             try {
                 let response;
-                // ── Phase 3: opt-in canonical SDK cron path ──────────────────
-                // CLEMENTINE_USE_RUNAGENT_CRON=1 routes the job through
-                // runAgentCron() — the canonical SDK pattern. Default OFF.
-                // Falls back to legacy on error so the job always completes.
-                const useRunAgentCron = process.env.CLEMENTINE_USE_RUNAGENT_CRON === '1';
+                // ── Phase 5: canonical SDK cron path is now DEFAULT ──────────
+                // runAgentCron() is the canonical path. Set
+                // CLEMENTINE_USE_RUNAGENT_CRON=0 to fall back to legacy.
+                const useRunAgentCron = process.env.CLEMENTINE_USE_RUNAGENT_CRON !== '0';
                 if (useRunAgentCron && !opts?.disableAllTools) {
                     try {
                         const { runAgentCron } = await import('../agent/run-agent-cron.js');
@@ -2720,11 +2657,11 @@ export class Gateway {
         const releaseLane = await lanes.acquire('cron');
         try {
             logger.info({ fromSlug, toSlug: profile.slug }, 'Running team message as autonomous task');
-            // ── Phase 4: opt-in canonical SDK team-task path ───────────────
-            // CLEMENTINE_USE_RUNAGENT_TEAM=1 routes through runAgentTeamTask
-            // (one runAgent call, SDK owns the loop — no phase wrapper).
-            // Default OFF; falls back to legacy on error.
-            const useRunAgentTeam = process.env.CLEMENTINE_USE_RUNAGENT_TEAM === '1';
+            // ── Phase 5: canonical SDK team-task path is now DEFAULT ───────
+            // runAgentTeamTask is the canonical path (one runAgent call —
+            // SDK owns the inner loop). Set CLEMENTINE_USE_RUNAGENT_TEAM=0
+            // to fall back to legacy.
+            const useRunAgentTeam = process.env.CLEMENTINE_USE_RUNAGENT_TEAM !== '0';
             if (useRunAgentTeam) {
                 try {
                     const { runAgentTeamTask } = await import('../agent/run-agent-team-task.js');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clementine-agent",
-  "version": "1.18.47",
+  "version": "1.18.48",
   "description": "Clementine — Personal AI Assistant (TypeScript)",
   "type": "module",
   "main": "dist/index.js",