Skip to content

Commit 6a79baa

Browse files
committed
sync: re-home the pty seam into v1.4.190's module split
v1.4.190 dissolves src/main/ipc/pty.ts (8030 lines) into 73 modules under src/main/ipc/pty/ and leaves a 39-line barrel. -X ours defended the fork's stale monolith while the merge took the new siblings, so both implementations were live at once. Move the terminal-dock ack'd-send seam into the modules that now own the code (write-input.ts, write.ts, register-handlers.ts), restore pty.ts to the tag's barrel, and repoint the manifest's seam and residual entries together. Also repair two hunks -X ours discarded: tab-types.ts lost upstream's ExecutionHostId import while keeping the executionHostId field that uses it, and web-session-tabs-sync.ts's two fork call sites lost the environmentId argument buildTerminalUnifiedTab now needs for executionHostId.
1 parent 26d4bda commit 6a79baa

7 files changed

Lines changed: 169 additions & 8117 deletions

File tree

‎config/fork-ownership.json‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,15 +154,31 @@
154154
"lines": ["const MACOS_PACKAGED_BUNDLE_ID = 'com.zpyoung.orca'"]
155155
},
156156
{
157-
"path": "src/main/ipc/pty.ts",
157+
"path": "src/main/ipc/pty/ipc/write-input.ts",
158158
"feature": "terminal-dock",
159159
"kind": "registration",
160160
"lines": [
161161
" const writePtyProviderInputAcknowledged = (",
162162
" return tooLarge ? false : writePtyProviderInputAcknowledgedChunks(settlementWrite, id, data)",
163-
" return allSettled"
163+
" return allSettled",
164+
" const writePtyInputProvablyLive = (args: PtyWritePayload): boolean | Promise<boolean> => {"
164165
]
165166
},
167+
{
168+
"path": "src/main/ipc/pty/ipc/write.ts",
169+
"feature": "terminal-dock",
170+
"kind": "registration",
171+
"lines": [
172+
" ipcMain.handle('pty:writeInputAccepted', (event, args: unknown): boolean | Promise<boolean> => {",
173+
" : writePtyInputProvablyLive(args)"
174+
]
175+
},
176+
{
177+
"path": "src/main/ipc/pty/register-handlers.ts",
178+
"feature": "terminal-dock",
179+
"kind": "registration",
180+
"lines": [" ipcMain.removeHandler('pty:writeInputAccepted')"]
181+
},
166182
{
167183
"path": "src/main/ipc/ssh.ts",
168184
"feature": "native-chat-relay",
@@ -2244,10 +2260,18 @@
22442260
"added": 1,
22452261
"removed": 1
22462262
},
2247-
"src/main/ipc/pty.ts": {
2248-
"added": 96,
2263+
"src/main/ipc/pty/ipc/write-input.ts": {
2264+
"added": 85,
22492265
"removed": 1
22502266
},
2267+
"src/main/ipc/pty/ipc/write.ts": {
2268+
"added": 13,
2269+
"removed": 0
2270+
},
2271+
"src/main/ipc/pty/register-handlers.ts": {
2272+
"added": 1,
2273+
"removed": 0
2274+
},
22512275
"src/main/ipc/ssh.ts": {
22522276
"added": 35,
22532277
"removed": 0
@@ -2813,7 +2837,7 @@
28132837
"removed": 1
28142838
},
28152839
"src/renderer/src/runtime/web-session-tabs-sync.ts": {
2816-
"added": 143,
2840+
"added": 144,
28172841
"removed": 28
28182842
},
28192843
"src/renderer/src/store/slices/tabs.ts": {

0 commit comments

Comments
 (0)