@evandu/super-pi 0.1.4 → 0.1.6

package/dist/client/index.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="theme-color" content="#101828" />
     <title>Super Pi</title>
-    <script type="module" crossorigin src="/assets/index-BsQxHODf.js"></script>
+    <script type="module" crossorigin src="/assets/index-B2W1-_yu.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DP3T9VzH.css">
   </head>
   <body>

package/dist/server/application/catalog-service.d.ts

@@ -36,7 +36,7 @@ export declare class CatalogService {
     /**
      * Broadcasts the model catalog to connected clients.
      */
-    broadcastCatalog(selection?: ModelSelection): Promise<void>;
+    broadcastCatalog(selection?: ModelSelection, conversationId?: string): Promise<void>;
     /**
      * Reads one catalog filtered by mode at source.
      */

package/dist/server/application/catalog-service.js

@@ -74,9 +74,9 @@ export class CatalogService {
     /**
      * Broadcasts the model catalog to connected clients.
      */
-    async broadcastCatalog(selection) {
+    async broadcastCatalog(selection, conversationId) {
         const catalog = await this.getCatalog(selection);
-        this.broadcaster.broadcast({ type: "model.catalog", catalog });
+        this.broadcaster.broadcast({ type: "model.catalog", catalog, conversationId });
     }
     /**
      * Reads one catalog filtered by mode at source.

package/dist/server/application/conversation-service.d.ts

@@ -37,6 +37,7 @@ export declare class ConversationService {
     /**
      * Selects a conversation and broadcasts the catalog for that conversation's model.
      */
+    getConversationCatalog(conversationId: string): Promise<import("../types.js").ModelCatalog>;
     selectConversation(conversationId: string): Promise<void>;
     /**
      * Archives a conversation.
@@ -62,11 +63,15 @@ export declare class ConversationService {
      * Configures or clears the primary agent assigned to a conversation.
      */
     setAgent(conversationId: string, agentId: string | null): Promise<void>;
+    private resolveAgentConfiguration;
     /**
      * Reverts conversation history to a designated message boundary, truncating both
      * Pi's transcript and state.json.
      */
-    revertMessage(conversationId: string, messageId: string): Promise<void>;
+    revertMessage(conversationId: string, messageId: string, withdraw?: boolean): Promise<{
+        content: string;
+        images: import("../types.js").MessageImage[] | undefined;
+    } | undefined>;
     /**
      * Forks an existing conversation into a new parallel branch, cloning the Pi session.
      */

package/dist/server/application/conversation-service.js

@@ -29,15 +29,27 @@ export class ConversationService {
      * Creates a new conversation in a workspace.
      */
     async createConversation(workspaceId) {
-        await this.store.createConversation(workspaceId);
+        const workspace = this.store.snapshot().workspaces.find(item => item.id === workspaceId);
+        if (!workspace)
+            throw new Error("Workspace not found");
+        const defaults = workspace.defaultAgentId
+            ? await this.resolveAgentConfiguration({ id: workspaceId, model: workspace.defaultModel, thinkingLevel: workspace.defaultThinkingLevel }, workspace.defaultAgentId)
+            : undefined;
+        await this.store.createConversation(workspaceId, defaults);
         this.broadcaster.broadcastState();
     }
     /**
      * Selects a conversation and broadcasts the catalog for that conversation's model.
      */
+    async getConversationCatalog(conversationId) {
+        const conversation = this.store.snapshot().conversations.find(item => item.id === conversationId);
+        if (!conversation)
+            throw new Error("Conversation not found");
+        return this.catalogService.getCatalog(conversation.model);
+    }
     async selectConversation(conversationId) {
         const conversation = this.store.snapshot().conversations.find((item) => item.id === conversationId);
-        await this.catalogService.broadcastCatalog(conversation?.model);
+        await this.catalogService.broadcastCatalog(conversation?.model, conversationId);
     }
     /**
      * Archives a conversation.
@@ -76,7 +88,7 @@ export class ConversationService {
             : { provider, modelId, label: modelId };
         await this.store.setConversationModel(conversationId, selection);
         this.broadcaster.broadcastState();
-        await this.catalogService.broadcastCatalog(selection);
+        await this.catalogService.broadcastCatalog(selection, conversationId);
     }
     /**
      * Sets the thinking level on a conversation, validating against the model's available levels.
@@ -102,42 +114,47 @@ export class ConversationService {
             this.broadcaster.broadcastState();
             return;
         }
+        const settings = await this.resolveAgentConfiguration(conversation, agentId);
+        await this.store.setConversationConfiguration(conversationId, settings);
+        this.broadcaster.broadcastState();
+        await this.catalogService.broadcastCatalog(this.store.snapshot().conversations.find((item) => item.id === conversationId)?.model, conversationId);
+    }
+    async resolveAgentConfiguration(conversation, agentId) {
         const agent = await this.runtime.agentFor?.({ id: conversation.id, agentId });
         if (!agent) {
             const dirsLabel = Array.isArray(this.agentsDir) ? this.agentsDir.join(", ") : this.agentsDir;
             throw new Error(`Agent ${JSON.stringify(agentId)} 不存在或不是可用的 primary agent（目录：${dirsLabel}）`);
         }
+        let selection = conversation.model;
         if (agent.model) {
             const catalog = await this.runtime.catalog();
             if (catalog.source === "pi" && !catalog.models.some((model) => model.provider === agent.model?.provider && model.modelId === agent.model?.modelId)) {
                 throw this.catalogService.notOffered(`Agent ${agent.name} 指定的模型 ${agent.model.provider}/${agent.model.modelId}`, catalog);
             }
             const option = catalog.models.find((model) => model.provider === agent.model?.provider && model.modelId === agent.model?.modelId);
-            await this.store.setConversationModel(conversationId, option
+            selection = option
                 ? { provider: option.provider, modelId: option.modelId, label: option.label }
-                : { provider: agent.model.provider, modelId: agent.model.modelId, label: `${agent.model.provider}/${agent.model.modelId}` });
+                : { provider: agent.model.provider, modelId: agent.model.modelId, label: `${agent.model.provider}/${agent.model.modelId}` };
         }
         if (agent.thinkingLevel) {
-            const catalog = await this.runtime.catalog(this.store.snapshot().conversations.find((item) => item.id === conversationId)?.model);
+            const catalog = await this.runtime.catalog(selection);
             if (catalog.source === "pi" && !catalog.levels.includes(agent.thinkingLevel)) {
                 throw this.catalogService.notOffered(`Agent ${agent.name} 指定的思考等级 ${agent.thinkingLevel}`, catalog);
             }
-            await this.store.setConversationThinking(conversationId, agent.thinkingLevel);
         }
-        await this.store.setConversationAgent(conversationId, agent.id);
-        this.broadcaster.broadcastState();
-        await this.catalogService.broadcastCatalog(this.store.snapshot().conversations.find((item) => item.id === conversationId)?.model);
+        return { agentId: agent.id, model: selection, thinkingLevel: agent.thinkingLevel ?? conversation.thinkingLevel };
     }
     /**
      * Reverts conversation history to a designated message boundary, truncating both
      * Pi's transcript and state.json.
      */
-    async revertMessage(conversationId, messageId) {
-        const plan = this.store.planRevert(conversationId, messageId);
-        const conversation = this.store.snapshot().conversations.find((item) => item.id === conversationId);
+    async revertMessage(conversationId, messageId, withdraw = false) {
+        let plan = this.store.planRevert(conversationId, messageId, withdraw);
+        let conversation = this.store.snapshot().conversations.find((item) => item.id === conversationId);
         if (!conversation)
             throw new Error("会话不存在");
-        const workspace = this.store.snapshot().workspaces.find((item) => item.id === conversation.workspaceId);
+        const workspaceId = conversation.workspaceId;
+        const workspace = this.store.snapshot().workspaces.find((item) => item.id === workspaceId);
         if (!workspace)
             throw new Error(`会话所属的工作区 ${conversation.workspaceId} 已不存在，拒绝回退`);
         if (!this.runtime.revert) {
@@ -146,6 +163,11 @@ export class ConversationService {
         if (this.runService.isRunning(conversationId)) {
             this.extensionUiService.cancelPendingUi(conversationId, "aborted");
             await this.runService.stopRun(conversationId);
+            // The stopping turn may have recorded the user's Pi entry while it drained.
+            plan = this.store.planRevert(conversationId, messageId, withdraw);
+            conversation = this.store.snapshot().conversations.find(item => item.id === conversationId);
+            if (!conversation)
+                throw new Error("会话不存在");
         }
         for (const runId of plan.doomedRunIds) {
             if (this.subagents.stop(runId)) {
@@ -156,12 +178,15 @@ export class ConversationService {
             conversation,
             cwd: workspace.path,
             boundaryEntryId: plan.boundaryEntryId,
+            beforeBoundary: withdraw && Boolean(conversation.messages.find(item => item.id === messageId)?.piEntryId),
         });
-        const applied = await this.store.revertMessages(conversationId, messageId);
+        const applied = await this.store.revertMessages(conversationId, messageId, withdraw);
         console.log(`Super Pi: reverted conversation ${conversationId} to ${applied.boundaryIndex + 1} message(s): ` +
             `${plan.removedMessageIds.length} message(s) and ${applied.doomedRunIds.length} sub-agent run(s) dropped from state.json; ` +
             `Pi's file ${outcome.sessionFile} kept ${outcome.linesKept} line(s) and lost ${outcome.entriesDropped}.`);
         this.broadcaster.broadcastState();
+        const withdrawn = conversation.messages.find(item => item.id === messageId);
+        return withdraw && withdrawn ? { content: withdrawn.content, images: withdrawn.images } : undefined;
     }
     /**
      * Forks an existing conversation into a new parallel branch, cloning the Pi session.

package/dist/server/application/run-service.js

@@ -96,8 +96,13 @@ export class RunService {
      * Opens a turn by creating user and assistant messages in store.
      */
     async openTurn(conversationId, prompt, images) {
+        const conversation = this.store.snapshot().conversations.find(item => item.id === conversationId);
+        if (!conversation)
+            throw new Error("Conversation not found");
+        const agent = await this.runtime.agentFor?.(conversation);
+        const identity = agent ? { id: agent.id, name: agent.name } : { name: "Pi" };
         const user = await this.store.addUserMessage(conversationId, prompt ?? "", images);
-        const assistant = await this.store.beginAssistantMessage(conversationId);
+        const assistant = await this.store.beginAssistantMessage(conversationId, identity);
         this.broadcaster.broadcastState();
         return { user, assistant };
     }

package/dist/server/command-handler.js

@@ -43,7 +43,10 @@ export class CommandHandler {
             return;
         }
         if (command.type === "conversation.select") {
-            await this.conversationService.selectConversation(command.conversationId);
+            if (sendToSocket)
+                sendToSocket({ type: "model.catalog", catalog: await this.conversationService.getConversationCatalog(command.conversationId), conversationId: command.conversationId });
+            else
+                await this.conversationService.selectConversation(command.conversationId);
             return;
         }
         if (command.type === "conversation.archive") {
@@ -94,7 +97,15 @@ export class CommandHandler {
             return;
         }
         if (command.type === "message.revert") {
-            await this.conversationService.revertMessage(command.conversationId, command.messageId);
+            try {
+                const withdrawn = await this.conversationService.revertMessage(command.conversationId, command.messageId, command.withdraw);
+                sendToSocket?.({ type: "message.revert.result", conversationId: command.conversationId, ok: true, withdrawn });
+            }
+            catch (error) {
+                if (!sendToSocket)
+                    throw error;
+                sendToSocket({ type: "message.revert.result", conversationId: command.conversationId, ok: false, message: error instanceof Error ? error.message : String(error) });
+            }
             return;
         }
         if (command.type === "run.stop") {
@@ -125,7 +136,10 @@ export class CommandHandler {
             return;
         }
         if (command.type === "catalog.fetch") {
-            await this.catalogService.broadcastCatalog();
+            if (sendToSocket)
+                sendToSocket({ type: "model.catalog", catalog: await this.catalogService.getCatalog() });
+            else
+                await this.catalogService.broadcastCatalog();
             return;
         }
         if (command.type === "agent.catalog.fetch") {

package/dist/server/runtime.d.ts

@@ -112,6 +112,7 @@ export type RevertRequest = {
     cwd: string;
     /** Pi's entry id of the last message that SURVIVES. Everything written after it is dropped. */
     boundaryEntryId: string;
+    beforeBoundary?: boolean;
 };
 export type RevertOutcome = {
     /** The file that was truncated, so a caller can log what was rewritten. */
@@ -439,7 +440,7 @@ export declare function killTree(pid: number): Promise<void>;
  * EXPORTED so it can be tested against a fabricated session file in a temp directory, without Pi and
  * without touching anybody's real transcript.
  */
-export declare function truncateSessionFile(path: string, boundaryEntryId: string, expectedSessionId: string): Promise<{
+export declare function truncateSessionFile(path: string, boundaryEntryId: string, expectedSessionId: string, beforeBoundary?: boolean): Promise<{
     linesKept: number;
     entriesDropped: number;
 }>;
@@ -620,10 +621,8 @@ export declare class PiRpcRuntime implements AgentRuntime {
     /**
      * The agent a conversation runs as, or undefined for Pi's own defaults.
      *
-     * A missing file is NOT an error: a conversation that names an agent that has since been deleted
-     * degrades to running as Pi itself, with a warning, rather than failing every turn forever. A
-     * `subagent` definition is also ignored here - those are invoked BY a primary agent, never chosen
-     * as the conversation's own role.
+     * A selected role must remain valid. Missing or invalid definitions are refused before
+     * spawning Pi so their prompt and tool restrictions cannot silently disappear.
      */
     agentFor(conversation: Pick<Conversation, "id" | "agentId">): Promise<AgentDefinition | undefined>;
     setAgentsDir(dir: string | string[]): void;
@@ -713,7 +712,7 @@ export declare class PiRpcRuntime implements AgentRuntime {
      * revert is a rare, deliberate act, and a second Pi answers in well under a second. It buys the
      * elimination of an entire class of "we truncated the wrong file and nothing said so" failures.
      */
-    revert({ conversation, cwd, boundaryEntryId }: RevertRequest): Promise<RevertOutcome>;
+    revert({ conversation, cwd, boundaryEntryId, beforeBoundary }: RevertRequest): Promise<RevertOutcome>;
     /**
      * Copies Pi's own transcript for one conversation into a second, independent file under a new id.
      *

package/dist/server/runtime.js

@@ -298,7 +298,7 @@ export function killTree(pid) {
  * EXPORTED so it can be tested against a fabricated session file in a temp directory, without Pi and
  * without touching anybody's real transcript.
  */
-export async function truncateSessionFile(path, boundaryEntryId, expectedSessionId) {
+export async function truncateSessionFile(path, boundaryEntryId, expectedSessionId, beforeBoundary = false) {
     const raw = await readFile(path, "utf8");
     // Split, then drop the empty segment a trailing newline leaves behind. Probe A measured that the file
     // DOES end with a newline, so `split` yields one empty tail element; keeping it would append a blank
@@ -337,9 +337,12 @@ export async function truncateSessionFile(path, boundaryEntryId, expectedSession
         throw new Error(`Pi 的会话文件属于会话 ${JSON.stringify(parsed[0]?.id ?? null)}，不是要回退的会话 ${JSON.stringify(expectedSessionId)}。拒绝截断别人的会话。`);
     if (!raw.endsWith("\n"))
         throw new Error(`Pi 的会话文件末尾没有换行，格式已经变了，拒绝回退：${path}`);
-    const boundary = parsed.findIndex((entry, index) => index > 0 && entry?.id === boundaryEntryId);
+    let boundary = boundaryEntryId === "" ? 0 : parsed.findIndex((entry, index) => index > 0 && entry?.id === boundaryEntryId);
     if (boundary < 0)
         throw new Error(`在这份 Pi 会话记录里找不到要保留的那条消息（entry ${JSON.stringify(boundaryEntryId)}）。这条消息可能是更早的版本写的，Super Pi 当时没有记下它对应 Pi 的哪一条。`);
+    const expectedLastId = beforeBoundary ? parsed[boundary - 1]?.id : parsed[boundary]?.id;
+    if (beforeBoundary)
+        boundary -= 1;
     // The `parentId` property probe A measured, enforced at the boundary that matters: every entry still
     // being KEPT must point at something also being kept. A prefix that violates this is not a session,
     // and writing it would produce a file Pi either rejects or silently misreads.
@@ -368,7 +371,7 @@ export async function truncateSessionFile(path, boundaryEntryId, expectedSession
     catch {
         lastEntry = undefined;
     }
-    if (verified.length !== boundary + 1 || lastEntry?.id !== boundaryEntryId) {
+    if (verified.length !== boundary + 1 || lastEntry?.id !== expectedLastId) {
         throw new Error(`截断后的 Pi 会话文件没有以要保留的那条消息结尾（写到 ${verified.length} 行，期望 ${boundary + 1} 行，末行 id=${JSON.stringify(lastEntry?.id ?? null)}）。原始文件仍在 ${backupPath}。`);
     }
     return { linesKept: boundary + 1, entriesDropped: lines.length - (boundary + 1) };
@@ -619,21 +622,18 @@ export class PiRpcRuntime {
     /**
      * The agent a conversation runs as, or undefined for Pi's own defaults.
      *
-     * A missing file is NOT an error: a conversation that names an agent that has since been deleted
-     * degrades to running as Pi itself, with a warning, rather than failing every turn forever. A
-     * `subagent` definition is also ignored here - those are invoked BY a primary agent, never chosen
-     * as the conversation's own role.
+     * A selected role must remain valid. Missing or invalid definitions are refused before
+     * spawning Pi so their prompt and tool restrictions cannot silently disappear.
      */
     async agentFor(conversation) {
         if (!conversation.agentId)
             return undefined;
-        const { agents, problems } = await readAgents(this.agents.dir);
+        const { agents } = await readAgents(this.agents.dir);
         const agent = agents.find((item) => item.id === conversation.agentId);
         if (agent)
             return agent;
         const dirLabel = Array.isArray(this.agents.dir) ? this.agents.dir.join(", ") : this.agents.dir;
-        console.warn(`PiRpcRuntime: conversation ${conversation.id} names agent ${JSON.stringify(conversation.agentId)}, which is not a primary agent in ${dirLabel}${problems.length ? ` (${problems.length} file(s) there are not usable agents)` : ""} - running as Pi itself.`);
-        return undefined;
+        throw new Error(`Agent ${JSON.stringify(conversation.agentId)} 已失效或不是可用的 primary agent（目录：${dirLabel}）。请重新选择 Agent，或选择“跟随 Pi 默认”后重试。`);
     }
     setAgentsDir(dir) {
         this.agents.dir = dir;
@@ -1064,7 +1064,7 @@ export class PiRpcRuntime {
      * revert is a rare, deliberate act, and a second Pi answers in well under a second. It buys the
      * elimination of an entire class of "we truncated the wrong file and nothing said so" failures.
      */
-    async revert({ conversation, cwd, boundaryEntryId }) {
+    async revert({ conversation, cwd, boundaryEntryId, beforeBoundary }) {
         if (this.runs.has(conversation.id))
             throw new Error("这个会话还有一轮任务在跑，先停止它再回退");
         if (!this.pi.found)
@@ -1120,7 +1120,7 @@ export class PiRpcRuntime {
         // reported, because the alternative is a revert that appears to work and changes nothing.
         if (!exists?.isFile())
             throw new Error(`Pi 还没有为这个会话建立记录文件（${sessionFile}），没有可以回退的历史。`);
-        const result = await truncateSessionFile(sessionFile, boundaryEntryId, conversation.id);
+        const result = await truncateSessionFile(sessionFile, boundaryEntryId, conversation.id, beforeBoundary);
         return { sessionFile, linesKept: result.linesKept, entriesDropped: result.entriesDropped };
     }
     /**

package/dist/server/store.d.ts

@@ -100,7 +100,11 @@ export declare class Store {
         agentId?: string | null;
     }): Promise<Workspace>;
     deleteWorkspace(workspaceId: string): Promise<string[]>;
-    createConversation(workspaceId: string): Promise<Conversation>;
+    createConversation(workspaceId: string, configuration?: {
+        agentId?: string;
+        model?: ModelSelection;
+        thinkingLevel?: string;
+    }): Promise<Conversation>;
     /**
      * Copies a conversation into a NEW one, under an id the caller has already minted.
      *
@@ -195,7 +199,12 @@ export declare class Store {
      * START of the next turn, so the turn in flight is unaffected.
      */
     setConversationAgent(conversationId: string, agentId: string | undefined): Promise<Conversation>;
-    beginAssistantMessage(conversationId: string): Promise<Message>;
+    setConversationConfiguration(conversationId: string, settings: {
+        agentId?: string;
+        model?: ModelSelection;
+        thinkingLevel?: string;
+    }): Promise<Conversation>;
+    beginAssistantMessage(conversationId: string, agentIdentity?: Message["agentIdentity"]): Promise<Message>;
     appendAssistantDelta(conversationId: string, messageId: string, delta: string): Promise<void>;
     /**
      * Appends one tool call to the message it belongs to, and returns the message's whole `toolCalls`
@@ -241,7 +250,7 @@ export declare class Store {
     }): Promise<ToolCallBlock[]>;
     setStatus(conversationId: string, status: Conversation["status"]): Promise<void>;
     /** The plan a revert would carry out, without carrying it out. The server reads this to stop children first. */
-    planRevert(conversationId: string, messageId: string): RevertPlan;
+    planRevert(conversationId: string, messageId: string, withdraw?: boolean): RevertPlan;
     /**
      * Records which Pi entry a message became, as reported by Pi while it was still running.
      *
@@ -269,7 +278,7 @@ export declare class Store {
      * plan is recomputed here rather than passed in - two callers cannot disagree about what a message id
      * means, and the recomputation is a pure scan of a small array.
      */
-    revertMessages(conversationId: string, messageId: string): Promise<RevertPlan>;
+    revertMessages(conversationId: string, messageId: string, withdraw?: boolean): Promise<RevertPlan>;
     private requireConversation;
     /**
      * This conversation's waiting list, oldest first.

package/dist/server/store.js

@@ -363,7 +363,7 @@ function reconcileQueuedMessages(state) {
  * own message for "that message is not in this conversation" - and a revert that silently did nothing is
  * the failure this whole feature exists to avoid.
  */
-function planRevert(state, conversationId, messageId) {
+function planRevert(state, conversationId, messageId, withdraw = false) {
     const conversation = state.conversations.find((item) => item?.id === conversationId);
     if (!conversation)
         throw new Error("会话不存在");
@@ -371,9 +371,11 @@ function planRevert(state, conversationId, messageId) {
     if (boundaryIndex < 0)
         throw new Error("要回退的那条消息不在这个会话里");
     const boundary = conversation.messages[boundaryIndex];
-    if (!boundary?.piEntryId)
+    if (!withdraw && !boundary?.piEntryId)
         throw new Error("这条消息没有对应的 Pi 记录，不能作为回退位置。请在它之后的任意一条消息上回退。");
-    const removed = conversation.messages.slice(boundaryIndex + 1);
+    if (withdraw && boundary.role !== "user")
+        throw new Error("Only user messages can be withdrawn");
+    const removed = conversation.messages.slice(boundaryIndex + (withdraw ? 0 : 1));
     // Unparseable stamps are compared as 0, i.e. "older than everything", which keeps a corrupted run
     // record ALIVE rather than deleting a child that may still be the user's most recent work. Deleting on a
     // guess is the irreversible direction; keeping a stale record costs one card that startup reconciliation
@@ -382,7 +384,7 @@ function planRevert(state, conversationId, messageId) {
     const doomedRunIds = state.subagentRuns
         .filter((run) => run?.conversationId === conversationId && (Date.parse(run.startedAt) || 0) >= firstRemovedAt)
         .map((run) => run.id);
-    return { boundaryIndex, boundaryEntryId: boundary.piEntryId, removedMessageIds: removed.map((item) => item.id), doomedRunIds };
+    return { boundaryIndex, boundaryEntryId: boundary.piEntryId ?? conversation.messages.slice(0, boundaryIndex).reverse().find(item => item.piEntryId)?.piEntryId ?? "", removedMessageIds: removed.map((item) => item.id), doomedRunIds };
 }
 /**
  * Brings `state.todos` back to a shape the browser can render, on boot.
@@ -551,7 +553,7 @@ export class Store {
         await this.persist();
         return [...doomed];
     }
-    async createConversation(workspaceId) {
+    async createConversation(workspaceId, configuration) {
         const workspace = this.state.workspaces.find((item) => item.id === workspaceId);
         if (!workspace)
             throw new Error("Workspace not found");
@@ -567,6 +569,14 @@ export class Store {
             conversation.thinkingLevel = workspace.defaultThinkingLevel;
         if (workspace.defaultAgentId)
             conversation.agentId = workspace.defaultAgentId;
+        if (configuration) {
+            if (configuration.model)
+                conversation.model = { ...configuration.model };
+            if (configuration.thinkingLevel)
+                conversation.thinkingLevel = configuration.thinkingLevel;
+            if (configuration.agentId)
+                conversation.agentId = configuration.agentId;
+        }
         this.state.conversations.unshift(conversation);
         await this.persist();
         return structuredClone(conversation);
@@ -772,7 +782,34 @@ export class Store {
         await this.persist();
         return structuredClone(conversation);
     }
-    async beginAssistantMessage(conversationId) { const conversation = this.requireConversation(conversationId); const message = { id: id("message"), role: "assistant", content: "", createdAt: now() }; conversation.messages.push(message); await this.persist(); return structuredClone(message); }
+    async setConversationConfiguration(conversationId, settings) {
+        const conversation = this.requireConversation(conversationId);
+        const previous = { agentId: conversation.agentId, model: conversation.model, thinkingLevel: conversation.thinkingLevel };
+        const apply = (value) => {
+            if (value.agentId === undefined)
+                delete conversation.agentId;
+            else
+                conversation.agentId = value.agentId;
+            if (value.model === undefined)
+                delete conversation.model;
+            else
+                conversation.model = { provider: value.model.provider, modelId: value.model.modelId, label: value.model.label };
+            if (value.thinkingLevel === undefined)
+                delete conversation.thinkingLevel;
+            else
+                conversation.thinkingLevel = value.thinkingLevel;
+        };
+        apply(settings);
+        try {
+            await this.persist();
+        }
+        catch (error) {
+            apply(previous);
+            throw error;
+        }
+        return structuredClone(conversation);
+    }
+    async beginAssistantMessage(conversationId, agentIdentity) { const conversation = this.requireConversation(conversationId); const message = { id: id("message"), role: "assistant", content: "", createdAt: now(), ...(agentIdentity ? { agentIdentity: structuredClone(agentIdentity) } : {}) }; conversation.messages.push(message); await this.persist(); return structuredClone(message); }
     async appendAssistantDelta(conversationId, messageId, delta) { const conversation = this.requireConversation(conversationId); const message = conversation.messages.find((item) => item.id === messageId); if (!message)
         throw new Error("Assistant message not found"); message.content += delta; conversation.updatedAt = now(); await this.persist(); }
     /**
@@ -842,7 +879,7 @@ export class Store {
     }
     async setStatus(conversationId, status) { const conversation = this.requireConversation(conversationId); conversation.status = status; conversation.updatedAt = now(); await this.persist(); }
     /** The plan a revert would carry out, without carrying it out. The server reads this to stop children first. */
-    planRevert(conversationId, messageId) { return planRevert(this.state, conversationId, messageId); }
+    planRevert(conversationId, messageId, withdraw = false) { return planRevert(this.state, conversationId, messageId, withdraw); }
     /**
      * Records which Pi entry a message became, as reported by Pi while it was still running.
      *
@@ -879,10 +916,10 @@ export class Store {
      * plan is recomputed here rather than passed in - two callers cannot disagree about what a message id
      * means, and the recomputation is a pure scan of a small array.
      */
-    async revertMessages(conversationId, messageId) {
-        const plan = planRevert(this.state, conversationId, messageId);
+    async revertMessages(conversationId, messageId, withdraw = false) {
+        const plan = planRevert(this.state, conversationId, messageId, withdraw);
         const conversation = this.requireConversation(conversationId);
-        conversation.messages.splice(plan.boundaryIndex + 1);
+        conversation.messages.splice(plan.boundaryIndex + (withdraw ? 0 : 1));
         if (plan.doomedRunIds.length) {
             const doomed = new Set(plan.doomedRunIds);
             this.state.subagentRuns = this.state.subagentRuns.filter((run) => !doomed.has(run.id));

package/dist/server/types.d.ts

@@ -57,6 +57,10 @@ export type Message = {
     piEntryId?: string;
     toolCalls?: ToolCallBlock[];
     images?: MessageImage[];
+    agentIdentity?: {
+        id?: string;
+        name: string;
+    };
 };
 /**
  * ONE PARAMETER OF A TOOL CALL, as a call block lists it, and the boundary that keeps Pi's arguments out
@@ -746,6 +750,7 @@ export type ClientCommand = {
     type: "message.revert";
     conversationId: string;
     messageId: string;
+    withdraw?: boolean;
 }
 /**
  * Drops ONE queued message, by Super Pi's id.
@@ -910,9 +915,19 @@ export type ServerEvent = {
     conversationId: string;
     requestId: string;
     reason: ExtensionUiCloseReason;
+} | {
+    type: "message.revert.result";
+    conversationId: string;
+    ok: boolean;
+    message?: string;
+    withdrawn?: {
+        content: string;
+        images?: MessageImage[];
+    };
 } | {
     type: "model.catalog";
     catalog: ModelCatalog;
+    conversationId?: string;
 } | {
     type: "agent.catalog";
     catalog: AgentCatalog;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evandu/super-pi",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Web control plane and companion for Pi",
   "license": "MIT",
   "type": "module",
@@ -72,7 +72,8 @@
     "scripts/task-tool.test.mjs",
     "scripts/fork-server.test.mjs",
     "scripts/styles-no-dangling.test.mjs",
-    "scripts/theme-no-hardcoded-colours.test.mjs"
+    "scripts/theme-no-hardcoded-colours.test.mjs",
+    "scripts/agent-config-regression.test.mjs"
   ],
   "check:browser": [
     "scripts/extension-ui-browser.test.mjs",
@@ -102,7 +103,8 @@
     "scripts/theme-switch-state.test.mjs",
     "scripts/settings-window-structure.test.mjs",
     "scripts/file-tab-selected-contrast.test.mjs",
-    "scripts/help-window.test.mjs"
+    "scripts/help-window.test.mjs",
+    "scripts/composer-regression-browser.test.mjs"
   ],
   "dependencies": {
     "ws": "latest"