Skip to content

Commit 8cde398

Browse files
PR Batch Testerclaude
andcommitted
fix: resolve what the main merge broke silently
Main added its own query failure field and changed how prompt links narrow the environment, so the merged branch no longer typechecked. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent ac065df commit 8cde398

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎apps/mobile/src/state/query.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ export function useEnvironmentQuery<A, E>(
3535
successResult: result._tag === "Success" && !result.waiting ? result : null,
3636
failure: result._tag === "Failure" ? Cause.squash(result.cause) : null,
3737
error: result._tag === "Failure" ? formatError(result.cause) : null,
38-
failure:
39-
result._tag === "Failure" ? Option.getOrNull(Cause.findErrorOption(result.cause)) : null,
4038
isPending: atom !== null && result.waiting,
4139
isSuccess: result._tag === "Success",
4240
refresh,

‎apps/web/src/components/promptLinks/NewThreadLinkView.tsx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,9 @@ export function NewThreadLinkView({ link }: { readonly link: NewThreadLink }) {
202202
const cloneRepository = async (repository: PromptLinkRepository) => {
203203
const environmentId = lastActiveEnvironmentId();
204204
const environment = environments.find((entry) => entry.environmentId === environmentId);
205-
const newProjectsRoot = environment?.serverConfig?.newProjectsRoot ?? null;
206-
if (environmentId === null || newProjectsRoot === null) {
205+
const serverConfig = environment?.serverConfig ?? null;
206+
const newProjectsRoot = serverConfig?.newProjectsRoot ?? null;
207+
if (environmentId === null || serverConfig === null || newProjectsRoot === null) {
207208
setState({
208209
status: "failed",
209210
message:
@@ -214,7 +215,7 @@ export function NewThreadLinkView({ link }: { readonly link: NewThreadLink }) {
214215
setState({ status: "opening" });
215216
const projectId = newProjectId();
216217
const remoteUrl = `https://github.com/${repository.owner}/${repository.name}.git`;
217-
const settings = environment.serverConfig.settings;
218+
const settings = serverConfig.settings;
218219
const result = await startProjectClone({
219220
environmentId,
220221
input: {

0 commit comments

Comments
 (0)