Skip to content

Commit 5df74ed

Browse files
sheetsyncclaude
andcommitted
fix: reconcile preview branch with upstream
- Stop passing the removed preferredTerminalId option in the runner test. - Cover stale process ownership by reopening after exit, now that TerminalManager.restart is gone. - Name what the mobile route identity effect keeps in step, as the current lint rule requires. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d745802 commit 5df74ed

4 files changed

Lines changed: 28 additions & 25 deletions

File tree

‎apps/mobile/src/features/threads/ThreadRouteScreen.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ function ThreadRouteContent(
471471
const routeThreadIdentity =
472472
environmentIdRaw !== null && threadId !== null ? `${environmentIdRaw}:${threadId}` : null;
473473
const currentRouteThreadIdentityRef = useRef<string | null>(null);
474-
// oxlint-disable-next-line t3code/react-effect-budget -- route identity must update before pending results resume
474+
// oxlint-disable-next-line t3code/no-unreasoned-state-sync -- publishes the committed route identity to a ref that pending action results check before opening
475475
useLayoutEffect(() => {
476476
currentRouteThreadIdentityRef.current = routeThreadIdentity;
477477
return () => {

‎apps/server/src/project/ProjectSetupScriptRunner.test.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
7272
const layer = ProjectSetupScriptRunner.layer.pipe(
7373
Layer.provide(
7474
Layer.mergeAll(
75+
Layer.mock(ProjectionStore.ProjectionStoreV2)({
76+
getThreadShell: () => Effect.succeed(null),
77+
}),
7578
Layer.mock(ProjectService.ProjectService)({
7679
getById: () => Effect.succeedSome(project),
7780
}),
@@ -299,7 +302,6 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
299302
threadId: input.threadId,
300303
projectId,
301304
worktreePath: input.worktreePath,
302-
preferredTerminalId: "setup-output",
303305
observeCompletion: {
304306
onOutputLine: (line) =>
305307
Effect.sync(() => {
@@ -315,7 +317,7 @@ it.effect("ReservedScript-overlappingStarts-reusesOwnerAndRetriesAfterCompletion
315317
yield* publish({
316318
type: "output",
317319
threadId: input.threadId,
318-
terminalId: "setup-output",
320+
terminalId: "setup-preview",
319321
data: `${wrapper}\r\n% (\r\nsubsh> )\r\nReady (vite)\r\nBuild complete ( 42 files )\r\nbackend\r\n__T3_SETUP_DONE___${outputToken}:0\r\n$ `,
320322
});
321323
assert.equal((yield* observed.completion!).exitCode, 0);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"claudeSystemAppendBytes": 5135,
33
"codexAdditionalContextBytes": 6865,
4-
"mcpToolListJsonBytes": 46007
4+
"mcpToolListJsonBytes": 46092
55
}

‎apps/server/src/terminal/Manager.test.ts‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -731,48 +731,49 @@ it.layer(
731731
}),
732732
);
733733

734-
it.effect("TerminalWrite-afterRestartOrExit-rejectsStaleProcessOwnership", () =>
734+
it.effect("TerminalWrite-afterExitOrReopen-rejectsStaleProcessOwnership", () =>
735735
Effect.gen(function* () {
736736
const { manager, ptyAdapter } = yield* createManager();
737737
yield* manager.open(openInput());
738738
const originalProcess = ptyAdapter.processes[0]!;
739-
const restarted = yield* manager.restart(restartInput());
740-
const currentProcess = ptyAdapter.processes[1]!;
741-
const staleWrite = yield* manager
742-
.write({
743-
threadId: "thread-1",
744-
terminalId: DEFAULT_TERMINAL_ID,
745-
expectedPid: originalProcess.pid,
746-
data: "stale\r",
747-
})
748-
.pipe(Effect.flip);
749-
assert.equal(staleWrite._tag, "TerminalNotRunningError");
750-
yield* manager.write({
751-
threadId: "thread-1",
752-
terminalId: DEFAULT_TERMINAL_ID,
753-
expectedPid: restarted.pid!,
754-
data: "current\r",
755-
});
756-
expect(currentProcess.writes).toEqual(["current\r"]);
757739

758740
const exited = yield* Deferred.make<void>();
759741
const unsubscribe = yield* manager.subscribe((event) =>
760742
event.type === "exited" && event.terminalId === DEFAULT_TERMINAL_ID
761743
? Deferred.succeed(exited, undefined).pipe(Effect.asVoid)
762744
: Effect.void,
763745
);
764-
currentProcess.emitExit({ exitCode: 0, signal: 0 });
746+
originalProcess.emitExit({ exitCode: 0, signal: 0 });
765747
yield* Deferred.await(exited);
766748
unsubscribe();
767749
const exitedWrite = yield* manager
768750
.write({
769751
threadId: "thread-1",
770752
terminalId: DEFAULT_TERMINAL_ID,
771-
expectedPid: currentProcess.pid,
753+
expectedPid: originalProcess.pid,
772754
data: "after exit\r",
773755
})
774756
.pipe(Effect.flip);
775757
assert.equal(exitedWrite._tag, "TerminalNotRunningError");
758+
759+
const reopened = yield* manager.open(openInput());
760+
const currentProcess = ptyAdapter.processes[1]!;
761+
const staleWrite = yield* manager
762+
.write({
763+
threadId: "thread-1",
764+
terminalId: DEFAULT_TERMINAL_ID,
765+
expectedPid: originalProcess.pid,
766+
data: "stale\r",
767+
})
768+
.pipe(Effect.flip);
769+
assert.equal(staleWrite._tag, "TerminalNotRunningError");
770+
yield* manager.write({
771+
threadId: "thread-1",
772+
terminalId: DEFAULT_TERMINAL_ID,
773+
expectedPid: reopened.pid!,
774+
data: "current\r",
775+
});
776+
expect(originalProcess.writes).toEqual([]);
776777
expect(currentProcess.writes).toEqual(["current\r"]);
777778
}),
778779
);

0 commit comments

Comments
 (0)