snowspeeder/pi-web
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract shell message helpers

Browse Source
This commit is contained in:
Federico Jaramillo Martinez
2026-05-07 14:14:41 +02:00
parent 6c0cd655ab
commit d62ca94e4c
2 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/client/src/controllers/sessionController.ts
+4 -25
View File
@@ -1,7 +1,8 @@
import { api, type CommandResult, type SessionActivity, type SessionInfo, type SessionStatus } from "../api";
import { appendText, normalizeMessages, textMessage } from "../chatMessages";
import { GlobalSessionSocket, SessionSocket, type SessionUiEvent } from "../sessionSocket";
import type { ChatLine, ChatPart } from "../components/shared";
import { isShellInput, appendShellChunk, finalizeShellMessage, shellStartMessage } from "../shellMessages";
import { GlobalSessionSocket, SessionSocket, type SessionUiEvent } from "../sessionSocket";
import type { GetState, SetState, UpdateUrl } from "./types";
export class SessionController {
@@ -58,7 +59,7 @@ export class SessionController {
async send(text: string) {
const trimmed = text.trim();
if (trimmed.startsWith("/")) return this.runCommand(text);
if (trimmed.startsWith("!")) return this.runShell(text);
if (isShellInput(text)) return this.runShell(text);
const session = this.getState().selectedSession;
if (!session) return;
this.setState({ messages: [...this.getState().messages, textMessage("user", text)] });
@@ -157,7 +158,7 @@ export class SessionController {
} else if (event.type === "tool.end") {
this.setState({ messages: [...messages, { role: "tool", parts: [{ type: "toolResult", toolName: event.toolName, text: event.text, isError: event.isError }] }] });
} else if (event.type === "shell.start") {
this.setState({ messages: [...messages, textMessage("bash", `$ ${event.command}${event.excludeFromContext ? "\n\nexcluded from context" : ""}`)] });
this.setState({ messages: [...messages, shellStartMessage(event.command, event.excludeFromContext)] });
} else if (event.type === "shell.chunk") {
this.setState({ messages: appendShellChunk(messages, event.chunk) });
} else if (event.type === "shell.end") {
@@ -180,25 +181,3 @@ function appendPart(messages: ChatLine[], role: ChatLine["role"], part: ChatPart
return [...messages, { role, parts: [part] }];
}
function appendShellChunk(messages: ChatLine[], chunk: string): ChatLine[] {
const last = messages.at(-1);
const lastPart = last?.parts.at(-1);
if (last?.role !== "bash" || lastPart?.type !== "text") return [...messages, textMessage("bash", chunk)];
const separator = lastPart.text.includes("\n\n") ? "" : "\n\n";
return [...messages.slice(0, -1), { ...last, parts: [...last.parts.slice(0, -1), { ...lastPart, text: lastPart.text + separator + chunk }] }];
}
function finalizeShellMessage(messages: ChatLine[], event: Extract<SessionUiEvent, { type: "shell.end" }>): ChatLine[] {
const last = messages.at(-1);
const lastPart = last?.parts.at(-1);
if (last?.role !== "bash" || lastPart?.type !== "text") return messages;
const notes: string[] = [];
if (!lastPart.text.includes("\n\n") && !event.output) notes.push("(no output)");
if (event.isError) notes.push(event.output ?? "Bash command failed");
if (event.exitCode != null) notes.push(`exit ${event.exitCode}`);
if (event.cancelled) notes.push("cancelled");
if (event.truncated) notes.push("output truncated");
if (event.fullOutputPath) notes.push(`full output: ${event.fullOutputPath}`);
if (!notes.length) return messages;
return [...messages.slice(0, -1), { ...last, parts: [...last.parts.slice(0, -1), { ...lastPart, text: `${lastPart.text}\n\n${notes.join("\n")}` }] }];
}
src/client/src/shellMessages.ts
+34
View File
@@ -0,0 +1,34 @@
import { textMessage } from "./chatMessages";
import type { ChatLine } from "./components/shared";
import type { SessionUiEvent } from "./sessionSocket";
export function isShellInput(text: string): boolean {
return text.trim().startsWith("!");
}
export function shellStartMessage(command: string, excludeFromContext?: boolean): ChatLine {
return textMessage("bash", `$ ${command}${excludeFromContext ? "\n\nexcluded from context" : ""}`);
}
export function appendShellChunk(messages: ChatLine[], chunk: string): ChatLine[] {
const last = messages.at(-1);
const lastPart = last?.parts.at(-1);
if (last?.role !== "bash" || lastPart?.type !== "text") return [...messages, textMessage("bash", chunk)];
const separator = lastPart.text.includes("\n\n") ? "" : "\n\n";
return [...messages.slice(0, -1), { ...last, parts: [...last.parts.slice(0, -1), { ...lastPart, text: lastPart.text + separator + chunk }] }];
}
export function finalizeShellMessage(messages: ChatLine[], event: Extract<SessionUiEvent, { type: "shell.end" }>): ChatLine[] {
const last = messages.at(-1);
const lastPart = last?.parts.at(-1);
if (last?.role !== "bash" || lastPart?.type !== "text") return messages;
const notes: string[] = [];
if (!lastPart.text.includes("\n\n") && !event.output) notes.push("(no output)");
if (event.isError) notes.push(event.output ?? "Bash command failed");
if (event.exitCode != null) notes.push(`exit ${event.exitCode}`);
if (event.cancelled) notes.push("cancelled");
if (event.truncated) notes.push("output truncated");
if (event.fullOutputPath) notes.push(`full output: ${event.fullOutputPath}`);
if (!notes.length) return messages;
return [...messages.slice(0, -1), { ...last, parts: [...last.parts.slice(0, -1), { ...lastPart, text: `${lastPart.text}\n\n${notes.join("\n")}` }] }];
}