@openchamber/web 2.0.2 → 2.0.4
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/bin/lib/DOCUMENTATION.md +1 -1
- package/bin/lib/commands-connect-url.js +6 -5
- package/bin/lib/commands-tunnel.js +24 -5
- package/dist/assets/{CodeMirrorCommentWidgets-CmKmyb9T.js → CodeMirrorCommentWidgets-C_zL-eri.js} +1 -1
- package/dist/assets/{DiffView-8-PFpZ2p.js → DiffView-BeN2_YYF.js} +3 -3
- package/dist/assets/FilesView-CN34wm_N.js +17 -0
- package/dist/assets/{GitView-DNUSu00w.js → GitView-DLDazOo1.js} +4 -4
- package/dist/assets/{GuestAttachDialog-Cv6QzjHC.js → GuestAttachDialog-C0xe_Lyy.js} +1 -1
- package/dist/assets/{GuestSurfacePane-Bt3jB_Ye.js → GuestSurfacePane-BdaurnDr.js} +1 -1
- package/dist/assets/{JsonTreeView-BlyHTRhM.js → JsonTreeView-B1Xq-k2t.js} +1 -1
- package/dist/assets/LinearIssuesView-BryoAHow.js +1 -0
- package/dist/assets/{MarkdownImageGallery-2UXJF-5B.js → MarkdownImageGallery-DfuEoaGq.js} +1 -1
- package/dist/assets/MarkdownRendererImpl-B_ZcWOvX.js +12 -0
- package/dist/assets/OnboardingScreen-C22bGmnP.js +1 -0
- package/dist/assets/{PatchDiff-ByvnbG5T.js → PatchDiff-0xd6UeFB.js} +1 -1
- package/dist/assets/{PierreDiffViewer-BXieg0mH.js → PierreDiffViewer-BC950e3F.js} +3 -3
- package/dist/assets/PlanView-B7Xgihqk.js +5 -0
- package/dist/assets/PluginPane-2C71F8uF.js +3 -0
- package/dist/assets/SettingsView-m_zoFiaT.js +30 -0
- package/dist/assets/{SettingsWindow-BIz224xs.js → SettingsWindow-CofS020b.js} +1 -1
- package/dist/assets/{SubmoduleDiffSummary-CXKmlps9.js → SubmoduleDiffSummary-BSA9gnIO.js} +1 -1
- package/dist/assets/{ToolOutputDialog-BsgAK8xu.js → ToolOutputDialog-DprkVKcj.js} +7 -7
- package/dist/assets/{ToolPartDiffPreview-vdPObXOf.js → ToolPartDiffPreview-Dq0go_fX.js} +2 -2
- package/dist/assets/{VirtualizedFileDiff-BkFNKWS5.js → VirtualizedFileDiff-Kp8hKJdT.js} +1 -1
- package/dist/assets/WalkthroughView-DGnTzqIU.js +4 -0
- package/dist/assets/{appThemeRegistry-aHUNHoqP.js → appThemeRegistry-BdEHBA4s.js} +1 -1
- package/dist/assets/{commitAndPush-Bon9r94r.js → commitAndPush-LwtVa2Oc.js} +1 -1
- package/dist/assets/{computeVirtualFileMetrics-DKqr_1AQ.js → computeVirtualFileMetrics-6V1xNpO9.js} +2 -2
- package/dist/assets/de-DlgBHUAI.js +10 -0
- package/dist/assets/es-BC8G41U8.js +16 -0
- package/dist/assets/fr-I0z3vVjy.js +14 -0
- package/dist/assets/index-CgR5rJq_.js +41 -0
- package/dist/assets/{index-DpFttslC.js → index-CmNPYddV.js} +1 -1
- package/dist/assets/index-adyy_sEk.css +1 -0
- package/dist/assets/{isDiffPlainText-kzAgpIgi.js → isDiffPlainText-1bXcWCrw.js} +1 -1
- package/dist/assets/{isFilePlainText-Uj6y-jzz.js → isFilePlainText-CBAppvy1.js} +1 -1
- package/dist/assets/ja-BIElEsY8.js +16 -0
- package/dist/assets/ko-DRnnHetA.js +16 -0
- package/dist/assets/{main-CbfMxn-I.js → main-CzjTMTfW.js} +2 -2
- package/dist/assets/main-DVX34beR.js +886 -0
- package/dist/assets/markdownCore-Cxbkn5NR.js +7 -0
- package/dist/assets/{miniChat-CiAKBC10.js → miniChat-CP68IL8Q.js} +2 -2
- package/dist/assets/{mobile-CsT4sJwC.js → mobile-BrlBrNfZ.js} +2 -2
- package/dist/assets/nl-DzUV-kwp.js +16 -0
- package/dist/assets/{patchFileDiff-DeaE08W0.js → patchFileDiff-pqRSHLHI.js} +2 -2
- package/dist/assets/pl-Bb-cb7k7.js +16 -0
- package/dist/assets/pt-BR-CyIWrTcE.js +16 -0
- package/dist/assets/renderElectronMiniChatApp-DKIilR7N.js +2 -0
- package/dist/assets/renderMobileApp-B0z6-x58.js +25 -0
- package/dist/assets/runtimeEndpointReset-uu1DBwLL.js +52 -0
- package/dist/assets/{scheduledTasksApi-BZCNJ588.js → scheduledTasksApi-BuzWT445.js} +1 -1
- package/dist/assets/{shikiHighlight-BSUEa3yF.js → shikiHighlight-BWGrY5YU.js} +1 -1
- package/dist/assets/{textMateThemeFromAppTheme-CsATFZIV.js → textMateThemeFromAppTheme-BSUFChBY.js} +1 -1
- package/dist/assets/tr-DXEDSoYO.js +7 -0
- package/dist/assets/uk-C8hN--q_.js +16 -0
- package/dist/assets/useAppFontEffects-Dsl_sLrj.js +7366 -0
- package/dist/assets/useInlineCommentController-d5vntsQ_.js +2 -0
- package/dist/assets/{useRootScrollLock-Cp1eFoM2.js → useRootScrollLock-2rd5Y6gR.js} +2 -2
- package/dist/assets/{vendor-base-ui-CsXYnR5c.js → vendor-base-ui-DnNniUWp.js} +1 -1
- package/dist/assets/{vendor-codemirror-language-data-BwwommM0.js → vendor-codemirror-language-data-B1EetJur.js} +2 -2
- package/dist/assets/vendor-opencode-client-DSZl7jSi.js +12 -0
- package/dist/assets/{vendor-tanstack-react-virtual-ClYN8CzB.js → vendor-tanstack-react-virtual--0sBrLRh.js} +1 -1
- package/dist/assets/{vendor-tanstack-virtual-core-BewVQryB.js → vendor-tanstack-virtual-core-BoA4iGMw.js} +1 -1
- package/dist/assets/{vendor-zod-BSoePkpP.js → vendor-zod-CxRSdNoV.js} +4 -4
- package/dist/assets/{web-components-D3Yjr4Zx.js → web-components-ngpHPEDU.js} +1 -1
- package/dist/assets/zh-CN-CtzXdjMZ.js +16 -0
- package/dist/assets/zh-TW-Ds0CADSz.js +16 -0
- package/dist/index.html +5 -5
- package/dist/mini-chat.html +5 -5
- package/dist/mobile.html +5 -5
- package/package.json +5 -5
- package/server/index.js +82 -4
- package/server/lib/agent-tool/DOCUMENTATION.md +8 -1
- package/server/lib/agent-tool/runtime.js +13 -4
- package/server/lib/agent-tool/runtime.test.js +15 -0
- package/server/lib/context-obligatory/DOCUMENTATION.md +10 -7
- package/server/lib/context-obligatory/runtime.js +2 -1
- package/server/lib/context-obligatory/runtime.test.js +76 -30
- package/server/lib/dictation/DOCUMENTATION.md +4 -1
- package/server/lib/dictation/openai-compatible-session.js +7 -0
- package/server/lib/enterprise-mode.d.ts +30 -0
- package/server/lib/enterprise-mode.js +253 -0
- package/server/lib/enterprise-mode.test.js +247 -0
- package/server/lib/event-stream/translate-v2.js +6 -0
- package/server/lib/event-stream/translate-v2.test.js +6 -0
- package/server/lib/git/DOCUMENTATION.md +2 -1
- package/server/lib/git/routes.js +44 -1
- package/server/lib/git/routes.test.js +98 -1
- package/server/lib/git/service.js +146 -11
- package/server/lib/git/service.test.js +195 -0
- package/server/lib/github/routes.js +9 -19
- package/server/lib/github/routes.test.js +112 -0
- package/server/lib/guests/DOCUMENTATION.md +4 -2
- package/server/lib/guests/background.test.js +1 -1
- package/server/lib/guests/catalog.js +56 -2
- package/server/lib/guests/catalog.test.js +24 -1
- package/server/lib/guests/clone-network.test.js +52 -0
- package/server/lib/guests/clone.js +30 -4
- package/server/lib/guests/enterprise.js +68 -0
- package/server/lib/guests/enterprise.test.js +106 -0
- package/server/lib/guests/grant-scope.js +8 -2
- package/server/lib/guests/grant-scope.test.js +9 -0
- package/server/lib/guests/html-styles.js +16 -2
- package/server/lib/guests/html-styles.test.js +53 -4
- package/server/lib/guests/install.js +10 -0
- package/server/lib/guests/persist.js +1 -0
- package/server/lib/guests/routes.js +40 -5
- package/server/lib/guests/updates.js +9 -2
- package/server/lib/notifications/DOCUMENTATION.md +1 -1
- package/server/lib/notifications/runtime.js +22 -8
- package/server/lib/notifications/trigger-runtime.test.js +45 -0
- package/server/lib/openchamber-sessions/session-metadata-store.js +27 -0
- package/server/lib/openchamber-sessions/session-metadata-store.test.js +18 -0
- package/server/lib/opencode/DOCUMENTATION.md +13 -9
- package/server/lib/opencode/auth-state-runtime.js +2 -2
- package/server/lib/opencode/config-paths.test.js +1 -0
- package/server/lib/opencode/env-runtime.js +26 -3
- package/server/lib/opencode/env-runtime.test.js +57 -0
- package/server/lib/opencode/feature-routes-runtime.js +2 -0
- package/server/lib/opencode/hmr-state-runtime.js +4 -3
- package/server/lib/opencode/lifecycle.js +10 -5
- package/server/lib/opencode/lifecycle.test.js +6 -2
- package/server/lib/opencode/managed-config-file.js +2 -1
- package/server/lib/opencode/managed-config-file.test.js +18 -0
- package/server/lib/opencode/npm-registry-config.d.ts +1 -0
- package/server/lib/opencode/npm-registry-config.js +123 -0
- package/server/lib/opencode/npm-registry-config.test.js +167 -0
- package/server/lib/opencode/npm-registry.js +5 -6
- package/server/lib/opencode/npm-registry.test.js +30 -0
- package/server/lib/opencode/openchamber-routes.js +8 -0
- package/server/lib/opencode/project-icon-routes.js +2 -2
- package/server/lib/opencode/project-icon-routes.test.js +44 -0
- package/server/lib/opencode/provider-source-route.test.js +32 -0
- package/server/lib/opencode/routes.js +17 -2
- package/server/lib/opencode/settings-helpers.js +26 -3
- package/server/lib/opencode/settings-helpers.test.js +12 -5
- package/server/lib/opencode/settings-registry.json +35 -1
- package/server/lib/opencode/settings-runtime.js +1 -0
- package/server/lib/opencode/shutdown-runtime.js +2 -0
- package/server/lib/opencode/static-routes-runtime.js +9 -1
- package/server/lib/opencode/static-routes-runtime.test.js +58 -1
- package/server/lib/package-manager.js +4 -1
- package/server/lib/package-manager.test.js +24 -0
- package/server/lib/permission-auto-accept/DOCUMENTATION.md +23 -15
- package/server/lib/permission-auto-accept/modes.js +26 -0
- package/server/lib/permission-auto-accept/runtime.js +146 -40
- package/server/lib/permission-auto-accept/runtime.test.js +93 -9
- package/server/lib/quota/DOCUMENTATION.md +6 -0
- package/server/lib/quota/providers/zhipuai-coding-plan.js +74 -30
- package/server/lib/quota/providers/zhipuai-coding-plan.test.js +124 -0
- package/server/lib/relay/DOCUMENTATION.md +1 -1
- package/server/lib/relay/service.js +32 -12
- package/server/lib/relay/service.test.js +30 -0
- package/server/lib/routing/DOCUMENTATION.md +150 -41
- package/server/lib/routing/classifier.js +156 -0
- package/server/lib/routing/defaults.js +27 -0
- package/server/lib/routing/jev.js +5 -17
- package/server/lib/routing/routes.http.test.js +9 -0
- package/server/lib/routing/routes.js +27 -1
- package/server/lib/routing/runtime.js +199 -33
- package/server/lib/routing/runtime.test.js +299 -15
- package/server/lib/routing/store.js +57 -0
- package/server/lib/routing/store.test.js +37 -0
- package/server/lib/session-assist/DOCUMENTATION.md +17 -7
- package/server/lib/session-assist/context.js +42 -2
- package/server/lib/session-assist/context.test.js +38 -1
- package/server/lib/session-assist/runtime.js +57 -13
- package/server/lib/session-assist/runtime.test.js +45 -0
- package/server/lib/session-goal/DOCUMENTATION.md +47 -22
- package/server/lib/session-goal/audit.js +112 -0
- package/server/lib/session-goal/audit.test.js +58 -0
- package/server/lib/session-goal/runtime.js +113 -134
- package/server/lib/session-goal/runtime.test.js +146 -13
- package/server/lib/session-lineage.js +52 -0
- package/server/lib/session-lineage.test.js +45 -0
- package/server/lib/session-work/DOCUMENTATION.md +108 -0
- package/server/lib/session-work/questions.js +126 -0
- package/server/lib/session-work/runtime.js +278 -0
- package/server/lib/session-work/runtime.test.js +255 -0
- package/server/lib/session-work/state.js +48 -0
- package/server/lib/session-work/state.test.js +34 -0
- package/server/lib/small-model/DOCUMENTATION.md +14 -7
- package/server/lib/small-model/client.js +7 -4
- package/server/lib/small-model/index.js +11 -21
- package/server/lib/small-model/index.test.js +13 -26
- package/server/lib/spaces/DOCUMENTATION.md +79 -25
- package/server/lib/spaces/gatekeeper-channel.js +63 -11
- package/server/lib/spaces/gatekeeper-channel.test.js +34 -4
- package/server/lib/spaces/gatekeeper-program.cjs +64 -13
- package/server/lib/spaces/gatekeeper-program.test.js +115 -3
- package/server/lib/spaces/host.js +58 -13
- package/server/lib/spaces/host.test.js +34 -1
- package/server/lib/spaces/idle-stop.js +98 -0
- package/server/lib/spaces/idle-stop.test.js +130 -0
- package/server/lib/spaces/journey.js +427 -17
- package/server/lib/spaces/journey.test.js +592 -5
- package/server/lib/spaces/layout.js +27 -6
- package/server/lib/spaces/manager.test.js +1 -1
- package/server/lib/spaces/places/contract-suite.js +4 -2
- package/server/lib/spaces/places/docker-live-support.js +27 -4
- package/server/lib/spaces/places/docker.js +32 -5
- package/server/lib/spaces/places/docker.test.js +38 -8
- package/server/lib/spaces/places/escape-suite.js +32 -0
- package/server/lib/spaces/places/fake-docker.js +3 -1
- package/server/lib/spaces/places/grants.docker.live.test.js +197 -0
- package/server/lib/spaces/places/memory-place.js +3 -3
- package/server/lib/spaces/places/sessions.docker.live.test.js +4 -2
- package/server/lib/spaces/routes.js +49 -1
- package/server/lib/spaces/routes.test.js +31 -3
- package/server/lib/spaces/space-opencode.js +52 -0
- package/server/lib/spaces/space-opencode.test.js +41 -0
- package/server/lib/spaces/space-records.js +90 -2
- package/server/lib/spaces/space-records.test.js +58 -1
- package/server/lib/spaces/space-server.js +13 -1
- package/server/lib/spaces/space-server.test.js +13 -0
- package/server/lib/spaces/space-setup.js +173 -0
- package/server/lib/spaces/space-setup.test.js +174 -0
- package/server/lib/tts/DOCUMENTATION.md +3 -0
- package/server/lib/tts/base-url.js +8 -0
- package/server/lib/tts/routes.js +13 -1
- package/server/lib/tts/routes.test.js +26 -0
- package/server/lib/tunnels/DOCUMENTATION.md +2 -0
- package/server/lib/tunnels/routes.js +14 -0
- package/server/lib/tunnels/routes.test.js +26 -0
- package/server/lib/walkthrough/index.js +11 -7
- package/server/lib/walkthrough/jobs.test.js +8 -0
- package/server/lib/walkthrough/languages.js +1 -0
- package/server/lib/walkthrough/routes.js +7 -1
- package/dist/assets/FilesView-0Ie20mEk.js +0 -17
- package/dist/assets/LinearIssuesView-CSl2MUfA.js +0 -1
- package/dist/assets/MarkdownRendererImpl-DVHqZoug.js +0 -12
- package/dist/assets/OnboardingScreen-CIdXJpfc.js +0 -1
- package/dist/assets/PlanView-DEIi3Q7M.js +0 -5
- package/dist/assets/PluginPane-BEPUWVho.js +0 -3
- package/dist/assets/SettingsView-CiNh-RbW.js +0 -30
- package/dist/assets/WalkthroughView-6oE-MuDL.js +0 -4
- package/dist/assets/de-CgAJ51z7.js +0 -10
- package/dist/assets/es-zGi_ravM.js +0 -16
- package/dist/assets/fr-CPfogrWx.js +0 -14
- package/dist/assets/index-CHfphYL3.js +0 -41
- package/dist/assets/index-DvMJ3w6V.css +0 -1
- package/dist/assets/ja-DMk6wd-U.js +0 -16
- package/dist/assets/ko-BFpzJ8jc.js +0 -16
- package/dist/assets/main-anyZFMIs.js +0 -896
- package/dist/assets/markdownCore-CmM47cAE.js +0 -7
- package/dist/assets/pl-VdRPcZrB.js +0 -16
- package/dist/assets/pt-BR-BRys_lOW.js +0 -16
- package/dist/assets/renderElectronMiniChatApp-C5677jy0.js +0 -2
- package/dist/assets/renderMobileApp-D4dBBAqQ.js +0 -25
- package/dist/assets/runtimeEndpointReset-5r0hkd-2.js +0 -27
- package/dist/assets/tr-CA9ckNnm.js +0 -7
- package/dist/assets/uk-byjR-y8D.js +0 -16
- package/dist/assets/useAppFontEffects-BWQZ5DeI.js +0 -7341
- package/dist/assets/useInlineCommentController-DlFyVfBu.js +0 -2
- package/dist/assets/vendor-opencode-client-DYdsLbCM.js +0 -12
- package/dist/assets/zh-CN-DRabgxdG.js +0 -16
- package/dist/assets/zh-TW-rbY5c9UK.js +0 -16
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
2
|
|
|
3
3
|
const gitLibraries = {
|
|
4
4
|
stageFiles: vi.fn(),
|
|
@@ -8,6 +8,7 @@ const gitLibraries = {
|
|
|
8
8
|
getWorktrees: vi.fn(),
|
|
9
9
|
observeWorktreeTopology: vi.fn(),
|
|
10
10
|
subscribeWorktreeTopologyChanges: vi.fn(),
|
|
11
|
+
removeWorktree: vi.fn(),
|
|
11
12
|
};
|
|
12
13
|
|
|
13
14
|
vi.mock('./index.js', () => ({
|
|
@@ -18,6 +19,7 @@ vi.mock('./index.js', () => ({
|
|
|
18
19
|
getWorktrees: gitLibraries.getWorktrees,
|
|
19
20
|
observeWorktreeTopology: gitLibraries.observeWorktreeTopology,
|
|
20
21
|
subscribeWorktreeTopologyChanges: gitLibraries.subscribeWorktreeTopologyChanges,
|
|
22
|
+
removeWorktree: gitLibraries.removeWorktree,
|
|
21
23
|
}));
|
|
22
24
|
|
|
23
25
|
const { registerGitRoutes } = await import('./routes.js');
|
|
@@ -219,6 +221,101 @@ describe('git worktree topology routes', () => {
|
|
|
219
221
|
});
|
|
220
222
|
});
|
|
221
223
|
|
|
224
|
+
describe('git worktree removal instance disposal', () => {
|
|
225
|
+
let fetchMock;
|
|
226
|
+
|
|
227
|
+
const createJsonResponse = (payload, status = 200) => new Response(JSON.stringify(payload), {
|
|
228
|
+
status,
|
|
229
|
+
headers: { 'content-type': 'application/json' },
|
|
230
|
+
});
|
|
231
|
+
|
|
232
|
+
beforeEach(() => {
|
|
233
|
+
gitLibraries.removeWorktree.mockReset();
|
|
234
|
+
fetchMock = vi.fn(async () => createJsonResponse(true));
|
|
235
|
+
vi.stubGlobal('fetch', fetchMock);
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
afterEach(() => {
|
|
239
|
+
vi.unstubAllGlobals();
|
|
240
|
+
});
|
|
241
|
+
|
|
242
|
+
it('passes a disposal hook that targets the removed worktree when the runtime helpers are wired', async () => {
|
|
243
|
+
gitLibraries.removeWorktree.mockResolvedValue(true);
|
|
244
|
+
const { app, getRoute } = createRouteRegistry();
|
|
245
|
+
registerGitRoutes(app, {
|
|
246
|
+
emitWorktreeChanged: vi.fn(),
|
|
247
|
+
buildOpenCodeUrl: (routePath) => `http://opencode.test${routePath}`,
|
|
248
|
+
getOpenCodeAuthHeaders: () => ({ Authorization: 'Bearer test' }),
|
|
249
|
+
});
|
|
250
|
+
|
|
251
|
+
const response = createMockResponse();
|
|
252
|
+
await getRoute('DELETE', '/api/git/worktrees')(
|
|
253
|
+
{ query: { directory: '/repo' }, body: { directory: '/repo/wt', deleteLocalBranch: true } },
|
|
254
|
+
response,
|
|
255
|
+
);
|
|
256
|
+
|
|
257
|
+
expect(response.statusCode).toBe(200);
|
|
258
|
+
expect(response.body).toEqual({ success: true });
|
|
259
|
+
expect(gitLibraries.removeWorktree).toHaveBeenCalledWith('/repo', expect.objectContaining({
|
|
260
|
+
directory: '/repo/wt',
|
|
261
|
+
deleteLocalBranch: true,
|
|
262
|
+
}));
|
|
263
|
+
|
|
264
|
+
const disposeInstance = gitLibraries.removeWorktree.mock.calls[0][1].disposeInstance;
|
|
265
|
+
fetchMock.mockResolvedValue(new Response(null, { status: 204 }));
|
|
266
|
+
await disposeInstance('/repo/wt');
|
|
267
|
+
|
|
268
|
+
expect(fetchMock).toHaveBeenCalledTimes(1);
|
|
269
|
+
const [input, init] = fetchMock.mock.calls[0];
|
|
270
|
+
const request = new Request(input, init);
|
|
271
|
+
// OpenCode 2's location eviction; the v1 /instance/dispose route is gone.
|
|
272
|
+
expect(request.method).toBe('DELETE');
|
|
273
|
+
const url = new URL(request.url);
|
|
274
|
+
expect(url.origin + url.pathname).toBe('http://opencode.test/api/debug/location');
|
|
275
|
+
expect(url.searchParams.get('location[directory]')).toBe('/repo/wt');
|
|
276
|
+
expect(request.headers.get('authorization')).toBe('Bearer test');
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
it('rejects disposal errors so the removal wrapper can warn without failing', async () => {
|
|
280
|
+
gitLibraries.removeWorktree.mockResolvedValue(true);
|
|
281
|
+
fetchMock.mockResolvedValue(createJsonResponse({ name: 'BadRequest', data: { message: 'Bad request' } }, 400));
|
|
282
|
+
|
|
283
|
+
const { app, getRoute } = createRouteRegistry();
|
|
284
|
+
registerGitRoutes(app, {
|
|
285
|
+
buildOpenCodeUrl: () => 'http://opencode.test/',
|
|
286
|
+
getOpenCodeAuthHeaders: () => ({}),
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
await getRoute('DELETE', '/api/git/worktrees')(
|
|
290
|
+
{ query: { directory: '/repo' }, body: { directory: '/repo/wt' } },
|
|
291
|
+
createMockResponse(),
|
|
292
|
+
);
|
|
293
|
+
|
|
294
|
+
const disposeInstance = gitLibraries.removeWorktree.mock.calls[0][1].disposeInstance;
|
|
295
|
+
await expect(disposeInstance('/repo/wt')).rejects.toThrow('Bad request');
|
|
296
|
+
});
|
|
297
|
+
|
|
298
|
+
it('removes a worktree without a disposal hook when the runtime helpers are absent', async () => {
|
|
299
|
+
gitLibraries.removeWorktree.mockResolvedValue(true);
|
|
300
|
+
const { app, getRoute } = createRouteRegistry();
|
|
301
|
+
registerGitRoutes(app);
|
|
302
|
+
|
|
303
|
+
const response = createMockResponse();
|
|
304
|
+
await getRoute('DELETE', '/api/git/worktrees')(
|
|
305
|
+
{ query: { directory: '/repo' }, body: { directory: '/repo/wt' } },
|
|
306
|
+
response,
|
|
307
|
+
);
|
|
308
|
+
|
|
309
|
+
expect(response.statusCode).toBe(200);
|
|
310
|
+
expect(response.body).toEqual({ success: true });
|
|
311
|
+
expect(gitLibraries.removeWorktree).toHaveBeenCalledWith('/repo', {
|
|
312
|
+
directory: '/repo/wt',
|
|
313
|
+
deleteLocalBranch: false,
|
|
314
|
+
disposeInstance: undefined,
|
|
315
|
+
});
|
|
316
|
+
});
|
|
317
|
+
});
|
|
318
|
+
|
|
222
319
|
describe('git routes status discovery', () => {
|
|
223
320
|
beforeEach(() => {
|
|
224
321
|
gitLibraries.isGitRepository.mockReset();
|
|
@@ -904,9 +904,13 @@ const parseGitErrorText = (error) => {
|
|
|
904
904
|
// primarily via message/toString; keep String(error) as a last resort so
|
|
905
905
|
// "not a git repository" matching never misses and aborts callers.
|
|
906
906
|
const fallback = !message && error != null ? String(error) : '';
|
|
907
|
-
|
|
907
|
+
const chunks = [stderr, stdout, message, fallback]
|
|
908
908
|
.map((chunk) => String(chunk || '').trim())
|
|
909
|
-
.filter(Boolean)
|
|
909
|
+
.filter(Boolean);
|
|
910
|
+
// execFile's message already embeds stderr; a chunk another one contains
|
|
911
|
+
// would print every git error line twice.
|
|
912
|
+
return chunks
|
|
913
|
+
.filter((chunk, index) => !chunks.some((other, otherIndex) => otherIndex !== index && other.length > chunk.length && other.includes(chunk)))
|
|
910
914
|
.join('\n')
|
|
911
915
|
.trim();
|
|
912
916
|
};
|
|
@@ -1019,11 +1023,11 @@ const isMissingDirectoryError = (error) => {
|
|
|
1019
1023
|
return /directory that does not exist|does not exist|no such file or directory/i.test(text);
|
|
1020
1024
|
};
|
|
1021
1025
|
|
|
1022
|
-
const runGitCommand = async (cwd, args, { timeoutMs = 0 } = {}) => {
|
|
1026
|
+
const runGitCommand = async (cwd, args, { timeoutMs = 0, env: extraEnv } = {}) => {
|
|
1023
1027
|
try {
|
|
1024
1028
|
const { stdout, stderr } = await execFileAsync(getGitBinary(), args, {
|
|
1025
1029
|
cwd,
|
|
1026
|
-
env: await buildGitEnv(),
|
|
1030
|
+
env: { ...(await buildGitEnv()), ...extraEnv },
|
|
1027
1031
|
windowsHide: true,
|
|
1028
1032
|
maxBuffer: 20 * 1024 * 1024,
|
|
1029
1033
|
// Only short probes pass a timeout; commands that legitimately run long
|
|
@@ -5047,6 +5051,70 @@ export async function getWorktreeBootstrapStatus(directory) {
|
|
|
5047
5051
|
);
|
|
5048
5052
|
}
|
|
5049
5053
|
|
|
5054
|
+
/**
|
|
5055
|
+
* Releases the OpenCode instance that served a removed worktree. The owning
|
|
5056
|
+
* runtime injects `disposeInstance`; disposal is best-effort, so a failure is
|
|
5057
|
+
* warned about and never fails or rolls back the removal.
|
|
5058
|
+
*/
|
|
5059
|
+
const disposeWorktreeInstanceBestEffort = async (disposeInstance, worktreeDirectory) => {
|
|
5060
|
+
if (!disposeInstance) {
|
|
5061
|
+
return;
|
|
5062
|
+
}
|
|
5063
|
+
try {
|
|
5064
|
+
await disposeInstance(worktreeDirectory);
|
|
5065
|
+
} catch (error) {
|
|
5066
|
+
console.warn(
|
|
5067
|
+
`Failed to dispose the OpenCode instance for removed worktree ${worktreeDirectory}:`,
|
|
5068
|
+
error instanceof Error ? error.message : String(error)
|
|
5069
|
+
);
|
|
5070
|
+
}
|
|
5071
|
+
};
|
|
5072
|
+
|
|
5073
|
+
// Windows refuses to delete a folder another process still holds (a session's
|
|
5074
|
+
// shell, a file watcher, an editor); those handles are usually released
|
|
5075
|
+
// moments later, so a busy failure is retried briefly before it is reported.
|
|
5076
|
+
const WORKTREE_BUSY_RETRY_DELAYS_MS = [250, 500, 1000, 2000];
|
|
5077
|
+
const WORKTREE_BUSY_MESSAGE = 'The worktree folder is still in use by another process (a running session, terminal or editor). Stop it and try again.';
|
|
5078
|
+
|
|
5079
|
+
// Only Windows locks a folder that is open elsewhere; on other platforms the
|
|
5080
|
+
// same words mean a real permission problem and are reported as they are.
|
|
5081
|
+
const isWorktreeBusyError = (text) => process.platform === 'win32'
|
|
5082
|
+
&& /Permission denied|EBUSY|EPERM|resource busy|being used by another process/i.test(String(text || ''));
|
|
5083
|
+
|
|
5084
|
+
const removeBusyDirectory = async (targetDirectory) => {
|
|
5085
|
+
try {
|
|
5086
|
+
// fs.rm retries EBUSY/EPERM itself with these options.
|
|
5087
|
+
await fsp.rm(targetDirectory, { recursive: true, force: true, maxRetries: WORKTREE_BUSY_RETRY_DELAYS_MS.length, retryDelay: WORKTREE_BUSY_RETRY_DELAYS_MS[0] });
|
|
5088
|
+
} catch (error) {
|
|
5089
|
+
if (isWorktreeBusyError(error?.code) || isWorktreeBusyError(error?.message)) {
|
|
5090
|
+
throw new Error(WORKTREE_BUSY_MESSAGE);
|
|
5091
|
+
}
|
|
5092
|
+
throw error;
|
|
5093
|
+
}
|
|
5094
|
+
};
|
|
5095
|
+
|
|
5096
|
+
// Resolves true when git removed the worktree, false when git dropped the
|
|
5097
|
+
// registration but left the folder behind (the caller removes it as an orphan).
|
|
5098
|
+
const removeGitWorktreeWhenFree = async (primaryWorktree, worktreePath, targetCanonical) => {
|
|
5099
|
+
for (let attempt = 0; ; attempt += 1) {
|
|
5100
|
+
const result = await runGitCommand(primaryWorktree, ['worktree', 'remove', '--force', worktreePath]);
|
|
5101
|
+
if (result.success) return true;
|
|
5102
|
+
if (!isWorktreeBusyError(result.message)) {
|
|
5103
|
+
throw new Error(result.message || 'Failed to remove git worktree');
|
|
5104
|
+
}
|
|
5105
|
+
const stillRegistered = await (async () => {
|
|
5106
|
+
for (const entry of await listWorktreeEntries(primaryWorktree)) {
|
|
5107
|
+
if (entry?.worktree && await canonicalPath(entry.worktree) === targetCanonical) return true;
|
|
5108
|
+
}
|
|
5109
|
+
return false;
|
|
5110
|
+
})();
|
|
5111
|
+
if (!stillRegistered) return false;
|
|
5112
|
+
const delay = WORKTREE_BUSY_RETRY_DELAYS_MS[attempt];
|
|
5113
|
+
if (delay === undefined) throw new Error(WORKTREE_BUSY_MESSAGE);
|
|
5114
|
+
await wait(delay);
|
|
5115
|
+
}
|
|
5116
|
+
};
|
|
5117
|
+
|
|
5050
5118
|
export async function removeWorktree(directory, input = {}) {
|
|
5051
5119
|
const targetDirectory = normalizeDirectoryPath(input?.directory);
|
|
5052
5120
|
if (!targetDirectory) {
|
|
@@ -5079,25 +5147,35 @@ export async function removeWorktree(directory, input = {}) {
|
|
|
5079
5147
|
return null;
|
|
5080
5148
|
})();
|
|
5081
5149
|
|
|
5082
|
-
|
|
5150
|
+
const removeManagedOrphan = async () => {
|
|
5083
5151
|
const isManagedOrphan = targetCanonical !== worktreeRootCanonical
|
|
5084
5152
|
&& isInsideOrSameDirectory(worktreeRootCanonical, targetCanonical);
|
|
5085
5153
|
|
|
5086
5154
|
const targetExists = await checkPathExists(targetDirectory);
|
|
5087
5155
|
if (targetExists && isManagedOrphan) {
|
|
5088
|
-
await
|
|
5156
|
+
await removeBusyDirectory(targetDirectory);
|
|
5089
5157
|
}
|
|
5158
|
+
// A removal git abandoned halfway leaves `.git/worktrees/<name>` without
|
|
5159
|
+
// its gitdir; prune drops that metadata so it cannot linger.
|
|
5160
|
+
await runGitCommand(context.primaryWorktree, ['worktree', 'prune']);
|
|
5161
|
+
};
|
|
5090
5162
|
|
|
5163
|
+
if (!matchedEntry?.worktree) {
|
|
5164
|
+
await removeManagedOrphan();
|
|
5091
5165
|
clearWorktreeBootstrapState(targetDirectory);
|
|
5092
5166
|
|
|
5093
5167
|
return true;
|
|
5094
5168
|
}
|
|
5095
5169
|
|
|
5096
|
-
|
|
5097
|
-
|
|
5098
|
-
|
|
5099
|
-
|
|
5100
|
-
);
|
|
5170
|
+
// The directory is a registered linked worktree and still exists here, which
|
|
5171
|
+
// is the only point where its OpenCode instance can be released by path.
|
|
5172
|
+
await disposeWorktreeInstanceBestEffort(input?.disposeInstance, matchedEntry.worktree);
|
|
5173
|
+
|
|
5174
|
+
const removedByGit = await removeGitWorktreeWhenFree(context.primaryWorktree, matchedEntry.worktree, targetCanonical);
|
|
5175
|
+
if (!removedByGit) {
|
|
5176
|
+
// Git deleted its registration but not the still-locked folder.
|
|
5177
|
+
await removeManagedOrphan();
|
|
5178
|
+
}
|
|
5101
5179
|
await publishWorktreeTopologyChange(context.primaryWorktree);
|
|
5102
5180
|
|
|
5103
5181
|
if (deleteLocalBranch) {
|
|
@@ -5116,6 +5194,63 @@ export async function removeWorktree(directory, input = {}) {
|
|
|
5116
5194
|
return true;
|
|
5117
5195
|
}
|
|
5118
5196
|
|
|
5197
|
+
// Run snapshots live under a private namespace so they never show up as
|
|
5198
|
+
// branches or tags, yet stay reachable (and safe from gc) until deleted.
|
|
5199
|
+
const RUN_SNAPSHOT_REF_PATTERN = /^refs\/openchamber\/runs\/[A-Za-z0-9._-]+\/[A-Za-z0-9._-]+$/;
|
|
5200
|
+
|
|
5201
|
+
const assertRunSnapshotRef = (ref) => {
|
|
5202
|
+
const value = typeof ref === 'string' ? ref.trim() : '';
|
|
5203
|
+
if (!RUN_SNAPSHOT_REF_PATTERN.test(value) || value.includes('..')) {
|
|
5204
|
+
throw new Error('Invalid snapshot ref');
|
|
5205
|
+
}
|
|
5206
|
+
return value;
|
|
5207
|
+
};
|
|
5208
|
+
|
|
5209
|
+
const SNAPSHOT_IDENTITY_ENV = {
|
|
5210
|
+
GIT_AUTHOR_NAME: 'OpenChamber',
|
|
5211
|
+
GIT_AUTHOR_EMAIL: 'snapshot@openchamber.local',
|
|
5212
|
+
GIT_COMMITTER_NAME: 'OpenChamber',
|
|
5213
|
+
GIT_COMMITTER_EMAIL: 'snapshot@openchamber.local',
|
|
5214
|
+
};
|
|
5215
|
+
|
|
5216
|
+
/**
|
|
5217
|
+
* Records the complete state of a worktree (committed, staged, unstaged and
|
|
5218
|
+
* untracked-but-not-ignored files) as a commit under `ref`. A throwaway index
|
|
5219
|
+
* is used, so the worktree's real index, HEAD, branch and files are untouched.
|
|
5220
|
+
*/
|
|
5221
|
+
export async function snapshotWorktree(directory, input = {}) {
|
|
5222
|
+
const worktreeDirectory = normalizeDirectoryPath(directory);
|
|
5223
|
+
if (!worktreeDirectory) {
|
|
5224
|
+
throw new Error('Worktree directory is required');
|
|
5225
|
+
}
|
|
5226
|
+
const ref = assertRunSnapshotRef(input?.ref);
|
|
5227
|
+
const head = (await runGitCommandOrThrow(worktreeDirectory, ['rev-parse', '--verify', 'HEAD'], 'Worktree has no HEAD commit')).stdout.trim();
|
|
5228
|
+
|
|
5229
|
+
const tempDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'openchamber-snapshot-'));
|
|
5230
|
+
const indexEnv = { GIT_INDEX_FILE: path.join(tempDir, 'index') };
|
|
5231
|
+
try {
|
|
5232
|
+
const run = async (args, message, env = indexEnv) => {
|
|
5233
|
+
const result = await runGitCommand(worktreeDirectory, args, { env });
|
|
5234
|
+
if (!result.success) {
|
|
5235
|
+
throw new Error(result.message || message);
|
|
5236
|
+
}
|
|
5237
|
+
return result.stdout.trim();
|
|
5238
|
+
};
|
|
5239
|
+
await run(['read-tree', head], 'Failed to prepare snapshot index');
|
|
5240
|
+
await run(['add', '-A'], 'Failed to collect worktree changes');
|
|
5241
|
+
const tree = await run(['write-tree'], 'Failed to write snapshot tree');
|
|
5242
|
+
const commit = await run(
|
|
5243
|
+
['commit-tree', tree, '-p', head, '-m', 'OpenChamber run snapshot'],
|
|
5244
|
+
'Failed to write snapshot commit',
|
|
5245
|
+
{ ...indexEnv, ...SNAPSHOT_IDENTITY_ENV },
|
|
5246
|
+
);
|
|
5247
|
+
await run(['update-ref', ref, commit], 'Failed to store snapshot ref', {});
|
|
5248
|
+
return { ref, commit, head };
|
|
5249
|
+
} finally {
|
|
5250
|
+
await fsp.rm(tempDir, { recursive: true, force: true }).catch(() => undefined);
|
|
5251
|
+
}
|
|
5252
|
+
}
|
|
5253
|
+
|
|
5119
5254
|
export async function deleteBranch(directory, branch, options = {}) {
|
|
5120
5255
|
const { git } = await createRepositoryGitContext(directory);
|
|
5121
5256
|
|
|
@@ -28,6 +28,7 @@ import {
|
|
|
28
28
|
observeWorktreeTopology,
|
|
29
29
|
populateWorktreeWithLockRecovery,
|
|
30
30
|
removeWorktree,
|
|
31
|
+
snapshotWorktree,
|
|
31
32
|
resolvePrimaryWorktreeRoot,
|
|
32
33
|
resolveWorktreeTopLevel,
|
|
33
34
|
resetToCommit,
|
|
@@ -1685,11 +1686,14 @@ describe('removeWorktree', () => {
|
|
|
1685
1686
|
runGit(repo, ['commit', '-m', 'Initial commit']);
|
|
1686
1687
|
fs.writeFileSync(canary, 'sentinel');
|
|
1687
1688
|
|
|
1689
|
+
const disposeInstance = vi.fn();
|
|
1688
1690
|
await expect(removeWorktree(repo, {
|
|
1689
1691
|
directory: sentinel,
|
|
1690
1692
|
deleteLocalBranch: false,
|
|
1693
|
+
disposeInstance,
|
|
1691
1694
|
})).resolves.toBe(true);
|
|
1692
1695
|
expect(fs.existsSync(canary)).toBe(true);
|
|
1696
|
+
expect(disposeInstance).not.toHaveBeenCalled();
|
|
1693
1697
|
} finally {
|
|
1694
1698
|
if (previousXdgDataHome === undefined) {
|
|
1695
1699
|
delete process.env.XDG_DATA_HOME;
|
|
@@ -1698,6 +1702,197 @@ describe('removeWorktree', () => {
|
|
|
1698
1702
|
}
|
|
1699
1703
|
}
|
|
1700
1704
|
});
|
|
1705
|
+
|
|
1706
|
+
it('disposes the registered worktree instance before git removes the directory', async () => {
|
|
1707
|
+
if (!canRunGit()) return;
|
|
1708
|
+
|
|
1709
|
+
const previousXdgDataHome = process.env.XDG_DATA_HOME;
|
|
1710
|
+
process.env.XDG_DATA_HOME = createTempDir();
|
|
1711
|
+
|
|
1712
|
+
try {
|
|
1713
|
+
const repo = createTempDir();
|
|
1714
|
+
runGit(repo, ['init', '-b', 'main']);
|
|
1715
|
+
runGit(repo, ['config', 'user.email', 'test@example.com']);
|
|
1716
|
+
runGit(repo, ['config', 'user.name', 'Test User']);
|
|
1717
|
+
runGit(repo, ['commit', '--allow-empty', '-m', 'init']);
|
|
1718
|
+
|
|
1719
|
+
const created = await createWorktree(repo, {
|
|
1720
|
+
mode: 'new',
|
|
1721
|
+
branchName: 'feature/dispose-order',
|
|
1722
|
+
worktreeName: 'dispose-order',
|
|
1723
|
+
});
|
|
1724
|
+
const targetRealPath = fs.realpathSync(created.path);
|
|
1725
|
+
|
|
1726
|
+
let observed = null;
|
|
1727
|
+
const disposeInstance = vi.fn(async (worktreeDirectory) => {
|
|
1728
|
+
observed = {
|
|
1729
|
+
realPath: fs.realpathSync(worktreeDirectory),
|
|
1730
|
+
directoryExists: fs.existsSync(worktreeDirectory),
|
|
1731
|
+
};
|
|
1732
|
+
});
|
|
1733
|
+
|
|
1734
|
+
await expect(removeWorktree(repo, {
|
|
1735
|
+
directory: created.path,
|
|
1736
|
+
disposeInstance,
|
|
1737
|
+
})).resolves.toBe(true);
|
|
1738
|
+
|
|
1739
|
+
expect(disposeInstance).toHaveBeenCalledTimes(1);
|
|
1740
|
+
expect(observed).toEqual({ realPath: targetRealPath, directoryExists: true });
|
|
1741
|
+
expect(fs.existsSync(created.path)).toBe(false);
|
|
1742
|
+
} finally {
|
|
1743
|
+
if (previousXdgDataHome === undefined) {
|
|
1744
|
+
delete process.env.XDG_DATA_HOME;
|
|
1745
|
+
} else {
|
|
1746
|
+
process.env.XDG_DATA_HOME = previousXdgDataHome;
|
|
1747
|
+
}
|
|
1748
|
+
}
|
|
1749
|
+
});
|
|
1750
|
+
|
|
1751
|
+
it('warns about a failed instance disposal and still removes the worktree', async () => {
|
|
1752
|
+
if (!canRunGit()) return;
|
|
1753
|
+
|
|
1754
|
+
const previousXdgDataHome = process.env.XDG_DATA_HOME;
|
|
1755
|
+
process.env.XDG_DATA_HOME = createTempDir();
|
|
1756
|
+
|
|
1757
|
+
try {
|
|
1758
|
+
const repo = createTempDir();
|
|
1759
|
+
runGit(repo, ['init', '-b', 'main']);
|
|
1760
|
+
runGit(repo, ['config', 'user.email', 'test@example.com']);
|
|
1761
|
+
runGit(repo, ['config', 'user.name', 'Test User']);
|
|
1762
|
+
runGit(repo, ['commit', '--allow-empty', '-m', 'init']);
|
|
1763
|
+
|
|
1764
|
+
const created = await createWorktree(repo, {
|
|
1765
|
+
mode: 'new',
|
|
1766
|
+
branchName: 'feature/dispose-failure',
|
|
1767
|
+
worktreeName: 'dispose-failure',
|
|
1768
|
+
});
|
|
1769
|
+
|
|
1770
|
+
const disposeInstance = vi.fn(async () => {
|
|
1771
|
+
throw new Error('OpenCode API URL is not available');
|
|
1772
|
+
});
|
|
1773
|
+
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {});
|
|
1774
|
+
|
|
1775
|
+
try {
|
|
1776
|
+
await expect(removeWorktree(repo, {
|
|
1777
|
+
directory: created.path,
|
|
1778
|
+
disposeInstance,
|
|
1779
|
+
})).resolves.toBe(true);
|
|
1780
|
+
|
|
1781
|
+
expect(disposeInstance).toHaveBeenCalledTimes(1);
|
|
1782
|
+
expect(fs.existsSync(created.path)).toBe(false);
|
|
1783
|
+
expect(warnSpy).toHaveBeenCalledWith(
|
|
1784
|
+
expect.stringContaining(created.path),
|
|
1785
|
+
'OpenCode API URL is not available'
|
|
1786
|
+
);
|
|
1787
|
+
} finally {
|
|
1788
|
+
warnSpy.mockRestore();
|
|
1789
|
+
}
|
|
1790
|
+
} finally {
|
|
1791
|
+
if (previousXdgDataHome === undefined) {
|
|
1792
|
+
delete process.env.XDG_DATA_HOME;
|
|
1793
|
+
} else {
|
|
1794
|
+
process.env.XDG_DATA_HOME = previousXdgDataHome;
|
|
1795
|
+
}
|
|
1796
|
+
}
|
|
1797
|
+
});
|
|
1798
|
+
|
|
1799
|
+
it('never disposes the primary workspace', async () => {
|
|
1800
|
+
if (!canRunGit()) return;
|
|
1801
|
+
|
|
1802
|
+
const previousXdgDataHome = process.env.XDG_DATA_HOME;
|
|
1803
|
+
process.env.XDG_DATA_HOME = createTempDir();
|
|
1804
|
+
|
|
1805
|
+
try {
|
|
1806
|
+
const repo = createTempDir();
|
|
1807
|
+
runGit(repo, ['init', '-b', 'main']);
|
|
1808
|
+
runGit(repo, ['config', 'user.email', 'test@example.com']);
|
|
1809
|
+
runGit(repo, ['config', 'user.name', 'Test User']);
|
|
1810
|
+
runGit(repo, ['commit', '--allow-empty', '-m', 'init']);
|
|
1811
|
+
|
|
1812
|
+
const disposeInstance = vi.fn();
|
|
1813
|
+
await expect(removeWorktree(repo, {
|
|
1814
|
+
directory: repo,
|
|
1815
|
+
disposeInstance,
|
|
1816
|
+
})).rejects.toThrow('Cannot remove the primary workspace');
|
|
1817
|
+
expect(disposeInstance).not.toHaveBeenCalled();
|
|
1818
|
+
} finally {
|
|
1819
|
+
if (previousXdgDataHome === undefined) {
|
|
1820
|
+
delete process.env.XDG_DATA_HOME;
|
|
1821
|
+
} else {
|
|
1822
|
+
process.env.XDG_DATA_HOME = previousXdgDataHome;
|
|
1823
|
+
}
|
|
1824
|
+
}
|
|
1825
|
+
});
|
|
1826
|
+
|
|
1827
|
+
it('prunes the metadata a half-finished removal left behind', async () => {
|
|
1828
|
+
if (!canRunGit()) return;
|
|
1829
|
+
|
|
1830
|
+
const repo = createTempDir();
|
|
1831
|
+
const worktree = path.join(createTempDir(), 'half-removed');
|
|
1832
|
+
runGit(repo, ['init', '-b', 'main']);
|
|
1833
|
+
runGit(repo, ['config', 'user.email', 'test@example.com']);
|
|
1834
|
+
runGit(repo, ['config', 'user.name', 'Test User']);
|
|
1835
|
+
runGit(repo, ['commit', '--allow-empty', '-m', 'Initial commit']);
|
|
1836
|
+
runGit(repo, ['worktree', 'add', '-b', 'half', worktree]);
|
|
1837
|
+
// What a Windows lock leaves: git deleted these files, then stopped.
|
|
1838
|
+
const metadata = path.join(repo, '.git', 'worktrees', 'half-removed');
|
|
1839
|
+
for (const name of ['gitdir', 'HEAD', 'index']) fs.rmSync(path.join(metadata, name), { force: true });
|
|
1840
|
+
|
|
1841
|
+
await expect(removeWorktree(repo, { directory: worktree })).resolves.toBe(true);
|
|
1842
|
+
expect(fs.existsSync(metadata)).toBe(false);
|
|
1843
|
+
});
|
|
1844
|
+
});
|
|
1845
|
+
|
|
1846
|
+
// ---------------------------------------------------------------------------
|
|
1847
|
+
// snapshotWorktree
|
|
1848
|
+
// ---------------------------------------------------------------------------
|
|
1849
|
+
|
|
1850
|
+
describe('snapshotWorktree', () => {
|
|
1851
|
+
const createSnapshotRepo = () => {
|
|
1852
|
+
const repo = createTempDir();
|
|
1853
|
+
runGit(repo, ['init', '-b', 'main']);
|
|
1854
|
+
runGit(repo, ['config', 'user.email', 'test@example.com']);
|
|
1855
|
+
runGit(repo, ['config', 'user.name', 'Test User']);
|
|
1856
|
+
fs.writeFileSync(path.join(repo, 'README.md'), '# Test\n');
|
|
1857
|
+
fs.writeFileSync(path.join(repo, '.gitignore'), 'secret.env\n');
|
|
1858
|
+
runGit(repo, ['add', 'README.md', '.gitignore']);
|
|
1859
|
+
runGit(repo, ['commit', '-m', 'Initial commit']);
|
|
1860
|
+
return repo;
|
|
1861
|
+
};
|
|
1862
|
+
|
|
1863
|
+
it('captures staged, unstaged and untracked changes without touching the worktree', async () => {
|
|
1864
|
+
if (!canRunGit()) return;
|
|
1865
|
+
const repo = createSnapshotRepo();
|
|
1866
|
+
const head = runGit(repo, ['rev-parse', 'HEAD']).trim();
|
|
1867
|
+
fs.writeFileSync(path.join(repo, 'README.md'), '# Changed\n');
|
|
1868
|
+
fs.writeFileSync(path.join(repo, 'staged.txt'), 'staged\n');
|
|
1869
|
+
runGit(repo, ['add', 'staged.txt']);
|
|
1870
|
+
fs.writeFileSync(path.join(repo, 'new.txt'), 'untracked\n');
|
|
1871
|
+
fs.writeFileSync(path.join(repo, 'secret.env'), 'TOKEN=1\n');
|
|
1872
|
+
const statusBefore = runGit(repo, ['status', '--porcelain']);
|
|
1873
|
+
|
|
1874
|
+
const ref = 'refs/openchamber/runs/group-1/ses_abc';
|
|
1875
|
+
const result = await snapshotWorktree(repo, { ref });
|
|
1876
|
+
|
|
1877
|
+
expect(result).toMatchObject({ ref, head });
|
|
1878
|
+
expect(runGit(repo, ['rev-parse', ref]).trim()).toBe(result.commit);
|
|
1879
|
+
expect(runGit(repo, ['rev-parse', `${result.commit}^`]).trim()).toBe(head);
|
|
1880
|
+
const files = runGit(repo, ['ls-tree', '-r', '--name-only', result.commit]).trim().split('\n').sort();
|
|
1881
|
+
expect(files).toEqual(['.gitignore', 'README.md', 'new.txt', 'staged.txt']);
|
|
1882
|
+
expect(runGit(repo, ['show', `${result.commit}:README.md`])).toBe('# Changed\n');
|
|
1883
|
+
|
|
1884
|
+
expect(runGit(repo, ['rev-parse', 'HEAD']).trim()).toBe(head);
|
|
1885
|
+
expect(runGit(repo, ['status', '--porcelain'])).toBe(statusBefore);
|
|
1886
|
+
expect(runGit(repo, ['branch', '--list']).trim()).toBe('* main');
|
|
1887
|
+
});
|
|
1888
|
+
|
|
1889
|
+
it('rejects refs outside the private namespace', async () => {
|
|
1890
|
+
if (!canRunGit()) return;
|
|
1891
|
+
const repo = createSnapshotRepo();
|
|
1892
|
+
await expect(snapshotWorktree(repo, { ref: 'refs/heads/main' })).rejects.toThrow('Invalid snapshot ref');
|
|
1893
|
+
await expect(snapshotWorktree(repo, { ref: 'refs/openchamber/runs/../heads' })).rejects.toThrow('Invalid snapshot ref');
|
|
1894
|
+
});
|
|
1895
|
+
|
|
1701
1896
|
});
|
|
1702
1897
|
|
|
1703
1898
|
// ---------------------------------------------------------------------------
|
|
@@ -1490,29 +1490,19 @@ export function registerGitHubRoutes(app) {
|
|
|
1490
1490
|
const prRefs = items
|
|
1491
1491
|
.map((item) => ({ number: item.number, repoRef: findRepoForSearchItem(item) }))
|
|
1492
1492
|
.filter((ref) => Number.isFinite(ref.number) && ref.number > 0 && ref.repoRef);
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1498
|
-
|
|
1499
|
-
|
|
1500
|
-
|
|
1501
|
-
repo: repoRef.repo,
|
|
1502
|
-
pull_number: number,
|
|
1503
|
-
});
|
|
1504
|
-
return mapPrSummary(pr.data, repoRef);
|
|
1505
|
-
} catch {
|
|
1506
|
-
return null;
|
|
1507
|
-
}
|
|
1508
|
-
}));
|
|
1509
|
-
prs = results.filter(Boolean);
|
|
1510
|
-
}
|
|
1493
|
+
const prs = await Promise.all(prRefs.map(async ({ number, repoRef }) => {
|
|
1494
|
+
const pr = await octokit.rest.pulls.get({
|
|
1495
|
+
owner: repoRef.owner,
|
|
1496
|
+
repo: repoRef.repo,
|
|
1497
|
+
pull_number: number,
|
|
1498
|
+
});
|
|
1499
|
+
return mapPrSummary(pr.data, repoRef);
|
|
1500
|
+
}));
|
|
1511
1501
|
const fetchedCount = (effectivePage - 1) * 50 + items.length;
|
|
1512
1502
|
const hasMore = fetchedCount < totalCount;
|
|
1513
1503
|
return res.json({ connected: true, repo, prs, page: effectivePage, hasMore });
|
|
1514
1504
|
} catch (error) {
|
|
1515
|
-
console.error('Failed to search GitHub PRs:', error);
|
|
1505
|
+
console.error('Failed to search or enrich GitHub PRs:', error);
|
|
1516
1506
|
throw error;
|
|
1517
1507
|
}
|
|
1518
1508
|
}
|