[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

Draft
sameerr03 wants to merge 1 commit into from
Draft

[DO NOT MERGE] feat(web): edit and fork Codex conversations #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 72 additions & 0 deletions apps/web/src/components/ChatView.logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
ChatImageAttachment,
EnvironmentId,
EventId,
MessageId,
ProjectId,
ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
hasEnvironmentReconnectWarningGraceElapsed,
hasServerAcknowledgedLocalDispatch,
isBranchMismatchDismissedForSession,
isForkEditableUserMessage,
reconcileMountedTerminalThreadIds,
reconcileRetainedMountedThreadIds,
resolveThreadForkLineage,
resolveThreadMetadataUpdateForNextTurn,
resolveSendEnvMode,
scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
it("offers edit only for plain-text user messages", () => {
const message = {
id: MessageId.make("message-editable"),
role: "user" as const,
text: "Rewrite this prompt",
turnId: null,
streaming: false,
createdAt: now,
updatedAt: now,
};

expect(isForkEditableUserMessage(message)).toBe(true);
expect(
isForkEditableUserMessage({
...message,
text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
}),
).toBe(false);
expect(
isForkEditableUserMessage({
...message,
attachments: [
ChatImageAttachment.make({
type: "image",
id: "image-1",
name: "reference.png",
mimeType: "image/png",
sizeBytes: 100,
}),
],
}),
).toBe(false);
});

it("reads the durable parent link and ignores malformed payloads", () => {
expect(
resolveThreadForkLineage([
{
id: EventId.make("fork-activity"),
tone: "info",
kind: "thread.forked",
summary: "Forked from Parent thread",
payload: { parentThreadId: "thread-parent", cut: "through" },
turnId: null,
createdAt: now,
},
]),
).toEqual({
label: "Forked from Parent thread",
parentThreadId: ThreadId.make("thread-parent"),
});
expect(
resolveThreadForkLineage([
{
id: EventId.make("malformed-fork-activity"),
tone: "info",
kind: "thread.forked",
summary: "Forked",
payload: {},
turnId: null,
createdAt: now,
},
]),
).toBeNull();
});
});

describe("environment reconnect warning grace", () => {
afterEach(() => vi.useRealTimers());

Expand Down
39 changes: 38 additions & 1 deletion apps/web/src/components/ChatView.logic.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
type EnvironmentId,
isProviderDriverKind,
type OrchestrationThreadActivity,
ProjectId,
type ModelSelection,
type ProviderDriverKind,
type ServerProvider,
type ScopedProjectRef,
type ScopedThreadRef,
type ThreadId,
ThreadId,
type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
readonly label: string;
readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
/<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
return (
message.role === "user" &&
!message.streaming &&
(message.attachments?.length ?? 0) === 0 &&
!SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
);
}

export function resolveThreadForkLineage(
activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
const activity = activities.find((candidate) => candidate.kind === "thread.forked");
const payload =
activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
const parentThreadId =
payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
? payload.parentThreadId.trim()
: "";
if (!activity || parentThreadId.length === 0) {
return null;
}
return {
label: activity.summary,
parentThreadId: ThreadId.make(parentThreadId),
};
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
return () => globalThis.clearTimeout(timeoutId);
Expand Down
155 changes: 154 additions & 1 deletion apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
scheduleEnvironmentReconnectWarning,
hasServerAcknowledgedLocalDispatch,
isBranchMismatchDismissedForSession,
isForkEditableUserMessage,
shouldShowBranchMismatchBanner,
getStartedThreadModelChangeBlockReason,
LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
deriveLockedProvider,
readFileAsDataUrl,
reconcileMountedTerminalThreadIds,
resolveThreadForkLineage,
resolveThreadMetadataUpdateForNextTurn,
resolveSendEnvMode,
revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
reportFailure: false,
});
const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
reportFailure: false,
});
const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
>({});
const [isConnecting, _setIsConnecting] = useState(false);
const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
const [isForkingThread, setIsForkingThread] = useState(false);
const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
null,
);
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
}, [activeProviderInstanceId, providerStatuses, selectedProvider]);
const canForkCodexThread =
routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
forkEligibilityRef.current = { activeThread, canForkCodexThread };
const canEditUserMessage = useCallback((messageId: MessageId) => {
const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
if (!canFork) {
return false;
}
const message = thread?.messages.find((candidate) => candidate.id === messageId);
return message ? isForkEditableUserMessage(message) : false;
}, []);
const canForkAssistantMessage = useCallback((messageId: MessageId) => {
const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
return (
canFork &&
(thread?.checkpoints.some(
(checkpoint) =>
checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
) ??
false)
);
}, []);
const threadForkLineage = useMemo(
() => resolveThreadForkLineage(activeThread?.activities ?? []),
[activeThread?.activities],
);
const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
},
[composerRef],
);
const forkFromMessage = useCallback(
async (messageId: MessageId, cut: "before" | "through") => {
if (!activeThread || !canForkCodexThread || isForkingThread) {
return;
}
if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
setThreadError(
activeThread.id,
`Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
);
return;
}
if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
setThreadError(activeThread.id, "Finish the current action before forking this thread.");
return;
}

const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
if (!sourceMessage) {
return;
}

setIsForkingThread(true);
setThreadError(activeThread.id, null);
try {
const result = await forkThread({
environmentId: activeThread.environmentId,
input: {
sourceThreadId: activeThread.id,
sourceMessageId: messageId,
cut,
title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
},
});
if (result._tag === "Failure") {
if (!isAtomCommandInterrupted(result)) {
setThreadError(
activeThread.id,
chatActionErrorMessage(squashAtomCommandFailure(result)),
);
}
return;
}

const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
if (cut === "before") {
setComposerDraftPrompt(childThreadRef, sourceMessage.text);
}
await navigate({
to: "/$environmentId/$threadId",
params: {
environmentId: childThreadRef.environmentId,
threadId: childThreadRef.threadId,
},
});
if (cut === "before") {
scheduleComposerFocus();
}
} catch (error) {
setThreadError(activeThread.id, chatActionErrorMessage(error));
} finally {
setIsForkingThread(false);
}
},
[
activeEnvironmentUnavailable,
activeEnvironmentUnavailableLabel,
activeThread,
canForkCodexThread,
forkThread,
isConnecting,
isForkingThread,
isRevertingCheckpoint,
isSendBusy,
navigate,
phase,
scheduleComposerFocus,
setComposerDraftPrompt,
setThreadError,
],
);
const onEditUserMessage = useCallback(
(messageId: MessageId) => void forkFromMessage(messageId, "before"),
[forkFromMessage],
);
const onForkAssistantMessage = useCallback(
(messageId: MessageId) => void forkFromMessage(messageId, "through"),
[forkFromMessage],
);
const onOpenForkParent = useCallback(() => {
if (!activeThread || !threadForkLineage) {
return;
}
void navigate({
to: "/$environmentId/$threadId",
params: {
environmentId: activeThread.environmentId,
threadId: threadForkLineage.parentThreadId,
},
});
}, [activeThread, navigate, threadForkLineage]);
const timelineForkLineage = useMemo(
() =>
threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
[onOpenForkParent, threadForkLineage],
);
const setTerminalOpen = useCallback(
(open: boolean) => {
if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
!activeThread ||
isSendBusy ||
isConnecting ||
isForkingThread ||
threadDetailLoading ||
sendInFlightRef.current
) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
onOpenTurnDiff={onOpenTurnDiff}
revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
onRevertUserMessage={onRevertUserMessage}
canEditUserMessage={canEditUserMessage}
canForkAssistantMessage={canForkAssistantMessage}
onEditUserMessage={onEditUserMessage}
onForkAssistantMessage={onForkAssistantMessage}
isForkingThread={isForkingThread}
forkLineage={timelineForkLineage}
isRevertingCheckpoint={isRevertingCheckpoint}
onImageExpand={onExpandTimelineImage}
markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
phase={phase}
isConnecting={isConnecting}
isSendBusy={isSendBusy}
sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
sendDisabledReason={
threadDetailLoading
? "Messages loading"
: isForkingThread
? "Creating fork"
: null
}
isPreparingWorktree={isPreparingWorktree}
environmentUnavailable={activeEnvironmentUnavailableState}
activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[DO NOT MERGE] feat(web): edit and fork Codex conversations#8

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

 Draft

sameerr03
wants to merge
1
commit into

from

 Draft


[DO NOT MERGE] feat(web): edit and fork Codex conversations
#8
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


72 changes: 72 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
import {
 ChatImageAttachment,
 EnvironmentId,
 EventId,
 MessageId,
 ProjectId,
 ProviderInstanceId,
Expand All@@ -24,8 +26,10 @@ import {
 hasEnvironmentReconnectWarningGraceElapsed,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 reconcileMountedTerminalThreadIds,
 reconcileRetainedMountedThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 scheduleEnvironmentReconnectWarning,
Expand All@@ -39,6 +43,74 @@ const projectId = ProjectId.make("project-1");
const threadId = ThreadId.make("thread-1");
const now = "2026-03-29T00:00:00.000Z";

describe("thread fork lineage", () => {
 it("offers edit only for plain-text user messages", () => {
 const message = {
 id: MessageId.make("message-editable"),
 role: "user" as const,
 text: "Rewrite this prompt",
 turnId: null,
 streaming: false,
 createdAt: now,
 updatedAt: now,
 };

 expect(isForkEditableUserMessage(message)).toBe(true);
 expect(
 isForkEditableUserMessage({
 ...message,
 text: "Rewrite this\n\n<terminal_context>\n- shell:\n output\n</terminal_context>",
 }),
 ).toBe(false);
 expect(
 isForkEditableUserMessage({
 ...message,
 attachments: [
 ChatImageAttachment.make({
 type: "image",
 id: "image-1",
 name: "reference.png",
 mimeType: "image/png",
 sizeBytes: 100,
 }),
 ],
 }),
 ).toBe(false);
 });

 it("reads the durable parent link and ignores malformed payloads", () => {
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked from Parent thread",
 payload: { parentThreadId: "thread-parent", cut: "through" },
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toEqual({
 label: "Forked from Parent thread",
 parentThreadId: ThreadId.make("thread-parent"),
 });
 expect(
 resolveThreadForkLineage([
 {
 id: EventId.make("malformed-fork-activity"),
 tone: "info",
 kind: "thread.forked",
 summary: "Forked",
 payload: {},
 turnId: null,
 createdAt: now,
 },
 ]),
 ).toBeNull();
 });
});

describe("environment reconnect warning grace", () => {
 afterEach(() => vi.useRealTimers());

Expand Down

39 changes: 38 additions & 1 deletion
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
import {
 type EnvironmentId,
 isProviderDriverKind,
 type OrchestrationThreadActivity,
 ProjectId,
 type ModelSelection,
 type ProviderDriverKind,
 type ServerProvider,
 type ScopedProjectRef,
 type ScopedThreadRef,
type ThreadId,
 ThreadId,
 type TurnId,
} from "@t3tools/contracts";
import { type ChatMessage, type SessionPhase, type Thread, type ThreadShell } from "../types";
Expand All@@ -29,6 +30,42 @@ export const ENVIRONMENT_RECONNECT_WARNING_GRACE_MS = 2_000;

export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);

export interface ThreadForkLineage {
 readonly label: string;
 readonly parentThreadId: ThreadId;
}

const SERIALIZED_MESSAGE_CONTEXT_PATTERN =
 /<(?:terminal_context|element_context|preview_annotation|review_comment)\b/i;

export function isForkEditableUserMessage(message: ChatMessage): boolean {
 return (
 message.role === "user" &&
 !message.streaming &&
 (message.attachments?.length ?? 0) === 0 &&
 !SERIALIZED_MESSAGE_CONTEXT_PATTERN.test(message.text)
 );
}

export function resolveThreadForkLineage(
 activities: ReadonlyArray<OrchestrationThreadActivity>,
): ThreadForkLineage | null {
 const activity = activities.find((candidate) => candidate.kind === "thread.forked");
 const payload =
 activity?.payload && typeof activity.payload === "object" ? activity.payload : null;
 const parentThreadId =
 payload && "parentThreadId" in payload && typeof payload.parentThreadId === "string"
 ? payload.parentThreadId.trim()
 : "";
 if (!activity || parentThreadId.length === 0) {
 return null;
 }
 return {
 label: activity.summary,
 parentThreadId: ThreadId.make(parentThreadId),
 };
}

export function scheduleEnvironmentReconnectWarning(showWarning: () => void): () => void {
 const timeoutId = globalThis.setTimeout(showWarning, ENVIRONMENT_RECONNECT_WARNING_GRACE_MS);
 return () => globalThis.clearTimeout(timeoutId);
Expand Down

155 changes: 154 additions & 1 deletion
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -314,6 +314,7 @@ import {
 scheduleEnvironmentReconnectWarning,
 hasServerAcknowledgedLocalDispatch,
 isBranchMismatchDismissedForSession,
 isForkEditableUserMessage,
 shouldShowBranchMismatchBanner,
 getStartedThreadModelChangeBlockReason,
 LAST_INVOKED_SCRIPT_BY_PROJECT_KEY,
Expand All@@ -324,6 +325,7 @@ import {
 deriveLockedProvider,
 readFileAsDataUrl,
 reconcileMountedTerminalThreadIds,
 resolveThreadForkLineage,
 resolveThreadMetadataUpdateForNextTurn,
 resolveSendEnvMode,
 revokeBlobPreviewUrl,
Expand All@@ -338,6 +340,7 @@ import { useComposerHandleContext } from "../composerHandleContext";
import { sanitizeThreadErrorMessage } from "~/rpc/transportError";
import { RightPanelSheet } from "./RightPanelSheet";
import { previewEnvironment } from "../state/preview";
import { orchestrationEnvironment } from "../state/orchestration";
import { useAtomCommand } from "../state/use-atom-command";
import { Button } from "./ui/button";
import {
Expand DownExpand Up@@ -1251,6 +1254,9 @@ function ChatViewContent(props: ChatViewProps) {
 const revertThreadCheckpoint = useAtomCommand(threadEnvironment.revertCheckpoint, {
 reportFailure: false,
 });
 const forkThread = useAtomCommand(orchestrationEnvironment.forkThread, {
 reportFailure: false,
 });
 const openPreview = useAtomCommand(previewEnvironment.open, { reportFailure: false });
 const closePreview = useAtomCommand(previewEnvironment.close, "preview close");
 const { environments } = useEnvironments();
Expand DownExpand Up@@ -1364,6 +1370,7 @@ function ChatViewContent(props: ChatViewProps) {
 >({});
 const [isConnecting, _setIsConnecting] = useState(false);
 const [isRevertingCheckpoint, setIsRevertingCheckpoint] = useState(false);
 const [isForkingThread, setIsForkingThread] = useState(false);
 const [maximizedRightPanelThreadKey, setMaximizedRightPanelThreadKey] = useState<string | null>(
 null,
 );
Expand DownExpand Up@@ -2683,6 +2690,33 @@ function ChatViewContent(props: ChatViewProps) {
 const defaultInstanceId = defaultInstanceIdForDriver(selectedProvider);
 return providerStatuses.find((status) => status.instanceId === defaultInstanceId) ?? null;
 }, [activeProviderInstanceId, providerStatuses, selectedProvider]);
 const canForkCodexThread =
 routeKind === "server" && activeProviderStatus?.driver === ProviderDriverKind.make("codex");
 const forkEligibilityRef = useRef({ activeThread, canForkCodexThread });
 forkEligibilityRef.current = { activeThread, canForkCodexThread };
 const canEditUserMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 if (!canFork) {
 return false;
 }
 const message = thread?.messages.find((candidate) => candidate.id === messageId);
 return message ? isForkEditableUserMessage(message) : false;
 }, []);
 const canForkAssistantMessage = useCallback((messageId: MessageId) => {
 const { activeThread: thread, canForkCodexThread: canFork } = forkEligibilityRef.current;
 return (
 canFork &&
 (thread?.checkpoints.some(
 (checkpoint) =>
 checkpoint.status === "ready" && checkpoint.assistantMessageId === messageId,
 ) ??
 false)
 );
 }, []);
 const threadForkLineage = useMemo(
 () => resolveThreadForkLineage(activeThread?.activities ?? []),
 [activeThread?.activities],
 );
 const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
 const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
 string | null
Expand DownExpand Up@@ -2836,6 +2870,112 @@ function ChatViewContent(props: ChatViewProps) {
 },
 [composerRef],
 );
 const forkFromMessage = useCallback(
 async (messageId: MessageId, cut: "before" | "through") => {
 if (!activeThread || !canForkCodexThread || isForkingThread) {
 return;
 }
 if (activeEnvironmentUnavailable && activeEnvironmentUnavailableLabel) {
 setThreadError(
 activeThread.id,
 `Reconnect ${activeEnvironmentUnavailableLabel} before forking this thread.`,
 );
 return;
 }
 if (phase === "running" || isSendBusy || isConnecting || isRevertingCheckpoint) {
 setThreadError(activeThread.id, "Finish the current action before forking this thread.");
 return;
 }

 const sourceMessage = activeThread.messages.find((message) => message.id === messageId);
 if (!sourceMessage) {
 return;
 }

 setIsForkingThread(true);
 setThreadError(activeThread.id, null);
 try {
 const result = await forkThread({
 environmentId: activeThread.environmentId,
 input: {
 sourceThreadId: activeThread.id,
 sourceMessageId: messageId,
 cut,
 title: truncate(`${activeThread.title} (${cut === "before" ? "edit" : "fork"})`),
 },
 });
 if (result._tag === "Failure") {
 if (!isAtomCommandInterrupted(result)) {
 setThreadError(
 activeThread.id,
 chatActionErrorMessage(squashAtomCommandFailure(result)),
 );
 }
 return;
 }

 const childThreadRef = scopeThreadRef(activeThread.environmentId, result.value.threadId);
 if (cut === "before") {
 setComposerDraftPrompt(childThreadRef, sourceMessage.text);
 }
 await navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: childThreadRef.environmentId,
 threadId: childThreadRef.threadId,
 },
 });
 if (cut === "before") {
 scheduleComposerFocus();
 }
 } catch (error) {
 setThreadError(activeThread.id, chatActionErrorMessage(error));
 } finally {
 setIsForkingThread(false);
 }
 },
 [
 activeEnvironmentUnavailable,
 activeEnvironmentUnavailableLabel,
 activeThread,
 canForkCodexThread,
 forkThread,
 isConnecting,
 isForkingThread,
 isRevertingCheckpoint,
 isSendBusy,
 navigate,
 phase,
 scheduleComposerFocus,
 setComposerDraftPrompt,
 setThreadError,
 ],
 );
 const onEditUserMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "before"),
 [forkFromMessage],
 );
 const onForkAssistantMessage = useCallback(
 (messageId: MessageId) => void forkFromMessage(messageId, "through"),
 [forkFromMessage],
 );
 const onOpenForkParent = useCallback(() => {
 if (!activeThread || !threadForkLineage) {
 return;
 }
 void navigate({
 to: "/$environmentId/$threadId",
 params: {
 environmentId: activeThread.environmentId,
 threadId: threadForkLineage.parentThreadId,
 },
 });
 }, [activeThread, navigate, threadForkLineage]);
 const timelineForkLineage = useMemo(
 () =>
 threadForkLineage ? { label: threadForkLineage.label, onOpenParent: onOpenForkParent } : null,
 [onOpenForkParent, threadForkLineage],
 );
 const setTerminalOpen = useCallback(
 (open: boolean) => {
 if (!activeThreadRef) return;
Expand DownExpand Up@@ -5012,6 +5152,7 @@ function ChatViewContent(props: ChatViewProps) {
 !activeThread ||
 isSendBusy ||
 isConnecting ||
 isForkingThread ||
 threadDetailLoading ||
 sendInFlightRef.current
 ) {
Expand DownExpand Up@@ -6396,6 +6537,12 @@ function ChatViewContent(props: ChatViewProps) {
 onOpenTurnDiff={onOpenTurnDiff}
 revertTurnCountByUserMessageId={revertTurnCountByUserMessageId}
 onRevertUserMessage={onRevertUserMessage}
 canEditUserMessage={canEditUserMessage}
 canForkAssistantMessage={canForkAssistantMessage}
 onEditUserMessage={onEditUserMessage}
 onForkAssistantMessage={onForkAssistantMessage}
 isForkingThread={isForkingThread}
 forkLineage={timelineForkLineage}
 isRevertingCheckpoint={isRevertingCheckpoint}
 onImageExpand={onExpandTimelineImage}
 markdownCwd={gitCwd ?? undefined}
Expand DownExpand Up@@ -6507,7 +6654,13 @@ function ChatViewContent(props: ChatViewProps) {
 phase={phase}
 isConnecting={isConnecting}
 isSendBusy={isSendBusy}
 sendDisabledReason={threadDetailLoading ? "Messages loading" : null}
 sendDisabledReason={
 threadDetailLoading
 ? "Messages loading"
 : isForkingThread
 ? "Creating fork"
 : null
 }
 isPreparingWorktree={isPreparingWorktree}
 environmentUnavailable={activeEnvironmentUnavailableState}
 activePendingApproval={activePendingApproval}
Expand Down
Loading
Loading