@vibes.diy/api-svc 14.2.6 → 14.2.7

package/public/prompt-chat-section.js

@@ -27,12 +27,11 @@ import { bumpAppRecency } from "../intern/bump-app-recency.js";
 import { waitChatPersistIdle } from "../intern/chat-persist-gate.js";
 import { peekInFlightTurns } from "../intern/in-flight-turns.js";
 import { acquireTurnBuildLock, peekBuildLockEntry, releaseTurnBuildLock } from "../intern/codegen-build-lock.js";
-import { agentFirstTurnEnabled, agentLaneEnabled, agentSessionEnabled } from "../intern/agent-lane-flag.js";
 import { deliverAgentSession } from "../intern/agent-session-runtime.js";
 import { readAgentSession } from "../intern/agent-session-store.js";
 import { runEditVibeTool } from "../intern/agent-build-tools.js";
 import { claimFirstTurnMint, claimMintJob, getMintJob } from "../intern/mint-job-store.js";
-import { codegenTurnLane, legacyVariantHint, mintRowSaysFirstTurnIsAgents, routeAgentTurn, } from "../intern/agent-router.js";
+import { codegenTurnLane, mintRowSaysFirstTurnIsAgents, routeAgentTurn } from "../intern/agent-router.js";
 import { assembleAgentPayload } from "../intern/agent-assembly.js";
 import { claimAgentAppContext, composeAgentRequest, isAppContextMessage, markJournalCacheTail, } from "../intern/agent-request-frame.js";
 import { createAgentBelt } from "../intern/agent-belt.js";
@@ -159,9 +158,8 @@ export const promptChatSection = {
         const agentWakeBudget = readAgentWakeBudget(orig.agentWakeBudget);
         const agentWakeNoteRaw = orig.agentWakeNote;
         const agentWakeNote = agentWakeTurn === true && typeof agentWakeNoteRaw === "string" ? agentWakeNoteRaw : undefined;
-        const agentLane = agentLaneEnabled(vctx);
-        const firstTurnAgent = agentLane && agentFirstTurnEnabled(vctx) && orig.firstTurnAgent === true;
-        const nonInteractive = agentLane && orig.nonInteractive === true;
+        const firstTurnAgent = orig.firstTurnAgent === true;
+        const nonInteractive = orig.nonInteractive === true;
         let agentFetchUrlContext;
         await waitChatPersistIdle(vctx.connections, req.chatId, { logger: vctx.logger });
         const rResChat = await getResChatFromMode(vctx, req, orig);
@@ -207,7 +205,6 @@ export const promptChatSection = {
                 }
             }
             const routeInput = {
-                agentLane,
                 codegenChatTurn: true,
                 dryRun: orig.dryRun === true,
                 directBuildRequested,
@@ -216,10 +213,8 @@ export const promptChatSection = {
                 firstTurnAgent,
             };
             let agentRoute = routeAgentTurn(routeInput);
-            const mintRowWorthReading = agentLane &&
-                agentFirstTurnEnabled(vctx) &&
-                ((agentRoute.route === "codegen" && agentRoute.skip === "first-turn") ||
-                    (agentRoute.route === "agent" && hasPriorTurn === true));
+            const mintRowWorthReading = (agentRoute.route === "codegen" && agentRoute.skip === "first-turn") ||
+                (agentRoute.route === "agent" && hasPriorTurn === true);
             if (mintRowWorthReading) {
                 const rJob = await getMintJob(vctx, req.chatId);
                 if (rJob.isErr()) {
@@ -249,12 +244,11 @@ export const promptChatSection = {
                     appSlug: resChat.appSlug,
                     activatedUrls: activateWorkUrls(currentUserMessageText(orig.prompt.messages.filter(isChatMessage))),
                 });
-                const legacyHint = legacyVariantHint(orig.variant);
                 const buildInFlight = peekBuildLockEntry(vctx.connections, req.chatId);
-                const rSeenHead = agentSessionEnabled(vctx) ? await readAgentSession(vctx.sql, req.chatId) : undefined;
-                if (rSeenHead !== undefined && rSeenHead.isErr())
+                const rSeenHead = await readAgentSession(vctx.sql, req.chatId);
+                if (rSeenHead.isErr())
                     vctx.logger.Warn().Err(rSeenHead).Str("chatId", req.chatId).Msg("agent-session-head-read-failed");
-                const lastSeenHeadFsId = rSeenHead !== undefined && rSeenHead.isOk() ? rSeenHead.Ok().snapshot?.headFsId : undefined;
+                const lastSeenHeadFsId = rSeenHead.isOk() ? rSeenHead.Ok().snapshot?.headFsId : undefined;
                 const rAgent = await assembleAgentPayload(vctx, {
                     chatId: req.chatId,
                     userId: req._auth.verifiedAuth.claims.userId,
@@ -262,171 +256,167 @@ export const promptChatSection = {
                     ownerHandle: resChat.ownerHandle,
                     appSlug: resChat.appSlug,
                     newUserMessages: orig.prompt.messages.filter(isChatMessage),
-                    ...(legacyHint === undefined ? {} : { legacyHint }),
                     ...(agentWakeNote === undefined ? {} : { wakeNote: agentWakeNote }),
                     ...(buildInFlight === undefined ? {} : { buildInFlight: { promptId: buildInFlight.promptId } }),
                     ...(agentFirstTurnMint ? { noAppYet: true } : {}),
                     ...(nonInteractive ? { nonInteractive: true } : {}),
-                    ...(agentSessionEnabled(vctx) ? { session: true } : {}),
                     ...(lastSeenHeadFsId === undefined ? {} : { lastSeenHeadFsId }),
                 });
                 if (rAgent.isErr())
                     return Result.Err(rAgent);
                 agentAssembled = { model: rAgent.Ok().model, messages: rAgent.Ok().messages };
-                if (agentSessionEnabled(vctx)) {
-                    const rawIncoming = orig.prompt.messages.filter(isUserChatMessage);
-                    const newMessageCount = orig.prompt.messages.filter(isChatMessage).length;
-                    const incoming = newMessageCount === 0 ? [] : rAgent.Ok().messages.slice(-newMessageCount).filter(isUserChatMessage);
-                    const delivered = incoming.length === 0 && agentWakeTurn
-                        ? [
-                            {
-                                role: "user",
-                                content: [
-                                    {
-                                        type: "text",
-                                        text: agentWakeNote ??
-                                            "[session resumed] Continue from your persisted context and pending results. Inspect outcomes before retrying interrupted tools.",
-                                    },
-                                ],
-                            },
-                        ]
-                        : incoming;
-                    const acquired = await deliverAgentSession(vctx, {
+                const rawIncoming = orig.prompt.messages.filter(isUserChatMessage);
+                const newMessageCount = orig.prompt.messages.filter(isChatMessage).length;
+                const incoming = newMessageCount === 0 ? [] : rAgent.Ok().messages.slice(-newMessageCount).filter(isUserChatMessage);
+                const delivered = incoming.length === 0 && agentWakeTurn
+                    ? [
+                        {
+                            role: "user",
+                            content: [
+                                {
+                                    type: "text",
+                                    text: agentWakeNote ??
+                                        "[session resumed] Continue from your persisted context and pending results. Inspect outcomes before retrying interrupted tools.",
+                                },
+                            ],
+                        },
+                    ]
+                    : incoming;
+                const acquired = await deliverAgentSession(vctx, {
+                    chatId: req.chatId,
+                    userId: req._auth.verifiedAuth.claims.userId,
+                    ownerHandle: resChat.ownerHandle,
+                    appSlug: resChat.appSlug,
+                }, { id: ctx.validated.tid, messages: delivered }, rAgent.Ok().messages.filter((message) => message.role === "system" || isAppContextMessage(message)));
+                if (acquired.isErr())
+                    return Result.Err(acquired.Err());
+                const { live, created } = acquired.Ok();
+                const composedHead = rAgent.Ok().headFsId;
+                if (composedHead !== undefined) {
+                    const noted = await live.session.observeHead(composedHead);
+                    if (noted.isErr())
+                        vctx.logger.Warn().Err(noted).Str("chatId", req.chatId).Msg("agent-session-head-note-failed");
+                }
+                if (created === false) {
+                    const receiptId = vctx.sthis.nextId(12).str;
+                    const receiptEvidence = createAgentEvidenceWriter({
                         chatId: req.chatId,
-                        userId: req._auth.verifiedAuth.claims.userId,
-                        ownerHandle: resChat.ownerHandle,
-                        appSlug: resChat.appSlug,
-                    }, { id: ctx.validated.tid, messages: delivered }, rAgent.Ok().messages.filter((message) => message.role === "system" || isAppContextMessage(message)));
-                    if (acquired.isErr())
-                        return Result.Err(acquired.Err());
-                    const { live, created } = acquired.Ok();
-                    const composedHead = rAgent.Ok().headFsId;
-                    if (composedHead !== undefined) {
-                        const noted = await live.session.observeHead(composedHead);
-                        if (noted.isErr())
-                            vctx.logger.Warn().Err(noted).Str("chatId", req.chatId).Msg("agent-session-head-note-failed");
-                    }
-                    if (created === false) {
-                        const receiptId = vctx.sthis.nextId(12).str;
-                        const receiptEvidence = createAgentEvidenceWriter({
+                        promptId: receiptId,
+                        sessionId: live.promptId,
+                        append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: receiptId, blockSeq, evt }),
+                    });
+                    const linked = await receiptEvidence({ kind: "active" });
+                    if (linked.isErr())
+                        return Result.Err(linked.Err());
+                    await ctx.send.send(ctx, wrapMsgBase(ctx.validated, {
+                        payload: {
+                            type: "vibes.diy.res-prompt-chat-section",
                             chatId: req.chatId,
+                            ownerHandle: resChat.ownerHandle,
+                            appSlug: resChat.appSlug,
                             promptId: receiptId,
-                            sessionId: live.promptId,
-                            append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: receiptId, blockSeq, evt }),
-                        });
-                        const linked = await receiptEvidence({ kind: "active" });
-                        if (linked.isErr())
-                            return Result.Err(linked.Err());
-                        await ctx.send.send(ctx, wrapMsgBase(ctx.validated, {
-                            payload: {
-                                type: "vibes.diy.res-prompt-chat-section",
-                                chatId: req.chatId,
-                                ownerHandle: resChat.ownerHandle,
-                                appSlug: resChat.appSlug,
-                                promptId: receiptId,
-                                outerTid: req.outerTid,
-                                mode: req.mode,
-                            },
-                            tid: ctx.validated.tid,
-                            src: "agentSession",
-                        }));
-                        const echo = await appendBlockEvent({
-                            ctx,
-                            vctx,
-                            req,
-                            promptId: receiptId,
-                            blockSeq: 0,
-                            evt: {
-                                type: "prompt.req",
-                                ...(orig.mode === "codegen" && orig.source === "suggestion" ? { source: "suggestion" } : {}),
-                                streamId: receiptId,
-                                chatId: req.chatId,
-                                seq: 0,
-                                request: { messages: rawIncoming },
-                                timestamp: new Date(),
-                            },
-                        });
-                        if (echo.isErr())
-                            return Result.Err(echo.Err());
-                        const terminal = await appendBlockEvent({
-                            ctx,
-                            vctx,
-                            req,
-                            promptId: receiptId,
-                            blockSeq: 1,
-                            evt: {
-                                type: "block.end",
-                                streamId: receiptId,
-                                blockId: receiptId,
-                                blockNr: 0,
-                                seq: 1,
-                                timestamp: new Date(),
-                                stats: {
-                                    toplevel: { lines: 0, bytes: 0 },
-                                    code: { lines: 0, bytes: 0 },
-                                    image: { lines: 0, bytes: 0 },
-                                    total: { lines: 0, bytes: 0 },
-                                },
-                                usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
+                            outerTid: req.outerTid,
+                            mode: req.mode,
+                        },
+                        tid: ctx.validated.tid,
+                        src: "agentSession",
+                    }));
+                    const echo = await appendBlockEvent({
+                        ctx,
+                        vctx,
+                        req,
+                        promptId: receiptId,
+                        blockSeq: 0,
+                        evt: {
+                            type: "prompt.req",
+                            ...(orig.mode === "codegen" && orig.source === "suggestion" ? { source: "suggestion" } : {}),
+                            streamId: receiptId,
+                            chatId: req.chatId,
+                            seq: 0,
+                            request: { messages: rawIncoming },
+                            timestamp: new Date(),
+                        },
+                    });
+                    if (echo.isErr())
+                        return Result.Err(echo.Err());
+                    const terminal = await appendBlockEvent({
+                        ctx,
+                        vctx,
+                        req,
+                        promptId: receiptId,
+                        blockSeq: 1,
+                        evt: {
+                            type: "block.end",
+                            streamId: receiptId,
+                            blockId: receiptId,
+                            blockNr: 0,
+                            seq: 1,
+                            timestamp: new Date(),
+                            stats: {
+                                toplevel: { lines: 0, bytes: 0 },
+                                code: { lines: 0, bytes: 0 },
+                                image: { lines: 0, bytes: 0 },
+                                total: { lines: 0, bytes: 0 },
                             },
-                        });
-                        if (terminal.isErr())
-                            return Result.Err(terminal.Err());
-                        const ended = await appendBlockEvent({
-                            ctx,
-                            vctx,
-                            req,
-                            promptId: receiptId,
-                            blockSeq: 2,
-                            evt: { type: "prompt.block-end", streamId: receiptId, chatId: req.chatId, seq: 2, timestamp: new Date() },
-                        });
-                        if (ended.isErr())
-                            return Result.Err(ended.Err());
-                        return Result.Ok(EventoResult.Continue);
-                    }
-                    agentSession = live;
-                    agentEvidence = observeEvidenceLine(createAgentEvidenceWriter({
-                        chatId: req.chatId,
-                        promptId: live.promptId,
-                        sessionId: live.promptId,
-                        append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: live.promptId, blockSeq, evt }),
-                    }), turnLatency);
-                    const active = await agentEvidence({
-                        kind: "active",
-                        ...(live.supersedes === undefined ? {} : { supersedes: live.supersedes }),
+                            usage: { given: [], calculated: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } },
+                        },
                     });
-                    if (active.isErr()) {
-                        live.close();
-                        return Result.Err(active.Err());
-                    }
-                    if (live.session.messages().length === 0) {
-                        const initial = agentAssembled.messages.slice(0, agentAssembled.messages.length - newMessageCount - (agentWakeNote === undefined ? 0 : 1));
-                        const saved = await live.session.checkpoint(initial);
-                        if (saved.isErr()) {
-                            live.close();
-                            return Result.Err(saved.Err());
-                        }
-                    }
-                    const events = await nextAgentSessionMessages(live.session, agentEvidence);
-                    if (events.isErr()) {
-                        live.close();
-                        return Result.Err(events.Err());
-                    }
-                    agentAssembled = {
-                        ...agentAssembled,
-                        messages: composeAgentRequest({
-                            system: agentAssembled.messages.filter((message) => message.role === "system"),
-                            journal: markJournalCacheTail(live.session.messages()),
-                            context: agentAssembled.messages.filter(isAppContextMessage),
-                            tail: events.Ok() ?? [],
-                        }),
-                    };
-                    const saved = await live.session.checkpoint(agentAssembled.messages);
+                    if (terminal.isErr())
+                        return Result.Err(terminal.Err());
+                    const ended = await appendBlockEvent({
+                        ctx,
+                        vctx,
+                        req,
+                        promptId: receiptId,
+                        blockSeq: 2,
+                        evt: { type: "prompt.block-end", streamId: receiptId, chatId: req.chatId, seq: 2, timestamp: new Date() },
+                    });
+                    if (ended.isErr())
+                        return Result.Err(ended.Err());
+                    return Result.Ok(EventoResult.Continue);
+                }
+                agentSession = live;
+                agentEvidence = observeEvidenceLine(createAgentEvidenceWriter({
+                    chatId: req.chatId,
+                    promptId: live.promptId,
+                    sessionId: live.promptId,
+                    append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId: live.promptId, blockSeq, evt }),
+                }), turnLatency);
+                const active = await agentEvidence({
+                    kind: "active",
+                    ...(live.supersedes === undefined ? {} : { supersedes: live.supersedes }),
+                });
+                if (active.isErr()) {
+                    live.close();
+                    return Result.Err(active.Err());
+                }
+                if (live.session.messages().length === 0) {
+                    const initial = agentAssembled.messages.slice(0, agentAssembled.messages.length - newMessageCount - (agentWakeNote === undefined ? 0 : 1));
+                    const saved = await live.session.checkpoint(initial);
                     if (saved.isErr()) {
                         live.close();
                         return Result.Err(saved.Err());
                     }
                 }
+                const events = await nextAgentSessionMessages(live.session, agentEvidence);
+                if (events.isErr()) {
+                    live.close();
+                    return Result.Err(events.Err());
+                }
+                agentAssembled = {
+                    ...agentAssembled,
+                    messages: composeAgentRequest({
+                        system: agentAssembled.messages.filter((message) => message.role === "system"),
+                        journal: markJournalCacheTail(live.session.messages()),
+                        context: agentAssembled.messages.filter(isAppContextMessage),
+                        tail: events.Ok() ?? [],
+                    }),
+                };
+                const saved = await live.session.checkpoint(agentAssembled.messages);
+                if (saved.isErr()) {
+                    live.close();
+                    return Result.Err(saved.Err());
+                }
             }
             else {
                 const rAssembled = await assemblePromptPayload(vctx, {
@@ -552,8 +542,10 @@ export const promptChatSection = {
         }
         else if (agentAssembled !== undefined && isReqPromptLLMChatSection(orig)) {
             const agentPayload = agentAssembled;
+            const liveSession = agentSession;
+            if (liveSession === undefined)
+                return Result.Err("Agent turn has no session");
             prompSectionAction = async (scope, blockSeq) => {
-                const liveSession = agentSession;
                 const rActor = await resolveAgentActor(vctx, {
                     userId: req._auth.verifiedAuth.claims.userId,
                     scope: agentFirstTurnMint
@@ -570,12 +562,9 @@ export const promptChatSection = {
                     appSlug: resChat.appSlug,
                     editBaseFsId: undefined,
                 });
-                if (liveSession !== undefined && rVfs.isErr())
+                if (rVfs.isErr())
                     return Result.Err(rVfs.Err());
-                if (rVfs.isErr()) {
-                    vctx.logger.Warn().Err(rVfs).Str("chatId", req.chatId).Msg("agent-turn-vfs-load-failed");
-                }
-                const vfs = new Map(rVfs.isOk() ? rVfs.Ok() : []);
+                const vfs = new Map(rVfs.Ok());
                 function extendDeadlineForAwaitedBuild(awaiting) {
                     void extendOpenTurnDeadline(vctx.sql, {
                         chatId: req.chatId,
@@ -600,15 +589,11 @@ export const promptChatSection = {
                     auth: orig.auth,
                     outerTid: req.outerTid,
                     handle: (dispatchCtx) => promptChatSection.handle(dispatchCtx),
-                    wakeBudget: liveSession === undefined ? agentWakeBudget : 0,
-                    ...(agentSession === undefined
-                        ? {}
-                        : {
-                            onPendingBuild: (t) => {
-                                extendDeadlineForAwaitedBuild(t.promptId);
-                                return agentSession?.watch(t.promptId);
-                            },
-                        }),
+                    wakeBudget: 0,
+                    onPendingBuild: (t) => {
+                        extendDeadlineForAwaitedBuild(t.promptId);
+                        return liveSession.watch(t.promptId);
+                    },
                     ...(agentFirstTurnMint
                         ? {
                             firstTurn: {
@@ -643,8 +628,8 @@ export const promptChatSection = {
                         : {}),
                     ...(agentFetchUrlContext === undefined ? {} : { fetchUrl: agentFetchUrlContext }),
                     dispatcher,
-                    ...(liveSession === undefined ? {} : { queueEdit: (input) => liveSession.queue(input) }),
-                    ...(liveSession === undefined ? {} : { fileSession: liveSession }),
+                    queueEdit: (input) => liveSession.queue(input),
+                    fileSession: liveSession,
                     onStyleApplied: async (applied) => {
                         await appendBlockEvent({
                             ctx,
@@ -666,7 +651,7 @@ export const promptChatSection = {
                     },
                     onDispatch: (dispatched) => {
                         liveAppSlug = dispatched.appSlug;
-                        liveSession?.claimAppAddress(dispatched.appSlug);
+                        liveSession.claimAppAddress(dispatched.appSlug);
                         firstTurnAppClaimed = true;
                         vctx.logger
                             .Info()
@@ -675,106 +660,104 @@ export const promptChatSection = {
                     },
                 });
                 turnToolsOffered = belt.definitions.map((d) => d.function.name);
-                if (agentSession !== undefined) {
-                    await agentSession.bind((input) => runEditVibeTool(vctx, {
-                        actor: rActor.Ok(),
-                        chatId: req.chatId,
-                        input,
-                        dispatcher,
-                        toolsOffered: belt.definitions.map((d) => d.function.name),
-                    }), async (commit) => {
-                        if (firstTurnAppClaimed === false)
-                            return Result.Ok({
-                                ok: false,
-                                reason: "no-app-yet",
-                                message: "Call create_vibe first; there is no app to edit until it has been created.",
-                            });
-                        const currentActor = await resolveAgentActor(vctx, {
-                            userId: rActor.Ok().userId,
-                            requestedHandle: rActor.Ok().ownerHandle,
-                            scope: rActor.Ok().scope,
+                await liveSession.bind((input) => runEditVibeTool(vctx, {
+                    actor: rActor.Ok(),
+                    chatId: req.chatId,
+                    input,
+                    dispatcher,
+                    toolsOffered: belt.definitions.map((d) => d.function.name),
+                }), async (commit) => {
+                    if (firstTurnAppClaimed === false)
+                        return Result.Ok({
+                            ok: false,
+                            reason: "no-app-yet",
+                            message: "Call create_vibe first; there is no app to edit until it has been created.",
                         });
-                        if (currentActor.isErr())
-                            return Result.Err(currentActor.Err());
-                        const scoped = await resolveChatApp(vctx, currentActor.Ok(), req.chatId);
-                        if (scoped.isErr())
-                            return Result.Err(scoped.Err());
-                        const commitId = vctx.sthis.nextId(12).str;
-                        const lock = acquireTurnBuildLock({
-                            vctx,
+                    const currentActor = await resolveAgentActor(vctx, {
+                        userId: rActor.Ok().userId,
+                        requestedHandle: rActor.Ok().ownerHandle,
+                        scope: rActor.Ok().scope,
+                    });
+                    if (currentActor.isErr())
+                        return Result.Err(currentActor.Err());
+                    const scoped = await resolveChatApp(vctx, currentActor.Ok(), req.chatId);
+                    if (scoped.isErr())
+                        return Result.Err(scoped.Err());
+                    const commitId = vctx.sthis.nextId(12).str;
+                    const lock = acquireTurnBuildLock({
+                        vctx,
+                        chatId: req.chatId,
+                        promptId: commitId,
+                        movesFilesystem: true,
+                        wakesOnTerminal: false,
+                    });
+                    if (lock.acquired === false)
+                        return Result.Err("A build is running; the staged commit could not acquire the write lane.");
+                    const committed = { promptBlockEndEmitted: false };
+                    const saved = await exception2Result(() => handleFSPrompt({
+                        scope,
+                        vctx,
+                        ctx,
+                        promptId: commitId,
+                        blockSeq: 0,
+                        terminal: committed,
+                        beginDirect: true,
+                        resChat: { ...resChat, mode: "fs-update" },
+                        req: {
+                            type: "vibes.diy.req-prompt-chat-section",
+                            mode: "fs-update",
+                            auth: orig.auth,
+                            _auth: req._auth,
                             chatId: req.chatId,
-                            promptId: commitId,
-                            movesFilesystem: true,
-                            wakesOnTerminal: false,
-                        });
-                        if (lock.acquired === false)
-                            return Result.Err("A build is running; the staged commit could not acquire the write lane.");
-                        const committed = { promptBlockEndEmitted: false };
-                        const saved = await exception2Result(() => handleFSPrompt({
-                            scope,
-                            vctx,
+                            outerTid: req.outerTid,
+                            agentFileCommit: commit,
+                            fsUpdate: {
+                                update: commit.changes.map((file) => ({
+                                    type: "code-block",
+                                    filename: file.path,
+                                    content: file.contents,
+                                    lang: langForFilename(file.path),
+                                })),
+                                remove: [],
+                            },
+                        },
+                    })).finally(() => {
+                        committed.releasePersistGate?.();
+                        releaseTurnBuildLock(vctx, req.chatId, commitId);
+                    });
+                    if (saved.isErr()) {
+                        const last = await maxPersistedBlockSeq(vctx.sql, { chatId: req.chatId, promptId: commitId });
+                        if (last.isErr())
+                            return Result.Err(last.Err());
+                        const seq = (last.Ok() ?? -1) + 1;
+                        await appendBlockEvent({
                             ctx,
+                            vctx,
+                            req,
                             promptId: commitId,
-                            blockSeq: 0,
-                            terminal: committed,
-                            beginDirect: true,
-                            resChat: { ...resChat, mode: "fs-update" },
-                            req: {
-                                type: "vibes.diy.req-prompt-chat-section",
-                                mode: "fs-update",
-                                auth: orig.auth,
-                                _auth: req._auth,
+                            blockSeq: seq,
+                            evt: {
+                                type: "prompt.error",
+                                streamId: commitId,
                                 chatId: req.chatId,
-                                outerTid: req.outerTid,
-                                agentFileCommit: commit,
-                                fsUpdate: {
-                                    update: commit.changes.map((file) => ({
-                                        type: "code-block",
-                                        filename: file.path,
-                                        content: file.contents,
-                                        lang: langForFilename(file.path),
-                                    })),
-                                    remove: [],
-                                },
+                                seq,
+                                timestamp: new Date(),
+                                error: saved.Err().message,
                             },
-                        })).finally(() => {
-                            committed.releasePersistGate?.();
-                            releaseTurnBuildLock(vctx, req.chatId, commitId);
-                        });
-                        if (saved.isErr()) {
-                            const last = await maxPersistedBlockSeq(vctx.sql, { chatId: req.chatId, promptId: commitId });
-                            if (last.isErr())
-                                return Result.Err(last.Err());
-                            const seq = (last.Ok() ?? -1) + 1;
-                            await appendBlockEvent({
-                                ctx,
-                                vctx,
-                                req,
-                                promptId: commitId,
-                                blockSeq: seq,
-                                evt: {
-                                    type: "prompt.error",
-                                    streamId: commitId,
-                                    chatId: req.chatId,
-                                    seq,
-                                    timestamp: new Date(),
-                                    error: saved.Err().message,
-                                },
-                            });
-                            return Result.Err(saved.Err());
-                        }
-                        if (committed.fsRef === undefined)
-                            return Result.Err("The commit did not persist a version.");
-                        const committedPaths = commit.changes.map((file) => file.path);
-                        return Result.Ok({
-                            ok: true,
-                            saved: true,
-                            fsRef: committed.fsRef,
-                            paths: committedPaths,
-                            entryTouched: classifyTurnReach(committedPaths).entryTouched,
                         });
+                        return Result.Err(saved.Err());
+                    }
+                    if (committed.fsRef === undefined)
+                        return Result.Err("The commit did not persist a version.");
+                    const committedPaths = commit.changes.map((file) => file.path);
+                    return Result.Ok({
+                        ok: true,
+                        saved: true,
+                        fsRef: committed.fsRef,
+                        paths: committedPaths,
+                        entryTouched: classifyTurnReach(committedPaths).entryTouched,
                     });
-                }
+                });
                 const res = await handlerLlmRequest({
                     ctx,
                     blockSeq,
@@ -790,7 +773,7 @@ export const promptChatSection = {
                     observeEvidenceLine(createAgentEvidenceWriter({
                         chatId: req.chatId,
                         promptId,
-                        ...(liveSession === undefined ? {} : { sessionId: liveSession.promptId }),
+                        sessionId: liveSession.promptId,
                         append: (evt, blockSeq) => appendBlockEvent({ ctx, vctx, req, promptId, blockSeq, evt }),
                     }), turnLatency);
                 let providerStream;
@@ -810,33 +793,29 @@ export const promptChatSection = {
                         stream: rSse.Ok(),
                         abort: res.abort,
                         onToolEvidence: ({ kind, call, text, round, epoch }) => evidence({ kind, callId: call.id, name: call.name, text, round, epoch }),
-                        ...(liveSession === undefined
-                            ? {}
-                            : {
-                                session: {
-                                    checkpoint: async (messages) => {
-                                        const saved = await liveSession.session.checkpoint(messages);
-                                        if (saved.isErr())
-                                            return saved;
-                                        const extended = await extendOpenTurnDeadline(vctx.sql, {
-                                            chatId: req.chatId,
-                                            promptId,
-                                            deadlineAtMs: Date.now() + agentTotalBudgetMs(vctx) + OPEN_TURN_AWAIT_BUILD_EXTENSION_MS,
-                                        });
-                                        if (extended.isErr())
-                                            return Result.Err(extended.Err());
-                                        return Result.Ok();
-                                    },
-                                    next: () => nextAgentSessionMessages(liveSession.session, evidence),
-                                    head: () => liveSession.session.head(),
-                                    dispatchBudgetMs: agentTotalBudgetMs(vctx),
-                                },
-                            }),
+                        session: {
+                            checkpoint: async (messages) => {
+                                const saved = await liveSession.session.checkpoint(messages);
+                                if (saved.isErr())
+                                    return saved;
+                                const extended = await extendOpenTurnDeadline(vctx.sql, {
+                                    chatId: req.chatId,
+                                    promptId,
+                                    deadlineAtMs: Date.now() + agentTotalBudgetMs(vctx) + OPEN_TURN_AWAIT_BUILD_EXTENSION_MS,
+                                });
+                                if (extended.isErr())
+                                    return Result.Err(extended.Err());
+                                return Result.Ok();
+                            },
+                            next: () => nextAgentSessionMessages(liveSession.session, evidence),
+                            head: () => liveSession.session.head(),
+                            dispatchBudgetMs: agentTotalBudgetMs(vctx),
+                        },
                         dispatch: async ({ request, budget }) => {
                             const messages = agentFirstTurnMint && firstTurnAppClaimed
                                 ? claimAgentAppContext(request.messages, { ownerHandle: resChat.ownerHandle, appSlug: liveAppSlug })
                                 : request.messages;
-                            if (agentSession !== undefined) {
+                            {
                                 const latest = await loadWorkVfs(vctx, {
                                     chatId: req.chatId,
                                     ownerHandle: resChat.ownerHandle,
@@ -966,7 +945,6 @@ export const promptChatSection = {
         const promptId = agentSession?.promptId ?? vctx.sthis.nextId(96 / 8).str;
         const movesFilesystem = isSourceChangingMode(req.mode) && agentAssembled === undefined;
         const wakesOnTerminal = decideAgentWake({
-            agentLane,
             agentDispatched: agentDispatchedBuild,
             movedFilesystem: movesFilesystem,
             budget: agentWakeBudget,
@@ -1181,10 +1159,9 @@ export const promptChatSection = {
                     };
                     const { consumed } = settleTurnTerminal(vctx.connections, req.chatId, promptId, landingOutcome);
                     const wake = decideAgentWake({
-                        agentLane,
                         agentDispatched: agentDispatchedBuild,
                         movedFilesystem: movesFilesystem,
-                        budget: agentSessionEnabled(vctx) ? 1 : agentWakeBudget,
+                        budget: 1,
                     });
                     if (consumed === true) {
                         vctx.logger
@@ -1201,7 +1178,7 @@ export const promptChatSection = {
                             outerTid: req.outerTid,
                             chatId: req.chatId,
                             budget: wake.budget,
-                            note: renderAgentWakeNote(landingOutcome, agentSessionEnabled(vctx)),
+                            note: renderAgentWakeNote(landingOutcome),
                             handle: (wakeCtx) => promptChatSection.handle(promptDispatchContext(ctx, wakeCtx.validated)),
                         });
                     }
@@ -1212,7 +1189,6 @@ export const promptChatSection = {
                             chatId: req.chatId,
                             promptId,
                             skip: wake.skip,
-                            agentLane,
                             agentDispatched: agentDispatchedBuild,
                             movedFilesystem: movesFilesystem,
                             budget: agentWakeBudget,