Skip to content

fix(server): append terminal history output #7938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tarik02 wants to merge 25 commits into from
Closed

fix(server): append terminal history output #7938

Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
949504f
fix(server): append terminal history output
tarik02 Aug 22, 2026
548246b
Merge remote-tracking branch 'upstream/main' into fix/terminal-histor…
tarik02 Aug 22, 2026
1556266
fix(server): bound appended terminal history
tarik02 Aug 22, 2026
b18dcb8
fix(server): retry terminal history writes
tarik02 Aug 22, 2026
600d01e
fix(server): order terminal history resets
tarik02 Aug 22, 2026
3ab5e39
fix(server): discard deleted history retries
tarik02 Aug 22, 2026
fd4be84
fix(server): order terminal event publication
tarik02 Aug 22, 2026
68e4f0c
fix(server): preserve event test literal types
tarik02 Aug 22, 2026
ac6caa7
fix(server): discard stale terminal attach events
tarik02 Aug 22, 2026
49fc176
fix(server): reopen attach streams after restart
tarik02 Aug 22, 2026
2503467
fix(server): preserve terminal event and history ordering
tarik02 Aug 23, 2026
7ac8228
fix(server): flush queued terminal output on shutdown
tarik02 Aug 23, 2026
be90646
fix(server): preserve terminal history during close and retry
tarik02 Aug 23, 2026
734faf0
fix(server): preserve terminal history during final flushes
tarik02 Aug 23, 2026
6232d5e
fix(server): preserve ordered terminal output
tarik02 Aug 23, 2026
866d71c
fix(server): retain terminal history at byte boundaries
tarik02 Aug 23, 2026
54de904
fix(server): avoid terminal event drain deadlock
tarik02 Aug 23, 2026
63fb231
fix(server): release evicted terminal history retries
tarik02 Aug 23, 2026
7ae5d7b
fix(server): preserve terminal history retry state
tarik02 Aug 23, 2026
be6378e
Merge remote-tracking branch 'upstream/main' into fix/terminal-histor…
tarik02 Aug 23, 2026
bb9ddc4
fix(server): simplify terminal history persistence
tarik02 Aug 23, 2026
4cfce6a
fix(server): preserve split terminal unicode
tarik02 Aug 23, 2026
5d89abf
fix(server): keep attach history ordered
tarik02 Aug 23, 2026
9c3d4b7
Merge remote-tracking branch 'upstream/main' into fix/terminal-histor…
tarik02 Aug 23, 2026
24fc2d5
Merge remote-tracking branch 'upstream/main' into fix/terminal-histor…
tarik02 Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 69 additions & 36 deletions apps/server/src/terminal/Manager.ts
View file
Open in desktop
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ export interface TerminalSessionState {
}

interface PersistHistoryRequest {
history: string;
contents: string;
mode: "append" | "truncate";
immediate: boolean;
}

Expand All @@ -281,7 +282,7 @@ type DrainProcessEventAction =
threadId: string;
terminalId: string;
sequence: number;
history: string | null;
historyDelta: string;
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
data: string;
}
| {
Expand Down Expand Up @@ -1358,10 +1359,14 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
never,
never
>({
merge: (current, next) => ({
history: next.history,
immediate: current.immediate || next.immediate,
}),
merge: (current, next) =>
next.mode === "truncate"
? next
: {
contents: `${current.contents}${next.contents}`,
mode: current.mode,
immediate: current.immediate || next.immediate,
},
Comment thread
tarik02 marked this conversation as resolved.
Outdated
process: Effect.fn("terminal.persistHistoryWorker")(function* (sessionKey, request) {
if (!request.immediate) {
yield* Effect.sleep(DEFAULT_PERSIST_DEBOUNCE_MS);
Expand All @@ -1372,46 +1377,64 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
return;
}

yield* fileSystem.writeFileString(historyPath(threadId, terminalId), request.history).pipe(
Effect.catch((error) =>
Effect.logWarning("failed to persist terminal history", {
threadId,
terminalId,
error,
}),
),
);
yield* fileSystem
.writeFileString(historyPath(threadId, terminalId), request.contents, {
flag: request.mode === "append" ? "a" : "w",
Comment thread
tarik02 marked this conversation as resolved.
Outdated
Comment thread
tarik02 marked this conversation as resolved.
Outdated
})
.pipe(
Effect.catch((error) =>
Comment thread
macroscopeapp[bot] marked this conversation as resolved.
Outdated
Effect.logWarning("failed to persist terminal history", {
threadId,
terminalId,
error,
Comment thread
tarik02 marked this conversation as resolved.
Outdated
}),
),
);
}),
});

const queuePersist = Effect.fn("terminal.queuePersist")(function* (
threadId: string,
terminalId: string,
history: string,
contents: string,
) {
yield* persistWorker.enqueue(toSessionKey(threadId, terminalId), {
history,
contents,
mode: "append",
immediate: false,
});
});

const flushPersist = Effect.fn("terminal.flushPersist")(function* (
const drainPersist = Effect.fn("terminal.drainPersist")(function* (
threadId: string,
terminalId: string,
) {
yield* persistWorker.drainKey(toSessionKey(threadId, terminalId));
});

const persistHistory = Effect.fn("terminal.persistHistory")(function* (
const flushPersist = Effect.fn("terminal.flushPersist")(function* (
threadId: string,
terminalId: string,
) {
yield* persistWorker.enqueue(toSessionKey(threadId, terminalId), {
contents: "",
mode: "append",
immediate: true,
});
yield* drainPersist(threadId, terminalId);
});

const resetPersistedHistory = Effect.fn("terminal.resetPersistedHistory")(function* (
threadId: string,
terminalId: string,
history: string,
contents: string,
) {
yield* persistWorker.enqueue(toSessionKey(threadId, terminalId), {
history,
contents,
mode: "truncate",
immediate: true,
});
yield* flushPersist(threadId, terminalId);
yield* drainPersist(threadId, terminalId);
});

const readHistory = Effect.fn("terminal.readHistory")(function* (
Expand Down Expand Up @@ -1673,7 +1696,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
threadId: session.threadId,
terminalId: session.terminalId,
sequence: eventStamp.sequence,
history: sanitized.visibleText.length > 0 ? session.history : null,
historyDelta: sanitized.visibleText,
data: nextEvent.data,
} as const;
}
Expand Down Expand Up @@ -1713,8 +1736,8 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
}

if (action.type === "output") {
if (action.history !== null) {
yield* queuePersist(action.threadId, action.terminalId, action.history);
if (action.historyDelta.length > 0) {
yield* queuePersist(action.threadId, action.terminalId, action.historyDelta);
Comment thread
cursor[bot] marked this conversation as resolved.
Outdated
}

yield* publishEvent({
Expand Down Expand Up @@ -1972,11 +1995,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
if (Option.isSome(session)) {
yield* stopProcess(session.value);
yield* unregisterTerminal({ threadId, terminalId });
yield* persistHistory(threadId, terminalId, session.value.history);
yield* flushPersist(threadId, terminalId);
} else {
yield* drainPersist(threadId, terminalId);
}

yield* flushPersist(threadId, terminalId);

const removed = yield* modifyManagerState((state) => {
if (!state.sessions.has(key)) {
return [false, state] as const;
Expand Down Expand Up @@ -2130,9 +2153,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
session: TerminalSessionState,
) {
cleanupProcessHandles(session);
if (!session.process) return;
yield* clearKillFiber(session.process);
yield* runKillEscalation(session.process, session.threadId, session.terminalId);
yield* drainPersist(session.threadId, session.terminalId);
if (session.process) {
yield* clearKillFiber(session.process);
yield* runKillEscalation(session.process, session.threadId, session.terminalId);
}
});

yield* Effect.forEach(sessions, cleanupSession, {
Expand All @@ -2149,7 +2174,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
const sessionKey = toSessionKey(input.threadId, terminalId);
const existing = yield* getSession(input.threadId, terminalId);
if (Option.isNone(existing)) {
yield* flushPersist(input.threadId, terminalId);
yield* drainPersist(input.threadId, terminalId);
const history = yield* readHistory(input.threadId, terminalId);
const cols = input.cols ?? DEFAULT_OPEN_COLS;
const rows = input.rows ?? DEFAULT_OPEN_ROWS;
Expand Down Expand Up @@ -2226,7 +2251,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
liveSession.pendingProcessEvents = [];
liveSession.pendingProcessEventIndex = 0;
liveSession.processEventDrainRunning = false;
yield* persistHistory(liveSession.threadId, liveSession.terminalId, liveSession.history);
yield* resetPersistedHistory(
liveSession.threadId,
liveSession.terminalId,
liveSession.history,
);
} else if (liveSession.status === "exited" || liveSession.status === "error") {
liveSession.runtimeEnv = nextRuntimeEnv;
liveSession.worktreePath = nextWorktreePath;
Expand All @@ -2235,7 +2264,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
liveSession.pendingProcessEvents = [];
liveSession.pendingProcessEventIndex = 0;
liveSession.processEventDrainRunning = false;
yield* persistHistory(liveSession.threadId, liveSession.terminalId, liveSession.history);
yield* resetPersistedHistory(
liveSession.threadId,
liveSession.terminalId,
liveSession.history,
);
}

if (!liveSession.process) {
Expand Down Expand Up @@ -2541,7 +2574,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
session.pendingProcessEventIndex = 0;
session.processEventDrainRunning = false;
const eventStamp = advanceEventSequence(session);
yield* persistHistory(input.threadId, terminalId, session.history);
yield* resetPersistedHistory(input.threadId, terminalId, session.history);
yield* publishEvent({
type: "cleared",
threadId: input.threadId,
Expand Down Expand Up @@ -2613,7 +2646,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
session.pendingProcessEvents = [];
session.pendingProcessEventIndex = 0;
session.processEventDrainRunning = false;
yield* persistHistory(input.threadId, terminalId, session.history);
yield* resetPersistedHistory(input.threadId, terminalId, session.history);
yield* startSession(
session,
{
Expand Down
Loading