Skip to content

Commit 3a3caa7

Browse files
ilysenkoilysenko
authored
Fix upstream DMG drift (#1023)
watchdog-v2-action: commit-source
1 parent 4065439 commit 3a3caa7

9 files changed

Lines changed: 36 additions & 19 deletions

File tree

‎linux-features/frameless-titlebar/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ const patches = [
156156
phase: "webview-asset",
157157
order: 20_730,
158158
ciPolicy: "optional",
159-
pattern: /^(?:app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar|app-initial~app-main~onboarding-page)-[^.]+\.js$/,
159+
pattern: /^(?:app-initial~app-main~projects-index-page~remote-conversation-page|app-initial~app-main~pull-request-route~new-thread-panel-page~onboarding-page~settings-page~i2dgsl27)-[^.]+\.js$/,
160160
missingDescription: "main app chrome bundle",
161161
skipDescription: "frameless titlebar webview layout patch",
162162
apply: applyFramelessTitlebarWebviewPatch,

‎linux-features/frameless-titlebar/test.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,18 @@ test("frameless-titlebar stays disabled until listed in features.json", () => {
6666
(descriptor) => descriptor.id === "feature:frameless-titlebar:webview-window-controls-layout",
6767
);
6868
assert.match(
69-
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
69+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js",
7070
webviewPatch.pattern,
7171
);
7272
assert.match(
73+
"app-initial~app-main~pull-request-route~new-thread-panel-page~onboarding-page~settings-page~i2dgsl27-Cg6hAhRO.js",
74+
webviewPatch.pattern,
75+
);
76+
assert.doesNotMatch(
77+
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
78+
webviewPatch.pattern,
79+
);
80+
assert.doesNotMatch(
7381
"app-initial~app-main~onboarding-page-CIkoyvFz.js",
7482
webviewPatch.pattern,
7583
);

‎linux-features/open-target-discovery/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ module.exports = {
829829
phase: "webview-asset",
830830
order: 20520,
831831
ciPolicy: "optional",
832-
pattern: /^app-initial~app-main~new-thread-panel-page~onboarding-page~appgen-library-page~hotkey-windo~nrw3o0ql-[^.]+\.js$/,
832+
pattern: /^app-initial~artifact-tab-content\.electron~app-main~pull-request-route~pull-request-code-rev~jgoqfqy2-[^.]+\.js$/,
833833
missingDescription: "open target selection webview bundle",
834834
skipDescription: "native open-target selection patch",
835835
apply: applyNativeOpenTargetSelectionPatch,

‎linux-features/open-target-discovery/test.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ test("open-target discovery targets only the current native selector bundle", ()
14001400

14011401
assert.ok(descriptor);
14021402
assert.match(
1403-
"app-initial~app-main~new-thread-panel-page~onboarding-page~appgen-library-page~hotkey-windo~nrw3o0ql-CI1_Z0oj.js",
1403+
"app-initial~artifact-tab-content.electron~app-main~pull-request-route~pull-request-code-rev~jgoqfqy2-gdph-otp.js",
14041404
descriptor.pattern,
14051405
);
14061406
assert.doesNotMatch(
@@ -1415,6 +1415,10 @@ test("open-target discovery targets only the current native selector bundle", ()
14151415
"app-initial~app-main~new-thread-panel-page~appgen-library-page~hotkey-window-thread-page~ho~iufn7mg3-MXsOJYYa.js",
14161416
descriptor.pattern,
14171417
);
1418+
assert.doesNotMatch(
1419+
"app-initial~app-main~new-thread-panel-page~onboarding-page~appgen-library-page~hotkey-windo~nrw3o0ql-CI1_Z0oj.js",
1420+
descriptor.pattern,
1421+
);
14181422
assert.doesNotMatch("open-target-selection-legacy.js", descriptor.pattern);
14191423
assert.doesNotMatch(
14201424
"app-initial~app-main~pull-request-code-review~onboarding-page~hotkey-window-thread-page~cha~b76hmflu-y0KJWbm3.js",

‎linux-features/remote-control-ui/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ module.exports = {
6363
phase: "webview-asset",
6464
order: 20500,
6565
ciPolicy: "optional",
66-
pattern: /^app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-[^.]+\.js$/,
66+
pattern: /^(?:app-initial~app-main~projects-index-page~remote-conversation-page|app-initial~app-main~pull-request-route~new-thread-panel-page~onboarding-page~settings-page~i2dgsl27)-[^.]+\.js$/,
6767
missingDescription: "remote connection visibility bundle",
6868
skipDescription: "remote control UI remote connections visibility patch",
6969
apply: applyRemoteConnectionsVisibilityPatch,

‎linux-features/remote-control-ui/test.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,17 @@ test("remote-control UI descriptors match the current app chunks", () => {
173173

174174
assert.ok(
175175
remoteConnectionsPatch.pattern.test(
176-
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
176+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js",
177+
),
178+
);
179+
assert.ok(
180+
remoteConnectionsPatch.pattern.test(
181+
"app-initial~app-main~pull-request-route~new-thread-panel-page~onboarding-page~settings-page~i2dgsl27-Cg6hAhRO.js",
177182
),
178183
);
179184
assert.equal(
180185
remoteConnectionsPatch.pattern.test(
181-
"app-initial~app-main~hotkey-window-thread-page~keyboard-shortcuts-settings~thread-app-shell~cf704xib-BhQogfRL.js",
186+
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
182187
),
183188
false,
184189
);
@@ -217,7 +222,7 @@ test("remote-control UI feature patches matching webview assets and records patc
217222
fs.writeFileSync(
218223
path.join(
219224
assetsDir,
220-
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
225+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js",
221226
),
222227
"function Twt(){let e=(0,kwt.c)(3),{data:t}=Vr(y4,Br(B2)),n=BN(`4114442250`);if(t?.config[`features.remote_connections`]===!0)return!0;let r=t?.config.features;if(typeof r!=`object`||!r||Array.isArray(r))return n;let i;return e[0]!==r||e[1]!==n?(i=Object.getOwnPropertyDescriptor(r,`remote_connections`)?.value===!0||n,e[0]=r,e[1]=n,e[2]=i):i=e[2],i}function D8(e){return e(RN,`4114442250`)?`enabled`:`disabled`}",
223228
);
@@ -244,7 +249,7 @@ test("remote-control UI feature patches matching webview assets and records patc
244249
fs.readFileSync(
245250
path.join(
246251
assetsDir,
247-
"app-initial~app-main~hotkey-window-new-thread-page~hotkey-window-home-page~composer-utility-bar-D9zyQF1n.js",
252+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js",
248253
),
249254
"utf8",
250255
),

‎linux-features/ui-tweaks/patches/model-picker-model-list.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
const MODEL_PICKER_STATE_ASSET_PATTERN =
44
/^app-initial~app-main~new-thread-panel-page~appgen-library-page~hotkey-window-thread-page~ho~iufn7mg3-[^.]+\.js$/;
55
const MODEL_PICKER_ALLOWLIST_ASSET_PATTERN =
6-
/^app-initial~app-main~onboarding-page~projects-index-page~hotkey-window-thread-page~quick-ch~iiv1g666-[^.]+\.js$/;
6+
/^app-initial~app-main~projects-index-page~remote-conversation-page-[^.]+\.js$/;
77
const MODEL_PICKER_MENU_ASSET_PATTERN =
8-
/^app-initial~app-main~onboarding-page~projects-index-page~hotkey-window-thread-page~quick-ch~iiv1g666-[^.]+\.js$/;
8+
/^app-initial~app-main~new-thread-panel-page~onboarding-page~projects-index-page~appgen-libra~lpb6mnim-[^.]+\.js$/;
99
const SIMPLE_MENU_VIEW_PATTERN =
1010
/([A-Za-z_$][\w$]*)=([A-Za-z_$][\w$]*)\(`composer-model-picker-menu-view-v1`,`simple`\)/;
1111
const ADVANCED_MENU_VIEW_PATTERN =

‎linux-features/ui-tweaks/patches/sidebar-project-name.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const DEFAULT_PROJECT_NAME_STYLE = "font-weight: 700 !important; padding-top: 0.25rem;";
44
const PROJECTS_SIDEBAR_ASSET_PATTERN =
5-
/^app-initial~app-main~page-[^.]+\.js$/;
5+
/^app-initial~app-main~projects-index-page~remote-conversation-page-[^.]+\.js$/;
66
const PROJECT_NAME_SELECTOR = ".group\\/folder-row .text-fade-truncate.pr-1";
77
const STYLE_ID = "codex-linux-ui-tweaks-sidebar-project-name-style";
88
const RUNTIME_MARKER = "codexLinuxUiTweaksSidebarProjectNameStyleRuntime";

‎linux-features/ui-tweaks/test.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,9 @@ test("model picker descriptors target the current state and menu bundles", () =>
183183
const stateAsset =
184184
"app-initial~app-main~new-thread-panel-page~appgen-library-page~hotkey-window-thread-page~ho~iufn7mg3-DRU9Ekz0.js";
185185
const allowlistAsset =
186-
"app-initial~app-main~onboarding-page~projects-index-page~hotkey-window-thread-page~quick-ch~iiv1g666-BjNKtmac.js";
187-
const menuAsset = allowlistAsset;
186+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js";
187+
const menuAsset =
188+
"app-initial~app-main~new-thread-panel-page~onboarding-page~projects-index-page~appgen-libra~lpb6mnim-BiQtt1Kd.js";
188189

189190
assert.match(stateAsset, MODEL_PICKER_STATE_ASSET_PATTERN);
190191
assert.match(allowlistAsset, MODEL_PICKER_ALLOWLIST_ASSET_PATTERN);
@@ -195,8 +196,7 @@ test("model picker descriptors target the current state and menu bundles", () =>
195196
assert.doesNotMatch(allowlistAsset, MODEL_PICKER_STATE_ASSET_PATTERN);
196197
assert.doesNotMatch(menuAsset, MODEL_PICKER_STATE_ASSET_PATTERN);
197198

198-
// The previous DMG split these patches across different chunks.
199-
// Current-DMG-only targeting must not retain those chunks as fallbacks.
199+
// Current-DMG-only targeting must not retain previous chunks as fallbacks.
200200
assert.doesNotMatch(
201201
"app-initial~app-main~page-CMpPiY3-.js",
202202
MODEL_PICKER_STATE_ASSET_PATTERN,
@@ -206,7 +206,7 @@ test("model picker descriptors target the current state and menu bundles", () =>
206206
MODEL_PICKER_ALLOWLIST_ASSET_PATTERN,
207207
);
208208
assert.doesNotMatch(
209-
"app-initial~app-main~new-thread-panel-page~onboarding-page~projects-index-page~appgen-libra~lpb6mnim-Bawo32lF.js",
209+
"app-initial~app-main~onboarding-page~projects-index-page~hotkey-window-thread-page~quick-ch~iiv1g666-BjNKtmac.js",
210210
MODEL_PICKER_MENU_ASSET_PATTERN,
211211
);
212212
assert.doesNotMatch(
@@ -396,11 +396,11 @@ test("English reasoning effort labels can be disabled", () => {
396396

397397
test("sidebar project descriptor targets only the current project sidebar asset", () => {
398398
assert.match(
399-
"app-initial~app-main~page-kMhXWEru.js",
399+
"app-initial~app-main~projects-index-page~remote-conversation-page-ClV_ycdc.js",
400400
PROJECTS_SIDEBAR_ASSET_PATTERN,
401401
);
402402
assert.doesNotMatch(
403-
"app-initial~app-main~projects-index-page~remote-conversation-page-CFT2LLOB.js",
403+
"app-initial~app-main~page-kMhXWEru.js",
404404
PROJECTS_SIDEBAR_ASSET_PATTERN,
405405
);
406406
assert.doesNotMatch(

0 commit comments

Comments
 (0)