@jingyi0605/codingns 0.6.0 → 0.6.5
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 +240 -2
- package/dist/public/assets/AdaptiveButlerPage-CfsUVZKl.js +3 -0
- package/dist/public/assets/{App-BZvapsi8.js → App-B9HcTkMT.js} +3 -3
- package/dist/public/assets/{BootstrapPage-gHSoa4JN.js → BootstrapPage-BgLdZEKQ.js} +1 -1
- package/dist/public/assets/ConversationPage-Cj8go7L0.js +4 -0
- package/dist/public/assets/{DesktopDetachPreviewPage-4eMRxiBW.js → DesktopDetachPreviewPage-YCBnyC58.js} +1 -1
- package/dist/public/assets/DesktopWindowPage-CrvndE23.js +2 -0
- package/dist/public/assets/FileContextPanel-CdC7GGw5.js +1 -0
- package/dist/public/assets/GitSidebar-z2SBinQh.js +6 -0
- package/dist/public/assets/MobileCreateSessionSheet-Cb2HM-y3.js +1 -0
- package/dist/public/assets/{MobileTopHeaderFrame-Bwv8Ovm_.js → MobileTopHeaderFrame-etF2HKlm.js} +1 -1
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-CuGJ31kb.js +1 -0
- package/dist/public/assets/{RelayConnectEntryPage-D_4YL-YH.js → RelayConnectEntryPage-BB6DbGtP.js} +1 -1
- package/dist/public/assets/{ServerSettingsModal-CMSm3BZU.js → ServerSettingsModal-Bl1sacZg.js} +1 -1
- package/dist/public/assets/SessionIndexPage-NbF9gJnp.js +1 -0
- package/dist/public/assets/SettingsPage-DGsmQpLv.js +1 -0
- package/dist/public/assets/TerminalManagerPanel-BOm8Hi_v.js +1 -0
- package/dist/public/assets/{TerminalPage-DaooFaJ4.js → TerminalPage-B5JNFU6w.js} +19 -19
- package/dist/public/assets/TerminalRuntimeFallbackModal-CM3LRKOJ.js +1 -0
- package/dist/public/assets/{ToolFilesPage-CGxBvYG0.js → ToolFilesPage-GSqKQsj_.js} +1 -1
- package/dist/public/assets/ToolGitPage-BVFWMMQp.js +1 -0
- package/dist/public/assets/ToolProcessesPage-DZ456fYz.js +1 -0
- package/dist/public/assets/ToolsHomePage-DsJp0y8A.js +1 -0
- package/dist/public/assets/WorkbenchLandingPage-DyPei0e-.js +1 -0
- package/dist/public/assets/WorkbenchLayout-DlbgBT3n.js +4 -0
- package/dist/public/assets/WorkbenchModal-LNfB69qx.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-BsxumYx5.js +1 -0
- package/dist/public/assets/WorkbenchShellRoute-DhQo_0vu.css +1 -0
- package/dist/public/assets/WorkspaceDebugDetailPage-CaXj5zVI.js +1 -0
- package/dist/public/assets/WorkspaceDetailPage-DOexuuaw.js +1 -0
- package/dist/public/assets/WorkspaceHomePage-DkCHNjKD.js +1 -0
- package/dist/public/assets/{client-runtime-manager-BZpL17fc.js → client-runtime-manager-6OoYHXGd.js} +1 -1
- package/dist/public/assets/{file-tree-icon-Db5LXC8h.js → file-tree-icon-9pt1OStn.js} +1 -1
- package/dist/public/assets/index-BwlbvwaA.css +1 -0
- package/dist/public/assets/index-DSw-TkQL.js +42 -0
- package/dist/public/assets/legna-code-6TqgZ4Ls.png +0 -0
- package/dist/public/assets/{login-direct-candidate-resolver-1mxe_Oh8.js → login-direct-candidate-resolver-CLlYtBRq.js} +1 -1
- package/dist/public/assets/model-switch-api-C-l8-E1S.js +1 -0
- package/dist/public/assets/{preferences-service-DWnzl5a0.js → preferences-service-BCcfYP_d.js} +1 -1
- package/dist/public/assets/{relay-entry-C5_Iay0I.js → relay-entry-BmLkMKuq.js} +1 -1
- package/dist/public/assets/session-runtime-machine-DgtvREca.js +21 -0
- package/dist/public/assets/{terminal-runtime-meta-cdtWVfCm.js → terminal-runtime-meta-0h-75uRy.js} +1 -1
- package/dist/public/assets/useRegisteredDebugTemplates-rBVmAqh3.js +1 -0
- package/dist/public/index.html +2 -2
- package/dist/server/config/env.d.ts +2 -0
- package/dist/server/config/env.js +7 -0
- package/dist/server/config/env.js.map +1 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.d.ts +4 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.js +12 -1
- package/dist/server/modules/assistant-capability/assistant-capability-service.js.map +1 -1
- package/dist/server/modules/butler/butler-control-session-service.d.ts +4 -1
- package/dist/server/modules/butler/butler-control-session-service.js +17 -1
- package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
- package/dist/server/modules/butler/butler-profile-service.d.ts +3 -1
- package/dist/server/modules/butler/butler-profile-service.js +16 -4
- package/dist/server/modules/butler/butler-profile-service.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/opencli/opencli-bridge-skill-service.d.ts +12 -0
- package/dist/server/modules/opencli/opencli-bridge-skill-service.js +124 -0
- package/dist/server/modules/opencli/opencli-bridge-skill-service.js.map +1 -0
- package/dist/server/modules/opencli/opencli-catalog-service.d.ts +50 -0
- package/dist/server/modules/opencli/opencli-catalog-service.js +345 -0
- package/dist/server/modules/opencli/opencli-catalog-service.js.map +1 -0
- package/dist/server/modules/opencli/opencli-controller.d.ts +13 -0
- package/dist/server/modules/opencli/opencli-controller.js +30 -0
- package/dist/server/modules/opencli/opencli-controller.js.map +1 -0
- package/dist/server/modules/opencli/opencli-health-service.d.ts +28 -0
- package/dist/server/modules/opencli/opencli-health-service.js +106 -0
- package/dist/server/modules/opencli/opencli-health-service.js.map +1 -0
- package/dist/server/modules/opencli/opencli-install-discovery.d.ts +23 -0
- package/dist/server/modules/opencli/opencli-install-discovery.js +130 -0
- package/dist/server/modules/opencli/opencli-install-discovery.js.map +1 -0
- package/dist/server/modules/opencli/opencli-management-service.d.ts +59 -0
- package/dist/server/modules/opencli/opencli-management-service.js +152 -0
- package/dist/server/modules/opencli/opencli-management-service.js.map +1 -0
- package/dist/server/modules/opencli/opencli-runtime-builder.d.ts +11 -0
- package/dist/server/modules/opencli/opencli-runtime-builder.js +214 -0
- package/dist/server/modules/opencli/opencli-runtime-builder.js.map +1 -0
- package/dist/server/modules/opencli/opencli-runtime-layout.d.ts +3 -0
- package/dist/server/modules/opencli/opencli-runtime-layout.js +11 -0
- package/dist/server/modules/opencli/opencli-runtime-layout.js.map +1 -0
- package/dist/server/modules/opencli/opencli-runtime-profile-service.d.ts +29 -0
- package/dist/server/modules/opencli/opencli-runtime-profile-service.js +104 -0
- package/dist/server/modules/opencli/opencli-runtime-profile-service.js.map +1 -0
- package/dist/server/modules/opencli/opencli-runtime-resolver.d.ts +29 -0
- package/dist/server/modules/opencli/opencli-runtime-resolver.js +110 -0
- package/dist/server/modules/opencli/opencli-runtime-resolver.js.map +1 -0
- package/dist/server/modules/opencli/opencli-session-prompt-service.d.ts +11 -0
- package/dist/server/modules/opencli/opencli-session-prompt-service.js +66 -0
- package/dist/server/modules/opencli/opencli-session-prompt-service.js.map +1 -0
- package/dist/server/modules/parallel-sessions/parallel-session-controller.d.ts +4 -0
- package/dist/server/modules/parallel-sessions/parallel-session-controller.js +7 -0
- package/dist/server/modules/parallel-sessions/parallel-session-controller.js.map +1 -1
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.d.ts +6 -1
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.js +36 -2
- package/dist/server/modules/parallel-sessions/parallel-session-group-service.js.map +1 -1
- 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-catalog-service.d.ts +46 -0
- package/dist/server/modules/provider/provider-catalog-service.js +249 -0
- package/dist/server/modules/provider/provider-catalog-service.js.map +1 -0
- package/dist/server/modules/provider/provider-controller.d.ts +20 -2
- package/dist/server/modules/provider/provider-controller.js +65 -5
- package/dist/server/modules/provider/provider-controller.js.map +1 -1
- package/dist/server/modules/provider/provider-disabled.d.ts +8 -0
- package/dist/server/modules/provider/provider-disabled.js +45 -0
- package/dist/server/modules/provider/provider-disabled.js.map +1 -0
- package/dist/server/modules/provider/provider-discovery-helper-client.d.ts +3 -0
- package/dist/server/modules/provider/provider-discovery-helper-client.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-helper-process.js +4 -4
- package/dist/server/modules/provider/provider-discovery-helper-process.js.map +1 -1
- package/dist/server/modules/provider/provider-discovery-runtime.d.ts +1 -1
- package/dist/server/modules/provider/provider-discovery-runtime.js +17 -9
- package/dist/server/modules/provider/provider-discovery-runtime.js.map +1 -1
- package/dist/server/modules/sessions/claude-compatible-provider-registry.d.ts +16 -0
- package/dist/server/modules/sessions/claude-compatible-provider-registry.js +91 -0
- package/dist/server/modules/sessions/claude-compatible-provider-registry.js.map +1 -0
- 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 +1 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.js +10 -0
- package/dist/server/modules/sessions/codex-app-server-helper-client.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 +18 -2
- package/dist/server/modules/sessions/session-history-service.js +330 -29
- package/dist/server/modules/sessions/session-history-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-router-service.js +9 -4
- package/dist/server/modules/sessions/session-live-runtime-router-service.js.map +1 -1
- package/dist/server/modules/sessions/session-live-runtime-service.d.ts +22 -5
- package/dist/server/modules/sessions/session-live-runtime-service.js +350 -122
- 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-permission-request-service.d.ts +5 -2
- package/dist/server/modules/sessions/session-permission-request-service.js +26 -27
- package/dist/server/modules/sessions/session-permission-request-service.js.map +1 -1
- package/dist/server/modules/sessions/session-provider-config-service.d.ts +82 -0
- package/dist/server/modules/sessions/session-provider-config-service.js +925 -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/skills/skill-manager-service.d.ts +5 -0
- package/dist/server/modules/skills/skill-manager-service.js +26 -0
- package/dist/server/modules/skills/skill-manager-service.js.map +1 -1
- package/dist/server/modules/tasks/task-helper-process-handlers.d.ts +1 -0
- package/dist/server/modules/tasks/task-helper-process-handlers.js +1 -1
- package/dist/server/modules/tasks/task-helper-process-handlers.js.map +1 -1
- package/dist/server/routes/opencli.d.ts +3 -0
- package/dist/server/routes/opencli.js +7 -0
- package/dist/server/routes/opencli.js.map +1 -0
- package/dist/server/routes/providers.js +4 -2
- package/dist/server/routes/providers.js.map +1 -1
- package/dist/server/server/create-server.d.ts +8 -0
- package/dist/server/server/create-server.js +48 -12
- package/dist/server/server/create-server.js.map +1 -1
- package/dist/server/storage/repositories/opencli-catalog-entry-repository.d.ts +9 -0
- package/dist/server/storage/repositories/opencli-catalog-entry-repository.js +85 -0
- package/dist/server/storage/repositories/opencli-catalog-entry-repository.js.map +1 -0
- package/dist/server/storage/repositories/opencli-provider-repository.d.ts +8 -0
- package/dist/server/storage/repositories/opencli-provider-repository.js +88 -0
- package/dist/server/storage/repositories/opencli-provider-repository.js.map +1 -0
- package/dist/server/storage/repositories/opencli-runtime-profile-repository.d.ts +11 -0
- package/dist/server/storage/repositories/opencli-runtime-profile-repository.js +127 -0
- package/dist/server/storage/repositories/opencli-runtime-profile-repository.js.map +1 -0
- package/dist/server/storage/repositories/provider-control-repository.d.ts +9 -0
- package/dist/server/storage/repositories/provider-control-repository.js +51 -0
- package/dist/server/storage/repositories/provider-control-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/sqlite/client.js +72 -0
- package/dist/server/storage/sqlite/client.js.map +1 -1
- package/dist/server/storage/sqlite/schema.sql +71 -0
- package/dist/server/types/domain.d.ts +56 -0
- 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/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/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 +41 -21
- 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 +15 -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 +167 -10
- 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/AdaptiveButlerPage-uFwDdN-F.js +0 -3
- package/dist/public/assets/ConversationPage-z3sXtKZ7.js +0 -4
- package/dist/public/assets/DesktopWindowPage-CZcoGApB.js +0 -2
- package/dist/public/assets/FileContextPanel-C3qex8bb.js +0 -1
- package/dist/public/assets/GitSidebar-BK6H16XU.js +0 -6
- package/dist/public/assets/MobileCreateSessionSheet-BYfbvK8o.js +0 -1
- package/dist/public/assets/MobileSheet-Ckug8hTb.js +0 -1
- package/dist/public/assets/MobileWorkspaceSwitcherHeader-RqWrBdn2.js +0 -1
- package/dist/public/assets/SessionIndexPage-DuK10DL5.js +0 -1
- package/dist/public/assets/SettingsPage-fyD-xaHL.js +0 -1
- package/dist/public/assets/TerminalManagerPanel-CCLr1Ypk.js +0 -1
- package/dist/public/assets/TerminalRuntimeFallbackModal-aUzjEBwP.js +0 -1
- package/dist/public/assets/ToolGitPage-C264yjS9.js +0 -1
- package/dist/public/assets/ToolProcessesPage-BOP4A1cb.js +0 -1
- package/dist/public/assets/ToolsHomePage-CQxGiKQA.js +0 -1
- package/dist/public/assets/WorkbenchLandingPage-CvAY68ca.js +0 -1
- package/dist/public/assets/WorkbenchLayout-DGm8Tc5M.js +0 -3
- package/dist/public/assets/WorkbenchModal-0tPIIhca.js +0 -1
- package/dist/public/assets/WorkbenchShellRoute-BF0nHWOk.css +0 -1
- package/dist/public/assets/WorkbenchShellRoute-DBBOsJo9.js +0 -1
- package/dist/public/assets/WorkspaceDebugDetailPage-CDerFYd2.js +0 -1
- package/dist/public/assets/WorkspaceDetailPage-BlJc1CHE.js +0 -1
- package/dist/public/assets/WorkspaceHomePage-BUsKJ3lv.js +0 -1
- package/dist/public/assets/default-session-permission-mode-DT4SGiwp.js +0 -1
- package/dist/public/assets/index-BZLcEHW3.js +0 -42
- package/dist/public/assets/index-BbspQPC2.css +0 -1
- package/dist/public/assets/session-runtime-machine-DdLeDqQr.js +0 -17
- package/dist/public/assets/useRegisteredDebugTemplates-oFAQNIqh.js +0 -1
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import path from "node:path";
|
|
2
|
+
import { hashContent } from "../../shared/utils/hash.js";
|
|
3
|
+
import { nowIso } from "../../shared/utils/time.js";
|
|
4
|
+
import { resolveOpenCliRuntimeRoot } from "./opencli-runtime-layout.js";
|
|
5
|
+
export class OpenCliRuntimeProfileService {
|
|
6
|
+
providerRepository;
|
|
7
|
+
catalogEntryRepository;
|
|
8
|
+
runtimeProfileRepository;
|
|
9
|
+
now;
|
|
10
|
+
runtimeStorageRootPath;
|
|
11
|
+
constructor(providerRepository, catalogEntryRepository, runtimeProfileRepository, options) {
|
|
12
|
+
this.providerRepository = providerRepository;
|
|
13
|
+
this.catalogEntryRepository = catalogEntryRepository;
|
|
14
|
+
this.runtimeProfileRepository = runtimeProfileRepository;
|
|
15
|
+
this.now = options.now ?? nowIso;
|
|
16
|
+
this.runtimeStorageRootPath = path.resolve(options.runtimeStorageRootPath);
|
|
17
|
+
}
|
|
18
|
+
findOrCreateDesiredProfile() {
|
|
19
|
+
const provider = this.providerRepository.get();
|
|
20
|
+
const source = assertInstalledSource(provider);
|
|
21
|
+
const catalogEntries = this.catalogEntryRepository.list();
|
|
22
|
+
const enabledCommandIds = collectEnabledCommandIds(catalogEntries);
|
|
23
|
+
const contentHash = computeOpenCliRuntimeProfileHash({
|
|
24
|
+
version: source.version,
|
|
25
|
+
sourceInstallPath: source.installPath,
|
|
26
|
+
enabledCommandIds
|
|
27
|
+
});
|
|
28
|
+
this.markOutdatedProfilesAsStale(source.installPath, source.version);
|
|
29
|
+
const existingProfile = this.runtimeProfileRepository.findByContentHash(contentHash);
|
|
30
|
+
if (existingProfile) {
|
|
31
|
+
return {
|
|
32
|
+
provider,
|
|
33
|
+
enabledCommandIds,
|
|
34
|
+
contentHash,
|
|
35
|
+
profile: existingProfile
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
const timestamp = this.now();
|
|
39
|
+
const profileId = `opencli-runtime-${contentHash.slice(0, 16)}`;
|
|
40
|
+
const profile = this.runtimeProfileRepository.upsert({
|
|
41
|
+
id: profileId,
|
|
42
|
+
version: source.version,
|
|
43
|
+
sourceInstallPath: source.installPath,
|
|
44
|
+
enabledCommandIdsJson: JSON.stringify(enabledCommandIds),
|
|
45
|
+
runtimeRootPath: resolveOpenCliRuntimeRoot(this.runtimeStorageRootPath, profileId),
|
|
46
|
+
status: "pending",
|
|
47
|
+
contentHash,
|
|
48
|
+
createdAt: timestamp,
|
|
49
|
+
updatedAt: timestamp,
|
|
50
|
+
lastErrorCode: null,
|
|
51
|
+
lastErrorDetail: null
|
|
52
|
+
});
|
|
53
|
+
return {
|
|
54
|
+
provider,
|
|
55
|
+
enabledCommandIds,
|
|
56
|
+
contentHash,
|
|
57
|
+
profile
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
markOutdatedProfilesAsStale(sourceInstallPath, version) {
|
|
61
|
+
const profiles = this.runtimeProfileRepository.list();
|
|
62
|
+
for (const profile of profiles) {
|
|
63
|
+
if (profile.status === "stale"
|
|
64
|
+
|| (profile.sourceInstallPath === sourceInstallPath && profile.version === version)) {
|
|
65
|
+
continue;
|
|
66
|
+
}
|
|
67
|
+
this.runtimeProfileRepository.upsert({
|
|
68
|
+
...profile,
|
|
69
|
+
status: "stale",
|
|
70
|
+
updatedAt: this.now()
|
|
71
|
+
});
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
export function computeOpenCliRuntimeProfileHash(input) {
|
|
76
|
+
return hashContent(JSON.stringify({
|
|
77
|
+
version: input.version,
|
|
78
|
+
sourceInstallPath: input.sourceInstallPath,
|
|
79
|
+
enabledCommandIds: [...input.enabledCommandIds]
|
|
80
|
+
}));
|
|
81
|
+
}
|
|
82
|
+
function collectEnabledCommandIds(entries) {
|
|
83
|
+
return entries
|
|
84
|
+
.filter((entry) => entry.enabled)
|
|
85
|
+
.sort((left, right) => {
|
|
86
|
+
if (left.sortOrder !== right.sortOrder) {
|
|
87
|
+
return left.sortOrder - right.sortOrder;
|
|
88
|
+
}
|
|
89
|
+
return left.commandId.localeCompare(right.commandId);
|
|
90
|
+
})
|
|
91
|
+
.map((entry) => entry.commandId);
|
|
92
|
+
}
|
|
93
|
+
function assertInstalledSource(provider) {
|
|
94
|
+
const installPath = provider.installPath?.trim() ?? "";
|
|
95
|
+
const version = provider.version?.trim() ?? "";
|
|
96
|
+
if (provider.installState !== "installed" || !installPath || !version) {
|
|
97
|
+
throw new Error("OPENCLI_RUNTIME_SOURCE_UNAVAILABLE");
|
|
98
|
+
}
|
|
99
|
+
return {
|
|
100
|
+
installPath,
|
|
101
|
+
version
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=opencli-runtime-profile-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencli-runtime-profile-service.js","sourceRoot":"","sources":["../../../../src/modules/opencli/opencli-runtime-profile-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import type { OpenCliProviderRepository } from "../../storage/repositories/opencli-provider-repository.js";
|
|
2
|
+
import type { OpenCliRuntimeProfileRepository } from "../../storage/repositories/opencli-runtime-profile-repository.js";
|
|
3
|
+
import { OpenCliRuntimeBuilder } from "./opencli-runtime-builder.js";
|
|
4
|
+
import type { OpenCliRuntimeProfileService } from "./opencli-runtime-profile-service.js";
|
|
5
|
+
export interface OpenCliRuntimeResolverOptions {
|
|
6
|
+
env?: NodeJS.ProcessEnv;
|
|
7
|
+
homeDir?: string;
|
|
8
|
+
userProfile?: string | null;
|
|
9
|
+
}
|
|
10
|
+
export interface OpenCliSessionRuntimeResolution {
|
|
11
|
+
availability: "disabled" | "unavailable" | "ready";
|
|
12
|
+
runtimeRootPath: string | null;
|
|
13
|
+
runtimeBinPath: string | null;
|
|
14
|
+
realHome: string | null;
|
|
15
|
+
realUserProfile: string | null;
|
|
16
|
+
errorCode: string | null;
|
|
17
|
+
errorDetail: string | null;
|
|
18
|
+
}
|
|
19
|
+
export declare class OpenCliRuntimeResolver {
|
|
20
|
+
private readonly providerRepository;
|
|
21
|
+
private readonly runtimeProfileRepository;
|
|
22
|
+
private readonly runtimeProfileService;
|
|
23
|
+
private readonly runtimeBuilder;
|
|
24
|
+
private readonly env;
|
|
25
|
+
private readonly realHome;
|
|
26
|
+
private readonly realUserProfile;
|
|
27
|
+
constructor(providerRepository: OpenCliProviderRepository, runtimeProfileRepository: OpenCliRuntimeProfileRepository, runtimeProfileService: OpenCliRuntimeProfileService, runtimeBuilder: OpenCliRuntimeBuilder, options?: OpenCliRuntimeResolverOptions);
|
|
28
|
+
resolveSessionRuntime(): OpenCliSessionRuntimeResolution;
|
|
29
|
+
}
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
import os from "node:os";
|
|
2
|
+
import path from "node:path";
|
|
3
|
+
export class OpenCliRuntimeResolver {
|
|
4
|
+
providerRepository;
|
|
5
|
+
runtimeProfileRepository;
|
|
6
|
+
runtimeProfileService;
|
|
7
|
+
runtimeBuilder;
|
|
8
|
+
env;
|
|
9
|
+
realHome;
|
|
10
|
+
realUserProfile;
|
|
11
|
+
constructor(providerRepository, runtimeProfileRepository, runtimeProfileService, runtimeBuilder, options = {}) {
|
|
12
|
+
this.providerRepository = providerRepository;
|
|
13
|
+
this.runtimeProfileRepository = runtimeProfileRepository;
|
|
14
|
+
this.runtimeProfileService = runtimeProfileService;
|
|
15
|
+
this.runtimeBuilder = runtimeBuilder;
|
|
16
|
+
this.env = options.env ?? process.env;
|
|
17
|
+
this.realHome = normalizeOptionalValue(options.homeDir ?? os.homedir());
|
|
18
|
+
this.realUserProfile = normalizeOptionalValue(options.userProfile ?? this.env.USERPROFILE ?? this.realHome);
|
|
19
|
+
}
|
|
20
|
+
resolveSessionRuntime() {
|
|
21
|
+
const provider = this.providerRepository.get();
|
|
22
|
+
if (!provider.enabled) {
|
|
23
|
+
return unavailableResolution("disabled");
|
|
24
|
+
}
|
|
25
|
+
const installPath = provider.installPath?.trim() ?? "";
|
|
26
|
+
const version = provider.version?.trim() ?? "";
|
|
27
|
+
if (provider.installState !== "installed" || !installPath || !version) {
|
|
28
|
+
return unavailableResolution("unavailable");
|
|
29
|
+
}
|
|
30
|
+
try {
|
|
31
|
+
const desiredProfile = this.runtimeProfileService.findOrCreateDesiredProfile();
|
|
32
|
+
const resolvedProfile = this.runtimeBuilder.buildProfile(desiredProfile.profile);
|
|
33
|
+
if (resolvedProfile.status !== "ready") {
|
|
34
|
+
this.providerRepository.upsert({
|
|
35
|
+
...provider,
|
|
36
|
+
activeRuntimeId: null,
|
|
37
|
+
healthState: "runtime_build_failed",
|
|
38
|
+
lastErrorCode: resolvedProfile.lastErrorCode,
|
|
39
|
+
lastErrorDetail: resolvedProfile.lastErrorDetail
|
|
40
|
+
});
|
|
41
|
+
return {
|
|
42
|
+
availability: "unavailable",
|
|
43
|
+
runtimeRootPath: null,
|
|
44
|
+
runtimeBinPath: null,
|
|
45
|
+
realHome: this.realHome,
|
|
46
|
+
realUserProfile: this.realUserProfile,
|
|
47
|
+
errorCode: resolvedProfile.lastErrorCode,
|
|
48
|
+
errorDetail: resolvedProfile.lastErrorDetail
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
this.providerRepository.upsert({
|
|
52
|
+
...provider,
|
|
53
|
+
activeRuntimeId: resolvedProfile.id,
|
|
54
|
+
healthState: resolveHealthyStateAfterRuntimeReady(provider.healthState),
|
|
55
|
+
lastErrorCode: null,
|
|
56
|
+
lastErrorDetail: null
|
|
57
|
+
});
|
|
58
|
+
return {
|
|
59
|
+
availability: "ready",
|
|
60
|
+
runtimeRootPath: resolvedProfile.runtimeRootPath,
|
|
61
|
+
runtimeBinPath: path.join(resolvedProfile.runtimeRootPath, "bin"),
|
|
62
|
+
realHome: this.realHome,
|
|
63
|
+
realUserProfile: this.realUserProfile,
|
|
64
|
+
errorCode: null,
|
|
65
|
+
errorDetail: null
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
70
|
+
this.providerRepository.upsert({
|
|
71
|
+
...provider,
|
|
72
|
+
activeRuntimeId: null,
|
|
73
|
+
healthState: "runtime_build_failed",
|
|
74
|
+
lastErrorCode: "OPENCLI_RUNTIME_RESOLVE_FAILED",
|
|
75
|
+
lastErrorDetail: detail
|
|
76
|
+
});
|
|
77
|
+
return {
|
|
78
|
+
availability: "unavailable",
|
|
79
|
+
runtimeRootPath: null,
|
|
80
|
+
runtimeBinPath: null,
|
|
81
|
+
realHome: this.realHome,
|
|
82
|
+
realUserProfile: this.realUserProfile,
|
|
83
|
+
errorCode: "OPENCLI_RUNTIME_RESOLVE_FAILED",
|
|
84
|
+
errorDetail: detail
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
function resolveHealthyStateAfterRuntimeReady(current) {
|
|
90
|
+
if (current === "runtime_build_failed") {
|
|
91
|
+
return "binary_ready";
|
|
92
|
+
}
|
|
93
|
+
return current;
|
|
94
|
+
}
|
|
95
|
+
function unavailableResolution(availability) {
|
|
96
|
+
return {
|
|
97
|
+
availability,
|
|
98
|
+
runtimeRootPath: null,
|
|
99
|
+
runtimeBinPath: null,
|
|
100
|
+
realHome: null,
|
|
101
|
+
realUserProfile: null,
|
|
102
|
+
errorCode: null,
|
|
103
|
+
errorDetail: null
|
|
104
|
+
};
|
|
105
|
+
}
|
|
106
|
+
function normalizeOptionalValue(value) {
|
|
107
|
+
const normalized = value?.trim() ?? "";
|
|
108
|
+
return normalized.length > 0 ? normalized : null;
|
|
109
|
+
}
|
|
110
|
+
//# sourceMappingURL=opencli-runtime-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencli-runtime-resolver.js","sourceRoot":"","sources":["../../../../src/modules/opencli/opencli-runtime-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { OpenCliCatalogEntryRepository } from "../../storage/repositories/opencli-catalog-entry-repository.js";
|
|
2
|
+
import type { OpenCliProviderRepository } from "../../storage/repositories/opencli-provider-repository.js";
|
|
3
|
+
export declare class OpenCliSessionPromptService {
|
|
4
|
+
private readonly providerRepository;
|
|
5
|
+
private readonly catalogEntryRepository;
|
|
6
|
+
constructor(providerRepository: Pick<OpenCliProviderRepository, "get">, catalogEntryRepository: Pick<OpenCliCatalogEntryRepository, "list">);
|
|
7
|
+
buildPrompt(input: {
|
|
8
|
+
provider: string;
|
|
9
|
+
runtimeEnv: Record<string, string>;
|
|
10
|
+
}): string | null;
|
|
11
|
+
}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
const OPENCLI_PROMPT_PROVIDER_IDS = new Set(["codex", "claude-code", "legna-code"]);
|
|
2
|
+
const MAX_PROMPT_COMMANDS = 40;
|
|
3
|
+
export class OpenCliSessionPromptService {
|
|
4
|
+
providerRepository;
|
|
5
|
+
catalogEntryRepository;
|
|
6
|
+
constructor(providerRepository, catalogEntryRepository) {
|
|
7
|
+
this.providerRepository = providerRepository;
|
|
8
|
+
this.catalogEntryRepository = catalogEntryRepository;
|
|
9
|
+
}
|
|
10
|
+
buildPrompt(input) {
|
|
11
|
+
if (!OPENCLI_PROMPT_PROVIDER_IDS.has(input.provider)) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
const runtimeRootPath = input.runtimeEnv.CODINGNS_OPENCLI_RUNTIME_ROOT?.trim() ?? "";
|
|
15
|
+
if (!runtimeRootPath) {
|
|
16
|
+
return null;
|
|
17
|
+
}
|
|
18
|
+
const provider = this.providerRepository.get();
|
|
19
|
+
if (!provider.enabled) {
|
|
20
|
+
return null;
|
|
21
|
+
}
|
|
22
|
+
const enabledEntries = this.catalogEntryRepository
|
|
23
|
+
.list()
|
|
24
|
+
.filter((entry) => entry.enabled)
|
|
25
|
+
.sort((left, right) => left.sortOrder - right.sortOrder || left.commandId.localeCompare(right.commandId));
|
|
26
|
+
if (enabledEntries.length === 0) {
|
|
27
|
+
return [
|
|
28
|
+
"## OpenCLI CLI技能",
|
|
29
|
+
"- 当前会话已经注入 CodingNS 管理的 OpenCLI 运行时,但当前没有启用任何 CLI技能。",
|
|
30
|
+
"- 不要调用 `opencli`,除非用户先在面板里启用具体命令。"
|
|
31
|
+
].join("\n");
|
|
32
|
+
}
|
|
33
|
+
const siteSummaries = buildSiteSummaries(enabledEntries);
|
|
34
|
+
const visibleCommandIds = enabledEntries
|
|
35
|
+
.slice(0, MAX_PROMPT_COMMANDS)
|
|
36
|
+
.map((entry) => entry.commandId);
|
|
37
|
+
const hiddenCommandCount = enabledEntries.length - visibleCommandIds.length;
|
|
38
|
+
return [
|
|
39
|
+
"## OpenCLI CLI技能",
|
|
40
|
+
"- 当前会话已经注入 CodingNS 管理的裁剪版 OpenCLI 运行时,可以直接在 shell 里使用 `opencli`。",
|
|
41
|
+
"- 只能把下面这些已启用命令当成当前会话可见能力;不在列表里的命令,视为当前会话不可用。",
|
|
42
|
+
"- 如需先确认目录,优先执行 `opencli list -f json`,再调用具体命令。",
|
|
43
|
+
"- 目录里存在命令,不等于当前环境一定可运行;标记为依赖浏览器的命令,在浏览器桥缺失时仍可能失败。",
|
|
44
|
+
`- 已启用站点:${siteSummaries.join(";")}`,
|
|
45
|
+
`- 已启用命令:${visibleCommandIds.join("、")}${hiddenCommandCount > 0 ? ` 等另外 ${hiddenCommandCount} 个` : ""}`
|
|
46
|
+
].join("\n");
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
function buildSiteSummaries(entries) {
|
|
50
|
+
const grouped = new Map();
|
|
51
|
+
for (const entry of entries) {
|
|
52
|
+
const current = grouped.get(entry.site) ?? {
|
|
53
|
+
total: 0,
|
|
54
|
+
browserDependent: 0
|
|
55
|
+
};
|
|
56
|
+
current.total += 1;
|
|
57
|
+
current.browserDependent += entry.browser ? 1 : 0;
|
|
58
|
+
grouped.set(entry.site, current);
|
|
59
|
+
}
|
|
60
|
+
return [...grouped.entries()]
|
|
61
|
+
.sort(([left], [right]) => left.localeCompare(right))
|
|
62
|
+
.map(([site, summary]) => summary.browserDependent > 0
|
|
63
|
+
? `${site}(${summary.total} 个,其中 ${summary.browserDependent} 个依赖浏览器)`
|
|
64
|
+
: `${site}(${summary.total} 个,可直接运行)`);
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=opencli-session-prompt-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"opencli-session-prompt-service.js","sourceRoot":"","sources":["../../../../src/modules/opencli/opencli-session-prompt-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { FastifyReply, FastifyRequest } from "fastify";
|
|
2
|
+
import type { SessionProviderConfigMode } from "../../types/domain.js";
|
|
2
3
|
import type { ParallelSessionGroupService } from "./parallel-session-group-service.js";
|
|
3
4
|
import type { SessionIsolatedWorkspaceService } from "./session-isolated-workspace-service.js";
|
|
4
5
|
interface SessionParams {
|
|
@@ -16,12 +17,15 @@ interface IsolatedWorkspaceParams {
|
|
|
16
17
|
interface ParallelMemberBody {
|
|
17
18
|
provider?: string;
|
|
18
19
|
model?: string | null;
|
|
20
|
+
providerConfigMode?: SessionProviderConfigMode | null;
|
|
21
|
+
providerPresetId?: string | null;
|
|
19
22
|
memberPrompt?: string | null;
|
|
20
23
|
workspaceIsolationMode?: "none" | "temporary_worktree" | null;
|
|
21
24
|
}
|
|
22
25
|
interface CreateParallelGroupBody {
|
|
23
26
|
sourceMessageId?: string | null;
|
|
24
27
|
sharedPrompt?: string;
|
|
28
|
+
permissionMode?: string | null;
|
|
25
29
|
members?: ParallelMemberBody[];
|
|
26
30
|
}
|
|
27
31
|
export declare class ParallelSessionController {
|
|
@@ -22,6 +22,7 @@ export class ParallelSessionController {
|
|
|
22
22
|
sourceSessionId: request.params.sessionId,
|
|
23
23
|
sourceMessageId: request.body.sourceMessageId?.trim() || null,
|
|
24
24
|
sharedPrompt: request.body.sharedPrompt ?? "",
|
|
25
|
+
permissionMode: request.body.permissionMode?.trim() || null,
|
|
25
26
|
members: normalizeMembers(request.body.members),
|
|
26
27
|
userId: requireUserId(request)
|
|
27
28
|
});
|
|
@@ -31,6 +32,7 @@ export class ParallelSessionController {
|
|
|
31
32
|
const result = await this.parallelSessionGroupService.createFromWorkspace({
|
|
32
33
|
workspaceId: request.params.workspaceId,
|
|
33
34
|
sharedPrompt: request.body.sharedPrompt ?? "",
|
|
35
|
+
permissionMode: request.body.permissionMode?.trim() || null,
|
|
34
36
|
members: normalizeMembers(request.body.members),
|
|
35
37
|
userId: requireUserId(request)
|
|
36
38
|
});
|
|
@@ -39,6 +41,7 @@ export class ParallelSessionController {
|
|
|
39
41
|
appendMembers = async (request, reply) => {
|
|
40
42
|
const result = await this.parallelSessionGroupService.appendMembers({
|
|
41
43
|
groupId: request.params.groupId,
|
|
44
|
+
permissionMode: request.body.permissionMode?.trim() || null,
|
|
42
45
|
members: normalizeMembers(request.body.members),
|
|
43
46
|
userId: requireUserId(request)
|
|
44
47
|
});
|
|
@@ -61,6 +64,10 @@ function normalizeMembers(input) {
|
|
|
61
64
|
return input.map((member) => ({
|
|
62
65
|
provider: member?.provider?.trim() ?? "",
|
|
63
66
|
model: member?.model?.trim() || null,
|
|
67
|
+
providerConfigMode: member?.providerConfigMode === "cc-switch-preset"
|
|
68
|
+
? "cc-switch-preset"
|
|
69
|
+
: "global-default",
|
|
70
|
+
providerPresetId: member?.providerPresetId?.trim() || null,
|
|
64
71
|
memberPrompt: member?.memberPrompt?.trim() || null,
|
|
65
72
|
workspaceIsolationMode: member?.workspaceIsolationMode === "temporary_worktree"
|
|
66
73
|
? "temporary_worktree"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parallel-session-controller.js","sourceRoot":"","sources":["../../../../src/modules/parallel-sessions/parallel-session-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"parallel-session-controller.js","sourceRoot":"","sources":["../../../../src/modules/parallel-sessions/parallel-session-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAwC5D,SAAS,aAAa,CAAC,OAAuB;IAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;IAEzC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,QAAQ,CAAC;YACjB,UAAU,EAAE,GAAG;YACf,SAAS,EAAE,cAAc;YACzB,MAAM,EAAE,aAAa;SACtB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,yBAAyB;IAEjB;IACA;IAFnB,YACmB,2BAAwD,EACxD,+BAAiF;QADjF,gCAA2B,GAA3B,2BAA2B,CAA6B;QACxD,oCAA+B,GAA/B,+BAA+B,CAAkD;IACjG,CAAC;IAEK,iBAAiB,GAAG,KAAK,EAChC,OAAiF,EACjF,KAAmB,EACJ,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,iBAAiB,CAAC;YACtE,eAAe,EAAE,OAAO,CAAC,MAAM,CAAC,SAAS;YACzC,eAAe,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,EAAE,IAAI,IAAI;YAC7D,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE;YAC7C,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,IAAI;YAC3D,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/C,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;SAC/B,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC,CAAC;IAEO,mBAAmB,GAAG,KAAK,EAClC,OAAmF,EACnF,KAAmB,EACJ,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,mBAAmB,CAAC;YACxE,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW;YACvC,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE;YAC7C,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,IAAI;YAC3D,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/C,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;SAC/B,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnE,CAAC,CAAC;IAEO,aAAa,GAAG,KAAK,EAC5B,OAA+E,EAC/E,KAAmB,EACJ,EAAE;QACjB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,aAAa,CAAC;YAClE,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC/B,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,IAAI;YAC3D,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC;YAC/C,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC;SAC/B,CAAC,CAAC;QAEH,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjC,CAAC,CAAC;IAEO,SAAS,GAAG,KAAK,EACxB,OAAgD,EAChD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,2BAA2B,CAAC,QAAQ,CACvC,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,aAAa,CAAC,OAAO,CAAC,CACvB,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,WAAW,GAAG,KAAK,EAC1B,OAAgD,EAChD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAChD,OAAO,CAAC,MAAM,CAAC,OAAO,EACtB,aAAa,CAAC,OAAO,CAAC,CACvB,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,wBAAwB,GAAG,KAAK,EACvC,OAA4D,EAC5D,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;CACH;AAED,SAAS,gBAAgB,CAAC,KAAyC;IACjE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC5B,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;QACxC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,IAAI;QACpC,kBAAkB,EAChB,MAAM,EAAE,kBAAkB,KAAK,kBAAkB;YAC/C,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,gBAAgB;QACtB,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,EAAE,IAAI,EAAE,IAAI,IAAI;QAC1D,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,IAAI;QAClD,sBAAsB,EACpB,MAAM,EAAE,sBAAsB,KAAK,oBAAoB;YACrD,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,MAAM;KACb,CAAC,CAAC,CAAC;AACN,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ParallelSessionGroupRecord, ParallelSessionMemberRecord, ParallelSessionWorkspaceIsolationMode, SessionIsolatedWorkspaceRecord, SessionListItem } from "../../types/domain.js";
|
|
1
|
+
import type { ParallelSessionGroupRecord, ParallelSessionMemberRecord, ParallelSessionWorkspaceIsolationMode, SessionProviderConfigMode, SessionIsolatedWorkspaceRecord, SessionListItem } from "../../types/domain.js";
|
|
2
2
|
import type { ParallelSessionGroupRepository } from "../../storage/repositories/parallel-session-group-repository.js";
|
|
3
3
|
import type { ParallelSessionMemberRepository } from "../../storage/repositories/parallel-session-member-repository.js";
|
|
4
4
|
import type { SessionIsolatedWorkspaceRepository } from "../../storage/repositories/session-isolated-workspace-repository.js";
|
|
@@ -8,6 +8,8 @@ import type { CleanupSessionIsolatedWorkspaceResult, PromoteSessionIsolatedWorks
|
|
|
8
8
|
export interface ParallelSessionMemberInput {
|
|
9
9
|
provider: string;
|
|
10
10
|
model?: string | null;
|
|
11
|
+
providerConfigMode?: SessionProviderConfigMode;
|
|
12
|
+
providerPresetId?: string | null;
|
|
11
13
|
memberPrompt?: string | null;
|
|
12
14
|
workspaceIsolationMode?: ParallelSessionWorkspaceIsolationMode;
|
|
13
15
|
}
|
|
@@ -16,17 +18,20 @@ export interface CreateParallelGroupFromSessionInput {
|
|
|
16
18
|
sourceMessageId?: string | null;
|
|
17
19
|
sharedPrompt: string;
|
|
18
20
|
members: ParallelSessionMemberInput[];
|
|
21
|
+
permissionMode?: string | null;
|
|
19
22
|
userId: string;
|
|
20
23
|
}
|
|
21
24
|
export interface CreateParallelGroupFromWorkspaceInput {
|
|
22
25
|
workspaceId: string;
|
|
23
26
|
sharedPrompt: string;
|
|
24
27
|
members: ParallelSessionMemberInput[];
|
|
28
|
+
permissionMode?: string | null;
|
|
25
29
|
userId: string;
|
|
26
30
|
}
|
|
27
31
|
export interface AppendParallelGroupMembersInput {
|
|
28
32
|
groupId: string;
|
|
29
33
|
members: ParallelSessionMemberInput[];
|
|
34
|
+
permissionMode?: string | null;
|
|
30
35
|
userId: string;
|
|
31
36
|
}
|
|
32
37
|
export interface ParallelSessionMemberFailure {
|
|
@@ -61,8 +61,11 @@ export class ParallelSessionGroupService {
|
|
|
61
61
|
sourceMessageId: group.sourceMessageId,
|
|
62
62
|
provider: member.provider,
|
|
63
63
|
model: member.model ?? null,
|
|
64
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
65
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
64
66
|
sharedPrompt,
|
|
65
67
|
memberPrompt: member.memberPrompt ?? null,
|
|
68
|
+
permissionMode: input.permissionMode ?? null,
|
|
66
69
|
targetWorkspaceId: workspaceId,
|
|
67
70
|
userId: input.userId
|
|
68
71
|
});
|
|
@@ -79,8 +82,11 @@ export class ParallelSessionGroupService {
|
|
|
79
82
|
sourceMessageId: group.sourceMessageId,
|
|
80
83
|
provider: member.provider,
|
|
81
84
|
model: member.model ?? null,
|
|
85
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
86
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
82
87
|
sharedPrompt,
|
|
83
88
|
memberPrompt: member.memberPrompt ?? null,
|
|
89
|
+
permissionMode: input.permissionMode ?? null,
|
|
84
90
|
targetWorkspaceId: null,
|
|
85
91
|
userId: input.userId
|
|
86
92
|
}),
|
|
@@ -129,8 +135,11 @@ export class ParallelSessionGroupService {
|
|
|
129
135
|
workspaceId,
|
|
130
136
|
provider: member.provider,
|
|
131
137
|
model: member.model ?? null,
|
|
138
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
139
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
132
140
|
sharedPrompt,
|
|
133
141
|
memberPrompt: member.memberPrompt ?? null,
|
|
142
|
+
permissionMode: input.permissionMode ?? null,
|
|
134
143
|
userId: input.userId
|
|
135
144
|
});
|
|
136
145
|
}
|
|
@@ -145,8 +154,11 @@ export class ParallelSessionGroupService {
|
|
|
145
154
|
workspaceId: group.workspaceId,
|
|
146
155
|
provider: member.provider,
|
|
147
156
|
model: member.model ?? null,
|
|
157
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
158
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
148
159
|
sharedPrompt,
|
|
149
160
|
memberPrompt: member.memberPrompt ?? null,
|
|
161
|
+
permissionMode: input.permissionMode ?? null,
|
|
150
162
|
userId: input.userId
|
|
151
163
|
}),
|
|
152
164
|
sessionIsolatedWorkspace: null
|
|
@@ -209,8 +221,11 @@ export class ParallelSessionGroupService {
|
|
|
209
221
|
sourceMessageId: group.sourceMessageId,
|
|
210
222
|
provider: member.provider,
|
|
211
223
|
model: member.model ?? null,
|
|
224
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
225
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
212
226
|
sharedPrompt,
|
|
213
227
|
memberPrompt: member.memberPrompt ?? null,
|
|
228
|
+
permissionMode: input.permissionMode ?? null,
|
|
214
229
|
targetWorkspaceId: workspaceId,
|
|
215
230
|
userId: input.userId
|
|
216
231
|
});
|
|
@@ -227,8 +242,11 @@ export class ParallelSessionGroupService {
|
|
|
227
242
|
sourceMessageId: group.sourceMessageId,
|
|
228
243
|
provider: member.provider,
|
|
229
244
|
model: member.model ?? null,
|
|
245
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
246
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
230
247
|
sharedPrompt,
|
|
231
248
|
memberPrompt: member.memberPrompt ?? null,
|
|
249
|
+
permissionMode: input.permissionMode ?? null,
|
|
232
250
|
targetWorkspaceId: null,
|
|
233
251
|
userId: input.userId
|
|
234
252
|
}),
|
|
@@ -244,8 +262,11 @@ export class ParallelSessionGroupService {
|
|
|
244
262
|
workspaceId,
|
|
245
263
|
provider: member.provider,
|
|
246
264
|
model: member.model ?? null,
|
|
265
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
266
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
247
267
|
sharedPrompt,
|
|
248
268
|
memberPrompt: member.memberPrompt ?? null,
|
|
269
|
+
permissionMode: input.permissionMode ?? null,
|
|
249
270
|
userId: input.userId
|
|
250
271
|
});
|
|
251
272
|
}
|
|
@@ -260,8 +281,11 @@ export class ParallelSessionGroupService {
|
|
|
260
281
|
workspaceId: group.workspaceId,
|
|
261
282
|
provider: member.provider,
|
|
262
283
|
model: member.model ?? null,
|
|
284
|
+
providerConfigMode: member.providerConfigMode ?? "global-default",
|
|
285
|
+
providerPresetId: member.providerPresetId ?? null,
|
|
263
286
|
sharedPrompt,
|
|
264
287
|
memberPrompt: member.memberPrompt ?? null,
|
|
288
|
+
permissionMode: input.permissionMode ?? null,
|
|
265
289
|
userId: input.userId
|
|
266
290
|
}),
|
|
267
291
|
sessionIsolatedWorkspace: null
|
|
@@ -495,8 +519,11 @@ export class ParallelSessionGroupService {
|
|
|
495
519
|
userId: input.userId,
|
|
496
520
|
content: buildComposedPrompt(input.sharedPrompt, input.memberPrompt),
|
|
497
521
|
clientRequestId: null,
|
|
522
|
+
providerConfigMode: input.providerConfigMode,
|
|
523
|
+
providerPresetId: input.providerPresetId,
|
|
498
524
|
runtimeOptions: {
|
|
499
|
-
model: input.model
|
|
525
|
+
model: input.model,
|
|
526
|
+
permissionMode: input.permissionMode
|
|
500
527
|
}
|
|
501
528
|
});
|
|
502
529
|
return this.sessionHistoryService.getSession(forkedSession.sessionId, input.userId);
|
|
@@ -521,8 +548,11 @@ export class ParallelSessionGroupService {
|
|
|
521
548
|
sessionKind: "default",
|
|
522
549
|
annotationSourceMessageId: null,
|
|
523
550
|
annotationSourceText: null,
|
|
551
|
+
providerConfigMode: input.providerConfigMode,
|
|
552
|
+
providerPresetId: input.providerPresetId,
|
|
524
553
|
runtimeOptions: {
|
|
525
|
-
model: input.model
|
|
554
|
+
model: input.model,
|
|
555
|
+
permissionMode: input.permissionMode
|
|
526
556
|
}
|
|
527
557
|
});
|
|
528
558
|
return (startedSession.session
|
|
@@ -541,6 +571,10 @@ function normalizeMembers(members, limits) {
|
|
|
541
571
|
return members.map((member, index) => ({
|
|
542
572
|
provider: normalizeRequiredText(member.provider, `members[${index}].provider`),
|
|
543
573
|
model: normalizeOptionalText(member.model),
|
|
574
|
+
providerConfigMode: member.providerConfigMode === "cc-switch-preset"
|
|
575
|
+
? "cc-switch-preset"
|
|
576
|
+
: "global-default",
|
|
577
|
+
providerPresetId: normalizeOptionalText(member.providerPresetId),
|
|
544
578
|
memberPrompt: normalizeOptionalText(member.memberPrompt),
|
|
545
579
|
workspaceIsolationMode: member.workspaceIsolationMode === "temporary_worktree"
|
|
546
580
|
? "temporary_worktree"
|