Skip to content
Merged
Changes from all commits
Commits
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
37 changes: 15 additions & 22 deletions apps/web/src/state/terminalSessions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import {
type TerminalAttachInput,
type TerminalSummary,
} from "@t3tools/contracts";
import { useMemo } from "react";

import { useEnvironmentQuery } from "./query";
import { terminalEnvironment } from "./terminal";
Expand Down Expand Up @@ -153,19 +152,17 @@ export function useAttachedTerminalSession(input: {
}),
);

return useMemo(() => {
if (input.environmentId === null || input.terminal === null) {
return EMPTY_TERMINAL_SESSION_STATE;
}
const summary =
(metadata.data === null
? null
: terminalMetadataIndex(metadata.data)
.byThreadId.get(input.terminal.threadId)
?.find((terminal) => terminal.terminalId === input.terminal?.terminalId)) ?? null;
const state = combineTerminalSessionState(summary, attach.data ?? EMPTY_TERMINAL_BUFFER_STATE);
return attach.error === null ? state : { ...state, error: attach.error, status: "error" };
}, [attach.data, attach.error, input.environmentId, input.terminal, metadata.data]);
if (input.environmentId === null || input.terminal === null) {
return EMPTY_TERMINAL_SESSION_STATE;
}
const summary =
(metadata.data === null
? null
: terminalMetadataIndex(metadata.data)
.byThreadId.get(input.terminal.threadId)
?.find((terminal) => terminal.terminalId === input.terminal?.terminalId)) ?? null;
const state = combineTerminalSessionState(summary, attach.data ?? EMPTY_TERMINAL_BUFFER_STATE);
return attach.error === null ? state : { ...state, error: attach.error, status: "error" };
}

export function useKnownTerminalSessions(input: {
Expand All @@ -181,19 +178,15 @@ export function useKnownTerminalSessions(input: {
input: null,
}),
);
return useMemo(
() =>
metadata.data === null || metadata.error !== null
? null
: selectKnownTerminalSessions(metadata.data, input.environmentId, input.threadId),
[input.environmentId, input.threadId, metadata.data, metadata.error],
);
return metadata.data === null || metadata.error !== null
? null
: selectKnownTerminalSessions(metadata.data, input.environmentId, input.threadId);
}

export function useThreadRunningTerminalIds(input: {
readonly environmentId: EnvironmentId | null;
readonly threadId: ThreadId | null;
}): ReadonlyArray<string> {
const sessions = useKnownTerminalSessions(input);
return useMemo(() => selectRunningSubprocessTerminalIds(sessions ?? []), [sessions]);
return selectRunningSubprocessTerminalIds(sessions ?? []);
}
Loading