neoctl 0.2.56 → 0.2.58

package/dist/types/events.d.ts

@@ -49,6 +49,9 @@ export interface ContextMetrics {
 }
 import type { TimingRecord } from "../core/query-timing.js";
 export type AgentEvent = {
+    type: "fast-mode.fallback";
+    revision: number;
+} | {
     type: "timing.updated";
     timing: TimingRecord;
 } | {

package/dist/web/index.d.ts

@@ -735,6 +735,7 @@ export declare class WebRepl {
             sessionPrompt?: import("../core/session-settings-prompt.js").SessionPromptState | null;
         };
         fastMode: boolean;
+        fastModeRevision: number;
         appPrompt: import("../app/app-prompt.js").AppPromptSnapshot;
         catalog: {
             commands: import("../repl/commands.js").ReplCommandDefinition[];
@@ -873,6 +874,7 @@ export declare class WebRepl {
     setFastMode(enabled: boolean): Promise<WebActionResult<{
         fastMode: boolean;
         deferred: boolean;
+        fastModeRevision: number;
     }>>;
     setContextWindowK(value: unknown): Promise<WebActionResult<{
         contextWindowK: number;

package/dist/web/index.js

@@ -937,6 +937,7 @@ export class WebRepl {
             modelSettings: { model: engineSnapshot.model, reasoning: engineSnapshot.reasoning, imageInput: findModelMetadata(engineSnapshot.model || "")?.imageInput },
             pendingSessionSettings,
             fastMode: this.runtime.engine.isFastMode(),
+            fastModeRevision: engineSnapshot.fastModeRevision,
             appPrompt: this.runtime.engine.getAppPrompt(),
             catalog: webCatalog(this.runtime),
             interactive: includeCatalog ? webInteractiveCatalog(this.runtime) : undefined,
@@ -1503,7 +1504,7 @@ export class WebRepl {
             const { deferred } = await engine.updateSessionSettings({ fastMode: enabled });
             if (this.runtime.engine === engine)
                 this.broadcastSync();
-            return { ok: true, fastMode: enabled, deferred };
+            return { ok: true, fastMode: engine.getPendingSessionSettings().fastMode ?? engine.isFastMode(), deferred, fastModeRevision: engine.getFastModeRevision() };
         }
         catch (error) {
             return actionFailure("FAST_MODE_UPDATE_FAILED", error instanceof Error ? error.message : String(error));
@@ -1605,7 +1606,10 @@ export class WebRepl {
         }
         try {
             // An idle click executes now through the settings barrier, not the chat/input queue.
-            const result = await engine.updateSessionSettings({ compact: true }, { abortSignal: controller?.signal, onCompactionDelta: text => {
+            const result = await engine.updateSessionSettings({ compact: true }, { abortSignal: controller?.signal, onRetry: event => {
+                    if (showProgress && this.runtime.engine === engine && this.foregroundRunToken === runToken && !controller?.signal.aborted)
+                        this.handleEvent(event);
+                }, onCompactionDelta: text => {
                     if (showProgress && this.runtime.engine === engine && this.foregroundRunToken === runToken && !controller?.signal.aborted) {
                         this.handleEvent({ type: "context.compaction.delta", text });
                     }
@@ -2293,6 +2297,12 @@ export class WebRepl {
             this.appendCompaction(event.compaction);
             return;
         }
+        if (event.type === "fast-mode.fallback") {
+            this.broadcastSync();
+            for (const subscriber of this.subscribers)
+                this.send(subscriber, "fast-mode.fallback", { revision: event.revision, sessionId: this.runtime.engine.snapshot().session?.sessionId });
+            return;
+        }
         if (event.type === "state" || event.type === "context.metrics" || event.type === "usage" || event.type === "retrying") {
             this.broadcastSync();
             return;
@@ -2573,7 +2583,7 @@ export class WebRepl {
                 if (this.runtime.engine !== engine)
                     continue;
                 if (this.suppressReattachedStreaming.has(engine)) {
-                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage" || event.type === "timing.updated") {
+                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage" || event.type === "timing.updated" || event.type === "fast-mode.fallback") {
                         if (event.type === "message" || event.type === "terminal" || event.type === "error")
                             this.suppressReattachedStreaming.delete(engine);
                         this.handleEvent(event);
@@ -2664,6 +2674,8 @@ export class WebRepl {
         if (subscriber.blocked) {
             if (event === "client.reload")
                 subscriber.pendingClientReload = data;
+            else if (event === "fast-mode.fallback")
+                subscriber.pendingFastModeFallback = data;
             else if (event === "runtime.context")
                 subscriber.needsRuntimeContext = true;
             else
@@ -2688,6 +2700,11 @@ export class WebRepl {
                 subscriber.needsSync = false;
                 this.send(subscriber, "sync", this.snapshot(false));
             }
+            if (subscriber.pendingFastModeFallback) {
+                const payload = subscriber.pendingFastModeFallback;
+                subscriber.pendingFastModeFallback = undefined;
+                this.send(subscriber, "fast-mode.fallback", payload);
+            }
             if (subscriber.needsRuntimeContext) {
                 subscriber.needsRuntimeContext = false;
                 this.publishRuntimeContext([subscriber]);
@@ -3429,7 +3446,7 @@ function toolStreamStepStatus(phase) {
 }
 function reduceStatus(status, event) {
     if (event.type === "context.compaction.delta")
-        return { ...status, phase: "compacting", compactionText: (status.compactionText || "") + event.text, activityTick: status.activityTick + 1 };
+        return { ...status, retryCooldownUntil: undefined, phase: "compacting", compactionText: (status.compactionText || "") + event.text, activityTick: status.activityTick + 1 };
     if (event.type === "state")
         return { ...status, phase: event.phase, detail: event.detail, compactionText: event.phase === "compacting" && status.phase === "compacting" ? status.compactionText : undefined, modelOutput: undefined, currentTool: event.phase === "running_tools" ? status.currentTool : undefined, usage: event.phase === "preparing" ? undefined : status.usage, streamedOutputTokens: event.phase === "preparing" ? 0 : status.streamedOutputTokens, inputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.inputTokenUpdatedAt, outputTokenUpdatedAt: event.phase === "preparing" ? undefined : status.outputTokenUpdatedAt, retryCooldownUntil: event.phase === "preparing" ? undefined : status.retryCooldownUntil, activityTick: status.activityTick + 1 };
     if (event.type === "context.compacted")
@@ -3445,19 +3462,19 @@ function reduceStatus(status, event) {
     if (event.type === "assistant.delta" && !event.text)
         return status;
     if (event.type === "assistant.delta")
-        return { ...status, phase: "calling_model", modelOutput: { kind: "text" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, retryCooldownUntil: undefined, phase: "calling_model", modelOutput: { kind: "text" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "thinking.done")
         return status.phase === "thinking" || status.modelOutput?.kind === "thinking" ? { ...status, phase: "calling_model", modelOutput: undefined, activityTick: status.activityTick + 1 } : status;
     if (event.type === "thinking.delta" && !event.text)
         return status;
     if (event.type === "thinking.delta")
-        return { ...status, phase: "thinking", modelOutput: { kind: "thinking" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
+        return { ...status, retryCooldownUntil: undefined, phase: "thinking", modelOutput: { kind: "thinking" }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.text), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "tool_call.started")
-        return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name }, activityTick: status.activityTick + 1 };
+        return { ...status, retryCooldownUntil: undefined, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name }, activityTick: status.activityTick + 1 };
     if (event.type === "tool_call.delta")
         return { ...status, phase: "calling_model", modelOutput: { kind: "tool_call", callId: event.callId, name: event.name ?? (status.modelOutput?.kind === "tool_call" && status.modelOutput.callId === event.callId ? status.modelOutput.name : undefined) }, streamedOutputTokens: status.streamedOutputTokens + estimateTokens(event.argumentsDelta), outputTokenUpdatedAt: Date.now(), activityTick: status.activityTick + 1 };
     if (event.type === "retrying")
-        return { ...status, phase: "calling_model", modelOutput: undefined, detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
+        return { ...status, phase: status.phase === "compacting" ? "compacting" : "calling_model", modelOutput: undefined, detail: `retrying in ${(event.delayMs / 1000).toFixed(1)}s`, retryCooldownUntil: Date.now() + event.delayMs, activityTick: status.activityTick + 1 };
     if (event.type === "tool.started")
         return { ...status, phase: "running_tools", modelOutput: undefined, currentTool: { id: event.toolUse.id, name: event.toolUse.name, input: event.toolUse.input, startedAt: Date.now() }, activityTick: status.activityTick + 1 };
     if (event.type === "tool.progress")
@@ -3581,7 +3598,7 @@ const SHARED_LOGIN_FIELDS = [
     { key: "maxOutputTokens", label: "Max output tokens", envKey: "MODEL_MAX_OUTPUT_TOKENS", scope: "shared", placeholder: "Leave empty for server default" },
     { key: "timeoutMs", label: "Timeout ms", envKey: "MODEL_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
     { key: "streamIdleTimeoutMs", label: "Stream idle timeout ms", envKey: "MODEL_STREAM_IDLE_TIMEOUT_MS", scope: "shared", placeholder: "120000" },
-    { key: "maxRetries", label: "Max retries", envKey: "MODEL_MAX_RETRIES", scope: "shared", placeholder: "2" },
+    { key: "maxRetries", label: "Max retries", envKey: "MODEL_MAX_RETRIES", scope: "shared", placeholder: "5" },
 ];
 const LOGIN_FIELD_DEFINITIONS = {
     anthropic: [