merge: resolve v1.22.2 conflicts with custom

Per Q4 resolution (documented on kanban t_83741c53):
- .github/workflows/*: KEEP custom deletion (fork uses Gitea Actions under .gitea/workflows)
- ChatInput.tsx: KEEP custom forge picker states + provider-aware linkedPr
- WorkStatusContextSection.tsx: combine imports (WorkStatusPill + useConfigStore)
- WorkStatusPrimaryGroup.tsx: upstream nested-git/bootstrap-gate base + custom GitLab/Gitea forge rows
- NewWorktreeDialog.tsx: combine dialogs; keep custom MR/PR branch resolution
- SettingsView.tsx: custom deps minus undefined openThirdPartyProviderSetup
- search.ts + search.test.ts: KEEP upstream (enter-to-send, large-text-paste, first-party integrations)
- tr.ts: drop 4 auto-merge duplicate gitView.empty.* keys
This commit is contained in:
2026-09-06 10:55:54 +00:00
220 changed files with 45375 additions and 3531 deletions
+8
View File
@@ -884,6 +884,14 @@ export const registerFsRoutes = (app, dependencies) => {
managedRoots,
});
if (!resolved.ok) {
// An `optional` stat is a graceful probe — the caller only wants to
// know whether a path resolves to a readable file, and treats both
// "missing" and "outside the active workspace" as absent. Without this,
// boot-time probes of config/backup paths outside the workspace 400 and
// surface as console errors for a check that was never mandatory.
if (optional && resolved.error === 'Path is outside of active workspace') {
return res.json({ path: filePath, exists: false });
}
if (req.query?.allowOutsideWorkspace === 'true') {
console.warn(`Rejected outside-workspace stat: ${resolved.error}`);
}