@openchamber/web 1.18.3 → 1.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.
- package/README.md +1 -0
- package/dist/assets/{CodeMirrorCommentWidgets-DbUi6I9s.js → CodeMirrorCommentWidgets-DAvopJvy.js} +1 -1
- package/dist/assets/{CommitSection-Jc2_hNPE.js → CommitSection-D9cV-qR9.js} +1 -1
- package/dist/assets/{DiagramEditor-PCrYHBko.js → DiagramEditor-B9NCadU7.js} +1 -1
- package/dist/assets/DiagramView-LKGBwf4G.js +1 -0
- package/dist/assets/{DiffView-DEGlNjMH.js → DiffView-BWNq-0ov.js} +2 -2
- package/dist/assets/FilesView-DB-Q0Gkz.js +14 -0
- package/dist/assets/{GitView-C-n17voy.js → GitView-DsWXqWx3.js} +3 -3
- package/dist/assets/{JsonTreeView-BYcgdTOQ.js → JsonTreeView-h4dHASlq.js} +1 -1
- package/dist/assets/MarkdownImageGallery-n0ikH-xm.js +1 -0
- package/dist/assets/MarkdownRendererImpl-CT2mjx-s.js +12 -0
- package/dist/assets/OnboardingScreen-CDjgzxEe.js +1 -0
- package/dist/assets/{PatchDiff-Bn7bfgUv.js → PatchDiff-jPKTJje5.js} +1 -1
- package/dist/assets/{PierreDiffViewer-D1fWvrUn.js → PierreDiffViewer-D_Gt4A_6.js} +1 -1
- package/dist/assets/PlanView-UvuxIl9-.js +4 -0
- package/dist/assets/SessionSwitcherDropdown-xKU4LRuQ.js +1 -0
- package/dist/assets/SettingsView-3B9VN6Ys.js +28 -0
- package/dist/assets/SettingsWindow-CqQNDKNd.js +1 -0
- package/dist/assets/{ToolOutputDialog-BtIJkFno.js → ToolOutputDialog-PmjlAxVE.js} +6 -6
- package/dist/assets/{ToolPartDiffPreview-i3PQo6_0.js → ToolPartDiffPreview-B34Xw9wq.js} +1 -1
- package/dist/assets/{VirtualizedFileDiff-DkcusvMa.js → VirtualizedFileDiff-B37yB9jZ.js} +3 -3
- package/dist/assets/{WalkthroughView-Cc5Hd6P5.js → WalkthroughView-Bxun3k66.js} +2 -2
- package/dist/assets/{computeVirtualFileMetrics-xPena3W2.js → computeVirtualFileMetrics-DYFv_yZS.js} +2 -2
- package/dist/assets/contextPanelEmbeddedChat-BO1wRpaN.js +1 -0
- package/dist/assets/de-DbV6CLxv.js +9 -0
- package/dist/assets/document-attachments-DFAWlG3U.js +31 -0
- package/dist/assets/es-CVDlyzZ4.js +15 -0
- package/dist/assets/fr-Czc-p0g-.js +13 -0
- package/dist/assets/index-1OhiMDBz.css +1 -0
- package/dist/assets/index-BSvmTvZl.js +1 -0
- package/dist/assets/index-DzriVon2.js +7 -0
- package/dist/assets/{isDiffPlainText-Dudf-dWx.js → isDiffPlainText-DwHKxDYc.js} +1 -1
- package/dist/assets/{isFilePlainText-DS4QV1dd.js → isFilePlainText-Dwq6ILxo.js} +1 -1
- package/dist/assets/ja-dwc9NM_S.js +15 -0
- package/dist/assets/ko-Ds1DZ8FX.js +15 -0
- package/dist/assets/{lua-BgMRiT3U.js → lua-VAEuO923.js} +1 -1
- package/dist/assets/main-BF51IOVF.js +921 -0
- package/dist/assets/{main-C0DyIwTb.js → main-D7UPARut.js} +2 -2
- package/dist/assets/markdownCore-BgeBDwD3.js +2 -0
- package/dist/assets/{miniChat-CGfrxKpJ.js → miniChat-BISXSGOo.js} +2 -2
- package/dist/assets/mobile-BnYxVuvw.js +2 -0
- package/dist/assets/{patchFileDiff-C5D1OPCa.js → patchFileDiff-BEDPDypx.js} +2 -2
- package/dist/assets/pl-CLiTO7i-.js +15 -0
- package/dist/assets/pt-BR-GIimJgpK.js +15 -0
- package/dist/assets/renderElectronMiniChatApp-BaOy72Gi.js +2 -0
- package/dist/assets/{renderMobileApp-B5HA4qbi.js → renderMobileApp-BiMbzPq9.js} +7 -7
- package/dist/assets/runtimeEndpointReset-BMBRhIbf.js +15 -0
- package/dist/assets/scheduledTasksApi-01zzfzqH.js +1 -0
- package/dist/assets/{shikiHighlight-CmanopUB.js → shikiHighlight-DXYW46vW.js} +1 -1
- package/dist/assets/uk-DLfgD1ki.js +15 -0
- package/dist/assets/{useAppFontEffects-sHmU5b8u.js → useAppFontEffects-CbzHzFop.js} +139 -142
- package/dist/assets/{useInlineCommentController-gt56WkxJ.js → useInlineCommentController-CegKdDXi.js} +2 -2
- package/dist/assets/{vendor-base-ui-D_V6hAcE.js → vendor-base-ui-BYlZTzrw.js} +1 -1
- package/dist/assets/vendor-codemirror-autocomplete-DzPz9Wgq.js +1 -0
- package/dist/assets/vendor-codemirror-commands-B7H_j0iU.js +1 -0
- package/dist/assets/{vendor-codemirror-lang-angular-CgY7_gQ1.js → vendor-codemirror-lang-angular-DEPs2M5t.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-cpp-B5Ta4enQ.js → vendor-codemirror-lang-cpp-DhkseaMo.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-css-VgNqFSH-.js → vendor-codemirror-lang-css-O0cZX78y.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-go-LxLz62pp.js → vendor-codemirror-lang-go-fMdQYcON.js} +1 -1
- package/dist/assets/vendor-codemirror-lang-html-CfgK872x.js +1 -0
- package/dist/assets/{vendor-codemirror-lang-java-Bksi1PH4.js → vendor-codemirror-lang-java-CQj4S3zl.js} +1 -1
- package/dist/assets/vendor-codemirror-lang-javascript-Cc2ZYbgX.js +13 -0
- package/dist/assets/{vendor-codemirror-lang-jinja-C7npuDD7.js → vendor-codemirror-lang-jinja-BmZZv8g-.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-json-ryCw7nab.js → vendor-codemirror-lang-json-CMBS2tG9.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-less-BxsZJD6N.js → vendor-codemirror-lang-less-C6Eo8hVS.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-liquid-De6qch10.js → vendor-codemirror-lang-liquid-DSTR47-H.js} +1 -1
- package/dist/assets/vendor-codemirror-lang-markdown-BPGOH9ye.js +1 -0
- package/dist/assets/{vendor-codemirror-lang-php-Cm1es33p.js → vendor-codemirror-lang-php-DD9udfPH.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-python-N414WYK-.js → vendor-codemirror-lang-python-HahnQaAS.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-rust-C_WuUStH.js → vendor-codemirror-lang-rust-nLTovbjv.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sass-8UHTCAOM.js → vendor-codemirror-lang-sass-pL2Yc72v.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-sql-CV3sMA5D.js → vendor-codemirror-lang-sql-BVBnan19.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-vue-DzvC1Dhk.js → vendor-codemirror-lang-vue-BqGzJVm1.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-wast-jlr-LDdA.js → vendor-codemirror-lang-wast-B0_m5DqU.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-xml-CrO63OVp.js → vendor-codemirror-lang-xml-Dj3voadT.js} +1 -1
- package/dist/assets/{vendor-codemirror-lang-yaml-dxi6CISW.js → vendor-codemirror-lang-yaml-yu-9Z5u7.js} +1 -1
- package/dist/assets/vendor-codemirror-language-BgPj_McA.js +3 -0
- package/dist/assets/{vendor-codemirror-language-data-Dihw9MtL.js → vendor-codemirror-language-data-CiAYDJXN.js} +2 -2
- package/dist/assets/vendor-codemirror-search-BmS-GmcX.js +2 -0
- package/dist/assets/{vendor-codemirror-state-CNWM3Q8V.js → vendor-codemirror-state-C9awkmn-.js} +5 -5
- package/dist/assets/vendor-codemirror-view-CiLROUVV.js +4 -0
- package/dist/assets/vendor-replit-codemirror-vim-B2DJlAhT.js +6 -0
- package/dist/assets/vendor-replit-codemirror-vim-core-FHzKdNUS.js +34 -0
- package/dist/assets/vendor-zod-adaMkgkm.js +39 -0
- package/dist/assets/{web-components-BL-Ur2Tb.js → web-components-DCLjCO9n.js} +1 -1
- package/dist/assets/zh-CN-DkeP5awK.js +15 -0
- package/dist/assets/zh-TW-BocaFm3d.js +15 -0
- package/dist/index.html +4 -4
- package/dist/mini-chat.html +3 -3
- package/dist/mobile.html +3 -3
- package/package.json +1 -1
- package/server/index.js +116 -3
- package/server/lib/agent-memory/actions.js +243 -0
- package/server/lib/agent-memory/actions.test.js +343 -0
- package/server/lib/agent-memory/feature-flag.js +19 -0
- package/server/lib/agent-memory/feature-flag.test.js +38 -0
- package/server/lib/agent-memory/project-resolution.js +56 -0
- package/server/lib/agent-memory/project-resolution.test.js +85 -0
- package/server/lib/agent-memory/routes.http.test.js +270 -0
- package/server/lib/agent-memory/routes.js +169 -0
- package/server/lib/agent-memory/runtime.js +427 -0
- package/server/lib/agent-memory/runtime.test.js +344 -0
- package/server/lib/agent-memory/threat-patterns.js +61 -0
- package/server/lib/agent-memory/threat-patterns.test.js +61 -0
- package/server/lib/agent-tool/DOCUMENTATION.md +14 -0
- package/server/lib/agent-tool/runtime.js +63 -13
- package/server/lib/agent-tool/runtime.test.js +85 -2
- package/server/lib/context-obligatory/runtime.js +34 -3
- package/server/lib/context-obligatory/runtime.test.js +114 -0
- package/server/lib/dev-tunnel/client.js +20 -1
- package/server/lib/dev-tunnel/tunnel.test.js +9 -0
- package/server/lib/fs/DOCUMENTATION.md +3 -0
- package/server/lib/fs/routes.js +149 -32
- package/server/lib/fs/routes.test.js +225 -0
- package/server/lib/git/DOCUMENTATION.md +8 -0
- package/server/lib/git/service.js +121 -67
- package/server/lib/git/service.test.js +129 -0
- package/server/lib/github/DOCUMENTATION.md +14 -3
- package/server/lib/github/pr-status.js +188 -83
- package/server/lib/github/pr-status.test.js +182 -0
- package/server/lib/github/routes.js +36 -30
- package/server/lib/markdown-image-grants/DOCUMENTATION.md +36 -0
- package/server/lib/markdown-image-grants/routes.js +340 -0
- package/server/lib/markdown-image-grants/routes.test.js +221 -0
- package/server/lib/notifications/template-runtime.js +2 -3
- package/server/lib/openchamber-control/action-resolution.test.js +65 -0
- package/server/lib/openchamber-control/actions.js +78 -0
- package/server/lib/openchamber-control/service.js +7 -0
- package/server/lib/openchamber-sessions/routes.js +14 -0
- package/server/lib/opencode/DOCUMENTATION.md +6 -4
- package/server/lib/opencode/claude-cli-auth.js +60 -0
- package/server/lib/opencode/claude-cli-auth.test.js +54 -0
- package/server/lib/opencode/feature-routes-runtime.js +22 -0
- package/server/lib/opencode/plugins.js +12 -3
- package/server/lib/opencode/plugins.test.js +18 -0
- package/server/lib/opencode/proxy-agent-wiring.test.js +152 -0
- package/server/lib/opencode/proxy.js +116 -6
- package/server/lib/opencode/proxy.test.js +158 -1
- package/server/lib/opencode/routes.js +4 -1
- package/server/lib/opencode/server-startup-runtime.js +22 -1
- package/server/lib/opencode/server-startup-runtime.test.js +44 -0
- package/server/lib/opencode/settings-helpers.js +11 -0
- package/server/lib/opencode/settings-helpers.test.js +35 -0
- package/server/lib/opencode/settings-runtime.js +51 -0
- package/server/lib/opencode/shared.js +120 -16
- package/server/lib/opencode/shared.test.js +185 -1
- package/server/lib/project-context/DOCUMENTATION.md +158 -0
- package/server/lib/project-context/routes.http.test.js +264 -0
- package/server/lib/project-context/routes.js +237 -0
- package/server/lib/project-context/runtime.js +667 -0
- package/server/lib/project-context/runtime.test.js +498 -0
- package/server/lib/quota/DOCUMENTATION.md +16 -1
- package/server/lib/quota/providers/claude/auth.js +113 -0
- package/server/lib/quota/providers/claude/auth.test.js +117 -0
- package/server/lib/quota/providers/claude/index.js +151 -0
- package/server/lib/quota/providers/claude/index.test.js +147 -0
- package/server/lib/quota/providers/claude/transforms.js +127 -0
- package/server/lib/quota/providers/claude/transforms.test.js +82 -0
- package/server/lib/quota/providers/command-code.js +90 -0
- package/server/lib/quota/providers/command-code.test.js +72 -0
- package/server/lib/quota/providers/index.js +22 -2
- package/server/lib/quota/providers/index.test.js +10 -1
- package/server/lib/quota/utils/formatters.js +2 -1
- package/server/lib/scheduled-tasks/runtime.js +21 -2
- package/server/lib/session-knowledge/DOCUMENTATION.md +87 -0
- package/server/lib/session-knowledge/routes.js +107 -0
- package/server/lib/session-knowledge/runtime.js +331 -0
- package/server/lib/session-knowledge/runtime.test.js +275 -0
- package/server/lib/skills-catalog/DOCUMENTATION.md +22 -22
- package/server/lib/skills-catalog/curated-sources.js +1 -1
- package/server/lib/skills-catalog/curated-sources.test.js +10 -0
- package/server/lib/small-model/index.js +8 -0
- package/server/lib/small-model/index.test.js +31 -1
- package/server/lib/small-model/routes.js +3 -1
- package/dist/assets/DiagramView-CndEcZNu.js +0 -1
- package/dist/assets/FilesView-CzUgIvUm.js +0 -14
- package/dist/assets/MarkdownImageGallery-DzHwkVIH.js +0 -1
- package/dist/assets/MarkdownRendererImpl-DUcIcWgs.js +0 -12
- package/dist/assets/OnboardingScreen-BmN0lhk4.js +0 -1
- package/dist/assets/PlanView-CWM0iyFk.js +0 -4
- package/dist/assets/SessionSwitcherDropdown-Cez-9xRh.js +0 -1
- package/dist/assets/SettingsView-Bl1drwPw.js +0 -28
- package/dist/assets/SettingsWindow-DL5axjDZ.js +0 -1
- package/dist/assets/contextPanelEmbeddedChat-tQekJUAF.js +0 -1
- package/dist/assets/de-u7gSnqWs.js +0 -9
- package/dist/assets/document-attachments-CX_YaDsu.js +0 -30
- package/dist/assets/es-T9O7aAOr.js +0 -15
- package/dist/assets/fr-Oor7ewbE.js +0 -13
- package/dist/assets/index-CVNuER6G.css +0 -1
- package/dist/assets/index-Crz1YOFl.js +0 -1
- package/dist/assets/index-iFY_N5aO.js +0 -7
- package/dist/assets/ja-DHpqbVmr.js +0 -15
- package/dist/assets/ko-CwLkS3nx.js +0 -15
- package/dist/assets/main-CAxX6DAN.js +0 -915
- package/dist/assets/markdownCore-DhfzuGXu.js +0 -2
- package/dist/assets/markdownImageAssets-BTNlRyjd.js +0 -1
- package/dist/assets/mobile-DEmhwNcV.js +0 -2
- package/dist/assets/pl-CcZILN8q.js +0 -15
- package/dist/assets/pt-BR-DYHhVK6o.js +0 -15
- package/dist/assets/renderElectronMiniChatApp-Dpbswpom.js +0 -2
- package/dist/assets/runtimeEndpointReset-cbahJ3hD.js +0 -13
- package/dist/assets/scheduledTasksApi-BxgGWTL8.js +0 -1
- package/dist/assets/uk-BA2kZR38.js +0 -15
- package/dist/assets/vendor-codemirror-autocomplete-BjbBRsUA.js +0 -1
- package/dist/assets/vendor-codemirror-commands-ARAOgp1x.js +0 -1
- package/dist/assets/vendor-codemirror-lang-html-B3Qe3OpS.js +0 -1
- package/dist/assets/vendor-codemirror-lang-javascript-Bbw3D7r0.js +0 -13
- package/dist/assets/vendor-codemirror-lang-markdown-FGQydhTc.js +0 -1
- package/dist/assets/vendor-codemirror-language-DUOssd4j.js +0 -3
- package/dist/assets/vendor-codemirror-search-8kyQdB3f.js +0 -2
- package/dist/assets/vendor-codemirror-view-DSzLbZiS.js +0 -4
- package/dist/assets/vendor-replit-codemirror-vim-B0Ecqnlh.js +0 -39
- package/dist/assets/zh-CN-dlOQK6v9.js +0 -15
- package/dist/assets/zh-TW-BnqQ-WL5.js +0 -15
- package/server/lib/quota/providers/claude.js +0 -107
|
@@ -140,6 +140,30 @@ const registerWrite = (fsPromises) => {
|
|
|
140
140
|
return getRoute('POST', '/api/fs/write');
|
|
141
141
|
};
|
|
142
142
|
|
|
143
|
+
const registerUpload = (fsPromises) => {
|
|
144
|
+
const { app, getRoute } = createRouteRegistry();
|
|
145
|
+
registerFsRoutes(app, {
|
|
146
|
+
os: { homedir: () => '/home/user' },
|
|
147
|
+
path: path.posix,
|
|
148
|
+
fsPromises: {
|
|
149
|
+
realpath: async (targetPath) => {
|
|
150
|
+
if (targetPath === '/repo') return targetPath;
|
|
151
|
+
throw Object.assign(new Error('not found'), { code: 'ENOENT' });
|
|
152
|
+
},
|
|
153
|
+
stat: async () => ({ isDirectory: () => false }),
|
|
154
|
+
...fsPromises,
|
|
155
|
+
},
|
|
156
|
+
spawn: vi.fn(),
|
|
157
|
+
crypto: { randomUUID: () => 'job-0' },
|
|
158
|
+
normalizeDirectoryPath: (p) => p,
|
|
159
|
+
resolveProjectDirectory: async () => ({ directory: '/repo' }),
|
|
160
|
+
buildAugmentedPath: () => '/usr/bin',
|
|
161
|
+
resolveGitBinaryForSpawn: () => 'git',
|
|
162
|
+
openchamberUserConfigRoot: '/home/user/.config',
|
|
163
|
+
});
|
|
164
|
+
return getRoute('POST', '/api/fs/upload');
|
|
165
|
+
};
|
|
166
|
+
|
|
143
167
|
const registerRead = (fsPromises) => {
|
|
144
168
|
const { app, getRoute } = createRouteRegistry();
|
|
145
169
|
registerFsRoutes(app, {
|
|
@@ -233,6 +257,28 @@ const callWrite = async (handler, body) => {
|
|
|
233
257
|
return res;
|
|
234
258
|
};
|
|
235
259
|
|
|
260
|
+
const callUpload = async (handler, {
|
|
261
|
+
body = Buffer.from('upload'),
|
|
262
|
+
chunks,
|
|
263
|
+
includeContentLength = true,
|
|
264
|
+
path: filePath = '/repo/file.bin',
|
|
265
|
+
overwrite = false,
|
|
266
|
+
} = {}) => {
|
|
267
|
+
const res = createMockResponse();
|
|
268
|
+
const uploadChunks = chunks ?? [body];
|
|
269
|
+
const headers = { 'content-type': 'application/octet-stream' };
|
|
270
|
+
if (includeContentLength) headers['content-length'] = String(body.length);
|
|
271
|
+
const req = {
|
|
272
|
+
headers,
|
|
273
|
+
query: { path: filePath, overwrite: overwrite ? 'true' : undefined },
|
|
274
|
+
async *[Symbol.asyncIterator]() {
|
|
275
|
+
yield* uploadChunks;
|
|
276
|
+
},
|
|
277
|
+
};
|
|
278
|
+
await handler(req, res);
|
|
279
|
+
return res;
|
|
280
|
+
};
|
|
281
|
+
|
|
236
282
|
const callRead = async (handler, query) => {
|
|
237
283
|
const res = createMockResponse();
|
|
238
284
|
await handler({ query }, res);
|
|
@@ -340,7 +386,186 @@ describe('fs write', () => {
|
|
|
340
386
|
});
|
|
341
387
|
});
|
|
342
388
|
|
|
389
|
+
describe('fs upload', () => {
|
|
390
|
+
it('streams a binary file to temp storage before committing it without overwrite', async () => {
|
|
391
|
+
const write = vi.fn(async (_buffer, _offset, length) => ({ bytesWritten: length }));
|
|
392
|
+
const close = vi.fn(async () => undefined);
|
|
393
|
+
const fsPromises = {
|
|
394
|
+
open: vi.fn(async () => ({ write, close })),
|
|
395
|
+
link: vi.fn(async () => undefined),
|
|
396
|
+
rename: vi.fn(async () => undefined),
|
|
397
|
+
unlink: vi.fn(async () => undefined),
|
|
398
|
+
};
|
|
399
|
+
const handler = registerUpload(fsPromises);
|
|
400
|
+
|
|
401
|
+
const body = Buffer.from([0, 1, 2, 255]);
|
|
402
|
+
const res = await callUpload(handler, {
|
|
403
|
+
body,
|
|
404
|
+
chunks: [body.subarray(0, 2), body.subarray(2)],
|
|
405
|
+
});
|
|
406
|
+
|
|
407
|
+
expect(res.body).toEqual({ success: true, path: '/repo/file.bin' });
|
|
408
|
+
const tmp = fsPromises.open.mock.calls[0][0];
|
|
409
|
+
expect(tmp).toMatch(/^\/repo\/file\.bin\.upload-/);
|
|
410
|
+
expect(fsPromises.open).toHaveBeenCalledWith(tmp, 'wx');
|
|
411
|
+
expect(write).toHaveBeenNthCalledWith(1, Buffer.from([0, 1]), 0, 2, null);
|
|
412
|
+
expect(write).toHaveBeenNthCalledWith(2, Buffer.from([2, 255]), 0, 2, null);
|
|
413
|
+
expect(close).toHaveBeenCalledTimes(1);
|
|
414
|
+
expect(fsPromises.link).toHaveBeenCalledWith(tmp, '/repo/file.bin');
|
|
415
|
+
expect(fsPromises.unlink).toHaveBeenCalledWith(tmp);
|
|
416
|
+
expect(fsPromises.rename).not.toHaveBeenCalled();
|
|
417
|
+
});
|
|
418
|
+
|
|
419
|
+
it('returns a conflict instead of silently replacing an existing file', async () => {
|
|
420
|
+
const fsPromises = {
|
|
421
|
+
realpath: vi.fn(async (targetPath) => targetPath),
|
|
422
|
+
stat: vi.fn(async () => ({ isDirectory: () => false })),
|
|
423
|
+
open: vi.fn(async () => ({ write: vi.fn(), close: vi.fn() })),
|
|
424
|
+
};
|
|
425
|
+
const handler = registerUpload(fsPromises);
|
|
426
|
+
|
|
427
|
+
const res = await callUpload(handler);
|
|
428
|
+
|
|
429
|
+
expect(res.statusCode).toBe(409);
|
|
430
|
+
expect(res.body).toEqual({ error: 'File already exists', reason: 'already-exists' });
|
|
431
|
+
expect(fsPromises.open).not.toHaveBeenCalled();
|
|
432
|
+
});
|
|
433
|
+
|
|
434
|
+
it('atomically replaces a file only when overwrite is explicit', async () => {
|
|
435
|
+
const write = vi.fn(async (_buffer, _offset, length) => ({ bytesWritten: length }));
|
|
436
|
+
const fsPromises = {
|
|
437
|
+
realpath: vi.fn(async (targetPath) => targetPath),
|
|
438
|
+
stat: vi.fn(async () => ({ isDirectory: () => false })),
|
|
439
|
+
open: vi.fn(async () => ({ write, close: vi.fn(async () => undefined) })),
|
|
440
|
+
rename: vi.fn(async () => undefined),
|
|
441
|
+
unlink: vi.fn(async () => undefined),
|
|
442
|
+
};
|
|
443
|
+
const handler = registerUpload(fsPromises);
|
|
444
|
+
|
|
445
|
+
const res = await callUpload(handler, { overwrite: true });
|
|
446
|
+
|
|
447
|
+
expect(res.body).toEqual({ success: true, path: '/repo/file.bin' });
|
|
448
|
+
const tmp = fsPromises.open.mock.calls[0][0];
|
|
449
|
+
expect(tmp).toMatch(/^\/repo\/file\.bin\.upload-/);
|
|
450
|
+
expect(write).toHaveBeenCalledWith(Buffer.from('upload'), 0, 6, null);
|
|
451
|
+
expect(fsPromises.rename).toHaveBeenCalledWith(tmp, '/repo/file.bin');
|
|
452
|
+
});
|
|
453
|
+
|
|
454
|
+
it('rejects an existing directory before reading the upload body', async () => {
|
|
455
|
+
const fsPromises = {
|
|
456
|
+
realpath: vi.fn(async (targetPath) => targetPath),
|
|
457
|
+
stat: vi.fn(async () => ({ isDirectory: () => true })),
|
|
458
|
+
open: vi.fn(async () => ({ write: vi.fn(), close: vi.fn() })),
|
|
459
|
+
};
|
|
460
|
+
const handler = registerUpload(fsPromises);
|
|
461
|
+
|
|
462
|
+
const res = await callUpload(handler);
|
|
463
|
+
|
|
464
|
+
expect(res.statusCode).toBe(400);
|
|
465
|
+
expect(res.body).toEqual({ error: 'Specified path is a directory' });
|
|
466
|
+
expect(fsPromises.open).not.toHaveBeenCalled();
|
|
467
|
+
});
|
|
468
|
+
|
|
469
|
+
it('rejects a destination parent that resolves outside the workspace', async () => {
|
|
470
|
+
const fsPromises = {
|
|
471
|
+
realpath: vi.fn(async (targetPath) => targetPath === '/repo/link' ? '/outside' : targetPath),
|
|
472
|
+
open: vi.fn(async () => ({ write: vi.fn(), close: vi.fn() })),
|
|
473
|
+
};
|
|
474
|
+
const handler = registerUpload(fsPromises);
|
|
475
|
+
|
|
476
|
+
const res = await callUpload(handler, { path: '/repo/link/file.bin' });
|
|
477
|
+
|
|
478
|
+
expect(res.statusCode).toBe(403);
|
|
479
|
+
expect(res.body).toEqual({ error: 'Access denied' });
|
|
480
|
+
expect(fsPromises.open).not.toHaveBeenCalled();
|
|
481
|
+
});
|
|
482
|
+
|
|
483
|
+
it('cleans up a partial temp file when the configured streaming limit is exceeded', async () => {
|
|
484
|
+
const previous = process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES;
|
|
485
|
+
process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES = '5';
|
|
486
|
+
const write = vi.fn(async (_buffer, _offset, length) => ({ bytesWritten: length }));
|
|
487
|
+
const fsPromises = {
|
|
488
|
+
open: vi.fn(async () => ({ write, close: vi.fn(async () => undefined) })),
|
|
489
|
+
link: vi.fn(async () => undefined),
|
|
490
|
+
unlink: vi.fn(async () => undefined),
|
|
491
|
+
};
|
|
492
|
+
try {
|
|
493
|
+
const handler = registerUpload(fsPromises);
|
|
494
|
+
const res = await callUpload(handler, {
|
|
495
|
+
body: Buffer.from('123456'),
|
|
496
|
+
chunks: [Buffer.from('123'), Buffer.from('456')],
|
|
497
|
+
includeContentLength: false,
|
|
498
|
+
});
|
|
499
|
+
|
|
500
|
+
expect(res.statusCode).toBe(413);
|
|
501
|
+
expect(res.body).toEqual({ error: 'File exceeds maximum size of 5 bytes' });
|
|
502
|
+
expect(write).toHaveBeenCalledWith(Buffer.from('123'), 0, 3, null);
|
|
503
|
+
expect(fsPromises.link).not.toHaveBeenCalled();
|
|
504
|
+
expect(fsPromises.unlink).toHaveBeenCalledWith(expect.stringMatching(/^\/repo\/file\.bin\.upload-/));
|
|
505
|
+
} finally {
|
|
506
|
+
if (previous === undefined) delete process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES;
|
|
507
|
+
else process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES = previous;
|
|
508
|
+
}
|
|
509
|
+
});
|
|
510
|
+
|
|
511
|
+
it('rejects a declared oversized upload before opening a temp file', async () => {
|
|
512
|
+
const previous = process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES;
|
|
513
|
+
process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES = '5';
|
|
514
|
+
const fsPromises = {
|
|
515
|
+
open: vi.fn(async () => ({ write: vi.fn(), close: vi.fn() })),
|
|
516
|
+
};
|
|
517
|
+
try {
|
|
518
|
+
const handler = registerUpload(fsPromises);
|
|
519
|
+
const res = await callUpload(handler, { body: Buffer.from('123456') });
|
|
520
|
+
|
|
521
|
+
expect(res.statusCode).toBe(413);
|
|
522
|
+
expect(res.body).toEqual({ error: 'File exceeds maximum size of 5 bytes' });
|
|
523
|
+
expect(fsPromises.open).not.toHaveBeenCalled();
|
|
524
|
+
} finally {
|
|
525
|
+
if (previous === undefined) delete process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES;
|
|
526
|
+
else process.env.OPENCHAMBER_FS_UPLOAD_MAX_BYTES = previous;
|
|
527
|
+
}
|
|
528
|
+
});
|
|
529
|
+
|
|
530
|
+
it('keeps the existing file when a target appears before the atomic commit', async () => {
|
|
531
|
+
const error = Object.assign(new Error('exists'), { code: 'EEXIST' });
|
|
532
|
+
const fsPromises = {
|
|
533
|
+
open: vi.fn(async () => ({
|
|
534
|
+
write: vi.fn(async (_buffer, _offset, length) => ({ bytesWritten: length })),
|
|
535
|
+
close: vi.fn(async () => undefined),
|
|
536
|
+
})),
|
|
537
|
+
link: vi.fn(async () => { throw error; }),
|
|
538
|
+
unlink: vi.fn(async () => undefined),
|
|
539
|
+
};
|
|
540
|
+
const handler = registerUpload(fsPromises);
|
|
541
|
+
|
|
542
|
+
const res = await callUpload(handler);
|
|
543
|
+
|
|
544
|
+
expect(res.statusCode).toBe(409);
|
|
545
|
+
expect(res.body).toEqual({ error: 'File already exists', reason: 'already-exists' });
|
|
546
|
+
expect(fsPromises.unlink).toHaveBeenCalledWith(expect.stringMatching(/^\/repo\/file\.bin\.upload-/));
|
|
547
|
+
});
|
|
548
|
+
});
|
|
549
|
+
|
|
343
550
|
describe('fs read', () => {
|
|
551
|
+
it('reads workspace files through symlinks that resolve outside the workspace', async () => {
|
|
552
|
+
const fsPromises = {
|
|
553
|
+
realpath: vi.fn(async (targetPath) => {
|
|
554
|
+
if (targetPath === '/repo/link.txt') return '/shared/target.txt';
|
|
555
|
+
return targetPath;
|
|
556
|
+
}),
|
|
557
|
+
stat: vi.fn(async () => ({ isFile: () => true, size: 6 })),
|
|
558
|
+
readFile: vi.fn(async () => 'shared'),
|
|
559
|
+
};
|
|
560
|
+
const handler = registerRead(fsPromises);
|
|
561
|
+
|
|
562
|
+
const res = await callRead(handler, { path: '/repo/link.txt' });
|
|
563
|
+
|
|
564
|
+
expect(res.statusCode).toBe(200);
|
|
565
|
+
expect(res.body).toBe('shared');
|
|
566
|
+
expect(fsPromises.readFile).toHaveBeenCalledWith('/shared/target.txt', 'utf8');
|
|
567
|
+
});
|
|
568
|
+
|
|
344
569
|
it('rejects outside workspace reads without a grant', async () => {
|
|
345
570
|
const warn = vi.spyOn(console, 'warn').mockImplementation(() => {});
|
|
346
571
|
const fsPromises = {
|
|
@@ -52,6 +52,14 @@ The following functions are exported and used by the web server:
|
|
|
52
52
|
- `removeWorktree(directory, input)`: Remove a worktree (optionally delete local branch).
|
|
53
53
|
- `isLinkedWorktree(directory)`: Check if directory is a linked worktree (not primary).
|
|
54
54
|
|
|
55
|
+
### Worktree creation from a GitHub pull request
|
|
56
|
+
The UI provisions `pr-<owner>` via `ensureRemoteName`/`ensureRemoteUrl`
|
|
57
|
+
(HTTPS clone URL preferred over SSH) and checks out
|
|
58
|
+
`remotes/pr-<owner>/<head>`. A missing head URL or unreachable fork fails with
|
|
59
|
+
a clear error before a worktree is kept. If upstream fetch fails during
|
|
60
|
+
bootstrap, tracking is left unset rather than writing `branch.*.remote` /
|
|
61
|
+
`branch.*.merge` for a ref that was never fetched.
|
|
62
|
+
|
|
55
63
|
### Commit and Remote Operations
|
|
56
64
|
- `commit(directory, message, options)`: Create a commit from the current index. `options.stageFiles` may be provided with `options.files` by older callers to stage only selected unstaged rows before committing, but the shared Git panel now stages/unstages explicitly before commit.
|
|
57
65
|
- `pull(directory, options)`: Pull changes from remote.
|
|
@@ -1891,6 +1891,100 @@ const fetchRemoteBranchRef = async (primaryWorktree, remoteName, branchName) =>
|
|
|
1891
1891
|
);
|
|
1892
1892
|
};
|
|
1893
1893
|
|
|
1894
|
+
/**
|
|
1895
|
+
* Shared existing-mode resolver for validate + create.
|
|
1896
|
+
* Provisioned remotes (`ensureRemoteName`/`ensureRemoteUrl`) are used for fork
|
|
1897
|
+
* PR heads; other existing branches keep the local / already-fetched remote path.
|
|
1898
|
+
*
|
|
1899
|
+
* @param {'validate'|'create'} intent
|
|
1900
|
+
*/
|
|
1901
|
+
const resolveExistingWorktreeSource = async (primaryWorktree, input = {}, intent = 'create') => {
|
|
1902
|
+
const preferredBranchName = cleanBranchName(String(input?.branchName || '').trim());
|
|
1903
|
+
const ensureRemoteName = String(input?.ensureRemoteName || '').trim();
|
|
1904
|
+
const ensureRemoteUrl = String(input?.ensureRemoteUrl || '').trim();
|
|
1905
|
+
const requestedExistingBranch = String(input?.existingBranch || '').trim();
|
|
1906
|
+
const wantUpstream = Boolean(input?.setUpstream);
|
|
1907
|
+
const explicitUpstreamRemote = String(input?.upstreamRemote || '').trim();
|
|
1908
|
+
const explicitUpstreamBranch = String(input?.upstreamBranch || '').trim();
|
|
1909
|
+
const parsedExistingRemote = await resolveRemoteBranchRef(primaryWorktree, requestedExistingBranch);
|
|
1910
|
+
|
|
1911
|
+
if (
|
|
1912
|
+
parsedExistingRemote
|
|
1913
|
+
&& ensureRemoteName
|
|
1914
|
+
&& ensureRemoteUrl
|
|
1915
|
+
&& parsedExistingRemote.remote === ensureRemoteName
|
|
1916
|
+
) {
|
|
1917
|
+
if (intent === 'validate') {
|
|
1918
|
+
const lsRemote = await runGitCommand(
|
|
1919
|
+
primaryWorktree,
|
|
1920
|
+
['ls-remote', '--heads', ensureRemoteUrl, `refs/heads/${parsedExistingRemote.branch}`]
|
|
1921
|
+
);
|
|
1922
|
+
if (!lsRemote.success) {
|
|
1923
|
+
throw new Error(
|
|
1924
|
+
`Unable to reach remote ${ensureRemoteName} (${ensureRemoteUrl}). `
|
|
1925
|
+
+ 'Check network access and credentials for that repository.'
|
|
1926
|
+
);
|
|
1927
|
+
}
|
|
1928
|
+
if (!String(lsRemote.stdout || '').trim()) {
|
|
1929
|
+
throw new Error(`Remote branch not found: ${parsedExistingRemote.remoteRef}`);
|
|
1930
|
+
}
|
|
1931
|
+
} else {
|
|
1932
|
+
await ensureRemoteWithUrl(primaryWorktree, ensureRemoteName, ensureRemoteUrl);
|
|
1933
|
+
try {
|
|
1934
|
+
await fetchRemoteBranchRef(
|
|
1935
|
+
primaryWorktree,
|
|
1936
|
+
parsedExistingRemote.remote,
|
|
1937
|
+
parsedExistingRemote.branch
|
|
1938
|
+
);
|
|
1939
|
+
} catch (error) {
|
|
1940
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
1941
|
+
throw new Error(
|
|
1942
|
+
`Unable to fetch ${parsedExistingRemote.remote}/${parsedExistingRemote.branch} `
|
|
1943
|
+
+ `from ${ensureRemoteUrl}. ${detail}`
|
|
1944
|
+
);
|
|
1945
|
+
}
|
|
1946
|
+
}
|
|
1947
|
+
|
|
1948
|
+
const localBranch = cleanBranchName(preferredBranchName || parsedExistingRemote.branch);
|
|
1949
|
+
return {
|
|
1950
|
+
localBranch,
|
|
1951
|
+
checkoutRef: parsedExistingRemote.remoteRef,
|
|
1952
|
+
createLocalBranch: true,
|
|
1953
|
+
setUpstream: wantUpstream,
|
|
1954
|
+
upstream: {
|
|
1955
|
+
remote: explicitUpstreamRemote || parsedExistingRemote.remote,
|
|
1956
|
+
branch: explicitUpstreamBranch || parsedExistingRemote.branch,
|
|
1957
|
+
},
|
|
1958
|
+
};
|
|
1959
|
+
}
|
|
1960
|
+
|
|
1961
|
+
if (!requestedExistingBranch) {
|
|
1962
|
+
throw new Error('existingBranch is required in existing mode');
|
|
1963
|
+
}
|
|
1964
|
+
|
|
1965
|
+
const resolved = await resolveBranchForExistingMode(
|
|
1966
|
+
primaryWorktree,
|
|
1967
|
+
requestedExistingBranch,
|
|
1968
|
+
preferredBranchName
|
|
1969
|
+
);
|
|
1970
|
+
const upstream = resolved.remoteRef
|
|
1971
|
+
? {
|
|
1972
|
+
remote: explicitUpstreamRemote || resolved.remoteRef.remote,
|
|
1973
|
+
branch: explicitUpstreamBranch || resolved.remoteRef.branch,
|
|
1974
|
+
}
|
|
1975
|
+
: (explicitUpstreamRemote && explicitUpstreamBranch
|
|
1976
|
+
? { remote: explicitUpstreamRemote, branch: explicitUpstreamBranch }
|
|
1977
|
+
: null);
|
|
1978
|
+
|
|
1979
|
+
return {
|
|
1980
|
+
localBranch: resolved.localBranch,
|
|
1981
|
+
checkoutRef: resolved.checkoutRef,
|
|
1982
|
+
createLocalBranch: resolved.createLocalBranch,
|
|
1983
|
+
setUpstream: wantUpstream && Boolean(upstream),
|
|
1984
|
+
upstream,
|
|
1985
|
+
};
|
|
1986
|
+
};
|
|
1987
|
+
|
|
1894
1988
|
const checkRemoteBranchExists = async (primaryWorktree, remoteName, branchName, remoteUrl = '') => {
|
|
1895
1989
|
const remote = String(remoteName || '').trim();
|
|
1896
1990
|
const branch = String(branchName || '').trim();
|
|
@@ -1914,19 +2008,6 @@ const checkRemoteBranchExists = async (primaryWorktree, remoteName, branchName,
|
|
|
1914
2008
|
};
|
|
1915
2009
|
};
|
|
1916
2010
|
|
|
1917
|
-
const setBranchTrackingFallback = async (worktreeDirectory, localBranch, upstream) => {
|
|
1918
|
-
await runGitCommandOrThrow(
|
|
1919
|
-
worktreeDirectory,
|
|
1920
|
-
['config', `branch.${localBranch}.remote`, upstream.remote],
|
|
1921
|
-
`Failed to set branch.${localBranch}.remote`
|
|
1922
|
-
);
|
|
1923
|
-
await runGitCommandOrThrow(
|
|
1924
|
-
worktreeDirectory,
|
|
1925
|
-
['config', `branch.${localBranch}.merge`, `refs/heads/${upstream.branch}`],
|
|
1926
|
-
`Failed to set branch.${localBranch}.merge`
|
|
1927
|
-
);
|
|
1928
|
-
};
|
|
1929
|
-
|
|
1930
2011
|
const applyUpstreamConfiguration = async (args) => {
|
|
1931
2012
|
const {
|
|
1932
2013
|
primaryWorktree,
|
|
@@ -1952,23 +2033,19 @@ const applyUpstreamConfiguration = async (args) => {
|
|
|
1952
2033
|
return;
|
|
1953
2034
|
}
|
|
1954
2035
|
|
|
1955
|
-
let fetched = true;
|
|
1956
2036
|
try {
|
|
1957
2037
|
await fetchRemoteBranchRef(primaryWorktree, upstream.remote, upstream.branch);
|
|
1958
2038
|
} catch {
|
|
1959
|
-
|
|
1960
|
-
|
|
1961
|
-
|
|
1962
|
-
if (fetched) {
|
|
1963
|
-
await runGitCommandOrThrow(
|
|
1964
|
-
worktreeDirectory,
|
|
1965
|
-
['branch', `--set-upstream-to=${upstream.full}`, localBranch],
|
|
1966
|
-
`Failed to set upstream to ${upstream.full}`
|
|
1967
|
-
);
|
|
2039
|
+
// Fetch failed: leave tracking unset. Do not write branch.*.remote/merge
|
|
2040
|
+
// pointing at a ref that was never fetched.
|
|
1968
2041
|
return;
|
|
1969
2042
|
}
|
|
1970
2043
|
|
|
1971
|
-
await
|
|
2044
|
+
await runGitCommandOrThrow(
|
|
2045
|
+
worktreeDirectory,
|
|
2046
|
+
['branch', `--set-upstream-to=${upstream.full}`, localBranch],
|
|
2047
|
+
`Failed to set upstream to ${upstream.full}`
|
|
2048
|
+
);
|
|
1972
2049
|
};
|
|
1973
2050
|
|
|
1974
2051
|
export async function isGitRepository(directory) {
|
|
@@ -3759,33 +3836,13 @@ export async function validateWorktreeCreate(directory, input = {}) {
|
|
|
3759
3836
|
|
|
3760
3837
|
if (mode === 'existing') {
|
|
3761
3838
|
try {
|
|
3762
|
-
const
|
|
3763
|
-
|
|
3764
|
-
if (
|
|
3765
|
-
const lsRemote = await runGitCommand(
|
|
3766
|
-
context.primaryWorktree,
|
|
3767
|
-
['ls-remote', '--heads', ensureRemoteUrl, `refs/heads/${parsedExistingRemote.branch}`]
|
|
3768
|
-
);
|
|
3769
|
-
if (!lsRemote.success) {
|
|
3770
|
-
throw new Error(`Unable to query remote ${ensureRemoteName}`);
|
|
3771
|
-
}
|
|
3772
|
-
if (!String(lsRemote.stdout || '').trim()) {
|
|
3773
|
-
throw new Error(`Remote branch not found: ${parsedExistingRemote.remoteRef}`);
|
|
3774
|
-
}
|
|
3775
|
-
localBranch = cleanBranchName(preferredBranchName || parsedExistingRemote.branch);
|
|
3839
|
+
const resolved = await resolveExistingWorktreeSource(context.primaryWorktree, input, 'validate');
|
|
3840
|
+
localBranch = resolved.localBranch || '';
|
|
3841
|
+
if (resolved.upstream) {
|
|
3776
3842
|
inferredUpstream = {
|
|
3777
|
-
remote:
|
|
3778
|
-
branch:
|
|
3843
|
+
remote: resolved.upstream.remote,
|
|
3844
|
+
branch: resolved.upstream.branch,
|
|
3779
3845
|
};
|
|
3780
|
-
} else {
|
|
3781
|
-
const resolved = await resolveBranchForExistingMode(context.primaryWorktree, requestedExistingBranch, preferredBranchName);
|
|
3782
|
-
localBranch = resolved.localBranch || '';
|
|
3783
|
-
if (resolved.remoteRef) {
|
|
3784
|
-
inferredUpstream = {
|
|
3785
|
-
remote: resolved.remoteRef.remote,
|
|
3786
|
-
branch: resolved.remoteRef.branch,
|
|
3787
|
-
};
|
|
3788
|
-
}
|
|
3789
3846
|
}
|
|
3790
3847
|
} catch (error) {
|
|
3791
3848
|
errors.push({
|
|
@@ -3954,25 +4011,19 @@ export async function previewWorktreeCreate(directory, input = {}) {
|
|
|
3954
4011
|
|
|
3955
4012
|
async function attachGitWorktreeToCandidate(context, candidate, input = {}) {
|
|
3956
4013
|
const mode = input?.mode === 'existing' ? 'existing' : 'new';
|
|
3957
|
-
const preferredBranchName = cleanBranchName(String(input?.branchName || '').trim());
|
|
3958
4014
|
const startRef = normalizeStartRef(input?.startRef);
|
|
3959
|
-
|
|
3960
|
-
|
|
4015
|
+
let ensureRemoteName = String(input?.ensureRemoteName || '').trim();
|
|
4016
|
+
let ensureRemoteUrl = String(input?.ensureRemoteUrl || '').trim();
|
|
3961
4017
|
|
|
3962
4018
|
let localBranch = '';
|
|
3963
4019
|
let inferredUpstream = null;
|
|
4020
|
+
let shouldSetUpstream = Boolean(input?.setUpstream);
|
|
3964
4021
|
const worktreeAddArgs = ['worktree', 'add', '--no-checkout'];
|
|
3965
4022
|
|
|
3966
4023
|
if (mode === 'existing') {
|
|
3967
|
-
const
|
|
3968
|
-
const parsedExistingRemote = await resolveRemoteBranchRef(context.primaryWorktree, requestedExistingBranch);
|
|
3969
|
-
if (parsedExistingRemote && ensureRemoteName && ensureRemoteUrl && parsedExistingRemote.remote === ensureRemoteName) {
|
|
3970
|
-
await ensureRemoteWithUrl(context.primaryWorktree, ensureRemoteName, ensureRemoteUrl);
|
|
3971
|
-
await fetchRemoteBranchRef(context.primaryWorktree, parsedExistingRemote.remote, parsedExistingRemote.branch);
|
|
3972
|
-
}
|
|
3973
|
-
|
|
3974
|
-
const resolved = await resolveBranchForExistingMode(context.primaryWorktree, requestedExistingBranch, preferredBranchName);
|
|
4024
|
+
const resolved = await resolveExistingWorktreeSource(context.primaryWorktree, input, 'create');
|
|
3975
4025
|
localBranch = resolved.localBranch;
|
|
4026
|
+
shouldSetUpstream = resolved.setUpstream;
|
|
3976
4027
|
|
|
3977
4028
|
const inUse = await findBranchInUse(context.primaryWorktree, localBranch);
|
|
3978
4029
|
if (inUse) {
|
|
@@ -3984,10 +4035,10 @@ async function attachGitWorktreeToCandidate(context, candidate, input = {}) {
|
|
|
3984
4035
|
}
|
|
3985
4036
|
worktreeAddArgs.push(candidate.directory, resolved.checkoutRef);
|
|
3986
4037
|
|
|
3987
|
-
if (resolved.
|
|
4038
|
+
if (resolved.upstream) {
|
|
3988
4039
|
inferredUpstream = {
|
|
3989
|
-
remote: resolved.
|
|
3990
|
-
branch: resolved.
|
|
4040
|
+
remote: resolved.upstream.remote,
|
|
4041
|
+
branch: resolved.upstream.branch,
|
|
3991
4042
|
};
|
|
3992
4043
|
}
|
|
3993
4044
|
} else {
|
|
@@ -4033,9 +4084,12 @@ async function attachGitWorktreeToCandidate(context, candidate, input = {}) {
|
|
|
4033
4084
|
|
|
4034
4085
|
await runGitCommandOrThrow(context.primaryWorktree, worktreeAddArgs, 'Failed to create git worktree');
|
|
4035
4086
|
|
|
4036
|
-
const
|
|
4037
|
-
|
|
4038
|
-
|
|
4087
|
+
const upstreamRemote = shouldSetUpstream
|
|
4088
|
+
? String(inferredUpstream?.remote || input?.upstreamRemote || '').trim()
|
|
4089
|
+
: '';
|
|
4090
|
+
const upstreamBranch = shouldSetUpstream
|
|
4091
|
+
? String(inferredUpstream?.branch || input?.upstreamBranch || '').trim()
|
|
4092
|
+
: '';
|
|
4039
4093
|
|
|
4040
4094
|
const bootstrapStatus = setWorktreeBootstrapState(
|
|
4041
4095
|
candidate.directory,
|
|
@@ -4697,7 +4751,7 @@ export async function renameBranch(directory, oldName, newName) {
|
|
|
4697
4751
|
`Failed to set upstream to ${upstream.full}`
|
|
4698
4752
|
);
|
|
4699
4753
|
} catch {
|
|
4700
|
-
|
|
4754
|
+
// Leave tracking unset rather than writing config for a missing ref.
|
|
4701
4755
|
}
|
|
4702
4756
|
}
|
|
4703
4757
|
}
|
|
@@ -27,6 +27,7 @@ import {
|
|
|
27
27
|
applyHunk,
|
|
28
28
|
getDiff,
|
|
29
29
|
getFileDiff,
|
|
30
|
+
validateWorktreeCreate,
|
|
30
31
|
} from './service.js';
|
|
31
32
|
|
|
32
33
|
// ---------------------------------------------------------------------------
|
|
@@ -806,6 +807,134 @@ describe('createWorktree', () => {
|
|
|
806
807
|
});
|
|
807
808
|
});
|
|
808
809
|
|
|
810
|
+
// ---------------------------------------------------------------------------
|
|
811
|
+
// createWorktree from a forked GitHub PR head (issue #2422)
|
|
812
|
+
// ---------------------------------------------------------------------------
|
|
813
|
+
|
|
814
|
+
describe('createWorktree from a forked GitHub PR', () => {
|
|
815
|
+
const withDataHome = async (test) => {
|
|
816
|
+
const previousXdgDataHome = process.env.XDG_DATA_HOME;
|
|
817
|
+
const dataHome = createTempDir();
|
|
818
|
+
process.env.XDG_DATA_HOME = dataHome;
|
|
819
|
+
try {
|
|
820
|
+
await test(dataHome);
|
|
821
|
+
} finally {
|
|
822
|
+
if (previousXdgDataHome === undefined) {
|
|
823
|
+
delete process.env.XDG_DATA_HOME;
|
|
824
|
+
} else {
|
|
825
|
+
process.env.XDG_DATA_HOME = previousXdgDataHome;
|
|
826
|
+
}
|
|
827
|
+
}
|
|
828
|
+
};
|
|
829
|
+
|
|
830
|
+
const publishForkHead = (repository, forkBare, branchName) => {
|
|
831
|
+
fs.writeFileSync(path.join(repository, 'FORK.md'), `# ${branchName}\n`);
|
|
832
|
+
runGit(repository, ['add', 'FORK.md']);
|
|
833
|
+
runGit(repository, ['commit', '-m', `fork ${branchName}`]);
|
|
834
|
+
const sha = runGit(repository, ['rev-parse', 'HEAD']).trim();
|
|
835
|
+
runGit(repository, ['push', forkBare, `HEAD:refs/heads/${branchName}`]);
|
|
836
|
+
return sha;
|
|
837
|
+
};
|
|
838
|
+
|
|
839
|
+
const getBranchTrackingRemote = (directory, branch) => {
|
|
840
|
+
try {
|
|
841
|
+
return runGit(directory, ['config', '--get', `branch.${branch}.remote`]).trim();
|
|
842
|
+
} catch {
|
|
843
|
+
return '';
|
|
844
|
+
}
|
|
845
|
+
};
|
|
846
|
+
|
|
847
|
+
const forkWorktreeInput = ({ fork, worktreeName }) => ({
|
|
848
|
+
mode: 'existing',
|
|
849
|
+
branchName: 'feature/login',
|
|
850
|
+
worktreeName,
|
|
851
|
+
existingBranch: 'remotes/pr-alice/feature/login',
|
|
852
|
+
setUpstream: true,
|
|
853
|
+
upstreamRemote: 'pr-alice',
|
|
854
|
+
upstreamBranch: 'feature/login',
|
|
855
|
+
ensureRemoteName: 'pr-alice',
|
|
856
|
+
ensureRemoteUrl: fork,
|
|
857
|
+
});
|
|
858
|
+
|
|
859
|
+
it('creates a worktree from a reachable fork head remote', async () => {
|
|
860
|
+
if (!canRunGit()) return;
|
|
861
|
+
|
|
862
|
+
await withDataHome(async () => {
|
|
863
|
+
const { repository } = createRepositoryWithRemote();
|
|
864
|
+
const fork = createTempDir();
|
|
865
|
+
runGit(fork, ['init', '--bare']);
|
|
866
|
+
const sha = publishForkHead(repository, fork, 'feature/login');
|
|
867
|
+
|
|
868
|
+
const created = await createWorktree(repository, forkWorktreeInput({
|
|
869
|
+
fork,
|
|
870
|
+
worktreeName: 'pr-42',
|
|
871
|
+
}));
|
|
872
|
+
|
|
873
|
+
expect(created.branch).toBe('feature/login');
|
|
874
|
+
expect(runGit(created.path, ['rev-parse', 'HEAD']).trim()).toBe(sha);
|
|
875
|
+
await expect.poll(() => fs.existsSync(path.join(created.path, 'FORK.md')), { timeout: 5_000 }).toBe(true);
|
|
876
|
+
expect(runGit(repository, ['remote', 'get-url', 'pr-alice']).trim()).toBe(fork);
|
|
877
|
+
await expect.poll(
|
|
878
|
+
() => getBranchTrackingRemote(created.path, 'feature/login') === 'pr-alice',
|
|
879
|
+
{ timeout: 5_000 }
|
|
880
|
+
).toBe(true);
|
|
881
|
+
});
|
|
882
|
+
}, 30_000);
|
|
883
|
+
|
|
884
|
+
it('rejects an unreachable fork with an actionable error and no worktree', async () => {
|
|
885
|
+
if (!canRunGit()) return;
|
|
886
|
+
|
|
887
|
+
await withDataHome(async () => {
|
|
888
|
+
const { repository } = createRepositoryWithRemote();
|
|
889
|
+
const missingFork = path.join(createTempDir(), 'missing-fork.git');
|
|
890
|
+
const before = runGit(repository, ['worktree', 'list', '--porcelain']);
|
|
891
|
+
|
|
892
|
+
await expect(createWorktree(repository, forkWorktreeInput({
|
|
893
|
+
fork: missingFork,
|
|
894
|
+
worktreeName: 'pr-42-unreachable',
|
|
895
|
+
}))).rejects.toThrow(/Unable to (reach|fetch)/i);
|
|
896
|
+
|
|
897
|
+
expect(runGit(repository, ['worktree', 'list', '--porcelain'])).toBe(before);
|
|
898
|
+
|
|
899
|
+
const validation = await validateWorktreeCreate(repository, forkWorktreeInput({
|
|
900
|
+
fork: missingFork,
|
|
901
|
+
worktreeName: 'pr-42-unreachable',
|
|
902
|
+
}));
|
|
903
|
+
expect(validation.ok).toBe(false);
|
|
904
|
+
expect(validation.errors.some((error) => /Unable to (reach|fetch)/i.test(error.message))).toBe(true);
|
|
905
|
+
});
|
|
906
|
+
}, 30_000);
|
|
907
|
+
|
|
908
|
+
it('does not write upstream tracking when the upstream ref cannot be fetched', async () => {
|
|
909
|
+
if (!canRunGit()) return;
|
|
910
|
+
|
|
911
|
+
await withDataHome(async () => {
|
|
912
|
+
const { repository } = createRepositoryWithRemote();
|
|
913
|
+
runGit(repository, ['branch', 'feature/tracking']);
|
|
914
|
+
const emptyRemote = createTempDir();
|
|
915
|
+
runGit(emptyRemote, ['init', '--bare']);
|
|
916
|
+
runGit(repository, ['remote', 'add', 'broken-upstream', emptyRemote]);
|
|
917
|
+
|
|
918
|
+
const created = await createWorktree(repository, {
|
|
919
|
+
mode: 'existing',
|
|
920
|
+
branchName: 'feature/tracking-wt',
|
|
921
|
+
worktreeName: 'feature-tracking-wt',
|
|
922
|
+
existingBranch: 'feature/tracking',
|
|
923
|
+
setUpstream: true,
|
|
924
|
+
upstreamRemote: 'broken-upstream',
|
|
925
|
+
upstreamBranch: 'does-not-exist',
|
|
926
|
+
});
|
|
927
|
+
|
|
928
|
+
await expect.poll(
|
|
929
|
+
() => getWorktreeBootstrapStatus(created.path).then((status) => status.status === 'ready' || status.status === 'failed'),
|
|
930
|
+
{ timeout: 5_000 }
|
|
931
|
+
).toBe(true);
|
|
932
|
+
|
|
933
|
+
expect(getBranchTrackingRemote(created.path, 'feature/tracking-wt')).toBe('');
|
|
934
|
+
});
|
|
935
|
+
}, 30_000);
|
|
936
|
+
});
|
|
937
|
+
|
|
809
938
|
// ---------------------------------------------------------------------------
|
|
810
939
|
// removeWorktree
|
|
811
940
|
// ---------------------------------------------------------------------------
|