@itookit/dsht 0.5.1 → 0.6.0

package/dist/controller/controller.js

@@ -1,9 +1,7 @@
 /** Application facade: composes the connection, session, catalog and cost domains. */
 import { join } from 'node:path';
-import { AsyncLocalStorage } from 'node:async_hooks';
-import { randomUUID } from 'node:crypto';
 import { Client } from "../transport/client.js";
-import { listEntries, readText, removeFile, writeHeapSnapshot } from "../storage/index.js";
+import { removeFile, writeHeapSnapshot } from "../storage/index.js";
 import { errorText, string } from "../transport/wire.js";
 import { DEFAULT_HISTORY_LIMITS } from "../session/memory.js";
 import { layoutStats } from "../session/history.js";
@@ -13,12 +11,13 @@ import { CatalogController } from "../catalog/controller.js";
 import { CostController } from "../cost/controller.js";
 import { ConnectionController } from "./connection.js";
 import { MemoryLog } from "./memory-log.js";
+import { ForegroundSlot } from "./foreground.js";
 import { TraceLog } from "./trace-log.js";
 import { PromptStore } from "./prompts.js";
-import { latestAssistantText, parseLoopResult, ScoredLoop } from "./loop.js";
-import { findingsLines } from "./loop-contract.js";
+import { latestAssistantText } from "./loop.js";
+import { LoopCoordinator } from "./loop-coordinator.js";
 import { loopRecords as listLoopRecords } from "./loop-protocols.js";
-import { verificationId, verdictFile } from "./verifier.js";
+import { loopSourceInfo } from "./loop-prompts.js";
 import { SessionPeek } from "../session/peek.js";
 import { costAddresses } from "../cost/scanner.js";
 import { sessionLabel } from "../session-title.js";
@@ -38,8 +37,6 @@ function shellEnv() {
     delete env.DSH_URL;
     return env;
 }
-/** How many times a verifier outage is retried before the run reports verification unavailable. */
-const VERIFIER_RETRIES = 2;
 /** Sources this client registers before it forgets the oldest; a session list can still find them. */
 const SOURCE_LIMIT = 50;
 /** The tag every verifier session title starts with, so a reader can tell it apart in a list. */
@@ -49,13 +46,6 @@ function verifierLabel(title) {
     const stripped = title.startsWith(VERIFIER_TAG) ? title.slice(VERIFIER_TAG.length) : title;
     return stripped.trim() === '' ? title : stripped.trim();
 }
-/** How long a finished turn may take to commit its final assistant message.
- *
- * The host reports the turn idle just before that message reaches the follow stream, so a single
- * parse can miss the result block that decides the attempt. Waiting too long only delays a reply
- * that never complies, while deciding too early spends an attempt the reviewer never got.
- */
-const LOOP_SETTLE_GRACE_MS = 4000;
 /** File `/handoff` clears on this machine before it asks the agent to write a handoff. */
 const HANDOFF_FILE = 'HANDOFF.md';
 /** Instruction `/handoff` sends once this client's own copy of the file is gone.
@@ -95,50 +85,12 @@ export class Controller {
     trace;
     /** Shortcut prompts the operator saved; in memory for this run when no path was supplied. */
     promptStore;
-    /** Running agent loop, if any; the loop lives here, not in the UI. */
-    loop;
-    /** Prompt the loop still has to send, when it could not be sent immediately. */
-    loopPrompt;
     /** Finished turns of the selected session, so a waiter never has to sample a cached flag. */
     completedTurns = 0;
     /** Sessions the host reported busy, so a lone idle frame cannot claim a finished turn. */
     busySessions = new Set();
-    /** When the in-flight attempt's turn ended, while its result block is still awaited. */
-    loopEndedAt;
-    /** Timer that settles an attempt whose reply never commits its result block. */
-    loopSettleTimer;
-    /** Whether an attempt is currently being judged by an independent verifier. */
-    loopVerifying = false;
-    /** A verdict is being consumed right now.
-     *
-     * Consuming one reads the artifact, so it is asynchronous; without this gate a replayed idle edge
-     * could start a second verification of an attempt whose verdict is already being applied.
-     */
-    loopSettling = false;
-    /** Cancels that verification when the loop is stopped or replaced. */
-    loopVerifyAbort;
-    /** Verdict of the previous attempt on the current step, for the retry and the next verifier. */
-    loopPrevious;
-    /** Identity of the run in flight, so its verdicts are isolated from every other run's. */
-    loopRunId;
-    /** Whether the run in flight already wrote its `loop end`; one end per begin (I9). */
-    loopEndTraced = false;
-    /** Sequence of the verification task in flight, so a retry never reuses the old task's identity. */
-    loopVerifySeq = 0;
-    /** Identity of the verification task whose result may still decide the attempt in flight. */
-    loopVerifyIdentity;
-    /** Timer that stops the whole run when its budget expires. */
-    loopDeadlineTimer;
-    /** Whole-run budget, when the operator set one. */
-    deadlineMs;
-    /** Consecutive verifier outages in this attempt, so a broken verifier is retried then reported. */
-    loopVerifierMisses = 0;
-    /** What the operator answered when a verifier abstained; consumed by the next judgment. */
-    loopAnswer;
-    /** Whether a reply block may stand in for a missing verdict; off unless asked for. */
-    allowSelfFallback;
-    /** Client-side directory verdict files are written under. */
-    verdictRoot;
+    /** Loop execution owns all verifier, settling and deadline state. */
+    loops;
     /** Local `!` commands, run on this machine and shown inline in the transcript. */
     shell;
     /** Mutating surface the UI drives. */
@@ -155,26 +107,20 @@ export class Controller {
     memoryLogPath;
     /** Directory this client runs in. */
     localDirectory;
-    /** Independent verifier for scored rounds, when one was supplied. */
-    verifier;
     /** Session opened at startup, when one was named. */
     initialSession;
     observers = new Set();
     selector = 0;
     connectionSettled = false;
+    /** Startup defaults apply once; subsequent generations restore the operator's selection. */
+    initialized = false;
     /** Counter behind `commandId`, so every executed line has one identifier in begin and end. */
     commandSeq = 0;
-    /** The operation that owns the client right now, when one does; the single foreground slot. */
-    foreground;
-    /** Callers waiting for the slot, oldest first; woken one at a time so nobody barges in. */
-    foregroundWaiters = [];
-    /** True while a waiter has been promised the slot but has not taken it yet. */
-    foregroundGranted = false;
-    /** Set when the client stops, so a waiter never starts work on a closed connection. */
-    foregroundClosed = false;
-    foregroundSeq = 0;
-    /** Which operation the current async continuation belongs to, so a nested call never re-claims. */
-    foregroundOwner = new AsyncLocalStorage();
+    /** Scheduling and cancellation are owned independently of domain operations. */
+    foregroundSlot = new ForegroundSlot({
+        changed: started => this.update(started ? { lastFailure: '' } : {}),
+        trace: event => this.traceEvent('foreground', event),
+    });
     /** Read-only follower for the full-screen view; it borrows the connection and never selects. */
     peek;
     /** Sources this client created, keyed by session id; the host cannot record that lineage itself. */
@@ -193,10 +139,15 @@ export class Controller {
         this.memoryLogPath = options.memoryLogPath;
         this.localDirectory = options.localDirectory ?? process.cwd();
         this.initialSession = initialSession;
-        this.verifier = options.verifier;
-        this.allowSelfFallback = options.allowSelfFallback === true;
-        this.verdictRoot = options.verdictRoot ?? this.localDirectory;
-        this.deadlineMs = options.deadlineMs;
+        this.loops = new LoopCoordinator({
+            facts: () => ({ sessionId: this.state.sessionId, online: this.state.online,
+                ready: this.state.session.record.ready, busy: this.foregroundSlot.snapshot !== undefined, pending: this.state.pending.length > 0 }),
+            reply: () => latestAssistantText(this.state.session.record.messages),
+            send: prompt => this.session.promptInternal(prompt),
+            publish: failure => this.update(failure === undefined ? {} : { lastFailure: failure }),
+            trace: (event, detail) => this.traceEvent(event, detail),
+        }, { directory: this.localDirectory, verifier: options.verifier, verdictRoot: options.verdictRoot,
+            deadlineMs: options.deadlineMs, allowSelfFallback: options.allowSelfFallback });
         const connectionOptions = { base, token, initialSession, makeClient, authenticate };
         this.connection = new ConnectionController(this, connectionOptions, this);
         // The view follows other sessions over the same connection; it never becomes a second writer.
@@ -210,13 +161,21 @@ export class Controller {
             env: () => shellEnv(),
             anchor: () => this.state.session.record.readThrough,
         }, shellEnabled);
-        this.catalog = new CatalogController(this, this.connection);
+        this.catalog = new CatalogController({
+            client: () => this.connection.client(), require: () => this.connection.require(),
+            online: () => this.state.online, signal: () => this.connection.signal(),
+            selection: () => ({ revision: this.selection(), sessionId: this.state.sessionId }),
+            publish: patch => this.update(patch),
+        });
         if (costs)
             this.cost = new CostController(costs, {
                 client: () => this.connection.client(),
                 online: () => this.state.online,
                 signal: () => this.connection.signal(),
                 publish: () => this.update({}),
+                // The session on screen is scanned whatever its age: `/cost` reports its own total, and the
+                // window filter exists to skip sessions nobody is looking at.
+                selectedSessionId: () => this.state.sessionId,
                 // The scan already reads every session's whole history; handing its pages to the session
                 // domain lets the prompt cache pick them up, so one open does not pay for a second walk.
                 scanPage: (sessionId, records) => this.session.rememberScanPage(sessionId, records),
@@ -251,19 +210,19 @@ export class Controller {
     /** Whether an operation owns the client's foreground slot right now.
      * @returns True while an operation is running.
      */
-    busy() { return this.foreground !== undefined; }
+    busy() { return this.foregroundSlot.snapshot !== undefined; }
     update(patch) {
         const previous = this.state;
         const next = { ...this.state, ...patch, version: this.state.version + 1 };
         next.pending = next.online && next.screen === 'chat' && this.session
-            ? this.session.pendingFor(next) : [];
+            ? this.session.pendingFor(next.sessionId) : [];
         // The shell service owns its blocks; state carries only the plain snapshot the UI renders.
         if (this.shell)
             next.shell = this.shell.snapshot();
         // A loop belongs to one session: selecting a different session ends it, but a reconnect — which
         // transiently clears the selection — must not, or a long review could never finish.
-        if (next.sessionId !== undefined && next.sessionId !== this.state.sessionId && this.loop?.sessionId !== next.sessionId) {
-            this.forgetLoop();
+        if (next.sessionId !== undefined && next.sessionId !== this.state.sessionId && this.loops.sessionId !== next.sessionId) {
+            this.loops.forget();
             // The read-only view belongs to the conversation that opened it; leaving that conversation
             // closes it, and the session switch that follows is never left rendering someone else's rows.
             this.dropPeek();
@@ -272,12 +231,7 @@ export class Controller {
         this.traceTransition(previous, next);
         for (const observer of this.observers)
             observer();
-        // A prompt the loop could not send yet (offline, busy or answering) goes out as soon as it can.
-        if (this.loopPrompt !== undefined)
-            void this.flushLoop();
-        // A finished attempt whose reply is still committing gets another look on every publish.
-        if (this.loopEndedAt !== undefined)
-            this.trySettleLoop();
+        this.loops.changed();
     }
     /** Record one diagnostic event; a no-op when no trace path was configured. */
     traceEvent(event, detail = {}) {
@@ -334,33 +288,34 @@ export class Controller {
      */
     buildActions() {
         return {
-            foreground: (kind, label, work, wait) => this.claimForeground(kind, label, work, wait),
-            cancelForeground: () => this.cancelForeground(),
+            foreground: (kind, label, work, wait) => this.foregroundSlot.run(kind, label, work, wait),
+            cancelForeground: () => this.foregroundSlot.cancel(),
             openPeek: id => this.openPeek(id),
             closePeek: () => this.closePeek(),
-            switchWorkspace: id => this.runAction('navigation', 'Switching workspace…', () => this.switchWorkspace(id)),
-            switchSession: query => this.runAction('navigation', 'Switching session…', () => this.switchSession(query)),
+            switchWorkspace: id => this.runAction('navigation', 'Switching workspace…', signal => this.switchWorkspace(id, signal)),
+            switchSession: query => this.runAction('navigation', 'Switching session…', signal => this.switchSession(query, signal)),
             selectSession: id => this.runAction('navigation', 'Loading session…', () => this.selectSession(id)),
-            createWorkspace: path => this.runAction('navigation', 'Registering workspace…', () => this.createWorkspace(path)),
-            createSession: () => this.runAction('navigation', 'Creating session…', () => this.createSession()),
+            createWorkspace: path => this.runAction('navigation', 'Registering workspace…', signal => this.createWorkspace(path, signal)),
+            createSession: () => this.runAction('navigation', 'Creating session…', signal => this.createSession(signal)),
             createVerifierSession: title => this.runActionValue('verifier', 'Creating verifier session…', () => this.createVerifierSession(title)),
-            cancelVerifierSession: sessionId => this.runAction('verifier', 'Stopping verifier…', async () => {
+            cancelVerifierSession: sessionId => this.runImmediateAction(async () => {
                 await this.session.cancelNamedSession(sessionId);
                 // The run is over even though its transcript stays readable; the list should say so.
                 this.endSource(sessionId, Date.now());
             }),
-            showPicker: screen => this.runAction('picker', 'Listing…', () => this.showPicker(screen)),
+            showPicker: screen => this.runAction('picker', 'Listing…', signal => this.showPicker(screen, signal)),
             removeTarget: target => this.runAction('removal', 'Removing…', () => this.removeTarget(target)),
             removalTarget: (kind, query) => this.runActionValue('removal', 'Reading target…', () => this.removalTarget(kind, query)),
             waitForHistory: signal => this.runAction('history', 'Loading history…', () => this.waitForHistory(signal)),
             searchSessions: (query, workspaceOnly, signal) => this.runActionValue('search', 'Searching sessions…', () => this.searchSessions(query, workspaceOnly, signal)),
-            searchHistory: (query, signal) => this.runActionValue('search', 'Searching history…', () => this.searchHistory(query, signal)),
+            openHistory: (target, signal) => this.runAction('history', 'Opening history…', operation => this.session.openHistory(target, AbortSignal.any([signal, operation]))),
+            searchHistory: (query, signal) => this.runActionValue('search', 'Searching history…', operation => this.searchHistory(query, AbortSignal.any([signal, operation]))),
             prompt: text => this.runAction('prompt', 'Sending…', () => this.prompt(text)),
             handoff: () => this.runAction('handoff', 'Requesting handoff…', () => this.handoff()),
-            startLoop: (protocol, limits) => this.runAction('loop', 'Starting loop…', () => this.startLoop(protocol, limits)),
-            stopLoop: () => this.stopLoop(),
-            clearLoopResult: () => this.clearLoopResult(),
-            answerLoop: text => this.runAction('loop', 'Answering the verifier…', () => this.answerLoop(text)),
+            startLoop: (protocol, limits) => this.runAction('loop', 'Starting loop…', () => this.loops.start(protocol, limits)),
+            stopLoop: () => this.loops.stop(),
+            clearLoopResult: () => this.loops.clearResult(),
+            answerLoop: text => this.runAction('loop', 'Answering the verifier…', () => this.loops.answer(text)),
             cancelTurn: () => this.runAction('interaction', 'Cancelling…', () => this.cancelTurn()),
             answer: value => this.runAction('interaction', 'Answering…', () => this.answer(value)),
             answerQuestion: input => this.runAction('interaction', 'Answering…', async () => {
@@ -370,19 +325,19 @@ export class Controller {
             approve: allowed => this.runAction('interaction', 'Answering…', () => this.approve(allowed)),
             dismissQuestion: () => this.runAction('interaction', 'Dismissing…', () => this.dismissQuestion()),
             interrupt: force => this.interrupt(force),
-            older: (signal, transcript) => this.runAction('history', 'Loading history…', () => this.older(signal, transcript)),
-            historyThrough: (target, signal) => this.runAction('history', 'Loading history…', () => this.historyThrough(target, signal)),
+            older: (signal, transcript) => this.runAction('history', 'Loading history…', operation => this.older(signal === undefined ? operation : AbortSignal.any([signal, operation]), transcript)),
+            historyThrough: (target, signal) => this.runAction('history', 'Loading history…', operation => this.historyThrough(target, AbortSignal.any([signal, operation]))),
             removeQueued: itemId => this.runAction('command', 'Removing queued input…', () => this.removeQueued(itemId)),
-            savePrompt: text => this.runAction('local', 'Saving prompt…', async () => {
+            savePrompt: text => this.runImmediateAction(async () => {
                 await this.promptStore.save(text);
                 this.update({ lastFailure: '' });
             }),
-            updatePrompt: (id, text) => this.runAction('local', 'Saving prompt…', async () => {
+            updatePrompt: (id, text) => this.runImmediateAction(async () => {
                 if (!await this.promptStore.update(id, text))
                     throw new Error('That saved prompt no longer exists');
                 this.update({ lastFailure: '' });
             }),
-            deletePrompt: id => this.runAction('local', 'Deleting prompt…', async () => {
+            deletePrompt: id => this.runImmediateAction(async () => {
                 if (!await this.promptStore.remove(id))
                     throw new Error('That saved prompt no longer exists');
                 this.update({ lastFailure: '' });
@@ -390,15 +345,15 @@ export class Controller {
             command: (line, signal) => this.runActionValue('command', 'Running command…', () => this.command(line, signal)),
             exportLog: (path, signal) => this.runActionValue('export', 'Exporting session log…', () => this.exportLog(path, signal)),
             exportHtml: (path, signal) => this.runActionValue('export', 'Exporting conversation…', () => this.exportHtml(path, signal)),
-            selectModel: (provider, model, effort) => this.runAction('model', 'Selecting model…', () => this.selectModel(provider, model, effort)),
-            modelCatalog: () => this.runActionValue('model', 'Loading models…', () => this.modelCatalog()),
-            refreshCosts: signal => this.runAction('cost', 'Refreshing costs…', () => this.refreshCosts(signal)),
+            selectModel: (provider, model, effort) => this.runAction('model', 'Selecting model…', signal => this.catalog.selectModel(provider, model, effort, signal)),
+            modelCatalog: () => this.runActionValue('model', 'Loading models…', signal => this.catalog.modelCatalog(signal)),
+            refreshCosts: signal => this.runAction('cost', 'Refreshing costs…', operation => this.refreshCosts(signal === undefined ? operation : AbortSignal.any([signal, operation]))),
             loadPresetNames: () => this.loadPresetNames(),
             clearFailure: () => this.clearFailure(),
             enterPath: () => this.enterPath(),
             pickWorkspace: id => this.pickWorkspace(id),
             showChat: () => this.showChat(),
-            setViewWindow: window => this.setViewWindow(window),
+            showLatest: () => this.session.setViewWindow(undefined),
             pinHistory: pinned => this.pinHistory(pinned),
             setAnswers: answers => this.setAnswers(answers),
             setOption: option => this.setOption(option),
@@ -415,8 +370,8 @@ export class Controller {
         return {
             get running() { return controller.running; },
             get turnsCompleted() { return controller.completedTurns; },
-            get forkedVerification() { return controller.verifier !== undefined; },
-            get selfScoring() { return controller.verifier === undefined || controller.allowSelfFallback; },
+            get forkedVerification() { return controller.loops.forkedVerification; },
+            get selfScoring() { return controller.loops.selfScoring; },
             get connectionSettled() { return controller.connectionSettled; },
             get sessionName() { return controller.sessionName; },
             get sessionMode() { return controller.sessionMode; },
@@ -425,22 +380,22 @@ export class Controller {
             get record() { return controller.record; },
             get window() { return controller.window; },
             get interaction() { return controller.interaction; },
-            get telemetry() { return controller.telemetry; },
+            get telemetry() { return controller.telemetry.reader; },
             get recallAtOldest() { return controller.recallAtOldest; },
             get recallLength() { return controller.recallLength; },
             get recallHasOlder() { return controller.recallHasOlder; },
             get prompts() { return controller.promptStore.list; },
             get promptsError() { return controller.promptStore.error; },
-            get loop() { return controller.loop?.progress; },
-            get foreground() { return controller.foreground; },
+            get loop() { return controller.loops.progress; },
+            get foreground() { return controller.foregroundSlot.snapshot; },
             get sources() { return controller.outputSources(); },
             get peek() { return controller.peekSnapshot(); },
             get activity() { return controller.activity; },
             get loopRecords() { return listLoopRecords(); },
+            get loopSource() { return loopSourceInfo(); },
             pendingCounts: () => controller.pendingCounts(),
             recall: (direction, current) => controller.recall(direction, current),
             references: (query, signal) => controller.references(query, signal),
-            historyAt: (target, signal) => controller.historyAt(target, signal),
             render: input => controller.render(input),
         };
     }
@@ -457,9 +412,9 @@ export class Controller {
     /** Cancel retries and HTTP, close the socket, and release session and catalog work. */
     async stop() {
         // Nobody waits forever for a slot that will never be handed out again.
-        this.foregroundClosed = true;
-        for (const wake of this.foregroundWaiters.splice(0))
-            wake();
+        this.foregroundSlot.close();
+        this.catalog.close();
+        await this.loops.close();
         this.dropPeek();
         await this.shell.stop();
         await this.connection.stop();
@@ -489,13 +444,13 @@ export class Controller {
      * @returns Whether the operation ran to completion.
      */
     async runAction(kind, label, operation) {
-        if (!this.state.online)
-            return false;
-        if (!this.ownsForeground() && this.foreground !== undefined)
+        if (!this.state.online) {
+            this.update({ lastFailure: 'Not connected. Try again after reconnecting.' });
             return false;
-        return await this.claimForeground(kind, label, async () => {
+        }
+        return await this.foregroundSlot.run(kind, label, async (signal) => {
             try {
-                await operation();
+                await operation(signal);
                 return true;
             }
             catch (error) {
@@ -506,13 +461,13 @@ export class Controller {
     }
     /** Same slot, for an operation that produces a value the caller needs. */
     async runActionValue(kind, label, operation) {
-        if (!this.state.online)
-            return undefined;
-        if (!this.ownsForeground() && this.foreground !== undefined)
+        if (!this.state.online) {
+            this.update({ lastFailure: 'Not connected. Try again after reconnecting.' });
             return undefined;
-        return await this.claimForeground(kind, label, async () => {
+        }
+        return await this.foregroundSlot.run(kind, label, async (signal) => {
             try {
-                return await operation();
+                return await operation(signal);
             }
             catch (error) {
                 this.update({ lastFailure: errorText(error) });
@@ -520,83 +475,11 @@ export class Controller {
             }
         });
     }
-    /** Whether the current async continuation is already inside the foreground operation.
-     *
-     * An action invoked *by* a running operation (a paging loop calling `older`, a command's policy
-     * calling an action) belongs to that operation: refusing it for being busy would deadlock the very
-     * work that owns the slot. An async-local owner answers that exactly, where a plain flag could not
-     * tell a nested call from a second, unrelated one.
-     * @returns True when this call runs inside the operation that owns the slot.
+    /** Run outside the foreground slot, with the same application failure reporting.
+     * Local prompt edits need no connection; verifier cancellation uses the session control lane and
+     * must reach the host even while the foreground is busy or closed for shutdown.
      */
-    ownsForeground() { return this.foregroundOwner.getStore() !== undefined; }
-    /** Run one operation in the foreground slot, claiming it when the caller does not already own it.
-     *
-     * The slot serializes what the operator is doing — one thing at a time — which is a different
-     * question from the session write order (§6.3): a read takes this slot too. The controller owns the
-     * slot, the abort controller and the identity, so the front end only renders `queries.foreground`
-     * and cancels it in one call.
-     * @param kind - What the operation is.
-     * @param label - Human label shown while it runs.
-     * @param work - The work, handed the signal that `cancelForeground` aborts.
-     * @returns What the work returned, or undefined when the slot was taken or the work was cancelled.
-     */
-    async claimForeground(kind, label, work, wait = false) {
-        const owner = this.foreground;
-        // Nested: the operation that owns the slot supplies the signal and keeps the identity.
-        if (owner !== undefined && this.ownsForeground())
-            return await work(owner.abort.signal);
-        if (owner !== undefined || this.foregroundGranted) {
-            // A caller that does not want to wait is told no; one that does waits its turn in arrival order.
-            if (!wait)
-                return undefined;
-            this.traceEvent('foreground', { phase: 'queued', kind, label });
-            await new Promise(resolve => this.foregroundWaiters.push(resolve));
-            // The release handed this caller the slot; clearing the flag and taking it is one synchronous
-            // step, so a later arrival cannot slip in between.
-            this.foregroundGranted = false;
-            if (this.foregroundClosed)
-                return undefined;
-        }
-        const operation = { id: ++this.foregroundSeq, kind, label, startedAt: Date.now(), abort: new AbortController() };
-        this.foreground = operation;
-        this.update({ lastFailure: '' });
-        this.traceEvent('foreground', { phase: 'begin', id: operation.id, kind, label });
-        try {
-            return await this.foregroundOwner.run(operation.id, () => work(operation.abort.signal));
-        }
-        finally {
-            // Only the owner releases the slot; a nested claim never reaches this branch.
-            if (this.foreground === operation) {
-                this.foreground = undefined;
-                this.update({});
-                this.traceEvent('foreground', { phase: 'end', id: operation.id, kind, cancelled: operation.abort.signal.aborted });
-                // Hand the slot to the oldest waiter, if any: the occupant is gone before the next one takes
-                // it, and `foregroundGranted` keeps a fresh arrival from overtaking the promise already made.
-                const next = this.foregroundWaiters.shift();
-                if (next !== undefined) {
-                    this.foregroundGranted = true;
-                    next();
-                }
-            }
-        }
-    }
-    /** Cancel the operation that owns the foreground slot; false when none is running.
-     * @returns Whether an operation was there to cancel.
-     */
-    cancelForeground() {
-        if (this.foreground === undefined)
-            return false;
-        this.foreground.abort.abort();
-        return true;
-    }
-    /** Run one local operation that needs no connection, reporting failure the way `runAction` does.
-     *
-     * Shortcut prompts are the operator's own file, so they must keep working while the host is
-     * disconnected; only the failure line is shared with the remote operations.
-     * @param operation - Operation to run against local storage.
-     * @returns Whether it ran to completion.
-     */
-    async runLocalAction(operation) {
+    async runImmediateAction(operation) {
         try {
             await operation();
             return true;
@@ -672,35 +555,28 @@ export class Controller {
     }
     /** The event stream is ready and the control baseline is applied. */
     async ready() {
-        this.catalog.refresh();
         this.update({ online: true, status: 'Connected', pending: [], lastFailure: '' });
+        this.catalog.refresh();
         const screen = this.state.screen;
         this.traceEvent('generation', { phase: 'ready', screen });
-        const picker = screen === 'sessions' ? 'sessions' : 'workspaces';
-        this.traceEvent('picker', { requested: picker });
-        await this.session.showPicker(picker);
-        // Starting inside a registered workspace's directory already answers the first question, so the
-        // reader lands on that workspace's sessions instead of a list they would pick from by hand.
-        // The guard only excludes the `sessions` screen, so it also runs when the captured screen is
-        // `chat`: a reconnect mid-conversation then adopts the local workspace, `pickWorkspace` clears
-        // the selection, and the reader is returned to `/resume`. The trace records the `adopt` event
-        // and the `state` transition that follow, which is how that jump is told from a user action.
-        const mayAdopt = screen !== 'sessions' && !this.initialSession;
-        if (mayAdopt) {
+        this.traceEvent('navigation-refresh', { screen });
+        await this.session.refreshLists();
+        // Startup may choose the local workspace. Reconnect only refreshes data: it must not reinterpret
+        // the reader's current screen as a request to navigate or discard a selected conversation.
+        if (!this.initialized && this.state.screen === 'workspaces' && !this.state.sessionId && !this.initialSession) {
             const adopted = this.session.adoptLocalWorkspace(this.localDirectory);
             this.traceEvent('adopt', { directory: this.localDirectory, workspace: adopted ?? 'none' });
             if (adopted !== undefined)
                 this.update({ status: 'Workspace from this directory · ← to switch' });
         }
-        // A loop outlives a reconnect, so it re-attaches to its own session even when the picker
-        // replaced the selection; without that the loop would keep settling against an empty transcript.
-        const looping = this.loop?.sessionId;
-        const sessionId = this.state.sessionId ?? looping ?? this.initialSession;
-        const reselect = Boolean(sessionId && (screen === 'chat' || looping !== undefined || this.initialSession && !this.state.sessionId));
-        this.traceEvent('resolve', { session: sessionId ?? 'none', looping: looping ?? 'none', reselect });
-        if (sessionId && reselect) {
+        const selected = this.state.sessionId;
+        const sessionId = selected ?? this.loops.sessionId ?? (!this.initialized ? this.initialSession : undefined);
+        this.traceEvent('resolve', { session: sessionId ?? 'none', looping: this.loops.sessionId ?? 'none', reselect: sessionId !== undefined });
+        if (selected !== undefined)
+            this.session.restoreSelectedSession();
+        else if (sessionId !== undefined)
             await this.session.selectSession(sessionId);
-        }
+        this.initialized = true;
         // `online` means the socket works; `connectionSettled` means the picker and the selection are
         // done, which is what an automation caller must wait for or it races `showPicker`.
         this.connectionSettled = true;
@@ -744,7 +620,7 @@ export class Controller {
                     if (started && event.sessionId === this.state.sessionId)
                         this.completedTurns += 1;
                     this.cost?.onTurnIdle();
-                    this.settleLoop(event.sessionId);
+                    this.loops.idle(event.sessionId);
                 }
                 return true;
             case 'catalog-invalidated':
@@ -763,7 +639,7 @@ export class Controller {
     /** @returns Current session title, falling back to the list title and then the ID. */
     get sessionName() { return this.session.sessionName; }
     /** @returns Current agent-preset label. */
-    get sessionMode() { return this.session.sessionMode; }
+    get sessionMode() { return this.session.sessionMode(this.state.presets); }
     /** @returns Epoch start of the active turn, when known. */
     get workingSince() { return this.session.workingSince; }
     /** What the client is doing right now, merged across the host turn and any running loop.
@@ -776,7 +652,7 @@ export class Controller {
         if (this.running) {
             return { kind: 'turn', ...(this.workingSince === undefined ? {} : { since: this.workingSince }) };
         }
-        const progress = this.loop?.progress;
+        const progress = this.loops.progress;
         if (progress === undefined || !progress.active)
             return undefined;
         // A paused run is still the client's work, but nothing is running: the bar must ask for the reader
@@ -849,7 +725,7 @@ export class Controller {
             id: sessionId, kind: 'session', label: verifierLabel(title), state: 'running', startedAt: Date.now(),
             createdBy: 'verifier',
             ...(parent === undefined ? {} : { parentSessionId: parent }),
-            ...(this.verifier === undefined ? {} : { detail: `verifier ${this.verifier.name}` }),
+            ...(this.loops.verifierName === undefined ? {} : { detail: `verifier ${this.loops.verifierName}` }),
         });
         // The bar the run echoed into the transcript now opens this session, which is the newest check.
         this.shell.link(sessionId);
@@ -923,23 +799,13 @@ export class Controller {
     pendingCounts() { return this.session.pendingCounts(); }
     /** Load the optional preset roster once per connection. */
     loadPresetNames() { this.catalog.loadPresetNames(); }
-    /** @returns Host model routes and adapter-owned reasoning choices. */
-    async modelCatalog() { return this.catalog.modelCatalog(); }
-    /** Select the next request's model.
-     * @param provider - Host provider route ID.
-     * @param model - Exact model ID.
-     * @param reasoningEffort - Optional adapter-owned effort ID.
-     */
-    async selectModel(provider, model, reasoningEffort) {
-        await this.catalog.selectModel(provider, model, reasoningEffort);
-    }
     /** Stop the selected turn, or allow exit only while idle.
      * @param force - Send an explicit cancellation even when the cached running flag is idle.
      * @returns True when the caller may exit.
      */
     interrupt(force = false) {
         // Esc and Ctrl+C stop the automated loop as well as the turn; otherwise it would keep sending.
-        this.stopLoop();
+        this.loops.stop();
         return this.session.interrupt(force);
     }
     /** One-line estimate of the selected session's cost, or `?` while the ledger has no entry for it. */
@@ -952,7 +818,6 @@ export class Controller {
     /** Show a detached history window, releasing the one it replaces.
      * @param window - Record to display, or undefined to return to the live transcript.
      */
-    setViewWindow(window) { this.session.setViewWindow(window); }
     /** Recall one step through the selected session's prompt index; never touches the network.
      * @param direction - Negative for older input, positive for newer input.
      * @param current - Composer content before recall began, restored at the newest position.
@@ -1001,9 +866,9 @@ export class Controller {
     /** Refresh both lists from the host, then show the requested picker.
      * @param screen - Picker to display after the refresh.
      */
-    async showPicker(screen) {
+    async showPicker(screen, signal) {
         this.traceEvent('action', { action: 'showPicker', screen });
-        await this.session.showPicker(screen);
+        await this.session.showPicker(screen, signal);
     }
     /** Resolve a removal command to one reviewable object.
      * @param kind - Workspace registration removal or session archival.
@@ -1036,16 +901,16 @@ export class Controller {
     /** Open a workspace picker, or resolve a workspace target.
      * @param query - Workspace target, if any.
      */
-    async switchWorkspace(query) {
+    async switchWorkspace(query, signal) {
         this.traceEvent('action', { action: 'switchWorkspace', query: query ?? 'picker' });
-        await this.session.switchWorkspace(query);
+        await this.session.switchWorkspace(query, signal);
     }
     /** Guide session selection, list all sessions with `all`, or resolve a target.
      * @param query - Session target, `all`, or nothing for the guided picker.
      */
-    async switchSession(query) {
+    async switchSession(query, signal) {
         this.traceEvent('action', { action: 'switchSession', query: query ?? 'picker' });
-        await this.session.switchSession(query);
+        await this.session.switchSession(query, signal);
     }
     /** Prompt for a host path without starting a local agent. */
     enterPath() {
@@ -1055,14 +920,14 @@ export class Controller {
     /** Register a host directory and move to its session picker.
      * @param path - Absolute directory path on the host.
      */
-    async createWorkspace(path) {
+    async createWorkspace(path, signal) {
         this.traceEvent('action', { action: 'createWorkspace', path });
-        await this.session.createWorkspace(path);
+        await this.session.createWorkspace(path, signal);
     }
     /** Create a session in the selected workspace. */
-    async createSession() {
+    async createSession(signal) {
         this.traceEvent('action', { action: 'createSession', workspace: this.state.workspaceId ?? 'none' });
-        await this.session.createSession();
+        await this.session.createSession(signal);
     }
     /** Replace the selected transcript and follow the session.
      * @param sessionId - Session to follow.
@@ -1124,7 +989,7 @@ export class Controller {
      * @param text - Composed prompt text.
      */
     async prompt(text) {
-        this.stopLoop();
+        this.loops.stop();
         await this.session.prompt(text);
     }
     /** Clear this client's stale handoff file, then ask the agent to write a new one.
@@ -1137,566 +1002,9 @@ export class Controller {
         await removeFile(join(this.localDirectory, HANDOFF_FILE));
         await this.session.promptInternal(HANDOFF_PROMPT);
     }
-    /** Start a scored loop and send its opening step.
-     * @param protocol - Prompt text and step count the loop follows.
-     * @param limits - Resolved `--from/--to/--score/--tries`.
-     */
-    async startLoop(protocol, limits) {
-        const sessionId = this.state.sessionId;
-        // Every branch that can leave a start invisible is traced with its reason, so "it did nothing"
-        // is answerable from the trace instead of guessed at.
-        if (sessionId === undefined) {
-            this.traceEvent('loop', { phase: 'refused', kind: protocol.kind, reason: 'no-session' });
-            throw new Error('Select a session first');
-        }
-        // A new run replaces whatever was there; the old one is closed before the new identity exists.
-        this.forgetLoop('replaced');
-        const runId = randomUUID();
-        this.loopRunId = runId;
-        this.loopEndTraced = false;
-        this.traceEvent('loop', { phase: 'begin', runId, kind: protocol.kind, session: sessionId,
-            from: limits.from, to: limits.to, score: limits.score, tries: limits.tries, forked: this.verifier !== undefined });
-        const loop = new ScoredLoop(runId, sessionId, protocol, limits);
-        this.loop = loop;
-        // A protocol that reviews something already on disk verifies first: a round that passes costs no
-        // work turn at all, and only a failing verdict asks the agent to change anything.
-        if (this.startsByVerifying(loop)) {
-            this.update({});
-            this.armLoopDeadline();
-            this.traceEvent('loop', { phase: 'verify-first', runId, kind: protocol.kind, step: limits.from });
-            this.verifyStep(loop);
-            return;
-        }
-        const prompt = loop.start();
-        loop.sent();
-        this.update({});
-        this.armLoopDeadline();
-        try {
-            await this.session.promptInternal(prompt);
-            this.traceEvent('loop', { phase: 'sent', runId, kind: protocol.kind, step: limits.from, attempt: 1 });
-        }
-        catch (error) {
-            // The run never got its first turn. It ends needing a person rather than silently vanishing:
-            // the reason says the send was rejected, and the snapshot stays readable.
-            this.rejectLoopSend(loop, error);
-            throw error;
-        }
-    }
-    /** End a run whose next prompt could not be sent, keeping the reason visible.
-     *
-     * A rejected send is not a verdict and not an operator cancellation, so the phase is `needs-human`
-     * and `terminalReason` says why — this is what keeps `phase=cancelled` meaning "a person stopped it".
-     * @param loop - Run that could not send.
-     * @param error - What the host or the session layer rejected with.
-     */
-    rejectLoopSend(loop, error) {
-        const text = errorText(error).slice(0, 200);
-        this.forgetSettleTimer();
-        this.clearLoopDeadline();
-        this.abortVerification();
-        loop.human({ kind: 'send', text }, 'send-rejected');
-        this.traceLoopEnd(loop);
-        this.loopPrompt = undefined;
-        this.update({ lastFailure: text });
-    }
-    /** Record the end of one run once, with the phase it stopped in and why.
-     *
-     * I9 needs every `begin` to be paired inside the trace window; this is the only writer of `loop end`.
-     * @param loop - Run whose terminal phase was just published.
-     */
-    traceLoopEnd(loop) {
-        if (this.loopEndTraced)
-            return;
-        this.loopEndTraced = true;
-        const progress = loop.progress;
-        this.traceEvent('loop', { phase: 'end', runId: progress.runId, kind: loop.protocol.kind,
-            result: progress.phase, step: progress.step, attempt: progress.attempt,
-            reason: progress.terminalReason ?? 'unknown' });
-    }
-    /** Whether a step begins with verification rather than with a work prompt.
-     *
-     * Needs all three: the record asks for it, the record has a verifier prompt, and this client was
-     * given a verifier. Otherwise there is nobody to verify first, and the step asks for work.
-     * @param loop - Loop about to start a step.
-     * @returns True when the step starts by verifying.
-     */
-    startsByVerifying(loop) {
-        return loop.protocol.starts === 'verify' && loop.protocol.verify !== undefined && this.verifier !== undefined;
-    }
-    /** Verify the step in flight without a work turn before it.
-     *
-     * The activity is set inside `verifyRound`, so the first verification, a work-turn verdict and a
-     * retry all publish the same state without this caller having to remember it.
-     * @param loop - Loop whose step and attempt are already set.
-     */
-    verifyStep(loop) {
-        void this.verifySection(loop);
-    }
-    /** Check the round's own section before spending a verifier on it, then verify or ask for work.
-     *
-     * Verify-first exists so a round that already passes costs no work turn. When the section is not in
-     * the artifact at all the round *cannot* pass, and this client can read that itself — the same check
-     * it applies to a verdict before accepting one. Sending a verifier to discover "the file is missing"
-     * costs a session and, because a failed attempt consumes one, also the round's first attempt: a run
-     * over a document with no review yet would start working at attempt 2/10. An artifact this client
-     * cannot read stays a boundary: the verification runs and its verdict decides, as before.
-     * @param loop - Loop whose step and attempt are already set.
-     */
-    async verifySection(loop) {
-        const artifact = loop.protocol.artifact;
-        const marker = loop.protocol.artifactMarker?.(loop.progress.step);
-        if (artifact === undefined || marker === undefined) {
-            void this.verifyRound(loop);
-            return;
-        }
-        // `readText` answers undefined only for a file that is not there and throws for one that cannot be
-        // read, so the two cases are told apart here: a missing file has no section either, while an
-        // unreadable one is a boundary this client cannot decide.
-        let text;
-        try {
-            text = await readText(join(this.localDirectory, artifact));
-        }
-        catch {
-            void this.verifyRound(loop);
-            return;
-        }
-        // Reading the artifact is I/O, so the run may have moved on before it came back.
-        if (this.loop !== loop || !loop.active)
-            return;
-        if (text !== undefined && text.includes(marker)) {
-            void this.verifyRound(loop);
-            return;
-        }
-        // A missing file only proves the producer never wrote it when this client can see the workspace at
-        // all. A workspace this machine does not have is a boundary — the same boundary the artifact check
-        // after a verdict already respects — so the verifier's reading decides instead.
-        if (text === undefined && !await this.workspaceVisible()) {
-            void this.verifyRound(loop);
-            return;
-        }
-        this.traceEvent('loop', { phase: 'work-first', runId: this.loopRunId ?? '', kind: loop.protocol.kind,
-            step: loop.progress.step, artifact, reason: 'section-missing' });
-        loop.note(`⚠ artifact check · ${artifact} 还没有本轮小节，直接开始工作`);
-        // No verdict was consumed, so the attempt is untouched: the first work turn is attempt 1, exactly
-        // as it is for a record that asks for work first.
-        this.loopPrompt = loop.workPrompt();
-        this.update({});
-        void this.flushLoop();
-    }
-    /** Whether the directory this client runs in is readable here at all.
-     *
-     * `readText` answers undefined for a missing file and for a file inside a directory this machine does
-     * not have, and the two mean opposite things: the first is a producer that wrote nothing, the second
-     * is a workspace whose verdict cannot be checked from here.
-     * @returns True when the directory can be listed.
-     */
-    async workspaceVisible() {
-        try {
-            await listEntries(this.localDirectory);
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
-    /** Arm the whole-run budget, when the operator set one. */
-    armLoopDeadline() {
-        if (this.deadlineMs === undefined)
-            return;
-        this.loopDeadlineTimer = setTimeout(() => this.expireLoopDeadline(), this.deadlineMs);
-        this.loopDeadlineTimer.unref();
-    }
-    /** Answer a paused run, so the current artifact is judged again with what the operator supplied.
-     *
-     * The answer is not a work order: it only adds a condition to the judgment, so nothing is sent to the
-     * agent and no attempt is consumed. The verification that follows is a new task with a new identity,
-     * which is what keeps a late verdict from the paused one from deciding the attempt.
-     * @param text - What the operator added; never written to the trace.
-     */
-    async answerLoop(text) {
-        const loop = this.loop;
-        if (loop === undefined || !loop.active)
-            throw new Error('No loop is waiting for an answer');
-        this.loopAnswer = text;
-        const judged = this.verifier !== undefined && loop.protocol.verify !== undefined;
-        loop.resume(judged ? 'verify' : 'turn');
-        this.update({});
-        this.traceEvent('loop', { phase: 'answered', runId: loop.progress.runId, judged, chars: text.length });
-        if (judged) {
-            this.verifyStep(loop);
-            return;
-        }
-        // Without a forked verifier the answer is the next attempt's instruction: the agent is asked again
-        // with the addition, and the attempt budget still decides how many times that may happen.
-        this.loopPrompt = loop.answerPrompt(text);
-        void this.flushLoop();
-    }
-    /** Stop a running review; the terminal progress stays visible for the reader.
-     * @param reason - Why it stopped; the default is an operator action.
-     */
-    stopLoop(reason = 'user-cancelled') {
-        if (this.loop === undefined)
-            return;
-        this.forgetSettleTimer();
-        this.clearLoopDeadline();
-        this.abortVerification();
-        this.loopEndedAt = undefined;
-        this.loop.cancel(reason);
-        this.traceLoopEnd(this.loop);
-        this.loopPrompt = undefined;
-        this.update({});
-    }
-    /** Drop a finished run's progress line, keeping an active one.
-     *
-     * D3 keeps a terminal result on screen because it is what the reader most needs to see — but it is a
-     * result, not a status: the next line the operator runs means they have read it. An active run is
-     * left alone, so `/loop answer` and `/loop stop` keep the target they were typed for.
-     */
-    clearLoopResult() {
-        const loop = this.loop;
-        if (loop === undefined || loop.active)
-            return;
-        this.forgetLoop();
-        this.update({});
-    }
-    /** Drop the loop entirely, without publishing a cancelled phase.
-     * @param reason - Why it was dropped, recorded when it never reached a terminal phase itself.
-     */
-    forgetLoop(reason = 'replaced') {
-        // A run that is dropped while still active never published a terminal phase: close its trace span
-        // here so one begin still has one end, then let the snapshot go.
-        if (this.loop !== undefined && this.loop.active) {
-            this.loop.cancel(reason);
-            this.traceLoopEnd(this.loop);
-        }
-        this.forgetSettleTimer();
-        this.clearLoopDeadline();
-        this.abortVerification();
-        this.loopPrevious = undefined;
-        this.loopRunId = undefined;
-        this.loopEndTraced = false;
-        this.loopVerifySeq = 0;
-        this.loopVerifyIdentity = undefined;
-        this.loopVerifierMisses = 0;
-        this.loopAnswer = undefined;
-        this.loop = undefined;
-        this.loopPrompt = undefined;
-        this.loopEndedAt = undefined;
-    }
-    /** Note that an attempt's turn ended; its block may still be arriving.
-     * @param sessionId - Session the host reported idle.
-     */
-    settleLoop(sessionId) {
-        const loop = this.loop;
-        if (loop === undefined || !loop.active || !loop.settled || loop.sessionId !== sessionId)
-            return;
-        this.loopEndedAt ??= Date.now();
-        this.trySettleLoop();
-    }
-    /** Consume the attempt once its result block is committed, or the grace period expires.
-     *
-     * The final assistant message can land a moment after the idle event, so an empty parse is not yet
-     * a failed attempt: the next publish retries, and one timer covers a transcript that never grows.
-     */
-    trySettleLoop() {
-        const loop = this.loop;
-        if (loop === undefined || !loop.active || !loop.settled) {
-            this.forgetSettleTimer();
-            this.loopEndedAt = undefined;
-            return;
-        }
-        // Only a turn that actually ended may be consumed: a timer that fired just before the attempt
-        // settled must not decide the attempt that replaced it.
-        const endedAt = this.loopEndedAt;
-        if (endedAt === undefined) {
-            this.forgetSettleTimer();
-            return;
-        }
-        // An independent verifier decides the round; the reply block below stays as its fallback. Its
-        // branch keeps its own `verify` sub-state, so this must not announce settling over it.
-        if (loop.protocol.verify !== undefined && this.verifier !== undefined) {
-            if (!this.loopVerifying && !this.loopSettling)
-                void this.verifyRound(loop);
-            return;
-        }
-        // No forked verifier: reading the reply block, including the grace wait for it, is settling.
-        loop.settling();
-        const result = parseLoopResult(latestAssistantText(this.state.session.record.messages), loop.protocol);
-        if (result === undefined && Date.now() - endedAt < LOOP_SETTLE_GRACE_MS) {
-            if (this.loopSettleTimer === undefined) {
-                this.loopSettleTimer = setTimeout(() => { this.loopSettleTimer = undefined; this.trySettleLoop(); }, LOOP_SETTLE_GRACE_MS);
-                this.loopSettleTimer.unref();
-            }
-            return;
-        }
-        this.forgetSettleTimer();
-        this.loopEndedAt = undefined;
-        void this.settleChecked(loop, result);
-    }
-    /** Score one finished round out of band, in a process of its own.
-     *
-     * The child writes its verdict to a file, so a slow or failed verifier delays the attempt instead
-     * of corrupting it: with no verdict the reply block decides, and with neither the attempt fails.
-     * @param loop - The run whose attempt just finished.
-     */
-    async verifyRound(loop) {
-        const verifier = this.verifier;
-        if (verifier === undefined)
-            return;
-        const { step, attempt } = loop.progress;
-        const { kind } = loop.protocol;
-        const runId = this.loopRunId ?? (this.loopRunId = randomUUID());
-        // Every started verification is its own task: a failure retry or an operator answer must not
-        // reuse the identity or the file of the task it replaced, or a late verdict could decide it.
-        const seq = this.loopVerifySeq += 1;
-        const file = verdictFile(this.verdictRoot, runId, kind, step, attempt, seq);
-        const identity = verificationId(runId, kind, step, attempt, seq);
-        const prompt = loop.protocol.verify(loop.progress, step, attempt, { file, verificationId: identity }, this.loopPrevious);
-        // An answer the operator gave after an abstention only adds a condition: the same artifact is
-        // judged again, under a fresh identity, and no attempt is consumed for it.
-        const answered = this.loopAnswer === undefined ? prompt : `${prompt}\n\n## 操作者的补充判断\n${this.loopAnswer}`;
-        this.loopVerifying = true;
-        this.loopVerifyIdentity = identity;
-        // The sub-state is a fact on the loop, not a note: the progress line and the status bar both read
-        // it, and a retry's warning note stays beside it instead of being overwritten by a string.
-        loop.verifying();
-        this.update({});
-        this.traceEvent('verify', { runId, phase: 'begin', kind, step, attempt, seq, file });
-        const abort = new AbortController();
-        this.loopVerifyAbort = abort;
-        let outcome;
-        try {
-            // The reviewed workspace is declared here, where it is known, so the verifier's artifact check
-            // never has to infer it from whatever directory the process happens to run in.
-            outcome = await verifier.verify({ verificationId: identity, kind, step, attempt, prompt: answered, file,
-                workspace: this.localDirectory,
-                ...(loop.protocol.artifact === undefined ? {} : { artifact: loop.protocol.artifact }),
-                title: `[dsht-verify] ${loop.protocol.title} · ${step}/${attempt}` }, abort.signal);
-        }
-        catch (error) {
-            outcome = { type: 'unavailable', reason: `verifier failed: ${errorText(error)}` };
-        }
-        finally {
-            if (this.loopVerifyAbort === abort)
-                this.loopVerifyAbort = undefined;
-            this.loopVerifying = false;
-        }
-        // A newer verification task owns this attempt now: this task's verdict is stale by definition.
-        if (this.loopVerifyIdentity !== identity) {
-            this.traceEvent('verify', { runId, phase: 'stale', kind, step, attempt, seq });
-            return;
-        }
-        // Verification outlives nothing: a cancelled or replaced loop must not be settled by its result.
-        if (this.loop !== loop || !loop.active || !loop.settled) {
-            this.traceEvent('verify', { runId, phase: 'abandoned', kind, step, attempt, seq });
-            return;
-        }
-        this.forgetSettleTimer();
-        this.loopEndedAt = undefined;
-        // The review was cancelled: nothing to decide, and nothing to report as a verdict.
-        if (outcome.type === 'cancelled') {
-            this.traceEvent('verify', { runId, phase: 'cancelled', kind, step, attempt, seq });
-            return;
-        }
-        // The host is waiting for a human the verifier cannot answer: stop with the request attached.
-        // The verifier is blocked, not broken, so retrying would only hit the same wall three times.
-        if (outcome.type === 'needs-human') {
-            this.traceEvent('verify', { runId, phase: 'needs-human', kind, step, attempt, seq, request: outcome.request.kind });
-            this.clearLoopDeadline();
-            loop.human(outcome.request);
-            this.traceLoopEnd(loop);
-            this.update({});
-            return;
-        }
-        if (outcome.type === 'verified') {
-            this.traceEvent('verify', { runId, phase: 'verified', kind, step, attempt, seq,
-                score: outcome.result.score ?? -1, blocked: outcome.result.blocked === true, status: outcome.result.status ?? 'none' });
-            this.loopVerifierMisses = 0;
-            await this.settleChecked(loop, outcome.result);
-            return;
-        }
-        // Unavailable is not a verdict, so it never consumes the attempt: retry the verifier, and only
-        // then stop the run. Self-scoring is opt-in and is always visible in the progress line.
-        // A failure that says it is not retryable (an unconfirmed remote cancel, a bad configuration)
-        // would only repeat itself, so it is reported instead of spending the retry budget.
-        if (outcome.retryable === false) {
-            this.traceEvent('verify', { runId, phase: 'unavailable', kind, step, attempt, seq, retryable: false, reason: outcome.reason.slice(0, 200) });
-            loop.note(`⚠ verification unavailable · ${outcome.reason}`);
-            this.clearLoopDeadline();
-            loop.unavailable();
-            this.traceLoopEnd(loop);
-            this.update({});
-            return;
-        }
-        this.loopVerifierMisses += 1;
-        if (this.loopVerifierMisses <= VERIFIER_RETRIES) {
-            this.traceEvent('verify', { runId, phase: 'retry', kind, step, attempt, seq, misses: this.loopVerifierMisses, reason: outcome.reason.slice(0, 200) });
-            loop.note(`⚠ verification unavailable · retrying (${outcome.reason})`);
-            this.update({});
-            void this.verifyRound(loop);
-            return;
-        }
-        if (this.allowSelfFallback) {
-            const fallback = parseLoopResult(latestAssistantText(this.state.session.record.messages), loop.protocol);
-            this.traceEvent('verify', { runId, phase: 'fallback', kind, step, attempt, seq, block: fallback !== undefined });
-            await this.settleChecked(loop, fallback, fallback === undefined
-                ? `⚠ verification fallback · self-reported (and no reply block: ${outcome.reason})`
-                : '⚠ verification fallback · self-reported');
-            return;
-        }
-        this.traceEvent('verify', { runId, phase: 'unavailable', kind, step, attempt, seq, retryable: true, misses: this.loopVerifierMisses, reason: outcome.reason.slice(0, 200) });
-        loop.note(`⚠ verification unavailable · ${outcome.reason}`);
-        this.clearLoopDeadline();
-        loop.unavailable();
-        this.traceLoopEnd(loop);
-        this.update({});
-    }
-    /** Apply a protocol's own artifact requirement, then settle the attempt.
-     *
-     * The score is the verifier's judgement; whether the round's conclusion actually reached the
-     * artifact is a fact this client checks itself. A hard condition may not be overridden by a score:
-     * a round whose section is missing fails even at 10/10, and the missing line is fed back to the
-     * next attempt like any other finding. An artifact this client cannot read cannot be checked, so
-     * the verdict stands rather than being failed on a boundary.
-     * @param loop - The run whose attempt just finished.
-     * @param result - Verdict to consume.
-     * @param note - Note to show instead, when the check accepted the verdict unchanged.
-     */
-    async settleChecked(loop, result, note = '') {
-        if (this.loopSettling)
-            return;
-        this.loopSettling = true;
-        try {
-            const marker = result === undefined || result.blocked === true || result.abstained === true
-                ? undefined : loop.protocol.artifactMarker?.(loop.progress.step);
-            const artifact = loop.protocol.artifact;
-            if (marker === undefined || artifact === undefined || result === undefined) {
-                this.settleWith(loop, result, note);
-                return;
-            }
-            const text = await readText(join(this.localDirectory, artifact));
-            // Reading the artifact is I/O, so the run may have moved on before it came back.
-            if (this.loop !== loop || !loop.active || !loop.settled)
-                return;
-            if (text === undefined || text.includes(marker)) {
-                this.settleWith(loop, result, note);
-                return;
-            }
-            this.traceEvent('artifact', { phase: 'missing', artifact, step: loop.progress.step, score: result.score ?? -1 });
-            const reported = result.score === undefined ? '没有分数' : `${result.score} 分`;
-            this.settleWith(loop, { ...result, score: undefined,
-                findings: [...(result.findings ?? []), `工作区文件 ${artifact} 缺少本轮小节「${marker}」`] }, `⚠ artifact check · ${artifact} 缺少本轮小节「${marker}」（验证者给了 ${reported}，本轮不通过）`);
-        }
-        finally {
-            this.loopSettling = false;
-        }
-    }
-    /** Apply one attempt's verdict, and continue the run when it has a next step.
-     * @param loop - The run being settled.
-     * @param result - Verdict to consume, or undefined when the attempt produced none.
-     */
-    settleWith(loop, result, note = '') {
-        const before = loop.progress;
-        const step = loop.settle(result);
-        // The answer was the condition for this judgment, so it is spent once the verdict is in.
-        this.loopAnswer = undefined;
-        // A pause is not an end: the run keeps its span (and its deadline) until it is answered or ended.
-        if (step.kind !== 'continue' && !loop.active) {
-            this.clearLoopDeadline();
-            // A decision ended the run: close its trace span with the phase and reason it stopped in.
-            this.traceLoopEnd(loop);
-        }
-        // The note describes the attempt just decided, so it is applied after the state moved on.
-        loop.note(note);
-        if (step.kind === 'continue') {
-            // A retry on the same step carries the verdict that caused it; a new step starts clean.
-            this.loopPrevious = before.step === loop.progress.step && result !== undefined
-                ? { step: before.step, attempt: before.attempt, result } : undefined;
-            // A passing verdict advanced the step. When the record verifies first, the new round is
-            // verified against the artifact as it stands before anyone is asked to change it.
-            if (loop.progress.step !== before.step && this.startsByVerifying(loop)) {
-                this.update({});
-                this.verifyStep(loop);
-                return;
-            }
-            const findings = result === undefined ? [] : findingsLines(result);
-            // `step.prompt` is already brief-aware: a run that began by verifying has sent no prompt yet, so
-            // its first work message is the brief rather than a follow-up that describes nothing.
-            this.loopPrompt = [step.prompt, ...findings].join('\n');
-        }
-        this.update({});
-        if (step.kind === 'continue')
-            void this.flushLoop();
-    }
-    /** Stop an in-flight verification, if any; its result can no longer decide anything. */
-    abortVerification() {
-        this.loopVerifyAbort?.abort();
-        this.loopVerifyAbort = undefined;
-        this.loopVerifying = false;
-    }
-    /** Stop the run because the whole-run budget expired; a budget stop, not a verdict.
-     *
-     * Any verification in flight is cancelled (bounded, as everywhere else) and its late result can
-     * no longer decide anything, because the loop is no longer active.
-     */
-    expireLoopDeadline() {
-        this.loopDeadlineTimer = undefined;
-        const loop = this.loop;
-        if (loop === undefined || !loop.active)
-            return;
-        this.forgetSettleTimer();
-        this.abortVerification();
-        this.loopEndedAt = undefined;
-        loop.note('⚠ deadline reached');
-        loop.deadline();
-        this.traceLoopEnd(loop);
-        this.update({});
-    }
-    /** Drop the run deadline, if one is armed. */
-    clearLoopDeadline() {
-        if (this.loopDeadlineTimer === undefined)
-            return;
-        clearTimeout(this.loopDeadlineTimer);
-        this.loopDeadlineTimer = undefined;
-    }
-    /** Drop a pending settle timer, if any. */
-    forgetSettleTimer() {
-        if (this.loopSettleTimer === undefined)
-            return;
-        clearTimeout(this.loopSettleTimer);
-        this.loopSettleTimer = undefined;
-    }
-    /** Send the prompt the loop is holding, once the client can actually send it. */
-    async flushLoop() {
-        const loop = this.loop;
-        const prompt = this.loopPrompt;
-        if (loop === undefined || prompt === undefined || !loop.active)
-            return;
-        // Nothing of this loop writes while an independent verifier is judging it: the round under
-        // verification must be the round that was scored. A prompt that appears meanwhile is sent when
-        // the verdict lands (or dropped with the run), never interleaved with the verification.
-        if (this.loopVerifying)
-            return;
-        if (this.state.sessionId !== loop.sessionId)
-            return;
-        if (!this.state.online || this.foreground !== undefined || this.state.pending.length)
-            return;
-        // Consume before awaiting, so a re-entrant update cannot send the same prompt twice.
-        this.loopPrompt = undefined;
-        loop.sent();
-        this.update({});
-        try {
-            await this.session.promptInternal(prompt);
-        }
-        catch (error) {
-            // The next prompt was rejected (a waiting interaction, a lost snapshot, offline): the run ends
-            // with that reason recorded instead of vanishing without a trace.
-            this.rejectLoopSend(loop, error);
-        }
-    }
     /** Cancel the active turn; pending queue items remain host-owned. */
     async cancelTurn() {
-        this.stopLoop();
+        this.loops.stop();
         await this.session.cancelTurn();
     }
     /** Add a page before the retained window.
@@ -1710,12 +1018,6 @@ export class Controller {
      * @returns Newest-first bounded summaries and an explicit truncation flag.
      */
     async searchHistory(query, signal) { return this.session.searchHistory(query, signal); }
-    /** Load a separate small window ending at a search target.
-     * @param target - Durable message sequence to display.
-     * @param signal - Cancels the target-page request.
-     * @returns A caller-owned historical window that must be disposed when closed.
-     */
-    async historyAt(target, signal) { return this.session.historyAt(target, signal); }
     /** Plain rows and offsets for one laid-out record; the projection stays in the session domain. */
     render(input) {
         return this.session.render(input);