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}`);
}
+68
View File
@@ -286,6 +286,32 @@ const callRead = async (handler, query) => {
return res;
};
const registerStat = (fsPromises) => {
const { app, getRoute } = createRouteRegistry();
registerFsRoutes(app, {
os: { homedir: () => '/home/user' },
path: path.posix,
fsPromises: {
realpath: async (targetPath) => targetPath,
...fsPromises,
},
spawn: vi.fn(),
crypto: { randomUUID: () => 'job-0' },
normalizeDirectoryPath: (p) => p,
resolveProjectDirectory: async () => ({ directory: '/repo' }),
buildAugmentedPath: () => '/usr/bin',
resolveGitBinaryForSpawn: () => 'git',
openchamberUserConfigRoot: '/home/user/.config',
});
return getRoute('GET', '/api/fs/stat');
};
const callStat = async (handler, query) => {
const res = createMockResponse();
await handler({ query }, res);
return res;
};
const callRaw = async (handler, query) => {
const res = createMockResponse();
await handler({ query }, res);
@@ -770,6 +796,48 @@ describe('fs read', () => {
warn.mockRestore();
});
});
describe('fs stat', () => {
it('returns exists:false for an outside-workspace path when optional', async () => {
const fsPromises = {
stat: vi.fn(async () => ({ isFile: () => true, size: 3 })),
};
const handler = registerStat(fsPromises);
const res = await callStat(handler, { path: '/outside/plan.md', optional: 'true' });
expect(res.statusCode).toBe(200);
expect(res.body).toEqual({ path: '/outside/plan.md', exists: false });
expect(fsPromises.stat).not.toHaveBeenCalled();
});
it('still rejects an outside-workspace path when not optional', async () => {
const fsPromises = {
stat: vi.fn(async () => ({ isFile: () => true, size: 3 })),
};
const handler = registerStat(fsPromises);
const res = await callStat(handler, { path: '/outside/plan.md' });
expect(res.statusCode).toBe(400);
expect(res.body).toEqual({ error: 'Path is outside of active workspace' });
expect(fsPromises.stat).not.toHaveBeenCalled();
});
it('returns stat data for an in-workspace file', async () => {
const fsPromises = {
stat: vi.fn(async () => ({ isFile: () => true, size: 3 })),
};
const handler = registerStat(fsPromises);
const res = await callStat(handler, { path: '/repo/file.txt' });
expect(res.statusCode).toBe(200);
expect(res.body).toEqual({ path: '/repo/file.txt', isFile: true, size: 3 });
});
});
describe('fs reveal', () => {
it.each([
['linux', 'xdg-open', ['/repo']],