clementine-agent 1.18.16 → 1.18.18

package/README.md

@@ -326,7 +326,9 @@ Your overrides live in `~/.clementine/.env` — **they survive every `npm update
 
 The dashboard exposes these spend controls in Settings -> Channels & Env ->
 Spend Guards & Context Health, including direct dollar-cap editing, Default
-Caps, Safe Recovery, and No Caps presets.
+Caps, Safe Recovery, and No Caps presets. When a dashboard change needs the
+daemon to reload, Clementine shows a Restart Clementine prompt and handles the
+restart from the browser.
 
 For spend/context tuning, `clementine budgets` gives a safer shortcut:
 

package/dist/agent/assistant.js

@@ -13,7 +13,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { query as rawQuery, listSubagents, getSubagentMessages, SYSTEM_PROMPT_DYNAMIC_BOUNDARY, } from '@anthropic-ai/claude-agent-sdk';
 import pino from 'pino';
-import { BASE_DIR, PKG_DIR, VAULT_DIR, DAILY_NOTES_DIR, SOUL_FILE, AGENTS_FILE, MEMORY_FILE, AGENTS_DIR, ASSISTANT_NAME, OWNER_NAME, MODEL, MODELS, HEARTBEAT_MAX_TURNS, SEARCH_CONTEXT_LIMIT, SEARCH_RECENCY_LIMIT, SYSTEM_PROMPT_MAX_CONTEXT_CHARS, SESSION_EXCHANGE_HISTORY_SIZE, SESSION_EXCHANGE_MAX_CHARS, INJECTED_CONTEXT_MAX_CHARS, UNLEASHED_PHASE_TURNS, UNLEASHED_DEFAULT_MAX_HOURS, UNLEASHED_MAX_PHASES, PROJECTS_META_FILE, CRON_PROGRESS_DIR, CRON_REFLECTIONS_DIR, HANDOFFS_DIR, BUDGET, TASK_BUDGET_TOKENS, IDENTITY_FILE, CLAUDE_CODE_OAUTH_TOKEN, ANTHROPIC_API_KEY as CONFIG_ANTHROPIC_API_KEY, claudeCodeDisableOneMillionForModel, currentOneMillionContextMode, normalizeClaudeModelForOneMillionContext, usesOneMillionContext, envSnapshot, } from '../config.js';
+import { BASE_DIR, PKG_DIR, VAULT_DIR, DAILY_NOTES_DIR, SOUL_FILE, AGENTS_FILE, MEMORY_FILE, AGENTS_DIR, ASSISTANT_NAME, OWNER_NAME, MODEL, MODELS, HEARTBEAT_MAX_TURNS, SEARCH_CONTEXT_LIMIT, SEARCH_RECENCY_LIMIT, SYSTEM_PROMPT_MAX_CONTEXT_CHARS, SESSION_EXCHANGE_HISTORY_SIZE, SESSION_EXCHANGE_MAX_CHARS, INJECTED_CONTEXT_MAX_CHARS, UNLEASHED_PHASE_TURNS, UNLEASHED_DEFAULT_MAX_HOURS, UNLEASHED_MAX_PHASES, PROJECTS_META_FILE, CRON_PROGRESS_DIR, CRON_REFLECTIONS_DIR, HANDOFFS_DIR, BUDGET, TASK_BUDGET_TOKENS, IDENTITY_FILE, CLAUDE_CODE_OAUTH_TOKEN, ANTHROPIC_API_KEY as CONFIG_ANTHROPIC_API_KEY, claudeCodeDisableOneMillionForModel, currentOneMillionContextMode, normalizeClaudeModelForOneMillionContext, normalizeClaudeSdkOptionsForOneMillionContext, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, usesOneMillionContext, envSnapshot, } from '../config.js';
 import { summarizeIntegrationStatus } from '../config/integrations-registry.js';
 import { loadToolPreferences, computeAvailability, buildPromptInstruction, buildComposioStatusBlock, } from '../integrations/tool-preferences.js';
 import { loadClaudeIntegrations } from './mcp-bridge.js';
@@ -288,7 +288,7 @@ const query = ((args) => {
             if (typeof opts.appendSystemPrompt === 'string') {
                 newOpts.appendSystemPrompt = stripLoneSurrogates(opts.appendSystemPrompt);
             }
-            cleaned.options = newOpts;
+            cleaned.options = normalizeClaudeSdkOptionsForOneMillionContext(newOpts);
         }
         return rawQuery(cleaned);
     }
@@ -341,8 +341,7 @@ function resultInputTokens(result) {
     return total;
 }
 export function looksLikeOneMillionContextError(value) {
-    const text = String(value ?? '');
-    return /extra usage.*1m context|1m context.*extra usage|context-1m/i.test(text);
+    return looksLikeClaudeOneMillionContextError(value);
 }
 export function looksLikeNoResponseRequested(value) {
     const text = String(value ?? '').trim();
@@ -3427,14 +3426,13 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                                         responseText = responseText || ('Claude says the account credit balance is too low. I paused background jobs for a few hours so they stop draining/retrying, but interactive chat will also fail until credits are available again.');
                                     }
                                     else if (looksLikeOneMillionContextError(errorText)) {
-                                        process.env.CLEMENTINE_1M_CONTEXT_MODE = 'off';
-                                        process.env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+                                        applyOneMillionContextRecovery();
                                         if (sessionKey) {
                                             this.sessions.delete(sessionKey);
                                             this.exchangeCounts.set(sessionKey, 0);
                                             this._compactedSessions.delete(sessionKey);
                                         }
-                                        responseText = responseText || ("Claude rejected 1M context for this account. I've switched this process to 200K recovery mode and reset the session. To persist the fix across restarts, run `clementine budgets safe`, then `clementine restart`.");
+                                        responseText = responseText || ("Claude rejected 1M context for this account. I've switched Clementine to persistent 200K recovery mode and reset the session. Restart Clementine once so every background worker starts with the same safe setting.");
                                     }
                                     else if (lower.includes('rate') && lower.includes('limit')) {
                                         hitRateLimit = true;
@@ -3559,14 +3557,13 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                         responseText = responseText || ('Claude says the account credit balance is too low. I paused background jobs for a few hours so they stop draining/retrying, but interactive chat will also fail until credits are available again.');
                     }
                     else if (looksLikeOneMillionContextError(e)) {
-                        process.env.CLEMENTINE_1M_CONTEXT_MODE = 'off';
-                        process.env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+                        applyOneMillionContextRecovery();
                         if (sessionKey) {
                             this.sessions.delete(sessionKey);
                             this.exchangeCounts.set(sessionKey, 0);
                             this._compactedSessions.delete(sessionKey);
                         }
-                        responseText = responseText || ("Claude rejected 1M context for this account. I've switched this process to 200K recovery mode and reset the session. To persist the fix across restarts, run `clementine budgets safe`, then `clementine restart`.");
+                        responseText = responseText || ("Claude rejected 1M context for this account. I've switched Clementine to persistent 200K recovery mode and reset the session. Restart Clementine once so every background worker starts with the same safe setting.");
                     }
                     else if (errStr.includes('rate') && (errStr.includes('limit') || errStr.includes('rate_limit'))) {
                         hitRateLimit = true;
@@ -4822,8 +4819,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                         throw new Error(errText);
                     }
                     if (looksLikeOneMillionContextError(errText)) {
-                        process.env.CLEMENTINE_1M_CONTEXT_MODE = 'off';
-                        process.env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+                        applyOneMillionContextRecovery();
                         throw new Error(errText);
                     }
                 }
@@ -5171,8 +5167,7 @@ You have a cost budget per message — not a hard turn limit. Work until the tas
                                 throw new Error(exitText);
                             }
                             if (looksLikeOneMillionContextError(exitText)) {
-                                process.env.CLEMENTINE_1M_CONTEXT_MODE = 'off';
-                                process.env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+                                applyOneMillionContextRecovery();
                                 throw new Error(exitText);
                             }
                         }

package/dist/agent/daily-planner.js

@@ -8,7 +8,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import pino from 'pino';
-import { BASE_DIR, CRON_REFLECTIONS_DIR, TASKS_FILE, INBOX_DIR, MODELS, } from '../config.js';
+import { BASE_DIR, CRON_REFLECTIONS_DIR, TASKS_FILE, INBOX_DIR, MODELS, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../config.js';
 import { listAllGoals } from '../tools/shared.js';
 const logger = pino({ name: 'clementine.daily-planner' });
 const PLANS_DIR = path.join(BASE_DIR, 'plans', 'daily');
@@ -253,15 +253,24 @@ Rules:
             let text = '';
             const stream = query({
                 prompt,
-                options: {
+                options: normalizeClaudeSdkOptionsForOneMillionContext({
                     model: MODELS.haiku,
                     maxTurns: 1,
                     systemPrompt: 'You are a planning assistant. Analyze the context and produce a prioritized daily plan as JSON. Return only valid JSON, no markdown fencing.',
-                },
+                }),
             });
             for await (const msg of stream) {
-                if (msg.type === 'result')
+                if (msg.type === 'result') {
+                    if (msg.is_error) {
+                        const errorText = Array.isArray(msg.errors)
+                            ? msg.errors.join('; ')
+                            : String(msg.result ?? '');
+                        if (looksLikeClaudeOneMillionContextError(errorText))
+                            applyOneMillionContextRecovery();
+                        throw new Error(errorText || 'Claude SDK query failed');
+                    }
                     text = msg.result ?? '';
+                }
             }
             if (!text) {
                 logger.warn('LLM returned empty plan — using fallback');
@@ -278,6 +287,8 @@ Rules:
             return plan;
         }
         catch (err) {
+            if (looksLikeClaudeOneMillionContextError(err))
+                applyOneMillionContextRecovery();
             logger.warn({ err }, 'LLM plan generation failed — using fallback');
             return this.fallbackPlan(today);
         }

package/dist/agent/mcp-bridge.js

@@ -10,7 +10,7 @@ import { existsSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import pino from 'pino';
-import { BASE_DIR } from '../config.js';
+import { BASE_DIR, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../config.js';
 const logger = pino({ name: 'clementine.mcp-bridge' });
 const MCP_SERVERS_FILE = path.join(BASE_DIR, 'mcp-servers.json');
 const INTEGRATIONS_FILE = path.join(BASE_DIR, 'claude-integrations.json');
@@ -435,13 +435,13 @@ export async function probeAvailableTools(force = false) {
         const externalMcpServers = getMcpServersForAgent();
         const stream = query({
             prompt: 'ok',
-            options: {
+            options: normalizeClaudeSdkOptionsForOneMillionContext({
                 systemPrompt: 'Reply ok.',
                 model: 'claude-haiku-4-5',
                 permissionMode: 'bypassPermissions',
                 allowDangerouslySkipPermissions: true,
                 mcpServers: externalMcpServers,
-            },
+            }),
         });
         let tools = [];
         for await (const msg of stream) {
@@ -449,8 +449,14 @@ export async function probeAvailableTools(force = false) {
                 tools = msg.tools;
                 break;
             }
-            if (msg?.type === 'result')
+            if (msg?.type === 'result') {
+                if (msg.is_error) {
+                    const errorText = Array.isArray(msg.errors) ? msg.errors.join('; ') : String(msg.result ?? '');
+                    if (looksLikeClaudeOneMillionContextError(errorText))
+                        applyOneMillionContextRecovery();
+                }
                 break;
+            }
         }
         const inv = { probedAt: new Date().toISOString(), tools };
         saveToolInventory(inv);
@@ -471,6 +477,8 @@ export async function probeAvailableTools(force = false) {
         return inv;
     }
     catch (err) {
+        if (looksLikeClaudeOneMillionContextError(err))
+            applyOneMillionContextRecovery();
         logger.warn({ err }, 'Tool inventory probe failed — using cached or empty');
         return cached ?? { probedAt: new Date(0).toISOString(), tools: [] };
     }

package/dist/agent/strategic-planner.js

@@ -12,7 +12,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import path from 'node:path';
 import pino from 'pino';
-import { BASE_DIR, GOALS_DIR, MODELS } from '../config.js';
+import { BASE_DIR, GOALS_DIR, MODELS, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../config.js';
 import { listAllGoals } from '../tools/shared.js';
 const logger = pino({ name: 'clementine.strategic-planner' });
 const DAILY_PLANS_DIR = path.join(BASE_DIR, 'plans', 'daily');
@@ -23,15 +23,24 @@ async function llmJsonCall(prompt, systemPrompt) {
     let text = '';
     const stream = query({
         prompt,
-        options: {
+        options: normalizeClaudeSdkOptionsForOneMillionContext({
             model: MODELS.haiku,
             maxTurns: 1,
             systemPrompt,
-        },
+        }),
     });
     for await (const msg of stream) {
-        if (msg.type === 'result')
+        if (msg.type === 'result') {
+            if (msg.is_error) {
+                const errorText = Array.isArray(msg.errors)
+                    ? msg.errors.join('; ')
+                    : String(msg.result ?? '');
+                if (looksLikeClaudeOneMillionContextError(errorText))
+                    applyOneMillionContextRecovery();
+                throw new Error(errorText || 'Claude SDK query failed');
+            }
             text = msg.result ?? '';
+        }
     }
     return text;
 }

package/dist/brain/adapters/pdf.js

@@ -14,7 +14,7 @@ import { readFileSync } from 'node:fs';
 import path from 'node:path';
 import pdfParse from 'pdf-parse';
 import { contentHash } from './common.js';
-import { MODELS } from '../../config.js';
+import { MODELS, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../../config.js';
 export async function* parsePdf(filePath) {
     let buf;
     try {
@@ -91,7 +91,7 @@ async function ocrPdfViaClaude(filePath) {
         const { query } = await import('@anthropic-ai/claude-agent-sdk');
         const stream = query({
             prompt: `Read the PDF at ${JSON.stringify(filePath)} using the Read tool. Transcribe every page's text verbatim — preserve the reading order, headings, lists, and paragraphs exactly as they appear. Separate pages with the form-feed character (\\f). Do NOT summarize, paraphrase, add commentary, or wrap in code fences. Output only the transcribed text.`,
-            options: {
+            options: normalizeClaudeSdkOptionsForOneMillionContext({
                 model: MODELS.haiku,
                 maxTurns: 4, // Read tool call + response (a few turns of thinking is fine)
                 systemPrompt: 'You are a faithful OCR transcriber. Copy text exactly as written. When the PDF has images or scans, read the text from them using vision. Never invent content.',
@@ -99,7 +99,7 @@ async function ocrPdfViaClaude(filePath) {
                 allowedTools: ['Read'],
                 permissionMode: 'bypassPermissions',
                 settingSources: [],
-            },
+            }),
         });
         let text = '';
         for await (const message of stream) {
@@ -113,6 +113,13 @@ async function ocrPdfViaClaude(filePath) {
                 }
             }
             else if (message.type === 'result') {
+                const result = message;
+                if (result.is_error) {
+                    const errorText = Array.isArray(result.errors) ? result.errors.join('; ') : String(result.result ?? '');
+                    if (looksLikeClaudeOneMillionContextError(errorText))
+                        applyOneMillionContextRecovery();
+                    return [];
+                }
                 break;
             }
         }
@@ -121,7 +128,9 @@ async function ocrPdfViaClaude(filePath) {
             return [];
         return splitPages(cleaned);
     }
-    catch {
+    catch (err) {
+        if (looksLikeClaudeOneMillionContextError(err))
+            applyOneMillionContextRecovery();
         return [];
     }
 }

package/dist/brain/llm-client.js

@@ -13,7 +13,7 @@
  * pipeline can be verified without spawning the SDK subprocess.
  */
 import { query } from '@anthropic-ai/claude-agent-sdk';
-import { MODELS } from '../config.js';
+import { MODELS, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../config.js';
 let override = null;
 /** Inject a deterministic override (used by tests). Pass null to restore. */
 export function setLLMOverride(fn) {
@@ -29,10 +29,11 @@ export async function callLLM(prompt, opts = {}) {
     if (opts.format === 'json') {
         systemParts.push('Respond with a single valid JSON object. No prose, no code fences, no explanation.');
     }
+    const model = opts.model ?? MODELS.haiku;
     const stream = query({
         prompt,
-        options: {
-            model: opts.model ?? MODELS.haiku,
+        options: normalizeClaudeSdkOptionsForOneMillionContext({
+            model,
             maxTurns: 1,
             systemPrompt: systemParts.join('\n\n') || undefined,
             // No built-in tools: brain calls are pure completions
@@ -42,7 +43,7 @@ export async function callLLM(prompt, opts = {}) {
             // allowed-tool lists, and statusline config that can slow or
             // fail our minimal call.
             settingSources: [],
-        },
+        }),
     });
     let assistantText = '';
     for await (const message of stream) {
@@ -56,6 +57,13 @@ export async function callLLM(prompt, opts = {}) {
             }
         }
         else if (message.type === 'result') {
+            const result = message;
+            if (result.is_error) {
+                const errorText = Array.isArray(result.errors) ? result.errors.join('; ') : String(result.result ?? '');
+                if (looksLikeClaudeOneMillionContextError(errorText))
+                    applyOneMillionContextRecovery();
+                throw new Error(errorText || 'Claude SDK query failed');
+            }
             break; // Single-turn done
         }
     }

package/dist/cli/dashboard.js

@@ -18,7 +18,7 @@ import cron from 'node-cron';
 import { TunnelManager } from './tunnel.js';
 import { AgentManager } from '../agent/agent-manager.js';
 import { discoverMcpServers, getClaudeIntegrations } from '../agent/mcp-bridge.js';
-import { AGENTS_DIR, SESSIONS_FILE } from '../config.js';
+import { AGENTS_DIR, SESSIONS_FILE, applyOneMillionContextRecovery, looksLikeClaudeOneMillionContextError, normalizeClaudeSdkOptionsForOneMillionContext, } from '../config.js';
 import { parseTasks } from '../tools/shared.js';
 import { todayISO } from '../gateway/cron-scheduler.js';
 import { goalsRouter } from './routes/goals.js';
@@ -2066,7 +2066,14 @@ export async function cmdDashboard(opts) {
                 }
                 catch { /* ignore */ }
             }
-            oauthQuery = sdkQuery({ prompt: '', options: { permissionMode: 'bypassPermissions', allowDangerouslySkipPermissions: true, maxTurns: 0 } });
+            oauthQuery = sdkQuery({
+                prompt: '',
+                options: normalizeClaudeSdkOptionsForOneMillionContext({
+                    permissionMode: 'bypassPermissions',
+                    allowDangerouslySkipPermissions: true,
+                    maxTurns: 0,
+                }),
+            });
             const result = await oauthQuery.claudeAuthenticate(true);
             res.json({ ok: true, result });
         }
@@ -4003,7 +4010,7 @@ export async function cmdDashboard(opts) {
 Return ONLY a JSON array. Each element must be an object with shape \`{"id": string, "label": string, "sublabel"?: string}\`. Use the source system's stable id for \`id\` (so the feed can reference it later). Use a short human-readable title for \`label\`. Optional \`sublabel\` can include path, email, date, or any disambiguating detail.
 Do NOT include prose, markdown, code fences, or explanation. Just the JSON array.
 If the tool returns nothing or errors, return an empty array \`[]\`.`,
-                options: {
+                options: normalizeClaudeSdkOptionsForOneMillionContext({
                     model: MODELS.haiku,
                     maxTurns: 3,
                     systemPrompt: 'You are a data enumerator. You call the given tool once, extract the items from its response, and emit a strict JSON array. No commentary.',
@@ -4011,7 +4018,7 @@ If the tool returns nothing or errors, return an empty array \`[]\`.`,
                     mcpServers,
                     permissionMode: 'bypassPermissions',
                     settingSources: [],
-                },
+                }),
             });
             let text = '';
             for await (const msg of stream) {
@@ -4023,6 +4030,13 @@ If the tool returns nothing or errors, return an empty array \`[]\`.`,
                     }
                 }
                 else if (msg.type === 'result') {
+                    if (msg.is_error) {
+                        const errorText = Array.isArray(msg.errors)
+                            ? msg.errors.join('; ')
+                            : String(msg.result ?? '');
+                        if (looksLikeClaudeOneMillionContextError(errorText))
+                            applyOneMillionContextRecovery();
+                    }
                     break;
                 }
             }
@@ -4039,6 +4053,8 @@ If the tool returns nothing or errors, return an empty array \`[]\`.`,
             res.json({ items, cached: false, rawPreview: text.slice(0, 400) });
         }
         catch (err) {
+            if (looksLikeClaudeOneMillionContextError(err))
+                applyOneMillionContextRecovery();
             res.status(500).json({ error: err instanceof Error ? err.message : String(err) });
         }
     });
@@ -6321,20 +6337,30 @@ If the tool returns nothing or errors, return an empty array \`[]\`.`,
                     let result = '';
                     const stream = query({
                         prompt,
-                        options: {
+                        options: normalizeClaudeSdkOptionsForOneMillionContext({
                             model: 'claude-haiku-4-5-20251001',
                             maxTurns: 1,
                             systemPrompt: 'You are a memory consolidation assistant. Extract only facts directly evidenced by the corpus. Be terse. Output exactly the requested format.',
-                        },
+                        }),
                     });
                     for await (const msg of stream) {
                         if (msg.type === 'result') {
+                            if (msg.is_error) {
+                                const errorText = Array.isArray(msg.errors)
+                                    ? (msg.errors ?? []).join('; ')
+                                    : String(msg.result ?? '');
+                                if (looksLikeClaudeOneMillionContextError(errorText))
+                                    applyOneMillionContextRecovery();
+                                return '';
+                            }
                             result = msg.result ?? '';
                         }
                     }
                     return result;
                 }
-                catch {
+                catch (err) {
+                    if (looksLikeClaudeOneMillionContextError(err))
+                        applyOneMillionContextRecovery();
                     return '';
                 }
             };
@@ -15414,7 +15440,7 @@ if('serviceWorker' in navigator){navigator.serviceWorker.getRegistrations().then
         <div class="tab-pane active" id="tab-settings-general">
           <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:16px">
             <p style="color:var(--text-muted);margin:0">Manage API keys and configuration. Changes are saved to <code>~/.clementine/.env</code>.</p>
-            <button class="btn-sm" style="white-space:nowrap;background:var(--bg-tertiary);border:1px solid var(--border);color:var(--text-primary);padding:6px 12px;border-radius:6px;cursor:pointer" onclick="restartDashboard()">Restart Dashboard</button>
+            <button class="btn-sm btn-primary" style="white-space:nowrap;padding:6px 12px;border-radius:6px;cursor:pointer" onclick="restartDaemonFromDashboard()">Restart Clementine</button>
           </div>
           <div id="budget-health-content" style="margin-bottom:16px"><div class="empty-state">Loading budget health...</div></div>
           <div id="settings-content"><div class="empty-state">Loading settings...</div></div>
@@ -15579,8 +15605,8 @@ if('serviceWorker' in navigator){navigator.serviceWorker.getRegistrations().then
           <div class="card" style="margin-bottom:16px">
             <div class="card-header">Diagnostics &amp; maintenance</div>
             <div class="card-body" style="padding:16px;display:flex;gap:8px;flex-wrap:wrap">
+              <button class="btn-sm btn-primary" onclick="restartDaemonFromDashboard()">Restart Clementine</button>
               <button class="btn-sm" onclick="restartDashboard()">Restart Dashboard</button>
-              <button class="btn-sm" onclick="if(confirm('Restart the daemon? Active sessions drain first.')) apiPost('/api/restart')">Restart Daemon</button>
               <button class="btn-sm" onclick="apiFetch('/api/doctor').then(function(r){return r.text()}).then(function(t){alert(t)})">Run Doctor</button>
               <button class="btn-sm" onclick="apiFetch('/api/version').then(function(r){return r.json()}).then(function(d){alert('Version: '+(d.version||'?')+'\\nNode: '+(d.node||'?'))})">Build info</button>
             </div>
@@ -17633,6 +17659,7 @@ async function apiPost(url) {
     if (d.ok) toast(d.message, 'success');
     else toast(d.error || 'Error', 'error');
     setTimeout(refreshAll, 1000);
+    return d;
   } catch(e) { toast(String(e), 'error'); }
 }
 async function apiJson(method, url, body) {
@@ -17656,9 +17683,84 @@ async function apiDelete(url) {
     if (d.ok) toast(d.message, 'success');
     else toast(d.error || 'Error', 'error');
     setTimeout(refreshAll, 500);
+    return d;
   } catch(e) { toast(String(e), 'error'); }
 }
 
+function settingRequiresDaemonRestart(key) {
+  if (!key) return true;
+  if (key === 'COMPOSIO_API_KEY' || key === 'COMPOSIO_USER_ID') return false;
+  if (key.indexOf('ASSISTANT_') === 0) return false;
+  return true;
+}
+
+function renderRestartRequiredBanner() {
+  var reason = '';
+  try { reason = localStorage.getItem('clem-restart-required') || ''; } catch(e) { reason = ''; }
+  var existing = document.getElementById('restart-required-banner');
+  if (!reason) {
+    if (existing) existing.remove();
+    return;
+  }
+  if (!existing) {
+    existing = document.createElement('div');
+    existing.id = 'restart-required-banner';
+    existing.style.cssText = 'position:fixed;left:18px;right:18px;bottom:18px;z-index:9999;display:flex;align-items:center;justify-content:space-between;gap:12px;flex-wrap:wrap;border:1px solid var(--border);border-radius:8px;background:var(--bg-secondary);box-shadow:0 8px 28px rgba(0,0,0,0.28);padding:12px 14px;color:var(--text-primary)';
+    document.body.appendChild(existing);
+  }
+  existing.innerHTML = '<div style="min-width:220px;flex:1"><div style="font-weight:700;font-size:13px">Restart required</div>'
+    + '<div style="font-size:12px;color:var(--text-secondary);margin-top:2px">' + esc(reason) + '</div></div>'
+    + '<div style="display:flex;gap:8px;align-items:center;flex-wrap:wrap">'
+    + '<button class="btn-sm btn-primary" onclick="restartDaemonFromDashboard()">Restart Clementine</button>'
+    + '<button class="btn-sm" onclick="dismissRestartRequiredBanner()">Later</button>'
+    + '</div>';
+}
+
+function markRestartRequired(reason) {
+  var msg = reason || 'This change needs a Clementine restart before the daemon and channel workers use it.';
+  try { localStorage.setItem('clem-restart-required', msg); } catch(e) { /* ignore */ }
+  renderRestartRequiredBanner();
+}
+
+function clearRestartRequired() {
+  try { localStorage.removeItem('clem-restart-required'); } catch(e) { /* ignore */ }
+  var existing = document.getElementById('restart-required-banner');
+  if (existing) existing.remove();
+}
+
+function dismissRestartRequiredBanner() {
+  var existing = document.getElementById('restart-required-banner');
+  if (existing) existing.remove();
+}
+
+async function restartDaemonFromDashboard(skipConfirm) {
+  if (!skipConfirm && !confirm('Restart Clementine now? Active work may pause briefly while the daemon reloads.')) return;
+  toast('Restarting Clementine...', 'info');
+  try {
+    var r = await apiFetch('/api/restart', { method: 'POST' });
+    var d = {};
+    try { d = await r.json(); } catch(e) { d = {}; }
+    if (!r.ok || d.error) {
+      var err = String(d.error || 'Restart failed');
+      if (/not running/i.test(err)) {
+        var launch = await apiFetch('/api/launch', { method: 'POST' });
+        var launchData = await launch.json();
+        if (!launch.ok || launchData.error) throw new Error(launchData.error || 'Launch failed');
+        clearRestartRequired();
+        toast('Clementine started', 'success');
+        setTimeout(refreshAll, 2000);
+        return;
+      }
+      throw new Error(err);
+    }
+    clearRestartRequired();
+    toast('Clementine restart requested', 'success');
+    setTimeout(refreshAll, 2500);
+  } catch(e) {
+    toast('Restart failed: ' + String(e), 'error');
+  }
+}
+
 // ── Status + Overview ─────────────────────
 let lastStatusData = {};
 async function refreshStatus(preloaded) {
@@ -18809,6 +18911,7 @@ async function saveHeartbeatControl() {
     if (!r.ok || d.error) throw new Error(d.error || 'Save failed');
     if (statusEl) { statusEl.textContent = 'Saved. Restart daemon for schedule changes.'; statusEl.style.color = 'var(--green)'; }
     toast('Heartbeat controls saved', 'success');
+    markRestartRequired('Heartbeat control changes need a Clementine restart before the schedule uses them.');
   } catch(e) {
     if (statusEl) { statusEl.textContent = 'Save failed'; statusEl.style.color = 'var(--red)'; }
     toast(String(e), 'error');
@@ -20071,13 +20174,15 @@ async function postBudgetAction(url, body) {
 }
 
 async function applySafeBudgetPreset() {
-  await postBudgetAction('/api/budgets/safe', {});
+  var d = await postBudgetAction('/api/budgets/safe', {});
+  if (d && d.ok) markRestartRequired('Safe Recovery changed spend/context settings. Restart Clementine to apply them to chat and background workers.');
   refreshSettings();
 }
 
 async function applyBudgetPreset(preset) {
   if (preset === 'uncapped' && !confirm('Remove all spend caps? Clementine can still hit account limits or credits if a job runs long.')) return;
-  await postBudgetAction('/api/budgets/preset', { preset: preset });
+  var d = await postBudgetAction('/api/budgets/preset', { preset: preset });
+  if (d && d.ok) markRestartRequired('Spend guard changes need a Clementine restart before running workers use the new caps.');
   refreshSettings();
 }
 
@@ -20090,12 +20195,14 @@ async function saveBudgetCap(key) {
     toast('Budget must be a non-negative dollar amount. Use 0 for no cap.', 'error');
     return;
   }
-  await postBudgetAction('/api/budgets/set', { key: key, value: value });
+  var d = await postBudgetAction('/api/budgets/set', { key: key, value: value });
+  if (d && d.ok) markRestartRequired('Budget cap changes need a Clementine restart before running workers use the new value.');
   refreshSettings();
 }
 
 async function setBudgetContextMode(mode) {
-  await postBudgetAction('/api/budgets/1m', { mode: mode });
+  var d = await postBudgetAction('/api/budgets/1m', { mode: mode });
+  if (d && d.ok) markRestartRequired('1M context changes need a Clementine restart before new Claude calls use the setting.');
   refreshSettings();
 }
 
@@ -20105,7 +20212,10 @@ async function forceBudgetOneMillion() {
 }
 
 async function applyBudgetDoctorFix() {
-  await postBudgetAction('/api/budgets/doctor-fix', {});
+  var d = await postBudgetAction('/api/budgets/doctor-fix', {});
+  if (d && d.ok && d.result && d.result.changed && d.result.changed.length) {
+    markRestartRequired('Doctor Fix changed Clementine configuration. Restart Clementine to apply the fixes.');
+  }
   refreshSettings();
 }
 
@@ -20209,8 +20319,7 @@ async function refreshSettings() {
       + '</div></div>';
 
     html += '<div style="padding:12px;color:var(--text-muted);font-size:12px">'
-      + '<strong>Note:</strong> Changes to API keys require a daemon restart to take effect. '
-      + 'Use <code>clementine restart</code> after updating channel tokens.'
+      + '<strong>Note:</strong> Changes that require a daemon restart show a Restart Clementine prompt here in the dashboard.'
       + '</div>';
     container.innerHTML = html;
 
@@ -20273,8 +20382,11 @@ async function toggleSetting(el) {
 async function saveSettingValue(key, value) {
   var statusEl = document.getElementById('setting-' + key + '-status');
   try {
-    await apiJson('PUT', '/api/settings/' + encodeURIComponent(key), { value: value });
+    var result = await apiJson('PUT', '/api/settings/' + encodeURIComponent(key), { value: value });
     if (statusEl) { statusEl.textContent = 'Saved'; statusEl.style.color = 'var(--green)'; setTimeout(function(){ statusEl.textContent = ''; }, 2000); }
+    if (result && result.ok && settingRequiresDaemonRestart(key)) {
+      markRestartRequired(key + ' changed. Restart Clementine so the daemon and channel workers use the new value.');
+    }
   } catch(e) {
     if (statusEl) { statusEl.textContent = 'Error'; statusEl.style.color = 'var(--red)'; }
   }
@@ -20299,8 +20411,11 @@ async function saveAssistantPreferences() {
 async function removeSetting(key) {
   if (!confirm('Remove ' + key + ' from .env?')) return;
   try {
-    await apiDelete('/api/settings/' + encodeURIComponent(key));
+    var result = await apiDelete('/api/settings/' + encodeURIComponent(key));
     toast(key + ' removed', 'success');
+    if (result && result.ok && settingRequiresDaemonRestart(key)) {
+      markRestartRequired(key + ' was removed. Restart Clementine so running workers stop using the old value.');
+    }
     refreshSettings();
   } catch(e) { toast('Failed: ' + e, 'error'); }
 }
@@ -20330,8 +20445,11 @@ async function addCustomEnv() {
   if (!key || !value) { toast('Both key and value are required', 'error'); return; }
   if (!/^[A-Z_][A-Z0-9_]*$/.test(key)) { toast('Invalid key format — use UPPER_SNAKE_CASE', 'error'); return; }
   try {
-    await apiJson('PUT', '/api/settings/' + encodeURIComponent(key), { value: value });
+    var result = await apiJson('PUT', '/api/settings/' + encodeURIComponent(key), { value: value });
     toast(key + ' added', 'success');
+    if (result && result.ok && settingRequiresDaemonRestart(key)) {
+      markRestartRequired(key + ' was added. Restart Clementine so the daemon and channel workers can use it.');
+    }
     keyInput.value = '';
     valInput.value = '';
     refreshSettings();
@@ -27701,6 +27819,7 @@ async function refreshSalesforce() {
 
 // ── Initial load — single batch request instead of 12+ parallel fetches ──
 (async function initDashboard() {
+  renderRestartRequiredBanner();
   try {
     var r = await apiFetch('/api/init');
     var d = await r.json();
@@ -27772,6 +27891,7 @@ try {
         if (currentPage === 'home') refreshSessions();
       }
       if (evt.type === 'daemon_restarted') {
+        clearRestartRequired();
         toast('Daemon restarted \u2014 refreshing data...', 'info');
         setTimeout(function() { refreshAll(); }, 1500);
       }

package/dist/config.d.ts

@@ -15,6 +15,17 @@ export type OneMillionContextMode = 'auto' | 'off' | 'on';
 export declare const CLEMENTINE_1M_CONTEXT_MODE: OneMillionContextMode;
 export declare function currentOneMillionContextMode(): OneMillionContextMode;
 export declare function claudeCodeDisableOneMillionForModel(model: string | null | undefined, mode?: OneMillionContextMode): '1' | '0' | undefined;
+export declare function looksLikeClaudeOneMillionContextError(value: unknown): boolean;
+export declare function applyOneMillionContextRecovery(baseDir?: string): void;
+export declare function claudeOneMillionEnvForModel(model: string | null | undefined, mode?: OneMillionContextMode): Record<string, string>;
+type ClaudeSdkOptionsLike = {
+    model?: string;
+    env?: Record<string, string | undefined>;
+    betas?: unknown[];
+    mcpServers?: Record<string, unknown>;
+    [key: string]: unknown;
+};
+export declare function normalizeClaudeSdkOptionsForOneMillionContext<T extends ClaudeSdkOptionsLike>(options: T): T;
 export declare function normalizeClaudeModelForOneMillionContext(model: string, mode?: OneMillionContextMode): string;
 export declare function usesOneMillionContext(model: string | null | undefined, mode?: OneMillionContextMode): boolean;
 /**
@@ -196,4 +207,5 @@ export declare function getCredential(ref: string): string | null;
 export declare function setCredential(ref: string, value: string): void;
 /** List known credential refs (not their values) for dashboard display. */
 export declare function listCredentialRefs(): string[];
+export {};
 //# sourceMappingURL=config.d.ts.map

package/dist/config.js

@@ -88,6 +88,82 @@ export function claudeCodeDisableOneMillionForModel(model, mode = currentOneMill
         return '0';
     return modelFamily(model) === 'opus' ? undefined : '1';
 }
+function upsertRuntimeEnvValue(baseDir, key, value) {
+    const envPath = path.join(baseDir, '.env');
+    let text = '';
+    if (existsSync(envPath)) {
+        text = readFileSync(envPath, 'utf-8');
+    }
+    else {
+        fs.mkdirSync(baseDir, { recursive: true });
+    }
+    const line = `${key}=${value}`;
+    const re = new RegExp(`^${key}=.*$`, 'm');
+    const next = re.test(text)
+        ? text.replace(re, line)
+        : `${text}${text && !text.endsWith('\n') ? '\n' : ''}${line}\n`;
+    fs.writeFileSync(envPath, next, { mode: 0o600 });
+}
+export function looksLikeClaudeOneMillionContextError(value) {
+    const text = String(value ?? '');
+    return /extra usage.*1m context|1m context.*extra usage|context-1m|1m.*extra usage|requires?.*1m/i.test(text);
+}
+export function applyOneMillionContextRecovery(baseDir = BASE_DIR) {
+    process.env.CLEMENTINE_1M_CONTEXT_MODE = 'off';
+    process.env.CLAUDE_CODE_DISABLE_1M_CONTEXT = '1';
+    try {
+        upsertRuntimeEnvValue(baseDir, 'CLEMENTINE_1M_CONTEXT_MODE', 'off');
+        upsertRuntimeEnvValue(baseDir, 'CLAUDE_CODE_DISABLE_1M_CONTEXT', '1');
+    }
+    catch {
+        // Runtime env is already safe. Persisting is best-effort because this path
+        // is often called while handling an SDK failure.
+    }
+}
+export function claudeOneMillionEnvForModel(model, mode = currentOneMillionContextMode()) {
+    const disableValue = claudeCodeDisableOneMillionForModel(model, mode);
+    return {
+        CLEMENTINE_1M_CONTEXT_MODE: mode,
+        ...(disableValue !== undefined ? { CLAUDE_CODE_DISABLE_1M_CONTEXT: disableValue } : {}),
+    };
+}
+export function normalizeClaudeSdkOptionsForOneMillionContext(options) {
+    const rawModel = typeof options.model === 'string' ? options.model : '';
+    const model = rawModel ? normalizeClaudeModelForOneMillionContext(rawModel) : rawModel;
+    const oneMillionEnv = claudeOneMillionEnvForModel(model || rawModel || null);
+    const disableValue = oneMillionEnv.CLAUDE_CODE_DISABLE_1M_CONTEXT;
+    const next = {
+        ...options,
+        ...(rawModel ? { model } : {}),
+        env: { ...(options.env ?? {}), ...oneMillionEnv },
+        ...(disableValue === '1' ? { betas: [] } : {}),
+    };
+    if (options.mcpServers && typeof options.mcpServers === 'object') {
+        const servers = {};
+        for (const [name, server] of Object.entries(options.mcpServers)) {
+            if (server && typeof server === 'object' && !Array.isArray(server)) {
+                const serverObj = server;
+                const supportsEnv = serverObj.type === 'stdio' || 'env' in serverObj;
+                if (!supportsEnv) {
+                    servers[name] = server;
+                    continue;
+                }
+                const serverEnv = serverObj.env && typeof serverObj.env === 'object' && !Array.isArray(serverObj.env)
+                    ? serverObj.env
+                    : {};
+                servers[name] = {
+                    ...serverObj,
+                    env: { ...serverEnv, ...oneMillionEnv },
+                };
+            }
+            else {
+                servers[name] = server;
+            }
+        }
+        next.mcpServers = servers;
+    }
+    return next;
+}
 export function normalizeClaudeModelForOneMillionContext(model, mode = currentOneMillionContextMode()) {
     if (mode === 'on')
         return model;

package/dist/index.js

@@ -626,14 +626,32 @@ async function asyncMain() {
             const llmCall = async (prompt) => {
                 try {
                     let result = '';
-                    const stream = query({ prompt, options: { model: 'claude-haiku-4-5-20251001', maxTurns: 1, systemPrompt: 'You are a memory consolidation assistant. Be concise.' } });
+                    const stream = query({
+                        prompt,
+                        options: config.normalizeClaudeSdkOptionsForOneMillionContext({
+                            model: 'claude-haiku-4-5-20251001',
+                            maxTurns: 1,
+                            systemPrompt: 'You are a memory consolidation assistant. Be concise.',
+                        }),
+                    });
                     for await (const msg of stream) {
-                        if (msg.type === 'result')
+                        if (msg.type === 'result') {
+                            if (msg.is_error) {
+                                const errorText = Array.isArray(msg.errors)
+                                    ? msg.errors.join('; ')
+                                    : String(msg.result ?? '');
+                                if (config.looksLikeClaudeOneMillionContextError(errorText))
+                                    config.applyOneMillionContextRecovery();
+                                return '';
+                            }
                             result = msg.result ?? '';
+                        }
                     }
                     return result;
                 }
-                catch {
+                catch (err) {
+                    if (config.looksLikeClaudeOneMillionContextError(err))
+                        config.applyOneMillionContextRecovery();
                     return '';
                 }
             };

package/package.json

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