@jingyi0605/codingns 0.5.5 → 0.6.1
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/codingns.mjs +15 -2
- package/dist/public/assets/{AdaptiveButlerPage-CUyNL98E.js → AdaptiveButlerPage-Dw72U3hG.js} +3 -3
- package/dist/public/assets/App-CcDXqFl1.css +1 -0
- package/dist/public/assets/{App-BFP7LCSC.js → App-Dsf3ooXU.js} +3 -3
- package/dist/public/assets/{BootstrapPage-G74dX2Us.js → BootstrapPage-CE0m1qSR.js} +1 -1
- package/dist/public/assets/ConversationPage-8wOY7SX-.js +4 -0
- package/dist/public/assets/{DesktopDetachPreviewPage-IV7oEdOX.js → DesktopDetachPreviewPage-Dxarr_Wf.js} +1 -1
- package/dist/public/assets/DesktopWindowPage-VytPwJ4c.js +2 -0
- package/dist/public/assets/FileContextPanel-DwFzLsOp.js +1 -0
- package/dist/public/assets/GitSidebar-CH6WqTrM.js +6 -0
- package/dist/public/assets/MobileCreateSessionSheet-DcxKM00P.js +1 -0
- package/dist/public/assets/{MobileTopHeaderFrame-COTc7cRr.js → MobileTopHeaderFrame-C5rIKQT6.js} +1 -1
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-CfUnHgv_.js +1 -0
- package/dist/public/assets/RelayConnectEntryPage-CgMvVZwa.js +1 -0
- package/dist/public/assets/ServerSettingsModal-CFul__z1.js +1 -0
- package/dist/public/assets/SessionIndexPage-B-tRhBXC.js +1 -0
- package/dist/public/assets/SettingsPage-C9LGxSQZ.js +1 -0
- package/dist/public/assets/TerminalManagerPanel-BbORd-ee.js +1 -0
- package/dist/public/assets/{TerminalPage-DpsvQQVR.js → TerminalPage-DWHv6mlu.js} +19 -19
- package/dist/public/assets/TerminalRuntimeFallbackModal-B29YxbQe.js +1 -0
- package/dist/public/assets/ToolFilesPage-Dx9cv9hu.js +1 -0
- package/dist/public/assets/ToolGitPage-D7H3vAia.js +1 -0
- package/dist/public/assets/ToolProcessesPage-PqQWxsy-.js +1 -0
- package/dist/public/assets/ToolsHomePage-CX05Pe_4.js +1 -0
- package/dist/public/assets/WorkbenchLandingPage-CchkAC75.js +1 -0
- package/dist/public/assets/WorkbenchLayout-pOZvEqp7.js +3 -0
- package/dist/public/assets/{WorkbenchModal-CbDxaCOR.js → WorkbenchModal-ColqvV6a.js} +1 -1
- package/dist/public/assets/WorkbenchShellRoute-C0_h4lP6.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-RGZpA0_J.css +1 -0
- package/dist/public/assets/WorkspaceDebugDetailPage-Deqy2_pO.js +1 -0
- package/dist/public/assets/WorkspaceDetailPage-Cvf-ZdlB.js +1 -0
- package/dist/public/assets/WorkspaceHomePage-Dsyvqyk1.js +1 -0
- package/dist/public/assets/client-runtime-manager-DROQJ9v3.js +1 -0
- package/dist/public/assets/{file-tree-icon-BMKuc5pw.js → file-tree-icon-Bp3Ntt7u.js} +7 -7
- package/dist/public/assets/index-B84Po2NA.css +1 -0
- package/dist/public/assets/index-C-0oeG_5.js +42 -0
- package/dist/public/assets/legna-code-6TqgZ4Ls.png +0 -0
- package/dist/public/assets/login-direct-candidate-resolver-DotM530R.js +1 -0
- package/dist/public/assets/model-switch-api-Bh9nYslz.js +1 -0
- package/dist/public/assets/{preferences-service-gv_9vGKz.js → preferences-service-BG6GKG29.js} +1 -1
- package/dist/public/assets/relay-entry-pmr-c42O.js +1 -0
- package/dist/public/assets/session-runtime-machine-YN84QBlr.js +21 -0
- package/dist/public/assets/{styles-BWPBZvze.css → styles-CsEMfdaS.css} +1 -1
- package/dist/public/assets/{terminal-runtime-meta-B9xJGY__.js → terminal-runtime-meta-8_uRZf7h.js} +1 -1
- package/dist/public/assets/useRegisteredDebugTemplates-DWX7LXQu.js +1 -0
- package/dist/public/assets/window-BVUB8gMK.js +1 -0
- package/dist/public/index.html +2 -2
- package/dist/server/config/env.d.ts +3 -0
- package/dist/server/config/env.js +10 -0
- package/dist/server/config/env.js.map +1 -1
- package/dist/server/modules/client/npm-global-package-service.d.ts +7 -1
- package/dist/server/modules/client/npm-global-package-service.js +149 -43
- package/dist/server/modules/client/npm-global-package-service.js.map +1 -1
- package/dist/server/modules/client/service-update-task-service.js +6 -2
- package/dist/server/modules/client/service-update-task-service.js.map +1 -1
- package/dist/server/modules/client/service-update-types.d.ts +2 -0
- package/dist/server/modules/git/git-controller.d.ts +3 -0
- package/dist/server/modules/git/git-controller.js +3 -0
- package/dist/server/modules/git/git-controller.js.map +1 -1
- package/dist/server/modules/git/git-read-service.js +47 -1
- package/dist/server/modules/git/git-read-service.js.map +1 -1
- package/dist/server/modules/git/git-write-service.d.ts +4 -0
- package/dist/server/modules/git/git-write-service.js +24 -0
- package/dist/server/modules/git/git-write-service.js.map +1 -1
- package/dist/server/modules/git/types.d.ts +1 -0
- package/dist/server/modules/git/workspace-repo-guard.d.ts +2 -0
- package/dist/server/modules/git/workspace-repo-guard.js +24 -10
- package/dist/server/modules/git/workspace-repo-guard.js.map +1 -1
- package/dist/server/modules/model-switch/cc-switch-adapter.d.ts +7 -0
- package/dist/server/modules/model-switch/cc-switch-adapter.js +17 -0
- package/dist/server/modules/model-switch/cc-switch-adapter.js.map +1 -1
- package/dist/server/modules/parallel-sessions/parallel-session-controller.d.ts +57 -0
- package/dist/server/modules/parallel-sessions/parallel-session-controller.js +77 -0
- package/dist/server/modules/parallel-sessions/parallel-session-controller.js.map +1 -0
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.d.ts +88 -0
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.js +625 -0
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.js.map +1 -0
- package/dist/server/modules/parallel-sessions/session-isolated-workspace-service.d.ts +56 -0
- package/dist/server/modules/parallel-sessions/session-isolated-workspace-service.js +483 -0
- package/dist/server/modules/parallel-sessions/session-isolated-workspace-service.js.map +1 -0
- package/dist/server/modules/provider/opencode-model-options.d.ts +1 -0
- package/dist/server/modules/provider/opencode-model-options.js +54 -12
- package/dist/server/modules/provider/opencode-model-options.js.map +1 -1
- package/dist/server/modules/provider/provider-controller.d.ts +6 -1
- package/dist/server/modules/provider/provider-controller.js +24 -2
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +2 -0
- package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-runtime.js +5 -1
- package/dist/server/modules/provider/provider-discovery-runtime.js.map +1 -1
- package/dist/server/modules/relay-tunnel/relay-tunnel-candidate-endpoints.d.ts +2 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-candidate-endpoints.js +129 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-candidate-endpoints.js.map +1 -0
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js +12 -9
- package/dist/server/modules/relay-tunnel/relay-tunnel-runtime-adapter.js.map +1 -1
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js +1 -128
- package/dist/server/modules/relay-tunnel/relay-tunnel-service.js.map +1 -1
- package/dist/server/modules/sessions/claude-runtime-helper-client.d.ts +1 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.js +14 -0
- package/dist/server/modules/sessions/claude-runtime-helper-client.js.map +1 -1
- package/dist/server/modules/sessions/codex-app-server-helper-client.d.ts +4 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js +66 -45
- package/dist/server/modules/sessions/codex-app-server-helper-client.js.map +1 -1
- package/dist/server/modules/sessions/codex-app-server-helper-process.js +21 -2
- package/dist/server/modules/sessions/codex-app-server-helper-process.js.map +1 -1
- package/dist/server/modules/sessions/provider-session-delete-cli.js +2 -0
- package/dist/server/modules/sessions/provider-session-delete-cli.js.map +1 -1
- package/dist/server/modules/sessions/session-controller.d.ts +7 -0
- package/dist/server/modules/sessions/session-controller.js +22 -0
- package/dist/server/modules/sessions/session-controller.js.map +1 -1
- package/dist/server/modules/sessions/session-history-service.d.ts +21 -2
- package/dist/server/modules/sessions/session-history-service.js +425 -29
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-service.d.ts +23 -2
- package/dist/server/modules/sessions/session-live-runtime-service.js +472 -74
- package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
- package/dist/server/modules/sessions/session-message-attachment-service.js +2 -2
- package/dist/server/modules/sessions/session-message-attachment-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-config-service.d.ts +66 -0
- package/dist/server/modules/sessions/session-provider-config-service.js +821 -0
- package/dist/server/modules/sessions/session-provider-config-service.js.map +1 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.d.ts +2 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js +42 -0
- package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
- package/dist/server/modules/workbench/codex-archive-watcher.d.ts +16 -0
- package/dist/server/modules/workbench/codex-archive-watcher.js +50 -0
- package/dist/server/modules/workbench/codex-archive-watcher.js.map +1 -0
- package/dist/server/modules/workbench/workbench-service.d.ts +11 -2
- package/dist/server/modules/workbench/workbench-service.js +37 -8
- package/dist/server/modules/workbench/workbench-service.js.map +1 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.d.ts +1 -1
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js +26 -3
- package/dist/server/modules/workbench/workspace-panel-snapshot-service.js.map +1 -1
- package/dist/server/modules/workspace/workspace-service.d.ts +3 -1
- package/dist/server/modules/workspace/workspace-service.js +10 -2
- package/dist/server/modules/workspace/workspace-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-base-ref-resolver.d.ts +20 -0
- package/dist/server/modules/worktree/worktree-base-ref-resolver.js +111 -0
- package/dist/server/modules/worktree/worktree-base-ref-resolver.js.map +1 -0
- package/dist/server/modules/worktree/worktree-cleanup-service.js +9 -3
- package/dist/server/modules/worktree/worktree-cleanup-service.js.map +1 -1
- package/dist/server/modules/worktree/worktree-manager.d.ts +0 -1
- package/dist/server/modules/worktree/worktree-manager.js +14 -20
- package/dist/server/modules/worktree/worktree-manager.js.map +1 -1
- package/dist/server/routes/git.js +1 -0
- package/dist/server/routes/git.js.map +1 -1
- package/dist/server/routes/parallel-groups.d.ts +3 -0
- package/dist/server/routes/parallel-groups.js +9 -0
- package/dist/server/routes/parallel-groups.js.map +1 -0
- package/dist/server/server/create-server.d.ts +8 -0
- package/dist/server/server/create-server.js +48 -11
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/server/workbench-runtime-terminal-sync.d.ts +14 -0
- package/dist/server/server/workbench-runtime-terminal-sync.js +17 -0
- package/dist/server/server/workbench-runtime-terminal-sync.js.map +1 -0
- package/dist/server/storage/repositories/parallel-session-group-repository.d.ts +11 -0
- package/dist/server/storage/repositories/parallel-session-group-repository.js +131 -0
- package/dist/server/storage/repositories/parallel-session-group-repository.js.map +1 -0
- package/dist/server/storage/repositories/parallel-session-member-repository.d.ts +12 -0
- package/dist/server/storage/repositories/parallel-session-member-repository.js +150 -0
- package/dist/server/storage/repositories/parallel-session-member-repository.js.map +1 -0
- package/dist/server/storage/repositories/session-binding-repository.js +44 -5
- package/dist/server/storage/repositories/session-binding-repository.js.map +1 -1
- package/dist/server/storage/repositories/session-index-repository.js +6 -0
- package/dist/server/storage/repositories/session-index-repository.js.map +1 -1
- package/dist/server/storage/repositories/session-isolated-workspace-repository.d.ts +15 -0
- package/dist/server/storage/repositories/session-isolated-workspace-repository.js +230 -0
- package/dist/server/storage/repositories/session-isolated-workspace-repository.js.map +1 -0
- package/dist/server/storage/sqlite/client.js +19 -0
- package/dist/server/storage/sqlite/client.js.map +1 -1
- package/dist/server/storage/sqlite/schema.sql +78 -0
- package/dist/server/types/domain.d.ts +78 -0
- package/dist/server/ws/workbench-ws-hub.d.ts +3 -1
- package/dist/server/ws/workbench-ws-hub.js +23 -4
- package/dist/server/ws/workbench-ws-hub.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/claude-message-utils.d.ts +5 -2
- package/node_modules/@codingns/session-sync-core/dist/claude-message-utils.js +40 -8
- package/node_modules/@codingns/session-sync-core/dist/claude-message-utils.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/index.d.ts +2 -0
- package/node_modules/@codingns/session-sync-core/dist/index.js +2 -0
- package/node_modules/@codingns/session-sync-core/dist/index.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.d.ts +10 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js +110 -35
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-code.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-session-store.d.ts +11 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-session-store.js +105 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/claude-session-store.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +34 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js +131 -39
- package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/legna-code.d.ts +9 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/legna-code.js +17 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/legna-code.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-shared.d.ts +8 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-shared.js +19 -6
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode-shared.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.d.ts +1 -0
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +13 -8
- package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.d.ts +3 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js +46 -22
- package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.d.ts +5 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js +103 -51
- package/node_modules/@codingns/session-sync-core/dist/runtime/claude-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.d.ts +2 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +528 -301
- package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/gemini-runtime.js +32 -8
- package/node_modules/@codingns/session-sync-core/dist/runtime/gemini-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/legna-runtime.d.ts +10 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/legna-runtime.js +16 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/legna-runtime.js.map +1 -0
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js +196 -15
- package/node_modules/@codingns/session-sync-core/dist/runtime/opencode-runtime.js.map +1 -1
- package/node_modules/@codingns/session-sync-core/dist/runtime/types.d.ts +2 -0
- package/node_modules/@codingns/session-sync-core/dist/types.d.ts +1 -1
- package/node_modules/@codingns/session-sync-core/dist/types.js +1 -1
- package/node_modules/@codingns/session-sync-core/dist/types.js.map +1 -1
- package/package.json +1 -1
- package/dist/public/assets/App-DUAg5urj.css +0 -1
- package/dist/public/assets/ConversationPage-Bz0_tvvM.js +0 -2
- package/dist/public/assets/DesktopWindowPage-BBmHyRg5.js +0 -2
- package/dist/public/assets/FileContextPanel--FVTxDrq.js +0 -1
- package/dist/public/assets/GitSidebar-DAiSi9oc.js +0 -6
- package/dist/public/assets/MobileCreateSessionSheet-DqVwz_Hp.js +0 -1
- package/dist/public/assets/MobileSheet-D1lMrcvD.js +0 -1
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-DJPV9ym2.js +0 -1
- package/dist/public/assets/RelayConnectEntryPage-dSwU8VzK.js +0 -1
- package/dist/public/assets/ServerSettingsModal-B34ms3ze.js +0 -1
- package/dist/public/assets/SessionIndexPage-D3tG1gmM.js +0 -1
- package/dist/public/assets/SettingsPage-B3-6-5GL.js +0 -1
- package/dist/public/assets/TerminalManagerPanel-DhuTEdzV.js +0 -1
- package/dist/public/assets/TerminalRuntimeFallbackModal-CNzOt5v5.js +0 -1
- package/dist/public/assets/ToolFilesPage-BX9QDi9Y.js +0 -1
- package/dist/public/assets/ToolGitPage-4VtFox3p.js +0 -1
- package/dist/public/assets/ToolProcessesPage-DZJC6Qnt.js +0 -1
- package/dist/public/assets/ToolsHomePage-D7JbrAWv.js +0 -1
- package/dist/public/assets/WorkbenchLandingPage-C0yqnzqh.js +0 -1
- package/dist/public/assets/WorkbenchLayout-Brlj8K3i.js +0 -3
- package/dist/public/assets/WorkbenchShellRoute-BMcnFadA.css +0 -1
- package/dist/public/assets/WorkbenchShellRoute-puGpdDFY.js +0 -1
- package/dist/public/assets/WorkspaceDebugDetailPage-fTGweC9N.js +0 -1
- package/dist/public/assets/WorkspaceDetailPage-BtaIzSDB.js +0 -1
- package/dist/public/assets/WorkspaceHomePage-CUmmYDrM.js +0 -1
- package/dist/public/assets/client-runtime-manager-RHFa_iWo.js +0 -1
- package/dist/public/assets/default-session-permission-mode-Cu5SreTG.js +0 -1
- package/dist/public/assets/index-Cq3ue0za.css +0 -1
- package/dist/public/assets/index-DEbFT-Aq.js +0 -42
- package/dist/public/assets/session-runtime-machine-Bfnxkk9B.js +0 -17
- package/dist/public/assets/useRegisteredDebugTemplates-CDfl54Wt.js +0 -1
- package/dist/public/assets/window-BWqRixxq.js +0 -1
- /package/dist/public/assets/{styles-CSUx5LGe.js → styles-DRVvx_kv.js} +0 -0
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import type { SessionIsolatedWorkspaceRecord, SessionListItem, Workspace, WorkspaceWorktreeRecord } from "../../types/domain.js";
|
|
2
|
+
import type { SessionIsolatedWorkspaceRepository } from "../../storage/repositories/session-isolated-workspace-repository.js";
|
|
3
|
+
import type { WorkspaceWorktreeRepository } from "../../storage/repositories/workspace-worktree-repository.js";
|
|
4
|
+
import type { WorkspaceService } from "../workspace/workspace-service.js";
|
|
5
|
+
import type { GitReadService } from "../git/git-read-service.js";
|
|
6
|
+
import type { GitCommandRunner } from "../git/git-command-runner.js";
|
|
7
|
+
export interface CreateSessionIsolatedWorkspaceInput {
|
|
8
|
+
groupId: string;
|
|
9
|
+
sourceWorkspaceId: string;
|
|
10
|
+
displayName?: string | null;
|
|
11
|
+
createSession: (workspaceId: string) => Promise<SessionListItem>;
|
|
12
|
+
signal?: AbortSignal;
|
|
13
|
+
}
|
|
14
|
+
export interface CreateSessionIsolatedWorkspaceResult {
|
|
15
|
+
session: SessionListItem;
|
|
16
|
+
workspace: Workspace;
|
|
17
|
+
record: SessionIsolatedWorkspaceRecord;
|
|
18
|
+
}
|
|
19
|
+
export interface PromoteSessionIsolatedWorkspaceResult {
|
|
20
|
+
record: SessionIsolatedWorkspaceRecord;
|
|
21
|
+
workspace: Workspace;
|
|
22
|
+
worktree: WorkspaceWorktreeRecord;
|
|
23
|
+
}
|
|
24
|
+
export interface CleanupSessionIsolatedWorkspaceResult {
|
|
25
|
+
record: SessionIsolatedWorkspaceRecord;
|
|
26
|
+
removed: boolean;
|
|
27
|
+
branchDeleted: boolean;
|
|
28
|
+
deletedBranchName: string | null;
|
|
29
|
+
detail: string | null;
|
|
30
|
+
}
|
|
31
|
+
export declare class SessionIsolatedWorkspaceService {
|
|
32
|
+
private readonly sessionIsolatedWorkspaceRepository;
|
|
33
|
+
private readonly workspaceWorktreeRepository;
|
|
34
|
+
private readonly workspaceService;
|
|
35
|
+
private readonly gitReadService;
|
|
36
|
+
private readonly gitCommandRunner;
|
|
37
|
+
private readonly commandTemplateService;
|
|
38
|
+
constructor(sessionIsolatedWorkspaceRepository: SessionIsolatedWorkspaceRepository, workspaceWorktreeRepository: WorkspaceWorktreeRepository, workspaceService: Pick<WorkspaceService, "importWorkspace" | "removeWorkspace" | "getWorkspaceOrThrow">, gitReadService: Pick<GitReadService, "getStatus">, gitCommandRunner: Pick<GitCommandRunner, "run">, commandTemplateService: {
|
|
39
|
+
cloneTemplatesToWorkspace(input: {
|
|
40
|
+
sourceWorkspaceId: string;
|
|
41
|
+
targetWorkspaceId: string;
|
|
42
|
+
sourceWorkspacePath: string;
|
|
43
|
+
targetWorkspacePath: string;
|
|
44
|
+
}): unknown;
|
|
45
|
+
});
|
|
46
|
+
createForMember(input: CreateSessionIsolatedWorkspaceInput): Promise<CreateSessionIsolatedWorkspaceResult>;
|
|
47
|
+
promote(workspaceRecordId: string): PromoteSessionIsolatedWorkspaceResult;
|
|
48
|
+
cleanupByOwnerSessionId(ownerSessionId: string, signal?: AbortSignal): Promise<CleanupSessionIsolatedWorkspaceResult | null>;
|
|
49
|
+
private cleanupRecord;
|
|
50
|
+
private resolveWorkspacePath;
|
|
51
|
+
private requireRecordById;
|
|
52
|
+
private ensureBranchNameValid;
|
|
53
|
+
private ensureBranchDoesNotExist;
|
|
54
|
+
private resolveCommit;
|
|
55
|
+
private rollbackCreate;
|
|
56
|
+
}
|
|
@@ -0,0 +1,483 @@
|
|
|
1
|
+
import fs from "node:fs";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
import { AppError } from "../../shared/errors/app-error.js";
|
|
4
|
+
import { createId } from "../../shared/utils/id.js";
|
|
5
|
+
import { nowIso } from "../../shared/utils/time.js";
|
|
6
|
+
import { resolveWorktreeBaseRef } from "../worktree/worktree-base-ref-resolver.js";
|
|
7
|
+
const WORKTREE_CREATE_TIMEOUT_MS = 30_000;
|
|
8
|
+
const WORKTREE_CLEANUP_TIMEOUT_MS = 30_000;
|
|
9
|
+
export class SessionIsolatedWorkspaceService {
|
|
10
|
+
sessionIsolatedWorkspaceRepository;
|
|
11
|
+
workspaceWorktreeRepository;
|
|
12
|
+
workspaceService;
|
|
13
|
+
gitReadService;
|
|
14
|
+
gitCommandRunner;
|
|
15
|
+
commandTemplateService;
|
|
16
|
+
constructor(sessionIsolatedWorkspaceRepository, workspaceWorktreeRepository, workspaceService, gitReadService, gitCommandRunner, commandTemplateService) {
|
|
17
|
+
this.sessionIsolatedWorkspaceRepository = sessionIsolatedWorkspaceRepository;
|
|
18
|
+
this.workspaceWorktreeRepository = workspaceWorktreeRepository;
|
|
19
|
+
this.workspaceService = workspaceService;
|
|
20
|
+
this.gitReadService = gitReadService;
|
|
21
|
+
this.gitCommandRunner = gitCommandRunner;
|
|
22
|
+
this.commandTemplateService = commandTemplateService;
|
|
23
|
+
}
|
|
24
|
+
async createForMember(input) {
|
|
25
|
+
const sourceWorkspaceId = normalizeRequiredText(input.sourceWorkspaceId, "sourceWorkspaceId");
|
|
26
|
+
const sourceWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceWorkspaceId);
|
|
27
|
+
const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(sourceWorkspaceId);
|
|
28
|
+
const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceMeta?.rootWorkspaceId ?? sourceWorkspaceId);
|
|
29
|
+
const sourceStatus = await this.gitReadService.getStatus(sourceWorkspaceId, input.signal);
|
|
30
|
+
if (sourceStatus.snapshot.isDirty) {
|
|
31
|
+
throw new AppError({
|
|
32
|
+
statusCode: 409,
|
|
33
|
+
errorCode: "WORKTREE_SOURCE_DIRTY",
|
|
34
|
+
detail: "来源工作区存在未提交改动,不能创建临时隔离工作区"
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
const branchName = buildTemporaryBranchName(input.groupId);
|
|
38
|
+
await this.ensureBranchNameValid(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, input.signal);
|
|
39
|
+
await this.ensureBranchDoesNotExist(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, input.signal);
|
|
40
|
+
const baseResolution = await resolveWorktreeBaseRef({
|
|
41
|
+
gitCommandRunner: this.gitCommandRunner,
|
|
42
|
+
repoRoot: sourceStatus.snapshot.repoRoot,
|
|
43
|
+
workspaceId: sourceWorkspaceId,
|
|
44
|
+
currentBranch: sourceStatus.snapshot.branch,
|
|
45
|
+
resolveBaseRefOperation: "parallel.session_isolated.create.resolveBaseRef",
|
|
46
|
+
inspectCommitCountOperation: "parallel.session_isolated.create.inspectCommitCount",
|
|
47
|
+
bootstrapInitialCommitOperation: "parallel.session_isolated.create.bootstrapInitialCommit",
|
|
48
|
+
notFoundDetail: "临时工作区基准引用不存在,不能继续创建",
|
|
49
|
+
signal: input.signal
|
|
50
|
+
});
|
|
51
|
+
const { baseRef, baseCommit } = baseResolution;
|
|
52
|
+
const targetPath = buildTargetPath(rootWorkspace.path, branchName);
|
|
53
|
+
ensureTargetPathSafe(rootWorkspace.path, targetPath);
|
|
54
|
+
if (fs.existsSync(targetPath)) {
|
|
55
|
+
throw new AppError({
|
|
56
|
+
statusCode: 409,
|
|
57
|
+
errorCode: "WORKTREE_PATH_CONFLICT",
|
|
58
|
+
detail: "目标临时工作区目录已经存在,不能直接覆盖"
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
const displayName = normalizeDisplayName(input.displayName, branchName);
|
|
62
|
+
let createdWorkspace = null;
|
|
63
|
+
let worktreeCreated = false;
|
|
64
|
+
try {
|
|
65
|
+
fs.mkdirSync(path.dirname(targetPath), { recursive: true });
|
|
66
|
+
await this.gitCommandRunner.run(sourceStatus.snapshot.repoRoot, ["worktree", "add", "-b", branchName, targetPath, baseRef], {
|
|
67
|
+
timeoutMs: WORKTREE_CREATE_TIMEOUT_MS,
|
|
68
|
+
workspaceId: sourceWorkspaceId,
|
|
69
|
+
operation: "parallel.session_isolated.create",
|
|
70
|
+
signal: input.signal
|
|
71
|
+
});
|
|
72
|
+
worktreeCreated = true;
|
|
73
|
+
createdWorkspace = this.workspaceService.importWorkspace(targetPath, displayName);
|
|
74
|
+
this.commandTemplateService.cloneTemplatesToWorkspace({
|
|
75
|
+
sourceWorkspaceId: rootWorkspace.id,
|
|
76
|
+
targetWorkspaceId: createdWorkspace.id,
|
|
77
|
+
sourceWorkspacePath: rootWorkspace.path,
|
|
78
|
+
targetWorkspacePath: createdWorkspace.path
|
|
79
|
+
});
|
|
80
|
+
const session = await input.createSession(createdWorkspace.id);
|
|
81
|
+
const timestamp = nowIso();
|
|
82
|
+
const headCommit = await this.resolveCommit(createdWorkspace.path, createdWorkspace.id, "HEAD", "parallel.session_isolated.create.resolveHeadCommit", input.signal);
|
|
83
|
+
const record = this.sessionIsolatedWorkspaceRepository.create({
|
|
84
|
+
id: createId(),
|
|
85
|
+
groupId: normalizeRequiredText(input.groupId, "groupId"),
|
|
86
|
+
ownerSessionId: session.sessionId,
|
|
87
|
+
workspaceId: createdWorkspace.id,
|
|
88
|
+
sourceWorkspaceId,
|
|
89
|
+
branchName,
|
|
90
|
+
baseRef,
|
|
91
|
+
baseCommit,
|
|
92
|
+
headCommit,
|
|
93
|
+
lifecycleStatus: "active",
|
|
94
|
+
promotedAt: null,
|
|
95
|
+
removedAt: null,
|
|
96
|
+
createdAt: timestamp,
|
|
97
|
+
updatedAt: timestamp
|
|
98
|
+
});
|
|
99
|
+
return {
|
|
100
|
+
session,
|
|
101
|
+
workspace: createdWorkspace,
|
|
102
|
+
record
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
await this.rollbackCreate(sourceStatus.snapshot.repoRoot, sourceWorkspaceId, branchName, targetPath, createdWorkspace, worktreeCreated, input.signal);
|
|
107
|
+
throw mapCreateWorktreeError(error);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
promote(workspaceRecordId) {
|
|
111
|
+
const current = this.requireRecordById(workspaceRecordId);
|
|
112
|
+
if (current.lifecycleStatus !== "active") {
|
|
113
|
+
throw new AppError({
|
|
114
|
+
statusCode: 409,
|
|
115
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_NOT_ACTIVE",
|
|
116
|
+
detail: "只有 active 状态的临时工作区才能升级"
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
const existingWorktree = this.workspaceWorktreeRepository.findByWorkspaceId(current.workspaceId);
|
|
120
|
+
if (existingWorktree) {
|
|
121
|
+
const updated = this.sessionIsolatedWorkspaceRepository.update({
|
|
122
|
+
...current,
|
|
123
|
+
lifecycleStatus: "promoted",
|
|
124
|
+
promotedAt: current.promotedAt ?? nowIso(),
|
|
125
|
+
updatedAt: nowIso()
|
|
126
|
+
});
|
|
127
|
+
if (!updated) {
|
|
128
|
+
throw new AppError({
|
|
129
|
+
statusCode: 500,
|
|
130
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_UPDATE_FAILED",
|
|
131
|
+
detail: "临时工作区升级时写入 promoted 状态失败"
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
return {
|
|
135
|
+
record: updated,
|
|
136
|
+
workspace: this.workspaceService.getWorkspaceOrThrow(current.workspaceId),
|
|
137
|
+
worktree: existingWorktree
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
const workspace = this.workspaceService.getWorkspaceOrThrow(current.workspaceId);
|
|
141
|
+
const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(current.sourceWorkspaceId);
|
|
142
|
+
const timestamp = nowIso();
|
|
143
|
+
const worktree = this.workspaceWorktreeRepository.create({
|
|
144
|
+
workspaceId: current.workspaceId,
|
|
145
|
+
rootWorkspaceId: sourceMeta?.rootWorkspaceId ?? current.sourceWorkspaceId,
|
|
146
|
+
parentWorkspaceId: current.sourceWorkspaceId,
|
|
147
|
+
sourceWorkspaceId: current.sourceWorkspaceId,
|
|
148
|
+
mergeTargetWorkspaceId: current.sourceWorkspaceId,
|
|
149
|
+
branchName: current.branchName,
|
|
150
|
+
baseRef: current.baseRef,
|
|
151
|
+
baseCommit: current.baseCommit,
|
|
152
|
+
headCommit: current.headCommit,
|
|
153
|
+
displayName: workspace.name,
|
|
154
|
+
depth: sourceMeta ? sourceMeta.depth + 1 : 1,
|
|
155
|
+
lifecycleStatus: "active",
|
|
156
|
+
mergedAt: null,
|
|
157
|
+
removedAt: null,
|
|
158
|
+
createdAt: current.createdAt,
|
|
159
|
+
updatedAt: timestamp
|
|
160
|
+
});
|
|
161
|
+
const updated = this.sessionIsolatedWorkspaceRepository.update({
|
|
162
|
+
...current,
|
|
163
|
+
lifecycleStatus: "promoted",
|
|
164
|
+
promotedAt: current.promotedAt ?? timestamp,
|
|
165
|
+
updatedAt: timestamp
|
|
166
|
+
});
|
|
167
|
+
if (!updated) {
|
|
168
|
+
throw new AppError({
|
|
169
|
+
statusCode: 500,
|
|
170
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_UPDATE_FAILED",
|
|
171
|
+
detail: "临时工作区升级后写入 promoted 状态失败"
|
|
172
|
+
});
|
|
173
|
+
}
|
|
174
|
+
return {
|
|
175
|
+
record: updated,
|
|
176
|
+
workspace,
|
|
177
|
+
worktree
|
|
178
|
+
};
|
|
179
|
+
}
|
|
180
|
+
async cleanupByOwnerSessionId(ownerSessionId, signal) {
|
|
181
|
+
const record = this.sessionIsolatedWorkspaceRepository.findByOwnerSessionId(ownerSessionId.trim());
|
|
182
|
+
if (!record) {
|
|
183
|
+
return null;
|
|
184
|
+
}
|
|
185
|
+
return await this.cleanupRecord(record, signal);
|
|
186
|
+
}
|
|
187
|
+
async cleanupRecord(record, signal) {
|
|
188
|
+
if (record.lifecycleStatus === "promoted") {
|
|
189
|
+
return {
|
|
190
|
+
record,
|
|
191
|
+
removed: false,
|
|
192
|
+
branchDeleted: false,
|
|
193
|
+
deletedBranchName: null,
|
|
194
|
+
detail: "临时工作区已升级为正式子工作区,不会随删除动作自动清理"
|
|
195
|
+
};
|
|
196
|
+
}
|
|
197
|
+
if (record.lifecycleStatus === "removed") {
|
|
198
|
+
return {
|
|
199
|
+
record,
|
|
200
|
+
removed: true,
|
|
201
|
+
branchDeleted: false,
|
|
202
|
+
deletedBranchName: null,
|
|
203
|
+
detail: null
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
const sourceMeta = this.workspaceWorktreeRepository.findByWorkspaceId(record.sourceWorkspaceId);
|
|
207
|
+
const rootWorkspace = this.workspaceService.getWorkspaceOrThrow(sourceMeta?.rootWorkspaceId ?? record.sourceWorkspaceId);
|
|
208
|
+
const workspacePath = this.resolveWorkspacePath(record, rootWorkspace.path);
|
|
209
|
+
const timestamp = nowIso();
|
|
210
|
+
const removing = this.sessionIsolatedWorkspaceRepository.update({
|
|
211
|
+
...record,
|
|
212
|
+
lifecycleStatus: "removing",
|
|
213
|
+
updatedAt: timestamp
|
|
214
|
+
});
|
|
215
|
+
if (!removing) {
|
|
216
|
+
throw new AppError({
|
|
217
|
+
statusCode: 500,
|
|
218
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_UPDATE_FAILED",
|
|
219
|
+
detail: "临时工作区清理前无法写入 removing 状态"
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
try {
|
|
223
|
+
if (fs.existsSync(workspacePath)) {
|
|
224
|
+
const removeResult = await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "remove", "--force", workspacePath], {
|
|
225
|
+
allowNonZeroExit: true,
|
|
226
|
+
timeoutMs: WORKTREE_CLEANUP_TIMEOUT_MS,
|
|
227
|
+
workspaceId: rootWorkspace.id,
|
|
228
|
+
operation: "parallel.session_isolated.cleanup.remove",
|
|
229
|
+
signal
|
|
230
|
+
});
|
|
231
|
+
if (removeResult.exitCode !== 0 && fs.existsSync(workspacePath)) {
|
|
232
|
+
throw new AppError({
|
|
233
|
+
statusCode: 409,
|
|
234
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_REMOVE_FAILED",
|
|
235
|
+
detail: removeResult.stderr.trim() || removeResult.stdout.trim() || "临时工作区目录删除失败"
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
await this.gitCommandRunner.run(rootWorkspace.path, ["worktree", "prune"], {
|
|
240
|
+
allowNonZeroExit: true,
|
|
241
|
+
workspaceId: rootWorkspace.id,
|
|
242
|
+
operation: "parallel.session_isolated.cleanup.prune",
|
|
243
|
+
signal
|
|
244
|
+
});
|
|
245
|
+
const deleteBranchResult = await this.gitCommandRunner.run(rootWorkspace.path, ["branch", "-D", record.branchName], {
|
|
246
|
+
allowNonZeroExit: true,
|
|
247
|
+
workspaceId: rootWorkspace.id,
|
|
248
|
+
operation: "parallel.session_isolated.cleanup.deleteBranch",
|
|
249
|
+
signal
|
|
250
|
+
});
|
|
251
|
+
const branchDeleted = deleteBranchResult.exitCode === 0;
|
|
252
|
+
const detail = branchDeleted
|
|
253
|
+
? null
|
|
254
|
+
: deleteBranchResult.stderr.trim() || deleteBranchResult.stdout.trim() || "临时分支删除失败";
|
|
255
|
+
const removed = this.sessionIsolatedWorkspaceRepository.update({
|
|
256
|
+
...removing,
|
|
257
|
+
lifecycleStatus: "removed",
|
|
258
|
+
removedAt: timestamp,
|
|
259
|
+
updatedAt: timestamp
|
|
260
|
+
});
|
|
261
|
+
if (!removed) {
|
|
262
|
+
throw new AppError({
|
|
263
|
+
statusCode: 500,
|
|
264
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_UPDATE_FAILED",
|
|
265
|
+
detail: "临时工作区目录已删除,但 removed 状态写入失败"
|
|
266
|
+
});
|
|
267
|
+
}
|
|
268
|
+
try {
|
|
269
|
+
this.workspaceService.removeWorkspace(record.workspaceId);
|
|
270
|
+
}
|
|
271
|
+
catch {
|
|
272
|
+
// 工作区记录可能已被移除,这里继续收口元数据,不再阻断清理结果。
|
|
273
|
+
}
|
|
274
|
+
if (fs.existsSync(workspacePath)) {
|
|
275
|
+
fs.rmSync(workspacePath, {
|
|
276
|
+
recursive: true,
|
|
277
|
+
force: true
|
|
278
|
+
});
|
|
279
|
+
}
|
|
280
|
+
return {
|
|
281
|
+
record: removed,
|
|
282
|
+
removed: true,
|
|
283
|
+
branchDeleted,
|
|
284
|
+
deletedBranchName: branchDeleted ? record.branchName : null,
|
|
285
|
+
detail
|
|
286
|
+
};
|
|
287
|
+
}
|
|
288
|
+
catch (error) {
|
|
289
|
+
this.sessionIsolatedWorkspaceRepository.update({
|
|
290
|
+
...record,
|
|
291
|
+
lifecycleStatus: "active",
|
|
292
|
+
updatedAt: nowIso()
|
|
293
|
+
});
|
|
294
|
+
return {
|
|
295
|
+
record,
|
|
296
|
+
removed: false,
|
|
297
|
+
branchDeleted: false,
|
|
298
|
+
deletedBranchName: null,
|
|
299
|
+
detail: error instanceof Error ? error.message : "临时工作区清理失败"
|
|
300
|
+
};
|
|
301
|
+
}
|
|
302
|
+
}
|
|
303
|
+
resolveWorkspacePath(record, rootWorkspacePath) {
|
|
304
|
+
try {
|
|
305
|
+
return this.workspaceService.getWorkspaceOrThrow(record.workspaceId).path;
|
|
306
|
+
}
|
|
307
|
+
catch {
|
|
308
|
+
return buildTargetPath(rootWorkspacePath, record.branchName);
|
|
309
|
+
}
|
|
310
|
+
}
|
|
311
|
+
requireRecordById(workspaceRecordId) {
|
|
312
|
+
const record = this.sessionIsolatedWorkspaceRepository.findById(workspaceRecordId.trim());
|
|
313
|
+
if (!record) {
|
|
314
|
+
throw new AppError({
|
|
315
|
+
statusCode: 404,
|
|
316
|
+
errorCode: "SESSION_ISOLATED_WORKSPACE_NOT_FOUND",
|
|
317
|
+
detail: "临时隔离工作区不存在"
|
|
318
|
+
});
|
|
319
|
+
}
|
|
320
|
+
return record;
|
|
321
|
+
}
|
|
322
|
+
async ensureBranchNameValid(repoRoot, workspaceId, branchName, signal) {
|
|
323
|
+
const result = await this.gitCommandRunner.run(repoRoot, ["check-ref-format", "--branch", branchName], {
|
|
324
|
+
allowNonZeroExit: true,
|
|
325
|
+
workspaceId,
|
|
326
|
+
operation: "parallel.session_isolated.validateBranch",
|
|
327
|
+
signal
|
|
328
|
+
});
|
|
329
|
+
if (result.exitCode === 0) {
|
|
330
|
+
return;
|
|
331
|
+
}
|
|
332
|
+
throw new AppError({
|
|
333
|
+
statusCode: 400,
|
|
334
|
+
errorCode: "INVALID_INPUT",
|
|
335
|
+
detail: "临时工作区分支名不合法",
|
|
336
|
+
field: "branchName"
|
|
337
|
+
});
|
|
338
|
+
}
|
|
339
|
+
async ensureBranchDoesNotExist(repoRoot, workspaceId, branchName, signal) {
|
|
340
|
+
const result = await this.gitCommandRunner.run(repoRoot, ["show-ref", "--verify", "--quiet", `refs/heads/${branchName}`], {
|
|
341
|
+
allowNonZeroExit: true,
|
|
342
|
+
workspaceId,
|
|
343
|
+
operation: "parallel.session_isolated.checkBranchExists",
|
|
344
|
+
signal
|
|
345
|
+
});
|
|
346
|
+
if (result.exitCode !== 0) {
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
throw new AppError({
|
|
350
|
+
statusCode: 409,
|
|
351
|
+
errorCode: "WORKTREE_BRANCH_EXISTS",
|
|
352
|
+
detail: "目标分支已经存在,不能重复创建临时工作区"
|
|
353
|
+
});
|
|
354
|
+
}
|
|
355
|
+
async resolveCommit(cwd, workspaceId, ref, operation, signal) {
|
|
356
|
+
const result = await this.gitCommandRunner.run(cwd, ["rev-parse", "--verify", ref], {
|
|
357
|
+
allowNonZeroExit: true,
|
|
358
|
+
workspaceId,
|
|
359
|
+
operation,
|
|
360
|
+
signal
|
|
361
|
+
});
|
|
362
|
+
const commit = result.stdout.trim();
|
|
363
|
+
if (result.exitCode === 0 && commit) {
|
|
364
|
+
return commit;
|
|
365
|
+
}
|
|
366
|
+
throw new AppError({
|
|
367
|
+
statusCode: 404,
|
|
368
|
+
errorCode: "WORKTREE_BASE_REF_NOT_FOUND",
|
|
369
|
+
detail: "临时工作区基准引用不存在,不能继续创建",
|
|
370
|
+
field: "baseRef"
|
|
371
|
+
});
|
|
372
|
+
}
|
|
373
|
+
async rollbackCreate(repoRoot, workspaceId, branchName, targetPath, createdWorkspace, worktreeCreated, signal) {
|
|
374
|
+
if (createdWorkspace) {
|
|
375
|
+
try {
|
|
376
|
+
this.workspaceService.removeWorkspace(createdWorkspace.id);
|
|
377
|
+
}
|
|
378
|
+
catch {
|
|
379
|
+
// 回滚阶段不覆盖原始错误。
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
if (worktreeCreated || fs.existsSync(targetPath)) {
|
|
383
|
+
try {
|
|
384
|
+
await this.gitCommandRunner.run(repoRoot, ["worktree", "remove", "--force", targetPath], {
|
|
385
|
+
allowNonZeroExit: true,
|
|
386
|
+
workspaceId,
|
|
387
|
+
operation: "parallel.session_isolated.rollbackRemove",
|
|
388
|
+
signal
|
|
389
|
+
});
|
|
390
|
+
}
|
|
391
|
+
catch {
|
|
392
|
+
// 回滚阶段不再向外抛,优先保住原始错误。
|
|
393
|
+
}
|
|
394
|
+
if (fs.existsSync(targetPath)) {
|
|
395
|
+
fs.rmSync(targetPath, { recursive: true, force: true });
|
|
396
|
+
}
|
|
397
|
+
}
|
|
398
|
+
try {
|
|
399
|
+
await this.gitCommandRunner.run(repoRoot, ["branch", "-D", branchName], {
|
|
400
|
+
allowNonZeroExit: true,
|
|
401
|
+
workspaceId,
|
|
402
|
+
operation: "parallel.session_isolated.rollbackDeleteBranch",
|
|
403
|
+
signal
|
|
404
|
+
});
|
|
405
|
+
}
|
|
406
|
+
catch {
|
|
407
|
+
// 分支删除失败只保留残留,不能覆盖原始错误。
|
|
408
|
+
}
|
|
409
|
+
}
|
|
410
|
+
}
|
|
411
|
+
function normalizeRequiredText(value, field) {
|
|
412
|
+
const normalized = value?.trim();
|
|
413
|
+
if (!normalized) {
|
|
414
|
+
throw new AppError({
|
|
415
|
+
statusCode: 400,
|
|
416
|
+
errorCode: "INVALID_INPUT",
|
|
417
|
+
detail: `${field} 不能为空`,
|
|
418
|
+
field
|
|
419
|
+
});
|
|
420
|
+
}
|
|
421
|
+
return normalized;
|
|
422
|
+
}
|
|
423
|
+
function normalizeDisplayName(displayName, branchName) {
|
|
424
|
+
return displayName?.trim() || `并行临时工作区-${sanitizePathSegment(branchName).slice(0, 12)}`;
|
|
425
|
+
}
|
|
426
|
+
function buildTemporaryBranchName(groupId) {
|
|
427
|
+
return `parallel/${groupId.slice(0, 8)}/${createId().slice(0, 8)}`;
|
|
428
|
+
}
|
|
429
|
+
function buildTargetPath(rootWorkspacePath, branchName) {
|
|
430
|
+
const rootPath = path.resolve(rootWorkspacePath);
|
|
431
|
+
const rootParentPath = path.dirname(rootPath);
|
|
432
|
+
const rootName = path.basename(rootPath);
|
|
433
|
+
return path.join(rootParentPath, `${rootName}.worktrees`, sanitizePathSegment(branchName));
|
|
434
|
+
}
|
|
435
|
+
function ensureTargetPathSafe(rootWorkspacePath, targetPath) {
|
|
436
|
+
const normalizedRootPath = path.resolve(rootWorkspacePath);
|
|
437
|
+
const normalizedTargetPath = path.resolve(targetPath);
|
|
438
|
+
const relative = path.relative(normalizedRootPath, normalizedTargetPath);
|
|
439
|
+
if (relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative))) {
|
|
440
|
+
throw new AppError({
|
|
441
|
+
statusCode: 400,
|
|
442
|
+
errorCode: "WORKTREE_PATH_INVALID",
|
|
443
|
+
detail: "临时工作区目录不能落在根工作区目录内部"
|
|
444
|
+
});
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
function sanitizePathSegment(input) {
|
|
448
|
+
const sanitized = input
|
|
449
|
+
.trim()
|
|
450
|
+
.replace(/[\\/]+/g, "-")
|
|
451
|
+
.replace(/[^a-zA-Z0-9._-]+/g, "-")
|
|
452
|
+
.replace(/-+/g, "-")
|
|
453
|
+
.replace(/^-|-$/g, "");
|
|
454
|
+
return sanitized || "worktree";
|
|
455
|
+
}
|
|
456
|
+
function mapCreateWorktreeError(error) {
|
|
457
|
+
if (!(error instanceof AppError)) {
|
|
458
|
+
return error instanceof Error ? error : new Error(String(error));
|
|
459
|
+
}
|
|
460
|
+
if (error.errorCode !== "GIT_COMMAND_FAILED") {
|
|
461
|
+
return error;
|
|
462
|
+
}
|
|
463
|
+
if (error.message.includes("already exists")) {
|
|
464
|
+
return new AppError({
|
|
465
|
+
statusCode: 409,
|
|
466
|
+
errorCode: "WORKTREE_BRANCH_EXISTS",
|
|
467
|
+
detail: "目标分支已经存在,不能重复创建临时工作区"
|
|
468
|
+
});
|
|
469
|
+
}
|
|
470
|
+
if (error.message.includes("is already checked out")) {
|
|
471
|
+
return new AppError({
|
|
472
|
+
statusCode: 409,
|
|
473
|
+
errorCode: "WORKTREE_BRANCH_IN_USE",
|
|
474
|
+
detail: "目标分支已经被其他工作树占用,不能再次创建临时工作区"
|
|
475
|
+
});
|
|
476
|
+
}
|
|
477
|
+
return new AppError({
|
|
478
|
+
statusCode: 500,
|
|
479
|
+
errorCode: "WORKTREE_CREATE_FAILED",
|
|
480
|
+
detail: error.message
|
|
481
|
+
});
|
|
482
|
+
}
|
|
483
|
+
//# sourceMappingURL=session-isolated-workspace-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session-isolated-workspace-service.js","sourceRoot":"","sources":["../../../../src/modules/parallel-sessions/session-isolated-workspace-service.ts"],"names":[],"mappings":"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"}
|