Skip to content

Commit 2ff0ab2

Browse files
committed
Merge latest upstream/main into fix/3745-remove-model-thinking-toasts
Regenerate the renderer architecture and Astryx surface inventories from the merged source tree.\n\nGenerated-by: OpenAI Codex
2 parents 794aadd + 622d6fe commit 2ff0ab2

89 files changed

Lines changed: 4681 additions & 571 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/desktop/renderer-architecture.json

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@
233233
"src/renderer/use-new-task-choice.ts",
234234
"src/renderer/use-onboarding-snapshot.ts",
235235
"src/renderer/use-project-context.ts",
236-
"src/renderer/use-session-collaboration-dialog.ts",
237236
"src/renderer/use-settings-modal.ts",
238237
"src/renderer/use-shell-appearance.ts",
239238
"src/renderer/use-shell-chat-model.ts",
@@ -953,6 +952,7 @@
953952
"./error-boundary": 1,
954953
"./features/goals": 1,
955954
"./features/module-hub": 1,
955+
"./features/session-collaboration": 1,
956956
"./features/session-navigation": 1,
957957
"./features/session-settings": 1,
958958
"./features/task-entry": 1,
@@ -988,7 +988,6 @@
988988
"./use-new-task-choice": 1,
989989
"./use-onboarding-snapshot": 1,
990990
"./use-project-context": 1,
991-
"./use-session-collaboration-dialog": 1,
992991
"./use-settings-modal": 1,
993992
"./use-shell-appearance": 1,
994993
"./use-shell-chat-model": 1,
@@ -1025,7 +1024,7 @@
10251024
"react": 1
10261025
},
10271026
"importSpecifiers": 186,
1028-
"nonTriviaTokens": 15804
1027+
"nonTriviaTokens": 15779
10291028
},
10301029
"src/renderer/use-app-shell-composer-quotes.ts": {
10311030
"importDeclarations": 3,
@@ -4893,19 +4892,6 @@
48934892
"react": 1
48944893
}
48954894
},
4896-
"src/renderer/use-session-collaboration-dialog.ts": {
4897-
"bridgePaths": {},
4898-
"environmentCapabilities": {},
4899-
"hookCalls": {
4900-
"useState": 1
4901-
},
4902-
"lifecycleMethods": {},
4903-
"unresolvedDependencies": 0,
4904-
"actionFactories": [],
4905-
"dependencyPaths": {
4906-
"react": 1
4907-
}
4908-
},
49094895
"src/renderer/use-settings-modal.ts": {
49104896
"bridgePaths": {},
49114897
"environmentCapabilities": {

apps/desktop/scripts/check-renderer-architecture.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2021,6 +2021,7 @@ function validateMainWindowEntryContract(desktopRoot, violations) {
20212021
}
20222022

20232023
const allowedNavigationFiles = new Set([
2024+
'src/main/browser-message-box.ts',
20242025
'src/main/browser/controller.ts',
20252026
'src/main/computer-use/cursor-overlay-window.ts',
20262027
'src/main/computer-use/pip-electron.ts',

0 commit comments

Comments
 (0)