@curie-agent/core 0.2.4 → 0.3.0

package/dist/src/token-monitor.d.ts

@@ -0,0 +1,50 @@
+import { type PriceTier } from './pricing.js';
+export { estimateCost, PriceTier, parseTieredPricing, selectTier } from './pricing.js';
+export type TokenEvent = {
+    type: 'context-warning';
+    fillPct: number;
+    message: string;
+} | {
+    type: 'context-compaction-needed';
+    fillPct: number;
+    message: string;
+} | {
+    type: 'context-forced-compaction';
+    fillPct: number;
+    message: string;
+} | {
+    type: 'tier-warning';
+    threshold: number;
+    oldTier: PriceTier;
+    newTier: PriceTier;
+    message: string;
+};
+export interface TokenMonitorConfig {
+    contextWindowSize: number;
+    thresholdPct: number;
+    warnThresholdPct: number;
+    forcedThresholdPct: number;
+    pricingTierWarn: boolean;
+    /** Model name for cost estimation (e.g., 'claude-sonnet-4-6'). */
+    model?: string;
+}
+export declare class TokenMonitor {
+    config: TokenMonitorConfig;
+    cumulativeInputTokens: number;
+    lastTrackedTokens: number;
+    private acknowledged;
+    constructor(config: TokenMonitorConfig);
+    getFillPct(): number;
+    getStatus(): 'ok' | 'warning' | 'compaction-needed' | 'forced-compaction';
+    private parseTiers;
+    private selectTier;
+    checkTierCrossing(tiersRaw?: PriceTier[]): TokenEvent | null;
+    addTokens(inputTokens: number, outputTokens: number, tiersRaw?: PriceTier[]): TokenEvent[];
+    acknowledge(eventType: string): void;
+    reset(): void;
+    setContextWindowSize(size: number): void;
+    setThresholdPct(pct: number): void;
+    setWarnThresholdPct(pct: number): void;
+    setForcedThresholdPct(pct: number): void;
+}
+//# sourceMappingURL=token-monitor.d.ts.map

package/dist/src/token-monitor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"token-monitor.d.ts","sourceRoot":"","sources":["../../src/token-monitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgD,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEvF,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,2BAA2B,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,IAAI,EAAE,2BAA2B,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GACvE;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,SAAS,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEzG,MAAM,WAAW,kBAAkB;IACjC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,OAAO,CAAC;IACzB,kEAAkE;IAClE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,qBAAa,YAAY;IACvB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,YAAY,CAAqB;gBAE7B,MAAM,EAAE,kBAAkB;IAMtC,UAAU,IAAI,MAAM;IAKpB,SAAS,IAAI,IAAI,GAAG,SAAS,GAAG,mBAAmB,GAAG,mBAAmB;IAQzE,OAAO,CAAC,UAAU;IAKlB,OAAO,CAAC,UAAU;IAkBlB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,GAAG,UAAU,GAAG,IAAI;IA0B5D,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE;IA0B1F,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI;IAIpC,KAAK,IAAI,IAAI;IAMb,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAIxC,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAIlC,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAItC,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;CAGzC"}

package/dist/src/token-monitor.js

@@ -0,0 +1,119 @@
+import { estimateCost } from './pricing.js';
+export { estimateCost, parseTieredPricing, selectTier } from './pricing.js';
+export class TokenMonitor {
+    config;
+    cumulativeInputTokens;
+    lastTrackedTokens;
+    acknowledged = new Set();
+    constructor(config) {
+        this.config = config;
+        this.cumulativeInputTokens = 0;
+        this.lastTrackedTokens = 0;
+    }
+    getFillPct() {
+        if (this.config.contextWindowSize <= 0)
+            return 0;
+        return Math.min(100, Math.round((this.cumulativeInputTokens / this.config.contextWindowSize) * 100));
+    }
+    getStatus() {
+        const pct = this.getFillPct();
+        if (pct >= this.config.forcedThresholdPct)
+            return 'forced-compaction';
+        if (pct >= this.config.thresholdPct)
+            return 'compaction-needed';
+        if (pct >= this.config.warnThresholdPct)
+            return 'warning';
+        return 'ok';
+    }
+    parseTiers(tiersRaw) {
+        if (!tiersRaw || tiersRaw.length === 0)
+            return [];
+        return tiersRaw;
+    }
+    selectTier(tiers, totalTokens) {
+        let result = tiers[0] ?? { in: 0, out: 0 };
+        for (const tier of tiers) {
+            if (tier.threshold !== undefined && totalTokens >= tier.threshold) {
+                result = tier;
+            }
+        }
+        // Find the tier just below the current one
+        let prev = tiers[0] ?? { in: 0, out: 0 };
+        for (let i = 0; i < tiers.length; i++) {
+            if (tiers[i] === result) {
+                prev = i > 0 ? tiers[i - 1] : tiers[0];
+                break;
+            }
+        }
+        return [prev, result];
+    }
+    checkTierCrossing(tiersRaw) {
+        if (!this.config.pricingTierWarn)
+            return null;
+        const tiers = this.parseTiers(tiersRaw);
+        if (tiers.length < 2)
+            return null;
+        const [prevTier, newTier] = this.selectTier(tiers, this.cumulativeInputTokens);
+        if (prevTier.in === newTier.in)
+            return null;
+        const threshold = newTier.threshold ?? 0;
+        const key = `tier-${threshold}`;
+        if (this.acknowledged.has(key))
+            return null;
+        const oldRate = `$${prevTier.in.toFixed(2)}/$${prevTier.out.toFixed(2)} per 1M tokens`;
+        const newRate = `$${newTier.in.toFixed(2)}/$${newTier.out.toFixed(2)} per 1M tokens`;
+        const cost = estimateCost(this.config.model || 'claude-sonnet-4-6', this.cumulativeInputTokens, 0);
+        const oldCost = estimateCost(this.config.model || 'claude-sonnet-4-6', this.cumulativeInputTokens, 0, undefined);
+        return {
+            type: 'tier-warning',
+            threshold,
+            oldTier: prevTier,
+            newTier,
+            message: `⚠ Entering ${Math.round(threshold / 1000)}k+ tier — ${oldRate} -> ${newRate} (current session cost: $${cost.toFixed(2)})`,
+        };
+    }
+    addTokens(inputTokens, outputTokens, tiersRaw) {
+        this.cumulativeInputTokens += inputTokens;
+        const events = [];
+        const status = this.getStatus();
+        const pct = this.getFillPct();
+        if (status === 'warning') {
+            events.push({ type: 'context-warning', fillPct: pct, message: `Context window ${pct}% full (warning threshold: ${this.config.warnThresholdPct}%)` });
+        }
+        else if (status === 'compaction-needed') {
+            events.push({ type: 'context-compaction-needed', fillPct: pct, message: `Context window ${pct}% full (compaction threshold: ${this.config.thresholdPct}%)` });
+        }
+        else if (status === 'forced-compaction') {
+            events.push({ type: 'context-forced-compaction', fillPct: pct, message: `Context window ${pct}% full (forced compaction at ${this.config.forcedThresholdPct}%)` });
+        }
+        const tierEvent = this.checkTierCrossing(tiersRaw);
+        if (tierEvent) {
+            events.push(tierEvent);
+        }
+        if (events.length > 0) {
+            this.lastTrackedTokens = this.cumulativeInputTokens;
+        }
+        return events;
+    }
+    acknowledge(eventType) {
+        this.acknowledged.add(eventType);
+    }
+    reset() {
+        this.cumulativeInputTokens = 0;
+        this.lastTrackedTokens = 0;
+        this.acknowledged.clear();
+    }
+    setContextWindowSize(size) {
+        this.config.contextWindowSize = size;
+    }
+    setThresholdPct(pct) {
+        this.config.thresholdPct = pct;
+    }
+    setWarnThresholdPct(pct) {
+        this.config.warnThresholdPct = pct;
+    }
+    setForcedThresholdPct(pct) {
+        this.config.forcedThresholdPct = pct;
+    }
+}
+//# sourceMappingURL=token-monitor.js.map

package/dist/src/token-monitor.js.map

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

package/dist/src/turn-loop.d.ts

@@ -23,11 +23,13 @@ export interface ProviderStream {
         system?: string;
         signal?: AbortSignal;
         effort?: ReasoningEffort;
+        maxTokens?: number;
     }): CancelableIterable<ProviderEvent>;
     /** Non-streaming call — used for quick evaluations (e.g. harm-check). */
     check(prompt: string, args?: {
         model?: string;
         system?: string;
+        signal?: AbortSignal;
     }): Promise<string>;
 }
 export interface Tool {
@@ -36,7 +38,7 @@ export interface Tool {
         description: string;
         inputSchema: unknown;
     };
-    execute: (input: Record<string, unknown>, settings: any, cwd?: string) => Promise<{
+    execute: (input: Record<string, unknown>, settings: any, cwd?: string, sessionId?: string) => Promise<{
         output: unknown;
         error?: string;
     }>;
@@ -44,6 +46,9 @@ export interface Tool {
 export type ProviderEvent = {
     type: 'text-delta';
     text: string;
+} | {
+    type: 'thinking-delta';
+    text: string;
 } | {
     type: 'thinking-block';
     thinking: string;
@@ -66,6 +71,7 @@ export type ProviderEvent = {
 } | {
     type: 'stop';
     reason: string;
+    errorDetail?: string;
 };
 export interface TurnLoopConfig {
     provider: ProviderStream;
@@ -86,10 +92,13 @@ export interface TurnLoopConfig {
     resumeSessionId?: string;
     /** Called when a tool call needs interactive approval. Return true to allow, false to deny. */
     onApprovalAsk?: (req: {
+        toolCallId?: string;
         name: string;
         input: Record<string, unknown>;
         reason: string;
     }) => Promise<boolean>;
+    /** Optional session type / entrypoint (e.g. webui, tui, telegram, heartbeat) */
+    type?: string;
 }
 export interface TurnLoopResult {
     events: Event[];

package/dist/src/turn-loop.d.ts.map

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

package/dist/src/turn-loop.js

@@ -1,12 +1,19 @@
+import fs from 'node:fs';
 import { EventBus } from './event-bus.js';
 import { SessionStore } from './session-store.js';
 import { PermissionEngine } from './permission.js';
 import { createSnapshot } from './safety/snapshot.js';
+import { withDateContext } from './context.js';
 // The provider's stream() returns a CancelableIterable with a cancel() method
 // that synchronously aborts the underlying HTTP connection (e.g., Anthropic's
 // stream.abort()). The TurnLoop wires this cancel() to the AbortSignal's abort
 // event so pressing Esc closes the stream immediately instead of waiting for
 // the next SSE event from the server.
+// Brief delay to let WebSocket events flush to clients between approval requests.
+const approvalThrottleMs = 50;
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 export class TurnLoop {
     bus;
     store;
@@ -45,19 +52,36 @@ export class TurnLoop {
         this._cwd = newCwd;
     }
     async evaluateHarm(toolName, input) {
+        // Local/Ollama providers run on a single-threaded server. Firing check()
+        // re-entrantly while the main stream is in-flight serializes both requests
+        // and causes llama.cpp to appear hung. Thinking models (qwen3.x, deepseek-r1,
+        // etc.) also never emit a clean APPROVE/DENY token, so the harm-check always
+        // times out against these models anyway.
+        if (['local', 'ollama'].includes(this.config.provider.name)) {
+            return { approved: true, reason: 'local provider: LLM harm-check skipped' };
+        }
         const inputJson = JSON.stringify(input);
         const systemPrompt = 'You are a safety evaluator. Given a tool call, determine if it is potentially harmful to the user\'s system. Harmful means: deleting files, executing arbitrary shell commands, sending data to external services, modifying system configuration, or any action that could cause data loss or security compromise. Your response must be exactly one of these two strings: APPROVE or DENY. Do not add any other text.';
         const prompt = `Evaluate this tool call:\nTool: ${toolName}\nInput: ${inputJson}`;
         try {
-            const response = await this.config.provider.check(prompt, { model: this.config.model, system: systemPrompt });
-            const decision = response.trim().toUpperCase();
-            if (decision === 'APPROVE') {
-                return { approved: true, reason: `LLM harm-check: APPROVE` };
+            // Use an AbortController so the HTTP request itself is cancelled on timeout,
+            // not just the Promise.race outcome — prevents zombie requests from queuing.
+            const abortCtrl = new AbortController();
+            const timeoutId = setTimeout(() => abortCtrl.abort(new Error('harm-check timeout')), 15_000);
+            try {
+                const response = await this.config.provider.check(prompt, { model: this.config.model, system: systemPrompt, signal: abortCtrl.signal });
+                const decision = response.trim().toUpperCase();
+                if (decision === 'APPROVE') {
+                    return { approved: true, reason: `LLM harm-check: APPROVE` };
+                }
+                return { approved: false, reason: `LLM harm-check: DENY — ${response.trim()}` };
+            }
+            finally {
+                clearTimeout(timeoutId);
             }
-            return { approved: false, reason: `LLM harm-check: DENY — ${response.trim()}` };
         }
         catch {
-            // If LLM check fails, deny for safety
+            // If LLM check fails or times out, deny for safety
             return { approved: false, reason: 'LLM harm-check failed — denied' };
         }
     }
@@ -65,6 +89,7 @@ export class TurnLoop {
         const messages = [];
         let currentTurn = {
             assistantDeltas: [],
+            thinkingDeltas: [],
             toolCalls: [],
             toolResults: [],
         };
@@ -75,7 +100,7 @@ export class TurnLoop {
                     messages.push(...this.buildTurnMessages(currentTurn));
                 }
                 messages.push({ role: 'user', content: event.text });
-                currentTurn = { assistantDeltas: [], toolCalls: [], toolResults: [] };
+                currentTurn = { assistantDeltas: [], thinkingDeltas: [], toolCalls: [], toolResults: [] };
                 hasActiveTurn = true;
                 continue;
             }
@@ -84,6 +109,9 @@ export class TurnLoop {
             if (event.type === 'assistant-delta') {
                 currentTurn.assistantDeltas.push(event.text);
             }
+            else if (event.type === 'thinking-delta') {
+                currentTurn.thinkingDeltas.push(event.text);
+            }
             else if (event.type === 'tool-call') {
                 currentTurn.toolCalls.push({ toolCallId: event.toolCallId, name: event.name, input: event.input, thoughtSignature: event.thoughtSignature });
             }
@@ -98,8 +126,11 @@ export class TurnLoop {
     }
     buildTurnMessages(turn) {
         const msgs = [];
-        // Assistant message: text blocks + tool-use blocks
+        // Assistant message: thinking blocks + text blocks + tool-use blocks
         const assistantBlocks = [];
+        for (const text of turn.thinkingDeltas) {
+            assistantBlocks.push({ type: 'thinking', thinking: text, signature: '' });
+        }
         for (const text of turn.assistantDeltas) {
             assistantBlocks.push({ type: 'text', text });
         }
@@ -132,16 +163,23 @@ export class TurnLoop {
             const loaded = this.store.load(effectiveSessionId);
             if (loaded) {
                 session = loaded;
+                if (this.config.type && !session.type) {
+                    session.type = this.config.type;
+                    try {
+                        fs.writeFileSync(this.store.metadataPath(session.id), JSON.stringify(session, null, 2) + '\n');
+                    }
+                    catch { }
+                }
             }
             else {
                 // Session ID was provided but doesn't exist on disk yet
                 // (e.g. ChannelRouter generates a placeholder before TurnLoop creates it)
-                session = this.store.create(this.config.cwd, this.config.model, this.config.provider.name);
+                session = this.store.create(this.config.cwd, this.config.model, this.config.provider.name, this.config.type);
                 this.activeSessionId = session.id;
             }
         }
         else {
-            session = this.store.create(this.config.cwd, this.config.model, this.config.provider.name);
+            session = this.store.create(this.config.cwd, this.config.model, this.config.provider.name, this.config.type);
         }
         this.activeSessionId ??= session.id;
         // Resume: load stored events and reconstruct messages array
@@ -166,16 +204,22 @@ export class TurnLoop {
         this.messages.push({ role: 'user', content: prompt });
         let turn = 0;
         const maxTurns = this.config.maxTurns ?? 50;
+        let continuationCount = 0;
+        const maxContinuations = 5;
         try {
             while (turn < maxTurns && !this.abort) {
                 turn++;
+                if (process.env.DEBUG_PROVIDER) {
+                    console.log(`[turn-loop] turn=${turn}, messages.length=${this.messages.length}`);
+                }
                 // Create git snapshot before each turn (best-effort).
-                if (this.config.settings.SAFETY_SNAPSHOTS !== 'off') {
+                if (this.config.settings.safety?.snapshots !== 'off') {
                     await createSnapshot(this._cwd, prompt).catch(() => {
                         // Silently ignore — snapshots are recovery, not enforcement
                     });
                 }
                 let fullText = '';
+                let hitLengthLimit = false;
                 const toolCalls = [];
                 let totalToolCalls = 0;
                 let websearchToolCalls = 0;
@@ -183,7 +227,7 @@ export class TurnLoop {
                 // Local providers (Ollama, llama.cpp) don't support Anthropic thinking blocks.
                 // Strip thinking blocks from message history to avoid serialization errors.
                 const self = this;
-                const isLocal = self.config.provider.name === 'local';
+                const isLocal = ['local', 'ollama'].includes(self.config.provider.name);
                 const streamMessages = isLocal
                     ? self.messages.map((m) => {
                         if (m.role === 'assistant' && Array.isArray(m.content)) {
@@ -194,16 +238,48 @@ export class TurnLoop {
                     : self.messages;
                 // Capture abortController before the loop — it's always set by this point.
                 const abortCtrl = self.abortController;
+                // Pre-flight: abort before sending if estimated payload exceeds context window.
+                // Count actual text content chars (not JSON structure) and divide by 4 (~4 chars/token).
+                {
+                    const ctxWindow = self.config.settings.providers[self.config.settings.current_provider]?.model_context_window ?? 131072;
+                    const reservedForOutput = self.config.settings.providers[self.config.settings.current_provider]?.max_output_tokens ?? 65536;
+                    let contentChars = (self.config.system?.length ?? 0) + 200; // system prompt + date context overhead
+                    for (const m of streamMessages) {
+                        if (typeof m.content === 'string') {
+                            contentChars += m.content.length;
+                        }
+                        else if (Array.isArray(m.content)) {
+                            for (const b of m.content) {
+                                if (b.text)
+                                    contentChars += b.text.length;
+                                else if (b.thinking)
+                                    contentChars += b.thinking.length;
+                                else if (b.input)
+                                    contentChars += JSON.stringify(b.input).length;
+                            }
+                        }
+                    }
+                    const estimatedInputTokens = Math.ceil(contentChars / 4);
+                    if (estimatedInputTokens > ctxWindow - reservedForOutput) {
+                        emit({ type: 'error', id: session.id, timestamp: Date.now(), message: `Estimated input (~${Math.round(estimatedInputTokens / 1000)}k tokens) would exceed the context window ` +
+                                `(${Math.round(ctxWindow / 1000)}k) for provider "${self.config.settings.current_provider}". ` +
+                                `Run /context compact to summarize history, or switch to a model with a larger context window.` });
+                        emit({ type: 'session-stop', id: session.id, reason: 'error', timestamp: Date.now() });
+                        return { events: self.bus.history(), sessionId: session.id, reason: 'error' };
+                    }
+                }
                 // Start the provider stream and capture its cancel function.
                 // The cancel() method synchronously aborts the underlying HTTP connection
                 // (e.g., Anthropic's stream.abort()), making Esc feel instantaneous.
+                const maxTokens = self.config.settings.providers[self.config.settings.current_provider]?.max_output_tokens;
                 const cancelable = self.config.provider.stream({
                     messages: streamMessages,
                     tools: self.config.tools.map((t) => t.definition),
                     model: self.config.model,
-                    system: self.config.system,
+                    system: withDateContext(self.config.system),
                     signal: abortCtrl.signal,
                     effort: self.config.effort,
+                    maxTokens,
                 });
                 // Wire the AbortSignal's abort event to cancel the stream immediately.
                 // This is what makes Esc feel instant — it calls stream.abort() on the
@@ -220,6 +296,9 @@ export class TurnLoop {
                                 fullText += event.text;
                                 emit({ type: 'assistant-delta', id: session.id, text: event.text, timestamp: Date.now() });
                                 break;
+                            case 'thinking-delta':
+                                emit({ type: 'thinking-delta', id: session.id, text: event.text, timestamp: Date.now() });
+                                break;
                             case 'thinking-block':
                                 thinkingBlocks.push({ thinking: event.thinking, signature: event.signature });
                                 break;
@@ -230,6 +309,27 @@ export class TurnLoop {
                             case 'usage':
                                 emit({ type: 'usage', id: session.id, inputTokens: event.inputTokens, outputTokens: event.outputTokens, cacheReadTokens: event.cacheReadTokens, cacheWriteTokens: event.cacheWriteTokens, timestamp: Date.now() });
                                 break;
+                            case 'stop':
+                                if (event.reason === 'error' && event.errorDetail) {
+                                    const isCtxExceeded = /exceeds.*context|context.*size|too many tokens/i.test(event.errorDetail);
+                                    emit({ type: 'error', id: session.id, timestamp: Date.now(), message: isCtxExceeded
+                                            ? `Context window exceeded: ${event.errorDetail}. Run /context compact to summarize history, or switch to a model with a larger context window.`
+                                            : `Provider stream error: ${event.errorDetail}. This can happen with incompatible local model endpoints or network issues.`
+                                    });
+                                }
+                                else if (event.reason === 'aborted' && !self.abort) {
+                                    // Provider timeout (not user-initiated) — surface it
+                                    emit({ type: 'status', id: session.id, message: 'Provider request timed out. The local model may be too slow or overloaded.',
+                                        timestamp: Date.now(),
+                                    });
+                                }
+                                else if (event.reason === 'length') {
+                                    hitLengthLimit = true;
+                                    emit({ type: 'status', id: session.id, message: 'Model hit output token limit. Continuing...',
+                                        timestamp: Date.now(),
+                                    });
+                                }
+                                break;
                         }
                     }
                 }
@@ -257,6 +357,15 @@ export class TurnLoop {
                             emit({ type: 'session-stop', id: session.id, reason: 'error', timestamp: Date.now() });
                             return { events: self.bus.history(), sessionId: session.id, reason: 'error' };
                         }
+                        // Connection errors: server unreachable, connection reset, refused
+                        const connErrors = ['ECONNREFUSED', 'ECONNRESET', 'ECONNABORTED', 'ENOTFOUND', 'fetch failed'];
+                        if (connErrors.some(e => msg.includes(e))) {
+                            emit({ type: 'error', id: session.id, message: `Provider connection error: ${msg}. Check that the local model server is running and reachable at the configured URL.`,
+                                timestamp: Date.now(),
+                            });
+                            emit({ type: 'session-stop', id: session.id, reason: 'error', timestamp: Date.now() });
+                            return { events: self.bus.history(), sessionId: session.id, reason: 'error' };
+                        }
                         throw err;
                     }
                 }
@@ -265,6 +374,9 @@ export class TurnLoop {
                     emit({ type: 'session-stop', id: session.id, reason: 'cancelled', timestamp: Date.now() });
                     return { events: this.bus.history(), sessionId: session.id, reason: 'cancelled' };
                 }
+                if (process.env.DEBUG_PROVIDER) {
+                    console.log(`[turn-loop] turn=${turn} stream done: textLen=${fullText.length}, toolCalls=${toolCalls.length}, thinkingBlocks=${thinkingBlocks.length}`);
+                }
                 // Build assistant message: thinking blocks MUST come first (Anthropic
                 // requires them preserved when extended thinking + tool use is combined),
                 // then text, then tool-use blocks.
@@ -280,7 +392,23 @@ export class TurnLoop {
                 if (assistantContent.length > 0) {
                     this.messages.push({ role: 'assistant', content: assistantContent });
                 }
+                // Hit output token limit without tool calls — tell model to continue
+                if (hitLengthLimit && toolCalls.length === 0) {
+                    if (continuationCount >= maxContinuations) {
+                        emit({ type: 'status', id: session.id, message: `Output length limit reached. Model could not complete response after ${maxContinuations} continuation attempts.`,
+                            timestamp: Date.now() });
+                    }
+                    else {
+                        continuationCount++;
+                        this.messages.push({ role: 'user', content: '[continue — your previous response was cut off by the output token limit. If you were about to call Write with a large content parameter, use the skeleton+Edit approach: first Write a skeleton file with section headers and [PLACEHOLDER] markers, then fill each section with a separate Edit call.]' });
+                        continue;
+                    }
+                }
                 if (toolCalls.length === 0) {
+                    if (!fullText && thinkingBlocks.length === 0) {
+                        emit({ type: 'status', id: session.id, message: 'The model did not return a response. This can happen with incompatible models or configuration issues.',
+                            timestamp: Date.now() });
+                    }
                     emit({ type: 'assistant-stop', id: session.id, timestamp: Date.now() });
                     emit({ type: 'session-stop', id: session.id, reason: 'stop', timestamp: Date.now() });
                     return { events: this.bus.history(), sessionId: session.id, reason: 'stop' };
@@ -289,8 +417,8 @@ export class TurnLoop {
                     if (this.abort)
                         break;
                     // --- Tool usage limits ---
-                    const totalLimit = this.config.settings.TOOLS_PER_CALL ?? 10;
-                    const websearchLimit = this.config.settings.WEBSEARCH_PER_CALL ?? 5;
+                    const totalLimit = this.config.settings.tools_per_call ?? 10;
+                    const websearchLimit = this.config.settings.websearch_per_call ?? 5;
                     if (totalToolCalls >= totalLimit) {
                         const msg = `Tool call limit reached (${totalLimit} per turn). Skipping remaining tool call(s).`;
                         emit({ type: 'status', id: session.id, message: msg, timestamp: Date.now() });
@@ -318,8 +446,11 @@ export class TurnLoop {
                         name: tc.name,
                         input: tc.input,
                         decision: permResult.decision,
+                        mode: this.permission.mode,
                         timestamp: Date.now(),
                     });
+                    // Yield briefly so WebSocket events flush to clients before processing the next tool.
+                    await sleep(approvalThrottleMs);
                     if (permResult.decision === 'deny') {
                         emit({ type: 'approval-decision', id: session.id, toolCallId: tc.id, decision: 'deny', timestamp: Date.now() });
                         this.messages.push({ role: 'tool', toolUseId: tc.id, content: `Tool call denied: ${permResult.reason}` });
@@ -341,13 +472,13 @@ export class TurnLoop {
                             }
                             else {
                                 // LLM denied — ask user for final decision
-                                approved = await ask({ name: tc.name, input: tc.input, reason: harm.reason });
+                                approved = await ask({ toolCallId: tc.id, name: tc.name, input: tc.input, reason: harm.reason });
                                 decisionBy = 'user';
                             }
                         }
                         else {
                             approved = ask
-                                ? await ask({ name: tc.name, input: tc.input, reason: permResult.reason })
+                                ? await ask({ toolCallId: tc.id, name: tc.name, input: tc.input, reason: permResult.reason })
                                 : true; // no callback wired — treat as allow to preserve old behavior
                             decisionBy = approved ? 'user' : 'user';
                         }
@@ -376,17 +507,15 @@ export class TurnLoop {
                         continue;
                     }
                     try {
-                        const result = await tool.execute(tc.input, this.config.settings, this.config.cwd);
+                        const result = await tool.execute(tc.input, this.config.settings, this.config.cwd, this.config.sessionId);
                         emit({ type: 'tool-result', id: session.id, toolCallId: tc.id, output: result.output, error: result.error, timestamp: Date.now() });
-                        const outputStr = result.error ? `Error: ${result.error}` : JSON.stringify(result.output);
-                        const decisionLabel = toolDecisionBy === 'llm' ? 'LLM-approved' : toolDecisionBy === 'user' ? 'Approved by user' : 'Auto Approved';
-                        this.messages.push({ role: 'tool', toolUseId: tc.id, content: `${tc.name}: ${decisionLabel} — ${outputStr}` });
+                        const outputStr = result.error ? `Error: ${result.error}` : (typeof result.output === 'string' ? result.output : JSON.stringify(result.output));
+                        this.messages.push({ role: 'tool', toolUseId: tc.id, content: outputStr });
                     }
                     catch (err) {
                         const msg = err instanceof Error ? err.message : String(err);
                         emit({ type: 'tool-result', id: session.id, toolCallId: tc.id, output: null, error: msg, timestamp: Date.now() });
-                        const decisionLabel = toolDecisionBy === 'llm' ? 'LLM-approved' : toolDecisionBy === 'user' ? 'Approved by user' : 'Auto Approved';
-                        this.messages.push({ role: 'tool', toolUseId: tc.id, content: `${tc.name}: ${decisionLabel} — Error: ${msg}` });
+                        this.messages.push({ role: 'tool', toolUseId: tc.id, content: `Error: ${msg}` });
                     }
                 }
             }