Repository navigation
Commit fbf45c8
committed
feat(jsonl): manual port of upstream PR #24 + openai#311 (ANSI strip + non-JSONL guard)
본 fork 는 upstream `openai#24` (strip ANSI escape sequences)
+ `openai#311` (drop non-JSONL stdout garbage) 를 `git cherry-pick` 직접 불가
(fork v2.0.0/v2.1.0 hardening 의 broker/locale/TextDecoder 영역과 같은 file
같은 영역 변경으로 dry-run 시 `codex-companion.mjs` + `lib/codex.mjs` 양쪽
CONFLICT 확정). 두 PR 의 intent 를 v2.1.0 base 위에 manual port.
영역 — upstream `openai/codex-plugin-cc` issue #23 (JSONL parse: bracketed
paste escape sequence in output) 해결. fork audit cycle (axis R5/R6 Tier 1
Group A) 의 highest priority cherry-pick 후보.
## 변경
- `plugins/codex/scripts/lib/jsonl.mjs` 신규 — `cleanProtocolLine(rawLine)`
helper. PR openai#311 의 design (CSI + OSC + JSON prefix guard) 위에 PR #24 의
ECMA-48 완전 regex (CSI / OSC / DCS / SOS / PM / APC / simple Fp-Fe-Fs /
lone ESC) 합성. 비-JSON line (예: zh-TW CP-950 mojibaked `taskkill SUCCESS`
메시지) silent drop — broker 연결 끊김 방지.
- `plugins/codex/scripts/lib/app-server.mjs` `handleLine` — raw `JSON.parse`
앞에 `cleanProtocolLine` gate 추가. null 시 silent skip, candidate 시
parse 시도.
- `plugins/codex/scripts/app-server-broker.mjs` JSONL pump — 동일 gate
적용. invalid JSON 은 기존 -32700 error response 유지.
- `tests/jsonl.test.mjs` 신규 — PR openai#311 의 test 17건 통합 (CSI bracketed-
paste / modifyOtherKeys / OSC title / shell integration / hyperlink /
DCS-SOS-PM-APC string / Fp-Fe-Fs simple / mixed / Windows CP-950
mojibake / non-JSON prefix / nF intermediate / empty payload).
## 영향
- **upstream issue #23 (MED) 자동 해결**: parser raw `JSON.parse(line)` 가
zsh bracketed paste / OSC noise 로 broker 연결 끊기던 시나리오 차단.
- **openai#171 wrong-citation 정정**: Round 4 가 "fork 이미 cover" 분류했으나
실제 ANSI strip 부재 확인 후 본 commit 으로 진짜 cover.
- **openai#310 partial cover 완성**: 기존 locale mitigation 외에 parser
강건성 보강.
## 검증
- `node --test tests/jsonl.test.mjs` — 17/17 pass
- fork 의 기존 streaming TextDecoder / CODEX_HOME isolation / locale
override / MAX_BUFFERED_NOTIFICATIONS 동작 모두 보존 (handleLine 의
signature 만 변경, return 동작 동일)
## audit trail
`docs/upstream-tracking/2026-05-18-upstream-backlog-audit.md`
(axis R5 cross-link confirm + R6 wrong-citation 정정 + Tier 1 Group A).1 parent 6f71507 commit fbf45c8
4 files changed
Lines changed: 224 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
245 | 246 | | |
246 | 247 | | |
247 | 248 | | |
248 | | - | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
249 | 255 | | |
250 | 256 | | |
251 | 257 | | |
252 | 258 | | |
253 | 259 | | |
254 | | - | |
| 260 | + | |
255 | 261 | | |
256 | 262 | | |
257 | 263 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| |||
353 | 354 | | |
354 | 355 | | |
355 | 356 | | |
356 | | - | |
357 | | - | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
358 | 365 | | |
359 | 366 | | |
360 | 367 | | |
361 | 368 | | |
362 | 369 | | |
363 | | - | |
| 370 | + | |
364 | 371 | | |
365 | | - | |
| 372 | + | |
366 | 373 | | |
367 | 374 | | |
368 | 375 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
0 commit comments