@bevel-software/platform-core-frontend 0.14.0 → 0.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (360) hide show
  1. package/THIRD-PARTY-NOTICES.md +2 -2
  2. package/package.json +3 -3
  3. package/src/core/CoreAppShell.tsx +34 -26
  4. package/src/core/__tests__/AppChrome.test.tsx +0 -3
  5. package/src/core/__tests__/bootstrap.test.ts +33 -1
  6. package/src/core/__tests__/events.test.ts +43 -0
  7. package/src/core/bootstrap.ts +38 -1
  8. package/src/core/events.ts +85 -3
  9. package/src/core/registry.ts +1 -1
  10. package/src/lib/__tests__/api.test.ts +38 -0
  11. package/src/lib/__tests__/email.test.ts +44 -0
  12. package/src/lib/api.ts +19 -2
  13. package/src/lib/email.ts +37 -1
  14. package/src/lib/utils.ts +2 -0
  15. package/src/modules/access/__tests__/ManageAccessDialog.add-row-picking.test.tsx +141 -0
  16. package/src/modules/access/__tests__/ManageAccessDialog.chip-truncation.test.tsx +204 -0
  17. package/src/modules/access/__tests__/ManageAccessDialog.download-read.test.tsx +234 -0
  18. package/src/modules/access/__tests__/ManageAccessDialog.edited-row-visible.test.tsx +160 -0
  19. package/src/modules/access/__tests__/ManageAccessDialog.placement.test.tsx +2 -2
  20. package/src/modules/access/__tests__/ManageAccessDialog.proposal.test.tsx +166 -0
  21. package/src/modules/access/__tests__/ManageAccessDialog.restrict.test.tsx +510 -0
  22. package/src/modules/access/__tests__/ManageAccessDialog.row-menu-axes.test.tsx +299 -0
  23. package/src/modules/access/__tests__/ManageAccessDialog.row-menu-width.test.tsx +226 -0
  24. package/src/modules/access/__tests__/ManageAccessDialog.test.tsx +781 -76
  25. package/src/modules/access/__tests__/ManageAccessDialog.unknown-email.test.tsx +314 -0
  26. package/src/modules/access/__tests__/manage-access-affordance.test.ts +14 -0
  27. package/src/modules/access/__tests__/plugin-token.test.ts +21 -0
  28. package/src/modules/access/__tests__/tailwindDeclarations.ts +210 -0
  29. package/src/modules/access/api.ts +192 -10
  30. package/src/modules/access/components/ManageAccessDialog.tsx +1337 -570
  31. package/src/modules/access/manage-access-affordance.ts +17 -0
  32. package/src/modules/admin/__tests__/AddMemberInput.test.tsx +297 -0
  33. package/src/modules/admin/__tests__/AdminRolesPage.capabilities.test.tsx +2 -2
  34. package/src/modules/admin/__tests__/AdminRolesPage.fixed-admin.test.tsx +189 -0
  35. package/src/modules/admin/__tests__/AdminRolesPage.suggest.test.tsx +1 -1
  36. package/src/modules/admin/__tests__/ConnectionKeysPage.test.tsx +266 -0
  37. package/src/modules/admin/__tests__/DirectoryGroupsPage.suggest.test.tsx +182 -0
  38. package/src/modules/admin/__tests__/DirectoryGroupsPage.test.tsx +165 -14
  39. package/src/modules/admin/__tests__/UserAccountsPage.test.tsx +401 -4
  40. package/src/modules/admin/__tests__/group-members-path.test.ts +27 -0
  41. package/src/modules/admin/components/AddMemberInput.tsx +268 -0
  42. package/src/modules/admin/components/AdminRolesPage.tsx +97 -132
  43. package/src/modules/admin/components/ConnectionKeysPage.tsx +269 -0
  44. package/src/modules/admin/components/DirectoryGroupsPage.tsx +91 -39
  45. package/src/modules/admin/components/UserAccountsPage.tsx +271 -37
  46. package/src/modules/admin/components/connection-keys-grouping.ts +43 -0
  47. package/src/modules/admin/components/group-members-path.ts +32 -0
  48. package/src/modules/admin/services/connection-keys.api.ts +47 -0
  49. package/src/modules/admin/services/roles.api.ts +12 -1
  50. package/src/modules/auth/__tests__/AccountPage.test.tsx +50 -2
  51. package/src/modules/auth/components/AccountPage.tsx +73 -54
  52. package/src/modules/auth/components/LoginScreen.tsx +1 -0
  53. package/src/modules/auth/services/account.api.ts +78 -4
  54. package/src/modules/change-requests/__tests__/ChangeRequestDialog.access-rules.test.tsx +144 -0
  55. package/src/modules/change-requests/__tests__/ChangeRequestDialog.binary.test.tsx +422 -0
  56. package/src/modules/change-requests/__tests__/ChangeRequestDialog.brings-itself-up-to-date.test.tsx +431 -0
  57. package/src/modules/change-requests/__tests__/ChangeRequestDialog.fork-point.test.tsx +193 -0
  58. package/src/modules/change-requests/__tests__/ChangeRequestDialog.initial-file.test.tsx +142 -0
  59. package/src/modules/change-requests/__tests__/ChangeRequestDialog.moved.test.tsx +202 -0
  60. package/src/modules/change-requests/__tests__/ChangeRequestDialog.test.tsx +205 -13
  61. package/src/modules/change-requests/__tests__/ChangeRequestDialog.unreadable.test.tsx +271 -0
  62. package/src/modules/change-requests/__tests__/FileChangeBoxes.test.tsx +208 -0
  63. package/src/modules/change-requests/__tests__/apply-outcome-for-every-viewer.test.tsx +286 -0
  64. package/src/modules/change-requests/__tests__/propose.concurrent.test.ts +273 -0
  65. package/src/modules/change-requests/__tests__/readFailure.test.ts +122 -0
  66. package/src/modules/change-requests/__tests__/useCrFileDiffs.test.tsx +238 -0
  67. package/src/modules/change-requests/__tests__/useFileOnBranch.test.tsx +56 -1
  68. package/src/modules/change-requests/__tests__/useForkPointFile.test.tsx +79 -0
  69. package/src/modules/change-requests/components/BranchFilePreview.tsx +357 -0
  70. package/src/modules/change-requests/components/ChangeBox.tsx +31 -2
  71. package/src/modules/change-requests/components/ChangeRequestDialog.tsx +862 -72
  72. package/src/modules/change-requests/components/CrFileTree.tsx +74 -58
  73. package/src/modules/change-requests/components/FileChangeBoxes.tsx +19 -15
  74. package/src/modules/change-requests/hooks/useApplyChangeRequest.ts +41 -7
  75. package/src/modules/change-requests/hooks/useCrFileDiffs.ts +181 -23
  76. package/src/modules/change-requests/hooks/useFileOnBranch.ts +70 -7
  77. package/src/modules/change-requests/hooks/useForkPointFile.ts +77 -0
  78. package/src/modules/change-requests/services/change-requests.api.ts +57 -1
  79. package/src/modules/change-requests/services/denied-file.api.ts +53 -0
  80. package/src/modules/change-requests/services/propose.api.ts +97 -8
  81. package/src/modules/change-requests/utils/approval.ts +15 -0
  82. package/src/modules/change-requests/utils/author.ts +32 -0
  83. package/src/modules/change-requests/utils/readFailure.ts +110 -0
  84. package/src/modules/git/__tests__/FileHistoryPanel.test.tsx +20 -0
  85. package/src/modules/git/__tests__/GitSyncFailedBanner.test.tsx +65 -1
  86. package/src/modules/git/components/FileHistoryPanel.tsx +5 -0
  87. package/src/modules/git/components/GitSyncFailedBanner.tsx +68 -5
  88. package/src/modules/git/components/PullRequestsForMe.tsx +51 -24
  89. package/src/modules/git/services/__tests__/error-messages.test.ts +29 -0
  90. package/src/modules/git/services/error-messages.ts +12 -0
  91. package/src/modules/git/services/pr-prompts.ts +5 -5
  92. package/src/modules/layout/__tests__/HeaderAlignment.test.tsx +401 -0
  93. package/src/modules/layout/__tests__/SidebarFooterGrid.test.tsx +286 -0
  94. package/src/modules/layout/__tests__/SidebarFrameResponsive.test.tsx +61 -0
  95. package/src/modules/layout/components/AppLayout.tsx +2 -0
  96. package/src/modules/layout/components/MobileChatLayout.tsx +4 -1
  97. package/src/modules/layout/components/ResizableThreePaneLayout.tsx +4 -1
  98. package/src/modules/layout/components/SidebarFrame.tsx +109 -4
  99. package/src/modules/library/__tests__/AddToPluginDialog.test.tsx +171 -5
  100. package/src/modules/library/__tests__/DeleteToolDialog.test.tsx +356 -0
  101. package/src/modules/library/__tests__/IntegrationsSetupReminder.test.tsx +60 -0
  102. package/src/modules/library/__tests__/LibraryCard.test.tsx +91 -10
  103. package/src/modules/library/__tests__/LibraryRoutes.test.tsx +242 -107
  104. package/src/modules/library/__tests__/LibrarySidebarMenu.test.tsx +104 -99
  105. package/src/modules/library/__tests__/LinkSkillPanel.test.tsx +136 -0
  106. package/src/modules/library/__tests__/LockedPluginView.test.tsx +103 -7
  107. package/src/modules/library/__tests__/NewPluginDialog.test.tsx +18 -8
  108. package/src/modules/library/__tests__/PersonalAddDialog.test.tsx +79 -3
  109. package/src/modules/library/__tests__/PersonalPluginPage.test.tsx +201 -0
  110. package/src/modules/library/__tests__/PluginExtras.test.tsx +115 -9
  111. package/src/modules/library/__tests__/PluginJoinRequests.test.tsx +60 -1
  112. package/src/modules/library/__tests__/PluginPage.test.tsx +453 -7
  113. package/src/modules/library/__tests__/PluginsSidebar.contextmenu.test.tsx +17 -57
  114. package/src/modules/library/__tests__/PluginsSidebar.test.tsx +161 -97
  115. package/src/modules/library/__tests__/PluginsSidebarMenu.test.tsx +16 -0
  116. package/src/modules/library/__tests__/SharedViaPlugins.test.tsx +106 -0
  117. package/src/modules/library/__tests__/SkillPage.test.tsx +391 -78
  118. package/src/modules/library/__tests__/SkillsTree.test.tsx +461 -0
  119. package/src/modules/library/__tests__/ToolConnectionSection.test.tsx +582 -71
  120. package/src/modules/library/__tests__/ToolPage.test.tsx +94 -4
  121. package/src/modules/library/__tests__/WorkspaceItemRoute.test.tsx +279 -21
  122. package/src/modules/library/__tests__/auth-harness.tsx +9 -9
  123. package/src/modules/library/__tests__/card-row-menu.test.tsx +320 -0
  124. package/src/modules/library/__tests__/library-data.mapping.test.tsx +98 -0
  125. package/src/modules/library/__tests__/library-data.stale.test.tsx +183 -0
  126. package/src/modules/library/__tests__/library-data.test.ts +7 -0
  127. package/src/modules/library/__tests__/library-paths.test.ts +75 -0
  128. package/src/modules/library/__tests__/link-membership.test.ts +129 -0
  129. package/src/modules/library/__tests__/name-with-badges.test.tsx +273 -0
  130. package/src/modules/library/__tests__/newSkillMarkdown.test.ts +30 -0
  131. package/src/modules/library/__tests__/owner-pill.test.tsx +357 -0
  132. package/src/modules/library/__tests__/pending-tools.test.tsx +400 -0
  133. package/src/modules/library/__tests__/plugin-entries.test.ts +122 -0
  134. package/src/modules/library/__tests__/plugin-summary.test.ts +67 -0
  135. package/src/modules/library/__tests__/status.test.ts +82 -2
  136. package/src/modules/library/__tests__/tools.api.test.ts +44 -1
  137. package/src/modules/library/__tests__/useJoinRequests.test.tsx +46 -0
  138. package/src/modules/library/components/AccessRequestsBanner.tsx +85 -47
  139. package/src/modules/library/components/AddDialogTabs.tsx +103 -0
  140. package/src/modules/library/components/AddToPluginDialog.tsx +107 -18
  141. package/src/modules/library/components/IntegrationsSetupReminder.tsx +59 -0
  142. package/src/modules/library/components/ItemActionsMenu.tsx +288 -0
  143. package/src/modules/library/components/LibraryCard.tsx +149 -34
  144. package/src/modules/library/components/LibraryLayout.tsx +120 -247
  145. package/src/modules/library/components/LibraryPage.tsx +172 -39
  146. package/src/modules/library/components/LinkSkillPanel.tsx +169 -0
  147. package/src/modules/library/components/LockedPluginView.tsx +63 -35
  148. package/src/modules/library/components/NameWithBadges.tsx +164 -0
  149. package/src/modules/library/components/NewPluginDialog.tsx +19 -5
  150. package/src/modules/library/components/PageActions.tsx +31 -9
  151. package/src/modules/library/components/{PendingSkillReview.tsx → PendingItemReview.tsx} +14 -7
  152. package/src/modules/library/components/PersonalAddDialog.tsx +68 -18
  153. package/src/modules/library/components/PersonalPluginPage.tsx +123 -23
  154. package/src/modules/library/components/PluginExtras.tsx +143 -18
  155. package/src/modules/library/components/PluginIndexRow.tsx +47 -12
  156. package/src/modules/library/components/PluginPage.tsx +234 -38
  157. package/src/modules/library/components/PluginRows.tsx +286 -0
  158. package/src/modules/library/components/PluginsSidebar.tsx +271 -238
  159. package/src/modules/library/components/PluginsSidebarMenu.tsx +26 -1
  160. package/src/modules/library/components/RenamePluginDialog.tsx +136 -0
  161. package/src/modules/library/components/ShareButton.tsx +17 -0
  162. package/src/modules/library/components/SkillsTree.tsx +204 -0
  163. package/src/modules/library/components/StatusDot.tsx +1 -0
  164. package/src/modules/library/components/TeamRoute.tsx +15 -0
  165. package/src/modules/library/components/__tests__/upload-notices-once-per-page.test.tsx +144 -0
  166. package/src/modules/library/components/plugin-page-parts.tsx +132 -23
  167. package/src/modules/library/components/skill-page/SharedViaPlugins.tsx +212 -0
  168. package/src/modules/library/components/skill-page/SkillFilePane.tsx +5 -0
  169. package/src/modules/library/components/skill-page/SkillPage.tsx +337 -121
  170. package/src/modules/library/components/tool-page/DeleteToolDialog.tsx +218 -0
  171. package/src/modules/library/components/tool-page/ToolConnectionSection.tsx +79 -178
  172. package/src/modules/library/components/tool-page/ToolPage.tsx +116 -17
  173. package/src/modules/library/components/tool-page/ToolVarRow.tsx +42 -41
  174. package/src/modules/library/hooks/__tests__/useLibraryData.test.ts +98 -0
  175. package/src/modules/library/hooks/useJoinRequests.ts +48 -18
  176. package/src/modules/library/hooks/useLibraryData.ts +92 -19
  177. package/src/modules/library/routes/LibraryRoutes.tsx +14 -11
  178. package/src/modules/library/routes/WorkspaceItemRoute.tsx +229 -82
  179. package/src/modules/library/routes/library-paths.ts +46 -35
  180. package/src/modules/library/services/library.api.ts +89 -17
  181. package/src/modules/library/services/plugins.api.ts +161 -9
  182. package/src/modules/library/services/teams.api.ts +15 -0
  183. package/src/modules/library/services/tools.api.ts +78 -0
  184. package/src/modules/library/state/library-data.tsx +268 -37
  185. package/src/modules/library/utils/personal-plugin.ts +13 -15
  186. package/src/modules/library/utils/plugin-entries.ts +134 -0
  187. package/src/modules/library/utils/plugin-summary.ts +102 -0
  188. package/src/modules/library/utils/status.ts +204 -35
  189. package/src/modules/onboarding/__tests__/creator-welcome.test.tsx +11 -3
  190. package/src/modules/onboarding/__tests__/onboarding.test.tsx +853 -760
  191. package/src/modules/onboarding/agent-clients.ts +55 -23
  192. package/src/modules/onboarding/components/ConnectAgentPill.tsx +5 -1
  193. package/src/modules/onboarding/components/WelcomePage.tsx +98 -62
  194. package/src/modules/pr/services/pr-merge.api.ts +2 -1
  195. package/src/modules/review/components/MarkdownDiffViewer.tsx +53 -8
  196. package/src/modules/review/components/ReviewPanel.tsx +15 -17
  197. package/src/modules/review/components/__tests__/MarkdownDiffViewer.test.tsx +64 -0
  198. package/src/modules/review/components/__tests__/ReviewPanel.test.tsx +25 -1
  199. package/src/modules/secrets-vault/components/ConnectToolsPage.tsx +454 -117
  200. package/src/modules/secrets-vault/components/SecretsPage.tsx +48 -7
  201. package/src/modules/secrets-vault/components/ToolSecretsPanel.tsx +84 -5
  202. package/src/modules/secrets-vault/components/__tests__/ConnectToolsPage.test.tsx +425 -0
  203. package/src/modules/secrets-vault/components/__tests__/SecretsPage.test.tsx +417 -82
  204. package/src/modules/secrets-vault/components/__tests__/ToolSecretsPanel.test.tsx +105 -0
  205. package/src/modules/secrets-vault/components/__tests__/connect-lists-what-the-banner-counted.test.tsx +407 -0
  206. package/src/modules/secrets-vault/probe/SavedKeyProbeResult.tsx +98 -0
  207. package/src/modules/secrets-vault/probe/__tests__/probe-verdict.test.ts +160 -0
  208. package/src/modules/secrets-vault/probe/probe-verdict.ts +108 -0
  209. package/src/modules/secrets-vault/probe/useSavedKeyProbe.ts +228 -0
  210. package/src/modules/secrets-vault/services/connect.api.ts +36 -5
  211. package/src/modules/secrets-vault/utils/connect-status.ts +98 -0
  212. package/src/modules/settings/components/ClaudeConnectionCard.tsx +154 -0
  213. package/src/modules/settings/components/ClaudeConnectionFields.tsx +23 -0
  214. package/src/modules/settings/components/DeploymentPage.tsx +16 -22
  215. package/src/modules/settings/components/MarketplaceSection.tsx +152 -0
  216. package/src/modules/settings/components/__tests__/ClaudeConnectionCard.test.tsx +63 -0
  217. package/src/modules/settings/components/__tests__/DeploymentPage.test.tsx +74 -1
  218. package/src/modules/settings/components/__tests__/MarketplaceSection.test.tsx +325 -0
  219. package/src/modules/settings/components/__tests__/SettingsLayout.test.tsx +5 -5
  220. package/src/modules/settings/services/github-facade.api.ts +66 -0
  221. package/src/modules/settings/settings-nav-items.tsx +10 -2
  222. package/src/modules/setup/__tests__/setup.oidc.test.tsx +172 -0
  223. package/src/modules/setup/__tests__/setup.probe-refusal.test.tsx +123 -0
  224. package/src/modules/setup/__tests__/setup.test.tsx +615 -4
  225. package/src/modules/setup/__tests__/useSetupStatus.test.tsx +130 -0
  226. package/src/modules/setup/components/SetupGate.tsx +16 -16
  227. package/src/modules/setup/components/SetupScreen.tsx +711 -40
  228. package/src/modules/setup/hooks/useSetupStatus.ts +93 -0
  229. package/src/modules/setup/services/setup.api.ts +218 -3
  230. package/src/modules/setup/utils/__tests__/root-folders.test.ts +72 -0
  231. package/src/modules/setup/utils/root-folders.ts +46 -0
  232. package/src/modules/toolbar/assets/claude-setup/01-add-manually.webp +0 -0
  233. package/src/modules/toolbar/assets/claude-setup/02-add-configuration.webp +0 -0
  234. package/src/modules/toolbar/assets/claude-setup/03-connect-account.webp +0 -0
  235. package/src/modules/toolbar/assets/claude-setup/04-pick-instance.webp +0 -0
  236. package/src/modules/toolbar/assets/claude-setup/05-plugins-add.webp +0 -0
  237. package/src/modules/toolbar/assets/claude-setup/06-add-marketplace.webp +0 -0
  238. package/src/modules/toolbar/assets/claude-setup/07-paste-url-sync.webp +0 -0
  239. package/src/modules/toolbar/assets/claude-setup/08-install-plugins.webp +0 -0
  240. package/src/modules/toolbar/assets/claude-setup/09-select-repository.webp +0 -0
  241. package/src/modules/toolbar/assets/claude-setup/10-connector-not-added.webp +0 -0
  242. package/src/modules/toolbar/assets/claude-setup/11-add-custom-connector.webp +0 -0
  243. package/src/modules/toolbar/assets/claude-setup/README.md +68 -0
  244. package/src/modules/toolbar/components/AgentInstructionsCard.tsx +296 -0
  245. package/src/modules/toolbar/components/ClaudeMarketplaceCarousel.tsx +107 -0
  246. package/src/modules/toolbar/components/ClaudeRegistrationSteps.tsx +127 -0
  247. package/src/modules/toolbar/components/CoworkSetupSteps.tsx +100 -0
  248. package/src/modules/toolbar/components/ExternalAgentAccessPage.tsx +395 -124
  249. package/src/modules/toolbar/components/ScreenshotStep.tsx +77 -0
  250. package/src/modules/toolbar/components/SetupCarousel.tsx +177 -0
  251. package/src/modules/toolbar/components/__tests__/AgentInstructionsCard.test.tsx +370 -0
  252. package/src/modules/toolbar/components/__tests__/ExternalAgentAccessPage.test.tsx +659 -36
  253. package/src/modules/toolbar/components/__tests__/Toolbar.test.tsx +2 -2
  254. package/src/modules/toolbar/components/__tests__/claude-setup-shots.test.ts +104 -0
  255. package/src/modules/toolbar/components/claude-connector-slide.tsx +38 -0
  256. package/src/modules/toolbar/components/claude-setup-shots.ts +167 -0
  257. package/src/modules/toolbar/components/deployment-address.ts +29 -0
  258. package/src/modules/toolbar/components/setup-step-parts.tsx +35 -0
  259. package/src/modules/toolbar/services/__tests__/agent-instructions.api.test.ts +89 -0
  260. package/src/modules/toolbar/services/agent-instructions.api.ts +167 -0
  261. package/src/modules/toolbar/services/external-api-keys.api.ts +8 -0
  262. package/src/modules/workflow/state/ChangeRequestStaleBinder.tsx +43 -0
  263. package/src/modules/workflow/state/EventBusProvider.tsx +122 -11
  264. package/src/modules/workflow/state/__tests__/EventBusProvider.storage.test.tsx +87 -0
  265. package/src/modules/workflow/state/__tests__/EventBusProvider.watch.test.tsx +223 -0
  266. package/src/modules/workflow/state/event-bus.context.ts +10 -0
  267. package/src/modules/workspace/__tests__/testFixtures.ts +6 -3
  268. package/src/modules/workspace/components/FileExplorer.tsx +1527 -367
  269. package/src/modules/workspace/components/FileRoute.tsx +376 -22
  270. package/src/modules/workspace/components/FileViewer.tsx +166 -45
  271. package/src/modules/workspace/components/KbDocumentShell.tsx +50 -6
  272. package/src/modules/workspace/components/KbPageHeader.tsx +120 -55
  273. package/src/modules/workspace/components/TreeActionConfirm.tsx +350 -0
  274. package/src/modules/workspace/components/__tests__/FileExplorer.test.tsx +2473 -129
  275. package/src/modules/workspace/components/__tests__/FileRoute.test.tsx +768 -16
  276. package/src/modules/workspace/components/__tests__/FileViewer.test.tsx +332 -12
  277. package/src/modules/workspace/components/__tests__/KbDocumentShell.test.tsx +39 -0
  278. package/src/modules/workspace/components/__tests__/KbPageHeader.test.tsx +33 -20
  279. package/src/modules/workspace/components/renderers/DocxRenderer.tsx +4 -5
  280. package/src/modules/workspace/components/renderers/DownloadFileButton.tsx +13 -4
  281. package/src/modules/workspace/components/renderers/EmailRenderer.tsx +4 -3
  282. package/src/modules/workspace/components/renderers/HtmlRenderer.tsx +8 -14
  283. package/src/modules/workspace/components/renderers/ImageRenderer.tsx +75 -16
  284. package/src/modules/workspace/components/renderers/KbImage.tsx +180 -0
  285. package/src/modules/workspace/components/renderers/KbMarkdownView.tsx +22 -6
  286. package/src/modules/workspace/components/renderers/MarkdownRenderer.tsx +48 -22
  287. package/src/modules/workspace/components/renderers/PdfRenderer.tsx +4 -5
  288. package/src/modules/workspace/components/renderers/PptxRenderer.tsx +4 -3
  289. package/src/modules/workspace/components/renderers/XlsxRenderer.tsx +4 -3
  290. package/src/modules/workspace/components/renderers/__tests__/DocxRenderer.test.tsx +12 -0
  291. package/src/modules/workspace/components/renderers/__tests__/DownloadFileButton.test.tsx +57 -9
  292. package/src/modules/workspace/components/renderers/__tests__/EmailRenderer.test.tsx +13 -1
  293. package/src/modules/workspace/components/renderers/__tests__/ImageRenderer.test.tsx +163 -0
  294. package/src/modules/workspace/components/renderers/__tests__/KbMarkdownView.test.tsx +237 -0
  295. package/src/modules/workspace/components/renderers/__tests__/MarkdownRenderer.test.tsx +108 -14
  296. package/src/modules/workspace/components/renderers/__tests__/PptxRenderer.test.tsx +14 -1
  297. package/src/modules/workspace/components/renderers/__tests__/XlsxRenderer.test.tsx +16 -1
  298. package/src/modules/workspace/components/renderers/__tests__/rendererSelection.test.tsx +66 -1
  299. package/src/modules/workspace/components/renderers/index.ts +53 -2
  300. package/src/modules/workspace/components/renderers/kbMarkdownPipeline.tsx +25 -4
  301. package/src/modules/workspace/components/renderers/rendererWorkspace.ts +40 -0
  302. package/src/modules/workspace/hooks/__tests__/useImageRevision.test.tsx +174 -0
  303. package/src/modules/workspace/hooks/__tests__/useOpenChangeRequests.test.tsx +179 -1
  304. package/src/modules/workspace/hooks/__tests__/useWorkspaceImageResolver.test.tsx +122 -0
  305. package/src/modules/workspace/hooks/__tests__/useWorkspaceState.test.tsx +892 -7
  306. package/src/modules/workspace/hooks/useImageRevision.ts +101 -0
  307. package/src/modules/workspace/hooks/useMergedWorkspaceTree.ts +89 -0
  308. package/src/modules/workspace/hooks/useWorkspaceImageResolver.ts +55 -0
  309. package/src/modules/workspace/hooks/useWorkspaceState.ts +438 -66
  310. package/src/modules/workspace/routing/__tests__/kb-routes.test.tsx +279 -3
  311. package/src/modules/workspace/routing/kb-routes.ts +207 -30
  312. package/src/modules/workspace/services/__tests__/workspace.api.test.ts +57 -1
  313. package/src/modules/workspace/services/workspace.api.ts +57 -4
  314. package/src/modules/workspace/state/__tests__/applied-request-clears-pending.test.tsx +343 -0
  315. package/src/modules/workspace/state/__tests__/upload-lands-where-it-was-dropped.test.tsx +158 -0
  316. package/src/modules/workspace/state/open-change-requests.tsx +100 -12
  317. package/src/modules/workspace/state/workspace.context.ts +130 -16
  318. package/src/modules/workspace/utils/__tests__/file-trace.test.ts +73 -0
  319. package/src/modules/workspace/utils/__tests__/fileTree.test.ts +234 -5
  320. package/src/modules/workspace/utils/__tests__/pasteLink.test.ts +76 -0
  321. package/src/modules/workspace/utils/__tests__/treeConfirm.test.ts +364 -0
  322. package/src/modules/workspace/utils/__tests__/uploadError.test.ts +35 -0
  323. package/src/modules/workspace/utils/file-trace.ts +50 -0
  324. package/src/modules/workspace/utils/fileTree.ts +126 -52
  325. package/src/modules/workspace/utils/frontmatter.ts +8 -4
  326. package/src/modules/workspace/utils/pasteLink.ts +90 -0
  327. package/src/modules/workspace/utils/treeConfirm.ts +338 -0
  328. package/src/modules/workspace/utils/uploadError.ts +29 -0
  329. package/src/shared/__tests__/marketplace-url.test.ts +59 -0
  330. package/src/shared/components/Badge.tsx +3 -1
  331. package/src/shared/components/Banner.tsx +5 -1
  332. package/src/shared/components/Button.tsx +16 -2
  333. package/src/shared/components/Dialog.tsx +27 -11
  334. package/src/shared/components/Menu.tsx +13 -1
  335. package/src/shared/components/PageShell.tsx +13 -8
  336. package/src/shared/components/__tests__/primitives.test.tsx +116 -2
  337. package/src/shared/components/__tests__/useFocusHandoff.test.tsx +192 -0
  338. package/src/shared/components/index.ts +2 -0
  339. package/src/shared/components/useDismissableMenu.ts +32 -10
  340. package/src/shared/components/useFocusHandoff.ts +51 -0
  341. package/src/shared/components/useLatestRef.ts +28 -0
  342. package/src/shared/markdown/Markdown.tsx +12 -3
  343. package/src/shared/markdown/__tests__/escapeSpacesInLinkDestinations.test.ts +39 -0
  344. package/src/shared/markdown/hrefs.ts +50 -0
  345. package/src/shared/marketplace-url.ts +118 -0
  346. package/src/shared/mcp/ChatGptInstallLink.tsx +3 -3
  347. package/src/shared/mcp/ConnectionInstructions.tsx +38 -27
  348. package/src/shared/mcp/__tests__/connect-snippets.test.ts +3 -3
  349. package/src/shared/mcp/connect-snippets.ts +14 -9
  350. package/src/shared/mcp/index.ts +1 -1
  351. package/src/shared/theme/__tests__/header-band.test.ts +197 -0
  352. package/src/shared/theme/header.ts +75 -0
  353. package/src/shared/theme/measure.ts +7 -4
  354. package/src/shared/theme/tokens.css +34 -0
  355. package/src/modules/library/__tests__/PluginsIndexPage.test.tsx +0 -363
  356. package/src/modules/library/__tests__/PluginsSidebar.locked.test.tsx +0 -97
  357. package/src/modules/library/components/PluginsIndexPage.tsx +0 -265
  358. package/src/modules/update-check/__tests__/UpdateBanner.test.tsx +0 -126
  359. package/src/modules/update-check/components/UpdateBanner.tsx +0 -92
  360. package/src/modules/update-check/services/update-check.api.ts +0 -24
@@ -1,4 +1,4 @@
1
- import { describe, it, expect } from 'vitest';
1
+ import { describe, it, expect, vi } from 'vitest';
2
2
  import { act, render, screen } from '@testing-library/react';
3
3
  import { GitSyncFailedBanner } from '../components/GitSyncFailedBanner';
4
4
  import {
@@ -11,6 +11,15 @@ import {
11
11
  } from '../../workspace/state/workspace.context';
12
12
  import { makeWorkspaceFixture } from '../../workspace/__tests__/testFixtures';
13
13
 
14
+ // The conflict rendering opens files through the file-navigation hook, which
15
+ // needs a router and the git context. Neither belongs in this suite: the
16
+ // banner's contract is what it says and which paths it offers, so the hook
17
+ // is replaced with a recorder.
18
+ const { openWorkspacePath } = vi.hoisted(() => ({ openWorkspacePath: vi.fn() }));
19
+ vi.mock('../../workspace/routing/kb-routes', () => ({
20
+ useFileNav: () => ({ openFile: vi.fn(), openWorkspacePath }),
21
+ }));
22
+
14
23
  /**
15
24
  * A minimal stand-in for the SSE bus: keeps the handlers the component
16
25
  * registers and lets a test push events through them, so these assertions
@@ -179,3 +188,58 @@ describe('GitSyncFailedBanner', () => {
179
188
  expect(screen.getAllByRole('alert')).toHaveLength(1);
180
189
  });
181
190
  });
191
+
192
+ describe('GitSyncFailedBanner — remote-sync conflict', () => {
193
+ const CONFLICT = {
194
+ kind: 'git-sync-failed',
195
+ workspaceId: 'ws-1',
196
+ branch: 'feat/x',
197
+ reason:
198
+ 'feat/x could not be synced: Plugins/x/SKILL.md was changed in Hexis and on the git host. Resolve the conflict on feat/x in Hexis, then sync again.',
199
+ conflictedPaths: ['Plugins/x/SKILL.md', 'Docs/a.md'],
200
+ };
201
+
202
+ it('tells the author to reconcile the files, and lists each one', () => {
203
+ const bus = renderBanner();
204
+ bus.emit(CONFLICT);
205
+ const alert = screen.getByRole('alert');
206
+ // This one IS the author's to act on — no "check the server logs".
207
+ expect(alert.textContent).toContain('changed both here and there');
208
+ expect(alert.textContent).not.toContain('server logs');
209
+ expect(screen.getByRole('button', { name: 'Plugins/x/SKILL.md' })).toBeTruthy();
210
+ expect(screen.getByRole('button', { name: 'Docs/a.md' })).toBeTruthy();
211
+ });
212
+
213
+ it('a file link opens that file in this workspace', () => {
214
+ const bus = renderBanner();
215
+ bus.emit(CONFLICT);
216
+ openWorkspacePath.mockClear();
217
+ act(() => {
218
+ screen.getByRole('button', { name: 'Docs/a.md' }).click();
219
+ });
220
+ expect(openWorkspacePath).toHaveBeenCalledWith('knowledge-base/Docs/a.md');
221
+ });
222
+
223
+ it('clears like any other failure once the branch syncs', () => {
224
+ const bus = renderBanner();
225
+ bus.emit(CONFLICT);
226
+ bus.emit({ kind: 'git-sync-recovered', workspaceId: 'ws-1', branch: 'feat/x' });
227
+ expect(screen.queryByRole('alert')).toBeNull();
228
+ });
229
+ });
230
+
231
+ describe('GitSyncFailedBanner — a conflict that arrives before the workspace has bootstrapped', () => {
232
+ it('lists the files as text, never as links to null/<path>', () => {
233
+ const bus = renderBanner({ kbDirName: null });
234
+ const early = {
235
+ kind: 'git-sync-failed',
236
+ workspaceId: 'ws-1',
237
+ branch: 'feat/x',
238
+ reason: 'conflict',
239
+ conflictedPaths: ['Docs/a.md'],
240
+ };
241
+ bus.emit(early);
242
+ expect(screen.getByText('Docs/a.md')).toBeTruthy();
243
+ expect(screen.queryByRole('button', { name: 'Docs/a.md' })).toBeNull();
244
+ });
245
+ });
@@ -265,6 +265,11 @@ export function FileHistoryPanel({ filePath }: Props) {
265
265
  // relative link in it has no meaningful "current" document
266
266
  // to resolve against — the target may have moved or stopped
267
267
  // existing since. Links render inert.
268
+ //
269
+ // No image resolver either: the checked-out tree holds
270
+ // today's copy of a picture, not the one this commit had,
271
+ // so the viewer names each workspace image instead of
272
+ // fetching bytes that may not match (`?ref=` in TODOS.md).
268
273
  <MarkdownDiffViewer payload={mdPayload} />
269
274
  )
270
275
  )}
@@ -1,8 +1,43 @@
1
1
  import { useCallback, useState } from 'react';
2
- import { CloudOff } from 'lucide-react';
2
+ import { CloudOff, GitMerge } from 'lucide-react';
3
3
  import { useEventBusSubscription } from '../../workflow/hooks/useEventBusSubscription';
4
4
  import { canonicalizeWorkspaceId } from '../../workflow/state/event-bus.context';
5
5
  import { useWorkspace } from '../../workspace/state/workspace.context';
6
+ import { useFileNav } from '../../workspace/routing/kb-routes';
7
+
8
+ /**
9
+ * The files a remote sync could not reconcile, each a link that opens it.
10
+ * Its own component so the navigation hook is only mounted for the conflict
11
+ * case — the push-failure banner has nothing to open.
12
+ *
13
+ * The paths arrive repo-relative; opening one needs the workspace's KB folder
14
+ * name, which the context holds as null until the workspace has bootstrapped.
15
+ * A conflict event can arrive before that fetch answers, so until the name is
16
+ * known the files are listed as text — never as links to `null/<path>`.
17
+ */
18
+ function ConflictFiles({ paths }: { paths: string[] }) {
19
+ const { kbDirName } = useWorkspace();
20
+ const { openWorkspacePath } = useFileNav();
21
+ return (
22
+ <ul className="mt-1 ml-5 flex flex-wrap gap-x-3 gap-y-0.5">
23
+ {paths.map((p) => (
24
+ <li key={p}>
25
+ {kbDirName ? (
26
+ <button
27
+ type="button"
28
+ className="font-mono underline underline-offset-2 hover:text-ink"
29
+ onClick={() => openWorkspacePath(`${kbDirName}/${p}`)}
30
+ >
31
+ {p}
32
+ </button>
33
+ ) : (
34
+ <span className="font-mono">{p}</span>
35
+ )}
36
+ </li>
37
+ ))}
38
+ </ul>
39
+ );
40
+ }
6
41
 
7
42
  /**
8
43
  * Shown when a commit landed locally but could not be pushed to the remote.
@@ -48,9 +83,9 @@ export function GitSyncFailedBanner() {
48
83
  // settles it (failures re-emit on every attempt, recoveries on the next
49
84
  // transition). The alternative — clearing on switch — hides real, still-
50
85
  // broken state, which is the exact failure mode this PR exists to fix.
51
- const [failures, setFailures] = useState<ReadonlyMap<string, { branch: string; reason: string }>>(
52
- new Map(),
53
- );
86
+ const [failures, setFailures] = useState<
87
+ ReadonlyMap<string, { branch: string; reason: string; conflictedPaths?: string[] }>
88
+ >(new Map());
54
89
 
55
90
  useEventBusSubscription(
56
91
  'git-sync-failed',
@@ -61,7 +96,11 @@ export function GitSyncFailedBanner() {
61
96
  // failure from being recorded under this one's key.
62
97
  if (!canonId || canonicalizeWorkspaceId(e.workspaceId) !== canonId) return;
63
98
  setFailures((prev) =>
64
- new Map(prev).set(canonId, { branch: e.branch, reason: e.reason }),
99
+ new Map(prev).set(canonId, {
100
+ branch: e.branch,
101
+ reason: e.reason,
102
+ conflictedPaths: e.conflictedPaths,
103
+ }),
65
104
  );
66
105
  },
67
106
  [canonId],
@@ -87,6 +126,30 @@ export function GitSyncFailedBanner() {
87
126
  const failure = canonId ? failures.get(canonId) : undefined;
88
127
  if (!failure) return null;
89
128
 
129
+ // A remote-sync CONFLICT is the one failure an author can act on, not only
130
+ // an operator: the same file changed here and on the git host. Automatic
131
+ // recovery is already running; if it does not clear, the person decides.
132
+ // Different copy, and the files themselves, each a link.
133
+ if (failure.conflictedPaths && failure.conflictedPaths.length > 0) {
134
+ return (
135
+ <div
136
+ role="alert"
137
+ className="px-3 py-1.5 bg-sunken border-b border-line text-xs text-ink shrink-0"
138
+ >
139
+ <div className="flex items-center gap-2">
140
+ <GitMerge size={13} className="shrink-0" />
141
+ <span className="flex-1">
142
+ <span className="font-mono font-semibold">{failure.branch}</span> isn’t in sync with
143
+ the git repository yet: these files were changed both here and there. Hexis is trying
144
+ to reconcile them. If this notice stays, open each one, keep the content you want, and
145
+ save.
146
+ </span>
147
+ </div>
148
+ <ConflictFiles paths={failure.conflictedPaths} />
149
+ </div>
150
+ );
151
+ }
152
+
90
153
  return (
91
154
  <div
92
155
  role="alert"
@@ -3,13 +3,14 @@ import { ChevronRight, Check, X, Clock } from 'lucide-react';
3
3
  import type { PullRequestSummary } from '@bevel-software/platform-shared';
4
4
  import { cn } from '../../../lib/utils';
5
5
  import { Badge } from '../../../shared/components';
6
+ import { SIDEBAR_CHILD_INDENT, SIDEBAR_ROW_INSET } from '../../layout/components/SidebarFrame';
6
7
  import { listPullRequestsForMe } from '../services/pr.api';
7
8
  import { friendlyGitError } from '../services/error-messages';
8
9
  import { useGit } from '../state/git.context';
9
10
  import { ChangeRequestDialog } from '../../change-requests/components/ChangeRequestDialog';
10
- import { PR_STALE_EVENT } from '../../../core/events';
11
+ import { PR_STALE_EVENT, PR_STALE_FALLBACK_MS, subscribePrStale } from '../../../core/events';
11
12
 
12
- const POLL_INTERVAL_MS = 60_000;
13
+ const POLL_INTERVAL_MS = PR_STALE_FALLBACK_MS;
13
14
 
14
15
  export function PullRequestsForMe() {
15
16
  const git = useGit();
@@ -133,12 +134,12 @@ export function PullRequestsForMe() {
133
134
  console.error('[PullRequestsForMe] initial load failed', e);
134
135
  });
135
136
  document.addEventListener('visibilitychange', handleVisibility);
136
- window.addEventListener(PR_STALE_EVENT, handlePrStale);
137
+ const offStale = subscribePrStale(handlePrStale);
137
138
 
138
139
  return () => {
139
140
  cancelled = true;
140
141
  document.removeEventListener('visibilitychange', handleVisibility);
141
- window.removeEventListener(PR_STALE_EVENT, handlePrStale);
142
+ offStale();
142
143
  if (timerRef.current) clearTimeout(timerRef.current);
143
144
  };
144
145
  }, [available, deleteBranch, refreshBranches]);
@@ -156,7 +157,14 @@ export function PullRequestsForMe() {
156
157
  // one hairline, a disclosure header with an amber count, and rows in the
157
158
  // same two type sizes the tree above and the Library nav use, so the whole
158
159
  // sidebar is one typographic system rather than three.
159
- <div className="flex max-h-60 shrink-0 flex-col border-t border-line px-2">
160
+ //
161
+ // The hairline and the space above it are the FRAME's now
162
+ // (`SIDEBAR_FOOTER_SLOT`): this dock shares the footer with the Library's
163
+ // setup reminder, and a dock that drew its own rule put a second one
164
+ // directly under the reminder's. What is left here is the dock, and it
165
+ // sits flush in the column so its rows can take the sidebar's row inset
166
+ // exactly as the tree rows above do.
167
+ <div className="flex max-h-60 shrink-0 flex-col">
160
168
  <button
161
169
  type="button"
162
170
  onClick={() => setExpanded((v) => !v)}
@@ -165,7 +173,10 @@ export function PullRequestsForMe() {
165
173
  // SCOPE in words, because this queue is deliberately narrower than the
166
174
  // dots in the tree — it is the requests that are yours to act on.
167
175
  aria-label="Change requests for you"
168
- className="flex items-center gap-[7px] px-1.5 pt-2.5 pb-2 text-label uppercase text-ink-faint transition-colors hover:text-ink"
176
+ className={cn(
177
+ 'flex items-center gap-[7px] pt-2.5 pb-2 text-label uppercase text-ink-faint transition-colors hover:text-ink',
178
+ SIDEBAR_ROW_INSET,
179
+ )}
169
180
  >
170
181
  <span className="flex w-3 flex-none items-center justify-center">
171
182
  <ChevronRight
@@ -173,9 +184,13 @@ export function PullRequestsForMe() {
173
184
  className={cn('transition-transform duration-150', expanded && 'rotate-90')}
174
185
  />
175
186
  </span>
176
- <span className="flex-1 text-left">Change requests</span>
187
+ {/* `min-w-0` + `truncate`, so the count keeps its place. A flex item's
188
+ automatic minimum is its own content, so at 180px — the narrowest
189
+ the sidebar goes — the label refused to give way and pushed the
190
+ badge past the right edge of the row instead. */}
191
+ <span className="min-w-0 flex-1 truncate text-left">Change requests</span>
177
192
  {prs.length > 0 && (
178
- <Badge tone="wait" size="xs">
193
+ <Badge tone="wait" size="xs" className="flex-none">
179
194
  {prs.length}
180
195
  </Badge>
181
196
  )}
@@ -183,7 +198,11 @@ export function PullRequestsForMe() {
183
198
 
184
199
  {expanded && (
185
200
  <div className="flex flex-col gap-px overflow-y-auto pb-1.5">
186
- {error && <div className="pl-[25px] pr-1.5 py-2 text-meta text-danger">{error}</div>}
201
+ {error && (
202
+ <div className={cn('py-2', SIDEBAR_ROW_INSET)}>
203
+ <div className={cn('text-meta text-danger', SIDEBAR_CHILD_INDENT)}>{error}</div>
204
+ </div>
205
+ )}
187
206
  {!error &&
188
207
  prs.map((pr) => <PrRow key={pr.number} pr={pr} onOpen={() => setOpenCr(pr)} />)}
189
208
  </div>
@@ -228,23 +247,31 @@ function PrRow({ pr, onOpen }: { pr: PullRequestSummary; onOpen(): void }) {
228
247
  onOpen();
229
248
  }
230
249
  }}
231
- className="group block cursor-pointer rounded-sm pl-[25px] pr-[7px] py-1.5 transition-colors hover:bg-hover"
250
+ className={cn(
251
+ 'group block cursor-pointer rounded-sm py-1.5 transition-colors hover:bg-hover',
252
+ SIDEBAR_ROW_INSET,
253
+ )}
232
254
  title={pr.title}
233
255
  >
234
- <div className="flex min-w-0 gap-1.5 text-ui text-ink-muted group-hover:text-ink">
235
- <span className="flex-none tabular-nums text-ink-faint">#{pr.number}</span>
236
- {/* The ellipsis has to live on the TEXT, not on the flex row — a flex
237
- container clips its children without ever drawing one. */}
238
- <span className="min-w-0 truncate">{pr.title}</span>
239
- </div>
240
- <div className="mt-px flex items-center gap-2 text-meta text-ink-faint">
241
- <span className="truncate">{who}</span>
242
- <ReviewBadge review={pr.review} />
243
- {touched > 0 && (
244
- <span className="flex-none">
245
- {touched} file{touched === 1 ? '' : 's'}
246
- </span>
247
- )}
256
+ {/* The indent is on the CONTENT, not on the row: the row keeps the
257
+ sidebar's own inset, so it spans the full column the way a tree row
258
+ does and its hover fill starts where theirs does. */}
259
+ <div className={SIDEBAR_CHILD_INDENT}>
260
+ <div className="flex min-w-0 gap-1.5 text-ui text-ink-muted group-hover:text-ink">
261
+ <span className="flex-none tabular-nums text-ink-faint">#{pr.number}</span>
262
+ {/* The ellipsis has to live on the TEXT, not on the flex row — a flex
263
+ container clips its children without ever drawing one. */}
264
+ <span className="min-w-0 truncate">{pr.title}</span>
265
+ </div>
266
+ <div className="mt-px flex items-center gap-2 text-meta text-ink-faint">
267
+ <span className="truncate">{who}</span>
268
+ <ReviewBadge review={pr.review} />
269
+ {touched > 0 && (
270
+ <span className="flex-none">
271
+ {touched} file{touched === 1 ? '' : 's'}
272
+ </span>
273
+ )}
274
+ </div>
248
275
  </div>
249
276
  </div>
250
277
  );
@@ -54,6 +54,35 @@ describe('friendlyGitError: translates raw backend git messages', () => {
54
54
  expect(friendlyGitError(err)).toBe('something completely new went wrong');
55
55
  });
56
56
 
57
+ it('rewrites the read-before-write refusal to name the folder the person cannot read', () => {
58
+ // The backend's `AccessDeniedError` with `unreadable` set: the folder a
59
+ // new file would land in, or the file itself when it exists.
60
+ const folder = new GitApiError(
61
+ 403,
62
+ 'You don\'t have permission to write to "knowledge-base/KnowledgeBase/Sales/brief.pdf". You don\'t have read access to "KnowledgeBase/Sales"; only what you can read can be created, changed or removed.',
63
+ );
64
+ expect(friendlyGitError(folder)).toBe(
65
+ 'You can\'t add or change anything in "KnowledgeBase/Sales" because you don\'t have read access to it. Ask an admin or the folder\'s owners to share it with you first.',
66
+ );
67
+ const root = new GitApiError(
68
+ 403,
69
+ 'You don\'t have permission to write to "knowledge-base/notes.md". You don\'t have read access to the top level; only what you can read can be created, changed or removed.',
70
+ );
71
+ expect(friendlyGitError(root)).toBe(
72
+ 'You can\'t add or change anything in the top level because you don\'t have read access to it. Ask an admin or the folder\'s owners to share it with you first.',
73
+ );
74
+ });
75
+
76
+ it('still rewrites the write-grant refusal, which shares the same lead', () => {
77
+ const err = new GitApiError(
78
+ 403,
79
+ 'You don\'t have permission to write to "knowledge-base/KnowledgeBase/Sales/brief.md". Eligible: Sales; Ana <ana@x.io>.',
80
+ );
81
+ expect(friendlyGitError(err)).toBe(
82
+ 'You don\'t have permission to edit "knowledge-base/KnowledgeBase/Sales/brief.md". Editing is restricted to Sales; Ana <ana@x.io>. Ask one of them to make the change, or to broaden access for this folder.',
83
+ );
84
+ });
85
+
57
86
  it('rewrites raw "no history in common" CLI errors when pre-flight is bypassed', () => {
58
87
  const err = new GitApiError(
59
88
  500,
@@ -139,6 +139,18 @@ export function friendlyGitError(err: unknown): string {
139
139
  }
140
140
  }
141
141
 
142
+ // The read-before-write refusal (the AccessDeniedError the backend throws
143
+ // when the caller cannot READ where a change would land — a folder they
144
+ // cannot see, or a file they cannot open). Matched before the write-grant
145
+ // shape below because both open with the same lead.
146
+ const unreadableMatch = raw.match(
147
+ /^You don't have permission to write to "([^"]+)"\. You don't have read access to (the top level|"[^"]+"); only what you can read can be created, changed or removed\.$/,
148
+ );
149
+ if (unreadableMatch) {
150
+ const [, , place] = unreadableMatch;
151
+ return `You can't add or change anything in ${place} because you don't have read access to it. Ask an admin or the folder's owners to share it with you first.`;
152
+ }
153
+
142
154
  // Access-control rejections (the AccessDeniedError thrown by the backend
143
155
  // when the caller lacks the `write` role on a touched path).
144
156
  const accessMatch = raw.match(
@@ -72,10 +72,10 @@ export interface ProposeDraftPromptInput {
72
72
  /**
73
73
  * Seed text the chat composer receives when applying a change request hits
74
74
  * conflicts. The agent reads it as a user request to resolve the
75
- * disagreement and re-apply — keeping the user out of the loop. Phrased in
76
- * the workspace's plain-language vocabulary; the agent's system prompt
77
- * already knows the underlying git mechanics (which branches, which paths,
78
- * `commit_change` + `merge_change_request`).
75
+ * disagreement, then hand the apply back to the user — an agent proposes and
76
+ * syncs, a person merges. Phrased in the workspace's plain-language
77
+ * vocabulary; the agent's system prompt already knows the underlying git
78
+ * mechanics (which branches, which paths, `commit_change` + `merge_branch`).
79
79
  */
80
80
  export function buildResolveApplyConflictsPrompt(input: {
81
81
  /** The change request number being applied. */
@@ -97,7 +97,7 @@ export function buildResolveApplyConflictsPrompt(input: {
97
97
  return [
98
98
  `I tried to apply change request #${changeRequestNumber} into \`${base}\` and the two sides have differences that couldn't be reconciled automatically.${pathBlurb}`,
99
99
  '',
100
- "Please look at each affected file, decide what the merged version should look like for the process to remain consistent, and apply your resolution to the change request's source branch. Then retry applying the change request. If you genuinely can't tell which version should win on a particular file, ask me about that specific case in plain language. But resolve everything you can on your own first.",
100
+ "Please look at each affected file, decide what the merged version should look like for the process to remain consistent, and apply your resolution to the change request's source branch. Then tell me it's ready, so I can apply the change request again in the app. If you genuinely can't tell which version should win on a particular file, ask me about that specific case in plain language. But resolve everything you can on your own first.",
101
101
  ].join('\n');
102
102
  }
103
103